enhance: credential overrides: support multiple arguments (#593)

Signed-off-by: Grant Linville <[email protected]>
Co-authored-by: Nick Hale <[email protected]>

docs/docs/03-tools/04-credential-tools.md

@@ -153,6 +153,8 @@ You can bypass credential tools and stored credentials by setting the `--credent
 need to be aware of which environment variables the credential tool sets. You can find this out by running the
 `gptscript credential --show-env-vars` command.
 
+To override multiple credentials, specify the `--credential-override` argument multiple times.
+
 ### Format
 
 :::info
@@ -171,10 +173,6 @@ The `--credential-override` argument must be formatted in one of the following t
 In this example, both `toolA` provides the variables `ENV_VAR_1` and `ENV_VAR_2`.
 This will set the environment variables `ENV_VAR_1` and `ENV_VAR_2` to the specific values `value1` and `value2`.
 
-:::info
-To override more than one credential, use `;` as a separator. For example, `toolA:ENV_VAR_1=value1;toolB:ENV_VAR_2=value2`.
-:::
-
 #### 2. Environment Variables
 
 `toolA:ENV_VAR_1,ENV_VAR_2`

docs/docs/04-command-line-reference/gptscript.md

@@ -19,7 +19,7 @@ gptscript [flags] PROGRAM_FILE [INPUT...]
       --config string                 Path to GPTScript config file ($GPTSCRIPT_CONFIG)
       --confirm                       Prompt before running potentially dangerous commands ($GPTSCRIPT_CONFIRM)
       --credential-context string     Context name in which to store credentials ($GPTSCRIPT_CREDENTIAL_CONTEXT) (default "default")
-      --credential-override string    Credentials to override (ex: --credential-override github.com/example/cred-tool:API_TOKEN=1234) ($GPTSCRIPT_CREDENTIAL_OVERRIDE)
+      --credential-override strings   Credentials to override (ex: --credential-override github.com/example/cred-tool:API_TOKEN=1234) ($GPTSCRIPT_CREDENTIAL_OVERRIDE)
       --debug                         Enable debug logging ($GPTSCRIPT_DEBUG)
       --debug-messages                Enable logging of chat completion calls ($GPTSCRIPT_DEBUG_MESSAGES)
       --default-model string          Default LLM model to use ($GPTSCRIPT_DEFAULT_MODEL) (default "gpt-4o")

docs/docs/04-command-line-reference/gptscript_eval.md

@@ -25,27 +25,27 @@ gptscript eval [flags]
 ### Options inherited from parent commands
 
 ```
-      --cache-dir string             Directory to store cache (default: $XDG_CACHE_HOME/gptscript) ($GPTSCRIPT_CACHE_DIR)
-  -C, --chdir string                 Change current working directory ($GPTSCRIPT_CHDIR)
-      --color                        Use color in output (default true) ($GPTSCRIPT_COLOR)
-      --config string                Path to GPTScript config file ($GPTSCRIPT_CONFIG)
-      --confirm                      Prompt before running potentially dangerous commands ($GPTSCRIPT_CONFIRM)
-      --credential-context string    Context name in which to store credentials ($GPTSCRIPT_CREDENTIAL_CONTEXT) (default "default")
-      --credential-override string   Credentials to override (ex: --credential-override github.com/example/cred-tool:API_TOKEN=1234) ($GPTSCRIPT_CREDENTIAL_OVERRIDE)
-      --debug                        Enable debug logging ($GPTSCRIPT_DEBUG)
-      --debug-messages               Enable logging of chat completion calls ($GPTSCRIPT_DEBUG_MESSAGES)
-      --default-model string         Default LLM model to use ($GPTSCRIPT_DEFAULT_MODEL) (default "gpt-4o")
-      --disable-cache                Disable caching of LLM API responses ($GPTSCRIPT_DISABLE_CACHE)
-      --dump-state string            Dump the internal execution state to a file ($GPTSCRIPT_DUMP_STATE)
-      --events-stream-to string      Stream events to this location, could be a file descriptor/handle (e.g. fd://2), filename, or named pipe (e.g. \\.\pipe\my-pipe) ($GPTSCRIPT_EVENTS_STREAM_TO)
-  -f, --input string                 Read input from a file ("-" for stdin) ($GPTSCRIPT_INPUT_FILE)
-      --no-trunc                     Do not truncate long log messages ($GPTSCRIPT_NO_TRUNC)
-      --openai-api-key string        OpenAI API KEY ($OPENAI_API_KEY)
-      --openai-base-url string       OpenAI base URL ($OPENAI_BASE_URL)
-      --openai-org-id string         OpenAI organization ID ($OPENAI_ORG_ID)
-  -o, --output string                Save output to a file, or - for stdout ($GPTSCRIPT_OUTPUT)
-  -q, --quiet                        No output logging (set --quiet=false to force on even when there is no TTY) ($GPTSCRIPT_QUIET)
-      --workspace string             Directory to use for the workspace, if specified it will not be deleted on exit ($GPTSCRIPT_WORKSPACE)
+      --cache-dir string              Directory to store cache (default: $XDG_CACHE_HOME/gptscript) ($GPTSCRIPT_CACHE_DIR)
+  -C, --chdir string                  Change current working directory ($GPTSCRIPT_CHDIR)
+      --color                         Use color in output (default true) ($GPTSCRIPT_COLOR)
+      --config string                 Path to GPTScript config file ($GPTSCRIPT_CONFIG)
+      --confirm                       Prompt before running potentially dangerous commands ($GPTSCRIPT_CONFIRM)
+      --credential-context string     Context name in which to store credentials ($GPTSCRIPT_CREDENTIAL_CONTEXT) (default "default")
+      --credential-override strings   Credentials to override (ex: --credential-override github.com/example/cred-tool:API_TOKEN=1234) ($GPTSCRIPT_CREDENTIAL_OVERRIDE)
+      --debug                         Enable debug logging ($GPTSCRIPT_DEBUG)
+      --debug-messages                Enable logging of chat completion calls ($GPTSCRIPT_DEBUG_MESSAGES)
+      --default-model string          Default LLM model to use ($GPTSCRIPT_DEFAULT_MODEL) (default "gpt-4o")
+      --disable-cache                 Disable caching of LLM API responses ($GPTSCRIPT_DISABLE_CACHE)
+      --dump-state string             Dump the internal execution state to a file ($GPTSCRIPT_DUMP_STATE)
+      --events-stream-to string       Stream events to this location, could be a file descriptor/handle (e.g. fd://2), filename, or named pipe (e.g. \\.\pipe\my-pipe) ($GPTSCRIPT_EVENTS_STREAM_TO)
+  -f, --input string                  Read input from a file ("-" for stdin) ($GPTSCRIPT_INPUT_FILE)
+      --no-trunc                      Do not truncate long log messages ($GPTSCRIPT_NO_TRUNC)
+      --openai-api-key string         OpenAI API KEY ($OPENAI_API_KEY)
+      --openai-base-url string        OpenAI base URL ($OPENAI_BASE_URL)
+      --openai-org-id string          OpenAI organization ID ($OPENAI_ORG_ID)
+  -o, --output string                 Save output to a file, or - for stdout ($GPTSCRIPT_OUTPUT)
+  -q, --quiet                         No output logging (set --quiet=false to force on even when there is no TTY) ($GPTSCRIPT_QUIET)
+      --workspace string              Directory to use for the workspace, if specified it will not be deleted on exit ($GPTSCRIPT_WORKSPACE)
 ```
 
 ### SEE ALSO

docs/docs/04-command-line-reference/gptscript_fmt.md

@@ -19,27 +19,27 @@ gptscript fmt [flags]
 ### Options inherited from parent commands
 
 ```
-      --cache-dir string             Directory to store cache (default: $XDG_CACHE_HOME/gptscript) ($GPTSCRIPT_CACHE_DIR)
-  -C, --chdir string                 Change current working directory ($GPTSCRIPT_CHDIR)
-      --color                        Use color in output (default true) ($GPTSCRIPT_COLOR)
-      --config string                Path to GPTScript config file ($GPTSCRIPT_CONFIG)
-      --confirm                      Prompt before running potentially dangerous commands ($GPTSCRIPT_CONFIRM)
-      --credential-context string    Context name in which to store credentials ($GPTSCRIPT_CREDENTIAL_CONTEXT) (default "default")
-      --credential-override string   Credentials to override (ex: --credential-override github.com/example/cred-tool:API_TOKEN=1234) ($GPTSCRIPT_CREDENTIAL_OVERRIDE)
-      --debug                        Enable debug logging ($GPTSCRIPT_DEBUG)
-      --debug-messages               Enable logging of chat completion calls ($GPTSCRIPT_DEBUG_MESSAGES)
-      --default-model string         Default LLM model to use ($GPTSCRIPT_DEFAULT_MODEL) (default "gpt-4o")
-      --disable-cache                Disable caching of LLM API responses ($GPTSCRIPT_DISABLE_CACHE)
-      --dump-state string            Dump the internal execution state to a file ($GPTSCRIPT_DUMP_STATE)
-      --events-stream-to string      Stream events to this location, could be a file descriptor/handle (e.g. fd://2), filename, or named pipe (e.g. \\.\pipe\my-pipe) ($GPTSCRIPT_EVENTS_STREAM_TO)
-  -f, --input string                 Read input from a file ("-" for stdin) ($GPTSCRIPT_INPUT_FILE)
-      --no-trunc                     Do not truncate long log messages ($GPTSCRIPT_NO_TRUNC)
-      --openai-api-key string        OpenAI API KEY ($OPENAI_API_KEY)
-      --openai-base-url string       OpenAI base URL ($OPENAI_BASE_URL)
-      --openai-org-id string         OpenAI organization ID ($OPENAI_ORG_ID)
-  -o, --output string                Save output to a file, or - for stdout ($GPTSCRIPT_OUTPUT)
-  -q, --quiet                        No output logging (set --quiet=false to force on even when there is no TTY) ($GPTSCRIPT_QUIET)
-      --workspace string             Directory to use for the workspace, if specified it will not be deleted on exit ($GPTSCRIPT_WORKSPACE)
+      --cache-dir string              Directory to store cache (default: $XDG_CACHE_HOME/gptscript) ($GPTSCRIPT_CACHE_DIR)
+  -C, --chdir string                  Change current working directory ($GPTSCRIPT_CHDIR)
+      --color                         Use color in output (default true) ($GPTSCRIPT_COLOR)
+      --config string                 Path to GPTScript config file ($GPTSCRIPT_CONFIG)
+      --confirm                       Prompt before running potentially dangerous commands ($GPTSCRIPT_CONFIRM)
+      --credential-context string     Context name in which to store credentials ($GPTSCRIPT_CREDENTIAL_CONTEXT) (default "default")
+      --credential-override strings   Credentials to override (ex: --credential-override github.com/example/cred-tool:API_TOKEN=1234) ($GPTSCRIPT_CREDENTIAL_OVERRIDE)
+      --debug                         Enable debug logging ($GPTSCRIPT_DEBUG)
+      --debug-messages                Enable logging of chat completion calls ($GPTSCRIPT_DEBUG_MESSAGES)
+      --default-model string          Default LLM model to use ($GPTSCRIPT_DEFAULT_MODEL) (default "gpt-4o")
+      --disable-cache                 Disable caching of LLM API responses ($GPTSCRIPT_DISABLE_CACHE)
+      --dump-state string             Dump the internal execution state to a file ($GPTSCRIPT_DUMP_STATE)
+      --events-stream-to string       Stream events to this location, could be a file descriptor/handle (e.g. fd://2), filename, or named pipe (e.g. \\.\pipe\my-pipe) ($GPTSCRIPT_EVENTS_STREAM_TO)
+  -f, --input string                  Read input from a file ("-" for stdin) ($GPTSCRIPT_INPUT_FILE)
+      --no-trunc                      Do not truncate long log messages ($GPTSCRIPT_NO_TRUNC)
+      --openai-api-key string         OpenAI API KEY ($OPENAI_API_KEY)
+      --openai-base-url string        OpenAI base URL ($OPENAI_BASE_URL)
+      --openai-org-id string          OpenAI organization ID ($OPENAI_ORG_ID)
+  -o, --output string                 Save output to a file, or - for stdout ($GPTSCRIPT_OUTPUT)
+  -q, --quiet                         No output logging (set --quiet=false to force on even when there is no TTY) ($GPTSCRIPT_QUIET)
+      --workspace string              Directory to use for the workspace, if specified it will not be deleted on exit ($GPTSCRIPT_WORKSPACE)
 ```
 
 ### SEE ALSO

docs/docs/04-command-line-reference/gptscript_parse.md

@@ -19,27 +19,27 @@ gptscript parse [flags]
 ### Options inherited from parent commands
 
 ```
-      --cache-dir string             Directory to store cache (default: $XDG_CACHE_HOME/gptscript) ($GPTSCRIPT_CACHE_DIR)
-  -C, --chdir string                 Change current working directory ($GPTSCRIPT_CHDIR)
-      --color                        Use color in output (default true) ($GPTSCRIPT_COLOR)
-      --config string                Path to GPTScript config file ($GPTSCRIPT_CONFIG)
-      --confirm                      Prompt before running potentially dangerous commands ($GPTSCRIPT_CONFIRM)
-      --credential-context string    Context name in which to store credentials ($GPTSCRIPT_CREDENTIAL_CONTEXT) (default "default")
-      --credential-override string   Credentials to override (ex: --credential-override github.com/example/cred-tool:API_TOKEN=1234) ($GPTSCRIPT_CREDENTIAL_OVERRIDE)
-      --debug                        Enable debug logging ($GPTSCRIPT_DEBUG)
-      --debug-messages               Enable logging of chat completion calls ($GPTSCRIPT_DEBUG_MESSAGES)
-      --default-model string         Default LLM model to use ($GPTSCRIPT_DEFAULT_MODEL) (default "gpt-4o")
-      --disable-cache                Disable caching of LLM API responses ($GPTSCRIPT_DISABLE_CACHE)
-      --dump-state string            Dump the internal execution state to a file ($GPTSCRIPT_DUMP_STATE)
-      --events-stream-to string      Stream events to this location, could be a file descriptor/handle (e.g. fd://2), filename, or named pipe (e.g. \\.\pipe\my-pipe) ($GPTSCRIPT_EVENTS_STREAM_TO)
-  -f, --input string                 Read input from a file ("-" for stdin) ($GPTSCRIPT_INPUT_FILE)
-      --no-trunc                     Do not truncate long log messages ($GPTSCRIPT_NO_TRUNC)
-      --openai-api-key string        OpenAI API KEY ($OPENAI_API_KEY)
-      --openai-base-url string       OpenAI base URL ($OPENAI_BASE_URL)
-      --openai-org-id string         OpenAI organization ID ($OPENAI_ORG_ID)
-  -o, --output string                Save output to a file, or - for stdout ($GPTSCRIPT_OUTPUT)
-  -q, --quiet                        No output logging (set --quiet=false to force on even when there is no TTY) ($GPTSCRIPT_QUIET)
-      --workspace string             Directory to use for the workspace, if specified it will not be deleted on exit ($GPTSCRIPT_WORKSPACE)
+      --cache-dir string              Directory to store cache (default: $XDG_CACHE_HOME/gptscript) ($GPTSCRIPT_CACHE_DIR)
+  -C, --chdir string                  Change current working directory ($GPTSCRIPT_CHDIR)
+      --color                         Use color in output (default true) ($GPTSCRIPT_COLOR)
+      --config string                 Path to GPTScript config file ($GPTSCRIPT_CONFIG)
+      --confirm                       Prompt before running potentially dangerous commands ($GPTSCRIPT_CONFIRM)
+      --credential-context string     Context name in which to store credentials ($GPTSCRIPT_CREDENTIAL_CONTEXT) (default "default")
+      --credential-override strings   Credentials to override (ex: --credential-override github.com/example/cred-tool:API_TOKEN=1234) ($GPTSCRIPT_CREDENTIAL_OVERRIDE)
+      --debug                         Enable debug logging ($GPTSCRIPT_DEBUG)
+      --debug-messages                Enable logging of chat completion calls ($GPTSCRIPT_DEBUG_MESSAGES)
+      --default-model string          Default LLM model to use ($GPTSCRIPT_DEFAULT_MODEL) (default "gpt-4o")
+      --disable-cache                 Disable caching of LLM API responses ($GPTSCRIPT_DISABLE_CACHE)
+      --dump-state string             Dump the internal execution state to a file ($GPTSCRIPT_DUMP_STATE)
+      --events-stream-to string       Stream events to this location, could be a file descriptor/handle (e.g. fd://2), filename, or named pipe (e.g. \\.\pipe\my-pipe) ($GPTSCRIPT_EVENTS_STREAM_TO)
+  -f, --input string                  Read input from a file ("-" for stdin) ($GPTSCRIPT_INPUT_FILE)
+      --no-trunc                      Do not truncate long log messages ($GPTSCRIPT_NO_TRUNC)
+      --openai-api-key string         OpenAI API KEY ($OPENAI_API_KEY)
+      --openai-base-url string        OpenAI base URL ($OPENAI_BASE_URL)
+      --openai-org-id string          OpenAI organization ID ($OPENAI_ORG_ID)
+  -o, --output string                 Save output to a file, or - for stdout ($GPTSCRIPT_OUTPUT)
+  -q, --quiet                         No output logging (set --quiet=false to force on even when there is no TTY) ($GPTSCRIPT_QUIET)
+      --workspace string              Directory to use for the workspace, if specified it will not be deleted on exit ($GPTSCRIPT_WORKSPACE)
 ```
 
 ### SEE ALSO