fix(gateway): 完成 Gateway 启动接线与 Runtime 工具分流

- MultiWorkspaceRuntime 新增 InjectRunnerDispatcher，同时注入已有
  和未来创建的 workspace bundle
- gateway_commands 中创建 RunnerRegistry/RunnerToolManager 并传入
  NetworkServerOptions 和 runtime dispatcher
- network_server 在 WS 断连时自动清理 runner 注册记录
- runtime 新增 RunnerToolDispatcher 接口及设值方法，在工具执行前
  优先尝试 runner 分发，handled=false 时回退本地执行
- 新增 runner_tool_bridge 适配 RunnerToolManager 到 runtime 接口

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: Cai-Tang-www

internal/cli/gateway_commands.go

@@ -19,6 +19,7 @@ import (
 	"neo-code/internal/config"
 	"neo-code/internal/gateway"
 	gatewayauth "neo-code/internal/gateway/auth"
+	agentruntime "neo-code/internal/runtime"
 	"neo-code/internal/webassets"
 )
 
@@ -238,6 +239,15 @@ func startGatewayServer(ctx context.Context, options gatewayCommandOptions, stat
 		Metrics: metrics,
 	})
 
+	runnerRegistry := gateway.NewRunnerRegistry(logger)
+	runnerToolManager := gateway.NewRunnerToolManager(
+		runnerRegistry,
+		relay,
+		nil, // capability signer: nil allows execution without token for MVP
+		30*time.Second,
+		logger,
+	)
+
 	runtimePort, closeRuntimePort, err := buildGatewayRuntimePort(signalContext, options.Workdir)
 	if err != nil {
 		return fmt.Errorf("initialize gateway runtime: %w", err)
@@ -248,6 +258,9 @@ func startGatewayServer(ctx context.Context, options gatewayCommandOptions, stat
 		}
 	}()
 
+	// 注入 Runner 工具分发器到 runtime，使 ReAct 循环中的工具调用可以通过 runner 执行
+	injectRunnerDispatcherIntoRuntime(runtimePort, runnerToolManager)
+
 	idleCloser := newGatewayIdleShutdownController(logger, cancelRuntime)
 	defer idleCloser.close()
 
