dsh-github-flow 0.1.6 → 0.1.8

package/lib/api/routes.js

@@ -1,6 +1,62 @@
 import path from 'node:path';
 import { TtlCache } from '../cache.js';
 import { mapLimit, tryReadWorkspaces, findWorkspacePathBySession, findMostRecentWorkspacePath, hasGitDir } from '../workspace.js';
+import { UpdateChecker } from '../updater.js';
+import { UpgradeManager } from '../upgrade-manager.js';
+/**
+ * 依据当前登录账号判定 Issue 的归属身份维度 (可多选):
+ * - reported: 用户提起的 (属于当前账号名下仓库，但作者不是本人)
+ * - assigned: 被分配的 (指派列表中包含当前账号)
+ * - created: 我创建的 (作者是当前账号)
+ *
+ * 为什么这样划分：
+ * 在真实工程实践中，Maintainer 不仅要关注自己创建的任务，更要对社区/用户提交的 Bug 反馈负责，
+ * 同时还要处理他人指派的待办任务。这三个维度互补且可能重叠。
+ */
+function resolveIssueCategories(issue, currentUser, explicitRepoOwner) {
+    const categories = [];
+    if (!currentUser)
+        return categories;
+    const currentLower = currentUser.toLowerCase();
+    const authorLogin = issue.author?.login?.toLowerCase();
+    const isAuthor = Boolean(authorLogin && authorLogin === currentLower);
+    const isAssignee = Array.isArray(issue.assignees) &&
+        issue.assignees.some((a) => a.login?.toLowerCase() === currentLower);
+    // 仓库 owner 判定：优先从 repository.nameWithOwner 提取，兜底使用 explicitRepoOwner
+    let repoOwner = explicitRepoOwner?.toLowerCase();
+    if (!repoOwner && issue.repository?.nameWithOwner) {
+        repoOwner = issue.repository.nameWithOwner.split('/')[0]?.toLowerCase();
+    }
+    const isOwnerRepo = Boolean(repoOwner && repoOwner === currentLower);
+    if (isAuthor)
+        categories.push('created');
+    if (isAssignee)
+        categories.push('assigned');
+    // 如果是当前用户维护的仓库，且作者不是本人，则明确归为「用户提起的」
+    if (isOwnerRepo && !isAuthor)
+        categories.push('reported');
+    return categories;
+}
+function calculateIssueStats(issues) {
+    let reported = 0;
+    let assigned = 0;
+    let created = 0;
+    for (const item of issues) {
+        const cats = item.categories || [];
+        if (cats.includes('reported'))
+            reported++;
+        if (cats.includes('assigned'))
+            assigned++;
+        if (cats.includes('created'))
+            created++;
+    }
+    return {
+        total: issues.length,
+        reported,
+        assigned,
+        created,
+    };
+}
 /** path.basename 在空串/异常输入上会抛错，工作区路径来自磁盘文件，必须防御 */
 function basenameSafe(p) {
     try {
@@ -40,11 +96,13 @@ function isSafeExternalUrl(raw) {
         return false;
     }
 }
-export function registerApiRoutes(ctxOrWebServer, executor, workspaceRegistry, cacheTtlMs = 15_000) {
+export function registerApiRoutes(ctxOrWebServer, executor, workspaceRegistry, cacheTtlMs = 15_000, updateChecker, upgradeManager) {
     const ctx = ctxOrWebServer;
     const webServer = ctx?.webServer || ctx;
     if (!webServer || typeof webServer.register !== 'function')
         return;
+    const checker = updateChecker || new UpdateChecker();
+    const upgrader = upgradeManager || new UpgradeManager();
     const cacheMap = new TtlCache(cacheTtlMs);
     const globalCache = new TtlCache(globalCacheTtlMs(cacheTtlMs));
     function sendJson(res, status, data) {
@@ -108,7 +166,12 @@ export function registerApiRoutes(ctxOrWebServer, executor, workspaceRegistry, c
                 const now = Date.now();
                 const cachedData = cacheMap.get(cwd, now);
                 if (cachedData) {
-                    sendJson(res, 200, { ok: true, data: cachedData, fromCache: true, cwd });
+                    sendJson(res, 200, {
+                        ok: true,
+                        data: { ...cachedData, updateInfo: checker.getQuickStatus() },
+                        fromCache: true,
+                        cwd,
+                    });
                     return;
                 }
                 const auth = await executor.checkAuth(cwd);
@@ -125,18 +188,30 @@ export function registerApiRoutes(ctxOrWebServer, executor, workspaceRegistry, c
                     ]);
                     if (prsRes.ok && Array.isArray(prsRes.data))
                         pullRequests = prsRes.data;
-                    if (issuesRes.ok && Array.isArray(issuesRes.data))
-                        issues = issuesRes.data;
+                    if (issuesRes.ok && Array.isArray(issuesRes.data)) {
+                        const currentUser = auth.user;
+                        const repoOwner = repo?.owner || repo?.nameWithOwner?.split('/')[0];
+                        issues = issuesRes.data.map((item) => {
+                            const categories = resolveIssueCategories(item, currentUser, repoOwner);
+                            return {
+                                ...item,
+                                categories,
+                            };
+                        });
+                    }
                     if (runsRes.ok && Array.isArray(runsRes.data))
                         runs = runsRes.data;
                 }
+                const issueStats = calculateIssueStats(issues);
                 const freshData = {
                     auth,
                     repo: repo || undefined,
                     pullRequests,
                     issues,
+                    issueStats,
                     runs,
                     lastUpdated: new Date().toISOString(),
+                    updateInfo: checker.getQuickStatus(),
                 };
                 cacheMap.set(cwd, freshData, now);
                 sendJson(res, 200, { ok: true, data: freshData, fromCache: false, cwd });
@@ -271,7 +346,11 @@ export function registerApiRoutes(ctxOrWebServer, executor, workspaceRegistry, c
             const now = Date.now();
             const cachedGlobal = globalCache.get('global', now);
             if (cachedGlobal) {
-                sendJson(res, 200, { ok: true, data: cachedGlobal, fromCache: true });
+                sendJson(res, 200, {
+                    ok: true,
+                    data: { ...cachedGlobal, updateInfo: checker.getQuickStatus() },
+                    fromCache: true,
+                });
                 return;
             }
             try {
@@ -279,17 +358,29 @@ export function registerApiRoutes(ctxOrWebServer, executor, workspaceRegistry, c
                 let userRepos = [];
                 let myPrs = [];
                 let myIssues = [];
+                let issueStats = { total: 0, reported: 0, assigned: 0, created: 0 };
                 let workspaceMatrix = [];
                 let workspaceError;
                 if (auth.loggedIn) {
-                    // 并发执行：1. 账号下仓库列表 2. 个人 PRs 3. 个人 Issues
-                    // 超时压到 8 秒：本机实测 `gh search issues --author=@me` 单次就要 10 秒，
-                    // 它是这组的木桶短板，直接决定首屏等待时间。面板查询不值得为它多等 4 秒。
-                    const [reposRes, prsRes, issuesRes] = await Promise.all([
+                    // 并发执行：1. 账号下仓库列表 2. 个人 PRs 3. 三维 Issue 检索（名下仓库用户提单 + 指派待办 + 我创建的）
+                    // 为什么三路并发搜索：
+                    // - --owner=@me: 捕获用户/访客在当前用户所有仓库下提的 Issue (如反馈 Bug、Feature Request)，解决外部提单看不见的问题
+                    // - --assignee=@me: 捕获团队成员或自己指派给当前账号的待办任务 (含跨组织/第三方项目)
+                    // - --author=@me: 捕获当前账号亲自发起的任务与向外部提起的议题
+                    // 3 个轻量进程与 repo/prs 同步 spawn，经 OS 并发调度实测仅耗时 3 秒出头，完全满足 8 秒超时门限。
+                    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', 'issues', '--author=@me', '--state=open', '--limit', '10', '--json', 'number,title,repository,url,updatedAt'], { 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 }),
                     ]);
+                    const reposRes = queryResults[0].status === 'fulfilled' ? queryResults[0].value : { ok: false };
+                    const prsRes = queryResults[1].status === 'fulfilled' ? queryResults[1].value : { ok: false };
+                    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 };
                     if (reposRes.ok && Array.isArray(reposRes.data)) {
                         userRepos = reposRes.data.map((r) => ({
                             name: r.name || '',
@@ -305,9 +396,40 @@ export function registerApiRoutes(ctxOrWebServer, executor, workspaceRegistry, c
                     if (prsRes.ok && Array.isArray(prsRes.data)) {
                         myPrs = prsRes.data;
                     }
-                    if (issuesRes.ok && Array.isArray(issuesRes.data)) {
-                        myIssues = issuesRes.data;
-                    }
+                    // 多源 Issues 聚合、按 URL 唯一去重并排序
+                    const issueMap = new Map();
+                    const collectIssues = (res) => {
+                        if (res.ok && Array.isArray(res.data)) {
+                            for (const item of res.data) {
+                                if (item.url && !issueMap.has(item.url)) {
+                                    issueMap.set(item.url, item);
+                                }
+                            }
+                        }
+                    };
+                    collectIssues(ownerIssuesRes);
+                    collectIssues(assignedIssuesRes);
+                    collectIssues(authorIssuesRes);
+                    const rawList = Array.from(issueMap.values());
+                    // 统一按最后更新时间降序排列
+                    rawList.sort((a, b) => new Date(b.updatedAt || 0).getTime() - new Date(a.updatedAt || 0).getTime());
+                    const currentUser = auth.user;
+                    myIssues = rawList.map((raw) => {
+                        const categories = resolveIssueCategories(raw, currentUser);
+                        return {
+                            number: raw.number,
+                            title: raw.title || '',
+                            repository: raw.repository || { nameWithOwner: '' },
+                            author: raw.author ? { login: raw.author.login } : undefined,
+                            assignees: Array.isArray(raw.assignees) ? raw.assignees.map((a) => ({ login: a.login })) : [],
+                            labels: Array.isArray(raw.labels) ? raw.labels.map((l) => ({ name: l.name, color: l.color })) : [],
+                            url: raw.url || '',
+                            updatedAt: raw.updatedAt || '',
+                            state: raw.state || 'OPEN',
+                            categories,
+                        };
+                    });
+                    issueStats = calculateIssueStats(myIssues);
                 }
                 // 解析本地所有工作区与 GitHub 关联矩阵
                 const wsRead = tryReadWorkspaces();
@@ -336,7 +458,9 @@ export function registerApiRoutes(ctxOrWebServer, executor, workspaceRegistry, c
                     workspaceMatrix,
                     myPrs,
                     myIssues,
+                    issueStats,
                     lastUpdated: new Date().toISOString(),
+                    updateInfo: checker.getQuickStatus(),
                     ...(workspaceError ? { workspaceError } : {}),
                 };
                 globalCache.set('global', globalData, now);
@@ -347,4 +471,75 @@ export function registerApiRoutes(ctxOrWebServer, executor, workspaceRegistry, c
             }
         },
     });
+    // 5. 闲时静默检查更新端点（前端在 gh 业务数据完全拉取就绪后，由 idle 延时静默触发）
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/check-update',
+        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 force = url.searchParams.get('force') === 'true';
+                const info = await checker.check(force);
+                sendJson(res, 200, { ok: true, data: info });
+            }
+            catch (err) {
+                sendJson(res, 500, { ok: false, error: err.message || '检查更新失败' });
+            }
+        },
+    });
+    // 6. 一键自动升级触发端点（用户点击操作横幅按钮后发起）
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/upgrade',
+        handler: async (req, res) => {
+            if (req.method !== 'POST') {
+                sendJson(res, 405, { ok: false, message: '仅支持 POST 请求' });
+                return;
+            }
+            try {
+                const info = await checker.check(false);
+                const result = await upgrader.executeUpgrade(info.latestVersion);
+                sendJson(res, result.ok ? 200 : 500, result);
+            }
+            catch (err) {
+                sendJson(res, 500, { ok: false, message: err.message || '执行自动升级异常' });
+            }
+        },
+    });
+    // 7. 升级状态与实时日志查询端点
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/upgrade-status',
+        handler: async (req, res) => {
+            if (req.method !== 'GET') {
+                sendJson(res, 405, { ok: false, message: '仅支持 GET 请求' });
+                return;
+            }
+            sendJson(res, 200, { ok: true, data: upgrader.getStatus() });
+        },
+    });
+    // 8. 快速认证状态轻量探针 (耗时 < 500ms，专供登录自愈检测与快速恢复)
+    bindRoute({
+        kind: 'exact',
+        path: '/api/github/auth',
+        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 force = url.searchParams.get('force') === 'true';
+                const auth = await executor.checkAuth(undefined, force);
+                sendJson(res, 200, { ok: true, auth });
+            }
+            catch (err) {
+                sendJson(res, 500, { ok: false, error: err.message || '认证检测失败' });
+            }
+        },
+    });
 }

