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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (53) hide show
  1. package/README.md +32 -7
  2. package/dist/acp.d.ts +23 -3
  3. package/dist/acp.js +106 -21
  4. package/dist/broker-runtime.d.ts +2 -0
  5. package/dist/broker-runtime.js +60 -3
  6. package/dist/broker.d.ts +56 -1
  7. package/dist/broker.js +310 -11
  8. package/dist/claude-local.js +26 -5
  9. package/dist/client.js +1 -1
  10. package/dist/close-diagnostics.d.ts +1 -1
  11. package/dist/close-diagnostics.js +1 -1
  12. package/dist/cold-protocol.d.ts +17 -0
  13. package/dist/cold-protocol.js +399 -0
  14. package/dist/cold-recovery.d.ts +62 -0
  15. package/dist/cold-recovery.js +595 -0
  16. package/dist/cold-store.d.ts +99 -0
  17. package/dist/cold-store.js +29 -0
  18. package/dist/conversation-details.js +21 -8
  19. package/dist/employee-endpoint.js +15 -1
  20. package/dist/employee-mcp.js +1 -1
  21. package/dist/employee-native.js +7 -1
  22. package/dist/employee-provider.js +46 -11
  23. package/dist/employee-relay.js +148 -1
  24. package/dist/employee-shell.d.ts +2 -0
  25. package/dist/employee-shell.js +22 -19
  26. package/dist/employee-tools.js +2 -2
  27. package/dist/employee-workspace.d.ts +20 -4
  28. package/dist/employee-workspace.js +26 -5
  29. package/dist/index.d.ts +12 -3
  30. package/dist/index.js +221 -51
  31. package/dist/input.js +4 -1
  32. package/dist/live-steering.d.ts +46 -0
  33. package/dist/live-steering.js +45 -0
  34. package/dist/mapping.d.ts +4 -24
  35. package/dist/mapping.js +11 -65
  36. package/dist/model-catalog.d.ts +2 -0
  37. package/dist/model-catalog.js +5 -1
  38. package/dist/preflight-diagnostic.js +1 -1
  39. package/dist/presentation.js +1 -0
  40. package/dist/provider.d.ts +15 -0
  41. package/dist/provider.js +3 -2
  42. package/dist/rpc-namespace.js +16 -2
  43. package/dist/session-source.d.ts +3 -1
  44. package/dist/session-source.js +2 -1
  45. package/dist/startup-timing.d.ts +14 -0
  46. package/dist/startup-timing.js +34 -0
  47. package/dist/toolbridge-loop.d.ts +3 -2
  48. package/dist/toolbridge-loop.js +4 -2
  49. package/dist/toolbridge-table.d.ts +4 -3
  50. package/dist/toolbridge-table.js +14 -5
  51. package/dist/toolbridge.d.ts +1 -1
  52. package/dist/toolbridge.js +4 -4
  53. package/package.json +23 -16
package/README.md CHANGED
@@ -1,10 +1,29 @@
1
- # AI Workbench 远程助手 · @ai-workbench/remote-agent@0.9.0-toolbridge.3 · 插件 → 添加插件
1
+ # AI Workbench 远程助手 · @ai-workbench/remote-agent@0.9.0-toolbridge.30 · 插件 → 添加插件
2
+
3
+ ## 办公依赖与开工计时(O1,2026-11-15)
4
+
5
+ 员工目录模式现在桥接 DSH `load_workspace_dependencies`,由 DSH 原生循环执行、审批并返回员工电脑的 Python/Node 绝对路径;命令仍通过员工执行器执行这些路径。主机目录模式不开放工具桥,不能使用员工运行时路径。Codex 新建线程在主机明确声明能力时,先按本轮所选模型建立原生基础说明,再保留每轮模型、推理与权限的真实设置回执;没有裁剪 DSH、安全或原生说明,恢复与真实换模型维持原语义。需主机含桥适配器 `2.2.2-aw.13`;旧主机照旧运行。
6
+
7
+ 技术详情的 `STARTUP_TIMING` 只记录单调时钟与固定阶段,含目录快照、登录、端点、静态执行器元数据、broker、工具桥、ACP 初始化/建会话、模型/权限确认、实际 SDK 派发,以及支持持久消息协议时的 `prompt-delivery`(绑定和输入确认)。`startup` 到实际 SDK 写出,不能直接称为 DSH 提交到主机 task_started;跨机差额需同轮事件另算。静态执行器路径与本轮端点准备并行;每轮目录/登录/端点核验及事件撤销、主机目标绑定保持。
8
+
9
+ 新增设置、限制、错误码均为 0。已有会话的历史说明不会被改写;避免初始模型切换冗余的效果从新会话开始。
2
10
 
3
11
  ## 含工具桥预发布线
4
12
 
5
- 本包为 `0.9.0-toolbridge.3`,在独立 `toolbridge` 分支开发;稳定 main/0.8.x 和原总包保持原样。员工安装由连接组件提供的「AI 写作工作台(含工具桥)」总包,与不含工具桥的版本二选一。预发布渠道为 `toolbridge`,本轮仅提供本地固定包,不发布 npm。
13
+ 本包为 `0.9.0-toolbridge.27`,从 `v0.9.0-toolbridge.14` 派生,使用 `host-toolbridge` 发布渠道。员工安装由连接组件提供的「AI 写作工作台(含工具桥)」总包 `@ai-workbench/workbench-toolbridge@0.1.27`,与不含工具桥的版本二选一。
14
+
15
+ 本轮增加两家运行中插话(DSH 原生 nextStep),保留官方队列和原话;明确 followup 仍排下一轮。Codex 含桥组件需 `2.2.2-aw.12`,Claude 仍为官方 `0.94.0`。插件确定消息未发出时保留排队资格;送达未确认时明确报错且不重放。已注入旧正文不能撤回,编辑版下一步骤交付。
16
+
17
+ host `0.8.11` 的新 broker 支持同一客户端/SDK 在切网后按输出游标和输入 ACK 水位接回原 prompt、结果及用量,不重新发送原 prompt;旧本机执行端失效仍为 UNKNOWN,不用新进程替换或重放旧操作。客户端完全退出、崩溃后,重新打开同一 DSH 会话会自动接回已持久登记的原 prompt,显示未落盘输出并取回原结果、增量用量。原 prompt 只执行一次;旧审批仅取消,不复活未知本机执行。旧运行 broker 和 X.14 在途轮不会被安装自动补造冷恢复记录。无新增设置;512,000,000 字节默认保留,实际协议头计入同一容量。
18
+
19
+ 原轮正常完成(或冷接回已交付原结果)后结束该轮主机 broker,原生线程写锁随之释放,同一 DSH 会话下一轮不再因旧轮保留 10 分钟而报“原会话仍被占用”;结果未定(插件退出、断开、失败)时仍保留原轮待接回。保留的原轮若已不在主机上(按既有回收时限结束、broker 崩溃或主机重启),下一条消息先说明那一轮结果无法接回、没有重发那一轮任务,再用原会话编号恢复原生会话(Claude session/resume、Codex session/load)带着原上下文处理新消息,不新建会话(0.9.0-toolbridge.22 起;此前同一会话每条新消息都报“主机会话控制失败(ENOENT/ECONNREFUSED)”,只能新开对话)。保留的原轮若是因主机登录失效(登出、换账号、过期或被撤销)而失败(ACP 认证失败 -32000),下一条消息先说明那一轮因登录失效没有完成、没有重发那一轮任务,结束那一轮持旧登录的主机进程,再用当前登录按原会话编号恢复(Claude session/resume、Codex session/load)处理新消息;主机仍未登录时照旧提示需要登录(0.9.0-toolbridge.23 起;此前这条消息报“原轮返回错误(-32000)”且不处理,旧进程留到回收)。旧 X.14–.16 发出的结束请求在主机上始终不生效,只有升级本包才消除;只升主机不够。
6
20
 
