chore: already cached performance improvements

Author: ibuildthecloud

pkg/engine/cmd.go

@@ -96,7 +96,7 @@ func (e *Engine) runCommand(ctx Context, tool types.Tool, input string, toolCate
 		instructions = append(instructions, inputContext.Content)
 	}
 	var extraEnv = []string{
-		strings.TrimSpace(fmt.Sprintf("GPTSCRIPT_CONTEXT=%s", strings.Join(instructions, "\n"))),
+		strings.TrimSpace("GPTSCRIPT_CONTEXT=" + strings.Join(instructions, "\n")),
 	}
 
 	cmd, stop, err := e.newCommand(ctx.Ctx, extraEnv, tool, input)

pkg/env/env.go

@@ -60,6 +60,10 @@ func AppendPath(env []string, binPath string) []string {
 // Lookup will try to find bin in the PATH in env. It will refer to PATHEXT for Windows support.
 // If bin can not be resolved to anything the original bin string is returned.
 func Lookup(env []string, bin string) string {
+	if strings.Contains(bin, string(filepath.Separator)) {
+		return bin
+	}
+
 	for _, env := range env {
 		for _, prefix := range []string{"PATH=", "Path="} {
 			suffix, ok := strings.CutPrefix(env, prefix)

pkg/gptscript/gptscript.go

@@ -75,6 +75,9 @@ func complete(opts ...Options) Options {
 	if result.CredentialContext == "" {
 		result.CredentialContext = "default"
 	}
+	if result.OpenAI.DefaultModel == "" {
+		result.OpenAI.DefaultModel = builtin.GetDefaultModel()
+	}
 
 	return result
 }

pkg/loader/url.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	url2 "net/url"
 	"path"
+	"regexp"
 	"strings"
 	"time"
 
@@ -33,6 +34,14 @@ type cacheValue struct {
 	Time   time.Time
 }
 
+func (c *cacheKey) isStatic() bool {
+	return c.Repo != nil &&
+		c.Repo.Revision != "" &&
+		stableRef.MatchString(c.Repo.Revision)
+}
+
+var stableRef = regexp.MustCompile("^([a-f0-9]{7,40}$|v[0-9]|[0-9])")
+
 func loadURL(ctx context.Context, cache *cache.Client, base *source, name string) (*source, bool, error) {
 	var (
 		repo        *types.Repo
@@ -47,9 +56,17 @@ func loadURL(ctx context.Context, cache *cache.Client, base *source, name string
 		cachedValue cacheValue
 	)
 
+	if cachedKey.Repo == nil {
+		if _, rev, ok := strings.Cut(name, "@"); ok && stableRef.MatchString(rev) {
+			cachedKey.Repo = &types.Repo{
+				Revision: rev,
+			}
+		}
+	}
+
 	if ok, err := cache.Get(ctx, cachedKey, &cachedValue); err != nil {
 		return nil, false, err
-	} else if ok && time.Since(cachedValue.Time) < CacheTimeout {
+	} else if ok && (cachedKey.isStatic() || time.Since(cachedValue.Time) < CacheTimeout) {
 		return cachedValue.Source, true, nil
 	}
 

pkg/openai/client.go

@@ -138,6 +138,10 @@ func (c *Client) ValidAuth() error {
 }
 
 func (c *Client) Supports(ctx context.Context, modelName string) (bool, error) {
+	if c.defaultModel != "" && c.defaultModel == modelName {
+		return true, nil
+	}
+
 	models, err := c.ListModels(ctx)
 	if err != nil {
 		return false, err