@jingyi0605/codingns4dsh 0.2.1-beta.6 → 0.2.1-beta.7

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

@@ -8,8 +8,9 @@ import { dshSettingsToastStyle, dshThemeColor } from './theme.js';
 import { gitPanelClass, installGitPanelStyles } from './git-panel-styles.js';
 import { resolveCodingNsTranslator } from './locale.js';
 import { notifyGitWorkspaceChanged } from './git-workspace-events.js';
-import { readNativeWorkspaceListStore, readNativeWorkspaceSnapshot } from './native-workspace-store.js';
+import { readNativeService, readNativeWorkspaceListStore, readNativeWorkspaceSnapshot } from './native-workspace-store.js';
 import { parseVirtualSessionId, parseVirtualWorkspaceId } from '../shared/contracts/peer-host.js';
+import { uiFontSize } from './font-scale.js';
 // 单列 Git 视图需要一个稳定的分段控件；这里保持 React 结构简单，避免引入额外依赖。
 function SegmentedControl({ id, value, options, onChange, label, disabled }) {
     const index = Math.max(0, options.findIndex((option) => option.value === value));
@@ -646,10 +647,17 @@ function GitWorkspaceRecovery({ useSessions, remote, uiContext, sidebarRight })
         let disposed = false;
         const recover = async () => {
             const workspaceItems = await readWorkspaceItems(remote?.workspace, uiContext);
+            if (disposed)
+                return;
             const allSessionIds = [...new Set([...sessionIds, ...workspaceItems.flatMap((item) => item.sessionIds)])];
             for (const sessionId of allSessionIds) {
+                // Store 增量会启动下一轮恢复；旧任务必须停止，不能继续为剩余会话发请求。
+                if (disposed)
+                    return;
                 const workspaceId = await resolveGitWorkspaceId(remote, sessionId, uiContext).catch(() => undefined);
-                if (disposed || workspaceId === undefined)
+                if (disposed)
+                    return;
+                if (workspaceId === undefined)
                     continue;
                 rememberGitWorkspaceSession(sessionId, workspaceId);
                 const existing = readGitTabs(sidebarRight, sessionId, openTabSnapshot);
@@ -788,7 +796,7 @@ export async function resolveGitWorkspaceId(remote, sessionId, uiContext) {
     if (parseVirtualSessionId(sessionId) !== null)
         return undefined;
     const localWorkspaces = workspaces.filter((item) => parseVirtualWorkspaceId(item.workspaceId) === null);
-    const session = await readCurrentSession(api?.session, sessionId);
+    const session = await readCurrentSession(api?.session, sessionId, uiContext);
     if (session?.workspaceId !== undefined)
         return session.workspaceId;
     const sessionCwd = session?.cwd;
@@ -830,18 +838,53 @@ async function readWorkspaceItems(api, uiContext) {
         return [{ workspaceId, sessionIds, ...(path === undefined ? {} : { path }) }];
     });
 }
-async function readCurrentSession(api, sessionId) {
+async function readCurrentSession(api, sessionId, uiContext) {
+    const store = asRecord(readNativeService(uiContext, 'sessions', 'list'));
+    if (typeof store?.getSnapshot === 'function') {
+        // 原生列表已经执行首次 session/list，并持续消费 Remote 增量。未知 ID 也由
+        // 这份快照决定；不能为了一个未挂工作区的子会话再次读取整个 Host 的列表。
+        const snapshot = asRecord(store.getSnapshot());
+        const byId = asRecord(snapshot?.byId);
+        if (byId !== undefined)
+            return sessionItem(asRecord(byId[sessionId]));
+        const items = Array.isArray(snapshot?.items) ? snapshot.items : [];
+        return sessionItem(asRecord(items.find((item) => asRecord(item)?.sessionId === sessionId)));
+    }
     if (api?.list === undefined)
         return undefined;
-    const result = asRecord(unwrapRemoteValue(await api.list({})));
+    // 旧宿主没有原生 Store 时才拉取基线；同一恢复批次的所有会话共享一次请求，
+    // 短时间重复恢复也复用快照，避免按会话数量放大完整列表读取。
+    const result = await readLegacySessionList(api);
     const items = Array.isArray(result?.items) ? result.items : [];
-    const session = asRecord(items.find((item) => asRecord(item)?.sessionId === sessionId));
+    return sessionItem(asRecord(items.find((item) => asRecord(item)?.sessionId === sessionId)));
+}
+function sessionItem(session) {
     if (session === undefined)
         return undefined;
     const workspaceId = typeof session.workspaceId === 'string' && session.workspaceId.trim() !== '' ? session.workspaceId : undefined;
     const cwd = typeof session.cwd === 'string' && session.cwd.trim() !== '' ? session.cwd : undefined;
     return workspaceId === undefined && cwd === undefined ? {} : { ...(workspaceId === undefined ? {} : { workspaceId }), ...(cwd === undefined ? {} : { cwd }) };
 }
+const legacySessionLists = new WeakMap();
+async function readLegacySessionList(api) {
+    const previous = legacySessionLists.get(api);
+    if (previous !== undefined && Date.now() < previous.expiresAt)
+        return previous.promise;
+    const promise = Promise.resolve().then(() => api.list({})).then((value) => asRecord(unwrapRemoteValue(value)));
+    // 在途请求不受缓存时间限制，慢响应也不会被下一批恢复任务重复发起。
+    const entry = { promise, expiresAt: Infinity };
+    legacySessionLists.set(api, entry);
+    try {
+        const result = await promise;
+        entry.expiresAt = Date.now() + 5_000;
+        return result;
+    }
+    catch (error) {
+        if (legacySessionLists.get(api)?.promise === promise)
+            legacySessionLists.delete(api);
+        throw error;
+    }
+}
 function isPathWithin(candidate, parent) {
     const normalizedCandidate = normalizePath(candidate);
     const normalizedParent = normalizePath(parent);
@@ -972,26 +1015,26 @@ function graphRailStyle(lane, stroke, dashed = false) {
 // 面板根节点不再铺底色：DSH 右侧栏的其它面板都是透明的，继承 Sidebar 表面色才不会出现色块接缝。
 const panelStyle = { position: 'relative', userSelect: 'none', boxSizing: 'border-box', display: 'flex', flexDirection: 'column', gap: 12, minHeight: '100%', padding: '12px 14px 20px', overflow: 'auto', color: dshThemeColor.labelPrimary };
 const headerStyle = { display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 12, minHeight: 28 };
-const tabTitleStyle = { display: 'inline-flex', alignItems: 'center', minWidth: 0, color: dshThemeColor.labelPrimary, fontSize: 12 };
+const tabTitleStyle = { display: 'inline-flex', alignItems: 'center', minWidth: 0, color: dshThemeColor.labelPrimary, fontSize: uiFontSize(12) };
 const headerActionsStyle = { display: 'inline-flex', alignItems: 'center', gap: 4 };
 // SegmentedControl 自带 indicator 与键盘走查；外层占满面板宽度后再将控件居中。
 const columnSwitchStyle = { display: 'flex', alignItems: 'center', justifyContent: 'center', width: '100%', minWidth: 0 };
-const summaryStyle = { color: dshThemeColor.labelSecondary, fontSize: 12 };
+const summaryStyle = { color: dshThemeColor.labelSecondary, fontSize: uiFontSize(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 };
 // 卡片用 layer-1：与 DSH 内置卡片同层，暗色下只比侧栏表面亮一档。
 const sectionStyle = { display: 'flex', flexDirection: 'column', gap: 8, padding: 10, border: `.5px solid ${dshThemeColor.menuBorder}`, borderRadius: 8, background: dshThemeColor.cardBackground };
-const sectionHeaderStyle = { display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 8, minHeight: 24, fontSize: 12 };
+const sectionHeaderStyle = { display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 8, minHeight: 24, fontSize: uiFontSize(12) };
 const treeStyle = { display: 'flex', flexDirection: 'column', gap: 1 };
 const treeDirectoryStyle = { minWidth: 0 };
-const treeRowStyle = { display: 'flex', alignItems: 'center', gap: 7, minHeight: 28, paddingLeft: 4, paddingRight: 2, borderRadius: 4, fontSize: 12 };
-const treeChevronStyle = { width: 12, color: dshThemeColor.labelTertiary, fontSize: 12 };
-const folderIconStyle = { color: dshThemeColor.accent, fontSize: 11 };
-const fileIconStyle = { width: 12, color: dshThemeColor.labelTertiary, fontSize: 12, textAlign: 'center' };
+const treeRowStyle = { display: 'flex', alignItems: 'center', gap: 7, minHeight: 28, paddingLeft: 4, paddingRight: 2, borderRadius: 4, fontSize: uiFontSize(12) };
+const treeChevronStyle = { width: 12, color: dshThemeColor.labelTertiary, fontSize: uiFontSize(12) };
+const folderIconStyle = { color: dshThemeColor.accent, fontSize: uiFontSize(11) };
+const fileIconStyle = { width: 12, color: dshThemeColor.labelTertiary, fontSize: uiFontSize(12), textAlign: 'center' };
 const fileNameStyle = { minWidth: 0, flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' };
-const fileStatusStyle = { color: dshThemeColor.labelTertiary, fontFamily: dshThemeColor.codeFont, fontSize: 11 };
+const fileStatusStyle = { color: dshThemeColor.labelTertiary, fontFamily: dshThemeColor.codeFont, fontSize: uiFontSize(11) };
 const historyListStyle = { display: 'flex', flexDirection: 'column', gap: 0, minWidth: 0 };
-const historyRowStyle = { display: 'flex', alignItems: 'stretch', minWidth: 0, fontSize: 12 };
+const historyRowStyle = { display: 'flex', alignItems: 'stretch', minWidth: 0, fontSize: uiFontSize(12) };
 const historyRowBodyStyle = { display: 'flex', flexDirection: 'column', gap: 3, minWidth: 0, flex: '1 1 auto' };
 const historyRowMainStyle = { display: 'flex', alignItems: 'center', gap: 8, minWidth: 0, minHeight: 28, paddingLeft: 4, paddingRight: 2, borderRadius: 4 };
 const graphGutterStyle = { display: 'flex', flexDirection: 'column', flex: '0 0 auto', alignSelf: 'stretch', marginRight: 6 };
@@ -1000,49 +1043,49 @@ const graphRailsStyle = { position: 'relative', flex: '0 0 auto', alignSelf: 'st
 const historyHeaderActionsStyle = { display: 'inline-flex', alignItems: 'center', gap: 6, flexWrap: 'wrap', justifyContent: 'flex-end' };
 const historyRefListStyle = { display: 'flex', flexWrap: 'wrap', gap: '4px 6px', paddingLeft: 2 };
 // 尺寸对齐 DSH Pill：20px 高、11px 字号；颜色仍按来源区分，颜色是唯一的语义载体。
-const historyRefPillBaseStyle = { justifyContent: 'center', height: 20, padding: '0 8px', fontSize: 11, lineHeight: '17px' };
-const historyDateHeaderStyle = { display: 'flex', alignItems: 'stretch', color: dshThemeColor.labelSecondary, fontSize: 11, fontWeight: 600 };
+const historyRefPillBaseStyle = { justifyContent: 'center', height: 20, padding: '0 8px', fontSize: uiFontSize(11), lineHeight: '17px' };
+const historyDateHeaderStyle = { display: 'flex', alignItems: 'stretch', color: dshThemeColor.labelSecondary, fontSize: uiFontSize(11), fontWeight: 600 };
 const historyDateHeaderTextStyle = { display: 'block', minWidth: 0, paddingTop: 8 };
-const hashStyle = { color: dshThemeColor.labelTertiary, fontFamily: dshThemeColor.codeFont, fontSize: 11 };
+const hashStyle = { color: dshThemeColor.labelTertiary, fontFamily: dshThemeColor.codeFont, fontSize: uiFontSize(11) };
 const rowActionsStyle = { display: 'inline-flex', alignItems: 'center', gap: 2, flex: '0 0 auto' };
-const mutedStyle = { color: dshThemeColor.labelTertiary, fontSize: 11 };
+const mutedStyle = { color: dshThemeColor.labelTertiary, fontSize: uiFontSize(11) };
 const historyTimeStyle = { ...mutedStyle, flex: '0 0 auto', fontVariantNumeric: 'tabular-nums' };
-const emptyStyle = { padding: 16, color: dshThemeColor.labelSecondary, fontSize: 12 };
+const emptyStyle = { padding: 16, color: dshThemeColor.labelSecondary, fontSize: uiFontSize(12) };
 const diffOverlayStyle = { position: 'fixed', inset: 0, zIndex: 1000, display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 20, boxSizing: 'border-box', background: dshThemeColor.overlay };
 const diffStyle = { ...sectionStyle, width: 'min(1000px, 100%)', maxHeight: 'min(88vh, 760px)', overflow: 'hidden', background: dshThemeColor.menuBackground, boxShadow: dshThemeColor.prominentShadow };
 const diffBodyStyle = { display: 'flex', flexDirection: 'column', gap: 12, minHeight: 0, overflow: 'auto', paddingRight: 2 };
 const diffFilesSectionStyle = { ...sectionStyle, gap: 6, padding: 10, background: dshThemeColor.pageBackground };
 const diffDiffSectionStyle = { ...sectionStyle, gap: 6, padding: 10, background: dshThemeColor.pageBackground };
-const diffSectionHeaderStyle = { display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 8, minHeight: 24, fontSize: 12 };
-const diffCountStyle = { minWidth: 20, padding: '2px 6px', borderRadius: 999, color: dshThemeColor.labelSecondary, background: dshThemeColor.surfaceSubtle, fontSize: 11, textAlign: 'center' };
+const diffSectionHeaderStyle = { display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 8, minHeight: 24, fontSize: uiFontSize(12) };
+const diffCountStyle = { minWidth: 20, padding: '2px 6px', borderRadius: 999, color: dshThemeColor.labelSecondary, background: dshThemeColor.surfaceSubtle, fontSize: uiFontSize(11), textAlign: 'center' };
 const diffFileListStyle = { display: 'flex', flexDirection: 'column', gap: 2 };
-const diffFileRowStyle = { display: 'flex', alignItems: 'center', gap: 8, minHeight: 30, padding: '4px 6px', borderRadius: 4, background: dshThemeColor.surfaceSubtle, fontSize: 12 };
-const diffFileStatusStyle = { display: 'inline-flex', alignItems: 'center', justifyContent: 'center', width: 42, flex: '0 0 auto', color: dshThemeColor.accent, fontSize: 11, fontWeight: 700 };
+const diffFileRowStyle = { display: 'flex', alignItems: 'center', gap: 8, minHeight: 30, padding: '4px 6px', borderRadius: 4, background: dshThemeColor.surfaceSubtle, fontSize: uiFontSize(12) };
+const diffFileStatusStyle = { display: 'inline-flex', alignItems: 'center', justifyContent: 'center', width: 42, flex: '0 0 auto', color: dshThemeColor.accent, fontSize: uiFontSize(11), fontWeight: 700 };
 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: `.5px solid ${dshThemeColor.menuBorder}`, borderRadius: 8, background: dshThemeColor.pageBackground, fontFamily: dshThemeColor.codeFont, fontSize: 12 };
+const diffFileOldPathStyle = { overflow: 'hidden', color: dshThemeColor.labelTertiary, textOverflow: 'ellipsis', whiteSpace: 'nowrap', fontSize: uiFontSize(11) };
+const diffBinaryStyle = { color: dshThemeColor.labelTertiary, fontSize: uiFontSize(11) };
+const fileDiffTitleStyle = { ...fileNameStyle, fontSize: uiFontSize(12) };
+const diffTruncatedStyle = { color: dshThemeColor.labelTertiary, fontSize: uiFontSize(11) };
+const diffEmptyStyle = { padding: 10, color: dshThemeColor.labelTertiary, fontSize: uiFontSize(12) };
+const diffLinesStyle = { overflow: 'auto', border: `.5px solid ${dshThemeColor.menuBorder}`, borderRadius: 8, background: dshThemeColor.pageBackground, fontFamily: dshThemeColor.codeFont, fontSize: uiFontSize(12) };
 const diffLineBaseStyle = { display: 'grid', gridTemplateColumns: '42px 42px minmax(0, 1fr)', minHeight: 21, alignItems: 'stretch', padding: '0 8px', whiteSpace: 'pre', overflowWrap: 'normal', lineHeight: 1.5 };
 const diffLineNumberStyle = { paddingRight: 8, color: dshThemeColor.labelTertiary, borderRight: `.5px solid ${dshThemeColor.menuBorder}`, textAlign: 'right', userSelect: 'none' };
 const diffCodeStyle = { minWidth: 0, paddingLeft: 10, color: 'inherit', font: 'inherit', overflow: 'visible' };
 const commitSectionStyle = { ...sectionStyle, gap: 10 };
 /** 提交框与「生成提交信息」按钮同高，输入面沿用面板的表单风格（边框 + 输入底色 + 8px 圆角）。 */
 const commitEditorRowStyle = { display: 'flex', alignItems: 'stretch', gap: 8, minWidth: 0 };
-const commitSubjectStyle = { width: '100%', minHeight: 34, boxSizing: 'border-box', resize: 'none', padding: '7px 10px', borderRadius: 8, font: 'inherit', fontSize: 12, lineHeight: '16px' };
-const draftButtonStyle = { width: 34, flex: '0 0 auto', padding: 0, borderRadius: 8, fontSize: 16, lineHeight: 1 };
+const commitSubjectStyle = { width: '100%', minHeight: 34, boxSizing: 'border-box', resize: 'none', padding: '7px 10px', borderRadius: 8, font: 'inherit', fontSize: uiFontSize(12), lineHeight: '16px' };
+const draftButtonStyle = { width: 34, flex: '0 0 auto', padding: 0, borderRadius: 8, fontSize: uiFontSize(16), lineHeight: 1 };
 const commitActionsStyle = { display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 8 };
-const refreshActionStyle = { minHeight: 32, padding: '6px 12px', borderRadius: 8, fontSize: 12, lineHeight: '16px' };
+const refreshActionStyle = { minHeight: 32, padding: '6px 12px', borderRadius: 8, fontSize: uiFontSize(12), lineHeight: '16px' };
 // 主按钮沿用 DSH 品牌填充与前景色，暗色下自动变成浅底深字，与内置主按钮一致。
 const submitActionStyle = { ...refreshActionStyle };
-const primaryButtonStyle = { minHeight: 30, padding: '5px 12px', borderRadius: 8, fontSize: 12 };
-const branchSelectStyle = { maxWidth: 150, borderRadius: 8, padding: '3px 5px', fontSize: 11 };
+const primaryButtonStyle = { minHeight: 30, padding: '5px 12px', borderRadius: 8, fontSize: uiFontSize(12) };
+const branchSelectStyle = { maxWidth: 150, borderRadius: 8, padding: '3px 5px', fontSize: uiFontSize(11) };
 const scopeSelectStyle = { ...branchSelectStyle, maxWidth: 92 };
-const loadMoreButtonStyle = { minHeight: 30, borderRadius: 8, padding: '4px 9px', fontSize: 12 };
+const loadMoreButtonStyle = { minHeight: 30, borderRadius: 8, padding: '4px 9px', fontSize: uiFontSize(12) };
 const menuStyle = { position: 'relative', flex: '0 0 auto' };
-const operationStatusStyle = { display: 'inline-flex', alignItems: 'center', gap: 5, color: dshThemeColor.labelSecondary, fontSize: 11, whiteSpace: 'nowrap' };
+const operationStatusStyle = { display: 'inline-flex', alignItems: 'center', gap: 5, color: dshThemeColor.labelSecondary, fontSize: uiFontSize(11), whiteSpace: 'nowrap' };
 const menuPopupStyle = { position: 'absolute', right: 0, zIndex: 2, display: 'flex', flexDirection: 'column', gap: 2, minWidth: 120, padding: 4 };
 const iconActionStyle = { width: 28, height: 28 };
 const menuItemStyle = { padding: '6px 8px' };