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

package/cordis.patch.yml

@@ -13,7 +13,9 @@
 #
 # The last two rows are additive and self-softening: `multi-root-registry` waits
 # for the storage domain (absent only in compositions that mount no storage at
-# all), and `multi-root-command` registers the `/workspace-folders` command
+# all) and takes a store-wide kernel lease beside the JSON document so two DSH
+# processes sharing $DSH_HOME cannot each grant a stale snapshot (ADR-0007);
+# `multi-root-command` registers the `/workspace-folders` command
 # wherever a command registry exists and the browser panel channel wherever a
 # host Connection and web server exist (see
 # docs/troubleshooting/panel-channel-http-405.md for why both must be declared
@@ -30,6 +32,12 @@
 - id: sandbox
   disabled: true
 - insert:
+    # The compatibility gate comes first, and every security-relevant row below
+    # injects `multiRootCompat`. If the installed DSH release is not on this
+    # plugin's allowlist, this row throws and none of them start, rather than
+    # widening a sandbox profile whose shape was never verified (ADR-0009).
+    - id: multi-root-compat
+      name: '@dsh-electron/dsh-plugin-multi-root-workspace/compat'
     - id: multi-root-fs
       name: '@dsh-electron/dsh-plugin-multi-root-workspace/fs'
     - id: multi-root-sandbox
@@ -38,6 +46,19 @@
       name: '@dsh-electron/dsh-plugin-multi-root-workspace/scope'
     - id: multi-root-registry
       name: '@dsh-electron/dsh-plugin-multi-root-workspace/registry'
+      config:
+        # Store-wide kernel lease beside the JSON domain document. A custom
+        # storage-json.root must override this path in lockstep (ADR-0007).
+        leasePath: !!js dshHomePath('storages/multi_root_workspace.lock')
+    # Upstream `agent-instructions` only discovers instruction files from the
+    # session cwd upward, so an additional root's own AGENTS.md is invisible to
+    # the model. This row closes that gap for the additional roots only; the
+    # primary root and the user-global file stay upstream's. The budget is the
+    # total for ALL additional roots, not per root.
+    - id: multi-root-instructions
+      name: '@dsh-electron/dsh-plugin-multi-root-workspace/instructions'
+      config:
+        maxBytes: 65536
     - id: multi-root-command
       name: '@dsh-electron/dsh-plugin-multi-root-workspace/command'
     - id: multi-root-client

package/lib/client.js

