@moxt-ai/mobius 0.0.142 → 0.0.144

package/dist/cli.js

@@ -3381,7 +3381,7 @@ var program = new Command();
 // package.json
 var package_default = {
   name: "@moxt-ai/mobius",
-  version: "0.0.142",
+  version: "0.0.144",
   description: "Mobius CLI for pairing and running local AI agent services.",
   type: "module",
   bin: {
@@ -29441,7 +29441,7 @@ var userHistoryMessage = external_exports.strictObject({
   text: external_exports.string().max(SESSION_HISTORY_CHARACTER_LIMIT),
   images: external_exports.array(historyImage).max(8).readonly().optional()
 }).readonly();
-var assistantHistoryMessage = external_exports.strictObject({
+var assistantHistoryMessageSchema = external_exports.strictObject({
   activities: external_exports.array(nativeMessageActivitySchema).max(100).readonly().default([]),
   content: external_exports.array(displayContentSchema).max(100).readonly().default([]),
   role: external_exports.literal("assistant"),
@@ -29450,7 +29450,7 @@ var assistantHistoryMessage = external_exports.strictObject({
   text: external_exports.string().max(SESSION_HISTORY_CHARACTER_LIMIT),
   images: external_exports.array(historyImage).max(8).readonly().optional()
 }).readonly();
-var historyMessage = external_exports.discriminatedUnion("role", [userHistoryMessage, assistantHistoryMessage]);
+var historyMessage = external_exports.discriminatedUnion("role", [userHistoryMessage, assistantHistoryMessageSchema]);
 var availableSessionHistoryObjectSchema = external_exports.strictObject({
   status: external_exports.literal("available"),
   messages: external_exports.array(historyMessage).max(SESSION_HISTORY_MESSAGE_LIMIT).readonly(),
@@ -29521,6 +29521,7 @@ var activeTurnSnapshotSchema = external_exports.strictObject({
   truncated: external_exports.boolean(),
   epoch: identifierStringSchema,
   interaction: external_exports.discriminatedUnion("kind", [sessionPermissionRequestedEventSchema, sessionElicitationRequestedEventSchema]).nullable(),
+  messages: external_exports.array(assistantHistoryMessageSchema).max(SESSION_HISTORY_MESSAGE_LIMIT).readonly(),
   sequence: external_exports.number().int().nonnegative(),
   state: external_exports.literal("running")
 }).readonly();
@@ -32240,6 +32241,48 @@ var AgentUpdateStream = class {
   };
 };
 
+// src/acp/runtime-operations.ts
+var RuntimeOperations = class {
+  #shutdown = new AbortController();
+  #pending = /* @__PURE__ */ new Set();
+  #closing = null;
+  run = async (options, operation) => {
+    const signal = AbortSignal.any([options.signal, this.#shutdown.signal]);
+    signal.throwIfAborted();
+    const pending = Promise.resolve().then(() => operation({ ...options, signal }));
+    this.#pending.add(pending);
+    try {
+      const result = await pending;
+      signal.throwIfAborted();
+      return result;
+    } finally {
+      this.#pending.delete(pending);
+    }
+  };
+  close = (release) => {
+    if (this.#closing !== null) {
+      return this.#closing;
+    }
+    this.#shutdown.abort();
+    this.#closing = (async () => {
+      await Promise.allSettled([...this.#pending]);
+      await release();
+    })();
+    return this.#closing;
+  };
+};
+async function waitForSharedOperation(pending, signal) {
+  signal.throwIfAborted();
+  const cancelled = Promise.withResolvers();
+  const abort = () => cancelled.reject(signal.reason);
+  signal.addEventListener("abort", abort, { once: true });
+  try {
+    return await Promise.race([pending, cancelled.promise]);
+  } finally {
+    signal.removeEventListener("abort", abort);
+  }
+}
+
 // src/acp/session-config/session-config-protocol.ts
 import { methods as methods7 } from "@agentclientprotocol/sdk";
 var MAXIMUM_CONFIG_OPTIONS = 100;
@@ -38879,9 +38922,7 @@ var AgentSession = class _AgentSession {
   #configOptions = [];
   #prompted = false;
   #nativePrompt = null;
-  #replay = {
-    kind: "idle"
-  };
+  #sessionLoad = { kind: "not-requested" };
   #restored = false;
   #sessionTitle = null;
   #sessionUpdatedAt = "";
@@ -38994,30 +39035,46 @@ var AgentSession = class _AgentSession {
         }
       };
     }
-    const history = new AcpHistoryReplay();
-    this.#replay = { kind: "capture", history };
-    try {
-      await this.race(
-        this.#connection.connection.agent.request(
-          methods8.agent.session.load,
-          {
-            additionalDirectories: [...this.#additionalDirectories],
-            cwd: this.#cwd,
-            mcpServers: [],
-            sessionId: this.#updates.sessionId()
-          },
-          { cancellationSignal: signal }
-        ),
-        "ACP agent exited while loading history",
-        signal
-      );
-      await this.#updates.drained();
-      signal.throwIfAborted();
-      return await embedLocalHistoryImages(await history.snapshot(), signal);
-    } finally {
-      this.#replay = { kind: "idle" };
-    }
+    const loaded = await this.#loadSession(signal, "ACP agent exited while loading history");
+    return await embedLocalHistoryImages(await loaded.history.snapshot(), signal);
   };
+  async #loadSession(signal, exitMessage) {
+    if (this.#sessionLoad.kind === "loaded") {
+      return this.#sessionLoad;
+    }
+    if (this.#sessionLoad.kind === "capturing") {
+      return await waitForSharedOperation(this.#sessionLoad.completion, signal);
+    }
+    const history = new AcpHistoryReplay();
+    const completion = Promise.resolve().then(async () => {
+      try {
+        const response = await this.race(
+          this.#connection.connection.agent.request(
+            methods8.agent.session.load,
+            {
+              additionalDirectories: [...this.#additionalDirectories],
+              cwd: this.#cwd,
+              mcpServers: [],
+              sessionId: this.#updates.sessionId()
+            },
+            { cancellationSignal: signal }
+          ),
+          exitMessage,
+          signal
+        );
+        await this.#updates.drained();
+        signal.throwIfAborted();
+        const loaded = { history, kind: "loaded", response };
+        this.#sessionLoad = loaded;
+        return loaded;
+      } catch (cause) {
+        this.#sessionLoad = { kind: "not-requested" };
+        throw cause;
+      }
+    });
+    this.#sessionLoad = { completion, history, kind: "capturing" };
+    return await completion;
+  }
   prepareAgentContent = async (content) => {
     if (content.type === "image" && content.uri.length > 0) {
       const signal = AbortSignal.timeout(2e4);
@@ -39220,29 +39277,10 @@ var AgentSession = class _AgentSession {
           )
         );
       } else if (this.#capabilities.loadSession) {
-        this.#replay = { kind: "discard" };
-        try {
-          lifecycleResponse = await this.#metrics.measure(
-            "session-load",
-            async () => await this.race(
-              this.#connection.connection.agent.request(
-                methods8.agent.session.load,
-                {
-                  additionalDirectories: [...this.#additionalDirectories],
-                  cwd: this.#cwd,
-                  mcpServers: [],
-                  sessionId: this.#updates.sessionId()
-                },
-                { cancellationSignal: signal }
-              ),
-              "ACP agent exited while loading a session",
-              signal
-            )
-          );
-        } finally {
-          await this.#updates.drained();
-          this.#replay = { kind: "idle" };
-        }
+        lifecycleResponse = await this.#metrics.measure(
+          "session-load",
+          async () => (await this.#loadSession(signal, "ACP agent exited while loading a session")).response
+        );
       } else {
         throw new AcpExecutionError(
           "The ACP agent cannot restore its persisted session",
@@ -39627,10 +39665,10 @@ var AgentSession = class _AgentSession {
   #processUpdate = async (notification) => {
     this.assertNativeSession(notification.sessionId);
     const update = notification.update;
-    if (this.#replay.kind === "capture") {
-      await this.#replay.history.record(update);
+    if (this.#sessionLoad.kind !== "not-requested") {
+      await this.#sessionLoad.history.record(update);
     }
-    if (this.#replay.kind !== "idle" && (update.sessionUpdate === "user_message_chunk" || update.sessionUpdate === "agent_message_chunk" || update.sessionUpdate === "agent_thought_chunk" || update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update" || update.sessionUpdate === "plan" || update.sessionUpdate === "plan_update" || update.sessionUpdate === "plan_removed")) {
+    if (this.#sessionLoad.kind === "capturing" && (update.sessionUpdate === "user_message_chunk" || update.sessionUpdate === "agent_message_chunk" || update.sessionUpdate === "agent_thought_chunk" || update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update" || update.sessionUpdate === "plan" || update.sessionUpdate === "plan_update" || update.sessionUpdate === "plan_removed")) {
       return;
     }
     if (update.sessionUpdate === "agent_message_chunk") {
@@ -39900,48 +39938,6 @@ var RetainedAgentProcesses = class {
   };
 };
 
-// src/acp/runtime-operations.ts
-var RuntimeOperations = class {
-  #shutdown = new AbortController();
-  #pending = /* @__PURE__ */ new Set();
-  #closing = null;
-  run = async (options, operation) => {
-    const signal = AbortSignal.any([options.signal, this.#shutdown.signal]);
-    signal.throwIfAborted();
-    const pending = Promise.resolve().then(() => operation({ ...options, signal }));
-    this.#pending.add(pending);
-    try {
-      const result = await pending;
-      signal.throwIfAborted();
-      return result;
-    } finally {
-      this.#pending.delete(pending);
-    }
-  };
-  close = (release) => {
-    if (this.#closing !== null) {
-      return this.#closing;
-    }
-    this.#shutdown.abort();
-    this.#closing = (async () => {
-      await Promise.allSettled([...this.#pending]);
-      await release();
-    })();
-    return this.#closing;
-  };
-};
-async function waitForPreparation(pending, signal) {
-  signal.throwIfAborted();
-  const cancelled = Promise.withResolvers();
-  const abort = () => cancelled.reject(signal.reason);
-  signal.addEventListener("abort", abort, { once: true });
-  try {
-    return await Promise.race([pending, cancelled.promise]);
-  } finally {
-    signal.removeEventListener("abort", abort);
-  }
-}
-
 // src/acp/agent-query-processes.ts
 var AgentQueryProcesses = class {
   #processesByQuery;
@@ -39988,7 +39984,7 @@ var AgentQueryProcesses = class {
   prepare = async (options) => {
     const pending = this.#processesByQuery.pending(options.sessionId);
     if (pending !== void 0) {
-      const runtime2 = await waitForPreparation(pending, options.signal);
+      const runtime2 = await waitForSharedOperation(pending, options.signal);
       if (runtime2.belongsTo(options.agent.id, options.cwd, options.additionalDirectories)) {
         this.#processesByQuery.touch(options.sessionId, runtime2);
         return runtime2.prepared();
@@ -40406,7 +40402,7 @@ var AgentRuntimeManager = class {
     if (pending !== void 0) {
       const runtime2 = await metrics.measure(
         "session-preparation-wait",
-        async () => await waitForPreparation(pending, options2.signal)
+        async () => await waitForSharedOperation(pending, options2.signal)
       );
       if (runtime2.belongsTo(options2.agent.id, options2.cwd, options2.additionalDirectories)) {
         this.#executionProcesses.touch(options2.sessionId, runtime2);
@@ -40496,7 +40492,7 @@ var AgentRuntimeManager = class {
   prepareExecutionSession = async (options) => this.#operations.run(options, async (options2) => {
     const pending = this.#executionProcesses.pending(options2.sessionId);
     if (pending !== void 0) {
-      await waitForPreparation(pending, options2.signal);
+      await waitForSharedOperation(pending, options2.signal);
       return await this.prepareExecutionSession(options2);
     }
     const existing = this.#executionProcesses.get(options2.sessionId);
@@ -40550,7 +40546,7 @@ var AgentRuntimeManager = class {
     }
     const pending = this.#executionProcesses.pending(options2.sessionId);
     if (pending !== void 0) {
-      await waitForPreparation(pending, options2.signal);
+      await waitForSharedOperation(pending, options2.signal);
     }
     if (this.#executions.command(options2.sessionId) !== options2.targetCommandId) {
       throw new AcpExecutionError("The target turn is no longer active", {}, "steering_target_unavailable");
@@ -42103,6 +42099,7 @@ var ActiveDaemonTurn = class {
   #text = "";
   #activities = /* @__PURE__ */ new Map();
   #content = /* @__PURE__ */ new Map();
+  #timeline = [];
   #sequence = 0;
   #interaction = null;
   #epoch = decodeIdentifier(randomUUID2());
@@ -42146,12 +42143,16 @@ var ActiveDaemonTurn = class {
   recordEvent = (event) => {
     if (event.kind === AGENT_MESSAGE_DELTA_KIND) {
       this.#text += event.text;
+      this.appendMessageText(event.messageId, event.text);
       return this.updated();
     }
     if (event.sessionId !== this.command.sessionId || "commandId" in event && event.commandId !== this.command.commandId) {
       return event;
     }
     if (event.kind === AGENT_ACTIVITY_KIND) {
+      if (!this.#activities.has(event.activityId)) {
+        this.#timeline = [...this.#timeline, { activityId: event.activityId, kind: "activity" }];
+      }
       this.#activities.set(event.activityId, {
         activityId: event.activityId,
         activityType: event.activityType,
@@ -42167,6 +42168,9 @@ var ActiveDaemonTurn = class {
       });
     } else if (event.kind === AGENT_ACTIVITY_NARRATION_KIND) {
       const previous = this.#activities.get(event.activityId);
+      if (previous === void 0) {
+        this.#timeline = [...this.#timeline, { activityId: event.activityId, kind: "activity" }];
+      }
       this.#activities.set(event.activityId, {
         activityId: event.activityId,
         activityType: event.activityType,
@@ -42182,6 +42186,24 @@ var ActiveDaemonTurn = class {
       });
     } else if (event.kind === AGENT_CONTENT_KIND) {
       this.#content.set(event.contentId, event.content);
+      const target = this.#timeline.findLastIndex(
+        (entry) => entry.kind === "message" && entry.messageId === event.messageId
+      );
+      if (target < 0) {
+        this.#timeline = [
+          ...this.#timeline,
+          {
+            content: /* @__PURE__ */ new Map([[event.contentId, event.content]]),
+            kind: "message",
+            messageId: event.messageId,
+            text: ""
+          }
+        ];
+      } else {
+        this.#timeline = this.#timeline.map(
+          (entry, index) => index === target && entry.kind === "message" ? { ...entry, content: new Map([...entry.content, [event.contentId, event.content]]) } : entry
+        );
+      }
     } else if (event.kind === SESSION_PERMISSION_REQUESTED_KIND || event.kind === SESSION_ELICITATION_REQUESTED_KIND) {
       this.#interaction = event;
     } else if ((event.kind === SESSION_PERMISSION_RESOLVED_KIND || event.kind === SESSION_ELICITATION_RESOLVED_KIND) && this.#interaction?.interactionId === event.interactionId) {
@@ -42192,6 +42214,49 @@ var ActiveDaemonTurn = class {
     }
     return event;
   };
+  appendMessageText(messageId, text2) {
+    let remaining = text2;
+    while (remaining.length > 0) {
+      const latest = this.#timeline.at(-1);
+      if (latest?.kind === "message" && latest.messageId === messageId) {
+        const available = SESSION_HISTORY_CHARACTER_LIMIT - latest.text.length;
+        if (available > 0) {
+          this.#timeline = [
+            ...this.#timeline.slice(0, -1),
+            { ...latest, text: `${latest.text}${remaining.slice(0, available)}` }
+          ];
+          remaining = remaining.slice(available);
+          continue;
+        }
+      }
+      this.#timeline = [
+        ...this.#timeline,
+        {
+          content: /* @__PURE__ */ new Map(),
+          kind: "message",
+          messageId,
+          text: remaining.slice(0, SESSION_HISTORY_CHARACTER_LIMIT)
+        }
+      ];
+      remaining = remaining.slice(SESSION_HISTORY_CHARACTER_LIMIT);
+    }
+  }
+  timelineMessages() {
+    return this.#timeline.flatMap((entry) => {
+      if (entry.kind === "message") {
+        return [
+          {
+            activities: [],
+            content: [...entry.content.values()],
+            role: "assistant",
+            text: entry.text
+          }
+        ];
+      }
+      const activity2 = this.#activities.get(entry.activityId);
+      return activity2 === void 0 ? [] : [{ activities: [activity2], content: [], role: "assistant", text: "" }];
+    });
+  }
   updated = () => {
     this.#sequence += 1;
     const turn = this.snapshot();
@@ -42200,18 +42265,26 @@ var ActiveDaemonTurn = class {
     }
     return { kind: "session.turn.updated", sessionId: this.command.sessionId, turn };
   };
-  snapshot = () => this.#dispatch.kind === "running" ? {
-    activities: [...this.#activities.values()].sort((left, right) => left.sequence - right.sequence),
-    commandId: decodeIdentifier(this.command.commandId),
-    content: [...this.#content.values()],
-    prompt: this.command.prompt,
-    text: this.#text,
-    truncated: false,
-    epoch: this.#epoch,
-    interaction: this.#interaction,
-    sequence: this.#sequence,
-    state: "running"
-  } : null;
+  snapshot = () => {
+    if (this.#dispatch.kind !== "running") {
+      return null;
+    }
+    const completeMessages = this.timelineMessages();
+    const messages = completeMessages.slice(-SESSION_HISTORY_MESSAGE_LIMIT);
+    return {
+      activities: [...this.#activities.values()].sort((left, right) => left.sequence - right.sequence),
+      commandId: decodeIdentifier(this.command.commandId),
+      content: [...this.#content.values()],
+      prompt: this.command.prompt,
+      text: this.#text,
+      truncated: messages.length !== completeMessages.length,
+      epoch: this.#epoch,
+      interaction: this.#interaction,
+      messages,
+      sequence: this.#sequence,
+      state: "running"
+    };
+  };
   matches = (cancellation) => cancellation.commandId === this.command.commandId && cancellation.sessionId === this.command.sessionId;
   matchesInteraction = (interactionId, sessionId) => this.command.sessionId === sessionId && this.#interaction?.interactionId === interactionId;
   requestCancellation = () => {
@@ -42397,15 +42470,21 @@ var turnsSchema = external_exports.object({
 });
 var itemTypeSchema = external_exports.object({ type: external_exports.string().min(1).max(80) });
 var userMessageSchema = external_exports.object({
-  content: external_exports.array(external_exports.unknown()).max(1e4)
+  content: external_exports.array(external_exports.unknown()).max(1e4),
+  type: external_exports.literal("userMessage")
 });
 var textSchema = external_exports.object({ text: external_exports.string() });
 var imageSchema = external_exports.object({ url: external_exports.string() });
-var agentMessageSchema = textSchema.extend({ phase: external_exports.string().nullish() });
+var agentMessageSchema = textSchema.extend({
+  id: external_exports.string().optional(),
+  phase: external_exports.string().nullish(),
+  type: external_exports.literal("agentMessage")
+});
 var reasoningSchema = external_exports.object({
   id: external_exports.string(),
   summary: external_exports.array(external_exports.string()).max(1e4),
-  content: external_exports.array(external_exports.string()).max(1e4)
+  content: external_exports.array(external_exports.string()).max(1e4),
+  type: external_exports.literal("reasoning")
 });
 var commandExecutionSchema = external_exports.object({
   id: external_exports.string(),
@@ -42414,8 +42493,45 @@ var commandExecutionSchema = external_exports.object({
   status: external_exports.string(),
   commandActions: external_exports.array(external_exports.object({ type: external_exports.string() }).passthrough()).max(100),
   aggregatedOutput: external_exports.string().nullish(),
-  exitCode: external_exports.number().int().nullish()
+  exitCode: external_exports.number().int().nullish(),
+  type: external_exports.literal("commandExecution")
+});
+var fileChangeSchema = external_exports.object({
+  changes: external_exports.array(external_exports.object({ diff: external_exports.string(), path: external_exports.string() })).max(1e4),
+  id: external_exports.string(),
+  status: external_exports.string(),
+  type: external_exports.literal("fileChange")
+});
+var mcpToolCallSchema = external_exports.object({
+  arguments: external_exports.unknown().optional(),
+  error: external_exports.unknown().nullish(),
+  id: external_exports.string(),
+  result: external_exports.unknown().nullish(),
+  server: external_exports.string(),
+  status: external_exports.string(),
+  tool: external_exports.string(),
+  type: external_exports.literal("mcpToolCall")
+});
+var dynamicToolCallSchema = external_exports.object({
+  arguments: external_exports.unknown().optional(),
+  contentItems: external_exports.array(external_exports.unknown()).max(1e4).nullish(),
+  id: external_exports.string(),
+  namespace: external_exports.string().nullish(),
+  status: external_exports.string(),
+  tool: external_exports.string(),
+  type: external_exports.literal("dynamicToolCall")
 });
+var planSchema = external_exports.object({ id: external_exports.string(), text: external_exports.string(), type: external_exports.literal("plan") });
+var historyItemSchema = external_exports.discriminatedUnion("type", [
+  userMessageSchema,
+  agentMessageSchema,
+  reasoningSchema,
+  commandExecutionSchema,
+  fileChangeSchema,
+  mcpToolCallSchema,
+  dynamicToolCallSchema,
+  planSchema
+]);
 function bounded(value, maximum) {
   return value.slice(0, maximum);
 }
@@ -42446,6 +42562,33 @@ function errorMessage(value) {
   }
   return JSON.stringify(value) ?? "Codex stopped before completing this turn.";
 }
+function formatted(value) {
+  if (value === void 0) {
+    return "";
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  return JSON.stringify(value) ?? "";
+}
+function toolStatus(status) {
+  return status === "inProgress" ? "running" : status === "completed" ? "completed" : "failed";
+}
+function diffDisplayContent(path3, newText) {
+  return {
+    artifactId: "",
+    data: "",
+    mimeType: "",
+    name: "",
+    newText,
+    oldText: "",
+    path: path3,
+    terminalId: "",
+    text: "",
+    type: "diff",
+    uri: ""
+  };
+}
 function messageSize(message) {
   return message.text.length + (message.role === "assistant" ? JSON.stringify(message.activities).length + JSON.stringify(message.content).length : 0);
 }
@@ -42483,8 +42626,8 @@ function fitActivities(activities, maximumCharacters) {
   const maximumActivityCharacters = Math.floor(Math.max(0, maximumCharacters - arrayCharacters) / activities.length);
   return activities.map((activity2) => fitActivity(activity2, maximumActivityCharacters));
 }
-function fitHistoryMessage(message) {
-  const text2 = message.text.slice(-SESSION_HISTORY_MESSAGE_CHARACTER_LIMIT);
+function fitHistoryMessage(message, maximumCharacters = SESSION_HISTORY_MESSAGE_CHARACTER_LIMIT) {
+  const text2 = message.text.slice(-maximumCharacters);
   if (message.role === "user") {
     return {
       message: { ...message, text: text2 },
@@ -42494,12 +42637,12 @@ function fitHistoryMessage(message) {
   let activities = message.activities;
   const content = message.content;
   let fitted = { ...message, activities, content, text: text2 };
-  if (messageSize(fitted) > SESSION_HISTORY_MESSAGE_CHARACTER_LIMIT && activities.length > 0) {
-    const maximumCharacters = SESSION_HISTORY_MESSAGE_CHARACTER_LIMIT - text2.length - JSON.stringify(content).length;
-    activities = fitActivities(activities, maximumCharacters);
+  if (messageSize(fitted) > maximumCharacters && activities.length > 0) {
+    const maximumActivityCharacters = maximumCharacters - text2.length - JSON.stringify(content).length;
+    activities = fitActivities(activities, maximumActivityCharacters);
     fitted = { ...fitted, activities };
   }
-  const excess = Math.max(0, messageSize(fitted) - SESSION_HISTORY_MESSAGE_CHARACTER_LIMIT);
+  const excess = Math.max(0, messageSize(fitted) - maximumCharacters);
   if (excess > 0) {
     const maximumTextLength = Math.max(0, fitted.text.length - excess);
     fitted = {
@@ -42537,128 +42680,209 @@ function decodeHistory(thread, value, options) {
   let truncated = page.nextCursor != null;
   for (const turn of page.data.toReversed()) {
     const outcome = turnOutcome(turn.status);
-    const activities = [];
-    let assignedActivityCount = 0;
+    const turnMessageCharacterLimit = Math.max(
+      1,
+      Math.floor(SESSION_HISTORY_CHARACTER_LIMIT / Math.max(1, turn.items.length + (turn.error == null ? 0 : 1)))
+    );
     let sequence = 0;
     let assistantMessageIndex = null;
-    const activitySlice = () => {
-      const assigned = activities.slice(assignedActivityCount).slice(-100);
-      assignedActivityCount = activities.length;
-      return assigned;
+    const append = (message) => {
+      const fitted = fitHistoryMessage(message, turnMessageCharacterLimit);
+      if (fitted.message.text.length === 0 && (fitted.message.images?.length ?? 0) === 0 && (fitted.message.role === "user" || fitted.message.activities.length === 0 && fitted.message.content.length === 0)) {
+        return;
+      }
+      truncated ||= fitted.truncated;
+      messages.push(fitted.message);
+      if (fitted.message.role === "assistant") {
+        assistantMessageIndex = messages.length - 1;
+      }
+      characters += messageSize(fitted.message);
     };
     for (const item of turn.items) {
-      const { type } = itemTypeSchema.parse(item);
-      let message;
-      if (type === "userMessage") {
-        const { content } = userMessageSchema.parse(item);
-        const text2 = content.map((block) => {
-          const { type: type2 } = itemTypeSchema.parse(block);
-          if (type2 === "text") {
+      const decoded = historyItemSchema.safeParse(item);
+      if (!decoded.success) {
+        continue;
+      }
+      const historyItem = decoded.data;
+      if (historyItem.type === "userMessage") {
+        const text2 = historyItem.content.map((block) => {
+          const { type } = itemTypeSchema.parse(block);
+          if (type === "text") {
             return textSchema.parse(block).text;
           }
-          if (type2 === "image") {
+          if (type === "image") {
             return `[@image](${imageSchema.parse(block).url})`;
           }
           return "[Attachment]";
         }).join("");
-        message = {
+        append({
           role: "user",
           text: text2
-        };
-      } else if (type === "agentMessage") {
-        const agent = agentMessageSchema.parse(item);
-        if (agent.phase === "commentary") {
-          if (options.detail === "rich" && agent.text.length > 0) {
-            activities.push(
-              activity(`progress-${sequence.toString()}`, "progress", sequence, {
+        });
+      } else if (historyItem.type === "agentMessage") {
+        if (historyItem.phase === "commentary") {
+          if (options.detail === "rich" && historyItem.text.length > 0) {
+            append({
+              activities: [
+                activity(historyItem.id ?? `progress-${sequence.toString()}`, "progress", sequence, {
+                  input: "",
+                  locations: [],
+                  name: "",
+                  output: historyItem.text,
+                  status: "completed",
+                  title: "Progress",
+                  toolKind: ""
+                })
+              ],
+              content: [],
+              role: "assistant",
+              text: ""
+            });
+            sequence += 1;
+          }
+          continue;
+        }
+        append({ activities: [], content: [], role: "assistant", text: historyItem.text });
+      } else if (historyItem.type === "reasoning" && options.detail === "rich") {
+        const output2 = (historyItem.summary.length > 0 ? historyItem.summary : historyItem.content).join(
+          "\n\n"
+        );
+        if (output2.length > 0) {
+          append({
+            activities: [
+              activity(historyItem.id, "reasoning", sequence, {
                 input: "",
                 locations: [],
                 name: "",
-                output: agent.text,
+                output: output2,
                 status: "completed",
-                title: "Progress",
+                title: "Reasoning",
                 toolKind: ""
               })
-            );
-            sequence += 1;
-          }
-          continue;
+            ],
+            content: [],
+            role: "assistant",
+            text: ""
+          });
+          sequence += 1;
         }
-        message = { activities: activitySlice(), content: [], role: "assistant", text: agent.text };
-      } else if (type === "reasoning" && options.detail === "rich") {
-        const reasoning = reasoningSchema.parse(item);
-        const output2 = (reasoning.summary.length > 0 ? reasoning.summary : reasoning.content).join("\n\n");
-        if (output2.length > 0) {
-          activities.push(
-            activity(reasoning.id, "reasoning", sequence, {
+      } else if (historyItem.type === "commandExecution" && options.detail === "rich") {
+        const action = historyItem.commandActions[0]?.type ?? "execute";
+        append({
+          activities: [
+            activity(historyItem.id, "tool", sequence, {
+              input: JSON.stringify({ command: historyItem.command, cwd: historyItem.cwd }),
+              locations: [historyItem.cwd],
+              name: "",
+              output: JSON.stringify({
+                formatted_output: historyItem.aggregatedOutput ?? "",
+                ...historyItem.exitCode == null ? {} : { exit_code: historyItem.exitCode }
+              }),
+              status: toolStatus(historyItem.status),
+              title: historyItem.command,
+              toolKind: action
+            })
+          ],
+          content: [],
+          role: "assistant",
+          text: ""
+        });
+        sequence += 1;
+      } else if (historyItem.type === "fileChange" && options.detail === "rich") {
+        const paths = historyItem.changes.map((change) => change.path);
+        const content = historyItem.changes.map(
+          (change) => diffDisplayContent(change.path, change.diff)
+        );
+        append({
+          activities: [
+            activity(historyItem.id, "tool", sequence, {
+              input: JSON.stringify({ changes: paths }),
+              locations: paths,
+              name: "",
+              output: "",
+              status: toolStatus(historyItem.status),
+              title: paths.join(", "),
+              toolKind: "edit"
+            })
+          ].map((entry) => ({ ...entry, content })),
+          content: [],
+          role: "assistant",
+          text: ""
+        });
+        sequence += 1;
+      } else if (historyItem.type === "mcpToolCall" && options.detail === "rich") {
+        append({
+          activities: [
+            activity(historyItem.id, "tool", sequence, {
+              input: formatted(historyItem.arguments),
+              locations: [],
+              name: historyItem.tool,
+              output: formatted(historyItem.error ?? historyItem.result),
+              status: toolStatus(historyItem.status),
+              title: `${historyItem.server}/${historyItem.tool}`,
+              toolKind: "other"
+            })
+          ],
+          content: [],
+          role: "assistant",
+          text: ""
+        });
+        sequence += 1;
+      } else if (historyItem.type === "dynamicToolCall" && options.detail === "rich") {
+        append({
+          activities: [
+            activity(historyItem.id, "tool", sequence, {
+              input: formatted(historyItem.arguments),
+              locations: [],
+              name: historyItem.tool,
+              output: formatted(historyItem.contentItems),
+              status: toolStatus(historyItem.status),
+              title: historyItem.namespace == null ? historyItem.tool : `${historyItem.namespace}/${historyItem.tool}`,
+              toolKind: "other"
+            })
+          ],
+          content: [],
+          role: "assistant",
+          text: ""
+        });
+        sequence += 1;
+      } else if (historyItem.type === "plan" && options.detail === "rich") {
+        append({
+          activities: [
+            activity(historyItem.id, "plan", sequence, {
               input: "",
               locations: [],
               name: "",
-              output: output2,
+              output: historyItem.text,
               status: "completed",
-              title: "Reasoning",
+              title: "Plan",
               toolKind: ""
             })
-          );
-          sequence += 1;
-        }
-        continue;
-      } else if (type === "commandExecution" && options.detail === "rich") {
-        const command = commandExecutionSchema.parse(item);
-        const action = command.commandActions[0]?.type ?? "execute";
-        activities.push(
-          activity(command.id, "tool", sequence, {
-            input: JSON.stringify({ command: command.command, cwd: command.cwd }),
-            locations: [command.cwd],
-            name: "",
-            output: JSON.stringify({
-              formatted_output: command.aggregatedOutput ?? "",
-              ...command.exitCode == null ? {} : { exit_code: command.exitCode }
-            }),
-            status: command.status === "completed" ? "completed" : "failed",
-            title: command.command,
-            toolKind: action
-          })
-        );
+          ],
+          content: [],
+          role: "assistant",
+          text: ""
+        });
         sequence += 1;
-        continue;
-      } else {
-        continue;
-      }
-      const fitted = fitHistoryMessage(message);
-      if (fitted.message.text.length === 0 && (fitted.message.images?.length ?? 0) === 0) {
-        continue;
       }
-      truncated ||= fitted.truncated;
-      messages.push(fitted.message);
-      if (message.role === "assistant") {
-        assistantMessageIndex = messages.length - 1;
-      }
-      characters += messageSize(fitted.message);
     }
     if (options.detail === "rich" && turn.error != null) {
-      activities.push(
-        activity(`agent-error-${sequence.toString()}`, "tool", sequence, {
-          input: "",
-          locations: [],
-          name: "",
-          output: errorMessage(turn.error),
-          status: "failed",
-          title: "Agent error",
-          toolKind: "other"
-        })
-      );
-    }
-    if (options.detail === "rich" && activities.length > assignedActivityCount) {
-      const message = {
-        activities: activitySlice(),
+      append({
+        activities: [
+          activity(`agent-error-${sequence.toString()}`, "tool", sequence, {
+            input: "",
+            locations: [],
+            name: "",
+            output: errorMessage(turn.error),
+            status: "failed",
+            title: "Agent error",
+            toolKind: "other"
+          })
+        ],
         content: [],
         role: "assistant",
         text: ""
-      };
-      messages.push(message);
-      assistantMessageIndex = messages.length - 1;
-      characters += messageSize(message);
+      });
     }
     if (assistantMessageIndex !== null) {
       const assistant = messages[assistantMessageIndex];
@@ -42668,20 +42892,20 @@ function decodeHistory(thread, value, options) {
           ...assistant,
           ...outcome === void 0 ? {} : { outcome }
         };
-        const fitted = fitHistoryMessage(updated);
+        const fitted = fitHistoryMessage(updated, turnMessageCharacterLimit);
         truncated ||= fitted.truncated;
         messages[assistantMessageIndex] = fitted.message;
         characters += messageSize(fitted.message);
       }
-    } else if (activities.length > 0 || outcome !== void 0) {
+    } else if (outcome !== void 0) {
       const message = {
-        activities: activities.slice(-100),
+        activities: [],
         content: [],
         role: "assistant",
         ...outcome === void 0 ? {} : { outcome },
         text: ""
       };
-      const fitted = fitHistoryMessage(message);
+      const fitted = fitHistoryMessage(message, turnMessageCharacterLimit);
       truncated ||= fitted.truncated;
       messages.push(fitted.message);
       characters += messageSize(fitted.message);
@@ -44521,6 +44745,34 @@ function liveHistoryCoveredTurnRanges(history) {
 function historyMessageCharacters(message) {
   return message.text.length + (message.role === "assistant" ? JSON.stringify(message.activities).length + JSON.stringify(message.content).length : 0);
 }
+function boundedActiveMessages(messages, messageLimit, characterLimit) {
+  const selected = [];
+  let remainingCharacters = characterLimit;
+  for (let index = messages.length - 1; index >= 0 && selected.length < messageLimit; index -= 1) {
+    const message = messages[index];
+    if (message === void 0) {
+      break;
+    }
+    const characters = historyMessageCharacters(message);
+    if (characters <= remainingCharacters) {
+      selected.unshift(message);
+      remainingCharacters -= characters;
+      continue;
+    }
+    const structuredCharacters = characters - message.text.length;
+    if (selected.length === 0 && structuredCharacters <= remainingCharacters) {
+      const textCharacters = remainingCharacters - structuredCharacters;
+      selected.unshift({ ...message, text: textCharacters === 0 ? "" : message.text.slice(-textCharacters) });
+      remainingCharacters = 0;
+    }
+    break;
+  }
+  return {
+    characters: characterLimit - remainingCharacters,
+    messages: selected,
+    truncated: selected.length !== messages.length
+  };
+}
 function paginateAcpSessionHistory(history, sessionId, cursor, limit) {
   if (history.status === "unavailable") {
     if (cursor !== null) {
@@ -44551,30 +44803,19 @@ function paginateLiveSessionHistory(history, activeTurn, sessionId, cursor, limi
   if (activeTurn === null || cursor !== null) {
     return paginateAcpSessionHistory(history, sessionId, cursor, limit);
   }
-  const activeMessageOverhead = 4;
-  const activeStructuredCharacters = JSON.stringify(activeTurn.activities).length + JSON.stringify(activeTurn.content).length;
-  const maximumActiveTextLength = Math.max(
-    0,
-    SESSION_HISTORY_CHARACTER_LIMIT - activeTurn.prompt.length - activeStructuredCharacters - activeMessageOverhead
-  );
-  const activeText = activeTurn.text.slice(-maximumActiveTextLength);
-  const completeActiveMessages = [
-    { role: "user", text: activeTurn.prompt },
-    {
-      activities: activeTurn.activities,
-      content: activeTurn.content,
-      role: "assistant",
-      text: activeText
-    }
-  ];
   if (history.status === "unavailable") {
+    const bounded3 = boundedActiveMessages(
+      activeTurn.messages,
+      Math.max(0, limit - 1),
+      Math.max(0, SESSION_HISTORY_CHARACTER_LIMIT - activeTurn.prompt.length)
+    );
     return {
       coveredCommandIds: [],
       coveredMessageIds: [],
-      messages: completeActiveMessages,
+      messages: [{ role: "user", text: activeTurn.prompt }, ...bounded3.messages],
       nextCursor: null,
       status: "available",
-      truncated: activeTurn.truncated || activeText.length !== activeTurn.text.length
+      truncated: activeTurn.truncated || bounded3.truncated
     };
   }
   const activeUserIndex = history.coveredCommandIds.includes(activeTurn.commandId) ? history.messages.findLastIndex((message) => message.role === "user") : -1;
@@ -44589,9 +44830,18 @@ function paginateLiveSessionHistory(history, activeTurn, sessionId, cursor, limi
     };
   }
   const latestNativeMessage = history.messages.at(-1);
-  const activeMessages = activeUserIndex >= 0 || latestNativeMessage?.role === "user" && latestNativeMessage.text === activeTurn.prompt ? completeActiveMessages.slice(1) : completeActiveMessages;
+  const includeActivePrompt = activeUserIndex < 0 && !(latestNativeMessage?.role === "user" && latestNativeMessage.text === activeTurn.prompt);
+  const bounded2 = boundedActiveMessages(
+    activeTurn.messages,
+    Math.max(0, limit - (includeActivePrompt ? 1 : 0)),
+    Math.max(0, SESSION_HISTORY_CHARACTER_LIMIT - (includeActivePrompt ? activeTurn.prompt.length : 0))
+  );
+  const activeMessages = [
+    ...includeActivePrompt ? [{ role: "user", text: activeTurn.prompt }] : [],
+    ...bounded2.messages
+  ];
   let historicalMessageCount = 0;
-  let remainingCharacters = SESSION_HISTORY_CHARACTER_LIMIT - activeText.length - activeMessageOverhead - activeStructuredCharacters - (activeMessages.length === completeActiveMessages.length ? activeTurn.prompt.length : 0);
+  let remainingCharacters = SESSION_HISTORY_CHARACTER_LIMIT - bounded2.characters - (includeActivePrompt ? activeTurn.prompt.length : 0);
   const historicalMessageLimit = Math.max(0, limit - activeMessages.length);
   for (let index = history.messages.length - 1; index >= 0 && historicalMessageCount < historicalMessageLimit; index -= 1) {
     const message = history.messages[index];
@@ -44616,7 +44866,7 @@ function paginateLiveSessionHistory(history, activeTurn, sessionId, cursor, limi
   return {
     ...page,
     messages: [...page.messages, ...activeMessages],
-    truncated: page.truncated || activeTurn.truncated || activeText.length !== activeTurn.text.length
+    truncated: page.truncated || activeTurn.truncated || bounded2.truncated
   };
 }
 function mergeLiveSessionHistory(history, activeTurn, sessionId) {
@@ -44926,167 +45176,113 @@ function warnIgnoredSetting(audit, event, commandId, sessionId, agentId, selecti
 `);
 }
 
-// src/relay-connection/coalescing-activity-publisher.ts
-var AGENT_ACTIVITY_COALESCING_MILLISECONDS = 100;
-var CoalescingDaemonActivityPublisher = class {
-  #pending = /* @__PURE__ */ new Map();
+// src/relay-connection/coalescing-agent-event-publisher.ts
+var AGENT_EVENT_COALESCING_MILLISECONDS = 100;
+var AGENT_EVENT_TEXT_MAXIMUM_LENGTH = 1e5;
+var CoalescingAgentEventPublisher = class {
+  #entries = [];
   #publish;
   #publishedActivityIds = /* @__PURE__ */ new Set();
-  #scheduled = /* @__PURE__ */ new Map();
+  #scheduled = null;
   #timer;
   constructor(timer, publish) {
     this.#publish = publish;
     this.#timer = timer;
   }
-  flush = () => {
-    const activities = [...this.#pending.values()].sort((left, right) => left.sequence - right.sequence);
-    for (const task of this.#scheduled.values()) {
-      task.cancel();
-    }
-    this.#pending.clear();
-    this.#scheduled.clear();
-    for (const activity2 of activities) {
-      this.#publish(activity2);
-    }
-  };
-  record = (activity2) => {
-    if (activity2.status !== "pending" && activity2.status !== "running") {
-      this.#discardPending(activity2.activityId);
-      this.#publishedActivityIds.add(activity2.activityId);
-      this.#publish(activity2);
-      return Promise.resolve();
-    }
-    if (!this.#publishedActivityIds.has(activity2.activityId)) {
-      this.#publishedActivityIds.add(activity2.activityId);
-      this.#publish(activity2);
-      return Promise.resolve();
-    }
-    this.#pending.set(activity2.activityId, activity2);
-    if (!this.#scheduled.has(activity2.activityId)) {
-      this.#scheduled.set(
-        activity2.activityId,
-        this.#timer.schedule(
-          () => this.#flushActivity(activity2.activityId),
-          AGENT_ACTIVITY_COALESCING_MILLISECONDS
-        )
-      );
-    }
-    return Promise.resolve();
-  };
-  #discardPending = (activityId) => {
-    this.#scheduled.get(activityId)?.cancel();
-    this.#scheduled.delete(activityId);
-    this.#pending.delete(activityId);
-  };
-  #flushActivity = (activityId) => {
-    const activity2 = this.#pending.get(activityId);
-    this.#discardPending(activityId);
-    if (activity2 !== void 0) {
-      this.#publish(activity2);
-    }
-  };
-};
-
-// src/relay-connection/coalescing-narration-publisher.ts
-var CoalescingNarrationPublisher = class {
-  #coalescingMilliseconds;
-  #maximumTextLength;
-  #publish;
-  #timer;
-  #pending = /* @__PURE__ */ new Map();
-  #scheduled = null;
-  constructor(timer, publish, coalescingMilliseconds, maximumTextLength) {
-    this.#publish = publish;
-    this.#timer = timer;
-    this.#coalescingMilliseconds = coalescingMilliseconds;
-    this.#maximumTextLength = maximumTextLength;
-  }
-  /** Emit every buffered increment now, cancelling the pending flush. */
   flush = () => {
     this.#scheduled?.cancel();
     this.#scheduled = null;
-    const increments = [...this.#pending.entries()].map(
-      ([activityId, pending]) => ({
-        activityId,
-        activityType: pending.activityType,
-        sequence: pending.sequence,
-        text: pending.text
-      })
-    );
-    this.#pending.clear();
-    for (const increment of increments) {
-      this.#publish(increment);
+    const entries = this.#entries;
+    this.#entries = [];
+    for (const entry of entries) {
+      this.#publish(entry);
     }
   };
-  /**
-   * Buffer an increment, emitting the buffered text when it would exceed the
-   * protocol's per-event text limit so no event is rejected by the codec.
-   */
-  record = (increment) => {
-    if (increment.text.length === 0) {
-      return;
-    }
-    const previous = this.#pending.get(increment.activityId);
-    if (previous !== void 0 && previous.text.length + increment.text.length > this.#maximumTextLength) {
+  recordActivity = (activity2) => {
+    const latest = this.#entries.at(-1);
+    this.#entries = latest?.kind === "activity" && latest.activity.activityId === activity2.activityId ? [...this.#entries.slice(0, -1), { activity: activity2, kind: "activity" }] : [...this.#entries, { activity: activity2, kind: "activity" }];
+    const first = !this.#publishedActivityIds.has(activity2.activityId);
+    this.#publishedActivityIds.add(activity2.activityId);
+    if (first || activity2.status !== "pending" && activity2.status !== "running") {
       this.flush();
+    } else {
+      this.schedule();
     }
-    const current = this.#pending.get(increment.activityId);
-    this.#pending.set(increment.activityId, {
-      activityType: increment.activityType,
-      sequence: increment.sequence,
-      text: `${current?.text ?? ""}${increment.text}`
-    });
-    this.#scheduled ??= this.#timer.schedule(this.flush, this.#coalescingMilliseconds);
+    return Promise.resolve();
   };
-};
-
-// src/relay-connection/coalescing-text-publisher.ts
-var CoalescingTextPublisher = class {
-  #coalescingMilliseconds;
-  #maximumTextLength;
-  #publish;
-  #timer;
-  #messageId = "";
-  #scheduled = null;
-  #text = "";
-  constructor(timer, publish, coalescingMilliseconds, maximumTextLength) {
-    this.#publish = publish;
-    this.#timer = timer;
-    this.#coalescingMilliseconds = coalescingMilliseconds;
-    this.#maximumTextLength = maximumTextLength;
-  }
-  /** Emit any buffered text now, cancelling the pending flush. */
-  flush = () => {
-    this.#scheduled?.cancel();
-    this.#scheduled = null;
-    const messageId = this.#messageId;
-    const text2 = this.#text;
-    this.#messageId = "";
-    this.#text = "";
-    if (text2.length > 0) {
-      this.#publish(messageId, text2);
+  recordNarration = (increment) => {
+    if (increment.text.length === 0) {
+      return Promise.resolve();
     }
+    let remaining = increment.text;
+    while (remaining.length > 0) {
+      const latest = this.#entries.at(-1);
+      if (latest?.kind === "narration" && latest.increment.activityId === increment.activityId) {
+        const available = AGENT_EVENT_TEXT_MAXIMUM_LENGTH - latest.increment.text.length;
+        if (available > 0) {
+          this.#entries = [
+            ...this.#entries.slice(0, -1),
+            {
+              increment: {
+                ...increment,
+                text: `${latest.increment.text}${remaining.slice(0, available)}`
+              },
+              kind: "narration"
+            }
+          ];
+          remaining = remaining.slice(available);
+          continue;
+        }
+      }
+      this.#entries = [
+        ...this.#entries,
+        {
+          increment: { ...increment, text: remaining.slice(0, AGENT_EVENT_TEXT_MAXIMUM_LENGTH) },
+          kind: "narration"
+        }
+      ];
+      remaining = remaining.slice(AGENT_EVENT_TEXT_MAXIMUM_LENGTH);
+    }
+    this.schedule();
+    return Promise.resolve();
   };
-  /**
-   * Buffer a chunk, emitting the buffered text when the message changes or the
-   * buffer would exceed the protocol's per-event text limit.
-   */
-  record = (messageId, text2) => {
+  recordText = (text2, messageId) => {
     if (text2.length === 0) {
-      return;
+      return Promise.resolve();
     }
-    if (this.#text.length > 0 && (this.#messageId !== messageId || this.#text.length + text2.length > this.#maximumTextLength)) {
-      this.flush();
+    let remaining = text2;
+    while (remaining.length > 0) {
+      const latest = this.#entries.at(-1);
+      if (latest?.kind === "text" && latest.messageId === messageId) {
+        const available = AGENT_EVENT_TEXT_MAXIMUM_LENGTH - latest.text.length;
+        if (available > 0) {
+          this.#entries = [
+            ...this.#entries.slice(0, -1),
+            { ...latest, text: `${latest.text}${remaining.slice(0, available)}` }
+          ];
+          remaining = remaining.slice(available);
+          continue;
+        }
+      }
+      this.#entries = [
+        ...this.#entries,
+        {
+          kind: "text",
+          messageId,
+          text: remaining.slice(0, AGENT_EVENT_TEXT_MAXIMUM_LENGTH)
+        }
+      ];
+      remaining = remaining.slice(AGENT_EVENT_TEXT_MAXIMUM_LENGTH);
     }
-    this.#messageId = messageId;
-    this.#text = `${this.#text}${text2}`;
-    this.#scheduled ??= this.#timer.schedule(this.flush, this.#coalescingMilliseconds);
+    this.schedule();
+    return Promise.resolve();
   };
+  schedule() {
+    this.#scheduled ??= this.#timer.schedule(this.flush, AGENT_EVENT_COALESCING_MILLISECONDS);
+  }
 };
 
 // src/daemon-prompt-executor.ts
-var AGENT_TEXT_COALESCING_MILLISECONDS = 100;
-var AGENT_TEXT_MAXIMUM_LENGTH = 1e5;
 function daemonActivity(command, activity2) {
   return {
     activityId: activity2.activityId,
@@ -45122,41 +45318,30 @@ async function executePrompt({
   recordLiveEvent,
   cancellationRequested
 }) {
-  const narration = new CoalescingNarrationPublisher(
-    timer,
-    (increment) => {
-      const event = {
-        activityId: increment.activityId,
-        activityType: increment.activityType,
+  const events = new CoalescingAgentEventPublisher(timer, (event) => {
+    if (event.kind === "text") {
+      publisher.publish(
+        command.sessionId,
+        recordLiveEvent({ kind: AGENT_MESSAGE_DELTA_KIND, messageId: event.messageId, text: event.text })
+      );
+      return;
+    }
+    if (event.kind === "narration") {
+      const recorded = {
+        activityId: event.increment.activityId,
+        activityType: event.increment.activityType,
         commandId: command.commandId,
         kind: AGENT_ACTIVITY_NARRATION_KIND,
-        sequence: increment.sequence,
+        sequence: event.increment.sequence,
         sessionId: command.sessionId,
-        text: increment.text
+        text: event.increment.text
       };
-      publisher.publish(command.sessionId, recordLiveEvent(event));
-    },
-    AGENT_ACTIVITY_COALESCING_MILLISECONDS,
-    AGENT_TEXT_MAXIMUM_LENGTH
-  );
-  const activities = new CoalescingDaemonActivityPublisher(timer, (activity2) => {
-    if (activity2.status !== "pending" && activity2.status !== "running") {
-      narration.flush();
+      publisher.publish(command.sessionId, recordLiveEvent(recorded));
+      return;
     }
-    const event = daemonActivity(command, activity2);
-    publisher.publish(command.sessionId, recordLiveEvent(event));
+    const activity2 = daemonActivity(command, event.activity);
+    publisher.publish(command.sessionId, recordLiveEvent(activity2));
   });
-  const text2 = new CoalescingTextPublisher(
-    timer,
-    (messageId, delta) => {
-      publisher.publish(
-        command.sessionId,
-        recordLiveEvent({ kind: AGENT_MESSAGE_DELTA_KIND, messageId, text: delta })
-      );
-    },
-    AGENT_TEXT_COALESCING_MILLISECONDS,
-    AGENT_TEXT_MAXIMUM_LENGTH
-  );
   try {
     const resolved = await resolveSessionDirectories(
       directories,
@@ -45245,15 +45430,9 @@ async function executePrompt({
         cwd: resolved.cwd,
         disposition: availability.disposition,
         images: attachments.images,
-        onActivity: activities.record,
-        onNarration: (increment) => {
-          narration.record(increment);
-          return Promise.resolve();
-        },
-        onText: (delta, messageId) => {
-          text2.record(messageId, delta);
-          return Promise.resolve();
-        },
+        onActivity: events.recordActivity,
+        onNarration: events.recordNarration,
+        onText: events.recordText,
         prompt: command.prompt,
         resources: attachments.resources,
         sessionId: command.sessionId,
@@ -45262,9 +45441,7 @@ async function executePrompt({
       });
       stopReason = result.stopReason;
     }
-    text2.flush();
-    narration.flush();
-    activities.flush();
+    events.flush();
     publisher.publish(command.sessionId, {
       commandId: command.commandId,
       kind: SESSION_COMPLETED_KIND,
@@ -45278,9 +45455,7 @@ async function executePrompt({
       sessionId: command.sessionId
     });
   } catch (error62) {
-    text2.flush();
-    narration.flush();
-    activities.flush();
+    events.flush();
     if (signal.aborted && cancellationRequested()) {
       publisher.publish(command.sessionId, {
         commandId: command.commandId,