Merge pull request Stack-Cairn#329 from yyg-max/feat/tool-approval-gate

feat: add per-tool execution approval gate and streamline tool settings

Author: coder-hhx

Cargo.lock

@@ -150,7 +150,7 @@ BUF_BREAKING_AGAINST ?= ../../.git\#subdir=$(AGENT_GATEWAY_DIR)
 proto-check:
 	@command -v buf >/dev/null || (echo "buf is required. Run: mise install" && exit 1)
 	cd $(AGENT_GATEWAY_DIR) && buf lint
-	node scripts/check-buf-breaking.mjs "$(AGENT_GATEWAY_DIR)" "$(BUF_BREAKING_AGAINST)"
+	cd $(AGENT_GATEWAY_DIR) && buf breaking --against '$(BUF_BREAKING_AGAINST)'
 
 webui:
 	pnpm --dir $(AGENT_GATEWAY_WEB_DIR) install --offline

Makefile

@@ -11,13 +11,13 @@ lint:
   except:
     # 历史布局 proto/<版本>/ 早于 buf；迁目录会改 import 路径、破坏 Rust build.rs 与生成物，不翻新。
     - PACKAGE_DIRECTORY_MATCH
-  # 共享业务消息沿用已发布的枚举命名；只对该迁移文件保留最小豁免。
+  # gateway.proto 中已发布的枚举命名保持不变，仅保留必要的 lint 豁免。
   ignore_only:
     ENUM_VALUE_PREFIX:
       - proto/v2/gateway.proto
     ENUM_ZERO_VALUE_SUFFIX:
       - proto/v2/gateway.proto
 breaking:
   use:
-    # WIRE_JSON：兼守二进制与 JSON 线格式兼容（chat 事件与公开分享页仍走 JSON 载荷）。
+    # 同时保护 Protobuf 二进制线格式与 proto JSON 表示的兼容性。
     - WIRE_JSON

crates/agent-gateway/buf.yaml

