@dsh-electron/dsh-plugin-multi-root-workspace 0.1.1 → 0.1.2

package/lib/{compat-nFYqN5wt.js → compat-CRdv0vPw.js}

@@ -31,7 +31,12 @@ import { Service } from "@deepseek-ai/cordis";
 * the upgrade smoke passed on that exact version — a green CI run on an
 * unlisted release is evidence, not authorization (ADR-0009).
 */
-const SUPPORTED_DSH_RELEASES = ["0.1.5-rc.2", "0.1.6-alpha.1"];
+const SUPPORTED_DSH_RELEASES = [
+	"0.1.5-rc.2",
+	"0.1.6-alpha.1",
+	"0.1.6-alpha.2",
+	"0.1.7-alpha.1"
+];
 /**
 * Packages whose absence means this plugin cannot function at all: every one of
 * them is either subclassed, imported for a value, or the owner of a service

package/lib/compat.js

@@ -1,2 +1,2 @@
-import { a as inject, i as assertSupportedInstallation, n as MultiRootCompatService, r as apply, t as DshCompatUnsupportedError } from "./compat-nFYqN5wt.js";
+import { a as inject, i as assertSupportedInstallation, n as MultiRootCompatService, r as apply, t as DshCompatUnsupportedError } from "./compat-CRdv0vPw.js";
 export { DshCompatUnsupportedError, MultiRootCompatService, apply, assertSupportedInstallation, inject };

package/lib/index.js

@@ -1,5 +1,5 @@
-import { c as REQUIRED_CORE_PACKAGES, d as compatEnforcement, f as readInstalledVersion, i as assertSupportedInstallation, l as SUPPORTED_DSH_RELEASES, n as MultiRootCompatService, o as CORE_PACKAGES, s as OPTIONAL_CORE_PACKAGES, t as DshCompatUnsupportedError, u as classifyInstallation } from "./compat-nFYqN5wt.js";
-import { a as composeInstructionMessage, c as createInstructionMessage, l as instructionsApi, r as PLUGIN_SOURCE, t as DEFAULT_MAX_BYTES, u as renderInstructions } from "./instructions-BRGoC82G.js";
+import { c as REQUIRED_CORE_PACKAGES, d as compatEnforcement, f as readInstalledVersion, i as assertSupportedInstallation, l as SUPPORTED_DSH_RELEASES, n as MultiRootCompatService, o as CORE_PACKAGES, s as OPTIONAL_CORE_PACKAGES, t as DshCompatUnsupportedError, u as classifyInstallation } from "./compat-CRdv0vPw.js";
+import { a as composeInstructionMessage, c as createInstructionMessage, l as instructionsApi, r as PLUGIN_SOURCE, t as DEFAULT_MAX_BYTES, u as renderInstructions } from "./instructions-Cn1Jj5Xi.js";
 import { n as widenConfined, t as MultiRootSandboxProvider } from "./sandbox-D8Fw95FM.js";
 import { a as classifyStoredRoots, c as indexedStatuses, f as resolveRootRef, i as canonicalRoot, l as isCanonicallyUnder, n as additionalRootId, p as validateRootCandidate, r as availableRoots, s as expandRootInput, t as RootValidationError, u as removeStatusAt } from "./roots-DasWEBJk.js";
 import { t as MultiRootFileSystem } from "./fs-D_Sw3o5z.js";

package/lib/{instructions-BRGoC82G.js → instructions-Cn1Jj5Xi.js}

@@ -127,7 +127,50 @@ async function renderInstructions(files, options) {
 //#endregion
 //#region src/compat/llm-message.ts
 /**
-* Build one `{ kind: 'plugin', form: 'instructions' }` user-role message.
+* This plugin's own producer kind.
+*
+* Session format 4 rejects the shared `kind: 'plugin'` (`format v4 message
+* requires a producer-owned source kind`). The kind is ours, not
+* `agent-instructions`: upstream treats that kind's `changes` array as its
+* own reconciliation authority.
+*/
+const PRODUCER_SOURCE_KIND = "multi-root-workspace";
+/**
+* The first session format whose encoder refuses `kind: 'plugin'`.
+* Earlier formats declare that kind on `MessageSourceMap` and require it.
+*/
+const PRODUCER_OWNED_FORMAT = 4;
+/**
+* Which source kind the installed session format will persist.
+* @param formatVersion - `SESSION_FORMAT_VERSION`, when the session package is installed.
+* @returns `plugin` through format 3, and this plugin's own kind from format 4 on.
+*/
+function instructionSourceKind(formatVersion) {
+	return formatVersion !== void 0 && formatVersion >= PRODUCER_OWNED_FORMAT ? PRODUCER_SOURCE_KIND : "plugin";
+}
+/**
+* The installed session format, when that package is present.
+*
+* A composition that never persists a session can omit the package; format 3
+* is then the spelling that still declares `kind: 'plugin'`. Any other failure
+* is a broken install and must surface.
+* @returns the format version, or `undefined` when the package is not installed.
+*/
+async function installedFormatVersion() {
+	try {
+		const session = await import("@deepseek-ai/dsh-session");
+		return typeof session.SESSION_FORMAT_VERSION === "number" ? session.SESSION_FORMAT_VERSION : void 0;
+	} catch (error) {
+		const code = error.code;
+		if (code === "ERR_MODULE_NOT_FOUND" || code === "MODULE_NOT_FOUND") return void 0;
+		throw error;
+	}
+}
+/**
+* Build one user-role instruction message.
+*
+* Format 3 and earlier: `{ kind: 'plugin', plugin, form: 'instructions' }`.
+* Format 4 and later: `{ kind: 'multi-root-workspace', plugin, form: 'instructions' }`.
 * @param input - the body and the plugin attribution.
 * @returns the frozen message upstream's helper produced.
 * @throws {Error} when the optional peer is absent: a step that has instruction
@@ -141,18 +184,42 @@ async function createInstructionMessage(input) {
 	} catch (error) {
 		throw new Error(`multi-root workspace: @deepseek-ai/dsh-llm is not installed, so additional roots' instruction files cannot be delivered as messages (${error instanceof Error ? error.message : String(error)}).`);
 	}
-	return module.createUserMessage({
+	const create = module.createUserMessage;
+	return create({
 		content: [{
 			type: "text",
 			text: input.text
 		}],
-		source: {
-			kind: "plugin",
-			plugin: input.plugin,
-			form: "instructions"
-		}
+		source: instructionSource(input.plugin, await installedFormatVersion())
 	});
 }
+/** The source object the installed format will persist. */
+function instructionSource(plugin, formatVersion) {
+	const kind = instructionSourceKind(formatVersion);
+	if (kind === "plugin") return {
+		kind,
+		plugin,
+		form: "instructions"
+	};
+	return {
+		kind,
+		plugin,
+		form: "instructions"
+	};
+}
+//#endregion
+//#region src/compat/tool-result.ts
+/**
+* Whether a tool-result message reports failure, on every supported release.
+* @param message - the `tool/result` message from the session log.
+* @returns `true` when either spelling says the call failed.
+*/
+function toolResultFailed(message) {
+	if (message.isError === true) return true;
+	const block = message.content?.[0];
+	if (typeof block !== "object" || block === null || !("isError" in block)) return false;
+	return block.isError === true;
+}
 //#endregion
 //#region src/instructions.ts
 /**
@@ -170,9 +237,10 @@ async function createInstructionMessage(input) {
 *
 * 1. **Not a system-prompt contribution.** Instruction text is
 *    producer-supplied context, not system authority, so it enters as a
-*    user-role message tagged `{ kind: 'plugin', form: 'instructions' }` — the
-*    position DSH's own message model reserves for it. It is also the only
-*    channel that is logged, and model-visible content must be logged.
+*    user-role message tagged `form: 'instructions'`. Through session format 3
+*    the source kind is `plugin`; format 4 retired that shared kind, so the
+*    adapter persists this plugin's own (`multi-root-workspace`). It is also
+*    the only channel that is logged, and model-visible content must be logged.
 * 2. **Injected from `agent/pre-step`, not a session lifecycle event.**
 *    `pre-step` is an awaited waterfall, so discovery, reading and rendering all
 *    complete BEFORE the step it feeds — deterministically, on the first step.
@@ -368,7 +436,7 @@ function apply(ctx, config = {}) {
 		const call = pendingCalls.get(callId);
 		pendingCalls.delete(callId);
 		if (call === void 0) return;
-		if (event.data.error !== void 0 || event.data.message.content[0]?.isError === true) return;
+		if (event.data.error !== void 0 || toolResultFailed(event.data.message)) return;
 		const path = touchedPathOfToolCall(call.name, call.arguments);
 		if (path === void 0) return;
 		const state = stateOf(session);

package/lib/instructions.js

@@ -1,2 +1,2 @@
-import { a as composeInstructionMessage, i as apply, n as DEFAULT_MAX_SOURCE_BYTES, o as inject, r as PLUGIN_SOURCE, s as touchedPathOfToolCall, t as DEFAULT_MAX_BYTES } from "./instructions-BRGoC82G.js";
+import { a as composeInstructionMessage, i as apply, n as DEFAULT_MAX_SOURCE_BYTES, o as inject, r as PLUGIN_SOURCE, s as touchedPathOfToolCall, t as DEFAULT_MAX_BYTES } from "./instructions-Cn1Jj5Xi.js";
 export { DEFAULT_MAX_BYTES, DEFAULT_MAX_SOURCE_BYTES, PLUGIN_SOURCE, apply, composeInstructionMessage, inject, touchedPathOfToolCall };

package/lib/types/client/panel-client.d.ts

@@ -55,5 +55,3 @@ export interface PanelClient {
  * @returns the client, with every transport failure normalized to a `PanelError`.
  */
 export declare function createPanelClient(connection: ConnectionHandle): PanelClient;
