dsh-github-flow 0.2.1 → 0.4.0

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,10 +40,31 @@ 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 = [];
+                // 面板增强信息载体（git 状态/Release 锚定/分支 PR——全部可选字段，
+                // 进缓存与快照时旧消费方零破坏，渲染层 ?. 兜底）
+                const freshExtras = {};
                 if (repo && auth.loggedIn) {
                     // 并发拉取当前文件夹仓库的 PRs、Issues 和 Runs
                     const [prsRes, issuesRes, runsRes] = await Promise.all([
@@ -50,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)) {
@@ -65,6 +133,36 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
                     }
                     if (runsRes.ok && Array.isArray(runsRes.data))
                         runs = runsRes.data;
+                    // 面板信息增强（三路并行，全部失败静默——可选装饰信息不阻塞主流程）：
+                    // 1. git 本地状态：纯本地毫秒级（remote-tracking 快照），零网络
+                    // 2. Release 锚定：gh release view，无 Release 仓库是常态非错误
+                    // 3. 当前分支↔PR 关联：pr status -c，无 PR 分支同样静默
+                    const [gitStatus, releaseInfo, branchPr] = await Promise.all([
+                        executor.getLocalGitStatus(cwd).catch(() => null),
+                        executor.run(['release', 'view', '--json', 'tagName,isPrerelease,isDraft,publishedAt,url', '-R', repo.nameWithOwner], { cwd, timeoutMs: 8_000 }).then((r) => (r.ok && r.data && !r.data.isDraft ? r.data : null)).catch(() => null),
+                        executor.run(['pr', 'status', '-c', '--json', 'number,title,state,url,isDraft', '-R', repo.nameWithOwner], { cwd, timeoutMs: 8_000 }).then((r) => {
+                            // 实测键集：{ createdBy: [...], needsReview: [...] }——「当前分支
+                            // 关联 PR」按优先级取 createdBy（自己发起）→ needsReview（待审）。
+                            // 不传 rawText：executor 对含 --json 的命令自动解析出 data——
+                            // rawText 模式 data 恒 undefined 会让本功能静默失效（审查抓到的真实 Bug）
+                            if (!r.ok || !r.data)
+                                return null;
+                            const createdBy = Array.isArray(r.data?.createdBy) ? r.data.createdBy : [];
+                            const needsReview = Array.isArray(r.data?.needsReview) ? r.data.needsReview : [];
+                            return createdBy[0] || needsReview[0] || null;
+                        }).catch(() => null),
+                    ]);
+                    freshExtras.gitStatus = gitStatus;
+                    freshExtras.releaseInfo = releaseInfo;
+                    freshExtras.branchPr = branchPr;
+                    // 4. git 提交记录三段（领先/落后/最近）：依赖 gitStatus.hasUpstream 守卫，
+                    // 在并行波次之后串行补（本地毫秒级，无感知延迟）——放进第一波会因
+                    // Promise.all 参数在调用时求值而引用未解构的 gitStatus（恒 undefined）
+                    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 = {
@@ -76,6 +174,7 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
                     runs,
                     lastUpdated: new Date().toISOString(),
                     updateInfo: checker.getQuickStatus(),
+                    ...freshExtras,
                 };
                 cacheMap.set(cwd, freshData, now);
                 sendJson(res, 200, { ok: true, data: freshData, fromCache: false, cwd });
@@ -124,7 +223,7 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
                     const issueFields = 'number,title,repository,author,assignees,labels,url,updatedAt';
                     const queryResults = await Promise.allSettled([
                         executor.run(['repo', 'list', '--limit', '20', '--json', 'name,nameWithOwner,description,defaultBranchRef,isPrivate,stargazerCount,updatedAt,url'], { timeoutMs: 8_000 }),
-                        executor.run(['search', 'prs', '--author=@me', '--state=open', '--limit', '10', '--json', 'number,title,repository,url,updatedAt'], { timeoutMs: 8_000 }),
+                        executor.run(['search', 'prs', '--author=@me', '--state=open', '--limit', '10', '--json', 'number,title,repository,url,updatedAt,isDraft'], { timeoutMs: 8_000 }),
                         executor.run(['search', 'issues', '--owner=@me', '--state=open', '--sort=updated', '--limit', '15', '--json', issueFields], { timeoutMs: 8_000 }),
                         executor.run(['search', 'issues', '--assignee=@me', '--state=open', '--sort=updated', '--limit', '15', '--json', issueFields], { timeoutMs: 8_000 }),
                         executor.run(['search', 'issues', '--author=@me', '--state=open', '--sort=updated', '--limit', '15', '--json', issueFields], { timeoutMs: 8_000 }),
@@ -134,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 || '',
@@ -195,6 +319,9 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
                     // 每次网络往返都要秒级，5 个工作区就足以把该端点拖到 20 秒。
                     workspaceMatrix = await mapLimit(wsEntries, WORKSPACE_PROBE_CONCURRENCY, async (ws) => {
                         const hasGit = hasGitDir(ws.path);
+                        // git 状态与身份识别同为纯本地探测（remote-tracking 快照零网络），
+                        // 挂进同一 mapLimit 有界并发——不新增并发维度，不碰性能红线
+                        const gitStatus = hasGit ? await executor.getLocalGitStatus(ws.path).catch(() => null) : null;
                         return {
                             id: ws.id,
                             title: ws.title || basenameSafe(ws.path),
@@ -202,6 +329,7 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
                             hasGit,
                             repo: hasGit ? executor.getRepoIdentityFromLocal(ws.path) || undefined : undefined,
                             sessionCount: ws.sessionIds.length,
+                            ...(gitStatus ? { gitStatus } : {}),
                         };
                     });
                 }
@@ -224,4 +352,71 @@ export function registerOverviewRoutes(deps, executor, cacheMap, globalCache, ch
             }
         },
     });
