@letta-ai/letta-code 0.21.9 → 0.21.11

package/letta.js

@@ -3269,7 +3269,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.21.9",
+    version: "0.21.11",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -3535,6 +3535,7 @@ var init_secrets = __esm(async () => {
 // src/settings-manager.ts
 var exports_settings_manager = {};
 __export(exports_settings_manager, {
+  shouldPersistSessionState: () => shouldPersistSessionState,
   settingsManager: () => settingsManager
 });
 import { randomUUID } from "node:crypto";
@@ -3543,6 +3544,9 @@ import { join as join2, resolve } from "node:path";
 function isSubagentProcess() {
   return process.env.LETTA_CODE_AGENT_ROLE === "subagent";
 }
+function shouldPersistSessionState() {
+  return process.env.LETTA_CODE_AGENT_ROLE !== "subagent" && process.env.LETTA_DISABLE_SESSION_PERSIST !== "1";
+}
 function normalizeBaseUrl(baseUrl) {
   let normalized = baseUrl.replace(/^https?:\/\//, "");
   normalized = normalized.replace(/\/$/, "");
@@ -5484,7 +5488,6 @@ var init_memory_check_reminder = () => {};
 var memory_filesystem_default = `---
 label: memory_filesystem
 description: Filesystem view of memory blocks (system + user)
-limit: 8000
 ---
 
 /memory/
@@ -6577,7 +6580,7 @@ When applying memory in responses, integrate it naturally — like a colleague w
 var init_system_prompt_blocks = () => {};
 
 // src/agent/prompts/system_prompt_memfs.md
-var system_prompt_memfs_default = "# Memory\n\nYour memory is stored in a git repository at `$MEMORY_DIR` (absolute path provided by Letta Code shell tools; usually `~/.letta/agents/$AGENT_ID/memory/`). This provides full version control, sync with the server, and worktrees for parallel edits. All memory files are markdown with YAML frontmatter (`description`, `limit`, optional `metadata`). The `description` field enables progressive disclosure — like skills, you see descriptions in your prompt and load full contents on demand; `limit` caps file size to keep system memory lean.\n\n## Memory layout\n\n**System memory** (`memory/system/`): Every `.md` file here is pinned directly into your system prompt — you see it at all times. This is your most valuable real estate: reserve it for durable knowledge that helps across sessions (user identity, persona, project architecture, conventions, gotchas). Do NOT store transient items here like specific commits, current work items, or session-specific notes — those dilute the signal.\n\n**Progressive memory**: Files outside `system/` are stored but not pinned in-context. Access them with standard file tools when you need deeper reference material — good for large notes, historical records, transient work tracking, or data that doesn't need to be always-visible.\n\n**Recall** (conversation history): Your full message history is searchable even after messages leave your context window. Use the recall subagent to retrieve past discussions, decisions, and context from earlier sessions.\n\n## How files map to your prompt\n\n1. Each `.md` file in `memory/system/` is pinned to your system prompt with tags <system/context/{name}.md></system/context/{name}.md>\n2. The `memory_filesystem` block renders the current tree view of all available memory files\n3. The system prompt is only recompiled on compactions or message resets — your local edits take effect on the next recompilation\n\n## Syncing\n\nChanges you commit and push sync to the Letta server within seconds, and server-side changes sync back automatically.\n\n```bash\ncd \"$MEMORY_DIR\"\n\n# See what changed\ngit status\n\n# Commit and push your changes\ngit add .\ngit commit -m \"<type>: <what changed>\"  # e.g. \"fix: update user prefs\", \"refactor: reorganize persona blocks\"\ngit push\n\n# Get latest from server\ngit pull\n```\nThe system will remind you when your memory has uncommitted changes. Sync when convenient.\n\n## History\n```bash\ngit -C \"$MEMORY_DIR\" log --oneline\n```\n";
+var system_prompt_memfs_default = "# Memory\n\nYour memory is projected onto the local memory filesystem (MemFS) at `$MEMORY_DIR` (usually `~/.letta/agents/$AGENT_ID/memory/`), including your memory blocks (in-context in the system prompt) and external memory. This projection makes it easy for you to modify your own context with filesystem operations which also include git tracking. Local changes are only propagated to your actual state on a successful push to remote, and the system prompt is only recompiled on compactions or new conversations (so may be stale). \n\n## Memory structure\nYou are responsible to maintaining a clear memory structure. All memory files are markdown with YAML frontmatter (`description`, optional `metadata`).\n\n**In-context memory** (`system/`): Memory files in `system/` correspond to memory blocks, which are pinned directly into your system prompt — visible at all times. This is your most valuable real estate: reserve it for durable knowledge that helps across sessions (user identity, persona, project architecture, conventions, gotchas). Do NOT store transient items here like specific commits, current work items, or session-specific notes — those dilute the signal.\n\n**External memory**: Files outside `system/` follow progressive disclosure — an index of files and descriptions is kept in the system prompt, but full contents must be retrieved on demand (e.g. by reading the file). Skills are a special type of external memory stored in the `skills/` folder. Use `[[path]]` to index files from memory blocks, or create discovery paths between related context (e.g. `[[reference/project/architecture.md]]` or `[[skills/using-slack/SKILL.md]]`).\n\n**Recall** (conversation history): Your full message history is searchable even after messages leave your context window. Use the recall subagent to retrieve past discussions, decisions, and context from earlier sessions.\n\n## Syncing\n\nChanges you commit and push sync to the Letta server within seconds, and server-side changes sync back automatically.\n\n```bash\ncd \"$MEMORY_DIR\"\n\n# See what changed\ngit status\n\n# Commit and push your changes\ngit add .\ngit commit --author=\"$AGENT_NAME <$AGENT_ID@letta.com>\" -m \"<type>: <what changed>\"  # e.g. \"fix: update user prefs\", \"refactor: reorganize persona blocks\"\ngit push\n\n# Get latest from server\ngit pull\n```\nThe system will remind you when your memory has uncommitted changes. Sync when convenient.\n\n## History\n```bash\ngit -C \"$MEMORY_DIR\" log --oneline\n```\n";
 var init_system_prompt_memfs = () => {};
 
 // src/utils/error.ts
@@ -6708,12 +6711,6 @@ async function loadMemoryBlocksFromMdx() {
       if (frontmatter.description) {
         block.description = frontmatter.description;
       }
-      if (frontmatter.limit) {
-        const limit2 = parseInt(frontmatter.limit, 10);
-        if (!Number.isNaN(limit2) && limit2 > 0) {
-          block.limit = limit2;
-        }
-      }
       if (READ_ONLY_BLOCK_LABELS.includes(label)) {
         block.read_only = true;
       }
@@ -6840,7 +6837,7 @@ var history_analyzer_default = `---
 name: history-analyzer
 description: Analyze Claude Code or Codex conversation history and directly update agent memory files with insights
 tools: Read, Write, Bash, Glob, Grep
-skills: migrating-from-codex-and-claude-code
+skills:
 model: auto
 memoryBlocks: none
 mode: stateless
@@ -6858,19 +6855,64 @@ Your memory files form the parent agent's identity and knowledge. Follow these p
 - **Generalize, don't memorize**: Distill patterns from repeated observations. "Always use uv, never pip (corrected 10+ times)" is valuable; a single offhand mention is not. Look for signal through repetition.
 - **System/ is the core program**: Only durable, generalizable knowledge belongs in \`system/\`. Distilled preferences, behavioral rules, project gotchas, conventions enforced through corrections. Evidence trails, raw session summaries, and verbose context go outside \`system/\`.
 - **Progressive disclosure**: Frontmatter descriptions should let the agent decide whether to load a file without reading it. Summaries and principles in \`system/\`; detail and evidence outside it, linked with \`[[path]]\`.
-- **Identity continuity**: Treat this history as the agent's own past — not someone else's sessions. Findings should read as learned knowledge, not "analysis of external data."
+- **Identity continuity**: This history IS the agent's past. These are memories of working with this user — you're reconstructing lived experience, not analyzing external data. Write findings as learned knowledge ("I've seen Sarah correct this 10+ times"), not research summaries ("The user appears to prefer...").
 - **Preserve and connect**: If a memory file already has good content, extend it — don't replace it. Use \`[[path]]\` links to connect new findings to existing memory.
+- **Promote findings into canonical memory**: Don't leave durable insights trapped in generic ingestion files if they can be promoted into focused memory like \`system/human/identity.md\`, \`system/human/prefs/workflow.md\`, or \`system/<project>/gotchas.md\`.
 
 ## Goal
 
-Distill actionable knowledge from conversation history into well-organized memory. Focus on:
+Distill actionable knowledge from conversation history into well-organized memory. You MUST produce findings in all three categories below — missing any category is a failure.
+
+This is not a request for a thin recap. Your output should be detailed enough that the parent agent can use it in future sessions without rereading the history chunk.
+
+### Required Output Categories
+
+You MUST extract and document all three:
+
+**1. User Personality & Identity** (REQUIRED)
+- How would you describe them as a person? (e.g., "pragmatic builder who values shipping over perfection")
+- What drives them? What are their goals? (e.g., "building tools that reduce friction for developers")
+- Communication style beyond just "direct" — do they joke? Use sarcasm? Have catchphrases?
+- Quirks, linguistic patterns, unique attributes
+- Pattern-match to common personas if applicable (e.g., "scrappy startup engineer", "meticulous architect")
+
+**2. Hard Rules & Preferences** (REQUIRED)
+- Coding preferences with enforcement evidence (e.g., "Use uv — corrected 10+ times")
+- Workflow patterns (testing habits, commit style, tool choices)
+- What frustrates them and why
+- Explicit "always/never" statements
+
+**3. Project Context** (REQUIRED)
+- Codebase structures, conventions, patterns
+- Gotchas discovered through debugging
+- Which files are safe to edit vs deprecated
+- Environment quirks
+
+If you cannot extract meaningful findings for ANY category, explicitly state why (e.g., "Insufficient data for personality analysis — only 5 prompts, all about a single bug fix").
+
+### Quality Bar
+
+When sufficient data exists, aim to extract at least:
+- **5+ durable findings** for user personality / identity
+- **8+ durable findings** for hard rules / preferences
+- **8+ durable findings** for project context
+
+If you produce materially fewer findings in a category, explain why the chunk truly lacked signal.
+
+Avoid low-value summaries like:
+- "User is direct"
+- "Project uses TypeScript"
+- "Uses conventional commits"
+
+These are insufficient unless paired with concrete operational detail, enforcement patterns, or repo-specific implications.
+
+### What NOT to Store
+One-off events, session-by-session summaries, anything that can be retrieved from conversation history on demand.
 
-- **Preferences enforced through corrections**: What the user repeatedly corrects their AI assistant about — these are gold. They reveal what the user actually cares about vs. what's merely documented.
-- **Project gotchas**: Footguns, fragile areas, and non-obvious constraints discovered through debugging sessions and errors.
-- **Working patterns**: How the user works — debugging style, testing habits, tools they reach for, communication style.
-- **Conventions actually used**: Not just what's in a README, but what's enforced through practice.
+### What TO Preserve
+Focus on understanding **why** the user reacted the way they did — what mistake or behavior triggered the correction? The pattern matters more than the quote. For example, don't just record "user said stop adding stuff" — record that the agent was over-engineering by adding abstractions when a simple flag change was needed. Quotes can serve as supporting evidence, but the real value is the behavioral pattern and what to do differently.
 
-**What NOT to store**: Raw quotes, one-off events, session-by-session summaries, anything that can be retrieved from conversation history on demand.
+Keep specific correction counts ("corrected 10+ times"), specific file paths, and specific gotchas with context. Specificity is identity; vague summaries are forgettable.
 
 ## Workflow
 
@@ -6888,12 +6930,29 @@ git worktree add "$WORKTREE_DIR/$BRANCH_NAME" -b "$BRANCH_NAME"
 If worktree creation fails (locked index), retry up to 3 times with backoff (sleep 2, 5, 10). Never delete \`.git/index.lock\` manually. All edits go in \`$WORKTREE_DIR/$BRANCH_NAME/\`.
 
 ### 2. Read existing memory
-
-Read all files in your worktree's \`system/\` directory. Understand what's already there so you can extend it, not duplicate it.
+Read the memory files in your worktree, to understand what already exists in the memory filesystem.
 
 ### 3. Read and analyze history
 
-Use the \`migrating-from-codex-and-claude-code\` skill for data access patterns. Filter to your assigned chunk.
+Your prompt will specify a pre-split JSONL chunk file and its source format. Use these patterns to read it:
+
+**Claude Code** (\`~/.claude/\`):
+- \`history.jsonl\` — each line: \`.display\` (prompt text), \`.timestamp\` (unix ms), \`.project\` (working dir), \`.sessionId\`
+- Session files at \`~/.claude/projects/<encoded-path>/<session-uuid>.jsonl\` (path encoding: \`/\` → \`-\`)
+  - User messages: \`jq 'select(.type == "user") | .message.content'\`
+  - Assistant text: \`jq 'select(.type == "assistant") | .message.content[] | select(.type == "text") | .text'\`
+  - Tool calls: \`jq 'select(.type == "assistant") | .message.content[] | select(.type == "tool_use") | {name, input}'\`
+  - Summaries: \`jq 'select(.type == "summary") | .summary'\`
+
+**OpenAI Codex** (\`~/.codex/\`):
+- \`history.jsonl\` — each line: \`.text\` (prompt text), \`.ts\` (unix seconds) — no project path
+- Session files at \`~/.codex/sessions/<year>/<month>/<day>/rollout-*.jsonl\`
+  - Session metadata (first line): \`jq 'select(.type == "session_meta") | .payload.cwd'\` (to get project dir)
+  - User messages: \`jq 'select(.type == "event_msg" and .payload.type == "user_message") | .payload.message'\`
+  - Assistant text: \`jq 'select(.type == "response_item" and .payload.type == "message") | .payload.content[] | select(.type == "output_text") | .text'\`
+  - Tool calls: \`jq 'select(.type == "response_item" and .payload.type == "function_call") | {name: .payload.name, args: .payload.arguments}'\`
+
+**Key format difference**: Claude uses \`.timestamp\` (milliseconds) and \`.display\`; Codex uses \`.ts\` (seconds) and \`.text\`.
 
 Look for **repeated patterns**, not isolated events:
 - Count correction frequency — 10 corrections on the same topic >> 1 mention
@@ -6901,38 +6960,70 @@ Look for **repeated patterns**, not isolated events:
 - Implicit preferences revealed by what commands they run, what patterns they follow
 - Frustration signals — "no", "undo", rapid corrections, /clear, model switches
 
+**For personality analysis**, look beyond the reaction to what caused it:
+- What agent behaviors triggered corrections? (over-engineering, wrong tool, verbose explanations, etc.)
+- What agent behaviors got positive responses? (fast fixes, running tests unprompted, etc.)
+- How do they phrase requests? (imperative, collaborative, questioning?)
+- What topics excite them vs bore them?
+- What's their tolerance for explanation vs "just fix it"?
+- How do they handle mistakes — their own and the agent's?
+
 ### 4. Update memory files
 
 **Content placement:**
 - \`system/\`: Generalized rules, distilled preferences, project gotchas, identity. Keep files lean — bullets, short lines, scannable.
 - Outside \`system/\`: Evidence, detailed history, verbose context. Link from system/ with \`[[path]]\`.
 
+**Preferred canonical paths:**
+- \`system/human/identity.md\`
+- \`system/human/prefs/communication.md\`
+- \`system/human/prefs/workflow.md\`
+- \`system/human/prefs/coding.md\`
+- \`system/<project>/conventions.md\`
+- \`system/<project>/gotchas.md\`
+
+If the current memory uses a more compressed layout, extend it carefully, but prefer splitting into these focused files when there is enough material to justify the move.
+
 **File structure:**
 - Use the project's **real name** as directory prefix (e.g. \`my-app/conventions.md\`), not generic \`project/\`
 - One concept per file, nested with \`/\` paths
 - Every file needs a meaningful \`description\` in frontmatter
 - Write for the agent's future self — clean, actionable, no clutter
 
+Each durable finding should include at least one of:
+- correction frequency or intensity
+- concrete commands that worked or failed
+- concrete file or directory paths
+- date range or source reference for future lookup
+- why the rule matters in practice
+
 You can also cite the files if you want to note where something came from (e.g. \`(from: ~/.claude/history.jsonl)\`).
 
 ### 5. Commit
 
+Before writing the commit, resolve the actual ID values:
+\`\`\`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. Never write a literal variable name like \`$LETTA_AGENT_ID\` or \`$AGENT_ID\` in the commit message.
+
 \`\`\`bash
 cd $WORKTREE_DIR/$BRANCH_NAME
 git add -A
-git commit -m "<type>(history-analyzer): [summary] ⏳
+git commit --author="History Analyzer <<ACTUAL_AGENT_ID>@letta.com>" -m "<type>(history-analyzer): <summary> ⏳
 
 Source: [file path] ([N] prompts, [DATE RANGE])
-Key updates:
-- [file]: [what was added/changed]
+
+Updates:
+- <what changed and why>
 
 Generated-By: Letta Code
 Agent-ID: <ACTUAL_AGENT_ID>
 Parent-Agent-ID: <ACTUAL_PARENT_AGENT_ID>"
 \`\`\`
 
-Resolve \`ACTUAL_AGENT_ID\` and \`ACTUAL_PARENT_AGENT_ID\` by running \`echo $LETTA_AGENT_ID\` and \`echo $LETTA_PARENT_AGENT_ID\` first. Never write literal variable names in the commit message. Omit trailers if the variable is empty.
-
 **Commit types**: \`chore\` (routine ingestion), \`feat\` (new memory topics), \`refactor\` (reorganizing by domain).
 
 ## Rules
@@ -6940,7 +7031,8 @@ Resolve \`ACTUAL_AGENT_ID\` and \`ACTUAL_PARENT_AGENT_ID\` by running \`echo $LE
 - Work in your worktree — do NOT edit the memory dir directly
 - Do NOT merge into main — the parent agent handles merging
 - Preserve existing content — extend or refine, don't replace
-- Quality over quantity — fewer distilled insights beat many raw observations
+- Preserve specificity — specific quotes, correction counts, and file paths are more valuable than vague summaries. Don't compress away the details that give the parent agent its character and grounding.
+- **REQUIRED**: You MUST produce findings for all three output categories (Personality, Rules, Project). If any category lacks data, explicitly state why.
 `;
 var init_history_analyzer = () => {};
 
@@ -53756,7 +53848,7 @@ If a directory has more than 1,000 entries, only the first 1,000 will be shown.`
 var init_LS = () => {};
 
 // src/tools/descriptions/Memory.md
-var Memory_default = '# Memory\nA convinience tool for memories stored in the memory directory (`$MEMORY_DIR`) that automatically commits and pushes changes. \n\nFiles stored inside of `system/` eventually become part of the agent\'s system prompt, so are always in the context window and do not need to be re-read. Other files only have metadata in the system prompt, so may need to be explicitly read to be updated. \n\nSupported operations on memory files:  \n- `str_replace`\n- `insert`\n- `delete` (files, or directories recursively)\n- `rename` (path rename only)\n- `update_description`\n- `create`\nMore general operations can be performanced through directory modifying the files. \n\nPath formats accepted:\n- relative memory file paths (e.g. `system/contacts.md`, `reference/project/team.md`)\n- absolute paths only when they are inside `$MEMORY_DIR`\n\nNote: absolute paths outside `$MEMORY_DIR` are rejected.\n\nExamples:\n\n```python\n# Replace text in a memory file \nmemory(command="str_replace", reason="Update theme preference", path="system/human/preferences.md", old_string="theme: dark", new_string="theme: light")\n\n# Insert text at line 5\nmemory(command="insert", reason="Add note about meeting", path="reference/history/meeting-notes.md", insert_line=5, insert_text="New note here")\n\n# Delete a memory file \nmemory(command="delete", reason="Remove stale notes", path="reference/history/old_notes.md")\n\n# Rename a memory file \nmemory(command="rename", reason="Promote temp notes", old_path="reference/history/temp.md", new_path="reference/history/permanent.md")\n\n# Update a block description\nmemory(command="update_description", reason="Clarify coding prefs block", path="system/human/prefs/coding.md", description="Dr. Wooders\' coding preferences.")\n\n# Create a block with starting text\nmemory(command="create", reason="Track coding preferences", path="system/human/prefs/coding.md", description="The user\'s coding preferences.", file_text="The user seems to add type hints to all of their Python code.")\n\n# Create an empty block\nmemory(command="create", reason="Create coding preferences block", path="reference/history/coding_preferences.md", description="The user\'s coding preferences.")\n```\n';
+var Memory_default = "# Memory\nA convinience tool for memories stored in the memory directory (`$MEMORY_DIR`) that automatically commits and pushes changes. \n\nFiles stored inside of `system/` eventually become part of the agent's system prompt, so are always in the context window and do not need to be re-read. Other files only have metadata in the system prompt, so may need to be explicitly read to be updated. \n\nSupported operations on memory files:  \n- `str_replace`\n- `insert`\n- `delete` (files, or directories recursively)\n- `rename` (path rename only)\n- `update_description`\n- `create`\nMore general operations can be performanced through directory modifying the files. \n\nPath formats accepted:\n- relative memory file paths (e.g. `system/contacts.md`, `reference/project/team.md`)\n- absolute paths only when they are inside `$MEMORY_DIR`\n\nNote: absolute paths outside `$MEMORY_DIR` are rejected.\n\nWhen creating or deleting files, check for `[[path]]` references in other memory files that may need to be added or updated. Keeping references consistent ensures future discoverability.\n\nExamples:\n\n```python\n# Replace text in a memory file \nmemory(command=\"str_replace\", reason=\"Update theme preference\", path=\"system/human/preferences.md\", old_string=\"theme: dark\", new_string=\"theme: light\")\n\n# Insert text at line 5\nmemory(command=\"insert\", reason=\"Add note about meeting\", path=\"reference/history/meeting-notes.md\", insert_line=5, insert_text=\"New note here\")\n\n# Delete a memory file \nmemory(command=\"delete\", reason=\"Remove stale notes\", path=\"reference/history/old_notes.md\")\n\n# Rename a memory file \nmemory(command=\"rename\", reason=\"Promote temp notes\", old_path=\"reference/history/temp.md\", new_path=\"reference/history/permanent.md\")\n\n# Update a block description\nmemory(command=\"update_description\", reason=\"Clarify coding prefs block\", path=\"system/human/prefs/coding.md\", description=\"Dr. Wooders' coding preferences.\")\n\n# Create a block with starting text\nmemory(command=\"create\", reason=\"Track coding preferences\", path=\"system/human/prefs/coding.md\", description=\"The user's coding preferences.\", file_text=\"The user seems to add type hints to all of their Python code.\")\n\n# Create an empty block\nmemory(command=\"create\", reason=\"Create coding preferences block\", path=\"reference/history/coding_preferences.md\", description=\"The user's coding preferences.\")\n```\n";
 var init_Memory = () => {};
 
 // src/tools/descriptions/MemoryApplyPatch.md
@@ -65799,6 +65891,9 @@ function parseResultFromStdout(stdout, agentId) {
     };
   }
 }
+function resolveSubagentWorkingDirectory(env3 = process.env, fallbackCwd = process.cwd()) {
+  return env3.USER_CWD || fallbackCwd;
+}
 function resolveSubagentLauncher(cliArgs, options = {}) {
   const env3 = options.env ?? process.env;
   const argv = options.argv ?? process.argv;
@@ -65913,8 +66008,9 @@ async function executeSubagent(type, config, model, userPrompt, baseURL, subagen
     const settings = await settingsManager.getSettingsWithSecureTokens();
     const inheritedApiKey = process.env.LETTA_API_KEY || settings.env?.LETTA_API_KEY;
     const inheritedBaseUrl = process.env.LETTA_BASE_URL || settings.env?.LETTA_BASE_URL;
+    const subagentWorkingDirectory = resolveSubagentWorkingDirectory();
     const proc2 = spawn4(launcher.command, launcher.args, {
-      cwd: process.cwd(),
+      cwd: subagentWorkingDirectory,
       env: {
         ...process.env,
         ...inheritedApiKey && { LETTA_API_KEY: inheritedApiKey },
@@ -73306,18 +73402,29 @@ var init_turn_recovery_policy = __esm(() => {
 });
 
 // src/agent/approval-recovery.ts
-async function fetchRunErrorDetail(runId) {
+async function fetchRunErrorInfo(runId) {
   if (!runId)
     return null;
   try {
     const client = await getClient();
     const run = await client.runs.retrieve(runId);
     const metaError = run.metadata?.error;
-    return metaError?.detail ?? metaError?.message ?? metaError?.error?.detail ?? metaError?.error?.message ?? null;
+    const nestedError = metaError?.error;
+    const errorInfo = {
+      error_type: metaError?.error_type ?? metaError?.type ?? nestedError?.error_type ?? nestedError?.type,
+      message: metaError?.message ?? nestedError?.message,
+      detail: metaError?.detail ?? nestedError?.detail,
+      run_id: metaError?.run_id ?? nestedError?.run_id ?? runId
+    };
+    return errorInfo.error_type || errorInfo.message || errorInfo.detail ? errorInfo : null;
   } catch {
     return null;
   }
 }
+async function fetchRunErrorDetail(runId) {
+  const errorInfo = await fetchRunErrorInfo(runId);
+  return errorInfo?.detail ?? errorInfo?.message ?? null;
+}
 var init_approval_recovery = __esm(async () => {
   init_turn_recovery_policy();
   await init_client2();
@@ -75761,6 +75868,7 @@ class StreamProcessor {
       const errorDetail = chunkWithError.error.detail || "";
       errorInfo = {
         message: errorDetail ? `${errorText}: ${errorDetail}` : errorText,
+        detail: errorDetail || undefined,
         run_id: this.lastRunId || undefined
       };
     }
@@ -77090,13 +77198,53 @@ function requestApprovalOverWS(runtime, socket, requestId, controlRequest) {
   if (socket.readyState !== WebSocket.OPEN) {
     return Promise.reject(new Error("WebSocket not open"));
   }
+  const abortSignal = runtime.activeAbortController?.signal ?? null;
+  const isInterrupted = () => runtime.cancelRequested || abortSignal?.aborted === true;
+  if (isInterrupted()) {
+    return Promise.reject(new Error("Cancelled by user"));
+  }
   return new Promise((resolve23, reject) => {
+    let settled = false;
+    const cleanupAbortListener = () => {
+      abortSignal?.removeEventListener("abort", handleAbort);
+    };
+    const wrappedResolve = (response) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      cleanupAbortListener();
+      resolve23(response);
+    };
+    const wrappedReject = (error) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      cleanupAbortListener();
+      reject(error);
+    };
+    const handleAbort = () => {
+      runtime.pendingApprovalResolvers.delete(requestId);
+      runtime.listener.approvalRuntimeKeyByRequestId.delete(requestId);
+      wrappedReject(new Error("Cancelled by user"));
+    };
+    abortSignal?.addEventListener("abort", handleAbort, { once: true });
+    if (isInterrupted()) {
+      handleAbort();
+      return;
+    }
     runtime.pendingApprovalResolvers.set(requestId, {
-      resolve: resolve23,
-      reject,
+      resolve: wrappedResolve,
+      reject: wrappedReject,
       controlRequest
     });
     runtime.listener.approvalRuntimeKeyByRequestId.set(requestId, runtime.key);
+    if (isInterrupted()) {
+      handleAbort();
+      return;
+    }
+    runtime.lastStopReason = "requires_approval";
     setLoopStatus(runtime, "WAITING_ON_APPROVAL");
     emitLoopStatusIfOpen(runtime.listener, {
       agent_id: runtime.agentId,
@@ -77392,12 +77540,18 @@ function populateInterruptQueue(runtime, input) {
   return false;
 }
 function consumeInterruptQueue(runtime, agentId, conversationId) {
+  const ctx = runtime.pendingInterruptedContext;
+  const matchingContext = !!ctx && ctx.agentId === agentId && ctx.conversationId === conversationId && ctx.continuationEpoch === runtime.continuationEpoch;
   if (!runtime.pendingInterruptedResults || runtime.pendingInterruptedResults.length === 0) {
+    if (matchingContext) {
+      runtime.pendingInterruptedResults = null;
+      runtime.pendingInterruptedContext = null;
+      runtime.pendingInterruptedToolCallIds = null;
+    }
     return null;
   }
-  const ctx = runtime.pendingInterruptedContext;
   let result = null;
-  if (ctx && ctx.agentId === agentId && ctx.conversationId === conversationId && ctx.continuationEpoch === runtime.continuationEpoch) {
+  if (matchingContext) {
     result = {
       approvalMessage: {
         type: "approval",
@@ -77565,6 +77719,175 @@ var init_permissionMode = __esm(() => {
   init_remote_settings();
 });
 
+// src/websocket/listener/recoverable-notices.ts
+function getRecoverableStatusNoticeVisibility(kind) {
+  switch (kind) {
+    case "stale_approval_conflict_recovery":
+      return "debug_only";
+    default:
+      return "transcript";
+  }
+}
+function getRecoverableRetryNoticeVisibility(kind, attempt) {
+  switch (kind) {
+    case "transient_provider_retry":
+      return attempt === 1 ? "debug_only" : "transcript";
+    default:
+      return "transcript";
+  }
+}
+function isDesktopDebugPanelMirrorEnabled() {
+  return process.env.LETTA_DESKTOP_DEBUG_PANEL === "1";
+}
+function mirrorRecoverableNoticeToDesktopDebugPanel(message) {
+  if (!isDesktopDebugPanelMirrorEnabled()) {
+    return;
+  }
+  try {
+    process.stderr.write(`${DESKTOP_DEBUG_PANEL_INFO_PREFIX} ${message}
+`);
+  } catch {}
+}
+function toStructuredApiError(errorInfo) {
+  if (!errorInfo?.error_type || !errorInfo.run_id) {
+    return;
+  }
+  return {
+    message_type: "error_message",
+    message: errorInfo.message || errorInfo.detail || "An error occurred",
+    error_type: errorInfo.error_type,
+    run_id: errorInfo.run_id,
+    ...errorInfo.detail ? { detail: errorInfo.detail } : {}
+  };
+}
+function getStructuredApiErrorFromError(error) {
+  if (!(error instanceof Error)) {
+    return;
+  }
+  const errorWithStructuredInfo = error;
+  return errorWithStructuredInfo.apiError ?? toStructuredApiError(errorWithStructuredInfo.runErrorInfo);
+}
+function buildStructuredFormatInput(apiError) {
+  return {
+    error: {
+      error: {
+        type: apiError.error_type,
+        message: apiError.message,
+        ...apiError.detail ? { detail: apiError.detail } : {}
+      },
+      run_id: apiError.run_id
+    }
+  };
+}
+function isAbortLikeError(error) {
+  if (error instanceof APIUserAbortError) {
+    return true;
+  }
+  if (!(error instanceof Error)) {
+    return false;
+  }
+  const errorWithCode = error;
+  return error.name === "AbortError" || error.message === "The operation was aborted" || errorWithCode.code === "ABORT_ERR";
+}
+function isTerminatedProcessNoise(message) {
+  return message.trim().toLowerCase() === "terminated";
+}
+function isProxyTransportError(detail, error, message) {
+  if (error instanceof APIError2 && error.status >= 500 && detail.toLowerCase().includes("trying to proxy")) {
+    return true;
+  }
+  return detail.toLowerCase().includes("error occurred while trying to proxy") || message.toLowerCase().includes("error occurred while trying to proxy");
+}
+function getLoopErrorNoticeDecision(params) {
+  const apiError = params.apiError ?? toStructuredApiError(params.errorInfo) ?? toStructuredApiError(params.runErrorInfo) ?? getStructuredApiErrorFromError(params.error);
+  const detail = apiError?.detail ?? params.errorInfo?.detail ?? params.runErrorInfo?.detail ?? extractConflictDetail(params.error) ?? "";
+  if (params.cancelRequested || params.abortSignal?.aborted || isAbortLikeError(params.error) || isTerminatedProcessNoise(params.message)) {
+    return {
+      visibility: "debug_only",
+      message: params.message
+    };
+  }
+  const cloudflareMessage = checkCloudflareEdgeError2(detail) ?? checkCloudflareEdgeError2(params.message);
+  if (cloudflareMessage) {
+    return {
+      visibility: "transcript",
+      message: cloudflareMessage,
+      apiError
+    };
+  }
+  if (isProxyTransportError(detail, params.error, params.message)) {
+    return {
+      visibility: "transcript",
+      message: "Connection to Letta service failed. Please retry.",
+      apiError
+    };
+  }
+  const formattedMessage = formatErrorDetails2(apiError ? buildStructuredFormatInput(apiError) : params.error ?? params.message, params.agentId ?? undefined, params.conversationId ?? undefined);
+  return {
+    visibility: "transcript",
+    message: formattedMessage,
+    apiError
+  };
+}
+function emitLoopErrorNotice(socket, runtime, params) {
+  const decision = getLoopErrorNoticeDecision(params);
+  if (decision.visibility === "debug_only") {
+    debugLog("recovery", `Debug-only loop error (${params.stopReason}): ${params.message}`);
+    mirrorRecoverableNoticeToDesktopDebugPanel(params.message);
+    return;
+  }
+  emitLoopErrorDelta(socket, runtime, {
+    message: decision.message,
+    stopReason: params.stopReason,
+    isTerminal: params.isTerminal,
+    runId: params.runId,
+    agentId: params.agentId,
+    conversationId: params.conversationId,
+    apiError: decision.apiError
+  });
+}
+function emitRecoverableStatusNotice(socket, runtime, params) {
+  const visibility = getRecoverableStatusNoticeVisibility(params.kind);
+  if (visibility === "debug_only") {
+    debugLog("recovery", `Debug-only lifecycle notice (${params.kind}): ${params.message}`);
+    mirrorRecoverableNoticeToDesktopDebugPanel(params.message);
+    return;
+  }
+  emitStatusDelta(socket, runtime, {
+    message: params.message,
+    level: params.level,
+    runId: params.runId,
+    agentId: params.agentId,
+    conversationId: params.conversationId
+  });
+}
+function emitRecoverableRetryNotice(socket, runtime, params) {
+  const visibility = getRecoverableRetryNoticeVisibility(params.kind, params.attempt);
+  if (visibility === "debug_only") {
+    debugLog("recovery", `Debug-only retry notice (${params.kind}, attempt ${params.attempt}/${params.maxAttempts}): ${params.message}`);
+    mirrorRecoverableNoticeToDesktopDebugPanel(params.message);
+    return;
+  }
+  emitRetryDelta(socket, runtime, {
+    message: params.message,
+    reason: params.reason,
+    attempt: params.attempt,
+    maxAttempts: params.maxAttempts,
+    delayMs: params.delayMs,
+    runId: params.runId,
+    agentId: params.agentId,
+    conversationId: params.conversationId
+  });
+}
+var DESKTOP_DEBUG_PANEL_INFO_PREFIX = "[LETTA_DESKTOP_DEBUG_PANEL_INFO]";
+var init_recoverable_notices = __esm(async () => {
+  init_error();
+  init_turn_recovery_policy();
+  init_errorFormatter();
+  init_debug();
+  await init_protocol_outbound();
+});
+
 // node_modules/diff/libesm/diff/base.js
 class Diff {
   diff(oldStr, newStr, options = {}) {
@@ -79144,13 +79467,15 @@ async function drainRecoveryStreamWithEmission(recoveryStream, socket, runtime,
       }
     }
     if (errorInfo) {
-      emitLoopErrorDelta(socket, runtime, {
+      emitLoopErrorNotice(socket, runtime, {
         message: errorInfo.message || "Stream error",
         stopReason: errorInfo.error_type || "error",
         isTerminal: false,
         runId: runtime.activeRunId || errorInfo.run_id,
         agentId: params.agentId ?? undefined,
-        conversationId: params.conversationId
+        conversationId: params.conversationId,
+        errorInfo,
+        abortSignal: params.abortSignal
       });
     }
     if (shouldOutput) {
@@ -79201,7 +79526,7 @@ function finalizeHandledRecoveryTurn(runtime, socket, params) {
   const runId = runtime.activeRunId;
   clearActiveRunState(runtime);
   emitRuntimeStateUpdates(runtime, scope);
-  emitLoopErrorDelta(socket, runtime, {
+  emitLoopErrorNotice(socket, runtime, {
     message: `Recovery continuation ended unexpectedly: ${terminalStopReason}`,
     stopReason: terminalStopReason,
     isTerminal: true,
@@ -79538,7 +79863,8 @@ var init_recovery = __esm(async () => {
     init_approval_suggestions(),
     init_interrupts(),
     init_protocol_outbound(),
-    init_queue()
+    init_queue(),
+    init_recoverable_notices()
   ]);
 });
 
@@ -79646,9 +79972,6 @@ async function resolveStaleApprovals(runtime, socket, abortSignal, deps = {}) {
     ];
     let pendingNeedsUserInput = [...needsUserInput];
     if (pendingNeedsUserInput.length > 0) {
-      runtime.lastStopReason = "requires_approval";
-      setLoopStatus(runtime, "WAITING_ON_APPROVAL", scope);
-      emitRuntimeStateUpdates(runtime, scope);
       while (pendingNeedsUserInput.length > 0) {
         const ac = pendingNeedsUserInput.shift();
         if (!ac) {
@@ -79842,8 +80165,8 @@ async function sendMessageStreamWithRetry(conversationId, messages, opts, socket
               throw new Error("Cancelled by user");
           }
         }
-        const detail = await fetchRunErrorDetail(runtime.activeRunId);
-        throw new Error(detail || `Pre-stream approval conflict after ${preStreamRecoveryAttempts} recovery attempts`);
+        const runErrorInfo = await fetchRunErrorInfo(runtime.activeRunId);
+        throw Object.assign(new Error(runErrorInfo?.detail || runErrorInfo?.message || `Pre-stream approval conflict after ${preStreamRecoveryAttempts} recovery attempts`), { runErrorInfo });
       }
       if (action === "retry_transient") {
         runtime.isRecoveringApprovals = true;
@@ -79976,8 +80299,8 @@ async function sendApprovalContinuationWithRetry(conversationId, messages, opts,
           }
           continue;
         }
-        const detail = await fetchRunErrorDetail(runtime.activeRunId);
-        throw new Error(detail || `Approval continuation conflict after ${preStreamRecoveryAttempts} recovery attempts`);
+        const runErrorInfo = await fetchRunErrorInfo(runtime.activeRunId);
+        throw Object.assign(new Error(runErrorInfo?.detail || runErrorInfo?.message || `Approval continuation conflict after ${preStreamRecoveryAttempts} recovery attempts`), { runErrorInfo });
       }
       if (action === "retry_transient") {
         runtime.isRecoveringApprovals = true;
@@ -80103,7 +80426,7 @@ async function handleApprovalStop(params) {
       agent_id: agentId,
       conversation_id: conversationId
     });
-    emitLoopErrorDelta(socket, runtime, {
+    emitLoopErrorNotice(socket, runtime, {
       message: "requires_approval stop returned no approvals",
       stopReason: "error",
       isTerminal: true,
@@ -80177,11 +80500,6 @@ async function handleApprovalStop(params) {
     if (shouldInterrupt()) {
       return interruptTermination();
     }
-    runtime.lastStopReason = "requires_approval";
-    setLoopStatus(runtime, "WAITING_ON_APPROVAL", {
-      agent_id: agentId,
-      conversation_id: conversationId
-    });
     while (pendingNeedsUserInput.length > 0) {
       const ac = pendingNeedsUserInput.shift();
       if (!ac) {
@@ -80411,6 +80729,7 @@ var init_turn_approval = __esm(async () => {
     init_interrupts(),
     init_protocol_outbound(),
     init_queue(),
+    init_recoverable_notices(),
     init_recovery(),
     init_send()
   ]);
@@ -80742,13 +81061,16 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
         }
         if (errorInfo) {
           latestErrorText = errorInfo.message || latestErrorText;
-          emitLoopErrorDelta(socket, runtime, {
+          emitLoopErrorNotice(socket, runtime, {
             message: errorInfo.message || "Stream error",
             stopReason: errorInfo.error_type || "error",
             isTerminal: false,
             runId: runId || errorInfo.run_id,
             agentId,
-            conversationId
+            conversationId,
+            errorInfo,
+            cancelRequested: runtime.cancelRequested,
+            abortSignal: turnAbortSignal
           });
         }
         if (shouldOutput) {
@@ -80808,7 +81130,8 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
       }
       if (stopReason !== "requires_approval") {
         const lastRunId = runId || msgRunIds[msgRunIds.length - 1] || null;
-        const errorDetail = latestErrorText || (lastRunId ? await fetchRunErrorDetail(lastRunId) : null);
+        const runErrorInfo = lastRunId ? await fetchRunErrorInfo(lastRunId) : null;
+        const errorDetail = latestErrorText || runErrorInfo?.detail || runErrorInfo?.message || null;
         if (shouldAttemptPostStopApprovalRecovery({
           stopReason,
           runIdsSeen: msgRunIds.length,
@@ -80817,7 +81140,8 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
           latestErrorText
         })) {
           postStopApprovalRecoveryRetries += 1;
-          emitStatusDelta(socket, runtime, {
+          emitRecoverableStatusNotice(socket, runtime, {
+            kind: "stale_approval_conflict_recovery",
             message: "Recovering from stale approval conflict after interrupted/reconnected turn",
             level: "warning",
             runId: lastRunId || undefined,
@@ -80913,7 +81237,8 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
             detail: errorDetail
           });
           const retryMessage = getRetryStatusMessage(errorDetail) || `LLM API error encountered, retrying (attempt ${attempt}/${LLM_API_ERROR_MAX_RETRIES})...`;
-          emitRetryDelta(socket, runtime, {
+          emitRecoverableRetryNotice(socket, runtime, {
+            kind: "transient_provider_retry",
             message: retryMessage,
             reason: "llm_api_error",
             attempt,
@@ -80968,13 +81293,16 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
           conversation_id: conversationId
         });
         const errorMessage = errorDetail || `Unexpected stop reason: ${stopReason}`;
-        emitLoopErrorDelta(socket, runtime, {
+        emitLoopErrorNotice(socket, runtime, {
           message: errorMessage,
           stopReason: effectiveStopReason,
           isTerminal: true,
           runId,
           agentId,
-          conversationId
+          conversationId,
+          runErrorInfo: runErrorInfo ?? undefined,
+          cancelRequested: runtime.cancelRequested,
+          abortSignal: turnAbortSignal
         });
         break;
       }
@@ -81058,12 +81386,15 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
       conversation_id: conversationId
     });
     const errorMessage = error instanceof Error ? error.message : String(error);
-    emitLoopErrorDelta(socket, runtime, {
+    emitLoopErrorNotice(socket, runtime, {
       message: errorMessage,
       stopReason: "error",
       isTerminal: true,
       agentId: agentId || undefined,
-      conversationId
+      conversationId,
+      error,
+      cancelRequested: runtime.cancelRequested,
+      abortSignal: turnAbortSignal
     });
     if (isDebugEnabled()) {
       console.error("[Listen] Error handling message:", error);
@@ -81113,6 +81444,7 @@ var init_turn = __esm(async () => {
     init_toolset(),
     init_interrupts(),
     init_protocol_outbound(),
+    init_recoverable_notices(),
     init_recovery(),
     init_send(),
     init_turn_approval()
@@ -81436,7 +81768,7 @@ function buildLoopStatus(runtime, params) {
   const conversationRuntime = getConversationRuntime(listener, scopedAgentId, scopedConversationId);
   const interruptedCacheActive = hasInterruptedCacheForScope(listener, scope);
   const recovered = getRecoveredApprovalStateForScope(listener, scope);
-  const status = interruptedCacheActive ? !conversationRuntime?.isProcessing ? "WAITING_ON_INPUT" : conversationRuntime?.loopStatus ?? "WAITING_ON_INPUT" : recovered && recovered.pendingRequestIds.size > 0 && conversationRuntime?.loopStatus === "WAITING_ON_INPUT" ? "WAITING_ON_APPROVAL" : conversationRuntime?.loopStatus ?? "WAITING_ON_INPUT";
+  const status = interruptedCacheActive ? !conversationRuntime?.isProcessing ? "WAITING_ON_INPUT" : conversationRuntime?.loopStatus === "WAITING_ON_APPROVAL" ? "WAITING_ON_INPUT" : conversationRuntime?.loopStatus ?? "WAITING_ON_INPUT" : recovered && recovered.pendingRequestIds.size > 0 && conversationRuntime?.loopStatus === "WAITING_ON_INPUT" ? "WAITING_ON_APPROVAL" : conversationRuntime?.loopStatus ?? "WAITING_ON_INPUT";
   return {
     status,
     active_run_ids: interruptedCacheActive && !conversationRuntime?.isProcessing ? [] : conversationRuntime?.activeRunId ? [conversationRuntime.activeRunId] : []
@@ -81598,9 +81930,6 @@ function resolveSubagentScopeForSnapshot(runtime, scope) {
 function buildSubagentSnapshot(runtime, scope) {
   const runtimeScope = resolveSubagentScopeForSnapshot(runtime, scope);
   return getSubagents().filter((a) => {
-    if (a.status !== "pending" && a.status !== "running") {
-      return false;
-    }
     if (a.silent && a.isBackground !== true) {
       return false;
     }
@@ -81672,7 +82001,8 @@ function emitLoopErrorDelta(socket, runtime, params) {
     ...createLifecycleMessageBase("loop_error", params.runId),
     message: params.message,
     stop_reason: params.stopReason,
-    is_terminal: params.isTerminal
+    is_terminal: params.isTerminal,
+    ...params.apiError ? { api_error: params.apiError } : {}
   }, {
     agent_id: params.agentId,
     conversation_id: params.conversationId
@@ -82915,12 +83245,13 @@ function handleModeChange(msg, socket, runtime, scope) {
     }
   } catch (error) {
     trackListenerError("listener_mode_change_failed", error, "listener_mode_change");
-    emitLoopErrorDelta(socket, runtime, {
+    emitLoopErrorNotice(socket, runtime, {
       message: error instanceof Error ? error.message : "Mode change failed",
       stopReason: "error",
       isTerminal: false,
       agentId: scope?.agent_id,
-      conversationId: scope?.conversation_id
+      conversationId: scope?.conversation_id,
+      error
     });
     if (isDebugEnabled()) {
       console.error("[Listen] Mode change failed:", error);
@@ -83670,6 +84001,7 @@ async function handleAbortMessageInput(listener, params, deps = {}) {
   }
   const interruptedRunId = scopedRuntime.activeRunId;
   scopedRuntime.cancelRequested = true;
+  const pendingRequestsSnapshot = hasPendingApprovals ? resolvedDeps.getPendingControlRequests(listener, scope) : [];
   if (scopedRuntime.activeExecutingToolCallIds.length > 0 && (!scopedRuntime.pendingInterruptedResults || scopedRuntime.pendingInterruptedResults.length === 0)) {
     scopedRuntime.pendingInterruptedResults = scopedRuntime.activeExecutingToolCallIds.map((toolCallId) => ({
       type: "tool",
@@ -83715,9 +84047,8 @@ async function handleAbortMessageInput(listener, params, deps = {}) {
       agentId: scope.agent_id,
       conversationId: scope.conversation_id
     });
-  } else if (hasPendingApprovals) {
-    const pendingRequests = resolvedDeps.getPendingControlRequests(listener, scope);
-    scopedRuntime.pendingInterruptedResults = pendingRequests.map((req) => ({
+  } else if (hasPendingApprovals && (!scopedRuntime.pendingInterruptedResults || scopedRuntime.pendingInterruptedResults.length === 0) && pendingRequestsSnapshot.length > 0) {
+    scopedRuntime.pendingInterruptedResults = pendingRequestsSnapshot.map((req) => ({
       type: "approval",
       tool_call_id: req.request.tool_call_id,
       approve: false,
@@ -83728,6 +84059,7 @@ async function handleAbortMessageInput(listener, params, deps = {}) {
       conversationId: scope.conversation_id,
       continuationEpoch: scopedRuntime.continuationEpoch
     };
+    scopedRuntime.pendingInterruptedToolCallIds = null;
     resolvedDeps.emitInterruptedStatusDelta(params.socket, scopedRuntime, {
       runId: interruptedRunId,
       agentId: scope.agent_id,
@@ -83772,12 +84104,13 @@ async function handleCwdChange(msg, socket, runtime) {
       conversation_id: conversationId
     });
   } catch (error) {
-    emitLoopErrorDelta(socket, runtime, {
+    emitLoopErrorNotice(socket, runtime, {
       message: error instanceof Error ? error.message : "Working directory change failed",
       stopReason: "error",
       isTerminal: false,
       agentId,
-      conversationId
+      conversationId,
+      error
     });
   }
 }
@@ -83996,7 +84329,7 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
         return;
       }
       if (parsed.type === "__invalid_input") {
-        emitLoopErrorDelta(socket, runtime, {
+        emitLoopErrorNotice(socket, runtime, {
           message: parsed.reason,
           stopReason: "error",
           isTerminal: false,
@@ -84039,7 +84372,7 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
         }
         const inputPayload = parsed.payload;
         if (inputPayload.kind !== "create_message") {
-          emitLoopErrorDelta(socket, runtime, {
+          emitLoopErrorNotice(socket, runtime, {
             message: `Unsupported input payload kind: ${String(inputPayload.kind)}`,
             stopReason: "error",
             isTerminal: false,
@@ -84056,7 +84389,7 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
         };
         const hasApprovalPayload = incoming.messages.some((payload) => ("type" in payload) && payload.type === "approval");
         if (hasApprovalPayload) {
-          emitLoopErrorDelta(socket, runtime, {
+          emitLoopErrorNotice(socket, runtime, {
             message: "Protocol violation: approval payloads are not allowed in input.kind=create_message. Use input.kind=approval_response.",
             stopReason: "error",
             isTerminal: false,
@@ -84613,12 +84946,13 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
       if (!parsedScope) {
         return;
       }
-      emitLoopErrorDelta(socket, runtime, {
+      emitLoopErrorNotice(socket, runtime, {
         message: error instanceof Error ? error.message : "Failed to process listener message",
         stopReason: "error",
         isTerminal: false,
         agentId: parsedScope.agent_id,
-        conversationId: parsedScope.conversation_id
+        conversationId: parsedScope.conversation_id,
+        error
       });
     }
   });
@@ -84916,6 +85250,7 @@ var init_client4 = __esm(async () => {
     init_protocol_inbound(),
     init_protocol_outbound(),
     init_queue(),
+    init_recoverable_notices(),
     init_recovery(),
     init_send(),
     init_turn(),
@@ -85336,7 +85671,7 @@ var init_skills2 = __esm(() => {
 var exports_fs = {};
 __export(exports_fs, {
   writeJsonFile: () => writeJsonFile,
-  writeFile: () => writeFile6,
+  writeFile: () => writeFile7,
   readJsonFile: () => readJsonFile,
   readFile: () => readFile9,
   mkdir: () => mkdir6,
@@ -85352,7 +85687,7 @@ import { dirname as dirname13 } from "node:path";
 async function readFile9(path23) {
   return fsReadFileSync2(path23, { encoding: "utf-8" });
 }
-async function writeFile6(path23, content) {
+async function writeFile7(path23, content) {
   const dir = dirname13(path23);
   if (!existsSync25(dir)) {
     mkdirSync17(dir, { recursive: true });
@@ -85373,7 +85708,7 @@ async function writeJsonFile(path23, data, options) {
   const indent = options?.indent ?? 2;
   const content = `${JSON.stringify(data, null, indent)}
 `;
-  await writeFile6(path23, content);
+  await writeFile7(path23, content);
 }
 var init_fs2 = () => {};
 
@@ -85398,7 +85733,7 @@ async function queryTerminalBackground(timeoutMs = 100) {
   }
   const wasRaw = process.stdin.isRaw;
   const wasFlowing = process.stdin.readableFlowing;
-  return new Promise((resolve25) => {
+  return new Promise((resolve26) => {
     let response = "";
     let resolved = false;
     const cleanup = () => {
@@ -85415,7 +85750,7 @@ async function queryTerminalBackground(timeoutMs = 100) {
     };
     const timeout = setTimeout(() => {
       cleanup();
-      resolve25(null);
+      resolve26(null);
     }, timeoutMs);
     const onData = (data) => {
       response += data.toString();
@@ -85425,7 +85760,7 @@ async function queryTerminalBackground(timeoutMs = 100) {
       if (match3) {
         clearTimeout(timeout);
         cleanup();
-        resolve25({
+        resolve26({
           r: parseHexComponent(match3[1] ?? "0"),
           g: parseHexComponent(match3[2] ?? "0"),
           b: parseHexComponent(match3[3] ?? "0")
@@ -85440,7 +85775,7 @@ async function queryTerminalBackground(timeoutMs = 100) {
     } catch {
       clearTimeout(timeout);
       cleanup();
-      resolve25(null);
+      resolve26(null);
     }
   });
 }
@@ -86649,10 +86984,10 @@ __export(exports_setup, {
   runSetup: () => runSetup
 });
 async function runSetup() {
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const { waitUntilExit } = render_default(import_react32.default.createElement(SetupUI, {
       onComplete: () => {
-        resolve26();
+        resolve27();
       }
     }));
     waitUntilExit().catch((error) => {
@@ -87127,6 +87462,20 @@ function validateRegistryHandleOrThrow2(handle) {
   }
 }
 
+// src/runtime-context.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+function getCurrentWorkingDirectory() {
+  const workingDirectory = runtimeContextStorage.getStore()?.workingDirectory;
+  if (typeof workingDirectory === "string" && workingDirectory.length > 0) {
+    return workingDirectory;
+  }
+  return process.env.USER_CWD || process.cwd();
+}
+var runtimeContextStorage;
+var init_runtime_context = __esm(() => {
+  runtimeContextStorage = new AsyncLocalStorage;
+});
+
 // src/agent/github-utils.ts
 var exports_github_utils = {};
 __export(exports_github_utils, {
@@ -87167,11 +87516,11 @@ __export(exports_import, {
   extractSkillsFromAf: () => extractSkillsFromAf
 });
 import { createReadStream } from "node:fs";
-import { chmod, mkdir as mkdir7, readFile as readFile10, writeFile as writeFile7 } from "node:fs/promises";
-import { dirname as dirname14, resolve as resolve26 } from "node:path";
+import { chmod, mkdir as mkdir7, readFile as readFile10, writeFile as writeFile8 } from "node:fs/promises";
+import { dirname as dirname14, resolve as resolve27 } from "node:path";
 async function importAgentFromFile(options) {
   const client = await getClient();
-  const resolvedPath = resolve26(options.filePath);
+  const resolvedPath = resolve27(options.filePath);
   const file = createReadStream(resolvedPath);
   const importResponse = await client.agents.importFile({
     file,
@@ -87206,7 +87555,7 @@ async function extractSkillsFromAf(afPath, destDir) {
     return [];
   }
   for (const skill2 of afData.skills) {
-    const skillDir = resolve26(destDir, skill2.name);
+    const skillDir = resolve27(destDir, skill2.name);
     await mkdir7(skillDir, { recursive: true });
     if (skill2.files) {
       await writeSkillFiles(skillDir, skill2.files);
@@ -87226,9 +87575,9 @@ async function writeSkillFiles(skillDir, files) {
   }
 }
 async function writeSkillFile(skillDir, filePath, content) {
-  const fullPath = resolve26(skillDir, filePath);
+  const fullPath = resolve27(skillDir, filePath);
   await mkdir7(dirname14(fullPath), { recursive: true });
-  await writeFile7(fullPath, content, "utf-8");
+  await writeFile8(fullPath, content, "utf-8");
   const isScript = filePath.startsWith("scripts/") || content.trimStart().startsWith("#!");
   if (isScript) {
     try {
@@ -87281,7 +87630,7 @@ function parseRegistryHandle(handle) {
 async function importAgentFromRegistry(options) {
   const { tmpdir: tmpdir4 } = await import("node:os");
   const { join: join35 } = await import("node:path");
-  const { writeFile: writeFile8, unlink: unlink3 } = await import("node:fs/promises");
+  const { writeFile: writeFile9, unlink: unlink3 } = 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`;
   const response = await fetch(rawUrl);
@@ -87293,7 +87642,7 @@ async function importAgentFromRegistry(options) {
   }
   const afContent = await response.text();
   const tempPath = join35(tmpdir4(), `letta-import-${author}-${name}-${Date.now()}.af`);
-  await writeFile8(tempPath, afContent, "utf-8");
+  await writeFile9(tempPath, afContent, "utf-8");
   try {
     const result = await importAgentFromFile({
       filePath: tempPath,
@@ -87524,7 +87873,7 @@ async function prepareHeadlessToolExecutionContext(params) {
     agentId: params.agentId,
     conversationId: params.conversationId,
     overrideModel: params.overrideModel,
-    workingDirectory: process.env.USER_CWD || process.cwd(),
+    workingDirectory: getCurrentWorkingDirectory(),
     exclude: ["AskUserQuestion"]
   });
   return {
@@ -87532,6 +87881,20 @@ async function prepareHeadlessToolExecutionContext(params) {
     availableTools: preparedToolContext.preparedToolContext.clientTools.map((tool) => tool.name)
   };
 }
+async function flushAndExit(code) {
+  const flushWritable = (stream2) => new Promise((resolve28) => {
+    if (stream2.destroyed || stream2.writableEnded) {
+      resolve28();
+      return;
+    }
+    stream2.write("", () => resolve28());
+  });
+  await Promise.allSettled([
+    flushWritable(process.stdout),
+    flushWritable(process.stderr)
+  ]);
+  process.exit(code);
+}
 async function handleHeadlessCommand(parsedArgs, model, skillsDirectoryOverride, skillSourcesOverride, systemInfoReminderEnabledOverride) {
   const { values, positionals } = parsedArgs;
   telemetry.setSurface("headless");
@@ -87602,6 +87965,7 @@ In headless mode, use:
   let forceNewConversation = values.new ?? false;
   const fromAgentId = values["from-agent"];
   let agent = null;
+  let autoEnableMemfsForFreshAgent = false;
   let specifiedAgentId = values.agent;
   const specifiedAgentName = values.name;
   let specifiedConversationId = values.conversation;
@@ -87884,7 +88248,7 @@ In headless mode, use:
   }
   if (!agent && forceNew) {
     const updateArgs = getModelUpdateArgs2(model);
-    const { isLettaCloud: isLettaCloud2, enableMemfsIfCloud: enableMemfsIfCloud2 } = await Promise.resolve().then(() => (init_memoryFilesystem(), exports_memoryFilesystem));
+    const { isLettaCloud: isLettaCloud2 } = await Promise.resolve().then(() => (init_memoryFilesystem(), exports_memoryFilesystem));
     const willAutoEnableMemfs = shouldAutoEnableMemfsForNewAgent && await isLettaCloud2();
     const effectiveMemoryMode = requestedMemoryPromptMode ?? (willAutoEnableMemfs ? "memfs" : undefined);
     const createOptions = {
@@ -87904,13 +88268,11 @@ In headless mode, use:
     };
     const result = await createAgent(createOptions);
     agent = result.agent;
-    if (willAutoEnableMemfs) {
-      await enableMemfsIfCloud2(agent.id);
-    }
+    autoEnableMemfsForFreshAgent = willAutoEnableMemfs;
   }
   if (!agent) {
     await settingsManager.loadLocalProjectSettings();
-    const localAgentId = settingsManager.getLocalLastAgentId(process.cwd());
+    const localAgentId = settingsManager.getLocalLastAgentId(getCurrentWorkingDirectory());
     if (localAgentId) {
       try {
         agent = await client.agents.retrieve(localAgentId);
@@ -87965,13 +88327,14 @@ In headless mode, use:
   let conversationId;
   let effectiveReflectionSettings;
   const isSubagent = process.env.LETTA_CODE_AGENT_ROLE === "subagent";
+  const startupMemfsFlag = autoEnableMemfsForFreshAgent ? true : memfsFlag;
   let memfsBgPromise;
   const secretsAgentId = agent?.id;
   const secretsInitPromise = secretsAgentId ? init_secretsStore().then(() => exports_secretsStore).then(({ initSecretsFromServer: initSecretsFromServer2 }) => initSecretsFromServer2(secretsAgentId)) : Promise.resolve();
   if (memfsStartupPolicy === "skip") {
     try {
       const { applyMemfsFlags: applyMemfsFlags2 } = await Promise.resolve().then(() => (init_memoryFilesystem(), exports_memoryFilesystem));
-      await applyMemfsFlags2(agent.id, memfsFlag, noMemfsFlag, {
+      await applyMemfsFlags2(agent.id, startupMemfsFlag, noMemfsFlag, {
         pullOnExistingRepo: false,
         agentTags: agent.tags,
         skipPromptUpdate: forceNew
@@ -87983,7 +88346,7 @@ In headless mode, use:
     }
   } else if (memfsStartupPolicy === "background") {
     const { applyMemfsFlags: applyMemfsFlags2 } = await Promise.resolve().then(() => (init_memoryFilesystem(), exports_memoryFilesystem));
-    memfsBgPromise = applyMemfsFlags2(agent.id, memfsFlag, noMemfsFlag, {
+    memfsBgPromise = applyMemfsFlags2(agent.id, startupMemfsFlag, noMemfsFlag, {
       pullOnExistingRepo: true,
       agentTags: agent.tags,
       skipPromptUpdate: forceNew
@@ -87994,7 +88357,7 @@ In headless mode, use:
   } else {
     try {
       const { applyMemfsFlags: applyMemfsFlags2 } = await Promise.resolve().then(() => (init_memoryFilesystem(), exports_memoryFilesystem));
-      const memfsResult = await applyMemfsFlags2(agent.id, memfsFlag, noMemfsFlag, {
+      const memfsResult = await applyMemfsFlags2(agent.id, startupMemfsFlag, noMemfsFlag, {
         pullOnExistingRepo: true,
         agentTags: agent.tags,
         skipPromptUpdate: forceNew
@@ -88097,7 +88460,7 @@ In headless mode, use:
   }
   markMilestone("HEADLESS_CONVERSATION_READY");
   setConversationId2(conversationId);
-  if (!isSubagent) {
+  if (shouldPersistSessionState()) {
     await settingsManager.loadLocalProjectSettings();
     settingsManager.persistSession(agent.id, conversationId);
   }
@@ -88136,7 +88499,7 @@ In headless mode, use:
       conversation_id: conversationId,
       model: agent.llm_config?.model ?? "",
       tools: availableTools,
-      cwd: process.cwd(),
+      cwd: getCurrentWorkingDirectory(),
       mcp_servers: [],
       permission_mode: "",
       slash_commands: [],
@@ -88297,6 +88660,7 @@ ${SYSTEM_REMINDER_CLOSE}
     },
     state: sharedReminderState,
     sessionContextReminderEnabled: systemInfoReminderEnabled,
+    workingDirectory: getCurrentWorkingDirectory(),
     reflectionSettings: effectiveReflectionSettings,
     skillSources: resolvedSkillSources,
     resolvePlanModeReminder: async () => {
@@ -88470,7 +88834,7 @@ ${loadedContents.join(`
             } else {
               console.error(`Conversation is busy, waiting ${Math.round(retryDelayMs / 1000)}s and retrying...`);
             }
-            await new Promise((resolve27) => setTimeout(resolve27, retryDelayMs));
+            await new Promise((resolve28) => setTimeout(resolve28, retryDelayMs));
             continue;
           }
         }
@@ -88519,7 +88883,7 @@ ${loadedContents.join(`
             const delaySeconds = Math.round(delayMs / 1000);
             console.error(`Transient API error before streaming (attempt ${attempt} of ${LLM_API_ERROR_MAX_RETRIES2}), retrying in ${delaySeconds}s...`);
           }
-          await new Promise((resolve27) => setTimeout(resolve27, delayMs));
+          await new Promise((resolve28) => setTimeout(resolve28, delayMs));
           conversationBusyRetries = 0;
           continue;
         }
@@ -88758,7 +89122,7 @@ ${loadedContents.join(`
             const delaySeconds = Math.round(delayMs / 1000);
             console.error(`LLM API error encountered (attempt ${attempt} of ${LLM_API_ERROR_MAX_RETRIES2}), retrying in ${delaySeconds}s...`);
           }
-          await new Promise((resolve27) => setTimeout(resolve27, delayMs));
+          await new Promise((resolve28) => setTimeout(resolve28, delayMs));
           refreshCurrentInputOtids();
           continue;
         }
@@ -88844,7 +89208,7 @@ ${loadedContents.join(`
             } else {
               console.error(`Empty LLM response, retrying (attempt ${attempt} of ${EMPTY_RESPONSE_MAX_RETRIES2})...`);
             }
-            await new Promise((resolve27) => setTimeout(resolve27, delayMs));
+            await new Promise((resolve28) => setTimeout(resolve28, delayMs));
             refreshCurrentInputOtids();
             continue;
           }
@@ -88872,7 +89236,7 @@ ${loadedContents.join(`
               const delaySeconds = Math.round(delayMs / 1000);
               console.error(`LLM API error encountered (attempt ${attempt} of ${LLM_API_ERROR_MAX_RETRIES2}), retrying in ${delaySeconds}s...`);
             }
-            await new Promise((resolve27) => setTimeout(resolve27, delayMs));
+            await new Promise((resolve28) => setTimeout(resolve28, delayMs));
             refreshCurrentInputOtids();
             continue;
           }
@@ -89001,6 +89365,7 @@ ${loadedContents.join(`
   }
   markMilestone("HEADLESS_COMPLETE");
   reportAllMilestones();
+  await flushAndExit(0);
 }
 async function runBidirectionalMode(agent, conversationId, client, _outputFormat, includePartialMessages, availableTools, skillSources, systemInfoReminderEnabled, reflectionSettings) {
   const sessionId = agent.id;
@@ -89013,7 +89378,7 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
     conversation_id: conversationId,
     model: agent.llm_config?.model,
     tools: availableTools,
-    cwd: process.cwd(),
+    cwd: getCurrentWorkingDirectory(),
     memfs_enabled: settingsManager.isMemfsEnabled(agent.id),
     skill_sources: skillSources,
     system_info_reminder_enabled: systemInfoReminderEnabled,
@@ -89205,9 +89570,9 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
     const syntheticUserLine = serializeQueuedMessageAsUserLine(queuedMessage);
     maybeNotifyBlocked(syntheticUserLine);
     if (lineResolver) {
-      const resolve27 = lineResolver;
+      const resolve28 = lineResolver;
       lineResolver = null;
-      resolve27(syntheticUserLine);
+      resolve28(syntheticUserLine);
       return;
     }
     lineQueue.push(syntheticUserLine);
@@ -89215,9 +89580,9 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
   rl.on("line", (line) => {
     maybeNotifyBlocked(line);
     if (lineResolver) {
-      const resolve27 = lineResolver;
+      const resolve28 = lineResolver;
       lineResolver = null;
-      resolve27(line);
+      resolve28(line);
     } else {
       lineQueue.push(line);
     }
@@ -89226,17 +89591,17 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
     setMessageQueueAdder(null);
     msgQueueRuntime.clear("shutdown");
     if (lineResolver) {
-      const resolve27 = lineResolver;
+      const resolve28 = lineResolver;
       lineResolver = null;
-      resolve27(null);
+      resolve28(null);
     }
   });
   async function getNextLine() {
     if (lineQueue.length > 0) {
       return lineQueue.shift() ?? null;
     }
-    return new Promise((resolve27) => {
-      lineResolver = resolve27;
+    return new Promise((resolve28) => {
+      lineResolver = resolve28;
     });
   }
   async function requestPermission(toolCallId, toolName, toolInput) {
@@ -89655,6 +90020,7 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
           },
           state: sharedReminderState,
           sessionContextReminderEnabled: systemInfoReminderEnabled,
+          workingDirectory: getCurrentWorkingDirectory(),
           reflectionSettings,
           skillSources,
           resolvePlanModeReminder: async () => {
@@ -89739,7 +90105,7 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
                 uuid: `retry-bidir-${randomUUID8()}`
               };
               console.log(JSON.stringify(retryMsg));
-              await new Promise((resolve27) => setTimeout(resolve27, delayMs));
+              await new Promise((resolve28) => setTimeout(resolve28, delayMs));
               continue;
             }
             throw preStreamError;
@@ -89980,6 +90346,7 @@ var init_headless = __esm(async () => {
   init_constants();
   init_diffPreview();
   init_queueRuntime();
+  init_runtime_context();
   init_interactivePolicy();
   init_debug();
   init_timing();
@@ -90034,10 +90401,10 @@ async function detectAndEnableKittyProtocol() {
     detectionComplete = true;
     return;
   }
-  return new Promise((resolve27) => {
+  return new Promise((resolve28) => {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
       detectionComplete = true;
-      resolve27();
+      resolve28();
       return;
     }
     const originalRawMode = process.stdin.isRaw;
@@ -90070,7 +90437,7 @@ async function detectAndEnableKittyProtocol() {
         console.error("[kitty] protocol query unsupported; enabled anyway (best-effort)");
       }
       detectionComplete = true;
-      resolve27();
+      resolve28();
     };
     const handleData = (data) => {
       if (timeoutId === undefined) {
@@ -112256,7 +112623,7 @@ var init_pasteRegistry = __esm(() => {
 import { execFileSync as execFileSync3 } from "node:child_process";
 import { existsSync as existsSync29, readFileSync as readFileSync16, statSync as statSync10, unlinkSync as unlinkSync10 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
-import { basename as basename4, extname as extname5, isAbsolute as isAbsolute18, join as join38, resolve as resolve27 } from "node:path";
+import { basename as basename4, extname as extname5, isAbsolute as isAbsolute18, join as join38, resolve as resolve28 } from "node:path";
 function countLines2(text) {
   return (text.match(/\r\n|\r|\n/g) || []).length + 1;
 }
@@ -112304,7 +112671,7 @@ function translatePasteForImages(paste) {
         } catch {}
       }
       if (!isAbsolute18(filePath))
-        filePath = resolve27(process.cwd(), filePath);
+        filePath = resolve28(process.cwd(), filePath);
       const ext3 = extname5(filePath || "").toLowerCase();
       if (IMAGE_EXTS.has(ext3) && existsSync29(filePath) && statSync10(filePath).isFile()) {
         const buf = readFileSync16(filePath);
@@ -113450,9 +113817,16 @@ var init_registry = __esm(async () => {
       }
     },
     "/reflect": {
-      desc: "Launch a background reflection agent to update memory",
+      desc: "Launch reflection (/reflect [transcript_file])",
+      args: "[transcript_file]",
       order: 50,
-      noArgs: true,
+      handler: () => {
+        return "Launching reflection agent...";
+      }
+    },
+    "/reflection": {
+      desc: "Alias for /reflect",
+      args: "[transcript_file]",
       handler: () => {
         return "Launching reflection agent...";
       }
@@ -113812,14 +114186,6 @@ Location: ${keybindingsPath}`;
         return "Clearing credentials...";
       }
     },
-    "/empanada": {
-      desc: "Order empanadas from Empanada Empire",
-      order: 44.5,
-      args: "[address]",
-      handler: () => {
-        return "Checking Empanada Empire...";
-      }
-    },
     "/ralph": {
       desc: 'Start Ralph Wiggum loop (/ralph [prompt] [--completion-promise "X"] [--max-iterations N])',
       order: 45,
@@ -114324,11 +114690,11 @@ var init_HelpDialog = __esm(async () => {
 
 // src/hooks/writer.ts
 import { homedir as homedir31 } from "node:os";
-import { resolve as resolve28 } from "node:path";
+import { resolve as resolve29 } from "node:path";
 function isProjectSettingsPathCollidingWithGlobal2(workingDirectory) {
   const home = process.env.HOME || homedir31();
-  const globalSettingsPath = resolve28(home, ".letta", "settings.json");
-  const projectSettingsPath = resolve28(workingDirectory, ".letta", "settings.json");
+  const globalSettingsPath = resolve29(home, ".letta", "settings.json");
+  const projectSettingsPath = resolve29(workingDirectory, ".letta", "settings.json");
   return globalSettingsPath === projectSettingsPath;
 }
 function loadHooksFromLocation(location, workingDirectory = process.cwd()) {
@@ -116966,7 +117332,7 @@ var init_AgentInfoBar = __esm(async () => {
 
 // src/cli/helpers/fileSearch.ts
 import { readdirSync as readdirSync13, statSync as statSync11 } from "node:fs";
-import { join as join41, relative as relative15, resolve as resolve29 } from "node:path";
+import { join as join41, relative as relative15, resolve as resolve30 } from "node:path";
 function searchDirectoryRecursive(dir, pattern, maxResults = 200, results = [], depth = 0, maxDepth = 10, lowerPattern = pattern.toLowerCase()) {
   if (results.length >= maxResults || depth >= maxDepth) {
     return results;
@@ -117009,7 +117375,7 @@ async function searchFiles(query, deep = false) {
       const dirPart = query.slice(0, lastSlashIndex);
       const pattern = query.slice(lastSlashIndex + 1);
       try {
-        const resolvedDir = resolve29(getIndexRoot(), dirPart);
+        const resolvedDir = resolve30(getIndexRoot(), dirPart);
         try {
           statSync11(resolvedDir);
           searchDir = resolvedDir;
@@ -131808,7 +132174,7 @@ async function executeStatusLineCommand(command, payload, options) {
   };
 }
 function runWithLauncher(launcher, inputJson, timeout, signal, workingDirectory, startTime) {
-  return new Promise((resolve30, reject) => {
+  return new Promise((resolve31, reject) => {
     const [executable, ...args] = launcher;
     if (!executable) {
       reject(new Error("Empty launcher"));
@@ -131821,7 +132187,7 @@ function runWithLauncher(launcher, inputJson, timeout, signal, workingDirectory,
     const safeResolve = (result) => {
       if (!resolved) {
         resolved = true;
-        resolve30(result);
+        resolve31(result);
       }
     };
     let child;
@@ -132998,14 +133364,14 @@ __export(exports_export, {
   packageSkills: () => packageSkills
 });
 import { readdir as readdir10, readFile as readFile13 } from "node:fs/promises";
-import { relative as relative16, resolve as resolve30 } from "node:path";
+import { relative as relative16, resolve as resolve31 } from "node:path";
 async function packageSkills(agentId, skillsDir) {
   const skills = [];
   const skillNames = new Set;
   const dirsToCheck = skillsDir ? [skillsDir] : [
     agentId && getAgentSkillsDir(agentId),
-    resolve30(process.cwd(), ".skills"),
-    resolve30(process.env.HOME || "~", ".letta", "skills")
+    resolve31(process.cwd(), ".skills"),
+    resolve31(process.env.HOME || "~", ".letta", "skills")
   ].filter((dir) => Boolean(dir));
   for (const baseDir of dirsToCheck) {
     try {
@@ -133015,8 +133381,8 @@ async function packageSkills(agentId, skillsDir) {
           continue;
         if (skillNames.has(entry.name))
           continue;
-        const skillDir = resolve30(baseDir, entry.name);
-        const skillMdPath = resolve30(skillDir, "SKILL.md");
+        const skillDir = resolve31(baseDir, entry.name);
+        const skillMdPath = resolve31(skillDir, "SKILL.md");
         try {
           await readFile13(skillMdPath, "utf-8");
         } catch {
@@ -133046,7 +133412,7 @@ async function readSkillFiles(skillDir) {
   async function walk(dir) {
     const entries = await readdir10(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = resolve30(dir, entry.name);
+      const fullPath = resolve31(dir, entry.name);
       if (entry.isDirectory()) {
         await walk(fullPath);
       } else {
@@ -135530,7 +135896,7 @@ ${newState.originalPrompt}`,
                   cancelled = true;
                   break;
                 }
-                await new Promise((resolve31) => setTimeout(resolve31, 100));
+                await new Promise((resolve32) => setTimeout(resolve32, 100));
               }
               buffersRef.current.byId.delete(statusId);
               buffersRef.current.order = buffersRef.current.order.filter((id) => id !== statusId);
@@ -135594,7 +135960,7 @@ ${newState.originalPrompt}`,
                 cancelled = true;
                 break;
               }
-              await new Promise((resolve31) => setTimeout(resolve31, 100));
+              await new Promise((resolve32) => setTimeout(resolve32, 100));
             }
             if (retryStatusId) {
               buffersRef.current.byId.delete(retryStatusId);
@@ -136352,7 +136718,7 @@ ${feedback}
           });
           buffersRef.current.order.push(statusId);
           refreshDerived();
-          await new Promise((resolve31) => setTimeout(resolve31, delayMs));
+          await new Promise((resolve32) => setTimeout(resolve32, delayMs));
           buffersRef.current.byId.delete(statusId);
           buffersRef.current.order = buffersRef.current.order.filter((id) => id !== statusId);
           refreshDerived();
@@ -136412,7 +136778,7 @@ ${feedback}
               cancelled = true;
               break;
             }
-            await new Promise((resolve31) => setTimeout(resolve31, 100));
+            await new Promise((resolve32) => setTimeout(resolve32, 100));
           }
           if (retryStatusId) {
             buffersRef.current.byId.delete(retryStatusId);
@@ -143626,11 +143992,11 @@ __export(exports_import2, {
   extractSkillsFromAf: () => extractSkillsFromAf2
 });
 import { createReadStream as createReadStream2 } from "node:fs";
-import { chmod as chmod2, mkdir as mkdir8, readFile as readFile14, writeFile as writeFile8 } from "node:fs/promises";
-import { dirname as dirname19, resolve as resolve31 } from "node:path";
+import { chmod as chmod2, mkdir as mkdir8, readFile as readFile14, writeFile as writeFile9 } from "node:fs/promises";
+import { dirname as dirname19, resolve as resolve32 } from "node:path";
 async function importAgentFromFile2(options) {
   const client = await getClient();
-  const resolvedPath = resolve31(options.filePath);
+  const resolvedPath = resolve32(options.filePath);
   const file = createReadStream2(resolvedPath);
   const importResponse = await client.agents.importFile({
     file,
@@ -143665,7 +144031,7 @@ async function extractSkillsFromAf2(afPath, destDir) {
     return [];
   }
   for (const skill2 of afData.skills) {
-    const skillDir = resolve31(destDir, skill2.name);
+    const skillDir = resolve32(destDir, skill2.name);
     await mkdir8(skillDir, { recursive: true });
     if (skill2.files) {
       await writeSkillFiles2(skillDir, skill2.files);
@@ -143685,9 +144051,9 @@ async function writeSkillFiles2(skillDir, files) {
   }
 }
 async function writeSkillFile2(skillDir, filePath, content) {
-  const fullPath = resolve31(skillDir, filePath);
+  const fullPath = resolve32(skillDir, filePath);
   await mkdir8(dirname19(fullPath), { recursive: true });
-  await writeFile8(fullPath, content, "utf-8");
+  await writeFile9(fullPath, content, "utf-8");
   const isScript = filePath.startsWith("scripts/") || content.trimStart().startsWith("#!");
   if (isScript) {
     try {
@@ -143740,7 +144106,7 @@ function parseRegistryHandle2(handle) {
 async function importAgentFromRegistry2(options) {
   const { tmpdir: tmpdir7 } = await import("node:os");
   const { join: join50 } = await import("node:path");
-  const { writeFile: writeFile9, unlink: unlink3 } = await import("node:fs/promises");
+  const { writeFile: writeFile10, unlink: unlink3 } = 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`;
   const response = await fetch(rawUrl);
@@ -143752,7 +144118,7 @@ async function importAgentFromRegistry2(options) {
   }
   const afContent = await response.text();
   const tempPath = join50(tmpdir7(), `letta-import-${author}-${name}-${Date.now()}.af`);
-  await writeFile9(tempPath, afContent, "utf-8");
+  await writeFile10(tempPath, afContent, "utf-8");
   try {
     const result = await importAgentFromFile2({
       filePath: tempPath,
@@ -148687,12 +149053,15 @@ async function runMemfsSubcommand(argv) {
 
 // src/cli/subcommands/messages.ts
 await init_client2();
+import { writeFile as writeFile6 } from "node:fs/promises";
+import { resolve as resolve23 } from "node:path";
 import { parseArgs as parseArgs8 } from "node:util";
 function printUsage5() {
   console.log(`
 Usage:
   letta messages search --query <text> [options]
   letta messages list [options]
+  letta messages transcript --conversation <id> [options]
 
 Search options:
   --query <text>        Search query (required)
@@ -148714,6 +149083,16 @@ List options:
   --start-date <date>   Client-side filter: after this date (ISO format)
   --end-date <date>     Client-side filter: before this date (ISO format)
 
+Transcript options:
+  --conversation <id>    Conversation ID to export (required)
+  --conversation-id <id> Alias for --conversation
+  --agent <id>           Required when conversation is "default"
+  --agent-id <id>        Alias for --agent
+  --limit <n>            Page size while fetching (default: 100)
+  --max-pages <n>        Max pagination pages to fetch (default: 200)
+  --out <path>           Write transcript text to file
+  --output <path>        Alias for --out
+
 Notes:
   - Output is JSON only.
   - Uses CLI auth; override with LETTA_API_KEY/LETTA_BASE_URL if needed.
@@ -148755,7 +149134,12 @@ var MESSAGES_OPTIONS = {
   "agent-id": { type: "string" },
   after: { type: "string" },
   before: { type: "string" },
-  order: { type: "string" }
+  order: { type: "string" },
+  conversation: { type: "string" },
+  "conversation-id": { type: "string" },
+  "max-pages": { type: "string" },
+  out: { type: "string" },
+  output: { type: "string" }
 };
 function parseMessagesArgs(argv) {
   return parseArgs8({
@@ -148782,6 +149166,115 @@ async function runMessagesSubcommand(argv) {
   }
   try {
     const client = await getClient();
+    const renderText = (value) => {
+      if (typeof value === "string")
+        return value;
+      if (!Array.isArray(value))
+        return "";
+      return value.map((part) => {
+        if (part && typeof part === "object" && "type" in part && part.type === "text" && "text" in part) {
+          return typeof part.text === "string" ? part.text : "";
+        }
+        return "";
+      }).filter((text) => text.length > 0).join(`
+`);
+    };
+    const renderUnknown = (value) => {
+      if (typeof value === "string")
+        return value;
+      if (value === null || value === undefined)
+        return "";
+      try {
+        return JSON.stringify(value);
+      } catch {
+        return String(value);
+      }
+    };
+    const safeTypeLabel = (msg) => msg.message_type || "unknown_message";
+    const formatEntry = (msg) => {
+      const timestamp = msg.date || "unknown-time";
+      const type = safeTypeLabel(msg);
+      if (type === "user_message") {
+        const text = renderText(msg.content);
+        return [`[${timestamp}] user`, text || "(empty)"];
+      }
+      if (type === "assistant_message") {
+        const text = renderText(msg.content);
+        return [`[${timestamp}] assistant`, text || "(empty)"];
+      }
+      if (type === "reasoning_message") {
+        return [
+          `[${timestamp}] reasoning`,
+          msg.reasoning && msg.reasoning.length > 0 ? msg.reasoning : "(empty)"
+        ];
+      }
+      if (type === "tool_call_message" || type === "approval_request_message") {
+        const calls = Array.isArray(msg.tool_calls) ? msg.tool_calls : msg.tool_call ? [msg.tool_call] : [];
+        if (calls.length === 0) {
+          return [`[${timestamp}] ${type}`, "(no tool call payload)"];
+        }
+        return calls.flatMap((call) => {
+          const header = `[${timestamp}] tool_call ${call.name || "unknown"} (${call.tool_call_id || "no-id"})`;
+          const args = call.arguments ? call.arguments : "{}";
+          return [header, args];
+        });
+      }
+      if (type === "tool_return_message") {
+        const returns = Array.isArray(msg.tool_returns) ? msg.tool_returns : [
+          {
+            tool_call_id: msg.tool_call_id,
+            status: msg.status,
+            tool_return: msg.tool_return,
+            func_response: msg.func_response
+          }
+        ];
+        return returns.flatMap((ret) => {
+          const header = `[${timestamp}] tool_return (${ret.tool_call_id || "no-id"}) status=${ret.status || "unknown"}`;
+          const body = renderUnknown(ret.tool_return ?? ret.func_response);
+          return [header, body || "(empty)"];
+        });
+      }
+      const fallbackText = renderText(msg.content) || renderUnknown(msg.content) || "(no content)";
+      return [`[${timestamp}] ${type}`, fallbackText];
+    };
+    const sortChronological3 = (messages) => {
+      return [...messages].sort((a, b) => {
+        const ta = a.date ? new Date(a.date).getTime() : 0;
+        const tb = b.date ? new Date(b.date).getTime() : 0;
+        return ta - tb;
+      });
+    };
+    const fetchConversationMessages = async (conversationId, agentIdForDefault, pageLimit, maxPages) => {
+      const collected = [];
+      const seenIds = new Set;
+      let cursorBefore;
+      for (let pageIndex = 0;pageIndex < maxPages; pageIndex += 1) {
+        const page = await client.conversations.messages.list(conversationId, {
+          limit: pageLimit,
+          order: "desc",
+          ...conversationId === "default" && agentIdForDefault ? { agent_id: agentIdForDefault } : {},
+          ...cursorBefore ? { before: cursorBefore } : {}
+        });
+        const items = page.getPaginatedItems();
+        if (items.length === 0) {
+          break;
+        }
+        let newItems = 0;
+        for (const item of items) {
+          const id = item.id;
+          if (id && !seenIds.has(id)) {
+            seenIds.add(id);
+            collected.push(item);
+            newItems += 1;
+          }
+        }
+        cursorBefore = items[items.length - 1]?.id;
+        if (newItems === 0 || items.length < pageLimit) {
+          break;
+        }
+      }
+      return sortChronological3(collected);
+    };
     if (action === "search") {
       const query = parsed.values.query;
       if (!query || typeof query !== "string") {
@@ -148846,6 +149339,44 @@ async function runMessagesSubcommand(argv) {
       console.log(JSON.stringify(sorted, null, 2));
       return 0;
     }
+    if (action === "transcript") {
+      const conversationId = parsed.values.conversation || parsed.values["conversation-id"];
+      if (!conversationId || typeof conversationId !== "string") {
+        console.error("Missing conversation id. Pass --conversation <id> or --conversation-id <id>.");
+        return 1;
+      }
+      const agentId = getAgentId5(parsed.values.agent, parsed.values["agent-id"]);
+      if (conversationId === "default" && !agentId) {
+        console.error('Conversation "default" requires an agent id. Set LETTA_AGENT_ID or pass --agent/--agent-id.');
+        return 1;
+      }
+      const pageLimit = Math.max(1, parseLimit3(parsed.values.limit, 100));
+      const maxPages = Math.max(1, parseLimit3(parsed.values["max-pages"], 200));
+      const outputPathRaw = parsed.values.out || parsed.values.output;
+      const messages = await fetchConversationMessages(conversationId, agentId || undefined, pageLimit, maxPages);
+      const transcript = messages.flatMap((msg) => formatEntry(msg)).join(`
+
+`).trim();
+      if (outputPathRaw && typeof outputPathRaw === "string") {
+        const outputPath = resolve23(process.cwd(), outputPathRaw);
+        await writeFile6(outputPath, `${transcript}
+`, "utf-8");
+        console.log(JSON.stringify({
+          conversation_id: conversationId,
+          agent_id: agentId || null,
+          message_count: messages.length,
+          output_path: outputPath
+        }, null, 2));
+        return 0;
+      }
+      console.log(JSON.stringify({
+        conversation_id: conversationId,
+        agent_id: agentId || null,
+        message_count: messages.length,
+        transcript
+      }, null, 2));
+      return 0;
+    }
   } catch (error) {
     console.error(error instanceof Error ? error.message : String(error));
     return 1;
@@ -148886,7 +149417,7 @@ async function runSubcommand(argv) {
 init_readOnlyShell();
 init_shell_command_normalization();
 import { homedir as homedir23 } from "node:os";
-import { isAbsolute as isAbsolute16, join as join29, relative as relative12, resolve as resolve23 } from "node:path";
+import { isAbsolute as isAbsolute16, join as join29, relative as relative12, resolve as resolve24 } 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");
@@ -148922,12 +149453,12 @@ function resolvePlanTargetPath2(targetPath, workingDirectory) {
   if (!trimmedPath)
     return null;
   if (trimmedPath.startsWith("~/")) {
-    return resolve23(homedir23(), trimmedPath.slice(2));
+    return resolve24(homedir23(), trimmedPath.slice(2));
   }
   if (isAbsolute16(trimmedPath)) {
-    return resolve23(trimmedPath);
+    return resolve24(trimmedPath);
   }
-  return resolve23(workingDirectory, trimmedPath);
+  return resolve24(workingDirectory, trimmedPath);
 }
 function isPathInPlansDir2(path23, plansDir) {
   if (!path23.endsWith(".md"))
@@ -149203,7 +149734,7 @@ await __promiseAll([
 ]);
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { homedir as homedir24 } from "node:os";
-import { join as join30, resolve as resolve24 } from "node:path";
+import { join as join30, resolve as resolve25 } from "node:path";
 var DEFAULT_SETTINGS3 = {
   lastAgent: null,
   tokenStreaming: false,
@@ -149228,6 +149759,9 @@ var DEFAULT_LETTA_API_URL2 = "https://api.letta.com";
 function isSubagentProcess2() {
   return process.env.LETTA_CODE_AGENT_ROLE === "subagent";
 }
+function shouldPersistSessionState2() {
+  return process.env.LETTA_CODE_AGENT_ROLE !== "subagent" && process.env.LETTA_DISABLE_SESSION_PERSIST !== "1";
+}
 function normalizeBaseUrl2(baseUrl) {
   let normalized = baseUrl.replace(/^https?:\/\//, "");
   normalized = normalized.replace(/\/$/, "");
@@ -149654,7 +150188,7 @@ class SettingsManager2 {
     return join30(workingDirectory, ".letta", "settings.json");
   }
   isProjectSettingsPathCollidingWithGlobal(workingDirectory) {
-    return resolve24(this.getProjectSettingsPath(workingDirectory)) === resolve24(this.getSettingsPath());
+    return resolve25(this.getProjectSettingsPath(workingDirectory)) === resolve25(this.getSettingsPath());
   }
   getLocalProjectSettingsPath(workingDirectory) {
     return join30(workingDirectory, ".letta", "settings.local.json");
@@ -150616,8 +151150,8 @@ function acquireSwitchLock2() {
   const lock = getSwitchLock2();
   lock.refCount++;
   if (lock.refCount === 1) {
-    lock.promise = new Promise((resolve25) => {
-      lock.resolve = resolve25;
+    lock.promise = new Promise((resolve26) => {
+      lock.resolve = resolve26;
     });
   }
 }
@@ -150888,6 +151422,7 @@ SUBCOMMANDS (JSON-only)
   letta agents list [--query <text> | --name <name> | --tags <tags>]
   letta messages search --query <text> [--all-agents]
   letta messages list [--agent <id>]
+  letta messages transcript --conversation <id> [--out <path>]
   letta blocks list --agent <id>
   letta blocks copy --block-id <id> [--label <label>] [--agent <id>] [--override]
   letta blocks attach --block-id <id> [--agent <id>] [--read-only] [--override]
@@ -151076,14 +151611,6 @@ async function main() {
   }
   const { checkAndAutoUpdate: checkAndAutoUpdate2 } = await init_auto_update().then(() => exports_auto_update);
   const autoUpdatePromise = startStartupAutoUpdateCheck(checkAndAutoUpdate2);
-  const { startDockerVersionCheck: startDockerVersionCheck2 } = await init_startup_docker_check().then(() => exports_startup_docker_check);
-  startDockerVersionCheck2().catch(() => {});
-  const { cleanupOldOverflowFiles: cleanupOldOverflowFiles2 } = await Promise.resolve().then(() => (init_overflow2(), exports_overflow));
-  Promise.resolve().then(() => {
-    try {
-      cleanupOldOverflowFiles2(process.cwd());
-    } catch {}
-  });
   const processedArgs = preprocessCliArgs(process.argv);
   let values;
   let positionals;
@@ -151109,7 +151636,7 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
     printHelp();
     const helpDelayMs = Number.parseInt(process.env.LETTA_TEST_HELP_EXIT_DELAY_MS ?? "", 10);
     if (Number.isFinite(helpDelayMs) && helpDelayMs > 0) {
-      await new Promise((resolve32) => setTimeout(resolve32, helpDelayMs));
+      await new Promise((resolve33) => setTimeout(resolve33, helpDelayMs));
     }
     process.exit(0);
   }
@@ -151194,6 +151721,16 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
   const isHeadless = values.prompt || values.run || !process.stdin.isTTY;
   telemetry2.setSurface(isHeadless ? "headless" : "tui");
   telemetry2.init();
+  if (!isHeadless) {
+    const { startDockerVersionCheck: startDockerVersionCheck2 } = await init_startup_docker_check().then(() => exports_startup_docker_check);
+    startDockerVersionCheck2().catch(() => {});
+    const { cleanupOldOverflowFiles: cleanupOldOverflowFiles2 } = await Promise.resolve().then(() => (init_overflow2(), exports_overflow));
+    Promise.resolve().then(() => {
+      try {
+        cleanupOldOverflowFiles2(process.cwd());
+      } catch {}
+    });
+  }
   if (command && !isHeadless) {
     console.error(`Error: Unknown command or argument "${command}"`);
     console.error("Run 'letta --help' for usage information.");
@@ -151321,9 +151858,9 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
         process.exit(1);
       }
     } else {
-      const { resolve: resolve32 } = await import("path");
+      const { resolve: resolve33 } = await import("path");
       const { existsSync: existsSync40 } = await import("fs");
-      const resolvedPath = resolve32(fromAfFile);
+      const resolvedPath = resolve33(fromAfFile);
       if (!existsSync40(resolvedPath)) {
         console.error(`Error: AgentFile not found: ${resolvedPath}`);
         process.exit(1);
@@ -151798,6 +152335,7 @@ Error: ${message}`);
         setLoadingState("initializing");
         const { createAgent: createAgent3 } = await init_create3().then(() => exports_create2);
         let agent = null;
+        let autoEnableMemfsForFreshAgent = false;
         if (fromAfFile2) {
           setLoadingState("importing");
           let result;
@@ -151882,10 +152420,7 @@ Error: ${message}`);
           });
           agent = result.agent;
           setAgentProvenance(result.provenance);
-          if (willAutoEnableMemfs) {
-            const { enableMemfsIfCloud: enableMemfsIfCloud3 } = await Promise.resolve().then(() => (init_memoryFilesystem2(), exports_memoryFilesystem2));
-            await enableMemfsIfCloud3(agent.id);
-          }
+          autoEnableMemfsForFreshAgent = willAutoEnableMemfs;
         }
         if (!agent && resumingAgentId) {
           try {
@@ -151908,11 +152443,12 @@ Error: ${message}`);
         settingsManager2.updateLocalProjectSettings({ lastAgent: agent.id });
         settingsManager2.updateSettings({ lastAgent: agent.id });
         setAgentContext(agent.id, skillsDirectory2, resolvedSkillSources);
-        const isSubagent = process.env.LETTA_CODE_AGENT_ROLE === "subagent";
         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 startupMemfsFlag = autoEnableMemfsForFreshAgent ? true : memfsFlag;
+        const memfsSyncPromise = Promise.resolve().then(() => (init_memoryFilesystem2(), exports_memoryFilesystem2)).then(({ applyMemfsFlags: applyMemfsFlags3 }) => applyMemfsFlags3(agentId2, startupMemfsFlag, noMemfsFlag, {
+          agentTags,
+          skipPromptUpdate: shouldCreateNew
         }));
         const secretsInitPromise = init_secretsStore2().then(() => exports_secretsStore2).then(({ initSecretsFromServer: initSecretsFromServer3 }) => initSecretsFromServer3(agentId2));
         const isResumingProject = !shouldCreateNew && !!resumingAgentId;
@@ -152053,7 +152589,7 @@ Error: ${message}`);
             }
           }
         }
-        if (!isSubagent) {
+        if (shouldPersistSessionState2()) {
           settingsManager2.persistSession(agent.id, conversationIdToUse);
         }
         setAgentId(agent.id);
@@ -152199,4 +152735,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=594F8E4675FBE99864756E2164756E21
+//# debugId=AA1793542E1A081B64756E2164756E21