@ai-workbench/remote-agent 0.9.0-toolbridge.2 → 0.9.0-toolbridge.3

package/README.md

@@ -1,14 +1,14 @@
-# AI Workbench 远程助手 · @ai-workbench/remote-agent@0.9.0-toolbridge.2 · 插件 → 添加插件
+# AI Workbench 远程助手 · @ai-workbench/remote-agent@0.9.0-toolbridge.3 · 插件 → 添加插件
 
 ## 含工具桥预发布线
 
-本包为 `0.9.0-toolbridge.2`，在独立 `toolbridge` 分支开发；稳定 main/0.8.x 和原总包保持原样。员工安装由连接组件提供的「AI 写作工作台（含工具桥）」总包，与不含工具桥的版本二选一。预发布渠道为 `toolbridge`，本轮仅提供本地固定包，不发布 npm。
+本包为 `0.9.0-toolbridge.3`，在独立 `toolbridge` 分支开发；稳定 main/0.8.x 和原总包保持原样。员工安装由连接组件提供的「AI 写作工作台（含工具桥）」总包，与不含工具桥的版本二选一。预发布渠道为 `toolbridge`，本轮仅提供本地固定包，不发布 npm。
 
 选择本机文件夹后，Claude 和 Codex 可以把 DSH 已启用的 MCP、web、skill、ask_user、todo/present/goal 等工具交给 DSH 原生执行和审批。内置文件/命令、子代理/agent-team、run_code 不在桥接表；原有文件和命令执行方式保留。plan 不自动放行桥接权限；default 下 Claude 的桥接原生权限由插件单次应答，员工只在 DSH 审批实际工具。主机文件夹不开放工具桥。
 
 工具表按每次主机连接生成快照，新增/移除在下一次连接生效；不承诺 Codex 当前 MCP 会话热刷新。审批期间的插话等当前主机 prompt 结束后再发，停泊中切换助手会停止原轮次并明确提示。工具主动结束DSH轮次时，已提交结果仍交回原agent；确认原生工具收到后结束原prompt，下一条沿原线程继续，不在已关闭步骤追加模型回复。取消和主机结束等待后的结果不重放；工具已执行的副作用不能因取消而撤销，请按说明核对。图片结果由官方附件组件读取后交回。
 
-Codex 需要 S 后续安装的独立受保护命令 `/usr/local/aw-host/bin/codex-acp-toolbridge`（aw.7），不会替换原 codex-acp/aw.6；Claude命令不变。指定桥接 server 的等待为 owner 确认的 **1800 秒**、审批交 DSH；不改其他 server 或全局策略，不新增设置项。N0.4.9、L0.7.37沿既有公开合同；真实界面/员工验收由编排安排。完整合同和证据见 `docs/contracts/codex-toolbridge.md`、`docs/evidence/2026-10-26-toolbridge/REPORT.md`。
+Codex 需要 S 后续安装的独立受保护命令 `/usr/local/aw-host/bin/codex-acp-toolbridge`（aw.8），不会替换原 codex-acp/aw.6；Claude命令不变。指定桥接 server 的等待为 owner 确认的 **1800 秒**、审批交 DSH；不改其他server的调用时限，不新增插件设置项。含桥的本机Codex会话按原生规则等各扩展现有启动时限结算后再捕获工具；启动失败会明确说明，文件和命令仍按原方式执行，本轮不自动重试。N0.4.9、L0.7.37沿既有公开合同；真实界面/员工验收由编排安排。完整合同和本轮启动修复证据见 `docs/contracts/codex-toolbridge.md`、`docs/evidence/2026-10-27-toolbridge-startup/REPORT.md`。
 
 通过官方 DSH 插件入口使用 Claude（远程主机）与 Codex（远程主机）。登录和工作区来源由“远程主机连接”组件提供；员工在原生工作区和模型菜单中选择文件夹与型号。
 

package/dist/acp.d.ts

