@letta-ai/letta-code 0.34.22 → 0.34.24

package/letta.js

@@ -5967,7 +5967,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.34.22",
+    version: "0.34.24",
     lettaStartupLogProtocol: 1,
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
@@ -6110,7 +6110,7 @@ var init_package = __esm(() => {
     license: "Apache-2.0",
     engines: {
       bun: ">=1.3.2",
-      node: ">=22.19.0"
+      node: "^22.23.4 || ^24.22.1 || ^26.12.1"
     },
     publishConfig: {
       access: "public"
@@ -6187,7 +6187,7 @@ var init_package = __esm(() => {
       prepublishOnly: "bun run runtime-graph:verify && bun run build",
       postinstall: `node scripts/postinstall-patches.js || echo letta: vendor patches skipped && node -e "try{require('fs').chmodSync(require('path').join(require.resolve('node-pty/package.json'),'../prebuilds/darwin-arm64/spawn-helper'),0o755)}catch(e){}" || true`,
       "mod-learning:memory-citations": "bun scripts/mod-learning/learn-mod.ts --env docs/examples/mods/learning/memory-citations.env.json",
-      "test:built-entrypoints": 'LETTA_TEST_CLI_BUNDLE="$PWD/letta.js" LETTA_TEST_BUILT_ARTIFACT=1 bun test src/cli/subcommands/lifecycle-output.test.ts src/websocket/app-server-dream.test.ts --timeout 60000'
+      "test:built-entrypoints": 'LETTA_TEST_CLI_BUNDLE="$PWD/letta.js" LETTA_TEST_BUILT_ARTIFACT=1 bun test src/subcommand-exit.test.ts src/cli/subcommands/lifecycle-output.test.ts src/websocket/app-server-dream.test.ts --timeout 60000'
     },
     "lint-staged": {
       "*.{ts,tsx,js,jsx,json}": [
@@ -6242,7 +6242,10 @@ var init_package = __esm(() => {
     },
     lettaLifecycleProtocol: 1,
     lettaRuntimeGraphProtocol: 1,
-    lettaRuntimeGraphSha512: "sha512-xHwgmxBsCCiYY3o9bJl2DPx84chNPq1OsLFGac23DBEoU+h6hGCcX7rZezQxutCYhG/yFzjQ65L3pZ5j6BzNbg=="
+    lettaRuntimeGraphSha512: "sha512-xHwgmxBsCCiYY3o9bJl2DPx84chNPq1OsLFGac23DBEoU+h6hGCcX7rZezQxutCYhG/yFzjQ65L3pZ5j6BzNbg==",
+    patchedDependencies: {
+      "@earendil-works/pi-ai@0.99.1": "patches/@earendil-works%2Fpi-ai@0.99.1.patch"
+    }
   };
 });
 
@@ -26753,6 +26756,16 @@ function addCacheControlToTextContent(message, cacheControl) {
   }
   return false;
 }
+function isOpenAIHost(baseUrl) {
+  if (!baseUrl)
+    return true;
+  try {
+    const host = new URL(baseUrl).hostname.toLowerCase();
+    return host === "api.openai.com" || host.endsWith(".azure.com");
+  } catch {
+    return true;
+  }
+}
 function convertMessages(model, context, compat, options) {
   const normalizedContext = resolveTranscript(context, compat.supportsMidConvoSystemMessages);
   const params = [];
@@ -26769,7 +26782,7 @@ function convertMessages(model, context, compat, options) {
       const prefix = callId.slice(0, Math.max(1, 40 - hash.length - 1));
       return `${prefix}_${hash}`;
     }
-    if (model.provider === "openai")
+    if (model.provider === "openai" && isOpenAIHost(model.baseUrl))
       return id.length > 40 ? id.slice(0, 40) : id;
     return id;
   };
@@ -109083,6 +109096,11 @@ var init_memory_filesystem2 = __esm(() => {
   MEMORY_TREE_MAX_CHILDREN_PER_DIR = DIRECTORY_LIMIT_DEFAULTS.memfsTreeMaxChildrenPerDir;
 });
 
+// src/backend/local/local-conversation-key.ts
+function localConversationKey(conversationId, agentId) {
+  return conversationId === "default" ? `default:${agentId}` : `conversation:${conversationId}`;
+}
+
 // src/backend/local/local-model-normalization.ts
 function supportedModelSettingsFromBody(bodyRecord) {
   const modelSettings = isRecord2(bodyRecord.model_settings) ? { ...bodyRecord.model_settings } : {};
@@ -112419,7 +112437,7 @@ class LocalStore {
     return conversation.agent_free ? this.executionAgentIdForConversation(conversationId) : conversation.agent_id;
   }
   conversationKey(conversationId, agentId) {
-    return conversationId === "default" ? `default:${agentId}` : `conversation:${conversationId}`;
+    return localConversationKey(conversationId, agentId);
   }
 }
 var DEFAULT_LOCAL_AGENT_NAME = "Letta Code", DEFAULT_LOCAL_MODEL = "local/default", LEGACY_LOCAL_CONTEXT_WINDOW_LIMIT2 = 128000, DEFAULT_LOCAL_CONVERSATION_ID_PREFIX = "local-conv-", DEFAULT_LOCAL_STORED_MESSAGE_ID_PREFIX = "letta-msg-", DEFAULT_LOCAL_UI_MESSAGE_ID_PREFIX = "ui-msg-", DEFAULT_RESIDENT_MESSAGE_TAIL_LIMIT = 100, LocalBackendNotFoundError;
@@ -113576,12 +113594,22 @@ function refreshInputOtidsForNewRequest(currentInput) {
   }));
 }
 function rebuildInputWithFreshDenials(currentInput, serverApprovals, denialReason, preserveMessageOtids = false) {
+  const localResults = new Map;
+  for (const item of currentInput) {
+    if (item?.type === "approval") {
+      for (const result of item.approvals ?? []) {
+        if (result.tool_call_id) {
+          localResults.set(result.tool_call_id, result);
+        }
+      }
+    }
+  }
   const content = currentInput.filter((item) => item?.type !== "approval");
   const stripped = preserveMessageOtids ? content : refreshInputOtidsForNewRequest(content);
   if (serverApprovals.length > 0) {
     const denials = {
       type: "approval",
-      approvals: buildFreshDenialApprovals(serverApprovals, denialReason),
+      approvals: buildFreshDenialApprovals(serverApprovals, denialReason).map((denial) => localResults.get(denial.tool_call_id) ?? denial),
       otid: randomUUID9()
     };
     return [denials, ...stripped];
@@ -113684,7 +113712,7 @@ function selectChatGPTQuotaFailoverHandle(params) {
   const index = Math.min(Math.floor(random() * candidates2.length), candidates2.length - 1);
   return candidates2[index]?.handle ?? null;
 }
-var INVALID_TOOL_CALL_IDS_FRAGMENT = "invalid tool call ids", APPROVAL_PENDING_DETAIL_FRAGMENT = "waiting for approval", CONVERSATION_BUSY_DETAIL_FRAGMENTS, CONVERSATION_BUSY_RUN_ID_PATTERN, EMPTY_RESPONSE_DETAIL_FRAGMENT = "empty content in", RETRYABLE_PROVIDER_DETAIL_PATTERNS, NON_RETRYABLE_PROVIDER_DETAIL_PATTERNS, NON_RETRYABLE_RUN_ERROR_TYPES, NON_RETRYABLE_429_REASONS, NON_RETRYABLE_QUOTA_DETAIL_PATTERNS, NON_RETRYABLE_4XX_PATTERN, RETRYABLE_429_PATTERN, DEFAULT_TRANSIENT_RETRY_BASE_DELAY_MS = 1000, CLOUDFLARE_EDGE_52X_RETRY_BASE_DELAY_MS = 5000, CONVERSATION_BUSY_RETRY_BASE_DELAY_MS = 1e4, EMPTY_RESPONSE_RETRY_BASE_DELAY_MS = 500, STALE_APPROVAL_RECOVERY_DENIAL_REASON = "The agent harness automatically closed this stale pending tool call to recover from a client/server state desync: the server was still waiting on a result for it, but the harness had no matching tool execution in flight and no result was ever recorded. It was not denied by the user or a permissions policy. Re-issue the tool call if you still need it.", STARTED_TOOL_CALL_RECOVERY_DENIAL_REASON = "The agent harness closed this pending tool call while recovering from an interrupted turn. The call had started, but its result was not recorded, so it may or may not have run. Check whether its effect already happened before running it again.", CHATGPT_USAGE_LIMIT_FRAGMENT = "usage_limit_reached", CHATGPT_OAUTH_PROVIDER_TYPE2 = "chatgpt_oauth", BYOK_PROVIDER_CATEGORY = "byok";
+var INVALID_TOOL_CALL_IDS_FRAGMENT = "invalid tool call ids", APPROVAL_PENDING_DETAIL_FRAGMENT = "waiting for approval", CONVERSATION_BUSY_DETAIL_FRAGMENTS, CONVERSATION_BUSY_RUN_ID_PATTERN, EMPTY_RESPONSE_DETAIL_FRAGMENT = "empty content in", RETRYABLE_PROVIDER_DETAIL_PATTERNS, NON_RETRYABLE_PROVIDER_DETAIL_PATTERNS, NON_RETRYABLE_RUN_ERROR_TYPES, NON_RETRYABLE_429_REASONS, NON_RETRYABLE_QUOTA_DETAIL_PATTERNS, NON_RETRYABLE_4XX_PATTERN, RETRYABLE_429_PATTERN, DEFAULT_TRANSIENT_RETRY_BASE_DELAY_MS = 1000, CLOUDFLARE_EDGE_52X_RETRY_BASE_DELAY_MS = 5000, CONVERSATION_BUSY_RETRY_BASE_DELAY_MS = 1e4, EMPTY_RESPONSE_RETRY_BASE_DELAY_MS = 500, STALE_APPROVAL_RECOVERY_DENIAL_REASON = "The agent harness automatically closed this stale pending tool call to recover from a client/server state desync: the server was still waiting on a result for it, but the harness had no matching tool execution in flight and no result was ever recorded. It was not denied by the user or a permissions policy. The harness can't tell whether it ran, so check whether its effect already happened before running it again.", STARTED_TOOL_CALL_RECOVERY_DENIAL_REASON = "The agent harness closed this pending tool call while recovering from an interrupted turn. The call had started, but its result was not recorded, so it may or may not have run. Check whether its effect already happened before running it again.", CHATGPT_USAGE_LIMIT_FRAGMENT = "usage_limit_reached", CHATGPT_OAUTH_PROVIDER_TYPE2 = "chatgpt_oauth", BYOK_PROVIDER_CATEGORY = "byok";
 var init_turn_recovery_policy = __esm(() => {
   init_error_formatter();
   init_zai_errors();
@@ -114248,7 +114276,7 @@ class HeadlessBackend {
   }
   async cancelConversation(...args) {
     const [conversationIdOrAgentId] = args;
-    const runId = this.activeRunByConversation.get(conversationIdOrAgentId) ?? this.findActiveRunByAgentId(conversationIdOrAgentId);
+    const runId = this.activeRunByConversation.get(localConversationKey(conversationIdOrAgentId, this.store.resolveAgentIdForConversation(conversationIdOrAgentId))) ?? this.activeRunByConversation.get(localConversationKey("default", conversationIdOrAgentId)) ?? this.findActiveRunByAgentId(conversationIdOrAgentId);
     const run = runId ? this.runs.get(runId) : undefined;
     if (run?.conversation_id && run.agent_id) {
       this.store.settleInterruptedToolCalls(run.conversation_id, {
@@ -114303,7 +114331,7 @@ class HeadlessBackend {
   }
   async cancelConversationRun(...args) {
     const [conversationId, requestedRunId] = args;
-    const runId = requestedRunId ?? this.activeRunByConversation.get(conversationId);
+    const runId = requestedRunId ?? this.activeRunByConversation.get(localConversationKey(conversationId, this.store.resolveAgentIdForConversation(conversationId)));
     if (!runId)
       return {};
     const run = this.runs.get(runId);
@@ -114338,7 +114366,8 @@ class HeadlessBackend {
     if (options?.signal?.aborted) {
       throw new APIUserAbortError;
     }
-    const activeRunId = this.activeRunByConversation.get(conversationId);
+    const turnAgentId = body.agent_id ?? this.store.resolveAgentIdForConversation(conversationId);
+    const activeRunId = this.activeRunByConversation.get(localConversationKey(conversationId, turnAgentId));
     const activeRun = activeRunId ? this.runs.get(activeRunId) : undefined;
     if (activeRun && !isTerminalRun(activeRun)) {
       throw new Error(`Conversation ${conversationId} already has an active run (${activeRun.id})`);
@@ -114447,7 +114476,7 @@ class HeadlessBackend {
       }
     };
     this.runs.set(run.id, run);
-    this.activeRunByConversation.set(conversationId, run.id);
+    this.activeRunByConversation.set(localConversationKey(conversationId, agentId), run.id);
     return run;
   }
   completeRun(runId, stopReason, errorInfo) {
@@ -114471,9 +114500,7 @@ class HeadlessBackend {
         }
       } : run.metadata
     });
-    if (run.conversation_id) {
-      this.activeRunByConversation.delete(run.conversation_id);
-    }
+    this.releaseActiveRun(run);
     this.runControllerByRunId.delete(runId);
     this.runStartupPreemptByRunId.delete(runId);
   }
@@ -114500,9 +114527,7 @@ class HeadlessBackend {
         }
       }
     });
-    if (run.conversation_id) {
-      this.activeRunByConversation.delete(run.conversation_id);
-    }
+    this.releaseActiveRun(run);
     this.runControllerByRunId.delete(runId);
     this.runStartupPreemptByRunId.delete(runId);
   }
@@ -114522,6 +114547,14 @@ class HeadlessBackend {
     const run = this.runs.get(runId);
     return run ? isTerminalRun(run) : false;
   }
+  releaseActiveRun(run) {
+    if (!run.conversation_id)
+      return;
+    const key = localConversationKey(run.conversation_id, run.agent_id);
+    if (this.activeRunByConversation.get(key) === run.id) {
+      this.activeRunByConversation.delete(key);
+    }
+  }
   findActiveRunByAgentId(agentId) {
     for (const [runId, run] of this.runs.entries()) {
       if (run.agent_id === agentId && !isTerminalRun(run))
@@ -117167,11 +117200,9 @@ function createUsageStatisticsChunk(usage, contextTokensEstimate) {
   const cachedInputTokens = usage?.cacheRead;
   const cacheWriteTokens = usage?.cacheWrite;
   const reasoningTokens = usage?.reasoning;
-  if (promptTokens === undefined && completionTokens === undefined && totalTokens === undefined && cachedInputTokens === undefined && cacheWriteTokens === undefined && reasoningTokens === undefined && contextTokens === undefined) {
-    return;
-  }
   return {
     message_type: "usage_statistics",
+    step_count: 1,
     ...promptTokens !== undefined ? { prompt_tokens: promptTokens } : {},
     ...completionTokens !== undefined ? { completion_tokens: completionTokens } : {},
     ...totalTokens !== undefined ? { total_tokens: totalTokens } : {},
@@ -117284,11 +117315,8 @@ function createProviderLettaStream(events, contextTokensEstimate) {
           }
           if (part.type === "done") {
             if (!sawUsageStatistics) {
-              const usageChunk = createUsageStatisticsChunk(part.message.usage, contextTokensEstimate);
-              if (usageChunk) {
-                sawUsageStatistics = true;
-                yield usageChunk;
-              }
+              sawUsageStatistics = true;
+              yield createUsageStatisticsChunk(part.message.usage, contextTokensEstimate);
             }
             pendingStopReason = {
               message_type: "stop_reason",
@@ -163406,14 +163434,14 @@ function buildLatestVersionUrl(packageName, registryBaseUrl) {
 function buildInstallCommand(pm, env6 = process.env) {
   return `${pm} ${buildInstallArgs(pm, env6).join(" ")}`;
 }
-function buildUpdateExecOptions(timeout, platform4 = process.platform) {
+function buildUpdateExecOptions(timeout = 0, platform4 = process.platform) {
   return {
     timeout,
     encoding: "utf8",
     shell: platform4 === "win32"
   };
 }
-async function runUpdateCommand(command, args, timeout) {
+async function runUpdateCommand(command, args, timeout = 0) {
   return execFileAsync3(command, args, buildUpdateExecOptions(timeout));
 }
 function getResolvedEntrypoint() {
@@ -163616,7 +163644,7 @@ async function performUpdate(progressLog) {
   try {
     debugLog2(`Running ${installCmd}...`);
     progressLog?.(`Running update command: ${installCmd}`);
-    await runUpdateCommand(pm, installArgs, UPDATE_INSTALL_TIMEOUT_MS);
+    await runUpdateCommand(pm, installArgs);
     debugLog2("Update completed successfully");
     progressLog?.("Update command completed successfully.");
     return { success: true };
@@ -163633,7 +163661,7 @@ async function performUpdate(progressLog) {
       debugLog2("ENOTEMPTY detected, attempting cleanup and retry...");
       await cleanupOrphanedDirs(globalPath);
       try {
-        await runUpdateCommand(pm, installArgs, UPDATE_INSTALL_TIMEOUT_MS);
+        await runUpdateCommand(pm, installArgs);
         debugLog2("Update succeeded after cleanup retry");
         return { success: true };
       } catch (retryError) {
@@ -163661,7 +163689,7 @@ async function performUpdate(progressLog) {
         await cleanupOrphanedDirs(globalPath);
       }
       try {
-        await runUpdateCommand(pm, installArgs, UPDATE_INSTALL_TIMEOUT_MS);
+        await runUpdateCommand(pm, installArgs);
         debugLog2("Update succeeded after race condition retry");
         return { success: true };
       } catch (retryError) {
@@ -163755,7 +163783,7 @@ async function manualUpdate(options) {
 To update manually: ${installCmd}`
   };
 }
-var execFileAsync3, DEBUG, DEFAULT_UPDATE_PACKAGE_NAME = "@letta-ai/letta-code", DEFAULT_UPDATE_REGISTRY_BASE_URL = "https://registry.npmjs.org", UPDATE_PACKAGE_NAME_ENV = "LETTA_UPDATE_PACKAGE_NAME", UPDATE_REGISTRY_BASE_URL_ENV = "LETTA_UPDATE_REGISTRY_BASE_URL", UPDATE_INSTALL_REGISTRY_URL_ENV = "LETTA_UPDATE_INSTALL_REGISTRY_URL", DESKTOP_MANAGED_ENV = "LETTA_CODE_DESKTOP_MANAGED", INSTALL_ARG_PREFIX, VALID_PACKAGE_MANAGERS, NPM_PREFIX_TIMEOUT_MS = 5000, UPDATE_INSTALL_TIMEOUT_MS = 60000, PYTHON_UPDATE_COMMAND = "Upgrade with your installer: uv tool upgrade letta, pipx upgrade letta, or python -m pip install --upgrade letta";
+var execFileAsync3, DEBUG, DEFAULT_UPDATE_PACKAGE_NAME = "@letta-ai/letta-code", DEFAULT_UPDATE_REGISTRY_BASE_URL = "https://registry.npmjs.org", UPDATE_PACKAGE_NAME_ENV = "LETTA_UPDATE_PACKAGE_NAME", UPDATE_REGISTRY_BASE_URL_ENV = "LETTA_UPDATE_REGISTRY_BASE_URL", UPDATE_INSTALL_REGISTRY_URL_ENV = "LETTA_UPDATE_INSTALL_REGISTRY_URL", DESKTOP_MANAGED_ENV = "LETTA_CODE_DESKTOP_MANAGED", INSTALL_ARG_PREFIX, VALID_PACKAGE_MANAGERS, NPM_PREFIX_TIMEOUT_MS = 5000, PYTHON_UPDATE_COMMAND = "Upgrade with your installer: uv tool upgrade letta, pipx upgrade letta, or python -m pip install --upgrade letta";
 var init_auto_update = __esm(() => {
   init_error_reporting();
   init_version();
@@ -180737,9 +180765,12 @@ class ChannelControlRequestCoordinator {
       return true;
     }
     await this.clear(requestId);
-    if (result2 === "expired") {
-      await this.options.deliverReprompt(cloneEvent(pending.event), input, "That approval prompt expired before I could use your reply. Please ask the agent to try again.");
-    }
+    if (result2 !== "expired")
+      return true;
+    const wasApproval = "decision" in parsed.response && parsed.response.decision?.behavior === "allow";
+    if (!wasApproval)
+      return false;
+    await this.options.deliverReprompt(cloneEvent(pending.event), input, "That approval prompt expired before I could use your reply. Please ask the agent to try again.");
     return true;
   }
   async clear(requestId) {
@@ -181380,7 +181411,8 @@ function createChannelInboundRouter(deps) {
         content: formatChannelNotification(preparedMessage2),
         turnSources: [
           buildChannelTurnSource(discordResult.route, preparedMessage2)
-        ]
+        ],
+        defaultPermissionMode: config.defaultPermissionMode
       });
       return;
     }
@@ -181445,7 +181477,8 @@ function createChannelInboundRouter(deps) {
     deps.deliver({
       route,
       content,
-      turnSources: [buildChannelTurnSource(route, preparedMessage)]
+      turnSources: [buildChannelTurnSource(route, preparedMessage)],
+      ...isDiscordChannelAccount(config) || isSlackChannelAccount(config) ? { defaultPermissionMode: config.defaultPermissionMode } : {}
     });
   }
   return { handleInboundMessage };
@@ -193257,7 +193290,10 @@ var init_parse_interval = __esm(() => {
 });
 
 // src/cron/process-identity.ts
+import { execFileSync as execFileSync7 } from "node:child_process";
 import { readFileSync as readFileSync26 } from "node:fs";
+import { uptime } from "node:os";
+import { basename as basename15 } from "node:path";
 function readLinuxProcessIdentity(pid) {
   try {
     const stat5 = readFileSync26(`/proc/${pid}/stat`, "utf8");
@@ -193309,10 +193345,51 @@ function isProcessAlive2(pid, owner) {
       }
     }
   }
+  if (pid === process.pid)
+    return true;
+  if (owner && pidReuseProbe.platform !== "linux") {
+    return !isPidReusedSinceBoot(pid, owner.started_at);
+  }
   return true;
 }
-var readProcessIdentityOverride = null;
-var init_process_identity = () => {};
+function isPidReusedSinceBoot(pid, startedAt) {
+  const startedAtMs = startedAt ? Date.parse(startedAt) : Number.NaN;
+  if (!Number.isFinite(startedAtMs) || startedAtMs >= pidReuseProbe.bootTimeMs() - BOOT_TIME_SLACK_MS) {
+    return false;
+  }
+  const command = pidReuseProbe.getProcessCommand(pid);
+  return Boolean(command) && !isLettaCommand(command ?? "");
+}
+function isLettaCommand(command) {
+  if (/letta/i.test(command))
+    return true;
+  const script4 = process.argv[1];
+  if (script4 && command.includes(script4))
+    return true;
+  const argv0 = command.split(/\s+/)[0] ?? "";
+  return argv0 === process.execPath || basename15(argv0) === basename15(process.execPath);
+}
+var BOOT_TIME_SLACK_MS = 60000, defaultPidReuseProbe, pidReuseProbe, readProcessIdentityOverride = null;
+var init_process_identity = __esm(() => {
+  defaultPidReuseProbe = {
+    platform: process.platform,
+    bootTimeMs: () => Date.now() - uptime() * 1000,
+    getProcessCommand: (pid) => {
+      if (process.platform === "win32")
+        return null;
+      try {
+        return execFileSync7("ps", ["-p", String(pid), "-o", "command="], {
+          encoding: "utf-8",
+          timeout: 1000,
+          stdio: ["ignore", "pipe", "ignore"]
+        }).trim();
+      } catch {
+        return null;
+      }
+    }
+  };
+  pidReuseProbe = defaultPidReuseProbe;
+});
 
 // src/cron/cron-file.ts
 import { randomBytes as randomBytes2 } from "node:crypto";
@@ -210919,7 +210996,7 @@ var init_mcp_client = __esm(() => {
   init_streamableHttp();
   DEFAULT_CLIENT_INFO = {
     name: "letta-code",
-    version: "0.34.22"
+    version: "0.34.24"
   };
 });
 
@@ -214052,7 +214129,7 @@ var init_cwd = __esm(() => {
 });
 
 // src/websocket/listener/durable-file-lock.ts
-import { execFileSync as execFileSync7 } from "node:child_process";
+import { execFileSync as execFileSync8 } from "node:child_process";
 import { randomUUID as randomUUID29 } from "node:crypto";
 import {
   chmodSync as chmodSync5,
@@ -214071,7 +214148,7 @@ import {
   unlinkSync as unlinkSync7,
   writeFileSync as writeFileSync23
 } from "node:fs";
-import { basename as basename15, dirname as dirname15, join as join43 } from "node:path";
+import { basename as basename16, dirname as dirname15, join as join43 } from "node:path";
 function installCandidateDirectory(candidatePath, lockPath, hooks) {
   mkdirSync27(lockPath, { mode: 448 });
   const directoryIdentity = pathIdentity(lockPath);
@@ -214121,7 +214198,7 @@ function fsyncDirectory(path12, platform5 = process.platform) {
     closeSync4(fd);
   }
 }
-function getProcessStart(pid, platform5 = process.platform, run = (executable, args, options) => execFileSync7(executable, args, {
+function getProcessStart(pid, platform5 = process.platform, run = (executable, args, options) => execFileSync8(executable, args, {
   ...options,
   encoding: "utf8",
   windowsHide: true
@@ -214298,7 +214375,7 @@ function removeDeadOwner(lockPath, parent, ownerPath, afterOwnerUnlink) {
   return true;
 }
 function sweepDeadCandidates(lockPath, parent, isOwnerAlive, ignoredPath) {
-  const prefix = `${basename15(lockPath)}.candidate-`;
+  const prefix = `${basename16(lockPath)}.candidate-`;
   const allCandidates = readdirSync9(parent, { withFileTypes: true }).filter((entry) => entry.name.startsWith(prefix) && entry.isDirectory());
   let hasUnresolvedCandidate = allCandidates.length > MAX_CANDIDATE_SWEEP;
   const candidates2 = allCandidates.slice(0, MAX_CANDIDATE_SWEEP);
@@ -217047,8 +217124,8 @@ function isGitExecutable(command) {
 }
 function isShellExecutable(command) {
   const normalized = command.replace(/\\/g, "/").toLowerCase();
-  const basename16 = path13.basename(normalized);
-  return basename16 === "bash" || basename16 === "sh" || basename16 === "zsh" || basename16 === "ash" || basename16 === "cmd.exe" || basename16.includes("powershell") || basename16.includes("pwsh");
+  const basename17 = path13.basename(normalized);
+  return basename17 === "bash" || basename17 === "sh" || basename17 === "zsh" || basename17 === "ash" || basename17 === "cmd.exe" || basename17.includes("powershell") || basename17.includes("pwsh");
 }
 function extractShellCommandArgument(launcher, startIndex) {
   const argIndex = launcher.findIndex((token2, index) => {
@@ -218133,7 +218210,7 @@ function detectShellContext(env6 = process.env, currentPlatform = platform6()) {
 var init_shell_context = () => {};
 
 // src/tools/impl/shell-launchers.ts
-import { existsSync as existsSync35 } from "node:fs";
+import { lstatSync as lstatSync2 } from "node:fs";
 import { delimiter as delimiter3, isAbsolute as isAbsolute11, join as join48 } from "node:path";
 function isValidEnvAlias(name) {
   return /^[A-Za-z_][A-Za-z0-9_]*$/.test(name);
@@ -218244,12 +218321,20 @@ function hasPathSeparator(executable) {
   return executable.includes("/") || executable.includes("\\");
 }
 function hasFileExtension(executable) {
-  const basename17 = executable.split(/[\\/]/).pop() ?? executable;
-  return /\.[^.]+$/.test(basename17);
+  const basename18 = executable.split(/[\\/]/).pop() ?? executable;
+  return /\.[^.]+$/.test(basename18);
+}
+function shellCandidateExists(candidate) {
+  try {
+    lstatSync2(candidate);
+    return true;
+  } catch {
+    return false;
+  }
 }
 function resolveExecutablePath(executable, env6) {
   if (isAbsolute11(executable) || hasPathSeparator(executable)) {
-    return existsSync35(executable) ? executable : null;
+    return shellCandidateExists(executable) ? executable : null;
   }
   const pathDelimiter = process.platform === "win32" ? ";" : delimiter3;
   const pathEntries = pathEnvValue(env6).split(pathDelimiter).filter(Boolean);
@@ -218262,7 +218347,7 @@ function resolveExecutablePath(executable, env6) {
   for (const entry of pathEntries) {
     for (const name of executableNames) {
       const candidate = join48(entry, name);
-      if (existsSync35(candidate)) {
+      if (shellCandidateExists(candidate)) {
         return candidate;
       }
     }
@@ -219069,7 +219154,7 @@ var SANDBOX_EXEC_PATH = "/usr/bin/sandbox-exec";
 
 // src/sandbox/availability.ts
 import { spawnSync as spawnSync5 } from "node:child_process";
-import { existsSync as existsSync36 } from "node:fs";
+import { existsSync as existsSync35 } from "node:fs";
 import { delimiter as delimiter4, isAbsolute as isAbsolute12, join as join49 } from "node:path";
 function detectSandboxBackend(options = {}) {
   const platform7 = options.platform ?? process.platform;
@@ -219101,7 +219186,7 @@ function warnSandboxBackendUnavailable(availability, context3) {
 }
 function probe(platform7) {
   if (platform7 === "darwin") {
-    if (existsSync36(SANDBOX_EXEC_PATH)) {
+    if (existsSync35(SANDBOX_EXEC_PATH)) {
       return { backend: "seatbelt", reason: "sandbox-exec available" };
     }
     return {
@@ -219136,13 +219221,13 @@ function probeBwrap() {
   return { backend: "bwrap", bwrapPath, reason: "bwrap available" };
 }
 function resolveExecutableOnPath(executable, envPath = process.env.PATH) {
-  if (isAbsolute12(executable) && existsSync36(executable))
+  if (isAbsolute12(executable) && existsSync35(executable))
     return executable;
   for (const dir of (envPath ?? "").split(delimiter4)) {
     if (!dir)
       continue;
     const candidate = join49(dir, executable);
-    if (existsSync36(candidate))
+    if (existsSync35(candidate))
       return candidate;
   }
   return null;
@@ -219183,7 +219268,7 @@ var init_policy = () => {};
 
 // src/permissions/memory-paths.ts
 import { homedir as homedir19 } from "node:os";
-import { basename as basename17, dirname as dirname20, isAbsolute as isAbsolute13, resolve as resolve16 } from "node:path";
+import { basename as basename18, dirname as dirname20, isAbsolute as isAbsolute13, resolve as resolve16 } from "node:path";
 function normalizeMemoryPath(path15) {
   const resolvedPath = resolve16(expandHomePath(path15));
   const normalized = resolvedPath.replace(/\\/g, "/");
@@ -219228,7 +219313,7 @@ function addRootAndSiblingWorktree(root2, acc) {
     return;
   }
   acc.add(normalizedRoot);
-  const leaf = basename17(normalizedRoot);
+  const leaf = basename18(normalizedRoot);
   if (leaf === "memory") {
     acc.add(normalizeMemoryPath(resolve16(dirname20(normalizedRoot), "memory-worktrees")));
   }
@@ -219309,9 +219394,9 @@ var init_memory_paths = __esm(() => {
 });
 
 // src/permissions/sandbox-policy.ts
-import { existsSync as existsSync37, realpathSync as realpathSync5 } from "node:fs";
+import { existsSync as existsSync36, realpathSync as realpathSync5 } from "node:fs";
 import { homedir as homedir20 } from "node:os";
-import { basename as basename18, dirname as dirname21, isAbsolute as isAbsolute14, join as join50, resolve as resolve17 } from "node:path";
+import { basename as basename19, dirname as dirname21, isAbsolute as isAbsolute14, join as join50, resolve as resolve17 } from "node:path";
 function getDefaultAgentsTreeRoot(homeDir = homedir20()) {
   return canonicalizeRoot(join50(homeDir, ".letta", "agents"));
 }
@@ -219330,8 +219415,8 @@ function canonicalizeRoot(input) {
   const abs = isAbsolute14(input) ? input : resolve17(input);
   let dir = abs;
   const tail2 = [];
-  while (!existsSync37(dir)) {
-    tail2.unshift(basename18(dir));
+  while (!existsSync36(dir)) {
+    tail2.unshift(basename19(dir));
     const parent = dirname21(dir);
     if (parent === dir) {
       return normalizeSandboxPath(abs);
@@ -219365,8 +219450,8 @@ function deriveSelfAgentRootsForTrees(memoryRoots, agentsTreeRoots = getCrossBac
     const canon = canonicalizeRoot(root2);
     const containingTree = canonicalTrees.find((tree) => canon !== tree && isWithinRoot(canon, tree));
     if (containingTree) {
-      const leaf = basename18(canon);
-      const parentLeaf = basename18(dirname21(canon));
+      const leaf = basename19(canon);
+      const parentLeaf = basename19(dirname21(canon));
       out.add(leaf === "memory" || leaf === "memory-worktrees" ? dirname21(canon) : parentLeaf === "memory-worktrees" || parentLeaf === "memory" && leaf === ".git" ? dirname21(dirname21(canon)) : canon);
       continue;
     }
@@ -220579,8 +220664,8 @@ function resolveRemovalTarget(rawTarget, cwd2, env6) {
   let target2 = expandEnvironment(rawTarget, env6).replace(/[),]+$/g, "").replace(/(?<=[\\/:])\$(?:env:)?[A-Za-z_][A-Za-z0-9_]*/gi, "").replaceAll("/", "\\");
   if (!target2 || target2 === "*")
     return null;
-  const basename19 = win323.basename(target2);
-  if (basename19.includes("*") || basename19.includes("?")) {
+  const basename20 = win323.basename(target2);
+  if (basename20.includes("*") || basename20.includes("?")) {
     target2 = win323.dirname(target2);
   }
   return win323.normalize(win323.resolve(cwd2, target2));
@@ -223861,10 +223946,10 @@ var init_memory_runtime = __esm(() => {
 });
 
 // src/tools/impl/memory.ts
-import { execFileSync as execFileSync8 } from "node:child_process";
+import { execFileSync as execFileSync9 } from "node:child_process";
 import {
   closeSync as closeSync5,
-  existsSync as existsSync39,
+  existsSync as existsSync38,
   openSync as openSync5,
   readdirSync as readdirSync13,
   readFileSync as readFileSync32,
@@ -223971,7 +224056,7 @@ function lastEditedByChild(dir, names2) {
     if (time3 > (edited.get(name) ?? 0))
       edited.set(name, time3);
   };
-  const git = (args) => execFileSync8("git", ["-C", dir, ...args], {
+  const git = (args) => execFileSync9("git", ["-C", dir, ...args], {
     encoding: "utf8",
     timeout: 5000,
     maxBuffer: 64 * 1024 * 1024,
@@ -224056,7 +224141,7 @@ function renderDirectory(memoryDir, relPath, fullPath) {
   const open4 = `<memory_content path="${escapeXmlText2(relPath).replace(/"/g, "&quot;")}">`;
   const close = "</memory_content>";
   let head4;
-  if (existsSync39(indexPath)) {
+  if (existsSync38(indexPath)) {
     const budget = Math.max(2000, LIMITS.READ_OUTPUT_CHARS - tailText.length - open4.length - close.length - 16);
     head4 = clampContent(readFileSync32(indexPath, "utf8").trimEnd(), indexPath, budget);
   } else {
@@ -224107,8 +224192,8 @@ async function memory2(args) {
     throw new Error(`skills/ is reserved for skills. Use Skill("${segments[1] ?? "<name>"}").`);
   }
   const fullPath = join52(memoryDir, ...segments);
-  if (!existsSync39(fullPath)) {
-    const candidates2 = !relPath.endsWith(".md") && existsSync39(`${fullPath}.md`) ? [`${relPath}.md`] : findByBasename(memoryDir, segments[segments.length - 1] ?? relPath);
+  if (!existsSync38(fullPath)) {
+    const candidates2 = !relPath.endsWith(".md") && existsSync38(`${fullPath}.md`) ? [`${relPath}.md`] : findByBasename(memoryDir, segments[segments.length - 1] ?? relPath);
     const hint = candidates2.length ? ` Did you mean ${candidates2.join(" or ")}? Paths are relative to the memory directory.` : "";
     throw new Error(`No memory at ${relPath}.${hint}`);
   }
@@ -227176,10 +227261,11 @@ var init_read_only_shell = __esm(() => {
 // src/permissions/checker.ts
 var exports_checker = {};
 __export(exports_checker, {
+  isPathWithin: () => isPathWithin,
   checkPermissionWithHooks: () => checkPermissionWithHooks,
   checkPermission: () => checkPermission
 });
-import { resolve as resolve24 } from "node:path";
+import { posix as posix3, resolve as resolve24, win32 as win324 } from "node:path";
 function envFlagEnabled(name) {
   const value = process.env[name];
   if (!value)
@@ -227542,15 +227628,25 @@ function checkPermissionForEngine(engine4, toolName2, toolArgs, permissions, wor
     trace
   };
 }
+function isPathWithin(child, root2, pathImpl = process.platform === "win32" ? win324 : posix3) {
+  const caseInsensitive = pathImpl === win324;
+  const normalizedChild = caseInsensitive ? child.toLowerCase() : child;
+  const normalizedRoot = caseInsensitive ? root2.toLowerCase() : root2;
+  const rel = pathImpl.relative(normalizedRoot, normalizedChild);
+  if (rel === "") {
+    return true;
+  }
+  return rel !== ".." && !rel.startsWith(`..${pathImpl.sep}`) && !pathImpl.isAbsolute(rel);
+}
 function isWithinAllowedDirectories(filePath, permissions, workingDirectory) {
   const absolutePath = resolve24(workingDirectory, filePath);
-  if (absolutePath.startsWith(workingDirectory)) {
+  if (isPathWithin(absolutePath, resolve24(workingDirectory))) {
     return true;
   }
   if (permissions.additionalDirectories) {
     for (const dir of permissions.additionalDirectories) {
       const resolvedDir = resolve24(workingDirectory, dir);
-      if (absolutePath.startsWith(resolvedDir)) {
+      if (isPathWithin(absolutePath, resolvedDir)) {
         return true;
       }
     }
@@ -228016,7 +228112,7 @@ __export(exports_analyzer, {
   analyzeApprovalContext: () => analyzeApprovalContext
 });
 import { homedir as homedir28 } from "node:os";
-import { dirname as dirname23, relative as relative5, resolve as resolve26, win32 as win324 } from "node:path";
+import { dirname as dirname23, relative as relative5, resolve as resolve26, win32 as win325 } from "node:path";
 function normalizeOsPath(path18) {
   return path18.replace(/\\/g, "/");
 }
@@ -228025,24 +228121,24 @@ function isWindowsPath(path18) {
 }
 function resolvePathForContext(basePath, targetPath) {
   const windows = isWindowsPath(basePath) || isWindowsPath(targetPath);
-  return windows ? win324.resolve(basePath, targetPath) : resolve26(basePath, targetPath);
+  return windows ? win325.resolve(basePath, targetPath) : resolve26(basePath, targetPath);
 }
 function relativePathForContext(basePath, targetPath) {
   const windows = isWindowsPath(basePath) || isWindowsPath(targetPath);
-  return windows ? win324.relative(basePath, targetPath) : relative5(basePath, targetPath);
+  return windows ? win325.relative(basePath, targetPath) : relative5(basePath, targetPath);
 }
 function isPathWithinDirectory(path18, directory) {
   const windows = isWindowsPath(path18) || isWindowsPath(directory);
   const normalizedPath = normalizeOsPath(path18);
   const normalizedDirectory = normalizeOsPath(directory);
-  const relativePath = normalizeOsPath(windows ? win324.relative(normalizedDirectory.toLowerCase(), normalizedPath.toLowerCase()) : relativePathForContext(normalizedDirectory, normalizedPath));
+  const relativePath = normalizeOsPath(windows ? win325.relative(normalizedDirectory.toLowerCase(), normalizedPath.toLowerCase()) : relativePathForContext(normalizedDirectory, normalizedPath));
   if (relativePath === "") {
     return true;
   }
   return !relativePath.startsWith("../") && relativePath !== ".." && !relativePath.startsWith("/") && !/^[a-zA-Z]:\//.test(relativePath);
 }
 function dirnameForContext(path18) {
-  return isWindowsPath(path18) ? win324.dirname(path18) : dirname23(path18);
+  return isWindowsPath(path18) ? win325.dirname(path18) : dirname23(path18);
 }
 function formatAbsoluteRulePath(path18) {
   const normalized = normalizeOsPath(path18).replace(/\/+$/, "");
@@ -228938,7 +229034,7 @@ var init_approval_result_normalization = __esm(() => {
 
 // src/agent/client-skills-watcher.ts
 import {
-  existsSync as existsSync40,
+  existsSync as existsSync39,
   readdirSync as readdirSync14,
   realpathSync as realpathSync7,
   statSync as statSync17,
@@ -229038,7 +229134,7 @@ class ClientSkillsWatcher {
     const watchPaths = new Set;
     let recursive = false;
     let awaitedChild = null;
-    if (existsSync40(root2)) {
+    if (existsSync39(root2)) {
       recursive = true;
       watchPaths.add(root2);
       collectSymlinkDirectoryTargets(root2, watchPaths, new Set);
@@ -229091,7 +229187,7 @@ __export(exports_skills2, {
   PROJECT_SKILLS_DIR: () => PROJECT_SKILLS_DIR,
   GLOBAL_SKILLS_DIR: () => GLOBAL_SKILLS_DIR
 });
-import { existsSync as existsSync41 } from "node:fs";
+import { existsSync as existsSync40 } from "node:fs";
 import { readdir as readdir4, readFile as readFile11, realpath as realpath3, stat as stat6 } from "node:fs/promises";
 import { dirname as dirname25, join as join54 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
@@ -229156,7 +229252,7 @@ async function getBundledSkills() {
 }
 async function discoverSkillsFromDir(skillsPath, source) {
   const errors6 = [];
-  if (!existsSync41(skillsPath)) {
+  if (!existsSync40(skillsPath)) {
     return { skills: [], errors: [] };
   }
   const skills = [];
@@ -229328,7 +229424,7 @@ var init_skills5 = __esm(() => {
 });
 
 // src/agent/shared-memory-skills.ts
-import { existsSync as existsSync42 } from "node:fs";
+import { existsSync as existsSync41 } from "node:fs";
 import { dirname as dirname26, join as join55 } from "node:path";
 function getAttachedRepositoriesCache() {
   const global2 = globalThis;
@@ -229421,7 +229517,7 @@ async function discoverSharedMemorySkills(skillsDirs) {
     const repositoryMount = dirname26(dir);
     if (isCheckoutPending(repositoryMount))
       continue;
-    if (!existsSync42(repositoryMount)) {
+    if (!existsSync41(repositoryMount)) {
       errors6.push({
         path: repositoryMount,
         message: "Attached repository is not mounted locally"
@@ -229467,7 +229563,7 @@ __export(exports_client_skills, {
   buildClientSkillsUpdateReminder: () => buildClientSkillsUpdateReminder,
   buildClientSkillsPayload: () => buildClientSkillsPayload
 });
-import { existsSync as existsSync43 } from "node:fs";
+import { existsSync as existsSync42 } from "node:fs";
 import { join as join56, resolve as resolve28 } from "node:path";
 function getCache2() {
   const global2 = globalThis;
@@ -229596,7 +229692,7 @@ function buildClientSkillsUpdateReminder(previous, current) {
 function getMemorySkillsDirs(agentId) {
   const dirs = new Set;
   const scopedMemoryDir = resolveScopedMemoryDir({ agentId });
-  if (scopedMemoryDir && scopedMemoryDir.trim().length > 0 && existsSync43(scopedMemoryDir)) {
+  if (scopedMemoryDir && scopedMemoryDir.trim().length > 0 && existsSync42(scopedMemoryDir)) {
     dirs.add(join56(scopedMemoryDir.trim(), "skills"));
   } else {
     const fallbackMemoryDir = (process.env.LETTA_MEMORY_DIR || process.env.MEMORY_DIR || "").trim();
@@ -231602,7 +231698,7 @@ var init_manager2 = __esm(async () => {
 import { createHash as createHash9, randomUUID as randomUUID31 } from "node:crypto";
 import {
   closeSync as closeSync6,
-  existsSync as existsSync44,
+  existsSync as existsSync43,
   fsyncSync as fsyncSync3,
   mkdirSync as mkdirSync31,
   openSync as openSync6,
@@ -231655,7 +231751,7 @@ function mergeRecords(a2, b3) {
 }
 function readAuthorityRecords(path18) {
   const records = new Map;
-  if (!existsSync44(path18))
+  if (!existsSync43(path18))
     return { records, degraded: false };
   try {
     const parsed = JSON.parse(readFileSync34(path18, "utf8"));
@@ -234976,7 +235072,7 @@ var init_memory_reminder = __esm(() => {
 });
 
 // src/agent/system-prompt-size.ts
-import { existsSync as existsSync45, readdirSync as readdirSync15, readFileSync as readFileSync35 } from "node:fs";
+import { existsSync as existsSync44, readdirSync as readdirSync15, readFileSync as readFileSync35 } from "node:fs";
 import { join as join59 } from "node:path";
 function estimateSystemTokens(text2) {
   return Math.ceil(Buffer.byteLength(text2, "utf8") / SYSTEM_PROMPT_BYTES_PER_TOKEN);
@@ -234985,7 +235081,7 @@ function normalizePath3(value) {
   return value.replaceAll("\\", "/");
 }
 function walkMarkdownFiles(dir) {
-  if (!existsSync45(dir)) {
+  if (!existsSync44(dir)) {
     return [];
   }
   const out = [];
@@ -235006,7 +235102,7 @@ function walkMarkdownFiles(dir) {
   return out;
 }
 function estimateSystemPromptSize(memoryDir, localMemfs = false) {
-  if (!existsSync45(memoryDir)) {
+  if (!existsSync44(memoryDir)) {
     return { total: 0, files: [] };
   }
   const memoryFormat = detectMemoryFormat(memoryDir, localMemfs);
@@ -235319,7 +235415,7 @@ var init_background_process_snapshot = __esm(() => {
 });
 
 // src/websocket/listener/constants.ts
-var MAX_RETRY_DURATION_MS, INITIAL_RETRY_DELAY_MS2 = 1000, MAX_RETRY_DELAY_MS = 30000, MAX_RETRY_ATTEMPTS, LISTENER_STREAM_OPEN_TIMEOUT_MS = 30000, LISTENER_HEARTBEAT_INTERVAL_MS = 30000, LISTENER_PONG_TIMEOUT_MS = 90000, SYSTEM_REMINDER_RE, LISTENER_STREAM_RESUME_POLICY, LLM_API_ERROR_MAX_RETRIES = 3, CLOUD_API_DEPLOYMENT_RECOVERY_MAX_ATTEMPTS = 3, EMPTY_RESPONSE_MAX_RETRIES = 2, MAX_PRE_STREAM_RECOVERY = 2, MAX_POST_STOP_APPROVAL_RECOVERY = 2;
+var CLOUD_ENVIRONMENT_NOT_FOUND_CLOSE_REASON = "Environment not found", MAX_RETRY_DURATION_MS, INITIAL_RETRY_DELAY_MS2 = 1000, MAX_RETRY_DELAY_MS = 30000, MAX_RETRY_ATTEMPTS, LISTENER_STREAM_OPEN_TIMEOUT_MS = 30000, LISTENER_HEARTBEAT_INTERVAL_MS = 30000, LISTENER_PONG_TIMEOUT_MS = 90000, SYSTEM_REMINDER_RE, LISTENER_STREAM_RESUME_POLICY, LLM_API_ERROR_MAX_RETRIES = 3, CLOUD_API_DEPLOYMENT_RECOVERY_MAX_ATTEMPTS = 3, EMPTY_RESPONSE_MAX_RETRIES = 2, MAX_PRE_STREAM_RECOVERY = 2, MAX_POST_STOP_APPROVAL_RECOVERY = 2;
 var init_constants3 = __esm(() => {
   MAX_RETRY_DURATION_MS = 5 * 60 * 1000;
   MAX_RETRY_ATTEMPTS = Math.ceil(Math.log2(MAX_RETRY_DURATION_MS / INITIAL_RETRY_DELAY_MS2));
@@ -235332,11 +235428,11 @@ var init_constants3 = __esm(() => {
 });
 
 // src/cli/helpers/git-context.ts
-import { execFile as execFile13, execFileSync as execFileSync9 } from "node:child_process";
+import { execFile as execFile13, execFileSync as execFileSync10 } from "node:child_process";
 import { promisify as promisify13 } from "node:util";
 function runGit2(args, cwd2) {
   try {
-    return execFileSync9("git", args, {
+    return execFileSync10("git", args, {
       cwd: cwd2,
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"],
@@ -235346,15 +235442,20 @@ function runGit2(args, cwd2) {
     return null;
   }
 }
-async function runGitAsync(args, cwd2) {
+async function runGitAsync(args, cwd2, timeoutMs) {
   try {
     const { stdout } = await execFileAsync8("git", args, {
       cwd: cwd2,
       encoding: "utf-8",
-      windowsHide: true
+      windowsHide: true,
+      timeout: timeoutMs,
+      killSignal: "SIGKILL"
     });
     return stdout.trim();
-  } catch {
+  } catch (error5) {
+    if (error5?.killed) {
+      throw new Error(`git ${args[0] ?? ""} timed out after ${timeoutMs}ms`);
+    }
     return null;
   }
 }
@@ -235419,22 +235520,23 @@ function gatherGitContextSnapshot(options = {}) {
     gitUser
   };
 }
-async function getGitContextAsync(cwd2) {
-  if (!await runGitAsync(["rev-parse", "--git-dir"], cwd2)) {
+async function getGitContextAsync(cwd2, options = {}) {
+  const timeoutMs = options.timeoutMs ?? GIT_ASYNC_TIMEOUT_MS;
+  if (!await runGitAsync(["rev-parse", "--git-dir"], cwd2, timeoutMs)) {
     return null;
   }
-  const branch = await runGitAsync(["branch", "--show-current"], cwd2);
+  const branch = await runGitAsync(["branch", "--show-current"], cwd2, timeoutMs);
   const branchList = await runGitAsync([
     "branch",
     "--sort=-committerdate",
     "--format=%(refname:short)",
     "--no-color"
-  ], cwd2);
+  ], cwd2, timeoutMs);
   const recentBranches = branchList ? branchList.split(`
 `).map((b3) => b3.trim()).filter((b3) => b3.length > 0 && b3 !== branch).slice(0, 10) : [];
   return { branch, recent_branches: recentBranches };
 }
-var execFileAsync8;
+var execFileAsync8, GIT_ASYNC_TIMEOUT_MS = 1e4;
 var init_git_context = __esm(() => {
   execFileAsync8 = promisify13(execFile13);
 });
@@ -235472,7 +235574,7 @@ class DeviceGitContextCache {
       });
       this.prune();
       return value;
-    }).finally(() => {
+    }, () => this.entries.get(cwd2)?.value ?? null).finally(() => {
       this.pending.delete(cwd2);
     });
     this.pending.set(cwd2, load);
@@ -235914,39 +236016,6 @@ function enqueueInboundUserMessage(runtime, incoming, actingUserId, options = {}
 }
 
 // src/websocket/listener/turn-correlation.ts
-function mergeTurnCorrelationIndexes(...sources) {
-  const merged = new Map;
-  for (const source of sources) {
-    for (const [conversationKey, runs2] of source ?? []) {
-      const mergedRuns = merged.get(conversationKey) ?? new Map;
-      for (const [runId, clientMessageIds] of runs2) {
-        const mergedClientMessageIds = [
-          ...new Set([...mergedRuns.get(runId) ?? [], ...clientMessageIds])
-        ].slice(-MAX_CLIENT_MESSAGE_IDS_PER_RUN);
-        mergedRuns.delete(runId);
-        mergedRuns.set(runId, mergedClientMessageIds);
-        while (mergedRuns.size > MAX_RECENT_RUN_CORRELATIONS) {
-          const oldestRunId = mergedRuns.keys().next().value;
-          if (!oldestRunId)
-            break;
-          mergedRuns.delete(oldestRunId);
-        }
-      }
-      merged.delete(conversationKey);
-      merged.set(conversationKey, mergedRuns);
-      while (merged.size > MAX_RECENT_CONVERSATIONS) {
-        const oldestConversationKey = merged.keys().next().value;
-        if (!oldestConversationKey)
-          break;
-        merged.delete(oldestConversationKey);
-      }
-    }
-  }
-  return merged;
-}
-function cloneTurnCorrelationIndex(source) {
-  return mergeTurnCorrelationIndexes(source);
-}
 function takeDequeuedClientMessageIds(runtime, batchId) {
   const clientMessageIds = runtime.dequeuedClientMessageIdsByBatchId.get(batchId) ?? [];
   runtime.dequeuedClientMessageIdsByBatchId.delete(batchId);
@@ -237007,7 +237076,7 @@ async function resolveDefaultBaseRef(repoRoot) {
   const branch = currentBranch.stdout.trim();
   return currentBranch.exitCode === 0 && branch && branch !== "HEAD" ? branch : "HEAD";
 }
-function isPathWithin(child, parent) {
+function isPathWithin2(child, parent) {
   const resolvedChild = path21.resolve(child);
   const resolvedParent = path21.resolve(parent);
   return resolvedChild === resolvedParent || resolvedChild.startsWith(resolvedParent + path21.sep);
@@ -237368,7 +237437,7 @@ async function claimWorktreeLock(params) {
   if (result2.outcome === "conflict") {
     throw new Error(formatLockConflict(result2.heldBy, params.worktreePath));
   }
-  if (isPathWithin(params.previousCwd, params.managedDir)) {
+  if (isPathWithin2(params.previousCwd, params.managedDir)) {
     const previousGitDir = await resolveWorktreeGitDir(params.previousCwd);
     if (previousGitDir && previousGitDir !== targetGitDir) {
       await releaseWorktreeLock({ worktreeGitDir: previousGitDir, owner });
@@ -238210,7 +238279,7 @@ No worktree session to exit.`, "success");
     }
     const primaryRoot = await resolvePrimaryWorktreeRoot(repoRoot);
     const managedDir = path24.join(primaryRoot, ".letta", "worktrees");
-    if (!isPathWithin(currentCwd, managedDir)) {
+    if (!isPathWithin2(currentCwd, managedDir)) {
       return textResult([
         `Not in a managed worktree (current directory: ${currentCwd}).`,
         "ExitWorktree only applies to worktrees under .letta/worktrees/; nothing to do."
@@ -238667,8 +238736,8 @@ var require_constants2 = __commonJS((exports, module3) => {
         "@": { type: "at", open: "(?:", close: ")" }
       };
     },
-    globChars(win325) {
-      return win325 === true ? WINDOWS_CHARS : POSIX_CHARS;
+    globChars(win326) {
+      return win326 === true ? WINDOWS_CHARS : POSIX_CHARS;
     }
   };
 });
@@ -238676,7 +238745,7 @@ var require_constants2 = __commonJS((exports, module3) => {
 // node_modules/picomatch/lib/utils.js
 var require_utils2 = __commonJS((exports) => {
   var path27 = __require("path");
-  var win325 = process.platform === "win32";
+  var win326 = process.platform === "win32";
   var {
     REGEX_BACKSLASH,
     REGEX_REMOVE_BACKSLASH,
@@ -238704,7 +238773,7 @@ var require_utils2 = __commonJS((exports) => {
     if (options && typeof options.windows === "boolean") {
       return options.windows;
     }
-    return win325 === true || path27.sep === "\\";
+    return win326 === true || path27.sep === "\\";
   };
   exports.escapeLast = (input, char, lastIdx) => {
     const idx = input.lastIndexOf(char, lastIdx);
@@ -239089,8 +239158,8 @@ var require_parse3 = __commonJS((exports, module3) => {
     const bos = { type: "bos", value: "", output: opts.prepend || "" };
     const tokens = [bos];
     const capture = opts.capture ? "" : "?:";
-    const win325 = utils.isWindows(options);
-    const PLATFORM_CHARS = constants6.globChars(win325);
+    const win326 = utils.isWindows(options);
+    const PLATFORM_CHARS = constants6.globChars(win326);
     const EXTGLOB_CHARS = constants6.extglobChars(PLATFORM_CHARS);
     const {
       DOT_LITERAL,
@@ -239324,9 +239393,9 @@ var require_parse3 = __commonJS((exports, module3) => {
               const idx = prev.value.lastIndexOf("[");
               const pre = prev.value.slice(0, idx);
               const rest5 = prev.value.slice(idx + 2);
-              const posix3 = POSIX_REGEX_SOURCE[rest5];
-              if (posix3) {
-                prev.value = pre + posix3;
+              const posix4 = POSIX_REGEX_SOURCE[rest5];
+              if (posix4) {
+                prev.value = pre + posix4;
                 state2.backtrack = true;
                 advance();
                 if (!bos.output && tokens.indexOf(prev) === 1) {
@@ -239762,7 +239831,7 @@ var require_parse3 = __commonJS((exports, module3) => {
       throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max2}`);
     }
     input = REPLACEMENTS[input] || input;
-    const win325 = utils.isWindows(options);
+    const win326 = utils.isWindows(options);
     const {
       DOT_LITERAL,
       SLASH_LITERAL,
@@ -239773,7 +239842,7 @@ var require_parse3 = __commonJS((exports, module3) => {
       NO_DOTS_SLASH,
       STAR,
       START_ANCHOR
-    } = constants6.globChars(win325);
+    } = constants6.globChars(win326);
     const nodot = opts.dot ? NO_DOTS : NO_DOT;
     const slashDot = opts.dot ? NO_DOTS_SLASH : NO_DOT;
     const capture = opts.capture ? "" : "?:";
@@ -239852,7 +239921,7 @@ var require_picomatch = __commonJS((exports, module3) => {
       throw new TypeError("Expected pattern to be a non-empty string");
     }
     const opts = options || {};
-    const posix3 = utils.isWindows(options);
+    const posix4 = utils.isWindows(options);
     const regex4 = isState ? picomatch.compileRe(glob3, options) : picomatch.makeRe(glob3, options, false, true);
     const state2 = regex4.state;
     delete regex4.state;
@@ -239862,8 +239931,8 @@ var require_picomatch = __commonJS((exports, module3) => {
       isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
     }
     const matcher = (input, returnObject = false) => {
-      const { isMatch: isMatch2, match: match3, output } = picomatch.test(input, regex4, options, { glob: glob3, posix: posix3 });
-      const result2 = { glob: glob3, state: state2, regex: regex4, posix: posix3, input, output, match: match3, isMatch: isMatch2 };
+      const { isMatch: isMatch2, match: match3, output } = picomatch.test(input, regex4, options, { glob: glob3, posix: posix4 });
+      const result2 = { glob: glob3, state: state2, regex: regex4, posix: posix4, input, output, match: match3, isMatch: isMatch2 };
       if (typeof opts.onResult === "function") {
         opts.onResult(result2);
       }
@@ -239888,7 +239957,7 @@ var require_picomatch = __commonJS((exports, module3) => {
     }
     return matcher;
   };
-  picomatch.test = (input, regex4, options, { glob: glob3, posix: posix3 } = {}) => {
+  picomatch.test = (input, regex4, options, { glob: glob3, posix: posix4 } = {}) => {
     if (typeof input !== "string") {
       throw new TypeError("Expected input to be a string");
     }
@@ -239896,7 +239965,7 @@ var require_picomatch = __commonJS((exports, module3) => {
       return { isMatch: false, output: "" };
     }
     const opts = options || {};
-    const format6 = opts.format || (posix3 ? utils.toPosixSlashes : null);
+    const format6 = opts.format || (posix4 ? utils.toPosixSlashes : null);
     let match3 = input === glob3;
     let output = match3 && format6 ? format6(input) : input;
     if (match3 === false) {
@@ -239905,14 +239974,14 @@ var require_picomatch = __commonJS((exports, module3) => {
     }
     if (match3 === false || opts.capture === true) {
       if (opts.matchBase === true || opts.basename === true) {
-        match3 = picomatch.matchBase(input, regex4, options, posix3);
+        match3 = picomatch.matchBase(input, regex4, options, posix4);
       } else {
         match3 = regex4.exec(output);
       }
     }
     return { isMatch: Boolean(match3), match: match3, output };
   };
-  picomatch.matchBase = (input, glob3, options, posix3 = utils.isWindows(options)) => {
+  picomatch.matchBase = (input, glob3, options, posix4 = utils.isWindows(options)) => {
     const regex4 = glob3 instanceof RegExp ? glob3 : picomatch.makeRe(glob3, options);
     return regex4.test(path27.basename(input));
   };
@@ -240308,7 +240377,7 @@ function buildCloudScheduleInput(params) {
   }
   const targetDeviceId = params.targetDeviceId?.trim();
   if (targetDeviceId) {
-    notes.push(CLOUD_DEVICE_FALLBACK_NOTE);
+    notes.push(CLOUD_DEVICE_OFFLINE_NOTE);
   }
   return {
     input: {
@@ -240322,7 +240391,7 @@ function buildCloudScheduleInput(params) {
     notes
   };
 }
-var CLOUD_EXECUTION_TARGET = "cloud-sandbox", SYNTHETIC_CLOUD_DEVICE_ID = "__letta_cloud__", SYNTHETIC_LOCAL_PLACEHOLDER_ID = "local", CLOUD_CRON_UTC_NOTE = "Recurring Cloud schedules currently interpret cron expressions in UTC (timezone support is tracked in LET-9815).", CLOUD_DEVICE_FALLBACK_NOTE = "If the target computer is offline when the schedule fires, execution falls back to the agent's cloud sandbox.";
+var CLOUD_EXECUTION_TARGET = "cloud-sandbox", SYNTHETIC_CLOUD_DEVICE_ID = "__letta_cloud__", SYNTHETIC_LOCAL_PLACEHOLDER_ID = "local", CLOUD_CRON_UTC_NOTE = "Recurring Cloud schedules currently interpret cron expressions in UTC (timezone support is tracked in LET-9815).", CLOUD_DEVICE_OFFLINE_NOTE = "If the target computer is offline when the schedule fires, that occurrence fails (TARGET_DEVICE_UNAVAILABLE) and does not run; omit --computer to run in the Cloud sandbox.";
 var init_runner = __esm(() => {
   init_request();
   init_schedules();
@@ -243307,7 +243376,7 @@ class CodexAppServerClient {
     await this.request("initialize", {
       clientInfo: {
         name: "letta-code",
-        version: "0.34.22"
+        version: "0.34.24"
       },
       capabilities: null
     });
@@ -244017,7 +244086,7 @@ var init_conversation_bootstrap = __esm(() => {
 
 // src/cli/helpers/session-context.ts
 import { platform as platform7 } from "node:os";
-import { basename as basename20 } from "node:path";
+import { basename as basename21 } from "node:path";
 function getLocalTime() {
   const now2 = new Date;
   return now2.toLocaleString(undefined, {
@@ -244061,7 +244130,7 @@ function getGitInfo(cwd2) {
   };
 }
 function buildUnixShellLine(shellContext) {
-  const shellName = basename20(shellContext.displayName) || shellContext.displayName;
+  const shellName = basename21(shellContext.displayName) || shellContext.displayName;
   return `- **Shell**: ${shellName}
 `;
 }
@@ -246771,7 +246840,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") && (capabilityRecord.mcp_originator_queue_isolation === undefined || typeof capabilityRecord.mcp_originator_queue_isolation === "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") && typeof capabilityRecord.split_channels === "boolean";
 }
 var APP_SERVER_PROTOCOL_VERSION = 1;
 
@@ -248740,7 +248809,7 @@ var init_memory_operation = __esm(() => {
 // src/agent/memory-worktree.ts
 import { execFile as execFileCb4 } from "node:child_process";
 import { randomUUID as randomUUID41 } from "node:crypto";
-import { existsSync as existsSync46 } from "node:fs";
+import { existsSync as existsSync45 } from "node:fs";
 import { mkdir as mkdir12 } from "node:fs/promises";
 import { dirname as dirname29, isAbsolute as isAbsolute23, join as join67, resolve as resolve36 } from "node:path";
 import { promisify as promisify17 } from "node:util";
@@ -248932,7 +249001,7 @@ async function inspectReflectionMemoryWorktree(worktree) {
   };
 }
 async function cleanupWorktreeAndBranch(parentMemoryDir, worktreeDir, branchName, options = {}) {
-  const removedWorktree = existsSync46(worktreeDir);
+  const removedWorktree = existsSync45(worktreeDir);
   if (removedWorktree) {
     await runGit4(parentMemoryDir, [
       "worktree",
@@ -248948,7 +249017,7 @@ async function cleanupWorktreeAndBranch(parentMemoryDir, worktreeDir, branchName
   ]);
 }
 async function finalizeReflectionMemoryWorktreeUnlocked(worktree, options) {
-  if (!existsSync46(worktree.worktreeDir) && options.knownNoChanges) {
+  if (!existsSync45(worktree.worktreeDir) && options.knownNoChanges) {
     const branchHead = (await tryRunGit(worktree.parentMemoryDir, [
       "rev-parse",
       "--verify",
@@ -249135,7 +249204,7 @@ async function integrateMemoryWorkerWorktree(worktree, options = {}) {
     await cleanup(true);
     return { status: "no_changes" };
   }
-  if (existsSync46(worktree.worktreeDir)) {
+  if (existsSync45(worktree.worktreeDir)) {
     await runGit4(worktree.parentMemoryDir, [
       "worktree",
       "remove",
@@ -250694,6 +250763,8 @@ function trackExternalFollowupCompletion(args) {
     existingAgentId: args.agentId,
     toolCallId: args.toolCallId,
     publishResult: args.publishResult,
+    emitCompletionNotification: args.emitCompletionNotification,
+    claimsParentRuntime: args.claimsParentRuntime,
     parentScope: args.parentScope,
     actingUserId: args.parentScope.actingUserId,
     deps: {
@@ -251198,7 +251269,7 @@ __export(exports_skill, {
   loadRenderedSkillContent: () => loadRenderedSkillContent,
   getResolvedSkillsDir: () => getResolvedSkillsDir
 });
-import { existsSync as existsSync47, readdirSync as readdirSync17 } from "node:fs";
+import { existsSync as existsSync46, readdirSync as readdirSync17 } from "node:fs";
 import { readFile as readFile17 } from "node:fs/promises";
 import { dirname as dirname30, join as join68 } from "node:path";
 async function readSkillFromRoot(skillsRoot, skillId) {
@@ -251220,7 +251291,7 @@ async function readSkillFromRoot(skillsRoot, skillId) {
 function getMemorySkillsDirs2(agentId) {
   const dirs = new Set;
   const scopedMemoryDir = resolveScopedMemoryDir({ agentId });
-  if (scopedMemoryDir && scopedMemoryDir.trim().length > 0 && existsSync47(scopedMemoryDir)) {
+  if (scopedMemoryDir && scopedMemoryDir.trim().length > 0 && existsSync46(scopedMemoryDir)) {
     dirs.add(join68(scopedMemoryDir.trim(), "skills"));
   } else {
     const fallbackMemoryDir = (process.env.LETTA_MEMORY_DIR || process.env.MEMORY_DIR || "").trim();
@@ -252797,7 +252868,7 @@ var init_watch_pr = __esm(async () => {
 });
 
 // src/tools/workflow/sdk-loader.ts
-import { existsSync as existsSync48, readFileSync as readFileSync37 } from "node:fs";
+import { existsSync as existsSync47, readFileSync as readFileSync37 } from "node:fs";
 import { createRequire as createRequire6 } from "node:module";
 import { dirname as dirname31, join as join69 } from "node:path";
 import { fileURLToPath as fileURLToPath7, pathToFileURL as pathToFileURL3 } from "node:url";
@@ -252821,7 +252892,7 @@ function preferRunningCliForSubagents() {
   if (process.env.LETTA_CLI_PATH)
     return;
   const entry = process.argv[1];
-  if (entry && /(^|[\\/])letta\.js$/.test(entry) && existsSync48(entry)) {
+  if (entry && /(^|[\\/])letta\.js$/.test(entry) && existsSync47(entry)) {
     process.env.LETTA_CLI_PATH = entry;
   }
 }
@@ -252852,7 +252923,7 @@ function probeInstalledSdkDirs(startDirs) {
     let dir = start2;
     while (true) {
       const candidate = join69(dir, "node_modules", ...SDK_PACKAGE.split("/"));
-      if (existsSync48(join69(candidate, "package.json")) && !found.includes(candidate)) {
+      if (existsSync47(join69(candidate, "package.json")) && !found.includes(candidate)) {
         found.push(candidate);
       }
       const parent = dirname31(dir);
@@ -255325,15 +255396,28 @@ var init_interrupted_turn_schema = __esm(async () => {
   await init_teleport_protocol_inbound();
 });
 
+// src/utils/rename-sync-with-retry.ts
+import { renameSync as renameSync10 } from "node:fs";
+function renameSyncWithRetry(source, destination, platform9 = process.platform, rename3 = renameSync10) {
+  const sleeper = new Int32Array(new SharedArrayBuffer(4));
+  for (let attempt2 = 0;; attempt2++) {
+    try {
+      rename3(source, destination);
+      return;
+    } catch (error5) {
+      const code2 = error5.code;
+      if (platform9 !== "win32" || attempt2 >= 9 || !["EPERM", "EACCES", "EBUSY"].includes(code2 ?? "")) {
+        throw error5;
+      }
+      Atomics.wait(sleeper, 0, 0, 10 * (attempt2 + 1));
+    }
+  }
+}
+var init_rename_sync_with_retry = () => {};
+
 // src/websocket/listener/interrupted-turn-storage.ts
 import { createHash as createHash11 } from "node:crypto";
-import {
-  closeSync as closeSync7,
-  fsyncSync as fsyncSync4,
-  openSync as openSync7,
-  renameSync as renameSync10,
-  writeFileSync as writeFileSync29
-} from "node:fs";
+import { closeSync as closeSync7, fsyncSync as fsyncSync4, openSync as openSync7, writeFileSync as writeFileSync29 } from "node:fs";
 import { homedir as homedir35 } from "node:os";
 import { join as join71 } from "node:path";
 function writeInterruptedTurnRecordFile(temporary, destination, directory, record6, syncDirectory) {
@@ -255341,7 +255425,7 @@ function writeInterruptedTurnRecordFile(temporary, destination, directory, recor
     mode: 384,
     flush: true
   });
-  renameSync10(temporary, destination);
+  renameSyncWithRetry(temporary, destination);
   syncDirectory(directory);
 }
 function fsyncInterruptedTurnDirectory(directory, platform9 = process.platform) {
@@ -255365,6 +255449,7 @@ function defaultInterruptedTurnDirectory() {
 }
 var init_interrupted_turn_storage = __esm(() => {
   init_server_url();
+  init_rename_sync_with_retry();
 });
 
 // src/websocket/listener/recorded-tool-results.ts
@@ -255430,11 +255515,10 @@ function createRecoveryAuthorityGuard(dependencies4) {
 // src/websocket/listener/recovery-lineage-sidecar.ts
 import { createHash as createHash12, randomUUID as randomUUID44 } from "node:crypto";
 import {
-  existsSync as existsSync49,
+  existsSync as existsSync48,
   mkdirSync as mkdirSync35,
   readdirSync as readdirSync18,
   readFileSync as readFileSync39,
-  renameSync as renameSync11,
   rmSync as rmSync18,
   statSync as statSync19,
   writeFileSync as writeFileSync30
@@ -255475,7 +255559,7 @@ function createRecoveryLineageSidecarAccess(params) {
         mode: 384,
         flush: true
       });
-      renameSync11(temporary, destination);
+      renameSyncWithRetry(temporary, destination);
       params.syncDirectory(params.directory);
     } finally {
       rmSync18(temporary, { force: true });
@@ -255725,7 +255809,7 @@ function createRecoveryLineageSidecarAccess(params) {
     const removeMalformedOrphan = (file) => {
       const separator = file.indexOf(".recovery-");
       const mainFile = separator >= 0 ? file.slice(0, separator) : "";
-      if (!mainFile || existsSync49(join72(params.directory, mainFile)))
+      if (!mainFile || existsSync48(join72(params.directory, mainFile)))
         return;
       try {
         rmSync18(join72(params.directory, file), { force: true });
@@ -255807,6 +255891,7 @@ function createRecoveryLineageSidecarAccess(params) {
 }
 var sidecarWriterInstanceId;
 var init_recovery_lineage_sidecar = __esm(async () => {
+  init_rename_sync_with_retry();
   init_durable_file_lock();
   await init_interrupted_turn_schema();
   sidecarWriterInstanceId = randomUUID44();
@@ -255815,7 +255900,7 @@ var init_recovery_lineage_sidecar = __esm(async () => {
 // src/websocket/listener/interrupted-turn-record.ts
 import { randomUUID as randomUUID45 } from "node:crypto";
 import {
-  existsSync as existsSync50,
+  existsSync as existsSync49,
   mkdirSync as mkdirSync36,
   readFileSync as readFileSync40,
   rmSync as rmSync19,
@@ -255872,7 +255957,7 @@ function createInterruptedTurnStore(directory = defaultInterruptedTurnDirectory(
   const recoveryAuthority = createRecoveryAuthorityGuard({
     path: path32,
     readRecord: readRecord2,
-    exists: existsSync50,
+    exists: existsSync49,
     acquire: (destination) => acquireDurableFileLock(destination, {
       waitMs: dependencies4.lockWaitMs
     }),
@@ -255906,7 +255991,7 @@ function createInterruptedTurnStore(directory = defaultInterruptedTurnDirectory(
           });
           try {
             const current = readRecord2(destination);
-            if (!existsSync50(destination)) {
+            if (!existsSync49(destination)) {
               removeSidecar(sidecar);
             } else if (current && current.recoveryClaimCompletion?.lineageId !== sidecar.lineageId) {
               removeSidecar(sidecar);
@@ -255931,7 +256016,7 @@ function createInterruptedTurnStore(directory = defaultInterruptedTurnDirectory(
     },
     listDurableInputOwnership() {
       const snapshot2 = rawSnapshot();
-      return collectInterruptedTurnInputOwnershipWithSidecars(snapshot2.records, readMainView, listSidecars(), (agentId, conversationId) => existsSync50(path32(agentId, conversationId)), snapshot2.unreadableScopes);
+      return collectInterruptedTurnInputOwnershipWithSidecars(snapshot2.records, readMainView, listSidecars(), (agentId, conversationId) => existsSync49(path32(agentId, conversationId)), snapshot2.unreadableScopes);
     },
     read(agentId, conversationId) {
       const current = readRecord2(path32(agentId, conversationId));
@@ -257490,7 +257575,7 @@ function socketForTransport(transport3) {
 }
 function refreshLegacySingleConnection(runtime) {
   const live = [...runtime.connections.values()].filter((connection) => isListenerTransportOpen(connection.writer));
-  const only = live.length === 1 ? live[0] : null;
+  const only = live.find(({ id: id2 }) => id2 === runtime.connectionId) ?? (live.length === 1 ? live[0] : null);
   runtime.transport = runtime.processTransport ?? only?.writer ?? null;
   runtime.streamTransport = only?.streamWriter ?? null;
   runtime.socket = only ? socketForTransport(only.writer) : null;
@@ -257716,6 +257801,26 @@ function suspendListenerConnection(runtime, connectionId) {
   getResumeStates(runtime).set(connectionId, resumeState);
   return closed;
 }
+function resumeListenerConnectionIdentity(runtime, previousId, nextId2) {
+  const states3 = getResumeStates(runtime);
+  const previous = states3.get(previousId);
+  states3.delete(previousId);
+  if (previous)
+    states3.set(nextId2, previous);
+  for (const conversation of runtime.conversationRuntimes.values()) {
+    for (const [itemId, message2] of conversation.queuedMessagesByItemId) {
+      if (message2.connectionId === previousId) {
+        conversation.queuedMessagesByItemId.set(itemId, {
+          ...message2,
+          connectionId: nextId2
+        });
+      }
+    }
+    if (conversation.activeConnectionId === previousId) {
+      conversation.activeConnectionId = nextId2;
+    }
+  }
+}
 
 class ProcessRuntimeTransport {
   runtime;
@@ -257761,9 +257866,6 @@ var init_connection = __esm(async () => {
 });
 
 // src/queue/queue-runtime.ts
-function isCoalescable(kind) {
-  return kind === "message" || kind === "task_notification" || kind === "cron_prompt" || kind === "mod_continue";
-}
 function hasSameScope(a2, b3) {
   return (a2.agentId ?? null) === (b3.agentId ?? null) && (a2.conversationId ?? null) === (b3.conversationId ?? null);
 }
@@ -257785,7 +257887,7 @@ class QueueRuntime {
     this.callbacks = options.callbacks ?? {};
   }
   enqueue(input, options = {}) {
-    if (options.preserveExisting && (this.store.length >= this.hardMaxItems || this.store.length >= this.maxItems && isCoalescable(input.kind))) {
+    if (options.preserveExisting && (this.store.length >= this.hardMaxItems || this.store.length >= this.maxItems)) {
       return null;
     }
     if (this.store.length >= this.hardMaxItems) {
@@ -257795,9 +257897,8 @@ class QueueRuntime {
       this.safeCallback("onDropped", phantom, "buffer_limit", this.store.length);
       return null;
     }
-    if (this.store.length >= this.maxItems && isCoalescable(input.kind)) {
-      const dropIdx = this.store.findIndex((i4) => isCoalescable(i4.kind));
-      const dropped = dropIdx !== -1 ? this.store[dropIdx] : undefined;
+    if (this.store.length >= this.maxItems) {
+      const dropped = this.store[0];
       if (dropped !== undefined) {
         if (!this.mutationAllowed("beforeDropped", dropped)) {
           const rejected = this.makeItem(input);
@@ -257806,7 +257907,7 @@ class QueueRuntime {
           this.safeCallback("onDropped", rejected, "buffer_limit", this.store.length);
           return null;
         }
-        this.store.splice(dropIdx, 1);
+        this.store.shift();
         const item2 = this.makeItem(input);
         this.store.push(item2);
         this.safeCallback("onDropped", dropped, "buffer_limit", this.store.length);
@@ -257844,16 +257945,14 @@ class QueueRuntime {
     }
     const batch = [];
     const first = this.store.find((item) => !item.paused);
-    if (first && isCoalescable(first.kind)) {
+    if (first) {
       for (const item of this.store) {
         if (item.paused)
           continue;
-        if (!isCoalescable(item.kind) || !hasSameScope(first, item))
+        if (!hasSameScope(first, item))
           break;
         batch.push(item);
       }
-    } else if (first) {
-      batch.push(first);
     }
     if (batch.length === 0) {
       return null;
@@ -258246,12 +258345,11 @@ import { randomUUID as randomUUID46 } from "node:crypto";
 import {
   chmodSync as chmodSync7,
   closeSync as closeSync8,
-  existsSync as existsSync51,
+  existsSync as existsSync50,
   fsyncSync as fsyncSync5,
   mkdirSync as mkdirSync37,
   openSync as openSync8,
   readFileSync as readFileSync41,
-  renameSync as renameSync12,
   statSync as statSync20,
   unlinkSync as unlinkSync11,
   writeFileSync as writeFileSync32
@@ -258390,7 +258488,7 @@ function validateDurableStore(value) {
   return value;
 }
 function readDurableStore(path32) {
-  if (!existsSync51(path32))
+  if (!existsSync50(path32))
     return emptyDurableStore();
   const size2 = statSync20(path32).size;
   if (size2 > MAX_INPUT_DISPOSITION_STORE_BYTES) {
@@ -258418,7 +258516,7 @@ function writeDurableStore(path32, store3) {
     } finally {
       closeSync8(fd);
     }
-    renameSync12(temporaryPath, path32);
+    renameSyncWithRetry(temporaryPath, path32);
     fsyncDirectory(dirname33(path32));
   } catch (error5) {
     try {
@@ -258820,6 +258918,7 @@ function loadDurableQueuedInputEntries(listener) {
 var ACCEPTED_INPUT_DISPOSITION_TTL_MS, MAX_ACCEPTED_INPUT_DISPOSITIONS_PER_SCOPE = 4096, MAX_ACCEPTED_INPUT_DISPOSITIONS = 65536, MAX_DURABLE_QUEUED_INPUT_BYTES, MAX_INPUT_DISPOSITION_STORE_BYTES, LOCK_WAIT_MS = 2000;
 var init_input_disposition = __esm(async () => {
   init_server_url();
+  init_rename_sync_with_retry();
   init_durable_file_lock();
   init_input_disposition_capacity();
   init_input_disposition_expiry();
@@ -258844,7 +258943,6 @@ import {
   openSync as openSync9,
   readdirSync as readdirSync19,
   readFileSync as readFileSync42,
-  renameSync as renameSync13,
   rmSync as rmSync20,
   writeFileSync as writeFileSync33
 } from "node:fs";
@@ -258940,7 +259038,7 @@ function createTurnFinishedStore(directory = defaultDirectory(), options = {}) {
         mode: 384,
         flush: true
       });
-      renameSync13(temporary, destination);
+      renameSyncWithRetry(temporary, destination);
       fsyncDirectory2(directory);
     } finally {
       rmSync20(temporary, { force: true });
@@ -259292,6 +259390,7 @@ var TurnFinishedCapacityError, MAX_PENDING_TERMINALS_PER_CONVERSATION = 64, DELI
 var init_turn_finished_replay = __esm(async () => {
   init_server_url();
   init_debug();
+  init_rename_sync_with_retry();
   init_durable_file_lock();
   await __promiseAll([
     init_connection(),
@@ -259956,20 +260055,6 @@ 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) {
@@ -260028,7 +260113,7 @@ function buildQueuedTurnMessage(runtime, batch) {
       messageOriginatorIds.push(undefined);
       originatorVotes.push(null);
       messages.push(withMessageAttribution({ role: "user", content: item.content }, item.actingUserId ?? undefined));
-    } else if (isCoalescable(item.kind) && "text" in item) {
+    } else {
       messageOriginatorIds.push(undefined);
       originatorVotes.push(null);
       messages.push({
@@ -260093,15 +260178,12 @@ function shouldProcessInboundMessageDirectly(runtime, parsed) {
   });
   return getListenerBlockedReason(runtime.turnLifecycle.snapshot(), activeScope ? getPendingControlRequestCount(runtime.listener, activeScope) : 0) === null;
 }
-function consumeQueuedTurn(runtime, activeScope) {
+function consumeQueuedTurn(runtime) {
   const queuedItems = runtime.queueRuntime.peekReady();
   const firstQueuedItem = queuedItems[0];
-  if (!firstQueuedItem || !isCoalescable(firstQueuedItem.kind)) {
+  if (!firstQueuedItem) {
     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;
@@ -260112,7 +260194,7 @@ function consumeQueuedTurn(runtime, activeScope) {
   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) || !sameMcpOriginatorScope(firstScope, getMcpOriginatorScope(item.kind === "message" ? runtime.queuedMessagesByItemId.get(item.id) : undefined))) {
+    if (!hasSameQueueScope(firstQueuedItem, item)) {
       break;
     }
     const incoming = runtime.queuedMessagesByItemId.get(item.id);
@@ -260158,6 +260240,25 @@ function consumeQueuedTurn(runtime, activeScope) {
   if (!dequeuedBatch) {
     return null;
   }
+  for (const item of dequeuedBatch.items) {
+    if (item.kind !== "cron_prompt")
+      continue;
+    try {
+      const task2 = getTask(item.cronTaskId);
+      if (task2 && task2.agent_id === item.agentId) {
+        safeAppendCronRunLogForTask(task2, {
+          status: "ok",
+          outcome: "delivered",
+          reason: "dequeued",
+          queueItemId: item.id,
+          conversationId: item.conversationId,
+          runAtMs: Date.now()
+        });
+      }
+    } catch (error5) {
+      debugWarn("Cron", "Error reading task for dequeued cron prompt:", error5);
+    }
+  }
   const clientMessageIds = getDequeuedClientMessageIds(runtime, dequeuedBatch);
   const queuedTurn = buildQueuedTurnMessage(runtime, dequeuedBatch);
   if (!queuedTurn) {
@@ -260316,7 +260417,8 @@ function scheduleQueuePump(runtime, socket, opts, processQueuedTurn) {
 }
 var init_queue = __esm(async () => {
   init_mcp_originator_tokens();
-  init_queue_runtime();
+  init_cron_file();
+  init_run_log();
   init_error_reporting();
   init_debug();
   init_transport();
@@ -261074,6 +261176,11 @@ function taskMatchesCronSchedulerScope(task2, scope) {
     return true;
   return scope === "local" ? isLocalAgentId(task2.agent_id) : !isLocalAgentId(task2.agent_id);
 }
+function clearSlowLeaseRetry() {
+  if (slowLeaseRetryTimer)
+    clearInterval(slowLeaseRetryTimer);
+  slowLeaseRetryTimer = null;
+}
 function logScheduler(opts, message2) {
   if (opts.onLog) {
     opts.onLog(`[Cron] ${message2}`);
@@ -261464,16 +261571,31 @@ function startScheduler(socket, opts, processQueuedTurn, _retryCount = 0) {
   try {
     token2 = claimSchedulerLease(scope);
   } catch (err) {
+    if (slowLeaseRetryTimer)
+      return;
     if (_retryCount < MAX_LEASE_RETRIES) {
       logScheduler(opts, `Could not claim scheduler lease (attempt ${_retryCount + 1}/${MAX_LEASE_RETRIES + 1}): ${err instanceof Error ? err.message : err}`);
       logScheduler(opts, "Cron tasks will not fire until the scheduler starts. Retrying...");
       setTimeout(() => startScheduler(socket, opts, processQueuedTurn, _retryCount + 1), LEASE_RETRY_MS);
     } else {
       logScheduler(opts, `Failed to claim scheduler lease after ${MAX_LEASE_RETRIES + 1} attempts. Cron tasks will not fire.`);
-      logScheduler(opts, "Another process may hold the lease. Restart Letta Code to retry.");
+      logScheduler(opts, `Another process may hold the lease. Retrying every ${SLOW_LEASE_RETRY_MS / 60000} minutes.`);
+      slowLeaseRetryTimer = setInterval(() => {
+        const ctx = listenerFireContext;
+        if (!ctx || schedulerState) {
+          clearSlowLeaseRetry();
+          return;
+        }
+        startScheduler(ctx.socket, ctx.opts, ctx.processQueuedTurn, _retryCount);
+      }, SLOW_LEASE_RETRY_MS);
+      slowLeaseRetryTimer.unref?.();
     }
     return;
   }
+  if (slowLeaseRetryTimer) {
+    clearSlowLeaseRetry();
+    logScheduler(opts, "Claimed scheduler lease on slow retry.");
+  }
   const now2 = new Date;
   const state2 = {
     token: token2,
@@ -261521,6 +261643,7 @@ function startScheduler(socket, opts, processQueuedTurn, _retryCount = 0) {
 }
 function stopScheduler() {
   listenerFireContext = null;
+  clearSlowLeaseRetry();
   if (!schedulerState)
     return;
   clearInterval(schedulerState.tickInterval);
@@ -261534,7 +261657,7 @@ function stopScheduler() {
   } catch {}
   schedulerState = null;
 }
-var schedulerState = null, CRON_SCHEDULER_SCOPE_ENV = "LETTA_CRON_SCHEDULER_SCOPE", listenerFireContext = null, TICK_INTERVAL_MS = 60000, GC_INTERVAL_MS, TOMBSTONE_HEARTBEAT_MS = 1000, LEASE_RETRY_MS = 30000, MAX_LEASE_RETRIES = 3, NEW_CONVERSATION_TARGET = "new";
+var schedulerState = null, CRON_SCHEDULER_SCOPE_ENV = "LETTA_CRON_SCHEDULER_SCOPE", listenerFireContext = null, TICK_INTERVAL_MS = 60000, GC_INTERVAL_MS, TOMBSTONE_HEARTBEAT_MS = 1000, LEASE_RETRY_MS = 30000, MAX_LEASE_RETRIES = 3, SLOW_LEASE_RETRY_MS, slowLeaseRetryTimer = null, NEW_CONVERSATION_TARGET = "new";
 var init_scheduler = __esm(async () => {
   init_backend2();
   init_debug();
@@ -261552,6 +261675,7 @@ var init_scheduler = __esm(async () => {
     init_runtime6()
   ]);
   GC_INTERVAL_MS = 60 * 60000;
+  SLOW_LEASE_RETRY_MS = 5 * 60000;
 });
 
 // src/cron/index.ts
@@ -261654,8 +261778,9 @@ Add options:
                          conversation; "default" for the agent default)
   --computer <id>        (managed Cloud sandbox only) Run on a connected
                          external computer (deviceId from \`letta computers
-                         list\`). Falls back to the Cloud sandbox if that
-                         computer is offline at fire time.
+                         list\`). If that computer is offline at fire
+                         time, that run fails (no Cloud sandbox fallback);
+                         omit --computer to run in the Cloud sandbox.
 
 List/filter options:
   --agent <id>           Filter by agent ID
@@ -261880,7 +262005,7 @@ async function handleCloudAdd(params) {
       output.notes = notes;
     }
     console.log(JSON.stringify(output, null, 2));
-    console.error(targetDeviceId ? `Created Cloud schedule: it fires from the cloud and runs on computer "${targetDeviceId}" (sandbox fallback if offline).` : "Created Cloud schedule: it fires from the cloud and runs in this agent's managed cloud sandbox (survives local shutdown).");
+    console.error(targetDeviceId ? `Created Cloud schedule: it fires from the cloud and runs on computer "${targetDeviceId}" (if it is offline at fire time, that run fails; no sandbox fallback).` : "Created Cloud schedule: it fires from the cloud and runs in this agent's managed cloud sandbox (survives local shutdown).");
     return 0;
   } catch (err) {
     console.error(`Error: failed to create Cloud schedule: ${err instanceof Error ? err.message : String(err)}`);
@@ -264248,6 +264373,11 @@ var init_listen_first_run_welcome = __esm(async () => {
   await init_AnimatedLogo();
 });
 
+// src/cli/subcommands/listen-output-mode.ts
+function shouldUseNonInteractiveListenerOutput(debugMode, lifecycleOutput, stdoutIsTTY = process.stdout.isTTY) {
+  return debugMode || lifecycleOutput || !stdoutIsTTY;
+}
+
 // src/cli/subcommands/listen-process-anchor.ts
 import { MessageChannel as MessageChannel2 } from "node:worker_threads";
 function createMessageChannelProcessAnchor() {
@@ -264305,7 +264435,7 @@ function printListenUsage() {
 }
 
 // src/cli/subcommands/listener-readiness.ts
-async function completeListenerConnectionStartup(expectedConnection, readiness, startGateway = async () => {}) {
+async function completeListenerConnectionStartup(expectedConnection, readiness, startGateway = async () => {}, onGatewayError = console.error) {
   const { getActiveRuntime: getActiveRuntime2 } = await init_runtime6().then(() => exports_runtime);
   const runtime = getActiveRuntime2();
   const connection = runtime?.connections.get(expectedConnection.id);
@@ -264315,12 +264445,12 @@ async function completeListenerConnectionStartup(expectedConnection, readiness,
   const { isListenerTransportOpen: isListenerTransportOpen2 } = await Promise.resolve().then(() => (init_transport(), exports_transport));
   if (!isListenerTransportOpen2(connection.writer))
     return false;
-  await startGateway();
   if (getActiveRuntime2()?.connections.get(connection.id) !== connection)
     return false;
   if (!connection.initialized || !connection.ingressReady || connection.cancellation.signal.aborted || !isListenerTransportOpen2(connection.writer))
     return false;
   readiness.completeCloudStartup(epoch);
+  Promise.resolve().then(startGateway).catch(onGatewayError);
   return true;
 }
 function applyGatewayLifecycleReadiness(readiness, event) {
@@ -264473,7 +264603,7 @@ var init_service_protocol = __esm(() => {
 // src/websocket/listen-log.ts
 import {
   appendFileSync as appendFileSync8,
-  existsSync as existsSync52,
+  existsSync as existsSync51,
   mkdirSync as mkdirSync39,
   readdirSync as readdirSync20,
   unlinkSync as unlinkSync12
@@ -264493,7 +264623,7 @@ function formatFileTimestamp(now2) {
 }
 function pruneOldLogs(dir, maxFiles) {
   try {
-    if (!existsSync52(dir))
+    if (!existsSync51(dir))
       return;
     const files = readdirSync20(dir).filter((f4) => f4.endsWith(".log")).sort();
     if (files.length >= maxFiles) {
@@ -264545,7 +264675,7 @@ class RemoteSessionLog {
     const previous = this.path;
     this.rotation += 1;
     this.path = this.freshPath();
-    while (existsSync52(this.path)) {
+    while (existsSync51(this.path)) {
       this.rotation += 1;
       this.path = this.freshPath();
     }
@@ -264569,7 +264699,7 @@ class RemoteSessionLog {
     if (this.dirCreated)
       return;
     try {
-      if (!existsSync52(this.dir)) {
+      if (!existsSync51(this.dir)) {
         mkdirSync39(this.dir, { recursive: true });
       }
       this.dirCreated = true;
@@ -265178,9 +265308,10 @@ var init_auth3 = __esm(() => {
 });
 
 // src/websocket/listener/manual-instance-lock.ts
+import { execFileSync as execFileSync11 } from "node:child_process";
 import { createHash as createHash15, randomUUID as randomUUID48 } from "node:crypto";
 import { link as link4, mkdir as mkdir13, readFile as readFile21, rm as rm11, unlink as unlink3, writeFile as writeFile15 } from "node:fs/promises";
-import { homedir as homedir39 } from "node:os";
+import { homedir as homedir39, uptime as uptime2 } from "node:os";
 import path32 from "node:path";
 function hasErrorCode3(error5, code2) {
   return typeof error5 === "object" && error5 !== null && "code" in error5 && error5.code === code2;
@@ -265193,6 +265324,32 @@ function defaultIsProcessAlive2(pid) {
     return !hasErrorCode3(error5, "ESRCH");
   }
 }
+function getDefaultBootTimeMs() {
+  return Date.now() - uptime2() * 1000;
+}
+function defaultGetProcessCommand(pid) {
+  if (process.platform === "win32")
+    return null;
+  try {
+    return execFileSync11("ps", ["-p", String(pid), "-o", "command="], {
+      encoding: "utf-8",
+      timeout: 1000,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
+  } catch {
+    return null;
+  }
+}
+function isOwnerAlive2(record6, deps) {
+  if (!deps.isProcessAlive(record6.pid))
+    return false;
+  const acquiredAtMs = Date.parse(record6.acquiredAt);
+  if (!Number.isFinite(acquiredAtMs) || acquiredAtMs >= deps.bootTimeMs - BOOT_TIME_SLACK_MS2) {
+    return true;
+  }
+  const command = deps.getProcessCommand(record6.pid);
+  return !command || /letta/i.test(command);
+}
 function getDefaultLockRoot() {
   return path32.join(process.env.HOME || homedir39(), ".letta");
 }
@@ -265277,7 +265434,7 @@ async function recoverDeadOwner(lockPath, staleContents, recoveryOwnerContents,
       if (!claimOwner) {
         throw new ManualListenerLockUnavailableError(`Listener lock recovery record is invalid: ${claimPath}`, lockPath);
       }
-      if (deps.isProcessAlive(claimOwner.pid)) {
+      if (isOwnerAlive2(claimOwner, deps)) {
         return false;
       }
     }
@@ -265308,6 +265465,8 @@ async function acquireManualListenerLock(scope, overrides = {}) {
     processId: process.pid,
     ownerToken: randomUUID48(),
     isProcessAlive: defaultIsProcessAlive2,
+    bootTimeMs: getDefaultBootTimeMs(),
+    getProcessCommand: defaultGetProcessCommand,
     ...overrides
   };
   const listenerLockDir = path32.join(deps.lockRoot, "listeners");
@@ -265367,7 +265526,7 @@ async function acquireManualListenerLock(scope, overrides = {}) {
     if (!incumbent) {
       throw new ManualListenerLockUnavailableError(`Listener lock is corrupt or belongs to an incompatible version: ${lockPath}`, lockPath);
     }
-    if (deps.isProcessAlive(incumbent.pid)) {
+    if (isOwnerAlive2(incumbent, deps)) {
       throw new ManualListenerAlreadyRunningError(incumbent.pid, lockPath);
     }
     const recovered = await recoverDeadOwner(lockPath, incumbentContents, ownerContents, scopeHash, deps);
@@ -265376,7 +265535,7 @@ async function acquireManualListenerLock(scope, overrides = {}) {
     }
   }
 }
-var RECOVERY_MAX_DEPTH2 = 64, ManualListenerAlreadyRunningError, ManualListenerLockUnavailableError;
+var RECOVERY_MAX_DEPTH2 = 64, BOOT_TIME_SLACK_MS2 = 60000, ManualListenerAlreadyRunningError, ManualListenerLockUnavailableError;
 var init_manual_instance_lock = __esm(() => {
   ManualListenerAlreadyRunningError = class ManualListenerAlreadyRunningError extends Error {
     holderPid;
@@ -267608,10 +267767,10 @@ async function handleListMemoryCommand(parsed, socket, safeSocketSend, overrides
     const isMemfsEnabledOnServer2 = overrides.isMemfsEnabledOnServer ?? actualIsMemfsEnabledOnServer;
     const { scanMemoryFilesystem: scanMemoryFilesystem2, getFileNodes: getFileNodes2, readFileContent: readFileContent2 } = await Promise.resolve().then(() => (init_memory_scanner(), exports_memory_scanner));
     const { parseFrontmatter: parseFrontmatter2 } = await Promise.resolve().then(() => exports_frontmatter);
-    const { existsSync: existsSync53, statSync: statSync22 } = await import("node:fs");
-    const { join: join78, posix: posix3 } = await import("node:path");
+    const { existsSync: existsSync52, statSync: statSync22 } = await import("node:fs");
+    const { join: join78, posix: posix4 } = await import("node:path");
     const memoryRoot = getMemoryFilesystemRoot2(parsed.agent_id);
-    let memfsInitialized = existsSync53(join78(memoryRoot, ".git"));
+    let memfsInitialized = existsSync52(join78(memoryRoot, ".git"));
     const memfsEnabled = memfsInitialized ? true : await isMemfsEnabledOnServer2(parsed.agent_id);
     if (!memfsEnabled) {
       safeSocketSend(socket, {
@@ -267629,7 +267788,7 @@ async function handleListMemoryCommand(parsed, socket, safeSocketSend, overrides
     await ensureLocalMemfsCheckout2(parsed.agent_id, {
       pullOnExistingRepo: true
     });
-    memfsInitialized = existsSync53(join78(memoryRoot, ".git"));
+    memfsInitialized = existsSync52(join78(memoryRoot, ".git"));
     if (!memfsInitialized) {
       throw new Error("MemFS is enabled, but the local memory checkout could not be initialized.");
     }
@@ -267658,8 +267817,8 @@ async function handleListMemoryCommand(parsed, socket, safeSocketSend, overrides
       if (!target2) {
         return null;
       }
-      const sourceDir = posix3.dirname(sourcePath.replace(/\\/g, "/"));
-      const candidate = target2.startsWith("./") || target2.startsWith("../") ? posix3.normalize(posix3.join(sourceDir, target2)) : posix3.normalize(target2.startsWith("/") ? target2.slice(1) : target2);
+      const sourceDir = posix4.dirname(sourcePath.replace(/\\/g, "/"));
+      const candidate = target2.startsWith("./") || target2.startsWith("../") ? posix4.normalize(posix4.join(sourceDir, target2)) : posix4.normalize(target2.startsWith("/") ? target2.slice(1) : target2);
       if (!candidate || candidate.startsWith("../") || candidate === "." || candidate === "..") {
         return null;
       }
@@ -267667,10 +267826,10 @@ async function handleListMemoryCommand(parsed, socket, safeSocketSend, overrides
       const candidates2 = new Set([withExtension]);
       const isExplicitRelative = target2.startsWith("./") || target2.startsWith("../");
       if (!isExplicitRelative && !target2.startsWith("/") && sourceDir && sourceDir !== ".") {
-        candidates2.add(posix3.normalize(posix3.join(sourceDir, withExtension)));
+        candidates2.add(posix4.normalize(posix4.join(sourceDir, withExtension)));
       }
       if (!withExtension.startsWith("system/")) {
-        candidates2.add(posix3.normalize(`system/${withExtension}`));
+        candidates2.add(posix4.normalize(`system/${withExtension}`));
       }
       for (const resolved2 of candidates2) {
         if (allPaths.has(resolved2)) {
@@ -267929,7 +268088,7 @@ function handleMemoryProtocolCommand(parsed, context3) {
           isMemfsEnabledOnServer: isMemfsEnabledOnServer2
         } = await Promise.resolve().then(() => (init_memory_filesystem2(), exports_memory_filesystem));
         const { readFile: readFile22 } = await import("node:fs/promises");
-        const { existsSync: existsSync53 } = await import("node:fs");
+        const { existsSync: existsSync52 } = await import("node:fs");
         const { isAbsolute: isAbsolute25, join: join78, normalize: normalize4, relative: relative8, sep: sep8 } = await import("node:path");
         if (isAbsolute25(parsed.path) || parsed.path.length === 0) {
           sendFailure("path must be a non-empty relative path");
@@ -267942,14 +268101,14 @@ function handleMemoryProtocolCommand(parsed, context3) {
           sendFailure("path must resolve inside the memory root");
           return;
         }
-        if (!existsSync53(join78(memoryRoot, ".git"))) {
+        if (!existsSync52(join78(memoryRoot, ".git"))) {
           const enabled = await isMemfsEnabledOnServer2(parsed.agent_id);
           if (!enabled) {
             sendFailure("memfs is not enabled for this agent");
             return;
           }
           await ensureLocalMemfsCheckout2(parsed.agent_id);
-          if (!existsSync53(join78(memoryRoot, ".git"))) {
+          if (!existsSync52(join78(memoryRoot, ".git"))) {
             sendFailure("failed to initialize local memory checkout");
             return;
           }
@@ -267995,7 +268154,7 @@ function handleMemoryProtocolCommand(parsed, context3) {
         } = await Promise.resolve().then(() => (init_memory_filesystem2(), exports_memory_filesystem));
         const { commitMemoryWrite: commitMemoryWrite2 } = await Promise.resolve().then(() => (init_memory_git(), exports_memory_git));
         const { writeFile: writeFile16, mkdir: mkdir14 } = await import("node:fs/promises");
-        const { existsSync: existsSync53 } = await import("node:fs");
+        const { existsSync: existsSync52 } = await import("node:fs");
         const { dirname: dirname34, isAbsolute: isAbsolute25, join: join78, normalize: normalize4, relative: relative8, sep: sep8 } = await import("node:path");
         if (isAbsolute25(parsed.path) || parsed.path.length === 0) {
           sendFailure("write_memory_file: path must be a non-empty relative path");
@@ -268008,14 +268167,14 @@ function handleMemoryProtocolCommand(parsed, context3) {
           sendFailure("write_memory_file: path must resolve inside the memory root");
           return;
         }
-        if (!existsSync53(join78(memoryRoot, ".git"))) {
+        if (!existsSync52(join78(memoryRoot, ".git"))) {
           const enabled = await isMemfsEnabledOnServer2(parsed.agent_id);
           if (!enabled) {
             sendFailure("write_memory_file: memfs is not enabled for this agent");
             return;
           }
           await ensureLocalMemfsCheckout2(parsed.agent_id);
-          if (!existsSync53(join78(memoryRoot, ".git"))) {
+          if (!existsSync52(join78(memoryRoot, ".git"))) {
             sendFailure("write_memory_file: failed to initialize local memory checkout");
             return;
           }
@@ -268093,7 +268252,7 @@ function handleMemoryProtocolCommand(parsed, context3) {
         } = await Promise.resolve().then(() => (init_memory_filesystem2(), exports_memory_filesystem));
         const { commitMemoryWrite: commitMemoryWrite2 } = await Promise.resolve().then(() => (init_memory_git(), exports_memory_git));
         const { unlink: unlink4 } = await import("node:fs/promises");
-        const { existsSync: existsSync53 } = await import("node:fs");
+        const { existsSync: existsSync52 } = await import("node:fs");
         const { isAbsolute: isAbsolute25, join: join78, normalize: normalize4, relative: relative8, sep: sep8 } = await import("node:path");
         if (isAbsolute25(parsed.path) || parsed.path.length === 0) {
           sendFailure("delete_memory_file: path must be a non-empty relative path");
@@ -268106,21 +268265,21 @@ function handleMemoryProtocolCommand(parsed, context3) {
           sendFailure("delete_memory_file: path must resolve inside the memory root");
           return;
         }
-        if (!existsSync53(join78(memoryRoot, ".git"))) {
+        if (!existsSync52(join78(memoryRoot, ".git"))) {
           const enabled = await isMemfsEnabledOnServer2(parsed.agent_id);
           if (!enabled) {
             sendFailure("delete_memory_file: memfs is not enabled for this agent");
             return;
           }
           await ensureLocalMemfsCheckout2(parsed.agent_id);
-          if (!existsSync53(join78(memoryRoot, ".git"))) {
+          if (!existsSync52(join78(memoryRoot, ".git"))) {
             sendFailure("delete_memory_file: failed to initialize local memory checkout");
             return;
           }
         }
         const pathspec = rel.split(sep8).join("/");
         const removeIfPresent = async () => {
-          if (!existsSync53(absolutePath))
+          if (!existsSync52(absolutePath))
             return false;
           await unlink4(absolutePath);
           return true;
@@ -268315,7 +268474,7 @@ __export(exports_remote_model_catalog, {
   applyCatalogModels: () => applyCatalogModels,
   __testResetRemoteModelCatalog: () => __testResetRemoteModelCatalog
 });
-import { existsSync as existsSync53, mkdirSync as mkdirSync40, readFileSync as readFileSync44, writeFileSync as writeFileSync34 } from "node:fs";
+import { existsSync as existsSync52, mkdirSync as mkdirSync40, readFileSync as readFileSync44, writeFileSync as writeFileSync34 } from "node:fs";
 import { homedir as homedir40 } from "node:os";
 import { dirname as dirname34, join as join78 } from "node:path";
 function catalogCachePath() {
@@ -268419,7 +268578,7 @@ function persistCatalogCache(entries2, source) {
 function loadPersistedModelCatalog(source) {
   try {
     const path33 = catalogCachePath();
-    if (!existsSync53(path33)) {
+    if (!existsSync52(path33)) {
       return false;
     }
     const parsed = JSON.parse(readFileSync44(path33, "utf-8"));
@@ -269112,7 +269271,7 @@ function recordStaleHandleUse(collector, owner, capability, onDiagnostic) {
 var MOD_DIAGNOSTICS_MAX_COUNT = 200, MOD_DIAGNOSTICS_RESET_COUNT = 50, MOD_DYNAMIC_CONTEXT_MIGRATION_HINT = "Dynamic context is now passed as ctx to commands, tools, events, permissions, and UI renderers. Use ctx.agent, ctx.cwd, ctx.conversation, ctx.model, etc.", MOD_LETTA_GET_CONTEXT_MIGRATION_HINT = "letta.getContext has been removed. Activation has no dynamic invocation context. Move dynamic work into a command, tool, event, permission, status, or statusline callback that receives ctx, or use explicit/global state such as process.cwd() for activation-time background work.", MOD_CTX_GET_CONTEXT_MIGRATION_HINT = "ctx.getContext has been removed. Use ctx directly; scoped fields are available as ctx.agent, ctx.cwd, ctx.conversation, ctx.model, etc.", MOD_GENERIC_GET_CONTEXT_MIGRATION_HINT = "getContext helpers have been removed. If this is callback ctx, use ctx directly; if activation/background code needs runtime state, move it into a callback that receives ctx or use explicit/global state such as process.cwd().";
 
 // src/mods/paths.ts
-import { existsSync as existsSync54 } from "node:fs";
+import { existsSync as existsSync53 } from "node:fs";
 import { homedir as homedir41 } from "node:os";
 import path33 from "node:path";
 function getGlobalModsDirectory(homeDirectory = homedir41()) {
@@ -269126,10 +269285,10 @@ function resolveDefaultGlobalModsDirectory(homeDirectory = homedir41(), env6 = p
   if (environmentDirectory)
     return environmentDirectory;
   const modsDirectory = getGlobalModsDirectory(homeDirectory);
-  if (existsSync54(modsDirectory))
+  if (existsSync53(modsDirectory))
     return modsDirectory;
   const legacyDirectory = getLegacyGlobalExtensionsDirectory(homeDirectory);
-  if (existsSync54(legacyDirectory))
+  if (existsSync53(legacyDirectory))
     return legacyDirectory;
   return modsDirectory;
 }
@@ -377136,10 +377295,10 @@ ${lanes.join(`
       }
       function getDefaultLibFilePriority(a2) {
         if (containsPath(defaultLibraryPath, a2.fileName, false)) {
-          const basename21 = getBaseFileName(a2.fileName);
-          if (basename21 === "lib.d.ts" || basename21 === "lib.es6.d.ts")
+          const basename22 = getBaseFileName(a2.fileName);
+          if (basename22 === "lib.d.ts" || basename22 === "lib.es6.d.ts")
             return 0;
-          const name = removeSuffix(removePrefix(basename21, "lib."), ".d.ts");
+          const name = removeSuffix(removePrefix(basename22, "lib."), ".d.ts");
           const index = libs.indexOf(name);
           if (index !== -1)
             return index + 1;
@@ -429702,8 +429861,8 @@ ${options.prefix}` : `
           }
         };
         for (const file of files) {
-          const basename21 = getBaseFileName(file);
-          if (basename21 === "package.json" || basename21 === "bower.json") {
+          const basename22 = getBaseFileName(file);
+          if (basename22 === "package.json" || basename22 === "bower.json") {
             createProjectWatcher(file, "FileWatcher");
             continue;
           }
@@ -432580,8 +432739,8 @@ All files are: ${JSON.stringify(names2)}`, "Err");
           const fileOrDirectoryPath = removeIgnoredPath(this.toPath(fileOrDirectory));
           if (!fileOrDirectoryPath)
             return;
-          const basename21 = getBaseFileName(fileOrDirectoryPath);
-          if (((_a10 = result3.affectedModuleSpecifierCacheProjects) == null ? undefined : _a10.size) && (basename21 === "package.json" || basename21 === "node_modules")) {
+          const basename22 = getBaseFileName(fileOrDirectoryPath);
+          if (((_a10 = result3.affectedModuleSpecifierCacheProjects) == null ? undefined : _a10.size) && (basename22 === "package.json" || basename22 === "node_modules")) {
             result3.affectedModuleSpecifierCacheProjects.forEach((project) => {
               var _a22;
               (_a22 = project.getModuleSpecifierCache()) == null || _a22.clear();
@@ -438187,7 +438346,7 @@ var init_package_manifest = __esm(() => {
 
 // src/mods/package-registry.ts
 import {
-  existsSync as existsSync55,
+  existsSync as existsSync54,
   mkdirSync as mkdirSync42,
   readFileSync as readFileSync46,
   rmSync as rmSync21,
@@ -438259,7 +438418,7 @@ function getRegistryPath(modsRoot) {
 }
 function readRegistryObject(modsRoot) {
   const registryPath = getRegistryPath(modsRoot);
-  if (!existsSync55(registryPath)) {
+  if (!existsSync54(registryPath)) {
     return { diagnostics: [], ok: false, registryExists: false, registryPath };
   }
   const registryResult = parseJsonFile(registryPath);
@@ -438691,7 +438850,7 @@ function writePackageRegistry(registryPath, registry4) {
 }
 function validateManagedModPackageRegistryForMutation(modsRoot) {
   const registryPath = getRegistryPath(modsRoot);
-  const contents = existsSync55(registryPath) ? readFileSync46(registryPath, "utf8") : null;
+  const contents = existsSync54(registryPath) ? readFileSync46(registryPath, "utf8") : null;
   const registry4 = readMutablePackageRegistry(modsRoot, {
     createIfMissing: true
   });
@@ -438814,10 +438973,10 @@ var init_package_registry = __esm(() => {
 });
 
 // src/mods/mod-sources.ts
-import { existsSync as existsSync56, readdirSync as readdirSync22 } from "node:fs";
+import { existsSync as existsSync55, readdirSync as readdirSync22 } from "node:fs";
 import path37 from "node:path";
 function listModFiles(directory) {
-  if (!existsSync56(directory))
+  if (!existsSync55(directory))
     return [];
   return readdirSync22(directory, { withFileTypes: true }).filter((entry) => {
     if (!entry.isFile())
@@ -438833,7 +438992,7 @@ function resolveLocalModSources(options = {}) {
   const includeGlobalMods = options.includeGlobalMods !== false;
   const managedPackages = includeGlobalMods ? resolveManagedModPackages(globalModsDirectory) : { diagnostics: [], files: [], packages: [] };
   const sources = [];
-  if (includeGlobalMods && legacyGlobalExtensionsDirectory && path37.resolve(legacyGlobalExtensionsDirectory) !== path37.resolve(globalModsDirectory) && existsSync56(legacyGlobalExtensionsDirectory)) {
+  if (includeGlobalMods && legacyGlobalExtensionsDirectory && path37.resolve(legacyGlobalExtensionsDirectory) !== path37.resolve(globalModsDirectory) && existsSync55(legacyGlobalExtensionsDirectory)) {
     sources.push({
       files: listModFiles(legacyGlobalExtensionsDirectory),
       legacyMigrationTargetRoot: globalModsDirectory,
@@ -438872,7 +439031,7 @@ var init_mod_sources = __esm(() => {
 
 // src/mods/runtime-dependencies.ts
 import {
-  lstatSync as lstatSync2,
+  lstatSync as lstatSync3,
   mkdirSync as mkdirSync43,
   readlinkSync,
   symlinkSync,
@@ -438893,7 +439052,7 @@ function ensureRuntimeDependencySymlink(cacheDirectory, packageName, resolveRunt
   const packageDirectory = path38.resolve(resolveRuntimePackageDirectory(packageName));
   mkdirSync43(nodeModulesDirectory, { recursive: true });
   try {
-    const stats = lstatSync2(linkPath);
+    const stats = lstatSync3(linkPath);
     if (!stats.isSymbolicLink())
       return;
     const existingTarget = readlinkSync(linkPath);
@@ -439012,7 +439171,7 @@ function createNoopModPanelHandle() {
 // src/mods/mod-engine.ts
 import { createHash as createHash16 } from "node:crypto";
 import {
-  existsSync as existsSync57,
+  existsSync as existsSync56,
   mkdirSync as mkdirSync44,
   readdirSync as readdirSync23,
   readFileSync as readFileSync47,
@@ -439202,7 +439361,7 @@ function createImportableModPath(modPath, cacheDirectory, source) {
   }
   const baseName = path39.basename(modPath, fileExtension).replace(/[^a-zA-Z0-9_-]/g, "-");
   const importPath = path39.join(importCacheDirectory, `.letta-mod-${baseName}-${hash3}.mjs`);
-  if (!existsSync57(importPath)) {
+  if (!existsSync56(importPath)) {
     writeFileSync37(importPath, importableSource, "utf8");
   }
   try {
@@ -442625,19 +442784,19 @@ function emitSkillsUpdated(socket, safeSocketSend) {
 }
 async function handleSkillCommand(parsed, socket, safeSocketSend) {
   const {
-    existsSync: existsSync58,
-    lstatSync: lstatSync3,
+    existsSync: existsSync57,
+    lstatSync: lstatSync4,
     mkdirSync: mkdirSync45,
     rmdirSync: rmdirSync2,
     symlinkSync: symlinkSync2,
     unlinkSync: unlinkSync15
   } = await import("node:fs");
-  const { basename: basename21, join: join80 } = await import("node:path");
+  const { basename: basename22, join: join80 } = await import("node:path");
   const lettaHome = process.env.LETTA_HOME || join80(process.env.HOME || process.env.USERPROFILE || "~", ".letta");
   const globalSkillsDir = join80(lettaHome, "skills");
   if (parsed.type === "skill_enable") {
     try {
-      if (!existsSync58(parsed.skill_path)) {
+      if (!existsSync57(parsed.skill_path)) {
         safeSocketSend(socket, {
           type: "skill_enable_response",
           request_id: parsed.request_id,
@@ -442647,7 +442806,7 @@ async function handleSkillCommand(parsed, socket, safeSocketSend) {
         return true;
       }
       const skillMdPath = join80(parsed.skill_path, "SKILL.md");
-      if (!existsSync58(skillMdPath)) {
+      if (!existsSync57(skillMdPath)) {
         safeSocketSend(socket, {
           type: "skill_enable_response",
           request_id: parsed.request_id,
@@ -442656,11 +442815,11 @@ async function handleSkillCommand(parsed, socket, safeSocketSend) {
         }, "listener_skill_send_failed", "listener_skill_command");
         return true;
       }
-      const linkName = basename21(parsed.skill_path);
+      const linkName = basename22(parsed.skill_path);
       const linkPath = join80(globalSkillsDir, linkName);
       mkdirSync45(globalSkillsDir, { recursive: true });
-      if (existsSync58(linkPath)) {
-        const stat12 = lstatSync3(linkPath);
+      if (existsSync57(linkPath)) {
+        const stat12 = lstatSync4(linkPath);
         if (stat12.isSymbolicLink()) {
           if (process.platform === "win32") {
             rmdirSync2(linkPath);
@@ -442701,7 +442860,7 @@ async function handleSkillCommand(parsed, socket, safeSocketSend) {
   if (parsed.type === "skill_disable") {
     try {
       const linkPath = join80(globalSkillsDir, parsed.name);
-      if (!existsSync58(linkPath)) {
+      if (!existsSync57(linkPath)) {
         safeSocketSend(socket, {
           type: "skill_disable_response",
           request_id: parsed.request_id,
@@ -442710,7 +442869,7 @@ async function handleSkillCommand(parsed, socket, safeSocketSend) {
         }, "listener_skill_send_failed", "listener_skill_command");
         return true;
       }
-      const stat12 = lstatSync3(linkPath);
+      const stat12 = lstatSync4(linkPath);
       if (!stat12.isSymbolicLink()) {
         safeSocketSend(socket, {
           type: "skill_disable_response",
@@ -443209,7 +443368,7 @@ function populateInterruptQueue(runtime, input) {
       type: "approval",
       tool_call_id: toolCallId,
       approve: false,
-      reason: "User interrupted the stream"
+      reason: input.denialReason ?? "User interrupted the stream"
     }));
     runtime.pendingInterruptedContext = {
       agentId: input.agentId,
@@ -443621,7 +443780,7 @@ var init_control_inputs = __esm(async () => {
 });
 
 // src/websocket/terminal-handler.ts
-import { existsSync as existsSync58 } from "node:fs";
+import { existsSync as existsSync57 } from "node:fs";
 import * as os7 from "node:os";
 import WebSocket7 from "ws";
 function getTerminalKey(connectionId, terminalId) {
@@ -443637,7 +443796,7 @@ function getDefaultShell() {
     "/bin/bash"
   ];
   for (const candidate of candidates2) {
-    if (candidate && existsSync58(candidate)) {
+    if (candidate && existsSync57(candidate)) {
       return candidate;
     }
   }
@@ -444034,6 +444193,24 @@ function revokeRecoveryClaims(listener, connectionId, connectionGeneration) {
     claim.revoke();
   }
 }
+function recoveryRefusals(listener) {
+  const generation4 = listener.connectionGeneration ?? undefined;
+  let state2 = refusalCounts.get(listener);
+  if (!state2 || state2.generation !== generation4) {
+    state2 = { generation: generation4, count: 0, refused: false };
+    refusalCounts.set(listener, state2);
+  }
+  return state2;
+}
+function recoveryRetryDelay(listener, base2) {
+  const state2 = recoveryRefusals(listener);
+  if (!state2.refused)
+    return base2;
+  state2.refused = false;
+  if (++state2.count === 5)
+    debugWarn("recovery", "Recovery refused because another connection owns the conversation; abandoned until the next reconnect");
+  return state2.count >= 5 ? Infinity : Math.min(base2 * 2 ** (state2.count - 1), 300000);
+}
 async function acquireRecoveryClaim(runtime, onLost = () => {}, dependencies4 = {}) {
   const connectionId = runtime.listener.connectionId;
   const connectionGeneration = runtime.listener.connectionGeneration;
@@ -444074,8 +444251,13 @@ async function acquireRecoveryClaim(runtime, onLost = () => {}, dependencies4 =
     const claim = new RecoveryClaim(runtime, runtime.agentId, runtime.conversationId, connectionId, connectionGeneration, response.token, response.fence, request2, dependencies4.schedule ?? ((callback, delay6) => setTimeout(callback, delay6)), dependencies4.cancel ?? ((timer) => clearTimeout(timer)), onLost, now2, requestedAt + RECOVERY_CLAIM_TTL_MS - RECOVERY_CLAIM_EXPIRY_MARGIN_MS);
     runtime.listener.activeRecoveryClaims ??= new Set;
     runtime.listener.activeRecoveryClaims.add(claim);
+    refusalCounts.delete(runtime.listener);
     return claim;
   } catch (error5) {
+    if (error5 instanceof ApiRequestError && error5.status === 409 && /"owner_mismatch"/.test(error5.responseText)) {
+      recoveryRefusals(runtime.listener).refused = true;
+      return null;
+    }
     debugWarn("recovery", "Recovery claim acquisition failed", error5);
     return null;
   }
@@ -444115,12 +444297,13 @@ async function getRecoveryEligibility(runtime, readStatus = getAgentRuntimeStatu
 async function canRecoverConversation(runtime, readStatus = getAgentRuntimeStatus) {
   return await getRecoveryEligibility(runtime, readStatus) === "owned";
 }
-var RECOVERY_CLAIM_TTL_MS = 15000, RECOVERY_CLAIM_RENEW_MS = 5000, RECOVERY_CLAIM_EXPIRY_MARGIN_MS = 500, defaultRecoveryClaimRequest = (agentId, body3) => apiRequest("POST", `/v1/agents/${encodeURIComponent(agentId)}/recovery-claims`, body3, { signal: AbortSignal.timeout(5000) });
+var RECOVERY_CLAIM_TTL_MS = 15000, RECOVERY_CLAIM_RENEW_MS = 5000, RECOVERY_CLAIM_EXPIRY_MARGIN_MS = 500, defaultRecoveryClaimRequest = (agentId, body3) => apiRequest("POST", `/v1/agents/${encodeURIComponent(agentId)}/recovery-claims`, body3, { signal: AbortSignal.timeout(5000) }), refusalCounts;
 var init_recovery_ownership = __esm(async () => {
   init_agents8();
   init_request();
   init_debug();
   await init_teleport();
+  refusalCounts = new WeakMap;
 });
 
 // src/agent/approval-recovery.ts
@@ -445679,7 +445862,7 @@ var init_tui_perf = __esm(() => {
 
 // src/cli/helpers/chunk-log.ts
 import {
-  existsSync as existsSync59,
+  existsSync as existsSync58,
   mkdirSync as mkdirSync46,
   readdirSync as readdirSync24,
   unlinkSync as unlinkSync15,
@@ -445780,7 +445963,7 @@ class ChunkLog {
     if (this.dirCreated || !this.agentDir)
       return;
     try {
-      if (!existsSync59(this.agentDir)) {
+      if (!existsSync58(this.agentDir)) {
         mkdirSync46(this.agentDir, { recursive: true });
       }
       this.dirCreated = true;
@@ -445805,7 +445988,7 @@ class ChunkLog {
     if (!this.agentDir)
       return;
     try {
-      if (!existsSync59(this.agentDir))
+      if (!existsSync58(this.agentDir))
         return;
       const files = readdirSync24(this.agentDir).filter((f4) => f4.endsWith(".jsonl")).sort();
       if (files.length >= MAX_SESSION_FILES2) {
@@ -447233,6 +447416,7 @@ function finishListenerTurn(runtime, lease, options) {
       debugWarn("recovery", "Failed to retire completed listener work", error5);
     }
   }
+  runtime.activeConnectionId = null;
   return transition2;
 }
 var init_turn_terminal = __esm(async () => {
@@ -449703,7 +449887,7 @@ __export(exports_diff, {
   ADV_DIFF_IGNORE_WHITESPACE: () => ADV_DIFF_IGNORE_WHITESPACE,
   ADV_DIFF_CONTEXT_LINES: () => ADV_DIFF_CONTEXT_LINES
 });
-import { basename as basename21 } from "node:path";
+import { basename as basename22 } from "node:path";
 function readFileOrNull(p2) {
   try {
     return __require("node:fs").readFileSync(p2, "utf-8");
@@ -449727,7 +449911,7 @@ function applyAllOccurrences(content, oldStr, newStr) {
   return { ok: true, out: content.split(oldStr).join(newStr) };
 }
 function computeAdvancedDiff(input, opts) {
-  const fileName = basename21(input.filePath || "");
+  const fileName = basename22(input.filePath || "");
   const fileContent = opts?.oldStrOverride !== undefined ? opts.oldStrOverride : readFileOrNull(input.filePath);
   if (fileContent === null && input.kind !== "write") {
     return { mode: "fallback", reason: "File not readable" };
@@ -449759,7 +449943,7 @@ function computeAdvancedDiff(input, opts) {
   return { mode: "advanced", fileName, oldStr, newStr, hunks };
 }
 function parsePatchToAdvancedDiff(patchLines, filePath) {
-  const fileName = basename21(filePath);
+  const fileName = basename22(filePath);
   const hunks = [];
   let currentHunk = null;
   let oldLine = 1;
@@ -450037,8 +450221,8 @@ function isFormatterSegment(tokens) {
   }
 }
 function isShellExecutor2(token2) {
-  const basename22 = token2.split("/").pop() ?? token2;
-  return ["bash", "sh", "zsh", "dash", "ksh"].includes(basename22.toLowerCase());
+  const basename23 = token2.split("/").pop() ?? token2;
+  return ["bash", "sh", "zsh", "dash", "ksh"].includes(basename23.toLowerCase());
 }
 function normalizeRawCommand(command) {
   if (Array.isArray(command)) {
@@ -450825,7 +451009,7 @@ var init_format_args_display = __esm(() => {
 });
 
 // src/helpers/diff-preview.ts
-import path41, { basename as basename22 } from "node:path";
+import path41, { basename as basename23 } from "node:path";
 function parseHunkLinePrefix(raw2) {
   if (raw2.length === 0) {
     return { type: "context", content: "" };
@@ -450931,7 +451115,7 @@ async function computeDiffPreviews(toolName2, toolArgs, workingDirectory = getCu
           filePath: resolvedFilePath,
           content: toolArgs.content || ""
         });
-        previews.push(toDiffPreview(result3, basename22(filePath)));
+        previews.push(toDiffPreview(result3, basename23(filePath)));
       }
     } else if (isFileEditTool3(toolName2)) {
       const filePath = toolArgs.file_path;
@@ -450944,7 +451128,7 @@ async function computeDiffPreviews(toolName2, toolArgs, workingDirectory = getCu
           newString: toolArgs.new_string || "",
           replaceAll: toolArgs.replace_all
         });
-        previews.push(toDiffPreview(result3, basename22(filePath)));
+        previews.push(toDiffPreview(result3, basename23(filePath)));
       }
     } else if (isPatchTool2(toolName2) && toolArgs.input) {
       const operations2 = parsePatchOperations2(toolArgs.input);
@@ -450952,7 +451136,7 @@ async function computeDiffPreviews(toolName2, toolArgs, workingDirectory = getCu
         if (op.kind === "add" || op.kind === "update") {
           const result3 = parsePatchToAdvancedDiff2(op.patchLines, op.path);
           if (result3) {
-            previews.push(toDiffPreview(result3, basename22(op.path)));
+            previews.push(toDiffPreview(result3, basename23(op.path)));
           }
         }
       }
@@ -451008,7 +451192,28 @@ function safeJsonParseOr(json2, defaultValue) {
 async function getMissingRequiredArgs(toolName2, parsedArgs, toolContextId) {
   const schema5 = getToolSchema(toolName2, toolContextId);
   const required6 = schema5?.input_schema?.required || [];
-  return required6.filter((key3) => !(key3 in parsedArgs) || parsedArgs[key3] == null);
+  const properties4 = schema5?.input_schema?.properties;
+  return required6.filter((key3) => {
+    if (!(key3 in parsedArgs) || parsedArgs[key3] === undefined)
+      return true;
+    if (parsedArgs[key3] === null)
+      return !schemaAllowsNull2(properties4?.[key3]);
+    return false;
+  });
+}
+function typeAllowsNull(schema5) {
+  if (!schema5 || typeof schema5 !== "object")
+    return false;
+  const type3 = schema5.type;
+  return type3 === "null" || Array.isArray(type3) && type3.includes("null");
+}
+function schemaAllowsNull2(schema5) {
+  if (typeAllowsNull(schema5))
+    return true;
+  if (!schema5 || typeof schema5 !== "object")
+    return false;
+  const { anyOf: anyOf3, oneOf: oneOf3 } = schema5;
+  return [anyOf3, oneOf3].some((branches) => Array.isArray(branches) && branches.some(typeAllowsNull));
 }
 function formatMissingRequiredArgsReason(toolName2, parsedArgs, missingRequiredArgs, argsParse) {
   const received = Object.keys(parsedArgs).join(", ");
@@ -451685,7 +451890,7 @@ async function handleApprovalStop(params) {
   const sendOptions = buildSendOptions() ?? {};
   if (shouldInterrupt())
     return interruptTermination();
-  const consumedQueuedTurn = params.allowQueuedContinuation === false ? null : consumeQueuedTurn(runtime, params.activeOriginatorScope ?? null);
+  const consumedQueuedTurn = params.allowQueuedContinuation === false ? null : consumeQueuedTurn(runtime);
   if (consumedQueuedTurn) {
     const { dequeuedBatch, queuedTurn } = consumedQueuedTurn;
     await params.onConsumeQueuedTurn?.(queuedTurn);
@@ -451797,7 +452002,7 @@ var init_turn_approval = __esm(async () => {
 });
 
 // src/agent/attached-repository-git-sync.ts
-import { existsSync as existsSync60 } from "node:fs";
+import { existsSync as existsSync59 } from "node:fs";
 import { join as join81 } from "node:path";
 async function getPendingCommitCount(path42) {
   const divergence = await getMemoryAheadBehind(path42);
@@ -451828,7 +452033,7 @@ async function syncPendingAttachedRepositoryCommitsUnlocked(params) {
     path: path42,
     permissions: params.repository.permissions ?? "unknown"
   };
-  if (!existsSync60(join81(path42, ".git"))) {
+  if (!existsSync59(join81(path42, ".git"))) {
     return {
       ...resultBase,
       status: "skipped",
@@ -451998,7 +452203,7 @@ var init_attached_repository_git_sync = __esm(() => {
 });
 
 // src/reminders/memory-git-sync.ts
-import { existsSync as existsSync61 } from "node:fs";
+import { existsSync as existsSync60 } from "node:fs";
 import { join as join82 } from "node:path";
 function formatMemoryRepairInProgressReminder(result3) {
   return `${SYSTEM_REMINDER_OPEN}
@@ -452109,7 +452314,7 @@ async function runPostTurnMemorySync(params, dependencies4 = {}) {
   if (memorySyncEnabled) {
     try {
       const memoryDir = getScopedMemoryFilesystemRoot(params.agentId);
-      const release = existsSync61(join82(memoryDir, ".git")) ? await (dependencies4.claimOperation ?? claimMemoryOperation)(memoryDir) : undefined;
+      const release = existsSync60(join82(memoryDir, ".git")) ? await (dependencies4.claimOperation ?? claimMemoryOperation)(memoryDir) : undefined;
       if (release !== null) {
         try {
           const result3 = await syncMemory(params.agentId);
@@ -452946,12 +453151,12 @@ function rowToolCalls(row, index, diagnostics2) {
   }
   return calls;
 }
-function contentText2(content) {
+function contentText3(content) {
   if (typeof content === "string") {
     if (content.startsWith(CONTENT_JSON_PREFIX)) {
       const encoded = content.slice(CONTENT_JSON_PREFIX.length);
       try {
-        return contentText2(JSON.parse(encoded));
+        return contentText3(JSON.parse(encoded));
       } catch {
         return encoded;
       }
@@ -453037,7 +453242,7 @@ var init_hermes = __esm(() => {
           });
         };
         if (row.role === "user") {
-          const content = contentText2(row.content);
+          const content = contentText3(row.content);
           if (content) {
             emit({
               type: "message",
@@ -453057,7 +453262,7 @@ var init_hermes = __esm(() => {
               ...timestamp ? { timestamp } : {}
             });
           }
-          const content = contentText2(row.content);
+          const content = contentText3(row.content);
           if (content) {
             emit({
               type: "message",
@@ -453080,7 +453285,7 @@ var init_hermes = __esm(() => {
         if (row.role === "tool") {
           emit({
             type: "tool_result",
-            content: contentText2(row.content),
+            content: contentText3(row.content),
             ...typeof row.tool_call_id === "string" && row.tool_call_id ? { callId: row.tool_call_id } : {},
             ...timestamp ? { timestamp } : {}
           });
@@ -454722,7 +454927,7 @@ var init_listing_shared = __esm(() => {
 
 // node_modules/@letta-ai/trajectory/dist/adapters/claude-code/list.js
 import { homedir as homedir45 } from "node:os";
-import { basename as basename23, join as join85 } from "node:path";
+import { basename as basename24, join as join85 } from "node:path";
 async function listClaudeCodeTrajectories(root2) {
   const base2 = root2 ?? join85(homedir45(), ".claude", "projects");
   const items3 = [];
@@ -454734,7 +454939,7 @@ async function listClaudeCodeTrajectories(root2) {
       if (!entry.isFile || !entry.name.endsWith(".jsonl"))
         continue;
       const path42 = join85(projectPath, entry.name);
-      const listing = listingFromFile(basename23(entry.name, ".jsonl"), path42);
+      const listing = listingFromFile(basename24(entry.name, ".jsonl"), path42);
       if (listing)
         items3.push(listing);
     }
@@ -454747,12 +454952,12 @@ var init_list = __esm(() => {
 
 // node_modules/@letta-ai/trajectory/dist/adapters/codex/list.js
 import { homedir as homedir46 } from "node:os";
-import { basename as basename24, join as join86 } from "node:path";
+import { basename as basename25, join as join86 } from "node:path";
 async function listCodexTrajectories(root2) {
   const base2 = root2 ?? join86(homedir46(), ".codex", "sessions");
   const items3 = [];
   for (const path42 of collectFiles(base2, ".jsonl", 4)) {
-    const listing = listingFromFile(basename24(path42, ".jsonl"), path42);
+    const listing = listingFromFile(basename25(path42, ".jsonl"), path42);
     if (listing)
       items3.push(listing);
   }
@@ -454857,9 +455062,9 @@ var init_list5 = __esm(() => {
 });
 
 // node_modules/@letta-ai/trajectory/dist/adapters/openclaw/list.js
-import { existsSync as existsSync62 } from "node:fs";
+import { existsSync as existsSync61 } from "node:fs";
 import { homedir as homedir50 } from "node:os";
-import { basename as basename25, join as join90 } from "node:path";
+import { basename as basename26, join as join90 } from "node:path";
 async function listOpenClawTrajectories(root2) {
   const base2 = root2 ?? defaultStateDir();
   const items3 = [];
@@ -454872,7 +455077,7 @@ async function listOpenClawTrajectories(root2) {
       if (!entry.isFile || !entry.name.endsWith(".jsonl"))
         continue;
       const path42 = join90(sessionsPath, entry.name);
-      const listing = listingFromFile(basename25(entry.name, ".jsonl"), path42);
+      const listing = listingFromFile(basename26(entry.name, ".jsonl"), path42);
       if (listing)
         items3.push(listing);
     }
@@ -454884,7 +455089,7 @@ function defaultStateDir() {
   if (override)
     return override;
   const current = join90(homedir50(), ".openclaw");
-  if (existsSync62(current))
+  if (existsSync61(current))
     return current;
   return join90(homedir50(), ".clawdbot");
 }
@@ -457390,6 +457595,11 @@ var init_execution_context_mcp_originator = __esm(async () => {
   await init_manager2();
 });
 
+// src/websocket/listener/mcp-originator-scope.ts
+function getEffectiveMcpOriginatorId(message2) {
+  return message2.mcpOriginatorTokenPresent === true ? message2.mcpOriginatorSuperRunId : undefined;
+}
+
 // src/websocket/listener/turn-finalizer.ts
 function applyTurnOriginSwap(parkedInput, consumedTurn, turnToolContextId) {
   retireMcpOriginatorTokensOnOriginSwap(parkedInput.mcpOriginatorSuperRunId, consumedTurn.mcpOriginatorSuperRunId);
@@ -457397,7 +457607,6 @@ function applyTurnOriginSwap(parkedInput, consumedTurn, turnToolContextId) {
 }
 function createQueuedTurnConsumer(params) {
   return {
-    activeOriginatorScope: getMcpOriginatorScope(params.parkedInput),
     allowQueuedContinuation: params.parkedInput.messages.some((message2) => ("content" in message2)),
     onConsumeQueuedTurn: async (queuedTurn) => {
       applyTurnOriginSwap(params.parkedInput, queuedTurn, params.turnToolContextId);
@@ -457501,6 +457710,37 @@ var init_turn_finalizer = __esm(async () => {
   ]);
 });
 
+// src/websocket/listener/turn-max-turns.ts
+function finishTurnIfMaxTurnsReached(params) {
+  const { runtime, buffers, stopReason, agentId, conversationId } = params;
+  const maxTurns = runtime.executionSettings?.max_turns;
+  if (maxTurns === undefined || buffers.usage.stepCount < maxTurns || stopReason === "error" && params.fallbackError) {
+    return false;
+  }
+  const message2 = `Maximum turns limit reached (${buffers.usage.stepCount}/${maxTurns} steps)`;
+  if (stopReason === "requires_approval") {
+    populateInterruptQueue(runtime, {
+      lastExecutionResults: null,
+      lastExecutingToolCallIds: [],
+      lastNeedsUserInputToolCallIds: params.approvals.map((a2) => a2.toolCallId),
+      agentId,
+      conversationId,
+      denialReason: message2
+    });
+  }
+  params.finishTurn({
+    stopReason: "max_steps",
+    socket: params.socket,
+    agentId,
+    conversationId,
+    errorNotice: { message: message2, runId: params.runId }
+  });
+  return true;
+}
+var init_turn_max_turns = __esm(async () => {
+  await init_interrupts();
+});
+
 // src/websocket/listener/turn-observers.ts
 function registerTurnObserver(otid, hooks) {
   hooksByOtid.set(otid, hooks);
@@ -458387,18 +458627,18 @@ async function handleIncomingMessageInner(msg, socket, runtime, onStatusChange,
         break;
       }
       lastApprovalContinuationAccepted = false;
-      const maxTurns = runtime.executionSettings?.max_turns;
-      if (maxTurns !== undefined && buffers.usage.stepCount >= maxTurns && stopReason !== "requires_approval" && !(stopReason === "error" && fallbackError)) {
-        finishTurn({
-          stopReason: "max_steps",
-          socket,
-          agentId,
-          conversationId,
-          errorNotice: {
-            message: `Maximum turns limit reached (${buffers.usage.stepCount}/${maxTurns} steps)`,
-            runId: runId || runtime.activeRunId
-          }
-        });
+      if (finishTurnIfMaxTurnsReached({
+        runtime,
+        socket,
+        buffers,
+        stopReason,
+        approvals,
+        fallbackError,
+        runId: runId || runtime.activeRunId,
+        agentId,
+        conversationId,
+        finishTurn
+      })) {
         break;
       }
       if (stopReason === "end_turn") {
@@ -458925,6 +459165,7 @@ var init_turn = __esm(async () => {
     init_turn_correlation(),
     init_turn_durability_ownership(),
     init_turn_finalizer(),
+    init_turn_max_turns(),
     init_turn_send(),
     init_turn_setup(),
     init_turn_status(),
@@ -460199,42 +460440,9 @@ function stampInboundUserMessageOtids(incoming) {
 function rejectReplacement(reason) {
   throw new Error(`Invalid listener replacement lineage: ${reason}`);
 }
-function cloneRawData(frame) {
-  if (Array.isArray(frame))
-    return frame.map((chunk2) => Buffer.from(chunk2));
-  if (Buffer.isBuffer(frame))
-    return Buffer.from(frame);
-  if (frame instanceof ArrayBuffer)
-    return frame.slice(0);
-  return Buffer.from(new Uint8Array(frame));
-}
-function cloneStartupFrameHandoff(handoff) {
-  return handoff.kind === "overflow" ? { ...handoff } : { ...handoff, frames: handoff.frames.map(cloneRawData) };
-}
-function cloneDispositionLedger(ledger) {
-  return {
-    entries: new Map([...ledger.entries].map(([key3, entry]) => [key3, structuredClone(entry)])),
-    scopeCounts: new Map(ledger.scopeCounts),
-    quarantinedCount: ledger.quarantinedCount,
-    abandonedReservations: new Map([...ledger.abandonedReservations].map(([key3, reservation]) => [
-      key3,
-      { ...reservation }
-    ])),
-    expiryQueue: ledger.expiryQueue.map((entry) => ({ ...entry })),
-    expiryQueueHead: ledger.expiryQueueHead,
-    nextGeneration: ledger.nextGeneration,
-    persistentPath: ledger.persistentPath
-  };
-}
 function createListenerClientReplacement(runtime, opts) {
   const lineageId = resolveStartupLineageId(runtime, opts);
   const generation4 = runtime.startupGenerationByLineage.get(lineageId) ?? 0;
-  const startupFrameHandoff = cloneStartupFrameHandoff(runtime.pendingStartupFramesByLineage.get(lineageId) ?? {
-    kind: "frames",
-    frames: [],
-    byteLength: 0
-  });
-  const clientMessageIdsByRunIdByConversation = cloneTurnCorrelationIndex(runtime.clientMessageIdsByRunIdByConversation);
   const replacement = Object.freeze({
     deviceId: opts.deviceId,
     connectionName: opts.connectionName,
@@ -460247,10 +460455,7 @@ function createListenerClientReplacement(runtime, opts) {
     connectionName: opts.connectionName,
     lineageId,
     generation: generation4,
-    authorityEpoch: getRuntimeAuthorityEpoch(runtime),
-    ledger: cloneDispositionLedger(runtime.acceptedInputDispositionLedger),
-    startupFrameHandoff: cloneStartupFrameHandoff(startupFrameHandoff),
-    clientMessageIdsByRunIdByConversation: cloneTurnCorrelationIndex(clientMessageIdsByRunIdByConversation)
+    authorityEpoch: getRuntimeAuthorityEpoch(runtime)
   });
   return replacement;
 }
@@ -460265,54 +460470,29 @@ function resolveAdoptableReplacement(opts) {
     rejectReplacement("identity_mismatch");
   }
   const issuer = provenance.issuer;
-  if (succeededListenerRuntimes.has(issuer)) {
-    rejectReplacement("superseded_issuer");
-  }
   if ((issuer.startupGenerationByLineage.get(provenance.lineageId) ?? 0) !== provenance.generation) {
     rejectReplacement("stale_generation");
   }
   if (provenance.authorityEpoch === null || provenance.authorityEpoch !== getLatestRuntimeAuthorityEpoch()) {
     rejectReplacement("unauthoritative_issuer");
   }
-  const activeRuntime2 = getActiveRuntime();
-  if (issuer.intentionallyClosed) {
-    if (activeRuntime2 !== null && activeRuntime2 !== issuer) {
-      rejectReplacement("unauthoritative_issuer");
-    }
-  } else if (issuer !== activeRuntime2) {
+  if (issuer.intentionallyClosed || issuer !== getActiveRuntime()) {
     rejectReplacement("unauthoritative_issuer");
   }
   return provenance;
 }
-function assertAdoptableListenerClientReplacement(opts) {
-  resolveAdoptableReplacement(opts);
-}
-function adoptListenerClientReplacement(runtime, opts) {
+function adoptListenerClientReplacement(opts) {
   const provenance = resolveAdoptableReplacement(opts);
-  const replacement = opts.replacement;
-  if (!provenance || !replacement)
-    return;
-  replacementProvenance.delete(replacement);
-  succeededListenerRuntimes.add(provenance.issuer);
-  runtime.acceptedInputDispositionLedger = cloneDispositionLedger(provenance.ledger);
-  runtime.acceptedInputDispositionLedger.abandonedReservations = new Map([
-    ...provenance.issuer.acceptedInputDispositionLedger.abandonedReservations
-  ].map(([key3, reservation]) => [key3, { ...reservation }]));
-  runtime.clientMessageIdsByRunIdByConversation = mergeTurnCorrelationIndexes(provenance.clientMessageIdsByRunIdByConversation, provenance.issuer.clientMessageIdsByRunIdByConversation, runtime.clientMessageIdsByRunIdByConversation);
-  runtime.startupGenerationByLineage.set(provenance.lineageId, provenance.generation);
-  if (provenance.startupFrameHandoff.kind === "overflow" || provenance.startupFrameHandoff.frames.length > 0) {
-    runtime.pendingStartupFramesByLineage.set(provenance.lineageId, cloneStartupFrameHandoff(provenance.startupFrameHandoff));
-  }
-}
-var replacementProvenance, succeededListenerRuntimes;
+  if (!provenance || !opts.replacement)
+    return null;
+  replacementProvenance.delete(opts.replacement);
+  return provenance.issuer;
+}
+var replacementProvenance;
 var init_listener_replacement = __esm(async () => {
   init_startup_ingress();
-  await __promiseAll([
-    init_runtime6(),
-    init_turn_correlation()
-  ]);
+  await init_runtime6();
   replacementProvenance = new WeakMap;
-  succeededListenerRuntimes = new WeakSet;
 });
 
 // src/websocket/listener/listener-task.ts
@@ -460592,9 +460772,9 @@ __export(exports_custom, {
   GLOBAL_COMMANDS_DIR: () => GLOBAL_COMMANDS_DIR,
   COMMANDS_DIR: () => COMMANDS_DIR
 });
-import { existsSync as existsSync63 } from "node:fs";
+import { existsSync as existsSync62 } from "node:fs";
 import { readdir as readdir11, readFile as readFile25 } from "node:fs/promises";
-import { basename as basename27, dirname as dirname36, join as join93 } from "node:path";
+import { basename as basename28, dirname as dirname36, join as join93 } from "node:path";
 async function getCustomCommands() {
   if (cachedCommands !== null) {
     return cachedCommands;
@@ -460626,7 +460806,7 @@ async function discoverCustomCommands(projectPath = join93(process.cwd(), COMMAN
   return result3;
 }
 async function discoverFromDirectory(dirPath, source) {
-  if (!existsSync63(dirPath)) {
+  if (!existsSync62(dirPath)) {
     return [];
   }
   const commands = [];
@@ -460654,7 +460834,7 @@ async function findCommandFiles(currentPath, rootPath, commands, source) {
 async function parseCommandFile(filePath, rootPath, source) {
   const content = await readFile25(filePath, "utf-8");
   const { frontmatter, body: body3 } = parseFrontmatter(content);
-  const id2 = basename27(filePath, ".md");
+  const id2 = basename28(filePath, ".md");
   const relativePath = dirname36(filePath).slice(rootPath.length);
   const namespace = relativePath.replace(/^[/\\]/, "") || undefined;
   let description = getStringField(frontmatter, "description");
@@ -461673,7 +461853,6 @@ 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
     }
   };
@@ -463691,16 +463870,29 @@ async function preparePairedListenerTransport(params) {
   runtime.streamTransport = streamSocket;
   return { kind: "ready", transport: streamSocket, streamSocket };
 }
+function createListenerLifecycleLog(opts) {
+  return (message2) => {
+    if (opts.onLog) {
+      opts.onLog(`[Listen] ${message2}`);
+      return;
+    }
+    debugLog("Listen", message2);
+  };
+}
+function formatListenerSocketClose(channel, code2, reason) {
+  const text3 = reason.toString();
+  const truncated = text3.length > MAX_CLOSE_REASON_LENGTH ? `${text3.slice(0, MAX_CLOSE_REASON_LENGTH)}...` : text3;
+  return `${channel} socket closed (code=${code2}, reason=${JSON.stringify(truncated)})`;
+}
 function attachSplitStreamSocketHandlers(params) {
   params.streamSocket.on("error", (error5) => {
+    params.log?.(`stream socket error: ${error5.message}`);
     params.trackListenerError("listener_stream_socket_error", error5, "listener_stream_socket");
     if (isDebugEnabled())
       console.error("[Listen] Stream WebSocket error:", error5);
   });
   params.streamSocket.on("close", (code2, reason) => {
-    if (isDebugEnabled()) {
-      console.log(`[Listen] Stream WebSocket closed (code: ${code2}, reason: ${reason.toString()})`);
-    }
+    params.log?.(formatListenerSocketClose("stream", code2, reason));
     terminateControlAfterStreamClose(params.runtime, params.streamSocket, code2, reason);
   });
 }
@@ -463748,6 +463940,7 @@ function handleListenerSocketOpenFailure({
   }
   terminateCurrentSocketPair(runtime, controlSocket, streamSocket);
 }
+var MAX_CLOSE_REASON_LENGTH = 120;
 var init_split_stream_lifecycle = __esm(async () => {
   init_debug();
   init_constants3();
@@ -463945,7 +464138,9 @@ async function handleSubagentMessageCommand(command, parent, deps = {}) {
           interrupt: receipt.interrupt,
           captureReservation,
           toolCallId: command.tool_call_id,
-          publishResult: true
+          publishResult: true,
+          emitCompletionNotification: false,
+          claimsParentRuntime: false
         });
       } catch (error5) {
         await receipt.interrupt().catch(() => {
@@ -465410,10 +465605,10 @@ async function recoverRecordedTurns(listener, deps = {}) {
     }
   } finally {
     recovering.delete(listener);
+    const retryDelayMs = recoveryRetryDelay(listener, deps.retryDelayMs ?? 5000);
     if (pendingRecoveries.delete(listener)) {
       scheduleRecordedTurnRecovery(listener, () => recoverRecordedTurns(listener, deps), deps.retryDelayMs);
-    } else if (deferred2 && !listener.intentionallyClosed) {
-      const retryDelayMs = deps.retryDelayMs ?? 5000;
+    } else if (deferred2 && Number.isFinite(retryDelayMs) && !listener.intentionallyClosed) {
       const timer2 = setTimeout(() => {
         retryTimers.delete(listener);
         scheduleRecordedTurnRecovery(listener, () => recoverRecordedTurns(listener, deps), retryDelayMs);
@@ -465494,6 +465689,39 @@ var init_socket_send = __esm(() => {
   init_debug();
 });
 
+// src/websocket/listener/startup-deadline.ts
+function startListenerStartupDeadline(runtime, transport3, opts, enabled = true) {
+  const socket = runtime.socket;
+  if (!enabled || !socket || socket !== transport3)
+    return () => {};
+  const configured = Number(process.env.LETTA_LISTENER_STARTUP_DEADLINE_MS);
+  const deadlineMs = Number.isFinite(configured) && configured > 0 ? configured : 60000;
+  const clear = () => {
+    clearTimeout(timer);
+    socket.off("close", clear);
+  };
+  const timer = setTimeout(() => {
+    clear();
+    if (runtime.socket !== socket || runtime.intentionallyClosed)
+      return;
+    const message2 = `Listener startup did not finish within ${deadlineMs}ms; reconnecting`;
+    try {
+      if (opts.onLog)
+        opts.onLog(message2);
+      else
+        debugLog("Listen", message2);
+    } finally {
+      socket.terminate();
+    }
+  }, deadlineMs);
+  socket.once("close", clear);
+  timer.unref();
+  return clear;
+}
+var init_startup_deadline = __esm(() => {
+  init_debug();
+});
+
 // src/websocket/listener/recovery-sync.ts
 function isBackendNotFoundError2(error5) {
   return error5 instanceof APIError && (error5.status === 404 || error5.status === 422) || error5 instanceof Error && error5.name === "LocalBackendNotFoundError";
@@ -465848,6 +466076,7 @@ async function startConnectedListenerRuntime(runtime, transport3, opts, processQ
     startListenerPongHeartbeat(runtime, transport3, trackListenerError4);
   }
   const heartbeat = options.startHeartbeat !== false && runtime.heartbeatInterval;
+  const clearStartupDeadline = startListenerStartupDeadline(runtime, transport3, opts, options.startStartupDeadline);
   let startupComplete = false;
   try {
     if (!await completeInitialConnectionStartup(runtime, startupConnection, transport3, opts, options))
@@ -465869,6 +466098,7 @@ async function startConnectedListenerRuntime(runtime, transport3, opts, processQ
       return;
     startupComplete = true;
   } finally {
+    clearStartupDeadline();
     if (!startupComplete && heartbeat) {
       clearInterval(heartbeat);
       if (runtime.heartbeatInterval === heartbeat)
@@ -466019,13 +466249,15 @@ async function attachOpenListenerSocket(runtime, socket, opts, options = {}) {
   });
 }
 async function startListenerClient(opts) {
-  assertAdoptableListenerClientReplacement(opts);
+  const resumedRuntime = adoptListenerClientReplacement(opts);
   const existingRuntime = getActiveRuntime();
-  if (existingRuntime) {
+  if (existingRuntime && !resumedRuntime)
     stopRuntime(existingRuntime, true);
+  const runtime = resumedRuntime ?? createRuntime();
+  if (resumedRuntime && runtime.connectionId) {
+    revokeRecoveryClaims(runtime, runtime.connectionId);
+    resumeListenerConnectionIdentity(runtime, runtime.connectionId, opts.connectionId);
   }
-  const runtime = createRuntime();
-  adoptListenerClientReplacement(runtime, opts);
   runtime.onWsEvent = opts.onWsEvent;
   runtime.connectionId = opts.connectionId;
   runtime.connectionName = opts.connectionName;
@@ -466033,7 +466265,8 @@ async function startListenerClient(opts) {
   telemetry.setSurface(getListenerTelemetrySurface());
   telemetry.init();
   setExplicitOrganizationId(opts.organizationId);
-  await reloadListenerModAdapter(runtime);
+  if (!resumedRuntime)
+    await reloadListenerModAdapter(runtime);
   await connectWithRetry(runtime, opts);
 }
 async function startLocalChannelListener(opts) {
@@ -466081,6 +466314,9 @@ async function connectWithRetry(runtime, opts, attempt2 = 0, startTime = Date.no
   if (attempt2 > 0) {
     if (elapsedTime >= MAX_RETRY_DURATION_MS) {
       if (runtime.everConnected && opts.onNeedsReregister) {
+        rejectPendingExternalToolCallsForConnection(runtime, opts.connectionId, "Listener connection re-registered");
+        killListenerConnectionTerminals(opts.connectionId);
+        revokeRecoveryClaims(runtime, opts.connectionId);
         opts.onNeedsReregister(createListenerClientReplacement(runtime, opts));
         return;
       }
@@ -466124,6 +466360,7 @@ async function connectWithRetry(runtime, opts, attempt2 = 0, startTime = Date.no
   const headers = { Authorization: `Bearer ${apiKey}` };
   const socket = new WebSocket11(url2.toString(), { headers });
   let streamSocket = streamUrl && !pairIdentity ? new WebSocket11(streamUrl.toString(), { headers }) : null;
+  const lifecycleLog = createListenerLifecycleLog(opts);
   const fileCommandSession = createFileCommandSession({
     socket,
     safeSocketSend,
@@ -466162,7 +466399,8 @@ async function connectWithRetry(runtime, opts, attempt2 = 0, startTime = Date.no
     attachSplitStreamSocketHandlers({
       runtime,
       streamSocket,
-      trackListenerError: trackListenerError4
+      trackListenerError: trackListenerError4,
+      log: lifecycleLog
     });
   }
   socket.on("open", () => {
@@ -466192,7 +466430,8 @@ async function connectWithRetry(runtime, opts, attempt2 = 0, startTime = Date.no
         attachSplitStreamSocketHandlers({
           runtime,
           streamSocket: streamOpen.streamSocket,
-          trackListenerError: trackListenerError4
+          trackListenerError: trackListenerError4,
+          log: lifecycleLog
         });
       }
       if (!isCurrentSocketPair(runtime, socket, streamSocket))
@@ -466231,9 +466470,12 @@ async function connectWithRetry(runtime, opts, attempt2 = 0, startTime = Date.no
       recordListenerPong(runtime, socket);
       return;
     }
+    if (!isCurrentSocketPair(runtime, socket, streamSocket))
+      return;
     pendingStartupFrames.accept(data, handleMessage);
   });
   socket.on("close", (code2, reason) => {
+    lifecycleLog(formatListenerSocketClose("control", code2, reason));
     abortStartupIngress();
     if (!shouldHandleControlSocketClose(runtime, socket, opts.connectionId)) {
       return;
@@ -466245,14 +466487,11 @@ async function connectWithRetry(runtime, opts, attempt2 = 0, startTime = Date.no
     });
     fileCommandSession.dispose();
     const reasonText = reason.toString();
-    const terminalClose = runtime.intentionallyClosed || code2 === 1008 || code2 === 1000 && reasonText === "Replaced by new connection";
+    const terminalClose = runtime.intentionallyClosed || code2 === 1008 && reasonText !== CLOUD_ENVIRONMENT_NOT_FOUND_CLOSE_REASON || code2 === 1000 && reasonText === "Replaced by new connection";
     if (!terminalClose && runtime.hasSuccessfulConnection) {
       opts.onRetrying?.(0, MAX_RETRY_ATTEMPTS, 0, opts.connectionId);
     }
     clearRuntimeTimers(runtime);
-    if (isDebugEnabled()) {
-      console.log(`[Listen] WebSocket disconnected (code: ${code2}, reason: ${reason.toString()})`);
-    }
     if (!terminalClose) {
       for (const conversationRuntime of runtime.conversationRuntimes.values()) {
         rejectPendingApprovalResolversForConnection(conversationRuntime, opts.connectionId, "Listener connection closed");
@@ -466264,7 +466503,8 @@ async function connectWithRetry(runtime, opts, attempt2 = 0, startTime = Date.no
       revokeRecoveryClaims(runtime, undefined, closingGeneration);
     }
     suspendListenerConnection(runtime, opts.connectionId);
-    killAllTerminals();
+    if (terminalClose)
+      killAllTerminals();
     clearListenerWarmState(runtime);
     if (streamSocket) {
       streamSocket.removeAllListeners("message");
@@ -466277,27 +466517,21 @@ async function connectWithRetry(runtime, opts, attempt2 = 0, startTime = Date.no
     runtime.socket = null;
     runtime.streamSocket = null;
     runtime.streamTransport = null;
-    if (terminalClose) {
-      const replacement = code2 === 1008 ? createListenerClientReplacement(runtime, opts) : null;
-      if (getActiveRuntime() === runtime) {
+    if (code2 === 1008 && !terminalClose && opts.onNeedsReregister) {
+      rejectPendingExternalToolCallsForConnection(runtime, opts.connectionId, "Listener connection re-registered");
+      killListenerConnectionTerminals(opts.connectionId);
+      revokeRecoveryClaims(runtime, opts.connectionId);
+      opts.onNeedsReregister(createListenerClientReplacement(runtime, opts));
+      return;
+    }
+    if (terminalClose || code2 === 1008) {
+      if (getActiveRuntime() === runtime)
         setActiveRuntime(null);
-      }
       stopRuntime(runtime, true);
-      if (code2 === 1008) {
-        if (isDebugEnabled()) {
-          console.log("[Listen] Environment not found, re-registering...");
-        }
-        if (opts.onNeedsReregister) {
-          if (!replacement) {
-            throw new Error("Missing listener replacement lineage");
-          }
-          opts.onNeedsReregister(replacement);
-        } else {
-          opts.onDisconnected();
-        }
-        return;
-      }
-      opts.onDisconnected();
+      if (code2 === 1008 && opts.onNeedsReregister)
+        opts.onNeedsReregister();
+      else
+        opts.onDisconnected();
       return;
     }
     const nextAttempt = runtime.hasSuccessfulConnection ? 0 : attempt2 + 1;
@@ -466308,7 +466542,10 @@ async function connectWithRetry(runtime, opts, attempt2 = 0, startTime = Date.no
     });
   });
   socket.on("error", (error5) => {
+    if (runtime.socket !== socket)
+      return;
     trackListenerError4("listener_websocket_error", error5, "listener_socket");
+    lifecycleLog(`control socket error: ${error5.message}`);
     safeEmitWsEvent("recv", "lifecycle", {
       type: "_ws_error",
       message: error5.message
@@ -466347,6 +466584,7 @@ var init_lifecycle = __esm(async () => {
   init_listener_task();
   init_permission_mode();
   init_socket_send();
+  init_startup_deadline();
   init_startup_frame_buffer();
   init_startup_ingress();
   init_stream_observers();
@@ -469669,7 +469907,7 @@ async function runListenSubcommand(argv) {
         },
         onConnected: () => {},
         onConnectionReady: async (connectedId) => {
-          const ready = await completeListenerConnectionStartup(connectedId, readiness, startChannelGateway);
+          const ready = await completeListenerConnectionStartup(connectedId, readiness, startChannelGateway, (error5) => logListenerMessage(`[ChannelGateway] startup failed: ${error5}`));
           if (!ready)
             return;
           sessionLog.log("Local channel listener ready.");
@@ -469752,7 +469990,8 @@ async function runListenSubcommand(argv) {
         console.log(`[${formatTimestamp3()}] ${arrow}${tag}  ${json2}`);
       }
     };
-    if (debugMode || lifecycleOutput) {
+    if (shouldUseNonInteractiveListenerOutput(debugMode, !!lifecycleOutput)) {
+      const printPlainLines = debugMode || !lifecycleOutput;
       const startNonInteractiveClient = async (connId, url2, nextSupportsSplitStatusChannels, nextSupportsPairedListenerGenerations, replacement) => {
         await startListenerClient2({
           replacement,
@@ -469768,18 +470007,18 @@ async function runListenSubcommand(argv) {
           onStatusChange: (status) => {
             sessionLog.log(`status: ${status}`);
             readiness.setStatus(status);
-            if (debugMode) {
+            if (printPlainLines) {
               console.log(`[${formatTimestamp3()}] status: ${status}`);
             }
           },
           onLog: logListenerMessage,
           onConnected: () => {},
           onConnectionReady: async (connectedId) => {
-            const ready = await completeListenerConnectionStartup(connectedId, readiness, startChannelGateway);
+            const ready = await completeListenerConnectionStartup(connectedId, readiness, startChannelGateway, (error5) => logListenerMessage(`[ChannelGateway] startup failed: ${error5}`));
             if (!ready)
               return;
             sessionLog.log("Connected. Awaiting instructions.");
-            if (debugMode) {
+            if (printPlainLines) {
               console.log(`[${formatTimestamp3()}] Connected. Awaiting instructions.`);
               console.log("");
             }
@@ -469787,13 +470026,13 @@ async function runListenSubcommand(argv) {
           onRetrying: (attempt2, _maxAttempts, nextRetryIn) => {
             readiness.setCloudReconnecting();
             sessionLog.log(`Reconnecting (attempt ${attempt2}, retry in ${Math.round(nextRetryIn / 1000)}s)`);
-            if (debugMode) {
+            if (printPlainLines) {
               console.log(`[${formatTimestamp3()}] Reconnecting (attempt ${attempt2}, retry in ${Math.round(nextRetryIn / 1000)}s)`);
             }
           },
           onNeedsReregister: async (replacement2) => {
             readiness.setCloudReconnecting();
-            if (debugMode) {
+            if (printPlainLines) {
               console.log(`[${formatTimestamp3()}] Computer connection expired, re-registering...`);
             }
             try {
@@ -469855,7 +470094,7 @@ async function runListenSubcommand(argv) {
           onLog: logListenerMessage,
           onConnected: () => {},
           onConnectionReady: async (connectedId) => {
-            const ready = await completeListenerConnectionStartup(connectedId, readiness, startChannelGateway);
+            const ready = await completeListenerConnectionStartup(connectedId, readiness, startChannelGateway, (error5) => logListenerMessage(`[ChannelGateway] startup failed: ${error5}`));
             if (!ready)
               return;
             sessionLog.log("Connected. Awaiting instructions.");
@@ -469958,7 +470197,7 @@ var init_listen = __esm(async () => {
 import { randomUUID as randomUUID55 } from "node:crypto";
 import {
   copyFileSync as copyFileSync3,
-  existsSync as existsSync64,
+  existsSync as existsSync63,
   mkdirSync as mkdirSync47,
   readdirSync as readdirSync26,
   readFileSync as readFileSync48,
@@ -469966,7 +470205,7 @@ import {
 } from "node:fs";
 import { join as join94 } from "node:path";
 function readJsonl(path46) {
-  if (!existsSync64(path46))
+  if (!existsSync63(path46))
     return [];
   return readFileSync48(path46, "utf8").split(`
 `).filter((line) => line.trim().length > 0).map((line) => JSON.parse(line));
@@ -470254,13 +470493,13 @@ function migrateLocalBackendTranscripts(input) {
     skipped: [],
     dryRun: input.dryRun === true
   };
-  if (!existsSync64(conversationsDir))
+  if (!existsSync63(conversationsDir))
     return result3;
   for (const name of readdirSync26(conversationsDir)) {
     const conversationDir = join94(conversationsDir, name);
     const messagesPath = join94(conversationDir, "messages.jsonl");
     const manifestPath = join94(conversationDir, "manifest.json");
-    const hasManifest = existsSync64(manifestPath);
+    const hasManifest = existsSync63(manifestPath);
     const existingManifest = hasManifest ? (() => {
       try {
         return JSON.parse(readFileSync48(manifestPath, "utf8"));
@@ -470304,7 +470543,7 @@ function migrateLocalBackendTranscripts(input) {
       copyFileSync3(messagesPath, backupPath);
       const conversationPath = join94(conversationDir, "conversation.json");
       let conversation;
-      if (existsSync64(conversationPath)) {
+      if (existsSync63(conversationPath)) {
         try {
           conversation = JSON.parse(readFileSync48(conversationPath, "utf8"));
         } catch {
@@ -470498,7 +470737,7 @@ var init_memory_tokens = __esm(() => {
 });
 
 // src/cli/subcommands/memory.ts
-import { cpSync, existsSync as existsSync65, mkdirSync as mkdirSync48, rmSync as rmSync22, statSync as statSync24 } from "node:fs";
+import { cpSync, existsSync as existsSync64, mkdirSync as mkdirSync48, rmSync as rmSync22, statSync as statSync24 } from "node:fs";
 import { readdir as readdir12 } from "node:fs/promises";
 import { dirname as dirname37, join as join95 } from "node:path";
 import { parseArgs as parseArgs11 } from "node:util";
@@ -470560,7 +470799,7 @@ function formatBackupTimestamp(date5 = new Date) {
 }
 async function listBackups(agentId) {
   const agentRoot = getAgentRoot(agentId);
-  if (!existsSync65(agentRoot)) {
+  if (!existsSync64(agentRoot)) {
     return [];
   }
   const entries2 = await readdir12(agentRoot, { withFileTypes: true });
@@ -470665,14 +470904,14 @@ async function runMemorySubcommand(argv, deps = {}) {
     }
     if (action3 === "backup") {
       const root2 = getMemoryRoot(agentId);
-      if (!existsSync65(root2)) {
+      if (!existsSync64(root2)) {
         console.error(`Memory directory not found for agent ${agentId}.`);
         return 1;
       }
       const agentRoot = getAgentRoot(agentId);
       const backupName = `memory-backup-${formatBackupTimestamp()}`;
       const backupPath = join95(agentRoot, backupName);
-      if (existsSync65(backupPath)) {
+      if (existsSync64(backupPath)) {
         console.error(`Backup already exists at ${backupPath}`);
         return 1;
       }
@@ -470696,7 +470935,7 @@ async function runMemorySubcommand(argv, deps = {}) {
         return 1;
       }
       const backupPath = resolveBackupPath(agentId, from);
-      if (!existsSync65(backupPath)) {
+      if (!existsSync64(backupPath)) {
         console.error(`Backup not found: ${backupPath}`);
         return 1;
       }
@@ -470718,11 +470957,11 @@ async function runMemorySubcommand(argv, deps = {}) {
         return 1;
       }
       const root2 = getMemoryRoot(agentId);
-      if (!existsSync65(root2)) {
+      if (!existsSync64(root2)) {
         console.error(`Memory directory not found for agent ${agentId}.`);
         return 1;
       }
-      if (existsSync65(out)) {
+      if (existsSync64(out)) {
         const stat15 = statSync24(out);
         if (stat15.isDirectory()) {
           const contents = await readdir12(out);
@@ -470771,10 +471010,10 @@ var init_memory7 = __esm(() => {
 });
 
 // src/backend/local/transcript-search.ts
-import { existsSync as existsSync66, readdirSync as readdirSync27, readFileSync as readFileSync49, statSync as statSync25 } from "node:fs";
+import { existsSync as existsSync65, readdirSync as readdirSync27, readFileSync as readFileSync49, statSync as statSync25 } from "node:fs";
 import { join as join96 } from "node:path";
 function readJsonFile3(path46) {
-  if (!existsSync66(path46))
+  if (!existsSync65(path46))
     return;
   try {
     return JSON.parse(readFileSync49(path46, "utf8"));
@@ -471056,7 +471295,7 @@ function collectConversationMessages(input) {
 }
 function conversationDirectories(storageDir) {
   const conversationsDir = join96(storageDir, "conversations");
-  if (!existsSync66(conversationsDir))
+  if (!existsSync65(conversationsDir))
     return [];
   try {
     return readdirSync27(conversationsDir).map((entry) => join96(conversationsDir, entry)).filter((entryPath) => statSync25(entryPath).isDirectory());
@@ -471970,13 +472209,13 @@ var init_model2 = __esm(() => {
 import { spawn as spawn13 } from "node:child_process";
 import {
   copyFileSync as copyFileSync4,
-  existsSync as existsSync67,
-  lstatSync as lstatSync3,
+  existsSync as existsSync66,
+  lstatSync as lstatSync4,
   mkdirSync as mkdirSync49,
   mkdtempSync as mkdtempSync5,
   readdirSync as readdirSync28,
   readFileSync as readFileSync50,
-  renameSync as renameSync14,
+  renameSync as renameSync11,
   rmSync as rmSync23,
   writeFileSync as writeFileSync40
 } from "node:fs";
@@ -472019,7 +472258,7 @@ function formatRepository(repository) {
 function isLocalLettaModPackageDirectory(packageDirectory) {
   const resolvedPackageDirectory = path46.resolve(packageDirectory);
   try {
-    const packageStats = lstatSync3(resolvedPackageDirectory);
+    const packageStats = lstatSync4(resolvedPackageDirectory);
     if (packageStats.isSymbolicLink() || !packageStats.isDirectory()) {
       return false;
     }
@@ -472046,7 +472285,7 @@ function validateManifestEntriesExist(packageRoot, entries2) {
     const entryPath = resolvePackageRelativePath(packageRoot, entry);
     let stats;
     try {
-      stats = lstatSync3(entryPath);
+      stats = lstatSync4(entryPath);
     } catch {
       throw new Error(`Package mod entry does not exist: ${entry}`);
     }
@@ -472062,7 +472301,7 @@ function resolvePackageDirectory(packageDirectory) {
   const resolvedPackageDirectory = path46.resolve(packageDirectory);
   let packageStats;
   try {
-    packageStats = lstatSync3(resolvedPackageDirectory);
+    packageStats = lstatSync4(resolvedPackageDirectory);
   } catch {
     throw new Error(`Package directory does not exist: ${packageDirectory}`);
   }
@@ -472120,7 +472359,7 @@ function copyPackageDirectory(sourceRoot, targetRoot) {
       continue;
     const sourcePath = path46.join(sourceRoot, entry.name);
     const targetPath = path46.join(targetRoot, entry.name);
-    const stats = lstatSync3(sourcePath);
+    const stats = lstatSync4(sourcePath);
     if (stats.isSymbolicLink()) {
       throw new Error(`Package contains unsupported symlink: ${sourcePath}`);
     }
@@ -472154,7 +472393,7 @@ function copyDependencyDirectoryFiltered(params) {
     }
     const sourcePath = path46.join(params.sourceRoot, entry.name);
     const targetPath = path46.join(params.targetRoot, entry.name);
-    const stats = lstatSync3(sourcePath);
+    const stats = lstatSync4(sourcePath);
     if (stats.isSymbolicLink()) {
       throw new Error(`Package dependency contains unsupported symlink: ${sourcePath}`);
     }
@@ -472179,7 +472418,7 @@ function copyDependencyDirectoryFiltered(params) {
   return copied;
 }
 function copyDependencyNodeModules(params) {
-  if (!existsSync67(params.sourceNodeModulesDirectory))
+  if (!existsSync66(params.sourceNodeModulesDirectory))
     return;
   copyDependencyDirectoryFiltered({
     installedPackageName: params.installedPackageName,
@@ -472189,7 +472428,7 @@ function copyDependencyNodeModules(params) {
 }
 function copyPackageInternalNodeModules(params) {
   const sourceNodeModulesDirectory = path46.join(params.packageDirectory, "node_modules");
-  if (!existsSync67(sourceNodeModulesDirectory))
+  if (!existsSync66(sourceNodeModulesDirectory))
     return;
   copyDependencyDirectoryFiltered({
     sourceRoot: sourceNodeModulesDirectory,
@@ -472211,12 +472450,12 @@ function removeIfExists(targetPath) {
 }
 function restoreDestination(params) {
   rmSync23(params.destinationRoot, { force: true, recursive: true });
-  if (params.backupRoot && existsSync67(params.backupRoot)) {
-    renameSync14(params.backupRoot, params.destinationRoot);
+  if (params.backupRoot && existsSync66(params.backupRoot)) {
+    renameSync11(params.backupRoot, params.destinationRoot);
   }
 }
 function restoreDestinationIfNeeded(params) {
-  if (!params.backupRoot || !existsSync67(params.backupRoot)) {
+  if (!params.backupRoot || !existsSync66(params.backupRoot)) {
     rmSync23(params.destinationRoot, { force: true, recursive: true });
     return;
   }
@@ -472257,13 +472496,13 @@ function installPreparedManagedModPackage(params) {
         targetPackageRoot: stagingRoot
       });
     }
-    if (existsSync67(destinationRoot)) {
+    if (existsSync66(destinationRoot)) {
       backupRoot = makeSiblingTempDirectory(destinationRoot, "backup");
       rmSync23(backupRoot, { force: true, recursive: true });
-      renameSync14(destinationRoot, backupRoot);
+      renameSync11(destinationRoot, backupRoot);
       destinationNeedsRollback = true;
     }
-    renameSync14(stagingRoot, destinationRoot);
+    renameSync11(stagingRoot, destinationRoot);
     destinationNeedsRollback = true;
     stagingRoot = null;
     try {
@@ -472542,13 +472781,13 @@ function hasRuntimeDependencies(packageJson) {
 }
 function readPackageJsonIfExists(packageDirectory) {
   const packageJsonPath = path46.join(packageDirectory, "package.json");
-  if (!existsSync67(packageJsonPath))
+  if (!existsSync66(packageJsonPath))
     return null;
   return readPackageJson(packageJsonPath);
 }
 function isRegularModFile(filePath) {
   try {
-    const stats = lstatSync3(filePath);
+    const stats = lstatSync4(filePath);
     return !stats.isSymbolicLink() && stats.isFile();
   } catch {
     return false;
@@ -472556,8 +472795,8 @@ function isRegularModFile(filePath) {
 }
 function inferCompatibilityModEntries(packageDirectory) {
   const modsDirectory = path46.join(packageDirectory, "mods");
-  if (existsSync67(modsDirectory)) {
-    const stats = lstatSync3(modsDirectory);
+  if (existsSync66(modsDirectory)) {
+    const stats = lstatSync4(modsDirectory);
     if (stats.isSymbolicLink()) {
       throw new Error(`Package mods directory must not be a symlink: mods`);
     }
@@ -472831,8 +473070,8 @@ var init_package_installer = __esm(() => {
 // src/mods/package-scaffolder.ts
 import {
   copyFileSync as copyFileSync5,
-  existsSync as existsSync68,
-  lstatSync as lstatSync4,
+  existsSync as existsSync67,
+  lstatSync as lstatSync5,
   mkdirSync as mkdirSync50,
   rmSync as rmSync24,
   writeFileSync as writeFileSync41
@@ -472858,7 +473097,7 @@ function readSourceFile(sourceFile) {
   const resolvedSourceFile = path47.resolve(sourceFile);
   let stats;
   try {
-    stats = lstatSync4(resolvedSourceFile);
+    stats = lstatSync5(resolvedSourceFile);
   } catch {
     throw new Error(`Mod file does not exist: ${sourceFile}`);
   }
@@ -472924,7 +473163,7 @@ function scaffoldLocalModPackage(options) {
   const sourceFile = readSourceFile(options.sourceFile);
   const packageName = assertValidPackageName(options.packageName);
   const outputDirectory = path47.resolve(options.outputDirectory ?? defaultOutputDirectory(sourceFile, packageName));
-  if (existsSync68(outputDirectory)) {
+  if (existsSync67(outputDirectory)) {
     throw new Error(`Output directory already exists: ${outputDirectory}`);
   }
   const modFileName = path47.basename(sourceFile);
@@ -473480,7 +473719,7 @@ var init_sandbox_files = __esm(() => {
 
 // src/cli/subcommands/sandbox.ts
 import { readFile as readFile27, stat as stat15, writeFile as writeFile19 } from "node:fs/promises";
-import { basename as basename28, resolve as resolve40 } from "node:path";
+import { basename as basename29, resolve as resolve40 } from "node:path";
 import { parseArgs as parseArgs16 } from "node:util";
 function printUsage13() {
   console.log(`
@@ -473631,13 +473870,13 @@ async function runSandboxSubcommand(argv, deps = {}) {
         throw new Error(`${localPath2} is not a file`);
       const data2 = await (deps.readLocalFile ?? readFile27)(localPath2);
       const sandbox2 = await ensureSandbox();
-      const result3 = await (deps.uploadFile ?? uploadFileToSandbox)(sandbox2.sandboxId, { blob: new Blob([data2]), name: basename28(localPath2) });
+      const result3 = await (deps.uploadFile ?? uploadFileToSandbox)(sandbox2.sandboxId, { blob: new Blob([data2]), name: basename29(localPath2) });
       console.log(JSON.stringify({ ...result3, ...targetOutput }, null, 2));
       return 0;
     }
     const sandbox = await ensureSandbox();
     const data = await (deps.downloadFile ?? downloadFileFromSandbox)(sandbox.sandboxId, path48);
-    const localPath = resolve40(parsed.values.to ?? basename28(path48));
+    const localPath = resolve40(parsed.values.to ?? basename29(path48));
     await (deps.writeLocalFile ?? writeFile19)(localPath, data);
     console.log(JSON.stringify({
       path: localPath,
@@ -474547,7 +474786,7 @@ var init_setup7 = __esm(async () => {
 });
 
 // src/cli/subcommands/shared-memory.ts
-import { existsSync as existsSync69 } from "node:fs";
+import { existsSync as existsSync68 } from "node:fs";
 import { join as join98 } from "node:path";
 import { parseArgs as parseArgs19 } from "node:util";
 function printUsage16() {
@@ -474740,7 +474979,7 @@ async function runSharedMemorySubcommand(argv, deps = {}) {
         invalidateClientSkills(agentId);
         const recompileError = await recompileAndReportFailure(recompileAgent, agentId);
         const mountDir = getRepositoryMountDir(agentId, repository.name);
-        const mounted = existsSync69(join98(mountDir, ".git"));
+        const mounted = existsSync68(join98(mountDir, ".git"));
         console.log(JSON.stringify({
           attached: true,
           repository: { id: repository.id, name: repository.name },
@@ -476269,7 +476508,7 @@ var init_AgentSelector = __esm(async () => {
 // src/cli/subcommands/skills.ts
 import {
   cpSync as cpSync2,
-  existsSync as existsSync70,
+  existsSync as existsSync69,
   mkdtempSync as mkdtempSync6,
   readFileSync as readFileSync51,
   rmSync as rmSync25,
@@ -476278,7 +476517,7 @@ import {
 } from "node:fs";
 import { mkdir as mkdir16, readdir as readdir13 } from "node:fs/promises";
 import { tmpdir as tmpdir14 } from "node:os";
-import { basename as basename29, dirname as dirname39, join as join99, normalize as normalize4, resolve as resolve41, sep as sep8 } from "node:path";
+import { basename as basename30, dirname as dirname39, join as join99, normalize as normalize4, resolve as resolve41, sep as sep8 } from "node:path";
 import { parseArgs as parseArgs20, TextDecoder as TextDecoder2, TextEncoder as TextEncoder2 } from "node:util";
 function printUsage17() {
   console.log(`
@@ -476473,7 +476712,7 @@ function parseDirectSkillFileUrlSpecifier(input) {
   if (url2.protocol !== "https:" && !(url2.protocol === "http:" && isLocalhostHostname(url2.hostname))) {
     return null;
   }
-  if (basename29(url2.pathname).toLowerCase() !== "skill.md")
+  if (basename30(url2.pathname).toLowerCase() !== "skill.md")
     return null;
   return { url: url2.toString() };
 }
@@ -476721,14 +476960,14 @@ function getSkillName(sourceDir) {
   const skillMd = readFileSync51(join99(sourceDir, "SKILL.md"), "utf8");
   const { frontmatter } = parseFrontmatter(skillMd);
   const frontmatterName = frontmatter.name;
-  const name = typeof frontmatterName === "string" && frontmatterName.trim() ? frontmatterName : basename29(sourceDir);
+  const name = typeof frontmatterName === "string" && frontmatterName.trim() ? frontmatterName : basename30(sourceDir);
   return sanitizeSkillName(name);
 }
 async function installSkillDirectory(params) {
   const sourceDir = resolve41(params.sourceDir);
   const memoryDir = resolve41(params.memoryDir);
   const skillMdPath = join99(sourceDir, "SKILL.md");
-  if (!existsSync70(skillMdPath)) {
+  if (!existsSync69(skillMdPath)) {
     throw new Error("No SKILL.md found in the skill directory.");
   }
   if (!statSync26(sourceDir).isDirectory()) {
@@ -476738,7 +476977,7 @@ async function installSkillDirectory(params) {
   const skillsDir = join99(memoryDir, "skills");
   const targetPath = join99(skillsDir, name);
   assertInside(skillsDir, targetPath);
-  if (existsSync70(targetPath)) {
+  if (existsSync69(targetPath)) {
     if (!params.force) {
       throw new Error(`Skill "${name}" already exists at ${targetPath}. Re-run with --force to replace it.`);
     }
@@ -476747,14 +476986,14 @@ async function installSkillDirectory(params) {
   await mkdir16(skillsDir, { recursive: true });
   cpSync2(sourceDir, targetPath, {
     recursive: true,
-    filter: (source) => basename29(source) !== ".git"
+    filter: (source) => basename30(source) !== ".git"
   });
   return { name, path: normalize4(targetPath) };
 }
 async function listSkillDirectories(params) {
   const memoryDir = resolve41(params.memoryDir);
   const skillsDir = join99(memoryDir, "skills");
-  if (!existsSync70(skillsDir))
+  if (!existsSync69(skillsDir))
     return [];
   const entries2 = await readdir13(skillsDir, { withFileTypes: true });
   const skills = [];
@@ -476763,7 +477002,7 @@ async function listSkillDirectories(params) {
       continue;
     const skillDir = join99(skillsDir, entry.name);
     const skillMdPath = join99(skillDir, "SKILL.md");
-    if (!existsSync70(skillMdPath))
+    if (!existsSync69(skillMdPath))
       continue;
     let name = entry.name;
     let description;
@@ -476787,7 +477026,7 @@ async function deleteSkillDirectory(params) {
   const name = sanitizeSkillName(params.name);
   const targetPath = join99(skillsDir, name);
   assertInside(skillsDir, targetPath);
-  if (!existsSync70(targetPath)) {
+  if (!existsSync69(targetPath)) {
     throw new Error(`Skill "${name}" is not installed at ${targetPath}.`);
   }
   if (!statSync26(targetPath).isDirectory()) {
@@ -476836,7 +477075,7 @@ async function installSkill(specifier, agentId, force) {
     tmpDir = downloaded.tmpDir;
     const sourceDir = resolve41(downloaded.sourceDir);
     assertInside(tmpDir, sourceDir);
-    if (!existsSync70(sourceDir)) {
+    if (!existsSync69(sourceDir)) {
       const missingPath = source.type === "git" ? source.location.subdir ?? "." : source.type === "direct-file" ? source.location.url : source.location.slug;
       throw new Error(`Skill path not found: ${missingPath}`);
     }
@@ -477467,7 +477706,7 @@ import {
   stat as stat17,
   writeFile as writeFile20
 } from "node:fs/promises";
-import { basename as basename30, join as join101 } from "node:path";
+import { basename as basename31, join as join101 } from "node:path";
 function fileTimestamp(startedAt) {
   if (!startedAt)
     return "unknown-date";
@@ -477635,10 +477874,10 @@ async function runTrajectoryExport(options) {
     if (!supported.includes(explicit.source)) {
       throw new Error(`Unknown source "${explicit.source}" in --transcript. The installed trajectory package supports: ${supported.join(", ")}.`);
     }
-    await exportTranscript(explicit.source, basename30(explicit.path).replace(/\.[^.]+$/, ""), explicit.path, () => readFile29(explicit.path, "utf-8"));
+    await exportTranscript(explicit.source, basename31(explicit.path).replace(/\.[^.]+$/, ""), explicit.path, () => readFile29(explicit.path, "utf-8"));
   }
   for (const checkpoint of options.deepagents ?? []) {
-    await exportCheckpoint(checkpoint, `${basename30(checkpoint.path)}-${checkpoint.threadId}`);
+    await exportCheckpoint(checkpoint, `${basename31(checkpoint.path)}-${checkpoint.threadId}`);
   }
   manifest2.sessions.sort((a2, b3) => (a2.startedAt ?? "").localeCompare(b3.startedAt ?? ""));
   await writeFile20(join101(options.outDir, MANIFEST_NAME), JSON.stringify(manifest2, null, 2), "utf-8");
@@ -481086,7 +481325,7 @@ var init_message_channel_gateway_tool = __esm(() => {
 });
 
 // src/channels/custom/scaffolding.ts
-import { existsSync as existsSync71, mkdirSync as mkdirSync51, rmSync as rmSync26, writeFileSync as writeFileSync43 } from "node:fs";
+import { existsSync as existsSync70, mkdirSync as mkdirSync51, rmSync as rmSync26, writeFileSync as writeFileSync43 } from "node:fs";
 function removeUserPlugin(channelId) {
   if (FIRST_PARTY_SET.has(channelId)) {
     return;
@@ -481095,7 +481334,7 @@ function removeUserPlugin(channelId) {
     return;
   }
   const channelDir = getChannelDir(channelId);
-  if (!existsSync71(channelDir)) {
+  if (!existsSync70(channelDir)) {
     return;
   }
   try {
@@ -487874,7 +488113,7 @@ var BYTES_PER_TOKEN = 4;
 
 // src/cli/helpers/window-title-config.ts
 import { homedir as homedir55 } from "node:os";
-import { basename as basename31, resolve as resolve42 } from "node:path";
+import { basename as basename32, resolve as resolve42 } from "node:path";
 function isWindowTitleField(value) {
   return WINDOW_TITLE_FIELDS.includes(value);
 }
@@ -488033,7 +488272,7 @@ function terminalTitleProjectName(data) {
   if (!directory)
     return null;
   const resolved2 = resolve42(directory);
-  const name = basename31(resolved2) || formatDirectoryDisplay(resolved2) || resolved2;
+  const name = basename32(resolved2) || formatDirectoryDisplay(resolved2) || resolved2;
   return truncateTerminalTitlePart(name, 24);
 }
 function titleDirectory(data) {
@@ -488715,7 +488954,7 @@ var init_cli_mod_context = __esm(() => {
 
 // src/cli/helpers/reflection-arena-hf-upload.ts
 import { execFile as execFileCb5 } from "node:child_process";
-import { existsSync as existsSync73 } from "node:fs";
+import { existsSync as existsSync72 } from "node:fs";
 import { appendFile as appendFile3, chmod, mkdir as mkdir18, writeFile as writeFile21 } from "node:fs/promises";
 import { homedir as homedir56 } from "node:os";
 import { join as join105 } from "node:path";
@@ -488769,7 +489008,7 @@ async function writeGitAskpass(repoRoot) {
 }
 async function prepareHfRepo(env6) {
   await mkdir18(HF_CACHE_ROOT, { recursive: true });
-  if (!existsSync73(join105(HF_REPO_DIR, ".git"))) {
+  if (!existsSync72(join105(HF_REPO_DIR, ".git"))) {
     await runGit6(HF_CACHE_ROOT, ["clone", "--depth", "1", HF_REPO_URL, HF_REPO_DIR], env6);
     return HF_REPO_DIR;
   }
@@ -490328,7 +490567,7 @@ __export(exports_terminal_keybinding_installer, {
 });
 import {
   copyFileSync as copyFileSync6,
-  existsSync as existsSync74,
+  existsSync as existsSync73,
   mkdirSync as mkdirSync53,
   readFileSync as readFileSync53,
   writeFileSync as writeFileSync45
@@ -490397,7 +490636,7 @@ function parseKeybindings(content) {
   }
 }
 function keybindingExists(keybindingsPath) {
-  if (!existsSync74(keybindingsPath))
+  if (!existsSync73(keybindingsPath))
     return false;
   try {
     const content = readFileSync53(keybindingsPath, { encoding: "utf-8" });
@@ -490410,7 +490649,7 @@ function keybindingExists(keybindingsPath) {
   }
 }
 function createBackup(keybindingsPath) {
-  if (!existsSync74(keybindingsPath))
+  if (!existsSync73(keybindingsPath))
     return null;
   const backupPath = `${keybindingsPath}.letta-backup`;
   try {
@@ -490426,12 +490665,12 @@ function installKeybinding(keybindingsPath) {
       return { success: true, alreadyExists: true };
     }
     const parentDir = dirname40(keybindingsPath);
-    if (!existsSync74(parentDir)) {
+    if (!existsSync73(parentDir)) {
       mkdirSync53(parentDir, { recursive: true });
     }
     let keybindings = [];
     let backupPath = null;
-    if (existsSync74(keybindingsPath)) {
+    if (existsSync73(keybindingsPath)) {
       backupPath = createBackup(keybindingsPath);
       const content = readFileSync53(keybindingsPath, { encoding: "utf-8" });
       const parsed = parseKeybindings(content);
@@ -490461,7 +490700,7 @@ function installKeybinding(keybindingsPath) {
 }
 function removeKeybinding(keybindingsPath) {
   try {
-    if (!existsSync74(keybindingsPath)) {
+    if (!existsSync73(keybindingsPath)) {
       return { success: true };
     }
     const content = readFileSync53(keybindingsPath, { encoding: "utf-8" });
@@ -490529,11 +490768,11 @@ function getWezTermConfigPath() {
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig) {
     const xdgPath = join107(xdgConfig, "wezterm", "wezterm.lua");
-    if (existsSync74(xdgPath))
+    if (existsSync73(xdgPath))
       return xdgPath;
   }
   const configPath = join107(homedir58(), ".config", "wezterm", "wezterm.lua");
-  if (existsSync74(configPath))
+  if (existsSync73(configPath))
     return configPath;
   return join107(homedir58(), ".wezterm.lua");
 }
@@ -490638,7 +490877,7 @@ ${WEZTERM_DELETE_FIX}
 `;
 }
 function wezTermDeleteFixExists(configPath) {
-  if (!existsSync74(configPath))
+  if (!existsSync73(configPath))
     return false;
   try {
     const content = readFileSync53(configPath, { encoding: "utf-8" });
@@ -490655,14 +490894,14 @@ function installWezTermDeleteFix() {
     }
     let content = "";
     let backupPath = null;
-    if (existsSync74(configPath)) {
+    if (existsSync73(configPath)) {
       backupPath = `${configPath}.letta-backup`;
       copyFileSync6(configPath, backupPath);
       content = readFileSync53(configPath, { encoding: "utf-8" });
     }
     content = injectWezTermDeleteFix(content);
     const parentDir = dirname40(configPath);
-    if (!existsSync74(parentDir)) {
+    if (!existsSync73(parentDir)) {
       mkdirSync53(parentDir, { recursive: true });
     }
     writeFileSync45(configPath, content, { encoding: "utf-8" });
@@ -492659,9 +492898,9 @@ function getHeaderText(fileEdit) {
   const relPath = relative13(cwd2, fileEdit.filePath);
   const displayPath = relPath.startsWith("..") ? fileEdit.filePath : relPath;
   if (t2 === "write") {
-    const { existsSync: existsSync75 } = __require("node:fs");
+    const { existsSync: existsSync74 } = __require("node:fs");
     try {
-      if (existsSync75(fileEdit.filePath)) {
+      if (existsSync74(fileEdit.filePath)) {
         return `Overwrite ${displayPath}?`;
       }
     } catch {}
@@ -501578,9 +501817,9 @@ var init_InputRich = __esm(async () => {
 });
 
 // src/cli/commands/install-github-app.ts
-import { execFileSync as execFileSync10 } from "node:child_process";
+import { execFileSync as execFileSync12 } from "node:child_process";
 import {
-  existsSync as existsSync75,
+  existsSync as existsSync74,
   mkdirSync as mkdirSync54,
   mkdtempSync as mkdtempSync7,
   readFileSync as readFileSync54,
@@ -501591,7 +501830,7 @@ import { tmpdir as tmpdir15 } from "node:os";
 import { dirname as dirname41, join as join109 } from "node:path";
 function runCommand(command, args, cwd2, input) {
   try {
-    return execFileSync10(command, args, {
+    return execFileSync12(command, args, {
       cwd: cwd2,
       encoding: "utf8",
       stdio: [input ? "pipe" : "ignore", "pipe", "pipe"],
@@ -501822,12 +502061,12 @@ function runGit7(args, cwd2) {
 }
 function writeWorkflow(repoDir, workflowPath, content) {
   const absolutePath = join109(repoDir, workflowPath);
-  if (!existsSync75(dirname41(absolutePath))) {
+  if (!existsSync74(dirname41(absolutePath))) {
     mkdirSync54(dirname41(absolutePath), { recursive: true });
   }
   const next = `${content.trimEnd()}
 `;
-  if (existsSync75(absolutePath)) {
+  if (existsSync74(absolutePath)) {
     const previous = readFileSync54(absolutePath, "utf8");
     if (previous === next) {
       return false;
@@ -505717,7 +505956,7 @@ __export(exports_generate_memory_viewer, {
   generateAndOpenMemoryViewer: () => generateAndOpenMemoryViewer
 });
 import { execFile as execFileCb7 } from "node:child_process";
-import { chmodSync as chmodSync8, existsSync as existsSync76, mkdirSync as mkdirSync55, writeFileSync as writeFileSync47 } from "node:fs";
+import { chmodSync as chmodSync8, existsSync as existsSync75, mkdirSync as mkdirSync55, writeFileSync as writeFileSync47 } from "node:fs";
 import { homedir as homedir61 } from "node:os";
 import { join as join110 } from "node:path";
 import { promisify as promisify22 } from "node:util";
@@ -506028,7 +506267,7 @@ ${m4.body}` : m4.subject;
 async function generateAndOpenMemoryViewer(agentId, options) {
   const memoryRoot = getScopedMemoryFilesystemRoot(agentId);
   const repoDir = memoryRoot;
-  if (!existsSync76(join110(repoDir, ".git"))) {
+  if (!existsSync75(join110(repoDir, ".git"))) {
     throw new Error("Memory viewer requires memfs. Run /memfs enable first.");
   }
   const data = await collectMemoryData(agentId, repoDir, memoryRoot, options?.conversationId);
@@ -506038,7 +506277,7 @@ async function generateAndOpenMemoryViewer(agentId, options) {
   data.context = applyContextUsageSnapshot(data.context, options?.contextUsage);
   const jsonPayload = JSON.stringify(data).replace(/</g, "\\u003c");
   const html5 = memory_viewer_template_default.replace("<!--LETTA_DATA_PLACEHOLDER-->", () => jsonPayload);
-  if (!existsSync76(VIEWERS_DIR)) {
+  if (!existsSync75(VIEWERS_DIR)) {
     mkdirSync55(VIEWERS_DIR, { recursive: true, mode: 448 });
   }
   try {
@@ -506075,7 +506314,7 @@ var init_generate_memory_viewer = __esm(() => {
 });
 
 // src/cli/components/MemfsTreeViewer.tsx
-import { existsSync as existsSync77 } from "node:fs";
+import { existsSync as existsSync76 } from "node:fs";
 import { join as join111 } from "node:path";
 function renderTreePrefix(node) {
   let prefix = "";
@@ -506104,8 +506343,8 @@ function MemfsTreeViewer({
   const [status, setStatus] = import_react88.useState(null);
   const statusTimerRef = import_react88.useRef(null);
   const memoryRoot = getScopedMemoryFilesystemRoot(agentId);
-  const memoryExists = existsSync77(memoryRoot);
-  const hasGitRepo = import_react88.useMemo(() => existsSync77(join111(memoryRoot, ".git")), [memoryRoot]);
+  const memoryExists = existsSync76(memoryRoot);
+  const hasGitRepo = import_react88.useMemo(() => existsSync76(join111(memoryRoot, ".git")), [memoryRoot]);
   function showStatus(msg, durationMs) {
     if (statusTimerRef.current)
       clearTimeout(statusTimerRef.current);
@@ -514952,9 +515191,9 @@ function getFileEditHeader(toolName2, toolArgs) {
     const relPath = relative13(cwd2, filePath);
     const displayPath = relPath.startsWith("..") ? filePath : relPath;
     if (t2 === "write") {
-      const { existsSync: existsSync78 } = __require("node:fs");
+      const { existsSync: existsSync77 } = __require("node:fs");
       try {
-        if (existsSync78(filePath)) {
+        if (existsSync77(filePath)) {
           return `Overwrite ${displayPath}?`;
         }
       } catch {}
@@ -516722,7 +516961,7 @@ __export(exports_generate_diff_viewer, {
   generateAndOpenDiffViewer: () => generateAndOpenDiffViewer
 });
 import { execFile as execFileCb8 } from "node:child_process";
-import { chmodSync as chmodSync9, existsSync as existsSync78, mkdirSync as mkdirSync56, writeFileSync as writeFileSync48 } from "node:fs";
+import { chmodSync as chmodSync9, existsSync as existsSync77, mkdirSync as mkdirSync56, writeFileSync as writeFileSync48 } from "node:fs";
 import { homedir as homedir63 } from "node:os";
 import { isAbsolute as isAbsolute27, join as join113, resolve as resolve44 } from "node:path";
 import { promisify as promisify23 } from "node:util";
@@ -516947,7 +517186,7 @@ async function generateAndOpenDiffViewer(targetPath) {
   };
   const jsonPayload = JSON.stringify(payload).replace(/</g, "\\u003c");
   const html5 = diff_viewer_template_default.replace("<!--LETTA_DIFF_DATA_PLACEHOLDER-->", () => jsonPayload);
-  if (!existsSync78(VIEWERS_DIR2)) {
+  if (!existsSync77(VIEWERS_DIR2)) {
     mkdirSync56(VIEWERS_DIR2, { recursive: true, mode: 448 });
   }
   try {
@@ -518983,12 +519222,12 @@ __export(exports_shell_aliases, {
   expandAliases: () => expandAliases,
   clearAliasCache: () => clearAliasCache
 });
-import { existsSync as existsSync79, readFileSync as readFileSync55 } from "node:fs";
+import { existsSync as existsSync78, readFileSync as readFileSync55 } from "node:fs";
 import { homedir as homedir64 } from "node:os";
 import { join as join114 } from "node:path";
 function parseAliasesFromFile(filePath) {
   const aliases = new Map;
-  if (!existsSync79(filePath)) {
+  if (!existsSync78(filePath)) {
     return aliases;
   }
   try {
@@ -520203,6 +520442,16 @@ var init_retry2 = __esm(() => {
 function stripSystemReminders2(text3) {
   return text3.replace(new RegExp(`${SYSTEM_REMINDER_OPEN}[\\s\\S]*?${SYSTEM_REMINDER_CLOSE}`, "g"), "").replace(new RegExp(`${SYSTEM_ALERT_OPEN}[\\s\\S]*?${SYSTEM_ALERT_CLOSE}`, "g"), "").trim();
 }
+function getRestorableUserText(input) {
+  const message2 = input.find((item) => item?.type === "message");
+  const content = message2 && "content" in message2 ? message2.content : undefined;
+  if (typeof content === "string")
+    return stripSystemReminders2(content);
+  if (!Array.isArray(content))
+    return "";
+  return content.flatMap((c) => c.type === "text" && !c.text.includes(SYSTEM_REMINDER_OPEN) && !c.text.includes(SYSTEM_ALERT_OPEN) ? [c.text] : []).join(`
+`).trim();
+}
 var init_system_reminders2 = __esm(() => {
   init_constants2();
 });
@@ -520735,20 +520984,9 @@ function useConversationLoop(ctx) {
                 const agent = await getBackend().retrieveAgent(agentIdRef.current);
                 const { pendingApprovals: serverApprovals } = await getResumeDataFromBackend(agent, conversationIdRef.current);
                 if (serverApprovals && serverApprovals.length > 0) {
-                  const userMessage = currentInput.find((item) => item?.type === "message");
-                  if (userMessage && "content" in userMessage) {
-                    const content = userMessage.content;
-                    let textToRestore = "";
-                    if (typeof content === "string") {
-                      textToRestore = stripSystemReminders2(content);
-                    } else if (Array.isArray(content)) {
-                      textToRestore = content.filter((c) => typeof c === "object" && c !== null && ("type" in c) && c.type === "text" && ("text" in c) && typeof c.text === "string" && !c.text.includes(SYSTEM_REMINDER_OPEN) && !c.text.includes(SYSTEM_ALERT_OPEN)).map((c) => c.text).join(`
-`);
-                    }
-                    if (textToRestore.trim()) {
-                      setRestoredInput(textToRestore);
-                    }
-                  }
+                  const textToRestore = getRestorableUserText(currentInput);
+                  if (textToRestore)
+                    setRestoredInput(textToRestore);
                   setApprovalResults([]);
                   setAutoHandledResults([]);
                   setAutoDeniedApprovals([]);
@@ -520766,6 +521004,13 @@ function useConversationLoop(ctx) {
                   sendDesktopNotification("Approval needed");
                   return;
                 }
+                const plainInput = rebuildInputWithFreshDenials(currentInput, [], "");
+                if (plainInput.length > 0 && llmApiErrorRetriesRef.current < LLM_API_ERROR_MAX_RETRIES3) {
+                  llmApiErrorRetriesRef.current += 1;
+                  currentInput = plainInput;
+                  buffersRef.current.interrupted = false;
+                  continue;
+                }
               } catch {}
             }
           }
@@ -521371,20 +521616,9 @@ ${feedback}
             const agent = await getBackend().retrieveAgent(agentIdRef.current);
             const { pendingApprovals: serverApprovals } = await getResumeDataFromBackend(agent, conversationIdRef.current);
             if (serverApprovals && serverApprovals.length > 0) {
-              const userMessage = currentInput.find((item) => item?.type === "message");
-              if (userMessage && "content" in userMessage) {
-                const content = userMessage.content;
-                let textToRestore = "";
-                if (typeof content === "string") {
-                  textToRestore = stripSystemReminders2(content);
-                } else if (Array.isArray(content)) {
-                  textToRestore = content.filter((c) => typeof c === "object" && c !== null && ("type" in c) && c.type === "text" && ("text" in c) && typeof c.text === "string" && !c.text.includes(SYSTEM_REMINDER_OPEN) && !c.text.includes(SYSTEM_ALERT_OPEN)).map((c) => c.text).join(`
-`);
-                }
-                if (textToRestore.trim()) {
-                  setRestoredInput(textToRestore);
-                }
-              }
+              const textToRestore = getRestorableUserText(currentInput);
+              if (textToRestore)
+                setRestoredInput(textToRestore);
               setApprovalResults([]);
               setAutoHandledResults([]);
               setAutoDeniedApprovals([]);
@@ -521402,6 +521636,13 @@ ${feedback}
               sendDesktopNotification("Approval needed");
               return;
             }
+            const plainInput = rebuildInputWithFreshDenials(currentInput, [], "");
+            if (plainInput.length > 0 && llmApiErrorRetriesRef.current < LLM_API_ERROR_MAX_RETRIES3) {
+              llmApiErrorRetriesRef.current += 1;
+              currentInput = plainInput;
+              buffersRef.current.interrupted = false;
+              continue;
+            }
           } catch {}
         }
         const approvalPendingDetected = isApprovalPendingError(detailFromRun) || isApprovalPendingError(latestErrorText);
@@ -521751,7 +521992,6 @@ var init_use_conversation_loop = __esm(async () => {
   init_reflection_transcript();
   init_thinking_messages();
   init_tool_name_mapping2();
-  init_constants2();
   init_hooks();
   init_format_denial();
   init_mode();
@@ -527088,7 +527328,7 @@ __export(exports_worktree_diff_list, {
   listWorktreeDiffOptions: () => listWorktreeDiffOptions
 });
 import { execFile as execFileCb9 } from "node:child_process";
-import { basename as basename32 } from "node:path";
+import { basename as basename33 } from "node:path";
 import { promisify as promisify24 } from "node:util";
 async function runGit9(cwd2, args) {
   try {
@@ -527137,7 +527377,7 @@ function parseWorktreeList(output, currentPath) {
       if (current?.path) {
         worktrees.push({
           path: current.path,
-          name: basename32(current.path),
+          name: basename33(current.path),
           branch: current.branch ?? "detached",
           head: current.head ?? "",
           isCurrent: current.path === currentPath,
@@ -527163,7 +527403,7 @@ function parseWorktreeList(output, currentPath) {
   if (current?.path) {
     worktrees.push({
       path: current.path,
-      name: basename32(current.path),
+      name: basename33(current.path),
       branch: current.branch ?? "detached",
       head: current.head ?? "",
       isCurrent: current.path === currentPath,
@@ -527320,7 +527560,7 @@ var init_conversation_switch_alert = __esm(() => {
 
 // src/cli/app/use-submit-handler.ts
 import { randomUUID as randomUUID67 } from "node:crypto";
-import { existsSync as existsSync80, readFileSync as readFileSync56, renameSync as renameSync15 } from "node:fs";
+import { existsSync as existsSync79, readFileSync as readFileSync56, renameSync as renameSync12 } from "node:fs";
 import { tmpdir as tmpdir16 } from "node:os";
 import { join as join115 } from "node:path";
 async function findCustomCommandByName(commandName) {
@@ -527933,7 +528173,7 @@ ${SYSTEM_REMINDER_CLOSE}`),
               join115(memoryRoot, "system", "persona.md"),
               join115(memoryRoot, "memory", "system", "persona.md")
             ];
-            const personaPath = personaCandidates.find((candidate) => existsSync80(candidate));
+            const personaPath = personaCandidates.find((candidate) => existsSync79(candidate));
             if (personaPath) {
               const personaContent = readFileSync56(personaPath, "utf-8");
               setCurrentPersonalityId(detectPersonalityFromPersonaFile(personaContent));
@@ -528775,12 +529015,12 @@ Path: ${memoryDir}`, true);
           setCommandRunning(true);
           try {
             const memoryDir = getScopedMemoryFilesystemRoot(agentId);
-            if (!existsSync80(memoryDir)) {
+            if (!existsSync79(memoryDir)) {
               updateMemorySyncCommand(cmdId, "No local memory filesystem found to reset.", true, msg);
               return { submitted: true };
             }
             const backupDir = join115(tmpdir16(), `letta-memfs-reset-${agentId}-${Date.now()}`);
-            renameSync15(memoryDir, backupDir);
+            renameSync12(memoryDir, backupDir);
             if (getBackend().capabilities.localMemfs) {
               const { initializeLocalMemoryRepo: initializeLocalMemoryRepo2 } = await Promise.resolve().then(() => (init_memory_git(), exports_memory_git));
               await initializeLocalMemoryRepo2({
@@ -531733,9 +531973,9 @@ Memory may be stale. Try running: git -C ${getScopedMemoryFilesystemRoot(agentId
     (async () => {
       try {
         const { watch: watch4 } = await import("node:fs");
-        const { existsSync: existsSync81 } = await import("node:fs");
+        const { existsSync: existsSync80 } = await import("node:fs");
         const memRoot = getScopedMemoryFilesystemRoot(agentId);
-        if (!existsSync81(memRoot))
+        if (!existsSync80(memRoot))
           return;
         watcher2 = watch4(memRoot, { recursive: true }, () => {});
         memfsWatcherRef.current = watcher2;
@@ -533536,7 +533776,9 @@ async function main() {
   }
   const subcommandResult = await runSubcommand(subcommandArgs);
   if (subcommandResult !== null) {
-    process.exit(subcommandResult);
+    process.channel?.unref();
+    process.exitCode = subcommandResult;
+    return;
   }
   await settingsManager.initialize();
   const settings3 = await settingsManager.getSettingsWithSecureTokens();
@@ -537155,4 +537397,4 @@ function registerBunOAuthFlows() {
 registerBunOAuthFlows();
 await init_src5().then(() => exports_src2);
 
-//# debugId=835D7F3E2C67DB2C64756E2164756E21
+//# debugId=B1F6CA2886AACEA464756E2164756E21