asmgr 0.3.0 → 0.4.1

package/README.md

@@ -55,11 +55,11 @@ asmgr show --file /path/to/session.jsonl.zstd --format dialogue
 asmgr html <session-id> --agent dsh -o dsh-session.html
 ```
 
-以官方 [`dsh-v0.1.5-rc.1`](https://github.com/deepseek-ai/deepseek-harness/tree/dsh-v0.1.5-rc.1) 为基线，直接使用 `dsh-session-format-catalog` 的 v0→v3 解码/迁移及 `dsh-session/surface` 的原始追加消息筛选。迁移在内存中进行，不依赖本机 DSH 安装、不启动插件、不改写源日志。主干包含直接用户输入、助手正文，以及原生或 PTC 调用中 `ask_user_question` 的题目、全部选项与匹配的回答；普通工具的参数和结果完全不显示。回答按官方格式记录，不额外推断回答者身份。
+以官方 [`dsh-v0.1.5-rc.1`](https://github.com/deepseek-ai/deepseek-harness/tree/dsh-v0.1.5-rc.1) 为基线，直接使用 `dsh-session-format-catalog` 的 v0→v3 解码/迁移及 `dsh-session/surface` 的原始追加消息筛选。v4 存档复用官方 `dsh-session-format-v3-to-v4` 所依赖的 released v2 物理帧解码，再按 v4 词汇表（一等 tool-role 结果、`compact-checkpoint` 等生产者自有 source kind）投影；不升级已锁定的官方依赖。迁移在内存中进行，不依赖本机 DSH 安装、不启动插件、不改写源日志。主干包含直接用户输入、助手正文，以及原生或 PTC 调用中 `ask_user_question` 的题目、全部选项与匹配的回答；普通工具的参数和结果完全不显示。回答按官方格式记录，不额外推断回答者身份。
 
 范围保持有限：不解释未知插件事件、注入上下文、失败模型尝试或任意 `meta`；不把压缩 replacement 当成新对话，不重复拼接 fork 的父会话。只显示官方 compact checkpoint 对应的摘要。图片/文件只显示占位符并提示损失；完整工具仍在 text/HTML/Markdown 中保留。HTML/Markdown 暂无独立的主干导出开关。
 
-压缩日志需要运行时提供 Zstandard API（Node.js ≥ 22.15）；运行时缺少帧解码能力时明确报错，不把未读取内容当空会话。未知版本、官方迁移器拒绝的旧日志、损坏或未写完的文件会报出路径与原因，不尝试自定义补救，也不会自动回退到旧一代文件。已知官方边界包括 v0 中的 `subagent/descriptor.version: 2`：最新迁移器明确拒绝它；不能仅把该字段改成 3 来冒充兼容。
+压缩日志需要运行时提供 Zstandard API（Node.js ≥ 22.15）；运行时缺少帧解码能力时明确报错，不把未读取内容当空会话。未知版本（含比已支持最高代 v4 更新的存档）、官方迁移器拒绝的旧日志、损坏或未写完的文件会报出路径与原因，不尝试自定义补救，也不会自动回退到旧一代文件。已知官方边界包括 v0 中的 `subagent/descriptor.version: 2`：最新迁移器明确拒绝它；不能仅把该字段改成 3 来冒充兼容。
 
 ## <a id="install"></a>安装
 
@@ -179,7 +179,9 @@ asmgr search "database migration" --session <session-id>   # 只在一个会话
 
 每条命中是一行 tab 分隔、以 `project` 列（cwd 最近的含 `.git` 祖先目录；找不到 `.git` 祖先时为 cwd 原值，无 cwd 时为 `(unscoped)`）开头：`project`、`agent`、`session-id`、`#条目`、`role/kind`、`摘录`。
 
-`--session <id>` 把搜索限定到一个会话（先精确匹配 id，否则按前缀匹配）——用来在**当前这个会话**里按关键词找模型回复，不必先用 `--file` 指路径。
+`--session <id>` 把搜索限定到一个会话（先精确匹配 id，否则按前缀匹配；DSH 的 id 是 `session-<uuid>`，直接给裸 uuid 也可以）——用来在**当前这个会话**里按关键词找模型回复，不必先用 `--file` 指路径。
+
+跨会话搜索对每个会话独立解析：遇到官方迁移器拒绝或损坏的存档时，在 stderr 逐条报出路径与原因后跳过，不中断其余会话的检索；stdout 的命中行不受影响。
 
 ### `asmgr import`
 

package/dist/asmgr.mjs