@@ -294,6 +307,8 @@ func startGatewayServer(ctx context.Context, options gatewayCommandOptions, stat
 		AllowedOrigins:       gatewayConfig.Security.AllowOrigins,
 		StaticFileDir:        staticFileDir,
 		StaticFileFS:         staticFileFS,
+		RunnerRegistry:       runnerRegistry,
+		RunnerToolManager:    runnerToolManager,
 		ConnectionCountChanged: func(active int) {
 			idleCloser.observe(active)
 		},
@@ -479,6 +494,33 @@ func defaultNewGatewayNetworkServer(options gateway.NetworkServerOptions) (gatew
 	return gateway.NewNetworkServer(options)
 }
 
+// injectRunnerDispatcherIntoRuntime 将 RunnerToolManager 注入到多工作区 runtime 的所有 bundle 中，
+// 使 ReAct 循环中的工具调用可以通过 runner 远程执行。
+func injectRunnerDispatcherIntoRuntime(runtimePort gateway.RuntimePort, runnerToolManager *gateway.RunnerToolManager) {
+	if runtimePort == nil || runnerToolManager == nil {
+		return
+	}
+
+	mw, ok := runtimePort.(*gateway.MultiWorkspaceRuntime)
+	if !ok {
+		return
+	}
+
+	dispatcher := gateway.NewRunnerToolDispatcher(runnerToolManager)
+
+	mw.InjectRunnerDispatcher(func(port gateway.RuntimePort) {
+		bridge, ok := port.(*gatewayRuntimePortBridge)
+		if !ok {
+			return
+		}
+		svc, ok := bridge.runtime.(*agentruntime.Service)
+		if !ok {
+			return
+		}
+		svc.SetRunnerToolDispatcher(dispatcher)
+	})
+}
+
 // encodeJSONLine 将对象编码为单行 JSON，并写入目标输出流。
 func encodeJSONLine(writer io.Writer, payload any) error {
 	encoder := json.NewEncoder(writer)

internal/gateway/multi_workspace_runtime.go

@@ -21,6 +21,8 @@ type MultiWorkspaceRuntime struct {
 	defaultHash string
 	managementPort ManagementRuntimePort
 
+	runnerDispatcherInjector func(RuntimePort)
+
 	events    chan RuntimeEvent
 	eventSubs map[string]chan<- RuntimeEvent
 	eventMu   sync.Mutex
@@ -94,6 +96,10 @@ func (m *MultiWorkspaceRuntime) getPortForHash(hash string) (RuntimePort, error)
 		return nil, fmt.Errorf("build workspace runtime for %s: %w", hash, err)
 	}
 
+	if m.runnerDispatcherInjector != nil {
+		m.runnerDispatcherInjector(port)
+	}
+
 	b = &workspaceBundle{port: port, cleanup: cleanup}
 	m.bundles[hash] = b
 	m.startEventForwarder(hash, port)
@@ -135,6 +141,19 @@ func (m *MultiWorkspaceRuntime) startEventForwarder(hash string, port RuntimePor
 	}()
 }
 
+// InjectRunnerDispatcher 设置 runner tool dispatcher 注入回调。
+// fn 对每个已加载或未来创建的 RuntimePort 调用一次。
+func (m *MultiWorkspaceRuntime) InjectRunnerDispatcher(fn func(RuntimePort)) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	m.runnerDispatcherInjector = fn
+
+	for _, b := range m.bundles {
+		fn(b.port)
+	}
+}
+
 // Close 优雅关闭所有已加载的工作区 runtime。
 func (m *MultiWorkspaceRuntime) Close() error {
 	close(m.stopCh)

internal/gateway/network_server.go

@@ -621,6 +621,9 @@ func (s *NetworkServer) handleWebSocket(conn *websocket.Conn, runtimePort Runtim
 
 	defer func() {
 		s.unregisterWSConnection(conn)
+		if s.runnerRegistry != nil {
+			s.runnerRegistry.OnConnectionDropped(connectionID)
+		}
 		relay.dropConnection(connectionID)
 		_ = conn.Close()
 	}()

internal/gateway/runner_tool_bridge.go

@@ -0,0 +1,46 @@
+package gateway
+
+import (
+	"context"
+	"encoding/json"
+	"strings"
+
+	agentruntime "neo-code/internal/runtime"
+	"neo-code/internal/tools"
+)
+
+// runnerToolDispatcherBridge 适配 RunnerToolManager 为 runtime.RunnerToolDispatcher。
+type runnerToolDispatcherBridge struct {
+	manager *RunnerToolManager
+}
+
+// NewRunnerToolDispatcher 创建 runtime.RunnerToolDispatcher 的 gateway 端适配器。
+func NewRunnerToolDispatcher(manager *RunnerToolManager) agentruntime.RunnerToolDispatcher {
+	if manager == nil {
+		return nil
+	}
+	return &runnerToolDispatcherBridge{manager: manager}
+}
+
+func (b *runnerToolDispatcherBridge) TryDispatch(
+	ctx context.Context,
+	sessionID string,
+	runID string,
+	input tools.ToolCallInput,
+) (tools.ToolResult, bool, error) {
+	content, isError, err := b.manager.DispatchToolRequest(
+		ctx,
+		strings.TrimSpace(sessionID),
+		strings.TrimSpace(runID),
+		strings.TrimSpace(input.ID),
+		strings.TrimSpace(input.Name),
+		json.RawMessage(input.Arguments),
+	)
+	if err != nil {
+		if strings.Contains(err.Error(), "runner not online") {
+			return tools.ToolResult{}, false, nil
+		}
+		return tools.ToolResult{Content: err.Error(), IsError: true}, true, nil
+	}
+	return tools.ToolResult{Content: content, IsError: isError}, true, nil
+}

internal/runtime/permission.go

@@ -107,8 +107,16 @@ func (s *Service) executeToolCallWithPermission(ctx context.Context, input permi
 
 	effectiveTimeout := resolveToolExecutionTimeout(input.Call, input.ToolTimeout)
 	runCtx, cancel := context.WithTimeout(ctx, effectiveTimeout)
+	defer cancel()
+
+	if s.runnerToolDispatcher != nil {
+		result, handled, dispatchErr := s.runnerToolDispatcher.TryDispatch(runCtx, input.SessionID, input.RunID, callInput)
+		if handled {
+			return result, dispatchErr
+		}
+	}
+
 	result, execErr := s.toolManager.Execute(runCtx, callInput)
-	cancel()
 	if execErr == nil {
 		return result, nil
 	}

internal/runtime/runtime.go

@@ -184,6 +184,19 @@ type Service struct {
 	permissionAskLocks map[string]*permissionAskLockEntry
 
 	thinkingEnabled bool
+
+	runnerToolDispatcher RunnerToolDispatcher
+}
+
+// RunnerToolDispatcher 可选：将工具执行分发到远程 runner。
+// 返回 (result, handled, error)。handled=false 表示继续走本地执行。
+type RunnerToolDispatcher interface {
+	TryDispatch(ctx context.Context, sessionID, runID string, input tools.ToolCallInput) (tools.ToolResult, bool, error)
+}
+
+// SetRunnerToolDispatcher 设置远程工具分发器。
+func (s *Service) SetRunnerToolDispatcher(d RunnerToolDispatcher) {
+	s.runnerToolDispatcher = d
 }
 
 // sessionLockEntry 维护单个会话读写锁及其当前引用计数，用于在无引用时回收 map 项。