@dotobokuri/fleet-console 1.58.1 → 1.59.0

package/dist/fleet-plugins/scuttlebutt/routes.mjs

@@ -1,14 +1,18 @@
 #!/usr/bin/env node
 import * as fs from 'node:fs';
-import { constants, promises } from 'node:fs';
+import { promises } from 'node:fs';
 import * as path3 from 'node:path';
 import path3__default from 'node:path';
 import crypto2 from 'node:crypto';
-import fs2, { mkdtemp, mkdir, rm, writeFile, rename } from 'node:fs/promises';
-import { execFile } from 'node:child_process';
+import fs3, { mkdtemp, mkdir, rm, writeFile, rename } from 'node:fs/promises';
+import { execFile } from 'child_process';
+import { constants } from 'fs';
+import 'fs/promises';
+import os2 from 'os';
+import { promisify } from 'util';
+import { deflateRawSync } from 'zlib';
 import * as os from 'node:os';
-import os__default, { tmpdir } from 'node:os';
-import { promisify } from 'node:util';
+import { tmpdir } from 'node:os';
 import { query } from '@anthropic-ai/claude-agent-sdk';
 
 var __defProp = Object.defineProperty;
@@ -17637,6 +17641,26 @@ var benchmarks_default = {
         }
       }
     },
