@artenx/dshb 0.1.7 → 0.1.9

package/lib/router/decorate-shell.js

@@ -1,35 +1,97 @@
 import { sharedWorldResolver } from "./resolve.js";
 //#region src/router/decorate-shell.ts
+function outputReader(pick, current) {
+	return { readFrom: (fromByte) => {
+		const result = current();
+		if (!result) return {
+			text: "",
+			nextOffset: fromByte,
+			lossy: false
+		};
+		const output = pick(result);
+		const bytes = Buffer.from(output.text, "utf8");
+		const start = Math.max(0, Math.min(fromByte, bytes.length));
+		return {
+			text: bytes.subarray(start).toString("utf8"),
+			nextOffset: bytes.length,
+			lossy: output.truncated && start === 0,
+			...output.spillPath ? { spillPath: output.spillPath } : {}
+		};
+	} };
+}
+/**
+* DSH 0.1.6+ collapses the shell seam into `resolve`/`execute`, and the
+* `ShellExecution` handle replaces the old `run`/`start` pair. Remote worlds
+* still expose a foreground `run`, so this adapts one remote run into a live
+* execution handle: the foreground projection is the run's result, and the
+* handle's status, exit classification, and collectors settle from it.
+*/
+function executionFromRemoteRun(shell, spec) {
+	const resultPromise = shell.run(spec);
+	let status = "running";
+	let exitCode = null;
+	let signal = null;
+	let collected;
+	let consumed = false;
+	const execution = {
+		get status() {
+			return status;
+		},
+		get exitCode() {
+			return exitCode;
+		},
+		get signal() {
+			return signal;
+		},
+		done: resultPromise.then((result) => {
+			collected = result;
+			status = "completed";
+			exitCode = result.exitCode;
+			signal = result.signal;
+		}, () => {
+			status = "killed";
+		}),
+		readOutput: () => {
+			if (!collected || consumed) return {
+				delta: "",
+				lossy: false
+			};
+			consumed = true;
+			const result = collected;
+			return {
+				delta: result.stdout.text + result.stderr.text,
+				lossy: result.stdout.truncated || result.stderr.truncated,
+				...result.stdout.spillPath ? { stdoutSpillPath: result.stdout.spillPath } : {},
+				...result.stderr.spillPath ? { stderrSpillPath: result.stderr.spillPath } : {}
+			};
+		},
+		observed: {
+			stdout: outputReader((result) => result.stdout, () => collected),
+			stderr: outputReader((result) => result.stderr, () => collected)
+		},
+		kill: () => false,
+		result: () => resultPromise
+	};
+	return Promise.resolve(execution);
+}
 function decorateShell(shell) {
 	const resolver = sharedWorldResolver();
-	const origRun = shell.run.bind(shell);
-	const origStart = shell.start.bind(shell);
-	shell.run = async (spec) => {
+	const origExecute = shell.execute.bind(shell);
+	shell.execute = async (spec) => {
 		const ref = resolver.resolve(spec.workdir ?? "");
-		if (ref.kind === "local") return origRun(spec);
+		if (ref.kind === "local") return origExecute(spec);
 		if (ref.kind === "unrouted") throw new Error(`node ${ref.nodeId} world not available`);
 		await ref.provider.ensureDir(ref.remotePath).catch(() => {});
-		return ref.provider.shell.run({
-			...spec,
-			workdir: ref.remotePath
-		});
-	};
-	shell.start = (spec) => {
-		const ref = resolver.resolve(spec.workdir ?? "");
-		if (ref.kind === "local") return origStart(spec);
-		if (ref.kind === "unrouted") throw new Error(`node ${ref.nodeId} world not available`);
-		ref.provider.ensureDir(ref.remotePath).catch(() => {});
-		return ref.provider.shell.start({
+		return executionFromRemoteRun(ref.provider.shell, {
 			...spec,
 			workdir: ref.remotePath
 		});
 	};
 	return () => {
-		shell.run = origRun;
-		shell.start = origStart;
+		shell.execute = origExecute;
 	};
 }
 //#endregion
-export { decorateShell };
+export { decorateShell, executionFromRemoteRun };
 
 //# sourceMappingURL=decorate-shell.js.map

package/lib/router/decorate-shell.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorate-shell.js","names":[],"sources":["../../src/router/decorate-shell.ts"],"sourcesContent":["import type { ShellExecutor } from '@deepseek-ai/dsh-shell'\nimport type { ShellExecRequest, ShellExecSpec, ShellProcess, ShellRunResult } from '@deepseek-ai/dsh-shell'\nimport { sharedWorldResolver } from './resolve.js'\n\nexport function decorateShell(shell: ShellExecutor): () => void {\n  const resolver = sharedWorldResolver()\n\n  const origRun = shell.run.bind(shell)\n  const origStart = shell.start.bind(shell)\n\n  shell.run = async (spec: ShellExecSpec): Promise<ShellRunResult> => {\n    const ref = resolver.resolve(spec.workdir ?? '')\n    if (ref.kind === 'local') return origRun(spec)\n    if (ref.kind === 'unrouted') throw new Error(`node ${ref.nodeId} world not available`)\n    await ref.provider.ensureDir(ref.remotePath).catch(() => {})\n    return ref.provider.shell.run({ ...spec, workdir: ref.remotePath })\n  }\n\n  shell.start = (spec: ShellExecSpec): ShellProcess => {\n    const ref = resolver.resolve(spec.workdir ?? '')\n    if (ref.kind === 'local') return origStart(spec)\n    if (ref.kind === 'unrouted') throw new Error(`node ${ref.nodeId} world not available`)\n    void ref.provider.ensureDir(ref.remotePath).catch(() => {})\n    return ref.provider.shell.start({ ...spec, workdir: ref.remotePath })\n  }\n\n  return () => {\n    shell.run = origRun\n    shell.start = origStart\n  }\n}\n"],"mappings":";;AAIA,SAAgB,cAAc,OAAkC;CAC9D,MAAM,WAAW,oBAAoB;CAErC,MAAM,UAAU,MAAM,IAAI,KAAK,KAAK;CACpC,MAAM,YAAY,MAAM,MAAM,KAAK,KAAK;CAExC,MAAM,MAAM,OAAO,SAAiD;EAClE,MAAM,MAAM,SAAS,QAAQ,KAAK,WAAW,EAAE;EAC/C,IAAI,IAAI,SAAS,SAAS,OAAO,QAAQ,IAAI;EAC7C,IAAI,IAAI,SAAS,YAAY,MAAM,IAAI,MAAM,QAAQ,IAAI,OAAO,qBAAqB;EACrF,MAAM,IAAI,SAAS,UAAU,IAAI,UAAU,CAAC,CAAC,YAAY,CAAC,CAAC;EAC3D,OAAO,IAAI,SAAS,MAAM,IAAI;GAAE,GAAG;GAAM,SAAS,IAAI;EAAW,CAAC;CACpE;CAEA,MAAM,SAAS,SAAsC;EACnD,MAAM,MAAM,SAAS,QAAQ,KAAK,WAAW,EAAE;EAC/C,IAAI,IAAI,SAAS,SAAS,OAAO,UAAU,IAAI;EAC/C,IAAI,IAAI,SAAS,YAAY,MAAM,IAAI,MAAM,QAAQ,IAAI,OAAO,qBAAqB;EACrF,IAAS,SAAS,UAAU,IAAI,UAAU,CAAC,CAAC,YAAY,CAAC,CAAC;EAC1D,OAAO,IAAI,SAAS,MAAM,MAAM;GAAE,GAAG;GAAM,SAAS,IAAI;EAAW,CAAC;CACtE;CAEA,aAAa;EACX,MAAM,MAAM;EACZ,MAAM,QAAQ;CAChB;AACF"}
+{"version":3,"file":"decorate-shell.js","names":[],"sources":["../../src/router/decorate-shell.ts"],"sourcesContent":["import type { ShellExecutor, ShellExecSpec, ShellExecution, ShellProcessRead, ShellProcessStatus, ShellRunResult } from '@deepseek-ai/dsh-shell'\nimport type { CollectedOutput, SubprocessOutputReader } from '@deepseek-ai/dsh-subprocess'\nimport { sharedWorldResolver } from './resolve.js'\nimport type { ShellDelegate } from './types.js'\n\nfunction outputReader(pick: (result: ShellRunResult) => CollectedOutput, current: () => ShellRunResult | undefined): SubprocessOutputReader {\n  return {\n    readFrom: (fromByte: number) => {\n      const result = current()\n      if (!result) return { text: '', nextOffset: fromByte, lossy: false }\n      const output = pick(result)\n      const bytes = Buffer.from(output.text, 'utf8')\n      const start = Math.max(0, Math.min(fromByte, bytes.length))\n      const text = bytes.subarray(start).toString('utf8')\n      return {\n        text,\n        nextOffset: bytes.length,\n        lossy: output.truncated && start === 0,\n        ...(output.spillPath ? { spillPath: output.spillPath } : {}),\n      }\n    },\n  }\n}\n\n/**\n * DSH 0.1.6+ collapses the shell seam into `resolve`/`execute`, and the\n * `ShellExecution` handle replaces the old `run`/`start` pair. Remote worlds\n * still expose a foreground `run`, so this adapts one remote run into a live\n * execution handle: the foreground projection is the run's result, and the\n * handle's status, exit classification, and collectors settle from it.\n */\nexport function executionFromRemoteRun(shell: ShellDelegate, spec: ShellExecSpec): Promise<ShellExecution> {\n  const resultPromise = shell.run(spec)\n  let status: ShellProcessStatus = 'running'\n  let exitCode: number | null = null\n  let signal: NodeJS.Signals | null = null\n  let collected: ShellRunResult | undefined\n  let consumed = false\n\n  const done = resultPromise.then(\n    (result) => {\n      collected = result\n      status = 'completed'\n      exitCode = result.exitCode\n      signal = result.signal\n    },\n    () => {\n      status = 'killed'\n    },\n  )\n\n  const execution = {\n    get status() {\n      return status\n    },\n    get exitCode() {\n      return exitCode\n    },\n    get signal() {\n      return signal\n    },\n    done,\n    readOutput: (): ShellProcessRead => {\n      if (!collected || consumed) return { delta: '', lossy: false }\n      consumed = true\n      const result = collected\n      return {\n        delta: result.stdout.text + result.stderr.text,\n        lossy: result.stdout.truncated || result.stderr.truncated,\n        ...(result.stdout.spillPath ? { stdoutSpillPath: result.stdout.spillPath } : {}),\n        ...(result.stderr.spillPath ? { stderrSpillPath: result.stderr.spillPath } : {}),\n      }\n    },\n    observed: {\n      stdout: outputReader((result) => result.stdout, () => collected),\n      stderr: outputReader((result) => result.stderr, () => collected),\n    },\n    kill: () => false,\n    result: () => resultPromise,\n  }\n\n  return Promise.resolve(execution as unknown as ShellExecution)\n}\n\nexport function decorateShell(shell: ShellExecutor): () => void {\n  const resolver = sharedWorldResolver()\n\n  const origExecute = shell.execute.bind(shell)\n\n  shell.execute = async (spec: ShellExecSpec): Promise<ShellExecution> => {\n    const ref = resolver.resolve(spec.workdir ?? '')\n    if (ref.kind === 'local') return origExecute(spec)\n    if (ref.kind === 'unrouted') throw new Error(`node ${ref.nodeId} world not available`)\n    await ref.provider.ensureDir(ref.remotePath).catch(() => {})\n    return executionFromRemoteRun(ref.provider.shell, { ...spec, workdir: ref.remotePath })\n  }\n\n  return () => {\n    shell.execute = origExecute\n  }\n}\n"],"mappings":";;AAKA,SAAS,aAAa,MAAmD,SAAmE;CAC1I,OAAO,EACL,WAAW,aAAqB;EAC9B,MAAM,SAAS,QAAQ;EACvB,IAAI,CAAC,QAAQ,OAAO;GAAE,MAAM;GAAI,YAAY;GAAU,OAAO;EAAM;EACnE,MAAM,SAAS,KAAK,MAAM;EAC1B,MAAM,QAAQ,OAAO,KAAK,OAAO,MAAM,MAAM;EAC7C,MAAM,QAAQ,KAAK,IAAI,GAAG,KAAK,IAAI,UAAU,MAAM,MAAM,CAAC;EAE1D,OAAO;GACL,MAFW,MAAM,SAAS,KAAK,CAAC,CAAC,SAAS,MAEvC;GACH,YAAY,MAAM;GAClB,OAAO,OAAO,aAAa,UAAU;GACrC,GAAI,OAAO,YAAY,EAAE,WAAW,OAAO,UAAU,IAAI,CAAC;EAC5D;CACF,EACF;AACF;;;;;;;;AASA,SAAgB,uBAAuB,OAAsB,MAA8C;CACzG,MAAM,gBAAgB,MAAM,IAAI,IAAI;CACpC,IAAI,SAA6B;CACjC,IAAI,WAA0B;CAC9B,IAAI,SAAgC;CACpC,IAAI;CACJ,IAAI,WAAW;CAcf,MAAM,YAAY;EAChB,IAAI,SAAS;GACX,OAAO;EACT;EACA,IAAI,WAAW;GACb,OAAO;EACT;EACA,IAAI,SAAS;GACX,OAAO;EACT;EACA,MAtBW,cAAc,MACxB,WAAW;GACV,YAAY;GACZ,SAAS;GACT,WAAW,OAAO;GAClB,SAAS,OAAO;EAClB,SACM;GACJ,SAAS;EACX,CAaG;EACH,kBAAoC;GAClC,IAAI,CAAC,aAAa,UAAU,OAAO;IAAE,OAAO;IAAI,OAAO;GAAM;GAC7D,WAAW;GACX,MAAM,SAAS;GACf,OAAO;IACL,OAAO,OAAO,OAAO,OAAO,OAAO,OAAO;IAC1C,OAAO,OAAO,OAAO,aAAa,OAAO,OAAO;IAChD,GAAI,OAAO,OAAO,YAAY,EAAE,iBAAiB,OAAO,OAAO,UAAU,IAAI,CAAC;IAC9E,GAAI,OAAO,OAAO,YAAY,EAAE,iBAAiB,OAAO,OAAO,UAAU,IAAI,CAAC;GAChF;EACF;EACA,UAAU;GACR,QAAQ,cAAc,WAAW,OAAO,cAAc,SAAS;GAC/D,QAAQ,cAAc,WAAW,OAAO,cAAc,SAAS;EACjE;EACA,YAAY;EACZ,cAAc;CAChB;CAEA,OAAO,QAAQ,QAAQ,SAAsC;AAC/D;AAEA,SAAgB,cAAc,OAAkC;CAC9D,MAAM,WAAW,oBAAoB;CAErC,MAAM,cAAc,MAAM,QAAQ,KAAK,KAAK;CAE5C,MAAM,UAAU,OAAO,SAAiD;EACtE,MAAM,MAAM,SAAS,QAAQ,KAAK,WAAW,EAAE;EAC/C,IAAI,IAAI,SAAS,SAAS,OAAO,YAAY,IAAI;EACjD,IAAI,IAAI,SAAS,YAAY,MAAM,IAAI,MAAM,QAAQ,IAAI,OAAO,qBAAqB;EACrF,MAAM,IAAI,SAAS,UAAU,IAAI,UAAU,CAAC,CAAC,YAAY,CAAC,CAAC;EAC3D,OAAO,uBAAuB,IAAI,SAAS,OAAO;GAAE,GAAG;GAAM,SAAS,IAAI;EAAW,CAAC;CACxF;CAEA,aAAa;EACX,MAAM,UAAU;CAClB;AACF"}

package/lib/router/index.d.ts

@@ -1,4 +1,4 @@
-import { _ as WorkspaceBindings, a as NodeTestReport, t as ExecutionWorldProvider, v as WorldRef, y as WorldRegistry } from "../types-C0TtEO7z.js";
+import { _ as WorkspaceBindings, a as NodeTestReport, t as ExecutionWorldProvider, v as WorldRef, y as WorldRegistry } from "../types-ekJQQ4x6.js";
 import { sharedWorldResolver } from "./resolve.js";
 import { Context } from "@deepseek-ai/cordis";
 //#region src/router/index.d.ts

package/lib/router/index.js

@@ -14,6 +14,26 @@ function apply(ctx) {
 	decorateFileSystem(ctx.fs);
 	decorateSubprocess(ctx.subprocess);
 	decorateShell(ctx.shell);
+	decorateTerminalController(ctx);
+}
+function decorateTerminalController(ctx) {
+	ctx.inject(["terminalController"], (terminalCtx) => {
+		const controller = terminalCtx.terminalController;
+		const originalExecution = controller.execution.bind(controller);
+		controller.execution = (agent) => {
+			const execution = originalExecution(agent);
+			const ref = sharedWorldResolver().resolve(agent.session.header.cwd);
+			if (ref.kind === "local") return execution;
+			if (ref.kind === "unrouted") throw new Error(`node ${ref.nodeId} world not available`);
+			const subprocess = Object.create(execution.subprocess);
+			subprocess.terminalEnvironment = ref.provider.subprocess.terminalEnvironment.bind(ref.provider.subprocess);
+			subprocess.resolveExecutable = ref.provider.subprocess.resolveExecutable.bind(ref.provider.subprocess);
+			return {
+				...execution,
+				subprocess
+			};
+		};
+	});
 }
 //#endregion
 export { apply, inject, name, sharedWorldResolver };

package/lib/router/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../src/router/index.ts"],"sourcesContent":["import type { Context } from '@deepseek-ai/cordis'\nimport { decorateFileSystem } from './decorate-fs.js'\nimport { decorateSubprocess } from './decorate-subprocess.js'\nimport { decorateShell } from './decorate-shell.js'\nimport { sharedWorldResolver } from './resolve.js'\n\nexport const name = 'dshb-router'\n\nexport const inject = ['fs', 'subprocess', 'shell']\n\nexport function apply(ctx: Context): void {\n  ctx.provide('dshbRouter', sharedWorldResolver())\n  decorateFileSystem(ctx.fs)\n  decorateSubprocess(ctx.subprocess)\n  decorateShell(ctx.shell)\n}\n\nexport { sharedWorldResolver } from './resolve.js'\nexport type { ExecutionWorldProvider, WorkspaceBindings, WorldRegistry, WorldRef, NodeTestReport } from './types.js'\n"],"mappings":";;;;;AAMA,MAAa,OAAO;AAEpB,MAAa,SAAS;CAAC;CAAM;CAAc;AAAO;AAElD,SAAgB,MAAM,KAAoB;CACxC,IAAI,QAAQ,cAAc,oBAAoB,CAAC;CAC/C,mBAAmB,IAAI,EAAE;CACzB,mBAAmB,IAAI,UAAU;CACjC,cAAc,IAAI,KAAK;AACzB"}
+{"version":3,"file":"index.js","names":[],"sources":["../../src/router/index.ts"],"sourcesContent":["import type { Context } from '@deepseek-ai/cordis'\nimport type { SubprocessRuntime } from '@deepseek-ai/dsh-subprocess'\nimport { decorateFileSystem } from './decorate-fs.js'\nimport { decorateSubprocess } from './decorate-subprocess.js'\nimport { decorateShell } from './decorate-shell.js'\nimport { sharedWorldResolver } from './resolve.js'\n\nexport const name = 'dshb-router'\n\nexport const inject = ['fs', 'subprocess', 'shell']\n\nexport function apply(ctx: Context): void {\n  ctx.provide('dshbRouter', sharedWorldResolver())\n  decorateFileSystem(ctx.fs)\n  decorateSubprocess(ctx.subprocess)\n  decorateShell(ctx.shell)\n  decorateTerminalController(ctx)\n}\n\ninterface TerminalAgentLike {\n  session: { header: { cwd: string } }\n}\n\ninterface TerminalControllerLike {\n  execution(agent: TerminalAgentLike): { subprocess: SubprocessRuntime; sandboxPolicy: unknown }\n}\n\nfunction decorateTerminalController(ctx: Context): void {\n  ctx.inject(['terminalController'], (terminalCtx: Context) => {\n    const controller = (terminalCtx as unknown as { terminalController: TerminalControllerLike }).terminalController\n    const originalExecution = controller.execution.bind(controller)\n\n    controller.execution = (agent) => {\n      const execution = originalExecution(agent)\n      const ref = sharedWorldResolver().resolve(agent.session.header.cwd)\n      if (ref.kind === 'local') return execution\n      if (ref.kind === 'unrouted') throw new Error(`node ${ref.nodeId} world not available`)\n\n      const subprocess = Object.create(execution.subprocess) as SubprocessRuntime\n      subprocess.terminalEnvironment = ref.provider.subprocess.terminalEnvironment.bind(ref.provider.subprocess)\n      subprocess.resolveExecutable = ref.provider.subprocess.resolveExecutable.bind(ref.provider.subprocess)\n      return { ...execution, subprocess }\n    }\n  })\n}\n\nexport { sharedWorldResolver } from './resolve.js'\nexport type { ExecutionWorldProvider, WorkspaceBindings, WorldRegistry, WorldRef, NodeTestReport } from './types.js'\n"],"mappings":";;;;;AAOA,MAAa,OAAO;AAEpB,MAAa,SAAS;CAAC;CAAM;CAAc;AAAO;AAElD,SAAgB,MAAM,KAAoB;CACxC,IAAI,QAAQ,cAAc,oBAAoB,CAAC;CAC/C,mBAAmB,IAAI,EAAE;CACzB,mBAAmB,IAAI,UAAU;CACjC,cAAc,IAAI,KAAK;CACvB,2BAA2B,GAAG;AAChC;AAUA,SAAS,2BAA2B,KAAoB;CACtD,IAAI,OAAO,CAAC,oBAAoB,IAAI,gBAAyB;EAC3D,MAAM,aAAc,YAA0E;EAC9F,MAAM,oBAAoB,WAAW,UAAU,KAAK,UAAU;EAE9D,WAAW,aAAa,UAAU;GAChC,MAAM,YAAY,kBAAkB,KAAK;GACzC,MAAM,MAAM,oBAAoB,CAAC,CAAC,QAAQ,MAAM,QAAQ,OAAO,GAAG;GAClE,IAAI,IAAI,SAAS,SAAS,OAAO;GACjC,IAAI,IAAI,SAAS,YAAY,MAAM,IAAI,MAAM,QAAQ,IAAI,OAAO,qBAAqB;GAErF,MAAM,aAAa,OAAO,OAAO,UAAU,UAAU;GACrD,WAAW,sBAAsB,IAAI,SAAS,WAAW,oBAAoB,KAAK,IAAI,SAAS,UAAU;GACzG,WAAW,oBAAoB,IAAI,SAAS,WAAW,kBAAkB,KAAK,IAAI,SAAS,UAAU;GACrG,OAAO;IAAE,GAAG;IAAW;GAAW;EACpC;CACF,CAAC;AACH"}

package/lib/router/resolve.d.ts

@@ -1,4 +1,4 @@
-import { _ as WorkspaceBindings, v as WorldRef, y as WorldRegistry } from "../types-C0TtEO7z.js";
+import { _ as WorkspaceBindings, v as WorldRef, y as WorldRegistry } from "../types-ekJQQ4x6.js";
 //#region src/router/resolve.d.ts
 interface BindingHit {
   nodeId: string;

package/lib/router/router-shell.d.ts

@@ -1,13 +1,12 @@
 import { Context } from "@deepseek-ai/cordis";
 import SandboxBashExecutor from "@deepseek-ai/dsh-bash-sandbox";
-import { ShellExecRequest, ShellExecSpec, ShellProcess, ShellRunResult } from "@deepseek-ai/dsh-shell";
+import { ShellExecRequest, ShellExecSpec, ShellExecution } from "@deepseek-ai/dsh-shell";
 //#region src/router/router-shell.d.ts
 declare class RouterShell extends SandboxBashExecutor {
   private readonly resolver;
   constructor(ctx: Context, config: unknown);
   resolve(request: ShellExecRequest): ShellExecSpec;
-  run(spec: ShellExecSpec): Promise<ShellRunResult>;
-  start(spec: ShellExecSpec): ShellProcess;
+  execute(spec: ShellExecSpec): Promise<ShellExecution>;
 }
 //#endregion
 export { RouterShell as default };

package/lib/router/router-shell.js

@@ -1,4 +1,5 @@
 import { sharedWorldResolver } from "./resolve.js";
+import { executionFromRemoteRun } from "./decorate-shell.js";
 import SandboxBashExecutor from "@deepseek-ai/dsh-bash-sandbox";
 //#region src/router/router-shell.ts
 var RouterShell = class extends SandboxBashExecutor {
@@ -9,22 +10,12 @@ var RouterShell = class extends SandboxBashExecutor {
 	resolve(request) {
 		return super.resolve(request);
 	}
-	async run(spec) {
+	async execute(spec) {
 		const ref = this.resolver.resolve(spec.workdir ?? "");
-		if (ref.kind === "local") return super.run(spec);
+		if (ref.kind === "local") return super.execute(spec);
 		if (ref.kind === "unrouted") throw new Error(`node ${ref.nodeId} world not available`);
 		await ref.provider.ensureDir(ref.remotePath).catch(() => {});
-		return ref.provider.shell.run({
-			...spec,
-			workdir: ref.remotePath
-		});
-	}
-	start(spec) {
-		const ref = this.resolver.resolve(spec.workdir ?? "");
-		if (ref.kind === "local") return super.start(spec);
-		if (ref.kind === "unrouted") throw new Error(`node ${ref.nodeId} world not available`);
-		ref.provider.ensureDir(ref.remotePath).catch(() => {});
-		return ref.provider.shell.start({
+		return executionFromRemoteRun(ref.provider.shell, {
 			...spec,
 			workdir: ref.remotePath
 		});

package/lib/router/router-shell.js.map

@@ -1 +1 @@
-{"version":3,"file":"router-shell.js","names":[],"sources":["../../src/router/router-shell.ts"],"sourcesContent":["import SandboxBashExecutor from '@deepseek-ai/dsh-bash-sandbox'\nimport type { Context } from '@deepseek-ai/cordis'\nimport type { ShellExecRequest, ShellExecSpec, ShellProcess, ShellRunResult } from '@deepseek-ai/dsh-shell'\nimport { sharedWorldResolver } from './resolve.js'\n\nexport default class RouterShell extends SandboxBashExecutor {\n  private readonly resolver = sharedWorldResolver()\n\n  constructor(ctx: Context, config: unknown) {\n    super(ctx, config as never)\n  }\n\n  override resolve(request: ShellExecRequest): ShellExecSpec {\n    return super.resolve(request)\n  }\n\n  override async run(spec: ShellExecSpec): Promise<ShellRunResult> {\n    const ref = this.resolver.resolve(spec.workdir ?? '')\n    if (ref.kind === 'local') return super.run(spec)\n    if (ref.kind === 'unrouted') throw new Error(`node ${ref.nodeId} world not available`)\n    await ref.provider.ensureDir(ref.remotePath).catch(() => {})\n    return ref.provider.shell.run({ ...spec, workdir: ref.remotePath })\n  }\n\n  override start(spec: ShellExecSpec): ShellProcess {\n    const ref = this.resolver.resolve(spec.workdir ?? '')\n    if (ref.kind === 'local') return super.start(spec)\n    if (ref.kind === 'unrouted') throw new Error(`node ${ref.nodeId} world not available`)\n    void ref.provider.ensureDir(ref.remotePath).catch(() => {})\n    return ref.provider.shell.start({ ...spec, workdir: ref.remotePath })\n  }\n}\n"],"mappings":";;;AAKA,IAAqB,cAArB,cAAyC,oBAAoB;CAC3D,WAA4B,oBAAoB;CAEhD,YAAY,KAAc,QAAiB;EACzC,MAAM,KAAK,MAAe;CAC5B;CAEA,QAAiB,SAA0C;EACzD,OAAO,MAAM,QAAQ,OAAO;CAC9B;CAEA,MAAe,IAAI,MAA8C;EAC/D,MAAM,MAAM,KAAK,SAAS,QAAQ,KAAK,WAAW,EAAE;EACpD,IAAI,IAAI,SAAS,SAAS,OAAO,MAAM,IAAI,IAAI;EAC/C,IAAI,IAAI,SAAS,YAAY,MAAM,IAAI,MAAM,QAAQ,IAAI,OAAO,qBAAqB;EACrF,MAAM,IAAI,SAAS,UAAU,IAAI,UAAU,CAAC,CAAC,YAAY,CAAC,CAAC;EAC3D,OAAO,IAAI,SAAS,MAAM,IAAI;GAAE,GAAG;GAAM,SAAS,IAAI;EAAW,CAAC;CACpE;CAEA,MAAe,MAAmC;EAChD,MAAM,MAAM,KAAK,SAAS,QAAQ,KAAK,WAAW,EAAE;EACpD,IAAI,IAAI,SAAS,SAAS,OAAO,MAAM,MAAM,IAAI;EACjD,IAAI,IAAI,SAAS,YAAY,MAAM,IAAI,MAAM,QAAQ,IAAI,OAAO,qBAAqB;EACrF,IAAS,SAAS,UAAU,IAAI,UAAU,CAAC,CAAC,YAAY,CAAC,CAAC;EAC1D,OAAO,IAAI,SAAS,MAAM,MAAM;GAAE,GAAG;GAAM,SAAS,IAAI;EAAW,CAAC;CACtE;AACF"}
+{"version":3,"file":"router-shell.js","names":[],"sources":["../../src/router/router-shell.ts"],"sourcesContent":["import SandboxBashExecutor from '@deepseek-ai/dsh-bash-sandbox'\nimport type { Context } from '@deepseek-ai/cordis'\nimport type { ShellExecRequest, ShellExecSpec, ShellExecution } from '@deepseek-ai/dsh-shell'\nimport { sharedWorldResolver } from './resolve.js'\nimport { executionFromRemoteRun } from './decorate-shell.js'\n\nexport default class RouterShell extends SandboxBashExecutor {\n  private readonly resolver = sharedWorldResolver()\n\n  constructor(ctx: Context, config: unknown) {\n    super(ctx, config as never)\n  }\n\n  override resolve(request: ShellExecRequest): ShellExecSpec {\n    return super.resolve(request)\n  }\n\n  override async execute(spec: ShellExecSpec): Promise<ShellExecution> {\n    const ref = this.resolver.resolve(spec.workdir ?? '')\n    if (ref.kind === 'local') return super.execute(spec)\n    if (ref.kind === 'unrouted') throw new Error(`node ${ref.nodeId} world not available`)\n    await ref.provider.ensureDir(ref.remotePath).catch(() => {})\n    return executionFromRemoteRun(ref.provider.shell, { ...spec, workdir: ref.remotePath })\n  }\n}\n"],"mappings":";;;;AAMA,IAAqB,cAArB,cAAyC,oBAAoB;CAC3D,WAA4B,oBAAoB;CAEhD,YAAY,KAAc,QAAiB;EACzC,MAAM,KAAK,MAAe;CAC5B;CAEA,QAAiB,SAA0C;EACzD,OAAO,MAAM,QAAQ,OAAO;CAC9B;CAEA,MAAe,QAAQ,MAA8C;EACnE,MAAM,MAAM,KAAK,SAAS,QAAQ,KAAK,WAAW,EAAE;EACpD,IAAI,IAAI,SAAS,SAAS,OAAO,MAAM,QAAQ,IAAI;EACnD,IAAI,IAAI,SAAS,YAAY,MAAM,IAAI,MAAM,QAAQ,IAAI,OAAO,qBAAqB;EACrF,MAAM,IAAI,SAAS,UAAU,IAAI,UAAU,CAAC,CAAC,YAAY,CAAC,CAAC;EAC3D,OAAO,uBAAuB,IAAI,SAAS,OAAO;GAAE,GAAG;GAAM,SAAS,IAAI;EAAW,CAAC;CACxF;AACF"}

package/lib/router/types.d.ts

@@ -1,2 +1,2 @@
-import { _ as WorkspaceBindings, a as NodeTestReport, c as ShellExecSpec, d as SubprocessDelegate, f as SubprocessHandle, g as SubprocessTerminalSpawnSpec, h as SubprocessTerminalHandle, i as FsTargetLike, l as ShellProcess, m as SubprocessSpawnSpec, n as FileSystem, o as ShellDelegate, p as SubprocessRuntime, r as FsDelegate, s as ShellExecRequest, t as ExecutionWorldProvider, u as ShellRunResult, v as WorldRef, y as WorldRegistry } from "../types-C0TtEO7z.js";
+import { _ as WorkspaceBindings, a as NodeTestReport, c as ShellExecSpec, d as SubprocessDelegate, f as SubprocessHandle, g as SubprocessTerminalSpawnSpec, h as SubprocessTerminalHandle, i as FsTargetLike, l as ShellProcess, m as SubprocessSpawnSpec, n as FileSystem, o as ShellDelegate, p as SubprocessRuntime, r as FsDelegate, s as ShellExecRequest, t as ExecutionWorldProvider, u as ShellRunResult, v as WorldRef, y as WorldRegistry } from "../types-ekJQQ4x6.js";
 export { ExecutionWorldProvider, type FileSystem, FsDelegate, FsTargetLike, NodeTestReport, ShellDelegate, type ShellExecRequest, type ShellExecSpec, type ShellProcess, type ShellRunResult, SubprocessDelegate, type SubprocessHandle, type SubprocessRuntime, type SubprocessSpawnSpec, type SubprocessTerminalHandle, type SubprocessTerminalSpawnSpec, WorkspaceBindings, WorldRef, WorldRegistry };

package/lib/{types-C0TtEO7z.d.ts → types-ekJQQ4x6.d.ts}

@@ -1,5 +1,5 @@
+import { SubprocessHandle as SubprocessHandle$1, SubprocessRuntime as SubprocessRuntime$1, SubprocessSpawnSpec as SubprocessSpawnSpec$1, SubprocessTerminalEnvironment, SubprocessTerminalHandle as SubprocessTerminalHandle$1, SubprocessTerminalSpawnSpec as SubprocessTerminalSpawnSpec$1 } from "@deepseek-ai/dsh-subprocess";
 import { FileSystem as FileSystem$1 } from "@deepseek-ai/dsh-fs";
-import { SubprocessHandle as SubprocessHandle$1, SubprocessRuntime as SubprocessRuntime$1, SubprocessSpawnSpec as SubprocessSpawnSpec$1, SubprocessTerminalHandle as SubprocessTerminalHandle$1, SubprocessTerminalSpawnSpec as SubprocessTerminalSpawnSpec$1 } from "@deepseek-ai/dsh-subprocess";
 import { ShellExecRequest as ShellExecRequest$1, ShellExecSpec as ShellExecSpec$1, ShellProcess as ShellProcess$1, ShellRunResult as ShellRunResult$1 } from "@deepseek-ai/dsh-shell";
 //#region src/router/types.d.ts
 interface NodeTestReport {
@@ -27,6 +27,8 @@ interface FsDelegate {
 }
 type FsTargetLike = string;
 interface SubprocessDelegate {
+  terminalEnvironment(signal?: AbortSignal): Promise<SubprocessTerminalEnvironment>;
+  resolveExecutable(command: string, env?: Readonly<Record<string, string>>, signal?: AbortSignal): Promise<string>;
   spawn(spec: SubprocessSpawnSpec$1): SubprocessHandle$1;
   spawnTerminal(spec: SubprocessTerminalSpawnSpec$1): Promise<SubprocessTerminalHandle$1>;
 }
@@ -64,4 +66,4 @@ type WorldRef = {
 };
 //#endregion
 export { WorkspaceBindings as _, NodeTestReport as a, ShellExecSpec$1 as c, SubprocessDelegate as d, SubprocessHandle$1 as f, SubprocessTerminalSpawnSpec$1 as g, SubprocessTerminalHandle$1 as h, FsTargetLike as i, ShellProcess$1 as l, SubprocessSpawnSpec$1 as m, FileSystem$1 as n, ShellDelegate as o, SubprocessRuntime$1 as p, FsDelegate as r, ShellExecRequest$1 as s, ExecutionWorldProvider as t, ShellRunResult$1 as u, WorldRef as v, WorldRegistry as y };
-//# sourceMappingURL=types-C0TtEO7z.d.ts.map
+//# sourceMappingURL=types-ekJQQ4x6.d.ts.map