@ai-workbench/remote-agent 0.8.25 → 0.8.26

package/README.md

@@ -1,4 +1,4 @@
-# AI Workbench 远程助手 · @ai-workbench/remote-agent@0.8.25 · 插件 → 添加插件
+# AI Workbench 远程助手 · @ai-workbench/remote-agent@0.8.26 · 插件 → 添加插件
 
 通过官方 DSH 插件入口使用 Claude（远程主机）与 Codex（远程主机）。登录和工作区来源由“远程主机连接”组件提供；员工在原生工作区和模型菜单中选择文件夹与型号。
 
@@ -6,6 +6,8 @@
 
 需要远程主机连接组件 0.7.29 或更新的 0.7.x，以及联网助手 0.4.9。主机来源保存于官方 storage.domain 的会话元数据表，每轮仅由连接组件检查一次主机目录，不检查本机占位目录。
 
+Claude 本机 Bash 会单独消费员工桥代理的控制诊断，不把它交给模型当作命令输出；真实传输中断仍提示结果未知。命令自身的标准输出、标准错误与退出码照常返回。
+
 ## 会话行为
 
 每轮启动一个新助手进程，按原生会话编号恢复上下文；不接回旧进程或重放上一轮输入。主机会话始终使用创建时保存的主机和目录；工作区之后的选择只影响新会话。

package/dist/employee-shell.d.ts

