@andyqiu/codeforge 0.8.16 → 0.8.18

package/dist/index.js

@@ -22873,7 +22873,7 @@ class ApprovalStore {
     await fs6.writeFile(file2, JSON.stringify(meta, null, 2), "utf8");
     return file2;
   }
-  async getLatest(pendingId) {
+  async getLatestRaw(pendingId) {
     const dir = path8.join(this.base, pendingId);
     const files = await this.safeReaddir(dir);
     const metaFiles = files.filter((f) => /^meta(?:-\d+)?\.json$/.test(f));
@@ -22890,6 +22890,33 @@ class ApprovalStore {
     all.sort((a, b) => b.createdAt.localeCompare(a.createdAt));
     return all[0];
   }
+  async getLatest(pendingId) {
+    const raw = await this.getLatestRaw(pendingId);
+    if (!raw)
+      return;
+    if (raw.invalidatedAt)
+      return;
+    return raw;
+  }
+  async invalidateLatest(pendingId, reason) {
+    const raw = await this.getLatestRaw(pendingId);
+    if (!raw)
+      return { ok: false, skipped: "no-record" };
+    if (raw.invalidatedAt)
+      return { ok: false, skipped: "already-invalidated" };
+    const invalidatedRecord = {
+      ...raw,
+      invalidatedAt: new Date().toISOString(),
+      invalidatedReason: reason,
+      createdAt: new Date().toISOString()
+    };
+    const dir = path8.join(this.base, pendingId);
+    await fs6.mkdir(dir, { recursive: true });
+    const filename = await this.pickRecordFilename(dir);
+    const file2 = path8.join(dir, filename);
+    await fs6.writeFile(file2, JSON.stringify(invalidatedRecord, null, 2), "utf8");
+    return { ok: true, file: file2 };
+  }
   async findAliasApprovals(ownerSessionId) {
     if (!ownerSessionId)
       return [];
@@ -28116,6 +28143,35 @@ async function sendParentNotice(client, sessionID, text, opts = {}) {
 
 // lib/spawner-production.ts
 init_decision_parser();
+
+// lib/approval-invalidation.ts
+async function invalidateLatestIfStale(store, pendingIds, reason, log5) {
+  for (const pendingId of pendingIds) {
+    try {
+      const result = await store.invalidateLatest(pendingId, reason);
+      if (result.ok) {
+        log5?.("info", `[approval-invalidation] stale approval 已作废`, {
+          pendingId,
+          reason,
+          file: result.file
+        });
+      } else {
+        log5?.("info", `[approval-invalidation] 无需作废`, {
+          pendingId,
+          skipped: result.skipped
+        });
+      }
+    } catch (err) {
+      log5?.("warn", `[approval-invalidation] 作废失败（fail-open），stale 可能残留`, {
+        pendingId,
+        reason,
+        err: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }
+}
+
+// lib/spawner-production.ts
 class ProductionSpawner {
   opts;
   constructor(opts) {
@@ -28153,23 +28209,34 @@ class ProductionSpawner {
     } catch (err) {
       throw err;
     }
+    let result;
     if (r.llmError) {
-      return {
+      result = {
         decision: "REQUEST_CHANGES",
         summary: `reviewer LLM error: ${describe4(r.llmError)}`
       };
-    }
-    const parsed = parseDecision(r.text);
-    if (parsed.token === null) {
-      return {
-        decision: "REQUEST_CHANGES",
-        summary: `decision parse failed: ${parsed.reason}
+    } else {
+      const parsed = parseDecision(r.text);
+      if (parsed.token === null) {
+        result = {
+          decision: "REQUEST_CHANGES",
+          summary: `decision parse failed: ${parsed.reason}
 
 ---
 ${r.text.slice(0, 800)}`
-      };
+        };
+      } else {
+        result = { decision: parsed.token, summary: r.text };
+      }
     }
-    return { decision: parsed.token, summary: r.text };
+    if (result.decision !== "APPROVE" && ownerRoot) {
+      const pendingIds = [`session:${ownerSessionId}`];
+      if (args.sessionId && args.sessionId !== ownerSessionId) {
+        pendingIds.push(`session:${args.sessionId}`);
+      }
+      await invalidateLatestIfStale(ApprovalStore.forProject(ownerRoot), pendingIds, `spawnReviewer round ${args.round}: decision=${result.decision}, invalidating stale approval`, this.opts.log).catch(() => {});
+    }
+    return result;
   }
   async spawnCoder(args) {
     const prompt = buildCoderPrompt(args);
@@ -32690,7 +32757,7 @@ import * as https from "node:https";
 // lib/version-injected.ts
 function getInjectedVersion() {
   try {
-    const v = "0.8.16";
+    const v = "0.8.18";
     if (typeof v === "string" && /^\d+\.\d+\.\d+/.test(v)) {
       return v;
     }
@@ -32815,7 +32882,7 @@ function defaultHttpFetcher(url3, timeoutMs) {
 
 // plugins/update-checker.ts
 var PLUGIN_NAME19 = "update-checker";
-var PLUGIN_VERSION = "3.0.0";
+var PLUGIN_VERSION = "4.0.0";
 var _updateCheckStarted = false;
 function getCacheFile() {
   return join27(process.env["CODEFORGE_CACHE_DIR"] ?? join27(homedir9(), ".cache", "codeforge"), "update-check.json");
@@ -32903,12 +32970,32 @@ function spawnAsync(cmd, args, opts = {}) {
 }
 async function resolveNodeBin() {
   const w = process.platform === "win32";
+  if (w) {
+    try {
+      const r = await spawnAsync("where", ["node.exe"], { timeout: 3000, shell: true });
+      if (r.status === 0 && r.stdout.trim())
+        return r.stdout.trim().split(/\r?\n/)[0].trim();
+    } catch {}
+    try {
+      const r = await spawnAsync("where", ["node"], { timeout: 3000, shell: true });
+      if (r.status === 0 && r.stdout.trim())
+        return r.stdout.trim().split(/\r?\n/)[0].trim();
+    } catch {}
+    for (const c of ["C:\\Program Files\\nodejs\\node.exe", "C:\\Program Files (x86)\\nodejs\\node.exe"]) {
+      try {
+        const r = await spawnAsync(c, ["--version"], { timeout: 2000, shell: false });
+        if (r.status === 0)
+          return c;
+      } catch {}
+    }
+    return process.execPath;
+  }
   try {
-    const r = await spawnAsync(w ? "where" : "which", ["node"], { timeout: 3000 });
+    const r = await spawnAsync("which", ["node"], { timeout: 3000 });
     if (r.status === 0 && r.stdout.trim())
       return r.stdout.trim().split(/\r?\n/)[0].trim();
   } catch {}
-  for (const c of w ? ["C:\\Program Files\\nodejs\\node.exe"] : ["/usr/local/bin/node", "/usr/bin/node", "/opt/homebrew/bin/node", "/opt/homebrew/opt/node/bin/node"]) {
+  for (const c of ["/usr/local/bin/node", "/usr/bin/node", "/opt/homebrew/bin/node", "/opt/homebrew/opt/node/bin/node"]) {
     try {
       const r = await spawnAsync(c, ["--version"], { timeout: 2000 });
       if (r.status === 0)
@@ -32919,12 +33006,34 @@ async function resolveNodeBin() {
 }
 async function resolveNpmBin() {
   const w = process.platform === "win32";
+  if (w) {
+    try {
+      const r = await spawnAsync("where", ["npm.cmd"], { timeout: 3000, shell: true });
+      if (r.status === 0 && r.stdout.trim())
+        return r.stdout.trim().split(/\r?\n/)[0].trim();
+    } catch {}
+    try {
+      const r = await spawnAsync("where", ["npm"], { timeout: 3000, shell: true });
+      if (r.status === 0 && r.stdout.trim()) {
+        const p = r.stdout.trim().split(/\r?\n/)[0].trim();
+        return p.replace(/\.cmd$/i, "") + ".cmd";
+      }
+    } catch {}
+    for (const c of ["C:\\Program Files\\nodejs\\npm.cmd", "C:\\Program Files (x86)\\nodejs\\npm.cmd"]) {
+      try {
+        const r = await spawnAsync(c, ["--version"], { timeout: 2000, shell: true });
+        if (r.status === 0)
+          return c;
+      } catch {}
+    }
+    return "npm.cmd";
+  }
   try {
-    const r = await spawnAsync(w ? "where" : "which", ["npm"], { timeout: 3000 });
+    const r = await spawnAsync("which", ["npm"], { timeout: 3000 });
     if (r.status === 0 && r.stdout.trim())
       return r.stdout.trim().split(/\r?\n/)[0].trim();
   } catch {}
-  for (const c of w ? ["C:\\Program Files\\nodejs\\npm.cmd"] : ["/usr/local/bin/npm", "/usr/bin/npm", "/opt/homebrew/bin/npm"]) {
+  for (const c of ["/usr/local/bin/npm", "/usr/bin/npm", "/opt/homebrew/bin/npm"]) {
     try {
       const r = await spawnAsync(c, ["--version"], { timeout: 2000 });
       if (r.status === 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andyqiu/codeforge",
-  "version": "0.8.16",
+  "version": "0.8.18",
   "description": "CodeForge — opencode 的零侵入扩展包",
   "type": "module",
   "private": false,