dsh-issue2pr 0.1.0 → 0.3.1

package/lib/stages/p6-coder.js

@@ -6,11 +6,11 @@ import { spawn } from "node:child_process";
 import { existsSync, readdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { writeArtifact, readArtifact } from "../store.js";
+import { writeArtifact, readArtifact } from "../core/store.js";
 import { requireArtifact, readRepoFile, logEvent } from "./helpers.js";
-import { slugify, timestamp } from "../store.js";
-import { saveRun, sessionPatchesReady } from "../pipeline.js";
-import { sysOf, paramsOf } from "../stageConfig.js";
+import { slugify, timestamp } from "../core/store.js";
+import { saveRun, sessionPatchesReady } from "../core/pipeline.js";
+import { sysOf, paramsOf } from "../core/stageConfig.js";
 
 // —— claude CLI 进程管理（stop/删除 Run 时杀进程树，避免孤儿 claude 继续写仓库） ——
 const activeExternals = new Map(); // runDir → ChildProcess
@@ -29,15 +29,18 @@ export function killExternal(runDir) {
 
 // claude 可执行文件解析：阶段配置（params.claudeBin）> 环境变量 ISSUE2PR_CLAUDE_BIN > 常见安装位置探测。
 // 开源环境安装路径各异，UI「配置」可显式指定；PATH 里未必有 claude（如 npm 全局目录不在系统 PATH）。
-// preflight 端点复用本函数做健康探测（项目页显示 claude CLI 是否就绪）。
-export function resolveClaudeBin(cfgBin) {
-  if (cfgBin) return cfgBin;
-  if (process.env.ISSUE2PR_CLAUDE_BIN) return process.env.ISSUE2PR_CLAUDE_BIN;
+// preflight 端点与 lib/agents.js 的发现/门禁复用本函数做健康探测。
+export function claudeCommonCandidates() {
   const home = homedir();
-  const cands = process.platform === "win32"
+  return process.platform === "win32"
     ? [join(home, ".npm-global", "claude.cmd"), join(home, ".npm_global", "claude.cmd"), join(home, "AppData", "Roaming", "npm", "claude.cmd"), join(home, ".local", "bin", "claude.exe")]
     : [join(home, ".local", "bin", "claude"), "/usr/local/bin/claude", "/opt/homebrew/bin/claude"];
-  return cands.find((p) => existsSync(p)) || "claude";
+}
+
+export function resolveClaudeBin(cfgBin) {
+  if (cfgBin) return cfgBin;
+  if (process.env.ISSUE2PR_CLAUDE_BIN) return process.env.ISSUE2PR_CLAUDE_BIN;
+  return claudeCommonCandidates().find((p) => existsSync(p)) || "claude";
 }
 
 // 无人值守跑 claude：-p headless；skip-permissions 无交互放行；--add-dir 允许写 run 产物目录（cwd 是仓库）。
@@ -168,7 +171,11 @@ async function delegateClaude(rcx, graph) {
     return { artifact: "06-implementation/", summary: "Claude Code 已执行任务包：" + countPatches(runDir) + " 份 patch + report，等待人工复核" + statsSummary(stats) };
   }
 
-  const reason = r.error || (r.timeout ? "超时被终止" : "退出码 " + r.code + (r.stderr ? "：" + String(r.stderr).slice(0, 300) : ""));
+  // 认证类失败（403 IP 白名单 / 未登录）给出可操作引导——到项目页委外智能体卡片重跑门禁
+  const rawReason = r.error || (r.timeout ? "超时被终止" : "退出码 " + r.code + (r.stderr ? "：" + String(r.stderr).slice(0, 300) : ""));
+  const authHit = /40[13]|authenticat|api[- ]?key|ip access|not logged in/i.test(String(r.stderr || "") + "\n" + String(r.stdout || ""));
+  const reason = rawReason + (authHit
+    ? "；疑似认证/授权问题——请到「项目」页委外智能体卡片重跑测试门禁（检查 Claude 登录状态、API Key 的 IP 白名单或代理出口）" : "");
   setExec({ status: r.error ? "skipped" : "failed", exitCode: r.code, stats, error: String(reason).slice(0, 500), finishedAt: new Date().toISOString() });
   logEvent(rcx, { kind: "tool", name: "Claude Code 执行未产出补丁", detail: String(reason).slice(0, 500), ok: false });
   // 回退等人工：保持 external 语义（UI 显示"等外部执行"并拦截空产物 approve），人可接管 session-task.md

package/lib/stages/p7-patch.js

@@ -3,8 +3,9 @@
 import { readFileSync, existsSync, readdirSync } from "node:fs";
 import { execFile } from "node:child_process";
 import { join } from "node:path";
-import { appendArtifactLine } from "../store.js";
+import { appendArtifactLine } from "../core/store.js";
 import { logEvent } from "./helpers.js";
+import { resetRepoClean } from "../infra/repoState.js";
 
 // 带stdin输入的异步执行（git apply - 用 stdin 收 diff）
 function execStdin(cmd, args, opts, input) {
@@ -27,12 +28,15 @@ async function hashRepo(repoDir) {
 // patch 清单：优先 coder-report.json（builtin 写 patches 字段；claude 委托写 tasks 字段且
 // patch 路径相对 06-implementation/，这里统一归一化为相对 runDir 全路径）；
 // report 缺失时退化为扫描目录（文件名序 = 应用序）。
-function collectPatches(runDir) {
+// 导出供 delegateVerify 复用：验证清单 = P7 应用清单，同一口径。
+export function collectPatches(runDir) {
   const normalize = (p) => !p ? null
     : { patch: p.startsWith("06-implementation/") ? p : "06-implementation/" + p.replace(/^\/+/, "") };
   const reportPath = join(runDir, "06-implementation", "coder-report.json");
   if (existsSync(reportPath)) {
-    const report = JSON.parse(readFileSync(reportPath, "utf8"));
+    let report;
+    try { report = JSON.parse(readFileSync(reportPath, "utf8")); }
+    catch { throw new Error("coder-report.json 损坏（非法 JSON），无法解析补丁清单；请回退 P6 重跑或修复报告文件"); }
     const list = Array.isArray(report.patches) ? report.patches
       : Array.isArray(report.tasks) ? report.tasks.map((t) => ({ patch: t.patch }))
       : [];
@@ -47,6 +51,11 @@ function collectPatches(runDir) {
 export default async function execute(rcx) {
   const patches = collectPatches(rcx.runDir);
   if (!patches.length) throw new Error("P7 无 patch 可应用（06-implementation/patches/ 为空且无 coder-report.json）");
+  // A1/A2 修复：应用补丁前先把工作区重置回 HEAD 基线。
+  // 打回重跑/回退重跑时上一轮已应用的补丁仍在工作区（直接 re-apply 必失败）；
+  // worktree 兜底共用基线 repo 的路径下同理清残留。reset 不碰 .gitignore 的目录（如 node_modules）。
+  await resetRepoClean(rcx.repoDir);
+  logEvent(rcx, { kind: "git", name: "工作区基线重置", detail: "P7 应用补丁前 git reset --hard + git clean -fd" });
   for (const p of patches) {
     const diff = readFileSync(join(rcx.runDir, p.patch), "utf8");
     const hashBefore = await hashRepo(rcx.repoDir);

package/lib/stages/p8-test-runner.js

@@ -3,9 +3,9 @@
 import { exec } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
-import { writeArtifact } from "../store.js";
+import { writeArtifact } from "../core/store.js";
 import { logEvent } from "./helpers.js";
-import { DEFAULT_TEST_TIMEOUT_MS } from "../stageConfig.js";
+import { DEFAULT_TEST_TIMEOUT_MS } from "../core/stageConfig.js";
 
 function detectCommand(repoDir) {
   const pkg = join(repoDir, "package.json");

package/lib/stages/p9-reviewer.js

@@ -1,7 +1,7 @@
 // lib/stages/p9-reviewer.js — 调研 §9：Review 是 PRBuilder 的前置门控
-import { writeArtifact, readArtifact } from "../store.js";
+import { writeArtifact, readArtifact } from "../core/store.js";
 import { requireArtifact, maybeDelegate } from "./helpers.js";
-import { sysOf, paramsOf } from "../stageConfig.js";
+import { sysOf, paramsOf } from "../core/stageConfig.js";
 
 export default async function execute(rcx) {
   const delegated = await maybeDelegate(rcx, "P9");

package/package.json

@@ -1,25 +1,54 @@
 {
   "name": "dsh-issue2pr",
-  "version": "0.1.0",
+  "version": "0.3.1",
   "description": "Issue-to-PR 可验证交付链：项目配置 → 11 阶段流水线 → 人工复核 → PR 说明（DSH 全局插件）",
   "type": "module",
   "main": "./index.js",
-  "exports": { ".": "./index.js", "./client": "./client.js", "./package.json": "./package.json" },
-  "scripts": { "test": "node --test \"tests/**/*.test.js\"" },
+  "exports": {
+    ".": "./index.js",
+    "./client": "./client.js",
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "test": "node --test \"tests/**/*.test.js\""
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/LONGSASASASASA/dsh-issue2pr.git"
   },
-  "keywords": ["dsh", "dsh-plugin", "deepseek-harness", "issue", "pull-request", "pipeline", "code-review", "cordis"],
+  "keywords": [
+    "dsh",
+    "dsh-plugin",
+    "deepseek-harness",
+    "issue",
+    "pull-request",
+    "pipeline",
+    "code-review",
+    "cordis"
+  ],
   "author": "LONGSASASASASA",
   "license": "MIT",
-  "files": ["index.js", "client.js", "lib/", "cordis.patch.yml", "docs/assets/"],
-  "publishConfig": { "registry": "https://registry.npmjs.org/" },
+  "files": [
+    "index.js",
+    "client.js",
+    "lib/",
+    "cordis.patch.yml",
+    "docs/assets/"
+  ],
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "dsh": {
-    "bundle": { "patch": "./cordis.patch.yml" },
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
     "client": {
       "platform": "web",
-      "inject": ["@deepseek-ai/dsh-client-runtime", "@deepseek-ai/dsh-client-locale", "@deepseek-ai/dsh-client-ui-settings"]
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-settings"
+      ]
     }
   },
   "peerDependencies": {