@@ -1,4 +1,4 @@
-import { type CloseDiagnostics } from './close-diagnostics.ts';
+import type { CloseDiagnostics } from './close-diagnostics.ts';
 import type { ChildProcessWithoutNullStreams } from 'node:child_process';
 import type { EmployeeEndpointTarget } from './employee-endpoint.ts';
 export interface EmployeeShellResult {

package/dist/employee-shell.js

@@ -1,19 +1,35 @@
-import { closeCode } from "./close-diagnostics.js";
 import { randomUUID } from 'node:crypto';
 import { EMPLOYEE_PYTHON_ERRORS } from "./employee-relay.js";
 import { NeedError } from "./remote.js";
 const SHELL_PYTHON = String.raw `
-import sys,json,subprocess,shlex
+import sys,json,subprocess,shlex,tempfile,signal,re
 def fail(code):
  sys.stderr.write(json.dumps({"code":code})+"\n");sys.exit(254)
 try:
- x=json.loads(sys.argv[1]);e=x["endpoint"];args=x["sshArgs"];cwd=x["cwd"]
+ x=json.loads(sys.argv[1]);e=x["endpoint"];args=list(x["sshArgs"]);cwd=x["cwd"]
+ proxy=[i for i,arg in enumerate(args) if arg.startswith("ProxyCommand=")]
+ if len(proxy)!=1:fail("EMPLOYEE_BRIDGE_PROTOCOL_INVALID")
  # User source is stdin, never argv. The sentinel preserves trailing newlines.
  wrapper="cd -- "+shlex.quote(cwd)+" || exit 254; "+"printf '%s\\n' "+shlex.quote('AW_EMPLOYEE_SHELL_STARTED '+x['executionId'])+" >&2; "+'aw_x_source=$(/bin/cat; printf x); aw_x_source='+chr(36)+'{aw_x_source%?}; eval "'+chr(36)+'aw_x_source"'
  command=shlex.join([e["endpointShell"],"-c",wrapper])
  sys.stderr.write("AW_EMPLOYEE_SHELL_READY "+x["executionId"]+"\n");sys.stderr.flush()
- p=subprocess.Popen(["/usr/bin/ssh","-T"]+args+[command],stdin=sys.stdin,stdout=sys.stdout,stderr=sys.stderr)
- code=p.wait();sys.exit(code if code>=0 else 255)
+ # OpenSSH inherits ProxyCommand fd2 into its combined stderr. Separate that
+ # producer before launch; never inspect/filter the employee command's bytes.
+ def interrupted(signum,frame):
+  raise SystemExit(255)
+ for sig in [signal.SIGTERM,signal.SIGHUP,signal.SIGINT]:signal.signal(sig,interrupted)
+ with tempfile.NamedTemporaryFile(prefix="aw-x-bridge-") as diagnostic:
+  # S already escaped its own percent tokens. Only escape the added path.
+  i=proxy[0];args[i]+=" 2>"+shlex.quote(diagnostic.name.replace("%","%%"))
+  p=subprocess.Popen(["/usr/bin/ssh","-T"]+args+[command],stdin=sys.stdin,stdout=sys.stdout,stderr=sys.stderr)
+  code=p.wait()
+  diagnostic.seek(0)
+  # S's raw CLI emits at most one fixed error line, never arbitrary diagnostics.
+  raw=diagnostic.read(x["maxBytes"]+1)
+  match=re.fullmatch(rb"BRIDGE_ERROR ([A-Z][A-Z0-9_]{0,63})\n",raw)
+  bridge_code=match.group(1).decode("ascii") if match else None
+  sys.stderr.write("\nAW_EMPLOYEE_BRIDGE_RESULT "+x["executionId"]+" "+json.dumps(bridge_code)+"\n");sys.stderr.flush()
+ sys.exit(code if code>=0 else 255)
 ` + EMPLOYEE_PYTHON_ERRORS;
 const unknown = (code) => new NeedError(code, '本机命令结果未知；没有重放，也未改在主机执行。', '员工端真实退出回执');
 /** Use only the target verified at this round lease opening. Cancellation cannot prove remote exit. */
@@ -22,11 +38,10 @@ export function createEmployeeShell(options) {
         signal.throwIfAborted();
         const diagnostics = options.closeDiagnostics?.child();
         const executionId = randomUUID(), target = options.target;
-        const child = await options.attach({ command: '/usr/bin/python3', args: ['-c', SHELL_PYTHON, JSON.stringify({ endpoint: target.endpoint, sshArgs: options.sshArgs, cwd: target.local.directory.path, executionId })] });
+        const child = await options.attach({ command: '/usr/bin/python3', args: ['-c', SHELL_PYTHON, JSON.stringify({ endpoint: target.endpoint, sshArgs: options.sshArgs, cwd: target.local.directory.path, executionId, maxBytes: options.maxBytes })] });
         return new Promise((yes, no) => {
             let settled = false, bytes = 0, stdout = [], stderr = [], reason, grace, timer;
-            const finish = (error, code) => {
-                diagnostics?.record({ layer: 'executor', initiator: 'shell.finish', reason: closeCode(error, 'SHELL_FINISHED'), action: 'close', exitCode: code ?? null, changes: [{ field: 'shell.settled', before: settled, after: true }] });
+            const finish = (error, code, exitSignal) => {
                 if (settled)
                     return;
                 settled = true;
@@ -39,6 +54,7 @@ export function createEmployeeShell(options) {
                 child.stdout.destroy();
                 child.stderr.destroy();
                 if (error) {
+                    diagnostics?.record({ layer: 'executor', initiator: 'shell.finish', reason: error.code, action: 'failure', exitCode: code ?? null });
                     no(error);
                     return;
                 }
@@ -51,6 +67,23 @@ export function createEmployeeShell(options) {
                     no(unknown('EMPLOYEE_OUTPUT_BINARY_UNSUPPORTED'));
                     return;
                 }
+                const trailer = '\nAW_EMPLOYEE_BRIDGE_RESULT ' + executionId + ' ', end = err.lastIndexOf(trailer);
+                let bridgeCode;
+                if (end >= 0) {
+                    try {
+                        const value = JSON.parse(err.slice(end + trailer.length));
+                        if (typeof value === 'string' && /^[A-Z][A-Z0-9_]{0,63}$/.test(value))
+                            bridgeCode = value;
+                        else if (value !== null)
+                            throw Error();
+                        err = err.slice(0, end);
+                    }
+                    catch {
+                        no(unknown('EMPLOYEE_EXIT_UNKNOWN'));
+                        return;
+                    }
+                }
+                diagnostics?.record({ layer: 'relay', initiator: 'shell.process-close', reason: 'PROCESS_EXIT', action: 'exit', exitCode: code ?? null, signal: exitSignal ?? null, ...bridgeCode ? { remoteReason: bridgeCode } : {} });
                 const header = 'AW_EMPLOYEE_SHELL_READY ' + executionId + '\n', started = 'AW_EMPLOYEE_SHELL_STARTED ' + executionId + '\n';
                 const start = err.indexOf(started, header.length);
                 if (!err.startsWith(header) || start < header.length || start > header.length && err[start - 1] !== '\n') {
@@ -62,11 +95,11 @@ export function createEmployeeShell(options) {
                             source = parsed.code;
                     }
                     catch { /* Never expose arbitrary transport diagnostics. */ }
-                    no(unknown(source ?? 'EMPLOYEE_EXIT_UNKNOWN'));
+                    no(unknown(bridgeCode ?? source ?? 'EMPLOYEE_EXIT_UNKNOWN'));
                     return;
                 }
-                if (code === null || code === undefined || code === 255) {
-                    no(unknown('EMPLOYEE_EXIT_UNKNOWN'));
+                if (code === null || code === undefined || code === 255 || end < 0) {
+                    no(unknown(bridgeCode ?? 'EMPLOYEE_EXIT_UNKNOWN'));
                     return;
                 }
                 yes({ stdout: out, stderr: err.slice(header.length, start) + err.slice(start + started.length), stderrSource: 'combined-ssh-and-command', exitCode: code, signal: null });
@@ -85,7 +118,7 @@ export function createEmployeeShell(options) {
             child.stderr.on('data', (b) => collect(stderr, b));
             child.stdin.on('error', () => stop('EMPLOYEE_INPUT_UNKNOWN'));
             child.once('error', () => { diagnostics?.record({ layer: 'relay', initiator: 'shell.process-error', reason: 'EMPLOYEE_TRANSPORT_UNKNOWN', action: 'failure' }); finish(unknown('EMPLOYEE_TRANSPORT_UNKNOWN')); });
-            child.once('close', (code, exitSignal) => { diagnostics?.record({ layer: 'relay', initiator: 'shell.process-close', reason: reason?.code ?? 'PROCESS_EXIT', action: 'exit', exitCode: code, signal: exitSignal }); finish(reason, code); });
+            child.once('close', (code, exitSignal) => finish(reason, code, exitSignal));
             signal.addEventListener('abort', abort, { once: true });
             if (signal.aborted)
                 abort();

package/package.json

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