@letta-ai/letta-code 0.34.20 → 0.34.21

package/letta.js

@@ -5967,7 +5967,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.34.20",
+    version: "0.34.21",
     lettaStartupLogProtocol: 1,
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
@@ -6242,7 +6242,7 @@ var init_package = __esm(() => {
     },
     lettaLifecycleProtocol: 1,
     lettaRuntimeGraphProtocol: 1,
-    lettaRuntimeGraphSha512: "sha512-RWgzMK/RLJluHmJEAXwWV7NZe1gpOgg3BYpp8+G8QfqsXUUmzZgQpQz5E9CHogeIwfcGzCaHAUIdboH6Ir7KyA=="
+    lettaRuntimeGraphSha512: "sha512-xHwgmxBsCCiYY3o9bJl2DPx84chNPq1OsLFGac23DBEoU+h6hGCcX7rZezQxutCYhG/yFzjQ65L3pZ5j6BzNbg=="
   };
 });
 
@@ -100099,7 +100099,7 @@ Other
 - [ ] Make a permissions edit: let the user know that you can modify permissions (what commands are automatically approved/denied). Ask them if there are certain actions they would like you to avoid.
 - [ ] Create a local mod: let the user know you can customize Letta Code with trusted local mods for new tools, slash commands, provider integrations, UI panels/status, events, or permission overlays. Explain that mods are for executable harness behavior, while memory and skills are for retained knowledge and reusable procedures.
 - [ ] Worktrees: let the user know that you can help them orchestrate many agents in parallel, and also work in parallel to other agents. Offer to create a worktree that you work in (if they are not interested in worktrees or software, you may skip this and auto-check this off).
-- [ ] Moving machines: ask the user to connect another computer (they can either run another desktop instance or run \`letta server\` on another machine) and run you there instead.
+- [ ] Moving machines: ask the user to connect another computer by running \`letta server\` on it, then run you there instead.
 `;
 var init_onboarding = () => {};
 
@@ -100152,7 +100152,7 @@ Other
 - [ ] Make a permissions edit: let the user know that you can modify permissions (what commands are automatically approved/denied). Ask them if there are certain actions they would like you to avoid.
 - [ ] Create a local mod: let the user know you can customize Letta Code with trusted local mods for new tools, slash commands, provider integrations, UI panels/status, events, or permission overlays. Explain that mods are for executable harness behavior, while memory and skills are for retained knowledge and reusable procedures.
 - [ ] Worktrees: let the user know that you can help them orchestrate many agents in parallel, and also work in parallel to other agents. Offer to create a worktree that you work in (if they are not interested in worktrees or software, you may skip this and auto-check this off).
-- [ ] Moving machines: ask the user to connect another computer (they can either run another desktop instance or run \`letta server\` on another machine) and run you there instead.
+- [ ] Moving machines: ask the user to connect another computer by running \`letta server\` on it, then run you there instead.
 `;
 var init_onboarding_local = () => {};
 
@@ -210910,7 +210910,7 @@ var init_mcp_client = __esm(() => {
   init_streamableHttp();
   DEFAULT_CLIENT_INFO = {
     name: "letta-code",
-    version: "0.34.20"
+    version: "0.34.21"
   };
 });
 
@@ -232387,13 +232387,14 @@ async function runUnifiedMcpTool(params) {
     body: { args: params.args },
     ...params.originatorToken ? {
       headers: {
-        [MCP_ORIGINATOR_TOKEN_HEADER]: params.originatorToken
+        [MCP_ORIGINATOR_TOKEN_HEADER]: params.originatorToken,
+        [MCP_ORIGINATOR_ISOLATION_HEADER]: "1"
       }
     } : {}
   }), params.timeoutMs ?? 60000, "Running agent MCP tool");
   return parseRunResult(value);
 }
-var MCP_ORIGINATOR_TOKEN_HEADER = "x-letta-mcp-originator-token";
+var MCP_ORIGINATOR_TOKEN_HEADER = "x-letta-mcp-originator-token", MCP_ORIGINATOR_ISOLATION_HEADER = "x-letta-mcp-originator-isolation";
 var init_unified_mcp = () => {};
 
 // src/mcp-runtime.ts