@@ -96,6 +96,12 @@ export declare class AcpSession {
     private detail;
     private employeeNoticeNames;
     private employeeNoticeUnshown;
+    private employeeBridge;
+    private pendingBridgeStartupFailures;
+    private bridgeStartupFailed;
+    private bridgeStartupNoticeDelivered;
+    private confirmBridgeStartupFailure;
+    private flushBridgeStartupNotice;
     private employeeInfo;
     private need;
     constructor(transport: acp.Stream | acp.AgentApp | stable.AgentApp, hooks: AcpHooks);

package/dist/acp.js

@@ -226,6 +226,27 @@ export class AcpSession {
     }
     employeeNoticeNames = new Set();
     employeeNoticeUnshown = false;
+    employeeBridge = false;
+    pendingBridgeStartupFailures = new Set();
+    bridgeStartupFailed = false;
+    bridgeStartupNoticeDelivered = false;
+    confirmBridgeStartupFailure() {
+        if (!this.sessionId)
+            return;
+        const failed = this.pendingBridgeStartupFailures.has(this.sessionId);
+        this.pendingBridgeStartupFailures.clear();
+        if (failed && !this.bridgeStartupFailed) {
+            this.bridgeStartupFailed = true;
+            this.detail({ kind: 'extension', severity: 'warning', code: 'TOOLBRIDGE_STARTUP_FAILED', summary: '本轮DSH扩展工具桥启动失败；文件和命令继续使用原生路径，没有自动重试。', method: 'session/update', payload: { server: 'employee', status: 'failed', source: 'codex-acp/mcp-startup-report', nativeSessionId: this.sessionId } });
+        }
+        this.flushBridgeStartupNotice();
+    }
+    flushBridgeStartupNotice() {
+        if (!this.bridgeStartupFailed || this.bridgeStartupNoticeDelivered || !this.busy || this.closeRequested || this.turnSignal?.aborted || !this.hooks.onEmployeeNotice)
+            return;
+        this.hooks.onEmployeeNotice('本轮DSH里的扩展工具未能连接到Codex，暂时不可用。文件和命令仍按原方式执行；具体原因见技术详情。本轮不会自动重试。');
+        this.bridgeStartupNoticeDelivered = true;
+    }
     employeeInfo(value) {
         const bridge = record(record(value)?.mcpBridge);
         if (bridge)
@@ -263,6 +284,11 @@ export class AcpSession {
                 this.detail({ kind: 'session', severity: 'warning', code: 'ACP_FOREIGN_SESSION_UPDATE', summary: '收到不属于当前远端会话的通知，未作为正文处理', method: 'session/update', payload: notification });
                 return;
             }
+            const update = notification.update;
+            if (this.employeeBridge && !this.closeRequested && (update.sessionUpdate === 'tool_call' || update.sessionUpdate === 'tool_call_update') && update.status === 'failed' && update.title === 'mcp__employee__startup' && update.toolCallId.startsWith('mcp_startup.employee.') && update.toolCallId.length > 'mcp_startup.employee.'.length) {
+                this.pendingBridgeStartupFailures.add(notification.sessionId);
+                this.confirmBridgeStartupFailure();
+            }
             const meta = record(notification._meta);
             if (notification.update.sessionUpdate === 'current_mode_update') {
                 this.nativeModeId = notification.update.currentModeId;
@@ -482,12 +508,13 @@ export class AcpSession {
             throw new NeedError('SESSION_ALREADY_STARTED', '此连接已用于建立会话，不能转用工作区或身份', '新的独立远端连接');
         this.startAttempted = true;
         this.employeeMeta = context?.employeeExecution;
+        this.employeeBridge = !!this.employeeMeta && !!context?.toolBridgeServers;
         const abort = () => this.close({ layer: 'acp', initiator: 'acp.start-signal', reason: 'ABORTED', action: 'abort' }, new NeedError('ABORTED', '会话建立已取消', '重新连接主机'));
         signal?.throwIfAborted();
         signal?.addEventListener('abort', abort, { once: true });
         try {
             const hello = await this.stage('acp-initialize', () => this.connection.agent.request(acp.methods.agent.initialize, {
-                protocolVersion: acp.PROTOCOL_VERSION, clientInfo: { name: '@ai-workbench/remote-agent', version: '0.9.0-toolbridge.2' },
+                protocolVersion: acp.PROTOCOL_VERSION, clientInfo: { name: '@ai-workbench/remote-agent', version: '0.9.0-toolbridge.3' },
                 clientCapabilities: { fs: { readTextFile: false, writeTextFile: false }, terminal: false, session: { notices: {} }, ...(this.employeeMeta ? { _meta: { awEmployeeExecution: { version: 1, closeReason: 1, ...(context?.toolBridgeServers ? { mcpBridge: 1 } : {}) } } } : {}) },
             }, { cancellationSignal: signal }));
             if (hello.protocolVersion !== acp.PROTOCOL_VERSION)
@@ -555,6 +582,7 @@ export class AcpSession {
                 this.lifecycleConfiguration(result, configRevision);
                 this.method = acp.methods.agent.session.new;
             }
+            this.confirmBridgeStartupFailure();
             await this.hooks.sessionOwnership?.bind(this.sessionId, signal);
             this.ready = true;
             this.cwd = cwd;
@@ -606,6 +634,7 @@ export class AcpSession {
         };
         signal?.addEventListener('abort', cancel, { once: true });
         try {
+            this.flushBridgeStartupNotice();
             const result = await this.stage('acp-prompt', () => {
                 this.promptPermissions.set(params, { current, native });
                 const request = this.connection.agent.request(acp.methods.agent.session.prompt, params, { cancellationSignal: signal });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-workbench/remote-agent",
-  "version": "0.9.0-toolbridge.2",
+  "version": "0.9.0-toolbridge.3",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",