@clawos-dev/clawd 0.2.10-beta.7.d4b8b64 → 0.2.11-beta.8.3707c2b

package/dist/cli.cjs

@@ -12448,6 +12448,24 @@ var ParsedEventSchema = external_exports.discriminatedUnion("kind", [
     ...ParsedEventBase,
     kind: external_exports.literal("turn_end")
   }),
+  // SDK system 帧 task_started / task_progress / task_notification 的归一化产物：
+  // 子 agent 执行过程中实时上报 agentId / lastToolName / stats，UI pending 期就能开抽屉、看进度。
+  // toolUseId 对齐父 Agent 工具的 tool_use_id；status 由 SDK subtype 派生。
+  external_exports.object({
+    ...ParsedEventBase,
+    kind: external_exports.literal("subagent_progress"),
+    toolUseId: external_exports.string(),
+    agentId: external_exports.string(),
+    status: external_exports.enum(["started", "running", "completed", "failed"]),
+    description: external_exports.string().optional(),
+    lastToolName: external_exports.string().optional(),
+    prompt: external_exports.string().optional(),
+    stats: external_exports.object({
+      durationMs: external_exports.number().int().nonnegative().optional(),
+      tokens: external_exports.number().int().nonnegative().optional(),
+      toolUseCount: external_exports.number().int().nonnegative().optional()
+    }).optional()
+  }),
   external_exports.object({
     ...ParsedEventBase,
     kind: external_exports.literal("error"),
@@ -13559,6 +13577,12 @@ var SessionManager = class {
   currentCollector = null;
   // tool id → capabilities 快照（仅 capabilities:get RPC 缓存用；contextWindowSize 走 adapter.resolveContextWindow，无需缓存）
   capabilitiesCache = /* @__PURE__ */ new Map();
+  // sessionId → (synth uuid → real uuid)：
+  //   synth uuid = daemon 在 reducer 'send' 命令里生成、写进 buffer 里 user_text 事件的 uuid
+  //   real uuid  = CC 写 jsonl 时给 user 行分配的 uuid（也是 file-history-snapshot.messageId 的来源）
+  // 由 observer 监听 jsonl user 行后调 recordRealUserUuid 建立映射；rewind 系列 RPC 在
+  // 入参 / 出参做转译，保证 UI 看到的 uuid 始终是 events 流里的 synth uuid
+  realUuidBySynth = /* @__PURE__ */ new Map();
   async getCapabilities(tool) {
     const cached = this.capabilitiesCache.get(tool);
     if (cached) return cached;
@@ -13658,6 +13682,53 @@ var SessionManager = class {
     const file = this.getFile(args.sessionId);
     return { response: file, broadcast: [] };
   }
+  // observer 上报"jsonl 写入了一条 user 行"时调用：在 buffer 里找到与之对应的、
+  // 还没建立映射的最早一条 synth user_text，记下 synth → real 映射。
+  // 找不到匹配的 synth（runner 不存在 / buffer 已被 /clear 清空 / 真 uuid 来自纯 history
+  // 重启后的 session）→ 静默跳过；rewindable 集合稍后在 RPC 出口走 fallback 路径
+  recordRealUserUuid(args) {
+    const runner = this.runners.get(args.sessionId);
+    if (!runner) return;
+    let map = this.realUuidBySynth.get(args.sessionId);
+    if (map && map.has(args.realUuid)) return;
+    if (map) {
+      for (const v of map.values()) if (v === args.realUuid) return;
+    }
+    const buffer = runner.getState().buffer;
+    let matchedSynth = null;
+    for (const seqd of buffer) {
+      const ev = seqd.event;
+      if (ev.kind !== "user_text") continue;
+      if (ev.text !== args.text) continue;
+      if (typeof ev.uuid !== "string") continue;
+      if (map && map.has(ev.uuid)) continue;
+      matchedSynth = ev.uuid;
+      break;
+    }
+    if (!matchedSynth) return;
+    if (!map) {
+      map = /* @__PURE__ */ new Map();
+      this.realUuidBySynth.set(args.sessionId, map);
+    }
+    map.set(matchedSynth, args.realUuid);
+  }
+  // 把 UI 传来的 uuid（events 流里的 synth uuid）转成 jsonl / file-history 用的 real uuid。
+  // 没有映射时返回原值——history-only session（buffer 为空）的 uuid 本来就来自 jsonl
+  // 真 uuid，UI 端 line.uuid 也是真 uuid，不需要转译
+  toRealUuid(sessionId, uuid) {
+    const map = this.realUuidBySynth.get(sessionId);
+    if (!map) return uuid;
+    return map.get(uuid) ?? uuid;
+  }
+  // file-history reader 拿到的是 real uuid 集合，反查映射输出给 UI 的 synth uuid。
+  // 没建立映射的 real uuid 原样输出（同上：history-only session 的 line.uuid 是 real uuid）
+  toUiUuids(sessionId, realUuids) {
+    const map = this.realUuidBySynth.get(sessionId);
+    if (!map) return realUuids;
+    const reverse = /* @__PURE__ */ new Map();
+    for (const [synth, real] of map) reverse.set(real, synth);
+    return realUuids.map((r) => reverse.get(r) ?? r);
+  }
   // 内部帮手：不走 ManagerResult 的 get，直接拿 SessionFile
   getFile(sessionId) {
     const runner = this.runners.get(sessionId);
@@ -13688,6 +13759,7 @@ var SessionManager = class {
         runner.input({ kind: "command", command: { kind: "delete" } });
       });
       this.runners.delete(args.sessionId);
+      this.realUuidBySynth.delete(args.sessionId);
       return { response: { sessionId: args.sessionId }, broadcast };
     }
     this.deps.store.delete(args.sessionId);
@@ -13753,7 +13825,10 @@ var SessionManager = class {
       cwd: file.cwd,
       toolSessionId
     });
-    return { response: { userMessageIds: ids }, broadcast: [] };
+    return {
+      response: { userMessageIds: this.toUiUuids(args.sessionId, ids) },
+      broadcast: []
+    };
   }
   // 预览 rewind 的真实 diff：对齐 CC `fileHistoryGetDiffStats`。daemon 读
   // ~/.claude/file-history/<toolSessionId>/<backupFileName> vs 磁盘当前内容算 hunks，
@@ -13776,7 +13851,8 @@ var SessionManager = class {
     const r = this.deps.historyReader.computeRewindDiff({
       cwd: file.cwd,
       toolSessionId,
-      userMessageId: args.userMessageId
+      // UI 传 synth uuid，转译成 jsonl 真 uuid 给 historyReader
+      userMessageId: this.toRealUuid(args.sessionId, args.userMessageId)
     });
     return { response: { ...r }, broadcast: [] };
   }
@@ -13804,7 +13880,8 @@ var SessionManager = class {
     let raw;
     try {
       raw = await runner.sendControlRequest("rewind_files", {
-        user_message_id: args.userMessageId,
+        // UI 传 synth uuid，CC IPC 要的是 jsonl 真 uuid（CC 进程内 FileHistoryState 用 real uuid 锚点）
+        user_message_id: this.toRealUuid(args.sessionId, args.userMessageId),
         dry_run: dryRun
       });
     } catch (err) {
@@ -15470,6 +15547,7 @@ function normalizeUsage(raw) {
 }
 function parseClaudeObject(obj) {
   if (obj.isSidechain === true) return [];
+  if (typeof obj.parent_tool_use_id === "string" && obj.parent_tool_use_id.length > 0) return [];
   const events = parseClaudeObjectInner(obj);
   const uuid = obj.uuid;
   if (typeof uuid === "string" && uuid.length > 0) {
@@ -15496,6 +15574,11 @@ function parseClaudeObjectInner(obj) {
     }
     return events;
   }
+  if (type === "system" && (subtype === "task_started" || subtype === "task_progress" || subtype === "task_notification")) {
+    const ev = parseTaskSystemEvent(subtype, obj);
+    if (ev) events.push(ev);
+    return events;
+  }
   if (type === "assistant") {
     const message = obj.message;
     if (message) {
@@ -15532,7 +15615,7 @@ function parseClaudeObjectInner(obj) {
     const message = obj.message;
     const content = message?.content ?? [];
     if (!Array.isArray(content)) return events;
-    const toolResultExtra = extractToolResultExtra(obj.toolUseResult);
+    const toolResultExtra = extractToolResultExtra(obj.toolUseResult ?? obj.tool_use_result);
     const sourceToolAssistantUUID = typeof obj.sourceToolAssistantUUID === "string" ? obj.sourceToolAssistantUUID : void 0;
     for (const part of content) {
       const partType = part.type;
@@ -15607,16 +15690,8 @@ function parseClaudeObjectInner(obj) {
     });
     return events;
   }
-  if (type === "usage" && obj.usage && typeof obj.usage === "object") {
-    const usage = normalizeUsage(obj.usage);
-    if (usage) events.push({ kind: "meta_update", patch: { contextUsage: usage } });
-    return events;
-  }
+  if (type === "usage") return events;
   if (type === "result") {
-    if (obj.usage && typeof obj.usage === "object") {
-      const usage = normalizeUsage(obj.usage);
-      if (usage) events.push({ kind: "meta_update", patch: { contextUsage: usage } });
-    }
     events.push({ kind: "turn_end" });
     return events;
   }
@@ -15649,6 +15724,25 @@ function extractStructuredPatch(raw) {
   }
   return hunks.length > 0 ? hunks : void 0;
 }
+function parseTaskSystemEvent(subtype, obj) {
+  const toolUseId = typeof obj.tool_use_id === "string" ? obj.tool_use_id : "";
+  const agentId = typeof obj.task_id === "string" ? obj.task_id : "";
+  if (!toolUseId || !agentId) return null;
+  const status = subtype === "task_started" ? "started" : subtype === "task_progress" ? "running" : typeof obj.status === "string" && obj.status === "failed" ? "failed" : "completed";
+  const ev = { kind: "subagent_progress", toolUseId, agentId, status };
+  if (typeof obj.description === "string" && obj.description.length > 0) ev.description = obj.description;
+  if (typeof obj.last_tool_name === "string" && obj.last_tool_name.length > 0) ev.lastToolName = obj.last_tool_name;
+  if (typeof obj.prompt === "string" && obj.prompt.length > 0) ev.prompt = obj.prompt;
+  const usage = obj.usage;
+  if (usage && typeof usage === "object") {
+    const stats = {};
+    if (typeof usage.duration_ms === "number") stats.durationMs = usage.duration_ms;
+    if (typeof usage.total_tokens === "number") stats.tokens = usage.total_tokens;
+    if (typeof usage.tool_uses === "number") stats.toolUseCount = usage.tool_uses;
+    if (Object.keys(stats).length > 0) ev.stats = stats;
+  }
+  return ev;
+}
 function extractToolResultExtra(raw) {
   if (!raw || typeof raw !== "object") return void 0;
   const r = raw;
@@ -15740,6 +15834,13 @@ function setUnknownTypeHandler(handler) {
 function notifyUnknownType(type, subtype, sessionId) {
   if (unknownTypeHandler) unknownTypeHandler(type, subtype, sessionId);
 }
+function buildSpawnEnv(ctxEnv, base = process.env) {
+  return {
+    CLAUDE_CODE_ENABLE_SDK_FILE_CHECKPOINTING: "1",
+    ...base,
+    ...ctxEnv ?? {}
+  };
+}
 function encodeClaudeStdin(text) {
   const frame = {
     type: "user",
@@ -15846,7 +15947,7 @@ var ClaudeAdapter = class {
     const cmd = process.env.CLAUDE_BIN ?? "claude";
     const child = (0, import_node_child_process.spawn)(cmd, args, {
       cwd: ctx.cwd,
-      env: { ...process.env, ...ctx.env ?? {} },
+      env: buildSpawnEnv(ctx.env),
       stdio: ["pipe", "pipe", "pipe"]
     });
     this.logger?.info("claude spawn", { cmd, args, cwd: ctx.cwd });
@@ -16229,11 +16330,50 @@ var SessionObserver = class {
         if (events.length > 0) {
           this.opts.onEvent({ sessionId: w.sessionId, events });
         }
+        this.maybeReportUserMessage(w.sessionId, line);
       }
     } finally {
       import_node_fs9.default.closeSync(fd);
     }
   }
+  // 解析 JSONL 单行：仅当是主链 user 文本行（非 sidechain / 非 sub-agent / message.role='user'
+  // 且 content 含 text part）时，抽出 real uuid + 第一段 text + timestamp 上报。
+  // 不依赖 adapter——这是 CC JSONL 格式的兜底识别，与 observer 整体的 CC 耦合一致
+  maybeReportUserMessage(sessionId, line) {
+    const cb = this.opts.onUserMessageObserved;
+    if (!cb) return;
+    const trimmed = line.trim();
+    if (!trimmed) return;
+    let obj;
+    try {
+      obj = JSON.parse(trimmed);
+    } catch {
+      return;
+    }
+    if (obj.type !== "user") return;
+    if (obj.isSidechain === true) return;
+    if (typeof obj.parent_tool_use_id === "string" && obj.parent_tool_use_id.length > 0) return;
+    if (typeof obj.parentToolUseId === "string" && obj.parentToolUseId.length > 0) return;
+    const uuid = obj.uuid;
+    if (typeof uuid !== "string" || uuid.length === 0) return;
+    const message = obj.message;
+    if (!message || message.role !== "user") return;
+    const content = message.content;
+    let text = null;
+    if (Array.isArray(content)) {
+      for (const part of content) {
+        if (part && typeof part === "object" && part.type === "text" && typeof part.text === "string") {
+          text = part.text;
+          break;
+        }
+      }
+    } else if (typeof content === "string") {
+      text = content;
+    }
+    if (text === null) return;
+    const ts = typeof obj.timestamp === "string" ? obj.timestamp : void 0;
+    cb(sessionId, uuid, text, ts);
+  }
   isObserving(sessionId) {
     return this.watches.has(sessionId);
   }
@@ -17907,7 +18047,12 @@ async function startDaemon(config) {
     onEvent: ({ sessionId, events }) => {
       manager.feedObserverEvents(sessionId, events);
     },
-    onStatus: (sessionId, status) => transport?.broadcastToSession(sessionId, { type: "session:status", sessionId, status })
+    onStatus: (sessionId, status) => transport?.broadcastToSession(sessionId, { type: "session:status", sessionId, status }),
+    // jsonl user 行的 real uuid 映射到 buffer 里 synth user_text，rewind 系列 RPC 在
+    // daemon 内部转译，UI 看到的始终是 events 流里的 synth uuid（详见 manager 注释）
+    onUserMessageObserved: (sessionId, realUuid, text) => {
+      manager.recordRealUserUuid({ sessionId, realUuid, text });
+    }
   });
   const handlers = buildMethodHandlers({ manager, workspace, skills, history, observer, getAdapter, store });
   wsServer = new LocalWsServer({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.10-beta.7.d4b8b64",
+  "version": "0.2.11-beta.8.3707c2b",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",