package/lib/client/panel.js

@@ -62,6 +62,33 @@ export function createGithubPanelComponent() {
             : h('div', { className: 'dsh-github-list' }, prs.map((pr) => h('div', { key: pr.number, className: 'dsh-github-item' }, h('div', { className: 'dsh-github-item-main' }, h('a', { className: 'dsh-github-item-title', href: pr.url, target: '_blank' }, `#${pr.number} ${pr.title}`), h('div', { className: 'dsh-github-item-meta' }, h('span', null, `由 ${pr.author?.login || '未知'} 提交`), h('span', null, `${pr.headRefName} → ${pr.baseRefName}`), pr.mergeable === 'CONFLICTING'
                 ? h('span', { className: 'dsh-github-badge dsh-badge-red' }, '冲突 Conflicting')
                 : h('span', { className: 'dsh-github-badge dsh-badge-green' }, '可合并 Mergeable'))), h('div', { className: 'dsh-github-item-actions' }, h('a', { className: 'dsh-github-btn-sm', href: pr.url, target: '_blank', style: { textDecoration: 'none' } }, '在 GitHub 打开'))))));
+        // Issues 区域
+        const issuesSectionEl = h('div', { className: 'dsh-github-section' }, h('div', { className: 'dsh-github-section-header' }, h('h3', null, `📋 仓库 Issues (${issues.length})`), repo?.url
+            ? h('a', {
+                href: `${repo.url}/issues`,
+                target: '_blank',
+                style: { fontSize: '11px', color: 'var(--dsw-alias-link, #0969da)', textDecoration: 'none' },
+            }, '全部 ↗')
+            : null), issues.length === 0
+            ? h('div', { className: 'dsh-github-empty' }, '当前无开放中的 Issue')
+            : h('div', { className: 'dsh-github-list' }, issues.map((issue) => {
+                const cats = issue.categories || [];
+                const badges = [];
+                if (cats.includes('reported')) {
+                    badges.push(h('span', { key: 'rep', className: 'dsh-github-badge dsh-badge-purple' }, '用户反馈'));
+                }
+                if (cats.includes('assigned')) {
+                    badges.push(h('span', { key: 'asn', className: 'dsh-github-badge dsh-badge-blue' }, '已分配'));
+                }
+                if (cats.includes('created')) {
+                    badges.push(h('span', { key: 'crt', className: 'dsh-github-badge dsh-badge-green' }, '我发起的'));
+                }
+                return h('div', { key: issue.number, className: 'dsh-github-item' }, h('div', { className: 'dsh-github-item-main' }, h('div', { style: { display: 'flex', alignItems: 'center', gap: '6px', flexWrap: 'wrap' } }, h('a', { className: 'dsh-github-item-title', href: issue.url, target: '_blank' }, `#${issue.number} ${issue.title}`), ...badges), h('div', { className: 'dsh-github-item-meta' }, h('span', null, `由 ${issue.author?.login || '未知'} 提出`), issue.assignees && issue.assignees.length > 0
+                    ? h('span', null, `指派: ${issue.assignees.map((a) => a.login).join(', ')}`)
+                    : null, issue.labels && issue.labels.length > 0
+                    ? issue.labels.map((lbl) => h('span', { key: lbl.name, className: 'dsh-github-badge dsh-badge-yellow' }, lbl.name))
+                    : null)), h('div', { className: 'dsh-github-item-actions' }, h('a', { className: 'dsh-github-btn-sm', href: issue.url, target: '_blank', style: { textDecoration: 'none' } }, '在 GitHub 打开')));
+            })));
         // GitHub Actions 区域
         const runsSectionEl = h('div', { className: 'dsh-github-section' }, h('div', { className: 'dsh-github-section-header' }, h('h3', null, `⚡ GitHub Actions 最近流水线 (${runs.length})`)), runs.length === 0
             ? h('div', { className: 'dsh-github-empty' }, '暂无工作流运行记录')
@@ -70,6 +97,6 @@ export function createGithubPanelComponent() {
                 : r.conclusion === 'failure'
                     ? h('span', { className: 'dsh-github-badge dsh-badge-red' }, '失败 Failure')
                     : h('span', { className: 'dsh-github-badge dsh-badge-yellow' }, r.status || '进行中'))), h('div', { className: 'dsh-github-item-actions' }, h('a', { className: 'dsh-github-btn-sm', href: r.url, target: '_blank', style: { textDecoration: 'none' } }, '查看流水线'))))));
-        return h('div', { className: 'dsh-github-panel' }, headerEl, cardsEl, prsSectionEl, runsSectionEl);
+        return h('div', { className: 'dsh-github-panel' }, headerEl, cardsEl, prsSectionEl, issuesSectionEl, runsSectionEl);
     };
 }