@clawos-dev/clawd 0.2.333 → 0.2.335

package/dist/cli.cjs

@@ -6905,7 +6905,7 @@ var init_principal = __esm({
 });
 
 // ../protocol/src/schemas.ts
-var SessionStatusSchema, UsageSchema, ContextUsageSchema, sessionMetaShape, SessionMetaSchema, SelectOptionSchema, ModelInfoSchema, ModeInfoSchema, ConfigFieldSchemaSchema, CapabilitiesGetArgs, ToolFeaturesSchema, CapabilitiesResponseSchema, AllowRuleSchema, SessionFileSchema, ParsedEventBase, HistoryUserMetaSchema, SubagentToolStatsSchema, StructuredPatchHunkSchema, ToolResultExtraSchema, MemoryEntrySchema, AskQuestionOptionSchema, AskQuestionItemSchema, ParsedEventSchema, SessionCreateArgs, SessionImportExternalArgs, SessionListArgs, SessionIdArgs, SessionUpdateArgs, SessionSendArgs, SessionInterruptArgs, SessionRewindArgs, SessionRewindResponseSchema, SessionRewindDiffArgs, RewindDiffHunkSchema, RewindDiffFileSchema, SessionRewindDiffResponseSchema, SessionRewindableMessageIdsArgs, SessionRewindableMessageIdsResponseSchema, SessionResumeArgs, SessionForkArgs, SessionForkResponseSchema, SessionObserveArgs, SessionEventsArgs, PermissionRespondArgs, HistoryListArgs, HistoryReadArgs, HistorySubagentsArgs, HistorySubagentReadArgs, WorkspaceListArgs, WorkspaceReadArgs, SkillsListArgs, SkillEntrySchema, AgentEntrySchema, AgentsListArgs, AgentsListResponseSchema, SessionCurrentTurnSenderArgs, SessionSubscribeArgs, SessionPinArgs, SessionArchiveArgs, PeerSessionUpsertArgs, PeerSessionUpsertResponseSchema, PeerSessionRemoveArgs, PeerSessionRemoveResponseSchema, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, CancelQuestionArgs, CancelQuestionResponseSchema, ClientInfoSchema, AuthRequestFrameSchema, AuthOkFrameSchema, DeviceConnectionEntrySchema, DeviceConnectionsResponseSchema, TunnelReadyEventSchema, TunnelExitedEventSchema, TunnelUnavailableEventSchema, InfoRunningSessionSchema, InfoResponseSchema, PROJECT_PORT_MIN, PROJECT_PORT_MAX, projectNameRegex, DEFAULT_DEV_COMMAND, ProjectMetadataSchema, PROJECT_STAGE_VALUES, ProjectStageSchema, ProjectWithStatusSchema, ListProjectsArgsSchema, ListProjectsResultSchema, GetProjectArgsSchema, GetProjectResultSchema, CreateProjectArgsSchema, CreateProjectResultSchema, DeleteProjectArgsSchema, DeleteProjectResultSchema, UpdateProjectPortArgsSchema, UpdateProjectPortResultSchema, SetProdUrlArgsSchema, SetProdUrlResultSchema, StartDevServerArgsSchema, StartDevServerResultSchema, ASSISTANT_REPORTABLE_STAGES, ReportStageArgsSchema, ReportStageResultSchema, StopDevServerArgsSchema, StopDevServerResultSchema, AppBuilderProjectUpdatedEventSchema, PublishArgsSchema, PublishResultSchema, DismissPublishJobArgsSchema, DismissPublishJobResultSchema, AppBuilderPublishProgressEventSchema, AppBuilderPublishFailedEventSchema;
+var SessionStatusSchema, UsageSchema, ContextUsageSchema, sessionMetaShape, SessionMetaSchema, SelectOptionSchema, ModelInfoSchema, ModeInfoSchema, ConfigFieldSchemaSchema, CapabilitiesGetArgs, ToolFeaturesSchema, CapabilitiesResponseSchema, AllowRuleSchema, SessionFileSchema, ParsedEventBase, HistoryUserMetaSchema, SubagentToolStatsSchema, StructuredPatchHunkSchema, ToolResultExtraSchema, MemoryEntrySchema, AskQuestionOptionSchema, AskQuestionItemSchema, TURN_END_REASONS, ParsedEventSchema, SessionCreateArgs, SessionImportExternalArgs, SessionListArgs, SessionIdArgs, SessionUpdateArgs, SessionSendArgs, SessionInterruptArgs, SessionRewindArgs, SessionRewindResponseSchema, SessionRewindDiffArgs, RewindDiffHunkSchema, RewindDiffFileSchema, SessionRewindDiffResponseSchema, SessionRewindableMessageIdsArgs, SessionRewindableMessageIdsResponseSchema, SessionResumeArgs, SessionForkArgs, SessionForkResponseSchema, SessionObserveArgs, SessionEventsArgs, PermissionRespondArgs, HistoryListArgs, HistoryReadArgs, HistorySubagentsArgs, HistorySubagentReadArgs, WorkspaceListArgs, WorkspaceReadArgs, SkillsListArgs, SkillEntrySchema, AgentEntrySchema, AgentsListArgs, AgentsListResponseSchema, SessionCurrentTurnSenderArgs, SessionSubscribeArgs, SessionPinArgs, SessionArchiveArgs, PeerSessionUpsertArgs, PeerSessionUpsertResponseSchema, PeerSessionRemoveArgs, PeerSessionRemoveResponseSchema, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, CancelQuestionArgs, CancelQuestionResponseSchema, ClientInfoSchema, AuthRequestFrameSchema, AuthOkFrameSchema, DeviceConnectionEntrySchema, DeviceConnectionsResponseSchema, TunnelReadyEventSchema, TunnelExitedEventSchema, TunnelUnavailableEventSchema, InfoRunningSessionSchema, InfoResponseSchema, PROJECT_PORT_MIN, PROJECT_PORT_MAX, projectNameRegex, DEFAULT_DEV_COMMAND, ProjectMetadataSchema, PROJECT_STAGE_VALUES, ProjectStageSchema, ProjectWithStatusSchema, ListProjectsArgsSchema, ListProjectsResultSchema, GetProjectArgsSchema, GetProjectResultSchema, CreateProjectArgsSchema, CreateProjectResultSchema, DeleteProjectArgsSchema, DeleteProjectResultSchema, UpdateProjectPortArgsSchema, UpdateProjectPortResultSchema, SetProdUrlArgsSchema, SetProdUrlResultSchema, StartDevServerArgsSchema, StartDevServerResultSchema, ASSISTANT_REPORTABLE_STAGES, ReportStageArgsSchema, ReportStageResultSchema, StopDevServerArgsSchema, StopDevServerResultSchema, AppBuilderProjectUpdatedEventSchema, PublishArgsSchema, PublishResultSchema, DismissPublishJobArgsSchema, DismissPublishJobResultSchema, AppBuilderPublishProgressEventSchema, AppBuilderPublishFailedEventSchema;
 var init_schemas = __esm({
   "../protocol/src/schemas.ts"() {
     "use strict";
@@ -7198,6 +7198,7 @@ var init_schemas = __esm({
       multiSelect: external_exports.boolean(),
       options: external_exports.array(AskQuestionOptionSchema).min(1)
     });
+    TURN_END_REASONS = ["completed", "interrupted"];
     ParsedEventSchema = external_exports.discriminatedUnion("kind", [
       // session_init 仅携带 session 标识；resolvedModel 等元信息走 meta_update
       external_exports.object({
@@ -7302,11 +7303,14 @@ var init_schemas = __esm({
       //   ① SDK 模式 stream-json `result` 帧（claude.ts）—— stdout 最后一帧，可靠
       //   ② TUI 模式 observer 读 JSONL `system/turn_duration` 行（claude-tui.ts parseLine）
       //      ⚠️ CC 写此行早于该轮尾段正文落盘，可能被尾随 text 覆盖 lastEventKind（③ 存在的原因）
-      //   ③ TUI 模式屏幕静止 AND observer 静止（observeScreenIdle + manager.observerIdleWaitMs 复合闸 →
-      //      dispatchTurnIdle inject）—— 兜 ② 的覆盖；等尾随 text 全部 poll 落盘后补，排在 buffer 末条
+      //   ③ TUI 模式 gate 关闭期被 drop 的 ② 信号，屏幕稳定后由 manager.notifyScreenIdle flush
+      //      注入（PR #962 双源确认模型；旧 dispatchTurnIdle 已拆除）—— 排在 buffer 末条
       external_exports.object({
         ...ParsedEventBase,
-        kind: external_exports.literal("turn_end")
+        kind: external_exports.literal("turn_end"),
+        // 本轮耗时（ms）。SDK=result.duration_ms；TUI=turn_duration.durationMs；缺失时 reducer 按 turnStartedAt 兜底
+        durationMs: external_exports.number().int().nonnegative().optional(),
+        reason: external_exports.enum(TURN_END_REASONS).optional()
       }),
       // SDK system 帧 task_started / task_progress / task_notification 的归一化产物：
       // 子 agent 执行过程中实时上报 agentId / lastToolName / stats，UI pending 期就能开抽屉、看进度。
@@ -14001,6 +14005,11 @@ function messageFromJsonl(obj) {
     }
     return null;
   }
+  if (type === "system" && o.subtype === "turn_duration") {
+    const msg = { kind: "turn-end", ts, raw: obj };
+    if (typeof o.durationMs === "number") msg.durationMs = o.durationMs;
+    return msg;
+  }
   if (type === "summary" && typeof o.summary === "string") {
     return { kind: "summary", text: o.summary, ts, raw: obj };
   }
@@ -14803,7 +14812,12 @@ function parseClaudeObjectInner(obj) {
   }
   if (type === "usage") return events;
   if (type === "result") {
-    events.push({ kind: "turn_end" });
+    const ev = {
+      kind: "turn_end",
+      reason: typeof subtype === "string" && subtype !== "success" ? "interrupted" : "completed"
+    };
+    if (typeof obj.duration_ms === "number") ev.durationMs = obj.duration_ms;
+    events.push(ev);
     return events;
   }
   if (type === "error") {
@@ -44374,6 +44388,7 @@ function cloneState(s) {
     nextSeq: s.nextSeq,
     bufferStartSeq: s.bufferStartSeq,
     turnOpen: s.turnOpen,
+    turnStartedAt: s.turnStartedAt,
     pendingPermissions: s.pendingPermissions,
     pendingQuestions: s.pendingQuestions,
     freshSpawn: s.freshSpawn,
@@ -44392,6 +44407,14 @@ function idleKillDelayOf(state) {
   const ms = state.subSessionMeta?.idleKillDelayMs;
   return ms !== void 0 && ms > 0 ? ms : void 0;
 }
+var STALE_TURN_END_TOLERANCE_MS = 2e3;
+function isLateTurnEnd(event, turnStartedAt, now) {
+  if (event.kind !== "turn_end") return false;
+  const durationMs = event.durationMs;
+  if (typeof durationMs !== "number" || typeof turnStartedAt !== "number") return false;
+  const elapsed = now - turnStartedAt;
+  return durationMs > elapsed + STALE_TURN_END_TOLERANCE_MS;
+}
 function tryFlushPending(state, deps) {
   if (!state.readyForSend || state.pendingSend.length === 0) return [];
   const text = state.pendingSend.shift();
@@ -44632,6 +44655,10 @@ function applyParsedEvent(state, event, deps) {
 }
 function pushEventToBuffer(state, event, deps) {
   const next = cloneState(state);
+  const effects = pushEventToBufferInPlace(next, event, deps);
+  return { state: next, effects };
+}
+function pushEventToBufferInPlace(next, event, deps) {
   const seq = next.nextSeq;
   const withSeq = { ...event, seq };
   const entry = { seq, event: withSeq };
@@ -44641,8 +44668,20 @@ function pushEventToBuffer(state, event, deps) {
   if (newBuffer.length === 1) next.bufferStartSeq = seq;
   const isTurnEnd = withSeq.kind === "turn_end";
   const isUserText = withSeq.kind === "user_text";
-  if (isTurnEnd) next.turnOpen = false;
-  else if (!next.turnOpen) next.turnOpen = true;
+  if (isTurnEnd && next.turnOpen && isLateTurnEnd(withSeq, next.turnStartedAt, deps.now())) {
+    return [emitSessionEvent(next.file.sessionId, withSeq)];
+  }
+  if (isTurnEnd) {
+    const te = withSeq;
+    if (te.durationMs === void 0 && typeof next.turnStartedAt === "number") {
+      te.durationMs = Math.max(0, deps.now() - next.turnStartedAt);
+    }
+    next.turnOpen = false;
+    next.turnStartedAt = null;
+  } else if (!next.turnOpen) {
+    next.turnOpen = true;
+    next.turnStartedAt = deps.now();
+  }
   if (!next.turnOpen && next.buffer.length > deps.bufferCap) {
     const remove = next.buffer.length - deps.bufferCap;
     const trimmed = next.buffer.slice(remove);
@@ -44675,7 +44714,7 @@ function pushEventToBuffer(state, event, deps) {
       });
     }
   }
-  return { state: next, effects };
+  return effects;
 }
 var RUNTIME_PATCH_KEYS = [
   "model",
@@ -44714,6 +44753,7 @@ function applyCommand(state, command, deps) {
         next.bufferStartSeq = 0;
         next.nextSeq = 0;
         next.turnOpen = false;
+        next.turnStartedAt = null;
         next.status = "running";
         if (deps.mode === "tui" && (next.file.tool ?? "claude") === "claude") {
           next.readyForSend = false;
@@ -44780,6 +44820,11 @@ function applyCommand(state, command, deps) {
         next.status = "stopping";
         effects.push({ kind: "kill", signal: "SIGKILL" });
       }
+      if (next.turnOpen) {
+        effects.push(
+          ...pushEventToBufferInPlace(next, { kind: "turn_end", reason: "interrupted" }, deps)
+        );
+      }
       return { state: next, effects };
     }
     case "spawn-if-needed": {
@@ -44792,6 +44837,7 @@ function applyCommand(state, command, deps) {
       next.bufferStartSeq = 0;
       next.nextSeq = 0;
       next.turnOpen = false;
+      next.turnStartedAt = null;
       next.status = "running";
       if (deps.mode === "tui" && (next.file.tool ?? "claude") === "claude") {
         next.readyForSend = false;
@@ -44864,6 +44910,7 @@ function applyCommand(state, command, deps) {
         next.nextSeq = 0;
         next.bufferStartSeq = 0;
         next.turnOpen = false;
+        next.turnStartedAt = null;
         next.pendingPermissions = {};
         next.freshSpawn = false;
         next.seenUuids = [];
@@ -44902,6 +44949,7 @@ function applyCommand(state, command, deps) {
       next.nextSeq = 0;
       next.bufferStartSeq = 0;
       next.turnOpen = false;
+      next.turnStartedAt = null;
       next.pendingPermissions = {};
       next.freshSpawn = false;
       next.seenUuids = [];
@@ -44958,6 +45006,7 @@ function reduceSessionInner(state, input, deps) {
       const next = cloneState(state);
       next.procAlive = false;
       next.status = "stopped";
+      const interruptEffects = next.turnOpen ? pushEventToBufferInPlace(next, { kind: "turn_end", reason: "interrupted" }, deps) : [];
       resetReadyGate(next);
       const sessionId = next.file.sessionId;
       const clearedEffects = Object.keys(state.pendingQuestions ?? {}).map(
@@ -44974,6 +45023,7 @@ function reduceSessionInner(state, input, deps) {
       return {
         state: next,
         effects: [
+          ...interruptEffects,
           {
             kind: "emit-frame",
             frame: {
@@ -45786,6 +45836,7 @@ function makeInitialState(file, subSessionMeta) {
     nextSeq: 0,
     bufferStartSeq: 0,
     turnOpen: false,
+    turnStartedAt: null,
     pendingPermissions: {},
     pendingQuestions: {},
     freshSpawn: false,
@@ -45829,7 +45880,8 @@ var SessionManager = class {
   // "屏幕真的稳定"作为触发点，signal-driven 而非 timer-driven。
   //
   // 清理点：newSession / stop / session-delete / stopAll。
-  pendingTurnDurationSignals = /* @__PURE__ */ new Set();
+  // sessionId → 被 gate drop 的 turn_end 携带的 durationMs（可能 undefined）；flush 注入时回填
+  pendingTurnDurationSignals = /* @__PURE__ */ new Map();
   // SessionStore 按 scope 派生（root = <dataDir>/sessions/<scopeSubPath>/）。
   // default scope 直接复用 deps.store；persona scope（owner / listener）第一次访问时按需创建并缓存。
   // 取代旧的 storesByAgent —— agentId 概念由 SessionScope 取代，路径即身份，
@@ -47588,14 +47640,18 @@ var SessionManager = class {
           { sessionId, toolSessionId }
         );
       } else {
+        const dropped = outEvents.find((e) => e.kind === "turn_end");
         feedEvents = outEvents.filter((e) => e.kind !== "turn_end");
         if (this.pendingTurnDurationSignals.has(sessionId)) {
           this.deps.screenIdleProbeLogger?.info(
             "turn_duration dedup: pending already set (repeated observer signal)",
             { sessionId, toolSessionId }
           );
+          if (dropped?.durationMs !== void 0) {
+            this.pendingTurnDurationSignals.set(sessionId, dropped.durationMs);
+          }
         } else {
-          this.pendingTurnDurationSignals.add(sessionId);
+          this.pendingTurnDurationSignals.set(sessionId, dropped?.durationMs);
           this.deps.screenIdleProbeLogger?.info(
             "turn_duration pending: gate closed \u2192 waiting for screen-idle signal",
             { sessionId, toolSessionId }
@@ -47644,12 +47700,16 @@ var SessionManager = class {
       );
       return;
     }
+    const durationMs = this.pendingTurnDurationSignals.get(sid);
     this.pendingTurnDurationSignals.delete(sid);
     this.deps.screenIdleProbeLogger?.info(
       "notifyScreenIdle: pending turn_duration + screen idle confirmed \u2192 inject turn_end",
       { sessionId: sid, toolSessionId }
     );
-    runner.input({ kind: "inject-events", events: [{ kind: "turn_end" }] });
+    runner.input({
+      kind: "inject-events",
+      events: [{ kind: "turn_end", ...durationMs !== void 0 ? { durationMs } : {} }]
+    });
   }
   clearPendingTurnEnd(sessionId) {
     if (this.pendingTurnDurationSignals.delete(sessionId)) {
@@ -51251,7 +51311,9 @@ var ClaudeTuiAdapter = class extends ClaudeAdapter {
       return super.parseLine(line);
     }
     if (obj.type === "system" && obj.subtype === "turn_duration") {
-      return [{ kind: "turn_end" }];
+      const ev = { kind: "turn_end" };
+      if (typeof obj.durationMs === "number") ev.durationMs = obj.durationMs;
+      return [ev];
     }
     if (obj.type !== "user") return super.parseLine(line);
     const message = obj.message;
@@ -58894,6 +58956,7 @@ function slimHistoryMessages(messages) {
     if (m2.parentToolUseId !== void 0) out.parentToolUseId = m2.parentToolUseId;
     if (m2.isSidechain !== void 0) out.isSidechain = m2.isSidechain;
     if (m2.askQuestionAnswers !== void 0) out.askQuestionAnswers = m2.askQuestionAnswers;
+    if (m2.durationMs !== void 0) out.durationMs = m2.durationMs;
     const isErrorPair = m2.toolUseId !== void 0 && errorToolUseIds.has(m2.toolUseId);
     if (m2.kind === "tool_call" && isErrorPair && m2.input !== void 0) out.input = m2.input;
     if (m2.kind === "tool_result" && m2.error !== void 0 && m2.output !== void 0) out.output = m2.output;
@@ -60071,7 +60134,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.333".length > 0 ? "0.2.333" : "dev";
+var version = "0.2.335".length > 0 ? "0.2.335" : "dev";
 
 // src/cli-probe/probe.ts
 var fs59 = __toESM(require("fs"), 1);

package/dist/dispatch/mcp-server.cjs

@@ -22326,6 +22326,7 @@ var AskQuestionItemSchema = external_exports.object({
   multiSelect: external_exports.boolean(),
   options: external_exports.array(AskQuestionOptionSchema).min(1)
 });
+var TURN_END_REASONS = ["completed", "interrupted"];
 var ParsedEventSchema = external_exports.discriminatedUnion("kind", [
   // session_init 仅携带 session 标识；resolvedModel 等元信息走 meta_update
   external_exports.object({
@@ -22430,11 +22431,14 @@ var ParsedEventSchema = external_exports.discriminatedUnion("kind", [
   //   ① SDK 模式 stream-json `result` 帧（claude.ts）—— stdout 最后一帧，可靠
   //   ② TUI 模式 observer 读 JSONL `system/turn_duration` 行（claude-tui.ts parseLine）
   //      ⚠️ CC 写此行早于该轮尾段正文落盘，可能被尾随 text 覆盖 lastEventKind（③ 存在的原因）
-  //   ③ TUI 模式屏幕静止 AND observer 静止（observeScreenIdle + manager.observerIdleWaitMs 复合闸 →
-  //      dispatchTurnIdle inject）—— 兜 ② 的覆盖；等尾随 text 全部 poll 落盘后补，排在 buffer 末条
+  //   ③ TUI 模式 gate 关闭期被 drop 的 ② 信号，屏幕稳定后由 manager.notifyScreenIdle flush
+  //      注入（PR #962 双源确认模型；旧 dispatchTurnIdle 已拆除）—— 排在 buffer 末条
   external_exports.object({
     ...ParsedEventBase,
-    kind: external_exports.literal("turn_end")
+    kind: external_exports.literal("turn_end"),
+    // 本轮耗时（ms）。SDK=result.duration_ms；TUI=turn_duration.durationMs；缺失时 reducer 按 turnStartedAt 兜底
+    durationMs: external_exports.number().int().nonnegative().optional(),
+    reason: external_exports.enum(TURN_END_REASONS).optional()
   }),
   // SDK system 帧 task_started / task_progress / task_notification 的归一化产物：
   // 子 agent 执行过程中实时上报 agentId / lastToolName / stats，UI pending 期就能开抽屉、看进度。