WIP

Signed-off-by: Grant Linville <grant@acorn.io>

Author: g-linville

pkg/config/cliconfig.go

@@ -15,13 +15,22 @@ import (
 	"github.com/docker/cli/cli/config/types"
 )
 
-var (
-	darwinHelpers  = []string{"osxkeychain", "file"}
-	windowsHelpers = []string{"wincred", "file"}
-	linuxHelpers   = []string{"secretservice", "pass", "file"}
+const (
+	Wincred       = "wincred"
+	Osxkeychain   = "osxkeychain"
+	Secretservice = "secretservice"
+	Pass          = "pass"
+	File          = "file"
+	Sqlite        = "sqlite"
+
+	GPTScriptHelperPrefix = "gptscript-credential-"
 )
 
-const GPTScriptHelperPrefix = "gptscript-credential-"
+var (
+	darwinHelpers  = []string{Osxkeychain, File, Sqlite}
+	windowsHelpers = []string{Wincred, File, Sqlite}
+	linuxHelpers   = []string{Secretservice, Pass, File, Sqlite}
+)
 
 type AuthConfig types.AuthConfig
 
@@ -169,11 +178,11 @@ func ReadCLIConfig(gptscriptConfigFile string) (*CLIConfig, error) {
 func (c *CLIConfig) setDefaultCredentialsStore() error {
 	switch runtime.GOOS {
 	case "darwin":
-		c.CredentialsStore = "osxkeychain"
+		c.CredentialsStore = Osxkeychain
 	case "windows":
-		c.CredentialsStore = "wincred"
+		c.CredentialsStore = Wincred
 	default:
-		c.CredentialsStore = "file"
+		c.CredentialsStore = File
 	}
 	return c.Save()
 }
@@ -187,7 +196,7 @@ func isValidCredentialHelper(helper string) bool {
 	case "linux":
 		return slices.Contains(linuxHelpers, helper)
 	default:
-		return helper == "file"
+		return helper == File || helper == Sqlite
 	}
 }
 

pkg/credentials/store.go

@@ -178,7 +178,7 @@ func (s *Store) getStore(ctx context.Context) (credentials.Store, error) {
 }
 
 func (s *Store) getStoreByHelper(ctx context.Context, helper string) (credentials.Store, error) {
-	if helper == "" || helper == config.GPTScriptHelperPrefix+"file" {
+	if helper == "" || helper == config.GPTScriptHelperPrefix+config.File {
 		return credentials.NewFileStore(s.cfg), nil
 	}
 

pkg/credentials/util.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/gptscript-ai/gptscript/pkg/config"
 	runtimeEnv "github.com/gptscript-ai/gptscript/pkg/env"
 )
 
@@ -13,7 +14,7 @@ type CredentialHelperDirs struct {
 
 func RepoNameForCredentialStore(store string) string {
 	switch store {
-	case "sqlite":
+	case config.Sqlite:
 		return "gptscript-credential-sqlite"
 	default:
 		return "gptscript-credential-helpers"

pkg/repos/get.go

@@ -109,11 +109,11 @@ func (m *Manager) deferredSetUpCredentialHelpers(ctx context.Context, cliCfg *co
 		distInfo, suffix string
 	)
 	// The file helper is built-in and does not need to be downloaded.
-	if helperName == "file" {
+	if helperName == config.File {
 		return nil
 	}
 	switch helperName {
-	case "wincred":
+	case config.Wincred:
 		suffix = ".exe"
 	default:
 		distInfo = fmt.Sprintf("-%s-%s", runtime.GOOS, runtime.GOARCH)

pkg/repos/runtimes/golang/golang.go

@@ -18,6 +18,7 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/gptscript-ai/gptscript/pkg/config"
 	"github.com/gptscript-ai/gptscript/pkg/debugcmd"
 	runtimeEnv "github.com/gptscript-ai/gptscript/pkg/env"
 	"github.com/gptscript-ai/gptscript/pkg/hash"
@@ -286,7 +287,7 @@ func (r *Runtime) Setup(ctx context.Context, _ types.Tool, dataRoot, toolSource
 }
 
 func (r *Runtime) DownloadCredentialHelper(ctx context.Context, tool types.Tool, helperName, distInfo, suffix string, binDir string) error {
-	if helperName == "file" {
+	if helperName == config.File {
 		return nil
 	}