@dsh-xhl/dsh-file-explorer 0.1.7 → 0.1.8

package/cordis.patch.yml

@@ -1,8 +1,8 @@
-# dsh-file-explorer bundle patch
-#
-# 通过 bundle 通道挂载：
-#   dsh plugin --profile <name> add @dsh-xhl/dsh-file-explorer@<version>
-# 或手动把 '@dsh-xhl/dsh-file-explorer' 加进 profile 的 dsh.profile.bundles 并 link 依赖。
-- insert:
-    - id: dsh-file-explorer
-      name: '@dsh-xhl/dsh-file-explorer'
+# dsh-file-explorer bundle patch
+#
+# 通过 bundle 通道挂载：
+#   dsh plugin --profile <name> add @dsh-xhl/dsh-file-explorer@<version>
+# 或手动把 '@dsh-xhl/dsh-file-explorer' 加进 profile 的 dsh.profile.bundles 并 link 依赖。
+- insert:
+    - id: dsh-file-explorer
+      name: '@dsh-xhl/dsh-file-explorer'

package/lib/client.js

@@ -37014,21 +37014,37 @@ window.__ModuleLoader__.load({
 		*/
 		const CSS = `
 /* ── header icon (utilities slot) ────────────────────────────────────── */
-/* Same 28×28 round button as dsh-git-gui's header entry (.gg-header-btn):
-   the primitive sm button is already 28px tall with a 16px icon, so only
-   the width / padding / radius need pinning down. */
-.filex-header-btn{width:28px;height:28px;padding:0;border-radius:14px}
+/* Same 28×28 header entry as dsh-git-gui's (.gg-header-btn) but with a
+   modest rounded-rectangle corner: the primitive sm button is already 28px
+   tall with a 16px icon, so only the width / padding / radius need pinning
+   down. An 8px radius keeps it a rounded square rather than a full circle. */
+.filex-header-btn{width:28px;height:28px;padding:0;border-radius:8px}
 
 /* ── hero ButtonGroup (shell.overlay entry) ──────────────────────────── */
 /* The mode group shown only on the hero / new-session screen: the left
    button carries the remembered mode's icon, the right chevron the mode
-   dropdown. Outer corners reuse the in-chat header-button radius (14px on
-   a 28px-tall button = a fully round cap), so the group reads as one pill
-   with the same curve as the session header icon. */
+   dropdown. Outer corners use the same rounded-rectangle radius as the
+   header buttons (8px on a 28px-tall button), so the group reads as one
+   pill consistent with the session header icons. */
 .filex-group{display:inline-flex;align-items:center;position:relative;height:28px}
 .filex-group .filex-group-main,.filex-group .filex-group-trigger{height:28px}
-.filex-group .filex-group-main{border-radius:14px 0 0 14px;padding:0 9px}
-.filex-group .filex-group-trigger{margin-left:-1px;border-radius:0 14px 14px 0;border-left:0;padding:0 7px}
+.filex-group .filex-group-main{border-radius:8px 0 0 8px;padding:0 9px}
+.filex-group .filex-group-trigger{margin-left:-1px;border-radius:0 8px 8px 0;border-left:0;padding:0 7px}
+
+/* ── header corner seat (new runtime) ────────────────────────────────── */
+/* The corner occupant: the hero ButtonGroup directly left of the right-
+   sidebar expand button in one flex row — the same corner seat the shell's
+   expand button occupies alone once the header chrome is shown, now shared
+   with the plugin's open-actions group. The seat's own margin and the
+   header's padding position the row at the far right of the blank header. */
+.filex-corner{display:flex;align-items:center;gap:8px}
+/* Re-painted expand button, same footprint as the shell's ExpandButton
+   (28×28, 15px mirrored panel icon) but with a rounded-rectangle corner to
+   match the editor button beside it; visible only while the panel is
+   collapsed. */
+.filex-corner-expand{width:28px;height:28px;color:var(--dsw-alias-label-secondary,#9ca3af);cursor:pointer;background:transparent;border:none;border-radius:8px;flex:none;justify-content:center;align-items:center;padding:6px;display:inline-flex}
+.filex-corner-expand:hover{background:var(--dsw-alias-interactive-bg-hover,rgba(128,128,128,.15))}
+.filex-corner-expand-icon{transform:scaleX(-1)}
 
 /* ── hero floating utility (shell.overlay entry) ─────────────────────── */
 /* The ButtonGroup, pinned by the plugin to the conversation column's
@@ -38196,6 +38212,20 @@ window.__ModuleLoader__.load({
 			};
 			emit();
 		}
+		/**
+		* Resolve the session's authoritative working directory from the host
+		* (`session.cwd` reads the session header), falling back to the framework
+		* session-list hint only when the host round-trip fails. This keeps
+		* reveal / vscode pointing at the session's own workspace even when the
+		* session-list snapshot carries no cwd for the bound session.
+		*/
+		async function resolveCwdHint(sessionId, fallback) {
+			try {
+				const result = await api.sessionCwd({ sessionId });
+				if (result.cwd !== "") return result.cwd;
+			} catch {}
+			return fallback;
+		}
 		/** Ask the host to reveal the session's working folder in the OS file manager. */
 		async function openSystemFolder(sessionId, cwd) {
 			const resolved = sessionId !== void 0 && sessionId !== "" ? sessionId : activeSessionId;
@@ -38204,7 +38234,8 @@ window.__ModuleLoader__.load({
 				return;
 			}
 			try {
-				showNotice(`已打开文件夹：${(await api.fsReveal({ sessionId: resolved }, cwd)).cwd}`);
+				const hint = await resolveCwdHint(resolved, cwd);
+				showNotice(`已打开文件夹：${(await api.fsReveal({ sessionId: resolved }, hint)).cwd}`);
 			} catch (error) {
 				showNotice(`打开系统文件夹失败：${error instanceof Error ? error.message : String(error)}`);
 			}
@@ -38217,7 +38248,8 @@ window.__ModuleLoader__.load({
 				return;
 			}
 			try {
-				showNotice(`已在 VS Code 打开：${(await api.fsVscode({ sessionId: resolved }, cwd)).cwd}`);
+				const hint = await resolveCwdHint(resolved, cwd);
+				showNotice(`已在 VS Code 打开：${(await api.fsVscode({ sessionId: resolved }, hint)).cwd}`);
 			} catch (error) {
 				showNotice(`用 VS Code 打开失败：${error instanceof Error ? error.message : String(error)}`);
 			}
@@ -38320,15 +38352,21 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* The hero ButtonGroup: the left button carries the remembered mode's icon and
-		* runs its action, the right chevron opens the mode dropdown. Rendered only on
-		* the hero / new-session screen — the in-chat header keeps the single
-		* built-in-editor `HeaderIcon`.
+		* runs its action, the right chevron opens the mode dropdown. Rendered on the
+		* hero / new-session screen (both the corner seat on the new runtime and the
+		* floating fallback) — the in-chat header keeps the single built-in-editor
+		* `HeaderIcon`.
+		*
+		* `sessionId` is optional: the corner seat supplies it from the session
+		* standard kit; the floating fallback (root-scoped overlay) resolves it from
+		* `useSessions` → `state.current` instead.
 		*/
 		function HeroGroup(props) {
 			const state = (0, react.useSyncExternalStore)(subscribe, getSnapshot);
 			const [menuOpen, setMenuOpen] = (0, react.useState)(false);
 			const useSessions = props.useSessions ?? (() => void 0);
-			const sessionId = useSessions((s) => s.current);
+			const current = useSessions((s) => s.current);
+			const sessionId = props.sessionId ?? current;
 			const sessionCwd = useSessions((s) => sessionId !== void 0 ? s.byId?.[sessionId]?.cwd : void 0);
 			const mode = state.mode;
 			const items = state.vscode ? MODE_ITEMS : MODE_ITEMS.filter((item) => item.id !== "vscode");
@@ -38389,6 +38427,103 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/**
+		* Corner expand button re-painted beside the explorer ButtonGroup while this
+		* plugin occupies the header's corner seat. Matches the shell's `ExpandButton`
+		* (28×28, mirrored panel icon, tooltip); the toggle goes through the
+		* cross-plugin `sidebarRight` face. Hides itself while the panel is open,
+		* exactly like the shipped button — the DOM probe (`data-sidebar-right-open`)
+		* is the same attribute the shell's panel root carries, so it tracks even
+		* opens that did not come from this button.
+		*/
+		function CornerExpandButton(props) {
+			const [expanded, setExpanded] = (0, react.useState)(false);
+			(0, react.useEffect)(() => {
+				const probe = () => {
+					setExpanded(document.querySelector("[data-sidebar-right-open]") !== null);
+				};
+				probe();
+				const observer = new MutationObserver(probe);
+				observer.observe(document.body, {
+					childList: true,
+					subtree: true,
+					attributes: true,
+					attributeFilter: ["data-sidebar-right-open"]
+				});
+				window.addEventListener("resize", probe);
+				return () => {
+					observer.disconnect();
+					window.removeEventListener("resize", probe);
+				};
+			}, []);
+			if (expanded) return null;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+				label: "展开右侧栏",
+				side: "bottom",
+				delayMs: 500,
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					type: "button",
+					className: "filex-corner-expand",
+					"aria-label": "展开右侧栏",
+					"data-sidebar-right-expand": "",
+					onClick: () => {
+						props.sidebar.toggleExpanded();
+					},
+					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPanelLeftOutline16, { className: "filex-corner-expand-icon" })
+				})
+			});
+		}
+		/**
+		* The header's corner seat while the new-session header chrome is blank: the
+		* explorer ButtonGroup sits directly left of the expand button — the same
+		* corner seat, one flex row, no floating layer, no measuring. In a session
+		* with records the `utilities` seat renders (where the editor icon lives), so
+		* only the expand button is re-painted here; the DOM probe keeps the pair
+		* from ever duplicating.
+		*/
+		function HeaderCornerGroup(props) {
+			const [utilitiesPresent, setUtilitiesPresent] = (0, react.useState)(false);
+			const [sidebar, setSidebar] = (0, react.useState)(void 0);
+			(0, react.useEffect)(() => {
+				let alive = true;
+				let tries = 0;
+				const read = () => {
+					if (!alive) return;
+					let value;
+					try {
+						value = ctxRef?.get?.("sidebarRight", false) ?? ctxRef?.sidebarRight;
+					} catch {
+						value = void 0;
+					}
+					if (value !== void 0) {
+						setSidebar(value);
+						return;
+					}
+					tries += 1;
+					if (tries < 40) setTimeout(read, 250);
+				};
+				read();
+				return () => {
+					alive = false;
+				};
+			}, []);
+			(0, react.useEffect)(() => {
+				const probe = () => {
+					setUtilitiesPresent(document.querySelector("[data-slot=\"conversation.session.header.utilities\"]") !== null);
+				};
+				probe();
+				const observer = new MutationObserver(probe);
+				observer.observe(document.body, {
+					childList: true,
+					subtree: true
+				});
+				return () => observer.disconnect();
+			}, []);
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "filex-corner",
+				children: [!utilitiesPresent && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(HeroGroup, { sessionId: props.sessionId }), sidebar !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CornerExpandButton, { sidebar })]
+			});
+		}
+		/**
 		* Hero / new-session floating utility: the hero ButtonGroup, rendered by the
 		* plugin itself through the generic `shell.overlay` floating layer (no shell
 		* change needed) and pinned to the conversation column's top-right corner —
@@ -38400,11 +38535,19 @@ window.__ModuleLoader__.load({
 		* tracked automatically. Clicking behaves exactly like the in-chat icon: in a
 		* blank-session hero the actions bind to that session, and with no session
 		* at all they surface the no-session notice.
+		*
+		* On the new runtime the corner seat carries the same ButtonGroup, so this
+		* fallback hides itself the moment `.filex-corner` is rendered — the two
+		* paths never overlap.
 		*/
 		function HeroFilexButton(props) {
 			const [pos, setPos] = (0, react.useState)(null);
 			(0, react.useEffect)(() => {
 				const update = () => {
+					if (document.querySelector(".filex-corner") !== null) {
+						setPos(null);
+						return;
+					}
 					const column = document.querySelector("[data-phase]");
 					if (column === null || column.getAttribute("data-phase") !== "hero") {
 						setPos(null);
@@ -38533,6 +38676,11 @@ window.__ModuleLoader__.load({
 						heroFab();
 					};
 				});
+				ctx.slots.inject("conversation.session.header.corner", () => ctx.slots.register({
+					name: "conversation.session.header.corner",
+					priority: -1,
+					label: "文件预览 / 编辑（角落）"
+				}, (props) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(HeaderCornerGroup, { sessionId: props.sessionId })));
 				probeVscode();
 				ctx.effect(() => {
 					const deps = {

package/lib/index.js

@@ -134,11 +134,16 @@ function isWithin(parent, child) {
 	if (c === p) return true;
 	return c.startsWith(p + "\\") || c.startsWith(p + "/") || c.startsWith(p + "\\") || c.startsWith(p + "/");
 }
-/** Resolve a session's authoritative working directory (header cwd first, process cwd last). */
+/**
+* Resolve a session's authoritative working directory (header cwd first).
+* A session with no workspace has no meaningful directory — falling back to
+* the host process cwd (the DSH installation's home) would silently point
+* file operations at the wrong tree, so this fails loudly instead.
+*/
 function sessionCwdOf(ctx, sessionId) {
 	const headerCwd = ctx.sessions.get(sessionId)?.header.cwd;
 	if (headerCwd !== void 0 && headerCwd !== "") return resolve(headerCwd);
-	return process.cwd();
+	throw new FilexError("no-workspace", "该会话没有关联的工作区目录。请先为该会话选择一个工作区。", 400);
 }
 async function readJsonBody(req) {
 	let raw = "";
@@ -334,15 +339,18 @@ function openInSystemFileManager(target) {
 }
 /**
 * Resolve the directory a reveal/open action should point at. Authoritative
-* source: the session's own header cwd. When it is absent (sessions created
-* without workspace metadata fall back to the host process cwd — usually
-* meaningless), accept the loopback-only client's session-list cwd hint so
-* the folder still opens where the user works.
+* source: the session's own header cwd. When it is absent (a session created
+* without workspace metadata), fall back to the loopback-only client's
+* session-list cwd hint — and only then fail loudly, never to the host
+* process cwd (which is the DSH installation's home directory and would make
+* "open folder" appear to open the user's home).
 */
 function revealCwdOf(ctx, sessionId, rawHint) {
 	const headerCwd = ctx.sessions.get(sessionId)?.header.cwd;
 	const hint = typeof rawHint === "string" && rawHint !== "" ? rawHint : void 0;
-	return headerCwd !== void 0 && headerCwd !== "" ? resolve(headerCwd) : hint !== void 0 && isAbsolute(hint) ? resolve(hint) : process.cwd();
+	if (headerCwd !== void 0 && headerCwd !== "") return resolve(headerCwd);
+	if (hint !== void 0 && isAbsolute(hint)) return resolve(hint);
+	throw new FilexError("no-workspace", "该会话没有关联的工作区目录，无法打开系统文件夹。请先为该会话选择一个工作区。", 400);
 }
 /**
 * Locate the VS Code CLI (`code`). Checks the standard install locations

package/lib/types/context-types.d.ts

@@ -111,11 +111,22 @@ export interface FilexSlotsService {
         id?: string;
         key?: string;
         order?: number;
+        priority?: number;
         label?: string | (() => string);
         inject?: (...args: unknown[]) => Record<string, unknown>;
     }, component: unknown): () => void;
     inject(key: string, callback: () => () => void): () => void;
 }
+/**
+ * The cross-plugin right-sidebar face (`dsh-client-ui-sidebar-right` provides
+ * it as `ctx.sidebarRight`). Only the expand-toggle and expanded-state read
+ * are used here, to re-paint the header's corner expand button beside the
+ * explorer ButtonGroup while the plugin occupies the corner seat.
+ */
+export interface FilexSidebarRight {
+    isExpanded(): boolean;
+    toggleExpanded(): void;
+}
 declare module 'cordis' {
     interface Context {
         webServer: FilexWebServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-xhl/dsh-file-explorer",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "DSH 外部编译型插件：工作区文件预览 / 编辑（CodeMirror 6 编辑器 + 文件树 + 全文搜索 + Markdown/HTML/图片/PDF 预览）。移植自同目录下的动态 Cordis 插件版本。",
   "type": "module",
   "main": "lib/index.js",