-/** The current session id, when the composed client can name one. */
-export declare function currentSessionIdOf(sessions: unknown): string | undefined;

package/lib/types/compat/client-icons.d.ts

@@ -0,0 +1,40 @@
+/**
+ * Compatibility adapter for the product icons the panel renders.
+ *
+ * ```text
+ * 0.1.5-rc.2 / 0.1.6   IconFolderClose16, IconChevronDownOutline14, …  (pixel size in the name)
+ * 0.1.7-alpha.1        IconFolderCloseRegular, IconChevronDownOutlineRegular, …  (weight in the name)
+ * ```
+ *
+ * `0.1.7-alpha.1` kept `size` as a prop and split each glyph into a Regular
+ * (1px) and a Medium (1.3px) weight. Upstream's own client surfaces use
+ * Regular for these glyphs, so that is the name this probe prefers after the
+ * pixel-sized one. The lookup is by export name, not by release string.
+ *
+ * @module @dsh-electron/dsh-plugin-multi-root-workspace/compat/client-icons
+ */
+import type { ReactNode } from 'react';
+import type { IconProps } from '@deepseek-ai/dsh-client-ui-primitives';
+/** One icon component, spelled the way both releases spell `IconProps`. */
+export type PanelIcon = (props: IconProps) => ReactNode;
+/** Exports addressed by name. A release carries one name from each pair. */
+type IconModule = Readonly<Record<string, PanelIcon | undefined>>;
+/**
+ * Pick the first export name this release actually provides.
+ * @param module - the icon module to read.
+ * @param names - candidate export names, preferred first.
+ * @returns the component.
+ * @throws {Error} when none of the names is exported. That is a compatibility
+ *   break to adapt here, not a missing optional peer.
+ */
+export declare function selectIcon(module: IconModule, names: readonly string[]): PanelIcon;
+export declare const IconChevronDown: PanelIcon;
+export declare const IconChevronUp: PanelIcon;
+export declare const IconCopy: PanelIcon;
+export declare const IconEdit: PanelIcon;
+export declare const IconEllipsis: PanelIcon;
+export declare const IconFolderClose: PanelIcon;
+export declare const IconFolderOpen: PanelIcon;
+export declare const IconPlus: PanelIcon;
+export declare const IconTrash: PanelIcon;
+export {};

