@andyqiu/codeforge 0.5.10 → 0.5.12

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);
@@ -13262,12 +13271,25 @@ async function mergeSessionBack(opts) {
   }
   const hasDevOnce = await packageHasScript(mainRoot, "dev:once");
   if (hasDevOnce) {
-    try {
-      await runCmd("npm", ["run", "dev:once"], mainRoot);
-    } catch (err) {
-      await runGit2(mainRoot, ["reset", "--hard", "HEAD"]).catch(() => {});
-      const msg = err instanceof Error ? err.message : String(err);
-      throw new Error(`dev:once 失败已 reset 主仓: ${msg}`);
+    const stagedRaw = await runGit2(mainRoot, [
+      "diff",
+      "--cached",
+      "--name-only",
+      "--diff-filter=ACMR"
+    ]);
+    const stagedPaths = stagedRaw.split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
+    const canSkipDevOnce = await shouldSkipDevOnce(mainRoot, stagedPaths);
+    if (canSkipDevOnce) {
+      const sourceCount = stagedPaths.filter((p) => /^(plugins|lib|src)\//.test(p) && !/\.(md|test\.ts)$/.test(p)).length;
+      console.log(`[session-worktree] skip dev:once: dist 已是最新（${sourceCount} staged 源文件 mtime <= dist mtime）`);
+    } else {
+      try {
+        await runCmd("npm", ["run", "dev:once"], mainRoot);
+      } catch (err) {
+        await runGit2(mainRoot, ["reset", "--hard", "HEAD"]).catch(() => {});
+        const msg = err instanceof Error ? err.message : String(err);
+        throw new Error(`dev:once 失败已 reset 主仓: ${msg}`);
+      }
     }
   } else {
     console.log(`[session-worktree] skip dev:once: not configured in ${mainRoot}/package.json`);
@@ -13275,7 +13297,9 @@ async function mergeSessionBack(opts) {
   const squashedRaw = await runGit2(wt, ["log", "--format=%s", `${baseSha}..HEAD`]);
   const squashedCommits = squashedRaw.split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
   const message = opts.commitMessage ?? buildMergeMessage(opts.sessionId, branch, baseSha, squashedCommits);
-  await runGit2(mainRoot, ["commit", "-m", message]);
+  await runGitWithEnv(mainRoot, ["commit", "-m", message], {
+    SKIP_DEV_SYNC_CHECK: "1"
+  });
   const newSha = (await runGit2(mainRoot, ["rev-parse", "HEAD"])).trim();
   try {
     await removeWorktree({ root: mainRoot, worktree_path: wt, force: true });
@@ -13376,6 +13400,24 @@ function runGit2(cwd, args, timeoutMs = 1e4) {
     });
   });
 }
+function runGitWithEnv(cwd, args, envOverrides, timeoutMs = 1e4) {
+  const inheritedEnv = process["env"];
+  return new Promise((resolve11, reject) => {
+    execFile3("git", args, {
+      cwd,
+      timeout: timeoutMs,
+      windowsHide: true,
+      encoding: "utf8",
+      env: Object.assign({}, inheritedEnv, envOverrides)
+    }, (err, stdout, stderr) => {
+      if (err) {
+        reject(new Error(`git ${args.join(" ")} (cwd=${cwd}) 失败: ${stderr?.trim() || err.message}`));
+        return;
+      }
+      resolve11(stdout);
+    });
+  });
+}
 async function packageHasScript(mainRoot, scriptName) {
   try {
     const pkgPath = path13.join(mainRoot, "package.json");
@@ -13388,7 +13430,31 @@ async function packageHasScript(mainRoot, scriptName) {
     return false;
   }
 }
-function runCmd(cmd, args, cwd, timeoutMs = 120000) {
+async function shouldSkipDevOnce(mainRoot, stagedPaths) {
+  let distMtimeSec;
+  try {
+    const st = await fs10.stat(path13.join(mainRoot, "dist/index.js"));
+    distMtimeSec = Math.floor(st.mtimeMs / 1000);
+  } catch {
+    return false;
+  }
+  const relevant = stagedPaths.filter((p) => /^(plugins|lib|src)\//.test(p) && !/\.(md|test\.ts)$/.test(p));
+  if (relevant.length === 0)
+    return true;
+  for (const rel of relevant) {
+    try {
+      const abs = path13.join(mainRoot, rel);
+      const st = await fs10.stat(abs);
+      const srcMtimeSec = Math.floor(st.mtimeMs / 1000);
+      if (srcMtimeSec > distMtimeSec)
+        return false;
+    } catch {
+      return false;
+    }
+  }
+  return true;
+}
+function runCmd(cmd, args, cwd, timeoutMs = 300000) {
   return new Promise((resolve11, reject) => {
     execFile3(cmd, args, { cwd, timeout: timeoutMs, windowsHide: true, encoding: "utf8" }, (err, stdout, stderr) => {
       if (err) {
@@ -13413,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) {
@@ -13434,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 = [];
@@ -13494,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 {
@@ -21232,7 +21353,11 @@ var RISK_PATTERNS = [
     kinds: ["bash", "other"],
     re: /\b(DROP\s+(DATABASE|TABLE)|TRUNCATE\s+TABLE|DROP\s+SCHEMA)\b/i
   },
-  { tag: "write_secrets", re: /(\.env(?:\.\w+)?|id_[edr]sa|\.ssh\/id_|\.pem|\.p12|secret\.json)/i },
+  {
+    tag: "write_secrets",
+    re: /(\.env(?:\.\w+)?|id_[edr]sa|\.ssh\/id_|\.pem|\.p12|secret\.json)/i,
+    matchOn: ["command", "filePath", "path"]
+  },
   {
     tag: "write_etc",
     kinds: ["bash", "edit"],
@@ -21313,11 +21438,11 @@ function classifyTool(tool2) {
 }
 function evaluateRisk(tool2, args) {
   const kind = classifyTool(tool2);
-  const haystack = buildHaystack(args);
   const hits = [];
   for (const pattern of RISK_PATTERNS) {
     if (pattern.kinds && !pattern.kinds.includes(kind))
       continue;
+    const haystack = buildHaystackFor(args, pattern.matchOn);
     const m = haystack.match(pattern.re);
     if (m) {
       hits.push({
@@ -21338,6 +21463,19 @@ function buildHaystack(args) {
     return String(args);
   }
 }
+function buildHaystackFor(args, matchOn) {
+  if (!matchOn || matchOn.length === 0) {
+    return buildHaystack(args);
+  }
+  const parts = [];
+  for (const key of matchOn) {
+    if (key in args) {
+      const val = args[key];
+      parts.push(typeof val === "string" ? val : JSON.stringify(val));
+    }
+  }
+  return parts.join(" ");
+}
 
 // lib/file-regex-acl.ts
 import * as path23 from "node:path";
@@ -21636,7 +21774,7 @@ import * as zlib from "node:zlib";
 // lib/version-injected.ts
 function getInjectedVersion() {
   try {
-    const v = "0.5.10";
+    const v = "0.5.12";
     if (typeof v === "string" && /^\d+\.\d+\.\d+/.test(v)) {
       return v;
     }
@@ -22916,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;
@@ -22939,6 +23077,8 @@ 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",
@@ -22970,6 +23110,20 @@ function commandContainsMainRoot(command, mainRoot) {
   const re = new RegExp(`${escapeRegex2(mainRoot)}(?=[\\s'"\`)]|$)`);
   return re.test(command);
 }
+function commandContainsMainRootExcludingWorktree(command, mainRoot, worktreePath) {
+  if (!worktreePath || worktreePath === mainRoot) {
+    return commandContainsMainRoot(command, mainRoot);
+  }
+  const wtpIdx = command.indexOf(worktreePath);
+  if (wtpIdx !== -1) {
+    const afterWtp = command.slice(wtpIdx + worktreePath.length);
+    if (/(?:^|[/\\])\.\.(?:[/\\\s'";|<>]|$)/.test(afterWtp)) {
+      return true;
+    }
+  }
+  const sanitized = command.split(worktreePath).join("");
+  return commandContainsMainRoot(sanitized, mainRoot);
+}
 function detectBashWriteIntent(command, mainRoot) {
   if (isReadOnlyBashCommand(command))
     return false;
@@ -23109,6 +23263,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") {
@@ -23227,7 +23397,7 @@ var sessionWorktreeGuardPlugin = async (ctx) => {
         }
         if (toolName === "bash") {
           const command = argsObj["command"];
-          if (typeof command === "string" && commandContainsMainRoot(command, mainRoot) && detectBashWriteIntent(command, mainRoot)) {
+          if (typeof command === "string" && commandContainsMainRootExcludingWorktree(command, mainRoot, worktreePath) && detectBashWriteIntent(command, mainRoot)) {
             const caller = await resolveAgentForGuard({ sessionID: input.sessionID, agent: input.agent }, ctx.client, log14);
             if (caller !== null && CLASS_B_CALLER_WHITELIST.has(caller)) {
               log14.debug?.(`[class-b-whitelist] allow caller=${caller}`, { sessionId, tool: toolName, command: command.slice(0, 200) });
@@ -23337,6 +23507,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", {});
@@ -23347,6 +23614,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;
@@ -23358,9 +23626,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, {
@@ -23386,7 +23662,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.10",
+  "version": "0.5.12",
   "description": "CodeForge — opencode 的零侵入扩展包",
   "type": "module",
   "private": false,