@jingyi0605/codingns4dsh 0.2.1-beta.1 → 0.2.1-beta.3

package/data/build/dist/client/bundle.js

@@ -296,6 +296,8 @@ window.__ModuleLoader__.load({
 				"sessionFiles.title": "Changed files",
 				"sessionFiles.count": "{count} files",
 				"sessionFiles.refresh": "Refresh",
+				"sessionFiles.close": "Close diff",
+				"sessionFiles.loadingDiff": "Reading diff…",
 				"sessionFiles.stageAll": "Stage all",
 				"sessionFiles.loading": "Reading session changes…",
 				"sessionFiles.empty": "No changed files were detected in this session",
@@ -362,6 +364,8 @@ window.__ModuleLoader__.load({
 				"sessionFiles.title": "修改文件",
 				"sessionFiles.count": "{count} 个文件",
 				"sessionFiles.refresh": "刷新",
+				"sessionFiles.close": "关闭 Diff",
+				"sessionFiles.loadingDiff": "正在读取 Diff…",
 				"sessionFiles.stageAll": "全部暂存",
 				"sessionFiles.loading": "正在读取会话修改…",
 				"sessionFiles.empty": "本次会话没有已识别的修改文件",
@@ -810,11 +814,18 @@ window.__ModuleLoader__.load({
 				"peerHostWorkspace.tabRemote": "Remote HOST",
 				"peerHostWorkspace.sourceLabel": "Workspace source",
 				"peerHostWorkspace.heading": "Remote HOST workspaces",
-				"peerHostWorkspace.hint": "Choose a Host, then one of its registered workspaces; added workspaces appear only in the local sidebar.",
+				"peerHostWorkspace.hint": "Choose a Host to view its added workspaces; use the candidates below to add another one.",
 				"peerHostWorkspace.loadingHosts": "Reading registered Hosts…",
 				"peerHostWorkspace.noHosts": "No other Host is registered yet. Add one under “Manage other DSH Hosts” first.",
 				"peerHostWorkspace.loadingWorkspaces": "Reading the workspaces registered on this Host…",
 				"peerHostWorkspace.noWorkspaces": "This Host has no registered workspaces.",
+				"peerHostWorkspace.addedHeading": "Added workspaces",
+				"peerHostWorkspace.availableHeading": "Add a workspace",
+				"peerHostWorkspace.noAddedWorkspaces": "No remote workspace has been added to this Host yet.",
+				"peerHostWorkspace.columnWorkspace": "Workspace",
+				"peerHostWorkspace.columnSessions": "Sessions",
+				"peerHostWorkspace.columnHost": "Remote HOST",
+				"peerHostWorkspace.columnPath": "Path",
 				"peerHostWorkspace.noSessions": "No sessions",
 				"peerHostWorkspace.sessionCount": "{count} sessions",
 				"peerHostWorkspace.added": "Added; the workspace appears in the sidebar after you close this dialog.",
@@ -841,11 +852,18 @@ window.__ModuleLoader__.load({
 				"peerHostWorkspace.tabRemote": "远程 HOST",
 				"peerHostWorkspace.sourceLabel": "工作区来源",
 				"peerHostWorkspace.heading": "远程 HOST 工作区",
-				"peerHostWorkspace.hint": "选择一台 Host，再选择它上面已登记的工作区；添加后只在本机侧栏显示这些工作区。",
+				"peerHostWorkspace.hint": "选择一台 Host 查看已添加的工作区；可在下方候选列表继续添加工作区。",
 				"peerHostWorkspace.loadingHosts": "正在读取已登记的 Host…",
 				"peerHostWorkspace.noHosts": "尚未登记其他 Host。请先在“管理其他 DSH Host”中添加。",
 				"peerHostWorkspace.loadingWorkspaces": "正在读取该 Host 已登记的工作区…",
 				"peerHostWorkspace.noWorkspaces": "该 Host 上没有已登记的工作区。",
+				"peerHostWorkspace.addedHeading": "已添加的远程工作区",
+				"peerHostWorkspace.availableHeading": "添加远程工作区",
+				"peerHostWorkspace.noAddedWorkspaces": "该 Host 尚未添加远程工作区。",
+				"peerHostWorkspace.columnWorkspace": "工作区名称",
+				"peerHostWorkspace.columnSessions": "会话数",
+				"peerHostWorkspace.columnHost": "所属远程 HOST",
+				"peerHostWorkspace.columnPath": "路径",
 				"peerHostWorkspace.noSessions": "无会话",
 				"peerHostWorkspace.sessionCount": "{count} 个会话",
 				"peerHostWorkspace.added": "已添加；关闭对话框后该工作区会出现在侧栏。",
@@ -2788,7 +2806,7 @@ window.__ModuleLoader__.load({
 			return /^0\.1\.5(?:-|$)/u.test(version);
 		}
 		/** Codingns4DSH 插件自身的 npm 版本。 */
-		const CODINGNS_VERSION = "0.2.1-beta.1";
+		const CODINGNS_VERSION = "0.2.1-beta.3";
 		/** 判断宿主版本是否落在当前插件声明的 DSH 兼容范围内；范围省略上界时不校验上限。 */
 		function isDshVersionCompatible(version) {
 			const match = /^>=([^ ]+)(?: <=([^ ]+))?$/u.exec(DSH_COMPATIBILITY);
@@ -17110,7 +17128,7 @@ window.__ModuleLoader__.load({
 		function findSkillReferenceMentions(value, names) {
 			const byLowerName = new Map([...names].map((name) => [name.toLocaleLowerCase(), name]));
 			const matches = [];
-			for (const match of value.matchAll(/\/[A-Za-z0-9][A-Za-z0-9._-]*(?=\s|$)/gu)) {
+			for (const match of value.matchAll(/\/[A-Za-z0-9][A-Za-z0-9._:/-]*(?=\s|$)/gu)) {
 				const token = match[0] ?? "";
 				const start = match.index ?? -1;
 				const before = start > 0 ? value[start - 1] : void 0;
@@ -17251,7 +17269,8 @@ window.__ModuleLoader__.load({
 		const SKILL_INPUT_SOURCE = "codingns-skills";
 		const SKILL_CATALOG_CACHE_TTL_MS = 3e4;
 		const skillCatalogCache = /* @__PURE__ */ new Map();
-		/** 把 Codex 原生 Skill 目录接入 DSH `/` 菜单。 */
+		const skillCapabilityCache = /* @__PURE__ */ new Map();
+		/** 把声明了 Skill 能力的外部 Agent 目录接入 DSH `/` 菜单。 */
 		function registerSkillCommand(ctx, options) {
 			const state = {
 				catalogReady: false,
@@ -17419,11 +17438,20 @@ window.__ModuleLoader__.load({
 				return false;
 			}
 		}
-		/** 按会话与 Agent 选择版本缓存目录，避免输入每个字符都请求 Codex。 */
+		/** 按会话与 Agent 选择版本缓存目录，避免输入每个字符都请求外部 CLI。 */
 		async function loadSkillCatalog(rpc, sessionId, signal, forceReload) {
 			const selectionRevision = cliSessionSelectionRevision(sessionId);
 			const cached = skillCatalogCache.get(sessionId);
 			if (!forceReload && cached !== void 0 && cached.selectionRevision === selectionRevision && Date.now() - cached.loadedAt < SKILL_CATALOG_CACHE_TTL_MS) return cached.catalog;
+			if (!await supportsSelectedAgentSkills(rpc, sessionId, selectionRevision)) {
+				skillCatalogCache.set(sessionId, {
+					selectionRevision,
+					loadedAt: Date.now(),
+					catalog: []
+				});
+				publishSkillCatalog(sessionId, []);
+				return [];
+			}
 			const catalog = await callCliRpc(rpc, "skills", {
 				sessionId,
 				forceReload: true
@@ -17436,6 +17464,25 @@ window.__ModuleLoader__.load({
 			publishSkillCatalog(sessionId, catalog);
 			return catalog;
 		}
+		/** 让原生 DSH Skill UI 处理 dsh 会话，插件只为声明了 skills 的外部适配器请求目录。 */
+		async function supportsSelectedAgentSkills(rpc, sessionId, selectionRevision) {
+			const cached = skillCapabilityCache.get(sessionId);
+			if (cached?.selectionRevision === selectionRevision) return cached.supported;
+			const session = await callCliRpc(rpc, "session/get", { sessionId });
+			if (session.adapterId === "dsh") {
+				skillCapabilityCache.set(sessionId, {
+					selectionRevision,
+					supported: false
+				});
+				return false;
+			}
+			const supported = (await callCliRpc(rpc, "catalog", {})).find((item) => item.id === session.adapterId)?.capabilities?.includes("skills") === true;
+			skillCapabilityCache.set(sessionId, {
+				selectionRevision,
+				supported
+			});
+			return supported;
+		}
 		function skillCommandSpan(draft, draftRev, selection) {
 			const caret = selection?.end ?? draft.length;
 			const token = /\/(?:skills|技能)(?=\s|$)/gu;
@@ -56021,8 +56068,11 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client/session-changed-files-view.ts
+		init_popup_dismiss();
 		init_locale();
 		const SESSION_CHANGED_FILES_VIEW_ID = "codingns4dsh/session-changed-files";
+		/** 后台轮询只负责兜底发现外部文件变化，不能和页面交互争夺刷新节奏。 */
+		const SESSION_CHANGED_FILES_BACKGROUND_REFRESH_MS = 3e4;
 		/** 会话“修改文件”视图；数据只通过插件 RPC 和现有 Git RPC 读取。 */
 		function SessionChangedFilesView(props) {
 			const t = props.t;
@@ -56031,50 +56081,68 @@ window.__ModuleLoader__.load({
 			const [changes, setChanges] = (0, react.useState)([]);
 			const [selectedPath, setSelectedPath] = (0, react.useState)();
 			const [diff, setDiff] = (0, react.useState)();
+			const [diffLoading, setDiffLoading] = (0, react.useState)(false);
+			const [mobileDiffOpen, setMobileDiffOpen] = (0, react.useState)(false);
 			const [collapsed, setCollapsed] = (0, react.useState)(/* @__PURE__ */ new Set());
 			const [hoveredPath, setHoveredPath] = (0, react.useState)();
 			const [loading, setLoading] = (0, react.useState)(true);
 			const [busy, setBusy] = (0, react.useState)(false);
 			const [error, setError] = (0, react.useState)();
 			const requestGeneration = (0, react.useRef)(0);
-			const load = async () => {
+			const inFlightLoad = (0, react.useRef)();
+			const load = (foreground = false) => {
+				if (inFlightLoad.current !== void 0) return inFlightLoad.current;
 				const generation = requestGeneration.current + 1;
 				requestGeneration.current = generation;
-				setLoading(true);
-				setError(void 0);
-				try {
-					const resolved = await resolveGitWorkspaceId(props.remote, props.sessionId);
-					if (resolved === void 0) throw new Error("当前会话没有可用的工作区");
-					const [sessionFiles, status] = await Promise.all([call(props.rpc, "fileManagement/session-changes", {
-						sessionId: props.sessionId,
-						workspaceId: resolved
-					}), call(props.rpc, "git/status", { workspaceId: resolved })]);
-					if (generation !== requestGeneration.current) return;
-					const next = selectSessionChangedFiles(sessionFiles, status);
-					setWorkspaceId(resolved);
-					setChanges(next);
-					props.reportCount?.(props.sessionId, next.length);
-					setSelectedPath((current) => current !== void 0 && next.some((item) => item.path === current) ? current : next[0]?.path);
-				} catch (cause) {
-					if (generation !== requestGeneration.current) return;
-					setError(cause instanceof Error ? cause.message : String(cause));
-					setChanges([]);
-					setWorkspaceId(void 0);
-					props.reportCount?.(props.sessionId, 0);
-				} finally {
-					if (generation === requestGeneration.current) setLoading(false);
+				if (foreground) {
+					setLoading(true);
+					setError(void 0);
 				}
+				const tracked = (async () => {
+					try {
+						const resolved = await resolveGitWorkspaceId(props.remote, props.sessionId);
+						if (resolved === void 0) throw new Error("当前会话没有可用的工作区");
+						const [sessionFiles, status] = await Promise.all([call(props.rpc, "fileManagement/session-changes", {
+							sessionId: props.sessionId,
+							workspaceId: resolved
+						}), call(props.rpc, "git/status", { workspaceId: resolved })]);
+						if (generation !== requestGeneration.current) return;
+						const next = selectSessionChangedFiles(sessionFiles, status);
+						setWorkspaceId((current) => current === resolved ? current : resolved);
+						setChanges((current) => mergeChangedFiles(current, next));
+						props.reportCount?.(props.sessionId, next.length);
+						setSelectedPath((current) => current !== void 0 && next.some((item) => item.path === current) ? current : next[0]?.path);
+						setError(void 0);
+					} catch (cause) {
+						if (generation !== requestGeneration.current) return;
+						if (foreground) {
+							setError(cause instanceof Error ? cause.message : String(cause));
+							setChanges([]);
+							setWorkspaceId(void 0);
+							props.reportCount?.(props.sessionId, 0);
+						} else setError(cause instanceof Error ? cause.message : String(cause));
+					} finally {
+						if (generation === requestGeneration.current && foreground) setLoading(false);
+					}
+				})().finally(() => {
+					if (inFlightLoad.current === tracked) inFlightLoad.current = void 0;
+				});
+				inFlightLoad.current = tracked;
+				return tracked;
 			};
 			(0, react.useEffect)(() => {
 				setDiff(void 0);
+				setDiffLoading(false);
+				setMobileDiffOpen(false);
 				setCollapsed(/* @__PURE__ */ new Set());
 				setWorkspaceId(void 0);
-				load();
+				load(true);
 				const timer = globalThis.setInterval(() => {
 					load();
-				}, 5e3);
+				}, SESSION_CHANGED_FILES_BACKGROUND_REFRESH_MS);
 				return () => {
 					requestGeneration.current += 1;
+					inFlightLoad.current = void 0;
 					globalThis.clearInterval(timer);
 				};
 			}, [
@@ -56096,11 +56164,18 @@ window.__ModuleLoader__.load({
 			(0, react.useEffect)(() => {
 				if (workspaceId === void 0 || selectedPath === void 0) {
 					setDiff(void 0);
+					setDiffLoading(false);
 					return;
 				}
 				const selected = changes.find((item) => item.path === selectedPath);
-				if (selected === void 0) return;
+				if (selected === void 0) {
+					setDiff(void 0);
+					setDiffLoading(false);
+					return;
+				}
 				let cancelled = false;
+				setDiff(void 0);
+				setDiffLoading(true);
 				call(props.rpc, "git/diff", {
 					workspaceId,
 					path: selected.path,
@@ -56109,6 +56184,8 @@ window.__ModuleLoader__.load({
 					if (!cancelled) setDiff(value);
 				}).catch((cause) => {
 					if (!cancelled) setError(cause instanceof Error ? cause.message : String(cause));
+				}).finally(() => {
+					if (!cancelled) setDiffLoading(false);
 				});
 				return () => {
 					cancelled = true;
@@ -56119,6 +56196,14 @@ window.__ModuleLoader__.load({
 				selectedPath,
 				workspaceId
 			]);
+			(0, react.useEffect)(() => {
+				if (!compactLayout) setMobileDiffOpen(false);
+				if (selectedPath === void 0 || !changes.some((item) => item.path === selectedPath)) setMobileDiffOpen(false);
+			}, [
+				changes,
+				compactLayout,
+				selectedPath
+			]);
 			const tree = (0, react.useMemo)(() => buildTree(changes), [changes]);
 			const unstaged = changes.filter((item) => !item.staged);
 			const stageTargets = async (targets, action) => {
@@ -56130,7 +56215,7 @@ window.__ModuleLoader__.load({
 						targets
 					});
 					notifyGitWorkspaceChanged(workspaceId);
-					await load();
+					await load(true);
 				} catch (cause) {
 					setError(cause instanceof Error ? cause.message : String(cause));
 				} finally {
@@ -56146,6 +56231,11 @@ window.__ModuleLoader__.load({
 				});
 			};
 			const hasChanges = changes.length > 0;
+			const selectedChange = selectedPath === void 0 ? void 0 : changes.find((item) => item.path === selectedPath);
+			const selectPath = (path) => {
+				setSelectedPath(path);
+				if (compactLayout) setMobileDiffOpen(true);
+			};
 			const viewRootStyle = {
 				...rootStyle,
 				padding: compactLayout ? "0 16px" : rootStyle.padding
@@ -56167,7 +56257,7 @@ window.__ModuleLoader__.load({
 			return (0, react.createElement)("div", { style: viewRootStyle }, (0, react.createElement)("div", { style: viewToolbarStyle }, (0, react.createElement)("strong", { style: { fontSize: 15 } }, t("sessionFiles.title")), (0, react.createElement)("span", { style: countStyle }, t("sessionFiles.count", { count: changes.length })), (0, react.createElement)("span", { style: { flex: 1 } }), (0, react.createElement)("button", {
 				type: "button",
 				disabled: loading || busy,
-				onClick: () => void load(),
+				onClick: () => void load(true),
 				style: toolbarRefreshButtonStyle,
 				title: t("sessionFiles.refresh"),
 				"aria-label": t("sessionFiles.refresh")
@@ -56181,7 +56271,24 @@ window.__ModuleLoader__.load({
 			}, (0, react.createElement)(StageIcon))), error === void 0 ? null : (0, react.createElement)("div", {
 				role: "alert",
 				style: errorStyle
-			}, error), (0, react.createElement)("div", { style: viewContentStyle }, (0, react.createElement)("div", { style: viewTreePaneStyle }, loading ? (0, react.createElement)("div", { style: emptyStyle }, t("sessionFiles.loading")) : changes.length === 0 ? (0, react.createElement)("div", { style: emptyStyle }, t("sessionFiles.empty")) : tree.map((node) => renderNode(node, 0, collapsed, hoveredPath, selectedPath, toggle, setSelectedPath, setHoveredPath, stageTargets, t))), hasChanges ? (0, react.createElement)("div", { style: diffPaneStyle }, selectedPath === void 0 ? (0, react.createElement)("div", { style: emptyStyle }, t("sessionFiles.selectFile")) : diff?.content ? (0, react.createElement)("pre", { style: diffStyle }, renderDiff(diff.content)) : (0, react.createElement)("div", { style: emptyStyle }, t("sessionFiles.noDiff"))) : null));
+			}, error), (0, react.createElement)("div", { style: viewContentStyle }, (0, react.createElement)("div", { style: viewTreePaneStyle }, loading ? (0, react.createElement)("div", { style: emptyStyle }, t("sessionFiles.loading")) : changes.length === 0 ? (0, react.createElement)("div", { style: emptyStyle }, t("sessionFiles.empty")) : tree.map((node) => renderNode(node, 0, collapsed, hoveredPath, selectedPath, toggle, selectPath, setHoveredPath, stageTargets, t))), !compactLayout && hasChanges ? (0, react.createElement)("div", { style: diffPaneStyle }, selectedPath === void 0 ? (0, react.createElement)("div", { style: emptyStyle }, t("sessionFiles.selectFile")) : diffLoading ? (0, react.createElement)("div", { style: emptyStyle }, t("sessionFiles.loadingDiff")) : diff?.content ? (0, react.createElement)("pre", { style: diffStyle }, renderDiff(diff.content)) : (0, react.createElement)("div", { style: emptyStyle }, t("sessionFiles.noDiff"))) : null), compactLayout && mobileDiffOpen && selectedPath !== void 0 ? (0, react.createElement)("div", {
+				style: mobileDiffOverlayStyle,
+				onPointerDown: backdropPointerDownHandler(() => setMobileDiffOpen(false))
+			}, (0, react.createElement)("section", {
+				role: "dialog",
+				"aria-modal": true,
+				"aria-label": selectedChange?.path ?? t("sessionFiles.title"),
+				style: mobileDiffModalStyle
+			}, (0, react.createElement)("header", { style: mobileDiffHeaderStyle }, (0, react.createElement)("strong", {
+				style: mobileDiffTitleStyle,
+				title: selectedChange?.path
+			}, selectedChange?.path ?? t("sessionFiles.title")), (0, react.createElement)("button", {
+				type: "button",
+				onClick: () => setMobileDiffOpen(false),
+				style: mobileDiffCloseStyle,
+				title: t("sessionFiles.close"),
+				"aria-label": t("sessionFiles.close")
+			}, "×")), (0, react.createElement)("div", { style: mobileDiffBodyStyle }, diffLoading ? (0, react.createElement)("div", { style: emptyStyle }, t("sessionFiles.loadingDiff")) : diff?.content ? (0, react.createElement)("pre", { style: diffStyle }, renderDiff(diff.content)) : (0, react.createElement)("div", { style: emptyStyle }, t("sessionFiles.noDiff"))))) : null);
 		}
 		/** 注册 DSH 原生 conversation.view Slot；标签由 DSH 根据 Slot 的 id/label 自动投影。 */
 		function registerSessionChangedFilesView(ctx, rpc, remote, locale) {
@@ -56264,37 +56371,51 @@ window.__ModuleLoader__.load({
 			(0, react.useEffect)(() => {
 				let disposed = false;
 				let generation = 0;
+				let hasSuccessfulLoad = false;
+				let subscribedWorkspaceId;
+				let inFlight;
 				let disposeWorkspaceSubscription;
 				const updateWorkspaceSubscription = (workspaceId) => {
+					if (subscribedWorkspaceId === workspaceId) return;
 					disposeWorkspaceSubscription?.();
+					subscribedWorkspaceId = workspaceId;
 					disposeWorkspaceSubscription = workspaceId === void 0 ? void 0 : subscribeGitWorkspaceChanged(workspaceId, () => {
 						load();
 					});
 				};
-				const load = async () => {
+				const load = () => {
+					if (inFlight !== void 0) return inFlight;
 					const currentGeneration = ++generation;
-					try {
-						const workspaceId = await resolveGitWorkspaceId(props.remote, props.sessionId);
-						if (workspaceId === void 0) throw new Error("当前会话没有可用的工作区");
-						const [sessionFiles, status] = await Promise.all([call(props.rpc, "fileManagement/session-changes", {
-							sessionId: props.sessionId,
-							workspaceId
-						}), call(props.rpc, "git/status", { workspaceId })]);
-						if (disposed || currentGeneration !== generation) return;
-						updateWorkspaceSubscription(workspaceId);
-						const count = selectSessionChangedFiles(sessionFiles, status).length;
-						props.reportCount(props.sessionId, count);
-					} catch {
-						if (!disposed && currentGeneration === generation) props.reportCount(props.sessionId, 0);
-					}
+					const tracked = (async () => {
+						try {
+							const workspaceId = await resolveGitWorkspaceId(props.remote, props.sessionId);
+							if (workspaceId === void 0) throw new Error("当前会话没有可用的工作区");
+							const [sessionFiles, status] = await Promise.all([call(props.rpc, "fileManagement/session-changes", {
+								sessionId: props.sessionId,
+								workspaceId
+							}), call(props.rpc, "git/status", { workspaceId })]);
+							if (disposed || currentGeneration !== generation) return;
+							updateWorkspaceSubscription(workspaceId);
+							const count = selectSessionChangedFiles(sessionFiles, status).length;
+							hasSuccessfulLoad = true;
+							props.reportCount(props.sessionId, count);
+						} catch {
+							if (!disposed && currentGeneration === generation && !hasSuccessfulLoad) props.reportCount(props.sessionId, 0);
+						}
+					})().finally(() => {
+						if (inFlight === tracked) inFlight = void 0;
+					});
+					inFlight = tracked;
+					return tracked;
 				};
 				load();
 				const timer = globalThis.setInterval(() => {
 					load();
-				}, 5e3);
+				}, SESSION_CHANGED_FILES_BACKGROUND_REFRESH_MS);
 				return () => {
 					disposed = true;
 					generation += 1;
+					inFlight = void 0;
 					globalThis.clearInterval(timer);
 					disposeWorkspaceSubscription?.();
 				};
@@ -56313,6 +56434,19 @@ window.__ModuleLoader__.load({
 				style: diffLineStyle(line)
 			}, `${line}${index < lines.length - 1 ? "\n" : ""}`));
 		}
+		/** 只替换真正变化的行对象，后台刷新时保持未变化文件的引用和交互状态。 */
+		function mergeChangedFiles(current, next) {
+			if (current.length === next.length && current.every((item, index) => sameChange(item, next[index]))) return current;
+			const previous = new Map(current.map((item) => [item.path, item]));
+			return next.map((item) => {
+				const old = previous.get(item.path);
+				return old !== void 0 && sameChange(old, item) ? old : item;
+			});
+		}
+		function sameChange(left, right) {
+			if (left === void 0 || right === void 0) return left === right;
+			return left.path === right.path && left.status === right.status && left.staged === right.staged && left.oldPath === right.oldPath && left.binary === right.binary && left.stagedStatus === right.stagedStatus && left.worktreeStatus === right.worktreeStatus;
+		}
 		/** 只显示当前 Git 状态中仍属于本会话触及范围的文件。 */
 		function selectSessionChangedFiles(sessionFiles, status) {
 			const touched = new Set(sessionFiles.paths.map(normalizePath));
@@ -56663,6 +56797,66 @@ window.__ModuleLoader__.load({
 			wordBreak: "break-word",
 			font: "12px/1.55 var(--dsw-font-mono,ui-monospace,monospace)"
 		};
+		const mobileDiffOverlayStyle = {
+			position: "fixed",
+			inset: 0,
+			zIndex: 1e3,
+			display: "flex",
+			alignItems: "stretch",
+			justifyContent: "center",
+			padding: 10,
+			boxSizing: "border-box",
+			background: "rgba(0,0,0,.48)"
+		};
+		const mobileDiffModalStyle = {
+			display: "flex",
+			flexDirection: "column",
+			width: "100%",
+			maxWidth: 720,
+			maxHeight: "100%",
+			minHeight: 0,
+			overflow: "hidden",
+			borderRadius: 10,
+			background: "var(--dsw-alias-bg-layer-1,#fff)",
+			boxShadow: "0 12px 40px rgba(0,0,0,.3)"
+		};
+		const mobileDiffHeaderStyle = {
+			display: "flex",
+			alignItems: "center",
+			gap: 8,
+			minHeight: 46,
+			padding: "0 12px",
+			borderBottom: "1px solid var(--dsw-alias-border-l3,#ddd)",
+			flex: "0 0 auto"
+		};
+		const mobileDiffTitleStyle = {
+			minWidth: 0,
+			flex: 1,
+			overflow: "hidden",
+			textOverflow: "ellipsis",
+			whiteSpace: "nowrap",
+			fontSize: 13
+		};
+		const mobileDiffCloseStyle = {
+			display: "inline-flex",
+			alignItems: "center",
+			justifyContent: "center",
+			width: 32,
+			height: 32,
+			border: 0,
+			borderRadius: 6,
+			padding: 0,
+			background: "transparent",
+			color: "var(--dsw-alias-label-secondary,#777)",
+			cursor: "pointer",
+			fontSize: 22,
+			lineHeight: 1
+		};
+		const mobileDiffBodyStyle = {
+			minHeight: 0,
+			overflow: "auto",
+			background: "var(--dsw-alias-bg-layer-1,transparent)"
+		};
 		const diffHeaderLineStyle = {
 			display: "block",
 			color: "var(--dsw-alias-label-tertiary,#777)"
@@ -58511,12 +58705,13 @@ window.__ModuleLoader__.load({
 		//#region src/client/peer-host-native-projection.ts
 		init_session_adapter_cache();
 		/**
-		* 为混合工作区生成只用于原生侧栏树归属的稳定路径。
+		* 为需要稳定显示标识的调用方生成虚拟 URI。
 		*
 		* DSH 会把 `workspace.path` 的目录前缀关系解释成父子工作区。不同 Host 的真实
 		* 路径以及本地工作区之间都可能发生前缀重叠，因此列表层不能继续暴露真实目录。
-		* 这里使用不对应本机文件系统的 URI，并把完整虚拟 ID 编码成单一段，保证所有
-		* 工作区都是同一层的兄弟节点。文件和会话请求仍使用所属 Host 的真实路径。
+		* 这里使用不对应本机文件系统的 URI，并把完整虚拟 ID 编码成单一段。Workspace
+		* Store 使用这个值保证不同 Host 的同路径工作区仍是并列条目；真正的文件请求会在
+		* Host 转发边界按虚拟 Workspace ID还原为目标 Host 的真实路径。
 		*/
 		function createPeerHostWorkspaceDisplayPath(virtualWorkspaceId) {
 			return `codingns-peer-host://${encodeURIComponent(virtualWorkspaceId)}`;
@@ -58590,8 +58785,8 @@ window.__ModuleLoader__.load({
 		}
 		function projectWorkspace(virtualHostId, workspace) {
 			const virtualWorkspaceId = createVirtualWorkspaceId(virtualHostId, workspace.workspaceId);
-			const displayPath = createPeerHostWorkspaceDisplayPath(virtualWorkspaceId);
 			const realPath = workspace.path;
+			const displayPath = createPeerHostWorkspaceDisplayPath(virtualWorkspaceId);
 			const sessionIds = [];
 			const archivedSessionIds = [];
 			const sessions = [];
@@ -58747,7 +58942,7 @@ window.__ModuleLoader__.load({
 			}));
 			const injected = virtual.filter((workspace) => !known.has(workspace.workspaceId));
 			const archivedSessionIds = mergeArchivedSessionIds(record.archivedSessionIds, virtual);
-			const mergedItems = normalizeWorkspaceDisplayPaths(orderWorkspaceItems([...items, ...injected], orderedWorkspaceIds, localHostId), localHostId);
+			const mergedItems = normalizeRemoteWorkspaceDisplayPaths(orderWorkspaceItems([...items, ...injected], orderedWorkspaceIds, localHostId));
 			if (!(mergedItems.length !== items.length || mergedItems.some((item, index) => item !== items[index])) && archivedSessionIds === void 0) return snapshot;
 			return {
 				...record,
@@ -58755,20 +58950,14 @@ window.__ModuleLoader__.load({
 				...archivedSessionIds === void 0 ? {} : { archivedSessionIds }
 			};
 		}
-		/**
-		* 原生 Remote 返回的远端工作区可能已经存在于底层 Store，此时不会走 injected
-		* 分支；本地条目也可能因真实目录前缀形成树层级。按虚拟 ID统一规范化 path，
-		* 保证所有工作区在 DSH 列表中都是同层兄弟节点。
-		*/
-		function normalizeWorkspaceDisplayPaths(items, localHostId) {
+		/** 原生 Remote 可能先把远端条目写入底层 Store，仍需强制保持扁平虚拟显示路径。 */
+		function normalizeRemoteWorkspaceDisplayPaths(items) {
 			let changed = false;
 			const normalized = items.map((item) => {
 				const record = asRecord$1(item);
 				const workspaceId = record?.workspaceId;
-				if (record === null || typeof workspaceId !== "string") return item;
-				const virtualWorkspaceId = parseVirtualWorkspaceId(workspaceId) !== null ? workspaceId : localHostId === void 0 ? void 0 : createVirtualWorkspaceId(localHostId, workspaceId);
-				if (virtualWorkspaceId === void 0) return item;
-				const displayPath = createPeerHostWorkspaceDisplayPath(virtualWorkspaceId);
+				if (record === null || typeof workspaceId !== "string" || parseVirtualWorkspaceId(workspaceId) === null) return item;
+				const displayPath = createPeerHostWorkspaceDisplayPath(workspaceId);
 				if (record.path === displayPath) return item;
 				changed = true;
 				return {
@@ -58779,9 +58968,8 @@ window.__ModuleLoader__.load({
 			return changed ? normalized : items;
 		}
 		/**
-		* 原生会话列表只把空白会话的 cwd 用于判断是否能复用。工作区树扁平化后，
-		* 让空白行看到同一个显示路径即可保留该判断；正式会话继续保留真实 cwd，
-		* 避免 Git、文件面板或远端工具拿到虚拟 URI。
+		* 原生会话列表只把空白会话的 cwd 用于判断是否能复用；同步工作区真实路径即可
+		* 保留该判断，正式会话也继续保留真实 cwd，避免 Git、文件面板或远端工具拿到虚拟 URI。
 		*/
 		function installSessionDisplayPathProjection(workspaceStore, sessionStore) {
 			if (sessionStore === void 0) return () => void 0;
@@ -59237,6 +59425,18 @@ window.__ModuleLoader__.load({
 .${TAB_CLASS}-rowName{overflow:hidden;font-size:13px;font-weight:500;line-height:20px;text-overflow:ellipsis;white-space:nowrap}
 .${TAB_CLASS}-rowMeta{overflow:hidden;font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap}
 .${TAB_CLASS}-rowCount{flex:none;font-size:11px;line-height:17px;color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums}
+.${TAB_CLASS}-sectionTitle{margin:4px 0 0;font-size:13px;font-weight:510;line-height:20px;color:var(--dsw-alias-label-primary)}
+.${TAB_CLASS}-tableWrap{flex:none;overflow-x:auto;margin:0 -8px;border:.5px solid var(--dsw-alias-border-l4);border-radius:var(--dsw-radius-sm)}
+.${TAB_CLASS}-table{width:100%;min-width:520px;border-collapse:collapse;table-layout:fixed;font-size:12px;line-height:18px}
+.${TAB_CLASS}-table th{padding:8px;text-align:left;font-size:11px;font-weight:500;color:var(--dsw-alias-label-tertiary);background:var(--dsw-alias-interactive-bg-hover);white-space:nowrap}
+.${TAB_CLASS}-table td{padding:9px 8px;border-top:.5px solid var(--dsw-alias-border-l4);color:var(--dsw-alias-label-primary);vertical-align:top}
+.${TAB_CLASS}-table th:nth-child(1),.${TAB_CLASS}-table td:nth-child(1){width:25%}
+.${TAB_CLASS}-table th:nth-child(2),.${TAB_CLASS}-table td:nth-child(2){width:13%;white-space:nowrap}
+.${TAB_CLASS}-table th:nth-child(3),.${TAB_CLASS}-table td:nth-child(3){width:20%;white-space:nowrap}
+.${TAB_CLASS}-table th:nth-child(4),.${TAB_CLASS}-table td:nth-child(4){width:42%}
+.${TAB_CLASS}-tableName{display:block;overflow:hidden;font-weight:500;text-overflow:ellipsis;white-space:nowrap}
+.${TAB_CLASS}-tablePath{display:block;overflow:hidden;color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap}
+.${TAB_CLASS}-tableEmpty{padding:10px 0;margin:0;font-size:12px;line-height:18px;color:var(--dsw-alias-label-tertiary)}
 [${PEER_HOST_WORKSPACE_TAB_STATE_ATTRIBUTE}='remote'] ${CRUMB_BAR_SELECTOR},
 [${PEER_HOST_WORKSPACE_TAB_STATE_ATTRIBUTE}='remote'] ${CONTENT_SELECTOR},
 [${PEER_HOST_WORKSPACE_TAB_STATE_ATTRIBUTE}='remote'] ${FOOTER_BAR_SELECTOR}{display:none !important}
@@ -59304,12 +59504,12 @@ window.__ModuleLoader__.load({
 		}
 		/** 注入样式表；用插件自有标记，停用时按标记精确移除。 */
 		function installStyle(dom) {
-			if (dom.querySelector(`style[data-plugin-css="${TAB_STYLE_ID}"]`) !== null) return;
-			const style = dom.createElement("style");
+			const existing = dom.querySelector(`style[data-plugin-css="${TAB_STYLE_ID}"]`);
+			const style = existing ?? dom.createElement("style");
 			style.dataset.plugin = "codingns4dsh";
 			style.dataset.pluginCss = TAB_STYLE_ID;
 			style.textContent = TAB_STYLE_TEXT;
-			dom.head?.appendChild(style);
+			if (existing === null) dom.head?.appendChild(style);
 		}
 		/** 在原生对话框里建立标签栏与远端面板。 */
 		function inject$1(dialog, editorScope, options, previous = null) {
@@ -59345,6 +59545,7 @@ window.__ModuleLoader__.load({
 				records: previous?.records ?? null,
 				selectedHostId: previous?.selectedHostId ?? null,
 				candidates: previous?.candidates ?? null,
+				addedWorkspaces: previous?.addedWorkspaces ?? null,
 				loading: false,
 				message: previous?.message ?? null,
 				messageKind: previous?.messageKind ?? "info",
@@ -59420,6 +59621,7 @@ window.__ModuleLoader__.load({
 					if (options === null || state.selectedHostId === record.id) return;
 					state.selectedHostId = record.id;
 					state.candidates = null;
+					state.addedWorkspaces = null;
 					state.message = null;
 					render(state, options);
 					if (record.status === "ready") loadCandidates(state, options);
@@ -59437,15 +59639,35 @@ window.__ModuleLoader__.load({
 				state.panel.append(note(dom, t("peerHostWorkspace.loadingWorkspaces"), "info"));
 				return;
 			}
-			if (state.candidates.length === 0) {
+			if (state.candidates.length === 0 && (state.addedWorkspaces === null || state.addedWorkspaces.length === 0)) {
 				if (state.message !== null) state.panel.append(note(dom, state.message, state.messageKind));
 				else state.panel.append(note(dom, t("peerHostWorkspace.noWorkspaces"), "info"));
 				return;
 			}
+			const addedIds = new Set(selected?.visibleWorkspaceIds ?? []);
+			const addedCandidates = state.addedWorkspaces === null ? state.candidates.filter((candidate) => addedIds.has(candidate.workspaceId)) : state.addedWorkspaces;
+			const addedWorkspaceIds = new Set(addedCandidates.map((candidate) => candidate.workspaceId));
+			const availableCandidates = state.candidates.filter((candidate) => !addedWorkspaceIds.has(candidate.workspaceId) && !addedIds.has(candidate.workspaceId));
+			const addedHeading = dom.createElement("strong");
+			addedHeading.className = `${TAB_CLASS}-sectionTitle`;
+			addedHeading.textContent = t("peerHostWorkspace.addedHeading");
+			state.panel.append(addedHeading);
+			if (addedCandidates.length === 0) {
+				const empty = dom.createElement("p");
+				empty.className = `${TAB_CLASS}-tableEmpty`;
+				empty.textContent = t("peerHostWorkspace.noAddedWorkspaces");
+				state.panel.append(empty);
+			} else state.panel.append(createWorkspaceTable(dom, t, selected?.displayName ?? "", addedCandidates));
+			if (availableCandidates.length > 0) {
+				const availableHeading = dom.createElement("strong");
+				availableHeading.className = `${TAB_CLASS}-sectionTitle`;
+				availableHeading.textContent = t("peerHostWorkspace.availableHeading");
+				state.panel.append(availableHeading);
+			}
 			const list = dom.createElement("div");
 			list.className = `${TAB_CLASS}-list`;
 			list.setAttribute("role", "list");
-			for (const candidate of state.candidates) {
+			for (const candidate of availableCandidates) {
 				const row = dom.createElement("button");
 				row.type = "button";
 				row.className = `${TAB_CLASS}-row`;
@@ -59473,9 +59695,56 @@ window.__ModuleLoader__.load({
 				});
 				list.append(row);
 			}
-			state.panel.append(list);
+			if (availableCandidates.length > 0) state.panel.append(list);
 			if (state.message !== null) state.panel.append(note(dom, state.message, state.messageKind));
 		}
+		/** 渲染已添加工作区的只读信息表；添加动作仍由下方候选列表负责。 */
+		function createWorkspaceTable(dom, t, hostName, candidates) {
+			const wrapper = dom.createElement("div");
+			wrapper.className = `${TAB_CLASS}-tableWrap`;
+			const table = dom.createElement("table");
+			table.className = `${TAB_CLASS}-table`;
+			table.setAttribute("aria-label", t("peerHostWorkspace.addedHeading"));
+			const head = dom.createElement("thead");
+			const headerRow = dom.createElement("tr");
+			for (const label of [
+				t("peerHostWorkspace.columnWorkspace"),
+				t("peerHostWorkspace.columnSessions"),
+				t("peerHostWorkspace.columnHost"),
+				t("peerHostWorkspace.columnPath")
+			]) {
+				const cell = dom.createElement("th");
+				cell.setAttribute("scope", "col");
+				cell.textContent = label;
+				headerRow.append(cell);
+			}
+			head.append(headerRow);
+			const body = dom.createElement("tbody");
+			for (const candidate of candidates) {
+				const row = dom.createElement("tr");
+				row.setAttribute("data-codingns-peer-host-tab-added-workspace", candidate.workspaceId);
+				const name = dom.createElement("td");
+				const nameText = dom.createElement("span");
+				nameText.className = `${TAB_CLASS}-tableName`;
+				nameText.textContent = candidate.displayName;
+				name.append(nameText);
+				const sessions = dom.createElement("td");
+				sessions.textContent = candidate.sessionCount === 0 ? t("peerHostWorkspace.noSessions") : t("peerHostWorkspace.sessionCount", { count: candidate.sessionCount });
+				const host = dom.createElement("td");
+				host.textContent = hostName;
+				const path = dom.createElement("td");
+				path.title = candidate.path;
+				const pathText = dom.createElement("span");
+				pathText.className = `${TAB_CLASS}-tablePath`;
+				pathText.textContent = candidate.path;
+				path.append(pathText);
+				row.append(name, sessions, host, path);
+				body.append(row);
+			}
+			table.append(head, body);
+			wrapper.append(table);
+			return wrapper;
+		}
 		async function loadRecords(state, options) {
 			const generation = ++state.generation;
 			try {
@@ -59495,12 +59764,21 @@ window.__ModuleLoader__.load({
 			if (hostId === null) return;
 			const generation = ++state.generation;
 			try {
-				const candidates = await options.api.workspaceCandidates(hostId);
+				const [candidateResult, aggregateResult] = await Promise.allSettled([options.api.workspaceCandidates(hostId), options.api.aggregate()]);
 				if (state.generation !== generation || state.selectedHostId !== hostId) return;
-				state.candidates = candidates;
+				if (candidateResult.status === "rejected") throw candidateResult.reason;
+				state.candidates = candidateResult.value;
+				const aggregateHost = aggregateResult.status === "fulfilled" ? aggregateResult.value.find((result) => result.targetHostId === hostId) : void 0;
+				state.addedWorkspaces = aggregateHost?.availability === "ready" ? aggregateHost.workspaces.map((workspace) => ({
+					workspaceId: workspace.workspaceId,
+					displayName: workspace.displayName,
+					path: workspace.path,
+					sessionCount: workspace.sessions.length + (workspace.archivedSessions?.length ?? 0)
+				})) : null;
 			} catch (error) {
 				if (state.generation !== generation || state.selectedHostId !== hostId) return;
 				state.candidates = [];
+				state.addedWorkspaces = [];
 				state.message = message(error);
 				state.messageKind = "error";
 			}
@@ -59513,7 +59791,14 @@ window.__ModuleLoader__.load({
 			state.message = null;
 			render(state, options);
 			try {
-				await options.api.setWorkspaceVisibility(hostId, workspaceId, true);
+				const updated = await options.api.setWorkspaceVisibility(hostId, workspaceId, true);
+				if (updated !== void 0) state.records = state.records?.map((record) => record.id === hostId ? updated : record) ?? state.records;
+				const added = state.candidates?.find((candidate) => candidate.workspaceId === workspaceId);
+				if (added !== void 0) {
+					const visibleIds = new Set(state.records?.find((record) => record.id === hostId)?.visibleWorkspaceIds ?? []);
+					const current = state.addedWorkspaces ?? state.candidates?.filter((candidate) => visibleIds.has(candidate.workspaceId)) ?? [];
+					if (!current.some((workspace) => workspace.workspaceId === added.workspaceId)) state.addedWorkspaces = [...current, added];
+				}
 				state.message = state.t("peerHostWorkspace.added");
 				state.messageKind = "success";
 				await options.onWorkspaceAdded?.(hostId, workspaceId);
@@ -66424,10 +66709,10 @@ window.__ModuleLoader__.load({
 .${terminalClass.toolAction}[aria-pressed="true"],.${terminalClass.toolModifierActive}{background:var(--dsw-alias-button-ghost-active-fill,var(--dsw-alias-interactive-bg-active));box-shadow:inset 0 0 0 .5px var(--dsw-alias-button-ghost-active-border,var(--dsw-alias-border-l3))}
 .${terminalClass.listRow}{box-sizing:border-box;display:flex;align-items:center;height:28px;min-width:110px;max-width:220px;border-radius:var(--dsw-radius-sm,6px);background:transparent;flex:none}
 .${terminalClass.listRowSelected}{background:var(--dsw-alias-interactive-bg-hover);box-shadow:var(--dsw-elevation-soft,0 1px 2px rgba(0,0,0,.08))}
-.${terminalClass.listSelect}{box-sizing:border-box;min-width:0;height:28px;min-height:28px;flex:1;text-align:left;color:inherit;border:0;background:transparent;cursor:pointer;padding:0 8px;display:flex;align-items:center;gap:5px;font:inherit;line-height:20px}
+.${terminalClass.listSelect}{box-sizing:border-box;min-width:0;height:28px;min-height:28px;flex:1;text-align:left;color:inherit;border:0;background:transparent;cursor:pointer;padding:0 8px;display:flex;align-items:center;gap:5px;font:inherit;font-size:12px;line-height:20px}
 .${terminalClass.listSelect} span{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}
 .${terminalClass.listSelect} small{color:var(--dsw-alias-label-caption);font-size:11px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
-.${terminalClass.listInput}{box-sizing:border-box;min-width:0;height:24px;min-height:24px;flex:1;margin:0 4px;color:inherit;background:var(--dsw-alias-bg-base);border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-sm,6px);padding:0 6px;font:inherit;line-height:20px}
+.${terminalClass.listInput}{box-sizing:border-box;min-width:0;height:24px;min-height:24px;flex:1;margin:0 4px;color:inherit;background:var(--dsw-alias-bg-base);border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-sm,6px);padding:0 6px;font:inherit;font-size:12px;line-height:20px}
 .${terminalClass.listClose}{box-sizing:border-box;width:28px;height:28px;min-height:28px;padding:0;border:0;color:var(--dsw-alias-label-secondary);background:transparent;cursor:pointer;font:inherit;font-size:16px;line-height:20px;flex:none}
 .${terminalClass.listClose}:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover)}
 .${terminalClass.content}{box-sizing:border-box;width:100%;min-width:0;min-height:0;display:flex;flex:1 1 auto;overflow:hidden}