@ai-workbench/remote-agent 0.9.0-toolbridge.37-rc.4 → 0.9.0-toolbridge.37

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.
package/README.md CHANGED
@@ -1,6 +1,6 @@
1
- # AI Workbench 远程助手 · @ai-workbench/remote-agent@0.9.0-toolbridge.37-rc.4 · 插件 → 添加插件
1
+ # AI Workbench 远程助手 · @ai-workbench/remote-agent@0.9.0-toolbridge.37 · 插件 → 添加插件
2
2
 
3
- 本版为 0.3.8 配套的预发布验证版本,正式渠道仍为总包 0.3.7 / X.36。只有三版 DSH、真实模型、主机与独审门全部通过后才转正式。
3
+ 本版配套总包 0.3.8,固定 N0.4.11 / L0.7.46。零自写提示词、原生技能/子代理及三版 DSH registry 升级门已通过;完整证据与真实模型边界见 TESTS.md。owner 11-16 决定以首调用固定开销为 token 门:同插件清单的 Codex 比直接 CLI 多 517 token(约 3.3%);整题因模型主动技能/依赖/重算步骤及产物不同仍有差异,按原生 DSH 工作流如实披露,不宣称整题 token 持平。历史 P1 原生 DSH 主任务约 34.7 万 token,样本条件不同。
4
4
 
5
5
  本版撤除插件自行拼写的系统规则、位置说明和技能目录说明。模型接收员工输入、原工具描述、CLI 原生上下文,以及员工显式配置的自定义指令原文。DSH 系统规则不转送;同一 DSH 会话切换品牌时仍补带可见对话及角色结构。插件控制诊断留在技术详情,不混入模型回复或下一轮历史。I3 规则重注入、摘要回执与 v2 协商已整体删除。
6
6
 
@@ -8,6 +8,8 @@ DSH 已公布目录的技能与资源同步到两端同一受控绝对路径,S
8
8
 
9
9
  Claude 原生 Agent/TaskStop 与 Codex 原生子代理首轮可用。Codex 只把技能、办公依赖必需桥工具置于 employee 首轮分组,DSH 子代理及其余工具在 dsh 分组按需发现。保留 B6 原生插话、冷恢复、防重放、U1 每次 prompt 用量和原生型号、推理档、权限设置。含桥主机需 2.2.2-aw.17(Codex 0.162.0);不含桥通道不变。没有新增设置项或自定义错误码。
10
10
 
11
+ 上一轮正常结束仍异步清理,不延迟已完成回复。下一次同一可信主机、DSH会话、品牌、原生线程及连接代次打开前,只等待本插件已经发出的那一次释放操作;取消等待不取消释放,失败仍走原有归属校验,不增加模型重试或重复发送任务。
12
+
11
13
  ## 办公依赖与开工计时(O1,2026-11-15)
12
14
 
13
15
  员工目录模式现在桥接 DSH `load_workspace_dependencies`,由 DSH 原生循环执行、审批并返回员工电脑的 Python/Node 绝对路径;命令仍通过员工执行器执行这些路径。主机目录模式不开放工具桥,不能使用员工运行时路径。Codex 新建线程在主机明确声明能力时,先按本轮所选模型建立原生基础说明,再保留每轮模型、推理与权限的真实设置回执;没有裁剪 DSH、安全或原生说明,恢复与真实换模型维持原语义。需主机含桥适配器 `2.2.2-aw.13`;旧主机照旧运行。
@@ -16,9 +18,9 @@ Claude 原生 Agent/TaskStop 与 Codex 原生子代理首轮可用。Codex 只
16
18
 
17
19
  新增设置、限制、错误码均为 0。已有会话的历史说明不会被改写;避免初始模型切换冗余的效果从新会话开始。
18
20
 
19
- ## 含工具桥预发布线
21
+ ## 含工具桥发布线
20
22
 
21
- 本包为 `0.9.0-toolbridge.37-rc.4`,从 `v0.9.0-toolbridge.14` 派生,使用 `host-toolbridge` 发布渠道。员工安装由连接组件提供的「AI 写作工作台(含工具桥)」总包 `@ai-workbench/workbench-toolbridge@0.3.7`;0.3.8 尚未转正式,与不含工具桥的版本二选一。
23
+ 本包为 `0.9.0-toolbridge.37`,从 `v0.9.0-toolbridge.14` 派生,使用 `host-toolbridge` 发布渠道。员工安装由连接组件提供的「AI 写作工作台(含工具桥)」总包 `@ai-workbench/workbench-toolbridge@0.3.8`,与不含工具桥的版本二选一。
22
24
 