@@ -65,7 +65,6 @@ func NormalizeRequestBody(body *handler.ChatRequestBody) error {
 	body.ExecutionMode = handler.NormalizeExecutionMode(body.ExecutionMode)
 	body.Workdir = handler.NormalizeWorkdir(body.Workdir)
 	body.QueuePolicy = normalizeQueuePolicy(body.QueuePolicy)
-	body.SelectedSystemTools = handler.NormalizeSelectedSystemTools(body.SelectedSystemTools)
 	body.UploadedFiles = handler.NormalizeChatUploadedFiles(body.UploadedFiles)
 	body.RuntimeControls = handler.NormalizeChatRuntimeControls(body.RuntimeControls)
 	selectedModel, err := handler.NormalizeChatSelectedModel(body.SelectedModel)
@@ -275,7 +274,6 @@ func buildUserMessageAppendedPayload(
 		"uploaded_files":        body.UploadedFiles,
 		"execution_mode":        body.ExecutionMode,
 		"workdir":               body.Workdir,
-		"selected_system_tools": body.SelectedSystemTools,
 		"runtime_controls":      body.RuntimeControls,
 		"selected_model":        body.SelectedModel,
 	}
@@ -326,7 +324,6 @@ func buildProtoRequest(body handler.ChatRequestBody) *gatewayv2.ChatRequest {
 		RuntimeControls:     handler.ToProtoChatRuntimeControls(body.RuntimeControls),
 		ExecutionMode:       body.ExecutionMode,
 		Workdir:             body.Workdir,
-		SelectedSystemTools: body.SelectedSystemTools,
 		UploadedFiles:       handler.ToProtoChatUploadedFiles(body.UploadedFiles),
 		QueuePolicy:         body.QueuePolicy,
 	}
@@ -359,7 +356,6 @@ func RequestBodyFromProto(req *gatewayv2.ChatRequest) handler.ChatRequestBody {
 		Message:             req.GetMessage(),
 		ExecutionMode:       req.GetExecutionMode(),
 		Workdir:             req.GetWorkdir(),
-		SelectedSystemTools: req.GetSelectedSystemTools(),
 		QueuePolicy:         req.GetQueuePolicy(),
 	}
 	if selected := req.GetSelectedModel(); selected != nil {

crates/agent-gateway/internal/chatcmd/chatcmd.go

@@ -35,7 +35,6 @@ type ChatRequestBody struct {
 	RuntimeControls     *ChatRuntimeControlsBody `json:"runtime_controls,omitempty"`
 	ExecutionMode       string                   `json:"execution_mode,omitempty"`
 	Workdir             string                   `json:"workdir,omitempty"`
-	SelectedSystemTools []string                 `json:"selected_system_tools,omitempty"`
 	UploadedFiles       []ChatUploadedFileBody   `json:"uploaded_files,omitempty"`
 	QueuePolicy         string                   `json:"queue_policy,omitempty"`
 }
@@ -73,10 +72,6 @@ func boolValue(input *bool, fallback bool) bool {
 	return *input
 }
 
-var validSystemToolIDs = map[string]struct{}{
-	"http_get_test": {},
-}
-
 func NormalizeChatSelectedModel(
 	input *ChatSelectedModelBody,
 ) (*ChatSelectedModelBody, error) {
@@ -148,28 +143,6 @@ func NormalizeWorkdir(value string) string {
 	return normalizeTrimmedText(value)
 }
 
-func NormalizeSelectedSystemTools(input []string) []string {
-	out := make([]string, 0, len(input))
-	seen := make(map[string]struct{}, len(input))
-
-	for _, item := range input {
-		value := normalizeTrimmedText(item)
-		if value == "" {
-			continue
-		}
-		if _, ok := validSystemToolIDs[value]; !ok {
-			continue
-		}
-		if _, ok := seen[value]; ok {
-			continue
-		}
-		seen[value] = struct{}{}
-		out = append(out, value)
-	}
-
-	return out
-}
-
 func NormalizeChatUploadedFiles(input []ChatUploadedFileBody) []ChatUploadedFileBody {
 	out := make([]ChatUploadedFileBody, 0, len(input))
 	seen := make(map[string]struct{}, len(input))

crates/agent-gateway/internal/handler/types.go

@@ -23,22 +23,6 @@ func TestNormalizeExecutionMode(t *testing.T) {
 	}
 }
 
-func TestNormalizeSelectedSystemTools(t *testing.T) {
-	t.Parallel()
-
-	got := NormalizeSelectedSystemTools([]string{
-		" http_get_test ",
-		"http_get_test",
-		"",
-		"unknown_tool",
-	})
-	want := []string{"http_get_test"}
-
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("NormalizeSelectedSystemTools() = %#v, want %#v", got, want)
-	}
-}
-
 func TestNormalizeChatSelectedModelAcceptsGemini(t *testing.T) {
 	t.Parallel()
 

crates/agent-gateway/internal/handler/types_test.go

@@ -609,7 +609,8 @@ message ChatRequest {
   ChatSelectedModel selected_model = 3;
   string execution_mode = 4;
   string workdir = 5;
-  repeated string selected_system_tools = 6;
+  reserved 6;
+  reserved "selected_system_tools";
   repeated ChatUploadedFile uploaded_files = 7;
   string client_request_id = 8;
   ChatRuntimeControls runtime_controls = 9;

crates/agent-gateway/internal/proto/v2/gateway.pb.go

@@ -1265,7 +1265,6 @@ test("GatewayWebSocketClient chatCommand sends the command frame and parses the
     systemSettings: {
       executionMode: "agent",
       workdir: "/workspace/project",
-      selectedSystemTools: ["Bash"],
     },
   });
   const socket = await connectAndAuth(codec);
@@ -1277,7 +1276,6 @@ test("GatewayWebSocketClient chatCommand sends the command frame and parses the
   assert.equal(command.json.chat_command.request.client_request_id, "req-1");
   assert.equal(command.json.chat_command.request.queue_policy, "append");
   assert.equal(command.json.chat_command.request.workdir, "/workspace/project");
-  assert.deepEqual(command.json.chat_command.request.selected_system_tools, ["Bash"]);
 
   socket.receiveBinary(
     codec.encodeServerFrame({

crates/agent-gateway/proto/v2/gateway.proto

@@ -615,7 +615,6 @@ test("gateway settings sync keeps remote connection local and syncs web terminal
     system: {
       executionMode: "tools",
       workdir: "/remote-workdir",
-      selectedSystemTools: ["http_get_test"],
     },
     chatRuntimeControls: {
       thinkingEnabled: false,
@@ -633,7 +632,6 @@ test("gateway settings sync keeps remote connection local and syncs web terminal
 
   assert.equal(synced.system.executionMode, "tools");
   assert.equal(synced.system.workdir, "/remote-workdir");
-  assert.deepEqual(synced.system.selectedSystemTools, ["http_get_test"]);
   assert.equal(synced.chatRuntimeControls.thinkingEnabled, false);
   assert.equal(synced.chatRuntimeControls.nativeWebSearchEnabled, false);
   assert.equal(synced.chatRuntimeControls.reasoning, "minimal");