@clawos-dev/clawd 0.2.17 → 0.2.18-beta.24.6c1b73d

package/dist/cli.cjs

@@ -13336,6 +13336,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。
@@ -13525,6 +13530,61 @@ 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 "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;
@@ -13609,6 +13669,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 +13693,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 +13874,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: [
@@ -18142,6 +18232,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.17",
+  "version": "0.2.18-beta.24.6c1b73d",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",