23
25
  本轮增加两家运行中插话(DSH 原生 nextStep),保留官方队列和原话;明确 followup 仍排下一轮。Codex 含桥组件需 `2.2.2-aw.12`,Claude 仍为官方 `0.94.0`。插件确定消息未发出时保留排队资格;送达未确认时明确报错且不重放。已注入旧正文不能撤回,编辑版下一步骤交付。
24
26
 
@@ -35,7 +37,7 @@ host `0.8.11` 的新 broker 支持同一客户端/SDK 在切网后按输出游
35
37
 
36
38
  工具表按每次主机连接生成快照,新增/移除在下一次连接生效;不承诺 Codex 当前 MCP 会话热刷新。审批期间的插话等当前主机 prompt 结束后再发,停泊中切换助手会停止原轮次并明确提示。工具主动结束DSH轮次时,已提交结果仍交回原agent;确认原生工具收到后结束原prompt,下一条沿原线程继续,不在已关闭步骤追加模型回复。取消和主机结束等待后的结果不重放;工具已执行的副作用不能因取消而撤销,请按说明核对。图片结果由官方附件组件读取后交回。
37
39
 
38
- 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`。
40
+ Codex 使用独立受保护命令 `/usr/local/aw-host/bin/codex-acp-toolbridge`(本版 aw.17,组件自带固定 Node24.13.1),不会替换原 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`。
39
41
 
40
42
  通过官方 DSH 插件入口使用 Claude(远程主机)与 Codex(远程主机)。登录和工作区来源由“远程主机连接”组件提供;员工在原生工作区和模型菜单中选择文件夹与型号。
41
43
 
@@ -8,14 +8,32 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
8
8
  };
9
9
  import { newColdId } from "./cold-store.js";
10
10
  import { randomUUID } from 'node:crypto';
11
- import { CloseDiagnostics } from "./close-diagnostics.js";
11
+ import { CloseDiagnostics, closeCode } from "./close-diagnostics.js";
12
12
  import { BrokerTransport, brokerCommand, brokerId, sshIo, controlJson } from "./broker.js";
13
13
  import { CODEX_AGENT } from "./agents.js";
14
14
  import { NeedError } from "./remote.js";
15
15
  import { identity } from "./provider.js";
16
16
  import { brokerOwnership } from "./broker-ownership.js";
17
+ /** Wait only for our own already-issued release; aborting the waiter never cancels it. */
18
+ async function awaitRelease(release, signal) {
19
+ signal?.throwIfAborted();
20
+ if (!signal) {
21
+ await release;
22
+ return;
23
+ }
24
+ const aborted = Promise.withResolvers(), onAbort = () => aborted.reject(signal.reason ?? new DOMException('Aborted', 'AbortError'));
25
+ signal.addEventListener('abort', onAbort, { once: true });
26
+ try {
27
+ signal.throwIfAborted();
28
+ await Promise.race([release, aborted.promise]);
29
+ }
30
+ finally {
31
+ signal.removeEventListener('abort', onAbort);
32
+ }
33
+ }
17
34
  /** Each invocation owns a new agent. Context resumes by native session ID, never by reattaching a broker. */
