codesesh 1.0.4 → 1.0.6

package/dist/{chunk-YCUN52HA.js → chunk-L3DDWTYV.js}

@@ -32,9 +32,9 @@ import {
   reportFieldMismatch,
   resolveSessionTitle,
   safeParseJsonRecord
-} from "./chunk-W4PZHL2C.js";
+} from "./chunk-4ND6AT6W.js";
 
-// ../core/dist/chunk-T57KKY7A.mjs
+// ../core/dist/chunk-PGD63YEI.mjs
 import { statSync } from "fs";
 import { readdirSync, statSync as statSync2 } from "fs";
 import { join } from "path";
@@ -470,9 +470,11 @@ var FileSystemSessionSource = class extends BaseAgent {
     count: (options) => this.listSessionSources(options).length
   };
   sourceFileStats = /* @__PURE__ */ new Map();
-  scanSessionSourceResult(source, options) {
-    const session = this.scanSessionSource(source.sourcePath, options);
-    return session ? parsedSession(session) : skippedSession("source produced no session");
+  /** 解析单个源并写入 metaMap，返回会话 head（解析失败/不可见返回 null）。 */
+  scanSessionSource(sourcePath, options) {
+    return getParsedSession(
+      this.scanSessionSourceResult({ sessionId: "", sourcePath, fingerprint: "" }, options)
+    );
   }
   scanSessionSourceOutcome(source, options) {
     const previousMeta = this.sessionMetaMap.get(source.sessionId);
@@ -602,9 +604,6 @@ var SingleFileSessionSource = class extends FileSystemSessionSource {
     }
     return result;
   }
-  scanSessionSource(sourcePath, options) {
-    return getParsedSession(this.parseSessionSource(sourcePath, options));
-  }
   scanSessionSourceResult(source, options) {
     return this.parseSessionSource(source.sourcePath, options);
   }
@@ -841,6 +840,7 @@ function extractClaudeUsage(data, msg) {
   if (!key) return null;
   return {
     key,
+    model: asString(msg["model"])?.trim() || void 0,
     input: readUsageNumber(usage, "input_tokens"),
     output: readUsageNumber(usage, "output_tokens"),
     cacheRead: readUsageNumber(usage, "cache_read_input_tokens"),
@@ -849,7 +849,7 @@ function extractClaudeUsage(data, msg) {
 }
 var ClaudeRecordConverter = class {
   // --- Record conversion ---
-  convertRecord(data, builder, assistantUuidToToolCalls, countedUsageKeys, childSessionIdByToolUseId) {
+  convertRecord(data, builder, assistantUuidToToolCalls, requestMessages, childSessionIdByToolUseId) {
     if (data["isMeta"] === true) return;
     const msgType = String(data["type"] ?? "");
     if (isInternalEventType(msgType)) return;
@@ -858,7 +858,7 @@ var ClaudeRecordConverter = class {
         data,
         builder,
         assistantUuidToToolCalls,
-        countedUsageKeys,
+        requestMessages,
         childSessionIdByToolUseId
       );
     } else if (msgType === "user") {
@@ -867,11 +867,15 @@ var ClaudeRecordConverter = class {
       this.convertToolResultRecord(data, builder);
     }
   }
-  convertAssistantRecord(data, builder, assistantUuidToToolCalls, countedUsageKeys, childSessionIdByToolUseId) {
+  convertAssistantRecord(data, builder, assistantUuidToToolCalls, requestMessages, childSessionIdByToolUseId) {
     const msg = asRecord(data["message"]) ?? {};
     const timestampMs = parseClaudeTimestampMs(data);
+    const model = asString(msg["model"])?.trim();
     const rawContent = asArray(msg["content"]) ?? [];
     const uuid = String(data["uuid"] ?? "");
+    const usage = extractClaudeUsage(data, msg);
+    let usageMessage = usage ? requestMessages.get(usage.key) : void 0;
+    if (usage && !usageMessage) builder.beginTurn();
     const toolCallIds = [];
     for (const item of rawContent) {
       const part = asRecord(item);
@@ -882,10 +886,10 @@ var ClaudeRecordConverter = class {
         if (text) {
           const message2 = builder.appendAssistantPart(
             this.buildReasoningPart(text, timestampMs),
-            { id: uuid, timestampMs, agent: "claude" },
+            { id: uuid, timestampMs, agent: "claude", model },
             { deduplicateTail: true }
           );
-          this.applyAssistantMetadata(message2, data, msg, countedUsageKeys);
+          usageMessage ??= message2;
         }
         continue;
       }
@@ -897,11 +901,12 @@ var ClaudeRecordConverter = class {
             {
               id: uuid,
               timestampMs,
-              agent: "claude"
+              agent: "claude",
+              model
             },
             { deduplicateTail: true }
           );
-          this.applyAssistantMetadata(message2, data, msg, countedUsageKeys);
+          usageMessage ??= message2;
         }
         continue;
       }
@@ -911,11 +916,11 @@ var ClaudeRecordConverter = class {
       const toolPart2 = this.buildToolPart(part, timestampMs);
       const message = builder.appendToolCall(
         toolPart2,
-        { id: uuid, timestampMs, agent: "claude", subagentId },
+        { id: uuid, timestampMs, agent: "claude", subagentId, model },
         { modeOnCreate: "tool" }
       );
       if (subagentId) message.subagent_id = subagentId;
-      this.applyAssistantMetadata(message, data, msg, countedUsageKeys);
+      usageMessage ??= message;
       if (toolCallId) {
         toolCallIds.push(toolCallId);
       }
@@ -923,6 +928,26 @@ var ClaudeRecordConverter = class {
     if (toolCallIds.length > 0) {
       assistantUuidToToolCalls.set(uuid, toolCallIds);
     }
+    if (usage) {
+      usageMessage ??= builder.appendMessage({
+        id: uuid,
+        role: "assistant",
+        timestampMs,
+        agent: "claude",
+        model
+      });
+      requestMessages.set(usage.key, usageMessage);
+      usageMessage.model = usage.model;
+      usageMessage.tokens = {
+        input: usage.input + usage.cacheCreate + usage.cacheRead,
+        output: usage.output,
+        cache_read: usage.cacheRead,
+        cache_create: usage.cacheCreate
+      };
+      usageMessage.time_completed = timestampMs;
+      usageMessage.cost = estimateTokenCost(usage.model, usageMessage.tokens) ?? 0;
+      usageMessage.cost_source = usageMessage.cost > 0 ? "estimated" : void 0;
+    }
   }
   convertUserRecord(data, builder, assistantUuidToToolCalls) {
     const msg = asRecord(data["message"]) ?? {};
@@ -1000,27 +1025,6 @@ var ClaudeRecordConverter = class {
       time_created: timestampMs
     };
   }
-  applyAssistantMetadata(message, data, msg, countedUsageKeys) {
-    const model = msg["model"];
-    if (model && typeof model === "string" && !message.model) {
-      message.model = model;
-    }
-    const usage = extractClaudeUsage(data, msg);
-    if (usage && !message.tokens && !countedUsageKeys.has(usage.key)) {
-      countedUsageKeys.add(usage.key);
-      message.tokens = {
-        input: usage.input + usage.cacheCreate + usage.cacheRead,
-        output: usage.output,
-        cache_read: usage.cacheRead,
-        cache_create: usage.cacheCreate
-      };
-      const cost = estimateTokenCost(message.model, message.tokens);
-      if (cost !== null) {
-        message.cost = cost;
-        message.cost_source = "estimated";
-      }
-    }
-  }
   // --- User content normalization ---
   normalizeUserTextParts(content, timestampMs) {
     if (typeof content === "string") {
@@ -1372,7 +1376,7 @@ var TranscriptBuilder = class {
     };
   }
 };
-var HEAD_INDEX_VERSION = "claudecode-head-v7";
+var HEAD_INDEX_VERSION = "claudecode-head-v9";
 function resolveClaudeCodeDataRoot() {
   return resolveHomePath("CLAUDE_CONFIG_DIR", ".claude");
 }
@@ -1431,7 +1435,7 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
     const allSources = this.walkFiles(projectDirs, (entry) => entry.name.endsWith(".jsonl"), {
       recursive: true
     });
-    this.indexChildContexts(allSources, projectDirs);
+    this.indexChildContexts(allSources);
     const indexedSources = allSources.flatMap((source) => {
       const child = this.childContextsBySource.get(source.file);
       if (!child && !projectDirSet.has(dirname(source.file))) return [];
@@ -1447,6 +1451,7 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
       ({ source }) => matchesScanWindow(source.stat.mtimeMs, options)
     );
     if (options?.from != null || options?.to != null) {
+      const knownSessionIds = new Set(indexedSources.map(({ sessionId }) => sessionId));
       const childrenByParent = /* @__PURE__ */ new Map();
       for (const indexed of indexedSources) {
         const parentId = indexed.child?.parentSessionId;
@@ -1467,7 +1472,7 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
         const indexed = windowSelectedById.get(sessionId);
         if (!indexed) return false;
         const parentId = indexed.child?.parentSessionId;
-        if (!parentId) {
+        if (!parentId || !knownSessionIds.has(parentId)) {
           acceptedIds.add(sessionId);
           return true;
         }
@@ -1483,7 +1488,9 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
         }
       }
       if (options?.includeRelatedSessions !== false) {
-        const pending = [...connectedSelected.values()].filter(({ child }) => !child?.parentSessionId).map(({ sessionId }) => sessionId);
+        const pending = [...connectedSelected.values()].filter(
+          ({ child }) => !child?.parentSessionId || !knownSessionIds.has(child.parentSessionId)
+        ).map(({ sessionId }) => sessionId);
         while (pending.length > 0) {
           const parentId = pending.pop();
           for (const child of childrenByParent.get(parentId) ?? []) {
@@ -1532,14 +1539,14 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
     this.ensureChildIndex();
     const builder = new TranscriptBuilder();
     const assistantUuidToToolCalls = /* @__PURE__ */ new Map();
-    const countedUsageKeys = /* @__PURE__ */ new Set();
+    const requestMessages = /* @__PURE__ */ new Map();
     for (const record of readJsonlFile(meta.sourcePath)) {
       try {
         CLAUDE_RECORD_CONVERTER.convertRecord(
           record,
           builder,
           assistantUuidToToolCalls,
-          countedUsageKeys,
+          requestMessages,
           this.childSessionIdByToolUseId
         );
       } catch {
@@ -1589,33 +1596,18 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
     this.indexChildContexts(
       this.walkFiles(projectDirs, (entry) => entry.name.endsWith(".jsonl"), {
         recursive: true
-      }),
-      projectDirs
+      })
     );
   }
-  indexChildContexts(sources, projectDirs) {
+  indexChildContexts(sources) {
     this.childContextsBySource.clear();
     this.childSessionIdByToolUseId.clear();
-    const projectDirSet = new Set(projectDirs);
-    const contexts = /* @__PURE__ */ new Map();
-    const knownSessionIds = /* @__PURE__ */ new Set();
     for (const source of sources) {
       const child = this.readChildContext(source.file);
-      if (!child) {
-        if (projectDirSet.has(dirname(source.file))) {
-          knownSessionIds.add(basename(source.file, ".jsonl"));
-        }
-        continue;
-      }
-      contexts.set(source.file, child);
-      knownSessionIds.add(child.sessionId);
-    }
-    for (const [sourcePath, child] of contexts) {
-      const parentSessionId = child.parentSessionId && knownSessionIds.has(child.parentSessionId) ? child.parentSessionId : null;
-      const normalized = parentSessionId === child.parentSessionId ? child : { ...child, parentSessionId };
-      this.childContextsBySource.set(sourcePath, normalized);
+      if (!child) continue;
+      this.childContextsBySource.set(source.file, child);
       if (child.toolUseId) {
-        this.childSessionIdByToolUseId.set(child.toolUseId, normalized.sessionId);
+        this.childSessionIdByToolUseId.set(child.toolUseId, child.sessionId);
       }
     }
     this.childIndexReady = true;
@@ -1651,8 +1643,7 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
     const sessionId = asString(metadata?.["agentId"])?.trim() || fileStem.replace(/^agent-/, "");
     if (!sessionId) return null;
     const parentAgentId = asString(metadata?.["parentAgentId"])?.trim();
-    const candidateParentId = parentAgentId || basename(parentDir) || null;
-    const parentSessionId = candidateParentId && this.hasChildParent(sourcePath, projectDir, candidateParentId) ? candidateParentId : null;
+    const parentSessionId = parentAgentId || basename(parentDir) || null;
     const name = asString(metadata?.["name"])?.trim();
     const description = asString(metadata?.["description"])?.trim();
     const context = {
@@ -1666,14 +1657,6 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
     this.childContextCache.set(sourcePath, { metaMtimeMs, context });
     return context;
   }
-  hasChildParent(sourcePath, projectDir, parentSessionId) {
-    const subagentsDir = dirname(sourcePath);
-    return [
-      join3(projectDir, parentSessionId + ".jsonl"),
-      join3(subagentsDir, "agent-" + parentSessionId + ".jsonl"),
-      join3(subagentsDir, parentSessionId + ".jsonl")
-    ].some((path) => existsSync2(path));
-  }
   createFileSessionMeta(head, source) {
     const child = this.getChildContext(source.file);
     const projectDir = child?.projectDir ?? dirname(source.file);
@@ -1744,7 +1727,7 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
     let totalCacheCreateTokens = 0;
     let totalCost = 0;
     const modelUsageMap = {};
-    const countedUsageKeys = /* @__PURE__ */ new Set();
+    const usageByRequest = /* @__PURE__ */ new Map();
     let messageTitle = null;
     for (const line of readJsonlFileLines(filePath)) {
       let data;
@@ -1791,36 +1774,28 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
           }
           if (role === "assistant") {
             const usage = extractClaudeUsage(data, msg);
-            if (usage && !countedUsageKeys.has(usage.key)) {
-              countedUsageKeys.add(usage.key);
-              const inputTokens = usage.input;
-              const cacheRead = usage.cacheRead;
-              const cacheCreate = usage.cacheCreate;
-              const outputTokens = usage.output;
-              totalInputTokens += inputTokens + cacheRead + cacheCreate;
-              totalOutputTokens += outputTokens;
-              totalCacheReadTokens += cacheRead;
-              totalCacheCreateTokens += cacheCreate;
-              const m = asString(msg["model"]);
-              if (m?.trim()) {
-                const name = m.trim();
-                const msgTotal = inputTokens + cacheRead + cacheCreate + outputTokens;
-                modelUsageMap[name] = (modelUsageMap[name] ?? 0) + msgTotal;
-                const cost = estimateTokenCost(name, {
-                  input: inputTokens + cacheRead + cacheCreate,
-                  output: outputTokens,
-                  cache_read: cacheRead,
-                  cache_create: cacheCreate
-                });
-                if (cost !== null) totalCost += cost;
-              }
-            }
+            if (usage) usageByRequest.set(usage.key, usage);
           }
         }
       } catch {
       }
     }
     if (lineIndex === 0) return skippedSession("empty file");
+    for (const usage of usageByRequest.values()) {
+      const input = usage.input + usage.cacheRead + usage.cacheCreate;
+      totalInputTokens += input;
+      totalOutputTokens += usage.output;
+      totalCacheReadTokens += usage.cacheRead;
+      totalCacheCreateTokens += usage.cacheCreate;
+      if (!usage.model) continue;
+      modelUsageMap[usage.model] = (modelUsageMap[usage.model] ?? 0) + input + usage.output;
+      totalCost += estimateTokenCost(usage.model, {
+        input,
+        output: usage.output,
+        cache_read: usage.cacheRead,
+        cache_create: usage.cacheCreate
+      }) ?? 0;
+    }
     const directory = cwd ?? projectDir;
     const directoryTitle = basenameTitle(directory) || basenameTitle(projectDir);
     const title = resolveSessionTitle(explicitTitle, messageTitle, directoryTitle);
@@ -2703,9 +2678,6 @@ var KimiAgent = class extends FileSystemSessionSource {
     }
     return refs;
   }
-  scanSessionSource(sourcePath) {
-    return getParsedSession(this.parseSessionHeadResult(sourcePath));
-  }
   scanSessionSourceResult(source) {
     return this.parseSessionHeadResult(source.sourcePath);
   }
@@ -3405,9 +3377,6 @@ var KimiCodeAgent = class extends FileSystemSessionSource {
       return false;
     });
   }
-  scanSessionSource(sourcePath) {
-    return getParsedSession(this.parseSessionHeadResult(sourcePath));
-  }
   scanSessionSourceResult(source) {
     return this.parseSessionHeadResult(source.sourcePath);
   }
@@ -5339,7 +5308,12 @@ var CursorAgent = class extends DatabaseSessionSource {
           root: dataPath,
           path: join8(dataPath, "globalStorage", "state.vscdb")
         },
-        { root: dataPath, path: join8(dataPath, "workspaceStorage") }
+        {
+          root: dataPath,
+          path: join8(dataPath, "workspaceStorage"),
+          // Read-only SQLite opens can rewrite shared memory without changing sessions.
+          ignoredFileNames: ["state.vscdb-shm"]
+        }
       ] : []
     };
   }
@@ -7002,9 +6976,6 @@ var GrokAgent = class extends FileSystemSessionSource {
       ];
     });
   }
-  scanSessionSource(sourcePath) {
-    return getParsedSession(this.parseSessionHeadResult(sourcePath));
-  }
   scanSessionSourceResult(source) {
     return this.parseSessionHeadResult(source.sourcePath);
   }
@@ -8154,11 +8125,6 @@ var DshAgent = class extends FileSystemSessionSource {
     return refs;
   }
   /** The scan window is applied during enumeration, so parsing needs no options. */
-  scanSessionSource(sourcePath) {
-    return getParsedSession(
-      this.scanSessionSourceResult({ sessionId: "", sourcePath, fingerprint: "" })
-    );
-  }
   scanSessionSourceResult(source) {
     const encoding = encodingOfPath(source.sourcePath);
     const { header, projection } = this.parseSession(source.sourcePath, encoding);
@@ -8419,4 +8385,4 @@ export {
   createRegisteredAgents,
   getAgentInfoMap
 };
-//# sourceMappingURL=chunk-YCUN52HA.js.map
+//# sourceMappingURL=chunk-L3DDWTYV.js.map