fix(coderd/x/chatd): clarify computer-use tool gate

ibetitsmike · ibetitsmike · commit a122ca13ba4d · 2026-04-30T17:02:02.000Z
diff --git a/coderd/x/chatd/chatd.go b/coderd/x/chatd/chatd.go
@@ -6739,14 +6739,13 @@ func (p *Server) runChat(
 	providerTools, err = appendComputerUseProviderTool(
 		providerTools,
 		computerUseProviderToolOptions{
-			provider:          computerUseProvider,
-			isPlanModeTurn:    isPlanModeTurn,
-			isExploreSubagent: isExploreSubagent,
-			isComputerUse:     isComputerUse,
-			getWorkspaceConn:  workspaceCtx.getWorkspaceConn,
-			storeFile:         storeChatAttachment,
-			clock:             p.clock,
-			logger:            p.logger.Named("computer_use"),
+			provider:         computerUseProvider,
+			isPlanModeTurn:   isPlanModeTurn,
+			isComputerUse:    isComputerUse,
+			getWorkspaceConn: workspaceCtx.getWorkspaceConn,
+			storeFile:        storeChatAttachment,
+			clock:            p.clock,
+			logger:           p.logger.Named("computer_use"),
 		},
 	)
 	if err != nil {
diff --git a/coderd/x/chatd/chatd_internal_test.go b/coderd/x/chatd/chatd_internal_test.go
@@ -200,14 +200,14 @@ func TestAppendComputerUseProviderTool_Gates(t *testing.T) {
 	}}
 
 	tests := []struct {
-		name              string
-		isPlanModeTurn    bool
-		isExploreSubagent bool
-		isComputerUse     bool
+		name           string
+		isPlanModeTurn bool
+		isComputerUse  bool
 	}{
 		{name: "PlanMode", isPlanModeTurn: true, isComputerUse: true},
-		{name: "ExploreSubagent", isExploreSubagent: true, isComputerUse: true},
-		{name: "NotComputerUse"},
+		// Non-computer-use includes regular, master, general, and explore chats.
+		// Mode cannot be both ChatModeComputerUse and another chat mode.
+		{name: "NonComputerUseModes"},
 	}
 
 	for _, tt := range tests {
@@ -217,10 +217,9 @@ func TestAppendComputerUseProviderTool_Gates(t *testing.T) {
 			providerTools, err := appendComputerUseProviderTool(
 				baseTools,
 				computerUseProviderToolOptions{
-					provider:          chattool.ComputerUseProviderOpenAI,
-					isPlanModeTurn:    tt.isPlanModeTurn,
-					isExploreSubagent: tt.isExploreSubagent,
-					isComputerUse:     tt.isComputerUse,
+					provider:       chattool.ComputerUseProviderOpenAI,
+					isPlanModeTurn: tt.isPlanModeTurn,
+					isComputerUse:  tt.isComputerUse,
 				},
 			)
 			require.NoError(t, err)
diff --git a/coderd/x/chatd/computer_use.go b/coderd/x/chatd/computer_use.go
@@ -106,21 +106,24 @@ func (p *Server) resolveComputerUseModel(
 }
 
 type computerUseProviderToolOptions struct {
-	provider          string
-	isPlanModeTurn    bool
-	isExploreSubagent bool
-	isComputerUse     bool
-	getWorkspaceConn  func(context.Context) (workspacesdk.AgentConn, error)
-	storeFile         chattool.StoreFileFunc
-	clock             quartz.Clock
-	logger            slog.Logger
+	provider         string
+	isPlanModeTurn   bool
+	isComputerUse    bool
+	getWorkspaceConn func(context.Context) (workspacesdk.AgentConn, error)
+	storeFile        chattool.StoreFileFunc
+	clock            quartz.Clock
+	logger           slog.Logger
 }
 
 func appendComputerUseProviderTool(
 	providerTools []chatloop.ProviderTool,
 	opts computerUseProviderToolOptions,
 ) ([]chatloop.ProviderTool, error) {
-	if opts.isPlanModeTurn || opts.isExploreSubagent || !opts.isComputerUse {
+	// This helper is called for every chat turn. Only chats created by the
+	// computer_use subagent definition have ChatModeComputerUse, which filters
+	// out root, general, and explore chats. Plan mode is separate from Mode, so
+	// planning turns stay gated even for computer-use chats.
+	if opts.isPlanModeTurn || !opts.isComputerUse {
 		return providerTools, nil
 	}
 