@@ -43220,7 +43220,7 @@ var {
 var BIN_NAME = "asmgr";
 
 // src/cli/version.ts
-var VERSION = true ? "0.3.0" : devVersion();
+var VERSION = true ? "0.4.1" : devVersion();
 
 // src/core/index.ts
 import { stat as stat2 } from "node:fs/promises";
@@ -53417,6 +53417,7 @@ function deriveEventMessage2(event) {
 }
 
 // src/core/adapters/dsh.ts
+var DSH_NATIVE_VERSION = 4;
 function isDshHeader(value) {
   const row2 = record3(value);
   return row2.type === "session" && typeof row2.version === "number" && typeof row2.id === "string";
@@ -53442,19 +53443,26 @@ function selectDshGenerations(paths) {
   }
   return [...other, ...selected.values()].sort();
 }
+function readV4Header(header) {
+  return { ...releasedV2SessionFormatCodec.decodeHeader({ ...record3(header), version: 2 }), version: DSH_NATIVE_VERSION };
+}
 function headerRef(path3, header) {
-  const result = sessionFormatCatalog.readHeader(header);
-  if (result.status === "unsupported" || result.status === "malformed") throw new Error(result.reason);
+  const stored = record3(header).version;
+  if (typeof stored === "number" && stored > DSH_NATIVE_VERSION) {
+    throw new Error(`DSH \u4F1A\u8BDD\u4F7F\u7528\u66F4\u65B0\u7684\u5B58\u6863\u683C\u5F0F v${stored}\uFF0C\u672C\u7248\u672C\u6700\u9AD8\u652F\u6301 v${DSH_NATIVE_VERSION}`);
+  }
+  const decoded = stored === DSH_NATIVE_VERSION ? { storedVersion: DSH_NATIVE_VERSION, header: readV4Header(header) } : sessionFormatCatalog.readHeader(header);
+  if ("reason" in decoded) throw new Error(decoded.reason);
   const namedVersion = dshLogVersion(path3);
-  if (namedVersion !== void 0 && namedVersion !== result.storedVersion) {
-    throw new Error(`DSH \u6587\u4EF6\u540D\u7248\u672C v${namedVersion} \u4E0E\u6587\u4EF6\u5934 v${result.storedVersion} \u4E0D\u7B26`);
+  if (namedVersion !== void 0 && namedVersion !== decoded.storedVersion) {
+    throw new Error(`DSH \u6587\u4EF6\u540D\u7248\u672C v${namedVersion} \u4E0E\u6587\u4EF6\u5934 v${decoded.storedVersion} \u4E0D\u7B26`);
   }
   return {
     agent: "dsh",
-    id: result.header.id,
+    id: decoded.header.id,
     path: path3,
-    cwd: result.header.cwd,
-    startedAt: new Date(result.header.createdAt).toISOString(),
+    cwd: decoded.header.cwd,
+    startedAt: new Date(decoded.header.createdAt).toISOString(),
     source: { kind: "events", path: path3, lossy: false }
   };
 }
@@ -53472,6 +53480,19 @@ async function discoverDsh(root5) {
   for (const path3 of files) refs.push(await refFromDshFile(path3));
   return refs;
 }
+function createDshRestore(headerRow) {
+  if (record3(headerRow).version !== DSH_NATIVE_VERSION) {
+    return sessionFormatCatalog.createRestore(headerRow, { recovery: "strict", validation: "current" });
+  }
+  const decoder = releasedV2SessionFormatCodec.createDecoder({ ...record3(headerRow), version: 2 }, "strict");
+  const header = { ...decoder.header, version: DSH_NATIVE_VERSION };
+  const collector = new SessionFormatEventCollector();
+  return {
+    header,
+    decodeRow: (row2) => decoder.decodeRow(row2, collector),
+    finish: () => ({ header, inheritedEventCount: decoder.finish(collector), events: collector.values })
+  };
+}
 async function parseDsh(ref) {
   try {
     let restore;
@@ -53479,7 +53500,7 @@ async function parseDsh(ref) {
     for await (const row2 of iterateJsonl(ref.path)) {
       if (!restore) {
         source = headerRef(ref.path, row2);
-        restore = sessionFormatCatalog.createRestore(row2, { recovery: "strict", validation: "current" });
+        restore = createDshRestore(row2);
       } else restore.decodeRow(row2);
     }
     if (!restore) throw new Error("\u7A7A\u4F1A\u8BDD\u6587\u4EF6");
@@ -53595,7 +53616,8 @@ ${answer}`,
       if (typeof data.compactionId === "string") summaries.set(data.compactionId, visibleText(data.summary));
     } else if (raw2.type === "user/message" && isReplacementSurfaceEvent(event)) {
       const source = record3(data.source);
-      if (source.kind === "plugin" && source.plugin === "compact" && typeof source.compactionId === "string") {
+      const compacted = source.kind === "compact-checkpoint" || source.kind === "plugin" && source.plugin === "compact";
+      if (compacted && typeof source.compactionId === "string") {
         push3({ role: "event", kind: "compaction", text: summaries.get(source.compactionId) || "\u5BF9\u8BDD\u5DF2\u538B\u7F29", timestamp, rawType: raw2.type });
       }
     } else if (isAppendSurfaceEvent(event)) {
@@ -53609,24 +53631,24 @@ ${answer}`,
         const text9 = visibleText(message.content);
         if (text9.trim()) push3({ role: "assistant", kind: "message", text: text9, timestamp, rawType: raw2.type });
       } else if (event.type === "tool/result") {
-        const block = event.data.message.content[0];
-        const linked = raw2.sourceEventSeqs?.map((seq) => callsBySeq.get(seq)).filter((value) => value !== void 0 && value.entry.tool?.callId === block.toolCallId) ?? [];
-        const pending = linked.length > 1 ? void 0 : linked[0] ?? calls.get(callKey(block.toolCallId));
-        if (pending) finishTool(pending, block.content, block.isError === true, event.data.error?.code, timestamp);
+        const result = toolResult(event.data.message);
+        const linked = raw2.sourceEventSeqs?.map((seq) => callsBySeq.get(seq)).filter((value) => value !== void 0 && value.entry.tool?.callId === result.callId) ?? [];
+        const pending = linked.length > 1 ? void 0 : linked[0] ?? calls.get(callKey(result.callId));
+        if (pending) finishTool(pending, result.content, result.isError, event.data.error?.code, timestamp);
         else push3({
           role: "tool",
           kind: "tool",
-          text: visibleText(block.content),
+          text: visibleText(result.content),
           timestamp,
           rawType: raw2.type,
-          tool: { callId: block.toolCallId, result: { type: block.isError ? "failure" : "success", log: visibleText(block.content) } }
+          tool: { callId: result.callId, result: { type: result.isError ? "failure" : "success", log: visibleText(result.content) } }
         });
       } else {
         diagnostics.ignored++;
         continue;
       }
     } else {
-      if (KNOWN_SESSION_EVENT_TYPES.has(raw2.type)) diagnostics.ignored++;
+      if (isKnownDshEventType(raw2.type)) diagnostics.ignored++;
       else {
         diagnostics.unknown++;
         unknown2.add(raw2.type);
@@ -53651,6 +53673,18 @@ ${answer}`,
 function record3(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
+function toolResult(message) {
+  const row2 = record3(message);
+  if (row2.role === "tool") {
+    return { callId: String(row2.toolCallId), content: row2.content, isError: row2.isError === true };
+  }
+  const wrapper = record3(Array.isArray(row2.content) ? row2.content[0] : void 0);
+  return { callId: String(wrapper.toolCallId), content: wrapper.content, isError: wrapper.isError === true };
+}
+var V4_EVENT_TYPES = /* @__PURE__ */ new Set(["developer/message", "workspace/changes"]);
+function isKnownDshEventType(type) {
+  return KNOWN_SESSION_EVENT_TYPES.has(type) || V4_EVENT_TYPES.has(type);
+}
 function parseJson(value) {
   if (typeof value !== "string") return value;
   try {
@@ -54767,13 +54801,25 @@ async function findSession(id, agents = AGENTS, roots = {}) {
   return findSessionAmong(await discoverSessions(agents, roots), id);
 }
 function findSessionAmong(refs, id) {
-  return refs.find((session) => session.id === id) ?? refs.find((session) => session.id.startsWith(id));
+  for (const needle of id.startsWith("session-") ? [id] : [id, `session-${id}`]) {
+    const found = refs.find((session) => session.id === needle) ?? refs.find((session) => session.id.startsWith(needle));
+    if (found) return found;
+  }
+  return void 0;
 }
 async function searchRefs(refs, query, limit = 20) {
   const hits = [];
   const needle = query.toLowerCase();
+  let skipped = 0;
   for (const ref of refs) {
-    const parsed = await parseSession(ref);
+    let parsed;
+    try {
+      parsed = await parseSession(ref);
+    } catch (error) {
+      skipped++;
+      console.error(`\u8DF3\u8FC7\u65E0\u6CD5\u89E3\u6790\u7684\u4F1A\u8BDD ${ref.path}\uFF1A${error instanceof Error ? error.message : String(error)}`);
+      continue;
+    }
     for (const entry of parsed.entries) {
       const searchText = timelineEntrySearchText(entry);
       if (!searchText.toLowerCase().includes(needle)) continue;
@@ -54796,6 +54842,7 @@ async function searchRefs(refs, query, limit = 20) {
       if (hits.length >= limit) return hits;
     }
   }
+  if (skipped > 0) console.error(`\u5DF2\u8DF3\u8FC7 ${skipped} \u4E2A\u65E0\u6CD5\u89E3\u6790\u7684\u4F1A\u8BDD\uFF08\u8BE6\u89C1\u4E0A\u65B9\u5404\u6761\u8DEF\u5F84\u4E0E\u539F\u56E0\uFF09`);
   return hits;
 }
 async function summarizeSession(ref) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asmgr",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Search and render coding-agent sessions and public ChatGPT shares as self-contained HTML or Markdown.",
   "license": "MIT",
   "type": "module",
@@ -30,6 +30,7 @@
     "@deepseek-ai/dsh-session": "0.1.5-rc.1",
     "@deepseek-ai/dsh-session-format": "0.1.5-rc.1",
     "@deepseek-ai/dsh-session-format-catalog": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-session-format-v2-to-v3": "0.1.5-rc.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/exec": "^7.0.3",
     "@semantic-release/git": "^10.0.1",