+    // 3. 单条提交详情（Git 记录页点击行的惰性查询——弹窗打开时才发起，
+    //    不进 overview 缓存：低频单查 + git show 本地毫秒级，无缓存必要）
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/commit-detail',
+        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');
+                let cwd = url.searchParams.get('cwd') || undefined;
+                const sessionId = url.searchParams.get('sessionId');
+                if (!cwd && sessionId) {
+                    cwd = findWorkspacePathBySession(sessionId) || undefined;
+                }
+                if (!cwd) {
+                    cwd = findMostRecentWorkspacePath() || undefined;
+                }
+                const sha = url.searchParams.get('sha') || '';
+                // sha 形态校验双保险（executor 内还有一道）：路由层先拦明显恶意值
+                if (!/^[0-9a-f]{4,40}$/i.test(sha)) {
+                    sendJson(res, 400, { ok: false, error: '非法 sha（仅接受 4-40 位十六进制）' });
+                    return;
+                }
+                const detail = await executor.getGitCommitDetail(cwd, sha);
+                if (detail === null) {
+                    sendJson(res, 404, { ok: false, error: '未找到该提交（可能不在当前仓库）' });
+                    return;
+                }
+                sendJson(res, 200, { ok: true, detail });
+            }
+            catch (err) {
+                sendJson(res, 500, { ok: false, error: err.message || '查询提交详情失败' });
+            }
+        },
+    });
+    // 4. 分页获取最近提交记录（Git 记录页下滑触底自动加载或点击加载更多）
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/git-log',
+        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');
+                let cwd = url.searchParams.get('cwd') || undefined;
+                const sessionId = url.searchParams.get('sessionId');
+                if (!cwd && sessionId) {
+                    cwd = findWorkspacePathBySession(sessionId) || undefined;
+                }
+                if (!cwd) {
+                    cwd = findMostRecentWorkspacePath() || undefined;
+                }
+                const limit = Math.min(Math.max(1, Number(url.searchParams.get('limit')) || 15), 50);
+                const skip = Math.max(0, Number(url.searchParams.get('skip')) || 0);
+                const result = await executor.getGitRecentLog(cwd, limit, skip);
+                sendJson(res, 200, { ok: true, data: result });
+            }
+            catch (err) {
+                sendJson(res, 500, { ok: false, error: err.message || '获取提交记录失败' });
+            }
+        },
+    });
 }

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,16 @@ declare global {
         };
     }
 }
-export {};
+import { formatRelativeTime, rollupCiStatus, reviewDecisionBadge, eventLabel } 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 } 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 { GithubWorkspacePanel } from './ui/workspace-panel.js';
+export { formatRelativeTime, rollupCiStatus, reviewDecisionBadge, eventLabel, GITHUB_PANEL_CSS, injectStyles, renderOctocat, renderGitIcon, renderOctocatBadge, renderPluginBadge, getLocalSyncSettings, saveLocalSyncSettings, getStoredGlobalOverview, saveStoredGlobalOverview, clearStoredGlobalOverview, getCacheStorageMeta, getRightbarStorageKey, getStoredRightbarSnapshot, saveStoredRightbarData, BranchSelectorDropdown, AuthGuideCard, UpgradeNotificationCard, NetworkAlertBanner, SyncStatusBadge, CommitDetailModal, GlobalSyncSettingsModal, GithubWorkspacePanel, };