@moxt-ai/mobius 0.0.320 → 0.0.322

package/dist/cli.js

@@ -2086,7 +2086,7 @@ var init_package = __esm({
   "package.json"() {
     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: {
@@ -5955,9 +5955,7 @@ var init_create_client = __esm({
     ).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);
     });
   }
@@ -65333,6 +65331,7 @@ var init_settings = __esm({
 });
 
 // src/acp/harness/claude/upstream/dist/session-mode.js
+import { randomUUID as randomUUID4 } from "node:crypto";
 import { RequestError as RequestError3 } from "@agentclientprotocol/sdk";
 var MODE_CONFIG_ID, AUTO_MODE_FALLBACK, AUTO_MODE_FALLBACK_NOTICE, SessionModeManager;
 var init_session_mode = __esm({
@@ -65461,11 +65460,13 @@ var init_session_mode = __esm({
           return;
         }
         session.autoModeFallbackWarningShown = true;
+        const messageId = randomUUID4();
         try {
           await this.options.sessionUpdate({
             sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId,
               content: { type: "text", text: AUTO_MODE_FALLBACK_NOTICE }
             }
           });
@@ -65557,7 +65558,7 @@ var init_session_mode = __esm({
 
 // src/acp/harness/claude/upstream/dist/acp-agent.js
 import { execFile } from "node:child_process";
-import { randomUUID as randomUUID4 } from "node:crypto";
+import { randomUUID as randomUUID5 } from "node:crypto";
 import { existsSync as existsSync3 } from "node:fs";
 import * as fs4 from "node:fs/promises";
 import * as os3 from "node:os";
@@ -65833,7 +65834,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-${randomUUID4()}`;
+  const elicitationId = `mcp-oauth-${randomUUID5()}`;
   const flowAbort = new AbortController();
   const abortFlow = () => flowAbort.abort(session.abortController.signal.reason);
   session.abortController.signal.addEventListener("abort", abortFlow, { once: true });
@@ -66579,17 +66580,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";
@@ -66680,14 +66676,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,
@@ -66708,8 +66705,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
@@ -66718,9 +66717,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 : "",
@@ -66729,11 +66730,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
@@ -66948,7 +66952,6 @@ function toAcpNotifications(content, role, sessionId, toolUseCache, client2, log
           }
         };
       }
-      applyMessageId(update, options?.messageId);
       output2.push({ sessionId, update });
     }
   }
@@ -67028,7 +67031,6 @@ function streamEventToAcpNotifications(message, sessionId, toolUseCache, client2
             }
           };
         }
-        applyMessageId(update, options?.messageId);
         return [{ sessionId, update }];
       }
       return toAcpNotifications([event.delta], "assistant", sessionId, toolUseCache, client2, logger, forwardedOptions);
@@ -67688,7 +67690,7 @@ var init_acp_agent = __esm({
           await this.publishTaskPlan(params.sessionId, session.taskState);
         }
         const userMessage = promptToClaude(params);
-        const promptUuid = randomUUID4();
+        const promptUuid = randomUUID5();
         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]);
@@ -67840,7 +67842,7 @@ var init_acp_agent = __esm({
           prompt: params.prompt
         };
         const userMessage = promptToClaude(promptRequest);
-        const steeredUuid = randomUUID4();
+        const steeredUuid = randomUUID5();
         userMessage.uuid = steeredUuid;
         userMessage.priority = (session.pendingUserInputCount ?? 0) > 0 ? STEER_PRIORITY_LATER : STEER_PRIORITY_NOW;
         turnInFlight.steeredEchoes ??= /* @__PURE__ */ new Set();
@@ -68233,7 +68235,7 @@ var init_acp_agent = __esm({
                   case "status": {
                     if (message.status === "compacting") {
                       if (compaction === null) {
-                        compaction = { id: randomUUID4() };
+                        compaction = { id: randomUUID5() };
                         await sendUpdate({
                           sessionId: message.session_id,
                           update: {
@@ -68290,6 +68292,7 @@ var init_acp_agent = __esm({
                       sessionId: message.session_id,
                       update: {
                         sessionUpdate: "agent_message_chunk",
+                        messageId: message.uuid,
                         content: { type: "text", text: message.content }
                       }
                     });
@@ -68406,6 +68409,7 @@ var init_acp_agent = __esm({
                       sessionId: message.session_id,
                       update: {
                         sessionUpdate: "agent_message_chunk",
+                        messageId: message.uuid,
                         content: { type: "text", text: text2 }
                       }
                     });
@@ -68503,6 +68507,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}`
@@ -68654,6 +68659,7 @@ ${message.api_refusal_explanation}` : "";
                         sessionId: params.sessionId,
                         update: {
                           sessionUpdate: "agent_message_chunk",
+                          messageId: message.uuid,
                           content: { type: "text", text: lastRefusalExplanation }
                         }
                       });
@@ -68677,7 +68683,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);
                         }
                       }
@@ -68797,6 +68803,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,
@@ -68827,10 +68839,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;
@@ -68897,7 +68913,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);
                     }
@@ -68963,7 +68979,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.
@@ -69312,10 +69328,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;
@@ -69789,10 +69801,12 @@ ${message.api_refusal_explanation}` : "";
         session.fastModeDisabledReason = nextReason;
         this.refreshFastModeOption(session, enabled);
         if (explain) {
+          const messageId = randomUUID5();
           await this.client.sessionUpdate({
             sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
+              messageId,
               content: {
                 type: "text",
                 text: `**Fast mode turned off:** ${FAST_MODE_UNAVAILABLE_EXPLANATIONS[nextReason]}.`
@@ -69863,7 +69877,7 @@ ${message.api_refusal_explanation}` : "";
         } else if (creationOpts.resume) {
           sessionId = creationOpts.resume;
         } else {
-          sessionId = randomUUID4();
+          sessionId = randomUUID5();
         }
         const input2 = new Pushable();
         const settingsManager = new SettingsManager(params.cwd, {
@@ -70061,7 +70075,7 @@ ${message.api_refusal_explanation}` : "";
           ...acpAdditionalDirectories
         ];
         if (creationOpts?.resume === void 0) {
-          options.sessionId = creationOpts.publicSessionId ? randomUUID4() : sessionId;
+          options.sessionId = creationOpts.publicSessionId ? randomUUID5() : sessionId;
         }
         if (abortController?.signal.aborted) {
           throw new Error("Cancelled");
@@ -70156,8 +70170,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,
@@ -70316,7 +70329,9 @@ var init_agent_connection = __esm({
           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);
@@ -72130,7 +72145,7 @@ var init_items = __esm({
 });
 
 // src/acp/harness/codex/borrowed-agent.ts
-import { randomUUID as randomUUID5 } from "node:crypto";
+import { randomUUID as randomUUID6 } from "node:crypto";
 import { setTimeout as setTimeout2 } from "node:timers/promises";
 var REQUEST_TIMEOUT, POLL_INTERVAL, queueResponseSchema, queuePageSchema, CodexBorrowedAcpAgent;
 var init_borrowed_agent = __esm({
@@ -72240,7 +72255,7 @@ var init_borrowed_agent = __esm({
                 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 }
                   });
                 }
@@ -72258,7 +72273,7 @@ var init_borrowed_agent = __esm({
                 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 }
                   });
                 }
@@ -72298,7 +72313,7 @@ var init_borrowed_agent = __esm({
         if (this.#pending !== null) {
           throw new AcpExecutionError("Another prompt is already running", {}, "session_busy");
         }
-        const pending = { clientId: randomUUID5(), completion: Promise.withResolvers() };
+        const pending = { clientId: randomUUID6(), completion: Promise.withResolvers() };
         this.#pending = pending;
         void pending.completion.promise.catch(() => {
         });
@@ -72694,7 +72709,7 @@ var init_history_images = __esm({
 });
 
 // src/acp/harness/codex/owned-agent.ts
-import { randomUUID as randomUUID6 } from "node:crypto";
+import { randomUUID as randomUUID7 } from "node:crypto";
 import { setTimeout as delay } from "node:timers/promises";
 import { methods as methods3 } from "@agentclientprotocol/sdk";
 function permissionDecision(optionId) {
@@ -72924,7 +72939,7 @@ var init_owned_agent = __esm({
           signal.throwIfAborted();
           const open7 = this.#settleCompaction("failed", cause instanceof Error ? cause.message : String(cause));
           if (open7 === null && !this.#turnSettledCompaction) {
-            const compactionId = randomUUID6();
+            const compactionId = randomUUID7();
             await this.#enqueue(async () => {
               await this.#context.emit({
                 compactionId,
@@ -72946,13 +72961,9 @@ var init_owned_agent = __esm({
       };
       /** 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(methods3.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
@@ -78332,7 +78343,7 @@ var init_pi_tools = __esm({
 });
 
 // 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 isAbsolute11, resolve as resolvePath } from "node:path";
 import { RequestError as RequestError7 } from "@agentclientprotocol/sdk";
@@ -78611,13 +78622,13 @@ var init_session = __esm({
           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;
@@ -78627,7 +78638,11 @@ var init_session = __esm({
         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", () => {
@@ -78674,6 +78689,7 @@ var init_session = __esm({
         this.startupInfoSent = true;
         this.emit({
           sessionUpdate: "agent_message_chunk",
+          messageId: randomUUID8(),
           content: { type: "text", text: this.startupInfo }
         });
       }
@@ -78685,6 +78701,7 @@ var init_session = __esm({
             this.turnQueue.push(queued);
             this.emit({
               sessionUpdate: "agent_message_chunk",
+              messageId: randomUUID8(),
               content: {
                 type: "text",
                 text: `Queued message (position ${this.turnQueue.length}).`
@@ -78751,6 +78768,7 @@ var init_session = __esm({
           }
           this.emit({
             sessionUpdate: "agent_message_chunk",
+            messageId: randomUUID8(),
             content: { type: "text", text: "Cleared queued prompts." }
           });
           this.emit({
@@ -78823,6 +78841,7 @@ var init_session = __esm({
         if (next) {
           this.emit({
             sessionUpdate: "agent_message_chunk",
+            messageId: randomUUID8(),
             content: { type: "text", text: `Starting queued message. (${this.turnQueue.length} remaining)` }
           });
           this.startTurn(next);
@@ -78890,24 +78909,41 @@ var init_session = __esm({
           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;
@@ -79114,6 +79150,7 @@ var init_session = __esm({
             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" } } }
               });
@@ -79258,7 +79295,7 @@ var init_prompt = __esm({
 
 // 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 realpathSync3, statSync as statSync3, unlinkSync as unlinkSync2 } from "node:fs";
 import { basename as basename6, dirname as dirname9, isAbsolute as isAbsolute12, join as join20 } from "node:path";
 import { RequestError as RequestError8 } from "@agentclientprotocol/sdk";
@@ -79952,7 +79989,7 @@ var init_agent2 = __esm({
           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: {
@@ -80041,6 +80078,7 @@ ${JSON.stringify(stats, null, 2)}`;
               sessionId: session.sessionId,
               update: {
                 sessionUpdate: "agent_message_chunk",
+                messageId: randomUUID9(),
                 content: { type: "text", text: text2 }
               }
             });
@@ -80053,6 +80091,7 @@ ${JSON.stringify(stats, null, 2)}`;
                 sessionId: session.sessionId,
                 update: {
                   sessionUpdate: "agent_message_chunk",
+                  messageId: randomUUID9(),
                   content: { type: "text", text: "Usage: /name <name>" }
                 }
               });
@@ -80067,6 +80106,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}` }
                 }
               });
@@ -80084,6 +80124,7 @@ ${JSON.stringify(stats, null, 2)}`;
               sessionId: session.sessionId,
               update: {
                 sessionUpdate: "agent_message_chunk",
+                messageId: randomUUID9(),
                 content: { type: "text", text: `Session name set: ${name2}` }
               }
             });
@@ -80098,6 +80139,7 @@ ${JSON.stringify(stats, null, 2)}`;
                 sessionId: session.sessionId,
                 update: {
                   sessionUpdate: "agent_message_chunk",
+                  messageId: randomUUID9(),
                   content: {
                     type: "text",
                     text: `Steering mode: ${current || "unknown"}`
@@ -80111,6 +80153,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"
@@ -80124,6 +80167,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}` }
               }
             });
@@ -80138,6 +80182,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"}`
@@ -80151,6 +80196,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"
@@ -80164,6 +80210,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}` }
               }
             });
@@ -80204,6 +80251,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)." }
                 }
               });
@@ -80217,6 +80265,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)}` }
                 }
               });
@@ -80232,6 +80281,7 @@ ${JSON.stringify(stats, null, 2)}`;
               sessionId: session.sessionId,
               update: {
                 sessionUpdate: "agent_message_chunk",
+                messageId: randomUUID9(),
                 content: { type: "text", text: text2 }
               }
             });
@@ -80246,6 +80296,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."
@@ -80261,6 +80312,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."
@@ -80274,6 +80326,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."
@@ -80293,6 +80346,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)}`
@@ -80306,6 +80360,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."
@@ -80315,10 +80370,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: "
@@ -80329,6 +80386,7 @@ ${JSON.stringify(stats, null, 2)}`;
               sessionId: session.sessionId,
               update: {
                 sessionUpdate: "agent_message_chunk",
+                messageId,
                 content: {
                   type: "resource_link",
                   name: `pi-session-${safeSessionId}.html`,
@@ -80358,6 +80416,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"}.`
@@ -80593,6 +80652,7 @@ ${JSON.stringify(stats, null, 2)}`;
                 sessionId: session.sessionId,
                 update: {
                   sessionUpdate: "user_message_chunk",
+                  messageId: randomUUID9(),
                   content: { type: "text", text: text2 }
                 }
               });
@@ -80605,6 +80665,7 @@ ${JSON.stringify(stats, null, 2)}`;
                 sessionId: session.sessionId,
                 update: {
                   sessionUpdate: "agent_message_chunk",
+                  messageId: randomUUID9(),
                   content: { type: "text", text: text2 }
                 }
               });
@@ -82892,7 +82953,7 @@ var init_session_event_id_allocator = __esm({
 });
 
 // src/session/history/session-event-store.ts
-import { randomUUID as randomUUID9 } from "node:crypto";
+import { randomUUID as randomUUID10 } from "node:crypto";
 function liveEvent(sessionId, sessionGenerationId, eventId, position, event, recordedAt = (/* @__PURE__ */ new Date()).toISOString()) {
   return {
     eventId,
@@ -83049,7 +83110,7 @@ var init_session_event_store = __esm({
         this.#eventIds = eventIds;
       }
       #session = (sessionId) => {
-        const sessionGenerationId = randomUUID9();
+        const sessionGenerationId = randomUUID10();
         const session = this.#events.get(sessionId) ?? new SessionEvents(sessionGenerationId);
         this.#events.set(sessionId, session);
         return session;
@@ -83114,7 +83175,7 @@ var init_session_event_store = __esm({
         this.#events.delete(sessionId);
       };
       reset = (sessionId) => {
-        const sessionGenerationId = randomUUID9();
+        const sessionGenerationId = randomUUID10();
         this.#events.set(sessionId, new SessionEvents(sessionGenerationId));
       };
     };
@@ -83130,7 +83191,7 @@ var init_session_event_store = __esm({
         this.#cacheTable = cacheTable;
       }
       #session = (sessionId) => {
-        const sessionGenerationId = randomUUID9();
+        const sessionGenerationId = randomUUID10();
         const session = this.#sessions.get(sessionId) ?? new SessionEvents(sessionGenerationId);
         this.#sessions.set(sessionId, session);
         return session;
@@ -83256,7 +83317,7 @@ var init_session_event_store = __esm({
       reset = (sessionId) => {
         const previous = this.#sessions.get(sessionId);
         this.#deletePersisted(sessionId, previous?.sessionGenerationId);
-        const sessionGenerationId = randomUUID9();
+        const sessionGenerationId = randomUUID10();
         this.#sessions.set(sessionId, new SessionEvents(sessionGenerationId));
       };
       materializedEventCount = (sessionId) => this.#sessions.get(sessionId)?.materializedCount ?? 0;
@@ -90594,7 +90655,7 @@ var init_runtime_connection = __esm({
 });
 
 // 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";
 function isRecord7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -90657,10 +90718,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) {
@@ -91055,7 +91116,7 @@ var init_runtime_installation_store = __esm({
 });
 
 // src/storage/daemon/version-data.ts
-import { randomUUID as randomUUID11 } from "node:crypto";
+import { randomUUID as randomUUID12 } from "node:crypto";
 import { cp as cp2, lstat as lstat4, mkdtemp, readFile as readFile7, rename as rename4, rm as rm3, writeFile as writeFile2 } from "node:fs/promises";
 import { join as join25, relative as relative2, sep as sep5 } from "node:path";
 async function readCurrentDataVersion(root, signal) {
@@ -91129,10 +91190,26 @@ async function copyVersionData(root, sourceVersion, targetVersion, signal) {
     await rm3(staging, { recursive: true, force: true });
   }
 }
+async function discardVersionData(root, version2, signal) {
+  if (await readCurrentDataVersion(root, signal) === version2 || !await versionDataExists(root, version2, signal)) {
+    return;
+  }
+  const versions = join25(root, STATE_ROOT_LAYOUT.versions);
+  const discarded = join25(versions, `.${version2}-discarded-${randomUUID12()}`);
+  try {
+    await rename4(join25(versions, version2), discarded);
+  } catch (cause) {
+    if (isNodeError(cause, "ENOENT")) {
+      return;
+    }
+    throw cause;
+  }
+  await rm3(discarded, { recursive: true, force: true });
+}
 async function writeCurrentDataVersion(root, version2, signal) {
   await validateLocalPath(root, true, true, signal);
   await validateLocalPath(join25(root, STATE_ROOT_LAYOUT.versions, version2), true, true, signal);
-  const temporary = join25(root, `.current-data-${randomUUID11()}.txt`);
+  const temporary = join25(root, `.current-data-${randomUUID12()}.txt`);
   try {
     await writeFile2(temporary, `versions/${version2}
 `, { mode: 384, flag: "wx", signal });
@@ -91369,6 +91446,9 @@ async function prepareVersionData(version2, signal, environment = process.env, f
     );
   }
 }
+async function discardRolledBackData(version2, signal) {
+  await discardVersionData(readStateDirectory(), runtimeUpgradeVersionSchema.parse(version2), signal);
+}
 async function recordCurrentData(version2, signal) {
   await writeCurrentDataVersion(readStateDirectory(), runtimeUpgradeVersionSchema.parse(version2), signal);
 }
@@ -92624,6 +92704,7 @@ async function runManager(stateDirectory, signal) {
         retryAfter: Date.now() + 8 * 36e5
       };
       await start(transition2.previous);
+      await discardRolledBackData(transition2.next.version, combined);
     }
   };
   const handle = async (value, requestSignal) => {
@@ -92728,6 +92809,7 @@ var init_manager = __esm({
     init_manager_lock();
     init_local_server();
     init_protocol2();
+    init_data();
     init_unhandled_rejection();
     init_worker_lifecycle_log();
     init_worker_process();
@@ -95979,22 +96061,13 @@ var init_session_manager = __esm({
           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",
                 {},
@@ -96013,6 +96086,15 @@ var init_session_manager = __esm({
             }
           });
         }
+        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(
@@ -96073,7 +96155,7 @@ var init_local_authorization_error = __esm({
 });
 
 // src/session/native/native-session-browser.ts
-import { randomUUID as randomUUID12 } from "node:crypto";
+import { randomUUID as randomUUID13 } from "node:crypto";
 function nextForkTitle(sourceTitle, sessions) {
   let highest = 0;
   for (const session of sessions) {
@@ -96181,7 +96263,7 @@ var init_native_session_browser = __esm({
           if (authorized === null) {
             return null;
           }
-          const entryId = decodeIdentifier(randomUUID12());
+          const entryId = decodeIdentifier(randomUUID13());
           if (this.#entries.size >= 5e3) {
             this.#entries.clear();
           }
@@ -96237,7 +96319,7 @@ var init_native_session_browser = __esm({
                 "invalid_native_session_response"
               );
             }
-            nextCursor = decodeIdentifier(randomUUID12());
+            nextCursor = decodeIdentifier(randomUUID13());
             if (this.#cursors.size >= 500) {
               this.#cursors.clear();
             }
@@ -96608,7 +96690,7 @@ var init_prompt_lifecycle = __esm({
 });
 
 // src/session/turn/execution-receipts.ts
-import { createHash as createHash7, randomUUID as randomUUID13 } from "node:crypto";
+import { createHash as createHash7, randomUUID as randomUUID14 } from "node:crypto";
 function isTerminal(state) {
   return state === "succeeded" || state === "failed" || state === "cancelled";
 }
@@ -96743,7 +96825,7 @@ var init_execution_receipts = __esm({
             outcome: this.#recoveredCommands.has(commandId) ? this.outcome(commandId) : void 0
           };
         }
-        const attemptId = randomUUID13();
+        const attemptId = randomUUID14();
         this.#save(commandId, {
           attemptId,
           commandHash,
@@ -96875,7 +96957,7 @@ var init_runtime_turn_activity = __esm({
 });
 
 // src/session/turn/active-turn.ts
-import { randomUUID as randomUUID14 } from "node:crypto";
+import { randomUUID as randomUUID15 } from "node:crypto";
 var ActiveRuntimeTurn;
 var init_active_turn = __esm({
   "src/session/turn/active-turn.ts"() {
@@ -96890,7 +96972,7 @@ var init_active_turn = __esm({
       #dispatch;
       #sequence = 0;
       #interaction = null;
-      #epoch = decodeIdentifier(randomUUID14());
+      #epoch = decodeIdentifier(randomUUID15());
       constructor(command, attemptId) {
         this.attemptId = attemptId;
         this.command = command;
@@ -97491,11 +97573,11 @@ var init_session_layer = __esm({
 });
 
 // src/storage/files/scratch-directory.ts
-import { randomUUID as randomUUID15 } from "node:crypto";
+import { randomUUID as randomUUID16 } from "node:crypto";
 import { lstat as lstat6, mkdir as mkdir5, readdir as readdir7, realpath as realpath9, rename as rename5, rm as rm4, stat as stat8, utimes, writeFile as writeFile5 } from "node:fs/promises";
 import { dirname as dirname12, join as join34 } from "node:path";
 async function atomicWrite(path8, bytes, signal) {
-  const temporary = `${path8}.${randomUUID15()}.tmp`;
+  const temporary = `${path8}.${randomUUID16()}.tmp`;
   try {
     await writeFile5(temporary, bytes, { mode: 384, signal });
     signal.throwIfAborted();
@@ -97511,7 +97593,7 @@ var init_scratch_directory = __esm({
     ScratchDirectory = class {
       #root;
       constructor(parent) {
-        this.#root = join34(parent, randomUUID15());
+        this.#root = join34(parent, randomUUID16());
       }
       /** Refreshes this directory's lease and removes sibling directories whose lease is older than `leaseMilliseconds`. */
       refreshLease = async (leaseMilliseconds) => {
@@ -99590,7 +99672,7 @@ var init_native_sessions = __esm({
 });
 
 // src/session/prompt/apply-session-configuration.ts
-import { randomUUID as randomUUID16 } from "node:crypto";
+import { randomUUID as randomUUID17 } from "node:crypto";
 function invalidSessionConfiguration(message) {
   return new AcpExecutionError(message, {}, "invalid_session_configuration");
 }
@@ -99728,7 +99810,7 @@ async function applySessionConfigurationSelection(sessions, options, selection,
     booleanValue: selection.booleanValue,
     configId: selection.configId,
     cwd,
-    requestId: `cfg_${randomUUID16()}`,
+    requestId: `cfg_${randomUUID17()}`,
     sessionId,
     signal,
     value: selection.value,
@@ -101715,7 +101797,7 @@ var init_engine = __esm({
 });
 
 // src/daemon/upgrades/upgrade.ts
-import { randomUUID as randomUUID17 } from "node:crypto";
+import { randomUUID as randomUUID18 } from "node:crypto";
 import { setInterval as setInterval2, setTimeout as setTimeout4 } from "node:timers/promises";
 async function reportDaemonUpgradeAvailability(send2, signal) {
   if (!process.connected) {
@@ -101774,7 +101856,7 @@ async function requestDaemonReleaseUpgrade(stateDirectory, currentVersion, signa
   return await requestInstalledDaemonReleaseSwitch(stateDirectory, launch, signal);
 }
 async function requestInstalledDaemonReleaseSwitch(stateDirectory, launch, signal) {
-  const id = randomUUID17();
+  const id = randomUUID18();
   const response = lifecycleResponse.parse(
     await sendLocalRequest(stateDirectory, "manager", { kind: "switch", id, context: "npm", launch }, signal)
   );