tweaks

Signed-off-by: Grant Linville <[email protected]>

Author: g-linville

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

@@ -51,7 +51,7 @@ credentials: credential-tool-1.gpt, credential-tool-2.gpt
 
 ## Credential Tool Arguments
 
-Your credential tool may define arguments. Here is an example:
+A credential tool may define arguments. Here is an example:
 
 ```yaml
 name: my-credential-tool
@@ -104,7 +104,7 @@ credentials: my-credential-tool.gpt as myAlias
 (tool stuff here)
 ```
 
-This will store the resulting credential with the name `myAlias`, rather than using the name of the tool (if it comes from GitHub).
+This will store the resulting credential with the name `myAlias`.
 This is useful when you want to reference the same credential tool in scripts that need to handle different credentials,
 or when you want to store credentials that were provided by a tool that is not on GitHub.
 

pkg/runner/runner.go

@@ -826,11 +826,12 @@ func (r *Runner) handleCredentials(callCtx engine.Context, monitor Monitor, env
 			exists bool
 		)
 
-		// Only try to look up the cred if the tool is on GitHub or has an alias
-		if isGitHubTool(toolName) {
-			cred, exists, err = store.Get(credToolName)
+		// Only try to look up the cred if the tool is on GitHub or has an alias.
+		// If it is a GitHub tool and has an alias, the alias overrides the tool name, so we use it as the credential name.
+		if isGitHubTool(toolName) && credentialAlias == "" {
+			cred, exists, err = store.Get(toolName)
 			if err != nil {
-				return nil, fmt.Errorf("failed to get credentials for tool %s: %w", credToolName, err)
+				return nil, fmt.Errorf("failed to get credentials for tool %s: %w", toolName, err)
 			}
 		} else if credentialAlias != "" {
 			cred, exists, err = store.Get(credentialAlias)
@@ -881,7 +882,7 @@ func (r *Runner) handleCredentials(callCtx engine.Context, monitor Monitor, env
 			if credentialAlias != "" {
 				cred.ToolName = credentialAlias
 			} else {
-				cred.ToolName = credToolName
+				cred.ToolName = toolName
 			}
 
 			isEmpty := true