@letta-ai/letta-code 0.33.3 → 0.33.4

package/letta.js

@@ -5653,7 +5653,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.33.3",
+    version: "0.33.4",
     lettaStartupLogProtocol: 1,
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
@@ -187644,7 +187644,7 @@ function getSubagentByToolCallId(toolCallId) {
   }
   return;
 }
-function registerSubagent(id2, type3, description, toolCallId, isBackground, silent, parentScope, prompt) {
+function registerSubagent(id2, type3, description, toolCallId, isBackground, silent, parentScope, prompt, claimsParentRuntime) {
   const displayType = type3.charAt(0).toUpperCase() + type3.slice(1);
   const agent = {
     id: id2,
@@ -187661,6 +187661,7 @@ function registerSubagent(id2, type3, description, toolCallId, isBackground, sil
     startTime: Date.now(),
     toolCallId,
     isBackground,
+    claimsParentRuntime,
     silent,
     parentAgentId: parentScope?.agentId ?? undefined,
     parentConversationId: parentScope?.conversationId && parentScope.conversationId.length > 0 ? parentScope.conversationId : undefined
@@ -188768,9 +188769,7 @@ function enqueueOutboundFrame(transport, frame) {
   if (frame.frameClass === "status" && frame.coalesceKey) {
     const index = state.frames.findIndex((f4) => f4.frameClass === "status" && f4.coalesceKey === frame.coalesceKey);
     if (index !== -1) {
-      state.frames[index] = frame;
-      drainOutboundQueue(transport, state);
-      return;
+      state.frames.splice(index, 1);
     }
   }
   state.frames.push(frame);
@@ -189196,6 +189195,9 @@ function createTurnCorrelation(runtime, message, batchId) {
     }
   }
   return {
+    get clientMessageIds() {
+      return [...clientMessageIds];
+    },
     appendDequeuedBatch(nextBatchId) {
       for (const clientMessageId of takeDequeuedClientMessageIds(runtime, nextBatchId)) {
         clientMessageIds.add(clientMessageId);
@@ -189241,7 +189243,6 @@ __export(exports_protocol_outbound, {
   emitProtocolV2Message: () => emitProtocolV2Message,
   emitLoopStatusUpdate: () => emitLoopStatusUpdate,
   emitLoopStatusIfOpen: () => emitLoopStatusIfOpen,
-  emitLoopErrorDelta: () => emitLoopErrorDelta,
   emitInterruptedStatusDelta: () => emitInterruptedStatusDelta,
   emitDeviceStatusUpdateIfChanged: () => emitDeviceStatusUpdateIfChanged,
   emitDeviceStatusUpdate: () => emitDeviceStatusUpdate,
@@ -189688,8 +189689,10 @@ function buildSubagentSnapshot(runtime, scope) {
     status: a2.status,
     agent_url: a2.agentURL,
     conversation_id: a2.conversationId ?? null,
+    super_run_id: a2.superRunId,
     model: a2.model,
     is_background: a2.isBackground,
+    claims_parent_runtime: a2.claimsParentRuntime,
     silent: a2.silent,
     tool_call_id: a2.toolCallId,
     parent_agent_id: a2.parentAgentId,
@@ -189726,18 +189729,6 @@ function createLifecycleMessageBase(messageType, runId) {
 function emitCanonicalMessageDelta(socket, runtime, delta2, scope) {
   emitStreamDelta(socket, runtime, delta2, scope);
 }
-function emitLoopErrorDelta(socket, runtime, params) {
-  emitCanonicalMessageDelta(socket, runtime, {
-    ...createLifecycleMessageBase("loop_error", params.runId),
-    message: params.message,
-    stop_reason: params.stopReason,
-    is_terminal: params.isTerminal,
-    ...params.apiError ? { api_error: params.apiError } : {}
-  }, {
-    agent_id: params.agentId,
-    conversation_id: params.conversationId
-  });
-}
 function emitRetryDelta(socket, runtime, params) {
   const delta2 = {
     ...createLifecycleMessageBase("retry", params.runId),
@@ -212179,6 +212170,9 @@ async function listEnqueuedRunMessages(runId, signal) {
   }
   return result2;
 }
+async function getExactSuperRun(agentId, superRunId, signal, request = apiRequest) {
+  return request("GET", `/v1/agents/${encodeURIComponent(agentId)}/super-runs/${encodeURIComponent(superRunId)}`, undefined, { signal });
+}
 async function getLatestConversationSuperRun(conversationId, signal) {
   return apiRequest("GET", `/v1/conversations/${encodeURIComponent(conversationId)}/super-run`, undefined, { signal });
 }
@@ -212189,212 +212183,93 @@ var init_conversation_enqueue = __esm(() => {
   init_request();
 });
 
-// src/headless-enqueue-wait.ts
-function getSendRunIds(status, clientMessageId) {
-  return Object.entries(status?.runtime_status?.loop_state?.client_message_ids_by_run_id ?? {}).filter(([, ids]) => ids.includes(clientMessageId)).map(([runId]) => runId);
-}
-function getConversationStatus(event, conversationId) {
-  if (event.type === "conversation_super_run_snapshot") {
-    return event.statuses.find((status) => status.conversation_id === conversationId) ?? null;
+// src/headless-super-run-wait.ts
+import { setTimeout as delay3 } from "node:timers/promises";
+function isTransientReadError(error4) {
+  if (error4 instanceof ApiRequestError || error4 instanceof APIError) {
+    return error4.status === 408 || error4.status === 429 || error4.status >= 500;
   }
-  return event.conversation_id === conversationId ? event.status : undefined;
+  return error4 instanceof TypeError || error4 instanceof Error && error4.name === "TimeoutError";
 }
-async function waitForEnqueuedReply(params) {
-  const runIds = new Set;
-  const now2 = params.now ?? Date.now;
-  let completedWithoutText;
-  let next = Promise.resolve({
-    done: false,
-    value: params.firstEvent
-  });
-  try {
-    while (true) {
-      params.signal.throwIfAborted();
-      let timer;
-      const event = await Promise.race([
-        next,
-        new Promise((resolve29) => {
-          timer = setTimeout(() => resolve29(null), params.pollMs ?? 1000);
-        })
-      ]).finally(() => clearTimeout(timer));
-      if (event) {
-        if (event.done)
-          throw new Error("Conversation status connection closed; remote execution may still be running.");
-        const status = getConversationStatus(event.value, params.receipt.conversation_id);
-        if (status !== undefined) {
-          for (const runId2 of getSendRunIds(status, params.receipt.client_message_id))
-            runIds.add(runId2);
-        }
-        next = params.events.next();
-        next.catch(() => {});
-      }
-      const runId = [...runIds].at(-1);
-      if (!runId) {
-        const latest = await params.latestSuperRun();
-        if (latest?.id === params.receipt.super_run_id && (latest.errored_at || latest.cancelled_at)) {
-          throw new Error(`Accepted send ${latest.id} ${latest.errored_at ? "failed" : "was cancelled"} before a run was observed.`);
-        }
-        continue;
-      }
-      const run = await params.retrieveRun(runId);
-      if (run.status === "failed" || run.status === "cancelled") {
-        throw new Error(`Remote run ${runId} ${run.status}${run.stop_reason ? ` (${run.stop_reason})` : ""}`);
-      }
-      if (run.status !== "completed" || run.stop_reason === "requires_approval")
-        continue;
-      const messages = await params.listRunMessages(runId);
-      const assistant = messages.filter((message) => message.message_type === "assistant_message").sort((a2, b3) => (b3.seq_id ?? 0) - (a2.seq_id ?? 0))[0];
-      if (assistant?.message_type === "assistant_message") {
-        const text2 = typeof assistant.content === "string" ? assistant.content : assistant.content.filter((part) => part.type === "text").map((part) => part.text).join(`
-`);
-        if (text2.trim())
-          return {
-            text: text2,
-            runIds: [...runIds],
-            stopReason: run.stop_reason ?? null
-          };
+async function retryRead(read2, signal, sleep11, failureLabel) {
+  let failures = 0;
+  while (true) {
+    signal.throwIfAborted();
+    try {
+      return await read2();
+    } catch (error4) {
+      signal.throwIfAborted();
+      if (!isTransientReadError(error4)) {
+        throw new RemoteExecutionFailed(`${failureLabel}: ${error4 instanceof Error ? error4.message : String(error4)}`);
       }
-      if (completedWithoutText?.runId !== runId)
-        completedWithoutText = { runId, at: now2() };
-      if (now2() - completedWithoutText.at < 15000)
-        continue;
-      throw new Error(`Remote run ${runId} completed without an assistant reply (${run.stop_reason ?? "unknown stop reason"})`);
+      await sleep11(Math.min(30000, 1000 * 2 ** Math.min(failures++, 5)), signal);
     }
-  } catch (error4) {
-    throw new EnqueuedWaitError(error4, [...runIds]);
   }
 }
-var EnqueuedWaitError;
-var init_headless_enqueue_wait = __esm(() => {
-  EnqueuedWaitError = class EnqueuedWaitError extends Error {
-    runIds;
-    constructor(error4, runIds) {
-      super(error4 instanceof Error ? error4.message : String(error4), {
-        cause: error4
-      });
-      this.runIds = runIds;
-      this.name = "EnqueuedWaitError";
-    }
-  };
-});
-
-// src/headless-super-run-wait.ts
-import { setTimeout as delay3 } from "node:timers/promises";
-function terminal(run) {
-  if (run.status === "CAN" || run.cancelled_at)
+function throwIfSuperRunFailed(run) {
+  if (run.errored_at) {
+    const detail = run.error ? ` during ${run.error.code}: ${run.error.message}` : "";
+    throw new RemoteExecutionFailed(`Remote Super Run ${run.id} failed${detail}`);
+  }
+  if (run.status === "CAN" || run.cancelled_at) {
     throw new RemoteExecutionFailed(`Remote Super Run ${run.id} was cancelled.`);
-  if (run.status !== "COM" && !run.completed_at)
-    return false;
-  if (run.errored_at)
-    throw new RemoteExecutionFailed(`Remote Super Run ${run.id} finished with an error.`);
-  return true;
+  }
+}
+function assistantText(messages) {
+  const assistant = messages.filter((message) => message.message_type === "assistant_message").sort((left, right) => (right.seq_id ?? 0) - (left.seq_id ?? 0))[0];
+  if (assistant?.message_type !== "assistant_message")
+    return null;
+  const text2 = typeof assistant.content === "string" ? assistant.content : assistant.content.filter((part) => part.type === "text").map((part) => part.text).join(`
+`);
+  return text2.trim() ? text2 : null;
+}
+function noReplyMessage(receipt) {
+  return `Remote task finished. Its reply was not collected. Read the conversation with: letta messages list --agent ${receipt.agent_id} --conversation ${receipt.conversation_id}. Do not launch the task again to retrieve its result.`;
 }
 async function waitForAcceptedSuperRun(receipt, signal, deps) {
-  const runIds = new Set;
-  let finished2 = false;
-  let failures = 0;
-  while (!finished2) {
+  const pollMs = deps.pollMs ?? 1000;
+  const sleep11 = deps.sleep ?? ((ms, waitSignal) => delay3(ms, undefined, { signal: waitSignal }));
+  while (true) {
     signal.throwIfAborted();
-    const controller = new AbortController;
-    const abort = () => controller.abort();
-    signal.addEventListener("abort", abort, { once: true });
-    try {
-      if (receipt.conversation_id !== "default") {
-        try {
-          const latest = await deps.latest(receipt.conversation_id, AbortSignal.any([signal, AbortSignal.timeout(30000)]));
-          if (latest.id === receipt.super_run_id)
-            finished2 = terminal(latest);
-        } catch (error4) {
-          if (!(error4 instanceof ApiRequestError && error4.status === 404))
-            throw error4;
-        }
-      }
-      if (finished2)
-        break;
-      const openTimeout = setTimeout(() => controller.abort(), 30000);
-      const stream11 = await deps.open(receipt.agent_id, controller).finally(() => clearTimeout(openTimeout));
-      const events = stream11[Symbol.asyncIterator]();
-      let next = events.next();
-      next.catch(() => {});
-      while (!finished2) {
-        signal.throwIfAborted();
-        let timer;
-        const event = await Promise.race([
-          next,
-          new Promise((resolve29) => {
-            timer = setTimeout(() => resolve29(null), deps.pollMs ?? 30000);
-          })
-        ]).finally(() => clearTimeout(timer));
-        if (!event)
-          break;
-        if (event.done)
-          throw new Error("Cloud status stream disconnected");
-        failures = 0;
-        const value = event.value;
-        if (value.type === "super_run_update") {
-          if (value.data.id === receipt.super_run_id)
-            finished2 = terminal(value.data);
-        } else {
-          const status = getConversationStatus(value, receipt.conversation_id);
-          if (status !== undefined) {
-            for (const id2 of getSendRunIds(status, receipt.client_message_id))
-              runIds.add(id2);
-            finished2 = !status?.active_super_runs.some((run) => run.id === receipt.super_run_id);
-          }
-        }
-        if (!finished2) {
-          next = events.next();
-          next.catch(() => {});
-        }
-      }
-    } catch (error4) {
-      signal.throwIfAborted();
-      if (error4 instanceof RemoteExecutionFailed)
-        throw error4;
-      if (error4 instanceof ApiRequestError && [401, 403].includes(error4.status))
-        throw error4;
-      await delay3(Math.min(30000, (deps.pollMs ?? 1000) * 2 ** Math.min(failures++, 5)), undefined, { signal });
-    } finally {
-      signal.removeEventListener("abort", abort);
-      controller.abort();
+    const exact = await retryRead(() => deps.exact(receipt.agent_id, receipt.super_run_id, AbortSignal.any([signal, AbortSignal.timeout(30000)])), signal, sleep11, `Cloud status read for accepted Super Run ${receipt.super_run_id} failed`);
+    if (exact.id !== receipt.super_run_id) {
+      throw new RemoteExecutionFailed(`Exact Super Run read returned ${exact.id} for ${receipt.super_run_id}.`);
+    }
+    throwIfSuperRunFailed(exact);
+    const terminal = exact.status === "COM" || exact.completed_at !== null;
+    if (!terminal) {
+      await sleep11(pollMs, signal);
+      continue;
     }
-  }
-  if (receipt.conversation_id !== "default") {
-    try {
-      const latest = await deps.latest(receipt.conversation_id, AbortSignal.any([signal, AbortSignal.timeout(1e4)]));
-      if (latest.id === receipt.super_run_id)
-        terminal(latest);
-    } catch (error4) {
-      signal.throwIfAborted();
-      if (error4 instanceof RemoteExecutionFailed)
-        throw error4;
+    const runId = exact.run_ids[0];
+    if (!runId) {
+      throw new RemoteExecutionFailed(`Remote Super Run ${exact.id} completed without a correlated child run.`);
     }
-  }
-  const runId = [...runIds].at(-1);
-  if (runId) {
+    const run = await retryRead(() => deps.run(runId, AbortSignal.any([signal, AbortSignal.timeout(30000)])), signal, sleep11, `Remote child run read for ${runId} failed`);
+    if (run.status === "failed" || run.status === "cancelled") {
+      throw new RemoteExecutionFailed(`Remote child run ${runId} ${run.status}${run.stop_reason ? ` (${run.stop_reason})` : ""}.`);
+    }
+    if (run.status !== "completed" || run.stop_reason === "requires_approval") {
+      await sleep11(pollMs, signal);
+      continue;
+    }
+    let messages = [];
     try {
-      const messages = await deps.messages(runId, AbortSignal.any([signal, AbortSignal.timeout(1e4)]));
-      const last2 = messages.filter((m4) => m4.message_type === "assistant_message").sort((a2, b3) => (b3.seq_id ?? 0) - (a2.seq_id ?? 0))[0];
-      if (last2?.message_type === "assistant_message") {
-        const text2 = typeof last2.content === "string" ? last2.content : last2.content.filter((p2) => p2.type === "text").map((p2) => p2.text).join(`
-`);
-        if (text2.trim())
-          return { text: text2, runIds: [...runIds], stopReason: null };
-      }
+      messages = await deps.messages(runId, AbortSignal.any([signal, AbortSignal.timeout(1e4)]));
     } catch {
       signal.throwIfAborted();
     }
+    return {
+      text: assistantText(messages) ?? noReplyMessage(receipt),
+      runIds: exact.run_ids,
+      stopReason: run.stop_reason ?? null
+    };
   }
-  return {
-    text: `Remote task finished. Its reply was not collected. Read the conversation with: letta messages list --agent ${receipt.agent_id} --conversation ${receipt.conversation_id}. Do not launch the task again to retrieve its result.`,
-    runIds: [...runIds],
-    stopReason: null
-  };
 }
 var RemoteExecutionFailed;
 var init_headless_super_run_wait = __esm(() => {
+  init_letta_client();
   init_request();
-  init_headless_enqueue_wait();
   RemoteExecutionFailed = class RemoteExecutionFailed extends Error {
   };
 });
@@ -212426,19 +212301,21 @@ async function resolveChildSubagent(backend3, agentId, parentAgentId) {
   }
 }
 function waitForChildRun(receipt, signal) {
+  const backend3 = getBackend();
   return waitForAcceptedSuperRun(receipt, signal, {
-    open: openConversationStatusStream,
-    latest: getLatestConversationSuperRun,
+    exact: getExactSuperRun,
+    run: (runId, readSignal) => backend3.retrieveRun(runId, { signal: readSignal }),
     messages: async () => []
   });
 }
 function trackChildSend(input) {
   const { receipt, child, parentScope } = input;
   const subagentId = generateSubagentId();
-  registerSubagent(subagentId, child.type, child.name, undefined, true, false, parentScope, input.prompt);
+  registerSubagent(subagentId, child.type, child.name, undefined, true, false, parentScope, input.prompt, false);
   updateSubagent(subagentId, {
     agentId: receipt.agent_id,
     conversationId: receipt.conversation_id,
+    superRunId: receipt.super_run_id,
     agentURL: buildAgentReference(receipt.agent_id, {
       conversationId: receipt.conversation_id
     })
@@ -212451,6 +212328,7 @@ function trackChildSend(input) {
 }
 var init_child_send_tracking = __esm(() => {
   init_subagent_state();
+  init_backend2();
   init_conversation_enqueue();
   init_app_urls();
   init_headless_super_run_wait();
@@ -213151,7 +213029,7 @@ class CodexAppServerClient {
     await this.request("initialize", {
       clientInfo: {
         name: "letta-code",
-        version: "0.33.3"
+        version: "0.33.4"
       },
       capabilities: null
     });
@@ -216509,9 +216387,10 @@ async function collectRemoteTurnResult(receipt, state, subagentId, signal = new
     })
   });
   try {
+    const backend3 = getBackend();
     const reply = await waitForAcceptedSuperRun(receipt, signal, {
-      open: openConversationStatusStream,
-      latest: getLatestConversationSuperRun,
+      exact: getExactSuperRun,
+      run: (runId, readSignal) => backend3.retrieveRun(runId, { signal: readSignal }),
       messages: async (runId, readSignal) => {
         const messages = await listEnqueuedRunMessages(runId, readSignal);
         for (const message of messages) {
@@ -216547,6 +216426,7 @@ async function collectRemoteTurnResult(receipt, state, subagentId, signal = new
 }
 var init_remote_turn_wait = __esm(() => {
   init_subagent_state();
+  init_backend2();
   init_conversation_enqueue();
   init_app_urls();
   init_constants2();
@@ -220963,7 +220843,7 @@ function usageTokensFromEvent(event) {
   return typeof total === "number" && Number.isFinite(total) ? total : undefined;
 }
 async function drainTurn(query3, usage, stop, maxToolCalls, onUsage) {
-  let assistantText = "";
+  let assistantText2 = "";
   let resultText;
   let success = false;
   let error4;
@@ -220971,7 +220851,7 @@ async function drainTurn(query3, usage, stop, maxToolCalls, onUsage) {
   const guard = createToolCallGuard(maxToolCalls);
   for await (const message of query3) {
     if (message.type === "assistant")
-      assistantText += message.content ?? "";
+      assistantText2 += message.content ?? "";
     if (message.type === "stream_event") {
       const tokens = usageTokensFromEvent(message.event);
       if (tokens !== undefined) {
@@ -220997,7 +220877,7 @@ async function drainTurn(query3, usage, stop, maxToolCalls, onUsage) {
     }
   }
   return {
-    finalText: (resultText ?? assistantText).trim(),
+    finalText: (resultText ?? assistantText2).trim(),
     success,
     error: error4,
     structuredOutput,
@@ -402562,14 +402442,16 @@ function emitLoopErrorNotice(socket, runtime, params) {
     mirrorRecoverableNoticeToDesktopDebugPanel(params.message);
     return null;
   }
-  emitLoopErrorDelta(socket, runtime, {
+  emitCanonicalMessageDelta(socket, runtime, {
+    ...createLifecycleMessageBase("loop_error", params.runId),
     message: decision.message,
-    stopReason: params.stopReason,
-    isTerminal: params.isTerminal,
-    runId: params.runId,
-    agentId: params.agentId,
-    conversationId: params.conversationId,
-    apiError: decision.apiError
+    stop_reason: params.stopReason,
+    is_terminal: params.isTerminal,
+    ...params.clientMessageIds?.length ? { client_message_ids: params.clientMessageIds } : {},
+    ...decision.apiError ? { api_error: decision.apiError } : {}
+  }, {
+    agent_id: params.agentId,
+    conversation_id: params.conversationId
   });
   return decision.message;
 }
@@ -406841,6 +406723,19 @@ function finishListenerTurn(runtime, lease, options) {
   if (options.stopReason === "end_turn" || options.stopReason === "cancelled") {
     forgetListenerWork(runtime);
   }
+  if (options.socket && options.errorNotice) {
+    const runId = options.errorNotice.runId ?? options.runId ?? transition2.runId;
+    const message = emitLoopErrorNotice(options.socket, runtime, {
+      ...options.errorNotice,
+      stopReason: options.stopReason,
+      isTerminal: true,
+      runId,
+      agentId: options.agentId,
+      conversationId: options.conversationId
+    });
+    runtime.lastTerminalLoopErrorMessage = message ?? options.errorNotice.message;
+    runtime.lastTerminalLoopErrorRunId = runId ?? null;
+  }
   if (options.stopReason === "cancelled" && transition2.previousKind === "active" && options.socket) {
     emitInterruptedStatusDelta(options.socket, runtime, {
       runId: options.runId ?? transition2.runId,
@@ -406873,6 +406768,7 @@ var init_turn_terminal = __esm(() => {
   init_connection();
   init_interrupted_turn_record();
   init_protocol_outbound();
+  init_recoverable_notices();
 });
 
 // src/websocket/listener/recovery.ts
@@ -417121,6 +417017,12 @@ async function handleIncomingMessageInner(msg, socket, runtime, onStatusChange,
     ...options,
     socket: options.socket ?? socket,
     turnId: activeDequeuedBatchId,
+    ...options.errorNotice ? {
+      errorNotice: {
+        ...options.errorNotice,
+        clientMessageIds: turnCorrelation.clientMessageIds
+      }
+    } : {},
     ...runtime.executionSettings ? { usage: buildTurnUsage(buffers.usage) } : {}
   }));
   const finishIfInterrupted = (runId) => {
@@ -417175,24 +417077,16 @@ async function handleIncomingMessageInner(msg, socket, runtime, onStatusChange,
       return;
     }
     if (setup.kind === "cancelled") {
-      const transition2 = finishTurn({
+      finishTurn({
         stopReason: "cancelled",
         agentId: agentId || null,
-        conversationId
-      });
-      if (!transition2.finished) {
-        return;
-      }
-      const formattedError = emitLoopErrorNotice(socket, runtime, {
-        message: setup.reason,
-        stopReason: "cancelled",
-        isTerminal: true,
-        agentId,
         conversationId,
-        cancelRequested: turnAbortSignal.aborted,
-        abortSignal: turnAbortSignal
+        errorNotice: {
+          message: setup.reason,
+          cancelRequested: turnAbortSignal.aborted,
+          abortSignal: turnAbortSignal
+        }
       });
-      runtime.lastTerminalLoopErrorMessage = formattedError ?? setup.reason;
       return;
     }
     let turnInput = setup.turnInput;
@@ -417262,19 +417156,15 @@ async function handleIncomingMessageInner(msg, socket, runtime, onStatusChange,
       lastApprovalContinuationAccepted = false;
       const maxTurns = runtime.executionSettings?.max_turns;
       if (maxTurns !== undefined && buffers.usage.stepCount >= maxTurns && stopReason !== "requires_approval" && !(stopReason === "error" && fallbackError)) {
-        emitLoopErrorNotice(socket, runtime, {
-          message: `Maximum turns limit reached (${buffers.usage.stepCount}/${maxTurns} steps)`,
-          stopReason: "max_steps",
-          isTerminal: true,
-          runId: runId || runtime.activeRunId,
-          agentId,
-          conversationId
-        });
         finishTurn({
           stopReason: "max_steps",
           socket,
           agentId,
-          conversationId
+          conversationId,
+          errorNotice: {
+            message: `Maximum turns limit reached (${buffers.usage.stepCount}/${maxTurns} steps)`,
+            runId: runId || runtime.activeRunId
+          }
         });
         break;
       }
@@ -417560,23 +417450,13 @@ async function handleIncomingMessageInner(msg, socket, runtime, onStatusChange,
           abortSignal: turnAbortSignal
         };
         const terminalError = getConsumerLoopErrorMessage(noticeParams);
-        const transition2 = finishTurn({
+        finishTurn({
           stopReason: effectiveStopReason,
           agentId,
           conversationId,
-          error: terminalError
-        });
-        if (!transition2.finished) {
-          break;
-        }
-        const formattedError = emitLoopErrorNotice(socket, runtime, {
-          ...noticeParams,
-          stopReason: effectiveStopReason,
-          isTerminal: true,
-          runId: terminalRunId
+          error: terminalError,
+          errorNotice: { ...noticeParams, runId: terminalRunId }
         });
-        runtime.lastTerminalLoopErrorMessage = formattedError ?? errorMessage5;
-        runtime.lastTerminalLoopErrorRunId = terminalRunId ?? null;
         break;
       }
       const approvalResult = await handleApprovalStop({
@@ -417600,25 +417480,16 @@ async function handleIncomingMessageInner(msg, socket, runtime, onStatusChange,
       });
       if (approvalResult.kind === "error") {
         const terminalRunId = runId || runtime.activeRunId;
-        const transition2 = finishTurn({
+        finishTurn({
           stopReason: "error",
           agentId,
           conversationId,
-          error: getTranscriptLoopErrorMessage({ message: approvalResult.message })
-        });
-        if (!transition2.finished) {
-          return;
-        }
-        const formattedError = emitLoopErrorNotice(socket, runtime, {
-          message: approvalResult.message,
-          stopReason: "error",
-          isTerminal: true,
-          runId: terminalRunId,
-          agentId,
-          conversationId
+          error: getTranscriptLoopErrorMessage({ message: approvalResult.message }),
+          errorNotice: {
+            message: approvalResult.message,
+            runId: terminalRunId
+          }
         });
-        runtime.lastTerminalLoopErrorMessage = formattedError ?? approvalResult.message;
-        runtime.lastTerminalLoopErrorRunId = terminalRunId ?? null;
         return;
       }
       turnInput = approvalResult.turnInput;
@@ -417720,19 +417591,12 @@ async function handleIncomingMessageInner(msg, socket, runtime, onStatusChange,
       stopReason: "error",
       agentId: agentId || null,
       conversationId,
-      error: terminalError
+      error: terminalError,
+      errorNotice: { ...noticeParams, runId: terminalRunId }
     });
     if (!transition2.finished) {
       return;
     }
-    const formattedError = emitLoopErrorNotice(socket, runtime, {
-      ...noticeParams,
-      stopReason: "error",
-      isTerminal: true,
-      runId: terminalRunId
-    });
-    runtime.lastTerminalLoopErrorMessage = formattedError ?? errorMessage5;
-    runtime.lastTerminalLoopErrorRunId = terminalRunId ?? null;
     if (isDebugEnabled()) {
       console.error("[Listen] Error handling message:", error4);
     }
@@ -418206,8 +418070,8 @@ function spawnBun(shell, cwd2, cols, rows, terminal_id, connectionId, socket) {
       data: (_t, chunk2) => handleData(new TextDecoder().decode(chunk2))
     }
   });
-  const terminal2 = proc.terminal;
-  if (!terminal2) {
+  const terminal = proc.terminal;
+  if (!terminal) {
     throw new Error("Bun.spawn terminal object missing — API unavailable");
   }
   proc.exited.then((exitCode) => {
@@ -418224,17 +418088,17 @@ function spawnBun(shell, cwd2, cols, rows, terminal_id, connectionId, socket) {
   return {
     write: (d2) => {
       try {
-        terminal2.write(d2);
+        terminal.write(d2);
       } catch {}
     },
     resize: (c, r5) => {
       try {
-        terminal2.resize(c, r5);
+        terminal.resize(c, r5);
       } catch {}
     },
     kill: () => {
       try {
-        terminal2.close();
+        terminal.close();
       } catch {}
       try {
         proc.kill();
@@ -428790,8 +428654,8 @@ function formatError(error4, mapper = (issue2) => issue2.message) {
           let i4 = 0;
           while (i4 < fullpath.length) {
             const el = fullpath[i4];
-            const terminal2 = i4 === fullpath.length - 1;
-            if (!terminal2) {
+            const terminal = i4 === fullpath.length - 1;
+            if (!terminal) {
               curr[el] = curr[el] || { _errors: [] };
             } else {
               curr[el] = curr[el] || { _errors: [] };
@@ -444782,7 +444646,7 @@ var init_mcp_client = __esm(() => {
   init_streamableHttp();
   DEFAULT_CLIENT_INFO = {
     name: "letta-code",
-    version: "0.33.3"
+    version: "0.33.4"
   };
 });
 
@@ -456140,23 +456004,23 @@ class ChannelGateway {
       active.richDraft?.flushPending();
     }
   }
-  handleTurnFinished(runtime, terminal2) {
+  handleTurnFinished(runtime, terminal) {
     const state = this.getState(runtime);
     const active = state.active;
     if (!active)
       return;
     state.active = null;
     active.richDraft?.dispose();
-    const remainingSources = lifecycleOutcome(terminal2.stopReason) === "completed" ? this.remainingSources(state) : [];
+    const remainingSources = lifecycleOutcome(terminal.stopReason) === "completed" ? this.remainingSources(state) : [];
     this.enqueueHook(state, () => this.hooks.onLifecycle({
       type: "finished",
       batchId: active.batchId,
       sources: active.lifecycleSources,
-      outcome: lifecycleOutcome(terminal2.stopReason),
-      stopReason: terminal2.stopReason,
+      outcome: lifecycleOutcome(terminal.stopReason),
+      stopReason: terminal.stopReason,
       ...remainingSources.length ? { remainingSources } : {},
-      ...terminal2.runId ?? active.runId ? { runId: terminal2.runId ?? active.runId } : {},
-      ...terminal2.error ? { error: terminal2.error } : {}
+      ...terminal.runId ?? active.runId ? { runId: terminal.runId ?? active.runId } : {},
+      ...terminal.error ? { error: terminal.error } : {}
     }));
   }
   handleControlRequest(message) {
@@ -458967,6 +458831,95 @@ var init_local_backend_mod_events = __esm(() => {
   init_local_backend();
 });
 
+// src/headless-enqueue-wait.ts
+function getSendRunIds(status, clientMessageId) {
+  return Object.entries(status?.runtime_status?.loop_state?.client_message_ids_by_run_id ?? {}).filter(([, ids]) => ids.includes(clientMessageId)).map(([runId]) => runId);
+}
+function getConversationStatus(event, conversationId) {
+  if (event.type === "conversation_super_run_snapshot") {
+    return event.statuses.find((status) => status.conversation_id === conversationId) ?? null;
+  }
+  return event.conversation_id === conversationId ? event.status : undefined;
+}
+async function waitForEnqueuedReply(params) {
+  const runIds = new Set;
+  const now2 = params.now ?? Date.now;
+  let completedWithoutText;
+  let next = Promise.resolve({
+    done: false,
+    value: params.firstEvent
+  });
+  try {
+    while (true) {
+      params.signal.throwIfAborted();
+      let timer;
+      const event = await Promise.race([
+        next,
+        new Promise((resolve42) => {
+          timer = setTimeout(() => resolve42(null), params.pollMs ?? 1000);
+        })
+      ]).finally(() => clearTimeout(timer));
+      if (event) {
+        if (event.done)
+          throw new Error("Conversation status connection closed; remote execution may still be running.");
+        const status = getConversationStatus(event.value, params.receipt.conversation_id);
+        if (status !== undefined) {
+          for (const runId2 of getSendRunIds(status, params.receipt.client_message_id))
+            runIds.add(runId2);
+        }
+        next = params.events.next();
+        next.catch(() => {});
+      }
+      const runId = [...runIds].at(-1);
+      if (!runId) {
+        const latest = await params.latestSuperRun();
+        if (latest?.id === params.receipt.super_run_id && (latest.errored_at || latest.cancelled_at)) {
+          throw new Error(`Accepted send ${latest.id} ${latest.errored_at ? "failed" : "was cancelled"} before a run was observed.`);
+        }
+        continue;
+      }
+      const run = await params.retrieveRun(runId);
+      if (run.status === "failed" || run.status === "cancelled") {
+        throw new Error(`Remote run ${runId} ${run.status}${run.stop_reason ? ` (${run.stop_reason})` : ""}`);
+      }
+      if (run.status !== "completed" || run.stop_reason === "requires_approval")
+        continue;
+      const messages = await params.listRunMessages(runId);
+      const assistant = messages.filter((message) => message.message_type === "assistant_message").sort((a2, b3) => (b3.seq_id ?? 0) - (a2.seq_id ?? 0))[0];
+      if (assistant?.message_type === "assistant_message") {
+        const text2 = typeof assistant.content === "string" ? assistant.content : assistant.content.filter((part) => part.type === "text").map((part) => part.text).join(`
+`);
+        if (text2.trim())
+          return {
+            text: text2,
+            runIds: [...runIds],
+            stopReason: run.stop_reason ?? null
+          };
+      }
+      if (completedWithoutText?.runId !== runId)
+        completedWithoutText = { runId, at: now2() };
+      if (now2() - completedWithoutText.at < 15000)
+        continue;
+      throw new Error(`Remote run ${runId} completed without an assistant reply (${run.stop_reason ?? "unknown stop reason"})`);
+    }
+  } catch (error5) {
+    throw new EnqueuedWaitError(error5, [...runIds]);
+  }
+}
+var EnqueuedWaitError;
+var init_headless_enqueue_wait = __esm(() => {
+  EnqueuedWaitError = class EnqueuedWaitError extends Error {
+    runIds;
+    constructor(error5, runIds) {
+      super(error5 instanceof Error ? error5.message : String(error5), {
+        cause: error5
+      });
+      this.runIds = runIds;
+      this.name = "EnqueuedWaitError";
+    }
+  };
+});
+
 // src/headless-cloud-send.ts
 import { randomUUID as randomUUID48 } from "node:crypto";
 function shouldEnqueueCloudSend(values4, cloud, isAgentLaunch) {
@@ -465672,14 +465625,14 @@ function detectTerminalType() {
 function isVSCodeLikeTerminal() {
   return detectTerminalType() !== null;
 }
-function getKeybindingsPath(terminal2) {
-  if (!terminal2)
+function getKeybindingsPath(terminal) {
+  if (!terminal)
     return null;
   const appName = {
     vscode: "Code",
     cursor: "Cursor",
     windsurf: "Windsurf"
-  }[terminal2];
+  }[terminal];
   const os9 = platform10();
   if (os9 === "darwin") {
     return join96(homedir52(), "Library", "Application Support", appName, "User", "keybindings.json");
@@ -465802,35 +465755,35 @@ function removeKeybinding(keybindingsPath) {
   }
 }
 function installKeybindingForCurrentTerminal() {
-  const terminal2 = detectTerminalType();
-  if (!terminal2) {
+  const terminal = detectTerminalType();
+  if (!terminal) {
     return {
       success: false,
       error: "Not running in a VS Code-like terminal"
     };
   }
-  const path48 = getKeybindingsPath(terminal2);
+  const path48 = getKeybindingsPath(terminal);
   if (!path48) {
     return {
       success: false,
-      error: `Could not determine keybindings.json path for ${terminal2}`
+      error: `Could not determine keybindings.json path for ${terminal}`
     };
   }
   return installKeybinding(path48);
 }
 function removeKeybindingForCurrentTerminal() {
-  const terminal2 = detectTerminalType();
-  if (!terminal2) {
+  const terminal = detectTerminalType();
+  if (!terminal) {
     return {
       success: false,
       error: "Not running in a VS Code-like terminal"
     };
   }
-  const path48 = getKeybindingsPath(terminal2);
+  const path48 = getKeybindingsPath(terminal);
   if (!path48) {
     return {
       success: false,
-      error: `Could not determine keybindings.json path for ${terminal2}`
+      error: `Could not determine keybindings.json path for ${terminal}`
     };
   }
   return removeKeybinding(path48);
@@ -466582,16 +466535,16 @@ var init_registry2 = __esm(() => {
         } = await Promise.resolve().then(() => (init_terminal_keybinding_installer(), exports_terminal_keybinding_installer));
         const { updateSettings: updateSettings2 } = await Promise.resolve().then(() => (init_settings4(), exports_settings2));
         const isRevert = args.includes("--revert") || args.includes("--remove");
-        const terminal2 = detectTerminalType2();
-        if (!terminal2) {
+        const terminal = detectTerminalType2();
+        if (!terminal) {
           return "Not running in a VS Code-like terminal. Shift+Enter keybinding is not needed.";
         }
         const terminalName = {
           vscode: "VS Code",
           cursor: "Cursor",
           windsurf: "Windsurf"
-        }[terminal2];
-        const keybindingsPath = getKeybindingsPath2(terminal2);
+        }[terminal];
+        const keybindingsPath = getKeybindingsPath2(terminal);
         if (!keybindingsPath) {
           return `Could not determine keybindings.json path for ${terminalName}`;
         }
@@ -508893,13 +508846,13 @@ Error: ${message}`);
           installKeybinding: installKeybinding2
         } = await Promise.resolve().then(() => (init_terminal_keybinding_installer(), exports_terminal_keybinding_installer));
         const { loadSettings: loadSettings2, updateSettings: updateSettings2 } = await Promise.resolve().then(() => (init_settings4(), exports_settings2));
-        const terminal2 = detectTerminalType2();
-        if (!terminal2) {
+        const terminal = detectTerminalType2();
+        if (!terminal) {
           setShowKeybindingSetup(false);
           return;
         }
         const settings4 = await loadSettings2();
-        const keybindingsPath = getKeybindingsPath2(terminal2);
+        const keybindingsPath = getKeybindingsPath2(terminal);
         if (!keybindingsPath || settings4.shiftEnterKeybindingInstalled) {
           setShowKeybindingSetup(false);
           return;
@@ -512015,4 +511968,4 @@ function registerBunOAuthFlows() {
 registerBunOAuthFlows();
 await init_src5().then(() => exports_src2);
 
-//# debugId=F0EE3697E822655164756E2164756E21
+//# debugId=E297E0391CF07BFB64756E2164756E21