feat: add system-tools-dir for system managed tools

Author: ibuildthecloud

pkg/cli/credential.go

@@ -48,7 +48,7 @@ func (c *Credential) Run(cmd *cobra.Command, _ []string) error {
 	}
 	opts = gptscript.Complete(opts)
 	if opts.Runner.RuntimeManager == nil {
-		opts.Runner.RuntimeManager = runtimes.Default(opts.Cache.CacheDir)
+		opts.Runner.RuntimeManager = runtimes.Default(opts.Cache.CacheDir, opts.SystemToolsDir)
 	}
 
 	ctxs := opts.CredentialContexts

pkg/cli/credential_delete.go

@@ -35,7 +35,7 @@ func (c *Delete) Run(cmd *cobra.Command, args []string) error {
 
 	opts = gptscript.Complete(opts)
 	if opts.Runner.RuntimeManager == nil {
-		opts.Runner.RuntimeManager = runtimes.Default(opts.Cache.CacheDir)
+		opts.Runner.RuntimeManager = runtimes.Default(opts.Cache.CacheDir, opts.SystemToolsDir)
 	}
 
 	if err = opts.Runner.RuntimeManager.SetUpCredentialHelpers(cmd.Context(), cfg); err != nil {

pkg/cli/credential_show.go

@@ -37,7 +37,7 @@ func (c *Show) Run(cmd *cobra.Command, args []string) error {
 
 	opts = gptscript.Complete(opts)
 	if opts.Runner.RuntimeManager == nil {
-		opts.Runner.RuntimeManager = runtimes.Default(opts.Cache.CacheDir)
+		opts.Runner.RuntimeManager = runtimes.Default(opts.Cache.CacheDir, opts.SystemToolsDir)
 	}
 
 	if err = opts.Runner.RuntimeManager.SetUpCredentialHelpers(cmd.Context(), cfg); err != nil {

pkg/cli/gptscript.go

@@ -47,6 +47,7 @@ type GPTScript struct {
 	CacheOptions
 	OpenAIOptions
 	DisplayOptions
+	SystemToolsDir string `usage:"Directory that contains system managed tool for which GPTScript will not manage the runtime"`
 	Color          *bool  `usage:"Use color in output (default true)" default:"true"`
 	Confirm        bool   `usage:"Prompt before running potentially dangerous commands"`
 	Debug          bool   `usage:"Enable debug logging"`
@@ -146,6 +147,7 @@ func (r *GPTScript) NewGPTScriptOpts() (gptscript.Options, error) {
 		Workspace:            r.Workspace,
 		DisablePromptServer:  r.UI,
 		DefaultModelProvider: r.DefaultModelProvider,
+		SystemToolsDir:       r.SystemToolsDir,
 	}
 
 	if r.Confirm {

pkg/gptscript/gptscript.go

@@ -52,6 +52,7 @@ type Options struct {
 	Quiet                *bool
 	Workspace            string
 	DisablePromptServer  bool
+	SystemToolsDir       string
 	Env                  []string
 }
 
@@ -63,6 +64,7 @@ func Complete(opts ...Options) Options {
 		result.Runner = runner.Complete(result.Runner, opt.Runner)
 		result.OpenAI = openai.Complete(result.OpenAI, opt.OpenAI)
 
+		result.SystemToolsDir = types.FirstSet(opt.SystemToolsDir, result.SystemToolsDir)
 		result.CredentialContexts = opt.CredentialContexts
 		result.Quiet = types.FirstSet(opt.Quiet, result.Quiet)
 		result.Workspace = types.FirstSet(opt.Workspace, result.Workspace)
@@ -99,7 +101,7 @@ func New(ctx context.Context, o ...Options) (*GPTScript, error) {
 	}
 
 	if opts.Runner.RuntimeManager == nil {
-		opts.Runner.RuntimeManager = runtimes.Default(cacheClient.CacheDir())
+		opts.Runner.RuntimeManager = runtimes.Default(cacheClient.CacheDir(), opts.SystemToolsDir)
 	}
 
 	if err := opts.Runner.RuntimeManager.SetUpCredentialHelpers(context.Background(), cliCfg); err != nil {

pkg/repos/get.go

@@ -8,6 +8,7 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"regexp"
 	"runtime"
 	"strings"
 	"sync"
@@ -58,7 +59,7 @@ type Manager struct {
 	storageDir       string
 	gitDir           string
 	runtimeDir       string
-	systemDir        string
+	systemDirs       []string
 	runtimes         []Runtime
 	credHelperConfig *credHelperConfig
 }
@@ -69,14 +70,22 @@ type credHelperConfig struct {
 	cliCfg      *config.CLIConfig
 }
 
-func New(cacheDir string, runtimes ...Runtime) *Manager {
-	root := filepath.Join(cacheDir, "repos")
+func New(cacheDir, systemDir string, runtimes ...Runtime) *Manager {
+	var (
+		systemDirs []string
+		root       = filepath.Join(cacheDir, "repos")
+	)
+
+	if strings.TrimSpace(systemDir) != "" {
+		systemDirs = regexp.MustCompile("[;:,]").Split(strings.TrimSpace(systemDir), -1)
+	}
+
 	return &Manager{
 		cacheDir:   cacheDir,
 		storageDir: root,
 		gitDir:     filepath.Join(root, "git"),
 		runtimeDir: filepath.Join(root, "runtimes"),
-		systemDir:  filepath.Join(root, "system"),
+		systemDirs: systemDirs,
 		runtimes:   runtimes,
 	}
 }
@@ -273,8 +282,10 @@ func (m *Manager) setup(ctx context.Context, runtime Runtime, tool types.Tool, e
 }
 
 func (m *Manager) GetContext(ctx context.Context, tool types.Tool, cmd, env []string) (string, []string, error) {
-	if strings.HasPrefix(tool.WorkingDir, m.systemDir) {
-		return tool.WorkingDir, env, nil
+	for _, systemDir := range m.systemDirs {
+		if strings.HasPrefix(tool.WorkingDir, systemDir) {
+			return tool.WorkingDir, env, nil
+		}
 	}
 
 	var isLocal bool

pkg/repos/runtimes/default.go

@@ -30,6 +30,6 @@ var Runtimes = []repos.Runtime{
 	},
 }
 
-func Default(cacheDir string) engine.RuntimeManager {
-	return repos.New(cacheDir, Runtimes...)
+func Default(cacheDir, systemDir string) engine.RuntimeManager {
+	return repos.New(cacheDir, systemDir, Runtimes...)
 }

pkg/sdkserver/server.go

@@ -111,7 +111,7 @@ func run(ctx context.Context, listener net.Listener, opts Options) error {
 		workspaceTool:    opts.WorkspaceTool,
 		client:           g,
 		events:           events,
-		runtimeManager:   runtimes.Default(opts.Options.Cache.CacheDir), // TODO - do we always want to use runtimes.Default here?
+		runtimeManager:   runtimes.Default(opts.Options.Cache.CacheDir, opts.SystemToolsDir),
 		waitingToConfirm: make(map[string]chan runner.AuthorizerResponse),
 		waitingToPrompt:  make(map[string]chan map[string]string),
 	}