@clawos-dev/clawd 0.2.409 → 0.2.411

package/dist/cli.cjs

@@ -14365,22 +14365,49 @@ var init_tool_result_extra = __esm({
 function cwdToHashDir(cwd) {
   return cwd.replace(/[^a-zA-Z0-9]/g, "-");
 }
-function newestSubagentMtimeMs(projectsRoot, cwd, toolSessionId) {
-  const dir = import_node_path5.default.join(projectsRoot, cwdToHashDir(cwd), toolSessionId, "subagents");
+function subagentsDirCandidates(projectsRoot, cwd, toolSessionId) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  const add = (dir) => {
+    if (seen.has(dir)) return;
+    try {
+      if (!import_node_fs6.default.statSync(dir).isDirectory()) return;
+    } catch {
+      return;
+    }
+    seen.add(dir);
+    out.push(dir);
+  };
+  add(import_node_path5.default.join(projectsRoot, cwdToHashDir(cwd), toolSessionId, "subagents"));
   let entries;
   try {
-    entries = import_node_fs6.default.readdirSync(dir, { withFileTypes: true });
+    entries = import_node_fs6.default.readdirSync(projectsRoot, { withFileTypes: true });
   } catch {
-    return null;
+    return out;
+  }
+  for (const ent of entries) {
+    if (!ent.isDirectory()) continue;
+    add(import_node_path5.default.join(projectsRoot, ent.name, toolSessionId, "subagents"));
   }
+  return out;
+}
+function newestSubagentMtimeMs(projectsRoot, cwd, toolSessionId) {
   let newest = null;
-  for (const e of entries) {
-    if (!e.isFile()) continue;
-    if (!e.name.startsWith("agent-") || !e.name.endsWith(".jsonl")) continue;
+  for (const dir of subagentsDirCandidates(projectsRoot, cwd, toolSessionId)) {
+    let entries;
     try {
-      const m2 = import_node_fs6.default.statSync(import_node_path5.default.join(dir, e.name)).mtimeMs;
-      if (newest === null || m2 > newest) newest = m2;
+      entries = import_node_fs6.default.readdirSync(dir, { withFileTypes: true });
     } catch {
+      continue;
+    }
+    for (const e of entries) {
+      if (!e.isFile()) continue;
+      if (!e.name.startsWith("agent-") || !e.name.endsWith(".jsonl")) continue;
+      try {
+        const m2 = import_node_fs6.default.statSync(import_node_path5.default.join(dir, e.name)).mtimeMs;
+        if (newest === null || m2 > newest) newest = m2;
+      } catch {
+      }
     }
   }
   return newest;
@@ -14934,38 +14961,41 @@ var init_claude_history = __esm({
         return { messages: this.readSubagentFromMainJsonl(args.cwd, args.toolSessionId, args.subagentId) };
       }
       // 独立目录路径：<projectsRoot>/<cwdHash>/<toolSessionId>/subagents/*.jsonl
-      // 返回 null 表示目录不存在（调用方回退旧实现）；返回空数组表示目录存在但无 jsonl
+      // 返回 null 表示一个候选目录都没有（调用方回退旧实现）；返回空数组表示目录在但无 jsonl。
+      // [cwd 漂移] 下取**所有候选目录的并集**：漂移前后的 agent 都该列出来。同名 agentId 只可能
+      // 是同一个 agent（id 全局唯一），取先遇到的那份（byCwd 优先）。
       listSubagentsFromDirectory(cwd, toolSessionId) {
-        const dir = import_node_path5.default.join(
-          this.resolveSessionDir(cwd, toolSessionId),
-          toolSessionId,
-          "subagents"
-        );
-        let entries;
-        try {
-          entries = import_node_fs6.default.readdirSync(dir, { withFileTypes: true });
-        } catch (err) {
-          if (err.code === "ENOENT") return null;
-          return null;
-        }
+        const dirs = subagentsDirCandidates(this.projectsRoot, cwd, toolSessionId);
+        if (dirs.length === 0) return null;
         const out = [];
-        for (const e of entries) {
-          if (!e.isFile()) continue;
-          if (!e.name.startsWith("agent-") || !e.name.endsWith(".jsonl")) continue;
-          const subagentId = e.name.slice("agent-".length, -".jsonl".length);
-          const filePath = import_node_path5.default.join(dir, e.name);
-          const lines = readJsonlLines(filePath);
-          let firstText = "";
-          let messageCount = 0;
-          for (const line of lines) {
-            const msg = messageFromJsonl(line);
-            if (!msg) continue;
-            messageCount += 1;
-            if (!firstText && msg.kind === "user-text" && msg.text) {
-              firstText = msg.text.slice(0, 120);
+        const seen = /* @__PURE__ */ new Set();
+        for (const dir of dirs) {
+          let entries;
+          try {
+            entries = import_node_fs6.default.readdirSync(dir, { withFileTypes: true });
+          } catch {
+            continue;
+          }
+          for (const e of entries) {
+            if (!e.isFile()) continue;
+            if (!e.name.startsWith("agent-") || !e.name.endsWith(".jsonl")) continue;
+            const subagentId = e.name.slice("agent-".length, -".jsonl".length);
+            if (seen.has(subagentId)) continue;
+            seen.add(subagentId);
+            const filePath = import_node_path5.default.join(dir, e.name);
+            const lines = readJsonlLines(filePath);
+            let firstText = "";
+            let messageCount = 0;
+            for (const line of lines) {
+              const msg = messageFromJsonl(line);
+              if (!msg) continue;
+              messageCount += 1;
+              if (!firstText && msg.kind === "user-text" && msg.text) {
+                firstText = msg.text.slice(0, 120);
+              }
             }
+            out.push({ subagentId, summary: firstText, messageCount });
           }
-          out.push({ subagentId, summary: firstText, messageCount });
         }
         return out;
       }
@@ -15002,28 +15032,26 @@ var init_claude_history = __esm({
           messageCount: buckets.get(id)?.count ?? 0
         }));
       }
-      // 独立文件路径：agent-<subagentId>.jsonl；文件不存在返回 null 让调用方回退旧实现
+      // 独立文件路径：agent-<subagentId>.jsonl；所有候选目录里都没有才返回 null，让调用方
+      // 回退去扫主 jsonl 的 sidechain。[cwd 漂移] 下要的就是「这个文件落在哪一侧」——
+      // 只看某一个目录在不在，会把漂移侧的 agent 判成不存在。
       readSubagentFromFile(cwd, toolSessionId, subagentId) {
-        const file = import_node_path5.default.join(
-          this.resolveSessionDir(cwd, toolSessionId),
-          toolSessionId,
-          "subagents",
-          `agent-${subagentId}.jsonl`
-        );
-        let exists = false;
-        try {
-          exists = import_node_fs6.default.statSync(file).isFile();
-        } catch {
-          return null;
-        }
-        if (!exists) return null;
-        const lines = readJsonlLines(file);
-        const messages = [];
-        for (const line of lines) {
-          const msg = messageFromJsonl(line);
-          if (msg) messages.push(msg);
+        for (const dir of subagentsDirCandidates(this.projectsRoot, cwd, toolSessionId)) {
+          const file = import_node_path5.default.join(dir, `agent-${subagentId}.jsonl`);
+          try {
+            if (!import_node_fs6.default.statSync(file).isFile()) continue;
+          } catch {
+            continue;
+          }
+          const lines = readJsonlLines(file);
+          const messages = [];
+          for (const line of lines) {
+            const msg = messageFromJsonl(line);
+            if (msg) messages.push(msg);
+          }
+          return messages;
         }
-        return messages;
+        return null;
       }
       /**
        * 遍历 session JSONL 找所有 `type:'file-history-snapshot'` 条目，按 messageId 建表
@@ -62305,7 +62333,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.409".length > 0 ? "0.2.409" : "dev";
+var version = "0.2.411".length > 0 ? "0.2.411" : "dev";
 
 // src/cli-probe/probe.ts
 var fs66 = __toESM(require("fs"), 1);