PR feedback

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

Author: g-linville

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

@@ -18,7 +18,7 @@ name: my-credential-tool
 
 #!/usr/bin/env bash
 
-output=$(gptscript -q --cache=false sys.prompt '{"message":"Please enter your fake credential.","fields":"credential"}')
+output=$(gptscript -q --cache=false sys.prompt '{"message":"Please enter your fake credential.","fields":"credential","sensitive":"true"}')
 credential=$(echo $output | jq -r '.credential')
 echo "{\"env\":{\"MY_ENV_VAR\":\"$credential\"}}"
 ```
@@ -76,11 +76,11 @@ context is basically a namespace for credentials. If you have multiple credentia
 switch between them by defining them in different credential contexts. The default context is called `default`, and this
 is used if none is specified.
 
-You can set the credential context to use with the `--credential-context` or `-c` flag when running GPTScript. For
+You can set the credential context to use with the `--credential-context` flag when running GPTScript. For
 example:
 
 ```bash
-gptscript -c my-azure-workspace my-azure-script.gpt
+gptscript --credential-context my-azure-workspace my-azure-script.gpt
 ```
 
 Any credentials fetched for that script will be stored in the `my-azure-workspace` context. If you were to call it again
@@ -89,11 +89,11 @@ with a different context, you would be able to give it a different set of creden
 ## Listing and Deleting Stored Credentials
 
 The `gptscript credential` command can be used to list and delete stored credentials. Running the command with no
-`--credential-context` (or `-c`) set will use the `default` credential context. You can also specify that it should list
-credentials in all contexts with `--all-contexts` or `-A`.
+`--credential-context` set will use the `default` credential context. You can also specify that it should list
+credentials in all contexts with `--all-contexts`.
 
 You can delete a credential by running the following command:
 
 ```bash
-gptscript credential delete -c <credential context> <credential tool name>
+gptscript credential delete --credential-context <credential context> <credential tool name>
 ```

pkg/cli/credential.go

@@ -6,26 +6,25 @@ import (
 	"sort"
 	"text/tabwriter"
 
-	"github.com/acorn-io/cmd"
+	cmd2 "github.com/acorn-io/cmd"
 	"github.com/gptscript-ai/gptscript/pkg/config"
 	"github.com/gptscript-ai/gptscript/pkg/credentials"
+	"github.com/gptscript-ai/gptscript/pkg/version"
 	"github.com/spf13/cobra"
 )
 
 type Credential struct {
 	root        *GPTScript
-	AllContexts bool `short:"A" usage:"List credentials for all contexts" local:"true"`
+	AllContexts bool `usage:"List credentials for all contexts" local:"true"`
 }
 
-func NewCredential(root *GPTScript) *cobra.Command {
-	c := cmd.Command(&Credential{root: root}, cobra.Command{
-		Use:     "credential",
-		Aliases: []string{"cred", "creds", "credentials"},
-		Short:   "List stored credentials",
-		Args:    cobra.NoArgs,
-	})
-	c.AddCommand(NewDelete(root))
-	return c
+func (c *Credential) Customize(cmd *cobra.Command) {
+	cmd.Use = "credential"
+	cmd.Version = version.Get().String()
+	cmd.Aliases = []string{"cred", "creds", "credentials"}
+	cmd.Short = "List stored credentials"
+	cmd.Args = cobra.NoArgs
+	cmd.AddCommand(cmd2.Command(&Delete{root: c.root}))
 }
 
 func (c *Credential) Run(_ *cobra.Command, _ []string) error {

pkg/cli/credential_delete.go

@@ -3,7 +3,6 @@ package cli
 import (
 	"fmt"
 
-	"github.com/acorn-io/cmd"
 	"github.com/gptscript-ai/gptscript/pkg/config"
 	"github.com/gptscript-ai/gptscript/pkg/credentials"
 	"github.com/spf13/cobra"
@@ -13,13 +12,11 @@ type Delete struct {
 	root *GPTScript
 }
 
-func NewDelete(root *GPTScript) *cobra.Command {
-	return cmd.Command(&Delete{root: root}, cobra.Command{
-		Use:          "delete <tool name>",
-		SilenceUsage: true,
-		Short:        "Delete a stored credential",
-		Args:         cobra.ExactArgs(1),
-	})
+func (c *Delete) Customize(cmd *cobra.Command) {
+	cmd.Use = "delete <tool name>"
+	cmd.SilenceUsage = true
+	cmd.Short = "Delete a stored credential"
+	cmd.Args = cobra.ExactArgs(1)
 }
 
 func (c *Delete) Run(_ *cobra.Command, args []string) error {

pkg/cli/gptscript.go

@@ -53,14 +53,14 @@ type GPTScript struct {
 	Chdir             string `usage:"Change current working directory" short:"C"`
 	Daemon            bool   `usage:"Run tool as a daemon" local:"true" hidden:"true"`
 	Ports             string `usage:"The port range to use for ephemeral daemon ports (ex: 11000-12000)" hidden:"true"`
-	CredentialContext string `usage:"Context name in which to store credentials" default:"default" short:"c"`
+	CredentialContext string `usage:"Context name in which to store credentials" default:"default"`
 }
 
 func New() *cobra.Command {
 	root := &GPTScript{}
 	return cmd.Command(root, &Eval{
 		gptscript: root,
-	}, NewCredential(root))
+	}, &Credential{root: root})
 }
 
 func (r *GPTScript) NewRunContext(cmd *cobra.Command) context.Context {

pkg/gptscript/gptscript.go

@@ -26,7 +26,7 @@ type Options struct {
 	OpenAI            openai.Options
 	Monitor           monitor.Options
 	Runner            runner.Options
-	CredentialContext string   `usage:"Context name in which to store credentials" default:"default" short:"c"`
+	CredentialContext string   `usage:"Context name in which to store credentials" default:"default"`
 	Quiet             *bool    `usage:"No output logging (set --quiet=false to force on even when there is no TTY)" short:"q"`
 	Env               []string `usage:"-"`
 }