+    "claude-opus-5": {
+      source: "cursorbench",
+      rungs: {
+        low: { score: 62.8, tokensPerTask: 18529, stepsPerTask: 37 },
+        medium: { score: 64.3, tokensPerTask: 23612, stepsPerTask: 44 },
+        high: { score: 66.7, tokensPerTask: 27932, stepsPerTask: 48 },
+        xhigh: { score: 69.3, tokensPerTask: 54239, stepsPerTask: 72 },
+        max: { score: 70, tokensPerTask: 61838, stepsPerTask: 78 }
+      }
+    },
+    "claude-fable-5": {
+      source: "cursorbench",
+      rungs: {
+        low: { score: 62.1, tokensPerTask: 18182, stepsPerTask: 31 },
+        medium: { score: 65.2, tokensPerTask: 30366, stepsPerTask: 41 },
+        high: { score: 66.5, tokensPerTask: 43747, stepsPerTask: 48 },
+        xhigh: { score: 68.4, tokensPerTask: 64971, stepsPerTask: 56 },
+        max: { score: 70.5, tokensPerTask: 103525, stepsPerTask: 72 }
+      }
+    },
     "kimi-k3": {
       source: "cursorbench",
       rungs: {
@@ -17685,7 +17709,7 @@ var benchmarks_default = {
 };
 var models_default = {
   version: 1,
-  updatedAt: "2026-08-14T00:00:00Z",
+  updatedAt: "2026-08-15T00:00:00Z",
   providers: {
     codex: {
       name: "Codex",
@@ -17827,7 +17851,7 @@ var models_default = {
     cursor: {
       name: "Cursor",
       defaultModel: "auto",
-      source: "Cursor GetUsableModels + Run conversationCheckpointUpdate.token_details.max_tokens (cli-2026.07.08-0c04a8a; auto, composer-2.5, and grok-4.5 families observed 2026-08-01); cursor-agent 2026.08.11-e8db854 observed 2026-08-13 for grok-4.6; quotaScope from DashboardService/GetCurrentPeriodUsage autoBucketModels (2026-08-05)",
+      source: "Cursor GetUsableModels + Run conversationCheckpointUpdate.token_details.max_tokens (cli-2026.07.08-0c04a8a; auto, composer-2.5, and grok-4.5 families observed 2026-08-01); cursor-agent 2026.08.11-e8db854 observed 2026-08-13 for grok-4.6; claude-opus-5 and claude-fable-5 standard/Max Mode windows observed 2026-08-10; quotaScope from DashboardService/GetCurrentPeriodUsage autoBucketModels (2026-08-05)",
       models: [
         {
           modelId: "auto",
@@ -17921,6 +17945,94 @@ var models_default = {
             ],
             upstreamModelIdTemplate: "cursor-grok-4.6-{effort}-fast"
           }
+        },
+        {
+          modelId: "claude-opus-5",
+          name: "Opus-5",
+          capabilityClass: "flagship",
+          quotaScope: "api",
+          contextWindow: 3e5,
+          effort: {
+            supported: true,
+            levels: [
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max"
+            ],
+            upstreamModelIdTemplate: "claude-opus-5-{effort}",
+            upstreamModelIds: {
+              xhigh: "claude-opus-5-thinking-xhigh",
+              max: "claude-opus-5-thinking-max"
+            }
+          },
+          benchmarkKey: "claude-opus-5"
+        },
+        {
+          modelId: "claude-opus-5-1m",
+          name: "Opus-5-1M",
+          capabilityClass: "flagship",
+          quotaScope: "api",
+          contextWindow: 1e6,
+          cursorMaxMode: true,
+          effort: {
+            supported: true,
+            levels: [
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max"
+            ],
+            upstreamModelIdTemplate: "claude-opus-5-{effort}",
+            upstreamModelIds: {
+              xhigh: "claude-opus-5-thinking-xhigh",
+              max: "claude-opus-5-thinking-max"
+            }
+          },
+          benchmarkKey: "claude-opus-5"
+        },
+        {
+          modelId: "claude-fable-5",
+          name: "Fable-5",
+          capabilityClass: "flagship",
+          quotaScope: "api",
+          description: "NO ZDR",
+          contextWindow: 3e5,
+          effort: {
+            supported: true,
+            levels: [
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max"
+            ],
+            upstreamModelIdTemplate: "claude-fable-5-{effort}"
+          },
+          benchmarkKey: "claude-fable-5"
+        },
+        {
+          modelId: "claude-fable-5-1m",
+          name: "Fable-5-1M",
+          capabilityClass: "flagship",
+          quotaScope: "api",
+          description: "NO ZDR",
+          contextWindow: 1e6,
+          cursorMaxMode: true,
+          effort: {
+            supported: true,
+            levels: [
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max"
+            ],
+            upstreamModelIdTemplate: "claude-fable-5-{effort}"
+          },
+          benchmarkKey: "claude-fable-5"
         }
       ]
     },
@@ -18534,13 +18646,14 @@ promisify(execFile);
 process.platform === "win32" ? constants.O_RDONLY : constants.O_RDONLY | constants.O_NONBLOCK;
 ({
   platform: process.platform,
-  homedir: os__default.homedir,
+  homedir: os2.homedir,
   env: process.env});
-var CURSOR_GREP_RECEIPT_PREFIX = "FLEET_CURSOR_GREP_V1:";
-String.raw`
+var CURSOR_GREP_RECEIPT_PREFIX = "FLEET_CURSOR_GREP_V2:";
+var CURSOR_GREP_RECEIPT_SCRIPT = String.raw`
 const {spawn}=require("node:child_process");
 const {TextDecoder}=require("node:util");
-const emit=(value)=>process.stdout.write("${CURSOR_GREP_RECEIPT_PREFIX}"+Buffer.from(JSON.stringify(value)).toString("base64url"));
+const {deflateRawSync}=require("node:zlib");
+const emit=(value)=>process.stdout.write("${CURSOR_GREP_RECEIPT_PREFIX}"+deflateRawSync(Buffer.from(JSON.stringify(value))).toString("base64url"));
 (async()=>{try {
   const input=JSON.parse(Buffer.from(process.argv[1],"base64url").toString("utf8"));
   const matchSeparator=30;
@@ -18626,6 +18739,7 @@ const emit=(value)=>process.stdout.write("${CURSOR_GREP_RECEIPT_PREFIX}"+Buffer.
   emit({ok:true,outputMode:input.outputMode,files,counts,matches,totalFiles,totalLines,totalMatchedLines,clientTruncated});
 }catch(error){emit({ok:false,error:error instanceof Error?error.message:String(error)});}})();
 `.trim();
+deflateRawSync(CURSOR_GREP_RECEIPT_SCRIPT).toString("base64url");
 var cursorAgentDescriptor = [
   "CgthZ2VudC5wcm90bxIIYWdlbnQudjEicgoOR2xvYlRvb2xSZXN1bHQSLAoHc3VjY2VzcxgBIAEoCzIZLmFnZW50LnYxLkdsb2JUb29sU3VjY2Vzc0gAEigK",
   "BWVycm9yGAIgASgLMhcuYWdlbnQudjEuR2xvYlRvb2xFcnJvckgAQggKBnJlc3VsdCIeCg1HbG9iVG9vbEVycm9yEg0KBWVycm9yGAEgASgJIokBCg9HbG9i",
@@ -19479,7 +19593,11 @@ function runVendorQuery(input) {
     close() {
       if (closed) return;
       closed = true;
-      void run.return?.(void 0);
+      try {
+        const closing = run.return?.(void 0);
+        if (closing !== void 0) void closing.catch(() => void 0);
+      } catch {
+      }
     }
   };
 }
@@ -19549,8 +19667,11 @@ async function createClaudeGatewaySdk(options) {
           };
         },
         close() {
-          run.close();
-          release();
+          try {
+            run.close();
+          } finally {
+            release();
+          }
         }
       };
       active = tracked;
@@ -19647,6 +19768,364 @@ function vendorServedMcpServers(servers) {
   }]));
 }
 
+// ../../packages/core-agent/src/claude/execution-events.ts
+function createClaudeExecutionEventDecoder() {
+  const toolNames = /* @__PURE__ */ new Map();
+  return {
+    decode(message2) {
+      if (!isRecord(message2)) return [];
+      if (message2.type === "stream_event") return decodeStreamEvent(message2);
+      if (message2.type === "assistant") return decodeAssistant(message2, toolNames);
+      if (message2.type === "user") return decodeUser(message2, toolNames);
+      if (message2.type === "result") return decodeResult(message2);
+      return [];
+    }
+  };
+}
+function decodeStreamEvent(message2) {
+  const inner = record2(message2.event);
+  if (inner.type !== "content_block_delta") return [];
+  const delta = record2(inner.delta);
+  if (delta.type === "text_delta" && typeof delta.text === "string" && delta.text.length > 0) {
+    return [{ kind: "text", text: delta.text }];
+  }
+  if (delta.type === "thinking_delta" && typeof delta.thinking === "string" && delta.thinking.length > 0) {
+    return [{ kind: "thinking", text: delta.thinking }];
+  }
+  return [];
+}
+function decodeAssistant(message2, toolNames) {
+  const events = [];
+  for (const block of blocks(message2.message)) {
+    if (block.type !== "tool_use") continue;
+    const name = typeof block.name === "string" ? block.name : "tool";
+    const id = typeof block.id === "string" ? block.id : void 0;
+    if (id !== void 0) toolNames.set(id, name);
+    events.push({
+      kind: "tool-start",
+      ...id === void 0 ? {} : { id },
+      name,
+      input: block.input
+    });
+  }
+  return events;
+}
+function decodeUser(message2, toolNames) {
+  const events = [];
+  for (const block of blocks(message2.message)) {
+    if (block.type !== "tool_result") continue;
+    const id = typeof block.tool_use_id === "string" ? block.tool_use_id : void 0;
+    const name = id === void 0 ? void 0 : toolNames.get(id);
+    events.push({
+      kind: "tool-end",
+      ...id === void 0 ? {} : { id },
+      ...name === void 0 ? {} : { name },
+      isError: block.is_error === true
+    });
+  }
+  return events;
+}
+function decodeResult(message2) {
+  return [{
+    kind: "result",
+    isError: message2.is_error === true,
+    ...typeof message2.result === "string" ? { detail: message2.result } : {},
+    source: "message"
+  }];
+}
+function blocks(message2) {
+  const content = record2(message2).content;
+  return Array.isArray(content) ? content.map(record2) : [];
+}
+function record2(value) {
+  return isRecord(value) ? value : {};
+}
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
+// ../../packages/core-agent/src/claude/execution-loop.ts
+function createClaudeExecutionLoop(options) {
+  let sdk = null;
+  let started = false;
+  let disposed = false;
+  let active = null;
+  let cancelTurn = null;
+  let resumeId = null;
+  let queueTail = Promise.resolve();
+  let startFlight = null;
+  let disposeFlight = null;
+  async function start() {
+    if (disposed) throw new Error("Session disposed");
+    if (started) return;
+    if (startFlight === null) startFlight = startSdk();
+    try {
+      await startFlight;
+    } catch (error51) {
+      if (!disposed) startFlight = null;
+      throw error51;
+    }
+  }
+  async function startSdk() {
+    const created = await options.createSdk();
+    if (disposed) {
+      await created.dispose().catch(() => void 0);
+      throw new Error("Session disposed");
+    }
+    sdk = created;
+    started = true;
+    if (disposed) {
+      sdk = null;
+      started = false;
+      await created.dispose().catch(() => void 0);
+      throw new Error("Session disposed");
+    }
+  }
+  function run(prompt) {
+    if (disposed) return Promise.reject(new Error("Session disposed"));
+    if (!started || sdk === null) return Promise.reject(new Error("Session not started"));
+    if (typeof prompt !== "string" || prompt.trim().length === 0) {
+      return Promise.reject(new Error("Message required"));
+    }
+    const control = createTurnControl();
+    if (cancelTurn === null) cancelTurn = control.cancel;
+    const work = queueTail.then(async () => {
+      if (cancelTurn === null) cancelTurn = control.cancel;
+      try {
+        await runTurn(prompt, control);
+      } finally {
+        if (cancelTurn === control.cancel) cancelTurn = null;
+      }
+    });
+    queueTail = work.catch(() => void 0);
+    return work;
+  }
+  function closeRun(expected) {
+    const current = active;
+    if (current === null || current.run !== expected) return;
+    current.close();
+  }
+  function cancel() {
+    cancelTurn?.();
+  }
+  function dispose() {
+    if (disposeFlight) return disposeFlight;
+    disposed = true;
+    active?.stop();
+    disposeFlight = disposeResources();
+    return disposeFlight;
+  }
+  async function disposeResources() {
+    let observed = queueTail;
+    for (; ; ) {
+      await observed.catch(() => void 0);
+      if (observed === queueTail) break;
+      observed = queueTail;
+    }
+    await startFlight?.catch(() => void 0);
+    const owned = sdk;
+    sdk = null;
+    started = false;
+    await owned?.dispose().catch(() => void 0);
+  }
+  async function runTurn(prompt, control) {
+    if (disposed) return;
+    const owned = sdk;
+    if (!owned) throw new Error("Session not started");
+    let settled = false;
+    let failed = false;
+    let failure;
+    let pendingResult;
+    let timer;
+    let handle = null;
+    const decoder = createClaudeExecutionEventDecoder();
+    const gate = createGate();
+    const clearTimer = () => {
+      if (timer === void 0) return;
+      clearTimeout(timer);
+      timer = void 0;
+    };
+    const complete = () => {
+      if (settled) return;
+      settled = true;
+      try {
+        clearTimer();
+        if (handle !== null) closeRun(handle.run);
+      } finally {
+        gate.open();
+      }
+    };
+    const fail = (error51) => {
+      if (!failed) {
+        failed = true;
+        failure = error51;
+      }
+      complete();
+    };
+    const queueResult = (event) => {
+      if (settled) return;
+      pendingResult = event;
+      complete();
+    };
+    control.onCancel = () => {
+      if (handle !== null) complete();
+    };
+    try {
+      if (control.canceled) return;
+      const built = await options.buildTurn(prompt);
+      if (disposed || control.canceled) return;
+      assertLoopOwnedKeysAbsent(built);
+      const resume = options.continuation.kind === "resume-child" && resumeId !== null ? { resume: resumeId } : {};
+      let run2;
+      try {
+        run2 = await owned.startTurn({ ...built, prompt, ...resume });
+      } catch (error51) {
+        if (disposed || control.canceled) return;
+        throw error51;
+      }
+      const startedRun = run2;
+      let closed = false;
+      handle = {
+        run: startedRun,
+        stop() {
+          complete();
+        },
+        close() {
+          if (closed) return;
+          closed = true;
+          if (active === handle) active = null;
+          try {
+            startedRun.close();
+          } catch {
+          }
+        }
+      };
+      active = handle;
+      if (disposed || control.canceled) {
+        complete();
+        return;
+      }
+      timer = armWatchdog(options.settlement, () => {
+        try {
+          if (settled || disposed) return;
+          queueResult({ kind: "result", isError: true, source: "watchdog" });
+        } catch {
+        }
+      });
+      const consume = async () => {
+        let iterator;
+        try {
+          iterator = startedRun[Symbol.asyncIterator]();
+          while (!settled) {
+            const step = await iterator.next();
+            if (step.done) {
+              if (!settled && !disposed && options.settlement.kind === "result-required") {
+                queueResult({ kind: "result", isError: true, source: "incomplete" });
+              }
+              break;
+            }
+            if (settled || disposed) break;
+            const message2 = step.value;
+            if (options.continuation.kind === "resume-child" && resumeId === null && typeof message2.session_id === "string") {
+              resumeId = message2.session_id;
+            }
+            for (const event of decoder.decode(message2)) {
+              if (event.kind === "result") {
+                queueResult(event);
+                break;
+              }
+              try {
+                options.onEvent?.(event);
+              } catch (error51) {
+                fail(error51);
+                break;
+              }
+            }
+          }
+        } catch (error51) {
+          if (disposed || settled) return;
+          fail(error51);
+        } finally {
+          complete();
+          const closing = iterator?.return?.();
+          if (closing !== void 0) void closing.catch(() => void 0);
+        }
+      };
+      const consumption = consume();
+      consumption.catch(() => void 0);
+      await gate.promise;
+      if (disposed) return;
+      if (pendingResult !== void 0 && !failed) {
+        try {
+          options.onEvent?.(pendingResult);
+        } catch (error51) {
+          failed = true;
+          failure = error51;
+        }
+      }
+    } catch (error51) {
+      if (!disposed && !control.canceled && !failed) {
+        failed = true;
+        failure = error51;
+      }
+    } finally {
+      control.onCancel = null;
+      complete();
+    }
+    if (disposed) return;
+    if (failed) return Promise.reject(failure);
+  }
+  return { start, run, cancel, dispose };
+}
+function createTurnControl() {
+  const control = {
+    canceled: false,
+    onCancel: null,
+    cancel() {
+      control.canceled = true;
+      control.onCancel?.();
+    }
+  };
+  return control;
+}
+function assertLoopOwnedKeysAbsent(built) {
+  if (!built || typeof built !== "object") return;
+  const record4 = built;
+  if (Object.hasOwn(record4, "prompt") || Object.hasOwn(record4, "resume")) {
+    throw new TypeError("buildTurn must not set prompt or resume; those keys are loop-owned.");
+  }
+}
+function watchdogMsOf(settlement) {
+  if (settlement.kind !== "result-required") return void 0;
+  const watchdogMs = settlement.watchdogMs;
+  if (typeof watchdogMs !== "number" || !Number.isFinite(watchdogMs) || watchdogMs <= 0) {
+    return void 0;
+  }
+  return watchdogMs;
+}
+function createGate() {
+  let opened = false;
+  let resolvePromise = () => void 0;
+  const promise2 = new Promise((resolve) => {
+    resolvePromise = resolve;
+  });
+  return {
+    promise: promise2,
+    open() {
+      if (opened) return;
+      opened = true;
+      resolvePromise();
+    }
+  };
+}
+function armWatchdog(settlement, onTimeout) {
+  const watchdogMs = watchdogMsOf(settlement);
+  if (watchdogMs === void 0) return void 0;
+  const timer = setTimeout(onTimeout, watchdogMs);
+  timer.unref?.();
+  return timer;
+}
+
 // ../fleet-plugins/scuttlebutt/server/chat-session.ts
 var SCUTTLEBUTT_AGENT = {
   /**
@@ -19777,52 +20256,16 @@ work without opening a terminal, a project, or a browser tab.
 }
 var ChatSession = class {
   options;
-  sdk = null;
-  run = null;
-  /** 같은 대화를 이어 가기 위한 자식 세션 id. 첫 턴이 알려 준다. */
-  resumeId = null;
-  started = false;
-  disposed = false;
-  turn = Promise.resolve();
-  disposeFlight = null;
+  loop;
   constructor(options) {
     this.options = { ...options };
-  }
-  async start() {
-    if (this.disposed) throw new Error("Session disposed");
-    if (this.started) return;
-    const create2 = { baseUrl: this.options.baseUrl, models: [SCUTTLEBUTT_AGENT.model] };
-    const sdk = await (this.options.createSdk?.(create2) ?? createClaudeGatewaySdk(create2));
-    if (this.disposed) {
-      await sdk.dispose().catch(() => void 0);
-      throw new Error("Session disposed");
-    }
-    this.sdk = sdk;
-    this.started = true;
-  }
-  send(text) {
-    if (this.disposed) return Promise.reject(new Error("Session disposed"));
-    if (!this.started || !this.sdk) return Promise.reject(new Error("Session not started"));
-    if (!text.trim()) return Promise.reject(new Error("Message required"));
-    const run = this.turn.then(() => this.runTurn(text));
-    this.turn = run.catch(() => void 0);
-    return run;
-  }
-  dispose() {
-    if (this.disposeFlight) return this.disposeFlight;
-    this.disposed = true;
-    this.disposeFlight = this.disposeResources();
-    return this.disposeFlight;
-  }
-  async runTurn(text) {
-    const sdk = this.sdk;
-    if (!sdk) throw new Error("Session not started");
-    const emit = (event) => this.options.onEvent?.(event);
     const redact = (value) => redactScratchPath(value, this.options.cwd);
-    let run;
-    try {
-      run = await sdk.startTurn({
-        prompt: text,
+    this.loop = createClaudeExecutionLoop({
+      createSdk: () => {
+        const create2 = { baseUrl: this.options.baseUrl, models: [SCUTTLEBUTT_AGENT.model] };
+        return this.options.createSdk?.(create2) ?? createClaudeGatewaySdk(create2);
+      },
+      buildTurn: () => ({
         model: SCUTTLEBUTT_AGENT.model,
         effort: SCUTTLEBUTT_AGENT.effort,
         systemPrompt: { mode: "replace", text: ADMIRAL_SYSTEM_PROMPTS[this.options.admiral] },
@@ -19831,85 +20274,69 @@ var ChatSession = class {
         allowedTools: [...PET_TOOLS],
         permissionMode: "dontAsk",
         // 텍스트를 흘려 보내려면 부분 메시지가 필요하다. SSE `chunk` 계약이 그것으로 만들어진다.
-        includePartialMessages: true,
-        ...this.resumeId === null ? {} : { resume: this.resumeId }
-      });
-    } catch (error51) {
-      emit({ type: "error", error: { code: "chat_error", message: redact(message(error51)) } });
-      throw error51;
-    }
-    this.run = run;
-    const toolNames = /* @__PURE__ */ new Map();
-    try {
-      for await (const event of run) {
-        if (typeof event.session_id === "string" && this.resumeId === null) this.resumeId = event.session_id;
-        for (const mapped of toChatEvents(event, toolNames, redact)) emit(mapped);
+        includePartialMessages: true
+      }),
+      continuation: { kind: "resume-child" },
+      settlement: { kind: "result" },
+      onEvent: (event) => {
+        for (const mapped of toChatEvents(event, redact)) this.options.onEvent?.(mapped);
+      }
+    });
+  }
+  start() {
+    return this.loop.start();
+  }
+  send(text) {
+    return this.loop.run(text).catch((error51) => {
+      if (!isLifecycleError(error51)) {
+        const redact = (value) => redactScratchPath(value, this.options.cwd);
+        this.options.onEvent?.({
+          type: "error",
+          error: { code: "chat_error", message: redact(message(error51)) }
+        });
       }
-    } catch (error51) {
-      if (this.disposed) return;
-      emit({ type: "error", error: { code: "chat_error", message: redact(message(error51)) } });
       throw error51;
-    } finally {
-      if (this.run === run) this.run = null;
-    }
+    });
   }
-  async disposeResources() {
-    this.run?.close();
-    this.run = null;
-    await this.turn.catch(() => void 0);
-    const sdk = this.sdk;
-    this.sdk = null;
-    this.started = false;
-    await sdk?.dispose().catch(() => void 0);
+  dispose() {
+    return this.loop.dispose();
   }
 };
-function toChatEvents(event, toolNames, redact) {
-  if (event.type === "stream_event") {
-    const inner = record2(event.event);
-    if (inner.type !== "content_block_delta") return [];
-    const delta = record2(inner.delta);
-    if (delta.type !== "text_delta" || typeof delta.text !== "string" || delta.text.length === 0) return [];
-    return [{ type: "chunk", text: redact(delta.text) }];
-  }
-  if (event.type === "assistant") {
-    const events = [];
-    for (const block of blocks(event.message)) {
-      if (block.type !== "tool_use") continue;
-      const name = typeof block.name === "string" ? block.name : "tool";
-      if (typeof block.id === "string") toolNames.set(block.id, name);
-      events.push({ type: "tool", title: redact(toolTitle(name, block.input)), status: "running" });
-    }
-    return events;
-  }
-  if (event.type === "user") {
-    const events = [];
-    for (const block of blocks(event.message)) {
-      if (block.type !== "tool_result") continue;
-      const name = typeof block.tool_use_id === "string" ? toolNames.get(block.tool_use_id) ?? "tool" : "tool";
-      events.push({ type: "tool", title: redact(name), status: block.is_error === true ? "error" : "done" });
-    }
-    return events;
-  }
-  if (event.type === "result") {
-    if (event.is_error === true) {
-      const detail = typeof event.result === "string" ? event.result : "Chat turn failed";
-      return [{ type: "error", error: { code: "chat_error", message: redact(detail) } }];
+function toChatEvents(event, redact) {
+  if (event.kind === "text") return [{ type: "chunk", text: redact(event.text) }];
+  if (event.kind === "thinking") return [];
+  if (event.kind === "tool-start") {
+    return [{ type: "tool", title: redact(toolTitle(event.name, event.input)), status: "running" }];
+  }
+  if (event.kind === "tool-end") {
+    return [{
+      type: "tool",
+      title: redact(event.name ?? "tool"),
+      status: event.isError ? "error" : "done"
+    }];
+  }
+  if (event.kind === "result") {
+    if (event.isError) {
+      return [{
+        type: "error",
+        error: { code: "chat_error", message: redact(event.detail ?? "Chat turn failed") }
+      }];
     }
     return [{ type: "complete" }];
   }
   return [];
 }
 function toolTitle(name, input) {
-  const detail = record2(input);
+  const detail = record3(input);
   for (const key of ["query", "url", "prompt"]) {
     const value = detail[key];
     if (typeof value === "string" && value.trim()) return `${name}: ${value.trim()}`;
   }
   return name;
 }
-function blocks(message2) {
-  const content = record2(message2).content;
-  return Array.isArray(content) ? content.map(record2) : [];
+function isLifecycleError(error51) {
+  const text = message(error51);
+  return text === "Session disposed" || text === "Session not started" || text === "Message required";
 }
 function message(error51) {
   return error51 instanceof Error ? error51.message : String(error51);
@@ -19923,7 +20350,7 @@ function redactScratchPath(text, cwd) {
   }
   return redacted;
 }
-function record2(value) {
+function record3(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
 
@@ -20030,7 +20457,7 @@ function registerChatRoutes(ctx, deps = {}) {
   const createSession = deps.createSession ?? ((options) => new ChatSession(options));
   const id = deps.id ?? crypto2.randomUUID;
   const ensureDir = deps.ensureDir ?? (async (dir) => {
-    await fs2.mkdir(dir, { recursive: true });
+    await fs3.mkdir(dir, { recursive: true });
   });
   registerRouter(ctx, "chat", async ({ req, res, pathname }) => {
     if (!ctx.host.security.isTerminalAuthorized(req)) {
@@ -20146,7 +20573,7 @@ async function handleStop(ctx, req, res, chatId, registry3) {
   if (req.method !== "POST") return methodNotAllowed(ctx, res);
   if (!isJsonRequest(req)) return unsupportedMediaType(ctx, res);
   const body = await ctx.host.http.readJsonBody(req);
-  if (!isRecord(body) || Object.keys(body).length > 0) {
+  if (!isRecord2(body) || Object.keys(body).length > 0) {
     ctx.host.http.writeJson(res, 400, { error: "invalid_stop" });
     return true;
   }
@@ -20155,10 +20582,10 @@ async function handleStop(ctx, req, res, chatId, registry3) {
   return true;
 }
 function isMessageBody(value) {
-  return isRecord(value) && Object.keys(value).length === 1 && typeof value.text === "string" && value.text.trim().length > 0;
+  return isRecord2(value) && Object.keys(value).length === 1 && typeof value.text === "string" && value.text.trim().length > 0;
 }
 function isStartBody(value) {
-  return isRecord(value) && Object.keys(value).length === 1 && typeof value.admiral === "string" && ADMIRAL_IDS.some((admiral) => admiral === value.admiral);
+  return isRecord2(value) && Object.keys(value).length === 1 && typeof value.admiral === "string" && ADMIRAL_IDS.some((admiral) => admiral === value.admiral);
 }
 function isJsonRequest(req) {
   const contentType = req.headers["content-type"];
@@ -20189,7 +20616,7 @@ function securityHeaders(headers) {
     "X-Content-Type-Options": "nosniff"
   };
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }