@andyqiu/codeforge 0.5.11 → 0.5.13

package/bin/codeforge.mjs

@@ -95,7 +95,7 @@ function parseArgs(argv) {
 // ────────────────────────────────────────────────────────────────────
 // opencode installer：薄壳，调现成的 install.ps1 / install.sh
 // ────────────────────────────────────────────────────────────────────
-function installOpencode({ scope, dryRun, extraArgs }) {
+function installOpencode({ scope, dryRun, extraArgs, quiet = false }) {
   const isWin = process.platform === "win32"
   const script = isWin ? path.join(REPO_ROOT, "install.ps1") : path.join(REPO_ROOT, "install.sh")
   if (!existsSync(script)) {
@@ -116,7 +116,11 @@ function installOpencode({ scope, dryRun, extraArgs }) {
   }
   const all = [...baseArgs, ...flagArgs, ...(extraArgs ?? [])]
   log(`opencode: ${cmd} ${all.join(" ")}`)
-  const r = spawnSync(cmd, all, { stdio: "inherit", cwd: REPO_ROOT })
+  const r = spawnSync(cmd, all, { stdio: quiet ? "pipe" : "inherit", cwd: REPO_ROOT })
+  if (quiet && r.status !== 0) {
+    if (r.stderr) process.stderr.write(r.stderr)
+    if (r.stdout) process.stderr.write(r.stdout)
+  }
   return r.status ?? 1
 }
 
@@ -288,46 +292,86 @@ function cmdRollback(args) {
 // ────────────────────────────────────────────────────────────────────
 // 子命令：upgrade —— 升级到 npm latest 并重新 install --global
 // ────────────────────────────────────────────────────────────────────
-function cmdUpgrade(args) {
+
+async function cmdUpgrade(args) {
   const dryRun = !!args.flags["dry-run"] || !!args.flags.dryRun
   const currentVersion = getVersion()
 
-  log(`CodeForge upgrade`)
-  log(`  当前版本 : ${currentVersion}`)
-  log(`  dry-run  : ${dryRun}`)
-  hr()
+  log(`检查版本...`)
 
-  const npmCmd = "npm"
-  const npmArgs = ["install", "-g", "@andyqiu/codeforge@latest"]
-  log(`步骤 1/2：${npmCmd} ${npmArgs.join(" ")}`)
-
-  if (!dryRun) {
-    const r = spawnSync(npmCmd, npmArgs, { stdio: "inherit", shell: true })
-    if (r.status !== 0) {
-      err(`npm install 失败 (exit=${r.status ?? 1})`)
-      err(`提示：可手动跑 npm install -g @andyqiu/codeforge@latest`)
-      return 1
-    }
+  // 查询 npm registry 最新版本
+  let latestVersion = null
+  try {
+    latestVersion = await new Promise((resolve) => {
+      import("node:https").then((mod) => {
+        const https = mod.default ?? mod  // node:https ESM 无 default export
+        const options = {
+          hostname: "registry.npmjs.org",
+          path: "/@andyqiu%2Fcodeforge/latest",
+          method: "GET",
+          headers: { "User-Agent": "codeforge-cli" },
+          timeout: 5000,
+        }
+        const req = https.get(options, (res) => {
+          let data = ""
+          res.on("data", (chunk) => { data += chunk })
+          res.on("end", () => {
+            try { resolve(JSON.parse(data).version ?? null) } catch { resolve(null) }
+          })
+        })
+        req.on("timeout", () => { req.destroy(); resolve(null) })
+        req.on("error", () => resolve(null))
+      }).catch(() => resolve(null))
+    })
+  } catch {
+    latestVersion = null
+  }
+
+  if (latestVersion === null) {
+    warn(`版本检查失败，继续升级流程`)
+  } else if (latestVersion === currentVersion) {
+    ok(`当前已是最新版本 v${currentVersion}，无需升级`)
+    return 0
   } else {
-    log(`[dry-run] 跳过 npm install`)
+    log(`当前版本：${currentVersion} → 最新版本：${latestVersion}`)
   }
 
   hr()
-  log(`步骤 2/2：codeforge install --global`)
+  log(`正在升级...`)
 
-  if (!dryRun) {
-    const skipBuildFlag = process.platform === "win32" ? "-SkipBuild" : "--skip-build"
-    const code = installOpencode({ scope: "global", dryRun: false, extraArgs: [skipBuildFlag] })
-    if (code !== 0) {
-      err(`install --global 失败 (exit=${code})`)
-      return 1
-    }
-  } else {
-    log(`[dry-run] 跳过 install --global`)
+  const npmCmd = "npm"
+  // 有明确版本号时用精确版本，绕过 @latest dist-tag 缓存
+  const installTarget = latestVersion
+    ? `@andyqiu/codeforge@${latestVersion}`
+    : "@andyqiu/codeforge@latest"
+  const npmArgs = ["install", "-g", installTarget]
+
+  if (dryRun) {
+    const displayNew = latestVersion ?? "未知（版本查询失败）"
+    ok(`[dry-run] 演示升级：${currentVersion} → ${displayNew}`)
+    ok(`[dry-run] 实际执行时将自动重启生效提示`)
+    return 0
   }
 
-  hr()
-  ok(`升级完成！运行 codeforge -v 查看新版本`)
+  const r = spawnSync(npmCmd, npmArgs, { stdio: "pipe", shell: true })
+  if (r.status !== 0) {
+    if (r.stderr) process.stderr.write(r.stderr)
+    if (r.stdout) process.stderr.write(r.stdout)
+    err(`npm install 失败 (exit=${r.status ?? 1})`)
+    err(`提示：可手动跑 npm install -g ${installTarget}`)
+    return 1
+  }
+
+  const skipBuildFlag = process.platform === "win32" ? "-SkipBuild" : "--skip-build"
+  const code = installOpencode({ scope: "global", dryRun: false, extraArgs: [skipBuildFlag], quiet: true })
+  if (code !== 0) {
+    err(`install --global 失败 (exit=${code})`)
+    return 1
+  }
+
+  // 升级后读取新版本（npm install 成功后本地 package.json 已更新）
+  const newVersion = latestVersion ?? getVersion()
+  ok(`升级完成：${currentVersion} → ${newVersion}`)
   ok(`重启 opencode 后新版本生效`)
   return 0
 }
@@ -437,7 +481,7 @@ function cmdHelp() {
   codeforge list
   codeforge version
   codeforge rollback   [--target=<path>] [--dry-run]   # 恢复最近 backup（auto_install 失败救场）
-  codeforge upgrade           [--dry-run]   # 升级到 npm latest 并重新 install --global
+  codeforge upgrade|update    [--dry-run]   # 升级到 npm latest 并重新 install --global
   codeforge runtime where [<path>]   # 打印当前项目的全局运行时目录
   codeforge adr-init   [--force] [--dry-run] [--write-prepare] [--no-pre-push]
                                      # 把 ADR 校验体系（hooks + scripts + 模板）下发到当前 git 项目
@@ -502,6 +546,7 @@ async function main() {
     case "rollback":
       return cmdRollback(args)
     case "upgrade":
+    case "update":
       return cmdUpgrade(args)
     case "runtime":
       return cmdRuntime(args)

package/dist/index.js

@@ -13228,6 +13228,15 @@ async function markPlanReadOk(opts) {
     return true;
   });
 }
+async function touchEntryUpdatedAt(opts) {
+  return await mutateRegistry(opts.mainRoot, (reg) => {
+    const entry = reg.entries.find((e) => e.sessionId === opts.sessionId);
+    if (!entry || entry.status !== "active")
+      return false;
+    entry.updatedAt = new Date().toISOString();
+    return true;
+  });
+}
 async function mergeSessionBack(opts) {
   const mainRoot = path13.resolve(opts.mainRoot);
   const entry = await getSessionWorktree(opts.sessionId, mainRoot);
@@ -13470,6 +13479,7 @@ Codeforge-Base: ${baseSha.slice(0, 12)}`;
   return subject + body + footer;
 }
 var ORPHAN_GRACE_MS = 60000;
+var SEMANTIC_ORPHAN_MIN_AGE_MS = 24 * 60 * 60000;
 async function pruneDiscardedRegistryEntries(mainRoot, opts = {}) {
   const keepRecent = opts.keepRecent ?? 50;
   if (keepRecent < 0) {
@@ -13491,7 +13501,7 @@ async function pruneDiscardedRegistryEntries(mainRoot, opts = {}) {
     return { pruned, kept: kept.length };
   });
 }
-async function pruneOrphanWorktrees(mainRoot) {
+async function pruneOrphanWorktrees(mainRoot, opts = {}) {
   const resolved = path13.resolve(mainRoot);
   const cleaned = [];
   const failed = [];
@@ -13551,6 +13561,60 @@ async function pruneOrphanWorktrees(mainRoot) {
       }
     }
   });
+  if (opts.isSessionAlive) {
+    const minAge = opts.semanticOrphanMinAgeMs ?? SEMANTIC_ORPHAN_MIN_AGE_MS;
+    const probe = opts.isSessionAlive;
+    await mutateRegistry(resolved, async (reg2) => {
+      const now = Date.now();
+      for (const entry of reg2.entries) {
+        if (entry.status !== "active")
+          continue;
+        const updatedMs = Date.parse(entry.updatedAt);
+        if (!Number.isFinite(updatedMs) || now - updatedMs < minAge) {
+          skipped++;
+          continue;
+        }
+        let aliveResult;
+        try {
+          aliveResult = await probe(entry.sessionId);
+        } catch {
+          skipped++;
+          continue;
+        }
+        if (aliveResult.source === "unknown") {
+          skipped++;
+          continue;
+        }
+        if (aliveResult.alive) {
+          skipped++;
+          continue;
+        }
+        try {
+          await removeWorktree({
+            root: resolved,
+            worktree_path: entry.worktreePath,
+            force: true
+          });
+        } catch (err) {
+          failed.push({
+            worktreePath: entry.worktreePath,
+            error: `D 类 removeWorktree 失败: ${err instanceof Error ? err.message : String(err)}`
+          });
+          continue;
+        }
+        try {
+          await runGit2(resolved, ["branch", "-D", entry.branch]);
+        } catch {}
+        entry.status = "discarded";
+        entry.updatedAt = new Date().toISOString();
+        cleaned.push({
+          sessionId: entry.sessionId,
+          worktreePath: entry.worktreePath,
+          reason: `D 类语义孤儿 (opencode session ${aliveResult.source}: dead)`
+        });
+      }
+    });
+  }
   const codeforgeWorktreeRoot = path13.resolve(path13.join(resolved, DEFAULT_WORKTREE_SUBDIR));
   const fsWorktreePaths = [];
   try {
@@ -21710,7 +21774,7 @@ import * as zlib from "node:zlib";
 // lib/version-injected.ts
 function getInjectedVersion() {
   try {
-    const v = "0.5.11";
+    const v = "0.5.13";
     if (typeof v === "string" && /^\d+\.\d+\.\d+/.test(v)) {
       return v;
     }
@@ -22990,9 +23054,9 @@ var handler24 = workflowEngineServer;
 import path27 from "node:path";
 var PLUGIN_NAME25 = "session-worktree-guard";
 logLifecycle(PLUGIN_NAME25, "import", {});
-var WRITE_INTENT_RE = />(?!=)|\btee\b|\brm\b|\bmv\b|\bcp\b|\bmkdir\b|\btouch\b|\bchmod\b|\bchown\b|\bln\b/;
+var WRITE_INTENT_RE = />(?![=&])|\btee\b|\brm\b|\bmv\b|\bcp\b|\bmkdir\b|\btouch\b|\bchmod\b|\bchown\b|\bln\b/;
 var READ_ONLY_COMMANDS = /^\s*(?:ls|cat|head|tail|grep|rg|find|fd|wc|stat|file|which|whereis|echo|pwd|cd|pushd|popd|env|printenv|type|less|more|sort|uniq|awk|tr|cut|jq|date|whoami|id|uname|git(?:\s+-C\s+\S+)?\s+(?:log|show|diff|status|branch|tag|remote|config\s+--get|rev-parse|rev-list|ls-files|ls-tree|cat-file|describe|reflog|blame|shortlog|name-rev|symbolic-ref|merge-base|worktree\s+list|stash\s+list|stash\s+show))\b/;
-var SIDE_EFFECT_TOKEN_RE = />(?!=)|\|\s*tee\b|\btee\b/;
+var SIDE_EFFECT_TOKEN_RE = />(?![=&])|\|\s*tee\b|\btee\b/;
 function isReadOnlyBashCommand(command) {
   if (!READ_ONLY_COMMANDS.test(command))
     return false;
@@ -23013,11 +23077,27 @@ function buildGitVcsWriteRegex(mainRoot) {
   return new RegExp(`git\\b[^\\n]*(?:-C\\s+|--work-tree[=\\s])${esc}`);
 }
 var WRITE_TOOLS = new Set(["write", "edit", "ast_edit"]);
+var TOUCH_THROTTLE_MS = 5 * 60000;
+var _touchCache = new Map;
 var CLASS_B_CALLER_WHITELIST = new Set([
   "codeforge",
   "reviewer",
+  "reviewer-lite",
   "general"
 ]);
+var CODEFORGE_WORKTREE_DIR_NAME = path27.join(".git", "codeforge-worktrees");
+function worktreesRoot(mainRoot) {
+  return path27.join(mainRoot, CODEFORGE_WORKTREE_DIR_NAME);
+}
+function isInsideAnyWorktreeDir(absPath, mainRoot) {
+  if (!path27.isAbsolute(absPath))
+    return false;
+  const root = worktreesRoot(mainRoot);
+  if (absPath === root)
+    return false;
+  const prefix = root.endsWith(path27.sep) ? root : root + path27.sep;
+  return absPath.startsWith(prefix);
+}
 function rewritePath(value, mainRoot, worktreeRoot) {
   if (!value)
     return null;
@@ -23026,6 +23106,9 @@ function rewritePath(value, mainRoot, worktreeRoot) {
   if (resolved === worktreeRoot || resolved.startsWith(wtPrefix2)) {
     return null;
   }
+  if (isInsideAnyWorktreeDir(resolved, mainRoot)) {
+    return null;
+  }
   if (resolved === mainRoot)
     return worktreeRoot;
   const prefix = mainRoot.endsWith("/") ? mainRoot : mainRoot + "/";
@@ -23055,7 +23138,20 @@ function commandContainsMainRootExcludingWorktree(command, mainRoot, worktreePat
       return true;
     }
   }
-  const sanitized = command.split(worktreePath).join("");
+  const wtRoot = worktreesRoot(mainRoot);
+  const wtRootPrefix = wtRoot + path27.sep;
+  const escapedWtRootPrefix = escapeRegex2(wtRootPrefix);
+  const wtPathPattern = escapedWtRootPrefix + `[^\\s'"\\x60)]*`;
+  const allWorktreePathsReForEscape = new RegExp(wtPathPattern, "g");
+  const allWorktreePathsReForReplace = new RegExp(wtPathPattern, "g");
+  for (const match of command.matchAll(allWorktreePathsReForEscape)) {
+    const matchedPath = match[0];
+    const tail = matchedPath.slice(wtRootPrefix.length);
+    if (/(?:^|[/\\])\.\.(?:[/\\]|$)/.test(tail)) {
+      return true;
+    }
+  }
+  const sanitized = command.split(worktreePath).join("").replace(allWorktreePathsReForReplace, "");
   return commandContainsMainRoot(sanitized, mainRoot);
 }
 function detectBashWriteIntent(command, mainRoot) {
@@ -23197,6 +23293,22 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
           }
         }
         const worktreePath = entry.worktreePath;
+        if (entry.status === "active" && isWriteOperation(toolName, argsObj, mainRoot)) {
+          const last = _touchCache.get(entry.sessionId) ?? 0;
+          const nowMs = Date.now();
+          if (nowMs - last > TOUCH_THROTTLE_MS) {
+            _touchCache.set(entry.sessionId, nowMs);
+            touchEntryUpdatedAt({
+              sessionId: entry.sessionId,
+              mainRoot
+            }).catch((err) => {
+              log14.warn("touchEntryUpdatedAt 失败 (已忽略)", {
+                sessionId: entry?.sessionId,
+                error: err instanceof Error ? err.message : String(err)
+              });
+            });
+          }
+        }
         if (toolName === "session_merge") {
           const action = argsObj["action"];
           if (action === "merge") {
@@ -23425,6 +23537,103 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
 };
 var handler25 = sessionWorktreeGuardPlugin;
 
+// lib/opencode-session-probe.ts
+import * as path28 from "node:path";
+import * as os6 from "node:os";
+import { createRequire as createRequire2 } from "node:module";
+var requireFromHere = createRequire2(import.meta.url);
+var DEFAULT_LIVENESS_MS = 6 * 60 * 60000;
+var DEFAULT_DB_PATH = path28.join(os6.homedir(), ".local/share/opencode/opencode.db");
+function createSessionProbe(opts = {}) {
+  const dbPath = opts.dbPath ?? DEFAULT_DB_PATH;
+  const httpBaseUrl = opts.httpBaseUrl ?? process.env["OPENCODE_SERVER_URL"];
+  const livenessWindowMs = opts.livenessWindowMs ?? DEFAULT_LIVENESS_MS;
+  const timeoutMs = opts.timeoutMs ?? 1500;
+  let db = null;
+  let dbInitTried = false;
+  let dbStmt = null;
+  async function tryOpenDb() {
+    if (dbInitTried)
+      return db != null;
+    dbInitTried = true;
+    try {
+      const mod = requireFromHere("node:sqlite");
+      try {
+        db = new mod.DatabaseSync(dbPath, { readOnly: true });
+      } catch {
+        db = null;
+        dbStmt = null;
+        return false;
+      }
+      dbStmt = db.prepare("SELECT time_updated, time_archived FROM session WHERE id = ? LIMIT 1");
+      return true;
+    } catch {
+      db = null;
+      dbStmt = null;
+      return false;
+    }
+  }
+  async function probeHttp(sessionId) {
+    if (!httpBaseUrl)
+      return null;
+    try {
+      const ctrl = new AbortController;
+      const t = setTimeout(() => ctrl.abort(), timeoutMs);
+      const res = await fetch(`${httpBaseUrl.replace(/\/$/, "")}/session`, {
+        signal: ctrl.signal
+      }).finally(() => clearTimeout(t));
+      if (!res.ok)
+        return null;
+      const list = await res.json();
+      const hit = Array.isArray(list) && list.some((s) => s.id === sessionId);
+      return { alive: hit, source: "http" };
+    } catch {
+      return null;
+    }
+  }
+  async function probeSqlite(sessionId) {
+    if (!await tryOpenDb() || !dbStmt)
+      return null;
+    try {
+      const row = dbStmt.get(sessionId);
+      if (!row) {
+        return { alive: false, source: "sqlite" };
+      }
+      if (row.time_archived != null) {
+        return {
+          alive: false,
+          source: "sqlite",
+          time_archived: row.time_archived
+        };
+      }
+      const now = Date.now();
+      const tu = Number(row.time_updated) || 0;
+      const alive = now - tu < livenessWindowMs;
+      return { alive, source: "sqlite", time_updated: tu, time_archived: null };
+    } catch {
+      return null;
+    }
+  }
+  return {
+    async isSessionAlive(sessionId) {
+      const http = await probeHttp(sessionId);
+      if (http)
+        return http;
+      const sql = await probeSqlite(sessionId);
+      if (sql)
+        return sql;
+      return { alive: true, source: "unknown" };
+    },
+    close() {
+      try {
+        db?.close?.();
+      } catch {}
+      db = null;
+      dbStmt = null;
+    }
+  };
+}
+
 // plugins/worktree-lifecycle.ts
 var PLUGIN_NAME26 = "worktree-lifecycle";
 logLifecycle(PLUGIN_NAME26, "import", {});
@@ -23435,6 +23644,7 @@ var PRUNE_INTERVAL_MS = 30 * 60000;
 var lastIdleToastAt = new Map;
 var pruneRunning = false;
 var _pruneTimer;
+var _probe = null;
 var log15 = makePluginLogger(PLUGIN_NAME26);
 var worktreeLifecyclePlugin = async (ctx) => {
   const mainRoot = ctx.directory;
@@ -23446,9 +23656,17 @@ var worktreeLifecyclePlugin = async (ctx) => {
     return {};
   }
   const client = ctx.client;
+  if (_probe) {
+    try {
+      _probe.close();
+    } catch {}
+  }
+  _probe = createSessionProbe();
   setImmediate(() => {
     safeAsync(PLUGIN_NAME26, "activate.pruneOrphan", async () => {
-      const result = await pruneOrphanWorktrees(mainRoot);
+      const result = await pruneOrphanWorktrees(mainRoot, {
+        isSessionAlive: _probe.isSessionAlive
+      });
       if (result.cleaned.length > 0 || result.failed.length > 0) {
         log15.info(`[pruneOrphan] cleaned=${result.cleaned.length} failed=${result.failed.length} skipped=${result.skipped}`);
         safeWriteLog(PLUGIN_NAME26, {
@@ -23474,7 +23692,9 @@ var worktreeLifecyclePlugin = async (ctx) => {
     pruneRunning = true;
     safeAsync(PLUGIN_NAME26, "interval.pruneOrphan", async () => {
       try {
-        const result = await pruneOrphanWorktrees(mainRoot);
+        const result = await pruneOrphanWorktrees(mainRoot, {
+          isSessionAlive: _probe.isSessionAlive
+        });
         if (result.cleaned.length > 0 || result.failed.length > 0) {
           log15.info(`[pruneOrphan interval] cleaned=${result.cleaned.length} failed=${result.failed.length} skipped=${result.skipped}`);
           safeWriteLog(PLUGIN_NAME26, {

package/package.json

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