@@ -5139,8 +5139,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		/** The absolute logical channel both halves speak over. */
 		const PANEL_CHANNEL = "/multi-root-workspace";
 		object({
-			primaryRoot: string().optional(),
-			sessionId: string().optional(),
+			sessionId: string().min(1),
 			entry: object({
 				ordinal: number().int().positive(),
 				id: string(),
@@ -5283,6 +5282,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"panel.additional": "附属工作目录",
 			"panel.empty": "还没有附属工作目录。",
 			"panel.emptyHint": "添加后，Agent 可在同一会话中读写该目录；macOS/Linux 的受限 bash 同步生效，Windows 当前仅覆盖 fs 写路径。",
+			"panel.noSession": "当前没有活动会话",
 			"panel.loading": "正在读取…",
 			"panel.retry": "重试",
 			"panel.close": "关闭",
@@ -5316,9 +5316,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"error.not-found": "没有找到对应的登记项。",
 			"error.invalid-ref": "请求缺少必要的标识。",
 			"error.storage-unavailable": "根目录登记的存储不可用，请检查 $DSH_HOME/storages 下的文件。",
+			"error.registry-contended": "根目录登记正由另一个 DSH 进程占用；本进程不会授予附加根。关闭另一个进程后点重试。",
 			"error.reveal-unavailable": "无法打开系统的文件管理器；登记项不受影响，路径仍可复制。",
 			"error.unavailable": "无法连接到 dsh 主进程。",
 			"error.copy-failed": "无法写入剪贴板，请检查浏览器的剪贴板权限。",
+			"error.session-not-found": "找不到该会话；请先打开一个工作区会话。",
 			"error.fallback": "操作失败。"
 		};
 		/** English copy, pinned to the Chinese key set. */
@@ -5332,6 +5334,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"panel.additional": "Secondary working directories",
 			"panel.empty": "No secondary working directories yet.",
 			"panel.emptyHint": "Once added, the agent can use the folder in this session; confined bash follows on macOS/Linux, while Windows currently covers fs writes only.",
+			"panel.noSession": "No active session",
 			"panel.loading": "Loading…",
 			"panel.retry": "Retry",
 			"panel.close": "Close",
@@ -5365,9 +5368,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"error.not-found": "No registration matches that reference.",
 			"error.invalid-ref": "The request is missing a required identity.",
 			"error.storage-unavailable": "The root registry store is unavailable; check the files under $DSH_HOME/storages.",
+			"error.registry-contended": "The root registry is owned by another DSH process; this process grants no additional roots. Close the other process, then retry.",
 			"error.reveal-unavailable": "Could not open the system file manager; the registration is untouched, and the path can still be copied.",
 			"error.unavailable": "Could not reach the dsh host process.",
 			"error.copy-failed": "Could not write to the clipboard; check the browser's clipboard permission.",
+			"error.session-not-found": "That session is not active; open a workspace session first.",
 			"error.fallback": "The operation failed."
 		};
 		//#endregion
@@ -5956,7 +5961,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			const [state, setState] = (0, react.useState)({
 				view: void 0,
 				error: void 0,
-				busy: false
+				busy: false,
+				noSession: false
 			});
 			const [manualPath, setManualPath] = (0, react.useState)("");
 			const [aliasFor, setAliasFor] = (0, react.useState)(void 0);
@@ -5972,7 +5978,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			}, []);
 			const requestBase = (0, react.useCallback)(() => {
 				const current = props.sessionId?.();
-				return current === void 0 ? {} : { sessionId: current };
+				return current === void 0 || current === "" ? void 0 : { sessionId: current };
 			}, [props.sessionId]);
 			(0, react.useEffect)(() => {
 				dialogRef.current?.focus();
@@ -6008,29 +6014,43 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					setState({
 						view: void 0,
 						error: new PanelError("unavailable", "no connection"),
-						busy: false
+						busy: false,
+						noSession: false
+					});
+					return;
+				}
+				const base = requestBase();
+				if (base === void 0) {
+					setState({
+						view: void 0,
+						error: void 0,
+						busy: false,
+						noSession: true
 					});
 					return;
 				}
 				const epoch = ++requestEpoch.current;
 				setState((previous) => ({
 					...previous,
-					busy: true
+					busy: true,
+					noSession: false
 				}));
 				try {
-					const view = await panel.call("list", requestBase());
+					const view = await panel.call("list", base);
 					if (!mounted.current || epoch !== requestEpoch.current) return;
 					setState({
 						view,
 						error: void 0,
-						busy: false
+						busy: false,
+						noSession: false
 					});
 				} catch (error) {
 					if (!mounted.current || epoch !== requestEpoch.current) return;
 					setState({
 						view: void 0,
 						error: asPanelError(error),
-						busy: false
+						busy: false,
+						noSession: false
 					});
 				}
 			}, [panel, requestBase]);
