deepseeker-code 1.0.65 → 1.0.66

package/dist/cli.mjs

@@ -1353,6 +1353,7 @@ sync\uFF08\u591A\u5165\u53E3\u6D41\u6C34\u7EBF\uFF0C\u628A GitHub/GitLab label i
       baselineProbePass: "\u{1F9EA} \u57FA\u7EBF\u63A2\u6D4B\u901A\u8FC7\uFF0C\u6062\u590D\u5E72\u51C0\u6811\u540E\u8FDB agent \u9636\u6BB5",
       testFilesH: "## \u89E6\u78B0\u7684\u6D4B\u8BD5\u6587\u4EF6\uFF08\u4FE1\u606F\u6807\u6CE8\uFF09",
       testFilesNote: (n) => `\u672C\u6B21 diff \u89E6\u78B0 ${n} \u4E2A\u6D4B\u8BD5\u8DEF\u5F84\uFF08P1 \u4EC5\u4FE1\u606F\u6807\u6CE8\uFF0C\u4E0D\u53C2\u4E0E\u72B6\u6001\u5224\u5B9A\uFF09\uFF1A`,
+      changedMore: (n) => `\u2026\uFF08\u5176\u4F59 ${n} \u4E2A\u7565\uFF09`,
       artifactLine: (p, branch) => `   \u4EA7\u7269\uFF1A${p}\uFF08\u5206\u652F ${branch}\uFF0C\u5DF2\u63D0\u4EA4\uFF0C\u4FDD\u7559\u5F85\u4EBA\u5DE5\u5904\u7F6E\uFF09`,
       inWindowNow: (hhmm) => `\u23F0 \u5F53\u524D ${hhmm} \u5DF2\u5728\u7A97\u53E3\u5185\uFF0C\u7ACB\u5373\u5F00\u8DD1\u3002`,
       waitWindowWait: (h, m) => `\u23F0 --wait-window\uFF1A${h} \u5C0F\u65F6 ${m} \u5206\u540E\uFF08\u7A97\u53E3\u8D77\u70B9\uFF09\u5F00\u8DD1\u3002\u6302\u673A\u7B49\u5F85\u4E2D\uFF0CCtrl+C \u53EF\u53D6\u6D88\u3002`,