package/lib/types/compat/client-session.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Compatibility adapter for "which session is the client looking at".
+ *
+ * The browser panel has to name that session before it may call the host
+ * (ADR-0008). Upstream moved the fact between two releases this plugin
+ * supports, without renaming the `sessions` service:
+ *
+ * ```text
+ * 0.1.5-rc.2, 0.1.6-alpha.1
+ *   sessions.list.getSnapshot().current          SessionId | undefined
+ * 0.1.6-alpha.2, 0.1.7-alpha.1
+ *   the catalog has no `current`. The main view retains its session with
+ *   source `mainView`, and that count is projected onto the list row:
+ *   sessions.list.getSnapshot().byId[id].retainedBy.mainView > 0
+ * ```
+ *
+ * Reading only `current` makes 0.1.6-alpha.2 report "no active session"
+ * while a conversation is on screen. Reading the first catalog id would
+ * name a session the operator is not looking at. This probe prefers the
+ * explicit selection when that field is a non-empty string, and otherwise
+ * the first row the main view actually retains — the same predicate
+ * `ui-session` uses to publish the main binding.
+ *
+ * @module @dsh-electron/dsh-plugin-multi-root-workspace/compat/client-session
+ */
+/**
+ * The session the composed client is showing, when it can name one.
+ * @param sessions - the client `sessions` service, or whatever this
+ *   composition provided under that name. Absence is a supported state.
+ * @returns the session id, or `undefined` when no main view holds one.
+ */
+export declare function currentSessionIdOf(sessions: unknown): string | undefined;