@@ -6044,21 +6064,33 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			*/
 			const mutate = (0, react.useCallback)(async (endpoint, payload) => {
 				if (panel === void 0) return false;
+				const base = requestBase();
+				if (base === void 0) {
+					setState({
+						view: void 0,
+						error: void 0,
+						busy: false,
+						noSession: true
+					});
+					return false;
+				}
 				const epoch = ++requestEpoch.current;
 				setState((previous) => ({
 					...previous,
-					busy: true
+					busy: true,
+					noSession: false
 				}));
 				try {
 					const view = await panel.call(endpoint, {
-						...requestBase(),
+						...base,
 						...payload
 					});
 					if (!mounted.current || epoch !== requestEpoch.current) return false;
 					setState({
 						view,
 						error: void 0,
-						busy: false
+						busy: false,
+						noSession: false
 					});
 					return true;
 				} catch (error) {
@@ -6105,14 +6137,25 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			/** Reveal one root: the answer is the revealed path, not a new view. */
 			const reveal = (0, react.useCallback)(async (root) => {
 				if (panel === void 0) return;
+				const base = requestBase();
+				if (base === void 0) {
+					setState({
+						view: void 0,
+						error: void 0,
+						busy: false,
+						noSession: true
+					});
+					return;
+				}
 				const epoch = ++requestEpoch.current;
 				setState((previous) => ({
 					...previous,
-					busy: true
+					busy: true,
+					noSession: false
 				}));
 				try {
 					await panel.call("reveal", {
-						...requestBase(),
+						...base,
 						entry: entryOf(root)
 					});
 					if (!mounted.current || epoch !== requestEpoch.current) return;
@@ -6189,7 +6232,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						})]
 					}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "mrfw-body",
-						children: [
+						children: [state.noSession ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							className: "mrfw-note",
+							children: t("panel.noSession")
+						}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 								className: "mrfw-description",
 								children: t("panel.subtitle")
@@ -6373,49 +6419,47 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 										}, key);
 									})
 								]
-							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-								className: "mrfw-actions",
-								children: [
-									props.pickDirectory === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconButton, {
-										variant: "outline",
-										disabled: state.busy,
-										onClick: () => {
-											addViaPicker();
-										},
-										icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutline16, {}),
-										label: t("panel.add")
-									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-										className: "mrfw-input",
-										value: manualPath,
-										placeholder: t("panel.addManual"),
-										onChange: (event) => {
-											setManualPath(event.target.value);
-										},
-										onKeyDown: (event) => {
-											if (event.key === "Enter") addManualPath();
-										}
-									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Action, {
-										onClick: () => {
-											addManualPath();
-										},
-										disabled: state.busy || manualPath.trim() === "",
-										variant: "primary",
-										children: t("panel.addConfirm")
-									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Action, {
-										onClick: () => {
-											refresh();
-										},
-										disabled: state.busy,
-										variant: "outline",
-										children: t("panel.retry")
-									})
-								]
 							})
-						]
+						] }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "mrfw-actions",
+							children: [
+								state.noSession || props.pickDirectory === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconButton, {
+									variant: "outline",
+									disabled: state.busy,
+									onClick: () => {
+										addViaPicker();
+									},
+									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutline16, {}),
+									label: t("panel.add")
+								}),
+								state.noSession ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+									className: "mrfw-input",
+									value: manualPath,
+									placeholder: t("panel.addManual"),
+									onChange: (event) => {
+										setManualPath(event.target.value);
+									},
+									onKeyDown: (event) => {
+										if (event.key === "Enter") addManualPath();
+									}
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Action, {
+									onClick: () => {
+										addManualPath();
+									},
+									disabled: state.busy || manualPath.trim() === "",
+									variant: "primary",
+									children: t("panel.addConfirm")
+								})] }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Action, {
+									onClick: () => {
+										refresh();
+									},
+									disabled: state.busy,
+									variant: "outline",
+									children: t("panel.retry")
+								})
+							]
+						})]
 					})]
 				})]
 			});
@@ -6493,7 +6537,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		* and the workspace UI service are composed by the surface, not by this
 		* plugin, and neither is a dependency it may assume (the footer action exists
 		* on surfaces where they do not). Absence is a supported state — the panel then
-		* offers a manual path field and lets the host resolve the workspace root.
+		* shows "No active session" and does not ask the host to guess a workspace root.
 		* @param ctx - the client context.
 		* @param name - the service key to read.
 		* @returns the service, or `undefined` when this composition has none.