@moxt-ai/mobius 0.0.320 → 0.0.322

package/dist/runtime.js

@@ -1176,9 +1176,7 @@ var createAcpClient = (handler) => client({ name: "mobius" }).onRequest(
 ).onRequest(
   methods.client.elicitation.create,
   async (context) => await handler.onElicitation(context.params, context.signal)
-).onNotification(methods.client.session.update, async (context) => {
-  await handler.onUpdate(context.params);
-}).onNotification(methods.client.elicitation.complete, async (context) => {
+).onNotification(methods.client.elicitation.complete, async (context) => {
   await handler.onElicitationComplete(context.params);
 });
 
@@ -26048,13 +26046,9 @@ var CodexOwnedAcpAgent = class {
   };
   /** Pushes the current settings so a mode change Codex applied reaches the Run settings panel. */
   #emitConfigOptionsUpdate = async () => {
-    const connection = this.#context.connection();
-    if (connection === null || this.#context.threadId().length === 0) {
-      return;
-    }
-    await connection.client.notify(methods6.client.session.update, {
-      sessionId: this.#context.threadId(),
-      update: { configOptions: this.#settings.configOptions(), sessionUpdate: "config_option_update" }
+    await this.#context.emit({
+      configOptions: this.#settings.configOptions(),
+      sessionUpdate: "config_option_update"
     });
   };
   // Notifications are serialized so two app-server items cannot interleave into one ACP update
@@ -32281,7 +32275,7 @@ import { fetch as fetch3 } from "undici";
 // package.json
 var package_default = {
   name: "@moxt-ai/mobius",
-  version: "0.0.320",
+  version: "0.0.322",
   description: "Mobius CLI for pairing and running local AI agent services.",
   type: "module",
   bin: {
@@ -32458,7 +32452,7 @@ function spawnClaudeWithParentLifeline(options) {
 
 // src/acp/harness/claude/upstream/dist/acp-agent.js
 import { execFile as execFile3 } from "node:child_process";
-import { randomUUID as randomUUID5 } from "node:crypto";
+import { randomUUID as randomUUID6 } from "node:crypto";
 import { existsSync as existsSync3 } from "node:fs";
 import * as fs3 from "node:fs/promises";
 import * as os3 from "node:os";
@@ -71591,6 +71585,7 @@ var SettingsManager = class {
 };
 
 // src/acp/harness/claude/upstream/dist/session-mode.js
+import { randomUUID as randomUUID5 } from "node:crypto";
 import { RequestError as RequestError3 } from "@agentclientprotocol/sdk";
 var MODE_CONFIG_ID = "mode";
 var AUTO_MODE_FALLBACK = "acceptEdits";
@@ -71714,11 +71709,13 @@ var SessionModeManager = class {
       return;
     }
     session.autoModeFallbackWarningShown = true;
+    const messageId = randomUUID5();
     try {
       await this.options.sessionUpdate({
         sessionId,
         update: {
           sessionUpdate: "agent_message_chunk",
+          messageId,
           content: { type: "text", text: AUTO_MODE_FALLBACK_NOTICE }
         }
       });
@@ -72151,7 +72148,7 @@ async function authenticateMcpServer(host, sessionId, query, serverName) {
   if (!login.authUrl) {
     throw new Error("Claude Code requested user action without returning an authorization URL");
   }
-  const elicitationId = `mcp-oauth-${randomUUID5()}`;
+  const elicitationId = `mcp-oauth-${randomUUID6()}`;
   const flowAbort = new AbortController();
   const abortFlow = () => flowAbort.abort(session.abortController.signal.reason);
   session.abortController.signal.addEventListener("abort", abortFlow, { once: true });
@@ -72625,7 +72622,7 @@ var ClaudeAcpAgent = class {
       await this.publishTaskPlan(params.sessionId, session.taskState);
     }
     const userMessage = promptToClaude(params);
-    const promptUuid = randomUUID5();
+    const promptUuid = randomUUID6();
     userMessage.uuid = promptUuid;
     const firstText = params.prompt[0]?.type === "text" ? params.prompt[0].text : "";
     const isLocalOnlyCommand = firstText.startsWith("/") && LOCAL_ONLY_COMMANDS.has(firstText.split(" ", 1)[0]);
@@ -72777,7 +72774,7 @@ var ClaudeAcpAgent = class {
       prompt: params.prompt
     };
     const userMessage = promptToClaude(promptRequest);
-    const steeredUuid = randomUUID5();
+    const steeredUuid = randomUUID6();
     userMessage.uuid = steeredUuid;
     userMessage.priority = (session.pendingUserInputCount ?? 0) > 0 ? STEER_PRIORITY_LATER : STEER_PRIORITY_NOW;
     turnInFlight.steeredEchoes ??= /* @__PURE__ */ new Set();
@@ -73170,7 +73167,7 @@ var ClaudeAcpAgent = class {
               case "status": {
                 if (message.status === "compacting") {
                   if (compaction === null) {
-                    compaction = { id: randomUUID5() };
+                    compaction = { id: randomUUID6() };
                     await sendUpdate({
                       sessionId: message.session_id,
                       update: {
@@ -73227,6 +73224,7 @@ var ClaudeAcpAgent = class {
                   sessionId: message.session_id,
                   update: {
                     sessionUpdate: "agent_message_chunk",
+                    messageId: message.uuid,
                     content: { type: "text", text: message.content }
                   }
                 });
@@ -73343,6 +73341,7 @@ var ClaudeAcpAgent = class {
                   sessionId: message.session_id,
                   update: {
                     sessionUpdate: "agent_message_chunk",
+                    messageId: message.uuid,
                     content: { type: "text", text: text2 }
                   }
                 });
@@ -73440,6 +73439,7 @@ ${message.api_refusal_explanation}` : "";
                   sessionId: message.session_id,
                   update: {
                     sessionUpdate: "agent_message_chunk",
+                    messageId: message.uuid,
                     content: {
                       type: "text",
                       text: `**Model fallback:** ${message.original_model} declined this request${category}; retried with ${message.fallback_model}. ${outcome}${explanation}`
@@ -73591,6 +73591,7 @@ ${message.api_refusal_explanation}` : "";
                     sessionId: params.sessionId,
                     update: {
                       sessionUpdate: "agent_message_chunk",
+                      messageId: message.uuid,
                       content: { type: "text", text: lastRefusalExplanation }
                     }
                   });
@@ -73614,7 +73615,7 @@ ${message.api_refusal_explanation}` : "";
                     break;
                   }
                   if (session.activeTurn?.isLocalOnlyCommand || !deliveredAssistantText && (message.usage.output_tokens ?? 0) === 0) {
-                    for (const notification of toAcpNotifications(message.result, "assistant", params.sessionId, session.toolUseCache, this.client, this.logger)) {
+                    for (const notification of toAcpNotifications(message.result, "assistant", params.sessionId, session.toolUseCache, this.client, this.logger, { messageId: message.uuid })) {
                       await sendUpdate(notification);
                     }
                   }
@@ -73734,6 +73735,12 @@ ${message.api_refusal_explanation}` : "";
                 });
               }
             }
+            if (currentStreamMessageId === void 0) {
+              if (message.event.type !== "content_block_start" && message.event.type !== "content_block_delta") {
+                break;
+              }
+              throw RequestError4.internalError({ code: "invalid_message_boundary" });
+            }
             for (const notification of streamEventToAcpNotifications(message, params.sessionId, session.toolUseCache, this.client, this.logger, {
               clientCapabilities: this.clientCapabilities,
               cwd: session.cwd,
@@ -73764,10 +73771,14 @@ ${message.api_refusal_explanation}` : "";
             if (message.parent_tool_use_id !== null && !(session.forwardSubagentText || supportsSubagentTranscript(this.clientCapabilities))) {
               break;
             }
-            const mappedMessageId = messageIdForGrouping(message);
-            if (mappedMessageId && typeof message.uuid === "string" && message.uuid.length > 0) {
-              session.messageIdToUuid.set(mappedMessageId, message.uuid);
+            if (message.uuid === void 0) {
+              throw RequestError4.internalError({ code: "invalid_source_message" });
             }
+            const mappedMessageId = messageIdForGrouping({
+              type: message.type,
+              uuid: message.uuid,
+              message: message.message
+            });
             if (message.type === "user" && "uuid" in message && message.uuid) {
               if (session.pendingGoalUpdate?.commandUuid === message.uuid) {
                 session.pendingGoalUpdate.started = true;
@@ -73834,7 +73845,7 @@ ${message.api_refusal_explanation}` : "";
                   parentToolUseId: message.parent_tool_use_id,
                   cwd: session.cwd,
                   taskState: session.taskState,
-                  messageId: messageIdForGrouping(message)
+                  messageId: mappedMessageId
                 })) {
                   await sendUpdate(notification);
                 }
@@ -73900,7 +73911,7 @@ ${message.api_refusal_explanation}` : "";
               cwd: session.cwd,
               taskState: session.taskState,
               emittedToolCalls: session.emittedToolCalls,
-              messageId: messageIdForGrouping(message),
+              messageId: mappedMessageId,
               toolUseResult: message.type === "user" ? message.tool_use_result : void 0,
               // On the wire since CLI 2.1.216 but not in SDKUserMessage's
               // type, hence the cast. Validated by parseToolResultMeta.
@@ -74249,10 +74260,6 @@ ${message.api_refusal_explanation}` : "";
         }
       }
       const replayMessageId = messageIdForGrouping(message);
-      const replaySession = this.sessions[sessionId];
-      if (replaySession && replayMessageId && message.uuid) {
-        replaySession.messageIdToUuid.set(replayMessageId, message.uuid);
-      }
       const parentToolUseId = parentToolUseIdOf(message);
       if (parentToolUseId !== null && !forwardSubagentText) {
         continue;
@@ -74726,10 +74733,12 @@ ${message.api_refusal_explanation}` : "";
     session.fastModeDisabledReason = nextReason;
     this.refreshFastModeOption(session, enabled);
     if (explain) {
+      const messageId = randomUUID6();
       await this.client.sessionUpdate({
         sessionId,
         update: {
           sessionUpdate: "agent_message_chunk",
+          messageId,
           content: {
             type: "text",
             text: `**Fast mode turned off:** ${FAST_MODE_UNAVAILABLE_EXPLANATIONS[nextReason]}.`
@@ -74800,7 +74809,7 @@ ${message.api_refusal_explanation}` : "";
     } else if (creationOpts.resume) {
       sessionId = creationOpts.resume;
     } else {
-      sessionId = randomUUID5();
+      sessionId = randomUUID6();
     }
     const input2 = new Pushable();
     const settingsManager = new SettingsManager(params.cwd, {
@@ -74998,7 +75007,7 @@ ${message.api_refusal_explanation}` : "";
       ...acpAdditionalDirectories
     ];
     if (creationOpts?.resume === void 0) {
-      options.sessionId = creationOpts.publicSessionId ? randomUUID5() : sessionId;
+      options.sessionId = creationOpts.publicSessionId ? randomUUID6() : sessionId;
     }
     if (abortController?.signal.aborted) {
       throw new Error("Cancelled");
@@ -75093,8 +75102,7 @@ ${message.api_refusal_explanation}` : "";
       emittedToolCalls: /* @__PURE__ */ new Set(),
       liveBackgroundTasks: /* @__PURE__ */ new Map(),
       emittedAssistantText: false,
-      idleBoundary: { kind: "unaccounted" },
-      messageIdToUuid: /* @__PURE__ */ new Map()
+      idleBoundary: { kind: "unaccounted" }
     };
     return {
       sessionId,
@@ -75843,17 +75851,12 @@ ${chunk.resource.text}
 function messageIdForGrouping(message) {
   if (message.type === "assistant") {
     const inner = message.message;
-    const apiId = inner && typeof inner === "object" && "id" in inner ? inner.id : void 0;
+    const apiId = inner !== null && typeof inner === "object" ? Reflect.get(inner, "id") : void 0;
     if (typeof apiId === "string" && apiId.length > 0) {
       return apiId;
     }
   }
-  return typeof message.uuid === "string" && message.uuid.length > 0 ? message.uuid : void 0;
-}
-function applyMessageId(update, messageId) {
-  if (messageId && (update.sessionUpdate === "agent_message_chunk" || update.sessionUpdate === "user_message_chunk" || update.sessionUpdate === "agent_thought_chunk")) {
-    update.messageId = messageId;
-  }
+  return message.uuid;
 }
 function isTaskTool(toolName) {
   return toolName === "TaskCreate" || toolName === "TaskUpdate" || toolName === "TaskList" || toolName === "TaskGet";
@@ -75945,14 +75948,15 @@ function toAcpNotifications(content, role, sessionId, toolUseCache, client2, log
     if (content.length === 0) {
       return [];
     }
+    const messageId = options.messageId;
     const update = {
       sessionUpdate: role === "assistant" ? "agent_message_chunk" : "user_message_chunk",
+      messageId,
       content: {
         type: "text",
         text: content
       }
     };
-    applyMessageId(update, options?.messageId);
     if (options?.parentToolUseId) {
       update._meta = {
         ...update._meta,
@@ -75973,8 +75977,10 @@ function toAcpNotifications(content, role, sessionId, toolUseCache, client2, log
       case "text":
       case "text_delta": {
         if (chunk.text) {
+          const messageId = options.messageId;
           update = {
             sessionUpdate: role === "assistant" ? "agent_message_chunk" : "user_message_chunk",
+            messageId,
             content: {
               type: "text",
               text: chunk.text
@@ -75983,9 +75989,11 @@ function toAcpNotifications(content, role, sessionId, toolUseCache, client2, log
         }
         break;
       }
-      case "image":
+      case "image": {
+        const messageId = options.messageId;
         update = {
           sessionUpdate: role === "assistant" ? "agent_message_chunk" : "user_message_chunk",
+          messageId,
           content: {
             type: "image",
             data: chunk.source.type === "base64" ? chunk.source.data : "",
@@ -75994,11 +76002,14 @@ function toAcpNotifications(content, role, sessionId, toolUseCache, client2, log
           }
         };
         break;
+      }
       case "thinking":
       case "thinking_delta": {
         if (chunk.thinking) {
+          const messageId = options.messageId;
           update = {
             sessionUpdate: "agent_thought_chunk",
+            messageId,
             content: {
               type: "text",
               text: chunk.thinking
@@ -76213,7 +76224,6 @@ function toAcpNotifications(content, role, sessionId, toolUseCache, client2, log
           }
         };
       }
-      applyMessageId(update, options?.messageId);
       output2.push({ sessionId, update });
     }
   }
@@ -76293,7 +76303,6 @@ function streamEventToAcpNotifications(message, sessionId, toolUseCache, client2
             }
           };
         }
-        applyMessageId(update, options?.messageId);
         return [{ sessionId, update }];
       }
       return toAcpNotifications([event.delta], "assistant", sessionId, toolUseCache, client2, logger, forwardedOptions);
@@ -76507,7 +76516,9 @@ var ClaudeAgentConnection = class extends EndpointAgentConnection {
       command: options.command,
       cwd: options.cwd,
       environment: options.environment,
-      onSessionUpdate: options.client.onUpdate,
+      onSessionUpdate: async (notification) => {
+        await options.client.onUpdate(notification);
+      },
       onBackgroundActivity: (active) => options.onBackgroundActivity?.(active)
     });
     super(endpoint, options.client);
@@ -76584,7 +76595,7 @@ import {
 } from "@agentclientprotocol/sdk";
 
 // src/acp/harness/codex/borrowed-agent.ts
-import { randomUUID as randomUUID6 } from "node:crypto";
+import { randomUUID as randomUUID7 } from "node:crypto";
 import { setTimeout as setTimeout2 } from "node:timers/promises";
 var REQUEST_TIMEOUT = 3e4;
 var POLL_INTERVAL = 500;
@@ -76685,7 +76696,7 @@ var CodexBorrowedAcpAgent = class {
             if (!baseline && !this.#seen.has(key) && clientId !== this.#pending?.clientId && text2.length > 0) {
               await this.#emit({
                 sessionUpdate: "user_message_chunk",
-                messageId: key,
+                messageId: item.id,
                 content: { type: "text", text: text2 }
               });
             }
@@ -76703,7 +76714,7 @@ var CodexBorrowedAcpAgent = class {
             if (text2.length > 0) {
               await this.#emit({
                 sessionUpdate: item.type === "agentMessage" ? "agent_message_chunk" : "agent_thought_chunk",
-                messageId: key,
+                messageId: item.id,
                 content: { type: "text", text: text2 }
               });
             }
@@ -76743,7 +76754,7 @@ var CodexBorrowedAcpAgent = class {
     if (this.#pending !== null) {
       throw new AcpExecutionError("Another prompt is already running", {}, "session_busy");
     }
-    const pending = { clientId: randomUUID6(), completion: Promise.withResolvers() };
+    const pending = { clientId: randomUUID7(), completion: Promise.withResolvers() };
     this.#pending = pending;
     void pending.completion.promise.catch(() => {
     });
@@ -77598,7 +77609,7 @@ import { agent as createAgentApp2, methods as methods10 } from "@agentclientprot
 
 // src/acp/harness/pi/upstream/dist/acp/agent.js
 import { spawnSync } from "node:child_process";
-import { randomUUID as randomUUID8 } from "node:crypto";
+import { randomUUID as randomUUID9 } from "node:crypto";
 import { existsSync as existsSync7, readdirSync as readdirSync6, readFileSync as readFileSync8, realpathSync as realpathSync4, statSync as statSync4, unlinkSync as unlinkSync2 } from "node:fs";
 import { basename as basename5, dirname as dirname8, isAbsolute as isAbsolute13, join as join19 } from "node:path";
 import { RequestError as RequestError8 } from "@agentclientprotocol/sdk";
@@ -78507,7 +78518,7 @@ function getQuietStartup(cwd, environment = process.env) {
 }
 
 // src/acp/harness/pi/upstream/dist/acp/session.js
-import { randomUUID as randomUUID7 } from "node:crypto";
+import { randomUUID as randomUUID8 } from "node:crypto";
 import { readFileSync as readFileSync7 } from "node:fs";
 import { isAbsolute as isAbsolute12, resolve as resolvePath } from "node:path";
 import { RequestError as RequestError7 } from "@agentclientprotocol/sdk";
@@ -79195,13 +79206,13 @@ var PiAcpSession = class {
       return settled;
     }
     if (this.activeCompactionId === null) {
-      this.activeCompactionId = randomUUID7();
+      this.activeCompactionId = randomUUID8();
     }
     return this.activeCompactionId;
   }
   /** Opening half of compactionId: always returns an id. */
   openCompactionId() {
-    return this.compactionId(true) ?? randomUUID7();
+    return this.compactionId(true) ?? randomUUID8();
   }
   constructor(opts) {
     this.sessionId = opts.sessionId;
@@ -79211,7 +79222,11 @@ var PiAcpSession = class {
     this.conn = opts.conn;
     this.fileCommands = opts.fileCommands ?? [];
     this.extensionQuestions = new PiExtensionQuestions(this.sessionId, this.conn, this.proc, async (text2) => {
-      this.emit({ sessionUpdate: "agent_message_chunk", content: { type: "text", text: text2 } });
+      this.emit({
+        sessionUpdate: "agent_message_chunk",
+        messageId: randomUUID8(),
+        content: { type: "text", text: text2 }
+      });
       await this.flushEmits();
     });
     this.proc.signal.addEventListener("abort", () => {
@@ -79258,6 +79273,7 @@ var PiAcpSession = class {
     this.startupInfoSent = true;
     this.emit({
       sessionUpdate: "agent_message_chunk",
+      messageId: randomUUID8(),
       content: { type: "text", text: this.startupInfo }
     });
   }
@@ -79269,6 +79285,7 @@ var PiAcpSession = class {
         this.turnQueue.push(queued);
         this.emit({
           sessionUpdate: "agent_message_chunk",
+          messageId: randomUUID8(),
           content: {
             type: "text",
             text: `Queued message (position ${this.turnQueue.length}).`
@@ -79335,6 +79352,7 @@ var PiAcpSession = class {
       }
       this.emit({
         sessionUpdate: "agent_message_chunk",
+        messageId: randomUUID8(),
         content: { type: "text", text: "Cleared queued prompts." }
       });
       this.emit({
@@ -79407,6 +79425,7 @@ var PiAcpSession = class {
     if (next) {
       this.emit({
         sessionUpdate: "agent_message_chunk",
+        messageId: randomUUID8(),
         content: { type: "text", text: `Starting queued message. (${this.turnQueue.length} remaining)` }
       });
       this.startTurn(next);
@@ -79474,24 +79493,41 @@ var PiAcpSession = class {
       void err;
     });
   }
+  streamedMessage = {
+    kind: "idle"
+  };
   handlePiEvent(ev2) {
     const type = String(ev2.type ?? "");
     switch (type) {
+      case "message_start":
+        this.streamedMessage = { kind: "active", messageId: randomUUID8() };
+        break;
+      case "message_end":
+        this.streamedMessage = { kind: "idle" };
+        break;
       case "message_update": {
         const ame2 = ev2.assistantMessageEvent;
         if (this.turnRetryFailure !== null && (ame2?.type === "text_delta" || ame2?.type === "thinking_delta" || ame2?.type === "toolcall_start")) {
           this.turnRetryFailure = null;
         }
         if (ame2?.type === "text_delta" && typeof ame2.delta === "string") {
+          if (this.streamedMessage.kind !== "active") {
+            throw RequestError7.internalError({ code: "invalid_message_boundary" });
+          }
           this.emit({
             sessionUpdate: "agent_message_chunk",
+            messageId: this.streamedMessage.messageId,
             content: { type: "text", text: ame2.delta }
           });
           break;
         }
         if (ame2?.type === "thinking_delta" && typeof ame2.delta === "string") {
+          if (this.streamedMessage.kind !== "active") {
+            throw RequestError7.internalError({ code: "invalid_message_boundary" });
+          }
           this.emit({
             sessionUpdate: "agent_thought_chunk",
+            messageId: this.streamedMessage.messageId,
             content: { type: "text", text: ame2.delta }
           });
           break;
@@ -79698,6 +79734,7 @@ var PiAcpSession = class {
         if (ev2.method === "notify") {
           this.emit({
             sessionUpdate: "agent_message_chunk",
+            messageId: randomUUID8(),
             content: { type: "text", text: stringProp(ev2, "message") ?? "Pi notification" },
             _meta: { piAcp: { notify: { level: stringProp(ev2, "notifyType") ?? "info" } } }
           });
@@ -80193,7 +80230,7 @@ var PiAcpAgent = class {
       const args = parseCommandArgs(argsString);
       if (cmd === "compact") {
         const customInstructions = args.join(" ").trim() || void 0;
-        const compactionId = randomUUID8();
+        const compactionId = randomUUID9();
         await this.conn.sessionUpdate({
           sessionId: session.sessionId,
           update: {
@@ -80282,6 +80319,7 @@ ${JSON.stringify(stats, null, 2)}`;
           sessionId: session.sessionId,
           update: {
             sessionUpdate: "agent_message_chunk",
+            messageId: randomUUID9(),
             content: { type: "text", text: text2 }
           }
         });
@@ -80294,6 +80332,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: { type: "text", text: "Usage: /name <name>" }
             }
           });
@@ -80308,6 +80347,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: { type: "text", text: `Failed to set session name: ${msg}${hint}` }
             }
           });
@@ -80325,6 +80365,7 @@ ${JSON.stringify(stats, null, 2)}`;
           sessionId: session.sessionId,
           update: {
             sessionUpdate: "agent_message_chunk",
+            messageId: randomUUID9(),
             content: { type: "text", text: `Session name set: ${name2}` }
           }
         });
@@ -80339,6 +80380,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: {
                 type: "text",
                 text: `Steering mode: ${current || "unknown"}`
@@ -80352,6 +80394,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: {
                 type: "text",
                 text: "Usage: /steering all | /steering one-at-a-time"
@@ -80365,6 +80408,7 @@ ${JSON.stringify(stats, null, 2)}`;
           sessionId: session.sessionId,
           update: {
             sessionUpdate: "agent_message_chunk",
+            messageId: randomUUID9(),
             content: { type: "text", text: `Steering mode set to: ${modeRaw}` }
           }
         });
@@ -80379,6 +80423,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: {
                 type: "text",
                 text: `Follow-up mode: ${current || "unknown"}`
@@ -80392,6 +80437,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: {
                 type: "text",
                 text: "Usage: /follow-up all | /follow-up one-at-a-time"
@@ -80405,6 +80451,7 @@ ${JSON.stringify(stats, null, 2)}`;
           sessionId: session.sessionId,
           update: {
             sessionUpdate: "agent_message_chunk",
+            messageId: randomUUID9(),
             content: { type: "text", text: `Follow-up mode set to: ${modeRaw}` }
           }
         });
@@ -80445,6 +80492,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: { type: "text", text: "Changelog not found (couldn't locate pi installation)." }
             }
           });
@@ -80458,6 +80506,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: { type: "text", text: `Failed to read changelog: ${String(e?.message ?? e)}` }
             }
           });
@@ -80473,6 +80522,7 @@ ${JSON.stringify(stats, null, 2)}`;
           sessionId: session.sessionId,
           update: {
             sessionUpdate: "agent_message_chunk",
+            messageId: randomUUID9(),
             content: { type: "text", text: text2 }
           }
         });
@@ -80487,6 +80537,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: {
                 type: "text",
                 text: "Nothing to export yet (no session messages). Send a prompt first."
@@ -80502,6 +80553,7 @@ ${JSON.stringify(stats, null, 2)}`;
               sessionId: session.sessionId,
               update: {
                 sessionUpdate: "agent_message_chunk",
+                messageId: randomUUID9(),
                 content: {
                   type: "text",
                   text: "Nothing to export yet (empty session file). Send a prompt first."
@@ -80515,6 +80567,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: {
                 type: "text",
                 text: "Couldn't read session file for export. Try sending a prompt first."
@@ -80534,6 +80587,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: {
                 type: "text",
                 text: `Export failed: ${String(e?.message ?? e)}`
@@ -80547,6 +80601,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: {
                 type: "text",
                 text: "Export failed: no output path returned by pi."
@@ -80556,10 +80611,12 @@ ${JSON.stringify(stats, null, 2)}`;
           return { stopReason: "end_turn" };
         }
         const uri = `file://${resultPath}`;
+        const messageId = randomUUID9();
         await this.conn.sessionUpdate({
           sessionId: session.sessionId,
           update: {
             sessionUpdate: "agent_message_chunk",
+            messageId,
             content: {
               type: "text",
               text: "Session exported: "
@@ -80570,6 +80627,7 @@ ${JSON.stringify(stats, null, 2)}`;
           sessionId: session.sessionId,
           update: {
             sessionUpdate: "agent_message_chunk",
+            messageId,
             content: {
               type: "resource_link",
               name: `pi-session-${safeSessionId}.html`,
@@ -80599,6 +80657,7 @@ ${JSON.stringify(stats, null, 2)}`;
           sessionId: session.sessionId,
           update: {
             sessionUpdate: "agent_message_chunk",
+            messageId: randomUUID9(),
             content: {
               type: "text",
               text: `Auto-compaction ${enabled ? "enabled" : "disabled"}.`
@@ -80834,6 +80893,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "user_message_chunk",
+              messageId: randomUUID9(),
               content: { type: "text", text: text2 }
             }
           });
@@ -80846,6 +80906,7 @@ ${JSON.stringify(stats, null, 2)}`;
             sessionId: session.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID9(),
               content: { type: "text", text: text2 }
             }
           });
@@ -82392,11 +82453,11 @@ async function unchangedIdentity(agent, signal) {
 }
 
 // src/runtime/connection/runtime-installation-store.ts
-import { randomUUID as randomUUID10 } from "node:crypto";
+import { randomUUID as randomUUID11 } from "node:crypto";
 import { resolve as resolve15 } from "node:path";
 
 // src/storage/installation/installation-files.ts
-import { createHash as createHash5, randomUUID as randomUUID9 } from "node:crypto";
+import { createHash as createHash5, randomUUID as randomUUID10 } from "node:crypto";
 import { mkdir as mkdir4, open as open5, readdir as readdir5, rename as rename3, unlink as unlink3, writeFile } from "node:fs/promises";
 import { dirname as dirname9, join as join23 } from "node:path";
 
@@ -82458,7 +82519,7 @@ async function readInstallationFile(path7) {
 async function writeInstallationFile(path7, text2, signal) {
   signal.throwIfAborted();
   const directory = dirname9(path7);
-  const temporaryPath = join23(directory, `.${randomUUID9()}.tmp`);
+  const temporaryPath = join23(directory, `.${randomUUID10()}.tmp`);
   try {
     await mkdir4(directory, { mode: 448, recursive: true });
     signal.throwIfAborted();
@@ -82617,10 +82678,10 @@ function parseRelayOrigin(value) {
   return origin;
 }
 function connectionId() {
-  return `mcn_${randomUUID10().replaceAll("-", "")}`;
+  return `mcn_${randomUUID11().replaceAll("-", "")}`;
 }
 function installationId() {
-  return `min_${randomUUID10().replaceAll("-", "")}`;
+  return `min_${randomUUID11().replaceAll("-", "")}`;
 }
 function decodeInstallationPointer(value) {
   if (!isRecord7(value) || !hasExactKeys(value, INSTALLATION_POINTER_KEYS) || value["version"] !== 1) {
@@ -85955,22 +86016,13 @@ var SessionManager2 = class {
       throw new AcpExecutionError("The native session is being managed", {}, "session_busy");
     }
     const linked = this.#store.findNative(options2.agent.id, origin.nativeSessionId);
-    if (linked.some(
-      (entry) => this.#executions.command(entry.sessionId) !== void 0 || this.#executionProcesses.pending(entry.sessionId) !== void 0
-    )) {
-      throw new AcpExecutionError(
-        "Wait for the native session's running operation to finish",
-        {},
-        "session_busy"
-      );
-    }
     const existing = linked[0];
     if (origin.kind === "import" && existing !== void 0) {
       return await this.#executionProcesses.use(existing.sessionId, async () => {
         this.#closedSessions.delete(existing.sessionId);
         const target2 = await this.#nativeTargetOptions(options2, existing.sessionId, resolveAgent);
         const runtime = await this.ensureSession(target2);
-        if (this.#executions.command(existing.sessionId) !== void 0 || this.#nativeOperations.has(key)) {
+        if (this.#nativeOperations.has(key)) {
           throw new AcpExecutionError(
             "Wait for the native session's running operation to finish",
             {},
@@ -85989,6 +86041,15 @@ var SessionManager2 = class {
         }
       });
     }
+    if (linked.some(
+      (entry) => this.#executions.command(entry.sessionId) !== void 0 || this.#executionProcesses.pending(entry.sessionId) !== void 0
+    )) {
+      throw new AcpExecutionError(
+        "Wait for the native session's running operation to finish",
+        {},
+        "session_busy"
+      );
+    }
     const target = await this.#nativeTargetOptions(options2, options2.sessionId, resolveAgent);
     if (this.#executionProcesses.get(options2.sessionId) !== void 0 || this.#executionProcesses.pending(options2.sessionId) !== void 0 || this.#store.read(options2.sessionId) instanceof FoundStoredSession) {
       throw new AcpExecutionError(
@@ -86032,7 +86093,7 @@ var SessionManager2 = class {
 };
 
 // src/session/native/native-session-browser.ts
-import { randomUUID as randomUUID11 } from "node:crypto";
+import { randomUUID as randomUUID12 } from "node:crypto";
 
 // src/session/workspace/local-authorization-error.ts
 var LocalAuthorizationError = class extends OperationError {
@@ -86141,7 +86202,7 @@ var NativeSessionService = class {
       if (authorized === null) {
         return null;
       }
-      const entryId = decodeIdentifier(randomUUID11());
+      const entryId = decodeIdentifier(randomUUID12());
       if (this.#entries.size >= 5e3) {
         this.#entries.clear();
       }
@@ -86197,7 +86258,7 @@ var NativeSessionService = class {
             "invalid_native_session_response"
           );
         }
-        nextCursor = decodeIdentifier(randomUUID11());
+        nextCursor = decodeIdentifier(randomUUID12());
         if (this.#cursors.size >= 500) {
           this.#cursors.clear();
         }
@@ -86559,7 +86620,7 @@ async function settleAbandonedTurn(projection, operations, cancellation) {
 }
 
 // src/session/turn/execution-receipts.ts
-import { createHash as createHash6, randomUUID as randomUUID12 } from "node:crypto";
+import { createHash as createHash6, randomUUID as randomUUID13 } from "node:crypto";
 var MAX_TERMINAL_RECEIPTS = 1024;
 function isTerminal(state) {
   return state === "succeeded" || state === "failed" || state === "cancelled";
@@ -86688,7 +86749,7 @@ var ExecutionReceipts = class {
         outcome: this.#recoveredCommands.has(commandId) ? this.outcome(commandId) : void 0
       };
     }
-    const attemptId = randomUUID12();
+    const attemptId = randomUUID13();
     this.#save(commandId, {
       attemptId,
       commandHash,
@@ -86812,7 +86873,7 @@ var RuntimeTurnActivity = class {
 };
 
 // src/session/turn/active-turn.ts
-import { randomUUID as randomUUID13 } from "node:crypto";
+import { randomUUID as randomUUID14 } from "node:crypto";
 var ActiveRuntimeTurn = class {
   attemptId;
   command;
@@ -86822,7 +86883,7 @@ var ActiveRuntimeTurn = class {
   #dispatch;
   #sequence = 0;
   #interaction = null;
-  #epoch = decodeIdentifier(randomUUID13());
+  #epoch = decodeIdentifier(randomUUID14());
   constructor(command, attemptId) {
     this.attemptId = attemptId;
     this.command = command;
@@ -87379,11 +87440,11 @@ import { createHash as createHash7 } from "node:crypto";
 import { join as join27 } from "node:path";
 
 // src/storage/files/scratch-directory.ts
-import { randomUUID as randomUUID14 } from "node:crypto";
+import { randomUUID as randomUUID15 } from "node:crypto";
 import { lstat as lstat4, mkdir as mkdir5, readdir as readdir6, realpath as realpath7, rename as rename4, rm as rm3, stat as stat6, utimes, writeFile as writeFile2 } from "node:fs/promises";
 import { dirname as dirname11, join as join26 } from "node:path";
 async function atomicWrite(path7, bytes, signal) {
-  const temporary = `${path7}.${randomUUID14()}.tmp`;
+  const temporary = `${path7}.${randomUUID15()}.tmp`;
   try {
     await writeFile2(temporary, bytes, { mode: 384, signal });
     signal.throwIfAborted();
@@ -87395,7 +87456,7 @@ async function atomicWrite(path7, bytes, signal) {
 var ScratchDirectory = class {
   #root;
   constructor(parent) {
-    this.#root = join26(parent, randomUUID14());
+    this.#root = join26(parent, randomUUID15());
   }
   /** Refreshes this directory's lease and removes sibling directories whose lease is older than `leaseMilliseconds`. */
   refreshLease = async (leaseMilliseconds) => {
@@ -89395,7 +89456,7 @@ function createNativeSessionCommands(context) {
 }
 
 // src/session/prompt/apply-session-configuration.ts
-import { randomUUID as randomUUID15 } from "node:crypto";
+import { randomUUID as randomUUID16 } from "node:crypto";
 function invalidSessionConfiguration(message) {
   return new AcpExecutionError(message, {}, "invalid_session_configuration");
 }
@@ -89533,7 +89594,7 @@ async function applySessionConfigurationSelection(sessions, options, selection,
     booleanValue: selection.booleanValue,
     configId: selection.configId,
     cwd,
-    requestId: `cfg_${randomUUID15()}`,
+    requestId: `cfg_${randomUUID16()}`,
     sessionId,
     signal,
     value: selection.value,