@dong-victor/dsh-better-sidebar-starter 0.1.8 → 0.1.9

package/lib/client.js

@@ -1089,29 +1089,28 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/DirChooser.tsx
 		/**
-		* Shared directory chooser: a filesystem folder tree (backed by the sidebar
-		* fs.tree API, which can list any absolute path) plus a browse button that
-		* opens a modal popup. Browsing starts at the user's home directory and can
-		* navigate up to any drive/root, so runtime tool paths (JDK/Maven/...) that
-		* live outside the workspace can be selected.
+		* Shared directory chooser: a filesystem folder tree (backed by the starter
+		* plugin's own fs-dirs host route) plus a browse button that opens a modal
+		* popup. Browsing starts at the user's home directory and can navigate up to
+		* any drive/root, so runtime tool paths (JDK/Maven/...) that live outside the
+		* workspace can be selected. The sidebar fs.tree API cannot be used here — it
+		* is workspace-confined since dsh-better-sidebar 0.16 (403 outside the
+		* session workspace).
 		* @module dsh-better-sidebar-starter/client/DirChooser
 		*/
-		/** Call the sidebar fs.tree API directly via fetch. Returns directories only. */
-		async function fsTree$1(scope, path) {
-			const payload = {
-				sessionId: scope.sessionId,
-				path
-			};
-			if (scope.cwd !== void 0 && scope.cwd !== "") payload.cwd = scope.cwd;
-			const resp = await fetch("/sidebar/api/fs.tree", {
+		/** Call the starter fs-dirs host route via fetch. Returns directories only. */
+		async function fsTree(scope, path) {
+			const resp = await fetch("/api/dsh-better-sidebar-starter/fs-dirs", {
 				method: "POST",
 				headers: { "content-type": "application/json" },
-				body: JSON.stringify(payload)
+				body: JSON.stringify({
+					sessionId: scope.sessionId,
+					path
+				})
 			});
-			if (!resp.ok) throw new Error(`fs.tree ${path}: ${resp.status}`);
-			const parsed = await resp.json();
-			if (!parsed.ok || parsed.value === void 0) throw new Error(`fs.tree ${path}: ${parsed.error?.message ?? "unknown error"}`);
-			return parsed.value.entries.filter((e) => e.isDir && !e.hidden);
+			const parsed = await resp.json().catch(() => void 0);
+			if (!resp.ok) throw new Error(`fs-dirs ${path}: ${parsed?.error ?? resp.status}`);
+			return (parsed?.entries ?? []).filter((e) => e.isDir && !e.hidden);
 		}
 		/** Fetch the user's home directory from the host. Falls back to cwd. */
 		async function fetchHomeDefault(scope) {
@@ -1163,7 +1162,7 @@ window.__ModuleLoader__.load({
 			const loadDir = (s, path) => {
 				setLoading(true);
 				setError(null);
-				fsTree$1(s, path).then((dirs) => {
+				fsTree(s, path).then((dirs) => {
 					setEntries(dirs);
 					setLoading(false);
 				}).catch((err) => {
@@ -1244,7 +1243,7 @@ window.__ModuleLoader__.load({
 				onToggleExpand(entry.path);
 				if (children === null) {
 					setLoading(true);
-					fsTree$1(scope, entry.path).then((dirs) => {
+					fsTree(scope, entry.path).then((dirs) => {
 						setChildren(dirs);
 						setLoading(false);
 					}).catch(() => {
@@ -1356,23 +1355,6 @@ window.__ModuleLoader__.load({
 		* and environment variables.
 		* @module dsh-better-sidebar-starter/client/ConfigEditorModal
 		*/
-		/** Call the sidebar fs.tree API directly via fetch. Returns directories only.
-		*  If path is omitted, the server uses the session cwd (root listing).
-		*  The sidebar API wraps responses in { ok: true, value: ... } envelope. */
-		async function fsTree(scope, path) {
-			const payload = { sessionId: scope.sessionId };
-			if (scope.cwd !== void 0 && scope.cwd !== "") payload.cwd = scope.cwd;
-			if (path !== void 0) payload.path = path;
-			const resp = await fetch("/sidebar/api/fs.tree", {
-				method: "POST",
-				headers: { "content-type": "application/json" },
-				body: JSON.stringify(payload)
-			});
-			if (!resp.ok) throw new Error(`fs.tree ${path ?? "(root)"}: ${resp.status}`);
-			const parsed = await resp.json();
-			if (!parsed.ok || parsed.value === void 0) throw new Error(`fs.tree ${path ?? "(root)"}: ${parsed.error?.message ?? "unknown error"}`);
-			return parsed.value.entries.filter((e) => e.isDir && !e.hidden);
-		}
 		/** Recursive tree node: loads its own children on expand. */
 		function TreeNode(props) {
 			const { scope, entry, depth, selectedPath, onSelect } = props;
@@ -1426,7 +1408,8 @@ window.__ModuleLoader__.load({
 				if (!expanded && children === null) {
 					setLoading(true);
 					setError(null);
-					fsTree(scope).then((dirs) => {
+					const root = scope.cwd ?? "";
+					(root === "" ? Promise.reject(/* @__PURE__ */ new Error("fs-dirs: 会话工作目录不可用")) : fsTree(scope, root)).then((dirs) => {
 						setChildren(dirs);
 						setLoading(false);
 					}).catch((err) => {
@@ -3104,39 +3087,7 @@ window.__ModuleLoader__.load({
 				icon: (size) => (0, react.createElement)(RocketIcon, { size }),
 				order: 50,
 				single: true,
-				settings: {
-					pluginToggles: [
-						{
-							key: "autoSelectOnStart",
-							type: "switch",
-							title: "启动后自动选中日志"
-						},
-						{
-							key: "autoScroll",
-							type: "switch",
-							title: "自动滚动到最新日志"
-						},
-						{
-							key: "javaHome",
-							type: "text",
-							title: "Java 主目录 (JAVA_HOME)",
-							desc: "Spring Boot 用的 JDK 路径，留空则自动查找"
-						},
-						{
-							key: "nodePath",
-							type: "text",
-							title: "Node.js 路径",
-							desc: "npm 命令用的 Node 路径，留空则用系统默认"
-						},
-						{
-							key: "pythonPath",
-							type: "text",
-							title: "Python 路径",
-							desc: "Python 命令用的解释器路径，留空则用系统默认"
-						}
-					],
-					render: (props) => (0, react.createElement)(SettingsPanel, props)
-				},
+				settings: { render: (props) => (0, react.createElement)(SettingsPanel, props) },
 				component: (props) => (0, react.createElement)(ServicesTab, props)
 			}), "dsh-better-sidebar-starter: services tab");
 		}