dsh-github-flow 0.4.0 → 0.6.0

package/lib/ui/sync-settings-modal.js

@@ -265,7 +265,7 @@ export function GlobalSyncSettingsModal(props) {
                     ? "var(--dsw-alias-state-error-primary, #cf222e)"
                     : "var(--dsw-alias-label-secondary, #656d76)",
         },
-    }, updateMsg.text) : null)) : activeSection === "about" ? h("div", null, h("div", { style: { display: "flex", alignItems: "center", gap: "10px", marginBottom: "14px" } }, renderOctocatBadge(40), h("div", null, h("div", { style: { fontSize: "15px", fontWeight: 600 } }, "DSH GitHub Flow"), h("div", { style: { fontSize: "12px", color: "var(--dsw-alias-label-secondary, #656d76)", marginTop: "2px" } }, "当前版本: v" + (aboutVersion || "…")))), h("div", { style: { fontSize: "12px", color: "var(--dsw-alias-label-secondary, #656d76)", marginBottom: "14px", lineHeight: "1.6" } }, "让 DeepSeek Harness Agent 拥有操作 GitHub 的原生手脚。原生复用宿主机 gh CLI 安全凭据，深度打通本地 Git 工作区与云端协作，提供 9 大领域 Agent 工具、人类 Slash 指令、Web 全景驾驶舱与一键跨平台升级。"), h("div", { style: { display: "flex", flexDirection: "column", gap: "8px", marginBottom: "14px" } }, h("div", { style: { display: "flex", alignItems: "center", gap: "8px", fontSize: "12px" } }, h("span", { style: { minWidth: "64px", color: "var(--dsw-alias-label-secondary, #656d76)" } }, "仓库地址"), h("a", { href: "https://github.com/ItQianChen/dsh-github-flow", target: "_blank", rel: "noopener noreferrer", style: { color: "var(--dsw-alias-link, #0969da)" } }, "github.com/ItQianChen/dsh-github-flow")), h("div", { style: { display: "flex", alignItems: "center", gap: "8px", fontSize: "12px" } }, h("span", { style: { minWidth: "64px", color: "var(--dsw-alias-label-secondary, #656d76)" } }, "npm 包"), h("a", { href: "https://www.npmjs.com/package/dsh-github-flow", target: "_blank", rel: "noopener noreferrer", style: { color: "var(--dsw-alias-link, #0969da)" } }, "npmjs.com/package/dsh-github-flow")), h("div", { style: { display: "flex", alignItems: "center", gap: "8px", fontSize: "12px" } }, h("span", { style: { minWidth: "64px", color: "var(--dsw-alias-label-secondary, #656d76)" } }, "开源协议"), h("a", { href: "https://github.com/ItQianChen/dsh-github-flow/blob/master/LICENSE", target: "_blank", rel: "noopener noreferrer", style: { color: "var(--dsw-alias-link, #0969da)" } }, "MIT License"))), h("div", {
+    }, updateMsg.text) : null)) : activeSection === "about" ? h("div", null, h("div", { style: { display: "flex", alignItems: "center", gap: "10px", marginBottom: "14px" } }, renderOctocatBadge(40), h("div", null, h("div", { style: { fontSize: "15px", fontWeight: 600 } }, "DSH GitHub Flow"), h("div", { style: { fontSize: "12px", color: "var(--dsw-alias-label-secondary, #656d76)", marginTop: "2px" } }, "当前版本: v" + (aboutVersion || "…")))), h("div", { style: { fontSize: "12px", color: "var(--dsw-alias-label-secondary, #656d76)", marginBottom: "14px", lineHeight: "1.6" } }, "让 DeepSeek Harness Agent 拥有操作 GitHub 的原生手脚。原生复用宿主机 gh CLI 安全凭据，深度打通本地 Git 工作区与云端协作，提供 18 大领域 Agent 工具、人类 Slash 指令、Web 全景驾驶舱与一键跨平台升级。"), h("div", { style: { display: "flex", flexDirection: "column", gap: "8px", marginBottom: "14px" } }, h("div", { style: { display: "flex", alignItems: "center", gap: "8px", fontSize: "12px" } }, h("span", { style: { minWidth: "64px", color: "var(--dsw-alias-label-secondary, #656d76)" } }, "仓库地址"), h("a", { href: "https://github.com/ItQianChen/dsh-github-flow", target: "_blank", rel: "noopener noreferrer", style: { color: "var(--dsw-alias-link, #0969da)" } }, "github.com/ItQianChen/dsh-github-flow")), h("div", { style: { display: "flex", alignItems: "center", gap: "8px", fontSize: "12px" } }, h("span", { style: { minWidth: "64px", color: "var(--dsw-alias-label-secondary, #656d76)" } }, "npm 包"), h("a", { href: "https://www.npmjs.com/package/dsh-github-flow", target: "_blank", rel: "noopener noreferrer", style: { color: "var(--dsw-alias-link, #0969da)" } }, "npmjs.com/package/dsh-github-flow")), h("div", { style: { display: "flex", alignItems: "center", gap: "8px", fontSize: "12px" } }, h("span", { style: { minWidth: "64px", color: "var(--dsw-alias-label-secondary, #656d76)" } }, "开源协议"), h("a", { href: "https://github.com/ItQianChen/dsh-github-flow/blob/master/LICENSE", target: "_blank", rel: "noopener noreferrer", style: { color: "var(--dsw-alias-link, #0969da)" } }, "MIT License"))), h("div", {
         className: "dsh-github-about-star-box",
         style: {
             display: "flex",

package/lib/ui/upgrade-card.js

@@ -50,14 +50,28 @@ export function UpgradeNotificationCard(props) {
             }
             else {
                 setStatus("failed");
-                var logTail = "";
-                if (json.log && typeof json.log === "string") {
-                    var lines = json.log.trim().split("\n").filter(function (l) { return l.trim(); });
-                    if (lines.length > 0) {
-                        logTail = "\n\n📝 日志末尾: " + lines.slice(-4).join(" ⏎ ").slice(0, 400);
+                var logText = String(json.log || "");
+                var isAgeViolation = json.errorType === "MINIMUM_RELEASE_AGE_VIOLATION" ||
+                    logText.includes("ERR_PNPM_MINIMUM_RELEASE_AGE_VIOLATION") ||
+                    logText.includes("minimumReleaseAge") ||
+                    (typeof json.message === "string" && (json.message.includes("24 小时安全保护期") || json.message.includes("防投毒")));
+                if (isAgeViolation) {
+                    // 命中 DSH 内置包管理器 24 小时防投毒策略：收起英文报错堆栈，呈现全中文专业自愈指引
+                    setMsg("🛡️ 触发 DSH 新版本 24 小时安全保护期（npm 供应链防投毒策略）。检测到目标版本刚刚发布未满 24 小时，DSH 内置包管理器暂缓了自动升级以保障系统安全。\n\n" +
+                        "【推荐操作】：\n" +
+                        "1. 立即尝鲜：请先【完全退出关闭 DSH 应用程序】，然后在系统终端执行手动安装命令（点击右侧「📋 复制命令」获取）；\n" +
+                        "2. 稍后升级：无需任何操作，发版满 24 小时后直接在此点击「⚡ 一键自动升级」即可平滑完成。");
+                }
+                else {
+                    var logTail = "";
+                    if (json.log && typeof json.log === "string") {
+                        var lines = json.log.trim().split("\n").filter(function (l) { return l.trim(); });
+                        if (lines.length > 0) {
+                            logTail = "\n\n📝 日志末尾: " + lines.slice(-4).join(" ⏎ ").slice(0, 400);
+                        }
                     }
+                    setMsg((json.message || "升级命令执行失败，请在宿主终端手动执行。") + logTail);
                 }
-                setMsg((json.message || "升级命令执行失败，请在宿主终端手动执行。") + logTail);
             }
         }
         catch (err) {
@@ -86,6 +100,7 @@ export function UpgradeNotificationCard(props) {
         window.location.reload();
     };
     var h = React.createElement;
+    var isAgeViolation = msg.includes("24 小时安全保护期") || msg.includes("防投毒");
     if (isRightbar) {
         return h("div", {
             className: "dsh-github-upgrade-strip",
@@ -95,13 +110,17 @@ export function UpgradeNotificationCard(props) {
                 borderRadius: "8px",
                 background: status === "success"
                     ? "var(--dsw-alias-state-success-subtle, rgba(46, 160, 67, 0.12))"
-                    : "var(--dsw-alias-bg-module-platform, rgba(9, 105, 218, 0.08))",
+                    : (isAgeViolation
+                        ? "rgba(217, 119, 6, 0.12)"
+                        : "var(--dsw-alias-bg-module-platform, rgba(9, 105, 218, 0.08))"),
                 border: "1px solid " + (status === "success"
                     ? "var(--dsw-alias-state-success-border, rgba(46, 160, 67, 0.35))"
-                    : "var(--dsw-alias-border-l2, rgba(9, 105, 218, 0.25))"),
+                    : (isAgeViolation
+                        ? "rgba(217, 119, 6, 0.35)"
+                        : "var(--dsw-alias-border-l2, rgba(9, 105, 218, 0.25))")),
                 fontSize: "12px",
             },
-        }, h("div", { style: { display: "flex", alignItems: "center", justifyContent: "space-between", marginBottom: "6px" } }, h("span", { style: { fontWeight: 600, color: "var(--dsw-alias-label-primary, #1f2328)" } }, status === "success" ? "🎉 升级完成" : "🚀 发现新版 v" + updateInfo.latestVersion), h("button", {
+        }, h("div", { style: { display: "flex", alignItems: "center", justifyContent: "space-between", marginBottom: "6px" } }, h("span", { style: { fontWeight: 600, color: "var(--dsw-alias-label-primary, #1f2328)" } }, status === "success" ? "🎉 升级完成" : (isAgeViolation ? "🛡️ 处于 24h 安全保护期" : "🚀 发现新版 v" + updateInfo.latestVersion)), h("button", {
             onClick: handleDismiss,
             title: "不再提醒此版本",
             style: { background: "none", border: "none", cursor: "pointer", color: "var(--dsw-alias-label-tertiary, #8c8c8c)", fontSize: "14px", padding: 0 },
@@ -151,13 +170,17 @@ export function UpgradeNotificationCard(props) {
             borderRadius: "8px",
             background: status === "success"
                 ? "linear-gradient(90deg, rgba(46, 160, 67, 0.15) 0%, rgba(9, 105, 218, 0.12) 100%)"
-                : "linear-gradient(90deg, rgba(9, 105, 218, 0.12) 0%, rgba(137, 87, 229, 0.12) 100%)",
-            border: "1px solid " + (status === "success" ? "rgba(46, 160, 67, 0.35)" : "rgba(9, 105, 218, 0.3)"),
+                : (isAgeViolation
+                    ? "linear-gradient(90deg, rgba(217, 119, 6, 0.15) 0%, rgba(245, 158, 11, 0.12) 100%)"
+                    : "linear-gradient(90deg, rgba(9, 105, 218, 0.12) 0%, rgba(137, 87, 229, 0.12) 100%)"),
+            border: "1px solid " + (status === "success" ? "rgba(46, 160, 67, 0.35)" : (isAgeViolation ? "rgba(217, 119, 6, 0.35)" : "rgba(9, 105, 218, 0.3)")),
             fontSize: "13px",
         },
-    }, h("div", { style: { display: "flex", alignItems: "center", gap: "10px" } }, h("span", { style: { fontSize: "20px" } }, status === "success" ? "🎉" : "🚀"), h("div", null, h("div", { style: { fontWeight: 600, color: "var(--dsw-alias-label-primary, #1f2328)" } }, status === "success"
+    }, h("div", { style: { display: "flex", alignItems: "center", gap: "10px" } }, h("span", { style: { fontSize: "20px" } }, status === "success" ? "🎉" : (isAgeViolation ? "🛡️" : "🚀")), h("div", null, h("div", { style: { fontWeight: 600, color: "var(--dsw-alias-label-primary, #1f2328)" } }, status === "success"
         ? "升级完成！新版本 v" + updateInfo.latestVersion + " 已写入"
-        : "发现 dsh-github-flow 新版本 v" + updateInfo.latestVersion + "（当前版本: v" + updateInfo.currentVersion + "）"), h("div", { style: { fontSize: "12px", color: "var(--dsw-alias-label-secondary, #656d76)", marginTop: "2px" } }, msg || (status === "success"
+        : (isAgeViolation
+            ? "🛡️ 触发 DSH 新版本 24 小时安全保护期 (供应链防投毒策略)"
+            : "发现 dsh-github-flow 新版本 v" + updateInfo.latestVersion + "（当前版本: v" + updateInfo.currentVersion + "）")), h("div", { style: { fontSize: "12px", color: "var(--dsw-alias-label-secondary, #656d76)", marginTop: "2px" } }, msg || (status === "success"
         ? "💡 提示：DSH 后端驻留了旧版内存，需重启 DSH 服务彻底生效后端工具；若仅预览界面改动可先刷新网页。"
         : "包含最新 GitHub 工具特性与性能优化，点击右侧可一键自动升级。")))), h("div", { style: { display: "flex", alignItems: "center", gap: "8px", flexShrink: 0 } }, status === "success"
         ? h("button", {
@@ -189,7 +212,9 @@ export function UpgradeNotificationCard(props) {
                 fontWeight: 600,
             } : {}),
         },
-    }, status === "failed" ? "📋 复制命令手动升级" : "📋 复制命令"), h("button", {
+    }, status === "failed"
+        ? (isAgeViolation ? "📋 复制命令 (需先退出DSH)" : "📋 复制命令手动升级")
+        : "📋 复制命令"), h("button", {
         onClick: handleDismiss,
         title: "不再提醒此版本",
         style: { background: "none", border: "none", cursor: "pointer", color: "var(--dsw-alias-label-tertiary, #8c8c8c)", fontSize: "16px", padding: "0 4px" },

package/lib/ui/utils.d.ts

@@ -8,3 +8,38 @@ export declare function reviewDecisionBadge(decision: any): {
     kind: "green" | "red" | "yellow";
 } | null;
 export declare function eventLabel(event: any): string;
+export interface FetchRetryConfig {
+    maxRetries?: number;
+    baseDelayMs?: number;
+    onRetry?: (attempt: number, delayMs: number, reason: string) => void;
+    signal?: AbortSignal;
+}
+/**
+ * 带有阶梯退避重试（Backoff Retry）的通用异步拉取函数
+ *
+ * 核心设计理由与约束：
+ * 1. 应对代理节点不稳定、TLS 握手卡顿、短时网络抖动（半秒至两秒微断流）；
+ * 2. 阶梯退避时序：第 1 次失败等 1s (1000ms)，第 2 次等 2s (2000ms)，第 3 次等 4s (4000ms)，附加 0~200ms Jitter；
+ * 3. 智能区分软硬错误：401/403/404/400 确定性错误坚决不重试，仅在网络超时、不可达、或带有 networkError 时重试；
+ * 4. 严格响应外部 AbortSignal，组件卸载或用户手动打断时立即退出等待，绝无内存泄漏。
+ */
+export declare function fetchWithRetry(url: string, options?: RequestInit, config?: FetchRetryConfig): Promise<{
+    res: Response;
+    json: any;
+}>;
+export interface GitStatItem {
+    path: string;
+    total: number;
+    additions: number;
+    deletions: number;
+    isBinary: boolean;
+    rawRight?: string;
+}
+export declare function parseGitStatText(statText: string): {
+    files: GitStatItem[];
+    summary: {
+        filesChanged: number;
+        insertions: number;
+        deletions: number;
+    } | null;
+} | null;

package/lib/ui/utils.js

@@ -64,3 +64,175 @@ export function eventLabel(event) {
         return "🔀 PR";
     return e || "";
 }
+/**
+ * 确定性失败的特征（客户端侧兜底判定）。
+ *
+ * 为什么这里还要再写一份：后端 GhExecutor 已统一分类并通过 errorKind 分流，
+ * 但浏览器端拿不到 errorKind，只能看到拼接后的错误文本。这类错误重试一万次
+ * 也不会变好（仓库就是关着 Issues），必须阻止阶梯退避把 7 秒白白烧掉。
+ * 与服务端共用同一组特征串，改动时两边同步。
+ */
+var DETERMINISTIC_HINT_RE = /repository has disabled|Could not resolve to a Repository|Branch not found|HTTP 403|Not Found \(HTTP 404\)|rate limit/i;
+/**
+ * 带有阶梯退避重试（Backoff Retry）的通用异步拉取函数
+ *
+ * 核心设计理由与约束：
+ * 1. 应对代理节点不稳定、TLS 握手卡顿、短时网络抖动（半秒至两秒微断流）；
+ * 2. 阶梯退避时序：第 1 次失败等 1s (1000ms)，第 2 次等 2s (2000ms)，第 3 次等 4s (4000ms)，附加 0~200ms Jitter；
+ * 3. 智能区分软硬错误：401/403/404/400 确定性错误坚决不重试，仅在网络超时、不可达、或带有 networkError 时重试；
+ * 4. 严格响应外部 AbortSignal，组件卸载或用户手动打断时立即退出等待，绝无内存泄漏。
+ */
+export async function fetchWithRetry(url, options = {}, config = {}) {
+    var maxRetries = config.maxRetries !== undefined ? config.maxRetries : 3;
+    var baseDelayMs = config.baseDelayMs !== undefined ? config.baseDelayMs : 1000;
+    var signal = config.signal || options.signal;
+    var attempt = 0;
+    while (true) {
+        attempt++;
+        var currentRes = null;
+        var currentJson = null;
+        var failureReason = "";
+        var shouldRetry = false;
+        try {
+            if (signal && signal.aborted) {
+                throw new Error("Aborted");
+            }
+            currentRes = await fetch(url, { ...options, signal });
+            // 硬错误守卫：客户端确定性错误（如未授权、权限拒绝、不存在、参数错误）坚决不重试
+            if (currentRes.status === 401 || currentRes.status === 403 || currentRes.status === 404 || currentRes.status === 400) {
+                currentJson = await currentRes.json().catch(() => ({}));
+                return { res: currentRes, json: currentJson };
+            }
+            if (!currentRes.ok) {
+                failureReason = "HTTP " + currentRes.status + " " + currentRes.statusText;
+                shouldRetry = true;
+            }
+            else {
+                currentJson = await currentRes.json().catch(() => null);
+                // 业务层软错误检测（后端返回了 200，但标记了 networkError 或 partialFailure）
+                var isNetworkError = Boolean(currentJson && (currentJson.partialFailure ||
+                    currentJson.data?.partialFailure ||
+                    currentJson.data?.networkError ||
+                    currentJson.data?.auth?.networkError));
+                if (isNetworkError) {
+                    failureReason = currentJson.error || currentJson.data?.networkErrorReason || "云端接口网络抖动";
+                    // 后端已把「确定性失败」（仓库关了 Issues / 仓库不存在 / 无权限）从
+                    // networkError 里剥离，只留真正的传输层故障。但历史版本或第三方实现
+                    // 仍可能把确定性文本塞进同一条链路，这里再兜一道：命中即放弃重试。
+                    shouldRetry = !DETERMINISTIC_HINT_RE.test(String(failureReason));
+                }
+                else {
+                    // 成功获取完整且无网络错误的数据
+                    return { res: currentRes, json: currentJson };
+                }
+            }
+        }
+        catch (err) {
+            if ((signal && signal.aborted) || err.name === "AbortError") {
+                throw err;
+            }
+            failureReason = err.message || "网络连接中断或超时";
+            shouldRetry = true;
+        }
+        // 判断是否已耗尽重试次数
+        if (!shouldRetry || attempt > maxRetries) {
+            if (currentRes) {
+                return { res: currentRes, json: currentJson || {} };
+            }
+            throw new Error(failureReason || "网络请求失败");
+        }
+        // 计算阶梯退避等待时间：baseDelayMs * 2^(attempt - 1) + Jitter 自适应微扰
+        var exponentialDelay = baseDelayMs * Math.pow(2, attempt - 1);
+        var maxJitter = Math.min(200, Math.floor(exponentialDelay * 0.2));
+        var jitter = Math.floor(Math.random() * (maxJitter + 1));
+        var totalDelay = exponentialDelay + jitter;
+        if (config.onRetry) {
+            config.onRetry(attempt, totalDelay, failureReason);
+        }
+        // 可中断的睡眠等待
+        await new Promise((resolve, reject) => {
+            var timer = setTimeout(resolve, totalDelay);
+            if (signal) {
+                signal.addEventListener("abort", () => {
+                    clearTimeout(timer);
+                    reject(new Error("Aborted"));
+                }, { once: true });
+            }
+        });
+    }
+}
+export function parseGitStatText(statText) {
+    if (!statText || typeof statText !== "string")
+        return null;
+    var lines = statText.split("\n");
+    var files = [];
+    var summary = null;
+    for (var i = 0; i < lines.length; i++) {
+        var line = lines[i].trim();
+        if (!line)
+            continue;
+        var summaryMatch = line.match(/(\d+)\s+files?\s+changed(?:,\s+(\d+)\s+insertions?\(\+\))?(?:,\s+(\d+)\s+deletions?\(-\))?/i);
+        if (summaryMatch) {
+            summary = {
+                filesChanged: parseInt(summaryMatch[1], 10),
+                insertions: parseInt(summaryMatch[2] || "0", 10),
+                deletions: parseInt(summaryMatch[3] || "0", 10),
+            };
+            continue;
+        }
+        var pipeIdx = line.indexOf("|");
+        if (pipeIdx > 0) {
+            var left = line.slice(0, pipeIdx).trim();
+            var right = line.slice(pipeIdx + 1).trim();
+            if (left.startsWith('"') && left.endsWith('"') && left.length >= 2) {
+                left = left.slice(1, -1);
+            }
+            if (/^Bin\b/i.test(right)) {
+                files.push({ path: left, total: 0, additions: 0, deletions: 0, isBinary: true, rawRight: right });
+            }
+            else {
+                var numMatch = right.match(/^(\d+)(.*)$/);
+                if (numMatch) {
+                    var total = parseInt(numMatch[1], 10);
+                    var graph = numMatch[2].trim();
+                    var plusCount = 0;
+                    var minusCount = 0;
+                    for (var j = 0; j < graph.length; j++) {
+                        if (graph[j] === "+")
+                            plusCount++;
+                        else if (graph[j] === "-")
+                            minusCount++;
+                    }
+                    var additions = 0;
+                    var deletions = 0;
+                    if (plusCount === 0 && minusCount === 0) {
+                        additions = total;
+                    }
+                    else if (minusCount === 0) {
+                        additions = total;
+                        deletions = 0;
+                    }
+                    else if (plusCount === 0) {
+                        additions = 0;
+                        deletions = total;
+                    }
+                    else {
+                        if (plusCount + minusCount === total) {
+                            additions = plusCount;
+                            deletions = minusCount;
+                        }
+                        else {
+                            var addExact = Math.round((total * plusCount) / (plusCount + minusCount));
+                            additions = addExact;
+                            deletions = Math.max(0, total - addExact);
+                        }
+                    }
+                    files.push({ path: left, total, additions, deletions, isBinary: false });
+                }
+            }
+        }
+    }
+    if (files.length === 0 && !summary)
+        return null;
+    return { files, summary };
+}