dsh-github-flow 0.3.0 → 0.5.0

package/lib/api/routes-actions.js

@@ -3,6 +3,8 @@
  * 共同特征：POST 触发、读少写多、无缓存语义，与概览类路由的演进方向不同。
  */
 import { spawn } from 'node:child_process';
+import { hasGitDir } from '../workspace.js';
+import { watchGitMetadata } from '../git-watcher.js';
 import { isSafeExternalUrl, sendJson } from './route-helpers.js';
 /**
  * 构造「在新终端窗口运行命令」的平台命令（execFile 数组形态，不经 shell）。
@@ -226,6 +228,42 @@ export function registerActionRoutes(deps, executor, cacheMap, globalCache) {
                             sendJson(res, 200, { ok: true, message: '已唤起系统终端' });
                             break;
                         }
+                        case 'switch_branch': {
+                            const branch = typeof payload.branch === 'string' ? payload.branch.trim() : '';
+                            if (!branch) {
+                                sendJson(res, 400, { ok: false, error: '缺少目标分支名称' });
+                                return;
+                            }
+                            const r = await executor.switchGitBranch(cwd, branch);
+                            if (!r.ok) {
+                                sendJson(res, 400, { ok: false, error: r.error });
+                                return;
+                            }
+                            cacheMap.clear();
+                            sendJson(res, 200, { ok: true, currentBranch: r.currentBranch, message: `已成功切换到分支 ${r.currentBranch}` });
+                            break;
+                        }
+                        case 'file_diff':
+                        case 'get_file_diff': {
+                            const fileTarget = typeof payload.file === 'string' ? payload.file.trim() : (typeof payload.filePath === 'string' ? payload.filePath.trim() : '');
+                            if (!fileTarget) {
+                                sendJson(res, 400, { ok: false, error: '缺少目标文件路径' });
+                                return;
+                            }
+                            const resolvedCwd = executor.resolveWorkspaceCwd(cwd);
+                            const r = await executor.getFileDiff(resolvedCwd, fileTarget);
+                            sendJson(res, 200, { ok: r.ok, data: r, error: r.error });
+                            break;
+                        }
+                        case 'uncommitted_files':
+                        case 'get_uncommitted_files': {
+                            const limit = Math.min(Math.max(1, Number(payload.limit) || 15), 100);
+                            const skip = Math.max(0, Number(payload.skip) || 0);
+                            const resolvedCwd = executor.resolveWorkspaceCwd(cwd);
+                            const r = await executor.getUncommittedFiles(resolvedCwd, limit, skip);
+                            sendJson(res, 200, { ok: true, data: r });
+                            break;
+                        }
                         default:
                             sendJson(res, 400, { ok: false, message: `未知的操作类型: ${payload.action}` });
                     }
@@ -236,4 +274,215 @@ export function registerActionRoutes(deps, executor, cacheMap, globalCache) {
             });
         },
     });
+    // 3. 读取当前工作区的所有 Git 分支列表（纯本地只读，毫秒级响应）
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/branches',
+        handler: async (req, res) => {
+            if (req.method !== 'GET') {
+                sendJson(res, 405, { ok: false, message: '仅支持 GET 请求' });
+                return;
+            }
+            try {
+                const url = new URL(req.url || '', 'http://127.0.0.1');
+                const cwd = url.searchParams.get('cwd') || undefined;
+                const result = await executor.getGitBranches(cwd);
+                if (!result) {
+                    sendJson(res, 404, { ok: false, error: '当前工作区不是 Git 仓库或无法读取分支' });
+                    return;
+                }
+                sendJson(res, 200, { ok: true, data: result });
+            }
+            catch (err) {
+                sendJson(res, 500, { ok: false, error: err?.message || '读取分支列表失败' });
+            }
+        },
+    });
+    // 4. 切换当前工作区的 Git 分支（带未提交变更防护与合法性校验）
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/branch-switch',
+        handler: async (req, res) => {
+            if (req.method !== 'POST') {
+                sendJson(res, 405, { ok: false, message: '仅支持 POST 请求' });
+                return;
+            }
+            let body = '';
+            req.on('data', (chunk) => { body += chunk; });
+            req.on('end', async () => {
+                try {
+                    const payload = body ? JSON.parse(body) : {};
+                    const cwd = payload.cwd || undefined;
+                    const branch = typeof payload.branch === 'string' ? payload.branch.trim() : '';
+                    if (!branch) {
+                        sendJson(res, 400, { ok: false, error: '缺少目标分支名称' });
+                        return;
+                    }
+                    const r = await executor.switchGitBranch(cwd, branch);
+                    if (!r.ok) {
+                        sendJson(res, 400, { ok: false, error: r.error });
+                        return;
+                    }
+                    // 核心联动：切换分支成功后，当前工作区缓存立即失效，确保后续拉取新分支数据
+                    cacheMap.clear();
+                    sendJson(res, 200, {
+                        ok: true,
+                        currentBranch: r.currentBranch,
+                        message: `已成功切换到分支 ${r.currentBranch}`,
+                    });
+                }
+                catch (err) {
+                    sendJson(res, 500, { ok: false, error: err?.message || '切换分支失败' });
+                }
+            });
+        },
+    });
+    // 5. 本地 Git 元数据定向监听（专供右侧栏开启「本地 Git 改动实时感知」时长轮询）
+    // 严格安全纪律：只针对 .git/index 与 .git/HEAD 实施定向非递归监听，严禁监听源码目录防句柄耗尽；
+    // 800ms 防抖合并；连接断开时自动关闭 watcher 释放系统资源（委托给底层 git-watcher 服务）。
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/git-watch',
+        handler: async (req, res) => {
+            if (req.method !== 'GET') {
+                sendJson(res, 405, { ok: false, message: '仅支持 GET 请求' });
+                return;
+            }
+            const url = new URL(req.url || '', 'http://127.0.0.1');
+            const cwd = url.searchParams.get('cwd');
+            if (!cwd || !hasGitDir(cwd)) {
+                sendJson(res, 400, { ok: false, error: '非 Git 仓库，无需监听' });
+                return;
+            }
+            let responded = false;
+            try {
+                const stop = watchGitMetadata(cwd, (event) => {
+                    if (responded)
+                        return;
+                    responded = true;
+                    sendJson(res, 200, { ok: true, ...event });
+                });
+                req.on('close', () => {
+                    if (!responded) {
+                        responded = true;
+                        stop();
+                    }
+                });
+            }
+            catch (err) {
+                sendJson(res, 500, { ok: false, error: err?.message || '建立监听失败' });
+            }
+        },
+    });
+    // 6. 纯本地 Git 状态毫秒级轻量查询（专供工作区改动时的局部定向刷新）
+    // 严格安全与性能纪律：
+    // 1. 动静解耦：仅执行本地 getLocalGitStatus、getGitCommitLog 与 getGitBranches；
+    // 2. 100% 零网络调用、零远端 GitHub API 请求、零 Token 额度消耗，耗时仅 5~10ms；
+    // 3. 彻底与 PR/Issue/Run 远端数据解耦，切断因修改本地文件误触发远端全量网络风暴与超时报错的恶性循环。
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/local-git-status',
+        handler: async (req, res) => {
+            if (req.method !== 'GET') {
+                sendJson(res, 405, { ok: false, message: '仅支持 GET 请求' });
+                return;
+            }
+            const url = new URL(req.url || '', 'http://127.0.0.1');
+            const cwd = url.searchParams.get('cwd');
+            if (!cwd || !hasGitDir(cwd)) {
+                sendJson(res, 400, { ok: false, error: '非 Git 仓库，无法获取本地 Git 状态' });
+                return;
+            }
+            try {
+                const gitStatus = await executor.getLocalGitStatus(cwd).catch(() => null);
+                const commitLog = await executor
+                    .getGitCommitLog(cwd, gitStatus ? gitStatus.hasUpstream : false)
+                    .catch(() => null);
+                const branches = await executor.getGitBranches(cwd).catch(() => null);
+                // 同步就地更新内存缓存中的本地元数据，保证后续全量请求也能自然拿到最新的本地状态
+                const cached = cacheMap.getFallback(cwd) || cacheMap.get(cwd, Date.now());
+                if (cached) {
+                    if (gitStatus)
+                        cached.gitStatus = gitStatus;
+                    if (commitLog)
+                        cached.commitLog = commitLog;
+                    if (branches)
+                        cached.branches = branches;
+                }
+                sendJson(res, 200, {
+                    ok: true,
+                    data: {
+                        gitStatus,
+                        commitLog,
+                        branches,
+                    },
+                    cwd,
+                });
+            }
+            catch (err) {
+                sendJson(res, 500, { ok: false, error: err?.message || '获取本地 Git 状态失败' });
+            }
+        },
+    });
+    // 7. 单个未提交文件的 Git Diff 差异查询（供右侧栏 FileDiffModal 调用）
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/file-diff',
+        handler: async (req, res) => {
+            if (req.method !== 'GET') {
+                sendJson(res, 405, { ok: false, message: '仅支持 GET 请求' });
+                return;
+            }
+            try {
+                const url = new URL(req.url || '', 'http://127.0.0.1');
+                const cwd = url.searchParams.get('cwd') || undefined;
+                const file = url.searchParams.get('file');
+                if (!file || !file.trim()) {
+                    sendJson(res, 400, { ok: false, error: '缺少必需的 file 参数' });
+                    return;
+                }
+                const resolvedCwd = executor.resolveWorkspaceCwd(cwd);
+                if (!hasGitDir(resolvedCwd)) {
+                    sendJson(res, 400, { ok: false, error: '当前工作区不是 Git 仓库' });
+                    return;
+                }
+                const diffResult = await executor.getFileDiff(resolvedCwd, file.trim());
+                if (!diffResult.ok) {
+                    sendJson(res, 400, { ok: false, error: diffResult.error || '获取文件差异失败' });
+                    return;
+                }
+                sendJson(res, 200, { ok: true, data: diffResult });
+            }
+            catch (err) {
+                sendJson(res, 500, { ok: false, error: err?.message || '获取文件差异失败' });
+            }
+        },
+    });
+    // 8. 本地未提交文件列表轻量流式分页查询（供右侧栏滑动加载调用）
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/uncommitted-files',
+        handler: async (req, res) => {
+            if (req.method !== 'GET') {
+                sendJson(res, 405, { ok: false, message: '仅支持 GET 请求' });
+                return;
+            }
+            try {
+                const url = new URL(req.url || '', 'http://127.0.0.1');
+                const cwd = url.searchParams.get('cwd') || undefined;
+                const limit = Math.min(Math.max(1, Number(url.searchParams.get('limit')) || 15), 100);
+                const skip = Math.max(0, Number(url.searchParams.get('skip')) || 0);
+                const resolvedCwd = executor.resolveWorkspaceCwd(cwd);
+                if (!hasGitDir(resolvedCwd)) {
+                    sendJson(res, 400, { ok: false, error: '当前工作区不是 Git 仓库' });
+                    return;
+                }
+                const result = await executor.getUncommittedFiles(resolvedCwd, limit, skip);
+                sendJson(res, 200, { ok: true, data: result });
+            }
+            catch (err) {
+                sendJson(res, 500, { ok: false, error: err?.message || '获取未提交文件列表失败' });
+            }
+        },
+    });
 }

package/lib/api/routes-overview.js

@@ -17,6 +17,7 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
                 const url = new URL(req.url || '', 'http://127.0.0.1');
                 let cwd = url.searchParams.get('cwd');
                 const sessionId = url.searchParams.get('sessionId');
+                const force = url.searchParams.get('force') === 'true';
                 // 会话 ID → 物理路径，以及「最近活跃工作区」兜底，统一由 workspace 模块提供
                 if (!cwd && sessionId) {
                     cwd = findWorkspacePathBySession(sessionId) || null;
@@ -29,7 +30,7 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
                 }
                 const now = Date.now();
                 const cachedData = cacheMap.get(cwd, now);
-                if (cachedData) {
+                if (cachedData && !force) {
                     sendJson(res, 200, {
                         ok: true,
                         data: { ...cachedData, updateInfo: checker.getQuickStatus() },
@@ -39,7 +40,25 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
                     return;
                 }
                 const auth = await executor.checkAuth(cwd);
-                const repo = await executor.getRepoMetadata(cwd);
+                // 先行检查当前工作区是否真实包含 .git，无 .git 铁证判定为未关联仓库
+                const isGitRepo = hasGitDir(cwd);
+                const repo = isGitRepo ? await executor.getRepoMetadata(cwd) : null;
+                // 若当前工作区未关联 Git 仓库，直接返回纯净空状态，坚决不拉取远端数据
+                if (!isGitRepo || !repo) {
+                    const emptyData = {
+                        auth,
+                        repo: undefined,
+                        pullRequests: [],
+                        issues: [],
+                        issueStats: { total: 0, reported: 0, assigned: 0, created: 0 },
+                        runs: [],
+                        lastUpdated: new Date().toISOString(),
+                        updateInfo: checker.getQuickStatus(),
+                    };
+                    cacheMap.set(cwd, emptyData, now);
+                    sendJson(res, 200, { ok: true, data: emptyData, fromCache: false, cwd });
+                    return;
+                }
                 let pullRequests = [];
                 let issues = [];
                 let runs = [];
@@ -53,6 +72,52 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
                         executor.run(['issue', 'list', '--json', 'number,title,state,author,labels,assignees,url,updatedAt', '-L', '10'], { cwd, timeoutMs: 8_000 }),
                         executor.run(['run', 'list', '--json', 'databaseId,name,status,conclusion,event,headBranch,url,createdAt', '-L', '5'], { cwd, timeoutMs: 8_000 }),
                     ]);
+                    // 核心数据拉取故障检测：若拉取核心业务数据遭遇失败（网络超时/断网/接口报错），
+                    // 绝对不能把失败伪装成「0 个 PR、0 个 Issue」并假装成功返回！
+                    const failures = [];
+                    if (!prsRes.ok)
+                        failures.push(`PR 获取失败: ${prsRes.error || '网络或接口异常'}`);
+                    if (!issuesRes.ok)
+                        failures.push(`Issue 获取失败: ${issuesRes.error || '网络或接口异常'}`);
+                    if (!runsRes.ok)
+                        failures.push(`Actions 获取失败: ${runsRes.error || '网络或接口异常'}`);
+                    if (failures.length > 0) {
+                        const failureReason = failures.join('；');
+                        // 若此前内存有缓存，保全已有缓存内容，附加 networkError 与 partialFailure
+                        const fallbackCached = cacheMap.getFallback(cwd) || cacheMap.get(cwd, now);
+                        if (fallbackCached && (fallbackCached.pullRequests.length > 0 || fallbackCached.issues.length > 0 || fallbackCached.runs.length > 0)) {
+                            sendJson(res, 200, {
+                                ok: true,
+                                fromCache: true,
+                                partialFailure: true,
+                                error: failureReason,
+                                data: {
+                                    ...fallbackCached,
+                                    networkError: true,
+                                    networkErrorReason: failureReason,
+                                    auth: { ...fallbackCached.auth, networkError: true, networkErrorReason: failureReason },
+                                },
+                                cwd,
+                            });
+                            return;
+                        }
+                        else {
+                            const freshData = {
+                                auth: { ...auth, networkError: true, networkErrorReason: failureReason },
+                                repo: repo || undefined,
+                                pullRequests: [],
+                                issues: [],
+                                issueStats: { total: 0, reported: 0, assigned: 0, created: 0 },
+                                runs: [],
+                                networkError: true,
+                                networkErrorReason: failureReason,
+                                lastUpdated: new Date().toISOString(),
+                                updateInfo: checker.getQuickStatus(),
+                            };
+                            sendJson(res, 200, { ok: true, partialFailure: true, error: failureReason, data: freshData, cwd });
+                            return;
+                        }
+                    }
                     if (prsRes.ok && Array.isArray(prsRes.data))
                         pullRequests = prsRes.data;
                     if (issuesRes.ok && Array.isArray(issuesRes.data)) {
@@ -96,6 +161,8 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
                     freshExtras.commitLog = await executor
                         .getGitCommitLog(cwd, gitStatus ? gitStatus.hasUpstream : false)
                         .catch(() => null);
+                    // 5. 分支列表（纯本地毫秒级）：供右侧栏分支选择器 0ms 秒开，消除独立请求延迟与 404 风险
+                    freshExtras.branches = await executor.getGitBranches(cwd).catch(() => null);
                 }
                 const issueStats = calculateIssueStats(issues);
                 const freshData = {
@@ -166,6 +233,31 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
                     const ownerIssuesRes = queryResults[2].status === 'fulfilled' ? queryResults[2].value : { ok: false };
                     const assignedIssuesRes = queryResults[3].status === 'fulfilled' ? queryResults[3].value : { ok: false };
                     const authorIssuesRes = queryResults[4].status === 'fulfilled' ? queryResults[4].value : { ok: false };
+                    // 检测全局拉取是否发生网络故障，绝不把网络失败当作「0 仓库、0 PR」伪造成功
+                    const globalFailures = [];
+                    if (!reposRes.ok)
+                        globalFailures.push(`仓库列表拉取失败: ${reposRes.error || '网络或接口异常'}`);
+                    if (!prsRes.ok)
+                        globalFailures.push(`个人 PR 拉取失败: ${prsRes.error || '网络或接口异常'}`);
+                    if (globalFailures.length > 0) {
+                        const globalNetReason = globalFailures.join('；');
+                        const fallbackGlobal = globalCache.getFallback('global') || globalCache.get('global', now);
+                        if (fallbackGlobal) {
+                            sendJson(res, 200, {
+                                ok: true,
+                                fromCache: true,
+                                partialFailure: true,
+                                error: globalNetReason,
+                                data: {
+                                    ...fallbackGlobal,
+                                    networkError: true,
+                                    networkErrorReason: globalNetReason,
+                                    auth: { ...fallbackGlobal.auth, networkError: true, networkErrorReason: globalNetReason },
+                                },
+                            });
+                            return;
+                        }
+                    }
                     if (reposRes.ok && Array.isArray(reposRes.data)) {
                         userRepos = reposRes.data.map((r) => ({
                             name: r.name || '',

package/lib/cache.d.ts

@@ -8,6 +8,8 @@ export declare class TtlCache<T> {
     private ttlMs;
     private maxEntries;
     private store;
+    /** 容灾备份底座：记录最后一次成功的有效快照，不受 TTL 过期或主动 refresh 清空的影响 */
+    private fallbackStore;
     /**
      * @param ttlMs 命中有效期；由面向用户的 cacheTtlMs 配置驱动
      * @param maxEntries 容量上限。键通常是工作区路径，一次会话就可能引入若干键，
@@ -16,6 +18,8 @@ export declare class TtlCache<T> {
     constructor(ttlMs: number, maxEntries?: number);
     get(key: string, now: number): T | undefined;
     set(key: string, data: T, now: number): void;
+    /** 获取最后一次有效成功的容灾底座数据（专供网络故障、超时时的 Fail-Safe 保全） */
+    getFallback(key: string): T | undefined;
     get size(): number;
     clear(): void;
 }