7
- 选择本机文件夹后,Claude 和 Codex 可以把 DSH 已启用的 MCP、web、skill、ask_user、todo/present/goal 等工具交给 DSH 原生执行和审批。内置文件/命令、子代理/agent-team、run_code 不在桥接表;原有文件和命令执行方式保留。plan 不自动放行桥接权限;default 下 Claude 的桥接原生权限由插件单次应答,员工只在 DSH 审批实际工具。主机文件夹不开放工具桥。
21
+ 本机文件夹下的主机 Claude 可以开自己的子代理(原生 Agent 与 TaskStop),子代理还能再开子代理,插件不加层数或次数限制。子代理继承同一工具表:原生 Read/Write/Edit/Glob/Grep/Bash 仍关闭,文件和命令只走员工本机工具并按原审批;工具桥的 DSH 工具同样可用。子代理的工具事件进技术详情,结论由主 Claude 在原回复里给出;取消本轮会一并结束子代理。Claude 原生的 SendMessage/ListAgents 不开放(DSH 同名的 send_message/list_agents 见下段),因为它们能触及主机账号的其他本地和云端会话;子代理完成后结果仍自动交回主 Claude。主机文件夹本就允许,行为不变。Claude 的云端子代理(Agent 的 isolation:"remote",会在员工 Claude 账号的云端运行,碰不到员工电脑和主机)在本机文件夹和主机文件夹下都被拒绝(0.9.0-toolbridge.21 起,上游 PreToolUse 钩子:调用里写 remote,或所调子代理类型的定义文件写 `isolation: remote`,都拒;检查在主机跑一个固定脚本,只读钩子输入和子代理定义文件,不执行模型内容);本地子代理、worktree、套娃、Skill 和 DSH 子代理工具照常。Codex 自身的多代理功能本线没有关闭(层数和线程数是 Codex 上游默认值,插件不改)。
22
+
23
+ 任何 agent 都可以调用其他 agent:本机文件夹下的主机 Claude/Codex 经工具桥使用 DSH 自带的子代理工具(subagent、subagent_fork、list_subagent_models、send_message、interrupt_agent、list_agents、wait_agent、spawn_teammate、team_task_*、workflow 及后台任务 job_output/job_list/job_kill),由 DSH 执行、审批、显示子代理卡片和交回结果。被调方可以是主机 Claude 新会话、主机 Codex 新会话或员工在 DSH 配好的模型;跨品牌路由需员工在 DSH 子代理设置里允许。DSH 的子会话不是工作区成员,插件沿 live 的 parentSession 找到最近一个登记在工作区里的祖先会话,按它的工作区执行(子会话 cwd 仍须等于该工作区,本机/主机文件夹同样适用);子会话有自己的主机原生会话、broker、冷接回记录,文件和命令照常走员工本机或所选主机目录。层数、并发由 DSH 自己的用户设置决定,插件不加任何层数、并发、次数或预算限制,也不改 DSH 设置。主机文件夹不开放工具桥,所以主机文件夹下的主机 Claude/Codex 只能用自己的原生子代理,作为被调方时由 DSH 子代理派出。
24
+
25
+
26
+ 选择本机文件夹后,Claude 和 Codex 可以把 DSH 已启用的 MCP、web、skill、ask_user、todo/present/goal 等工具交给 DSH 原生执行和审批。DSH 内置文件/命令、终端、run_code 不经工具桥转交;DSH 子代理/agent-team/workflow/后台任务工具经工具桥交给 DSH;原有文件和命令执行方式保留。plan 不自动放行桥接权限;default 下 Claude 的桥接原生权限由插件单次应答,员工只在 DSH 审批实际工具。主机文件夹不开放工具桥。
8
27
 
9
28
  工具表按每次主机连接生成快照,新增/移除在下一次连接生效;不承诺 Codex 当前 MCP 会话热刷新。审批期间的插话等当前主机 prompt 结束后再发,停泊中切换助手会停止原轮次并明确提示。工具主动结束DSH轮次时,已提交结果仍交回原agent;确认原生工具收到后结束原prompt,下一条沿原线程继续,不在已关闭步骤追加模型回复。取消和主机结束等待后的结果不重放;工具已执行的副作用不能因取消而撤销,请按说明核对。图片结果由官方附件组件读取后交回。
10
29
 
