fix: ensure system env compilation case sensitive (#1033)

Author: ryan-timothy-albert

.changeset/empty-birds-work.md

@@ -0,0 +1,5 @@
+---
+"server": patch
+---
+
+fix: ensure system env compilation is case sensitive

server/internal/chat/client.go

@@ -29,8 +29,8 @@ import (
 	"github.com/speakeasy-api/gram/server/internal/guardian"
 	"github.com/speakeasy-api/gram/server/internal/mv"
 	"github.com/speakeasy-api/gram/server/internal/o11y"
-	"github.com/speakeasy-api/gram/server/internal/thirdparty/openrouter"
 	tm "github.com/speakeasy-api/gram/server/internal/telemetry"
+	"github.com/speakeasy-api/gram/server/internal/thirdparty/openrouter"
 	"github.com/speakeasy-api/gram/server/internal/toolsets"
 )
 
@@ -281,7 +281,7 @@ func (c *ChatClient) LoadToolsetTools(
 			}
 
 			err = c.toolProxy.Do(ctx, rw, bytes.NewBufferString(rawArgs), gateway.ToolCallEnv{
-				SystemEnv:  gateway.CIEnvFrom(systemConfig),
+				SystemEnv:  systemConfig,
 				UserConfig: ciEnv,
 			}, plan, tm.NewNoopToolCallLogger())
 			if err != nil {

server/internal/environments/shared.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
-	"maps"
 	"strings"
 
 	"github.com/google/uuid"
@@ -119,7 +118,7 @@ func (e *EnvironmentEntries) LoadToolsetEnv(ctx context.Context, projectID uuid.
 // LoadSystemEnv loads and merges source and toolset environments.
 // Merges in order: source env (base) -> toolset env (override).
 // Returns empty map if neither environment exists.
-func (e *EnvironmentEntries) LoadSystemEnv(ctx context.Context, projectID uuid.UUID, toolsetID uuid.UUID, sourceKind string, sourceSlug string) (map[string]string, error) {
+func (e *EnvironmentEntries) LoadSystemEnv(ctx context.Context, projectID uuid.UUID, toolsetID uuid.UUID, sourceKind string, sourceSlug string) (*gateway.CaseInsensitiveEnv, error) {
 	// Load source environment (tool-specific)
 	sourceEnv, err := e.LoadSourceEnv(ctx, projectID, sourceKind, sourceSlug)
 	if err != nil {
@@ -133,9 +132,13 @@ func (e *EnvironmentEntries) LoadSystemEnv(ctx context.Context, projectID uuid.U
 	}
 
 	// Merge: source env (base) + toolset env (override)
-	systemEnv := make(map[string]string)
-	maps.Copy(systemEnv, sourceEnv)
-	maps.Copy(systemEnv, toolsetEnv)
+	systemEnv := gateway.NewCaseInsensitiveEnv()
+	for k, v := range sourceEnv {
+		systemEnv.Set(k, v)
+	}
+	for k, v := range toolsetEnv {
+		systemEnv.Set(k, v)
+	}
 
 	return systemEnv, nil
 }

server/internal/gateway/env.go

@@ -22,7 +22,7 @@ type EnvironmentLoader interface {
 	//
 	// # Errors
 	//   * `error`: when an unrecognized error occurs.
-	LoadSystemEnv(ctx context.Context, projectID uuid.UUID, toolsetID uuid.UUID, sourceKind string, sourceSlug string) (map[string]string, error)
+	LoadSystemEnv(ctx context.Context, projectID uuid.UUID, toolsetID uuid.UUID, sourceKind string, sourceSlug string) (*CaseInsensitiveEnv, error)
 }
 
 type SlugOrID struct {

server/internal/instances/impl.go

@@ -339,7 +339,7 @@ func (s *Service) ExecuteInstanceTool(w http.ResponseWriter, r *http.Request) er
 	interceptor := newResponseInterceptor(w)
 
 	err = s.toolProxy.Do(ctx, interceptor, requestBody, gateway.ToolCallEnv{
-		SystemEnv:  gateway.CIEnvFrom(systemConfig),
+		SystemEnv:  systemConfig,
 		UserConfig: ciEnv,
 	}, plan, toolCallLogger)
 	if err != nil {

server/internal/mcp/rpc_resources_read.go

@@ -170,7 +170,7 @@ func handleResourcesRead(ctx context.Context, logger *slog.Logger, db *pgxpool.P
 
 	err = toolProxy.ReadResource(ctx, rw, strings.NewReader("{}"), gateway.ToolCallEnv{
 		UserConfig: userConfig,
-		SystemEnv:  gateway.CIEnvFrom(systemConfig),
+		SystemEnv:  systemConfig,
 	}, plan, toolCallLogger)
 	if err != nil {
 		return nil, oops.E(oops.CodeUnexpected, err, "failed to execute resource call").Log(ctx, logger)

server/internal/mcp/rpc_tools_call.go

@@ -219,7 +219,7 @@ func handleToolsCall(
 	}()
 
 	err = toolProxy.Do(ctx, rw, bytes.NewBuffer(params.Arguments), gateway.ToolCallEnv{
-		UserConfig: userConfig, SystemEnv: gateway.CIEnvFrom(systemConfig)}, plan, toolCallLogger)
+		UserConfig: userConfig, SystemEnv: systemConfig}, plan, toolCallLogger)
 	if err != nil {
 		return nil, oops.E(oops.CodeUnexpected, err, "failed execute tool call").Log(ctx, logger)
 	}