revamp cred command and fix bug in cred storage

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

Author: g-linville

pkg/cli/credential.go

@@ -6,6 +6,7 @@ import (
 	"sort"
 	"strings"
 	"text/tabwriter"
+	"time"
 
 	cmd2 "github.com/acorn-io/cmd"
 	"github.com/gptscript-ai/gptscript/pkg/cache"
@@ -46,6 +47,7 @@ func (c *Credential) Run(_ *cobra.Command, _ []string) error {
 	}
 	opts.Cache = cache.Complete(opts.Cache)
 
+	// Initialize the credential store and get all the credentials.
 	store, err := credentials.NewStore(cfg, ctx, opts.Cache.CacheDir)
 	if err != nil {
 		return fmt.Errorf("failed to get credentials store: %w", err)
@@ -56,6 +58,10 @@ func (c *Credential) Run(_ *cobra.Command, _ []string) error {
 		return fmt.Errorf("failed to list credentials: %w", err)
 	}
 
+	w := tabwriter.NewWriter(os.Stdout, 10, 1, 3, ' ', 0)
+	defer w.Flush()
+
+	// Sort credentials and print column names, depending on the options.
 	if c.AllContexts {
 		// Sort credentials by context
 		sort.Slice(creds, func(i, j int) bool {
@@ -65,25 +71,10 @@ func (c *Credential) Run(_ *cobra.Command, _ []string) error {
 			return creds[i].Context < creds[j].Context
 		})
 
-		w := tabwriter.NewWriter(os.Stdout, 10, 1, 3, ' ', 0)
-		defer w.Flush()
-
 		if c.ShowEnvVars {
-			_, _ = w.Write([]byte("CONTEXT\tCREDENTIAL\tENVIRONMENT VARIABLES\n"))
-
-			for _, cred := range creds {
-				envVars := make([]string, 0, len(cred.Env))
-				for envVar := range cred.Env {
-					envVars = append(envVars, envVar)
-				}
-				sort.Strings(envVars)
-				_, _ = fmt.Fprintf(w, "%s\t%s\t%s\n", cred.Context, cred.ToolName, strings.Join(envVars, ", "))
-			}
+			_, _ = w.Write([]byte("CONTEXT\tCREDENTIAL\tEXPIRES IN\tENV\n"))
 		} else {
-			_, _ = w.Write([]byte("CONTEXT\tCREDENTIAL\n"))
-			for _, cred := range creds {
-				_, _ = fmt.Fprintf(w, "%s\t%s\n", cred.Context, cred.ToolName)
-			}
+			_, _ = w.Write([]byte("CONTEXT\tCREDENTIAL\tEXPIRES IN\n"))
 		}
 	} else {
 		// Sort credentials by tool name
@@ -92,24 +83,49 @@ func (c *Credential) Run(_ *cobra.Command, _ []string) error {
 		})
 
 		if c.ShowEnvVars {
-			w := tabwriter.NewWriter(os.Stdout, 10, 1, 3, ' ', 0)
-			defer w.Flush()
-			_, _ = w.Write([]byte("CREDENTIAL\tENVIRONMENT VARIABLES\n"))
-
-			for _, cred := range creds {
-				envVars := make([]string, 0, len(cred.Env))
-				for envVar := range cred.Env {
-					envVars = append(envVars, envVar)
-				}
-				sort.Strings(envVars)
-				_, _ = fmt.Fprintf(w, "%s\t%s\n", cred.ToolName, strings.Join(envVars, ", "))
+			_, _ = w.Write([]byte("CREDENTIAL\tEXPIRES IN\tENV\n"))
+		} else {
+			_, _ = w.Write([]byte("CREDENTIAL\tEXPIRES IN\n"))
+		}
+	}
+
+	for _, cred := range creds {
+		expires := "never"
+		if cred.ExpiresAt != nil {
+			if !cred.IsExpired() {
+				expires = cred.ExpiresAt.Sub(time.Now()).Truncate(time.Second).String()
+			} else {
+				expires = "expired"
 			}
+		}
+
+		var fields []any
+		if c.AllContexts {
+			fields = []any{cred.Context, cred.ToolName, expires}
 		} else {
-			for _, cred := range creds {
-				fmt.Println(cred.ToolName)
+			fields = []any{cred.ToolName, expires}
+		}
+
+		if c.ShowEnvVars {
+			envVars := make([]string, 0, len(cred.Env))
+			for envVar := range cred.Env {
+				envVars = append(envVars, envVar)
 			}
+			sort.Strings(envVars)
+			fields = append(fields, strings.Join(envVars, ", "))
 		}
+
+		printFields(w, fields)
 	}
 
 	return nil
 }
+
+func printFields(w *tabwriter.Writer, fields []any) {
+	if len(fields) == 0 {
+		return
+	}
+
+	fmtStr := strings.Repeat("%s\t", len(fields)-1) + "%s\n"
+	_, _ = fmt.Fprintf(w, fmtStr, fields...)
+}

pkg/runner/runner.go

@@ -915,6 +915,7 @@ func (r *Runner) handleCredentials(callCtx engine.Context, monitor Monitor, env
 				return nil, fmt.Errorf("failed to unmarshal credential tool %s response: %w", credToolName, err)
 			}
 			c.ToolName = credName
+			c.Type = credentials.CredentialTypeTool
 
 			isEmpty := true
 			for _, v := range c.Env {