@dsh-workbench/core 0.2.1 → 0.2.3

package/client.js

@@ -561,6 +561,7 @@ window.__ModuleLoader__.load({
       //#endregion
       //#region ../shared/dist/config/constants.js
       var PLUGIN_ID = "@dsh-workbench/core";
+      var RELEASE_SIBLINGS = ["@dsh-workbench/shared", "@dsh-workbench/module-tools"];
       var API_PREFIX = "/workbench/api";
       var PREFS_PREFIX = `${API_PREFIX}/prefs`;
       var EVENTS_PATH = "/workbench/events";
@@ -1242,6 +1243,8 @@ window.__ModuleLoader__.load({
       	"project.search.label": "Search workspaces",
       	"project.search.placeholder": "Search workspaces (folder / name / path)",
       	"project.search.empty": "No workspace matches “{query}”.",
+      	"project.group.workspaces": "Workspaces",
+      	"project.group.workshop": "Workshop",
       	"project.rename.row": "Rename “{name}”",
       	"project.rename.current": "Give this workspace a display name…",
       	"project.rename.title": "Give “{name}” a display name",
@@ -1416,6 +1419,7 @@ window.__ModuleLoader__.load({
       	"panels.market.add.failureIntegrity": "The downloaded package failed its integrity check",
       	"panels.market.add.failureTimeout": "The install timed out",
       	"panels.market.add.failurePnpmMissing": "pnpm was not found, cannot install",
+      	"panels.market.add.failureInstalled": "It is already in this profile: this dsh runs with hot reload, which refuses to install over the same package (remove it first) — and removing it failed too",
       	"panels.market.add.failureGeneric": "Something went wrong during install — see the install details",
       	"panels.market.add.approveTitle": "Your approval is needed for install scripts",
       	"panels.market.add.approveCaution": "Only allow packages you trust: install scripts run on this machine with your permissions.",
@@ -1587,6 +1591,8 @@ window.__ModuleLoader__.load({
       	"project.search.label": "搜索工作区",
       	"project.search.placeholder": "搜索工作区（目录名 / 中文名 / 路径）",
       	"project.search.empty": "没有匹配「{query}」的工作区。",
+      	"project.group.workspaces": "工作区",
+      	"project.group.workshop": "工坊",
       	"project.rename.row": "改「{name}」的中文名",
       	"project.rename.current": "改当前工作区的中文名…",
       	"project.rename.title": "给「{name}」配一个中文名",
@@ -1761,6 +1767,7 @@ window.__ModuleLoader__.load({
       	"panels.market.add.failureIntegrity": "下载的安装包校验失败",
       	"panels.market.add.failureTimeout": "安装超时",
       	"panels.market.add.failurePnpmMissing": "没有找到 pnpm，无法安装",
+      	"panels.market.add.failureInstalled": "它已经在这份 profile 里了：这一版 dsh 开着热更新，同一个包不许就地覆盖装（得先卸载再装），而这次也没能把它卸下来",
       	"panels.market.add.failureGeneric": "安装过程中出错，原因见安装详情",
       	"panels.market.add.approveTitle": "需要你允许安装脚本",
       	"panels.market.add.approveCaution": "只允许你信得过的包：安装脚本会以你的权限在这台机器上运行。",
@@ -2298,6 +2305,7 @@ window.__ModuleLoader__.load({
       	PREFS_PREFIX: () => PREFS_PREFIX,
       	PROBE_TTL_MS: () => PROBE_TTL_MS,
       	PROVISION_PREFIX: () => PROVISION_PREFIX,
+      	RELEASE_SIBLINGS: () => RELEASE_SIBLINGS,
       	RIGHTBAR_FULLSCREEN_WIDTH: () => 768,
       	Row: () => Row,
       	Rows: () => Rows,
@@ -4690,6 +4698,7 @@ window.__ModuleLoader__.load({
       	integrity: "panels.market.add.failureIntegrity",
       	timeout: "panels.market.add.failureTimeout",
       	"pnpm-missing": "panels.market.add.failurePnpmMissing",
+      	"already-installed": "panels.market.add.failureInstalled",
       	"operation-error": "panels.market.add.failureGeneric",
       	"incompatible-version": "panels.market.add.failureGeneric",
       	"not-bundle": "panels.market.add.failureGeneric",
@@ -6252,8 +6261,12 @@ window.__ModuleLoader__.load({
       //#endregion
       //#region src/shared/api/diy.ts
       var DIY_PRESET_ID = "workbench-diy";
+      var WORKSHOP_RELATIVE = "workbench/diy";
       var WORKSHOP_TITLE = "工作台DIY";
       var WORKSHOP_PAST_TITLES = ["DIY 工坊", "工作台自带 · DIY 模块住这儿"];
+      function isWorkshopPath(path) {
+      	return path.replace(/\\/g, "/").replace(/\/+$/, "").endsWith(`/${WORKSHOP_RELATIVE}`);
+      }
       //#endregion
       //#region src/app/units/index.ts
       var CLIENT_UNITS = [];
@@ -8781,6 +8794,29 @@ window.__ModuleLoader__.load({
       	}));
       }
       //#endregion
+      //#region src/app/layouts/sidebar/workspace-groups.ts
+      function workspaceSections(items, headings) {
+      	const workspaces = [];
+      	const workshop = [];
+      	for (const item of items) if (isWorkshopPath(item.path)) workshop.push(item);
+      	else workspaces.push(item);
+      	const sections = [];
+      	if (workspaces.length > 0) sections.push({
+      		id: "workspaces",
+      		heading: workshop.length > 0 ? headings.workspaces : null,
+      		items: workspaces
+      	});
+      	if (workshop.length > 0) sections.push({
+      		id: "workshop",
+      		heading: headings.workshop,
+      		items: workshop
+      	});
+      	return sections;
+      }
+      function flattenSections(sections) {
+      	return sections.flatMap((section) => section.items);
+      }
+      //#endregion
       //#region src/app/layouts/sidebar/WorkspaceRowAction.tsx
       function WorkspaceRowAction({ workspace, t, onEdit }) {
       	return /* @__PURE__ */ h(_deepseek_ai_dsh_client_ui_primitives.Button, {
@@ -8828,8 +8864,8 @@ window.__ModuleLoader__.load({
       //#endregion
       //#region src/app/layouts/sidebar/workspace-items.tsx
       function workspaceMenuItems(options) {
-      	const { results, currentId, hoverId, t, onHover, onEdit } = options;
-      	return results.map((workspace) => ({
+      	const { sections, currentId, hoverId, t, onHover, onEdit } = options;
+      	const rowOf = (workspace) => ({
       		id: workspace.workspaceId,
       		icon: /* @__PURE__ */ h(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenRegular, { size: 16 }),
       		label: /* @__PURE__ */ h(WorkspaceRowLabel, {
@@ -8842,7 +8878,12 @@ window.__ModuleLoader__.load({
       				onEdit: () => onEdit(workspace)
       			}) : void 0
       		})
-      	}));
+      	});
+      	return sections.flatMap((section) => [...section.heading === null ? [] : [{
+      		type: "label",
+      		id: section.id,
+      		text: section.heading
+      	}], ...section.items.map(rowOf)]);
       }
       //#endregion
       //#region src/app/layouts/sidebar/ProjectSwitcher.tsx
@@ -8862,7 +8903,12 @@ window.__ModuleLoader__.load({
       	const wasOpenRef = useRef(false);
       	const currentId = current?.workspaceId ?? null;
       	const results = useMemo(() => matchWorkspaces(items, query), [items, query]);
-      	const cursorId = cursor === null || results.length === 0 ? null : results[Math.min(cursor, results.length - 1)]?.workspaceId ?? null;
+      	const sections = useMemo(() => workspaceSections(results, {
+      		workspaces: t("project.group.workspaces"),
+      		workshop: t("project.group.workshop")
+      	}), [results, t]);
+      	const ordered = useMemo(() => flattenSections(sections), [sections]);
+      	const cursorId = cursor === null || ordered.length === 0 ? null : ordered[Math.min(cursor, ordered.length - 1)]?.workspaceId ?? null;
       	useEffect(() => {
       		if (open) {
       			wasOpenRef.current = true;
@@ -8885,11 +8931,11 @@ window.__ModuleLoader__.load({
       			setCursor(null);
       		},
       		onCursor: (step) => {
-      			if (results.length === 0) return;
-      			setCursor((at) => at === null ? step === 1 ? 0 : results.length - 1 : (at + step + results.length) % results.length);
+      			if (ordered.length === 0) return;
+      			setCursor((at) => at === null ? step === 1 ? 0 : ordered.length - 1 : (at + step + ordered.length) % ordered.length);
       		},
       		onSubmit: () => {
-      			const pick = results[Math.min(cursor ?? 0, results.length - 1)];
+      			const pick = ordered[Math.min(cursor ?? 0, ordered.length - 1)];
       			if (pick === void 0) return;
       			close();
       			onPick(pick.workspaceId);
@@ -8919,7 +8965,7 @@ window.__ModuleLoader__.load({
       			id: "empty",
       			text: t("project.search.empty", { query: query.trim() })
       		}] : [], ...workspaceMenuItems({
-      			results,
+      			sections,
       			currentId,
       			hoverId,
       			t,
@@ -9640,7 +9686,7 @@ window.__ModuleLoader__.load({
       			disposeDictionary?.();
       		};
       	}, "dsh-workbench: dictionaries");
-      	const workshopWorkspace = () => ctx.workspaces.list.getSnapshot().items.find((item) => item.path.endsWith("/workbench/diy"));
+      	const workshopWorkspace = () => ctx.workspaces.list.getSnapshot().items.find((item) => isWorkshopPath(item.path));
       	const openDiySession = (workspaceId, fallback) => {
       		const remoteCreate = sessionCreateOf(ctx.remote);
       		try {

package/dist/client/client.body.js

@@ -554,6 +554,7 @@ function readDeclaration(subject, raw) {
 //#endregion
 //#region ../shared/dist/config/constants.js
 var PLUGIN_ID = "@dsh-workbench/core";
+var RELEASE_SIBLINGS = ["@dsh-workbench/shared", "@dsh-workbench/module-tools"];
 var API_PREFIX = "/workbench/api";
 var PREFS_PREFIX = `${API_PREFIX}/prefs`;
 var EVENTS_PATH = "/workbench/events";
@@ -1235,6 +1236,8 @@ var en = {
 	"project.search.label": "Search workspaces",
 	"project.search.placeholder": "Search workspaces (folder / name / path)",
 	"project.search.empty": "No workspace matches “{query}”.",
+	"project.group.workspaces": "Workspaces",
+	"project.group.workshop": "Workshop",
 	"project.rename.row": "Rename “{name}”",
 	"project.rename.current": "Give this workspace a display name…",
 	"project.rename.title": "Give “{name}” a display name",
@@ -1409,6 +1412,7 @@ var en = {
 	"panels.market.add.failureIntegrity": "The downloaded package failed its integrity check",
 	"panels.market.add.failureTimeout": "The install timed out",
 	"panels.market.add.failurePnpmMissing": "pnpm was not found, cannot install",
+	"panels.market.add.failureInstalled": "It is already in this profile: this dsh runs with hot reload, which refuses to install over the same package (remove it first) — and removing it failed too",
 	"panels.market.add.failureGeneric": "Something went wrong during install — see the install details",
 	"panels.market.add.approveTitle": "Your approval is needed for install scripts",
 	"panels.market.add.approveCaution": "Only allow packages you trust: install scripts run on this machine with your permissions.",
@@ -1580,6 +1584,8 @@ var zh = {
 	"project.search.label": "搜索工作区",
 	"project.search.placeholder": "搜索工作区（目录名 / 中文名 / 路径）",
 	"project.search.empty": "没有匹配「{query}」的工作区。",
+	"project.group.workspaces": "工作区",
+	"project.group.workshop": "工坊",
 	"project.rename.row": "改「{name}」的中文名",
 	"project.rename.current": "改当前工作区的中文名…",
 	"project.rename.title": "给「{name}」配一个中文名",
@@ -1754,6 +1760,7 @@ var zh = {
 	"panels.market.add.failureIntegrity": "下载的安装包校验失败",
 	"panels.market.add.failureTimeout": "安装超时",
 	"panels.market.add.failurePnpmMissing": "没有找到 pnpm，无法安装",
+	"panels.market.add.failureInstalled": "它已经在这份 profile 里了：这一版 dsh 开着热更新，同一个包不许就地覆盖装（得先卸载再装），而这次也没能把它卸下来",
 	"panels.market.add.failureGeneric": "安装过程中出错，原因见安装详情",
 	"panels.market.add.approveTitle": "需要你允许安装脚本",
 	"panels.market.add.approveCaution": "只允许你信得过的包：安装脚本会以你的权限在这台机器上运行。",
@@ -2291,6 +2298,7 @@ var dist_exports = /* @__PURE__ */ __exportAll({
 	PREFS_PREFIX: () => PREFS_PREFIX,
 	PROBE_TTL_MS: () => PROBE_TTL_MS,
 	PROVISION_PREFIX: () => PROVISION_PREFIX,
+	RELEASE_SIBLINGS: () => RELEASE_SIBLINGS,
 	RIGHTBAR_FULLSCREEN_WIDTH: () => 768,
 	Row: () => Row,
 	Rows: () => Rows,
@@ -4683,6 +4691,7 @@ var FAILURE_KEYS = {
 	integrity: "panels.market.add.failureIntegrity",
 	timeout: "panels.market.add.failureTimeout",
 	"pnpm-missing": "panels.market.add.failurePnpmMissing",
+	"already-installed": "panels.market.add.failureInstalled",
 	"operation-error": "panels.market.add.failureGeneric",
 	"incompatible-version": "panels.market.add.failureGeneric",
 	"not-bundle": "panels.market.add.failureGeneric",
@@ -6245,8 +6254,12 @@ function registerMarketPanel(ctx, units) {
 //#endregion
 //#region src/shared/api/diy.ts
 var DIY_PRESET_ID = "workbench-diy";
+var WORKSHOP_RELATIVE = "workbench/diy";
 var WORKSHOP_TITLE = "工作台DIY";
 var WORKSHOP_PAST_TITLES = ["DIY 工坊", "工作台自带 · DIY 模块住这儿"];
+function isWorkshopPath(path) {
+	return path.replace(/\\/g, "/").replace(/\/+$/, "").endsWith(`/${WORKSHOP_RELATIVE}`);
+}
 //#endregion
 //#region src/app/units/index.ts
 var CLIENT_UNITS = [];
@@ -8774,6 +8787,29 @@ function WorkspaceSearchField({ t, query, onQuery, onCursor, onSubmit }) {
 	}));
 }
 //#endregion
+//#region src/app/layouts/sidebar/workspace-groups.ts
+function workspaceSections(items, headings) {
+	const workspaces = [];
+	const workshop = [];
+	for (const item of items) if (isWorkshopPath(item.path)) workshop.push(item);
+	else workspaces.push(item);
+	const sections = [];
+	if (workspaces.length > 0) sections.push({
+		id: "workspaces",
+		heading: workshop.length > 0 ? headings.workspaces : null,
+		items: workspaces
+	});
+	if (workshop.length > 0) sections.push({
+		id: "workshop",
+		heading: headings.workshop,
+		items: workshop
+	});
+	return sections;
+}
+function flattenSections(sections) {
+	return sections.flatMap((section) => section.items);
+}
+//#endregion
 //#region src/app/layouts/sidebar/WorkspaceRowAction.tsx
 function WorkspaceRowAction({ workspace, t, onEdit }) {
 	return /* @__PURE__ */ h(_deepseek_ai_dsh_client_ui_primitives.Button, {
@@ -8821,8 +8857,8 @@ function WorkspaceRowLabel({ workspace, current, action, onHover }) {
 //#endregion
 //#region src/app/layouts/sidebar/workspace-items.tsx
 function workspaceMenuItems(options) {
-	const { results, currentId, hoverId, t, onHover, onEdit } = options;
-	return results.map((workspace) => ({
+	const { sections, currentId, hoverId, t, onHover, onEdit } = options;
+	const rowOf = (workspace) => ({
 		id: workspace.workspaceId,
 		icon: /* @__PURE__ */ h(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenRegular, { size: 16 }),
 		label: /* @__PURE__ */ h(WorkspaceRowLabel, {
@@ -8835,7 +8871,12 @@ function workspaceMenuItems(options) {
 				onEdit: () => onEdit(workspace)
 			}) : void 0
 		})
-	}));
+	});
+	return sections.flatMap((section) => [...section.heading === null ? [] : [{
+		type: "label",
+		id: section.id,
+		text: section.heading
+	}], ...section.items.map(rowOf)]);
 }
 //#endregion
 //#region src/app/layouts/sidebar/ProjectSwitcher.tsx
@@ -8855,7 +8896,12 @@ function ProjectSwitcher({ items, current, onPick, onAdd, onRename, t }) {
 	const wasOpenRef = useRef(false);
 	const currentId = current?.workspaceId ?? null;
 	const results = useMemo(() => matchWorkspaces(items, query), [items, query]);
-	const cursorId = cursor === null || results.length === 0 ? null : results[Math.min(cursor, results.length - 1)]?.workspaceId ?? null;
+	const sections = useMemo(() => workspaceSections(results, {
+		workspaces: t("project.group.workspaces"),
+		workshop: t("project.group.workshop")
+	}), [results, t]);
+	const ordered = useMemo(() => flattenSections(sections), [sections]);
+	const cursorId = cursor === null || ordered.length === 0 ? null : ordered[Math.min(cursor, ordered.length - 1)]?.workspaceId ?? null;
 	useEffect(() => {
 		if (open) {
 			wasOpenRef.current = true;
@@ -8878,11 +8924,11 @@ function ProjectSwitcher({ items, current, onPick, onAdd, onRename, t }) {
 			setCursor(null);
 		},
 		onCursor: (step) => {
-			if (results.length === 0) return;
-			setCursor((at) => at === null ? step === 1 ? 0 : results.length - 1 : (at + step + results.length) % results.length);
+			if (ordered.length === 0) return;
+			setCursor((at) => at === null ? step === 1 ? 0 : ordered.length - 1 : (at + step + ordered.length) % ordered.length);
 		},
 		onSubmit: () => {
-			const pick = results[Math.min(cursor ?? 0, results.length - 1)];
+			const pick = ordered[Math.min(cursor ?? 0, ordered.length - 1)];
 			if (pick === void 0) return;
 			close();
 			onPick(pick.workspaceId);
@@ -8912,7 +8958,7 @@ function ProjectSwitcher({ items, current, onPick, onAdd, onRename, t }) {
 			id: "empty",
 			text: t("project.search.empty", { query: query.trim() })
 		}] : [], ...workspaceMenuItems({
-			results,
+			sections,
 			currentId,
 			hoverId,
 			t,
@@ -9633,7 +9679,7 @@ function mount(ctx) {
 			disposeDictionary?.();
 		};
 	}, "dsh-workbench: dictionaries");
-	const workshopWorkspace = () => ctx.workspaces.list.getSnapshot().items.find((item) => item.path.endsWith("/workbench/diy"));
+	const workshopWorkspace = () => ctx.workspaces.list.getSnapshot().items.find((item) => isWorkshopPath(item.path));
 	const openDiySession = (workspaceId, fallback) => {
 		const remoteCreate = sessionCreateOf(ctx.remote);
 		try {

package/dist/client/index.js

@@ -557,6 +557,7 @@ function readDeclaration(subject, raw) {
 //#endregion
 //#region ../shared/dist/config/constants.js
 var PLUGIN_ID = "@dsh-workbench/core";
+var RELEASE_SIBLINGS = ["@dsh-workbench/shared", "@dsh-workbench/module-tools"];
 var API_PREFIX = "/workbench/api";
 var PREFS_PREFIX = `${API_PREFIX}/prefs`;
 var EVENTS_PATH = "/workbench/events";
@@ -1238,6 +1239,8 @@ var en = {
 	"project.search.label": "Search workspaces",
 	"project.search.placeholder": "Search workspaces (folder / name / path)",
 	"project.search.empty": "No workspace matches “{query}”.",
+	"project.group.workspaces": "Workspaces",
+	"project.group.workshop": "Workshop",
 	"project.rename.row": "Rename “{name}”",
 	"project.rename.current": "Give this workspace a display name…",
 	"project.rename.title": "Give “{name}” a display name",
@@ -1412,6 +1415,7 @@ var en = {
 	"panels.market.add.failureIntegrity": "The downloaded package failed its integrity check",
 	"panels.market.add.failureTimeout": "The install timed out",
 	"panels.market.add.failurePnpmMissing": "pnpm was not found, cannot install",
+	"panels.market.add.failureInstalled": "It is already in this profile: this dsh runs with hot reload, which refuses to install over the same package (remove it first) — and removing it failed too",
 	"panels.market.add.failureGeneric": "Something went wrong during install — see the install details",
 	"panels.market.add.approveTitle": "Your approval is needed for install scripts",
 	"panels.market.add.approveCaution": "Only allow packages you trust: install scripts run on this machine with your permissions.",
@@ -1583,6 +1587,8 @@ var zh = {
 	"project.search.label": "搜索工作区",
 	"project.search.placeholder": "搜索工作区（目录名 / 中文名 / 路径）",
 	"project.search.empty": "没有匹配「{query}」的工作区。",
+	"project.group.workspaces": "工作区",
+	"project.group.workshop": "工坊",
 	"project.rename.row": "改「{name}」的中文名",
 	"project.rename.current": "改当前工作区的中文名…",
 	"project.rename.title": "给「{name}」配一个中文名",
@@ -1757,6 +1763,7 @@ var zh = {
 	"panels.market.add.failureIntegrity": "下载的安装包校验失败",
 	"panels.market.add.failureTimeout": "安装超时",
 	"panels.market.add.failurePnpmMissing": "没有找到 pnpm，无法安装",
+	"panels.market.add.failureInstalled": "它已经在这份 profile 里了：这一版 dsh 开着热更新，同一个包不许就地覆盖装（得先卸载再装），而这次也没能把它卸下来",
 	"panels.market.add.failureGeneric": "安装过程中出错，原因见安装详情",
 	"panels.market.add.approveTitle": "需要你允许安装脚本",
 	"panels.market.add.approveCaution": "只允许你信得过的包：安装脚本会以你的权限在这台机器上运行。",
@@ -2294,6 +2301,7 @@ var dist_exports = /* @__PURE__ */ __exportAll({
 	PREFS_PREFIX: () => PREFS_PREFIX,
 	PROBE_TTL_MS: () => PROBE_TTL_MS,
 	PROVISION_PREFIX: () => PROVISION_PREFIX,
+	RELEASE_SIBLINGS: () => RELEASE_SIBLINGS,
 	RIGHTBAR_FULLSCREEN_WIDTH: () => 768,
 	Row: () => Row,
 	Rows: () => Rows,
@@ -4686,6 +4694,7 @@ var FAILURE_KEYS = {
 	integrity: "panels.market.add.failureIntegrity",
 	timeout: "panels.market.add.failureTimeout",
 	"pnpm-missing": "panels.market.add.failurePnpmMissing",
+	"already-installed": "panels.market.add.failureInstalled",
 	"operation-error": "panels.market.add.failureGeneric",
 	"incompatible-version": "panels.market.add.failureGeneric",
 	"not-bundle": "panels.market.add.failureGeneric",
@@ -6248,8 +6257,12 @@ function registerMarketPanel(ctx, units) {
 //#endregion
 //#region src/shared/api/diy.ts
 var DIY_PRESET_ID = "workbench-diy";
+var WORKSHOP_RELATIVE = "workbench/diy";
 var WORKSHOP_TITLE = "工作台DIY";
 var WORKSHOP_PAST_TITLES = ["DIY 工坊", "工作台自带 · DIY 模块住这儿"];
+function isWorkshopPath(path) {
+	return path.replace(/\\/g, "/").replace(/\/+$/, "").endsWith(`/${WORKSHOP_RELATIVE}`);
+}
 //#endregion
 //#region src/app/units/index.ts
 var CLIENT_UNITS = [];
@@ -8777,6 +8790,29 @@ function WorkspaceSearchField({ t, query, onQuery, onCursor, onSubmit }) {
 	}));
 }
 //#endregion
+//#region src/app/layouts/sidebar/workspace-groups.ts
+function workspaceSections(items, headings) {
+	const workspaces = [];
+	const workshop = [];
+	for (const item of items) if (isWorkshopPath(item.path)) workshop.push(item);
+	else workspaces.push(item);
+	const sections = [];
+	if (workspaces.length > 0) sections.push({
+		id: "workspaces",
+		heading: workshop.length > 0 ? headings.workspaces : null,
+		items: workspaces
+	});
+	if (workshop.length > 0) sections.push({
+		id: "workshop",
+		heading: headings.workshop,
+		items: workshop
+	});
+	return sections;
+}
+function flattenSections(sections) {
+	return sections.flatMap((section) => section.items);
+}
+//#endregion
 //#region src/app/layouts/sidebar/WorkspaceRowAction.tsx
 function WorkspaceRowAction({ workspace, t, onEdit }) {
 	return /* @__PURE__ */ h(Button, {
@@ -8824,8 +8860,8 @@ function WorkspaceRowLabel({ workspace, current, action, onHover }) {
 //#endregion
 //#region src/app/layouts/sidebar/workspace-items.tsx
 function workspaceMenuItems(options) {
-	const { results, currentId, hoverId, t, onHover, onEdit } = options;
-	return results.map((workspace) => ({
+	const { sections, currentId, hoverId, t, onHover, onEdit } = options;
+	const rowOf = (workspace) => ({
 		id: workspace.workspaceId,
 		icon: /* @__PURE__ */ h(IconFolderOpenRegular, { size: 16 }),
 		label: /* @__PURE__ */ h(WorkspaceRowLabel, {
@@ -8838,7 +8874,12 @@ function workspaceMenuItems(options) {
 				onEdit: () => onEdit(workspace)
 			}) : void 0
 		})
-	}));
+	});
+	return sections.flatMap((section) => [...section.heading === null ? [] : [{
+		type: "label",
+		id: section.id,
+		text: section.heading
+	}], ...section.items.map(rowOf)]);
 }
 //#endregion
 //#region src/app/layouts/sidebar/ProjectSwitcher.tsx
@@ -8858,7 +8899,12 @@ function ProjectSwitcher({ items, current, onPick, onAdd, onRename, t }) {
 	const wasOpenRef = useRef(false);
 	const currentId = current?.workspaceId ?? null;
 	const results = useMemo(() => matchWorkspaces(items, query), [items, query]);
-	const cursorId = cursor === null || results.length === 0 ? null : results[Math.min(cursor, results.length - 1)]?.workspaceId ?? null;
+	const sections = useMemo(() => workspaceSections(results, {
+		workspaces: t("project.group.workspaces"),
+		workshop: t("project.group.workshop")
+	}), [results, t]);
+	const ordered = useMemo(() => flattenSections(sections), [sections]);
+	const cursorId = cursor === null || ordered.length === 0 ? null : ordered[Math.min(cursor, ordered.length - 1)]?.workspaceId ?? null;
 	useEffect(() => {
 		if (open) {
 			wasOpenRef.current = true;
@@ -8881,11 +8927,11 @@ function ProjectSwitcher({ items, current, onPick, onAdd, onRename, t }) {
 			setCursor(null);
 		},
 		onCursor: (step) => {
-			if (results.length === 0) return;
-			setCursor((at) => at === null ? step === 1 ? 0 : results.length - 1 : (at + step + results.length) % results.length);
+			if (ordered.length === 0) return;
+			setCursor((at) => at === null ? step === 1 ? 0 : ordered.length - 1 : (at + step + ordered.length) % ordered.length);
 		},
 		onSubmit: () => {
-			const pick = results[Math.min(cursor ?? 0, results.length - 1)];
+			const pick = ordered[Math.min(cursor ?? 0, ordered.length - 1)];
 			if (pick === void 0) return;
 			close();
 			onPick(pick.workspaceId);
@@ -8915,7 +8961,7 @@ function ProjectSwitcher({ items, current, onPick, onAdd, onRename, t }) {
 			id: "empty",
 			text: t("project.search.empty", { query: query.trim() })
 		}] : [], ...workspaceMenuItems({
-			results,
+			sections,
 			currentId,
 			hoverId,
 			t,
@@ -9636,7 +9682,7 @@ function mount(ctx) {
 			disposeDictionary?.();
 		};
 	}, "dsh-workbench: dictionaries");
-	const workshopWorkspace = () => ctx.workspaces.list.getSnapshot().items.find((item) => item.path.endsWith("/workbench/diy"));
+	const workshopWorkspace = () => ctx.workspaces.list.getSnapshot().items.find((item) => isWorkshopPath(item.path));
 	const openDiySession = (workspaceId, fallback) => {
 		const remoteCreate = sessionCreateOf(ctx.remote);
 		try {