@@ -240080,7 +240081,7 @@ async function resolveDesktopEnvironmentConnectionId(list = listEnvironments) {
   const response = await list({ limit: 100, onlineOnly: true });
   const matches3 = response.connections.filter((environment3) => (environment3.deviceId.startsWith("desktop:") && environment3.listenerInstanceId?.startsWith("desktop-primary:") === true || environment3.listenerInstanceId?.startsWith("desktop-direct-cloud:") === true) && environment3.organizationId !== "local" && isEnvironmentOnline(environment3));
   if (matches3.length === 0) {
-    throw new Error("Desktop Local is unavailable. Open Letta Desktop and wait for its computer connection to come online.");
+    throw new Error("No Desktop Local computer is online. Run `letta teleport list` and choose a connected computer by name, device ID, or connection ID. To connect a computer, run `letta server` on it.");
   }
   if (matches3.length > 1) {
     throw new Error(`Multiple Desktop computers are online. Run \`letta teleport list\` and choose one by name, device ID, or connection ID. Matched: ${matches3.map(describeEnvironment).join(", ")}`);
@@ -240227,7 +240228,7 @@ function validateTargetDevice(deviceId, environment2) {
   if (environment2?.organizationId === "local") {
     return {
       ok: false,
-      error: `Device ${deviceId} is this computer's local desktop connection, not a computer connected to your Letta account. Cloud schedules can only target connected computers — run \`letta server\` on that machine (or enable remote access in the desktop app) to connect it.`
+      error: `Device ${deviceId} is this computer's local desktop connection, not a computer connected to your Letta account. Cloud schedules can only target connected computers — run \`letta server\` on that machine to connect it.`
     };
   }
   return { ok: true };
@@ -243271,7 +243272,7 @@ class CodexAppServerClient {
     await this.request("initialize", {
       clientInfo: {
         name: "letta-code",
-        version: "0.34.20"
+        version: "0.34.21"
       },
       capabilities: null
     });
@@ -244353,11 +244354,13 @@ function buildMcpServersReminderText(entries) {
   if (entries.length === 0) {
     return `${SYSTEM_REMINDER_OPEN}
 MCP servers with available tools: None
+Do not automatically store results of principal-restricted operations in shared memory.
 ${SYSTEM_REMINDER_CLOSE}`;
   }
   const rendered = entries.map(formatMcpServerEntry).join(", ");
   return `${SYSTEM_REMINDER_OPEN}
 MCP servers with available tools: ${rendered}
+Do not automatically store results of principal-restricted operations in shared memory.
 Find tools (with schemas) with \`letta mcp search "<what you want to do>"\`, list one server's tools with \`letta mcp tools <server>\` (\`--full\` includes schemas, \`letta mcp schema <tool-name>\` fetches one), and invoke one with \`letta mcp call <tool-name> --args '{"key":"value"}'\`.
 ${SYSTEM_REMINDER_CLOSE}`;
 }
@@ -246733,7 +246736,7 @@ function isAppServerInfoResponseMessage(message2) {
     return false;
   }
   const capabilityRecord = capabilities;
-  return candidate.type === "app_server_info_response" && typeof candidate.request_id === "string" && candidate.request_id.length > 0 && candidate.success === true && (candidate.backend === "local" || candidate.backend === "api") && typeof candidate.letta_code_version === "string" && typeof candidate.protocol_version === "number" && Number.isInteger(candidate.protocol_version) && typeof capabilityRecord.agent_management === "boolean" && typeof capabilityRecord.conversation_management === "boolean" && typeof capabilityRecord.memory_management === "boolean" && typeof capabilityRecord.runtime_start === "boolean" && (capabilityRecord.agent_free_conversations === undefined || typeof capabilityRecord.agent_free_conversations === "boolean") && (capabilityRecord.launch_subagent === undefined || typeof capabilityRecord.launch_subagent === "boolean") && (capabilityRecord.launch_subagent_notify_caller === undefined || typeof capabilityRecord.launch_subagent_notify_caller === "boolean") && (capabilityRecord.subagent_message === undefined || typeof capabilityRecord.subagent_message === "boolean") && (capabilityRecord.runtime_workspace_sandbox === undefined || typeof capabilityRecord.runtime_workspace_sandbox === "boolean") && (capabilityRecord.runtime_external_tools_update === undefined || typeof capabilityRecord.runtime_external_tools_update === "boolean") && (capabilityRecord.structured_outputs === undefined || typeof capabilityRecord.structured_outputs === "boolean") && (capabilityRecord.write_file_base64 === undefined || typeof capabilityRecord.write_file_base64 === "boolean") && typeof capabilityRecord.split_channels === "boolean";
+  return candidate.type === "app_server_info_response" && typeof candidate.request_id === "string" && candidate.request_id.length > 0 && candidate.success === true && (candidate.backend === "local" || candidate.backend === "api") && typeof candidate.letta_code_version === "string" && typeof candidate.protocol_version === "number" && Number.isInteger(candidate.protocol_version) && typeof capabilityRecord.agent_management === "boolean" && typeof capabilityRecord.conversation_management === "boolean" && typeof capabilityRecord.memory_management === "boolean" && typeof capabilityRecord.runtime_start === "boolean" && (capabilityRecord.agent_free_conversations === undefined || typeof capabilityRecord.agent_free_conversations === "boolean") && (capabilityRecord.launch_subagent === undefined || typeof capabilityRecord.launch_subagent === "boolean") && (capabilityRecord.launch_subagent_notify_caller === undefined || typeof capabilityRecord.launch_subagent_notify_caller === "boolean") && (capabilityRecord.subagent_message === undefined || typeof capabilityRecord.subagent_message === "boolean") && (capabilityRecord.runtime_workspace_sandbox === undefined || typeof capabilityRecord.runtime_workspace_sandbox === "boolean") && (capabilityRecord.runtime_external_tools_update === undefined || typeof capabilityRecord.runtime_external_tools_update === "boolean") && (capabilityRecord.structured_outputs === undefined || typeof capabilityRecord.structured_outputs === "boolean") && (capabilityRecord.write_file_base64 === undefined || typeof capabilityRecord.write_file_base64 === "boolean") && (capabilityRecord.mcp_originator_queue_isolation === undefined || typeof capabilityRecord.mcp_originator_queue_isolation === "boolean") && typeof capabilityRecord.split_channels === "boolean";
 }
 var APP_SERVER_PROTOCOL_VERSION = 1;
 
@@ -259917,6 +259920,20 @@ var init_image_policy = __esm(async () => {
   await init_message_image_normalization();
 });
 
+// src/websocket/listener/mcp-originator-scope.ts
+function getMcpOriginatorScope(message2) {
+  return message2?.mcpOriginatorSuperRunId ? {
+    superRunId: message2.mcpOriginatorSuperRunId,
+    tokenPresent: message2.mcpOriginatorTokenPresent === true
+  } : null;
+}
+function sameMcpOriginatorScope(a2, b3) {
+  return a2 === null || b3 === null ? a2 === b3 : a2.superRunId === b3.superRunId && a2.tokenPresent === b3.tokenPresent;
+}
+function getEffectiveMcpOriginatorId(message2) {
+  return message2.mcpOriginatorTokenPresent === true ? message2.mcpOriginatorSuperRunId : undefined;
+}
+
 // src/websocket/listener/queue.ts
 function getQueueItemScope(item) {
   if (!item) {
@@ -260040,12 +260057,15 @@ function shouldProcessInboundMessageDirectly(runtime, parsed) {
   });
   return getListenerBlockedReason(runtime.turnLifecycle.snapshot(), activeScope ? getPendingControlRequestCount(runtime.listener, activeScope) : 0) === null;
 }
-function consumeQueuedTurn(runtime) {
+function consumeQueuedTurn(runtime, activeScope) {
   const queuedItems = runtime.queueRuntime.peekReady();
   const firstQueuedItem = queuedItems[0];
   if (!firstQueuedItem || !isCoalescable(firstQueuedItem.kind)) {
     return null;
   }
+  const firstScope = getMcpOriginatorScope(firstQueuedItem.kind === "message" ? runtime.queuedMessagesByItemId.get(firstQueuedItem.id) : undefined);
+  if (activeScope !== undefined && !sameMcpOriginatorScope(firstScope, activeScope))
+    return null;
   let queueLen = 0;
   let hasMessage = false;
   let hasTaskNotification = false;
@@ -260056,7 +260076,7 @@ function consumeQueuedTurn(runtime) {
   let batchPreferences = JSON.stringify(getStoredClientPreferences(runtime.agentId, runtime.conversationId));
   const isNoCoalesce = (candidate) => candidate.kind === "message" && candidate.noCoalesce === true;
   for (const item of queuedItems) {
-    if (!isCoalescable(item.kind) || !hasSameQueueScope(firstQueuedItem, item)) {
+    if (!isCoalescable(item.kind) || !hasSameQueueScope(firstQueuedItem, item) || !sameMcpOriginatorScope(firstScope, getMcpOriginatorScope(item.kind === "message" ? runtime.queuedMessagesByItemId.get(item.id) : undefined))) {
       break;
     }
     const incoming = runtime.queuedMessagesByItemId.get(item.id);
@@ -262118,11 +262138,12 @@ Legacy aliases:
 
 List options:
   --limit <n>       Max results (default: 50)
-  --after <id>      Pagination cursor from a previous computer id
+  --after <id>      The id of the last record from the previous page
   --online-only     Only include computers with a fresh active connection
 
 Notes:
   - Output is JSON only.
+  - Pass nextCursor to --after to advance, including with --online-only.
   - Uses CLI auth; override with LETTA_API_KEY/LETTA_BASE_URL if needed.
   - Use letta computers current to get this computer's stable deviceId.
   - Prefer deviceId or connectionName for --computer and Agent(computer=...).
@@ -262143,6 +262164,7 @@ function isOnline(environment2) {
 }
 function formatEnvironmentForCli(environment2, options) {
   const formatted = {
+    id: environment2.id,
     deviceId: environment2.deviceId,
     connectionName: environment2.connectionName,
     connectionId: environment2.connectionId ?? null,
@@ -262244,6 +262266,7 @@ async function runEnvironmentsSubcommand(argv, deps = {}) {
   })).filter((environment2) => !onlineOnly || environment2.isOnline).slice(0, limit4).map((environment2) => formatEnvironmentForCli(environment2, { onlineOnly, currentConnectionId }));
   console.log(JSON.stringify({
     ...result3,
+    nextCursor: result3.hasNextPage ? result3.connections.at(-1)?.id ?? null : null,
     connections
   }, null, 2));
   return 0;
@@ -268195,7 +268218,28 @@ function buildListModelsEntries(availableModels = [], options = {}) {
     nativeHandles.add(model.handle);
     return [buildNativeModelEntry(model)];
   });
-  return [...presetEntries, ...nativeEntries];
+  const byokHandles = new Set(availableModels.filter((model) => model.providerCategory === "byok").map((model) => model.handle));
+  return disambiguateByokLabels([...presetEntries, ...nativeEntries], byokHandles);
+}
+function providerNameFromHandle(handle2) {
+  const slashIndex = handle2.indexOf("/");
+  return slashIndex > 0 ? handle2.slice(0, slashIndex) : undefined;
+}
+function disambiguateByokLabels(entries2, byokHandles) {
+  const labelCounts = new Map;
+  for (const entry of entries2) {
+    if (!byokHandles.has(entry.handle))
+      continue;
+    labelCounts.set(entry.label, (labelCounts.get(entry.label) ?? 0) + 1);
+  }
+  return entries2.map((entry) => {
+    const isByokRow = byokHandles.has(entry.handle);
+    const providerName = providerNameFromHandle(entry.handle);
+    if (!isByokRow || !providerName || (labelCounts.get(entry.label) ?? 0) < 2) {
+      return entry;
+    }
+    return { ...entry, label: `${entry.label} · ${providerName}` };
+  });
 }
 var init_model_catalog2 = __esm(() => {
   init_model();
@@ -268744,7 +268788,7 @@ async function prepareToolExecutionContextForScope(params) {
       conversationId: scopedConversationId,
       ...actingUserId ? { actingUserId } : {},
       ...suppressActingUserFallback ? { suppressActingUserFallback: true } : {},
-      ...mcpOriginatorSuperRunId ? { mcpOriginatorSuperRunId } : {},
+      mcpOriginatorSuperRunId: mcpOriginatorSuperRunId ?? null,
       workingDirectory,
       ...skillsDirectory !== undefined ? { skillsDirectory } : {},
       ...skillSources !== undefined ? { skillSources } : {},
@@ -446669,98 +446713,6 @@ var init_cloud_retry_message = __esm(async () => {
   await init_protocol_outbound();
 });
 
-// src/websocket/listener/turn-input-state.ts
-function ensureTurnInputMessageOtids(messages) {
-  let didChange = false;
-  const messagesWithOtids = messages.map((message2) => {
-    if (!("content" in message2) || message2.otid) {
-      return message2;
-    }
-    didChange = true;
-    return {
-      ...message2,
-      otid: "client_message_id" in message2 && typeof message2.client_message_id === "string" ? message2.client_message_id : crypto.randomUUID()
-    };
-  });
-  return didChange ? messagesWithOtids : messages;
-}
-function createTurnInputState(messages, imageFailureModesByMessageOtid) {
-  return {
-    messages,
-    ...imageFailureModesByMessageOtid ? { imageFailureModesByMessageOtid } : {}
-  };
-}
-function createDeploymentRecoveryTurnInput() {
-  return createTurnInputState([
-    {
-      type: "message",
-      role: "user",
-      content: [{ type: "text", text: APPROVAL_RECOVERY_PROMPT }],
-      otid: crypto.randomUUID()
-    }
-  ]);
-}
-function updateTurnInputMessagesPreservingOtids(state2, messages) {
-  if (state2.imageFailureModesByMessageOtid) {
-    const nextOtids = new Set(messages.map((message2) => message2.otid));
-    for (const otid of Object.keys(state2.imageFailureModesByMessageOtid)) {
-      if (!nextOtids.has(otid)) {
-        throw new Error(`Cannot preserve image failure policy for missing message OTID: ${otid}`);
-      }
-    }
-  }
-  return createTurnInputState(messages, state2.imageFailureModesByMessageOtid);
-}
-function refreshTurnInputOtidsForNewRequest(state2) {
-  const refreshedMessages = refreshInputOtidsForNewRequest(state2.messages);
-  return createTurnInputState(refreshedMessages, remapImageFailureModesByPosition(state2.messages, refreshedMessages, state2.imageFailureModesByMessageOtid));
-}
-function rebuildTurnInputWithFreshDenials(state2, serverApprovals, denialReason, preserveMessageOtids = false) {
-  const rebuiltMessages = rebuildInputWithFreshDenials(state2.messages, serverApprovals, denialReason, preserveMessageOtids);
-  return createTurnInputState(rebuiltMessages, remapImageFailureModesByPosition(getContentMessages(state2.messages), getContentMessages(rebuiltMessages), state2.imageFailureModesByMessageOtid));
-}
-function getContentMessages(messages) {
-  return messages.filter((message2) => ("content" in message2));
-}
-function remapImageFailureModesByPosition(previousMessages, nextMessages, previousModes) {
-  if (!previousModes) {
-    return;
-  }
-  if (previousMessages.length !== nextMessages.length) {
-    throw new Error("Cannot remap image failure policy across non-corresponding message lists");
-  }
-  const remappedEntries = [];
-  for (const [index, previousMessage] of previousMessages.entries()) {
-    const nextMessage = nextMessages[index];
-    const previousOtid = previousMessage?.otid;
-    const nextOtid = nextMessage?.otid;
-    if (typeof previousOtid !== "string" || typeof nextOtid !== "string") {
-      continue;
-    }
-    const previousMode = previousModes[previousOtid];
-    if (previousMode) {
-      remappedEntries.push([nextOtid, previousMode]);
-    }
-  }
-  return remappedEntries.length > 0 ? Object.fromEntries(remappedEntries) : undefined;
-}
-var init_turn_input_state = __esm(() => {
-  init_prompt_assets();
-  init_turn_recovery_policy();
-});
-
-// src/websocket/listener/continuation-input.ts
-function appendQueuedTurnToInput(state2, queuedTurn) {
-  return createTurnInputState([...state2.messages, ...queuedTurn.messages], mergeImageFailureModesByMessageOtid(state2.imageFailureModesByMessageOtid, getInboundImageFailureModes(queuedTurn)));
-}
-var init_continuation_input = __esm(async () => {
-  init_turn_input_state();
-  await __promiseAll([
-    init_message_image_normalization(),
-    init_image_policy()
-  ]);
-});
-
 // src/websocket/listener/recovered-approval-checkpoint.ts
 function denialResult(decision) {
   return {
@@ -447041,26 +446993,6 @@ var init_recovered_approval_retry = __esm(() => {
   retryStates = new WeakMap;
 });
 
-// src/websocket/listener/recovered-queue-rehydration.ts
-function rehydrateClaimLostQueuedTurn(runtime, socket, queuedTurn, opts, processTurn) {
-  if (!requeueStartedInputDispositions(runtime, queuedTurn.durableInputIdentities ?? [])) {
-    scheduleDurableQueueRestore(runtime.listener, false);
-    throw new Error("Failed to requeue claim-lost durable continuation");
-  }
-  if (!enqueueInboundUserMessage(runtime, queuedTurn, queuedTurn.actingUserId)) {
-    scheduleDurableQueueRestore(runtime.listener, false);
-    throw new Error("Failed to rehydrate claim-lost queued continuation");
-  }
-  scheduleQueuePump(runtime, socket, opts ?? {}, (queued, batch) => processTurn(queued, socket, runtime, opts?.onStatusChange, queued.connectionId ?? opts?.connectionId, batch.batchId));
-}
-var init_recovered_queue_rehydration = __esm(async () => {
-  await __promiseAll([
-    init_conversation_runtime(),
-    init_input_disposition(),
-    init_queue()
-  ]);
-});
-
 // src/websocket/listener/interrupted-turn-read.ts
 function readInterruptedTurn(runtime, recoveryLineageId) {
   if (!runtime.agentId || !runtime.listener.connectionId?.startsWith("conn-"))
@@ -447586,6 +447518,86 @@ var init_turn_durability_ownership = __esm(async () => {
   await init_interrupted_turn_record();
 });
 
+// src/websocket/listener/turn-input-state.ts
+function ensureTurnInputMessageOtids(messages) {
+  let didChange = false;
+  const messagesWithOtids = messages.map((message2) => {
+    if (!("content" in message2) || message2.otid) {
+      return message2;
+    }
+    didChange = true;
+    return {
+      ...message2,
+      otid: "client_message_id" in message2 && typeof message2.client_message_id === "string" ? message2.client_message_id : crypto.randomUUID()
+    };
+  });
+  return didChange ? messagesWithOtids : messages;
+}
+function createTurnInputState(messages, imageFailureModesByMessageOtid) {
+  return {
+    messages,
+    ...imageFailureModesByMessageOtid ? { imageFailureModesByMessageOtid } : {}
+  };
+}
+function createDeploymentRecoveryTurnInput() {
+  return createTurnInputState([
+    {
+      type: "message",
+      role: "user",
+      content: [{ type: "text", text: APPROVAL_RECOVERY_PROMPT }],
+      otid: crypto.randomUUID()
+    }
+  ]);
+}
+function updateTurnInputMessagesPreservingOtids(state2, messages) {
+  if (state2.imageFailureModesByMessageOtid) {
+    const nextOtids = new Set(messages.map((message2) => message2.otid));
+    for (const otid of Object.keys(state2.imageFailureModesByMessageOtid)) {
+      if (!nextOtids.has(otid)) {
+        throw new Error(`Cannot preserve image failure policy for missing message OTID: ${otid}`);
+      }
+    }
+  }
+  return createTurnInputState(messages, state2.imageFailureModesByMessageOtid);
+}
+function refreshTurnInputOtidsForNewRequest(state2) {
+  const refreshedMessages = refreshInputOtidsForNewRequest(state2.messages);
+  return createTurnInputState(refreshedMessages, remapImageFailureModesByPosition(state2.messages, refreshedMessages, state2.imageFailureModesByMessageOtid));
+}
+function rebuildTurnInputWithFreshDenials(state2, serverApprovals, denialReason, preserveMessageOtids = false) {
+  const rebuiltMessages = rebuildInputWithFreshDenials(state2.messages, serverApprovals, denialReason, preserveMessageOtids);
+  return createTurnInputState(rebuiltMessages, remapImageFailureModesByPosition(getContentMessages(state2.messages), getContentMessages(rebuiltMessages), state2.imageFailureModesByMessageOtid));
+}
+function getContentMessages(messages) {
+  return messages.filter((message2) => ("content" in message2));
+}
+function remapImageFailureModesByPosition(previousMessages, nextMessages, previousModes) {
+  if (!previousModes) {
+    return;
+  }
+  if (previousMessages.length !== nextMessages.length) {
+    throw new Error("Cannot remap image failure policy across non-corresponding message lists");
+  }
+  const remappedEntries = [];
+  for (const [index, previousMessage] of previousMessages.entries()) {
+    const nextMessage = nextMessages[index];
+    const previousOtid = previousMessage?.otid;
+    const nextOtid = nextMessage?.otid;
+    if (typeof previousOtid !== "string" || typeof nextOtid !== "string") {
+      continue;
+    }
+    const previousMode = previousModes[previousOtid];
+    if (previousMode) {
+      remappedEntries.push([nextOtid, previousMode]);
+    }
+  }
+  return remappedEntries.length > 0 ? Object.fromEntries(remappedEntries) : undefined;
+}
+var init_turn_input_state = __esm(() => {
+  init_prompt_assets();
+  init_turn_recovery_policy();
+});
+
 // src/websocket/listener/recovery-debug.ts
 async function debugLogApprovalResumeState(runtime, params) {
   if (!isDebugEnabled())
@@ -448043,52 +448055,24 @@ async function executeRecoveredApprovalContinuation(params) {
       return;
     }
     emitRuntimeStateUpdates(runtime, scope);
-    let continuationInput = createTurnInputState([
+    const continuationInput = createTurnInputState([
       {
         type: "approval",
         approvals: approvalResults,
         otid: continuationOtid
       }
     ]);
-    let continuationBatchId = `batch-recovered-${crypto.randomUUID()}`;
-    let continuationCorrelation;
+    const continuationBatchId = `batch-recovered-${crypto.randomUUID()}`;
+    const continuationCorrelation = undefined;
     const continuationOwnership = createTurnDurabilityOwnership();
     continuationOwnership.recordInput(recovered);
-    const consumedQueuedTurn = consumeQueuedTurn(runtime);
-    if (consumedQueuedTurn) {
-      const { dequeuedBatch, queuedTurn } = consumedQueuedTurn;
-      continuationOwnership.recordInput(queuedTurn);
-      try {
-        await evidence.checkpointOwnership(continuationOwnership, queuedTurn.actingUserId);
-      } catch (error5) {
-        runtime.dequeuedClientMessageIdsByBatchId.delete(dequeuedBatch.batchId);
-        runtime.dequeuedInputIdentitiesByBatchId.delete(dequeuedBatch.batchId);
-        rehydrateClaimLostQueuedTurn(runtime, socket, queuedTurn, opts, processTurn);
-        throw error5;
-      }
-      continuationBatchId = dequeuedBatch.batchId;
-      continuationInput = appendQueuedTurnToInput(continuationInput, queuedTurn);
-      continuationCorrelation = createTurnCorrelation(runtime, {
-        type: "message",
-        agentId: recovered.agentId,
-        conversationId: recovered.conversationId,
-        durableInputIdentities: continuationOwnership.durableInputIdentities,
-        terminalConsumerIds: continuationOwnership.terminalConsumerIds,
-        messages: continuationInput.messages
-      }, continuationBatchId);
-      emitDequeuedUserMessage(socket, runtime, queuedTurn, dequeuedBatch);
-    }
     if (!hasRecoveryOwnership()) {
       runtime.dequeuedClientMessageIdsByBatchId.delete(continuationBatchId);
       runtime.dequeuedInputIdentitiesByBatchId.delete(continuationBatchId);
-      if (consumedQueuedTurn) {
-        const { queuedTurn } = consumedQueuedTurn;
-        rehydrateClaimLostQueuedTurn(runtime, socket, queuedTurn, opts, processTurn);
-      }
       return;
     }
     const continuationConnectionId = selectedDeliveryOwnerId ?? opts?.connectionId;
-    const continuationActingUserId = consumedQueuedTurn ? consumedQueuedTurn.queuedTurn.actingUserId : recovered.actingUserId;
+    const continuationActingUserId = recovered.actingUserId;
     await processTurn({
       type: "message",
       agentId: recovered.agentId,
@@ -448146,6 +448130,7 @@ async function executeRecoveredApprovalContinuation(params) {
     if (runtime.recoveredApprovalState === recovered) {
       clearRecoveredApprovalState(runtime);
     }
+    scheduleQueuePump(runtime, socket, opts ?? {}, (queued, batch) => processTurn(queued, socket, runtime, opts?.onStatusChange, queued.connectionId ?? opts?.connectionId, batch.batchId));
     return;
   } catch (error5) {
     if (continuationFinalized) {
@@ -448199,20 +448184,17 @@ var init_recovery = __esm(async () => {
     init_toolset(),
     init_cloud_retry_message(),
     init_connection(),
-    init_continuation_input(),
     init_conversation_runtime(),
     init_interrupted_turn_record(),
     init_interrupts(),
     init_mod_adapter2(),
     init_protocol_outbound(),
-    init_queue(),
     init_recoverable_notices(),
-    init_recovered_queue_rehydration(),
+    init_queue(),
     init_recovered_turn_finalizer(),
     init_recovery_evidence(),
     init_recovery_ownership(),
     init_runtime6(),
-    init_turn_correlation(),
     init_turn_durability_ownership(),
     init_turn_finished_replay(),
     init_turn_status()
@@ -448448,7 +448430,7 @@ async function resolveStaleApprovals(runtime, socket, turnLease, deps = {}) {
   runtime.currentToolset = preparedToolContext.toolset;
   runtime.currentToolsetPreference = preparedToolContext.toolsetPreference;
   runtime.currentLoadedTools = preparedToolContext.preparedToolContext.loadedToolNames;
-  let recoveryActingUserId = readInterruptedTurn(runtime)?.actingUserId;
+  const recoveryActingUserId = readInterruptedTurn(runtime)?.actingUserId;
   while (pendingApprovals.length > 0) {
     assertCurrentTurnLease();
     const recoveryBatchId = resolveRecoveryBatchId(runtime, pendingApprovals);
@@ -448461,7 +448443,7 @@ async function resolveStaleApprovals(runtime, socket, turnLease, deps = {}) {
       return null;
     }
     try {
-      let continuationInput = createTurnInputState([
+      const continuationInput = createTurnInputState([
         {
           type: "approval",
           approvals: approvalResults,
@@ -448469,14 +448451,6 @@ async function resolveStaleApprovals(runtime, socket, turnLease, deps = {}) {
         }
       ]);
       let recoveryTurnCorrelation;
-      const consumedQueuedTurn = consumeQueuedTurn(runtime);
-      if (consumedQueuedTurn) {
-        const { dequeuedBatch, queuedTurn } = consumedQueuedTurn;
-        recoveryActingUserId = queuedTurn.actingUserId;
-        recoveryTurnCorrelation = createTurnCorrelation(runtime, queuedTurn, dequeuedBatch.batchId);
-        continuationInput = appendQueuedTurnToInput(continuationInput, queuedTurn);
-        emitDequeuedUserMessage(socket, runtime, queuedTurn, dequeuedBatch);
-      }
       const continuationMessagesWithSkillContent = injectQueuedSkillContent(continuationInput.messages, {
         socket,
         runtime,
@@ -448848,14 +448822,11 @@ var init_send = __esm(async () => {
     init_toolset(),
     init_approval(),
     init_connection(),
-    init_continuation_input(),
     init_interrupted_turn_read(),
     init_mod_adapter2(),
     init_protocol_outbound(),
-    init_queue(),
     init_recovery(),
     init_skill_injection(),
-    init_turn_correlation(),
     init_turn_status()
   ]);
   ACTIVE_BLOCKING_RUN_STATUSES = new Set(["created", "running"]);
@@ -451162,6 +451133,18 @@ async function waitForApprovalTransportOpen(isDeliveryReady, shouldInterrupt) {
 }
 var APPROVAL_TRANSPORT_REOPEN_POLL_MS = 50;
 
+// src/websocket/listener/continuation-input.ts
+function appendQueuedTurnToInput(state2, queuedTurn) {
+  return createTurnInputState([...state2.messages, ...queuedTurn.messages], mergeImageFailureModesByMessageOtid(state2.imageFailureModesByMessageOtid, getInboundImageFailureModes(queuedTurn)));
+}
+var init_continuation_input = __esm(async () => {
+  init_turn_input_state();
+  await __promiseAll([
+    init_message_image_normalization(),
+    init_image_policy()
+  ]);
+});
+
 // src/websocket/listener/turn-approval.ts
 async function handleApprovalStop(params) {
   const {
@@ -451638,7 +451621,7 @@ async function handleApprovalStop(params) {
   const sendOptions = buildSendOptions() ?? {};
   if (shouldInterrupt())
     return interruptTermination();
-  const consumedQueuedTurn = consumeQueuedTurn(runtime);
+  const consumedQueuedTurn = params.allowQueuedContinuation === false ? null : consumeQueuedTurn(runtime, params.activeOriginatorScope ?? null);
   if (consumedQueuedTurn) {
     const { dequeuedBatch, queuedTurn } = consumedQueuedTurn;
     await params.onConsumeQueuedTurn?.(queuedTurn);
@@ -457346,13 +457329,17 @@ var init_execution_context_mcp_originator = __esm(async () => {
 // src/websocket/listener/turn-finalizer.ts
 function applyTurnOriginSwap(parkedInput, consumedTurn, turnToolContextId) {
   retireMcpOriginatorTokensOnOriginSwap(parkedInput.mcpOriginatorSuperRunId, consumedTurn.mcpOriginatorSuperRunId);
-  rebindTurnToolContextMcpOriginator(turnToolContextId, consumedTurn.mcpOriginatorSuperRunId);
+  rebindTurnToolContextMcpOriginator(turnToolContextId, getEffectiveMcpOriginatorId(consumedTurn));
 }
 function createQueuedTurnConsumer(params) {
-  return async (queuedTurn) => {
-    applyTurnOriginSwap(params.parkedInput, queuedTurn, params.turnToolContextId);
-    params.ownership.recordInput(queuedTurn);
-    params.interruptedRevisionRef.current = await checkpointTurnInputOwnership(params.runtime, params.ownership, params.interruptedRevisionRef.current, queuedTurn.actingUserId, params.recoveryLineageId, params.recoveryEvidenceWriter);
+  return {
+    activeOriginatorScope: getMcpOriginatorScope(params.parkedInput),
+    allowQueuedContinuation: params.parkedInput.messages.some((message2) => ("content" in message2)),
+    onConsumeQueuedTurn: async (queuedTurn) => {
+      applyTurnOriginSwap(params.parkedInput, queuedTurn, params.turnToolContextId);
+      params.ownership.recordInput(queuedTurn);
+      params.interruptedRevisionRef.current = await checkpointTurnInputOwnership(params.runtime, params.ownership, params.interruptedRevisionRef.current, queuedTurn.actingUserId, params.recoveryLineageId, params.recoveryEvidenceWriter);
+    }
   };
 }
 function createTurnFinalizer(params) {
@@ -457947,7 +457934,7 @@ async function prepareListenerTurn(params) {
     conversationId,
     actingUserId: msg.actingUserId,
     suppressActingUserFallback: msg.suppressActingUserFallback,
-    mcpOriginatorSuperRunId: msg.mcpOriginatorSuperRunId,
+    mcpOriginatorSuperRunId: getEffectiveMcpOriginatorId(msg),
     clientToolset: msg.clientToolset,
     clientToolAllowlist: msg.clientToolAllowlist,
     ...msg.excludeInteractiveTools ? { exclude: [...INTERACTIVE_USER_INPUT_TOOL_NAMES] } : {},
@@ -458657,7 +458644,7 @@ async function handleIncomingMessageInner(msg, socket, runtime, onStatusChange,
         turnToolContextId,
         turnLease,
         turnCorrelation,
-        onConsumeQueuedTurn: createQueuedTurnConsumer({
+        ...createQueuedTurnConsumer({
           parkedInput: msg,
           turnToolContextId,
           runtime,
@@ -461606,6 +461593,7 @@ function buildAppServerInfoResponse(command, options) {
       runtime_external_tools_update: true,
       structured_outputs: options.backend === "api",
       write_file_base64: true,
+      mcp_originator_queue_isolation: true,
       split_channels: false
     }
   };
@@ -536241,4 +536229,4 @@ function registerBunOAuthFlows() {
 registerBunOAuthFlows();
 await init_src5().then(() => exports_src2);
 
-//# debugId=9C7F976A516FF7CA64756E2164756E21
+//# debugId=13209D1BDC471C9864756E2164756E21