@jingyi0605/codingns4dsh 0.1.7-rc.3 → 0.2.0-beta.1

package/data/build/dist/client/git-management.js

@@ -71,15 +71,39 @@ function GitPanel(props) {
     const [busy, setBusy] = useState(false);
     const [toast, setToast] = useState(null);
     const [diffView, setDiffView] = useState(null);
+    const [fileDiff, setFileDiff] = useState(null);
+    const [singleColumn, setSingleColumn] = useState(false);
+    const [activeColumn, setActiveColumn] = useState('files');
     const [historyTotalCount, setHistoryTotalCount] = useState(0);
     const [historyLoadingMore, setHistoryLoadingMore] = useState(false);
+    const contentGridRef = useRef(null);
     const historyExpanded = useRef(false);
+    const gridVisible = status !== null && status.snapshot.enabled !== false;
     useEffect(() => {
         if (toast === null)
             return;
         const timer = globalThis.setTimeout(() => setToast(null), 3200);
         return () => globalThis.clearTimeout(timer);
     }, [toast]);
+    useEffect(() => {
+        const element = contentGridRef.current;
+        if (element === null) {
+            setSingleColumn(false);
+            return;
+        }
+        const update = () => {
+            const tracks = getComputedStyle(element).gridTemplateColumns.split(' ').filter((track) => track !== '');
+            setSingleColumn(tracks.length <= 1);
+        };
+        update();
+        if (typeof ResizeObserver === 'undefined') {
+            window.addEventListener('resize', update);
+            return () => window.removeEventListener('resize', update);
+        }
+        const observer = new ResizeObserver(update);
+        observer.observe(element);
+        return () => observer.disconnect();
+    }, [gridVisible]);
     const notify = (kind, message) => setToast({ kind, message });
     useEffect(() => {
         let disposed = false;
@@ -92,6 +116,7 @@ function GitPanel(props) {
         historyExpanded.current = false;
         setBranches(null);
         setDiffView(null);
+        setFileDiff(null);
         const load = async (resolvedWorkspaceId) => {
             const cached = readCache(resolvedWorkspaceId);
             // 已经手动展开历史后，定时刷新只能更新状态和分支，不能用首屏缓存覆盖已加载的分页。
@@ -235,6 +260,16 @@ function GitPanel(props) {
             setToast(null);
         }).catch((error) => notify('error', error instanceof Error ? error.message : String(error))).finally(() => setBusy(false));
     };
+    const openFileDiff = (path, staged) => {
+        if (workspaceId === undefined)
+            return;
+        setBusy(true);
+        notify('info', '正在读取文件 Diff…');
+        void call(props.rpc, 'git/diff', { workspaceId, path, staged }).then((value) => {
+            setFileDiff({ path, staged, diff: value });
+            setToast(null);
+        }).catch((error) => notify('error', error instanceof Error ? error.message : String(error))).finally(() => setBusy(false));
+    };
     const loadMoreHistory = () => {
         if (workspaceId === undefined || historyLoadingMore || history.length >= historyTotalCount)
             return;
@@ -257,10 +292,10 @@ function GitPanel(props) {
     };
     const stageAll = () => { void run('git/stage', { targets: unstaged.map((item) => item.path) }); };
     const discardAll = () => { void run('git/discard', { targets: changes.map((item) => item.path) }); };
-    return createElement('section', { style: panelStyle, 'data-git-management-panel': 'true' }, createElement('header', { style: headerStyle }, createElement('div', { style: { minWidth: 0 } }, createElement('h1', { style: titleStyle }, 'Git'), createElement('div', { style: branchStyle, title: status?.snapshot.repoRoot }, status?.snapshot.branch ?? '读取中')), createElement('div', { style: headerActionsStyle }, createElement(GitOperationsMenu, { busy, hasRemote: Boolean(status?.snapshot.hasRemote || branches?.remote.length), canUndo: history.length > 0, hasMoreVersions: history.length < historyTotalCount, stagedCount: staged.length, unstagedCount: unstaged.length, onStageAll: stageAll, onDiscardAll: discardAll, onLoadMore: loadMoreHistory, onOperation: runGitOperation }))), toast === null ? null : createElement('div', { role: toast.kind === 'error' ? 'alert' : 'status', 'aria-live': 'polite', style: { ...dshSettingsToastStyle, position: 'absolute', top: 8, right: 'auto', left: '50%', transform: 'translateX(-50%)', width: 'min(300px, calc(100% - 24px))', pointerEvents: 'none', borderColor: toast.kind === 'error' ? dshThemeColor.error : toast.kind === 'success' ? dshThemeColor.success : dshThemeColor.border } }, toast.message), status === null ? createElement('div', { style: emptyStyle }, '正在读取 Git 状态…') : null, status !== null && status.snapshot.enabled === false ? createElement('section', { style: sectionStyle }, createElement('strong', undefined, '当前目录还没有 Git 仓库'), createElement('div', { style: mutedStyle }, '初始化后即可查看改动、提交和版本历史。'), createElement('button', { type: 'button', disabled: busy, onClick: () => void run('git/init', {}), style: primaryButtonStyle }, '初始化 Git')) : null, status !== null ? createElement('div', { style: summaryStyle }, `${staged.length} 个已暂存 · ${unstaged.length} 个未暂存 · ${historyTotalCount} 条提交`) : null, diffView !== null ? createElement(DiffViewer, { diff: diffView, onClose: () => setDiffView(null) }) : null, status !== null && status.snapshot.enabled !== false ? createElement('div', { style: contentGridStyle }, createElement('div', { style: columnStyle }, createElement('section', { style: commitSectionStyle }, createElement('div', { style: commitEditorRowStyle }, createElement('textarea', { value: subject, disabled: busy || workspaceId === undefined, onChange: (event) => setSubject(event.currentTarget.value), onKeyDown: (event) => { if (event.key === 'Enter')
-            event.preventDefault(); }, placeholder: '在这里输入提交信息', rows: 1, style: commitSubjectStyle }), createElement('button', { type: 'button', disabled: busy || workspaceId === undefined, onClick: () => notify('info', '生成提交信息功能暂未开放'), style: draftButtonStyle, title: '生成提交信息', 'aria-label': '生成提交信息' }, '✦')), createElement('div', { style: commitActionsStyle }, createElement('button', { type: 'button', disabled: busy || workspaceId === undefined, onClick: () => void run('git/status', {}, (value) => setStatus(value)), style: refreshActionStyle }, '刷新'), createElement('button', { type: 'button', disabled: busy || workspaceId === undefined || staged.length === 0 || subject.trim().length === 0, onClick: commit, style: submitActionStyle }, '提交'))), staged.length > 0 ? createElement(ChangeSection, { title: '暂存文件', items: staged, busy, onAction: (action, path) => void run(`git/${action}`, { targets: [path] }), onBatchAction: (action, paths) => void run(`git/${action}`, { targets: paths }), onBulkAction: () => void run('git/unstage', { targets: staged.map((item) => item.path) }) }) : null, unstaged.length > 0 ? createElement(ChangeSection, { title: '未提交文件', items: unstaged, busy, onAction: (action, path) => void run(`git/${action}`, { targets: [path] }), onBatchAction: (action, paths) => void run(`git/${action}`, { targets: paths }), onBulkAction: () => void run('git/stage', { targets: unstaged.map((item) => item.path) }) }) : null), createElement('div', { style: columnStyle }, createElement(HistorySection, { history, totalCount: historyTotalCount, hasMore: history.length < historyTotalCount, loadingMore: historyLoadingMore, onLoadMore: loadMoreHistory, branches, busy, onSwitch: (branchName) => void run('git/switch', { branchName, create: false }, (value) => setBranches(normalizeBranchSnapshot(value))), onCopy: copyCommitHash, onCopyMessage: copyCommitMessage, onViewDiff: openCommitDiff, onUndo: () => runGitOperation('undo') }))) : null);
+    return createElement('section', { style: panelStyle, 'data-git-management-panel': 'true' }, createElement('header', { style: headerStyle }, createElement('div', { style: { minWidth: 0 } }, createElement('h1', { style: titleStyle }, 'Git')), createElement('div', { style: headerActionsStyle }, singleColumn ? createElement('div', { style: columnSwitchStyle, role: 'group', 'aria-label': '切换文件与版本视图' }, createElement('button', { type: 'button', onClick: () => setActiveColumn('files'), style: activeColumn === 'files' ? columnSwitchActiveButtonStyle : columnSwitchButtonStyle, title: '切换文件', 'aria-label': '切换文件', 'aria-pressed': activeColumn === 'files' }, '切换文件'), createElement('button', { type: 'button', onClick: () => setActiveColumn('history'), style: activeColumn === 'history' ? columnSwitchActiveButtonStyle : columnSwitchButtonStyle, title: '切换版本', 'aria-label': '切换版本', 'aria-pressed': activeColumn === 'history' }, '切换版本')) : null, createElement(GitOperationsMenu, { busy, hasRemote: Boolean(status?.snapshot.hasRemote || branches?.remote.length), canUndo: history.length > 0, hasMoreVersions: history.length < historyTotalCount, stagedCount: staged.length, unstagedCount: unstaged.length, onStageAll: stageAll, onDiscardAll: discardAll, onLoadMore: loadMoreHistory, onOperation: runGitOperation }))), toast === null ? null : createElement('div', { role: toast.kind === 'error' ? 'alert' : 'status', 'aria-live': 'polite', style: { ...dshSettingsToastStyle, position: 'absolute', top: 8, right: 'auto', left: '50%', transform: 'translateX(-50%)', width: 'min(300px, calc(100% - 24px))', pointerEvents: 'none', borderColor: toast.kind === 'error' ? dshThemeColor.error : toast.kind === 'success' ? dshThemeColor.success : dshThemeColor.border } }, toast.message), status === null ? createElement('div', { style: emptyStyle }, '正在读取 Git 状态…') : null, status !== null && status.snapshot.enabled === false ? createElement('section', { style: sectionStyle }, createElement('strong', undefined, '当前目录还没有 Git 仓库'), createElement('div', { style: mutedStyle }, '初始化后即可查看改动、提交和版本历史。'), createElement('button', { type: 'button', disabled: busy, onClick: () => void run('git/init', {}), style: primaryButtonStyle }, '初始化 Git')) : null, status !== null ? createElement('div', { style: summaryStyle }, `${staged.length} 个已暂存 · ${unstaged.length} 个未暂存 · ${historyTotalCount} 条提交`) : null, diffView !== null ? createElement(DiffViewer, { diff: diffView, onClose: () => setDiffView(null) }) : null, fileDiff !== null ? createElement(FileDiffViewer, { path: fileDiff.path, staged: fileDiff.staged, diff: fileDiff.diff, onClose: () => setFileDiff(null) }) : null, status !== null && status.snapshot.enabled !== false ? createElement('div', { ref: contentGridRef, style: contentGridStyle }, singleColumn && activeColumn !== 'files' ? null : createElement('div', { style: columnStyle }, createElement('section', { style: commitSectionStyle }, createElement('div', { style: commitEditorRowStyle }, createElement('textarea', { value: subject, disabled: busy || workspaceId === undefined, onChange: (event) => setSubject(event.currentTarget.value), onKeyDown: (event) => { if (event.key === 'Enter')
+            event.preventDefault(); }, placeholder: '在这里输入提交信息', rows: 1, style: commitSubjectStyle }), createElement('button', { type: 'button', disabled: busy || workspaceId === undefined, onClick: () => notify('info', '生成提交信息功能暂未开放'), style: draftButtonStyle, title: '生成提交信息', 'aria-label': '生成提交信息' }, '✦')), createElement('div', { style: commitActionsStyle }, createElement('button', { type: 'button', disabled: busy || workspaceId === undefined, onClick: () => void run('git/status', {}, (value) => setStatus(value)), style: refreshActionStyle }, '刷新'), createElement('button', { type: 'button', disabled: busy || workspaceId === undefined || staged.length === 0 || subject.trim().length === 0, onClick: commit, style: submitActionStyle }, '提交'))), staged.length > 0 ? createElement(ChangeSection, { title: '暂存文件', items: staged, busy, onOpenDiff: openFileDiff, onAction: (action, path) => void run(`git/${action}`, { targets: [path] }), onBatchAction: (action, paths) => void run(`git/${action}`, { targets: paths }), onBulkAction: () => void run('git/unstage', { targets: staged.map((item) => item.path) }) }) : null, unstaged.length > 0 ? createElement(ChangeSection, { title: '未提交文件', items: unstaged, busy, onOpenDiff: openFileDiff, onAction: (action, path) => void run(`git/${action}`, { targets: [path] }), onBatchAction: (action, paths) => void run(`git/${action}`, { targets: paths }), onBulkAction: () => void run('git/stage', { targets: unstaged.map((item) => item.path) }) }) : null), singleColumn && activeColumn !== 'history' ? null : createElement('div', { style: columnStyle }, createElement(HistorySection, { history, totalCount: historyTotalCount, hasMore: history.length < historyTotalCount, loadingMore: historyLoadingMore, onLoadMore: loadMoreHistory, branches, busy, onSwitch: (branchName) => void run('git/switch', { branchName, create: false }, (value) => setBranches(normalizeBranchSnapshot(value))), onCopy: copyCommitHash, onCopyMessage: copyCommitMessage, onViewDiff: openCommitDiff, onUndo: () => runGitOperation('undo') }))) : null);
 }
-function ChangeSection({ title, items, busy, onAction, onBatchAction, onBulkAction }) {
+function ChangeSection({ title, items, busy, onOpenDiff, onAction, onBatchAction, onBulkAction }) {
     const [hoveredPath, setHoveredPath] = useState(null);
     const nodes = buildChangeTree(items);
     const staged = title === '暂存文件';
@@ -272,7 +307,7 @@ function ChangeSection({ title, items, busy, onAction, onBatchAction, onBulkActi
             return createElement('details', { key: `dir:${node.path}`, open: true, style: treeDirectoryStyle }, createElement('summary', { style: { ...treeRowStyle, paddingLeft: 8 + depth * 14 }, onMouseEnter: () => setHoveredPath(directoryKey), onMouseLeave: () => setHoveredPath(null) }, createElement('span', { style: treeChevronStyle }, '⌄'), createElement('span', { style: folderIconStyle }, '▰'), createElement('span', { style: fileNameStyle, title: node.path }, node.name), createElement('span', { style: mutedStyle }, countTreeFiles(node)), isHovered ? createElement('div', { style: rowActionsStyle }, createElement('button', { type: 'button', disabled: busy, onClick: (event) => { event.preventDefault(); event.stopPropagation(); onBatchAction(staged ? 'unstage' : 'stage', directoryTargets); }, style: iconButtonStyle, title: staged ? '撤销目录暂存' : '将目录添加到暂存区', 'aria-label': staged ? '撤销目录暂存' : '将目录添加到暂存区' }, staged ? '↶' : '+'), !staged ? createElement('button', { type: 'button', disabled: busy, onClick: (event) => { event.preventDefault(); event.stopPropagation(); onBatchAction('discard', directoryTargets); }, style: dangerIconButtonStyle, title: '撤销目录变更', 'aria-label': '撤销目录变更' }, '×') : null) : null), createElement('div', undefined, ...node.children.map((child) => renderNode(child, depth + 1))));
         }
         const isHovered = hoveredPath === node.path;
-        return createElement('div', { key: `file:${node.path}`, style: { ...treeRowStyle, paddingLeft: 28 + depth * 14 }, onMouseEnter: () => setHoveredPath(node.path), onMouseLeave: () => setHoveredPath(null) }, createElement('span', { style: fileIconStyle }, fileIcon(node.name)), createElement('span', { title: node.path, style: fileNameStyle }, node.name), createElement('span', { style: fileStatusStyle }, changeStatus(node.item, staged)), isHovered ? createElement('div', { style: rowActionsStyle }, createElement('button', { type: 'button', disabled: busy, onClick: () => onAction(staged ? 'unstage' : 'stage', node.path), style: iconButtonStyle, title: staged ? '撤销暂存' : '添加到暂存区', 'aria-label': staged ? '撤销暂存' : '添加到暂存区' }, staged ? '↶' : '+'), !staged ? createElement('button', { type: 'button', disabled: busy, onClick: () => onAction('discard', node.path), style: dangerIconButtonStyle, title: '撤销变更', 'aria-label': '撤销变更' }, '×') : null) : null);
+        return createElement('div', { key: `file:${node.path}`, style: { ...treeRowStyle, paddingLeft: 28 + depth * 14 }, onMouseEnter: () => setHoveredPath(node.path), onMouseLeave: () => setHoveredPath(null), onDoubleClick: () => onOpenDiff(node.path, staged) }, createElement('span', { style: fileIconStyle }, fileIcon(node.name)), createElement('span', { title: node.path, style: fileNameStyle }, node.name), createElement('span', { style: fileStatusStyle }, changeStatus(node.item, staged)), isHovered ? createElement('div', { style: rowActionsStyle }, createElement('button', { type: 'button', disabled: busy, onClick: () => onAction(staged ? 'unstage' : 'stage', node.path), style: iconButtonStyle, title: staged ? '撤销暂存' : '添加到暂存区', 'aria-label': staged ? '撤销暂存' : '添加到暂存区' }, staged ? '↶' : '+'), !staged ? createElement('button', { type: 'button', disabled: busy, onClick: () => onAction('discard', node.path), style: dangerIconButtonStyle, title: '撤销变更', 'aria-label': '撤销变更' }, '×') : null) : null);
     };
     return createElement('section', { style: sectionStyle }, createElement('div', { style: sectionHeaderStyle }, createElement('strong', undefined, `${title} (${items.length})`), createElement('button', { type: 'button', disabled: busy, onClick: onBulkAction, style: iconButtonStyle, title: staged ? '取消全部暂存' : '全部添加到暂存区', 'aria-label': staged ? '取消全部暂存' : '全部添加到暂存区' }, staged ? '↶' : '+')), createElement('div', { style: treeStyle }, ...nodes.map((node) => renderNode(node, 0))));
 }
@@ -282,8 +317,16 @@ function GitOperationsMenu({ busy, hasRemote, canUndo, hasMoreVersions, stagedCo
 function DiffViewer({ diff, onClose }) {
     const providedFiles = diff.files ?? [];
     const files = providedFiles.length > 0 ? providedFiles : parseDiffFiles(diff.content);
-    const lines = parseDiffLines(diff.content);
-    return createElement('div', { style: diffOverlayStyle }, createElement('section', { role: 'dialog', 'aria-modal': true, 'aria-label': '提交 Diff', style: diffStyle }, createElement('div', { style: sectionHeaderStyle }, createElement('strong', undefined, `提交 Diff · ${diff.commitHash.slice(0, 8)}`), createElement('button', { type: 'button', onClick: onClose, style: iconButtonStyle, title: '关闭 Diff', 'aria-label': '关闭 Diff' }, '×')), createElement('div', { style: diffBodyStyle }, createElement('section', { style: diffFilesSectionStyle }, createElement('div', { style: diffSectionHeaderStyle }, createElement('strong', undefined, '变更文件'), createElement('span', { style: diffCountStyle }, String(files.length))), files.length === 0 ? createElement('div', { style: diffEmptyStyle }, '没有检测到文件变更。') : createElement('div', { style: diffFileListStyle }, ...files.map((file) => createElement('div', { key: `${file.status}:${file.oldPath ?? ''}:${file.path}`, style: diffFileRowStyle }, createElement('span', { style: diffFileStatusStyle, 'data-status': file.status }, diffFileStatusLabel(file.status)), createElement('div', { style: diffFileNameStyle }, createElement('strong', undefined, file.path), file.oldPath ? createElement('span', { style: diffFileOldPathStyle }, `原路径：${file.oldPath}`) : null), file.binary ? createElement('span', { style: diffBinaryStyle }, '二进制') : null)))), createElement('section', { style: diffDiffSectionStyle }, createElement('div', { style: diffSectionHeaderStyle }, createElement('strong', undefined, 'Diff'), diff.truncated ? createElement('span', { style: diffTruncatedStyle }, '内容已截断') : null), lines.length === 0 ? createElement('div', { style: diffEmptyStyle }, '当前没有可显示的文本差异。') : createElement('div', { style: diffLinesStyle }, ...lines.map((line, index) => createElement('div', { key: `${index}:${line.kind}:${line.text}`, style: diffLineStyle(line.kind) }, createElement('span', { style: diffLineNumberStyle }, line.oldLineNo === null ? '' : String(line.oldLineNo)), createElement('span', { style: diffLineNumberStyle }, line.newLineNo === null ? '' : String(line.newLineNo)), createElement('code', { style: diffCodeStyle }, `${diffLinePrefix(line.kind)}${line.text}`))))))));
+    return createElement('div', { style: diffOverlayStyle }, createElement('section', { role: 'dialog', 'aria-modal': true, 'aria-label': '提交 Diff', style: diffStyle }, createElement('div', { style: sectionHeaderStyle }, createElement('strong', undefined, `提交 Diff · ${diff.commitHash.slice(0, 8)}`), createElement('button', { type: 'button', onClick: onClose, style: iconButtonStyle, title: '关闭 Diff', 'aria-label': '关闭 Diff' }, '×')), createElement('div', { style: diffBodyStyle }, createElement('section', { style: diffFilesSectionStyle }, createElement('div', { style: diffSectionHeaderStyle }, createElement('strong', undefined, '变更文件'), createElement('span', { style: diffCountStyle }, String(files.length))), files.length === 0 ? createElement('div', { style: diffEmptyStyle }, '没有检测到文件变更。') : createElement('div', { style: diffFileListStyle }, ...files.map((file) => createElement('div', { key: `${file.status}:${file.oldPath ?? ''}:${file.path}`, style: diffFileRowStyle }, createElement('span', { style: diffFileStatusStyle, 'data-status': file.status }, diffFileStatusLabel(file.status)), createElement('div', { style: diffFileNameStyle }, createElement('strong', undefined, file.path), file.oldPath ? createElement('span', { style: diffFileOldPathStyle }, `原路径：${file.oldPath}`) : null), file.binary ? createElement('span', { style: diffBinaryStyle }, '二进制') : null)))), createElement('section', { style: diffDiffSectionStyle }, createElement('div', { style: diffSectionHeaderStyle }, createElement('strong', undefined, 'Diff'), diff.truncated ? createElement('span', { style: diffTruncatedStyle }, '内容已截断') : null), createElement(DiffLines, { content: diff.content })))));
+}
+function DiffLines({ content }) {
+    const lines = parseDiffLines(content);
+    if (lines.length === 0)
+        return createElement('div', { style: diffEmptyStyle }, '当前没有可显示的文本差异。');
+    return createElement('div', { style: diffLinesStyle }, ...lines.map((line, index) => createElement('div', { key: `${index}:${line.kind}:${line.text}`, style: diffLineStyle(line.kind) }, createElement('span', { style: diffLineNumberStyle }, line.oldLineNo === null ? '' : String(line.oldLineNo)), createElement('span', { style: diffLineNumberStyle }, line.newLineNo === null ? '' : String(line.newLineNo)), createElement('code', { style: diffCodeStyle }, `${diffLinePrefix(line.kind)}${line.text}`))));
+}
+function FileDiffViewer({ path, staged, diff, onClose }) {
+    return createElement('div', { style: diffOverlayStyle }, createElement('section', { role: 'dialog', 'aria-modal': true, 'aria-label': '文件 Diff', style: diffStyle }, createElement('div', { style: sectionHeaderStyle }, createElement('strong', { style: fileDiffTitleStyle, title: path }, `文件 Diff · ${path}`), createElement('div', { style: rowActionsStyle }, createElement('span', { style: diffCountStyle }, staged ? '已暂存' : '未暂存'), createElement('button', { type: 'button', onClick: onClose, style: iconButtonStyle, title: '关闭 Diff', 'aria-label': '关闭 Diff' }, '×'))), createElement('div', { style: diffBodyStyle }, createElement('section', { style: diffDiffSectionStyle }, createElement('div', { style: diffSectionHeaderStyle }, createElement('strong', undefined, staged ? '暂存区 Diff（相对 HEAD）' : '工作区 Diff'), diff.binary ? createElement('span', { style: diffBinaryStyle }, '二进制文件') : null, diff.truncated ? createElement('span', { style: diffTruncatedStyle }, '内容已截断') : null), createElement(DiffLines, { content: diff.content })))));
 }
 function parseDiffLines(content) {
     const lines = [];
@@ -350,7 +393,10 @@ function diffLineStyle(kind) {
 function HistorySection({ history, totalCount, hasMore, loadingMore, onLoadMore, branches, busy, onSwitch, onCopy, onCopyMessage, onViewDiff, onUndo }) {
     const rows = groupHistoryByDate(history).flatMap((group) => [
         createElement('div', { key: `date:${group.key}`, style: historyDateHeaderStyle }, createElement('time', { dateTime: group.key, style: historyDateHeaderTextStyle }, group.label)),
-        ...group.items.map(({ item, index, timeLabel }) => createElement('div', { key: item.commitHash, style: historyRowStyle }, createElement('code', { style: hashStyle }, item.commitHash.slice(0, 8)), createElement('span', { style: fileNameStyle, title: item.subject }, item.subject), createElement('time', { style: historyTimeStyle, dateTime: item.authoredAt }, timeLabel), createElement('details', { style: menuStyle }, createElement('summary', { style: menuSummaryStyle, title: '版本操作菜单', 'aria-label': '版本操作菜单' }, '⋯'), createElement('div', { style: menuPopupStyle }, createElement('button', { type: 'button', onClick: () => onViewDiff(item.commitHash), style: menuButtonStyle }, '查看更改文件与 Diff'), createElement('button', { type: 'button', onClick: () => onCopy(item.commitHash), style: menuButtonStyle }, '复制 Commit Hash'), createElement('button', { type: 'button', onClick: () => onCopyMessage(buildCommitMessageText(item.subject, item.body)), style: menuButtonStyle }, '复制提交信息'), createElement('button', { type: 'button', onClick: () => onCopy(item.commitHash), style: menuButtonStyle }, '复制 Git 版本号'), index === 0 ? createElement('button', { type: 'button', disabled: busy, onClick: onUndo, style: dangerMenuButtonStyle }, '撤销上次提交') : null)))),
+        ...group.items.map(({ item, index, timeLabel }) => {
+            const refs = item.refs ?? [];
+            return createElement('div', { key: item.commitHash, style: historyRowStyle }, createElement('div', { style: historyRowMainStyle }, createElement('code', { style: hashStyle }, item.commitHash.slice(0, 8)), createElement('span', { style: fileNameStyle, title: item.subject }, item.subject), createElement('time', { style: historyTimeStyle, dateTime: item.authoredAt }, timeLabel), createElement('details', { style: menuStyle }, createElement('summary', { style: menuSummaryStyle, title: '版本操作菜单', 'aria-label': '版本操作菜单' }, '⋯'), createElement('div', { style: menuPopupStyle }, createElement('button', { type: 'button', onClick: () => onViewDiff(item.commitHash), style: menuButtonStyle }, '查看更改文件与 Diff'), createElement('button', { type: 'button', onClick: () => onCopy(item.commitHash), style: menuButtonStyle }, '复制 Commit Hash'), createElement('button', { type: 'button', onClick: () => onCopyMessage(buildCommitMessageText(item.subject, item.body)), style: menuButtonStyle }, '复制提交信息'), createElement('button', { type: 'button', onClick: () => onCopy(item.commitHash), style: menuButtonStyle }, '复制 Git 版本号'), index === 0 ? createElement('button', { type: 'button', disabled: busy, onClick: onUndo, style: dangerMenuButtonStyle }, '撤销上次提交') : null))), refs.length === 0 ? null : createElement('div', { style: historyRefListStyle }, ...refs.map((ref) => createElement('span', { key: `${ref.kind}:${ref.name}`, title: ref.name, style: historyRefPillStyle(ref.kind, ref.remoteName) }, ref.name))));
+        }),
     ]);
     return createElement('section', { style: sectionStyle }, createElement('div', { style: sectionHeaderStyle }, createElement('strong', undefined, `Git 版本 (${totalCount})`), branches === null ? null : createElement('select', { value: branches.currentBranch, disabled: busy, onChange: (event) => onSwitch(event.currentTarget.value), style: branchSelectStyle }, ...branches.local.map((branch) => createElement('option', { key: branch.name, value: branch.name }, branch.name)))), history.length === 0 ? createElement('div', { style: mutedStyle }, '暂无提交') : rows, hasMore ? createElement('button', { type: 'button', disabled: busy || loadingMore, onClick: onLoadMore, style: loadMoreButtonStyle }, loadingMore ? '正在加载…' : '查看更多版本（每次 100 条）') : null);
 }
@@ -698,12 +744,32 @@ function formatHistoryTimestamp(value) {
     return { key: `${get('year')}-${get('month')}-${get('day')}`, dateLabel: `${get('month')}月${get('day')}日`, timeLabel: `${get('hour')}:${get('minute')}` };
 }
 function buildCommitMessageText(subject, body) { const normalizedSubject = subject.trim(); const normalizedBody = body.trim(); return normalizedBody ? `${normalizedSubject}\n\n${normalizedBody}` : normalizedSubject; }
-const panelStyle = { position: 'relative', boxSizing: 'border-box', display: 'flex', flexDirection: 'column', gap: 12, minHeight: '100%', padding: '16px 18px 24px', overflow: 'auto', background: dshThemeColor.pageBackground, color: dshThemeColor.labelPrimary };
+const REMOTE_REF_PALETTE = ['#8b5cf6', '#ef4444', '#10b981', '#f59e0b', '#06b6d4', '#ec4899'];
+function resolveRemotePaletteIndex(remoteName) {
+    if (remoteName === null)
+        return 0;
+    let hash = 0;
+    for (const character of remoteName)
+        hash = (hash * 33 + character.charCodeAt(0)) >>> 0;
+    return hash % REMOTE_REF_PALETTE.length;
+}
+function historyRefPillStyle(kind, remoteName) {
+    if (kind === 'remote') {
+        const color = REMOTE_REF_PALETTE[resolveRemotePaletteIndex(remoteName)];
+        return { ...historyRefPillBaseStyle, border: `1px solid color-mix(in srgb, ${color} 34%, transparent)`, background: `color-mix(in srgb, ${color} 14%, transparent)`, color };
+    }
+    const color = kind === 'head' ? '#4f9cff' : '#67b0ff';
+    const mix = kind === 'head' ? { border: 36, background: 18 } : { border: 28, background: 12 };
+    return { ...historyRefPillBaseStyle, border: `1px solid color-mix(in srgb, ${color} ${mix.border}%, transparent)`, background: `color-mix(in srgb, ${color} ${mix.background}%, transparent)`, color: '#2b74d8' };
+}
+const panelStyle = { position: 'relative', userSelect: 'none', boxSizing: 'border-box', display: 'flex', flexDirection: 'column', gap: 12, minHeight: '100%', padding: '16px 18px 24px', overflow: 'auto', background: dshThemeColor.pageBackground, color: dshThemeColor.labelPrimary };
 const headerStyle = { display: 'flex', alignItems: 'flex-start', justifyContent: 'space-between', gap: 12, paddingBottom: 10, borderBottom: `1px solid ${dshThemeColor.border}` };
 const titleStyle = { margin: 0, fontSize: 20, lineHeight: 1.2 };
 const tabTitleStyle = { display: 'inline-flex', alignItems: 'center', minWidth: 0, color: dshThemeColor.labelPrimary, fontSize: 12 };
 const headerActionsStyle = { display: 'inline-flex', alignItems: 'center', gap: 4 };
-const branchStyle = { marginTop: 4, overflow: 'hidden', color: dshThemeColor.labelSecondary, fontSize: 12, textOverflow: 'ellipsis', whiteSpace: 'nowrap' };
+const columnSwitchStyle = { display: 'inline-flex', alignItems: 'center', gap: 2, padding: 2, border: `1px solid ${dshThemeColor.border}`, borderRadius: 5, background: dshThemeColor.pageBackground };
+const columnSwitchButtonStyle = { border: 0, borderRadius: 3, padding: '3px 6px', color: dshThemeColor.labelSecondary, background: 'transparent', cursor: 'pointer', fontSize: 11, whiteSpace: 'nowrap' };
+const columnSwitchActiveButtonStyle = { ...columnSwitchButtonStyle, color: dshThemeColor.accent, background: 'color-mix(in srgb, currentColor 12%, transparent)', fontWeight: 600 };
 const summaryStyle = { color: dshThemeColor.labelSecondary, fontSize: 12 };
 const contentGridStyle = { display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))', alignItems: 'start', gap: 12 };
 const columnStyle = { display: 'flex', flexDirection: 'column', gap: 12, minWidth: 0 };
@@ -717,7 +783,10 @@ const folderIconStyle = { color: dshThemeColor.accent, fontSize: 11 };
 const fileIconStyle = { width: 12, color: dshThemeColor.labelTertiary, fontSize: 12, textAlign: 'center' };
 const fileNameStyle = { minWidth: 0, flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' };
 const fileStatusStyle = { color: dshThemeColor.labelTertiary, fontFamily: 'monospace', fontSize: 11 };
-const historyRowStyle = { display: 'flex', alignItems: 'center', gap: 8, minHeight: 28, fontSize: 12 };
+const historyRowStyle = { display: 'flex', flexDirection: 'column', gap: 3, fontSize: 12 };
+const historyRowMainStyle = { display: 'flex', alignItems: 'center', gap: 8, minWidth: 0, minHeight: 28 };
+const historyRefListStyle = { display: 'flex', flexWrap: 'wrap', gap: '4px 6px', paddingLeft: 2 };
+const historyRefPillBaseStyle = { display: 'inline-flex', alignItems: 'center', justifyContent: 'center', minHeight: 18, padding: '0 8px', borderRadius: 999, fontSize: 10, lineHeight: 1, whiteSpace: 'nowrap' };
 const historyDateHeaderStyle = { paddingTop: 6, color: dshThemeColor.labelSecondary, fontSize: 11, fontWeight: 600 };
 const historyDateHeaderTextStyle = { display: 'block' };
 const hashStyle = { color: dshThemeColor.labelTertiary, fontSize: 11 };
@@ -740,6 +809,7 @@ const diffFileStatusStyle = { display: 'inline-flex', alignItems: 'center', just
 const diffFileNameStyle = { display: 'flex', flexDirection: 'column', minWidth: 0, flex: 1, overflow: 'hidden' };
 const diffFileOldPathStyle = { overflow: 'hidden', color: dshThemeColor.labelTertiary, textOverflow: 'ellipsis', whiteSpace: 'nowrap', fontSize: 11 };
 const diffBinaryStyle = { color: dshThemeColor.labelTertiary, fontSize: 11 };
+const fileDiffTitleStyle = { ...fileNameStyle, fontSize: 12 };
 const diffTruncatedStyle = { color: dshThemeColor.labelTertiary, fontSize: 11 };
 const diffEmptyStyle = { padding: 10, color: dshThemeColor.labelTertiary, fontSize: 12 };
 const diffLinesStyle = { overflow: 'auto', border: `1px solid ${dshThemeColor.border}`, borderRadius: 4, background: dshThemeColor.pageBackground, fontFamily: 'ui-monospace, SFMono-Regular, Menlo, monospace', fontSize: 12 };

package/data/build/dist/client/index.d.ts

@@ -23,6 +23,7 @@ export type { CodingNsClientFeatureModule, CodingNsClientServices, CodingNsRpcCl
 export { CodingNsSettingsSection } from './settings-section.js';
 export { startWorkspaceSessionArchiveDom, WORKSPACE_SESSION_ARCHIVE_ATTRIBUTE, WORKSPACE_SESSION_ARCHIVE_MODAL_ATTRIBUTE, } from './workspace-session-archive-dom.js';
 export { startWorkspaceSessionVisibilityDom, WORKSPACE_SESSION_HIDDEN_ATTRIBUTE, WORKSPACE_SESSION_HIDDEN_MENU_ATTRIBUTE, WORKSPACE_SESSION_HIDDEN_LIST_ATTRIBUTE, } from './workspace-session-visibility-dom.js';
+export { startContextBreakdownDom, CONTEXT_BREAKDOWN_HIDDEN_ATTRIBUTE, CONTEXT_BREAKDOWN_STYLE_ID, CONTEXT_BREAKDOWN_CONVERSATION_ATTRIBUTE, DEFAULT_CONTEXT_BREAKDOWN_HIDDEN_ADAPTERS, } from './context-breakdown-dom.js';
 export { CodingNsTerminalView, CodingNsWebTerminals, registerCodingNsTerminalUi } from './terminal/index.js';
 export { registerSubscriptionSlot, registerCommandCodeSubscriptionSlot, CommandCodeSubscriptionSlot } from './subscription-slot.js';
 /** Client Runner 用于等待服务就绪的 Cordis 依赖声明。 */

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

@@ -1,3 +1,4 @@
+import * as dshUiPrimitives from '@deepseek-ai/dsh-client-ui-primitives';
 import './provider-icon-assets.js';
 import { FeatureRegistry } from '../features/registry.js';
 import { registerCodingNsLocale } from './locale.js';
@@ -7,7 +8,7 @@ import { ensureCryptoRandomUUID } from './lan-access.js';
 import { CodingNsSettingsSection } from './settings-section.js';
 import { callCodingNsRpc, createCodingNsSettingsBridge } from './settings-bridge.js';
 import { debugInfo, debugWarn } from '../shared/debug.js';
-import { createConfigFormSettingsStore } from '../dsh-capabilities/client/config-forms-adapter.js';
+import { createConfigFormSettingsStore, resolveServedConfigFormNamespace } from '../dsh-capabilities/client/config-forms-adapter.js';
 import { CodingNsWebTerminals, registerCodingNsTerminalUi } from './terminal/index.js';
 import { startCodingNsAccountBar } from './account-bar.js';
 import { assertInjectedDshVersion } from './dsh-runtime-version.js';
@@ -26,6 +27,7 @@ export { startPeerHostNativeNavigation, startPeerHostNativeSession, probePeerHos
 export { CodingNsSettingsSection } from './settings-section.js';
 export { startWorkspaceSessionArchiveDom, WORKSPACE_SESSION_ARCHIVE_ATTRIBUTE, WORKSPACE_SESSION_ARCHIVE_MODAL_ATTRIBUTE, } from './workspace-session-archive-dom.js';
 export { startWorkspaceSessionVisibilityDom, WORKSPACE_SESSION_HIDDEN_ATTRIBUTE, WORKSPACE_SESSION_HIDDEN_MENU_ATTRIBUTE, WORKSPACE_SESSION_HIDDEN_LIST_ATTRIBUTE, } from './workspace-session-visibility-dom.js';
+export { startContextBreakdownDom, CONTEXT_BREAKDOWN_HIDDEN_ATTRIBUTE, CONTEXT_BREAKDOWN_STYLE_ID, CONTEXT_BREAKDOWN_CONVERSATION_ATTRIBUTE, DEFAULT_CONTEXT_BREAKDOWN_HIDDEN_ADAPTERS, } from './context-breakdown-dom.js';
 export { CodingNsTerminalView, CodingNsWebTerminals, registerCodingNsTerminalUi } from './terminal/index.js';
 export { registerSubscriptionSlot, registerCommandCodeSubscriptionSlot, CommandCodeSubscriptionSlot } from './subscription-slot.js';
 /** Client Runner 用于等待服务就绪的 Cordis 依赖声明。 */
@@ -93,7 +95,8 @@ export function apply(ctx) {
         debugInfo('codingns4dsh: client account bar registration begin');
         const disposeAccountBar = startCodingNsAccountBar(connection.rpc, undefined, settings);
         debugInfo('codingns4dsh: client account bar registration ready');
-        const capabilityProfile = createDshCapabilityRegistry(dshVersion, 'client', settingsCtx).getProfile(settingsCtx);
+        // 图标导出由客户端静态导入决定，无法从 Context 探测；随装配一起交给注册表。
+        const capabilityProfile = createDshCapabilityRegistry(dshVersion, 'client', settingsCtx, { primitives: dshUiPrimitives }).getProfile(settingsCtx);
         debugInfo('codingns4dsh: client capabilities resolved', {
             dshVersion,
             capabilities: [...capabilityProfile.capabilities.entries()].map(([capability, resolution]) => ({ capability, status: resolution.status, route: resolution.routeId, reason: resolution.reason ?? null })),
@@ -183,61 +186,25 @@ function createClientSettingsStore(ctx, rpc) {
         return createCodingNsSettingsBridge(local, rpc);
     }
     const forms = ctx.get('configForms');
-    const form = findConfigForm(forms);
-    if (form === undefined) {
-        // DSH 只向回环页面或声明了 Host 所有权的页面下发持久设置命名空间；局域网和
-        // 中继页面会降级为 memory 模式，ConfigForm 因此缺失。设置页不能停在这里：
-        // 插件设置本来就由自己的 Host RPC 承载，退回 RPC 边界后这些页面依然可读写，
-        // 也不再需要宿主启动页去改页面级 Transport 全局（那会覆盖 Desktop Transport）。
-        debugWarn('codingns4dsh: client config form unavailable; falling back to Host settings RPC', {
+    const namespace = resolveServedConfigFormNamespace(forms, CODINGNS_SETTINGS_ENTRY_IDS);
+    if (namespace === undefined || forms === undefined) {
+        // DSH 只把 Host 真正下发的命名空间接进 ConfigForm。Host 持久模式（中继页面的
+        // 插件 Transport 声明 ownsHost）会为任意 entry 造出一份停在 loading 的空表单，
+        // memory 模式（局域网页面）则完全没有命名空间；两种情况下绑定原生表单都会让
+        // 设置页停在未就绪状态、把模块开关显示为不可操作。插件设置本来就由自己的 Host
+        // RPC 承载，退回 RPC 边界后这些页面依然可读写；原生设置页的 Host 所有权由宿主
+        // 启动页的合并写脚本行单独声明（见 src/host/index-injection.ts）。
+        debugWarn('codingns4dsh: client config form not served; falling back to Host settings RPC', {
             hasConfigForms: forms !== undefined,
         });
         return createCodingNsSettingsBridge(undefined, rpc);
     }
-    debugInfo('codingns4dsh: client settings source=configForms', { hasConfigForms: forms !== undefined, hasForm: true });
-    return createConfigFormSettingsStore({ get: () => form }, CODINGNS_SETTINGS_NAMESPACE, {
+    debugInfo('codingns4dsh: client settings source=configForms', { namespace });
+    return createConfigFormSettingsStore(forms, namespace, {
         // DSH 0.1.7 的 ConfigForm 会把 Host 后台索引更新也纳入 revision。
         // Codingns4DSH 的路径操作是原子的，交给 Host RPC 无条件合并，避免
         // 模块开关因为 cliSessions 的后台心跳而永久冲突。
         writeUnfenced: async (ops) => callCodingNsRpc(rpc, 'settings/set', { ops }),
     });
 }
-function findConfigForm(forms) {
-    if (forms === undefined)
-        return undefined;
-    // ConfigForms.get 对未知 entry 也会返回一个 Form；必须先看共享 mirror 中
-    // Host 实际提供的 namespace，否则会永远拿到旧的 `codingns` 空表单。
-    try {
-        const namespaces = forms.describe?.().getSnapshot().view?.namespaces;
-        debugInfo('codingns4dsh: client config form namespaces', {
-            namespaces: namespaces?.map((item) => item.ns),
-        });
-        const servedId = CODINGNS_SETTINGS_ENTRY_IDS.find((id) => namespaces?.some((item) => item.ns === id));
-        if (servedId !== undefined) {
-            const form = forms.get(servedId);
-            debugInfo('codingns4dsh: client config form namespace selected', { namespace: servedId, hasForm: form !== undefined });
-            return form;
-        }
-    }
-    catch {
-        // mirror 尚未就绪时继续按 scoped entry 优先的兼容顺序探测。
-    }
-    for (const id of CODINGNS_SETTINGS_ENTRY_IDS) {
-        try {
-            const form = forms.get(id);
-            if (form !== undefined && form.getSnapshot().status !== 'unavailable') {
-                debugInfo('codingns4dsh: client config form namespace fallback selected', {
-                    namespace: id,
-                    status: form.getSnapshot().status,
-                    revision: form.getSnapshot().revision,
-                });
-                return form;
-            }
-        }
-        catch {
-            // 不同 0.1.7 构建可能只接受其中一个 entry id，继续尝试别名。
-        }
-    }
-    return undefined;
-}
 //# sourceMappingURL=index.js.map

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

@@ -21,7 +21,7 @@ const en = {
     'feature.reverseProxy.label': 'Relay access service',
     'feature.reverseProxy.description': 'Access a DSH Host through the isolated Codingns4DSH relay.',
     'feature.cliAdapters.label': 'External Agent integration',
-    'feature.cliAdapters.description': 'View installed external Agents, versions, command paths, available models, and enable them independently.',
+    'feature.cliAdapters.description': 'View installed external Agents, versions, command paths, available models, and enable them independently. External Agent context panels keep only the occupancy percentage and totals.',
     'feature.workspaceSession.label': 'Workspace session enhancement',
     'feature.workspaceSession.description': 'Show Agent logos, archived-session entries, workspace hiding controls, subscription or usage information, local quick sessions, and an optional remembered conversation/right-sidebar width ratio.',
     'feature.terminal.label': 'Terminal enhancements',
@@ -209,6 +209,15 @@ const en = {
     'workspace.workspaceHidingDescription': 'Add a Hide workspace action to each workspace menu and show hidden workspaces through the workspace filter.',
     'workspace.showSubscriptionUsage': 'Show subscription and usage',
     'workspace.subscriptionUsageDescription': 'Detect and display provider subscription balances and upstream usage in the conversation footer.',
+    'workspace.subscriptionUsageSettings': 'Settings',
+    'subscriptionUsage.dialogTitle': 'Usage query settings',
+    'subscriptionUsage.dialogHint': 'The timeout applies to every adapter. The refresh interval drives the footer usage query; 0 disables automatic refresh, and a result is reused while it is still fresh.',
+    'subscriptionUsage.timeoutSecs': 'Query timeout (seconds)',
+    'subscriptionUsage.refreshInterval': 'Auto refresh interval (minutes)',
+    'subscriptionUsage.refreshIntervalHint': '0 disables automatic refresh.',
+    'subscriptionUsage.cancel': 'Cancel',
+    'subscriptionUsage.save': 'Save',
+    'subscriptionUsage.saved': 'Usage query settings saved',
     'workspace.showQuickPhrases': 'Show quick sessions',
     'workspace.quickPhrasesDescription': 'Keep reusable session instructions locally in Codingns4DSH and show the quick sessions button inside the composer.',
     'workspace.rememberConversationRightbarRatio': 'Remember conversation and right sidebar width ratio',
@@ -250,7 +259,7 @@ const zh = {
     'feature.reverseProxy.label': '中转访问服务',
     'feature.reverseProxy.description': '通过隔离的 Codingns4DSH 中继访问 DSH Host。',
     'feature.cliAdapters.label': '外部Agent集成',
-    'feature.cliAdapters.description': '查看外部 Agent 的安装状态、版本、命令路径和可用模型，并单独启用或停用。',
+    'feature.cliAdapters.description': '查看外部 Agent 的安装状态、版本、命令路径和可用模型，并单独启用或停用。外部 Agent 的上下文面板只保留占用百分比与总量。',
     'feature.workspaceSession.label': '工作区会话增强',
     'feature.workspaceSession.description': '在原生工作区会话行显示 Agent Logo、归档会话入口、工作区隐藏功能和订阅/用量信息，提供本地快捷会话，并可记忆对话窗口与右侧栏宽度比例。',
     'feature.terminal.label': '终端增强',
@@ -438,6 +447,15 @@ const zh = {
     'workspace.workspaceHidingDescription': '在工作区菜单中加入“隐藏工作区”，通过工作区筛选菜单显示隐藏的工作区并支持恢复。',
     'workspace.showSubscriptionUsage': '显示订阅/用量检测',
     'workspace.subscriptionUsageDescription': '在对话底部检测并显示 Agent 订阅余额和上游用量。',
+    'workspace.subscriptionUsageSettings': '设置',
+    'subscriptionUsage.dialogTitle': '用量查询设置',
+    'subscriptionUsage.dialogHint': '超时时间作用于所有适配器；自动查询间隔作用于对话底部的用量查询，0 表示不自动查询，间隔内的查询结果会直接复用。',
+    'subscriptionUsage.timeoutSecs': '超时时间（秒）',
+    'subscriptionUsage.refreshInterval': '自动查询间隔（分钟）',
+    'subscriptionUsage.refreshIntervalHint': '0 表示不自动查询。',
+    'subscriptionUsage.cancel': '取消',
+    'subscriptionUsage.save': '保存',
+    'subscriptionUsage.saved': '用量查询设置已保存',
     'workspace.showQuickPhrases': '显示快捷会话',
     'workspace.quickPhrasesDescription': '在 Codingns4DSH 内本地保存可复用的会话指令，并将快捷会话按钮显示在输入工具区。',
     'workspace.rememberConversationRightbarRatio': '记忆对话窗口与右侧栏的宽度比例',

package/data/build/dist/client/remote-web-context.js

@@ -368,12 +368,34 @@ function createBridgeScript() {
     const pending = new Map();
     // RPC、WebSocket 和远程 stream 必须使用各自的 ID 空间；资源 fetch
     // 不能改变 WebSocket 的 ID，否则 ws.open 与 ws.send 会指向不同 key。
+    //
+    // 每个 ID 还必须带 kind 前缀：早期实现把 fetch/script 计数器和 ws.open 计数器
+    // 当成裸数字放进同一个 pending Map，两个计数器各自从 1 开始，页面启动时
+    // 「插件包 fetch」与「/api/remote.mux ws.open」几乎同时发生，后到的
+    // pending.set 会覆盖先到的在途请求。被覆盖的那条 Promise 永远不会落地：
+    // 如果它正好是原生设置页的 settings/describe，DSH 的设置镜像会一直停在
+    // loading，中继下的「模型」页就永久空白且没有任何报错。
     let nextCallId = 0;
     let nextSocketId = 0;
     let nextStreamId = 0;
     let remoteLoadChain = Promise.resolve();
+    const allocateId = (prefix, counter) => {
+      let value = counter + 1;
+      let id = prefix + String(value);
+      // 绝不覆盖未完成的请求：万一同前缀 ID 仍在使用就继续往后取。
+      while (pending.has(id)) {
+        value += 1;
+        id = prefix + String(value);
+      }
+      return { id, counter: value };
+    };
     const call = (kind, input, body, explicitId) => new Promise((resolve, reject) => {
-      const id = explicitId || String(++nextCallId);
+      let id = explicitId;
+      if (id === undefined) {
+        const allocated = allocateId('req:', nextCallId);
+        nextCallId = allocated.counter;
+        id = allocated.id;
+      }
       pending.set(id, { resolve, reject });
       bridgeLog('bridge.call', { kind, id, path: input && typeof input.path === 'string' ? input.path : undefined });
       parent.postMessage({ kind, id, input, body }, '*');
@@ -705,7 +727,9 @@ function createBridgeScript() {
         this.url = String(url);
         this.readyState = RemoteWebSocket.CONNECTING;
         this._listeners = new Map();
-        window.__dshRemoteSockets.set(this._id = String(++nextSocketId), this);
+        const allocated = allocateId('ws:', nextSocketId);
+        nextSocketId = allocated.counter;
+        window.__dshRemoteSockets.set(this._id = allocated.id, this);
         bridgeLog('bridge.ws.open', { id: this._id, path: new URL(this.url, resourceBase()).pathname });
         call('ws.open', { path: new URL(this.url, resourceBase()).pathname }, undefined, this._id).then(() => {
           if (this.readyState !== RemoteWebSocket.CONNECTING) return;

package/data/build/dist/client/settings-bridge.d.ts

@@ -1,8 +1,15 @@
-import type { SettingsScope } from '@deepseek-ai/dsh-client-ui-settings/client';
 import type { CodingNsSettings } from '../shared/contracts/config.js';
 import type { CodingNsRpcClient } from './features/types.js';
-import { type CodingNsSettingsSnapshot, type CodingNsSettingsStore } from '../dsh-capabilities/settings-store.js';
-type SettingsMutation = Parameters<SettingsScope<CodingNsSettings>['mutate']>[0];
+import { type CodingNsSettingsSnapshot, type CodingNsSettingsStore, type CodingNsSettingsOperation } from '../dsh-capabilities/settings-store.js';
+/** DSH 0.1 SettingsScope 与 0.2 Client 设置镜像的共同最小结构。 */
+export interface DshClientSettingsScope<T> {
+    getSnapshot(): LocalScopeSnapshot<T>;
+    subscribe(listener: () => void): () => void;
+    mutate(operations: readonly CodingNsSettingsOperation[], expectedRevision?: number): Promise<void | boolean>;
+    set(field: string, value: unknown): Promise<void | boolean>;
+    unset(field: string): Promise<void | boolean>;
+}
+type SettingsMutation = readonly CodingNsSettingsOperation[];
 type SnapshotListener = () => void;
 /**
  * 把 DSH 本地设置和远程 Host 设置 RPC 统一成一个设置作用域。
@@ -19,7 +26,7 @@ export declare class CodingNsSettingsBridge implements CodingNsSettingsStore<Cod
     private readonly localUnsubscribe;
     private remoteLoad;
     private remoteLoaded;
-    constructor(local: SettingsScope<CodingNsSettings> | undefined, rpc: CodingNsRpcClient);
+    constructor(local: DshClientSettingsScope<CodingNsSettings> | undefined, rpc: CodingNsRpcClient);
     getSnapshot(): CodingNsSettingsSnapshot<CodingNsSettings>;
     subscribe(listener: SnapshotListener): () => void;
     load(): Promise<void>;
@@ -40,6 +47,14 @@ export declare class CodingNsSettingsBridge implements CodingNsSettingsStore<Cod
 }
 /** 调用 Codingns4DSH Host RPC，并兼容 DSH 原生连接与普通 Web API 回退。 */
 export declare function callCodingNsRpc<T>(rpc: CodingNsRpcClient, endpoint: string, payload: unknown): Promise<T>;
-export declare function createCodingNsSettingsBridge(local: SettingsScope<CodingNsSettings> | undefined, rpc: CodingNsRpcClient): CodingNsSettingsBridge;
+export declare function createCodingNsSettingsBridge(local: DshClientSettingsScope<CodingNsSettings> | undefined, rpc: CodingNsRpcClient): CodingNsSettingsBridge;
+/** 本地镜像或占位快照中的通用字段；DSH 各版本另有 base/user/mode 等附加字段。 */
+export type LocalScopeSnapshot<T = CodingNsSettings> = {
+    readonly value: T | undefined;
+    readonly revision: number | undefined;
+    readonly writable: boolean;
+    readonly status: 'loading' | 'ready' | 'unavailable';
+    readonly mode?: string;
+};
 export {};
 //# sourceMappingURL=settings-bridge.d.ts.map

package/data/build/dist/client/settings-bridge.js

@@ -174,19 +174,42 @@ export async function callCodingNsRpc(rpc, endpoint, payload) {
     return result.value;
 }
 /** 设置 RPC 只能传 JSON；在浏览器边界尽早拒绝函数、循环引用等无效值。 */
-function toJsonValue(value) {
+function toJsonValue(value, visiting = new WeakSet()) {
     if (value === null || typeof value === 'string' || typeof value === 'boolean')
         return value;
     if (typeof value === 'number' && Number.isFinite(value))
         return value;
-    if (Array.isArray(value))
-        return value.map(toJsonValue);
-    if (typeof value !== 'object')
+    if (Array.isArray(value)) {
+        if (visiting.has(value))
+            throw new TypeError('设置值不能包含循环引用');
+        visiting.add(value);
+        try {
+            return value.map((entry) => toJsonValue(entry, visiting));
+        }
+        finally {
+            visiting.delete(value);
+        }
+    }
+    if (typeof value !== 'object' || value === undefined)
         throw new TypeError('设置值必须是可序列化的 JSON');
+    const prototype = Object.getPrototypeOf(value);
+    if (prototype !== Object.prototype && prototype !== null)
+        throw new TypeError('设置值只能包含 JSON 对象、数组和标量');
+    if (visiting.has(value))
+        throw new TypeError('设置值不能包含循环引用');
+    visiting.add(value);
     const result = {};
-    for (const [key, entry] of Object.entries(value))
-        result[key] = toJsonValue(entry);
-    return result;
+    try {
+        for (const [key, entry] of Object.entries(value)) {
+            if (entry === undefined)
+                continue;
+            result[key] = toJsonValue(entry, visiting);
+        }
+        return result;
+    }
+    finally {
+        visiting.delete(value);
+    }
 }
 export function createCodingNsSettingsBridge(local, rpc) {
     return new CodingNsSettingsBridge(local, rpc);

package/data/build/dist/client/subscription-slot.d.ts

@@ -12,9 +12,11 @@ interface SubscriptionSlotProps {
     readonly rpc: CodingNsRpcClient;
     readonly sessionId?: string;
     readonly useSession?: SessionSelector;
+    /** 读取当前自动查询间隔（分钟）；缺省或 0 表示不自动查询。 */
+    readonly getRefreshIntervalMins?: () => number;
 }
 /** 在 DSH 原生步骤统计左侧显示当前 Agent 的订阅余量。 */
-export declare function registerSubscriptionSlot(slots: SlotRegistry, rpc: CodingNsRpcClient): () => void;
+export declare function registerSubscriptionSlot(slots: SlotRegistry, rpc: CodingNsRpcClient, getRefreshIntervalMins?: () => number): () => void;
 declare function CommandCodeSubscriptionSlot(props: SubscriptionSlotProps): ReactElement | null;
 export { CommandCodeSubscriptionSlot };
 export declare const registerCommandCodeSubscriptionSlot: typeof registerSubscriptionSlot;