@letta-ai/letta-code 0.16.1 → 0.16.2

package/letta.js

@@ -3122,7 +3122,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.16.1",
+    version: "0.16.2",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -5827,8 +5827,8 @@ Key updates:
 ...
 
 Generated-By: Letta Code
-Agent-ID: $LETTA_AGENT_ID
-Parent-Agent-ID: $LETTA_PARENT_AGENT_ID"
+Agent-ID: <ACTUAL_AGENT_ID>
+Parent-Agent-ID: <ACTUAL_PARENT_AGENT_ID>"
 \`\`\`
 
 **Commit type** — pick the one that fits:
@@ -5840,9 +5840,16 @@ Parent-Agent-ID: $LETTA_PARENT_AGENT_ID"
 - \`chore(history-analyzer): ingest Claude Code history 2025-09 ⏳\`
 - \`refactor(history-analyzer): reorganize memory by project domain ⏳\`
 
-**Trailers:** Omit \`Agent-ID\` or \`Parent-Agent-ID\` if the
-corresponding environment variable is unset (don't write
-the literal variable name).
+**Trailers:** Before writing the commit, resolve the actual
+ID values by running:
+\`\`\`bash
+echo "AGENT_ID=$LETTA_AGENT_ID"
+echo "PARENT_AGENT_ID=$LETTA_PARENT_AGENT_ID"
+\`\`\`
+Use the printed values (e.g. \`agent-abc123...\`) in the
+trailers. If a variable is empty or unset, omit that
+trailer entirely. Never write a literal variable name like
+\`$LETTA_AGENT_ID\` in the commit message.
 
 ## Important
 
@@ -7004,8 +7011,8 @@ Updates:
 - <what conversation context prompted each update>
 
 Generated-By: Letta Code
-Agent-ID: <value of $LETTA_AGENT_ID>
-Parent-Agent-ID: <value of $LETTA_PARENT_AGENT_ID>"
+Agent-ID: <ACTUAL_AGENT_ID>
+Parent-Agent-ID: <ACTUAL_PARENT_AGENT_ID>"
 \`\`\`
 
 **Commit type** — pick the one that fits:
@@ -7020,9 +7027,16 @@ Parent-Agent-ID: <value of $LETTA_PARENT_AGENT_ID>"
 - \`fix(reflection): correct stale user preference note 🔮\`
 - \`feat(reflection): add new project context block 🔮\`
 
-**Trailers:** Omit \`Agent-ID\` or \`Parent-Agent-ID\` if the
-corresponding environment variable is unset (don't write
-the literal variable name).
+**Trailers:** Before writing the commit, resolve the actual
+ID values by running:
+\`\`\`bash
+echo "AGENT_ID=$LETTA_AGENT_ID"
+echo "PARENT_AGENT_ID=$LETTA_PARENT_AGENT_ID"
+\`\`\`
+Use the printed values (e.g. \`agent-abc123...\`) in the
+trailers. If a variable is empty or unset, omit that
+trailer entirely. Never write a literal variable name like
+\`$LETTA_AGENT_ID\` in the commit message.
 
 **Step 5b: Pull + merge to main**
 
@@ -41861,10 +41875,10 @@ async function getMemoryGitStatus(agentId) {
     summary: parts.length > 0 ? parts.join(", ") : "clean"
   };
 }
-async function addGitMemoryTag(agentId) {
+async function addGitMemoryTag(agentId, prefetchedAgent) {
   const client = await getClient2();
   try {
-    const agent = await client.agents.retrieve(agentId);
+    const agent = prefetchedAgent ?? await client.agents.retrieve(agentId);
     const tags = agent.tags || [];
     if (!tags.includes(GIT_MEMORY_ENABLED_TAG)) {
       await client.agents.update(agentId, {
@@ -42813,6 +42827,21 @@ async function applyMemfsFlags(agentId, memfsFlag, noMemfsFlag, options) {
   if (isEnabled && (memfsFlag || shouldAutoEnableFromTag)) {
     const { detachMemoryTools: detachMemoryTools2 } = await init_toolset().then(() => exports_toolset);
     await detachMemoryTools2(agentId);
+    const { getClient: getClient3 } = await init_client2().then(() => exports_client);
+    const client = await getClient3();
+    for (const label of ["skills", "loaded_skills"]) {
+      try {
+        const block = await client.agents.blocks.retrieve(label, {
+          agent_id: agentId
+        });
+        if (block) {
+          await client.agents.blocks.detach(block.id, {
+            agent_id: agentId
+          });
+          await client.blocks.delete(block.id);
+        }
+      } catch {}
+    }
   }
   if (noMemfsFlag) {
     const { removeGitMemoryTag: removeGitMemoryTag2 } = await init_memoryGit().then(() => exports_memoryGit);
@@ -42821,7 +42850,7 @@ async function applyMemfsFlags(agentId, memfsFlag, noMemfsFlag, options) {
   let pullSummary;
   if (isEnabled) {
     const { addGitMemoryTag: addGitMemoryTag2, isGitRepo: isGitRepo2, cloneMemoryRepo: cloneMemoryRepo2, pullMemory: pullMemory2 } = await init_memoryGit().then(() => exports_memoryGit);
-    await addGitMemoryTag2(agentId);
+    await addGitMemoryTag2(agentId, options?.agentTags ? { tags: options.agentTags } : undefined);
     if (!isGitRepo2(agentId)) {
       await cloneMemoryRepo2(agentId);
     } else if (options?.pullOnExistingRepo) {
@@ -68399,6 +68428,159 @@ var init_approvalClassification = __esm(async () => {
   await init_manager3();
 });
 
+// src/cli/helpers/chunkLog.ts
+import {
+  existsSync as existsSync8,
+  mkdirSync as mkdirSync6,
+  readdirSync as readdirSync4,
+  unlinkSync as unlinkSync3,
+  writeFileSync as writeFileSync5
+} from "node:fs";
+import { homedir as homedir11 } from "node:os";
+import { join as join15 } from "node:path";
+function truncateStr(value, maxLen) {
+  if (value === null || value === undefined)
+    return "";
+  const s = typeof value === "string" ? value : JSON.stringify(value);
+  if (s.length <= maxLen)
+    return s;
+  return `${s.slice(0, maxLen)}...[truncated, was ${s.length}b]`;
+}
+function truncateChunk(chunk) {
+  const raw = chunk;
+  const type = raw.message_type;
+  switch (type) {
+    case "reasoning_message":
+      return {
+        ...raw,
+        reasoning: truncateStr(raw.reasoning, CONTENT_TRUNCATE_LEN)
+      };
+    case "assistant_message":
+      return {
+        ...raw,
+        content: truncateStr(raw.content, CONTENT_TRUNCATE_LEN)
+      };
+    case "tool_call_message": {
+      const truncateToolCall = (tc) => ({
+        ...tc,
+        arguments: truncateStr(tc.arguments, CONTENT_TRUNCATE_LEN)
+      });
+      const result = { ...raw };
+      if (raw.tool_call && typeof raw.tool_call === "object") {
+        result.tool_call = truncateToolCall(raw.tool_call);
+      }
+      if (Array.isArray(raw.tool_calls)) {
+        result.tool_calls = raw.tool_calls.map(truncateToolCall);
+      }
+      return result;
+    }
+    case "tool_return_message":
+      return {
+        ...raw,
+        tool_return: truncateStr(raw.tool_return, CONTENT_TRUNCATE_LEN)
+      };
+    case "ping":
+    case "error_message":
+    case "stop_reason":
+    case "usage_statistics":
+      return raw;
+    default: {
+      const result = { ...raw };
+      if (typeof result.content === "string" || Array.isArray(result.content)) {
+        result.content = truncateStr(result.content, CONTENT_TRUNCATE_LEN);
+      }
+      return result;
+    }
+  }
+}
+
+class ChunkLog {
+  buffer = [];
+  dirty = false;
+  logPath = null;
+  agentDir = null;
+  dirCreated = false;
+  init(agentId, sessionId) {
+    this.agentDir = join15(LOG_BASE_DIR, agentId);
+    this.logPath = join15(this.agentDir, `${sessionId}.jsonl`);
+    this.buffer = [];
+    this.dirty = false;
+    this.dirCreated = false;
+    this.pruneOldSessions();
+  }
+  append(chunk) {
+    this.buffer.push(truncateChunk(chunk));
+    if (this.buffer.length > MAX_ENTRIES) {
+      this.buffer.shift();
+    }
+    this.dirty = true;
+  }
+  flush() {
+    if (this.dirty && this.logPath) {
+      this.writeToDisk();
+      this.dirty = false;
+    }
+  }
+  getEntries() {
+    return this.buffer;
+  }
+  get size() {
+    return this.buffer.length;
+  }
+  ensureDir() {
+    if (this.dirCreated || !this.agentDir)
+      return;
+    try {
+      if (!existsSync8(this.agentDir)) {
+        mkdirSync6(this.agentDir, { recursive: true });
+      }
+      this.dirCreated = true;
+    } catch (e) {
+      debugWarn("chunkLog", `Failed to create directory ${this.agentDir}: ${e instanceof Error ? e.message : String(e)}`);
+    }
+  }
+  writeToDisk() {
+    if (!this.logPath)
+      return;
+    this.ensureDir();
+    try {
+      const content = this.buffer.map((entry) => JSON.stringify(entry)).join(`
+`);
+      writeFileSync5(this.logPath, `${content}
+`, "utf8");
+    } catch (e) {
+      debugWarn("chunkLog", `Failed to write ${this.logPath}: ${e instanceof Error ? e.message : String(e)}`);
+    }
+  }
+  pruneOldSessions() {
+    if (!this.agentDir)
+      return;
+    try {
+      if (!existsSync8(this.agentDir))
+        return;
+      const files = readdirSync4(this.agentDir).filter((f) => f.endsWith(".jsonl")).sort();
+      if (files.length >= MAX_SESSION_FILES) {
+        const toDelete = files.slice(0, files.length - MAX_SESSION_FILES + 1);
+        for (const file of toDelete) {
+          try {
+            unlinkSync3(join15(this.agentDir, file));
+          } catch (e) {
+            debugWarn("chunkLog", `Failed to delete old session log ${file}: ${e instanceof Error ? e.message : String(e)}`);
+          }
+        }
+      }
+    } catch (e) {
+      debugWarn("chunkLog", `Failed to prune old sessions: ${e instanceof Error ? e.message : String(e)}`);
+    }
+  }
+}
+var MAX_ENTRIES = 100, CONTENT_TRUNCATE_LEN = 200, MAX_SESSION_FILES = 5, LOG_BASE_DIR, chunkLog;
+var init_chunkLog = __esm(() => {
+  init_debug();
+  LOG_BASE_DIR = join15(homedir11(), ".letta", "logs", "chunk-logs");
+  chunkLog = new ChunkLog;
+});
+
 // src/cli/helpers/streamProcessor.ts
 class StreamProcessor {
   pendingApprovals = new Map;
@@ -68533,6 +68715,9 @@ async function drainStream(stream2, buffers, refresh, abortSignal, onFirstMessag
         logTiming(`TTFT: ${formatDuration(ttft)} (from POST to first content)`);
       }
       const { shouldOutput, errorInfo, updatedApproval } = streamProcessor.processChunk(chunk);
+      try {
+        chunkLog.append(chunk);
+      } catch {}
       if (abortSignal?.aborted) {
         stopReason = "cancelled";
         markIncompleteToolsAsCancelled(buffers, true, "user_interrupt");
@@ -68588,6 +68773,9 @@ async function drainStream(stream2, buffers, refresh, abortSignal, onFirstMessag
     markIncompleteToolsAsCancelled(buffers, true, "stream_error");
     queueMicrotask(refresh);
   } finally {
+    try {
+      chunkLog.flush();
+    } catch {}
     if (abortSignal) {
       abortSignal.removeEventListener("abort", abortHandler);
     }
@@ -68662,6 +68850,7 @@ var init_stream = __esm(async () => {
   init_error();
   init_debug();
   init_timing();
+  init_chunkLog();
   await __promiseAll([
     init_client2(),
     init_message(),
@@ -68893,7 +69082,7 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
           return;
         }
         opts.onStatusChange?.("receiving", opts.connectionId);
-        await handleIncomingMessage(parsed, socket, opts.onStatusChange, opts.connectionId);
+        await handleIncomingMessage(parsed, socket, opts.onStatusChange, opts.connectionId, opts.defaultConversationId);
         opts.onStatusChange?.("idle", opts.connectionId);
       }).catch((error) => {
         if (process.env.DEBUG) {
@@ -68929,11 +69118,11 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
     }
   });
 }
-async function handleIncomingMessage(msg, socket, onStatusChange, connectionId) {
+async function handleIncomingMessage(msg, socket, onStatusChange, connectionId, defaultConversationId) {
   try {
     const agentId = msg.agentId;
     const requestedConversationId = msg.conversationId || undefined;
-    const conversationId = requestedConversationId ?? "default";
+    const conversationId = requestedConversationId ?? defaultConversationId ?? "default";
     if (!agentId) {
       return;
     }
@@ -69026,6 +69215,7 @@ async function handleIncomingMessage(msg, socket, onStatusChange, connectionId)
         break;
       }
       const { autoAllowed, autoDenied, needsUserInput } = await classifyApprovals(approvals, {
+        alwaysRequiresUserInput: isInteractiveApprovalTool,
         treatAskAsDeny: false,
         requireArgsForAutoApprove: true
       });
@@ -69086,6 +69276,7 @@ var init_listen_client = __esm(async () => {
   init_check_approval();
   init_planName();
   init_mode();
+  init_interactivePolicy();
   await __promiseAll([
     init_approval_execution(),
     init_client2(),
@@ -69121,19 +69312,19 @@ __export(exports_skills2, {
   SKILLS_DIR: () => SKILLS_DIR2,
   GLOBAL_SKILLS_DIR: () => GLOBAL_SKILLS_DIR2
 });
-import { existsSync as existsSync9 } from "node:fs";
+import { existsSync as existsSync10 } from "node:fs";
 import { readdir as readdir6, readFile as readFile5 } from "node:fs/promises";
-import { dirname as dirname8, join as join18 } from "node:path";
+import { dirname as dirname8, join as join19 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 function getBundledSkillsPath2() {
   const thisDir = dirname8(fileURLToPath7(import.meta.url));
   if (thisDir.includes("src/agent") || thisDir.includes("src\\agent")) {
-    return join18(thisDir, "../skills/builtin");
+    return join19(thisDir, "../skills/builtin");
   }
-  return join18(thisDir, "skills");
+  return join19(thisDir, "skills");
 }
 function getAgentSkillsDir2(agentId) {
-  return join18(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents", agentId, "skills");
+  return join19(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents", agentId, "skills");
 }
 async function getBundledSkills2() {
   const bundledPath = getBundledSkillsPath2();
@@ -69142,7 +69333,7 @@ async function getBundledSkills2() {
 }
 async function discoverSkillsFromDir2(skillsPath, source) {
   const errors = [];
-  if (!existsSync9(skillsPath)) {
+  if (!existsSync10(skillsPath)) {
     return { skills: [], errors: [] };
   }
   const skills = [];
@@ -69156,7 +69347,7 @@ async function discoverSkillsFromDir2(skillsPath, source) {
   }
   return { skills, errors };
 }
-async function discoverSkills2(projectSkillsPath = join18(process.cwd(), SKILLS_DIR2), agentId, options) {
+async function discoverSkills2(projectSkillsPath = join19(process.cwd(), SKILLS_DIR2), agentId, options) {
   const allErrors = [];
   const skillsById = new Map;
   const sourceSet = new Set(options?.sources ?? ALL_SKILL_SOURCES);
@@ -69198,7 +69389,7 @@ async function findSkillFiles2(currentPath, rootPath, skills, errors, source) {
   try {
     const entries = await readdir6(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join18(currentPath, entry.name);
+      const fullPath = join19(currentPath, entry.name);
       if (entry.isDirectory()) {
         await findSkillFiles2(fullPath, rootPath, skills, errors, source);
       } else if (entry.isFile() && entry.name.toUpperCase() === "SKILL.MD") {
@@ -69273,7 +69464,7 @@ ${lines.join(`
 var SKILLS_DIR2 = ".skills", GLOBAL_SKILLS_DIR2;
 var init_skills2 = __esm(() => {
   init_skillSources();
-  GLOBAL_SKILLS_DIR2 = join18(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
+  GLOBAL_SKILLS_DIR2 = join19(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
 });
 
 // src/utils/fs.ts
@@ -69287,10 +69478,10 @@ __export(exports_fs, {
   exists: () => exists2
 });
 import {
-  existsSync as existsSync10,
+  existsSync as existsSync11,
   readFileSync as fsReadFileSync2,
   writeFileSync as fsWriteFileSync2,
-  mkdirSync as mkdirSync7
+  mkdirSync as mkdirSync8
 } from "node:fs";
 import { dirname as dirname9 } from "node:path";
 async function readFile6(path19) {
@@ -69298,16 +69489,16 @@ async function readFile6(path19) {
 }
 async function writeFile2(path19, content) {
   const dir = dirname9(path19);
-  if (!existsSync10(dir)) {
-    mkdirSync7(dir, { recursive: true });
+  if (!existsSync11(dir)) {
+    mkdirSync8(dir, { recursive: true });
   }
   fsWriteFileSync2(path19, content, { encoding: "utf-8", flush: true });
 }
 function exists2(path19) {
-  return existsSync10(path19);
+  return existsSync11(path19);
 }
 async function mkdir2(path19, options) {
-  mkdirSync7(path19, options);
+  mkdirSync8(path19, options);
 }
 async function readJsonFile(path19) {
   const text = await readFile6(path19);
@@ -69627,7 +69818,7 @@ __export(exports_auto_update, {
 import { execFile as execFile4 } from "node:child_process";
 import { realpathSync as realpathSync2 } from "node:fs";
 import { readdir as readdir7, rm } from "node:fs/promises";
-import { join as join19 } from "node:path";
+import { join as join20 } from "node:path";
 import { promisify as promisify4 } from "node:util";
 function debugLog2(...args) {
   if (DEBUG) {
@@ -69787,12 +69978,12 @@ async function getNpmGlobalPath() {
   }
 }
 async function cleanupOrphanedDirs(globalPath) {
-  const lettaAiDir = join19(globalPath, "lib/node_modules/@letta-ai");
+  const lettaAiDir = join20(globalPath, "lib/node_modules/@letta-ai");
   try {
     const entries = await readdir7(lettaAiDir);
     for (const entry of entries) {
       if (entry.startsWith(".letta-code-")) {
-        const orphanPath = join19(lettaAiDir, entry);
+        const orphanPath = join20(lettaAiDir, entry);
         debugLog2("Cleaning orphaned temp directory:", orphanPath);
         await rm(orphanPath, { recursive: true, force: true });
       }
@@ -70148,9 +70339,9 @@ __export(exports_subagents2, {
   GLOBAL_AGENTS_DIR: () => GLOBAL_AGENTS_DIR2,
   AGENTS_DIR: () => AGENTS_DIR2
 });
-import { existsSync as existsSync12 } from "node:fs";
+import { existsSync as existsSync13 } from "node:fs";
 import { readdir as readdir8, readFile as readFile7 } from "node:fs/promises";
-import { join as join21 } from "node:path";
+import { join as join22 } from "node:path";
 function isValidName2(name) {
   return /^[a-z][a-z0-9-]*$/.test(name);
 }
@@ -70232,7 +70423,7 @@ function getBuiltinSubagentNames2() {
   return new Set(Object.keys(getBuiltinSubagents2()));
 }
 async function discoverSubagentsFromDir2(agentsDir, seenNames, subagents, errors) {
-  if (!existsSync12(agentsDir)) {
+  if (!existsSync13(agentsDir)) {
     return;
   }
   try {
@@ -70241,7 +70432,7 @@ async function discoverSubagentsFromDir2(agentsDir, seenNames, subagents, errors
       if (!entry.isFile() || !entry.name.endsWith(".md")) {
         continue;
       }
-      const filePath = join21(agentsDir, entry.name);
+      const filePath = join22(agentsDir, entry.name);
       try {
         const config = await parseSubagentFile2(filePath);
         if (config) {
@@ -70273,7 +70464,7 @@ async function discoverSubagents2(workingDirectory = process.cwd()) {
   const subagents = [];
   const seenNames = new Set;
   await discoverSubagentsFromDir2(GLOBAL_AGENTS_DIR2, seenNames, subagents, errors);
-  const projectAgentsDir = join21(workingDirectory, AGENTS_DIR2);
+  const projectAgentsDir = join22(workingDirectory, AGENTS_DIR2);
   await discoverSubagentsFromDir2(projectAgentsDir, seenNames, subagents, errors);
   return { subagents, errors };
 }
@@ -70316,7 +70507,7 @@ var init_subagents2 = __esm(() => {
     recall_default,
     reflection_default
   ];
-  GLOBAL_AGENTS_DIR2 = join21(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents");
+  GLOBAL_AGENTS_DIR2 = join22(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents");
   VALID_MEMORY_BLOCKS2 = new Set(MEMORY_BLOCK_LABELS);
   cache5 = {
     builtins: null,
@@ -71213,6 +71404,12 @@ var init_cli2 = __esm(() => {
 });
 
 // src/agent/turn-recovery-policy.ts
+function hasNonRetryableQuotaDetail(detail) {
+  if (typeof detail !== "string")
+    return false;
+  const normalized = detail.toLowerCase();
+  return NON_RETRYABLE_429_REASONS.some((reason) => normalized.includes(reason)) || NON_RETRYABLE_QUOTA_DETAIL_PATTERNS.some((pattern) => normalized.includes(pattern));
+}
 function isInvalidToolCallIdsError(detail) {
   if (typeof detail !== "string")
     return false;
@@ -71245,9 +71442,12 @@ function isNonRetryableProviderErrorDetail(detail) {
 }
 function shouldRetryRunMetadataError(errorType, detail) {
   const explicitLlmError = errorType === "llm_error";
+  const nonRetryableQuotaDetail = hasNonRetryableQuotaDetail(detail);
   const retryable429Detail = typeof detail === "string" && RETRYABLE_429_PATTERN.test(detail);
   const retryableDetail = isRetryableProviderErrorDetail(detail);
   const nonRetryableDetail = isNonRetryableProviderErrorDetail(detail);
+  if (nonRetryableQuotaDetail)
+    return false;
   if (nonRetryableDetail && !retryable429Detail)
     return false;
   if (explicitLlmError)
@@ -71256,10 +71456,9 @@ function shouldRetryRunMetadataError(errorType, detail) {
 }
 function shouldRetryPreStreamTransientError(opts) {
   const { status, detail } = opts;
+  if (hasNonRetryableQuotaDetail(detail))
+    return false;
   if (status === 429) {
-    if (typeof detail === "string" && NON_RETRYABLE_429_REASONS.some((r) => detail.includes(r))) {
-      return false;
-    }
     return true;
   }
   if (status !== undefined && status >= 500)
@@ -71347,7 +71546,7 @@ function rebuildInputWithFreshDenials(currentInput, serverApprovals, denialReaso
 function shouldAttemptApprovalRecovery(opts) {
   return opts.approvalPendingDetected && opts.retries < opts.maxRetries;
 }
-var INVALID_TOOL_CALL_IDS_FRAGMENT = "invalid tool call ids", APPROVAL_PENDING_DETAIL_FRAGMENT = "waiting for approval", CONVERSATION_BUSY_DETAIL_FRAGMENT = "another request is currently being processed", RETRYABLE_PROVIDER_DETAIL_PATTERNS, NON_RETRYABLE_PROVIDER_DETAIL_PATTERNS, NON_RETRYABLE_429_REASONS, NON_RETRYABLE_4XX_PATTERN, RETRYABLE_429_PATTERN;
+var INVALID_TOOL_CALL_IDS_FRAGMENT = "invalid tool call ids", APPROVAL_PENDING_DETAIL_FRAGMENT = "waiting for approval", CONVERSATION_BUSY_DETAIL_FRAGMENT = "another request is currently being processed", RETRYABLE_PROVIDER_DETAIL_PATTERNS, NON_RETRYABLE_PROVIDER_DETAIL_PATTERNS, NON_RETRYABLE_429_REASONS, NON_RETRYABLE_QUOTA_DETAIL_PATTERNS, NON_RETRYABLE_4XX_PATTERN, RETRYABLE_429_PATTERN;
 var init_turn_recovery_policy = __esm(() => {
   init_zaiErrors();
   RETRYABLE_PROVIDER_DETAIL_PATTERNS = [
@@ -71381,7 +71580,19 @@ var init_turn_recovery_policy = __esm(() => {
     "context_length_exceeded",
     "invalid_encrypted_content"
   ];
-  NON_RETRYABLE_429_REASONS = ["agents-limit-exceeded"];
+  NON_RETRYABLE_429_REASONS = [
+    "agents-limit-exceeded",
+    "exceeded-quota",
+    "free-usage-exceeded",
+    "premium-usage-exceeded",
+    "standard-usage-exceeded",
+    "basic-usage-exceeded",
+    "not-enough-credits"
+  ];
+  NON_RETRYABLE_QUOTA_DETAIL_PATTERNS = [
+    "hosted model usage limit",
+    "out of credits"
+  ];
   NON_RETRYABLE_4XX_PATTERN = /Error code:\s*4(0[0-8]|1\d|2\d|3\d|4\d|51)/i;
   RETRYABLE_429_PATTERN = /Error code:\s*429|rate limit|too many requests/i;
 });
@@ -71930,6 +72141,18 @@ function isCreditExhaustedError2(e, reasons) {
     return false;
   return hasErrorReason2(e, "not-enough-credits", reasons);
 }
+function getTierUsageLimitMessage2(reasons) {
+  if (reasons.includes("premium-usage-exceeded")) {
+    return `You've reached your Premium model usage limit. Try switching to Standard or Basic hosted models with /model. View your plan and usage at ${LETTA_USAGE_URL2}, or connect your own provider keys with /connect.`;
+  }
+  if (reasons.includes("standard-usage-exceeded")) {
+    return `You've reached your Standard model usage limit. Try switching to Basic hosted models with /model. View your plan and usage at ${LETTA_USAGE_URL2}, or connect your own provider keys with /connect.`;
+  }
+  if (reasons.includes("basic-usage-exceeded")) {
+    return `You've reached your Basic model usage limit. Try switching models with /model, view your plan and usage at ${LETTA_USAGE_URL2}, or connect your own provider keys with /connect.`;
+  }
+  return;
+}
 function findEncryptedContentDetail2(e) {
   if (typeof e !== "object" || e === null)
     return;
@@ -72032,9 +72255,9 @@ Delete ${resourceType} at: ${LETTA_AGENTS_URL2}`;
     if (isCreditExhaustedError2(e, reasons)) {
       return `Your account is out of credits for hosted inference. Add credits, enable auto-recharge, or upgrade at ${LETTA_USAGE_URL2}. You can also connect your own provider keys with /connect.`;
     }
-    if (hasErrorReason2(e, "premium-usage-exceeded", reasons) || hasErrorReason2(e, "standard-usage-exceeded", reasons) || hasErrorReason2(e, "basic-usage-exceeded", reasons)) {
-      return `You've reached your hosted model usage limit. View your plan and usage at ${LETTA_USAGE_URL2}, or connect your own provider keys with /connect.`;
-    }
+    const tierUsageLimitMsg = getTierUsageLimitMessage2(reasons);
+    if (tierUsageLimitMsg)
+      return tierUsageLimitMsg;
     if (hasErrorReason2(e, "byok-not-available-on-free-tier", reasons)) {
       const { modelDisplayName } = getErrorContext();
       const modelInfo = modelDisplayName ? ` (${modelDisplayName})` : "";
@@ -72555,7 +72778,7 @@ var init_catalog = __esm(() => {
 });
 
 // src/reminders/engine.ts
-import { join as join22 } from "node:path";
+import { join as join23 } from "node:path";
 async function buildSessionContextReminder(context3) {
   if (!context3.sessionContextReminderEnabled || context3.state.hasSentSessionContext) {
     return null;
@@ -72579,7 +72802,7 @@ async function buildSkillsReminder(context3) {
   const previousSkillsReminder = context3.state.cachedSkillsReminder;
   let latestSkillsReminder = previousSkillsReminder ?? "";
   try {
-    const skillsDir = getSkillsDirectory() || join22(process.cwd(), SKILLS_DIR);
+    const skillsDir = getSkillsDirectory() || join23(process.cwd(), SKILLS_DIR);
     const { skills } = await discoverSkills(skillsDir, context3.agent.id, {
       sources: context3.skillSources
     });
@@ -73010,7 +73233,7 @@ function parseRegistryHandle(handle) {
 }
 async function importAgentFromRegistry(options) {
   const { tmpdir: tmpdir3 } = await import("node:os");
-  const { join: join23 } = await import("node:path");
+  const { join: join24 } = await import("node:path");
   const { writeFile: writeFile4, unlink } = await import("node:fs/promises");
   const { author, name } = parseRegistryHandle(options.handle);
   const rawUrl = `https://raw.githubusercontent.com/${AGENT_REGISTRY_OWNER}/${AGENT_REGISTRY_REPO}/refs/heads/${AGENT_REGISTRY_BRANCH}/agents/@${author}/${name}/${name}.af`;
@@ -73022,7 +73245,7 @@ async function importAgentFromRegistry(options) {
     throw new Error(`Failed to download agent @${author}/${name}: ${response.statusText}`);
   }
   const afContent = await response.text();
-  const tempPath = join23(tmpdir3(), `letta-import-${author}-${name}-${Date.now()}.af`);
+  const tempPath = join24(tmpdir3(), `letta-import-${author}-${name}-${Date.now()}.af`);
   await writeFile4(tempPath, afContent, "utf-8");
   try {
     const result = await importAgentFromFile({
@@ -73745,19 +73968,6 @@ In headless mode, use:
       conversationId
     });
   }
-  for (const label of ["skills", "loaded_skills"]) {
-    try {
-      const block = await client.agents.blocks.retrieve(label, {
-        agent_id: agent.id
-      });
-      if (block) {
-        await client.agents.blocks.detach(block.id, {
-          agent_id: agent.id
-        });
-        await client.blocks.delete(block.id);
-      }
-    } catch {}
-  }
   setAgentContext2(agent.id, skillsDirectory, resolvedSkillSources);
   const outputFormat = values["output-format"] || "text";
   const includePartialMessages = Boolean(values["include-partial-messages"]);
@@ -73913,7 +74123,7 @@ ${SYSTEM_REMINDER_CLOSE}
   syncReminderStateFromContextTracker(sharedReminderState, reminderContextTracker);
   const lastRunAt = agent.last_run_completion;
   const { parts: sharedReminderParts } = await buildSharedReminderParts({
-    mode: "headless-one-shot",
+    mode: isSubagent ? "subagent" : "headless-one-shot",
     agent: {
       id: agent.id,
       name: agent.name,
@@ -74512,6 +74722,7 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
   let currentAbortController = null;
   const reminderContextTracker = createContextTracker();
   const sharedReminderState = createSharedReminderState();
+  const isSubagent = process.env.LETTA_CODE_AGENT_ROLE === "subagent";
   const resolveAllPendingApprovals = async () => {
     const { getResumeData: getResumeData3 } = await Promise.resolve().then(() => (init_check_approval(), exports_check_approval));
     while (true) {
@@ -74863,7 +75074,7 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
         syncReminderStateFromContextTracker(sharedReminderState, reminderContextTracker);
         const lastRunAt = agent.last_run_completion;
         const { parts: sharedReminderParts } = await buildSharedReminderParts({
-          mode: "headless-bidirectional",
+          mode: isSubagent ? "subagent" : "headless-bidirectional",
           agent: {
             id: agent.id,
             name: agent.name,
@@ -75443,10 +75654,10 @@ __export(exports_settings, {
   loadProjectSettings: () => loadProjectSettings,
   getSetting: () => getSetting
 });
-import { homedir as homedir15 } from "node:os";
-import { join as join23 } from "node:path";
+import { homedir as homedir16 } from "node:os";
+import { join as join24 } from "node:path";
 function getSettingsPath() {
-  return join23(homedir15(), ".letta", "settings.json");
+  return join24(homedir16(), ".letta", "settings.json");
 }
 async function loadSettings() {
   const settingsPath = getSettingsPath();
@@ -75483,7 +75694,7 @@ async function getSetting(key) {
   return settings[key];
 }
 function getProjectSettingsPath() {
-  return join23(process.cwd(), ".letta", "settings.local.json");
+  return join24(process.cwd(), ".letta", "settings.local.json");
 }
 async function loadProjectSettings() {
   const settingsPath = getProjectSettingsPath();
@@ -75501,7 +75712,7 @@ async function loadProjectSettings() {
 }
 async function saveProjectSettings(settings) {
   const settingsPath = getProjectSettingsPath();
-  const dirPath = join23(process.cwd(), ".letta");
+  const dirPath = join24(process.cwd(), ".letta");
   try {
     if (!exists(dirPath)) {
       await mkdir(dirPath, { recursive: true });
@@ -78997,9 +79208,9 @@ function getFileEditHeader(toolName, toolArgs) {
     const relPath = relative7(cwd2, filePath);
     const displayPath = relPath.startsWith("..") ? filePath : relPath;
     if (t === "write" || t === "write_file" || t === "writefile" || t === "write_file_gemini" || t === "writefilegemini") {
-      const { existsSync: existsSync13 } = __require("node:fs");
+      const { existsSync: existsSync14 } = __require("node:fs");
       try {
-        if (existsSync13(filePath)) {
+        if (existsSync14(filePath)) {
           return `Overwrite ${displayPath}?`;
         }
       } catch {}
@@ -79701,9 +79912,9 @@ function getHeaderText(fileEdit) {
   const relPath = relative7(cwd2, fileEdit.filePath);
   const displayPath = relPath.startsWith("..") ? fileEdit.filePath : relPath;
   if (t === "write" || t === "write_file" || t === "writefile" || t === "write_file_gemini" || t === "writefilegemini") {
-    const { existsSync: existsSync13 } = __require("node:fs");
+    const { existsSync: existsSync14 } = __require("node:fs");
     try {
-      if (existsSync13(fileEdit.filePath)) {
+      if (existsSync14(fileEdit.filePath)) {
         return `Overwrite ${displayPath}?`;
       }
     } catch {}
@@ -82950,9 +83161,9 @@ var init_pasteRegistry = __esm(() => {
 
 // src/cli/helpers/clipboard.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
-import { existsSync as existsSync13, readFileSync as readFileSync3, statSync as statSync4, unlinkSync as unlinkSync4 } from "node:fs";
+import { existsSync as existsSync14, readFileSync as readFileSync3, statSync as statSync4, unlinkSync as unlinkSync5 } from "node:fs";
 import { tmpdir as tmpdir3 } from "node:os";
-import { basename as basename3, extname as extname5, isAbsolute as isAbsolute16, join as join24, resolve as resolve22 } from "node:path";
+import { basename as basename3, extname as extname5, isAbsolute as isAbsolute16, join as join25, resolve as resolve22 } from "node:path";
 function countLines2(text) {
   return (text.match(/\r\n|\r|\n/g) || []).length + 1;
 }
@@ -83002,7 +83213,7 @@ function translatePasteForImages(paste) {
       if (!isAbsolute16(filePath))
         filePath = resolve22(process.cwd(), filePath);
       const ext3 = extname5(filePath || "").toLowerCase();
-      if (IMAGE_EXTS.has(ext3) && existsSync13(filePath) && statSync4(filePath).isFile()) {
+      if (IMAGE_EXTS.has(ext3) && existsSync14(filePath) && statSync4(filePath).isFile()) {
         const buf = readFileSync3(filePath);
         const b64 = buf.toString("base64");
         const mt = ext3 === ".png" ? "image/png" : ext3 === ".jpg" || ext3 === ".jpeg" ? "image/jpeg" : ext3 === ".gif" ? "image/gif" : ext3 === ".webp" ? "image/webp" : ext3 === ".bmp" ? "image/bmp" : ext3 === ".svg" ? "image/svg+xml" : ext3 === ".tif" || ext3 === ".tiff" ? "image/tiff" : ext3 === ".heic" ? "image/heic" : ext3 === ".heif" ? "image/heif" : ext3 === ".avif" ? "image/avif" : "application/octet-stream";
@@ -83020,7 +83231,7 @@ function translatePasteForImages(paste) {
 function getClipboardImageToTempFile() {
   if (process.platform !== "darwin")
     return null;
-  const tempPath = join24(tmpdir3(), `letta-clipboard-${Date.now()}.bin`);
+  const tempPath = join25(tmpdir3(), `letta-clipboard-${Date.now()}.bin`);
   try {
     const jxa = `
       ObjC.import('AppKit');
@@ -83043,13 +83254,13 @@ function getClipboardImageToTempFile() {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"]
     }).trim();
-    if (!uti || !existsSync13(tempPath))
+    if (!uti || !existsSync14(tempPath))
       return null;
     return { tempPath, uti };
   } catch {
-    if (existsSync13(tempPath)) {
+    if (existsSync14(tempPath)) {
       try {
-        unlinkSync4(tempPath);
+        unlinkSync5(tempPath);
       } catch {}
     }
     return null;
@@ -83065,7 +83276,7 @@ async function tryImportClipboardImageMac() {
   try {
     const buffer = readFileSync3(tempPath);
     try {
-      unlinkSync4(tempPath);
+      unlinkSync5(tempPath);
     } catch {}
     const mediaType = UTI_TO_MEDIA_TYPE[uti] || "image/png";
     const resized = await resizeImageIfNeeded3(buffer, mediaType);
@@ -83080,9 +83291,9 @@ async function tryImportClipboardImageMac() {
       height: resized.height
     };
   } catch (err) {
-    if (existsSync13(tempPath)) {
+    if (existsSync14(tempPath)) {
       try {
-        unlinkSync4(tempPath);
+        unlinkSync5(tempPath);
       } catch {}
     }
     const message = err instanceof Error ? err.message : String(err);
@@ -83657,13 +83868,13 @@ __export(exports_terminalKeybindingInstaller, {
 });
 import {
   copyFileSync,
-  existsSync as existsSync14,
-  mkdirSync as mkdirSync9,
+  existsSync as existsSync15,
+  mkdirSync as mkdirSync10,
   readFileSync as readFileSync4,
-  writeFileSync as writeFileSync6
+  writeFileSync as writeFileSync7
 } from "node:fs";
-import { homedir as homedir16, platform as platform4 } from "node:os";
-import { dirname as dirname11, join as join25 } from "node:path";
+import { homedir as homedir17, platform as platform4 } from "node:os";
+import { dirname as dirname11, join as join26 } from "node:path";
 function detectTerminalType() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
     return "cursor";
@@ -83695,16 +83906,16 @@ function getKeybindingsPath(terminal) {
   }[terminal];
   const os5 = platform4();
   if (os5 === "darwin") {
-    return join25(homedir16(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join26(homedir17(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os5 === "win32") {
     const appData = process.env.APPDATA;
     if (!appData)
       return null;
-    return join25(appData, appName, "User", "keybindings.json");
+    return join26(appData, appName, "User", "keybindings.json");
   }
   if (os5 === "linux") {
-    return join25(homedir16(), ".config", appName, "User", "keybindings.json");
+    return join26(homedir17(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -83726,7 +83937,7 @@ function parseKeybindings(content) {
   }
 }
 function keybindingExists(keybindingsPath) {
-  if (!existsSync14(keybindingsPath))
+  if (!existsSync15(keybindingsPath))
     return false;
   try {
     const content = readFileSync4(keybindingsPath, { encoding: "utf-8" });
@@ -83739,7 +83950,7 @@ function keybindingExists(keybindingsPath) {
   }
 }
 function createBackup(keybindingsPath) {
-  if (!existsSync14(keybindingsPath))
+  if (!existsSync15(keybindingsPath))
     return null;
   const backupPath = `${keybindingsPath}.letta-backup`;
   try {
@@ -83755,12 +83966,12 @@ function installKeybinding(keybindingsPath) {
       return { success: true, alreadyExists: true };
     }
     const parentDir = dirname11(keybindingsPath);
-    if (!existsSync14(parentDir)) {
-      mkdirSync9(parentDir, { recursive: true });
+    if (!existsSync15(parentDir)) {
+      mkdirSync10(parentDir, { recursive: true });
     }
     let keybindings = [];
     let backupPath = null;
-    if (existsSync14(keybindingsPath)) {
+    if (existsSync15(keybindingsPath)) {
       backupPath = createBackup(keybindingsPath);
       const content = readFileSync4(keybindingsPath, { encoding: "utf-8" });
       const parsed = parseKeybindings(content);
@@ -83775,7 +83986,7 @@ function installKeybinding(keybindingsPath) {
     keybindings.push(SHIFT_ENTER_KEYBINDING);
     const newContent = `${JSON.stringify(keybindings, null, 2)}
 `;
-    writeFileSync6(keybindingsPath, newContent, { encoding: "utf-8" });
+    writeFileSync7(keybindingsPath, newContent, { encoding: "utf-8" });
     return {
       success: true,
       backupPath: backupPath ?? undefined
@@ -83790,7 +84001,7 @@ function installKeybinding(keybindingsPath) {
 }
 function removeKeybinding(keybindingsPath) {
   try {
-    if (!existsSync14(keybindingsPath)) {
+    if (!existsSync15(keybindingsPath)) {
       return { success: true };
     }
     const content = readFileSync4(keybindingsPath, { encoding: "utf-8" });
@@ -83804,7 +84015,7 @@ function removeKeybinding(keybindingsPath) {
     const filtered = keybindings.filter((kb) => !(kb.key?.toLowerCase() === "shift+enter" && kb.command === "workbench.action.terminal.sendSequence" && kb.when?.includes("terminalFocus")));
     const newContent = `${JSON.stringify(filtered, null, 2)}
 `;
-    writeFileSync6(keybindingsPath, newContent, { encoding: "utf-8" });
+    writeFileSync7(keybindingsPath, newContent, { encoding: "utf-8" });
     return { success: true };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -83857,17 +84068,17 @@ function getWezTermConfigPath() {
   }
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig) {
-    const xdgPath = join25(xdgConfig, "wezterm", "wezterm.lua");
-    if (existsSync14(xdgPath))
+    const xdgPath = join26(xdgConfig, "wezterm", "wezterm.lua");
+    if (existsSync15(xdgPath))
       return xdgPath;
   }
-  const configPath = join25(homedir16(), ".config", "wezterm", "wezterm.lua");
-  if (existsSync14(configPath))
+  const configPath = join26(homedir17(), ".config", "wezterm", "wezterm.lua");
+  if (existsSync15(configPath))
     return configPath;
-  return join25(homedir16(), ".wezterm.lua");
+  return join26(homedir17(), ".wezterm.lua");
 }
 function wezTermDeleteFixExists(configPath) {
-  if (!existsSync14(configPath))
+  if (!existsSync15(configPath))
     return false;
   try {
     const content = readFileSync4(configPath, { encoding: "utf-8" });
@@ -83884,7 +84095,7 @@ function installWezTermDeleteFix() {
     }
     let content = "";
     let backupPath = null;
-    if (existsSync14(configPath)) {
+    if (existsSync15(configPath)) {
       backupPath = `${configPath}.letta-backup`;
       copyFileSync(configPath, backupPath);
       content = readFileSync4(configPath, { encoding: "utf-8" });
@@ -83914,10 +84125,10 @@ ${WEZTERM_DELETE_FIX}
 `;
     }
     const parentDir = dirname11(configPath);
-    if (!existsSync14(parentDir)) {
-      mkdirSync9(parentDir, { recursive: true });
+    if (!existsSync15(parentDir)) {
+      mkdirSync10(parentDir, { recursive: true });
     }
-    writeFileSync6(configPath, content, { encoding: "utf-8" });
+    writeFileSync7(configPath, content, { encoding: "utf-8" });
     return {
       success: true,
       backupPath: backupPath ?? undefined
@@ -84405,9 +84616,9 @@ __export(exports_custom, {
   GLOBAL_COMMANDS_DIR: () => GLOBAL_COMMANDS_DIR,
   COMMANDS_DIR: () => COMMANDS_DIR
 });
-import { existsSync as existsSync15 } from "node:fs";
+import { existsSync as existsSync16 } from "node:fs";
 import { readdir as readdir9, readFile as readFile9 } from "node:fs/promises";
-import { basename as basename4, dirname as dirname12, join as join26 } from "node:path";
+import { basename as basename4, dirname as dirname12, join as join27 } from "node:path";
 async function getCustomCommands() {
   if (cachedCommands !== null) {
     return cachedCommands;
@@ -84418,7 +84629,7 @@ async function getCustomCommands() {
 function refreshCustomCommands() {
   cachedCommands = null;
 }
-async function discoverCustomCommands(projectPath = join26(process.cwd(), COMMANDS_DIR)) {
+async function discoverCustomCommands(projectPath = join27(process.cwd(), COMMANDS_DIR)) {
   const commandsById = new Map;
   const userCommands = await discoverFromDirectory(GLOBAL_COMMANDS_DIR, "user");
   for (const cmd of userCommands) {
@@ -84439,7 +84650,7 @@ async function discoverCustomCommands(projectPath = join26(process.cwd(), COMMAN
   return result;
 }
 async function discoverFromDirectory(dirPath, source) {
-  if (!existsSync15(dirPath)) {
+  if (!existsSync16(dirPath)) {
     return [];
   }
   const commands2 = [];
@@ -84450,7 +84661,7 @@ async function findCommandFiles(currentPath, rootPath, commands2, source) {
   try {
     const entries = await readdir9(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join26(currentPath, entry.name);
+      const fullPath = join27(currentPath, entry.name);
       if (entry.isDirectory()) {
         await findCommandFiles(fullPath, rootPath, commands2, source);
       } else if (entry.isFile() && entry.name.endsWith(".md")) {
@@ -84535,7 +84746,7 @@ async function findCustomCommand(commandName) {
 }
 var COMMANDS_DIR = ".commands", GLOBAL_COMMANDS_DIR, cachedCommands = null;
 var init_custom = __esm(() => {
-  GLOBAL_COMMANDS_DIR = join26(process.env.HOME || process.env.USERPROFILE || "~", ".letta/commands");
+  GLOBAL_COMMANDS_DIR = join27(process.env.HOME || process.env.USERPROFILE || "~", ".letta/commands");
 });
 
 // src/cli/components/HelpDialog.tsx
@@ -87212,8 +87423,8 @@ var init_AgentInfoBar = __esm(async () => {
 });
 
 // src/cli/helpers/fileSearch.ts
-import { readdirSync as readdirSync5, statSync as statSync5 } from "node:fs";
-import { join as join27, resolve as resolve23 } from "node:path";
+import { readdirSync as readdirSync6, statSync as statSync5 } from "node:fs";
+import { join as join28, resolve as resolve23 } from "node:path";
 function shouldExcludeEntry(entry) {
   if (entry.startsWith(".")) {
     return true;
@@ -87225,13 +87436,13 @@ function searchDirectoryRecursive(dir, pattern, maxResults = 200, results = [],
     return results;
   }
   try {
-    const entries = readdirSync5(dir);
+    const entries = readdirSync6(dir);
     for (const entry of entries) {
       if (shouldExcludeEntry(entry)) {
         continue;
       }
       try {
-        const fullPath = join27(dir, entry);
+        const fullPath = join28(dir, entry);
         const stats = statSync5(fullPath);
         const relativePath = fullPath.startsWith(process.cwd()) ? fullPath.slice(process.cwd().length + 1) : fullPath;
         const matches = pattern.length === 0 || relativePath.toLowerCase().includes(pattern.toLowerCase());
@@ -87279,14 +87490,14 @@ async function searchFiles(query, deep = false) {
     } else {
       let entries = [];
       try {
-        entries = readdirSync5(searchDir);
+        entries = readdirSync6(searchDir);
       } catch {
         return [];
       }
       const matchingEntries = entries.filter((entry) => !shouldExcludeEntry(entry)).filter((entry) => searchPattern.length === 0 || entry.toLowerCase().includes(searchPattern.toLowerCase()));
       for (const entry of matchingEntries.slice(0, 50)) {
         try {
-          const fullPath = join27(searchDir, entry);
+          const fullPath = join28(searchDir, entry);
           const stats = statSync5(fullPath);
           const relativePath = fullPath.startsWith(process.cwd()) ? fullPath.slice(process.cwd().length + 1) : fullPath;
           results.push({
@@ -90493,21 +90704,21 @@ var init_McpSelector = __esm(async () => {
 });
 
 // src/agent/memoryScanner.ts
-import { readdirSync as readdirSync6, readFileSync as readFileSync5, statSync as statSync6 } from "node:fs";
-import { join as join28, relative as relative7 } from "node:path";
+import { readdirSync as readdirSync7, readFileSync as readFileSync5, statSync as statSync6 } from "node:fs";
+import { join as join29, relative as relative7 } from "node:path";
 function scanMemoryFilesystem(memoryRoot) {
   const nodes = [];
   const scanDir = (dir, depth, parentIsLast) => {
     let entries;
     try {
-      entries = readdirSync6(dir);
+      entries = readdirSync7(dir);
     } catch {
       return;
     }
     const filtered = entries.filter((name) => !name.startsWith("."));
     const sorted = filtered.sort((a, b) => {
-      const aPath = join28(dir, a);
-      const bPath = join28(dir, b);
+      const aPath = join29(dir, a);
+      const bPath = join29(dir, b);
       let aIsDir = false;
       let bIsDir = false;
       try {
@@ -90527,7 +90738,7 @@ function scanMemoryFilesystem(memoryRoot) {
       return a.localeCompare(b);
     });
     sorted.forEach((name, index) => {
-      const fullPath = join28(dir, name);
+      const fullPath = join29(dir, name);
       let isDir = false;
       try {
         isDir = statSync6(fullPath).isDirectory();
@@ -90760,7 +90971,7 @@ a:hover { text-decoration: underline; }
 .tree-item.dir:not(.collapsed) { border-left-color: var(--accent); }
 .tree-item.dir:hover { background: var(--surface-2); }
 .tree-item.dir.collapsed ~ .tree-children { display: none; }
-.tree-children { /* wrapper for dir contents */ }
+.tree-children { padding-left: 12px; }
 .tree-children.hidden { display: none; }
 .tree-item.file { cursor: pointer; padding-left: 24px; }
 .tree-item.file:hover { background: var(--hover-accent); }
@@ -92198,9 +92409,9 @@ var init_memory_viewer_template = () => {};
 
 // src/web/generate-memory-viewer.ts
 import { execFile as execFileCb2 } from "node:child_process";
-import { chmodSync as chmodSync2, existsSync as existsSync16, mkdirSync as mkdirSync10, writeFileSync as writeFileSync7 } from "node:fs";
-import { homedir as homedir17 } from "node:os";
-import { join as join29 } from "node:path";
+import { chmodSync as chmodSync2, existsSync as existsSync17, mkdirSync as mkdirSync11, writeFileSync as writeFileSync8 } from "node:fs";
+import { homedir as homedir18 } from "node:os";
+import { join as join30 } from "node:path";
 import { promisify as promisify10 } from "node:util";
 async function runGitSafe(cwd2, args) {
   try {
@@ -92482,23 +92693,26 @@ async function generateAndOpenMemoryViewer(agentId, options) {
     data.agent.name = options.agentName;
   }
   const jsonPayload = JSON.stringify(data).replace(/</g, "\\u003c");
-  const html = memory_viewer_template_default.replace("<!--LETTA_DATA_PLACEHOLDER-->", jsonPayload);
-  if (!existsSync16(VIEWERS_DIR)) {
-    mkdirSync10(VIEWERS_DIR, { recursive: true, mode: 448 });
+  const html = memory_viewer_template_default.replace("<!--LETTA_DATA_PLACEHOLDER-->", () => jsonPayload);
+  if (!existsSync17(VIEWERS_DIR)) {
+    mkdirSync11(VIEWERS_DIR, { recursive: true, mode: 448 });
   }
   try {
     chmodSync2(VIEWERS_DIR, 448);
   } catch {}
-  const filePath = join29(VIEWERS_DIR, `memory-${encodeURIComponent(agentId)}.html`);
-  writeFileSync7(filePath, html);
+  const filePath = join30(VIEWERS_DIR, `memory-${encodeURIComponent(agentId)}.html`);
+  writeFileSync8(filePath, html);
   chmodSync2(filePath, 384);
-  try {
-    const { default: openUrl } = await Promise.resolve().then(() => (init_open(), exports_open));
-    await openUrl(filePath, { wait: false });
-  } catch (err) {
-    throw new Error(`Failed to open browser. File saved to: ${filePath}${err instanceof Error ? ` (${err.message})` : ""}`);
+  const isTmux = Boolean(process.env.TMUX);
+  if (!isTmux) {
+    try {
+      const { default: openUrl } = await Promise.resolve().then(() => (init_open(), exports_open));
+      await openUrl(filePath, { wait: false });
+    } catch {
+      throw new Error(`Could not open browser. Run: open ${filePath}`);
+    }
   }
-  return { filePath };
+  return { filePath, opened: !isTmux };
 }
 var execFile10, VIEWERS_DIR, MAX_COMMITS = 500, RECENT_DIFF_COUNT = 50, PER_DIFF_CAP = 1e5, TOTAL_PAYLOAD_CAP = 5000000, RECORD_SEP = "\x1E", REFLECTION_PATTERN;
 var init_generate_memory_viewer = __esm(async () => {
@@ -92510,12 +92724,12 @@ var init_generate_memory_viewer = __esm(async () => {
     init_memoryGit()
   ]);
   execFile10 = promisify10(execFileCb2);
-  VIEWERS_DIR = join29(homedir17(), ".letta", "viewers");
+  VIEWERS_DIR = join30(homedir18(), ".letta", "viewers");
   REFLECTION_PATTERN = /\(reflection\)|🔮|reflection:/i;
 });
 
 // src/cli/components/MemfsTreeViewer.tsx
-import { existsSync as existsSync17 } from "node:fs";
+import { existsSync as existsSync18 } from "node:fs";
 function renderTreePrefix(node) {
   let prefix = "";
   for (let i = 0;i < node.depth; i++) {
@@ -92541,7 +92755,7 @@ function MemfsTreeViewer({
   const [status, setStatus] = import_react72.useState(null);
   const statusTimerRef = import_react72.useRef(null);
   const memoryRoot = getMemoryFilesystemRoot(agentId);
-  const memoryExists = existsSync17(memoryRoot);
+  const memoryExists = existsSync18(memoryRoot);
   const hasGitRepo = import_react72.useMemo(() => isGitRepo(agentId), [agentId]);
   function showStatus(msg, durationMs) {
     if (statusTimerRef.current)
@@ -92567,7 +92781,13 @@ function MemfsTreeViewer({
     }
     if ((input === "o" || input === "O") && hasGitRepo) {
       showStatus("Opening in browser...", 1e4);
-      generateAndOpenMemoryViewer(agentId, { agentName }).then(() => showStatus("Opened in browser", 3000)).catch((err) => showStatus(err instanceof Error ? err.message : "Failed to open viewer", 5000));
+      generateAndOpenMemoryViewer(agentId, { agentName }).then((result) => {
+        if (result.opened) {
+          showStatus("Opened in browser", 3000);
+        } else {
+          showStatus(`Run: open ${result.filePath}`, 15000);
+        }
+      }).catch((err) => showStatus(err instanceof Error ? err.message : "Failed to open viewer", 5000));
       return;
     }
     if (key.escape) {
@@ -95142,11 +95362,11 @@ var init_byok_providers = __esm(async () => {
 
 // src/utils/aws-credentials.ts
 import { readFile as readFile10 } from "node:fs/promises";
-import { homedir as homedir18 } from "node:os";
-import { join as join30 } from "node:path";
+import { homedir as homedir19 } from "node:os";
+import { join as join31 } from "node:path";
 async function parseAwsCredentials() {
-  const credentialsPath = join30(homedir18(), ".aws", "credentials");
-  const configPath = join30(homedir18(), ".aws", "config");
+  const credentialsPath = join31(homedir19(), ".aws", "credentials");
+  const configPath = join31(homedir19(), ".aws", "config");
   const profiles = new Map;
   try {
     const content = await readFile10(credentialsPath, "utf-8");
@@ -96254,8 +96474,8 @@ function SkillsDialog({ onClose, agentId }) {
       try {
         const { discoverSkills: discoverSkills3, SKILLS_DIR: SKILLS_DIR3 } = await Promise.resolve().then(() => (init_skills(), exports_skills));
         const { getSkillsDirectory: getSkillsDirectory2, getSkillSources: getSkillSources2 } = await Promise.resolve().then(() => (init_context(), exports_context));
-        const { join: join31 } = await import("node:path");
-        const skillsDir = getSkillsDirectory2() || join31(process.cwd(), SKILLS_DIR3);
+        const { join: join32 } = await import("node:path");
+        const skillsDir = getSkillsDirectory2() || join32(process.cwd(), SKILLS_DIR3);
         const result = await discoverSkills3(skillsDir, agentId, {
           sources: getSkillSources2()
         });
@@ -100960,12 +101180,12 @@ __export(exports_shellAliases, {
   expandAliases: () => expandAliases,
   clearAliasCache: () => clearAliasCache
 });
-import { existsSync as existsSync18, readFileSync as readFileSync6 } from "node:fs";
-import { homedir as homedir19 } from "node:os";
-import { join as join31 } from "node:path";
+import { existsSync as existsSync19, readFileSync as readFileSync6 } from "node:fs";
+import { homedir as homedir20 } from "node:os";
+import { join as join32 } from "node:path";
 function parseAliasesFromFile(filePath) {
   const aliases = new Map;
-  if (!existsSync18(filePath)) {
+  if (!existsSync19(filePath)) {
     return aliases;
   }
   try {
@@ -101031,10 +101251,10 @@ function loadAliases(forceReload = false) {
   if (aliasCache && !forceReload) {
     return aliasCache;
   }
-  const home = homedir19();
+  const home = homedir20();
   const allAliases = new Map;
   for (const file of ALIAS_FILES) {
-    const filePath = join31(home, file);
+    const filePath = join32(home, file);
     const fileAliases = parseAliasesFromFile(filePath);
     for (const [name, value] of fileAliases) {
       allAliases.set(name, value);
@@ -102370,9 +102590,9 @@ var exports_App = {};
 __export(exports_App, {
   default: () => App2
 });
-import { existsSync as existsSync19, readFileSync as readFileSync7, renameSync as renameSync2, writeFileSync as writeFileSync8 } from "node:fs";
-import { homedir as homedir20, tmpdir as tmpdir4 } from "node:os";
-import { join as join32 } from "node:path";
+import { existsSync as existsSync20, readFileSync as readFileSync7, renameSync as renameSync2, writeFileSync as writeFileSync9 } from "node:fs";
+import { homedir as homedir21, tmpdir as tmpdir4 } from "node:os";
+import { join as join33 } from "node:path";
 function deriveReasoningEffort(modelSettings, llmConfig) {
   if (modelSettings && "provider_type" in modelSettings) {
     if (modelSettings.provider_type === "openai" && "reasoning" in modelSettings && modelSettings.reasoning) {
@@ -102569,7 +102789,7 @@ ${SYSTEM_REMINDER_CLOSE}
 }
 function planFileExists() {
   const planFilePath = permissionMode.getPlanFilePath();
-  return !!planFilePath && existsSync19(planFilePath);
+  return !!planFilePath && existsSync20(planFilePath);
 }
 function getQuestionsFromApproval(approval) {
   const parsed = safeJsonParseOr(approval.toolArgs, {});
@@ -102939,6 +103159,11 @@ function App2({
   const sessionStatsRef = import_react96.useRef(new SessionStats);
   const sessionStartTimeRef = import_react96.useRef(Date.now());
   const sessionHooksRanRef = import_react96.useRef(false);
+  import_react96.useEffect(() => {
+    if (agentId && agentId !== "loading") {
+      chunkLog.init(agentId, telemetry.getSessionId());
+    }
+  }, [agentId]);
   const syncTrajectoryTokenBase = import_react96.useCallback(() => {
     const snapshot = sessionStatsRef.current.getTrajectorySnapshot();
     setTrajectoryTokenBase(snapshot?.tokens ?? 0);
@@ -103662,8 +103887,8 @@ function App2({
     if (!planFilePath)
       return;
     try {
-      const { readFileSync: readFileSync8, existsSync: existsSync20 } = __require("node:fs");
-      if (!existsSync20(planFilePath))
+      const { readFileSync: readFileSync8, existsSync: existsSync21 } = __require("node:fs");
+      if (!existsSync21(planFilePath))
         return;
       const planContent = readFileSync8(planFilePath, "utf-8");
       const previewItem = {
@@ -103942,9 +104167,9 @@ Memory may be stale. Try running: git -C ~/.letta/agents/${agentId}/memory pull`
     (async () => {
       try {
         const { watch } = await import("node:fs");
-        const { existsSync: existsSync20 } = await import("node:fs");
+        const { existsSync: existsSync21 } = await import("node:fs");
         const memRoot = getMemoryFilesystemRoot(agentId);
-        if (!existsSync20(memRoot))
+        if (!existsSync21(memRoot))
           return;
         watcher = watch(memRoot, { recursive: true }, () => {});
         memfsWatcherRef.current = watcher;
@@ -105147,6 +105372,7 @@ ${feedback}
       setStreaming(false);
       resetTrajectoryBases();
       toolResultsInFlightRef.current = false;
+      setIsExecutingTool(false);
       if (!toolsCancelled) {
         appendError(INTERRUPT_MESSAGE, true);
       }
@@ -105206,12 +105432,17 @@ ${feedback}
         }
         if (abortControllerRef.current) {
           abortControllerRef.current.abort();
+          abortControllerRef.current = null;
         }
+        setIsExecutingTool(false);
+        toolResultsInFlightRef.current = false;
         pendingInterruptRecoveryConversationIdRef.current = conversationIdRef.current;
       } catch (e) {
         const errorDetails = formatErrorDetails2(e, agentId);
         appendError(`Failed to interrupt stream: ${errorDetails}`);
         setInterruptRequested(false);
+        setIsExecutingTool(false);
+        toolResultsInFlightRef.current = false;
       }
     }
   }, [
@@ -106848,7 +107079,7 @@ Press Enter to continue, or type anything to cancel.`, false, "running");
             fileContent = await client.agents.exportFile(agentId, exportParams);
           }
           const fileName = exportParams.conversation_id ? `${exportParams.conversation_id}.af` : `${agentId}.af`;
-          writeFileSync8(fileName, JSON.stringify(fileContent, null, 2));
+          writeFileSync9(fileName, JSON.stringify(fileContent, null, 2));
           let summary = `AgentFile exported to ${fileName}`;
           if (skills.length > 0) {
             summary += `
@@ -106938,11 +107169,11 @@ Path: ${result2.memoryDir}`, true, msg);
           setCommandRunning(true);
           try {
             const memoryDir = getMemoryFilesystemRoot(agentId);
-            if (!existsSync19(memoryDir)) {
+            if (!existsSync20(memoryDir)) {
               updateMemorySyncCommand(cmdId, "No local memory filesystem found to reset.", true, msg);
               return { submitted: true };
             }
-            const backupDir = join32(tmpdir4(), `letta-memfs-reset-${agentId}-${Date.now()}`);
+            const backupDir = join33(tmpdir4(), `letta-memfs-reset-${agentId}-${Date.now()}`);
             renameSync2(memoryDir, backupDir);
             ensureMemoryFilesystemDirs(agentId);
             updateMemorySyncCommand(cmdId, `Memory filesystem reset.
@@ -106970,8 +107201,8 @@ Run \`/memfs sync\` to repopulate from API.`, true, msg);
             await removeGitMemoryTag2(agentId);
             let backupInfo = "";
             const memoryDir = getMemoryFilesystemRoot(agentId);
-            if (existsSync19(memoryDir)) {
-              const backupDir = join32(tmpdir4(), `letta-memfs-disable-${agentId}-${Date.now()}`);
+            if (existsSync20(memoryDir)) {
+              const backupDir = join33(tmpdir4(), `letta-memfs-disable-${agentId}-${Date.now()}`);
               renameSync2(memoryDir, backupDir);
               backupInfo = `
 Local files backed up to ${backupDir}`;
@@ -108656,10 +108887,11 @@ ${guidance}`);
                 context_tokens: stats.usage.contextTokens
               };
             })(),
-            agent_name: agentName,
-            agent_description: agentDescription,
-            model: currentModelId,
-            billing_tier: billingTier
+            agent_name: agentName ?? undefined,
+            agent_description: agentDescription ?? undefined,
+            model: currentModelId ?? undefined,
+            billing_tier: billingTier ?? undefined,
+            recent_chunks: chunkLog.getEntries()
           })
         });
         if (!response.ok) {
@@ -108965,7 +109197,7 @@ ${guidance}`);
       }
       if (!planFileExists()) {
         const planFilePath = permissionMode.getPlanFilePath();
-        const plansDir = join32(homedir20(), ".letta", "plans");
+        const plansDir = join33(homedir21(), ".letta", "plans");
         handlePlanKeepPlanning(`You must write your plan to a plan file before exiting plan mode.
 ` + (planFilePath ? `Plan file path: ${planFilePath}
 ` : "") + `Use a write tool to create your plan in ${plansDir}, then use ExitPlanMode to present the plan to the user.`);
@@ -110082,6 +110314,7 @@ var init_App2 = __esm(async () => {
   init_SessionStats();
   init_AnimationContext();
   init_backfill();
+  init_chunkLog();
   init_contextChart();
   init_diff2();
   init_errorContext();
@@ -110219,13 +110452,13 @@ __export(exports_terminalKeybindingInstaller2, {
 });
 import {
   copyFileSync as copyFileSync2,
-  existsSync as existsSync20,
-  mkdirSync as mkdirSync11,
+  existsSync as existsSync21,
+  mkdirSync as mkdirSync12,
   readFileSync as readFileSync8,
-  writeFileSync as writeFileSync9
+  writeFileSync as writeFileSync10
 } from "node:fs";
-import { homedir as homedir21, platform as platform5 } from "node:os";
-import { dirname as dirname13, join as join33 } from "node:path";
+import { homedir as homedir22, platform as platform5 } from "node:os";
+import { dirname as dirname13, join as join34 } from "node:path";
 function detectTerminalType2() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
     return "cursor";
@@ -110257,16 +110490,16 @@ function getKeybindingsPath2(terminal) {
   }[terminal];
   const os6 = platform5();
   if (os6 === "darwin") {
-    return join33(homedir21(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join34(homedir22(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os6 === "win32") {
     const appData = process.env.APPDATA;
     if (!appData)
       return null;
-    return join33(appData, appName, "User", "keybindings.json");
+    return join34(appData, appName, "User", "keybindings.json");
   }
   if (os6 === "linux") {
-    return join33(homedir21(), ".config", appName, "User", "keybindings.json");
+    return join34(homedir22(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -110288,7 +110521,7 @@ function parseKeybindings2(content) {
   }
 }
 function keybindingExists2(keybindingsPath) {
-  if (!existsSync20(keybindingsPath))
+  if (!existsSync21(keybindingsPath))
     return false;
   try {
     const content = readFileSync8(keybindingsPath, { encoding: "utf-8" });
@@ -110301,7 +110534,7 @@ function keybindingExists2(keybindingsPath) {
   }
 }
 function createBackup2(keybindingsPath) {
-  if (!existsSync20(keybindingsPath))
+  if (!existsSync21(keybindingsPath))
     return null;
   const backupPath = `${keybindingsPath}.letta-backup`;
   try {
@@ -110317,12 +110550,12 @@ function installKeybinding2(keybindingsPath) {
       return { success: true, alreadyExists: true };
     }
     const parentDir = dirname13(keybindingsPath);
-    if (!existsSync20(parentDir)) {
-      mkdirSync11(parentDir, { recursive: true });
+    if (!existsSync21(parentDir)) {
+      mkdirSync12(parentDir, { recursive: true });
     }
     let keybindings = [];
     let backupPath = null;
-    if (existsSync20(keybindingsPath)) {
+    if (existsSync21(keybindingsPath)) {
       backupPath = createBackup2(keybindingsPath);
       const content = readFileSync8(keybindingsPath, { encoding: "utf-8" });
       const parsed = parseKeybindings2(content);
@@ -110337,7 +110570,7 @@ function installKeybinding2(keybindingsPath) {
     keybindings.push(SHIFT_ENTER_KEYBINDING2);
     const newContent = `${JSON.stringify(keybindings, null, 2)}
 `;
-    writeFileSync9(keybindingsPath, newContent, { encoding: "utf-8" });
+    writeFileSync10(keybindingsPath, newContent, { encoding: "utf-8" });
     return {
       success: true,
       backupPath: backupPath ?? undefined
@@ -110352,7 +110585,7 @@ function installKeybinding2(keybindingsPath) {
 }
 function removeKeybinding2(keybindingsPath) {
   try {
-    if (!existsSync20(keybindingsPath)) {
+    if (!existsSync21(keybindingsPath)) {
       return { success: true };
     }
     const content = readFileSync8(keybindingsPath, { encoding: "utf-8" });
@@ -110366,7 +110599,7 @@ function removeKeybinding2(keybindingsPath) {
     const filtered = keybindings.filter((kb) => !(kb.key?.toLowerCase() === "shift+enter" && kb.command === "workbench.action.terminal.sendSequence" && kb.when?.includes("terminalFocus")));
     const newContent = `${JSON.stringify(filtered, null, 2)}
 `;
-    writeFileSync9(keybindingsPath, newContent, { encoding: "utf-8" });
+    writeFileSync10(keybindingsPath, newContent, { encoding: "utf-8" });
     return { success: true };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -110419,17 +110652,17 @@ function getWezTermConfigPath2() {
   }
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig) {
-    const xdgPath = join33(xdgConfig, "wezterm", "wezterm.lua");
-    if (existsSync20(xdgPath))
+    const xdgPath = join34(xdgConfig, "wezterm", "wezterm.lua");
+    if (existsSync21(xdgPath))
       return xdgPath;
   }
-  const configPath = join33(homedir21(), ".config", "wezterm", "wezterm.lua");
-  if (existsSync20(configPath))
+  const configPath = join34(homedir22(), ".config", "wezterm", "wezterm.lua");
+  if (existsSync21(configPath))
     return configPath;
-  return join33(homedir21(), ".wezterm.lua");
+  return join34(homedir22(), ".wezterm.lua");
 }
 function wezTermDeleteFixExists2(configPath) {
-  if (!existsSync20(configPath))
+  if (!existsSync21(configPath))
     return false;
   try {
     const content = readFileSync8(configPath, { encoding: "utf-8" });
@@ -110446,7 +110679,7 @@ function installWezTermDeleteFix2() {
     }
     let content = "";
     let backupPath = null;
-    if (existsSync20(configPath)) {
+    if (existsSync21(configPath)) {
       backupPath = `${configPath}.letta-backup`;
       copyFileSync2(configPath, backupPath);
       content = readFileSync8(configPath, { encoding: "utf-8" });
@@ -110476,10 +110709,10 @@ ${WEZTERM_DELETE_FIX2}
 `;
     }
     const parentDir = dirname13(configPath);
-    if (!existsSync20(parentDir)) {
-      mkdirSync11(parentDir, { recursive: true });
+    if (!existsSync21(parentDir)) {
+      mkdirSync12(parentDir, { recursive: true });
     }
-    writeFileSync9(configPath, content, { encoding: "utf-8" });
+    writeFileSync10(configPath, content, { encoding: "utf-8" });
     return {
       success: true,
       backupPath: backupPath ?? undefined
@@ -110524,10 +110757,10 @@ __export(exports_settings2, {
   loadProjectSettings: () => loadProjectSettings2,
   getSetting: () => getSetting2
 });
-import { homedir as homedir22 } from "node:os";
-import { join as join34 } from "node:path";
+import { homedir as homedir23 } from "node:os";
+import { join as join35 } from "node:path";
 function getSettingsPath2() {
-  return join34(homedir22(), ".letta", "settings.json");
+  return join35(homedir23(), ".letta", "settings.json");
 }
 async function loadSettings2() {
   const settingsPath = getSettingsPath2();
@@ -110564,7 +110797,7 @@ async function getSetting2(key) {
   return settings[key];
 }
 function getProjectSettingsPath2() {
-  return join34(process.cwd(), ".letta", "settings.local.json");
+  return join35(process.cwd(), ".letta", "settings.local.json");
 }
 async function loadProjectSettings2() {
   const settingsPath = getProjectSettingsPath2();
@@ -110582,7 +110815,7 @@ async function loadProjectSettings2() {
 }
 async function saveProjectSettings2(settings) {
   const settingsPath = getProjectSettingsPath2();
-  const dirPath = join34(process.cwd(), ".letta");
+  const dirPath = join35(process.cwd(), ".letta");
   try {
     if (!exists(dirPath)) {
       await mkdir(dirPath, { recursive: true });
@@ -111285,7 +111518,7 @@ function parseRegistryHandle2(handle) {
 }
 async function importAgentFromRegistry2(options) {
   const { tmpdir: tmpdir5 } = await import("node:os");
-  const { join: join35 } = await import("node:path");
+  const { join: join36 } = await import("node:path");
   const { writeFile: writeFile5, unlink } = await import("node:fs/promises");
   const { author, name } = parseRegistryHandle2(options.handle);
   const rawUrl = `https://raw.githubusercontent.com/${AGENT_REGISTRY_OWNER2}/${AGENT_REGISTRY_REPO2}/refs/heads/${AGENT_REGISTRY_BRANCH2}/agents/@${author}/${name}/${name}.af`;
@@ -111297,7 +111530,7 @@ async function importAgentFromRegistry2(options) {
     throw new Error(`Failed to download agent @${author}/${name}: ${response.statusText}`);
   }
   const afContent = await response.text();
-  const tempPath = join35(tmpdir5(), `letta-import-${author}-${name}-${Date.now()}.af`);
+  const tempPath = join36(tmpdir5(), `letta-import-${author}-${name}-${Date.now()}.af`);
   await writeFile5(tempPath, afContent, "utf-8");
   try {
     const result = await importAgentFromFile2({
@@ -111545,23 +111778,23 @@ __export(exports_memoryFilesystem2, {
   MEMORY_FS_MEMORY_DIR: () => MEMORY_FS_MEMORY_DIR2,
   MEMORY_FS_AGENTS_DIR: () => MEMORY_FS_AGENTS_DIR2
 });
-import { existsSync as existsSync21, mkdirSync as mkdirSync12 } from "node:fs";
-import { homedir as homedir23 } from "node:os";
-import { join as join35 } from "node:path";
-function getMemoryFilesystemRoot2(agentId, homeDir = homedir23()) {
-  return join35(homeDir, MEMORY_FS_ROOT2, MEMORY_FS_AGENTS_DIR2, agentId, MEMORY_FS_MEMORY_DIR2);
+import { existsSync as existsSync22, mkdirSync as mkdirSync13 } from "node:fs";
+import { homedir as homedir24 } from "node:os";
+import { join as join36 } from "node:path";
+function getMemoryFilesystemRoot2(agentId, homeDir = homedir24()) {
+  return join36(homeDir, MEMORY_FS_ROOT2, MEMORY_FS_AGENTS_DIR2, agentId, MEMORY_FS_MEMORY_DIR2);
 }
-function getMemorySystemDir2(agentId, homeDir = homedir23()) {
-  return join35(getMemoryFilesystemRoot2(agentId, homeDir), MEMORY_SYSTEM_DIR2);
+function getMemorySystemDir2(agentId, homeDir = homedir24()) {
+  return join36(getMemoryFilesystemRoot2(agentId, homeDir), MEMORY_SYSTEM_DIR2);
 }
-function ensureMemoryFilesystemDirs2(agentId, homeDir = homedir23()) {
+function ensureMemoryFilesystemDirs2(agentId, homeDir = homedir24()) {
   const root = getMemoryFilesystemRoot2(agentId, homeDir);
   const systemDir = getMemorySystemDir2(agentId, homeDir);
-  if (!existsSync21(root)) {
-    mkdirSync12(root, { recursive: true });
+  if (!existsSync22(root)) {
+    mkdirSync13(root, { recursive: true });
   }
-  if (!existsSync21(systemDir)) {
-    mkdirSync12(systemDir, { recursive: true });
+  if (!existsSync22(systemDir)) {
+    mkdirSync13(systemDir, { recursive: true });
   }
 }
 function labelFromRelativePath2(relativePath) {
@@ -111646,6 +111879,21 @@ async function applyMemfsFlags2(agentId, memfsFlag, noMemfsFlag, options) {
   if (isEnabled && (memfsFlag || shouldAutoEnableFromTag)) {
     const { detachMemoryTools: detachMemoryTools2 } = await init_toolset().then(() => exports_toolset);
     await detachMemoryTools2(agentId);
+    const { getClient: getClient3 } = await init_client2().then(() => exports_client);
+    const client = await getClient3();
+    for (const label of ["skills", "loaded_skills"]) {
+      try {
+        const block = await client.agents.blocks.retrieve(label, {
+          agent_id: agentId
+        });
+        if (block) {
+          await client.agents.blocks.detach(block.id, {
+            agent_id: agentId
+          });
+          await client.blocks.delete(block.id);
+        }
+      } catch {}
+    }
   }
   if (noMemfsFlag) {
     const { removeGitMemoryTag: removeGitMemoryTag2 } = await init_memoryGit().then(() => exports_memoryGit);
@@ -111654,7 +111902,7 @@ async function applyMemfsFlags2(agentId, memfsFlag, noMemfsFlag, options) {
   let pullSummary;
   if (isEnabled) {
     const { addGitMemoryTag: addGitMemoryTag2, isGitRepo: isGitRepo2, cloneMemoryRepo: cloneMemoryRepo2, pullMemory: pullMemory2 } = await init_memoryGit().then(() => exports_memoryGit);
-    await addGitMemoryTag2(agentId);
+    await addGitMemoryTag2(agentId, options?.agentTags ? { tags: options.agentTags } : undefined);
     if (!isGitRepo2(agentId)) {
       await cloneMemoryRepo2(agentId);
     } else if (options?.pullOnExistingRepo) {
@@ -112708,6 +112956,18 @@ function isCreditExhaustedError(e, reasons) {
     return false;
   return hasErrorReason(e, "not-enough-credits", reasons);
 }
+function getTierUsageLimitMessage(reasons) {
+  if (reasons.includes("premium-usage-exceeded")) {
+    return `You've reached your Premium model usage limit. Try switching to Standard or Basic hosted models with /model. View your plan and usage at ${LETTA_USAGE_URL}, or connect your own provider keys with /connect.`;
+  }
+  if (reasons.includes("standard-usage-exceeded")) {
+    return `You've reached your Standard model usage limit. Try switching to Basic hosted models with /model. View your plan and usage at ${LETTA_USAGE_URL}, or connect your own provider keys with /connect.`;
+  }
+  if (reasons.includes("basic-usage-exceeded")) {
+    return `You've reached your Basic model usage limit. Try switching models with /model, view your plan and usage at ${LETTA_USAGE_URL}, or connect your own provider keys with /connect.`;
+  }
+  return;
+}
 var ENCRYPTED_CONTENT_HINT = [
   "",
   "This occurs when the conversation contains messages with encrypted",
@@ -112815,9 +113075,9 @@ Delete ${resourceType} at: ${LETTA_AGENTS_URL}`;
     if (isCreditExhaustedError(e, reasons)) {
       return `Your account is out of credits for hosted inference. Add credits, enable auto-recharge, or upgrade at ${LETTA_USAGE_URL}. You can also connect your own provider keys with /connect.`;
     }
-    if (hasErrorReason(e, "premium-usage-exceeded", reasons) || hasErrorReason(e, "standard-usage-exceeded", reasons) || hasErrorReason(e, "basic-usage-exceeded", reasons)) {
-      return `You've reached your hosted model usage limit. View your plan and usage at ${LETTA_USAGE_URL}, or connect your own provider keys with /connect.`;
-    }
+    const tierUsageLimitMsg = getTierUsageLimitMessage(reasons);
+    if (tierUsageLimitMsg)
+      return tierUsageLimitMsg;
     if (hasErrorReason(e, "byok-not-available-on-free-tier", reasons)) {
       const { modelDisplayName } = getErrorContext();
       const modelInfo = modelDisplayName ? ` (${modelDisplayName})` : "";
@@ -113661,7 +113921,7 @@ await __promiseAll([
 var import_react28 = __toESM(require_react(), 1);
 var jsx_dev_runtime8 = __toESM(require_jsx_dev_runtime(), 1);
 function ListenerStatusUI(props) {
-  const { agentId, connectionId, onReady } = props;
+  const { agentId, connectionId, conversationId, onReady } = props;
   const [status, setStatus] = import_react28.useState("idle");
   const [retryInfo, setRetryInfo] = import_react28.useState(null);
   import_react28.useEffect(() => {
@@ -113675,7 +113935,7 @@ function ListenerStatusUI(props) {
       }
     });
   }, [onReady]);
-  const adeUrl = `https://app.letta.com/agents/${agentId}?deviceId=${connectionId}`;
+  const adeUrl = `https://app.letta.com/agents/${agentId}?deviceId=${connectionId}${conversationId ? `&conversationId=${conversationId}` : ""}`;
   const statusText = retryInfo ? `Reconnecting (attempt ${retryInfo.attempt}, retry in ${Math.round(retryInfo.nextRetryIn / 1000)}s)` : status === "receiving" ? "Receiving message" : status === "processing" ? "Processing message" : "Awaiting instructions";
   const showSpinner = status !== "idle" || retryInfo !== null;
   return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
@@ -113735,28 +113995,33 @@ function ListenerStatusUI(props) {
 // src/cli/subcommands/listen.tsx
 var jsx_dev_runtime9 = __toESM(require_jsx_dev_runtime(), 1);
 async function runListenSubcommand(argv) {
+  const processedArgv = argv.map((arg) => arg === "--conv" ? "--conversation" : arg);
   const { values } = parseArgs3({
-    args: argv,
+    args: processedArgv,
     options: {
       name: { type: "string" },
       agent: { type: "string" },
+      conversation: { type: "string", short: "C" },
       help: { type: "boolean", short: "h" }
     },
     allowPositionals: false
   });
   if (values.help) {
-    console.log(`Usage: letta listen --name <connection-name> [--agent <agent-id>]
+    console.log(`Usage: letta listen --name <connection-name> [--agent <agent-id>] [--conversation <id>]
 `);
     console.log(`Register this letta-code instance to receive messages from Letta Cloud.
 `);
     console.log("Options:");
     console.log("  --name <name>      Friendly name for this connection (required)");
     console.log("  --agent <id>       Bind connection to specific agent (required for CLI usage)");
+    console.log("  --conversation <id>, --conv <id>, -C <id>");
+    console.log("                     Route messages to a specific conversation");
     console.log(`  -h, --help         Show this help message
 `);
     console.log("Examples:");
     console.log('  letta listen --name "george" --agent agent-abc123');
-    console.log(`  letta listen --name "laptop-work" --agent agent-xyz789
+    console.log('  letta listen --name "laptop-work" --agent agent-xyz789');
+    console.log(`  letta listen --name "daily-cron" --agent agent-abc123 --conv conv-xyz789
 `);
     console.log("Once connected, this instance will listen for incoming messages from cloud agents.");
     console.log("Messages will be executed locally using your letta-code environment.");
@@ -113764,6 +114029,7 @@ async function runListenSubcommand(argv) {
   }
   const connectionName = values.name;
   const agentId = values.agent;
+  const conversationId = values.conversation;
   if (!connectionName) {
     console.error(`Error: --name is required
 `);
@@ -113802,7 +114068,8 @@ async function runListenSubcommand(argv) {
       body: JSON.stringify({
         deviceId,
         connectionName,
-        agentId
+        agentId,
+        ...conversationId && { conversationId }
       })
     });
     if (!registerResponse.ok) {
@@ -113818,6 +114085,7 @@ async function runListenSubcommand(argv) {
     const { unmount } = render_default(/* @__PURE__ */ jsx_dev_runtime9.jsxDEV(ListenerStatusUI, {
       agentId,
       connectionId,
+      conversationId,
       onReady: (callbacks) => {
         updateStatusCallback = callbacks.updateStatus;
         updateRetryStatusCallback = callbacks.updateRetryStatus;
@@ -113831,6 +114099,7 @@ async function runListenSubcommand(argv) {
       deviceId,
       connectionName,
       agentId,
+      defaultConversationId: conversationId,
       onStatusChange: (status) => {
         clearRetryStatusCallback?.();
         updateStatusCallback?.(status);
@@ -113867,10 +114136,10 @@ async function runListenSubcommand(argv) {
 
 // src/cli/subcommands/memfs.ts
 await init_memoryGit();
-import { cpSync, existsSync as existsSync8, mkdirSync as mkdirSync6, rmSync as rmSync2, statSync as statSync2 } from "node:fs";
+import { cpSync, existsSync as existsSync9, mkdirSync as mkdirSync7, rmSync as rmSync2, statSync as statSync2 } from "node:fs";
 import { readdir as readdir5 } from "node:fs/promises";
-import { homedir as homedir11 } from "node:os";
-import { join as join15 } from "node:path";
+import { homedir as homedir12 } from "node:os";
+import { join as join16 } from "node:path";
 import { parseArgs as parseArgs4 } from "node:util";
 function printUsage3() {
   console.log(`
@@ -113899,10 +114168,10 @@ function getAgentId3(agentFromArgs, agentIdFromArgs) {
   return agentFromArgs || agentIdFromArgs || process.env.LETTA_AGENT_ID || "";
 }
 function getMemoryRoot(agentId) {
-  return join15(homedir11(), ".letta", "agents", agentId, "memory");
+  return join16(homedir12(), ".letta", "agents", agentId, "memory");
 }
 function getAgentRoot(agentId) {
-  return join15(homedir11(), ".letta", "agents", agentId);
+  return join16(homedir12(), ".letta", "agents", agentId);
 }
 function formatBackupTimestamp(date = new Date) {
   const pad = (value) => String(value).padStart(2, "0");
@@ -113916,7 +114185,7 @@ function formatBackupTimestamp(date = new Date) {
 }
 async function listBackups(agentId) {
   const agentRoot = getAgentRoot(agentId);
-  if (!existsSync8(agentRoot)) {
+  if (!existsSync9(agentRoot)) {
     return [];
   }
   const entries = await readdir5(agentRoot, { withFileTypes: true });
@@ -113926,7 +114195,7 @@ async function listBackups(agentId) {
       continue;
     if (!entry.name.startsWith("memory-backup-"))
       continue;
-    const path19 = join15(agentRoot, entry.name);
+    const path19 = join16(agentRoot, entry.name);
     let createdAt = null;
     try {
       const stat2 = statSync2(path19);
@@ -113943,7 +114212,7 @@ function resolveBackupPath(agentId, from) {
   if (from.startsWith("/") || /^[A-Za-z]:[/\\]/.test(from)) {
     return from;
   }
-  return join15(getAgentRoot(agentId), from);
+  return join16(getAgentRoot(agentId), from);
 }
 async function runMemfsSubcommand(argv) {
   let parsed;
@@ -114015,14 +114284,14 @@ async function runMemfsSubcommand(argv) {
     }
     if (action === "backup") {
       const root = getMemoryRoot(agentId);
-      if (!existsSync8(root)) {
+      if (!existsSync9(root)) {
         console.error(`Memory directory not found for agent ${agentId}.`);
         return 1;
       }
       const agentRoot = getAgentRoot(agentId);
       const backupName = `memory-backup-${formatBackupTimestamp()}`;
-      const backupPath = join15(agentRoot, backupName);
-      if (existsSync8(backupPath)) {
+      const backupPath = join16(agentRoot, backupName);
+      if (existsSync9(backupPath)) {
         console.error(`Backup already exists at ${backupPath}`);
         return 1;
       }
@@ -114046,7 +114315,7 @@ async function runMemfsSubcommand(argv) {
         return 1;
       }
       const backupPath = resolveBackupPath(agentId, from);
-      if (!existsSync8(backupPath)) {
+      if (!existsSync9(backupPath)) {
         console.error(`Backup not found: ${backupPath}`);
         return 1;
       }
@@ -114068,11 +114337,11 @@ async function runMemfsSubcommand(argv) {
         return 1;
       }
       const root = getMemoryRoot(agentId);
-      if (!existsSync8(root)) {
+      if (!existsSync9(root)) {
         console.error(`Memory directory not found for agent ${agentId}.`);
         return 1;
       }
-      if (existsSync8(out)) {
+      if (existsSync9(out)) {
         const stat2 = statSync2(out);
         if (stat2.isDirectory()) {
           const contents = await readdir5(out);
@@ -114085,7 +114354,7 @@ async function runMemfsSubcommand(argv) {
           return 1;
         }
       } else {
-        mkdirSync6(out, { recursive: true });
+        mkdirSync7(out, { recursive: true });
       }
       cpSync(root, out, { recursive: true });
       console.log(JSON.stringify({ exportedFrom: root, exportedTo: out, agentId }, null, 2));
@@ -114277,8 +114546,8 @@ async function runSubcommand(argv) {
 
 // src/permissions/mode.ts
 init_readOnlyShell();
-import { homedir as homedir12 } from "node:os";
-import { isAbsolute as isAbsolute14, join as join16, relative as relative3, resolve as resolve19 } from "node:path";
+import { homedir as homedir13 } from "node:os";
+import { isAbsolute as isAbsolute14, join as join17, relative as relative3, resolve as resolve19 } from "node:path";
 var MODE_KEY2 = Symbol.for("@letta/permissionMode");
 var PLAN_FILE_KEY2 = Symbol.for("@letta/planFilePath");
 var MODE_BEFORE_PLAN_KEY2 = Symbol.for("@letta/permissionModeBeforePlan");
@@ -114314,7 +114583,7 @@ function resolvePlanTargetPath2(targetPath, workingDirectory) {
   if (!trimmedPath)
     return null;
   if (trimmedPath.startsWith("~/")) {
-    return resolve19(homedir12(), trimmedPath.slice(2));
+    return resolve19(homedir13(), trimmedPath.slice(2));
   }
   if (isAbsolute14(trimmedPath)) {
     return resolve19(trimmedPath);
@@ -114440,7 +114709,7 @@ class PermissionModeManager2 {
           return "allow";
         }
         if (writeTools.includes(toolName)) {
-          const plansDir = join16(homedir12(), ".letta", "plans");
+          const plansDir = join17(homedir13(), ".letta", "plans");
           const targetPath = toolArgs?.file_path || toolArgs?.path;
           let candidatePaths = [];
           if ((toolName === "ApplyPatch" || toolName === "apply_patch") && toolArgs?.input) {
@@ -114510,8 +114779,8 @@ var permissionMode2 = new PermissionModeManager2;
 init_debug();
 init_fs();
 await init_secrets();
-import { homedir as homedir13 } from "node:os";
-import { join as join17 } from "node:path";
+import { homedir as homedir14 } from "node:os";
+import { join as join18 } from "node:path";
 var DEFAULT_SETTINGS2 = {
   lastAgent: null,
   tokenStreaming: false,
@@ -114843,8 +115112,8 @@ class SettingsManager2 {
     if (!this.settings)
       return;
     const settingsPath = this.getSettingsPath();
-    const home = process.env.HOME || homedir13();
-    const dirPath = join17(home, ".letta");
+    const home = process.env.HOME || homedir14();
+    const dirPath = join18(home, ".letta");
     try {
       if (!exists(dirPath)) {
         await mkdir(dirPath, { recursive: true });
@@ -114876,7 +115145,7 @@ class SettingsManager2 {
     if (!settings)
       return;
     const settingsPath = this.getProjectSettingsPath(workingDirectory);
-    const dirPath = join17(workingDirectory, ".letta");
+    const dirPath = join18(workingDirectory, ".letta");
     try {
       let existingSettings = {};
       if (exists(settingsPath)) {
@@ -114897,14 +115166,14 @@ class SettingsManager2 {
     }
   }
   getSettingsPath() {
-    const home = process.env.HOME || homedir13();
-    return join17(home, ".letta", "settings.json");
+    const home = process.env.HOME || homedir14();
+    return join18(home, ".letta", "settings.json");
   }
   getProjectSettingsPath(workingDirectory) {
-    return join17(workingDirectory, ".letta", "settings.json");
+    return join18(workingDirectory, ".letta", "settings.json");
   }
   getLocalProjectSettingsPath(workingDirectory) {
-    return join17(workingDirectory, ".letta", "settings.local.json");
+    return join18(workingDirectory, ".letta", "settings.local.json");
   }
   async loadLocalProjectSettings(workingDirectory = process.cwd()) {
     const cached = this.localProjectSettings.get(workingDirectory);
@@ -114955,7 +115224,7 @@ class SettingsManager2 {
     if (!settings)
       return;
     const settingsPath = this.getLocalProjectSettingsPath(workingDirectory);
-    const dirPath = join17(workingDirectory, ".letta");
+    const dirPath = join18(workingDirectory, ".letta");
     try {
       if (!exists(dirPath)) {
         await mkdir(dirPath, { recursive: true });
@@ -115270,7 +115539,7 @@ class SettingsManager2 {
     this.upsertAgentSettings(agentId, { toolset: preference });
   }
   hasLocalLettaDir(workingDirectory = process.cwd()) {
-    const dirPath = join17(workingDirectory, ".letta");
+    const dirPath = join18(workingDirectory, ".letta");
     return exists(dirPath);
   }
   storeOAuthState(state, codeVerifier, redirectUri, provider) {
@@ -115973,12 +116242,12 @@ EXAMPLES
   console.log(usage);
 }
 async function printInfo() {
-  const { join: join36 } = await import("path");
+  const { join: join37 } = await import("path");
   const { getVersion: getVersion3 } = await Promise.resolve().then(() => (init_version2(), exports_version));
   const { SKILLS_DIR: SKILLS_DIR3 } = await Promise.resolve().then(() => (init_skills2(), exports_skills2));
   const { exists: exists3 } = await Promise.resolve().then(() => (init_fs2(), exports_fs));
   const cwd2 = process.cwd();
-  const skillsDir = join36(cwd2, SKILLS_DIR3);
+  const skillsDir = join37(cwd2, SKILLS_DIR3);
   const skillsExist = exists3(skillsDir);
   await settingsManager2.loadLocalProjectSettings(cwd2);
   const localPinned = settingsManager2.getLocalPinnedAgents(cwd2);
@@ -116422,9 +116691,9 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
       }
     } else {
       const { resolve: resolve26 } = await import("path");
-      const { existsSync: existsSync22 } = await import("fs");
+      const { existsSync: existsSync23 } = await import("fs");
       const resolvedPath = resolve26(fromAfFile);
-      if (!existsSync22(resolvedPath)) {
+      if (!existsSync23(resolvedPath)) {
         console.error(`Error: AgentFile not found: ${resolvedPath}`);
         process.exit(1);
       }
@@ -116584,6 +116853,7 @@ Error: ${message}`);
     const [resumedExistingConversation, setResumedExistingConversation] = useState50(false);
     const [agentProvenance, setAgentProvenance] = useState50(null);
     const [selectedGlobalAgentId, setSelectedGlobalAgentId] = useState50(null);
+    const [validatedAgent, setValidatedAgent] = useState50(null);
     const [resumeAgentId, setResumeAgentId] = useState50(null);
     const [resumeAgentName, setResumeAgentName] = useState50(null);
     const [selectedConversationId, setSelectedConversationId] = useState50(null);
@@ -116775,9 +117045,10 @@ Error: ${message}`);
         }
         const localAgentId = settingsManager2.getLocalLastAgentId(process.cwd());
         let localAgentExists = false;
+        let cachedAgent = null;
         if (localAgentId) {
           try {
-            await client.agents.retrieve(localAgentId);
+            cachedAgent = await client.agents.retrieve(localAgentId);
             localAgentExists = true;
           } catch {
             setFailedAgentMessage(`Unable to locate recently used agent ${localAgentId}`);
@@ -116787,7 +117058,7 @@ Error: ${message}`);
         let globalAgentExists = false;
         if (globalAgentId && globalAgentId !== localAgentId) {
           try {
-            await client.agents.retrieve(globalAgentId);
+            cachedAgent = await client.agents.retrieve(globalAgentId);
             globalAgentExists = true;
           } catch {}
         } else if (globalAgentId && globalAgentId === localAgentId) {
@@ -116808,6 +117079,9 @@ Error: ${message}`);
         switch (target.action) {
           case "resume":
             setSelectedGlobalAgentId(target.agentId);
+            if (cachedAgent && cachedAgent.id === target.agentId) {
+              setValidatedAgent(cachedAgent);
+            }
             setLoadingState("assembling");
             return;
           case "select":
@@ -116987,7 +117261,7 @@ Error: ${message}`);
         }
         if (!agent && resumingAgentId) {
           try {
-            agent = await client.agents.retrieve(resumingAgentId);
+            agent = validatedAgent && validatedAgent.id === resumingAgentId ? validatedAgent : await client.agents.retrieve(resumingAgentId);
           } catch (error) {
             console.error(`Agent ${resumingAgentId} not found (error: ${JSON.stringify(error)})`);
             setLoadingState("selecting_global");
@@ -117014,30 +117288,13 @@ Error: ${message}`);
         }
         settingsManager2.updateLocalProjectSettings({ lastAgent: agent.id });
         settingsManager2.updateSettings({ lastAgent: agent.id });
-        for (const label of ["skills", "loaded_skills"]) {
-          try {
-            const block = await client.agents.blocks.retrieve(label, {
-              agent_id: agent.id
-            });
-            if (block) {
-              await client.agents.blocks.detach(block.id, {
-                agent_id: agent.id
-              });
-              await client.blocks.delete(block.id);
-            }
-          } catch {}
-        }
         setAgentContext(agent.id, skillsDirectory2, resolvedSkillSources);
         const isSubagent = process.env.LETTA_CODE_AGENT_ROLE === "subagent";
-        try {
-          const { applyMemfsFlags: applyMemfsFlags3 } = await Promise.resolve().then(() => (init_memoryFilesystem2(), exports_memoryFilesystem2));
-          await applyMemfsFlags3(agent.id, memfsFlag, noMemfsFlag, {
-            agentTags: agent.tags
-          });
-        } catch (error) {
-          console.error(error instanceof Error ? error.message : String(error));
-          process.exit(1);
-        }
+        const agentId2 = agent.id;
+        const agentTags = agent.tags ?? undefined;
+        const memfsSyncPromise = Promise.resolve().then(() => (init_memoryFilesystem2(), exports_memoryFilesystem2)).then(({ applyMemfsFlags: applyMemfsFlags3 }) => applyMemfsFlags3(agentId2, memfsFlag, noMemfsFlag, {
+          agentTags
+        }));
         const isResumingProject = !shouldCreateNew && !!resumingAgentId;
         const isReusingExistingAgent = !shouldCreateNew && !fromAfFile2 && agent && agent.id;
         const resuming = !!(continueSession || agentIdArg || isResumingProject || isReusingExistingAgent);
@@ -117076,8 +117333,7 @@ Error: ${message}`);
           setResumedExistingConversation(true);
           try {
             setLoadingState("checking");
-            const freshAgent = await client.agents.retrieve(agent.id);
-            const data = await getResumeData(client, freshAgent, specifiedConversationId);
+            const data = await getResumeData(client, agent, specifiedConversationId);
             setResumeData(data);
           } catch (error) {
             if (error instanceof APIError && (error.status === 404 || error.status === 422)) {
@@ -117096,8 +117352,7 @@ Error: ${message}`);
           if (lastSession && lastSession.agentId === agent.id) {
             try {
               setLoadingState("checking");
-              const freshAgent = await client.agents.retrieve(agent.id);
-              const data = await getResumeData(client, freshAgent, lastSession.conversationId);
+              const data = await getResumeData(client, agent, lastSession.conversationId);
               conversationIdToUse = lastSession.conversationId;
               setResumedExistingConversation(true);
               setResumeData(data);
@@ -117118,8 +117373,7 @@ Error: ${message}`);
         } else if (selectedConversationId) {
           try {
             setLoadingState("checking");
-            const freshAgent = await client.agents.retrieve(agent.id);
-            const data = await getResumeData(client, freshAgent, selectedConversationId);
+            const data = await getResumeData(client, agent, selectedConversationId);
             conversationIdToUse = selectedConversationId;
             setResumedExistingConversation(true);
             setResumeData(data);
@@ -117139,11 +117393,22 @@ Error: ${message}`);
         } else {
           conversationIdToUse = "default";
           setLoadingState("checking");
-          const freshAgent = await client.agents.retrieve(agent.id);
-          const data = await getResumeData(client, freshAgent, "default");
+          const [data] = await Promise.all([
+            getResumeData(client, agent, "default"),
+            memfsSyncPromise.catch((error) => {
+              console.error(error instanceof Error ? error.message : String(error));
+              process.exit(1);
+            })
+          ]);
           setResumeData(data);
           setResumedExistingConversation(true);
         }
+        try {
+          await memfsSyncPromise;
+        } catch (error) {
+          console.error(error instanceof Error ? error.message : String(error));
+          process.exit(1);
+        }
         if (!isSubagent) {
           settingsManager2.setLocalLastSession({ agentId: agent.id, conversationId: conversationIdToUse }, process.cwd());
           settingsManager2.setGlobalLastSession({
@@ -117176,6 +117441,7 @@ Error during initialization: ${message}`);
       fromAfFile2,
       loadingState,
       selectedGlobalAgentId,
+      validatedAgent,
       shouldContinue,
       resumeAgentId,
       selectedConversationId
@@ -117291,4 +117557,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=1F9D861A997C578E64756E2164756E21
+//# debugId=B0F648D57141B93564756E2164756E21