@yu_robotics/remote-cli 1.6.115 → 1.6.117
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 -0
- package/dist/client/MessageHandler.js +1 -1
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +5 -2
- package/dist/commands/start.js.map +1 -1
- package/dist/executor/DshExecutor.d.ts.map +1 -1
- package/dist/executor/DshExecutor.js +29 -2
- package/dist/executor/DshExecutor.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -16,6 +16,8 @@ Remote control Claude Code, AGY CLI, Codex CLI, OpenCode CLI, Kimi Code CLI, ZCo
|
|
|
16
16
|
- **Automatic Updates**: Install the newer Router's exact version when idle. Manual clients keep running and use the update on their next start; supervised non-interactive clients exit for an immediate restart.
|
|
17
17
|
- **Task Recovery**: With a compatible Router, running tasks resume output on a usable surviving card or a new card with an output-gap notice. Recovery retries use bounded backoff; disconnected output is not buffered or replayed, even after recovery is paused.
|
|
18
18
|
|
|
19
|
+
Router 1.6.117 and newer explicitly label standalone background-task notifications **Background task**. The status, originating thread name (or thread ID when no name is provided), and abbreviated task ID remain visible, while **View details** is collapsed by default and contains the rich Markdown result and optional output path. Failed tasks also show a short, literal failure summary outside the panel. This changes only the Router presentation: the CLI protocol, foreground replies, delegated-worker cards, and reply-to-thread routing remain unchanged.
|
|
20
|
+
|
|
19
21
|
## Prerequisites
|
|
20
22
|
|
|
21
23
|
- **Node.js** >= 18.0.0
|
|
@@ -750,7 +750,7 @@ Use /compact to reduce conversation context or /clear to start a fresh context.`
|
|
|
750
750
|
- /compact - Compress conversation history to reduce context size
|
|
751
751
|
- /cd <directory> - Change working directory for this thread
|
|
752
752
|
- /model [name] - Show models for the active backend, or set this thread's model
|
|
753
|
-
- /effort [auto|level] - Show or set effort for Codex/AGY/OpenCode/Kimi/ZCode/Pi (Claude Code is unsupported)
|
|
753
|
+
- /effort [auto|level] - Show or set effort for Codex/AGY/OpenCode/Kimi/ZCode/Pi/DSH (Claude Code is unsupported)
|
|
754
754
|
- /sandbox [on|off|read-only|default|allow <directory>|remove <directory>|network on|off] - Configure this thread's sandbox (Codex, Claude Code)
|
|
755
755
|
- /delegation [on|off|reset [backend]] - Delegate tasks between installed agent backends; reset saved worker context when needed
|
|
756
756
|
- /backend - List backends and show the current thread's effective backend
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAY,EAAE,KAAK,GAAG,EAAE,MAAM,KAAK,CAAC;AAKpC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,oBAAoB;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAY,EAAE,KAAK,GAAG,EAAE,MAAM,KAAK,CAAC;AAKpC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,oBAAoB;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDzH;AAED,2EAA2E;AAC3E,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAcrF;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CAoL7B"}
|
package/dist/commands/start.js
CHANGED
|
@@ -36,19 +36,22 @@ async function checkBackendAvailability(type, spinner, executorConfig) {
|
|
|
36
36
|
const isKimi = type === 'kimi';
|
|
37
37
|
const isZCode = type === 'zcode';
|
|
38
38
|
const isPi = type === 'pi';
|
|
39
|
+
const isDsh = type === 'dsh';
|
|
39
40
|
const cmd = isAgy ? (executorConfig?.agy?.command ?? 'agy')
|
|
40
41
|
: isCodex ? (executorConfig?.codex?.command ?? 'codex')
|
|
41
42
|
: isOpenCode ? (executorConfig?.opencode?.command ?? 'opencode')
|
|
42
43
|
: isKimi ? (executorConfig?.kimi?.command ?? 'kimi')
|
|
43
44
|
: isPi ? (executorConfig?.pi?.command ?? 'pi')
|
|
44
|
-
: '
|
|
45
|
+
: isDsh ? (executorConfig?.dsh?.command ?? 'dsh')
|
|
46
|
+
: 'claude';
|
|
45
47
|
const label = isAgy ? 'AGY CLI (Antigravity)'
|
|
46
48
|
: isCodex ? 'Codex CLI (OpenAI)'
|
|
47
49
|
: isOpenCode ? 'OpenCode CLI'
|
|
48
50
|
: isKimi ? 'Kimi Code CLI'
|
|
49
51
|
: isZCode ? 'ZCode'
|
|
50
52
|
: isPi ? 'Pi'
|
|
51
|
-
: '
|
|
53
|
+
: isDsh ? 'DeepSeek Harness'
|
|
54
|
+
: 'Claude Code';
|
|
52
55
|
const canRun = (args) => new Promise((resolve) => {
|
|
53
56
|
(0, child_process_1.execFile)(cmd, args, { timeout: 5000 }, (err) => resolve(!err));
|
|
54
57
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;;;;;AA2CA,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DshExecutor.d.ts","sourceRoot":"","sources":["../../src/executor/DshExecutor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAI1G,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,KAAK,YAAY,CAAC;CAC7E;
|
|
1
|
+
{"version":3,"file":"DshExecutor.d.ts","sourceRoot":"","sources":["../../src/executor/DshExecutor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAI1G,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,KAAK,YAAY,CAAC;CAC7E;AAcD,2FAA2F;AAC3F,qBAAa,WAAY,SAAQ,WAAW;IAC1C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAW;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,KAAK,EAAE,cAAc,EAAE,OAAO,GAAE,kBAAuB;IA4FnE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,CAAC;IAO7E,MAAM,IAAI,OAAO;IACjB,eAAe,IAAI,oBAAoB,GAAG,IAAI;IAExC,UAAU,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAShD,YAAY,IAAI,IAAI;IASd,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;IA6BjF,mFAAmF;IAC7E,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKlD,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAKzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B"}
|
|
@@ -11,6 +11,7 @@ const crypto_1 = require("crypto");
|
|
|
11
11
|
const AcpExecutor_1 = require("./AcpExecutor");
|
|
12
12
|
const compactHandoff_1 = require("./compactHandoff");
|
|
13
13
|
const DshAcpClient_1 = require("./dsh/DshAcpClient");
|
|
14
|
+
const COMPACT_CONTEXT_UNAVAILABLE = 'The saved DSH context cannot be resumed over ACP. No compact summary was created. Send a normal task to start fresh, or use /clear.';
|
|
14
15
|
/** DSH-specific compatibility policy; other ACP executors keep their existing defaults. */
|
|
15
16
|
class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
16
17
|
state;
|
|
@@ -19,7 +20,7 @@ class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
|
19
20
|
// Do not silently launch a DSH task in a different workspace when admission fails.
|
|
20
21
|
if (options.initialWorkingDirectory)
|
|
21
22
|
guard.resolveWorkingDirectory(options.initialWorkingDirectory, process.cwd());
|
|
22
|
-
const state = { images: false, usage: null, compacting: false, generation: 0 };
|
|
23
|
+
const state = { images: false, usage: null, recoveryNotice: false, compacting: false, generation: 0 };
|
|
23
24
|
const directory = options.sessionBaseDir ?? path_1.default.join(os_1.default.homedir(), '.remote-cli', 'dsh-sessions');
|
|
24
25
|
const handoffFile = path_1.default.join(directory, `${options.threadId ?? 'default'}.handoff.json`);
|
|
25
26
|
const clearHandoff = () => {
|
|
@@ -51,7 +52,25 @@ class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
|
51
52
|
return result;
|
|
52
53
|
},
|
|
53
54
|
newSession: (...args) => transport.newSession(...args),
|
|
54
|
-
loadSession: (...args) =>
|
|
55
|
+
loadSession: async (...args) => {
|
|
56
|
+
try {
|
|
57
|
+
return await transport.loadSession(...args);
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
61
|
+
// Match only DSH's known permanent error, not provider text or arbitrary RPC failures.
|
|
62
|
+
if (/^(?:ACP error -32602:\s*)?session is not resumable(?:\s*:|$)/i.test(message)) {
|
|
63
|
+
if (state.compacting)
|
|
64
|
+
throw new Error(COMPACT_CONTEXT_UNAVAILABLE);
|
|
65
|
+
state.recoveryNotice = true;
|
|
66
|
+
throw new Error('Session not found: the saved DSH context cannot be resumed over ACP.');
|
|
67
|
+
}
|
|
68
|
+
if (/^(?:ACP error -32602:\s*)?session cwd does not match(?:\s*:|$)/i.test(message)) {
|
|
69
|
+
throw new Error('The saved DSH session belongs to a different working directory. No context was reset. Use /clear to start fresh in the current directory, or /cd <directory> to change directories and start fresh. Changing directories does not automatically resume the original conversation.');
|
|
70
|
+
}
|
|
71
|
+
throw error;
|
|
72
|
+
}
|
|
73
|
+
},
|
|
55
74
|
setConfigOption: (id, key, value) => transport.setConfigOption(id, key, key === 'reasoning_effort' && value === 'auto' ? '' : value),
|
|
56
75
|
deleteSession: id => transport.deleteSession(id),
|
|
57
76
|
sendCancel: id => transport.sendCancel(id),
|
|
@@ -61,6 +80,10 @@ class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
|
61
80
|
if (!state.images && blocks.some(block => block.type === 'image')) {
|
|
62
81
|
throw new Error('This DSH ACP profile/model does not support image input. No part of this prompt was submitted.');
|
|
63
82
|
}
|
|
83
|
+
if (state.recoveryNotice) {
|
|
84
|
+
callbacks.onTextChunk?.({ type: 'text', text: '⚠️ The saved DSH context cannot be resumed over ACP. Continuing in a new session; remote-cli did not delete native DSH history.\n\n' });
|
|
85
|
+
state.recoveryNotice = false;
|
|
86
|
+
}
|
|
64
87
|
const handoff = state.handoff;
|
|
65
88
|
const result = await transport.prompt(id, handoff
|
|
66
89
|
? [{ type: 'text', text: (0, compactHandoff_1.seedPromptWithHandoff)(handoff.text, '') }, ...blocks] : blocks);
|
|
@@ -115,6 +138,7 @@ class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
|
115
138
|
fs_1.default.rmSync(this.handoffFile, { force: true });
|
|
116
139
|
this.state.handoff = undefined;
|
|
117
140
|
this.state.usage = null;
|
|
141
|
+
this.state.recoveryNotice = false;
|
|
118
142
|
super.resetContext();
|
|
119
143
|
}
|
|
120
144
|
async setWorkingDirectory(target) {
|
|
@@ -125,11 +149,14 @@ class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
|
125
149
|
fs_1.default.rmSync(this.handoffFile, { force: true });
|
|
126
150
|
this.state.handoff = undefined;
|
|
127
151
|
this.state.usage = null;
|
|
152
|
+
this.state.recoveryNotice = false;
|
|
128
153
|
}
|
|
129
154
|
}
|
|
130
155
|
async compactWhenFull(onStream) {
|
|
131
156
|
if (this.isBusy())
|
|
132
157
|
return { success: false, error: 'DSH is busy. Wait before compacting.' };
|
|
158
|
+
if (this.state.recoveryNotice)
|
|
159
|
+
return { success: false, error: COMPACT_CONTEXT_UNAVAILABLE };
|
|
133
160
|
if (this.state.handoff)
|
|
134
161
|
return { success: true, output: 'A compact summary is already saved for the next DSH turn.' };
|
|
135
162
|
this.state.compacting = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DshExecutor.js","sourceRoot":"","sources":["../../src/executor/DshExecutor.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,4CAAoB;AACpB,gDAAwB;AACxB,mCAAoC;AAEpC,+CAA4C;AAG5C,qDAAiF;AACjF,qDAAkD;
|
|
1
|
+
{"version":3,"file":"DshExecutor.js","sourceRoot":"","sources":["../../src/executor/DshExecutor.ts"],"names":[],"mappings":"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"}
|