@clawos-dev/clawd 0.2.224 → 0.2.226

package/dist/cli.cjs

@@ -11379,6 +11379,45 @@ function hashDirToCwd(hash) {
   const body = hash.startsWith("-") ? hash.slice(1) : hash;
   return "/" + body.replace(/-/g, "/");
 }
+function findTranscriptByToolSessionId(projectsRoot, toolSessionId) {
+  let entries;
+  try {
+    entries = import_node_fs5.default.readdirSync(projectsRoot, { withFileTypes: true });
+  } catch {
+    return null;
+  }
+  let best = null;
+  for (const ent of entries) {
+    if (!ent.isDirectory()) continue;
+    const candidate = import_node_path5.default.join(projectsRoot, ent.name, `${toolSessionId}.jsonl`);
+    try {
+      const st = import_node_fs5.default.statSync(candidate);
+      if (!best || st.mtimeMs > best.mtime) best = { p: candidate, mtime: st.mtimeMs };
+    } catch {
+    }
+  }
+  return best?.p ?? null;
+}
+function deriveCwdFromTranscript(filePath) {
+  const dirName = import_node_path5.default.basename(import_node_path5.default.dirname(filePath));
+  let raw;
+  try {
+    raw = import_node_fs5.default.readFileSync(filePath, "utf8");
+  } catch {
+    return null;
+  }
+  let hit = null;
+  for (const line of raw.split("\n")) {
+    const t = line.trim();
+    if (!t) continue;
+    try {
+      const o = JSON.parse(t);
+      if (typeof o.cwd === "string" && cwdToHashDir(o.cwd) === dirName) hit = o.cwd;
+    } catch {
+    }
+  }
+  return hit;
+}
 function safeStatMtime(p2) {
   try {
     return import_node_fs5.default.statSync(p2).mtimeMs;
@@ -41880,7 +41919,7 @@ var CONTACT_SSH_SYSTEM_PROMPT_HINT = `## \u8DE8\u8BBE\u5907\u6587\u4EF6\u8BBF\u9
 
 **\u6CE8\u610F**\uFF1A
 - \u6388\u6743\u76EE\u5F55\u6570\u636E\u6E90\u5B9E\u65F6\uFF08jail \u6BCF\u6B21\u8BFB A \u4FA7\u6700\u65B0\u914D\u7F6E\uFF09\uFF0CA \u6539\u4E86\u6388\u6743\u540E\u4F60\u4E0B\u4E00\u6B21\u62E8\u53F7\u7ACB\u5373\u611F\u77E5
-- \u6392\u969C\uFF1A\u672C\u673A debug \u65E5\u5FD7\u5728 \`~/.clawd/contact-ssh.log\`\uFF08\u7528\u6237\u53EF \`tail -f\` \u770B\u6BCF\u4E00\u6B65\uFF09\uFF0C\u4F60\u51FA\u9519\u65F6\u544A\u8BC9\u7528\u6237\u67E5\u8FD9\u4E2A\u6587\u4EF6
+- \u6392\u969C\uFF1A\u672C\u673A debug \u65E5\u5FD7\u5728 \`~/.clawd/log/contact-ssh.log\`\uFF08\u7528\u6237\u53EF \`tail -f\` \u770B\u6BCF\u4E00\u6B65\uFF09\uFF0C\u4F60\u51FA\u9519\u65F6\u544A\u8BC9\u7528\u6237\u67E5\u8FD9\u4E2A\u6587\u4EF6
 - \u5982\u679C \`ls ~/.clawd/contact-ssh-keys/\` \u4E3A\u7A7A\uFF0C\u8BF4\u660E\u8FD8\u6CA1\u6709\u5BF9\u7AEF\u6388\u6743\u4F60\u6216 key \u8FD8\u6CA1\u62C9\u5230\uFF08B \u4FA7 daemon \u6BCF 60s \u4E00\u6B21\u81EA\u52A8\u62C9\uFF09\uFF0C\u5982\u5B9E\u544A\u8BC9\u7528\u6237
 `;
 
@@ -42357,6 +42396,13 @@ function applyCommand(state, command, deps) {
       }
       return { state: next, effects };
     }
+    case "sync-cwd": {
+      if (next.file.cwd === command.cwd) return { state: next, effects };
+      next.file = { ...next.file, cwd: command.cwd, updatedAt: nowIso(deps) };
+      effects.push({ kind: "persist-file", file: next.file });
+      effects.push(sessionInfoFrame(next.file));
+      return { state: next, effects };
+    }
     case "resume": {
       const sameToolSession = next.file.toolSessionId === command.toolSessionId;
       const nextFile = {
@@ -43955,6 +44001,23 @@ var SessionManager = class {
     this.writeOwned(updated);
     return { response: updated, broadcast: [] };
   }
+  /**
+   * [T-17] observer 检测到 CC 挪走 transcript（cwd 中途变化）后的 cwd 校正入口。
+   * 不进 withCollector：observer 回调没有 in-flight RPC，session:info 帧走
+   * routeFromRunner 的异步 broadcast 路径。有 runner 走 reducer sync-cwd（无 kill，
+   * 区别于 update 的 RUNTIME_PATCH_KEYS 重启语义）；无 runner 直写 store。
+   * 幂等：reducer 同值 noop；session 不存在静默返回（observer 生命周期与 store 解耦）。
+   */
+  syncSessionCwd(sessionId, cwd) {
+    const runner = this.runners.get(sessionId);
+    if (runner) {
+      runner.input({ kind: "command", command: { kind: "sync-cwd", cwd } });
+      return;
+    }
+    const existing = this.findOwnedSession(sessionId);
+    if (!existing || existing.cwd === cwd) return;
+    this.writeOwned({ ...existing, cwd, updatedAt: nowIso2(this.deps) });
+  }
   /**
    * 启动清扫：删除所有磁盘残留的 ephemeral（快速问答临时）session。
    * 客户端崩溃 / 没关抽屉会留下永久不可见的孤儿（ephemeral 被 sidebar 过滤，用户自己也删不掉）。
@@ -49640,14 +49703,19 @@ var SessionObserver = class {
       lastSize: size,
       buf: "",
       adapter: args.adapter,
-      prevIsRejectSentinel: false
+      prevIsRejectSentinel: false,
+      toolSessionId: args.toolSessionId,
+      sawFile: import_node_fs25.default.existsSync(filePath),
+      lastRelocateScanMs: 0,
+      pendingCwdDerive: false,
+      lastDeriveMs: 0
     };
     try {
       import_node_fs25.default.mkdirSync(import_node_path24.default.dirname(filePath), { recursive: true });
     } catch {
     }
     w2.watcher = import_node_fs25.default.watch(import_node_path24.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
-      if (!changedName || !filePath.endsWith(changedName)) return;
+      if (!changedName || !w2.filePath.endsWith(changedName)) return;
       this.poll(w2);
     });
     w2.pollTimer = setInterval(() => this.poll(w2), 200);
@@ -49695,8 +49763,10 @@ var SessionObserver = class {
     try {
       size = import_node_fs25.default.statSync(w2.filePath).size;
     } catch {
+      if (w2.sawFile) this.maybeRelocate(w2);
       return;
     }
+    w2.sawFile = true;
     if (size < w2.lastSize) {
       w2.lastSize = 0;
       w2.buf = "";
@@ -49731,6 +49801,57 @@ var SessionObserver = class {
     } finally {
       import_node_fs25.default.closeSync(fd);
     }
+    if (w2.pendingCwdDerive) this.maybeDeriveCwd(w2);
+  }
+  // [T-17] 文件消失后的兜底重定位：按 tsid 全局扫描 → 切 watcher → lastSize/buf 保留接续读
+  // （CC 是 move，内容前缀不变，不重复喂；异常变小走 poll 的截断重建分支，上游 uuid dedup 兜底）。
+  // 检测点唯一（poll ENOENT），fs.watch rename 事件也 funnel 到 poll，天然幂等；scan 加 1s
+  // rate-limit 防 ENOENT 持续期（如 cleanupPeriodDays 真删除）反复 readdir 空转。
+  maybeRelocate(w2) {
+    const now = Date.now();
+    if (now - w2.lastRelocateScanMs < 1e3) return;
+    w2.lastRelocateScanMs = now;
+    const projectsRoot = import_node_path24.default.join(this.home, ".claude", "projects");
+    const found = findTranscriptByToolSessionId(projectsRoot, w2.toolSessionId);
+    if (!found || found === w2.filePath) return;
+    try {
+      w2.watcher?.close();
+    } catch {
+    }
+    w2.filePath = found;
+    try {
+      w2.watcher = import_node_fs25.default.watch(import_node_path24.default.dirname(found), { persistent: false }, (_event, changedName) => {
+        if (!changedName || !w2.filePath.endsWith(changedName)) return;
+        this.poll(w2);
+      });
+    } catch {
+      w2.watcher = null;
+    }
+    const cwd = deriveCwdFromTranscript(found);
+    if (cwd) {
+      this.applyDerivedCwd(w2, cwd);
+    } else {
+      w2.pendingCwdDerive = true;
+    }
+    this.opts.onJsonlRelocated?.(w2.sessionId, { filePath: found, cwd });
+    this.poll(w2);
+  }
+  maybeDeriveCwd(w2) {
+    const now = Date.now();
+    if (now - w2.lastDeriveMs < 500) return;
+    w2.lastDeriveMs = now;
+    const cwd = deriveCwdFromTranscript(w2.filePath);
+    if (!cwd) return;
+    w2.pendingCwdDerive = false;
+    this.applyDerivedCwd(w2, cwd);
+    this.opts.onJsonlRelocated?.(w2.sessionId, { filePath: w2.filePath, cwd });
+  }
+  applyDerivedCwd(w2, cwd) {
+    this.metaObserver?.start({
+      sessionId: w2.sessionId,
+      cwd,
+      toolSessionId: w2.toolSessionId
+    });
   }
   // 解析 JSONL 单行：仅当是主链 user 文本行（非 sidechain / 非 sub-agent / message.role='user'
   // 且 content 含 text part）时，抽出 real uuid + 第一段 text + timestamp 上报。
@@ -53069,7 +53190,9 @@ var TunnelManager = class {
       const proc = (this.deps.spawnImpl ?? import_node_child_process9.spawn)(frpcBin, ["-c", tomlPath], {
         stdio: ["ignore", "pipe", "pipe"]
       });
-      const logFilePath = import_node_path35.default.join(this.deps.dataDir, "frpc.log");
+      const logDir = import_node_path35.default.join(this.deps.dataDir, "log");
+      import_node_fs34.default.mkdirSync(logDir, { recursive: true });
+      const logFilePath = import_node_path35.default.join(logDir, "frpc.log");
       const logStream = import_node_fs34.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
       logStream.on("error", () => {
       });
@@ -53310,8 +53433,11 @@ var CLAWD_SSH_JAIL_SCRIPT = String.raw`#!/usr/bin/env bash
 
 set -euo pipefail
 
-# 用户可读审计日志：追加到 ~/.clawd/contact-ssh.log（跟 daemon TS 侧 contact-ssh-log.ts 共写）
-CONTACT_SSH_LOG="${"${HOME}"}/.clawd/contact-ssh.log"
+# 用户可读审计日志：追加到 ~/.clawd/log/contact-ssh.log（跟 daemon TS 侧 contact-ssh-log.ts 共写）
+# bash 侧写死 ~/.clawd/log/，因为 jail 脚本在 authorized_keys command= 里被 sshd 起，
+# 拿不到 daemon --data-dir 覆盖。dev daemon 用 --data-dir=/tmp/x 时 jail 仍写 ~/.clawd/log/，
+# 跟改动前 (~/.clawd/contact-ssh.log) 一样的分歧行为，不做统一。
+CONTACT_SSH_LOG="${"${HOME}"}/.clawd/log/contact-ssh.log"
 log_line() {
   # 参数: level tag msg
   local ts
@@ -53508,7 +53634,9 @@ var SshdManager = class {
     const proc = (this.deps.spawnImpl ?? import_node_child_process11.spawn)(sshdBin, ["-D", "-e", "-f", configPath], {
       stdio: ["ignore", "pipe", "pipe"]
     });
-    const logStream = import_node_fs38.default.createWriteStream(import_node_path39.default.join(this.sshdDir, "sshd.log"), {
+    const sshdLogDir = import_node_path39.default.join(this.deps.dataDir, "log");
+    import_node_fs38.default.mkdirSync(sshdLogDir, { recursive: true });
+    const logStream = import_node_fs38.default.createWriteStream(import_node_path39.default.join(sshdLogDir, "sshd.log"), {
       flags: "a",
       mode: 384
     });
@@ -53689,7 +53817,7 @@ var import_node_path42 = __toESM(require("path"), 1);
 var import_node_fs40 = __toESM(require("fs"), 1);
 var import_node_path41 = __toESM(require("path"), 1);
 function createContactSshLog(dataDir) {
-  const file = import_node_path41.default.join(dataDir, "contact-ssh.log");
+  const file = import_node_path41.default.join(dataDir, "log", "contact-ssh.log");
   function append(level, tag, message, meta) {
     const time = (/* @__PURE__ */ new Date()).toISOString();
     let line = `[${time}] [${level}] [${tag}] ${message}`;
@@ -54681,10 +54809,18 @@ function readJsonlEntries(file) {
 }
 function forkSession(input) {
   const baseDir = input.baseDir ?? import_node_path47.default.join(import_node_os16.default.homedir(), ".claude");
-  const projectDir = import_node_path47.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
-  const sourceFile = import_node_path47.default.join(projectDir, `${input.toolSessionId}.jsonl`);
+  let projectDir = import_node_path47.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
+  let sourceFile = import_node_path47.default.join(projectDir, `${input.toolSessionId}.jsonl`);
   if (!import_node_fs45.default.existsSync(sourceFile)) {
-    throw new Error(`fork: source transcript not found: ${sourceFile}`);
+    const found = findTranscriptByToolSessionId(
+      import_node_path47.default.join(baseDir, "projects"),
+      input.toolSessionId
+    );
+    if (!found) {
+      throw new Error(`fork: source transcript not found: ${sourceFile}`);
+    }
+    sourceFile = found;
+    projectDir = import_node_path47.default.dirname(found);
   }
   const entries = readJsonlEntries(sourceFile);
   const mainEntries = entries.filter((e) => e.isSidechain !== true);
@@ -59292,18 +59428,20 @@ async function startDaemon(config) {
     sampling: logShippingCfg.sampling,
     homeDir: import_node_os21.default.homedir()
   });
+  const logDir = import_node_path64.default.join(config.dataDir, "log");
+  import_node_fs51.default.mkdirSync(logDir, { recursive: true });
   const logger = createLogger({
     level: config.logLevel,
-    file: import_node_path64.default.join(config.dataDir, "clawd.log"),
+    file: import_node_path64.default.join(logDir, "clawd.log"),
     logClient
   });
   logger.info("starting clawd", { version, config: { port: config.port, host: config.host, dataDir: config.dataDir } });
   const screenIdleProbeLogger = createFileOnlyLogger({
-    file: import_node_path64.default.join(config.dataDir, "screen-idle-probe.log"),
+    file: import_node_path64.default.join(logDir, "screen-idle-probe.log"),
     level: "debug"
   });
   logger.info("screen-idle probe logger enabled", {
-    file: import_node_path64.default.join(config.dataDir, "screen-idle-probe.log")
+    file: import_node_path64.default.join(logDir, "screen-idle-probe.log")
   });
   const stateMgr = new StateFileManager({ dataDir: config.dataDir });
   const pre = stateMgr.preflight();
@@ -59474,7 +59612,7 @@ async function startDaemon(config) {
   const dispatchServerScriptPath = dispatchServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   let dispatchMcpConfigPath2;
   if (dispatchServerScriptPath) {
-    const dispatchLogPath = import_node_path64.default.join(config.dataDir, "dispatch-mcp-server.log");
+    const dispatchLogPath = import_node_path64.default.join(logDir, "dispatch-mcp-server.log");
     dispatchMcpConfigPath2 = writeDispatchMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: dispatchServerScriptPath,
@@ -59497,7 +59635,7 @@ async function startDaemon(config) {
   const ticketServerScriptPath = ticketServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   let ticketMcpConfigPath2;
   if (ticketServerScriptPath) {
-    const ticketLogPath = import_node_path64.default.join(config.dataDir, "ticket-mcp-server.log");
+    const ticketLogPath = import_node_path64.default.join(logDir, "ticket-mcp-server.log");
     ticketMcpConfigPath2 = writeTicketMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: ticketServerScriptPath,
@@ -59522,7 +59660,7 @@ async function startDaemon(config) {
   const shiftServerScriptPath = shiftServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   let shiftMcpConfigPath2;
   if (shiftServerScriptPath) {
-    const shiftLogPath = import_node_path64.default.join(config.dataDir, "shift-mcp-server.log");
+    const shiftLogPath = import_node_path64.default.join(logDir, "shift-mcp-server.log");
     shiftMcpConfigPath2 = await writeShiftMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: shiftServerScriptPath,
@@ -59546,7 +59684,7 @@ async function startDaemon(config) {
   const inboxServerScriptPath = inboxServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   let inboxMcpConfigPath2;
   if (inboxServerScriptPath) {
-    const inboxLogPath = import_node_path64.default.join(config.dataDir, "inbox-mcp-server.log");
+    const inboxLogPath = import_node_path64.default.join(logDir, "inbox-mcp-server.log");
     inboxMcpConfigPath2 = await writeInboxMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: inboxServerScriptPath,
@@ -59686,6 +59824,13 @@ async function startDaemon(config) {
     // daemon 内部转译，UI 看到的始终是 events 流里的 synth uuid（详见 manager 注释）
     onUserMessageObserved: (sessionId, realUuid, text) => {
       manager.recordRealUserUuid({ sessionId, realUuid, text });
+    },
+    // [T-17] CC 中途改 cwd 挪走 transcript：observer 重定位后校正 SessionFile.cwd
+    // （persist + session:info，不 kill），fork / respawn / UI 缓存随之对齐。
+    // cwd 可能两段式到达（挪走瞬间新 cwd 行未落盘 → 先 null 后补），回调幂等
+    onJsonlRelocated: (sessionId, { filePath, cwd }) => {
+      logger.info("observer jsonl relocated", { sessionId, filePath, cwd });
+      if (cwd) manager.syncSessionCwd(sessionId, cwd);
     }
   });
   manager.attachObserver(observer);
@@ -60351,7 +60496,7 @@ async function startDaemon(config) {
         `Tunnel:      ${r.url}`,
         ...resolvedAuthToken ? [`Connect:     ${connectUrl}`] : [],
         `Frpc config: ${import_node_path64.default.join(config.dataDir, "frpc.toml")}`,
-        `Frpc log:    ${import_node_path64.default.join(config.dataDir, "frpc.log")}`
+        `Frpc log:    ${import_node_path64.default.join(logDir, "frpc.log")}`
       ];
       const width = Math.max(...lines.map((l) => l.length));
       const bar = "\u2550".repeat(width + 4);