package/lib/types/compat/dsh-version.d.ts

@@ -28,7 +28,7 @@
  * the upgrade smoke passed on that exact version — a green CI run on an
  * unlisted release is evidence, not authorization (ADR-0009).
  */
-export declare const SUPPORTED_DSH_RELEASES: readonly ["0.1.5-rc.2", "0.1.6-alpha.1"];
+export declare const SUPPORTED_DSH_RELEASES: readonly ["0.1.5-rc.2", "0.1.6-alpha.1", "0.1.6-alpha.2", "0.1.7-alpha.1"];
 /** One release this plugin claims to support. */
 export type SupportedDshRelease = typeof SUPPORTED_DSH_RELEASES[number];
 /**

package/lib/types/compat/llm-message.d.ts

@@ -24,7 +24,44 @@ export interface InstructionMessageInput {
     readonly plugin: string;
 }
 /**
- * Build one `{ kind: 'plugin', form: 'instructions' }` user-role message.
+ * This plugin's own producer kind.
+ *
+ * Session format 4 rejects the shared `kind: 'plugin'` (`format v4 message
+ * requires a producer-owned source kind`). The kind is ours, not
+ * `agent-instructions`: upstream treats that kind's `changes` array as its
+ * own reconciliation authority.
+ */
+export declare const PRODUCER_SOURCE_KIND = "multi-root-workspace";
+declare module '@deepseek-ai/dsh-llm' {
+    interface MessageSourceMap {
+        'multi-root-workspace': {
+            kind: 'multi-root-workspace';
+            plugin: string;
+            form: 'instructions';
+        };
+    }
+}
+/** Either spelling of an instruction message's source. */
+type InstructionSource = {
+    readonly kind: 'plugin';
+    readonly plugin: string;
+    readonly form: 'instructions';
+} | {
+    readonly kind: 'multi-root-workspace';
+    readonly plugin: string;
+    readonly form: 'instructions';
+};
+/**
+ * Which source kind the installed session format will persist.
+ * @param formatVersion - `SESSION_FORMAT_VERSION`, when the session package is installed.
+ * @returns `plugin` through format 3, and this plugin's own kind from format 4 on.
+ */
+export declare function instructionSourceKind(formatVersion: number | undefined): InstructionSource['kind'];
+/**
+ * Build one user-role instruction message.
+ *
+ * Format 3 and earlier: `{ kind: 'plugin', plugin, form: 'instructions' }`.
+ * Format 4 and later: `{ kind: 'multi-root-workspace', plugin, form: 'instructions' }`.
  * @param input - the body and the plugin attribution.
  * @returns the frozen message upstream's helper produced.
  * @throws {Error} when the optional peer is absent: a step that has instruction
@@ -32,3 +69,4 @@ export interface InstructionMessageInput {
  *   user-visible context instead of reporting a misconfigured composition.
  */
 export declare function createInstructionMessage(input: InstructionMessageInput): Promise<UserMessage>;
