@ai-workbench/remote-agent 0.9.0-toolbridge.38-rc.2 → 0.9.0-toolbridge.39
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 +2 -2
- package/dist/auth-reason.js +3 -2
- package/dist/close-diagnostics.d.ts +1 -0
- package/dist/close-diagnostics.js +1 -1
- package/dist/employee-relay.js +31 -5
- package/dist/employee-shell.js +2 -2
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
# AI Workbench 远程助手 · @ai-workbench/remote-agent@0.9.0-toolbridge.
|
|
1
|
+
# AI Workbench 远程助手 · @ai-workbench/remote-agent@0.9.0-toolbridge.39 · 插件 → 添加插件
|
|
2
2
|
|
|
3
|
-
本版配套总包 0.3.
|
|
3
|
+
本版配套总包 0.3.10,固定 N0.4.12 / L0.7.47,主机使用 host0.8.14、aw.17 / Codex 0.162.0。登录检查遇到连接被拒或中断时按既有连接类错误提示;真实认证读取失败保持原样。新增员工桥固定错误码与阶段诊断,不记录正文、命令参数或业务路径,不增加重试。继承文件链接与首轮交付工具修复。
|
|
4
4
|
|
|
5
5
|
只逐字转送当前生效的 DSH 原生 `ui:deliverable-file-references` Shared guidance;不硬编码或改写原文,不附加插件自写文字,不恢复其他已撤除的 DSH 系统规则。原文作为独立 ACP 文本上下文块,每个新 prompt 发送一次;适用于新会话及既有原生线程接回,不改变员工输入、插话回执或工具桥等待步骤。它在 ACP 中是用户级上下文,不冒称已恢复 system 角色。生效作用域与完整提示词覆盖均按 DSH 原生组装结果处理。
|
|
6
6
|
|
package/dist/auth-reason.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/** L 0.7.10 officialReason v1 consumer validation; preserve canonical bytes only. */
|
|
2
|
-
const markers = ['AW_REMOTE_COMMAND_KILL_FAILED', 'AUTH_STATUS_JSON_INVALID:SyntaxError', 'Permission denied', 'Host key verification failed', 'Connection refused', 'Connection closed', 'command not found', 'No such file or directory'];
|
|
2
|
+
const markers = ['AW_REMOTE_COMMAND_KILL_FAILED', 'AUTH_STATUS_JSON_INVALID:SyntaxError', 'Permission denied', 'Host key verification failed', 'Connection refused', 'Connection closed', 'Broken pipe', 'Connection reset by peer', 'Connection timed out', 'command not found', 'No such file or directory'];
|
|
3
3
|
const names = ['Error', 'TypeError', 'SyntaxError', 'RangeError', 'AbortError', 'DOMException', 'UnknownError'];
|
|
4
4
|
const codes = ['ENOENT', 'EPERM', 'ESRCH', 'EACCES', 'EINVAL', 'EPIPE', 'ECONNRESET', 'ECONNREFUSED', 'ETIMEDOUT', 'ABORT_ERR', 'UNKNOWN'];
|
|
5
|
+
const transportReasons = ['CONNECTION_REFUSED', 'CONNECTION_RESET', 'PIPE_CLOSED', 'CONNECTION_CLOSED', 'CONNECTION_TIMEOUT', 'CANCELLED', 'SSH_EXIT_NONZERO', 'SSH_STDERR_NONEMPTY', 'SSH_PROCESS_FAILED'];
|
|
5
6
|
const stages = ['ssh-status', 'ssh-result', 'remote-frame', 'auth-status', 'connect-check-login', 'integration-pre-login', 'process-spawn', 'process-stdin', 'process-output', 'process-runner'];
|
|
6
7
|
const reasons = ['CANCELLED', 'SSH_EXIT_NONZERO', 'SSH_STDERR_NONEMPTY', 'FRAME_TRUNCATED', 'FRAME_JSON_INVALID', 'FRAME_OBJECT_INVALID', 'FRAME_VERSION_INVALID', 'FRAME_NONCE_INVALID', 'FRAME_AFTER_END', 'FRAME_KEYS_INVALID', 'FRAME_START_MISSING', 'FRAME_BASE64_INVALID', 'REMOTE_COMMAND_SIGNAL', 'FRAME_END_EXIT_INVALID', 'FRAME_SEQUENCE_OR_VALUE_INVALID', 'FRAME_END_MISSING', 'STATUS_ARGUMENT_INVALID', 'STATUS_EXECUTION_FAILED', 'STATUS_JSON_INVALID', 'STATUS_OBJECT_INVALID', 'STATUS_KEYS_INVALID', 'STATUS_VERSION_INVALID', 'STATUS_PROVIDER_INVALID', 'STATUS_EXIT_MISMATCH', 'STATUS_LOGGED_IN_INVALID', 'STATUS_STDERR_NONEMPTY', 'STATUS_EXIT_INVALID', 'STATUS_EXCEPTION', 'STATUS_SUPERSEDED', 'SSH_PORT_MISSING', 'STDIN_FAILED', 'SPAWN_FAILED', 'OUTPUT_LIMIT_EXCEEDED', 'PROCESS_SIGNAL'];
|
|
7
8
|
const object = (v) => !!v && typeof v === 'object' && !Array.isArray(v);
|
|
@@ -22,6 +23,6 @@ export function validOfficialReason(value) {
|
|
|
22
23
|
}
|
|
23
24
|
if (!object(v) || JSON.stringify(v) !== value || v.version !== 1 || !member(stages, v.stage) || !member(reasons, v.reason))
|
|
24
25
|
return false;
|
|
25
|
-
const fields = { version: x => x === 1, stage: x => member(stages, x), reason: x => member(reasons, x), errorName: x => member(names, x), errorCode: x => member(codes, x), exitCode: x => x === null || typeof x === 'number' && Number.isFinite(x) && Number.isInteger(x), signal: x => member(['SIGTERM', 'SIGKILL', 'SIGABRT', 'SIGHUP', 'SIGINT', 'SIGSEGV', 'OTHER'], x), index: integer, unexpectedCount: integer, maxOutputBytes: x => integer(x) && Number(x) > 0, observedBytes: integer, stderr: summary, output: summary, missing: x => Array.isArray(x) && x.every(k => member(['nonce', 'protocolVersion', 'type', 'data', 'exitCode', 'signal', 'loggedIn', 'provider'], k)), loggedInType: x => member(['null', 'undefined', 'object', 'boolean', 'number', 'string', 'function', 'symbol', 'bigint'], x), exitCodeType: x => member(['undefined', 'object', 'boolean', 'number', 'string', 'function', 'symbol', 'bigint'], x) };
|
|
26
|
+
const fields = { transportReason: x => member(transportReasons, x), version: x => x === 1, stage: x => member(stages, x), reason: x => member(reasons, x), errorName: x => member(names, x), errorCode: x => member(codes, x), exitCode: x => x === null || typeof x === 'number' && Number.isFinite(x) && Number.isInteger(x), signal: x => member(['SIGTERM', 'SIGKILL', 'SIGABRT', 'SIGHUP', 'SIGINT', 'SIGSEGV', 'OTHER'], x), index: integer, unexpectedCount: integer, maxOutputBytes: x => integer(x) && Number(x) > 0, observedBytes: integer, stderr: summary, output: summary, missing: x => Array.isArray(x) && x.every(k => member(['nonce', 'protocolVersion', 'type', 'data', 'exitCode', 'signal', 'loggedIn', 'provider'], k)), loggedInType: x => member(['null', 'undefined', 'object', 'boolean', 'number', 'string', 'function', 'symbol', 'bigint'], x), exitCodeType: x => member(['undefined', 'object', 'boolean', 'number', 'string', 'function', 'symbol', 'bigint'], x) };
|
|
26
27
|
return Object.entries(v).every(([key, item]) => Object.hasOwn(fields, key) && fields[key](item));
|
|
27
28
|
}
|
|
@@ -18,7 +18,7 @@ export class CloseDiagnostics {
|
|
|
18
18
|
recordUsing(sink, cause) {
|
|
19
19
|
if (this.state.first)
|
|
20
20
|
return;
|
|
21
|
-
const payload = Object.freeze({ layer: cause.layer, initiator: cause.initiator, reason: cause.reason, ...cause.remoteReason ? { remoteReason: cause.remoteReason } : {}, ...cause.exitCode !== undefined ? { exitCode: cause.exitCode } : {}, ...cause.signal !== undefined ? { signal: cause.signal } : {}, stage: this.stage, clock: 'client-monotonic', elapsedMs: performance.now() - this.started });
|
|
21
|
+
const payload = Object.freeze({ layer: cause.layer, initiator: cause.initiator, reason: cause.reason, ...cause.remoteReason ? { remoteReason: cause.remoteReason } : {}, ...cause.exitCode !== undefined ? { exitCode: cause.exitCode } : {}, ...cause.signal !== undefined ? { signal: cause.signal } : {}, stage: cause.stage ?? this.stage, clock: 'client-monotonic', elapsedMs: performance.now() - this.started });
|
|
22
22
|
this.state.first = payload;
|
|
23
23
|
try {
|
|
24
24
|
sink({ kind: 'session', severity: 'warning', code: 'REMOTE_CLOSE_REASON', summary: '首次观察到的关闭原因', payload });
|
package/dist/employee-relay.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/** Runs on the host. Only target discovery and SSH stdio forwarding; never user tools. */
|
|
2
2
|
export const EMPLOYEE_TARGET_PYTHON = String.raw `
|
|
3
|
-
import os,sys,json,subprocess,selectors,shlex,re
|
|
3
|
+
import os,sys,json,subprocess,selectors,shlex,re,tempfile
|
|
4
4
|
def fail(code):
|
|
5
|
-
sys.stderr.write(json.dumps({"code":code})+"\n");sys.exit(254)
|
|
5
|
+
sys.stderr.write(json.dumps({"code":code,"stage":"relay.target"})+"\n");sys.exit(254)
|
|
6
6
|
try:
|
|
7
7
|
x=json.loads(sys.argv[1]);e=x["endpoint"];b=x["bridge"];maximum=x["maxBytes"]
|
|
8
8
|
if not isinstance(maximum,int) or isinstance(maximum,bool) or maximum<1:fail("EMPLOYEE_RELAY_SETTINGS_INVALID")
|
|
@@ -42,7 +42,7 @@ export const EMPLOYEE_RELAY_PYTHON = EMPLOYEE_TARGET_PYTHON + String.raw `
|
|
|
42
42
|
class Relay:
|
|
43
43
|
def __init__(self,output):
|
|
44
44
|
self.output=output;self.process=None;self.ready=False;self.initialize=None;self.initialized=None;self.serial=0
|
|
45
|
-
self.pending={};self.front_ids={};self.server_ids={};self.readers=set();self.tasks={}
|
|
45
|
+
self.pending={};self.front_ids={};self.server_ids={};self.readers=set();self.tasks={};self.diagnostics={};self.stages={}
|
|
46
46
|
self.connect_lock=asyncio.Lock();self.write_lock=asyncio.Lock();self.output_lock=asyncio.Lock()
|
|
47
47
|
def identity(self):
|
|
48
48
|
self.serial+=1
|
|
@@ -58,6 +58,17 @@ export const EMPLOYEE_RELAY_PYTHON = EMPLOYEE_TARGET_PYTHON + String.raw `
|
|
|
58
58
|
async with self.write_lock:
|
|
59
59
|
if process is not self.process:raise Disconnected()
|
|
60
60
|
process.stdin.write(self.encode(message));await process.stdin.drain()
|
|
61
|
+
def diagnostic(self,process):
|
|
62
|
+
diagnostic=self.diagnostics.pop(process,None)
|
|
63
|
+
if diagnostic is None:return None
|
|
64
|
+
try:
|
|
65
|
+
diagnostic.seek(0);raw=diagnostic.read(maximum+1)
|
|
66
|
+
match=re.fullmatch(rb"BRIDGE_ERROR ([A-Z][A-Z0-9_]{0,63})\n",raw)
|
|
67
|
+
known=set("USAGE ROOT_FORBIDDEN EMPLOYEE_REQUIRED INVALID_HOME DEVELOPMENT_FORBIDDEN SETTINGS_REQUIRED UNTRUSTED_SETTINGS WRITABLE_SETTINGS SETTINGS_INVALID UNSAFE_STATE SOCKET_PATH_TOO_LONG KEY_GENERATION_FAILED IDENTITY_INCOMPLETE STATE_CORRUPT GENERATION_EXHAUSTED DEVICE_BUSY DEVICE_ACCOUNT_MISMATCH DEVICE_KEY_MISMATCH ENDPOINT_NOT_READY ENDPOINT_OFFLINE INSTANCE_MISMATCH STREAM_NOT_PENDING STREAM_ALREADY_BOUND BRIDGE_BUSY BAD_FRAME CONTROL_TOO_LARGE CONTROL_BACKPRESSURE HANDSHAKE_OBSERVATION_EXPIRED REGISTER_LEASE_EXPIRED TRANSPORT_CLOSED BRIDGE_OS_ERROR BRIDGE_INTERNAL_ERROR".split())
|
|
68
|
+
code=match.group(1).decode("ascii") if match else None
|
|
69
|
+
return code if code in known else None
|
|
70
|
+
except OSError:return None
|
|
71
|
+
finally:diagnostic.close()
|
|
61
72
|
async def disconnect(self,process,report=True):
|
|
62
73
|
if self.process is process:
|
|
63
74
|
if self.ready and report:sys.stderr.write("CLAUDE_EMPLOYEE_MCP_UNKNOWN\n");sys.stderr.flush()
|
|
@@ -72,6 +83,8 @@ export const EMPLOYEE_RELAY_PYTHON = EMPLOYEE_TARGET_PYTHON + String.raw `
|
|
|
72
83
|
try:process.kill()
|
|
73
84
|
except ProcessLookupError:pass
|
|
74
85
|
await process.wait()
|
|
86
|
+
code=self.diagnostic(process);stage=self.stages.pop(process,"relay.ssh-start")
|
|
87
|
+
if report:sys.stderr.write(json.dumps({"code":code or "EMPLOYEE_TRANSPORT_UNKNOWN","stage":stage})+"\n");sys.stderr.flush()
|
|
75
88
|
async def read(self,process):
|
|
76
89
|
try:
|
|
77
90
|
while True:
|
|
@@ -108,15 +121,28 @@ export const EMPLOYEE_RELAY_PYTHON = EMPLOYEE_TARGET_PYTHON + String.raw `
|
|
|
108
121
|
async with self.connect_lock:
|
|
109
122
|
if self.process is not None and self.ready:return self.process
|
|
110
123
|
if self.initialize is None:raise Disconnected()
|
|
111
|
-
|
|
124
|
+
ssh_args=list(args);diagnostic=None
|
|
125
|
+
proxy=[i for i,arg in enumerate(ssh_args) if arg.startswith("ProxyCommand=")]
|
|
126
|
+
if len(proxy)==1:
|
|
127
|
+
try:
|
|
128
|
+
diagnostic=tempfile.NamedTemporaryFile(prefix="aw-x-relay-")
|
|
129
|
+
ssh_args[proxy[0]]+=" 2>"+shlex.quote(diagnostic.name.replace("%","%%"))
|
|
130
|
+
except OSError:
|
|
131
|
+
if diagnostic is not None:diagnostic.close()
|
|
132
|
+
diagnostic=None
|
|
133
|
+
try:process=await asyncio.create_subprocess_exec("/usr/bin/ssh","-T",*ssh_args,command,stdin=asyncio.subprocess.PIPE,stdout=asyncio.subprocess.PIPE,limit=maximum+1)
|
|
134
|
+
except BaseException:
|
|
135
|
+
if diagnostic is not None:diagnostic.close()
|
|
136
|
+
raise
|
|
112
137
|
self.process=process;self.ready=False
|
|
138
|
+
self.stages[process]="relay.mcp-initialize";self.diagnostics[process]=diagnostic
|
|
113
139
|
reader=asyncio.create_task(self.read(process));self.readers.add(reader);reader.add_done_callback(self.readers.discard)
|
|
114
140
|
try:
|
|
115
141
|
reply=await self.request(process,{"jsonrpc":"2.0","method":"initialize","params":self.initialize})
|
|
116
142
|
if "error" in reply:raise Disconnected()
|
|
117
143
|
await self.write(process,{"jsonrpc":"2.0","method":"notifications/initialized"})
|
|
118
144
|
if process is not self.process:raise Disconnected()
|
|
119
|
-
self.initialized=reply["result"];self.ready=True
|
|
145
|
+
self.initialized=reply["result"];self.ready=True;self.stages[process]="relay.mcp-active"
|
|
120
146
|
return process
|
|
121
147
|
except asyncio.CancelledError:
|
|
122
148
|
await self.disconnect(process);raise
|
package/dist/employee-shell.js
CHANGED
|
@@ -94,12 +94,12 @@ export function createEmployeeShell(options) {
|
|
|
94
94
|
source = parsed.code;
|
|
95
95
|
}
|
|
96
96
|
catch { /* Never expose arbitrary transport diagnostics. */ }
|
|
97
|
-
diagnostics?.record({ layer: 'relay', initiator: 'shell.process-close', reason: bridgeCode ?? source ?? 'EMPLOYEE_EXIT_UNKNOWN', action: 'failure', exitCode: code ?? null, signal: exitSignal ?? null });
|
|
97
|
+
diagnostics?.record({ layer: 'relay', initiator: 'shell.process-close', reason: bridgeCode ?? source ?? 'EMPLOYEE_EXIT_UNKNOWN', action: 'failure', exitCode: code ?? null, signal: exitSignal ?? null, stage: 'shell.ssh-start' });
|
|
98
98
|
no(unknown(bridgeCode ?? source ?? 'EMPLOYEE_EXIT_UNKNOWN'));
|
|
99
99
|
return;
|
|
100
100
|
}
|
|
101
101
|
if (code === null || code === undefined || code === 255 || end < 0) {
|
|
102
|
-
diagnostics?.record({ layer: 'relay', initiator: 'shell.process-close', reason: bridgeCode ?? 'EMPLOYEE_EXIT_UNKNOWN', action: 'failure', exitCode: code ?? null, signal: exitSignal ?? null });
|
|
102
|
+
diagnostics?.record({ layer: 'relay', initiator: 'shell.process-close', reason: bridgeCode ?? 'EMPLOYEE_EXIT_UNKNOWN', action: 'failure', exitCode: code ?? null, signal: exitSignal ?? null, stage: 'shell.command-result' });
|
|
103
103
|
no(unknown(bridgeCode ?? 'EMPLOYEE_EXIT_UNKNOWN'));
|
|
104
104
|
return;
|
|
105
105
|
}
|