package/lib/cache.js

@@ -8,6 +8,8 @@ export class TtlCache {
     ttlMs;
     maxEntries;
     store = new Map();
+    /** 容灾备份底座：记录最后一次成功的有效快照，不受 TTL 过期或主动 refresh 清空的影响 */
+    fallbackStore = new Map();
     /**
      * @param ttlMs 命中有效期；由面向用户的 cacheTtlMs 配置驱动
      * @param maxEntries 容量上限。键通常是工作区路径，一次会话就可能引入若干键，
@@ -32,17 +34,29 @@ export class TtlCache {
     }
     set(key, data, now) {
         this.store.set(key, { data, time: now });
+        this.fallbackStore.set(key, data);
         while (this.store.size > this.maxEntries) {
             const oldest = this.store.keys().next();
             if (oldest.done)
                 break;
             this.store.delete(oldest.value);
         }
+        while (this.fallbackStore.size > this.maxEntries) {
+            const oldest = this.fallbackStore.keys().next();
+            if (oldest.done)
+                break;
+            this.fallbackStore.delete(oldest.value);
+        }
+    }
+    /** 获取最后一次有效成功的容灾底座数据（专供网络故障、超时时的 Fail-Safe 保全） */
+    getFallback(key) {
+        return this.fallbackStore.get(key);
     }
     get size() {
         return this.store.size;
     }
     clear() {
+        // 清空活动缓存以迫使后续请求重新发起网络拉取，但保留 fallbackStore 用于网络故障容灾
         this.store.clear();
     }
 }