+export {};

package/lib/types/compat/tool-result.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Compatibility adapter for where a tool result records failure.
+ *
+ * ```text
+ * 0.1.5-rc.2 / 0.1.6   content[0].isError on the tool-result block
+ * 0.1.7-alpha.1        message.isError on the tool-role message
+ * ```
+ *
+ * A failed `read` / `write` / `edit` must not make a directory worth examining
+ * (ADR-0010). The two releases store that bit in different places, and a
+ * session log can carry either spelling, so both are read. Neither access is
+ * written against the installed `ContentBlock` or `ToolResultMessage` type:
+ * one of the two properties is absent from each release's declaration.
+ *
+ * @module @dsh-electron/dsh-plugin-multi-root-workspace/compat/tool-result
+ */
+/** The fields either release uses to say a tool invocation failed. */
+export interface ToolResultFailureShape {
+    /** `0.1.7-alpha.1` records the outcome on the message. */
+    readonly isError?: boolean;
+    /** `0.1.5-rc.2` and `0.1.6` record it on the first content block. */
+    readonly content?: readonly object[];
+}
+/**
+ * Whether a tool-result message reports failure, on every supported release.
+ * @param message - the `tool/result` message from the session log.
+ * @returns `true` when either spelling says the call failed.
+ */
+export declare function toolResultFailed(message: ToolResultFailureShape): boolean;

package/lib/types/instructions.d.ts

@@ -13,9 +13,10 @@
  *
  * 1. **Not a system-prompt contribution.** Instruction text is
  *    producer-supplied context, not system authority, so it enters as a
- *    user-role message tagged `{ kind: 'plugin', form: 'instructions' }` — the
- *    position DSH's own message model reserves for it. It is also the only
- *    channel that is logged, and model-visible content must be logged.
+ *    user-role message tagged `form: 'instructions'`. Through session format 3
+ *    the source kind is `plugin`; format 4 retired that shared kind, so the
+ *    adapter persists this plugin's own (`multi-root-workspace`). It is also
+ *    the only channel that is logged, and model-visible content must be logged.
  * 2. **Injected from `agent/pre-step`, not a session lifecycle event.**
  *    `pre-step` is an awaited waterfall, so discovery, reading and rendering all
  *    complete BEFORE the step it feeds — deterministically, on the first step.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dsh-electron/dsh-plugin-multi-root-workspace",
   "description": "Multi-root Workspace for DeepSeek Harness: adds N additional roots to the workspace sandbox scope as an out-of-tree bundle",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -68,20 +68,20 @@
   "license": "MIT",
   "peerDependencies": {
     "@deepseek-ai/cordis": ">=4.0.1 <5.0.0",
-    "@deepseek-ai/dsh-agent": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-agent-instructions": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-connection": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-commands": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-fs": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-fs-local": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-llm": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-sandbox": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-sandbox-local": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-session": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-storage-domain": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-subprocess": "0.1.5-rc.2 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-system-prompt": "0.1.5-rc.2 || 0.1.6-alpha.1"
+    "@deepseek-ai/dsh-agent": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-agent-instructions": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-connection": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-commands": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-fs": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-fs-local": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-llm": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-sandbox": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-sandbox-local": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-session": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-storage-domain": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-subprocess": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1",
+    "@deepseek-ai/dsh-system-prompt": "0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2 || 0.1.7-alpha.1"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh-agent": {