18
35
  export function brokerFactory(_get, _ask, configuration, provided) {
36
+ const pendingReleases = new Map();
19
37
  return async (target, project, request) => {
20
38
  const agent = request.agent ?? CODEX_AGENT, settings = request.brokerSettings ?? (typeof configuration === 'function' ? configuration() : configuration);
21
39
  let argv = provided?.argv;
@@ -26,6 +44,17 @@ export function brokerFactory(_get, _ask, configuration, provided) {
26
44
  const io = provided?.io?.(target) ?? sshIo(target, argv, settings.brokerControlMaxBytes);
27
45
  const command = (args) => brokerCommand(target, args);
28
46
  const diagnostics = request.closeDiagnostics ?? new CloseDiagnostics(detail => request.detailChannel?.record(detail));
47
+ const api = _get(), connection = api?.getConnectionState(), generation = JSON.stringify(connection ? [connection.instanceId, connection.epoch, connection.phase] : null);
48
+ const releaseKey = JSON.stringify([identity(target), target.session.root, request.sessionId, agent.loginProvider]), previousRelease = pendingReleases.get(releaseKey);
49
+ if (request.resumeSessionId !== undefined && previousRelease && previousRelease.nativeId === request.resumeSessionId && previousRelease.api === api && previousRelease.generation === generation) {
50
+ try {
51
+ await awaitRelease(previousRelease.promise, request.signal);
52
+ }
53
+ catch (error) {
54
+ request.signal?.throwIfAborted();
55
+ diagnostics.record({ layer: 'broker', initiator: 'broker.previous-release', reason: closeCode(error, 'BROKER_CONTROL_FAILED'), action: 'failure' });
56
+ }
57
+ }
29
58
  const id = brokerId(request.sessionId + '/' + randomUUID(), agent.id);
30
59
  const startCommand = command(['start', id, '--cwd', project.path, '--settings', target.session.settingsPath, '--dsh-session-id', request.sessionId, '--provider', agent.loginProvider, '--', agent.command]);
31
60
  // environments.toml overrides CODEX_EXEC_SERVER_URL. Refuse that host default rather
@@ -96,23 +125,34 @@ export function brokerFactory(_get, _ask, configuration, provided) {
96
125
  diagnostics.record(cause);
97
126
  channel.close(cause);
98
127
  };
99
- const dispose = async (cause = { layer: 'broker', initiator: 'broker.dispose', reason: 'BROKER_DISPOSE', action: 'dispose' }) => {
128
+ let disposing, nativeSessionId;
129
+ const dispose = (cause = { layer: 'broker', initiator: 'broker.dispose', reason: 'BROKER_DISPOSE', action: 'dispose' }) => {
130
+ if (disposing)
131
+ return disposing;
100
132
  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);
104
- void io.run(command(['kill', id, '--if-instance', started.instanceId])).catch(() => console.warn('[remote-agent] 旧主机会话暂未清理,将由主机自动回收'));
133
+ return Promise.resolve();
134
+ // Register synchronously before detach yields. Only the next same-thread open
135
+ // waits; the completed official turn keeps its non-blocking cleanup contract.
136
+ const release = Promise.resolve().then(async () => { await detach(cause); await io.run(command(['kill', id, '--if-instance', started.instanceId])); });
137
+ disposing = release.catch(() => console.warn('[remote-agent] 旧主机会话暂未清理,将由主机自动回收'));
138
+ const entry = { promise: release, nativeId: nativeSessionId, api, generation };
139
+ pendingReleases.set(releaseKey, entry);
140
+ const clear = () => { if (pendingReleases.get(releaseKey) === entry)
141
+ pendingReleases.delete(releaseKey); };
142
+ void release.then(clear, clear);
143
+ return disposing;
105
144
  };
106
145
  const aborted = () => channel.fail(new NeedError('ABORTED', '本轮已取消。', '确认主机状态'), { layer: 'broker', initiator: 'broker.open-signal', reason: 'ABORTED', action: 'abort' });
107
146
  request.signal?.addEventListener('abort', aborted, { once: true });
108
147
  let sessionOwnership;
109
148
  try {
110
- sessionOwnership = brokerOwnership(io, command, { id, instanceId: started.instanceId }, started, request.sessionId, agent.loginProvider);
149
+ const ownership = brokerOwnership(io, command, { id, instanceId: started.instanceId }, started, request.sessionId, agent.loginProvider);
150
+ sessionOwnership = { ...ownership, async bind(nativeId, signal) { await ownership.bind(nativeId, signal); nativeSessionId = nativeId; } };
111
151
  request.signal?.throwIfAborted();
112
152
  await channel.connect();
113
153
  }
114
154
  catch (error) {
115
- await dispose();
155
+ void dispose().catch(() => console.warn('[remote-agent] 旧主机会话暂未清理,将由主机自动回收'));
116
156
  throw error;
117
157
  }
118
158
  finally {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ai-workbench/remote-agent",
3
- "version": "0.9.0-toolbridge.37-rc.4",
3
+ "version": "0.9.0-toolbridge.37",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",