@clawos-dev/clawd 0.2.19-beta.26.3dd6b2e → 0.2.20-beta.27.e8cd6cc

package/dist/cli.cjs

@@ -8145,6 +8145,9 @@ var METHOD_NAMES = [
   "session:unsubscribe",
   "session:pin",
   "permission:respond",
+  // AskUserQuestion 表单回写：UI 答完所有 question 后调用，daemon 把答案合并进 updated_input
+  // 写一条 control_response 到 CC stdin（详见 events.ts session:question JSDoc）
+  "session:answerQuestion",
   "history:projects",
   "history:list",
   "history:read",
@@ -8176,6 +8179,7 @@ var HISTORY_USER_META_VALUES = [
   "attachment-skills",
   "attachment-deferred-tools"
 ];
+var ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion";
 
 // ../protocol/src/errors.ts
 var ERROR_CODES = {
@@ -12378,6 +12382,16 @@ var MemoryEntrySchema = external_exports.object({
   content: external_exports.string(),
   mtimeMs: external_exports.number().optional()
 });
+var AskQuestionOptionSchema = external_exports.object({
+  label: external_exports.string().min(1),
+  description: external_exports.string().optional()
+});
+var AskQuestionItemSchema = external_exports.object({
+  question: external_exports.string().min(1),
+  // multiSelect 必填（boolean 不给默认值）：daemon emit 时必须显式传，避免 UI 端漂移
+  multiSelect: external_exports.boolean(),
+  options: external_exports.array(AskQuestionOptionSchema).min(1)
+});
 var ParsedEventSchema = external_exports.discriminatedUnion("kind", [
   // session_init 仅携带 session 标识；resolvedModel 等元信息走 meta_update
   external_exports.object({
@@ -12430,7 +12444,13 @@ var ParsedEventSchema = external_exports.discriminatedUnion("kind", [
     // 老 CC 走 <task-notification> user 消息携带统计，新 CC 直接挂在这里——兼容期两者可能并存
     toolResultExtra: ToolResultExtraSchema.optional(),
     // 精确指向发起 tool 的 assistant 消息顶层 uuid；toolUseId 已够 UI 聚合，这个仅作调试辅助
-    sourceToolAssistantUUID: external_exports.string().optional()
+    sourceToolAssistantUUID: external_exports.string().optional(),
+    // AskUserQuestion 实时回放（plan: clawd-ask-user-question 任务 B 修复）：
+    //   CC 用户答完后把 answers 写在 user 帧顶层 toolUseResult.answers，daemon parser
+    //   抽到这里。UI eventsToLines 用 toolUseId 配对到 question-card line，把卡片转为
+    //   只读态显示用户的答案。仅 AskUserQuestion 配对的 tool_result 行携带；普通工具不带。
+    //   等价于 HistoryMessage.askQuestionAnswers（历史回放路径），两端字段名对齐。
+    askQuestionAnswers: external_exports.record(external_exports.string(), external_exports.string()).optional()
   }),
   // CC 命中项目记忆（`type:"attachment"`，`attachment.type:"memories"`）的独立事件；
   // 其它 attachment 子类型（skills / hook_context / deferred_tools / hook_success / unknown）
@@ -12451,6 +12471,20 @@ var ParsedEventSchema = external_exports.discriminatedUnion("kind", [
     // 选项 ii）。老 daemon / legacy CC 不发该字段时保持向后兼容（optional）。
     toolUseId: external_exports.string().optional()
   }),
+  // AskUserQuestion 工具调用的内联锚点（plan: clawd-ask-user-question 问题 1 修复）：
+  //   daemon parser 把 assistant tool_use AskUserQuestion 翻译成本 kind（不是 permission_request、
+  //   也不是 tool_call），让 UI 在事件流自然位置渲染问答卡（紧跟 assistant 消息 / 在后续消息之前），
+  //   而不是被强行挂在末尾。permission_request 帧仍正常下发驱动 pendingQuestions 状态机，
+  //   但只走 wire 帧不入 ring buffer——状态由 daemon pendingQuestions 持有，
+  //   渲染锚点由本 kind 的 ParsedEvent 提供。
+  // 历史回放：history-to-lines.ts 在 jsonl tool_use AskUserQuestion 处插入对应 'question-card' line，
+  //   配对的 tool_result 携带 toolUseResult.answers，已答完的展示只读态。
+  external_exports.object({
+    ...ParsedEventBase,
+    kind: external_exports.literal("ask_user_question"),
+    toolUseId: external_exports.string(),
+    questions: external_exports.array(AskQuestionItemSchema)
+  }),
   external_exports.object({
     ...ParsedEventBase,
     kind: external_exports.literal("turn_end")
@@ -12658,6 +12692,20 @@ var RecentDirEntrySchema = external_exports.object({
 var HistoryRecentDirsResponseSchema = external_exports.object({
   dirs: external_exports.array(RecentDirEntrySchema)
 });
+var SessionQuestionFrameSchema = external_exports.object({
+  type: external_exports.literal("session:question"),
+  sessionId: external_exports.string().min(1),
+  toolUseId: external_exports.string().min(1),
+  requestId: external_exports.string().min(1),
+  // UI 单卡承载多 question；空数组语义无效，schema 必拒
+  questions: external_exports.array(AskQuestionItemSchema).min(1)
+});
+var AnswerQuestionArgs = external_exports.object({
+  sessionId: external_exports.string().min(1),
+  toolUseId: external_exports.string().min(1),
+  answers: external_exports.record(external_exports.string(), external_exports.string())
+});
+var AnswerQuestionResponseSchema = external_exports.object({ ok: external_exports.literal(true) });
 var AuthRequestFrameSchema = external_exports.object({
   type: external_exports.literal("auth"),
   token: external_exports.string().min(1),
@@ -12847,6 +12895,7 @@ function cloneState(s) {
     bufferStartSeq: s.bufferStartSeq,
     turnOpen: s.turnOpen,
     pendingPermissions: s.pendingPermissions,
+    pendingQuestions: s.pendingQuestions,
     freshSpawn: s.freshSpawn,
     procAlive: s.procAlive,
     seenUuids: s.seenUuids
@@ -12947,10 +12996,29 @@ function applyParsedEvent(state, event, deps) {
     const tool = event.tool;
     const input = event.input;
     const requestId = event.requestId;
-    const hit = matchesAnyRule(next.file.permissionRules, tool, input);
+    const toolUseId = event.toolUseId;
+    if (tool === ASK_USER_QUESTION_TOOL_NAME) {
+      const questions = input && typeof input === "object" && "questions" in input ? input.questions : void 0;
+      const frame = {
+        type: "session:question",
+        sessionId,
+        toolUseId: toolUseId ?? "",
+        requestId,
+        questions: Array.isArray(questions) ? questions : []
+      };
+      effects.push({ kind: "emit-frame", frame });
+      if (toolUseId) {
+        next.pendingQuestions = {
+          ...next.pendingQuestions,
+          [toolUseId]: { requestId, input }
+        };
+      }
+      return { state: next, effects };
+    }
     const pushed2 = pushEventToBuffer(next, event, deps);
     next = pushed2.state;
     effects.push(...pushed2.effects);
+    const hit = matchesAnyRule(next.file.permissionRules, tool, input);
     if (hit) {
       effects.push({
         kind: "write-stdin",
@@ -13071,6 +13139,7 @@ function applyCommand(state, command, deps) {
     }
     case "stop": {
       next.pendingPermissions = {};
+      next.pendingQuestions = {};
       if (next.procAlive) {
         next.status = "stopping";
         effects.push({ kind: "kill", signal: "SIGKILL" });
@@ -13097,6 +13166,7 @@ function applyCommand(state, command, deps) {
     }
     case "delete": {
       next.pendingPermissions = {};
+      next.pendingQuestions = {};
       if (next.procAlive) {
         effects.push({ kind: "kill", signal: "SIGKILL" });
       }
@@ -13206,6 +13276,7 @@ function reduceSession(state, input, deps) {
       const next = cloneState(state);
       next.procAlive = false;
       next.status = "stopped";
+      next.pendingQuestions = {};
       return {
         state: next,
         effects: [
@@ -13277,6 +13348,31 @@ function reduceSession(state, input, deps) {
       }
       return { state: next, effects };
     }
+    case "answer-question": {
+      const pending = state.pendingQuestions?.[input.toolUseId];
+      if (!pending) {
+        return { state, effects: [] };
+      }
+      const next = cloneState(state);
+      const nextPending = { ...next.pendingQuestions };
+      delete nextPending[input.toolUseId];
+      next.pendingQuestions = nextPending;
+      const baseInput = pending.input && typeof pending.input === "object" && !Array.isArray(pending.input) ? pending.input : {};
+      const updatedInput = {
+        ...baseInput,
+        answers: input.answers
+      };
+      return {
+        state: next,
+        effects: [
+          {
+            kind: "send-control-response-allow-with-input",
+            requestId: pending.requestId,
+            updatedInput
+          }
+        ]
+      };
+    }
     case "tick": {
       const staleMs = 10 * 60 * 1e3;
       const now = input.nowMs;
@@ -13301,6 +13397,20 @@ function reduceSession(state, input, deps) {
 
 // src/session/runner.ts
 var DEFAULT_CONTROL_REQUEST_TIMEOUT_MS = 1e4;
+function encodeAllowWithInputControlResponse(requestId, updatedInput) {
+  const payload = {
+    type: "control_response",
+    response: {
+      subtype: "success",
+      request_id: requestId,
+      response: {
+        behavior: "allow",
+        updatedInput
+      }
+    }
+  };
+  return JSON.stringify(payload) + "\n";
+}
 var DEFAULT_WAIT_STOP_TIMEOUT_MS = 3e3;
 var SessionRunner = class {
   constructor(initial, hooks) {
@@ -13336,6 +13446,11 @@ var SessionRunner = class {
       this.stopWaiters = [];
       for (const w of waiters) w();
     }
+    try {
+      this.hooks.onAfterInput?.(this.state, inputMsg);
+    } catch (err) {
+      this.hooks.logger?.warn("onAfterInput hook threw", { err: err.message });
+    }
   }
   // 等子进程退出（procAlive=false）。manager.stop 在发完 SIGTERM 后调它确保
   // 真停下来再 ack 给前端，从而避免"删 worktree 时 CC 还活着持有文件锁"的 race。
@@ -13460,6 +13575,9 @@ var SessionRunner = class {
       case "write-stdin":
         this.proc?.stdin?.write(effect.payload);
         break;
+      case "send-control-response-allow-with-input":
+        this.proc?.stdin?.write(encodeAllowWithInputControlResponse(effect.requestId, effect.updatedInput));
+        break;
       case "persist-file":
         try {
           this.hooks.store.write(effect.file);
@@ -13525,6 +13643,63 @@ var SessionRunner = class {
   }
 };
 
+// src/session/phase.ts
+var PHASE_DESCRIPTIONS = {
+  idle: "\u8FD8\u6CA1\u542F\u52A8",
+  spawning: "\u8FDB\u7A0B\u542F\u52A8\u4E2D",
+  "turn-idle": "\u8FDB\u7A0B\u6D3B\u7740\uFF0C\u7B49\u8F93\u5165",
+  "turn-running": "\u6B63\u5728 run \u4E2D",
+  stopping: "\u6B63\u5728\u6740\u8FDB\u7A0B",
+  exited: "\u8FDB\u7A0B\u5DF2\u9000\u51FA",
+  crashed: "\u542F\u52A8\u5931\u8D25 / \u5F02\u5E38\u9000\u51FA",
+  observing: "\u5916\u90E8 CC \u5728\u8DD1\uFF0Cdaemon \u65C1\u89C2"
+};
+function derivePhase(state) {
+  switch (state.status) {
+    case "idle":
+      return "idle";
+    case "spawning":
+      return "spawning";
+    case "running":
+      return state.turnOpen ? "turn-running" : "turn-idle";
+    case "stopping":
+      return "stopping";
+    case "stopped":
+      return "exited";
+    case "error":
+      return "crashed";
+  }
+}
+function deriveReason(input) {
+  switch (input.kind) {
+    case "command":
+      return `cmd:${input.command.kind}`;
+    case "proc-exit":
+      return "proc-exit";
+    case "proc-error":
+      return "proc-error";
+    case "inject-events":
+      return "observer-events";
+    case "stdout-line":
+      return "stdout";
+    case "permission-decision":
+      return "permission";
+    case "answer-question":
+      return "answer-question";
+    case "tick":
+      return "tick";
+  }
+}
+function buildPhaseLogFields(args) {
+  return {
+    sessionId: args.sessionId,
+    phase: args.phase,
+    prev: args.prev,
+    desc: PHASE_DESCRIPTIONS[args.phase],
+    ...args.reason ? { reason: args.reason } : {}
+  };
+}
+
 // src/session/manager.ts
 function compressFrameForWire(frame) {
   if (frame.type !== "session:status") return frame;
@@ -13586,6 +13761,7 @@ function makeInitialState(file) {
     bufferStartSeq: 0,
     turnOpen: false,
     pendingPermissions: {},
+    pendingQuestions: {},
     freshSpawn: false,
     procAlive: false,
     seenUuids: []
@@ -13609,6 +13785,9 @@ var SessionManager = class {
   // 由 observer 监听 jsonl user 行后调 recordRealUserUuid 建立映射；rewind 系列 RPC 在
   // 入参 / 出参做转译，保证 UI 看到的 uuid 始终是 events 流里的 synth uuid
   realUuidBySynth = /* @__PURE__ */ new Map();
+  // sessionId → 最近一次打过 log 的 phase；diff 命中才再打，避免每次 input 刷一行。
+  // observer 路径的 'observing' 也写到这张表，跟 reducer 派生 phase 共享 last 值
+  lastPhase = /* @__PURE__ */ new Map();
   async getCapabilities(tool) {
     const cached = this.capabilitiesCache.get(tool);
     if (cached) return cached;
@@ -13630,10 +13809,35 @@ var SessionManager = class {
       now: this.deps.now,
       bufferCap: this.deps.bufferCap,
       // adapter 自己持有模型表 + 兜底逻辑（contains / opus-1M / [1m] 等），manager 不再 cache 转发
-      resolveContextWindow: (tool, modelId) => this.deps.getAdapter(tool).resolveContextWindow(modelId)
+      resolveContextWindow: (tool, modelId) => this.deps.getAdapter(tool).resolveContextWindow(modelId),
+      // phase 派生：每次 input 应用完后比对，变化才打一行 log。observer 路径的
+      // 'observing' 由 onObserverPhase 单独写入 lastPhase 表，此处不会回退
+      onAfterInput: (state, input) => this.recordPhaseFromState(file.sessionId, state, deriveReason(input))
     });
     return runner;
   }
+  // 给 reducer state 派生当前 phase，跟上次 diff，变化时打一行带中文说明的 log
+  recordPhaseFromState(sessionId, state, reason) {
+    const next = derivePhase(state);
+    const prev = this.lastPhase.get(sessionId) ?? null;
+    if (prev === next) return;
+    this.lastPhase.set(sessionId, next);
+    this.deps.logger?.info(
+      "session-phase",
+      buildPhaseLogFields({ sessionId, phase: next, prev, reason })
+    );
+  }
+  // observer 路径：外部 CC 在跑、daemon 只 tail JSONL；走单独的 'observing' phase
+  recordObserverPhase(sessionId, status) {
+    const next = status === "observing" ? "observing" : "exited";
+    const prev = this.lastPhase.get(sessionId) ?? null;
+    if (prev === next) return;
+    this.lastPhase.set(sessionId, next);
+    this.deps.logger?.info(
+      "session-phase",
+      buildPhaseLogFields({ sessionId, phase: next, prev, reason: "observer" })
+    );
+  }
   // 统一 runner 出口：先压 wire，然后按当前上下文路由
   //   同步命令路径（currentCollector 非空） → push 进 collector，命令方法返回给 dispatcher
   //   异步路径（stdout/exit/observer 主动调用） → 走 deps.broadcastFrame
@@ -13786,9 +13990,11 @@ var SessionManager = class {
       });
       this.runners.delete(args.sessionId);
       this.realUuidBySynth.delete(args.sessionId);
+      this.lastPhase.delete(args.sessionId);
       return { response: { sessionId: args.sessionId }, broadcast };
     }
     this.deps.store.delete(args.sessionId);
+    this.lastPhase.delete(args.sessionId);
     return {
       response: { sessionId: args.sessionId },
       broadcast: [
@@ -14058,6 +14264,23 @@ var SessionManager = class {
     if (runner.getState().procAlive) return;
     runner.feedObserverEvents(events);
   }
+  // AskUserQuestion 表单回写（plan: clawd-ask-user-question）：UI 答完所有 question 后调用。
+  // - session 不存在 / 无 runner → noop 幂等返回 ok（first-decider-wins）
+  // - reducer noop（toolUseId 不存在或已答过）也保持幂等返回，handler 不抛
+  answerQuestion(args) {
+    const runner = this.runners.get(args.sessionId);
+    if (!runner) {
+      return { response: { ok: true }, broadcast: [] };
+    }
+    const { broadcast } = this.withCollector(() => {
+      runner.input({
+        kind: "answer-question",
+        toolUseId: args.toolUseId,
+        answers: args.answers
+      });
+    });
+    return { response: { ok: true }, broadcast };
+  }
   // 权限决定：dispatcher 收到 permission:respond 时调用
   // 先查 state.pendingPermissions：不存在 → 抛 PERMISSION_REQUEST_STALE
   respondPermission(args) {
@@ -14850,6 +15073,19 @@ function splitLines(text) {
   return result;
 }
 
+// src/tools/tool-result-extra.ts
+function extractAskQuestionAnswers(raw) {
+  if (!raw || typeof raw !== "object") return void 0;
+  const r = raw;
+  const answers = r.answers;
+  if (!answers || typeof answers !== "object" || Array.isArray(answers)) return void 0;
+  const out = {};
+  for (const [k, v] of Object.entries(answers)) {
+    if (typeof v === "string") out[k] = v;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+
 // src/tools/claude-history.ts
 function cwdToHashDir(cwd) {
   return "-" + cwd.replace(/^\//, "").replace(/\//g, "-");
@@ -14974,6 +15210,8 @@ function messageFromJsonl(obj) {
         };
         if (toolResultExtra) msg.toolResultExtra = toolResultExtra;
         if (sourceToolAssistantUUID) msg.sourceToolAssistantUUID = sourceToolAssistantUUID;
+        const answers = extractAskQuestionAnswers(o.toolUseResult);
+        if (answers) msg.askQuestionAnswers = answers;
         return withCommonFields(msg, o);
       }
       if (texts.length > 0) {
@@ -15625,10 +15863,21 @@ function parseClaudeObjectInner(obj) {
       } else if (partType === "thinking" && typeof part.thinking === "string") {
         events.push({ kind: "thinking", text: part.thinking });
       } else if (partType === "tool_use") {
+        const toolName = String(part.name ?? "");
+        if (toolName === ASK_USER_QUESTION_TOOL_NAME) {
+          const qInput = part.input ?? {};
+          const rawQs = Array.isArray(qInput.questions) ? qInput.questions : [];
+          events.push({
+            kind: "ask_user_question",
+            toolUseId: String(part.id ?? ""),
+            questions: rawQs
+          });
+          continue;
+        }
         events.push({
           kind: "tool_call",
           toolUseId: String(part.id ?? ""),
-          tool: String(part.name ?? ""),
+          tool: toolName,
           input: part.input
         });
       }
@@ -15641,6 +15890,7 @@ function parseClaudeObjectInner(obj) {
     if (!Array.isArray(content)) return events;
     const toolResultExtra = extractToolResultExtra(obj.toolUseResult ?? obj.tool_use_result);
     const sourceToolAssistantUUID = typeof obj.sourceToolAssistantUUID === "string" ? obj.sourceToolAssistantUUID : void 0;
+    const askQuestionAnswers = extractAskQuestionAnswers(obj.toolUseResult ?? obj.tool_use_result);
     for (const part of content) {
       const partType = part.type;
       if (partType === "text" && typeof part.text === "string") {
@@ -15664,6 +15914,7 @@ function parseClaudeObjectInner(obj) {
         }
         if (toolResultExtra) ev.toolResultExtra = toolResultExtra;
         if (sourceToolAssistantUUID) ev.sourceToolAssistantUUID = sourceToolAssistantUUID;
+        if (askQuestionAnswers) ev.askQuestionAnswers = askQuestionAnswers;
         events.push(ev);
       }
     }
@@ -17585,6 +17836,11 @@ function buildSessionHandlers(deps) {
     const { response, broadcast } = manager.pin(args);
     return { response: { type: "session:info", ...response }, broadcast };
   };
+  const answerQuestion = async (frame) => {
+    const args = AnswerQuestionArgs.parse(frame);
+    const { response, broadcast } = manager.answerQuestion(args);
+    return { response: { type: "session:answerQuestion", ...response }, broadcast };
+  };
   return {
     "session:create": create,
     "session:list": list,
@@ -17604,7 +17860,8 @@ function buildSessionHandlers(deps) {
     "session:events": events,
     "session:subscribe": subscribe,
     "session:unsubscribe": unsubscribe,
-    "session:pin": pin
+    "session:pin": pin,
+    "session:answerQuestion": answerQuestion
   };
 }
 
@@ -18142,6 +18399,7 @@ async function startDaemon(config) {
         hasRunner: !!r,
         runnerProcAlive: r ? r.getState().procAlive : null
       });
+      manager.recordObserverPhase(sessionId, status);
       transport?.broadcastToSession(sessionId, { type: "session:status", sessionId, status });
     },
     // jsonl user 行的 real uuid 映射到 buffer 里 synth user_text，rewind 系列 RPC 在

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.19-beta.26.3dd6b2e",
+  "version": "0.2.20-beta.27.e8cd6cc",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",