@@ -16,13 +35,17 @@ Codex 需要 S 后续安装的独立受保护命令 `/usr/local/aw-host/bin/code
16
35
 
17
36
  需要远程主机连接组件 0.7.37 或更新的 0.7.x、联网助手 0.4.9,以及支持公开会话归属接口的主机组件 S0.4.26。主机来源保存于官方 storage.domain 的会话元数据表,每轮仅由连接组件检查一次主机目录,不检查本机占位目录。
18
37
 
19
- Claude 本机 Bash 会单独消费员工桥代理的控制诊断,不把它交给模型当作命令输出;真实传输中断仍提示结果未知。命令自身的标准输出、标准错误与退出码照常返回。
38
+ Claude 员工MCP的stdio通道保持在当前原生客户端上。底层员工SSH/Unix流断开时,在途工具只返回结果未知,不重放;连接恢复后下一次新工具调用串行重新连接并初始化。同一DSH会话无需新建;若连接/绑定已撤销或DSH桥工具在途结束本轮,网络恢复后在原会话发新消息,沿原生编号续接。只使用原已核验的设备/账户/绑定,不跨代偷接。
39
+
40
+ DSH技能工具仅使用DSH公布的目录,主机原生技能按各自原生指令加载;本机文件夹下主机 Claude 的主会话和子代理都能用原生 Skill 加载主机账户的用户级技能(0.9.0-toolbridge.20 起),技能里的 `!` 内联命令需要原生 Bash,原生 Bash 仍关闭,所以不会在主机执行,该技能加载失败并明确报错;工具描述标明目录快照与返回的资源基址。
41
+
42
+ Claude 本机 Bash 会单独消费员工桥代理的控制诊断,不把它交给模型当作命令输出;真实传输中断仍提示结果未知。命令自身的标准输出、标准错误与退出码照常返回。非UTF-8流不拒绝,按原始字节base64返回并增加对应stdoutEncoding/stderrEncoding标记;有效UTF-8格式不变。没有新增原始字节上限,编码后的消息沿既有512MB容量核验。
20
43
 
21
44
  模型列表读取会随连接状态或连接代际变化取消,连接恢复时通过官方机制刷新。目录失败原因写入当前 profile 的 `ai-workbench-remote-agent/logs/model-catalog.jsonl`(脱敏);未增加单次读取时限或重试。
22
45
 
23
46
  ## 会话行为
24
47
 
25
- 每轮启动一个新助手进程,按原生会话编号恢复上下文;不接回旧进程或重放上一轮输入。主机会话始终使用创建时保存的主机和目录;工作区之后的选择只影响新会话。
48
+ 新的用户轮启动一个新助手进程,按原生会话编号恢复上下文;退出前尚未结算的原轮则附着原进程,仅取回该轮输出、结果和用量,不重发原输入。主机会话始终使用创建时保存的主机和目录;工作区之后的选择只影响新会话。
26
49
 
27
50
  同一 DSH 会话切换 Claude/Codex 时,切回会接本品牌最近的远端会话,并补充它尚未见过的可见对话;首次使用某品牌则带入全部可见历史。工具内部状态、推理和技术详情不转交。历史超出既有 `acpMaxMessageBytes` 容量时,只带能容纳的最近完整轮,并在技术详情说明省略数量;当前输入保持完整,超限仍明确失败。没有新增设置、重试或时限。
28
51
 
@@ -47,7 +70,7 @@ Codex 员工端只使用随包提供的原生组件,通道等待本次组件
47
70
 
48
71
  | 参数 | 默认值 | 作用 |
49
72
  | --- | ---: | --- |
50
- | acpMaxMessageBytes | 4194304 | 会话消息容量 |
73
+ | acpMaxMessageBytes | 512000000 | 会话消息容量;默认512 MB(十进制),自有Codex适配器接收参数另留协议外壳余量;不代表模型上下文或上游Claude适配器承诺 |
51
74
  | brokerMaxFrameBytes | 2097152 | 主机回传单段容量 |
52
75
  | brokerControlMaxBytes | 1048576 | 主机会话管理回复容量 |
53
76
  | employeeShellKillGraceMs | 1000 | 本机命令连接取消后的清理宽限毫秒 |
@@ -56,10 +79,12 @@ Codex 员工端只使用随包提供的原生组件,通道等待本次组件
56
79
 
57
80
  ## 技术详情与交付
58
81
 
59
- 技术详情只写官方 profile 下本地私有日志,并由既有技术详情界面展开显示。写入失败不覆盖原始错误、不等待远端投递回执。每个运行环境只记录首次关闭原因;首先观察到的原因不自动等同跨层根因。
82
+ 技术详情只写官方 profile 下本地私有日志,并由既有技术详情界面展开显示。写入失败不覆盖原始错误、不等待远端投递回执。连接与独立工具操作分别保留首次关闭原因,普通工具退出不再占用连接首因;首先观察到的原因不自动等同跨层根因。
60
83
 
61
84
  工程验证和独立审查见 `docs/evidence/2026-10-25-X-host-source-v2/`;AUTH profile 夹具补齐与最终 main 全套复验见其中的 `auth-profile-return.md`。固定包摘要及真实设备验收状态以项目 X 回执为准。插件不修改 DSH 核心,不添加启动器或自定义 profile。
62
85
 
63
86
  远程助手参数页只显示官方 ConfigForms 当前值,不提供保存、放弃或恢复继承值;修改请使用 DSH 官方 Config“打开配置文件”入口。
64
87
 
65
88
  模型目录在官方启动读取时获取,并在连接变为 connected 时经官方注册刷新;官方菜单打开或重试读取缓存是 DSH 官方限制,本插件不改官方菜单或核心。真正不支持的推理档位由 DSH 预检,其英文提示保留为观察项。
89
+
90
+ I3(0.9.0-toolbridge.27):同一 DSH 对话的系统规则更新后,续接原 Codex native 线程并在实际模型请求应用新版规则;需要主机含桥 Codex ACP aw.15。规则未变不重复追加历史;每次恢复仍带当前配置以支持压缩重建。用量说明已由 U1(0.9.0-toolbridge.30)更正:Codex aw.15 和 Claude 0.94.0 的 ACP 回执均按本次 prompt 统计,逐轮全额结算一次,不减历史基线;旧累计快照不再参与计算。冷接回只减同一 prompt 已在 DSH 落盘的部分,可靠终态先持久化,原 broker 回收后仍可补记其未落盘用量。订阅额度卡仍读取官方额度窗口,不能由 token 数推算百分比。Claude 的规则传递保持。无新增设置、限制或错误码。
package/dist/acp.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import type { StartupTiming } from './startup-timing.ts';
1
2
  import { CloseDiagnostics, type CloseCause } from './close-diagnostics.ts';
2
3
  import * as stable from '@agentclientprotocol/sdk';
3
4
  import * as acp from '@agentclientprotocol/sdk/unstable';
@@ -9,8 +10,10 @@ import type { EmployeeRouting } from './employee-relay.ts';
9
10
  import type { SessionOwnership } from './broker-ownership.ts';
10
11
  export type ApprovalOutcome = 'allowed-once' | 'rejected' | 'cancelled' | 'unavailable';
11
12
  export interface AcpHooks {
13
+ startupTiming?: StartupTiming;
14
+ onPromptDispatched?: () => void;
12
15
  closeDiagnostics?: CloseDiagnostics;
13
- onUpdate?: (notification: acp.SessionNotification) => void;
16
+ onUpdate?: (notification: acp.SessionNotification, originSequence?: number) => void;
14
17
  onResponse?: (response: acp.PromptResponse) => void;
15
18
  approve?: (request: acp.RequestPermissionRequest, signal?: AbortSignal) => Promise<ApprovalOutcome>;
16
19
  /** A grant belongs to the exact official permission generation that asked it. */
@@ -37,13 +40,25 @@ export interface EmployeeExecutionMeta {
37
40
  acpMaxMessageBytes: number;
38
41
  }
39
42
  export interface AcpStartContext {
43
+ initialModel?: string;
40
44
  toolBridgeServers?: EmployeeRouting['mcpServers'];
41
45
  systemPrompt?: string;
46
+ systemPromptChanged?: boolean;
42
47
  codexNewSessionOnly?: true;
43
48
  employeeExecution?: EmployeeExecutionMeta;
44
49
  employeeRouting?: EmployeeRouting;
45
50
  }
46
51
  export type AcpStartMethod = 'session/new' | 'session/resume' | 'session/load';
52
+ /** Owner 2026-11-12: refuse only Claude's cloud subagent (Agent isolation:"remote"; it would run in the employee's Claude cloud, away from the employee
53
+ * computer and the host). CLI 2.1.285 applies `isolation ?? definition.isolation`, and agent definition files (user/managed/project, not plugins) accept
54
+ * `isolation: remote`. Upstream PreToolUse hook (programmatic settings tier) runs before any permission mode, at every depth; the fixed script only reads
55
+ * the hook JSON from stdin and agent definition files, never runs model content:
56
+ * - explicit "isolation":"remote" → deny (one sentence for the model); explicit "worktree" → pass;
57
+ * - otherwise, only if a definition in a directory the CLI loads from (symlinks followed, BOM/CRLF tolerated) has a frontmatter isolation key
58
+ * (block, flow, quoted or explicit `?` form) whose value is not plain worktree, or a `<<` merge line, deny unless the requested type (default general-purpose) provably differs from every such definition's plain name
59
+ * (ASCII, compared as the CLI does: lowercase, no space/-/_); names that cannot be compared count as a match;
60
+ * - no such definition → exit 0 with no output, native permission flow unchanged. A failed stdin read denies (exit 2). */
61
+ export declare const CLOUD_SUBAGENT_REFUSED = "\u4E91\u7AEF\u5B50\u4EE3\u7406\u78B0\u4E0D\u5230\u4F60\u7684\u7535\u8111\u548C\u4E3B\u673A\uFF0C\u5DF2\u62D2\u7EDD\uFF0C\u8BF7\u6539\u7528\u672C\u5730\u5B50\u4EE3\u7406\u3002";
47
62
  /** ACP v1 with explicitly negotiated SDK 2.0 lifecycle/context extensions. */
48
63
  export declare class AcpSession {
49
64
  private connection;
@@ -53,6 +68,10 @@ export declare class AcpSession {
53
68
  private turnSignal?;
54
69
  private turnToken?;
55
70
  private busy;
71
+ private steeringSupported;
72
+ private dispatchedSteers;
73
+ get canSteer(): boolean;
74
+ get steerDispatchCount(): number;
56
75
  private startAttempted;
57
76
  private negotiated;
58
77
  private method?;
@@ -60,7 +79,6 @@ export declare class AcpSession {
60
79
  private closeRequested;
61
80
  private updating;
62
81
  private cwd?;
63
- private systemPrompt;
64
82
  private codexNewSessionOnly;
65
83
  private creatingReplacement;
66
84
  private employeeMeta?;
@@ -116,8 +134,10 @@ export declare class AcpSession {
116
134
  setHooks(hooks: AcpHooks): void;
117
135
  get closed(): Promise<void>;
118
136
  start(cwd: string, resumeId?: string, signal?: AbortSignal, context?: AcpStartContext, prompt?: acp.ContentBlock[]): Promise<string>;
119
- /** Codex context is immutable after creation; keep the old remote session intact. */
137
+ /** 续接保留原生线程;规则变化由 session/resume 或 session/load 的原生 developer 指令覆盖。 */
120
138
  prompt(input: string | acp.ContentBlock[], signal?: AbortSignal): Promise<acp.StopReason>;
139
+ steer(prompt: acp.ContentBlock[], signal?: AbortSignal, isCurrent?: () => boolean, maxBytes?: number): Promise<'injected' | 'promptRequired'>;
121
140
  close(cause?: CloseCause, error?: Error): void;
122
141
  }
123
142
  export declare function acpNeed(error: unknown): NeedError;
143
+ export declare const isKnownAcpUpdate: (update: unknown) => boolean;
package/dist/acp.js CHANGED
@@ -7,7 +7,34 @@ import { employeeFailure } from "./presentation.js";
7
7
  import { isolateRpcIds } from "./rpc-namespace.js";
8
8
  import { sanitizeObservation, sanitizeDisplayLabel } from "./conversation-details.js";
9
9
  import { ModelConfiguration, ModelConfigurationError } from "./model-configuration.js";
10
- function employeeClaudeOptions(routing) { return { tools: [], disallowedTools: ['Read', 'Write', 'Edit', 'Glob', 'Grep', 'Bash', 'Agent', 'Task', 'TaskOutput', 'TaskStop'], toolAliases: structuredClone(routing.toolAliases) }; }
10
+ // Native subagents stay on (Agent/TaskStop): children inherit this tool pool, deny rules and the employee MCP aliases, so their files/commands also run on the employee device.
11
+ // Skill stays on for the main session and subagents; a skill's `!` inline command needs native Bash, which stays disallowed, so it never runs on the host.
12
+ // SendMessage/ListAgents stay off: they also reach other local and cloud sessions of the host account.
13
+ /** Owner 2026-11-12: refuse only Claude's cloud subagent (Agent isolation:"remote"; it would run in the employee's Claude cloud, away from the employee
14
+ * computer and the host). CLI 2.1.285 applies `isolation ?? definition.isolation`, and agent definition files (user/managed/project, not plugins) accept
15
+ * `isolation: remote`. Upstream PreToolUse hook (programmatic settings tier) runs before any permission mode, at every depth; the fixed script only reads
16
+ * the hook JSON from stdin and agent definition files, never runs model content:
17
+ * - explicit "isolation":"remote" → deny (one sentence for the model); explicit "worktree" → pass;
18
+ * - otherwise, only if a definition in a directory the CLI loads from (symlinks followed, BOM/CRLF tolerated) has a frontmatter isolation key
19
+ * (block, flow, quoted or explicit `?` form) whose value is not plain worktree, or a `<<` merge line, deny unless the requested type (default general-purpose) provably differs from every such definition's plain name
20
+ * (ASCII, compared as the CLI does: lowercase, no space/-/_); names that cannot be compared count as a match;
21
+ * - no such definition → exit 0 with no output, native permission flow unchanged. A failed stdin read denies (exit 2). */
22
+ export const CLOUD_SUBAGENT_REFUSED = '云端子代理碰不到你的电脑和主机,已拒绝,请改用本地子代理。';
23
+ const cloudSubagentHook = `j=$(/bin/cat) || { echo '云端子代理检查失败,本次子代理没有启动。' >&2; exit 2; }
24
+ deny(){ printf '%s\\n' '{"hookSpecificOutput":{"hookEventName":"PreToolUse","permissionDecision":"deny","permissionDecisionReason":"${CLOUD_SUBAGENT_REFUSED}"}}'; exit 0; }
25
+ case $j in *'"isolation":"remote"'*) deny;; *'"isolation":"worktree"'*) exit 0;; esac
26
+ d=\${CLAUDE_PROJECT_DIR:-$PWD}; set -- "\${CLAUDE_CONFIG_DIR:-$HOME/.claude}/agents" "/Library/Application Support/ClaudeCode/.claude/agents"
27
+ while :; do set -- "$@" "$d/.claude/agents"; m=; [ -f "$d/.git" ] && m=$(/usr/bin/sed -n 's#^gitdir:[[:space:]]*\\(.*\\)/\\.git/worktrees/.*#\\1#p' "$d/.git"); case $m in '') ;; /*) set -- "$@" "$m/.claude/agents";; *) set -- "$@" "$d/$m/.claude/agents";; esac; [ "$d" = / ] && break; d=$(/usr/bin/dirname "$d"); done
28
+ c=$(for a; do [ -d "$a" ] && /usr/bin/find -L "$a" -type f -name '*.md' 2>/dev/null; done | while IFS= read -r f; do LC_ALL=C /usr/bin/awk 'NR==1{sub(/^\\357\\273\\277/,"");sub(/\\r$/,"");if($0!~/^---[ \\t]*$/)exit;next} {sub(/\\r$/,"")} /^---[ \\t]*$/{exit} {l=tolower($0)} match(l,/(^[ \\t]*|[{,][ \\t]*)["\\047]?isolation["\\047]?[ \\t]*:/){v=substr($0,RSTART+RLENGTH);sub(/^[ \\t]+/,"",v);sub(/[,}].*$/,"",v);sub(/[ \\t]+#.*$/,"",v);sub(/[ \\t]+$/,"",v);gsub(/^["\\047]|["\\047]$/,"",v);if(v!="worktree")c=1} l~/^[ \\t]*\\?[ \\t]*["\\047]?isolation/||index($0,"<<"){c=1} /^name[ \\t]*:/&&!h{h=1;n=$0;sub(/^name[ \\t]*:[ \\t]*/,"",n);sub(/[ \\t]+#.*$/,"",n);sub(/[ \\t]+$/,"",n);if(n~/^".*"$/||n~/^\\047.*\\047$/)n=substr(n,2,length(n)-2)} END{if(c)print "C" n}' "$f"; done)
29
+ [ -n "$c" ] || exit 0
30
+ z(){ /usr/bin/tr 'A-Z' 'a-z' | /usr/bin/tr -d ' \\t_-'; }
31
+ case $j in *'"subagent_type":'*) t=$(printf '%s' "$j" | /usr/bin/sed -n 's/.*"subagent_type":"\\([^"\\\\]*\\)".*/\\1/p');; *) t=general-purpose;; esac
32
+ case $t in ''|*[!\\ -~]*) deny;; esac
33
+ t=$(printf '%s' "$t" | z)
34
+ printf '%s\\n' "$c" | while IFS= read -r v; do v=\${v#C}; case $v in ''|*[!A-Za-z0-9._+@/\\ -]*) echo hit;; *) [ "$(printf '%s' "$v" | z)" = "$t" ] && echo hit;; esac; done | /usr/bin/grep -q hit && deny
35
+ exit 0`;
36
+ const claudeSettings = () => ({ hooks: { PreToolUse: [{ matcher: 'Agent', hooks: [{ type: 'command', command: cloudSubagentHook }] }] } });
37
+ function employeeClaudeOptions(routing) { return { tools: ['Agent', 'TaskStop', 'Skill'], disallowedTools: ['Read', 'Write', 'Edit', 'Glob', 'Grep', 'Bash'], toolAliases: structuredClone(routing.toolAliases), settings: claudeSettings() }; }
11
38
  const permissionRanks = { claude: { plan: 0, default: 1, acceptEdits: 1, bypassPermissions: 2 }, codex: { 'read-only': 0, 'workspace-write': 1, agent: 1, 'agent-full-access': 2 } };
12
39
  /** ACP v1 with explicitly negotiated SDK 2.0 lifecycle/context extensions. */
13
40
  export class AcpSession {
@@ -18,6 +45,10 @@ export class AcpSession {
18
45
  turnSignal;
19
46
  turnToken;
20
47
  busy = false;
48
+ steeringSupported = false;
49
+ dispatchedSteers = 0;
50
+ get canSteer() { return this.steeringSupported && this.busy && !this.closeRequested; }
51
+ get steerDispatchCount() { return this.dispatchedSteers; }
21
52
  startAttempted = false;
22
53
  negotiated = {};
23
54
  method;
@@ -25,7 +56,6 @@ export class AcpSession {
25
56
  closeRequested = false;
26
57
  updating = false;
27
58
  cwd;
28
- systemPrompt = '';
29
59
  codexNewSessionOnly = false;
30
60
  creatingReplacement = false;
31
61
  employeeMeta;
@@ -206,7 +236,7 @@ export class AcpSession {
206
236
  }
207
237
  reports = [];
208
238
  async stage(phase, operation) { this.closeDiagnostics.stage = phase; try {
209
- return await this.closeDiagnostics.run(phase, operation);
239
+ return await (this.hooks.startupTiming && phase !== 'acp-prompt' ? this.hooks.startupTiming.run(phase, () => this.closeDiagnostics.run(phase, operation)) : this.closeDiagnostics.run(phase, operation));
210
240
  }
211
241
  catch (error) {
212
242
  if (['acp-session-new', 'acp-session-resume', 'acp-session-load', 'acp-initialize'].includes(phase))
@@ -273,7 +303,8 @@ export class AcpSession {
273
303
  this.hooks = hooks;
274
304
  this.closeDiagnostics = hooks.closeDiagnostics ?? new CloseDiagnostics(event => this.detail(event));
275
305
  const app = acp.client({ name: '@ai-workbench/remote-agent' })
276
- .onNotification(acp.methods.client.session.update, ({ params: notification }) => {
306
+ .onNotification(acp.methods.client.session.update, ({ params: incoming }) => {
307
+ const { notification, sequence } = this.hooks.broker?.stripOutputOrigin(incoming) ?? { notification: incoming, sequence: undefined };
277
308
  if (this.creatingReplacement) {
278
309
  if (notification.sessionId !== this.sessionId && notification.update.sessionUpdate === 'config_option_update')
279
310
  this.pendingConfiguration(notification.sessionId, notification.update.configOptions);
@@ -315,7 +346,7 @@ export class AcpSession {
315
346
  if (meta && Object.keys(meta).length)
316
347
  this.detail({ kind: 'extension', severity: 'info', code: 'ACP_NOTIFICATION_META', summary: '远端通知扩展', method: 'session/update', payload: notification._meta });
317
348
  if (this.busy) {
318
- this.hooks.onUpdate?.(notification);
349
+ this.hooks.onUpdate?.(notification, sequence);
319
350
  }
320
351
  else
321
352
  this.detail({ kind: notification.update.sessionUpdate === 'available_commands_update' ? 'commands' : 'session', severity: 'info', code: 'ACP_IDLE_UPDATE', summary: '远端会话建立、恢复或空闲时的轨迹', method: 'session/update', payload: notification });
@@ -430,10 +461,14 @@ export class AcpSession {
430
461
  throw new acp.RequestError(-32601, '不支持此扩展交互');
431
462
  })
432
463
  .onNotification('*', ({ method, params }) => {
464
+ if (method === '_aw/broker-replay-complete') {
465
+ this.hooks.broker?.confirmReplay(record(params)?.generation);
466
+ return;
467
+ }
433
468
  this.detail({ kind: 'extension', severity: 'warning', code: 'ACP_UNKNOWN_NOTIFICATION', summary: '收到未知远端扩展通知,已保留技术记录', method, payload: params });
434
469
  });
435
470
  if ('readable' in transport && 'writable' in transport)
436
- this.connection = app.connect(isolateRpcIds(this.observe(transport), message => this.observeDispatch(message)));
471
+ this.connection = app.connect(isolateRpcIds(this.observe(this.hooks.broker?.withOutputOrigins(transport) ?? transport), message => this.observeDispatch(message)));
437
472
  else {
438
473
  // Stable and unstable apps use distinct private symbols. Bridge only their
439
474
  // public stream interfaces so either SDK entry point remains supported.
@@ -449,7 +484,8 @@ export class AcpSession {
449
484
  /** A rejected request on an already-closed SDK never reaches this write.
450
485
  * Once a transport write starts, failure remains delivery-unknown. */
451
486
  observeDispatch(message) {
452
- if (record(message)?.method !== 'session/prompt' || !Object.hasOwn(message, 'id'))
487
+ const method = record(message)?.method;
488
+ if (!['session/prompt', '_session/steering'].includes(String(method)) || !Object.hasOwn(message, 'id'))
453
489
  return;
454
490
  const params = record(record(message)?.params), current = params ? this.promptPermissions.get(params) : undefined;
455
491
  if (params)
@@ -458,6 +494,8 @@ export class AcpSession {
458
494
  this.closeDiagnostics.record({ layer: 'acp', initiator: 'acp.permission-dispatch-gate', reason: 'PERMISSION_POLICY_CHANGED', operation: 'session/prompt', action: 'failure' });
459
495
  throw new NeedError('PERMISSION_POLICY_CHANGED', '当前权限已变化或无法核对,这次派发已停止;原输入没有重放。', '当前权限代次与远端同值回执');
460
496
  }
497
+ if (current.maxBytes !== undefined && Buffer.byteLength(JSON.stringify(message)) + 1 > current.maxBytes)
498
+ throw new NeedError('ACP_MESSAGE_TOO_LARGE', '中途消息超过已设置的会话消息容量,未发送。', '管理员调整acpMaxMessageBytes');
461
499
  current.native();
462
500
  this.hooks.broker?.authorizePrompt(() => { try {
463
501
  if (!current.current())
@@ -468,21 +506,28 @@ export class AcpSession {
468
506
  catch {
469
507
  return false;
470
508
  } });
471
- this.dispatchedPrompts++;
509
+ if (method === 'session/prompt') {
510
+ this.dispatchedPrompts++;
511
+ this.hooks.onPromptDispatched?.();
512
+ }
513
+ else
514
+ this.dispatchedSteers++;
472
515
  }
473
516
  observe(stream) {
474
517
  // Observe already-parsed public Stream messages: no NDJSON parsing, second
475
518
  // byte buffer, message-size policy, or transport fallback is introduced.
476
519
  const observe = this.closeDiagnostics.capture();
477
520
  const readable = stream.readable.pipeThrough(new TransformStream({ transform: (message, controller) => {
478
- const raw = record(message);
479
- const params = record(raw?.params);
480
- const update = record(params?.update);
481
- if (raw?.method === acp.methods.client.session.update && typeof update?.sessionUpdate === 'string' && !knownUpdates.has(update.sessionUpdate)) {
482
- this.detail({ kind: 'extension', severity: 'warning', code: 'ACP_UNKNOWN_UPDATE', summary: '收到未知远端会话事件,已保留结构', method: 'session/update', payload: params });
483
- return;
484
- }
485
- controller.enqueue(message);
521
+ const inspect = (value) => { if (Array.isArray(value)) {
522
+ const members = value.flatMap(item => inspect(item));
523
+ return members.length ? [members] : [];
524
+ } const raw = record(value), params = record(raw?.params), update = record(params?.update); if (raw?.method === acp.methods.client.session.update && typeof update?.sessionUpdate === 'string' && !knownUpdates.has(update.sessionUpdate)) {
525
+ const notification = this.hooks.broker?.stripOutputOrigin(params).notification ?? params;
526
+ this.detail({ kind: 'extension', severity: 'warning', code: 'ACP_UNKNOWN_UPDATE', summary: '收到未知远端会话事件,已保留结构', method: 'session/update', payload: notification });
527
+ return [];
528
+ } return [value]; };
529
+ for (const value of inspect(message))
530
+ controller.enqueue(value);
486
531
  }, flush: () => observe({ layer: 'acp', initiator: 'acp.read-eof', reason: 'ACP_STREAM_EOF', action: 'eof' }) }));
487
532
  return { readable, writable: stream.writable };
488
533
  }
@@ -514,12 +559,14 @@ export class AcpSession {
514
559
  signal?.addEventListener('abort', abort, { once: true });
515
560
  try {
516
561
  const hello = await this.stage('acp-initialize', () => this.connection.agent.request(acp.methods.agent.initialize, {
517
- protocolVersion: acp.PROTOCOL_VERSION, clientInfo: { name: '@ai-workbench/remote-agent', version: '0.9.0-toolbridge.3' },
562
+ protocolVersion: acp.PROTOCOL_VERSION, clientInfo: { name: '@ai-workbench/remote-agent', version: '0.9.0-toolbridge.9' },
518
563
  clientCapabilities: { fs: { readTextFile: false, writeTextFile: false }, terminal: false, session: { notices: {} }, ...(this.employeeMeta ? { _meta: { awEmployeeExecution: { version: 1, closeReason: 1, ...(context?.toolBridgeServers ? { mcpBridge: 1 } : {}) } } } : {}) },
519
564
  }, { cancellationSignal: signal }));
520
565
  if (hello.protocolVersion !== acp.PROTOCOL_VERSION)
521
566
  throw new NeedError('ACP_VERSION_MISMATCH', 'ACP 协议版本不兼容', '支持 ACP v1 的远端 agent');
522
567
  this.negotiated = hello.agentCapabilities ?? {};
568
+ const steering = record(hello._meta?.steering);
569
+ this.steeringSupported = steering?.supported === true && (!context?.codexNewSessionOnly || steering.idleBehavior === 'promptRequired');
523
570
  if (this.employeeMeta) {
524
571
  const policy = record(hello._meta?.awEmployeeExecution);
525
572
  if (!this.hooks.employeeExecution || !policy || Object.keys(policy).length !== (context?.toolBridgeServers ? 6 : 5) || context?.toolBridgeServers && policy.mcpBridge !== 1 || policy.version !== 1 || policy.nativeCliVersion !== '0.160.1' || policy.native !== true || policy.perRpcGate !== true || policy.noHostFallback !== true)
@@ -528,12 +575,17 @@ export class AcpSession {
528
575
  this.detail({ kind: 'session', severity: 'info', code: 'EMPLOYEE_EXECUTION_SELECTED', summary: '文件和命令在员工电脑的选定目录执行;订阅凭据留在主机,本机扩展的忽略详情单独记录。', payload: { bindingId: this.employeeMeta.bindingId, workspaceId: this.employeeMeta.workspaceId, cwd: this.employeeMeta.cwd, nativeCliVersion: '0.160.1', noHostFallback: true, agentConfigSource: 'host CODEX_HOME', unsupportedLocalFeatures: ['http-mcp-execution', 'hooks', 'plugins', 'cold-resume', 'slash-commands', 'host-file-reports'] } });
529
576
  }
530
577
  const systemPrompt = context?.systemPrompt;
578
+ const resumePolicy = record(this.negotiated._meta?.aiWorkbenchSystemPrompt);
579
+ const nativeContext = !!resumeId && !!context?.codexNewSessionOnly && resumePolicy?.version === 2;
580
+ const initialPolicy = record(this.negotiated._meta?.aiWorkbenchInitialModel);
581
+ const initialModel = !resumeId && context?.codexNewSessionOnly && initialPolicy?.version === 1 && initialPolicy?.scope === 'new-session' ? context.initialModel : undefined;
531
582
  this.codexNewSessionOnly = !!context?.codexNewSessionOnly;
532
583
  if (prompt)
533
584
  this.validatePrompt(prompt);
534
585
  const routing = context?.employeeRouting ? structuredClone(context.employeeRouting) : undefined;
535
586
  this.employeeRouting = routing;
536
- const params = { cwd, mcpServers: context?.toolBridgeServers ? structuredClone(context.toolBridgeServers) : routing ? structuredClone(routing.mcpServers) : [], ...((routing || this.employeeMeta) ? { _meta: { ...(this.employeeMeta ? { awEmployeeExecution: this.employeeMeta } : {}), ...(routing ? { claudeCode: { options: employeeClaudeOptions(routing) } } : {}) } } : {}), ...(systemPrompt && !(resumeId && this.codexNewSessionOnly) ? { systemPrompt: { mode: 'append', content: [{ type: 'text', text: systemPrompt }] } } : {}) };
587
+ const claudeCode = routing ? { options: employeeClaudeOptions(routing) } : this.codexNewSessionOnly ? undefined : { options: { settings: claudeSettings() } };
588
+ const params = { cwd, mcpServers: context?.toolBridgeServers ? structuredClone(context.toolBridgeServers) : routing ? structuredClone(routing.mcpServers) : [], ...((claudeCode || this.employeeMeta || initialModel) ? { _meta: { ...(initialModel ? { awInitialModel: { version: 1, model: initialModel } } : {}), ...(this.employeeMeta ? { awEmployeeExecution: this.employeeMeta } : {}), ...(claudeCode ? { claudeCode } : {}) } } : {}), ...((systemPrompt !== undefined || context?.systemPromptChanged || nativeContext) && !(resumeId && this.codexNewSessionOnly && !context?.systemPromptChanged && !nativeContext) ? { systemPrompt: { mode: 'append', content: [{ type: 'text', text: systemPrompt ?? '' }] } } : {}) };
537
589
  const configRevision = this.resetConfiguration();
538
590
  const restore = async (operation) => {
539
591
  try {
@@ -586,7 +638,6 @@ export class AcpSession {
586
638
  await this.hooks.sessionOwnership?.bind(this.sessionId, signal);
587
639
  this.ready = true;
588
640
  this.cwd = cwd;
589
- this.systemPrompt = systemPrompt ?? '';
590
641
  return this.sessionId;
591
642
  }
592
643
  catch (error) {
@@ -601,7 +652,7 @@ export class AcpSession {
601
652
  signal?.removeEventListener('abort', abort);
602
653
  }
603
654
  }
604
- /** Codex context is immutable after creation; keep the old remote session intact. */
655
+ /** 续接保留原生线程;规则变化由 session/resume 或 session/load 的原生 developer 指令覆盖。 */
605
656
  async prompt(input, signal) {
606
657
  if (!this.ready || !this.sessionId)
607
658
  throw new NeedError('SESSION_REQUIRED', '我需要先建立远端会话', 'ACP 会话');
@@ -625,7 +676,18 @@ export class AcpSession {
625
676
  this.turnToken = Symbol('turn');
626
677
  let rejectAbort;
627
678
  const interrupted = new Promise((_resolve, reject) => { rejectAbort = reject; });
679
+ const requestAbort = new AbortController();
628
680
  const cancel = () => {
681
+ if (signal?.reason?.kind === 'disposed') {
682
+ this.close({ layer: 'acp', initiator: 'acp.owner-disposed', reason: 'SESSION_DETACHED', action: 'detach' });
683
+ rejectAbort?.(new NeedError('ABORTED', '客户端已退出,主机原轮保留,未发送取消', '原轮冷恢复'));
684
+ return;
685
+ }
686
+ if (this.closeRequested) {
687
+ rejectAbort?.(new NeedError('ABORTED', '客户端已分离,未重发或取消主机原轮', '原轮恢复状态'));
688
+ return;
689
+ }
690
+ requestAbort.abort(signal?.reason);
629
691
  this.closeDiagnostics.record({ layer: 'acp', initiator: 'acp.prompt-cancel', reason: 'ABORTED', operation: 'session/prompt', action: 'abort' });
630
692
  rejectAbort?.(new NeedError('ABORTED', '已请求取消本轮,远端状态需确认', '确认主机取消状态'));
631
693
  void this.connection.agent.notify(acp.methods.agent.session.cancel, { sessionId: this.sessionId }).catch(() => {
@@ -637,7 +699,7 @@ export class AcpSession {
637
699
  this.flushBridgeStartupNotice();
638
700
  const result = await this.stage('acp-prompt', () => {
639
701
  this.promptPermissions.set(params, { current, native });
640
- const request = this.connection.agent.request(acp.methods.agent.session.prompt, params, { cancellationSignal: signal });
702
+ const request = this.connection.agent.request(acp.methods.agent.session.prompt, params, { cancellationSignal: requestAbort.signal });
641
703
  return signal ? Promise.race([request, interrupted]) : request;
642
704
  });
643
705
  signal?.throwIfAborted();
@@ -656,12 +718,34 @@ export class AcpSession {
656
718
  this.turnToken = undefined;
657
719
  }
658
720
  }
721
+ async steer(prompt, signal, isCurrent, maxBytes) {
722
+ if (!this.canSteer || !this.sessionId || isCurrent && !isCurrent())
723
+ return 'promptRequired';
724
+ this.validatePrompt(prompt);
725
+ signal?.throwIfAborted();
726
+ const token = this.turnToken, permit = this.hooks.promptGuard?.(), expected = this.selectedPermission, reported = new Set();
727
+ const current = () => this.canSteer && (!isCurrent || isCurrent()) && this.turnToken === token && !signal?.aborted && (!permit || !permit.signal.aborted && permit.isCurrent());
728
+ const params = { sessionId: this.sessionId, prompt, _meta: { steering: { idleBehavior: 'promptRequired' } } };
729
+ this.promptPermissions.set(params, { current, native: () => this.validateNativePermission(expected, reported), maxBytes });
730
+ try {
731
+ const result = await this.connection.agent.request('_session/steering', params, { cancellationSignal: signal });
732
+ if (result.outcome === 'injected' || result.outcome === 'promptRequired')
733
+ return result.outcome;
734
+ throw new NeedError('INPUT_DELIVERY_UNCONFIRMED', '中途消息未获得同一轮的注入回执,没有重复提交。', '原轮injected或promptRequired回执');
735
+ }
736
+ catch (error) {
737
+ throw acpNeed(error);
738
+ }
739
+ }
659
740
  close(cause = { layer: 'acp', initiator: 'acp.close', reason: 'ACP_CLOSE_REQUESTED', action: 'close' }, error) { this.closeDiagnostics.record({ ...cause, changes: cause.changes ?? [{ field: 'acp.close-requested', before: this.closeRequested, after: true }] }); this.closeRequested = true; this.connection?.close(error); }
660
741
  }
661
742
  export function acpNeed(error) {
662
743
  if (error instanceof NeedError)
663
744
  return error;
664
745
  if (error instanceof acp.RequestError) {
746
+ const localCode = record(error.data)?.localDispatchCode;
747
+ if (error.message === 'ACP_LOCAL_REQUEST_REJECTED' && (localCode === 'ACP_MESSAGE_TOO_LARGE' || localCode === 'PERMISSION_POLICY_CHANGED'))
748
+ return new NeedError(localCode, '中途消息在实际派发前被拒绝,仍在官方队列中,未发送。', '当前消息、权限与acpMaxMessageBytes');
665
749
  if (record(error.data)?.reason === 'thread_active_writer')
666
750
  return new NeedError('REMOTE_SESSION_BUSY', employeeFailure('REMOTE_SESSION_BUSY'), '原远端线程仍被占用;需要按同一DSH会话和远端线程定位已断开的旧broker并确认释放;RPC 错误码 ' + error.code);
667
751
  // Host SDK1.9 uses Internal error + data.details for thrown adapter errors.
@@ -693,3 +777,4 @@ export function acpNeed(error) {
693
777
  function record(value) { return value !== null && typeof value === 'object' && !Array.isArray(value) ? value : undefined; }
694
778
  const knownUpdates = new Set(['user_message_chunk', 'agent_message_chunk', 'agent_thought_chunk', 'tool_call', 'tool_call_update', 'plan', 'plan_update', 'plan_removed', 'available_commands_update', 'current_mode_update', 'config_option_update', 'session_info_update', 'usage_update', 'notice', 'compaction_update', 'compaction_summary_chunk', 'subagent_update', 'session_message', 'session_message_chunk']);
695
779
  function safeLabel(value) { return value.replaceAll(/[\r\n\x00-\x1f\x7f]/g, ' '); }
780
+ export const isKnownAcpUpdate = (update) => !!update && typeof update === 'object' && knownUpdates.has(update.sessionUpdate);
@@ -1,3 +1,4 @@
1
+ import { type ColdStore } from './cold-store.ts';
1
2
  import { type SshArgv, type BrokerIo, type BrokerSettings } from './broker.ts';
2
3
  import { type ConnectApi, type ConnectTarget, type Project, type Runtime, type RuntimeRequest } from './provider.ts';
3
4
  import type { Interaction } from './interaction.ts';
@@ -5,4 +6,5 @@ import type { Interaction } from './interaction.ts';
5
6
  export declare function brokerFactory(_get: () => ConnectApi | undefined, _ask: Interaction | undefined, configuration: BrokerSettings | (() => BrokerSettings), provided?: {
6
7
  argv?: SshArgv;
7
8
  io?: (target: ConnectTarget) => BrokerIo;
9
+ coldStore?: ColdStore;
8
10
  }): (target: ConnectTarget, project: Project, request: RuntimeRequest) => Promise<Runtime>;
@@ -6,6 +6,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
6
6
  }
7
7
  return path;
8
8
  };
9
+ import { newColdId } from "./cold-store.js";
9
10
  import { randomUUID } from 'node:crypto';
10
11
  import { CloseDiagnostics } from "./close-diagnostics.js";
11
12
  import { BrokerTransport, brokerCommand, brokerId, sshIo, controlJson } from "./broker.js";
@@ -36,14 +37,70 @@ export function brokerFactory(_get, _ask, configuration, provided) {
36
37
  throw new NeedError(started.code, '主机的环境配置会覆盖本机执行位置,本轮已停止;请由管理员移开该配置后在原会话重试。', '主机 CODEX_HOME/environments.toml 不存在');
37
38
  if (started.protocolVersion !== 1 || started.id !== id || !started.instanceId)
38
39
  throw new NeedError('BROKER_PROTOCOL_INVALID', '主机会话未能启动,请恢复连接后再试。', '有效的主机会话启动回应');
39
- const channel = new BrokerTransport({ observeClose: diagnostics.capture(), maxFrameBytes: settings.brokerMaxFrameBytes, instanceId: started.instanceId, leased: true, controlMaxBytes: started.controlMaxBytes, attach: () => io.attach(command(['attach', id, '--after', '0', '--framed', '--leased', '--if-instance', started.instanceId])) });
40
+ const coldStore = started.messageInputProtocolVersion === 1 ? provided?.coldStore : undefined, roundId = newColdId(), boundOrigin = Promise.withResolvers();
41
+ void boundOrigin.promise.catch(() => { });
42
+ if (coldStore)
43
+ await coldStore.put({ version: 1, id: roundId, sessionId: request.sessionId, provider: agent.id, brand: agent.loginProvider, phase: 'opening', target: structuredClone(target), brokerId: id, instanceId: started.instanceId, controlMaxBytes: started.controlMaxBytes, heartbeatIntervalMs: started.lifecycle.heartbeatIntervalMs, rpcIds: [], answered: [], inputSequence: 0, outputAfter: 0 });
44
+ let endPromptDelivery;
45
+ const beforeMessage = coldStore ? async (bytes, message) => {
46
+ const rpc = JSON.parse(Buffer.from(bytes).toString('utf8'));
47
+ if (rpc.method === 'session/prompt')
48
+ endPromptDelivery = request.startupTiming?.start('prompt-delivery');
49
+ try {
50
+ let record = await coldStore.update(request.sessionId, agent.id, roundId, row => {
51
+ if (rpc.method && Object.hasOwn(rpc, 'id') && !row.rpcIds.includes(rpc.id))
52
+ row.rpcIds.push(rpc.id);
53
+ if (rpc.method === 'session/cancel' && rpc.params?.sessionId === row.nativeId || rpc.method === '$/cancel_request' && String(rpc.params?.requestId) === row.promptId)
54
+ row.cancelIntent ??= { source: 'wire' };
55
+ row.pending = { id: message.id, sha256: message.sha256, wire: Buffer.from(bytes).toString('base64'), baseSequence: message.baseSequence, chunkBytes: message.chunkBytes, chunks: Math.ceil(bytes.length / message.chunkBytes), ...(rpc.method ? { method: rpc.method } : {}), ...(Object.hasOwn(rpc, 'id') ? { rpcId: rpc.id } : {}) };
56
+ if (rpc.method === 'session/prompt') {
57
+ if (!row.meta || row.nativeId !== rpc.params?.sessionId || row.promptId)
58
+ throw new NeedError('INPUT_DELIVERY_UNCONFIRMED', '原轮归属未完成持久登记,未发送输入', '完整冷恢复快照');
59
+ row.promptId = String(rpc.id);
60
+ row.promptSha256 = message.sha256;
61
+ row.promptBytes = bytes.length;
62
+ row.phase = 'running';
63
+ }
64
+ });
65
+ if (rpc.method === 'session/prompt') {
66
+ const bound = controlJson(await io.run(command(['bind-round', id, '--if-instance', started.instanceId, '--dsh-session-id', request.sessionId, '--provider', agent.loginProvider, '--remote-session-id', record.nativeId, '--round-id', roundId, '--prompt-id', record.promptId, '--prompt-sha256', record.promptSha256, '--prompt-bytes', String(record.promptBytes)]), request.signal));
67
+ if (!Number.isSafeInteger(bound.round?.outputStartSequence))
68
+ throw new NeedError('BROKER_PROTOCOL_INVALID', '原轮输出起点未确认', '原轮绑定回执');
69
+ await coldStore.update(request.sessionId, agent.id, roundId, row => { row.outputStart = bound.round.outputStartSequence; });
70
+ boundOrigin.resolve(bound.round.outputStartSequence);
71
+ }
72
+ }
73
+ catch (error) {
74
+ if (rpc.method === 'session/prompt') {
75
+ endPromptDelivery?.('failed');
76
+ endPromptDelivery = undefined;
77
+ boundOrigin.reject(error);
78
+ }
79
+ throw error;
80
+ }
81
+ } : undefined;
82
+ const afterMessage = coldStore ? async (sequence) => { await coldStore.update(request.sessionId, agent.id, roundId, row => { if (row.pending && !row.pending.method && row.pending.rpcId !== undefined && !row.answered.includes(row.pending.rpcId))
83
+ row.answered.push(row.pending.rpcId); if (row.pending && ['session/cancel', '$/cancel_request'].includes(row.pending.method ?? '') && row.cancelIntent)
84
+ row.cancelIntent.delivered = true; row.inputSequence = sequence; delete row.pending; }); endPromptDelivery?.(); endPromptDelivery = undefined; } : undefined;
85
+ const channel = new BrokerTransport({ observeClose: diagnostics.capture(), maxFrameBytes: settings.brokerMaxFrameBytes, instanceId: started.instanceId, leased: true, controlMaxBytes: started.controlMaxBytes, ...(started.inputProtocolVersion === 2 ? { inputProtocolVersion: 2, recoverDisconnect: true } : {}), ...(coldStore ? { messageInput: true, outputOrigins: true, beforeMessage, afterMessage } : {}), attach: (after = 0) => io.attach(command(['attach', id, '--after', String(after), '--framed', '--leased', ...(started.inputProtocolVersion === 2 ? ['--input-protocol', '2'] : []), ...(coldStore ? ['--message-input'] : []), '--if-instance', started.instanceId])) });
86
+ const reconnectOff = started.inputProtocolVersion === 2 ? _get()?.onConnectionState?.(state => { if (state.phase === 'connected' && !channel.online)
87
+ void channel.connect().catch(() => { }); }) : undefined;
40
88
  let ended = false;
41
- const dispose = async (cause = { layer: 'broker', initiator: 'broker.dispose', reason: 'BROKER_DISPOSE', action: 'dispose' }) => {
89
+ const detach = async (cause = { layer: 'broker', initiator: 'broker.detach', reason: 'SESSION_DETACHED', action: 'detach' }) => {
42
90
  if (ended)
43
91
  return;
44
92
  ended = true;
93
+ endPromptDelivery?.('failed');
94
+ endPromptDelivery = undefined;
95
+ reconnectOff?.();
45
96
  diagnostics.record(cause);
46
97
  channel.close(cause);
98
+ };
99
+ const dispose = async (cause = { layer: 'broker', initiator: 'broker.dispose', reason: 'BROKER_DISPOSE', action: 'dispose' }) => {
100
+ if (ended)
101
+ return;
102
+ // Ending the round ends its host agent, so the native thread writer is free for the next round.
103
+ await detach(cause);
47
104
  void io.run(command(['kill', id, '--if-instance', started.instanceId])).catch(() => console.warn('[remote-agent] 旧主机会话暂未清理,将由主机自动回收'));
48
105
  };
49
106
  const aborted = () => channel.fail(new NeedError('ABORTED', '本轮已取消。', '确认主机状态'), { layer: 'broker', initiator: 'broker.open-signal', reason: 'ABORTED', action: 'abort' });
@@ -61,6 +118,6 @@ export function brokerFactory(_get, _ask, configuration, provided) {
61
118
  finally {
62
119
  request.signal?.removeEventListener('abort', aborted);
63
120
  }
64
- return { identity: identity(target), cwd: project.path, closeDiagnostics: diagnostics, broker: channel, sessionOwnership, acpTransport: channel, dispose, detach: dispose };
121
+ return { ...(coldStore ? { cold: { id: roundId, store: coldStore, bound: boundOrigin.promise, failBinding: error => boundOrigin.reject(error), prepare: async (nativeId, meta) => { await coldStore.update(request.sessionId, agent.id, roundId, row => { row.nativeId = nativeId; row.meta = structuredClone(meta); }); } } } : {}), identity: identity(target), cwd: project.path, closeDiagnostics: diagnostics, broker: channel, sessionOwnership, acpTransport: channel, dispose, detach: channel.supportsRecovery ? detach : dispose };
65
122
  };
66
123
  }