dsh-win-multi-bash 0.1.2 → 0.3.0

package/lib/tool-bash/types/factory.js

@@ -13,8 +13,9 @@ import { defineTool, TOOL_ABORTED } from '@deepseek-ai/dsh-tools';
 import { HarnessError } from '@deepseek-ai/dsh-llm';
 import { ESCALATION_TARGETS, approveEscalation, canonicalPath, validateEscalationArgs } from '@deepseek-ai/dsh-sandbox';
 import { DSH_ENV_PREFIX } from '@deepseek-ai/dsh-shell';
-import { processOutcome } from "./background.js";
-import { parseExitStatus, renderProcessRead, renderResult } from "./render.js";
+import { ownExecutor } from "./backend.js";
+import { processJob, processOutcome, processSources } from "./background.js";
+import { parseExitStatus, renderResult } from "./render.js";
 const DIALECT_FACTS = {
     posix: { shell: 'bash', invoke: 'bash -c', paths: 'POSIX paths', env: '$VAR', toolchain: 'the full Unix toolchain' },
     msys: {
@@ -31,10 +32,10 @@ const DIALECT_FACTS = {
         env: '$VAR',
     },
 };
-/** Runtime configuration schema for a shell tool instance. */
-export const Config = z.object({
+/** The tool-layer keys every shell tool instance carries, before its backend partition. */
+const TOOL_CONFIG = {
     enableRunInBackground: z.boolean().default(true),
-});
+};
 /**
  * The model-facing description of one shell tool instance. The POSIX variant
  * keeps the legacy wording byte-for-byte (the ACP/headless tool-schema
@@ -197,18 +198,47 @@ const BACKGROUND_OUTPUT_PROPERTIES = {
  * tool name, the approval subject, the prompt section name (`tool:<toolName>`),
  * and the `ctx.jobs` kind; the instance module declares its kind in
  * {@link JobKindMap} via declaration merging.
+ *
+ * The tool owns its executor outright (see `./backend.js`): dsh 0.1.7 dropped
+ * the shell seam's routing field, so a tool can no longer ask a shared seat
+ * for a-backend-by-name. `def.Executor` is constructed once per tool load and
+ * driven directly, leaving `ctx.shell` to the base bundle's own executor.
  * @param def - the instance definition: `toolName` (also the job kind),
- *   `shell` (routed to the selector executor when defined), and `dialect`.
+ *   `dialect`, `Executor` (the backend class to own), and `configKey` (the
+ *   Config partition that backend's settings live under).
  * @returns the complete plugin object (name/inject/Config/apply).
  */
 export function defineShellTool(def) {
+    const Config = z.object({
+        ...TOOL_CONFIG,
+        [def.configKey]: def.Executor.Config.default({}),
+    });
     return {
         name: `tool-${def.toolName}`,
-        inject: ['tools', 'shell', 'systemPrompt', 'shellEnv'],
+        // The last three are the owned executor's own requirements; injecting
+        // them here is what lets the backend be built during apply.
+        inject: ['tools', 'systemPrompt', 'shellEnv', 'subprocess', 'sandbox', 'sandboxPolicy'],
         Config,
-        apply(ctx, config = {}) {
+        async apply(ctx, config = {}) {
             const backgroundEnabled = config.enableRunInBackground ?? true;
-            const defaultMode = ctx.shell.sandboxMode;
+            const { executor } = ownExecutor(ctx, def.Executor, config[def.configKey]);
+            // The confinement probe is async on 0.1.7 (the provider's `confine`
+            // returns a promise), so the escalation surface settles before the
+            // tool registers: a tool never advertises a confinement it cannot
+            // reach.
+            //
+            // A backend whose probe fails *loud* is deliberately swallowed here
+            // — that is the documented lazy contract: an explicit
+            // `sandbox: bwrap` without bubblewrap must not brick the tool row
+            // at load. It advertises no confinement now and its error
+            // resurfaces at the first routed command.
+            let defaultMode;
+            try {
+                defaultMode = await executor.resolveSandboxMode();
+            }
+            catch {
+                defaultMode = undefined;
+            }
             const escalationModes = defaultMode === undefined ? [] : ESCALATION_TARGETS;
             const sandboxPolicy = defaultMode === undefined ? undefined : ctx.get('sandboxPolicy');
             if (defaultMode !== undefined && sandboxPolicy === undefined) {
@@ -350,7 +380,6 @@ export function defineShellTool(def) {
                         command: args.command,
                         ...workdir !== undefined ? { workdir } : {},
                         ...args.timeoutMs !== undefined ? { timeoutMs: args.timeoutMs } : {},
-                        ...def.shell !== undefined ? { shell: def.shell } : {},
                         dshEnv,
                         ...policy !== undefined ? { sandboxPolicy: policy } : {},
                     };
@@ -369,26 +398,33 @@ export function defineShellTool(def) {
                             error.name = 'AbortError';
                             throw error;
                         }
+                        // No deadline for a background command, and the process is
+                        // spawned inside the starter, after the registry admitted it,
+                        // so the pull sources bind lazily through the `proc` closure.
+                        const spec = executor.resolve({ ...request, onExpiry: 'none' });
+                        let proc;
                         // Task preflight finishes before the starter can spawn a process.
                         const id = jobs.start({
                             kind: def.toolName,
                             label: args.command,
-                            ...exec.agent ? { owner: exec.agent } : {},
+                            ...exec.agent ? { owner: exec.agent.id } : {},
+                            output: processSources(() => proc),
                             run: () => {
-                                const proc = ctx.shell.start(ctx.shell.resolve(request));
-                                return {
-                                    cancel: () => void proc.kill(),
-                                    done: proc.done.then(() => processOutcome(proc)),
-                                    readOutput: () => renderProcessRead(proc.readOutput(), proc.sandbox, escalationModes),
-                                };
+                                const hooks = processJob(async (signal) => {
+                                    proc = await executor.execute({ ...spec, signal });
+                                    return proc;
+                                }, (started) => processOutcome(started));
+                                return { done: hooks.done, cancel: (reason) => hooks.cancel(reason) };
                             },
                         });
                         return { kind: 'background', jobId: id };
                     }
-                    const result = await ctx.shell.run(ctx.shell.resolve({
+                    // Foreground is a property of awaiting the handle's result, not
+                    // of the call: the same `execute` also serves `run_in_background`.
+                    const result = await (await executor.execute(executor.resolve({
                         ...request,
                         signal: exec.signal,
-                    }));
+                    }))).result();
                     if (result.aborted) {
                         const error = new HarnessError('tool call aborted', TOOL_ABORTED);
                         error.name = 'AbortError';

package/lib/tool-bash/types/git-bash.js

@@ -1,13 +1,21 @@
 /**
- * The Git Bash (MSYS) tool instance: routes `request.shell` to the
- * 'git-bash' backend so a selector executor can serve it beside pwsh and WSL.
- * @module @deepseek-ai/dsh-tool-bash/git-bash
+ * The Git Bash (MSYS) tool instance: owns a {@link GitBashExecutor} outright
+ * and drives it directly. dsh 0.1.7 removed the shell seam's routing field
+ * (`ShellExecRequest.shell`), so there is no shared selector to route through
+ * any more — the tool itself is what knows it wants Git Bash.
+ * @module dsh-win-multi-bash/tool-bash/git-bash
  */
+import { GitBashExecutor } from "../../bash-git/index.js";
 import { defineShellTool } from "./factory.js";
-/** The Git Bash tool: routes request.shell to the 'git-bash' backend. */
-const tool = defineShellTool({ toolName: 'git_bash', shell: 'git-bash', dialect: 'msys' });
+/** The Git Bash tool: owns the git-bash backend. */
+const tool = defineShellTool({
+    toolName: 'git_bash',
+    Executor: GitBashExecutor,
+    configKey: 'gitBash',
+    dialect: 'msys',
+});
 export const name = tool.name;
 export const inject = tool.inject;
 export const Config = tool.Config;
 export const apply = tool.apply;
-//# sourceMappingURL=git-bash.js.map
+//# sourceMappingURL=git-bash.js.map

package/lib/tool-bash/types/render.js

@@ -57,35 +57,6 @@ export function renderResult(result, escalationModes = []) {
         body += '\n';
     return body + markers.join('\n');
 }
-/**
- * Shape one background-process read into the `job_output` delta the model
- * sees: the incremental delta, plus the lossy-read notice (with full-stream
- * spill paths) when in-memory truncation dropped unread bytes. Empty-delta
- * rendering (`(no new output)`) is the generic job controller's job.
- * @param read - one incremental read from the process handle.
- * @param sandbox - settled sandbox facts, when this was a confined process.
- * @param escalationModes - escalation targets advertised by this composition.
- * @returns the delta text with any loss or sandbox notice appended.
- */
-export function renderProcessRead(read, sandbox, escalationModes = []) {
-    const notices = [];
-    if (read.lossy) {
-        const paths = [read.stdoutSpillPath, read.stderrSpillPath].filter((path) => path !== undefined);
-        notices.push(`[some output was dropped from memory; full output: ${paths.length > 0 ? paths.join(', ') : '(unavailable)'}]`);
-    }
-    if (sandbox?.runnerFailed) {
-        notices.push(`[sandbox: the sandbox runner itself failed under ${sandbox.mode} mode — the command did not run; this is a sandbox problem, not a command failure]`);
-    }
-    else if (sandbox?.denied) {
-        notices.push(sandboxDenialMarker(sandbox.mode));
-        if (escalationModes.length > 0) {
-            notices.push(escalationHintMarker('command'));
-        }
-    }
-    if (notices.length === 0)
-        return read.delta;
-    return `${read.delta}${read.delta.length > 0 && !read.delta.endsWith('\n') ? '\n' : ''}${notices.join('\n')}`;
-}
 /**
  * The exit-status parse is the shared marker-contract half of the shell-tool
  * rendering story, owned by `@deepseek-ai/dsh-shell` so `dsh-tool-pwsh` reuses

package/lib/tool-bash/types/wsl-bash.js

@@ -1,13 +1,21 @@
 /**
- * The WSL bash tool instance: routes `request.shell` to the 'wsl-bash'
- * backend so a selector executor can serve it beside pwsh and Git Bash.
- * @module @deepseek-ai/dsh-tool-bash/wsl-bash
+ * The WSL bash tool instance: owns a {@link WslBashExecutor} outright and
+ * drives it directly. dsh 0.1.7 removed the shell seam's routing field
+ * (`ShellExecRequest.shell`), so there is no shared selector to route through
+ * any more — the tool itself is what knows it wants WSL.
+ * @module dsh-win-multi-bash/tool-bash/wsl-bash
  */
+import { WslBashExecutor } from "../../bash-wsl/index.js";
 import { defineShellTool } from "./factory.js";
-/** The WSL bash tool: routes request.shell to the 'wsl-bash' backend. */
-const tool = defineShellTool({ toolName: 'wsl_bash', shell: 'wsl-bash', dialect: 'wsl' });
+/** The WSL bash tool: owns the wsl-bash backend. */
+const tool = defineShellTool({
+    toolName: 'wsl_bash',
+    Executor: WslBashExecutor,
+    configKey: 'wslBash',
+    dialect: 'wsl',
+});
 export const name = tool.name;
 export const inject = tool.inject;
 export const Config = tool.Config;
 export const apply = tool.apply;
-//# sourceMappingURL=wsl-bash.js.map
+//# sourceMappingURL=wsl-bash.js.map

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "dsh-win-multi-bash",
-  "version": "0.1.2",
+  "version": "0.3.0",
   "author": "Dinosaur_MC",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Dinosaur-MC/dsh-win-multi-bash.git"
   },
-  "description": "Windows multi-bash plugin for dsh: git_bash / wsl_bash model tools plus a shell-select executor routing the single ctx.shell seat across Git Bash, WSL and pwsh (pwsh stays the default).",
+  "description": "Windows multi-bash plugin for dsh: git_bash / wsl_bash model tools, each owning its own Git Bash / WSL executor and leaving the ctx.shell seat to dsh's own pwsh executor.",
   "keywords": [
     "dsh-plugin",
     "windows",
@@ -26,7 +26,6 @@
   "main": "lib/index.js",
   "exports": {
     ".": "./lib/index.js",
-    "./shell-select": "./lib/shell-select/index.js",
     "./tool-git-bash": "./lib/tool-bash/types/git-bash.js",
     "./tool-wsl-bash": "./lib/tool-bash/types/wsl-bash.js",
     "./package.json": "./package.json"
@@ -50,14 +49,11 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": ">=4.0.1",
-    "@deepseek-ai/dsh-bash-local": ">=0.1.0-rc.7",
-    "@deepseek-ai/dsh-llm": ">=0.1.0-rc.7",
-    "@deepseek-ai/dsh-pwsh-local": ">=0.1.0-rc.7",
-    "@deepseek-ai/dsh-pwsh-sandbox": ">=0.1.0-rc.7",
-    "@deepseek-ai/dsh-sandbox": ">=0.1.0-rc.7",
-    "@deepseek-ai/dsh-settings": ">=0.1.0-rc.7",
-    "@deepseek-ai/dsh-shell": ">=0.1.0-rc.7",
-    "@deepseek-ai/dsh-tools": ">=0.1.0-rc.7",
+    "@deepseek-ai/dsh-bash-local": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh-sandbox": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh-shell": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh-tools": ">=0.1.7-rc.2",
     "@deepseek-ai/schemastery": ">=3.18.0"
   },
   "peerDependenciesMeta": {
@@ -70,18 +66,9 @@
     "@deepseek-ai/dsh-llm": {
       "optional": true
     },
-    "@deepseek-ai/dsh-pwsh-local": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-pwsh-sandbox": {
-      "optional": true
-    },
     "@deepseek-ai/dsh-sandbox": {
       "optional": true
     },
-    "@deepseek-ai/dsh-settings": {
-      "optional": true
-    },
     "@deepseek-ai/dsh-shell": {
       "optional": true
     },

package/lib/bash-git/invariant.js

@@ -1,23 +0,0 @@
-//#region lib/types/invariant.js
-/**
-* Package-owned invariant companion for `@deepseek-ai/dsh-bash-git`.
-* @module @deepseek-ai/dsh-bash-git/invariant
-*/
-const PACKAGE_NAME = "@deepseek-ai/dsh-bash-git";
-/** Cordis companion plugin name. */
-const name = "bash-git-invariant";
-/** Service required before the companion can reserve package ownership. */
-const inject = ["invariants"];
-/**
-* No runtime invariant: this package exposes no independent event sequence or mutable data relation
-* beyond contracts enforced at its owning seam.
-*/
-const install = () => {};
-/**
-* Register this package's invariant companion.
-* @param ctx - Cordis context carrying the invariant service.
-* @returns the installed registration's disposer after setup succeeds.
-*/
-const apply = (ctx) => Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install));
-//#endregion
-export { apply, inject, name };

package/lib/bash-wsl/invariant.js

@@ -1,23 +0,0 @@
-//#region lib/types/invariant.js
-/**
-* Package-owned invariant companion for `@deepseek-ai/dsh-bash-wsl`.
-* @module @deepseek-ai/dsh-bash-wsl/invariant
-*/
-const PACKAGE_NAME = "@deepseek-ai/dsh-bash-wsl";
-/** Cordis companion plugin name. */
-const name = "bash-wsl-invariant";
-/** Service required before the companion can reserve package ownership. */
-const inject = ["invariants"];
-/**
-* No runtime invariant: this package exposes no independent event sequence or mutable data relation
-* beyond contracts enforced at its owning seam.
-*/
-const install = () => {};
-/**
-* Register this package's invariant companion.
-* @param ctx - Cordis context carrying the invariant service.
-* @returns the installed registration's disposer after setup succeeds.
-*/
-const apply = (ctx) => Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install));
-//#endregion
-export { apply, inject, name };

package/lib/shell-select/index.js

@@ -1,169 +0,0 @@
-import z from "@deepseek-ai/schemastery";
-import { HarnessError } from "@deepseek-ai/dsh-llm";
-import { SHELL_SETTINGS_NAMESPACE, ShellExecutor } from "@deepseek-ai/dsh-shell";
-import { installSettingsSection } from "@deepseek-ai/dsh-settings";
-import { GitBashExecutor } from "../bash-git/index.js";
-import { WslBashExecutor } from "../bash-wsl/index.js";
-import { SandboxPwshExecutor } from "@deepseek-ai/dsh-pwsh-sandbox";
-import { assertServiceableBashConfig } from "@deepseek-ai/dsh-bash-local";
-import { assertServiceablePwshConfig } from "@deepseek-ai/dsh-pwsh-local";
-//#region lib/types/index.js
-/**
-* Selector Service Provider for the bash capability seam: occupies the single
-* `ctx.shell` seat and routes each request to one of several backends held as
-* plain instances. The tool name selects the backend (`request.shell`); a
-* request without one goes to the configured `default`. Backends are
-* constructed on their own child fibers with isolated `shell`/`settings`
-* scopes so their inherited Service registration and settings wiring cannot
-* collide with this executor's own seat. win32 compositions only; POSIX
-* compositions keep a single backend directly on the seat.
-* @module @deepseek-ai/dsh-shell-select
-*/
-/** Error code for routing to an unknown or disabled backend. */
-const SHELL_BACKEND_UNAVAILABLE = "SHELL_BACKEND_UNAVAILABLE";
-const DEFAULT_FACTORIES = {
-	"git-bash": (ctx, config) => new GitBashExecutor(ctx, GitBashExecutor.Config(config)),
-	"wsl-bash": (ctx, config) => new WslBashExecutor(ctx, WslBashExecutor.Config(config)),
-	pwsh: (ctx, config) => new SandboxPwshExecutor(ctx, SandboxPwshExecutor.Config(config))
-};
-/**
-* Selector executor over the bash capability seam. Registers as `ctx.shell`
-* (the single seat), routes every request to one enabled backend by name, and
-* stamps the chosen name on the resolved spec as `shellBackend`. Enabled
-* names without a factory fail loud at the first rebuild; routing to an
-* unbuilt name throws `SHELL_BACKEND_UNAVAILABLE`.
-*/
-var ShellSelectExecutor = class ShellSelectExecutor extends ShellExecutor {
-	static inject = [
-		"subprocess",
-		"sandbox",
-		"sandboxPolicy"
-	];
-	static Config = z.object({
-		backends: z.array(z.string()).default([
-			"git-bash",
-			"wsl-bash",
-			"pwsh"
-		]),
-		default: z.string().default("pwsh"),
-		gitBash: GitBashExecutor.Config.default({}),
-		wslBash: WslBashExecutor.Config.default({}),
-		pwsh: SandboxPwshExecutor.Config.default({})
-	});
-	/** Test hook: replace backend construction wholesale (mirrors the sandbox-local internals pattern). */
-	internals = {};
-	/** The currently authoritative config: the settings section, or the composition entry. */
-	source;
-	backends = /* @__PURE__ */ new Map();
-	fibers = [];
-	constructor(ctx, config) {
-		super(ctx);
-		const entry = config;
-		assertServiceableBashConfig(entry.gitBash);
-		assertServiceableBashConfig(entry.wslBash);
-		assertServiceablePwshConfig(entry.pwsh);
-		this.source = () => entry;
-		installSettingsSection(ctx, SHELL_SETTINGS_NAMESPACE, ShellSelectExecutor.Config, entry, {
-			validate: (value) => {
-				const v = value;
-				assertServiceableBashConfig(v.gitBash);
-				assertServiceableBashConfig(v.wslBash);
-				assertServiceablePwshConfig(v.pwsh);
-			},
-			setSource: (current) => {
-				this.source = current;
-			},
-			onChange: () => {
-				this.rebuildBackends(this.config);
-			}
-		});
-	}
-	/** Validated config (schemastery applied the defaults before construction). */
-	get config() {
-		return this.source();
-	}
-	/**
-	* The first sandbox mode any enabled backend declares (tool-layer
-	* advertisement). One backend's probe/verdict failure (e.g. explicit
-	* `sandbox: bwrap` without bubblewrap installed) must not brick the whole
-	* selector: that backend advertises no mode here and its error resurfaces
-	* loudly at its first routed command — the documented lazy contract.
-	*/
-	get sandboxMode() {
-		this.ensureBackends();
-		for (const name of this.config.backends) {
-			let mode;
-			try {
-				mode = this.backends.get(name)?.sandboxMode;
-			} catch {
-				continue;
-			}
-			if (mode !== void 0) return mode;
-		}
-	}
-	resolve(request) {
-		this.ensureBackends();
-		const name = request.shell ?? this.config.default;
-		return {
-			...this.requireBackend(name).resolve(request),
-			shellBackend: name
-		};
-	}
-	run(spec) {
-		this.ensureBackends();
-		return this.requireBackend(spec.shellBackend ?? this.config.default).run(spec);
-	}
-	start(spec) {
-		this.ensureBackends();
-		return this.requireBackend(spec.shellBackend ?? this.config.default).start(spec);
-	}
-	requireBackend(name) {
-		const backend = this.backends.get(name);
-		if (backend === void 0) throw new HarnessError(`shell-select: backend "${name}" is not enabled (enabled: ${[...this.backends.keys()].join(", ")})`, SHELL_BACKEND_UNAVAILABLE);
-		return backend;
-	}
-	/** The first rebuild runs at first use, after the internals hook is installed. */
-	ensureBackends() {
-		if (this.backends.size > 0) return;
-		this.rebuildBackends(this.config);
-	}
-	/**
-	* Construct one backend per enabled name on its own child fiber with
-	* isolated shell/settings scopes (see the class doc), or throw for an
-	* unknown name. Old fibers are disposed first so rebuilds never leak.
-	*/
-	rebuildBackends(entry) {
-		for (const fiber of this.fibers.splice(0)) fiber.dispose();
-		this.backends.clear();
-		for (const name of entry.backends) {
-			const factory = this.internals.factories?.[name] ?? DEFAULT_FACTORIES[name];
-			if (factory === void 0) throw new Error(`shell-select: unknown backend "${name}" (enabled: ${entry.backends.join(", ")})`);
-			const fiber = this.ctx.plugin({
-				inject: [
-					"subprocess",
-					"sandbox",
-					"sandboxPolicy"
-				],
-				apply: () => {}
-			});
-			this.fibers.push(fiber);
-			const backendCtx = fiber.ctx.isolate("shell", Symbol(name)).isolate("settings", Symbol(name));
-			this.backends.set(name, factory(backendCtx, backendConfig(name, entry)));
-		}
-	}
-};
-/**
-* The config partition for one backend name. Names without a dedicated
-* partition (test-hook factories) receive an empty config; the owning factory
-* decides what it needs.
-*/
-function backendConfig(name, entry) {
-	switch (name) {
-		case "git-bash": return entry.gitBash;
-		case "wsl-bash": return entry.wslBash;
-		case "pwsh": return entry.pwsh;
-		default: return {};
-	}
-}
-//#endregion
-export { SHELL_BACKEND_UNAVAILABLE, ShellSelectExecutor, ShellSelectExecutor as default };

package/lib/shell-select/invariant.js

@@ -1,23 +0,0 @@
-//#region lib/types/invariant.js
-/**
-* Package-owned invariant companion for `@deepseek-ai/dsh-shell-select`.
-* @module @deepseek-ai/dsh-shell-select/invariant
-*/
-const PACKAGE_NAME = "@deepseek-ai/dsh-shell-select";
-/** Cordis companion plugin name. */
-const name = "shell-select-invariant";
-/** Service required before the companion can reserve package ownership. */
-const inject = ["invariants"];
-/**
-* No runtime invariant: this package exposes no independent event sequence or
-* mutable data relation beyond contracts enforced at its owning seams.
-*/
-const install = () => {};
-/**
-* Register this package's invariant companion.
-* @param ctx - Cordis context carrying the invariant service.
-* @returns the installed registration's disposer after setup succeeds.
-*/
-const apply = (ctx) => Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install));
-//#endregion
-export { apply, inject, name };