@clawos-dev/clawd 0.2.373 → 0.2.374

package/dist/cli.cjs

@@ -11155,7 +11155,7 @@ var require_transport = __commonJS({
     "use strict";
     var { createRequire: createRequire2 } = require("module");
     var getCallers = require_caller();
-    var { join: join19, isAbsolute: isAbsolute4, sep: sep5 } = require("path");
+    var { join: join19, isAbsolute: isAbsolute4, sep: sep4 } = require("path");
     var sleep2 = require_atomic_sleep();
     var onExit = require_on_exit_leak_free();
     var ThreadStream = require_thread_stream();
@@ -11263,7 +11263,7 @@ var require_transport = __commonJS({
         let fixTarget2;
         for (const filePath of callers) {
           try {
-            const context = filePath === "node:repl" ? process.cwd() + sep5 : filePath;
+            const context = filePath === "node:repl" ? process.cwd() + sep4 : filePath;
             fixTarget2 = createRequire2(context).resolve(origin);
             break;
           } catch (err) {
@@ -48218,13 +48218,6 @@ function readCodexProjects(opts) {
 }
 
 // src/projects/store.ts
-var DEFAULT_TMP_ROOTS = () => [
-  "/tmp",
-  "/private/tmp",
-  "/var/folders",
-  "/private/var/folders",
-  path12.resolve(os5.tmpdir())
-];
 var ProjectsStore = class {
   constructor(opts) {
     this.opts = opts;
@@ -48262,23 +48255,8 @@ var ProjectsStore = class {
     const insideClawd = !(rel.startsWith("..") || path12.isAbsolute(rel));
     if (insideClawd) return false;
     if (abs === path12.resolve(os5.homedir()) || abs === path12.parse(abs).root) return false;
-    for (const root of this.tmpRoots()) {
-      if (abs === root || abs.startsWith(root.endsWith(path12.sep) ? root : root + path12.sep)) {
-        return false;
-      }
-    }
     return true;
   }
-  /** 层 2 的临时区根（缺省自适应，见构造器 opts.tmpRoots 注释） */
-  tmpRoots() {
-    if (this.opts.tmpRoots) return this.opts.tmpRoots;
-    const defaults = DEFAULT_TMP_ROOTS();
-    const clawd = path12.resolve(this.opts.clawdDir);
-    const clawdItselfInTmp = defaults.some(
-      (r) => clawd === r || clawd.startsWith(r + path12.sep)
-    );
-    return clawdItselfInTmp ? [] : defaults;
-  }
   list() {
     return [...this.entries];
   }
@@ -48302,6 +48280,7 @@ var ProjectsStore = class {
         stateFile: this.opts.codexStateFile,
         logger: this.opts.logger
       })) {
+        if (!c.createdAt) continue;
         const abs = this.normalize(c.path);
         if (!this.isProjectablePath(abs)) continue;
         byPath.set(abs, {
@@ -59034,23 +59013,6 @@ function toMs(v2) {
   const n = Number(v2 || 0);
   return n > 1e11 ? Math.round(n) : Math.round(n * 1e3);
 }
-function listFiles(dir, depth = 0, maxDepth = 8, out = []) {
-  let entries;
-  try {
-    entries = import_node_fs46.default.readdirSync(dir, { withFileTypes: true });
-  } catch {
-    return out;
-  }
-  for (const e of entries) {
-    const full = import_node_path51.default.join(dir, e.name);
-    if (e.isDirectory()) {
-      if (depth < maxDepth) listFiles(full, depth + 1, maxDepth, out);
-    } else if (e.isFile()) {
-      out.push(full);
-    }
-  }
-  return out;
-}
 async function* jsonLines(file) {
   let raw;
   try {
@@ -59108,6 +59070,7 @@ async function scanClaude(roots) {
         continue;
       }
       let cwd = "";
+      let entrypoint = "";
       let title = "";
       let firstUser = "";
       let turns = 0;
@@ -59116,6 +59079,7 @@ async function scanClaude(roots) {
       let hasMainLine = false;
       for await (const rec4 of jsonLines(file)) {
         if (!cwd && typeof rec4.cwd === "string") cwd = rec4.cwd;
+        if (!entrypoint && typeof rec4.entrypoint === "string") entrypoint = rec4.entrypoint;
         if (typeof rec4.timestamp === "string") {
           const t = Date.parse(rec4.timestamp);
           if (Number.isFinite(t)) {
@@ -59147,7 +59111,7 @@ async function scanClaude(roots) {
       };
       if (!hasMainLine) cand.skip = "subagent \u652F\u7EBF";
       else if (!cwd) cand.skip = "\u65E0 cwd";
-      else if (import_node_path51.default.basename(cwd).startsWith(TITLE_GEN_DIR_PREFIX)) cand.skip = "\u6807\u9898\u751F\u6210\u4E34\u65F6\u4F1A\u8BDD";
+      else if (entrypoint !== "cli" && entrypoint !== "claude-desktop") cand.skip = "\u975E\u7528\u6237\u5165\u53E3";
       out.push(cand);
     }
   }
@@ -59168,7 +59132,7 @@ async function countCodexTurns(rolloutPath) {
   return { turns, first };
 }
 function readCodexThreads(db) {
-  const COLS = ["id", "cwd", "created_at", "updated_at", "name", "title", "preview", "first_user_message", "archived", "rollout_path"];
+  const COLS = ["id", "cwd", "created_at", "updated_at", "name", "title", "preview", "first_user_message", "archived", "rollout_path", "thread_source"];
   try {
     const { DatabaseSync } = (0, import_node_module.createRequire)(import_meta4.url)("node:sqlite");
     const conn = new DatabaseSync(db, { readOnly: true });
@@ -59176,7 +59140,7 @@ function readCodexThreads(db) {
       const have = new Set(
         conn.prepare("PRAGMA table_info(threads)").all().map((r) => r.name)
       );
-      if (!["id", "cwd", "updated_at"].every((c) => have.has(c))) return null;
+      if (!["id", "cwd", "updated_at", "thread_source"].every((c) => have.has(c))) return null;
       const sel = COLS.map((c) => have.has(c) ? c : `NULL AS ${c}`).join(", ");
       return conn.prepare(`SELECT ${sel} FROM threads`).all();
     } finally {
@@ -59190,7 +59154,7 @@ function readCodexThreads(db) {
     const have = new Set(
       info.stdout.split("\n").map((l) => l.split("|")[1]).filter(Boolean)
     );
-    if (!["id", "cwd", "updated_at"].every((c) => have.has(c))) return null;
+    if (!["id", "cwd", "updated_at", "thread_source"].every((c) => have.has(c))) return null;
     const sel = COLS.map((c) => have.has(c) ? c : `NULL AS ${c}`).join(", ");
     const res = (0, import_node_child_process12.spawnSync)("sqlite3", ["-json", db, `SELECT ${sel} FROM threads;`], {
       encoding: "utf8",
@@ -59218,58 +59182,22 @@ async function codexFromRows(rows) {
       updatedMs,
       skip: ""
     };
-    if (r.archived) cand.skip = "\u5DF2\u5F52\u6863";
+    if (r.thread_source !== "user") cand.skip = "\u975E\u7528\u6237\u65B0\u5EFA";
+    else if (r.archived) cand.skip = "\u5DF2\u5F52\u6863";
     else if (!label) cand.skip = "\u7A7A\u4F1A\u8BDD";
     out.push(cand);
   }
   return out;
 }
-async function scanCodexRollouts(roots) {
-  const out = [];
-  for (const file of listFiles(import_node_path51.default.join(roots.codexDir, "sessions"))) {
-    if (!file.endsWith(".jsonl")) continue;
-    let st;
-    try {
-      st = import_node_fs46.default.statSync(file);
-    } catch {
-      continue;
-    }
-    let meta = null;
-    for await (const rec4 of jsonLines(file)) {
-      if (rec4.type === "session_meta") {
-        meta = rec4.payload || {};
-        break;
-      }
-    }
-    const tid = meta && (meta.session_id || meta.id);
-    if (!tid) continue;
-    const { turns, first } = await countCodexTurns(file);
-    const cand = {
-      tool: "codex",
-      toolSessionId: String(tid),
-      cwd: String(meta?.cwd || ""),
-      label: clipW(first, 56),
-      turns,
-      createdMs: st.mtimeMs,
-      updatedMs: st.mtimeMs,
-      skip: ""
-    };
-    if (!cand.cwd) cand.skip = "\u65E0 cwd";
-    out.push(cand);
-  }
-  return out;
-}
 async function scanCodex(roots) {
   let dbs = [];
   try {
     dbs = import_node_fs46.default.readdirSync(roots.codexDir).filter((n) => /^state_.*\.sqlite$/.test(n)).sort().map((n) => import_node_path51.default.join(roots.codexDir, n));
   } catch {
   }
-  if (dbs.length) {
-    const rows = readCodexThreads(dbs[dbs.length - 1]);
-    if (rows) return codexFromRows(rows);
-  }
-  return scanCodexRollouts(roots);
+  if (!dbs.length) return [];
+  const rows = readCodexThreads(dbs[dbs.length - 1]);
+  return rows ? codexFromRows(rows) : [];
 }
 async function scanExternalSessions(rootsIn) {
   const roots = { ...defaultRoots(), ...rootsIn };
@@ -59300,14 +59228,19 @@ async function scanExternalSessions(rootsIn) {
 var import_node_fs47 = __toESM(require("fs"), 1);
 var import_node_path52 = __toESM(require("path"), 1);
 var LEDGER_FILENAME = "session-import-ledger.json";
-function appendImportLedger(dataDir, entry) {
-  const file = import_node_path52.default.join(dataDir, LEDGER_FILENAME);
-  let entries = [];
+function readImportLedger(dataDir) {
   try {
-    const parsed = JSON.parse(import_node_fs47.default.readFileSync(file, "utf8"));
-    if (Array.isArray(parsed)) entries = parsed;
+    const parsed = JSON.parse(
+      import_node_fs47.default.readFileSync(import_node_path52.default.join(dataDir, LEDGER_FILENAME), "utf8")
+    );
+    return Array.isArray(parsed) ? parsed : [];
   } catch {
+    return [];
   }
+}
+function appendImportLedger(dataDir, entry) {
+  const file = import_node_path52.default.join(dataDir, LEDGER_FILENAME);
+  const entries = readImportLedger(dataDir);
   entries.push(entry);
   import_node_fs47.default.writeFileSync(file, JSON.stringify(entries, null, 2), { encoding: "utf8", mode: 384 });
 }
@@ -59416,6 +59349,9 @@ function buildSessionHandlers(deps) {
     parseArgs2(SessionExternalScanArgs, frame, "session:externalScan args");
     const owned = manager.list().response.sessions;
     const linked = new Set(owned.map((f) => f.toolSessionId).filter(Boolean));
+    if (deps.dataDir) {
+      for (const e of readImportLedger(deps.dataDir)) linked.add(e.toolSessionId);
+    }
     const candidates = (await scanExternalSessions()).filter((c) => !linked.has(c.toolSessionId));
     return { response: { candidates } };
   };
@@ -59847,8 +59783,8 @@ function isGuestPathAllowed(grants, absPath, personaRoot, action = "read", userW
     if (target === u || target.startsWith(u + usep)) return true;
   }
   const root = path65.resolve(personaRoot);
-  const sep5 = root.endsWith(path65.sep) ? "" : path65.sep;
-  if (!target.startsWith(root + sep5)) return false;
+  const sep4 = root.endsWith(path65.sep) ? "" : path65.sep;
+  if (!target.startsWith(root + sep4)) return false;
   const rel = path65.relative(root, target);
   if (!rel || rel.startsWith("..")) return false;
   const personaId2 = rel.split(path65.sep)[0];
@@ -59860,8 +59796,8 @@ function isGuestPathAllowed(grants, absPath, personaRoot, action = "read", userW
 function personaIdFromPath(absPath, personaRoot) {
   const root = path65.resolve(personaRoot);
   const target = path65.resolve(absPath);
-  const sep5 = root.endsWith(path65.sep) ? "" : path65.sep;
-  if (!target.startsWith(root + sep5)) return null;
+  const sep4 = root.endsWith(path65.sep) ? "" : path65.sep;
+  if (!target.startsWith(root + sep4)) return null;
   const rel = path65.relative(root, target);
   if (!rel || rel.startsWith("..")) return null;
   const id = rel.split(path65.sep)[0];
@@ -59870,8 +59806,8 @@ function personaIdFromPath(absPath, personaRoot) {
 function isPathWithin(dir, absPath) {
   const d = path65.resolve(dir);
   const t = path65.resolve(absPath);
-  const sep5 = d.endsWith(path65.sep) ? "" : path65.sep;
-  return t === d || t.startsWith(d + sep5);
+  const sep4 = d.endsWith(path65.sep) ? "" : path65.sep;
+  return t === d || t.startsWith(d + sep4);
 }
 function isPathInGuestBoundary(personaRoot, personaId2, userWorkDir, absPath) {
   if (userWorkDir && isPathWithin(userWorkDir, absPath)) return true;
@@ -61168,7 +61104,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.373".length > 0 ? "0.2.373" : "dev";
+var version = "0.2.374".length > 0 ? "0.2.374" : "dev";
 
 // src/cli-probe/probe.ts
 var fs64 = __toESM(require("fs"), 1);

package/dist/persona-defaults/persona-clawd-butler/.claude/skills/clawd-session-import/SKILL.md

@@ -49,6 +49,10 @@ node .claude/skills/clawd-session-import/scripts/link-sessions.mjs --undo
 node .claude/skills/clawd-session-import/scripts/link-sessions.mjs --undo --apply  # 真删
 ```
 
+台账里 session 已被手动删除的条目，`--undo` 只清账、不再调删除接口 —— 清掉后该会话
+才能重新出现在「关联外部 session」的候选里（扫盘去重会读这本台账，见
+`superpowers/specs/2026-08-19-external-scan-entrypoint-design.md` §4）。
+
 ## 原理
 
 一条 clawd 会话的元数据里有 `cwd` + `toolSessionId` 两个字段，指向底层工具那条真实

package/dist/persona-defaults/persona-clawd-butler/.claude/skills/clawd-session-import/scripts/link-sessions.mjs

@@ -485,9 +485,15 @@ async function doUndo(applyIt) {
   const res = await rpc('session:list', { limit: 100000 })
   const alive = new Set((res.sessions || []).map((s) => s.sessionId))
   const todo = entries.filter((e) => alive.has(e.sessionId))
-  console.log(`台账 ${entries.length} 条，其中 ${todo.length} 条还在。` +
-    (applyIt ? '正在删除……' : '（预演；加 --apply 才真删）'))
-  for (const e of todo) console.log(`  ${e.sessionId}  ${e.label || ''}`)
+  // 台账里 session 已经不在了（多半是用户直接在 clawd UI 里删的）：没什么可删，只需
+  // 把账清掉。扫盘去重会读这本台账（spec 2026-08-19 §4），条目留着就等于该会话永久
+  // 无法重新导入，而 undo 的语义本就是「撤销我的导入记录」。
+  const stale = entries.filter((e) => !alive.has(e.sessionId))
+  console.log(`台账 ${entries.length} 条，其中 ${todo.length} 条还在` +
+    (stale.length ? `，${stale.length} 条已不存在（只清账）` : '') + '。' +
+    (applyIt ? '正在处理……' : '（预演；加 --apply 才真删）'))
+  for (const e of todo) console.log(`  删   ${e.sessionId}  ${e.label || ''}`)
+  for (const e of stale) console.log(`  清账 ${e.sessionId}  ${e.label || ''}`)
   if (!applyIt) return
   let removed = 0
   const failed = new Set()
@@ -500,9 +506,13 @@ async function doUndo(applyIt) {
       console.error(`  删 ${e.sessionId} 失败：${err.message}`)
     }
   }
-  const doneIds = new Set(todo.map((t) => t.sessionId).filter((id) => !failed.has(id)))
+  // 清账范围 = 删成功的 + 本就不存在的；删失败的留在账上，下次 undo 还能重试
+  const doneIds = new Set([
+    ...todo.map((t) => t.sessionId).filter((id) => !failed.has(id)),
+    ...stale.map((s) => s.sessionId),
+  ])
   ledgerWrite(entries.filter((e) => !doneIds.has(e.sessionId)))
-  console.log(`已删除 ${removed} 条。原 Claude Code / Codex 的会话文件没有任何改动。`)
+  console.log(`已删除 ${removed} 条，清账 ${doneIds.size} 条。原 Claude Code / Codex 的会话文件没有任何改动。`)
 }
 
 // ---------------------------------------------------------------- 参数

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.373",
+  "version": "0.2.374",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",