@@ -1523,6 +1524,7 @@ sync (multi-entry pipeline \u2014 pull labeled GitHub/GitLab issues into local t
       baselineProbePass: "\u{1F9EA} baseline probe passed; restoring the clean tree, entering the agent phase",
       testFilesH: "## Touched test files (informational)",
       testFilesNote: (n) => `This diff touches ${n} test paths (P1: informational only, not part of status judgment):`,
+      changedMore: (n) => `...(and ${n} more)`,
       artifactLine: (p, branch) => `   Artifact: ${p} (branch ${branch}, committed, kept for manual handling)`,
       inWindowNow: (hhmm) => `\u23F0 It's ${hhmm}, already inside the window \u2014 starting now.`,
       waitWindowWait: (h, m) => `\u23F0 --wait-window: starting in ${h}h ${m}m (at the window start). Waiting \u2014 Ctrl+C to cancel.`,
@@ -1617,6 +1619,7 @@ var init_config2 = __esm({
         badTokenEnv: (v) => `gitlab.tokenEnv \u975E\u6CD5\uFF08"${v}"\uFF09\uFF1A\u987B\u662F\u73AF\u5883\u53D8\u91CF\u540D\uFF08\u5927\u5199\u5B57\u6BCD/\u6570\u5B57/\u4E0B\u5212\u7EBF\uFF09\u2014\u2014\u4E0D\u8981\u628A token \u672C\u4F53\u5199\u8FDB\u6587\u4EF6\uFF08sync.json \u8BBE\u8BA1\u4E3A\u53EF\u63D0\u4EA4\uFF0C\xA73.2\uFF09\u3002`,
         tokenLooksReal: "gitlab.tokenEnv \u7684\u503C\u50CF token \u672C\u4F53\uFF08glpat-/ghp_/github_pat_ \u524D\u7F00\uFF09\uFF1A\u8FD9\u91CC\u53EA\u6536\u73AF\u5883\u53D8\u91CF\u3010\u540D\u3011\uFF0Ctoken \u653E\u73AF\u5883\u53D8\u91CF\u91CC\u3002",
         badDefaultAccept: (v) => `defaultAccept \u975E\u6CD5\uFF08${v}\uFF09\uFF1A\u987B\u4E3A\u975E\u7A7A\u5355\u884C shell \u547D\u4EE4\u5B57\u7B26\u4E32\u3002`,
+        badDefaultSetup: (v) => `defaultSetup \u975E\u6CD5\uFF08${v}\uFF09\uFF1A\u987B\u4E3A\u975E\u7A7A\u5355\u884C shell \u547D\u4EE4\u5B57\u7B26\u4E32\u3002`,
         badBudget: (v) => `defaultBudgetYuan \u975E\u6CD5\uFF08${v}\uFF09\uFF1A\u987B\u4E3A\u6B63\u6570\uFF08\u5143\uFF09\u3002`,
         badMaxPerDay: (v) => `maxTicketsPerDay \u975E\u6CD5\uFF08${v}\uFF09\uFF1A\u987B\u4E3A\u6B63\u6574\u6570\u3002`,
         badBool: (k, v) => `${k} \u975E\u6CD5\uFF08${v}\uFF09\uFF1A\u987B\u4E3A true \u6216 false\u3002`,
@@ -1638,6 +1641,7 @@ var init_config2 = __esm({
         badTokenEnv: (v) => `Invalid gitlab.tokenEnv ("${v}"): must be an environment variable NAME (A-Z/0-9/_) \u2014 never the token itself (sync.json is designed to be committable).`,
         tokenLooksReal: "gitlab.tokenEnv looks like a real token (glpat-/ghp_/github_pat_ prefix): only the env var NAME goes here; the token lives in the environment.",
         badDefaultAccept: (v) => `Invalid defaultAccept (${v}): must be a non-empty single-line shell command string.`,
+        badDefaultSetup: (v) => `Invalid defaultSetup (${v}): must be a non-empty single-line shell command string.`,
         badBudget: (v) => `Invalid defaultBudgetYuan (${v}): must be a positive number (yuan).`,
         badMaxPerDay: (v) => `Invalid maxTicketsPerDay (${v}): must be a positive integer.`,
         badBool: (k, v) => `Invalid ${k} (${v}): must be true or false.`,
@@ -1652,7 +1656,7 @@ var init_config2 = __esm({
       return typeof v === "function" ? v(...args) : v;
     };
     SYNC_CONFIG_PATH = () => path7.join(batchQueueRoot(), "sync.json");
-    ALLOWED_KEYS = ["github", "gitlab", "defaultAccept", "defaultBudgetYuan", "maxTicketsPerDay", "allowExternalAccept", "authorAllowlist", "blockedKeywords", "maxBodyLength", "testPathPatterns"].join(", ");
+    ALLOWED_KEYS = ["github", "gitlab", "defaultAccept", "defaultSetup", "defaultBudgetYuan", "maxTicketsPerDay", "allowExternalAccept", "authorAllowlist", "blockedKeywords", "maxBodyLength", "testPathPatterns"].join(", ");
     REPO_SHAPE = /^[\w.-]+\/[\w.-]+$/;
     ENV_NAME_SHAPE = /^[A-Z_][A-Z0-9_]*$/i;
     TOKEN_SHAPE = /glpat-|ghp_|github_pat_|gho_/;
@@ -1703,7 +1707,7 @@ var init_config2 = __esm({
         if (TOKEN_SHAPE.test(gl.tokenEnv)) return { ok: false, error: cfgMsg(locale2, "tokenLooksReal") };
         config.gitlab = { baseUrl: gl.baseUrl, projects: gl.projects, label: gl.label, tokenEnv: gl.tokenEnv };
       }
-      if (config.github === void 0 && config.gitlab === void 0) {
+      if (config.github === void 0 && config.gitlab === void 0 && !opts?.allowNoSource) {
         return { ok: false, error: cfgMsg(locale2, "noSource") };
       }
       if (obj.defaultAccept !== void 0) {
@@ -1712,6 +1716,12 @@ var init_config2 = __esm({
         }
         config.defaultAccept = obj.defaultAccept.trim();
       }
+      if (obj.defaultSetup !== void 0) {
+        if (!isStr(obj.defaultSetup) || !obj.defaultSetup.trim() || /\r|\n/.test(obj.defaultSetup)) {
+          return { ok: false, error: cfgMsg(locale2, "badDefaultSetup", JSON.stringify(obj.defaultSetup)) };
+        }
+        config.defaultSetup = obj.defaultSetup.trim();
+      }
       if (obj.defaultBudgetYuan !== void 0) {
         const n = Number(obj.defaultBudgetYuan);
         if (!Number.isFinite(n) || n <= 0) return { ok: false, error: cfgMsg(locale2, "badBudget", String(obj.defaultBudgetYuan)) };
@@ -2033,6 +2043,8 @@ var init_strings2 = __esm({
         chkCfgOk: "\u914D\u7F6E\u5408\u6CD5\uFF08sync.json\uFF09",
         chkCfgFail: (e) => `\u914D\u7F6E\u975E\u6CD5\uFF1A${e}`,
         fixCfg: "\u628A sync.json.example \u590D\u5236\u4E3A <\u9879\u76EE>/.deepseeker-code/batch/sync.json \u5E76\u6309\u9700\u4FEE\u6539\uFF08GitHub \u6E90\u4E24\u884C\u5373\u53EF\uFF09",
+        chkSetupMissing: "defaultSetup \u672A\u914D\u7F6E\uFF08\u975E\u963B\u65AD\uFF09\u2014\u2014\u9700\u88C5\u4F9D\u8D56\u7684\u4ED3\u5E93\u5EFA\u8BAE\u914D\u7F6E\uFF0C\u5426\u5219\u5EFA\u51FA\u7684\u7968\u4F1A\u56E0\u73AF\u5883\u7F3A\u5931\u88AB\u7F13\u5B58\u6210 baseline-broken\uFF08\u5F53\u665A\u7A7A\u8F6C\uFF09",
+        fixSetup: '\u5728 sync.json \u52A0 "defaultSetup": "pnpm install"\uFF08\u6216\u8BE5\u4ED3\u5E93\u7684\u5B9E\u9645\u73AF\u5883\u51C6\u5907\u547D\u4EE4\uFF09',
         chkGhAuthOk: "gh \u5DF2\u5B89\u88C5\u4E14\u5DF2\u767B\u5F55",
         chkGhAuthFail: (why) => `gh \u4E0D\u53EF\u7528\u6216\u672A\u767B\u5F55\uFF08${why}\uFF09`,
         fixGhAuth: "\u5B89\u88C5 gh\uFF08https://cli.github.com\uFF09\u540E\u6267\u884C gh auth login\uFF1B\u6216\u8BBE GH_TOKEN \u73AF\u5883\u53D8\u91CF",
@@ -2092,6 +2104,8 @@ var init_strings2 = __esm({
         chkCfgOk: "Config valid (sync.json)",
         chkCfgFail: (e) => `Config invalid: ${e}`,
         fixCfg: "Copy sync.json.example to <project>/.deepseeker-code/batch/sync.json and adjust (two lines for a GitHub source)",
+        chkSetupMissing: "defaultSetup not configured (non-blocking) \u2014 recommended for repos that need dependency setup, otherwise tickets fail the baseline probe and get cached as baseline-broken (idle all night)",
+        fixSetup: `Add "defaultSetup": "pnpm install" to sync.json (or the repo's actual setup command)`,
         chkGhAuthOk: "gh installed and logged in",
         chkGhAuthFail: (why) => `gh unavailable or not logged in (${why})`,
         fixGhAuth: "Install gh (https://cli.github.com), run gh auth login; or set the GH_TOKEN environment variable",
@@ -2153,6 +2167,9 @@ var init_doctor = __esm({
       } else {
         items.push({ ok: true, text: M("chkCfgOk") });
         const config = cfg.config;
+        if (config.defaultSetup === void 0) {
+          items.push({ ok: true, text: M("chkSetupMissing"), warn: true, fix: M("fixSetup") });
+        }
         if (config.github) {
           const auth = await exec2("gh", ["auth", "status"]).catch((e) => ({ code: -1, stdout: "", stderr: String(e?.message ?? e) }));
           if (auth.code === 0) {
@@ -2228,11 +2245,12 @@ var init_doctor = __esm({
         }
       }
       for (const it of items) {
-        out(`${it.ok ? "\u2713" : "\u2717"} ${it.text}`);
-        if (!it.ok && it.fix) out(M("chkFixLine", it.fix));
+        out(`${it.warn ? "\u26A0" : it.ok ? "\u2713" : "\u2717"} ${it.text}`);
+        if ((!it.ok || it.warn) && it.fix) out(M("chkFixLine", it.fix));
       }
       const fails = items.filter((i) => !i.ok).length;
-      out(fails === 0 ? M("chkPass", items.length) : M("chkFail", fails, items.length));
+      const hard = items.filter((i) => !i.warn).length;
+      out(fails === 0 ? M("chkPass", hard) : M("chkFail", fails, hard));
       return { ok: fails === 0, items };
     };
   }
@@ -2263,7 +2281,7 @@ ${inner.map(quoteLine).join("\n")}`;
 // ../core/src/batch/continuation.ts
 import fs8 from "fs/promises";
 import path9 from "path";
-var doneTicketPath, findDoneTicketIdBySourceId, continuationBaseBranch, extractPrevReportSummary, buildContinuationTicketSource;
+var doneTicketPath, findDoneTicketIdBySourceId, continuationBaseBranch, CHANGED_FILE_CAP, CHANGED_MORE_NOTE, extractPrevReportSummary, buildContinuationTicketSource;
 var init_continuation = __esm({
   "../core/src/batch/continuation.ts"() {
     "use strict";
@@ -2292,6 +2310,8 @@ var init_continuation = __esm({
       const branch = m?.[1];
       return branch && /^[\w][\w./-]*$/.test(branch) ? branch : null;
     };
+    CHANGED_FILE_CAP = 30;
+    CHANGED_MORE_NOTE = (n) => `\u2026\uFF08\u5176\u4F59 ${n} \u4E2A\u7565\uFF09`;
     extractPrevReportSummary = (report, locale2 = "zh", maxChars = 1200) => {
       if (!report) return locale2 === "zh" ? "\uFF08\u524D\u6B21\u62A5\u544A\u5DF2\u4E0D\u5B58\u5728\u2014\u2014\u5B58\u6863\u53EF\u80FD\u88AB clean \u6E05\u7406\uFF09" : "(previous report unavailable \u2014 archive may have been cleaned)";
       const fm = (key) => {
@@ -2303,6 +2323,12 @@ var init_continuation = __esm({
         `- \u82B1\u8D39 / cost: ${fm("cost-yuan") || "?"} \u5143`,
         `- \u4EA7\u7269\u5206\u652F / branch: ${fm("branch") || "?"}`
       ];
+      const changedAll = [...report.matchAll(/^changed-file:\s*(.+)$/gm)].map((m) => m[1].trim());
+      if (changedAll.length > 0) {
+        const shown = changedAll.slice(0, CHANGED_FILE_CAP);
+        if (changedAll.length > CHANGED_FILE_CAP) shown.push(CHANGED_MORE_NOTE(changedAll.length - CHANGED_FILE_CAP));
+        lines.push("", "\u3010\u524D\u6B21\u6539\u52A8\u6587\u4EF6 / previous changed files\u3011", "", ...shown.map((f) => `- ${f}`));
+      }
       const sec = /^## (?:模型收尾汇报|Model final report)\s*$/m.exec(report);
       if (sec) {
         const rest = report.slice(sec.index + sec[0].length);
@@ -2903,6 +2929,8 @@ ${head}\uFF1A${note}
         "---",
         `title: ${sanitizeTitle(candidate.title)}`,
         `accept: ${acc.accept}`,
+        // defaultSetup（定时时代真缺口）：配置了才写 setup 行（未配置不写，手工票/老行为零变化）；续修票不走此处（本来继承前票 setup）。
+        config.defaultSetup ? `setup: ${config.defaultSetup}` : null,
         `source: ${candidate.sourceId.split(":")[0]}`,
         candidate.url ? `source-url: ${candidate.url}` : null,
         `source-id: ${candidate.sourceId}`,
@@ -3210,12 +3238,13 @@ var pr_exports = {};
 __export(pr_exports, {
   buildPrBody: () => buildPrBody,
   defaultPrFetch: () => defaultPrFetch,
+  nameStatusToPaths: () => nameStatusToPaths,
   runBatchPr: () => runBatchPr
 });
 import fs13 from "fs/promises";
 import os5 from "os";
 import path14 from "path";
-var defaultPrFetch, PR_MSG, msg3, BRANCH_RE, FILE_LIST_CAP, buildPrBody, runBatchPr;
+var defaultPrFetch, PR_MSG, msg3, BRANCH_RE, FILE_LIST_CAP, nameStatusToPaths, buildPrBody, runBatchPr;
 var init_pr = __esm({
   "../core/src/batch/pr.ts"() {
     "use strict";
@@ -3316,6 +3345,7 @@ You can open the MR on the web: branch agent/<ticket-id> is on the remote.`,
     };
     BRANCH_RE = /^[\w][\w./-]*$/;
     FILE_LIST_CAP = 20;
+    nameStatusToPaths = (rows) => rows.map((line) => line.split(/\t/).pop() ?? line).filter(Boolean);
     buildPrBody = (args) => {
       const lines = [
         `## ${args.title}`,
@@ -3452,13 +3482,14 @@ ${mt.stderr}`.split(/\r?\n/).map((l) => l.trim()).filter((l) => l.includes("CONF
           out(M("conflictBlock", conflicts.join("\n")));
           return fail(M("conflictShort"));
         }
-        const nst = await g(["diff", "--name-status", `${mergeBase}..${branch}`]);
+        const nst = await g(["-c", "core.quotepath=false", "diff", "--name-status", `${mergeBase}..${branch}`]);
         const shortstat = await g(["diff", "--shortstat", `${mergeBase}..${branch}`]);
         const files = nst.code === 0 ? nst.stdout.split(/\r?\n/).map((l) => l.trim()).filter(Boolean) : [];
         out(M("reviewHeader", files.length));
         for (const f of files.slice(0, FILE_LIST_CAP)) out(`  ${f}`);
         if (files.length > FILE_LIST_CAP) out(`  ${M("moreFiles", files.length - FILE_LIST_CAP)}`);
         if (shortstat.code === 0 && shortstat.stdout.trim()) out(`  ${shortstat.stdout.trim()}`);
+        const filePaths = nameStatusToPaths(files);
         const bodyTmp = path14.join(os5.tmpdir(), `dsc-pr-body-${process.pid}-${Math.random().toString(36).slice(2, 8)}.md`);
         try {
           await fs13.writeFile(bodyTmp, buildPrBody({
@@ -3466,7 +3497,7 @@ ${mt.stderr}`.split(/\r?\n/).map((l) => l.trim()).filter((l) => l.includes("CONF
             title: ticket.title,
             status,
             costYuan: fm("cost-yuan") || "0",
-            files,
+            files: filePaths,
             issueNumber: gh ? Number(gh[2]) : void 0
           }), "utf-8");
           const pushBranch = `agent/${ticketId}`;
@@ -22833,13 +22864,14 @@ ${args.trajectory}`;
 var batchRunner_exports = {};
 __export(batchRunner_exports, {
   buildReport: () => buildReport,
+  numstatToChangedFiles: () => numstatToChangedFiles,
   parseWaitWindow: () => parseWaitWindow,
   runBatchQueue: () => runBatchQueue
 });
 import fs60 from "fs";
 import path60 from "path";
 import { spawn as spawn8 } from "child_process";
-var BATCH_EDIT_TOOLS, BATCH_DEFAULT_DENYLIST, ACCEPT_TIMEOUT_MIN, ACCEPT_TAIL_LINES, emit2, ts, runAcceptCommand, extraTestPatterns, gitSimple, mainRepoRootOf, touchedTestFiles, collectSessionCost, commitText, buildWatchdogLines, buildReport, runOneTask, parseWaitWindow, nowMinutes, sleep, waitUntilWindow, runBatchQueue;
+var BATCH_EDIT_TOOLS, BATCH_DEFAULT_DENYLIST, ACCEPT_TIMEOUT_MIN, ACCEPT_TAIL_LINES, emit2, ts, runAcceptCommand, extraTestPatterns, gitSimple, mainRepoRootOf, touchedTestFiles, CHANGED_FILE_CAP2, numstatToChangedFiles, collectSessionCost, commitText, buildWatchdogLines, buildReport, runOneTask, parseWaitWindow, nowMinutes, sleep, waitUntilWindow, runBatchQueue;
 var init_batchRunner = __esm({
   "src/batchRunner.ts"() {
     "use strict";
@@ -22931,6 +22963,15 @@ ${lines.slice(-ACCEPT_TAIL_LINES).join("\n")}` : text;
       if (!out) return [];
       return out.split("\n").map((s) => s.trim()).filter(Boolean).filter((f) => isTestPath(f, extraTestPatterns));
     };
+    CHANGED_FILE_CAP2 = 30;
+    numstatToChangedFiles = (raw) => raw.split("\n").map((l) => l.trim()).filter(Boolean).map((line) => {
+      const cols = line.split("	");
+      const file = cols.pop() ?? "?";
+      const added = cols[0] ?? "-";
+      const removed = cols[1] ?? "-";
+      const counts = added === "-" && removed === "-" ? "(binary)" : `(+${added}/-${removed})`;
+      return `${file} ${counts}`;
+    });
     collectSessionCost = async (sessionId) => {
       const recs = (await readUsageRecords(2)).filter((r) => r.sessionId === sessionId || r.sessionId.startsWith(sessionId + "__sub__"));
       const c = { rounds: 0, mainRounds: 0, subRuns: 0, promptTokens: 0, completionTokens: 0, cachedTokens: 0, costYuan: null, toolCostYuan: 0, auxCostYuan: 0, partialPrice: false, durationMs: 0 };
@@ -22995,6 +23036,10 @@ ${T.testFilesH}
 ${T.testFilesNote(args.touchedTestFiles.length)}
 ${args.touchedTestFiles.map((f) => `- \`${f}\``).join("\n")}
 ` : "";
+      const changed = args.changedFiles ?? [];
+      const changedFm = changed.length === 0 ? "" : changed.slice(0, CHANGED_FILE_CAP2).map((f) => `changed-file: ${f}
+`).join("") + (changed.length > CHANGED_FILE_CAP2 ? `changed-file: ${T.changedMore(changed.length - CHANGED_FILE_CAP2)}
+` : "");
       return `---
 id: ${id}
 title: ${ticket.title}
@@ -23006,7 +23051,7 @@ ${ticket.needsReview ? "needs-review: true\n" : ""}session: batch-${id}
 worktree: ${wt?.path ?? T.notCreated}
 branch: ${wt?.branch ?? T.notCreated}
 ${ticket.continues ? `continues: ${ticket.continues}
-` : ""}---
+` : ""}${changedFm}---
 
 ${T.reportTitle(ticket.title)}
 
@@ -23407,6 +23452,8 @@ ${s.output}
       else if (commit.error) emit2(T.commitFail(commit.error));
       const diff = await harvestDiff(wt);
       const touched = await touchedTestFiles(wt.path, wt.baseSha);
+      const changedNumstat = await gitSimple(["-c", "core.quotepath=false", "diff", "--cached", "--numstat", wt.baseSha], wt.path);
+      const changedFiles = changedNumstat ? numstatToChangedFiles(changedNumstat) : void 0;
       let downgraded = false;
       if (status === "passed" && touched.length > 0 && !t.needsReview) {
         t.needsReview = true;
@@ -23429,7 +23476,8 @@ ${s.output}
         errorMessage: agentError,
         watchdogLines: buildWatchdogLines(wdSnapshots, cost.costYuan) ?? void 0,
         touchedTestFiles: touched.length > 0 ? touched : void 0,
-        imagesRead
+        imagesRead,
+        changedFiles
       }));
       if (downgraded) {
         await markTicketNeedsReview(doneTicketPath(task.id)).catch(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "deepseeker-code",
-    "version": "1.0.65",
+    "version": "1.0.66",
     "description": "DeepSeeker-Code 终端客户端（React Ink，in-process 直驱 runAgent）",
     "homepage": "https://github.com/xknk/deepSeekCode#readme",
     "repository": {