package/lib/client.d.ts

@@ -8,4 +8,17 @@ declare global {
         };
     }
 }
-export {};
+import { formatRelativeTime, rollupCiStatus, reviewDecisionBadge, eventLabel, parseGitStatText } from './ui/utils.js';
+import { GITHUB_PANEL_CSS, injectStyles } from './ui/styles.js';
+import { renderOctocat, renderGitIcon, renderOctocatBadge, renderPluginBadge } from './ui/icons.js';
+import { getLocalSyncSettings, saveLocalSyncSettings, getStoredGlobalOverview, saveStoredGlobalOverview, clearStoredGlobalOverview, getCacheStorageMeta, getRightbarStorageKey, getStoredRightbarSnapshot, saveStoredRightbarData, getStoredHeaderCardsVisible, saveStoredHeaderCardsVisible, HEADER_CARDS_STORAGE_KEY } from './ui/storage.js';
+import { BranchSelectorDropdown } from './ui/branch-selector.js';
+import { AuthGuideCard } from './ui/auth-guide-card.js';
+import { UpgradeNotificationCard } from './ui/upgrade-card.js';
+import { NetworkAlertBanner } from './ui/network-banner.js';
+import { SyncStatusBadge } from './ui/sync-status-badge.js';
+import { CommitDetailModal } from './ui/commit-modal.js';
+import { GlobalSyncSettingsModal } from './ui/sync-settings-modal.js';
+import { GithubHelpModal } from './ui/help-modal.js';
+import { GithubWorkspacePanel } from './ui/workspace-panel.js';
+export { formatRelativeTime, rollupCiStatus, reviewDecisionBadge, eventLabel, parseGitStatText, GITHUB_PANEL_CSS, injectStyles, renderOctocat, renderGitIcon, renderOctocatBadge, renderPluginBadge, getLocalSyncSettings, saveLocalSyncSettings, getStoredGlobalOverview, saveStoredGlobalOverview, clearStoredGlobalOverview, getCacheStorageMeta, getRightbarStorageKey, getStoredRightbarSnapshot, saveStoredRightbarData, getStoredHeaderCardsVisible, saveStoredHeaderCardsVisible, HEADER_CARDS_STORAGE_KEY, BranchSelectorDropdown, AuthGuideCard, UpgradeNotificationCard, NetworkAlertBanner, SyncStatusBadge, CommitDetailModal, GlobalSyncSettingsModal, GithubHelpModal, GithubWorkspacePanel, };