@letta-ai/letta-code 0.15.0 → 0.15.1

package/letta.js

@@ -3122,7 +3122,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.15.0",
+    version: "0.15.1",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -4444,7 +4444,7 @@ var init_memoryConstants = __esm(() => {
 });
 
 // src/agent/prompts/approval_recovery_alert.txt
-var approval_recovery_alert_default = `<system-alert>Automated keep-alive ping. Ignore this message and continue from where you stopped.</system-alert>
+var approval_recovery_alert_default = `<system-reminder>Automated keep-alive ping. Ignore this message and continue from where you stopped.</system-reminder>
 `;
 var init_approval_recovery_alert = () => {};
 
@@ -4802,7 +4802,7 @@ As we collaborate, I'll build up an understanding of how they think, what they v
 var init_human = () => {};
 
 // src/agent/prompts/interrupt_recovery_alert.txt
-var interrupt_recovery_alert_default = `<system-alert>The user interrupted the active stream.</system-alert>
+var interrupt_recovery_alert_default = `<system-reminder>The user interrupted the active stream.</system-reminder>
 `;
 var init_interrupt_recovery_alert = () => {};
 
@@ -4940,17 +4940,6 @@ user: Where are errors from the client handled?
 assistant: Clients are marked as failed in the \`connectToServer\` function in src/services/process.ts:712.
 </example>
 
-# Memory
-
-You have an advanced memory system that enables you to remember past interactions and continuously improve your own capabilities.
-Your memory consists of core memory (composed of memory blocks) and external memory:
-- Memory blocks: Each memory block contains a label (title), description (explaining how this block should influence your behavior), and value (the actual content). Memory blocks have size limits. Memory blocks are embedded within your system instructions and are pinned in-context (so they are always visible).
-- External memory: Additional memory storage that is accessible and that you can bring into context with tools when needed.
-
-Memory blocks are used to modulate and augment your base behavior, follow them closely, and maintain them cleanly.
-Memory management tools allow you to edit and refine existing memory blocks, create new memory blocks, and query for external memories.
-Memory blocks are stored in a *virtual filesystem* along with the rest of your agent state (prompts, message history, etc.), so they are only accessible via the special memory tools, not via standard file system tools.
-
 # Skills
  - /<skill-name> (e.g., /commit) is shorthand for users to invoke a skill. When executed, the skill gets expanded to a full prompt. Use the Skill tool to execute them. IMPORTANT: Only use Skill for skills listed in system-reminder messages in the conversation - do not guess or use built-in CLI commands.`;
 var init_letta_claude = () => {};
@@ -5074,17 +5063,6 @@ You are producing plain text that will later be styled by the CLI. Follow these
   * Do not provide range of lines
   * Examples: src/app.ts, src/app.ts:42, b/server/index.js#L10, C:\\repo\\project\\main.rs:12:5
 
-## Memory
-
-You have an advanced memory system that enables you to remember past interactions and continuously improve your own capabilities.
-Your memory consists of core memory (composed of memory blocks) and external memory:
-- Memory blocks: Each memory block contains a label (title), description (explaining how this block should influence your behavior), and value (the actual content). Memory blocks have size limits. Memory blocks are embedded within your system instructions and are pinned in-context (so they are always visible).
-- External memory: Additional memory storage that is accessible and that you can bring into context with tools when needed.
-
-Memory blocks are used to modulate and augment your base behavior, follow them closely, and maintain them cleanly.
-Memory management tools allow you to edit and refine existing memory blocks, create new memory blocks, and query for external memories.
-Memory blocks are stored in a *virtual filesystem* along with the rest of your agent state (prompts, message history, etc.), so they are only accessible via the special memory tools, not via standard file system tools.
-
 ## Skills
  - /<skill-name> (e.g., /commit) is shorthand for users to invoke a skill. When executed, the skill gets expanded to a full prompt. Use the Skill tool to execute them. IMPORTANT: Only use Skill for skills listed in system-reminder messages in the conversation - do not guess or use built-in CLI commands.`;
 var init_letta_codex = () => {};
@@ -5170,16 +5148,6 @@ IT IS CRITICAL TO FOLLOW THESE GUIDELINES TO AVOID EXCESSIVE TOKEN CONSUMPTION.
 - **Interactive Commands:** Prefer non-interactive commands when it makes sense; however, some commands are only interactive and expect user input during their execution (e.g. ssh, vim). If you choose to execute an interactive command consider letting the user know they can press \\\`ctrl + f\\\` to focus into the shell to provide input.
 - **Remembering Facts:** Use the memory tools available to you to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?
 
-# Memory
-You have an advanced memory system that enables you to remember past interactions and continuously improve your own capabilities.
-Your memory consists of core memory (composed of memory blocks) and external memory:
-- Memory blocks: Each memory block contains a label (title), description (explaining how this block should influence your behavior), and value (the actual content). Memory blocks have size limits. Memory blocks are embedded within your system instructions and are pinned in-context (so they are always visible).
-- External memory: Additional memory storage that is accessible and that you can bring into context with tools when needed.
-
-Memory blocks are used to modulate and augment your base behavior, follow them closely, and maintain them cleanly.
-Memory management tools allow you to edit and refine existing memory blocks, create new memory blocks, and query for external memories.
-Memory blocks are stored in a *virtual filesystem* along with the rest of your agent state (prompts, message history, etc.), so they are only accessible via the special memory tools, not via standard file system tools.
-
 # Skills
  - /<skill-name> (e.g., /commit) is shorthand for users to invoke a skill. When executed, the skill gets expanded to a full prompt. Use the Skill tool to execute them. IMPORTANT: Only use Skill for skills listed in system-reminder messages in the conversation - do not guess or use built-in CLI commands.`;
 var init_letta_gemini = () => {};
@@ -5667,67 +5635,29 @@ If the user asks for help or wants to give feedback inform them of the following
 
 When the user directly asks about Letta Code (eg 'can Letta Code do...', 'does Letta Code have...') or asks in second person (eg 'are you able...', 'can you do...'), first use the WebFetch tool to gather information to answer the question from the Letta Code repository at https://github.com/letta-ai/letta-code.
 
-# Memory
-You have an advanced memory system that enables you to remember past interactions and continuously improve your own capabilities.
-Your memory consists of memory blocks and external memory:
-- Memory Blocks: Stored as memory blocks, each containing a label (title), description (explaining how this block should influence your behavior), and value (the actual content). Memory blocks have size limits. Memory blocks are embedded within your system instructions and remain constantly available in-context.
-- External memory: Additional memory storage that is accessible and that you can bring into context with tools when needed.
-
-Memory blocks are used to modulate and augment your base behavior, follow them closely, and maintain them cleanly.
-They are the foundation which makes you *you*.
-
 # Skills
  - /<skill-name> (e.g., /commit) is shorthand for users to invoke a skill. When executed, the skill gets expanded to a full prompt. Use the Skill tool to execute them. IMPORTANT: Only use Skill for skills listed in system-reminder messages in the conversation - do not guess or use built-in CLI commands.
 `;
 var init_system_prompt = () => {};
 
 // src/agent/prompts/system_prompt_memfs.txt
-var system_prompt_memfs_default = `
-## Memory Filesystem
-Your memory is stored in a git repository at \`~/.letta/agents/<agent-id>/memory/\`. This provides full version control, sync with the server, and branching for parallel edits.
-
-### Structure
-\`\`\`
-~/.letta/agents/<agent-id>/
-└── memory/            # Git repo root
-    ├── .git/
-    └── system/        # Blocks in your system prompt
-        ├── persona/
-        ├── human/
-        └── ...
-\`\`\`
-
-### How It Works
-1. Each \`.md\` file in \`memory/system/\` maps to a memory block label (e.g., \`memory/system/persona/soul.md\` → label \`system/persona/soul\`)
-2. Files contain raw block content (no frontmatter)
-3. Changes pushed to git sync to the API within seconds
-4. API changes sync to git automatically
-5. The \`memory_filesystem\` block auto-updates with the current tree view
-
-### Syncing
-\`\`\`bash
-cd ~/.letta/agents/<agent-id>/memory
-
-# See what changed
-git status
-
-# Commit and push your changes
-git add system/
-git commit -m "<type>: <what changed>"  # e.g. "fix: update user prefs", "refactor: reorganize persona blocks"
-git push
+var system_prompt_memfs_default = "\n# Memory\n\nYou have an advanced memory system that enables you to remember past interactions and continuously improve your own capabilities.\n\n## Memory Filesystem\nYour memory is stored in a git repository at `~/.letta/agents/<agent-id>/memory/`. This provides full version control, sync with the server, and create worktrees for parallel edits.\nEach file contains metadata frontmatter include a `description` (the description of the file's contents), `limit` (the character limit), and optional `metadata`.\nThe filesystem tree is always available in your system prompt, along with the contents of files in the `system/` folder.\nYou also have additional external memory (e.g. your message history) that is accessible and that you can bring into context with tools when needed.\n\n## How It Works\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\n2. Changes pushed to git sync to the API server within seconds\n3. API server changes sync to git automatically\n4. The system prompt is only recompiled with the latest memory on the API on compactions or message resets: your local copy may diverge\n\n## Syncing\n```bash\ncd ~/.letta/agents/<agent-id>/memory\n\n# See what changed\ngit status\n\n# Commit and push your changes\ngit add system/\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 ~/.letta/agents/<agent-id>/memory log --oneline\n```\n";
+var init_system_prompt_memfs = () => {};
 
-# Get latest from server
-git pull
-\`\`\`
+// src/agent/prompts/system_prompt_memory.txt
+var system_prompt_memory_default = `
+# Memory
 
-The system will remind you when your memory has uncommitted changes. Sync when convenient.
+You have an advanced memory system that enables you to remember past interactions and continuously improve your own capabilities.
+Your memory consists of core memory (composed of memory blocks) and external memory:
+- Memory blocks: Each memory block contains a label (title), description (explaining how this block should influence your behavior), and value (the actual content). Memory blocks have size limits. Memory blocks are embedded within your system instructions and are pinned in-context (so they are always visible).
+- External memory: Additional memory storage that is accessible and that you can bring into context with tools when needed.
 
-### History
-\`\`\`bash
-git -C ~/.letta/agents/<agent-id>/memory log --oneline
-\`\`\`
+Memory blocks are used to modulate and augment your base behavior, follow them closely, and maintain them cleanly.
+Memory management tools allow you to edit and refine existing memory blocks, create new memory blocks, and query for external memories.
+Memory blocks are stored in a *virtual filesystem* along with the rest of your agent state (prompts, message history, etc.), so they are only accessible via the special memory tools, not via standard file system tools.
 `;
-var init_system_prompt_memfs = () => {};
+var init_system_prompt_memory = () => {};
 
 // src/utils/error.ts
 function getErrorMessage2(error) {
@@ -5992,6 +5922,10 @@ cd "$MEMORY_DIR"
 git worktree add "$WORKTREE_DIR/$BRANCH_NAME" -b "$BRANCH_NAME"
 \`\`\`
 
+If \`git worktree add\` fails because main is locked or busy,
+retry up to 3 times with backoff (sleep 2, 5, 10 seconds).
+Never delete \`.git/index.lock\` manually.
+
 All your edits go in \`$WORKTREE_DIR/$BRANCH_NAME/\`.
 
 ### 2. Read existing memory
@@ -6017,17 +5951,37 @@ Write memory files the way the agent would want to read them — clean, actionab
 
 ### 6. Commit
 
+Use Conventional Commits format with the \`(history-analyzer)\`
+scope and ⏳ signature:
+
 \`\`\`bash
 cd $WORKTREE_DIR/$BRANCH_NAME
 git add -A
-git commit -m "history-analyzer: [summary of what was learned]
+git commit -m "<type>(history-analyzer): [summary] ⏳
 
 Source: [file path] ([N] prompts, [DATE RANGE])
 Key updates:
 - [file]: [what was added/changed]
-..."
+...
+
+Generated-By: Letta Code
+Agent-ID: $LETTA_AGENT_ID
+Parent-Agent-ID: $LETTA_PARENT_AGENT_ID"
 \`\`\`
 
+**Commit type** — pick the one that fits:
+- \`chore\` — routine history ingestion (most common)
+- \`feat\` — adding wholly new memory blocks/topics
+- \`refactor\` — reorganizing memory by domain/project
+
+**Example subjects:**
+- \`chore(history-analyzer): ingest Claude Code history 2025-09 ⏳\`
+- \`refactor(history-analyzer): reorganize memory by project domain ⏳\`
+
+**Trailers:** Omit \`Agent-ID\` or \`Parent-Agent-ID\` if the
+corresponding environment variable is unset (don't write
+the literal variable name).
+
 ## Important
 
 - Create your own worktree and work there — do NOT edit the memory dir directly
@@ -7019,11 +6973,14 @@ cd "$MEMORY_DIR"
 git log --oneline -10
 \`\`\`
 
-Look for commits starting with "reflection:" - the most
-recent one tells you when the last reflection ran. When
-searching conversation history in Phase 2, you only need
-to go back to roughly that time. If there are no prior
-reflection commits, search a larger window.
+Look for reflection commits — they may use legacy
+\`reflection:\` subjects, include 🔮 in the subject line,
+and/or have a \`(reflection)\` scope (e.g.,
+\`chore(reflection): ...\`). The most recent one tells you
+when the last reflection ran. When searching conversation
+history in Phase 2, you only need to go back to roughly
+that time. If there are no prior reflection commits, search
+a larger window.
 
 **Step 1b: Create worktree**
 
@@ -7090,6 +7047,14 @@ to search the parent agent's history, not your own.
 - Prefer substance over trivia.
 - Corrections and frustrations are HIGH priority.
 
+**If nothing is worth saving** (rare — most conversations
+have at least something): If after thorough review you
+genuinely find nothing new worth preserving, skip Phase 4,
+clean up the worktree (Step 5d), and report "reviewed N
+messages, no updates needed." But be sure you've looked
+carefully — corrections, preferences, and project context
+are easy to overlook.
+
 ### Phase 4: Update Memory Files in Worktree
 
 Edit files in the **worktree**, not the main memory dir:
@@ -7140,55 +7105,169 @@ Read({ file_path: "$WORK/persona/soul.md" })
 - **Attribute when useful** - "Prefers X over Y
   (corrected agent on 2025-12-15)".
 
-### Phase 5: Commit, Merge, Clean Up
+### Phase 5: Merge, Push, and Clean Up (MANDATORY)
+
+Your reflection has two completion states:
+- **Complete**: merged to main AND pushed to remote.
+- **Partially complete**: merged to main, push failed.
+  Clean up the worktree, but report that local main is
+  ahead of remote and needs a push.
 
-After all edits are done:
+The commit in the worktree is neither — it's an intermediate
+step. Without at least a merge to main, your work is lost.
+
+**Step 5a: Commit in worktree**
 
 \`\`\`bash
 MEMORY_DIR=~/.letta/agents/$LETTA_PARENT_AGENT_ID/memory
 WORKTREE_DIR=~/.letta/agents/$LETTA_PARENT_AGENT_ID/memory-worktrees
 cd $WORKTREE_DIR/$BRANCH
-
-# Stage and commit all changes
 git add -A
-git commit -m "reflection: <summary of what was learned>
+\`\`\`
+
+Check \`git status\` — if there are no changes to commit,
+skip straight to Step 5d (cleanup). Report "no updates
+needed" in your output.
+
+If there are changes, commit using Conventional Commits
+format with the \`(reflection)\` scope and 🔮 signature:
+
+\`\`\`bash
+git commit -m "<type>(reflection): <summary> 🔮
 
 Reviewed messages from <start-date> to <end-date>.
 
 Updates:
 - <bullet point for each memory update made>
-- <what conversation context prompted each update>"
+- <what conversation context prompted each update>
+
+Generated-By: Letta Code
+Agent-ID: <value of $LETTA_AGENT_ID>
+Parent-Agent-ID: <value of $LETTA_PARENT_AGENT_ID>"
+\`\`\`
+
+**Commit type** — pick the one that fits:
+- \`chore\` — routine memory consolidation (most common)
+- \`fix\` — correcting stale or wrong memory entries
+- \`feat\` — adding a wholly new memory block/topic
+- \`refactor\` — restructuring existing content
+- \`docs\` — documentation-style notes
+
+**Example subjects:**
+- \`chore(reflection): consolidate recent learnings 🔮\`
+- \`fix(reflection): correct stale user preference note 🔮\`
+- \`feat(reflection): add new project context block 🔮\`
+
+**Trailers:** Omit \`Agent-ID\` or \`Parent-Agent-ID\` if the
+corresponding environment variable is unset (don't write
+the literal variable name).
 
-# Merge back to main branch
+**Step 5b: Pull + merge to main**
+
+\`\`\`bash
 cd $MEMORY_DIR
+\`\`\`
+
+First, check that main is in a clean state (\`git status\`).
+If a merge or rebase is in progress (lock file, dirty
+index), wait and retry up to 3 times with backoff (sleep 2,
+5, 10 seconds). Never delete \`.git/index.lock\` manually.
+If still busy after retries, go to Error Handling.
+
+Pull from remote:
+
+\`\`\`bash
+git pull --ff-only
+\`\`\`
+
+If \`--ff-only\` fails (remote has diverged), fall back:
+
+\`\`\`bash
+git pull --rebase
+\`\`\`
+
+If rebase has conflicts, resolve them autonomously to
+stabilize local \`main\` against remote \`main\` first. In this
+step, prefer **remote main** content for conflicting files,
+then run \`git rebase --continue\`.
+
+Important: do not apply reflection branch content yet during
+this rebase step. Reflection edits are merged later in this
+phase with \`git merge $BRANCH --no-edit\`.
+
+Now merge the reflection branch:
+
+\`\`\`bash
 git merge $BRANCH --no-edit
+\`\`\`
+
+If the merge has conflicts, resolve by preferring reflection
+branch/worktree content for memory files, stage the resolved
+files, and complete with \`git commit --no-edit\`.
+
+If you cannot resolve conflicts after 2 attempts, go to
+Error Handling.
+
+**Step 5c: Push to remote**
+
+\`\`\`bash
+git push
+\`\`\`
+
+If push fails, retry once. If it still fails, report that
+local main is ahead of remote and needs a push. Proceed to
+cleanup — the merge succeeded and data is safe on local
+main.
+
+**Step 5d: Clean up worktree and branch**
+
+Only clean up when merge to main completed (success or
+partially complete):
 
-# Clean up worktree and branch
+\`\`\`bash
 git worktree remove $WORKTREE_DIR/$BRANCH
 git branch -d $BRANCH
 \`\`\`
 
-If the merge has conflicts, resolve them by preferring
-the worktree's version (your edits are newer).
+**Step 5e: Verify**
+
+\`\`\`bash
+git status
+git log --oneline -3
+\`\`\`
+
+Confirm main is clean and your reflection commit (🔮 in
+subject) is visible in the log.
 
 ## Error Handling
 
-If anything goes wrong (git not available, memory dir
-not initialized, worktree creation fails, merge conflicts
-you can't resolve, etc.):
+If anything goes wrong at any phase:
 
-1. Clean up any partial worktree if possible:
+1. Stabilize main first (abort in-progress operations):
    \`\`\`bash
    cd $MEMORY_DIR
-   git worktree remove $WORKTREE_DIR/$BRANCH 2>/dev/null
-   git branch -d $BRANCH 2>/dev/null
+   git merge --abort 2>/dev/null
+   git rebase --abort 2>/dev/null
    \`\`\`
-2. Report the error clearly in your output, including:
+
+2. Do NOT clean up the worktree or branch on failure —
+   preserve them for debugging and manual recovery.
+
+3. Report clearly in your output:
    - What failed and the error message
-   - What state things were left in
-   - Suggested fix for the main agent or user
-3. Do NOT leave uncommitted changes in the main memory
-   directory.
+   - Worktree path: \`$WORKTREE_DIR/$BRANCH\`
+   - Branch name: \`$BRANCH\`
+   - Whether main has uncommitted/dirty state
+   - Concrete resume commands, e.g.:
+     \`\`\`bash
+     cd ~/.letta/agents/$LETTA_PARENT_AGENT_ID/memory
+     git merge <branch-name> --no-edit
+     git push
+     git worktree remove ../memory-worktrees/<branch-name>
+     git branch -d <branch-name>
+     \`\`\`
+
+4. Do NOT leave uncommitted changes on main.
 
 ## Output Format
 
@@ -7221,8 +7300,9 @@ For each edit:
 4. **Don't reorganize** - Add/update, don't restructure
 5. **Be selective** - Few meaningful > many trivial
 6. **No relative dates** - "2025-12-15", not "today"
-7. **Always commit and merge** - Don't leave dangling
-   worktrees or uncommitted changes
+7. **Always commit, merge, AND push** - Your work is wasted
+   if it isn't merged to main and pushed to remote. Don't
+   leave dangling worktrees or unsynced changes.
 8. **Report errors clearly** - If something breaks, say
    what happened and suggest a fix
 `;
@@ -7419,6 +7499,7 @@ var init_subagents = __esm(() => {
 var exports_promptAssets = {};
 __export(exports_promptAssets, {
   resolveSystemPrompt: () => resolveSystemPrompt,
+  SYSTEM_PROMPT_MEMORY_ADDON: () => SYSTEM_PROMPT_MEMORY_ADDON,
   SYSTEM_PROMPT_MEMFS_ADDON: () => SYSTEM_PROMPT_MEMFS_ADDON,
   SYSTEM_PROMPTS: () => SYSTEM_PROMPTS,
   SYSTEM_PROMPT: () => SYSTEM_PROMPT,
@@ -7447,7 +7528,7 @@ async function resolveSystemPrompt(systemPromptPreset) {
   }
   return SYSTEM_PROMPT;
 }
-var SYSTEM_PROMPT, SYSTEM_PROMPT_MEMFS_ADDON, PLAN_MODE_REMINDER, SKILL_CREATOR_PROMPT, REMEMBER_PROMPT, MEMORY_CHECK_REMINDER, MEMORY_REFLECTION_REMINDER, APPROVAL_RECOVERY_PROMPT, INTERRUPT_RECOVERY_ALERT, MEMORY_PROMPTS, SYSTEM_PROMPTS;
+var SYSTEM_PROMPT, SYSTEM_PROMPT_MEMORY_ADDON, SYSTEM_PROMPT_MEMFS_ADDON, PLAN_MODE_REMINDER, SKILL_CREATOR_PROMPT, REMEMBER_PROMPT, MEMORY_CHECK_REMINDER, MEMORY_REFLECTION_REMINDER, APPROVAL_RECOVERY_PROMPT, INTERRUPT_RECOVERY_ALERT, MEMORY_PROMPTS, SYSTEM_PROMPTS;
 var init_promptAssets = __esm(() => {
   init_approval_recovery_alert();
   init_claude();
@@ -7472,7 +7553,9 @@ var init_promptAssets = __esm(() => {
   init_style();
   init_system_prompt();
   init_system_prompt_memfs();
+  init_system_prompt_memory();
   SYSTEM_PROMPT = system_prompt_default;
+  SYSTEM_PROMPT_MEMORY_ADDON = system_prompt_memory_default;
   SYSTEM_PROMPT_MEMFS_ADDON = system_prompt_memfs_default;
   PLAN_MODE_REMINDER = plan_mode_reminder_default;
   SKILL_CREATOR_PROMPT = skill_creator_mode_default;
@@ -31274,11 +31357,11 @@ var init_build2 = __esm(async () => {
 // src/agent/client.ts
 var exports_client = {};
 __export(exports_client, {
-  getServerUrl: () => getServerUrl2,
+  getServerUrl: () => getServerUrl,
   getClient: () => getClient2
 });
 import { hostname as hostname2 } from "node:os";
-function getServerUrl2() {
+function getServerUrl() {
   const settings = settingsManager.getSettings();
   return process.env.LETTA_BASE_URL || settings.env?.LETTA_BASE_URL || LETTA_CLOUD_API_URL;
 }
@@ -31331,10 +31414,12 @@ var init_client2 = __esm(async () => {
 });
 
 // src/constants.ts
-var DEFAULT_AGENT_NAME = "Nameless Agent", INTERRUPTED_BY_USER = "Interrupted by user", SYSTEM_REMINDER_TAG = "system-reminder", SYSTEM_REMINDER_OPEN, SYSTEM_REMINDER_CLOSE, MEMFS_CONFLICT_CHECK_INTERVAL = 5, COMPACTION_SUMMARY_HEADER = "(Earlier messages in this conversation have been compacted to free up context, summarized below)", TOKEN_DISPLAY_THRESHOLD = 100, ELAPSED_DISPLAY_THRESHOLD_MS;
+var DEFAULT_AGENT_NAME = "Nameless Agent", INTERRUPTED_BY_USER = "Interrupted by user", SYSTEM_REMINDER_TAG = "system-reminder", SYSTEM_REMINDER_OPEN, SYSTEM_REMINDER_CLOSE, SYSTEM_ALERT_TAG = "system-alert", SYSTEM_ALERT_OPEN, SYSTEM_ALERT_CLOSE, MEMFS_CONFLICT_CHECK_INTERVAL = 5, COMPACTION_SUMMARY_HEADER = "(Earlier messages in this conversation have been compacted to free up context, summarized below)", TOKEN_DISPLAY_THRESHOLD = 100, ELAPSED_DISPLAY_THRESHOLD_MS;
 var init_constants = __esm(() => {
   SYSTEM_REMINDER_OPEN = `<${SYSTEM_REMINDER_TAG}>`;
   SYSTEM_REMINDER_CLOSE = `</${SYSTEM_REMINDER_TAG}>`;
+  SYSTEM_ALERT_OPEN = `<${SYSTEM_ALERT_TAG}>`;
+  SYSTEM_ALERT_CLOSE = `</${SYSTEM_ALERT_TAG}>`;
   ELAPSED_DISPLAY_THRESHOLD_MS = 60 * 1000;
 });
 
@@ -33543,11 +33628,23 @@ var init_models2 = __esm(() => {
         context_window: 200000
       }
     },
+    {
+      id: "minimax-m2.5",
+      handle: "minimax/MiniMax-M2.5",
+      label: "MiniMax 2.5",
+      description: "MiniMax's latest coding model",
+      isFeatured: true,
+      free: true,
+      updateArgs: {
+        context_window: 160000,
+        max_output_tokens: 64000
+      }
+    },
     {
       id: "minimax-m2.1",
       handle: "minimax/MiniMax-M2.1",
       label: "MiniMax 2.1",
-      description: "MiniMax's latest coding model",
+      description: "MiniMax's latest coding model (legacy)",
       isFeatured: true,
       free: true,
       updateArgs: {
@@ -34090,7 +34187,7 @@ function getMemoryRepoDir(agentId) {
   return join3(getAgentRootDir(agentId), "memory");
 }
 function getGitRemoteUrl(agentId) {
-  const baseUrl = getServerUrl2();
+  const baseUrl = getServerUrl();
   return `${baseUrl}/v1/git/${agentId}/state.git`;
 }
 async function getAuthToken() {
@@ -34115,7 +34212,7 @@ async function runGit(cwd2, args, token) {
   };
 }
 async function configureLocalCredentialHelper(dir, token) {
-  const baseUrl = getServerUrl2();
+  const baseUrl = getServerUrl();
   const helper = `!f() { echo "username=letta"; echo "password=${token}"; }; f`;
   await runGit(dir, ["config", `credential.${baseUrl}.helper`, helper]);
   debugLog("memfs-git", "Configured local credential helper");
@@ -34865,6 +34962,7 @@ __export(exports_context, {
   setConversationId: () => setConversationId2,
   setAgentContext: () => setAgentContext2,
   getSkillsDirectory: () => getSkillsDirectory,
+  getNoSkills: () => getNoSkills,
   getCurrentAgentId: () => getCurrentAgentId,
   getConversationId: () => getConversationId
 });
@@ -34874,14 +34972,16 @@ function getContext2() {
     global2[CONTEXT_KEY2] = {
       agentId: null,
       skillsDirectory: null,
+      noSkills: false,
       conversationId: null
     };
   }
   return global2[CONTEXT_KEY2];
 }
-function setAgentContext2(agentId, skillsDirectory) {
+function setAgentContext2(agentId, skillsDirectory, noSkills) {
   context2.agentId = agentId;
   context2.skillsDirectory = skillsDirectory || null;
+  context2.noSkills = noSkills ?? false;
 }
 function setCurrentAgentId(agentId) {
   context2.agentId = agentId;
@@ -34895,6 +34995,9 @@ function getCurrentAgentId() {
 function getSkillsDirectory() {
   return context2.skillsDirectory;
 }
+function getNoSkills() {
+  return context2.noSkills;
+}
 function setConversationId2(conversationId) {
   context2.conversationId = conversationId;
 }
@@ -37380,9 +37483,13 @@ var init_process_manager = __esm(() => {
 // src/tools/impl/shellEnv.ts
 var exports_shellEnv = {};
 __export(exports_shellEnv, {
-  getShellEnv: () => getShellEnv
+  resolveLettaInvocation: () => resolveLettaInvocation,
+  getShellEnv: () => getShellEnv,
+  ensureLettaShimDir: () => ensureLettaShimDir
 });
+import { mkdirSync as mkdirSync4, writeFileSync as writeFileSync2 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
+import { tmpdir } from "node:os";
 import * as path3 from "node:path";
 import { fileURLToPath } from "node:url";
 function getRipgrepBinDir() {
@@ -37406,12 +37513,81 @@ function getPackageNodeModulesDir() {
     return;
   }
 }
+function parseInvocationArgs(raw) {
+  if (!raw)
+    return [];
+  try {
+    const parsed = JSON.parse(raw);
+    if (Array.isArray(parsed) && parsed.every((item) => typeof item === "string")) {
+      return parsed;
+    }
+  } catch {}
+  return [];
+}
+function isDevLettaEntryScript(scriptPath) {
+  const normalized = scriptPath.replaceAll("\\", "/");
+  return normalized.endsWith("/src/index.ts");
+}
+function resolveLettaInvocation(env3 = process.env, argv = process.argv, execPath = process.execPath) {
+  const explicitBin = env3.LETTA_CODE_BIN?.trim();
+  if (explicitBin) {
+    return {
+      command: explicitBin,
+      args: parseInvocationArgs(env3[LETTA_BIN_ARGS_ENV])
+    };
+  }
+  const scriptPath = argv[1] || "";
+  if (scriptPath && isDevLettaEntryScript(scriptPath)) {
+    return { command: execPath, args: [scriptPath] };
+  }
+  return null;
+}
+function shellEscape(arg) {
+  return `'${arg.replaceAll("'", `'"'"'`)}'`;
+}
+function ensureLettaShimDir(invocation) {
+  if (!invocation.command)
+    return null;
+  const shimDir = path3.join(tmpdir(), "letta-code-shell-shim");
+  mkdirSync4(shimDir, { recursive: true });
+  if (process.platform === "win32") {
+    const cmdPath = path3.join(shimDir, "letta.cmd");
+    const quotedCommand = `"${invocation.command.replaceAll('"', '""')}"`;
+    const quotedArgs = invocation.args.map((arg) => `"${arg.replaceAll('"', '""')}"`).join(" ");
+    writeFileSync2(cmdPath, `@echo off\r
+${quotedCommand} ${quotedArgs} %*\r
+`);
+    return shimDir;
+  }
+  const shimPath = path3.join(shimDir, "letta");
+  const commandWithArgs = [invocation.command, ...invocation.args].map(shellEscape).join(" ");
+  writeFileSync2(shimPath, `#!/bin/sh
+exec ${commandWithArgs} "$@"
+`, {
+    mode: 493
+  });
+  return shimDir;
+}
 function getShellEnv() {
   const env3 = { ...process.env };
+  const pathKey = Object.keys(env3).find((k) => k.toUpperCase() === "PATH") || "PATH";
+  const pathPrefixes = [];
+  const lettaInvocation = resolveLettaInvocation(env3);
+  if (lettaInvocation) {
+    env3.LETTA_CODE_BIN = lettaInvocation.command;
+    env3[LETTA_BIN_ARGS_ENV] = JSON.stringify(lettaInvocation.args);
+    const shimDir = ensureLettaShimDir(lettaInvocation);
+    if (shimDir) {
+      pathPrefixes.push(shimDir);
+    }
+  }
   const rgBinDir = getRipgrepBinDir();
   if (rgBinDir) {
-    const pathKey = Object.keys(env3).find((k) => k.toUpperCase() === "PATH") || "PATH";
-    env3[pathKey] = `${rgBinDir}${path3.delimiter}${env3[pathKey] || ""}`;
+    pathPrefixes.push(rgBinDir);
+  }
+  if (pathPrefixes.length > 0) {
+    const existingPath = env3[pathKey] || "";
+    env3[pathKey] = existingPath ? `${pathPrefixes.join(path3.delimiter)}${path3.delimiter}${existingPath}` : pathPrefixes.join(path3.delimiter);
   }
   try {
     env3.LETTA_AGENT_ID = getCurrentAgentId();
@@ -37423,7 +37599,7 @@ function getShellEnv() {
         env3.LETTA_API_KEY = settings.env.LETTA_API_KEY;
       }
       if (!env3.LETTA_BASE_URL) {
-        env3.LETTA_BASE_URL = getServerUrl2();
+        env3.LETTA_BASE_URL = getServerUrl();
       }
     } catch {}
   }
@@ -37440,6 +37616,7 @@ function getShellEnv() {
   }
   return env3;
 }
+var LETTA_BIN_ARGS_ENV = "LETTA_CODE_BIN_ARGS_JSON";
 var init_shellEnv = __esm(async () => {
   init_context();
   await __promiseAll([
@@ -38122,7 +38299,7 @@ var init_Edit2 = () => {};
 
 // src/cli/helpers/planName.ts
 import { homedir as homedir9 } from "node:os";
-import { join as join8 } from "node:path";
+import { join as join9 } from "node:path";
 function randomElement(arr) {
   return arr[Math.floor(Math.random() * arr.length)];
 }
@@ -38134,7 +38311,7 @@ function generatePlanName() {
 }
 function generatePlanFilePath() {
   const name = generatePlanName();
-  return join8(homedir9(), ".letta", "plans", `${name}.md`);
+  return join9(homedir9(), ".letta", "plans", `${name}.md`);
 }
 var adjectives, nouns;
 var init_planName = __esm(() => {
@@ -38244,7 +38421,7 @@ __export(exports_mode, {
   permissionMode: () => permissionMode2
 });
 import { homedir as homedir10 } from "node:os";
-import { join as join9 } from "node:path";
+import { join as join10 } from "node:path";
 function getGlobalMode2() {
   const global2 = globalThis;
   if (!global2[MODE_KEY2]) {
@@ -38365,7 +38542,7 @@ class PermissionModeManager2 {
           return "allow";
         }
         if (writeTools.includes(toolName)) {
-          const plansDir = join9(homedir10(), ".letta", "plans");
+          const plansDir = join10(homedir10(), ".letta", "plans");
           let targetPath = toolArgs?.file_path || toolArgs?.path;
           if ((toolName === "ApplyPatch" || toolName === "apply_patch") && toolArgs?.input) {
             const input = toolArgs.input;
@@ -40393,7 +40570,7 @@ var init_LS2 = __esm(() => {
 
 // src/tools/impl/LS.ts
 import { readdir as readdir3, stat } from "node:fs/promises";
-import { join as join11, resolve as resolve7 } from "node:path";
+import { join as join12, resolve as resolve7 } from "node:path";
 async function ls(args) {
   validateRequiredParams(args, ["path"], "LS");
   validateParamTypes(args, LS_default2, "LS");
@@ -40403,7 +40580,7 @@ async function ls(args) {
     const items = await readdir3(dirPath);
     const filteredItems = items.filter((item) => !ignore.some((pattern) => import_picomatch.default.isMatch(item, pattern)));
     const fileInfos = await Promise.all(filteredItems.map(async (item) => {
-      const fullPath = join11(dirPath, item);
+      const fullPath = join12(dirPath, item);
       try {
         const stats = await stat(fullPath);
         return {
@@ -40564,12 +40741,12 @@ __export(exports_imageResize_magick, {
   MAX_IMAGE_BYTES: () => MAX_IMAGE_BYTES
 });
 import { execSync } from "node:child_process";
-import { readFileSync as readFileSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "node:fs";
-import { tmpdir } from "node:os";
-import { join as join12 } from "node:path";
+import { readFileSync as readFileSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync4 } from "node:fs";
+import { tmpdir as tmpdir2 } from "node:os";
+import { join as join13 } from "node:path";
 async function getImageDimensions(buffer) {
-  const tempInput = join12(tmpdir(), `image-${Date.now()}-${Math.random().toString(36).slice(2)}.tmp`);
-  writeFileSync3(tempInput, buffer);
+  const tempInput = join13(tmpdir2(), `image-${Date.now()}-${Math.random().toString(36).slice(2)}.tmp`);
+  writeFileSync4(tempInput, buffer);
   try {
     const output = execSync(`magick identify -format "%w %h %m" "${tempInput}"`, {
       encoding: "utf-8"
@@ -40591,12 +40768,12 @@ async function compressToFitByteLimit(buffer, currentWidth, currentHeight) {
   if (buffer.length <= MAX_IMAGE_BYTES) {
     return null;
   }
-  const tempInput = join12(tmpdir(), `compress-input-${Date.now()}-${Math.random().toString(36).slice(2)}.tmp`);
-  writeFileSync3(tempInput, buffer);
+  const tempInput = join13(tmpdir2(), `compress-input-${Date.now()}-${Math.random().toString(36).slice(2)}.tmp`);
+  writeFileSync4(tempInput, buffer);
   try {
     const qualities = [85, 70, 55, 40];
     for (const quality of qualities) {
-      const tempOutput = join12(tmpdir(), `compress-output-${Date.now()}-${Math.random().toString(36).slice(2)}.jpg`);
+      const tempOutput = join13(tmpdir2(), `compress-output-${Date.now()}-${Math.random().toString(36).slice(2)}.jpg`);
       try {
         execSync(`magick "${tempInput}" -quality ${quality} "${tempOutput}"`, {
           stdio: "ignore"
@@ -40622,7 +40799,7 @@ async function compressToFitByteLimit(buffer, currentWidth, currentHeight) {
     for (const scale of scales) {
       const scaledWidth = Math.floor(currentWidth * scale);
       const scaledHeight = Math.floor(currentHeight * scale);
-      const tempOutput = join12(tmpdir(), `compress-output-${Date.now()}-${Math.random().toString(36).slice(2)}.jpg`);
+      const tempOutput = join13(tmpdir2(), `compress-output-${Date.now()}-${Math.random().toString(36).slice(2)}.jpg`);
       try {
         execSync(`magick "${tempInput}" -resize ${scaledWidth}x${scaledHeight} -quality 70 "${tempOutput}"`, {
           stdio: "ignore"
@@ -40666,11 +40843,11 @@ async function resizeImageIfNeeded(buffer, inputMediaType) {
       resized: false
     };
   }
-  const tempInput = join12(tmpdir(), `resize-input-${Date.now()}-${Math.random().toString(36).slice(2)}.tmp`);
-  writeFileSync3(tempInput, buffer);
+  const tempInput = join13(tmpdir2(), `resize-input-${Date.now()}-${Math.random().toString(36).slice(2)}.tmp`);
+  writeFileSync4(tempInput, buffer);
   try {
     if (needsResize) {
-      const tempOutput2 = join12(tmpdir(), `resize-output-${Date.now()}-${Math.random().toString(36).slice(2)}`);
+      const tempOutput2 = join13(tmpdir2(), `resize-output-${Date.now()}-${Math.random().toString(36).slice(2)}`);
       let outputBuffer2;
       let outputMediaType;
       if (format2 === "jpeg" || format2 === "jpg") {
@@ -40701,7 +40878,7 @@ async function resizeImageIfNeeded(buffer, inputMediaType) {
         resized: true
       };
     }
-    const tempOutput = join12(tmpdir(), `convert-output-${Date.now()}-${Math.random().toString(36).slice(2)}.png`);
+    const tempOutput = join13(tmpdir2(), `convert-output-${Date.now()}-${Math.random().toString(36).slice(2)}.png`);
     execSync(`magick "${tempInput}" "${tempOutput}"`, {
       stdio: "ignore"
     });
@@ -53971,17 +54148,17 @@ __export(exports_skills, {
 });
 import { existsSync as existsSync7 } from "node:fs";
 import { readdir as readdir5, readFile as readFile3 } from "node:fs/promises";
-import { dirname as dirname4, join as join13 } from "node:path";
+import { dirname as dirname4, join as join14 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 function getBundledSkillsPath() {
   const thisDir = dirname4(fileURLToPath6(import.meta.url));
   if (thisDir.includes("src/agent") || thisDir.includes("src\\agent")) {
-    return join13(thisDir, "../skills/builtin");
+    return join14(thisDir, "../skills/builtin");
   }
-  return join13(thisDir, "skills");
+  return join14(thisDir, "skills");
 }
 function getAgentSkillsDir(agentId) {
-  return join13(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents", agentId, "skills");
+  return join14(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents", agentId, "skills");
 }
 async function getBundledSkills() {
   const bundledPath = getBundledSkillsPath();
@@ -54004,12 +54181,14 @@ async function discoverSkillsFromDir(skillsPath, source) {
   }
   return { skills, errors };
 }
-async function discoverSkills(projectSkillsPath = join13(process.cwd(), SKILLS_DIR), agentId) {
+async function discoverSkills(projectSkillsPath = join14(process.cwd(), SKILLS_DIR), agentId, options) {
   const allErrors = [];
   const skillsById = new Map;
-  const bundledSkills = await getBundledSkills();
-  for (const skill of bundledSkills) {
-    skillsById.set(skill.id, skill);
+  if (!options?.skipBundled) {
+    const bundledSkills = await getBundledSkills();
+    for (const skill of bundledSkills) {
+      skillsById.set(skill.id, skill);
+    }
   }
   const globalResult = await discoverSkillsFromDir(GLOBAL_SKILLS_DIR, "global");
   allErrors.push(...globalResult.errors);
@@ -54038,7 +54217,7 @@ async function findSkillFiles(currentPath, rootPath, skills, errors, source) {
   try {
     const entries = await readdir5(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join13(currentPath, entry.name);
+      const fullPath = join14(currentPath, entry.name);
       if (entry.isDirectory()) {
         await findSkillFiles(fullPath, rootPath, skills, errors, source);
       } else if (entry.isFile() && entry.name.toUpperCase() === "SKILL.MD") {
@@ -54112,7 +54291,7 @@ ${lines.join(`
 }
 var SKILLS_DIR = ".skills", GLOBAL_SKILLS_DIR;
 var init_skills = __esm(() => {
-  GLOBAL_SKILLS_DIR = join13(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
+  GLOBAL_SKILLS_DIR = join14(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
 });
 
 // src/tools/impl/skillContentRegistry.ts
@@ -54137,7 +54316,7 @@ var init_skillContentRegistry = __esm(() => {
 // src/tools/impl/Skill.ts
 import { readdirSync as readdirSync3 } from "node:fs";
 import { readFile as readFile4 } from "node:fs/promises";
-import { dirname as dirname5, join as join14 } from "node:path";
+import { dirname as dirname5, join as join15 } from "node:path";
 function hasAdditionalFiles(skillMdPath) {
   try {
     const skillDir = dirname5(skillMdPath);
@@ -54148,19 +54327,19 @@ function hasAdditionalFiles(skillMdPath) {
   }
 }
 async function readSkillContent(skillId, skillsDir, agentId) {
-  const projectSkillPath = join14(skillsDir, skillId, "SKILL.md");
+  const projectSkillPath = join15(skillsDir, skillId, "SKILL.md");
   try {
     const content = await readFile4(projectSkillPath, "utf-8");
     return { content, path: projectSkillPath };
   } catch {}
   if (agentId) {
-    const agentSkillPath = join14(getAgentSkillsDir(agentId), skillId, "SKILL.md");
+    const agentSkillPath = join15(getAgentSkillsDir(agentId), skillId, "SKILL.md");
     try {
       const content = await readFile4(agentSkillPath, "utf-8");
       return { content, path: agentSkillPath };
     } catch {}
   }
-  const globalSkillPath = join14(GLOBAL_SKILLS_DIR, skillId, "SKILL.md");
+  const globalSkillPath = join15(GLOBAL_SKILLS_DIR, skillId, "SKILL.md");
   try {
     const content = await readFile4(globalSkillPath, "utf-8");
     return { content, path: globalSkillPath };
@@ -54174,8 +54353,8 @@ async function readSkillContent(skillId, skillsDir, agentId) {
     } catch {}
   }
   try {
-    const bundledSkillsDir = join14(process.cwd(), "skills", "skills");
-    const bundledSkillPath = join14(bundledSkillsDir, skillId, "SKILL.md");
+    const bundledSkillsDir = join15(process.cwd(), "skills", "skills");
+    const bundledSkillPath = join15(bundledSkillsDir, skillId, "SKILL.md");
     const content = await readFile4(bundledSkillPath, "utf-8");
     return { content, path: bundledSkillPath };
   } catch {
@@ -54187,7 +54366,7 @@ async function getResolvedSkillsDir() {
   if (skillsDir) {
     return skillsDir;
   }
-  return join14(process.cwd(), SKILLS_DIR);
+  return join15(process.cwd(), SKILLS_DIR);
 }
 async function skill(args) {
   validateRequiredParams(args, ["skill"], "Skill");
@@ -55308,8 +55487,14 @@ async function task(args) {
       maxTurns: args.max_turns
     });
     await waitForBackgroundSubagentLink(subagentId2, null, signal);
-    return `Task running in background with ID: ${taskId}
-Output file: ${outputFile2}`;
+    const linkedAgent = getSnapshot2().agents.find((a) => a.id === subagentId2);
+    const agentId = linkedAgent?.agentURL?.split("/agents/")[1] ?? null;
+    const agentIdLine = agentId ? `
+Agent ID: ${agentId}` : "";
+    return `Task running in background with task ID: ${taskId}${agentIdLine}
+Output file: ${outputFile2}
+
+You will be notified automatically when this task completes — a <task-notification> message will be delivered with the result. No need to poll, sleep-wait, or check the output file. Just continue with your current work.`;
   }
   const subagentId = generateSubagentId();
   registerSubagent(subagentId, subagent_type, description, toolCallId, false);
@@ -58644,7 +58829,7 @@ __export(exports_loader, {
   loadPermissions: () => loadPermissions
 });
 import { homedir as homedir11 } from "node:os";
-import { join as join15 } from "node:path";
+import { join as join16 } from "node:path";
 async function loadPermissions(workingDirectory = process.cwd()) {
   const merged = {
     allow: [],
@@ -58653,10 +58838,10 @@ async function loadPermissions(workingDirectory = process.cwd()) {
     additionalDirectories: []
   };
   const sources = [
-    join15(process.env.XDG_CONFIG_HOME || join15(homedir11(), ".config"), "letta", "settings.json"),
-    join15(homedir11(), ".letta", "settings.json"),
-    join15(workingDirectory, ".letta", "settings.json"),
-    join15(workingDirectory, ".letta", "settings.local.json")
+    join16(process.env.XDG_CONFIG_HOME || join16(homedir11(), ".config"), "letta", "settings.json"),
+    join16(homedir11(), ".letta", "settings.json"),
+    join16(workingDirectory, ".letta", "settings.json"),
+    join16(workingDirectory, ".letta", "settings.local.json")
   ];
   for (const settingsPath of sources) {
     try {
@@ -58692,13 +58877,13 @@ async function savePermissionRule(rule, ruleType, scope, workingDirectory = proc
   let settingsPath;
   switch (scope) {
     case "user":
-      settingsPath = join15(process.env.XDG_CONFIG_HOME || join15(homedir11(), ".config"), "letta", "settings.json");
+      settingsPath = join16(process.env.XDG_CONFIG_HOME || join16(homedir11(), ".config"), "letta", "settings.json");
       break;
     case "project":
-      settingsPath = join15(workingDirectory, ".letta", "settings.json");
+      settingsPath = join16(workingDirectory, ".letta", "settings.json");
       break;
     case "local":
-      settingsPath = join15(workingDirectory, ".letta", "settings.local.json");
+      settingsPath = join16(workingDirectory, ".letta", "settings.local.json");
       break;
   }
   let settings = {};
@@ -58723,7 +58908,7 @@ async function savePermissionRule(rule, ruleType, scope, workingDirectory = proc
   }
 }
 async function ensureLocalSettingsIgnored(workingDirectory) {
-  const gitignorePath = join15(workingDirectory, ".gitignore");
+  const gitignorePath = join16(workingDirectory, ".gitignore");
   const pattern = ".letta/settings.local.json";
   try {
     let content = "";
@@ -60298,17 +60483,17 @@ __export(exports_skills2, {
 });
 import { existsSync as existsSync8 } from "node:fs";
 import { readdir as readdir6, readFile as readFile5 } from "node:fs/promises";
-import { dirname as dirname8, join as join16 } from "node:path";
+import { dirname as dirname8, join as join17 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 function getBundledSkillsPath2() {
   const thisDir = dirname8(fileURLToPath7(import.meta.url));
   if (thisDir.includes("src/agent") || thisDir.includes("src\\agent")) {
-    return join16(thisDir, "../skills/builtin");
+    return join17(thisDir, "../skills/builtin");
   }
-  return join16(thisDir, "skills");
+  return join17(thisDir, "skills");
 }
 function getAgentSkillsDir2(agentId) {
-  return join16(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents", agentId, "skills");
+  return join17(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents", agentId, "skills");
 }
 async function getBundledSkills2() {
   const bundledPath = getBundledSkillsPath2();
@@ -60331,12 +60516,14 @@ async function discoverSkillsFromDir2(skillsPath, source) {
   }
   return { skills, errors };
 }
-async function discoverSkills2(projectSkillsPath = join16(process.cwd(), SKILLS_DIR2), agentId) {
+async function discoverSkills2(projectSkillsPath = join17(process.cwd(), SKILLS_DIR2), agentId, options) {
   const allErrors = [];
   const skillsById = new Map;
-  const bundledSkills = await getBundledSkills2();
-  for (const skill2 of bundledSkills) {
-    skillsById.set(skill2.id, skill2);
+  if (!options?.skipBundled) {
+    const bundledSkills = await getBundledSkills2();
+    for (const skill2 of bundledSkills) {
+      skillsById.set(skill2.id, skill2);
+    }
   }
   const globalResult = await discoverSkillsFromDir2(GLOBAL_SKILLS_DIR2, "global");
   allErrors.push(...globalResult.errors);
@@ -60365,7 +60552,7 @@ async function findSkillFiles2(currentPath, rootPath, skills, errors, source) {
   try {
     const entries = await readdir6(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join16(currentPath, entry.name);
+      const fullPath = join17(currentPath, entry.name);
       if (entry.isDirectory()) {
         await findSkillFiles2(fullPath, rootPath, skills, errors, source);
       } else if (entry.isFile() && entry.name.toUpperCase() === "SKILL.MD") {
@@ -60439,7 +60626,7 @@ ${lines.join(`
 }
 var SKILLS_DIR2 = ".skills", GLOBAL_SKILLS_DIR2;
 var init_skills2 = __esm(() => {
-  GLOBAL_SKILLS_DIR2 = join16(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
+  GLOBAL_SKILLS_DIR2 = join17(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
 });
 
 // src/utils/fs.ts
@@ -60456,7 +60643,7 @@ import {
   existsSync as existsSync9,
   readFileSync as fsReadFileSync2,
   writeFileSync as fsWriteFileSync2,
-  mkdirSync as mkdirSync5
+  mkdirSync as mkdirSync6
 } from "node:fs";
 import { dirname as dirname9 } from "node:path";
 async function readFile6(path19) {
@@ -60465,7 +60652,7 @@ async function readFile6(path19) {
 async function writeFile2(path19, content) {
   const dir = dirname9(path19);
   if (!existsSync9(dir)) {
-    mkdirSync5(dir, { recursive: true });
+    mkdirSync6(dir, { recursive: true });
   }
   fsWriteFileSync2(path19, content, { encoding: "utf-8", flush: true });
 }
@@ -60473,7 +60660,7 @@ function exists2(path19) {
   return existsSync9(path19);
 }
 async function mkdir2(path19, options) {
-  mkdirSync5(path19, options);
+  mkdirSync6(path19, options);
 }
 async function readJsonFile(path19) {
   const text = await readFile6(path19);
@@ -60787,7 +60974,7 @@ __export(exports_auto_update, {
 import { exec as exec2 } from "node:child_process";
 import { realpathSync as realpathSync2 } from "node:fs";
 import { readdir as readdir7, rm } from "node:fs/promises";
-import { join as join17 } from "node:path";
+import { join as join18 } from "node:path";
 import { promisify as promisify4 } from "node:util";
 function debugLog2(...args) {
   if (DEBUG) {
@@ -60882,12 +61069,12 @@ async function getNpmGlobalPath() {
   }
 }
 async function cleanupOrphanedDirs(globalPath) {
-  const lettaAiDir = join17(globalPath, "lib/node_modules/@letta-ai");
+  const lettaAiDir = join18(globalPath, "lib/node_modules/@letta-ai");
   try {
     const entries = await readdir7(lettaAiDir);
     for (const entry of entries) {
       if (entry.startsWith(".letta-code-")) {
-        const orphanPath = join17(lettaAiDir, entry);
+        const orphanPath = join18(lettaAiDir, entry);
         debugLog2("Cleaning orphaned temp directory:", orphanPath);
         await rm(orphanPath, { recursive: true, force: true });
       }
@@ -61106,6 +61293,7 @@ var init_overflow2 = __esm(() => {
 var exports_promptAssets2 = {};
 __export(exports_promptAssets2, {
   resolveSystemPrompt: () => resolveSystemPrompt2,
+  SYSTEM_PROMPT_MEMORY_ADDON: () => SYSTEM_PROMPT_MEMORY_ADDON2,
   SYSTEM_PROMPT_MEMFS_ADDON: () => SYSTEM_PROMPT_MEMFS_ADDON2,
   SYSTEM_PROMPTS: () => SYSTEM_PROMPTS2,
   SYSTEM_PROMPT: () => SYSTEM_PROMPT2,
@@ -61134,7 +61322,7 @@ async function resolveSystemPrompt2(systemPromptPreset) {
   }
   return SYSTEM_PROMPT2;
 }
-var SYSTEM_PROMPT2, SYSTEM_PROMPT_MEMFS_ADDON2, PLAN_MODE_REMINDER2, SKILL_CREATOR_PROMPT2, REMEMBER_PROMPT2, MEMORY_CHECK_REMINDER2, MEMORY_REFLECTION_REMINDER2, APPROVAL_RECOVERY_PROMPT2, INTERRUPT_RECOVERY_ALERT2, MEMORY_PROMPTS2, SYSTEM_PROMPTS2;
+var SYSTEM_PROMPT2, SYSTEM_PROMPT_MEMORY_ADDON2, SYSTEM_PROMPT_MEMFS_ADDON2, PLAN_MODE_REMINDER2, SKILL_CREATOR_PROMPT2, REMEMBER_PROMPT2, MEMORY_CHECK_REMINDER2, MEMORY_REFLECTION_REMINDER2, APPROVAL_RECOVERY_PROMPT2, INTERRUPT_RECOVERY_ALERT2, MEMORY_PROMPTS2, SYSTEM_PROMPTS2;
 var init_promptAssets2 = __esm(() => {
   init_approval_recovery_alert();
   init_claude();
@@ -61159,7 +61347,9 @@ var init_promptAssets2 = __esm(() => {
   init_style();
   init_system_prompt();
   init_system_prompt_memfs();
+  init_system_prompt_memory();
   SYSTEM_PROMPT2 = system_prompt_default;
+  SYSTEM_PROMPT_MEMORY_ADDON2 = system_prompt_memory_default;
   SYSTEM_PROMPT_MEMFS_ADDON2 = system_prompt_memfs_default;
   PLAN_MODE_REMINDER2 = plan_mode_reminder_default;
   SKILL_CREATOR_PROMPT2 = skill_creator_mode_default;
@@ -61241,7 +61431,7 @@ __export(exports_subagents2, {
 });
 import { existsSync as existsSync11 } from "node:fs";
 import { readdir as readdir8, readFile as readFile7 } from "node:fs/promises";
-import { join as join19 } from "node:path";
+import { join as join20 } from "node:path";
 function isValidName2(name) {
   return /^[a-z][a-z0-9-]*$/.test(name);
 }
@@ -61332,7 +61522,7 @@ async function discoverSubagentsFromDir2(agentsDir, seenNames, subagents, errors
       if (!entry.isFile() || !entry.name.endsWith(".md")) {
         continue;
       }
-      const filePath = join19(agentsDir, entry.name);
+      const filePath = join20(agentsDir, entry.name);
       try {
         const config = await parseSubagentFile2(filePath);
         if (config) {
@@ -61364,7 +61554,7 @@ async function discoverSubagents2(workingDirectory = process.cwd()) {
   const subagents = [];
   const seenNames = new Set;
   await discoverSubagentsFromDir2(GLOBAL_AGENTS_DIR2, seenNames, subagents, errors);
-  const projectAgentsDir = join19(workingDirectory, AGENTS_DIR2);
+  const projectAgentsDir = join20(workingDirectory, AGENTS_DIR2);
   await discoverSubagentsFromDir2(projectAgentsDir, seenNames, subagents, errors);
   return { subagents, errors };
 }
@@ -61407,7 +61597,7 @@ var init_subagents2 = __esm(() => {
     recall_default,
     reflection_default
   ];
-  GLOBAL_AGENTS_DIR2 = join19(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents");
+  GLOBAL_AGENTS_DIR2 = join20(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents");
   VALID_MEMORY_BLOCKS2 = new Set(MEMORY_BLOCK_LABELS);
   cache5 = {
     builtins: null,
@@ -62300,7 +62490,7 @@ var init_cli2 = __esm(() => {
   cliPermissions2 = new CliPermissions2;
 });
 
-// src/agent/approval-recovery.ts
+// src/agent/turn-recovery-policy.ts
 function isInvalidToolCallIdsError(detail) {
   if (typeof detail !== "string")
     return false;
@@ -62333,6 +62523,50 @@ function getPreStreamErrorAction(detail, conversationBusyRetries, maxConversatio
   }
   return "rethrow";
 }
+function extractConflictDetail(error) {
+  if (error && typeof error === "object" && "error" in error) {
+    const errObj = error.error;
+    if (errObj && typeof errObj === "object") {
+      const outer = errObj;
+      if (outer.error && typeof outer.error === "object") {
+        const nested = outer.error;
+        if (typeof nested.detail === "string")
+          return nested.detail;
+        if (typeof nested.message === "string")
+          return nested.message;
+      }
+      if (typeof outer.detail === "string")
+        return outer.detail;
+      if (typeof outer.message === "string")
+        return outer.message;
+    }
+  }
+  if (error instanceof Error)
+    return error.message;
+  return "";
+}
+function rebuildInputWithFreshDenials(currentInput, serverApprovals, denialReason) {
+  const stripped = currentInput.filter((item) => item?.type !== "approval");
+  if (serverApprovals.length > 0) {
+    const denials = {
+      type: "approval",
+      approvals: serverApprovals.map((a) => ({
+        type: "approval",
+        tool_call_id: a.toolCallId,
+        approve: false,
+        reason: denialReason
+      }))
+    };
+    return [denials, ...stripped];
+  }
+  return stripped;
+}
+function shouldAttemptApprovalRecovery(opts) {
+  return opts.approvalPendingDetected && opts.retries < opts.maxRetries;
+}
+var INVALID_TOOL_CALL_IDS_FRAGMENT = "invalid tool call ids", APPROVAL_PENDING_DETAIL_FRAGMENT = "waiting for approval", CONVERSATION_BUSY_DETAIL_FRAGMENT = "another request is currently being processed";
+
+// src/agent/approval-recovery.ts
 async function fetchRunErrorDetail(runId) {
   if (!runId)
     return null;
@@ -62345,7 +62579,6 @@ async function fetchRunErrorDetail(runId) {
     return null;
   }
 }
-var INVALID_TOOL_CALL_IDS_FRAGMENT = "invalid tool call ids", APPROVAL_PENDING_DETAIL_FRAGMENT = "waiting for approval", CONVERSATION_BUSY_DETAIL_FRAGMENT = "another request is currently being processed";
 var init_approval_recovery = __esm(async () => {
   await init_client2();
 });
@@ -62617,8 +62850,10 @@ async function updateAgentSystemPromptRaw(agentId, systemPromptContent) {
 }
 async function updateAgentSystemPrompt(agentId, systemPromptId) {
   try {
-    const { resolveSystemPrompt: resolveSystemPrompt3 } = await Promise.resolve().then(() => (init_promptAssets(), exports_promptAssets));
-    const systemPromptContent = await resolveSystemPrompt3(systemPromptId);
+    const { resolveSystemPrompt: resolveSystemPrompt3, SYSTEM_PROMPT_MEMORY_ADDON: SYSTEM_PROMPT_MEMORY_ADDON3 } = await Promise.resolve().then(() => (init_promptAssets(), exports_promptAssets));
+    const baseContent = await resolveSystemPrompt3(systemPromptId);
+    const systemPromptContent = `${baseContent}
+${SYSTEM_PROMPT_MEMORY_ADDON3}`;
     const updateResult = await updateAgentSystemPromptRaw(agentId, systemPromptContent);
     if (!updateResult.success) {
       return {
@@ -62647,18 +62882,18 @@ async function updateAgentSystemPromptMemfs(agentId, enableMemfs) {
     const client = await getClient2();
     const agent = await client.agents.retrieve(agentId);
     let currentSystemPrompt = agent.system || "";
-    const { SYSTEM_PROMPT_MEMFS_ADDON: SYSTEM_PROMPT_MEMFS_ADDON3 } = await Promise.resolve().then(() => (init_promptAssets(), exports_promptAssets));
-    const memfsHeaderRegex = /\n## Memory Filesystem[\s\S]*?(?=\n# |$)/;
-    currentSystemPrompt = currentSystemPrompt.replace(memfsHeaderRegex, "");
-    if (enableMemfs) {
-      currentSystemPrompt = `${currentSystemPrompt}${SYSTEM_PROMPT_MEMFS_ADDON3}`;
-    }
+    const { SYSTEM_PROMPT_MEMFS_ADDON: SYSTEM_PROMPT_MEMFS_ADDON3, SYSTEM_PROMPT_MEMORY_ADDON: SYSTEM_PROMPT_MEMORY_ADDON3 } = await Promise.resolve().then(() => (init_promptAssets(), exports_promptAssets));
+    const memoryHeaderRegex = /\n#{1,2} Memory\b[\s\S]*?(?=\n#{1,2} (?!Memory|Filesystem|Structure|How It Works|Syncing|History)[^\n]|$)/;
+    currentSystemPrompt = currentSystemPrompt.replace(memoryHeaderRegex, "");
+    const addon = enableMemfs ? SYSTEM_PROMPT_MEMFS_ADDON3 : SYSTEM_PROMPT_MEMORY_ADDON3;
+    currentSystemPrompt = `${currentSystemPrompt}
+${addon}`;
     await client.agents.update(agentId, {
       system: currentSystemPrompt
     });
     return {
       success: true,
-      message: enableMemfs ? "System prompt updated to include Memory Filesystem section" : "System prompt updated to remove Memory Filesystem section"
+      message: enableMemfs ? "System prompt updated to include Memory Filesystem section" : "System prompt updated to include standard Memory section"
     };
   } catch (error) {
     return {
@@ -62831,6 +63066,8 @@ async function createAgent(nameOrOptions = DEFAULT_AGENT_NAME, model, embeddingM
   } else {
     systemPromptContent = await resolveSystemPrompt(options.systemPromptPreset);
   }
+  systemPromptContent = `${systemPromptContent}
+${SYSTEM_PROMPT_MEMORY_ADDON}`;
   if (options.systemPromptAppend) {
     systemPromptContent = `${systemPromptContent}
 
@@ -62841,6 +63078,9 @@ ${options.systemPromptAppend}`;
   if (isSubagent) {
     tags.push("role:subagent");
   }
+  if (options.tags && Array.isArray(options.tags)) {
+    tags.push(...options.tags);
+  }
   const agentDescription = options.description ?? `Letta Code agent created in ${process.cwd()}`;
   const agent = await client.agents.create({
     agent_type: "letta_v1_agent",
@@ -63098,8 +63338,8 @@ function normalizeLineEndings(s) {
 `).replace(/\r/g, `
 `);
 }
-function removeSystemReminderBlocks(text) {
-  return text.replace(new RegExp(`${SYSTEM_REMINDER_OPEN}[\\s\\S]*?${SYSTEM_REMINDER_CLOSE}`, "g"), "").trim();
+function removeSystemContextBlocks(text) {
+  return text.replace(new RegExp(`${SYSTEM_REMINDER_OPEN}[\\s\\S]*?${SYSTEM_REMINDER_CLOSE}`, "g"), "").replace(new RegExp(`${SYSTEM_ALERT_OPEN}[\\s\\S]*?${SYSTEM_ALERT_CLOSE}`, "g"), "").trim();
 }
 function extractCompactionSummary(text) {
   try {
@@ -63128,14 +63368,14 @@ function renderAssistantContentParts(parts) {
 function renderUserContentParts(parts) {
   if (typeof parts === "string") {
     const normalized = normalizeLineEndings(parts);
-    return clip(removeSystemReminderBlocks(normalized), CLIP_CHAR_LIMIT_TEXT);
+    return clip(removeSystemContextBlocks(normalized), CLIP_CHAR_LIMIT_TEXT);
   }
   const rendered = [];
   for (const p of parts) {
     if (p.type === "text") {
       const text = p.text || "";
       const normalized = normalizeLineEndings(text);
-      const withoutSystemReminders = removeSystemReminderBlocks(normalized);
+      const withoutSystemReminders = removeSystemContextBlocks(normalized);
       if (!withoutSystemReminders)
         continue;
       rendered.push(clip(withoutSystemReminders, CLIP_CHAR_LIMIT_TEXT));
@@ -63939,6 +64179,13 @@ function resolveAssistantLineId(b, chunk) {
   let canonical = canonicalFromMessageId || canonicalFromOtid || messageId || otid;
   if (!canonical)
     return;
+  if (otid && !canonicalFromOtid && canonicalFromMessageId) {
+    const existingLineId = resolveLineIdForKind(b, canonicalFromMessageId, "assistant");
+    const existingLine = b.byId.get(existingLineId);
+    if (existingLine && existingLine.kind === "assistant" && "phase" in existingLine && existingLine.phase === "finished") {
+      canonical = otid;
+    }
+  }
   if (canonicalFromMessageId && canonicalFromOtid && canonicalFromMessageId !== canonicalFromOtid) {
     const messageLineExists = b.byId.has(canonicalFromMessageId);
     const otidLineExists = b.byId.has(canonicalFromOtid);
@@ -63974,6 +64221,13 @@ function resolveReasoningLineId(b, chunk) {
   let canonical = canonicalFromMessageId || canonicalFromOtid || messageId || otid;
   if (!canonical)
     return;
+  if (otid && !canonicalFromOtid && canonicalFromMessageId) {
+    const existingLineId = resolveLineIdForKind(b, canonicalFromMessageId, "reasoning");
+    const existingLine = b.byId.get(existingLineId);
+    if (existingLine && existingLine.kind === "reasoning" && "phase" in existingLine && existingLine.phase === "finished") {
+      canonical = otid;
+    }
+  }
   if (canonicalFromMessageId && canonicalFromOtid && canonicalFromMessageId !== canonicalFromOtid) {
     const messageLineExists = b.byId.has(canonicalFromMessageId);
     const otidLineExists = b.byId.has(canonicalFromOtid);
@@ -64759,11 +65013,18 @@ ${createAgentLink(runId, agentId, conversationId)}` : baseError;
   }
   return String(e);
 }
+function getRetryStatusMessage(errorDetail) {
+  if (!errorDetail)
+    return DEFAULT_RETRY_MESSAGE;
+  if (errorDetail.includes("Anthropic API is overloaded"))
+    return "Anthropic API is overloaded, retrying...";
+  return DEFAULT_RETRY_MESSAGE;
+}
 function createAgentLink(runId, agentId, conversationId) {
   const url = `https://app.letta.com/agents/${agentId}${conversationId ? `?conversation=${conversationId}` : ""}`;
   return `View agent: \x1B]8;;${url}\x1B\\${agentId}\x1B]8;;\x1B\\ (run: ${runId})`;
 }
-var LETTA_USAGE_URL = "https://app.letta.com/settings/organization/usage", LETTA_AGENTS_URL = "https://app.letta.com/projects/default-project/agents", ENCRYPTED_CONTENT_HINT;
+var LETTA_USAGE_URL = "https://app.letta.com/settings/organization/usage", LETTA_AGENTS_URL = "https://app.letta.com/projects/default-project/agents", ENCRYPTED_CONTENT_HINT, DEFAULT_RETRY_MESSAGE = "Unexpected downstream LLM API error, retrying...";
 var init_errorFormatter = __esm(() => {
   init_error();
   init_errorContext();
@@ -65199,8 +65460,8 @@ function parseRegistryHandle(handle) {
   return { author: parts[0], name: parts[1] };
 }
 async function importAgentFromRegistry(options) {
-  const { tmpdir: tmpdir2 } = await import("node:os");
-  const { join: join20 } = await import("node:path");
+  const { tmpdir: tmpdir3 } = await import("node:os");
+  const { join: join21 } = await import("node:path");
   const { writeFile: writeFile4, unlink } = await import("node:fs/promises");
   const { author, name } = parseRegistryHandle(options.handle);
   const rawUrl = `https://raw.githubusercontent.com/${AGENT_REGISTRY_OWNER}/${AGENT_REGISTRY_REPO}/refs/heads/${AGENT_REGISTRY_BRANCH}/agents/@${author}/${name}/${name}.af`;
@@ -65212,7 +65473,7 @@ async function importAgentFromRegistry(options) {
     throw new Error(`Failed to download agent @${author}/${name}: ${response.statusText}`);
   }
   const afContent = await response.text();
-  const tempPath = join20(tmpdir2(), `letta-import-${author}-${name}-${Date.now()}.af`);
+  const tempPath = join21(tmpdir3(), `letta-import-${author}-${name}-${Date.now()}.af`);
   await writeFile4(tempPath, afContent, "utf-8");
   try {
     const result = await importAgentFromFile({
@@ -65292,11 +65553,142 @@ var init_defaults = __esm(async () => {
       name: "Incognito",
       description: INCOGNITO_DESCRIPTION,
       initBlocks: [],
-      baseTools: ["web_search", "conversation_search", "fetch_webpage"]
+      baseTools: ["web_search", "fetch_webpage"]
     }
   };
 });
 
+// src/agent/memoryFilesystem.ts
+var exports_memoryFilesystem = {};
+__export(exports_memoryFilesystem, {
+  renderMemoryFilesystemTree: () => renderMemoryFilesystemTree,
+  labelFromRelativePath: () => labelFromRelativePath,
+  getMemorySystemDir: () => getMemorySystemDir,
+  getMemoryFilesystemRoot: () => getMemoryFilesystemRoot,
+  ensureMemoryFilesystemDirs: () => ensureMemoryFilesystemDirs,
+  applyMemfsFlags: () => applyMemfsFlags,
+  MEMORY_SYSTEM_DIR: () => MEMORY_SYSTEM_DIR,
+  MEMORY_FS_ROOT: () => MEMORY_FS_ROOT,
+  MEMORY_FS_MEMORY_DIR: () => MEMORY_FS_MEMORY_DIR,
+  MEMORY_FS_AGENTS_DIR: () => MEMORY_FS_AGENTS_DIR
+});
+import { existsSync as existsSync12, mkdirSync as mkdirSync8 } from "node:fs";
+import { homedir as homedir14 } from "node:os";
+import { join as join21 } from "node:path";
+function getMemoryFilesystemRoot(agentId, homeDir = homedir14()) {
+  return join21(homeDir, MEMORY_FS_ROOT, MEMORY_FS_AGENTS_DIR, agentId, MEMORY_FS_MEMORY_DIR);
+}
+function getMemorySystemDir(agentId, homeDir = homedir14()) {
+  return join21(getMemoryFilesystemRoot(agentId, homeDir), MEMORY_SYSTEM_DIR);
+}
+function ensureMemoryFilesystemDirs(agentId, homeDir = homedir14()) {
+  const root = getMemoryFilesystemRoot(agentId, homeDir);
+  const systemDir = getMemorySystemDir(agentId, homeDir);
+  if (!existsSync12(root)) {
+    mkdirSync8(root, { recursive: true });
+  }
+  if (!existsSync12(systemDir)) {
+    mkdirSync8(systemDir, { recursive: true });
+  }
+}
+function labelFromRelativePath(relativePath) {
+  const normalized = relativePath.replace(/\\/g, "/");
+  return normalized.replace(/\.md$/, "");
+}
+function renderMemoryFilesystemTree(systemLabels, detachedLabels) {
+  const makeNode = () => ({ children: new Map, isFile: false });
+  const root = makeNode();
+  const insertPath = (base2, label) => {
+    const parts = base2 ? [base2, ...label.split("/")] : label.split("/");
+    let current = root;
+    for (const [i, partName] of parts.entries()) {
+      const part = i === parts.length - 1 ? `${partName}.md` : partName;
+      if (!current.children.has(part)) {
+        current.children.set(part, makeNode());
+      }
+      current = current.children.get(part);
+      if (i === parts.length - 1) {
+        current.isFile = true;
+      }
+    }
+  };
+  for (const label of systemLabels) {
+    insertPath(MEMORY_SYSTEM_DIR, label);
+  }
+  for (const label of detachedLabels) {
+    insertPath(null, label);
+  }
+  if (!root.children.has(MEMORY_SYSTEM_DIR)) {
+    root.children.set(MEMORY_SYSTEM_DIR, makeNode());
+  }
+  const sortedEntries = (node) => {
+    const entries = Array.from(node.children.entries());
+    return entries.sort(([nameA, nodeA], [nameB, nodeB]) => {
+      if (nodeA.isFile !== nodeB.isFile) {
+        return nodeA.isFile ? 1 : -1;
+      }
+      return nameA.localeCompare(nameB);
+    });
+  };
+  const lines = ["/memory/"];
+  const render2 = (node, prefix) => {
+    const entries = sortedEntries(node);
+    entries.forEach(([name, child], index) => {
+      const isLast = index === entries.length - 1;
+      const branch = isLast ? "└──" : "├──";
+      lines.push(`${prefix}${branch} ${name}${child.isFile ? "" : "/"}`);
+      if (child.children.size > 0) {
+        const nextPrefix = `${prefix}${isLast ? "    " : "│   "}`;
+        render2(child, nextPrefix);
+      }
+    });
+  };
+  render2(root, "");
+  return lines.join(`
+`);
+}
+async function applyMemfsFlags(agentId, memfsFlag, noMemfsFlag, options) {
+  const { getServerUrl: getServerUrl2 } = await init_client2().then(() => exports_client);
+  const { settingsManager: settingsManager3 } = await init_settings_manager().then(() => exports_settings_manager);
+  if (memfsFlag) {
+    const serverUrl = getServerUrl2();
+    if (!serverUrl.includes("api.letta.com")) {
+      throw new Error("--memfs is only available on Letta Cloud (api.letta.com).");
+    }
+    settingsManager3.setMemfsEnabled(agentId, true);
+  } else if (noMemfsFlag) {
+    settingsManager3.setMemfsEnabled(agentId, false);
+  }
+  const isEnabled = settingsManager3.isMemfsEnabled(agentId);
+  if (isEnabled && memfsFlag) {
+    const { detachMemoryTools: detachMemoryTools2 } = await init_toolset().then(() => exports_toolset);
+    await detachMemoryTools2(agentId);
+  }
+  if (memfsFlag || noMemfsFlag) {
+    const { updateAgentSystemPromptMemfs: updateAgentSystemPromptMemfs2 } = await init_modify().then(() => exports_modify);
+    await updateAgentSystemPromptMemfs2(agentId, isEnabled);
+  }
+  let pullSummary;
+  if (isEnabled) {
+    const { addGitMemoryTag: addGitMemoryTag2, isGitRepo: isGitRepo2, cloneMemoryRepo: cloneMemoryRepo2, pullMemory: pullMemory2 } = await init_memoryGit().then(() => exports_memoryGit);
+    await addGitMemoryTag2(agentId);
+    if (!isGitRepo2(agentId)) {
+      await cloneMemoryRepo2(agentId);
+    } else if (options?.pullOnExistingRepo) {
+      const result = await pullMemory2(agentId);
+      pullSummary = result.summary;
+    }
+  }
+  const action = memfsFlag ? "enabled" : noMemfsFlag ? "disabled" : "unchanged";
+  return {
+    action,
+    memoryDir: isEnabled ? getMemoryFilesystemRoot(agentId) : undefined,
+    pullSummary
+  };
+}
+var MEMORY_FS_ROOT = ".letta", MEMORY_FS_AGENTS_DIR = "agents", MEMORY_FS_MEMORY_DIR = "memory", MEMORY_SYSTEM_DIR = "system";
+var init_memoryFilesystem = () => {};
+
 // src/agent/check-approval.ts
 var exports_check_approval = {};
 __export(exports_check_approval, {
@@ -65475,7 +65867,7 @@ __export(exports_headless, {
   handleHeadlessCommand: () => handleHeadlessCommand
 });
 import { parseArgs as parseArgs5 } from "node:util";
-async function handleHeadlessCommand(argv, model, skillsDirectory) {
+async function handleHeadlessCommand(argv, model, skillsDirectory, noSkills) {
   const settings = settingsManager.getSettings();
   const { values, positionals } = parseArgs5({
     args: argv,
@@ -65513,8 +65905,10 @@ async function handleHeadlessCommand(argv, model, skillsDirectory) {
       "init-blocks": { type: "string" },
       "base-tools": { type: "string" },
       "from-af": { type: "string" },
+      tags: { type: "string" },
       memfs: { type: "boolean" },
       "no-memfs": { type: "boolean" },
+      "no-skills": { type: "boolean" },
       "max-turns": { type: "string" }
     },
     strict: false,
@@ -65611,6 +66005,16 @@ In headless mode, use:
   const fromAfFile = values["from-af"];
   const preLoadSkillsRaw = values["pre-load-skills"];
   const maxTurnsRaw = values["max-turns"];
+  const tagsRaw = values["tags"];
+  let tags;
+  if (tagsRaw !== undefined) {
+    const trimmed = tagsRaw.trim();
+    if (!trimmed || trimmed.toLowerCase() === "none") {
+      tags = [];
+    } else {
+      tags = trimmed.split(",").map((name) => name.trim()).filter((name) => name.length > 0);
+    }
+  }
   let maxTurns;
   if (maxTurnsRaw !== undefined) {
     const parsed = parseInt(maxTurnsRaw, 10);
@@ -65831,7 +66235,8 @@ In headless mode, use:
       initBlocks,
       baseTools,
       memoryBlocks,
-      blockValues
+      blockValues,
+      tags
     };
     const result = await createAgent(createOptions);
     agent = result.agent;
@@ -65897,36 +66302,16 @@ In headless mode, use:
   }
   let conversationId;
   const isSubagent = process.env.LETTA_CODE_AGENT_ROLE === "subagent";
-  if (memfsFlag) {
-    const serverUrl = getServerUrl2();
-    if (!serverUrl.includes("api.letta.com")) {
-      console.error("--memfs is only available on Letta Cloud (api.letta.com).");
-      process.exit(1);
-    }
-    settingsManager.setMemfsEnabled(agent.id, true);
-  } else if (noMemfsFlag) {
-    settingsManager.setMemfsEnabled(agent.id, false);
-  }
-  if (memfsFlag || noMemfsFlag) {
-    const { updateAgentSystemPromptMemfs: updateAgentSystemPromptMemfs2 } = await init_modify().then(() => exports_modify);
-    await updateAgentSystemPromptMemfs2(agent.id, settingsManager.isMemfsEnabled(agent.id));
-  }
-  if (settingsManager.isMemfsEnabled(agent.id)) {
-    try {
-      const { isGitRepo: isGitRepo2, cloneMemoryRepo: cloneMemoryRepo2, pullMemory: pullMemory2 } = await init_memoryGit().then(() => exports_memoryGit);
-      if (!isGitRepo2(agent.id)) {
-        await cloneMemoryRepo2(agent.id);
-      } else {
-        const result = await pullMemory2(agent.id);
-        if (result.summary.includes("CONFLICT")) {
-          console.error("Memory has merge conflicts. Run in interactive mode to resolve.");
-          process.exit(1);
-        }
-      }
-    } catch (error) {
-      console.error(`Memory git sync failed: ${error instanceof Error ? error.message : String(error)}`);
+  try {
+    const { applyMemfsFlags: applyMemfsFlags2 } = await Promise.resolve().then(() => (init_memoryFilesystem(), exports_memoryFilesystem));
+    const memfsResult = await applyMemfsFlags2(agent.id, memfsFlag, noMemfsFlag, { pullOnExistingRepo: true });
+    if (memfsResult.pullSummary?.includes("CONFLICT")) {
+      console.error("Memory has merge conflicts. Run in interactive mode to resolve.");
       process.exit(1);
     }
+  } catch (error) {
+    console.error(`Memory git sync failed: ${error instanceof Error ? error.message : String(error)}`);
+    process.exit(1);
   }
   const isolatedBlockLabels = initBlocks === undefined ? [...ISOLATED_BLOCK_LABELS] : ISOLATED_BLOCK_LABELS.filter((label) => initBlocks.includes(label));
   if (specifiedConversationId) {
@@ -65994,7 +66379,7 @@ In headless mode, use:
       }
     } catch {}
   }
-  setAgentContext2(agent.id, skillsDirectory);
+  setAgentContext2(agent.id, skillsDirectory, noSkills);
   const outputFormat = values["output-format"] || "text";
   const includePartialMessages = Boolean(values["include-partial-messages"]);
   if (!["text", "json", "stream-json"].includes(outputFormat)) {
@@ -66147,10 +66532,12 @@ ${SYSTEM_REMINDER_CLOSE}
       formatSkillsAsSystemReminder: formatSkillsAsSystemReminder3
     } = await Promise.resolve().then(() => (init_skills(), exports_skills));
     const { getSkillsDirectory: getSkillsDirectory2 } = await Promise.resolve().then(() => (init_context(), exports_context));
-    const { join: join20 } = await import("node:path");
+    const { join: join22 } = await import("node:path");
     try {
-      const skillsDir = getSkillsDirectory2() || join20(process.cwd(), defaultDir);
-      const { skills } = await discoverSkills3(skillsDir, agent.id);
+      const skillsDir = getSkillsDirectory2() || join22(process.cwd(), defaultDir);
+      const { skills } = await discoverSkills3(skillsDir, agent.id, {
+        skipBundled: noSkills
+      });
       const skillsReminder = formatSkillsAsSystemReminder3(skills);
       if (skillsReminder) {
         pushPart(skillsReminder);
@@ -66238,20 +66625,7 @@ ${loadedContents.join(`
           agentId: agent.id
         });
       } catch (preStreamError) {
-        let errorDetail = "";
-        if (preStreamError instanceof APIError2 && preStreamError.error && typeof preStreamError.error === "object") {
-          const errObj = preStreamError.error;
-          if (errObj.error && typeof errObj.error === "object" && "detail" in errObj.error) {
-            const nested = errObj.error;
-            errorDetail = typeof nested.detail === "string" ? nested.detail : "";
-          }
-          if (!errorDetail && typeof errObj.detail === "string") {
-            errorDetail = errObj.detail;
-          }
-        }
-        if (!errorDetail && preStreamError instanceof Error) {
-          errorDetail = preStreamError.message;
-        }
+        const errorDetail = extractConflictDetail(preStreamError);
         const preStreamAction = getPreStreamErrorAction(errorDetail, conversationBusyRetries, CONVERSATION_BUSY_MAX_RETRIES);
         if (preStreamAction === "resolve_approval_pending") {
           if (outputFormat === "stream-json") {
@@ -67009,8 +67383,8 @@ async function runBidirectionalMode(agent, conversationId, client, _outputFormat
               formatSkillsAsSystemReminder: formatSkillsAsSystemReminder3
             } = await Promise.resolve().then(() => (init_skills(), exports_skills));
             const { getSkillsDirectory: getSkillsDirectory2 } = await Promise.resolve().then(() => (init_context(), exports_context));
-            const { join: join20 } = await import("node:path");
-            const skillsDir = getSkillsDirectory2() || join20(process.cwd(), defaultDir);
+            const { join: join22 } = await import("node:path");
+            const skillsDir = getSkillsDirectory2() || join22(process.cwd(), defaultDir);
             const { skills } = await discover(skillsDir, agent.id);
             const skillsReminder = formatSkillsAsSystemReminder3(skills);
             if (skillsReminder) {
@@ -67050,21 +67424,9 @@ ${enrichedContent}`;
               agentId: agent.id
             });
           } catch (preStreamError) {
-            let errorDetail = "";
-            if (preStreamError instanceof APIError2 && preStreamError.error && typeof preStreamError.error === "object") {
-              const errObj = preStreamError.error;
-              if (errObj.error && typeof errObj.error === "object" && "detail" in errObj.error) {
-                const nested = errObj.error;
-                errorDetail = typeof nested.detail === "string" ? nested.detail : "";
-              }
-              if (!errorDetail && typeof errObj.detail === "string") {
-                errorDetail = errObj.detail;
-              }
-            }
-            if (!errorDetail && preStreamError instanceof Error) {
-              errorDetail = preStreamError.message;
-            }
-            if (isApprovalPendingError(errorDetail)) {
+            const errorDetail = extractConflictDetail(preStreamError);
+            const preStreamAction = getPreStreamErrorAction(errorDetail, 0, 0);
+            if (preStreamAction === "resolve_approval_pending") {
               const recoveryMsg = {
                 type: "recovery",
                 recovery_type: "approval_pending",
@@ -67471,29 +67833,6 @@ var init_build3 = __esm(async () => {
   ]);
 });
 
-// src/agent/memoryFilesystem.ts
-import { existsSync as existsSync12, mkdirSync as mkdirSync7 } from "node:fs";
-import { homedir as homedir14 } from "node:os";
-import { join as join20 } from "node:path";
-function getMemoryFilesystemRoot(agentId, homeDir = homedir14()) {
-  return join20(homeDir, MEMORY_FS_ROOT, MEMORY_FS_AGENTS_DIR, agentId, MEMORY_FS_MEMORY_DIR);
-}
-function getMemorySystemDir(agentId, homeDir = homedir14()) {
-  return join20(getMemoryFilesystemRoot(agentId, homeDir), MEMORY_SYSTEM_DIR);
-}
-function ensureMemoryFilesystemDirs(agentId, homeDir = homedir14()) {
-  const root = getMemoryFilesystemRoot(agentId, homeDir);
-  const systemDir = getMemorySystemDir(agentId, homeDir);
-  if (!existsSync12(root)) {
-    mkdirSync7(root, { recursive: true });
-  }
-  if (!existsSync12(systemDir)) {
-    mkdirSync7(systemDir, { recursive: true });
-  }
-}
-var MEMORY_FS_ROOT = ".letta", MEMORY_FS_AGENTS_DIR = "agents", MEMORY_FS_MEMORY_DIR = "memory", MEMORY_SYSTEM_DIR = "system";
-var init_memoryFilesystem = () => {};
-
 // src/ralph/mode.ts
 function getDefaultState() {
   return {
@@ -67589,9 +67928,9 @@ __export(exports_settings, {
   getSetting: () => getSetting
 });
 import { homedir as homedir15 } from "node:os";
-import { join as join21 } from "node:path";
+import { join as join22 } from "node:path";
 function getSettingsPath() {
-  return join21(homedir15(), ".letta", "settings.json");
+  return join22(homedir15(), ".letta", "settings.json");
 }
 async function loadSettings() {
   const settingsPath = getSettingsPath();
@@ -67628,7 +67967,7 @@ async function getSetting(key) {
   return settings[key];
 }
 function getProjectSettingsPath() {
-  return join21(process.cwd(), ".letta", "settings.local.json");
+  return join22(process.cwd(), ".letta", "settings.local.json");
 }
 async function loadProjectSettings() {
   const settingsPath = getProjectSettingsPath();
@@ -67646,7 +67985,7 @@ async function loadProjectSettings() {
 }
 async function saveProjectSettings(settings) {
   const settingsPath = getProjectSettingsPath();
-  const dirPath = join21(process.cwd(), ".letta");
+  const dirPath = join22(process.cwd(), ".letta");
   try {
     if (!exists(dirPath)) {
       await mkdir(dirPath, { recursive: true });
@@ -74014,8 +74353,9 @@ function extractUserMessagePreview2(message) {
     for (let i = content.length - 1;i >= 0; i--) {
       const part = content[i];
       if (part?.type === "text" && part.text) {
-        if (part.text.startsWith(SYSTEM_REMINDER_OPEN))
+        if (part.text.startsWith(SYSTEM_REMINDER_OPEN) || part.text.startsWith(SYSTEM_ALERT_OPEN)) {
           continue;
+        }
         textToShow = part.text;
         break;
       }
@@ -75036,8 +75376,8 @@ var init_pasteRegistry = __esm(() => {
 // src/cli/helpers/clipboard.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { existsSync as existsSync13, readFileSync as readFileSync3, statSync as statSync4, unlinkSync as unlinkSync4 } from "node:fs";
-import { tmpdir as tmpdir2 } from "node:os";
-import { basename as basename3, extname as extname5, isAbsolute as isAbsolute13, join as join22, resolve as resolve20 } from "node:path";
+import { tmpdir as tmpdir3 } from "node:os";
+import { basename as basename3, extname as extname5, isAbsolute as isAbsolute13, join as join23, resolve as resolve20 } from "node:path";
 function countLines2(text) {
   return (text.match(/\r\n|\r|\n/g) || []).length + 1;
 }
@@ -75105,7 +75445,7 @@ function translatePasteForImages(paste) {
 function getClipboardImageToTempFile() {
   if (process.platform !== "darwin")
     return null;
-  const tempPath = join22(tmpdir2(), `letta-clipboard-${Date.now()}.bin`);
+  const tempPath = join23(tmpdir3(), `letta-clipboard-${Date.now()}.bin`);
   try {
     const jxa = `
       ObjC.import('AppKit');
@@ -75743,12 +76083,12 @@ __export(exports_terminalKeybindingInstaller, {
 import {
   copyFileSync,
   existsSync as existsSync14,
-  mkdirSync as mkdirSync8,
+  mkdirSync as mkdirSync9,
   readFileSync as readFileSync4,
-  writeFileSync as writeFileSync5
+  writeFileSync as writeFileSync6
 } from "node:fs";
 import { homedir as homedir16, platform as platform3 } from "node:os";
-import { dirname as dirname11, join as join23 } from "node:path";
+import { dirname as dirname11, join as join24 } from "node:path";
 function detectTerminalType() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
     return "cursor";
@@ -75780,16 +76120,16 @@ function getKeybindingsPath(terminal) {
   }[terminal];
   const os5 = platform3();
   if (os5 === "darwin") {
-    return join23(homedir16(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join24(homedir16(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os5 === "win32") {
     const appData = process.env.APPDATA;
     if (!appData)
       return null;
-    return join23(appData, appName, "User", "keybindings.json");
+    return join24(appData, appName, "User", "keybindings.json");
   }
   if (os5 === "linux") {
-    return join23(homedir16(), ".config", appName, "User", "keybindings.json");
+    return join24(homedir16(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -75841,7 +76181,7 @@ function installKeybinding(keybindingsPath) {
     }
     const parentDir = dirname11(keybindingsPath);
     if (!existsSync14(parentDir)) {
-      mkdirSync8(parentDir, { recursive: true });
+      mkdirSync9(parentDir, { recursive: true });
     }
     let keybindings = [];
     let backupPath = null;
@@ -75860,7 +76200,7 @@ function installKeybinding(keybindingsPath) {
     keybindings.push(SHIFT_ENTER_KEYBINDING);
     const newContent = `${JSON.stringify(keybindings, null, 2)}
 `;
-    writeFileSync5(keybindingsPath, newContent, { encoding: "utf-8" });
+    writeFileSync6(keybindingsPath, newContent, { encoding: "utf-8" });
     return {
       success: true,
       backupPath: backupPath ?? undefined
@@ -75889,7 +76229,7 @@ function removeKeybinding(keybindingsPath) {
     const filtered = keybindings.filter((kb) => !(kb.key?.toLowerCase() === "shift+enter" && kb.command === "workbench.action.terminal.sendSequence" && kb.when?.includes("terminalFocus")));
     const newContent = `${JSON.stringify(filtered, null, 2)}
 `;
-    writeFileSync5(keybindingsPath, newContent, { encoding: "utf-8" });
+    writeFileSync6(keybindingsPath, newContent, { encoding: "utf-8" });
     return { success: true };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -75942,14 +76282,14 @@ function getWezTermConfigPath() {
   }
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig) {
-    const xdgPath = join23(xdgConfig, "wezterm", "wezterm.lua");
+    const xdgPath = join24(xdgConfig, "wezterm", "wezterm.lua");
     if (existsSync14(xdgPath))
       return xdgPath;
   }
-  const configPath = join23(homedir16(), ".config", "wezterm", "wezterm.lua");
+  const configPath = join24(homedir16(), ".config", "wezterm", "wezterm.lua");
   if (existsSync14(configPath))
     return configPath;
-  return join23(homedir16(), ".wezterm.lua");
+  return join24(homedir16(), ".wezterm.lua");
 }
 function wezTermDeleteFixExists(configPath) {
   if (!existsSync14(configPath))
@@ -76000,9 +76340,9 @@ ${WEZTERM_DELETE_FIX}
     }
     const parentDir = dirname11(configPath);
     if (!existsSync14(parentDir)) {
-      mkdirSync8(parentDir, { recursive: true });
+      mkdirSync9(parentDir, { recursive: true });
     }
-    writeFileSync5(configPath, content, { encoding: "utf-8" });
+    writeFileSync6(configPath, content, { encoding: "utf-8" });
     return {
       success: true,
       backupPath: backupPath ?? undefined
@@ -76438,7 +76778,7 @@ __export(exports_custom, {
 });
 import { existsSync as existsSync15 } from "node:fs";
 import { readdir as readdir9, readFile as readFile9 } from "node:fs/promises";
-import { basename as basename4, dirname as dirname12, join as join24 } from "node:path";
+import { basename as basename4, dirname as dirname12, join as join25 } from "node:path";
 async function getCustomCommands() {
   if (cachedCommands !== null) {
     return cachedCommands;
@@ -76449,7 +76789,7 @@ async function getCustomCommands() {
 function refreshCustomCommands() {
   cachedCommands = null;
 }
-async function discoverCustomCommands(projectPath = join24(process.cwd(), COMMANDS_DIR)) {
+async function discoverCustomCommands(projectPath = join25(process.cwd(), COMMANDS_DIR)) {
   const commandsById = new Map;
   const userCommands = await discoverFromDirectory(GLOBAL_COMMANDS_DIR, "user");
   for (const cmd of userCommands) {
@@ -76481,7 +76821,7 @@ async function findCommandFiles(currentPath, rootPath, commands2, source) {
   try {
     const entries = await readdir9(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join24(currentPath, entry.name);
+      const fullPath = join25(currentPath, entry.name);
       if (entry.isDirectory()) {
         await findCommandFiles(fullPath, rootPath, commands2, source);
       } else if (entry.isFile() && entry.name.endsWith(".md")) {
@@ -76566,7 +76906,7 @@ async function findCustomCommand(commandName) {
 }
 var COMMANDS_DIR = ".commands", GLOBAL_COMMANDS_DIR, cachedCommands = null;
 var init_custom = __esm(() => {
-  GLOBAL_COMMANDS_DIR = join24(process.env.HOME || process.env.USERPROFILE || "~", ".letta/commands");
+  GLOBAL_COMMANDS_DIR = join25(process.env.HOME || process.env.USERPROFILE || "~", ".letta/commands");
 });
 
 // src/cli/components/HelpDialog.tsx
@@ -80879,7 +81219,7 @@ var init_AgentInfoBar = __esm(async () => {
 
 // src/cli/helpers/fileSearch.ts
 import { readdirSync as readdirSync5, statSync as statSync5 } from "node:fs";
-import { join as join25, resolve as resolve21 } from "node:path";
+import { join as join26, resolve as resolve21 } from "node:path";
 function shouldExcludeEntry(entry) {
   if (entry.startsWith(".")) {
     return true;
@@ -80897,7 +81237,7 @@ function searchDirectoryRecursive(dir, pattern, maxResults = 200, results = [],
         continue;
       }
       try {
-        const fullPath = join25(dir, entry);
+        const fullPath = join26(dir, entry);
         const stats = statSync5(fullPath);
         const relativePath = fullPath.startsWith(process.cwd()) ? fullPath.slice(process.cwd().length + 1) : fullPath;
         const matches = pattern.length === 0 || relativePath.toLowerCase().includes(pattern.toLowerCase());
@@ -80952,7 +81292,7 @@ async function searchFiles(query, deep = false) {
       const matchingEntries = entries.filter((entry) => !shouldExcludeEntry(entry)).filter((entry) => searchPattern.length === 0 || entry.toLowerCase().includes(searchPattern.toLowerCase()));
       for (const entry of matchingEntries.slice(0, 50)) {
         try {
-          const fullPath = join25(searchDir, entry);
+          const fullPath = join26(searchDir, entry);
           const stats = statSync5(fullPath);
           const relativePath = fullPath.startsWith(process.cwd()) ? fullPath.slice(process.cwd().length + 1) : fullPath;
           results.push({
@@ -81797,7 +82137,8 @@ function Input({
   shouldAnimate = true,
   statusLineText,
   statusLineRight,
-  statusLinePadding = 0
+  statusLinePadding = 0,
+  statusLinePrompt
 }) {
   const [value, setValue] = import_react68.useState("");
   const [escapePressed, setEscapePressed] = import_react68.useState(false);
@@ -81810,7 +82151,10 @@ function Input({
   const [cursorPos, setCursorPos] = import_react68.useState(undefined);
   const [currentCursorPosition, setCurrentCursorPosition] = import_react68.useState(0);
   const columns = terminalWidth;
-  const contentWidth = Math.max(0, columns - 2);
+  const [isBashMode, setIsBashMode] = import_react68.useState(false);
+  const promptChar = isBashMode ? "!" : statusLinePrompt || ">";
+  const promptVisualWidth = stringWidth(promptChar) + 1;
+  const contentWidth = Math.max(0, columns - promptVisualWidth);
   const interactionEnabled = visible && inputEnabled;
   const reserveInputSpace = !collapseInputWhenDisabled;
   const hideFooter = !interactionEnabled || value.startsWith("/");
@@ -81856,7 +82200,6 @@ function Input({
   const [atStartBoundary, setAtStartBoundary] = import_react68.useState(false);
   const [atEndBoundary, setAtEndBoundary] = import_react68.useState(false);
   const [preferredColumn, setPreferredColumn] = import_react68.useState(null);
-  const [isBashMode, setIsBashMode] = import_react68.useState(false);
   import_react68.useEffect(() => {
     if (restoredInput && value === "") {
       setValue(restoredInput);
@@ -82258,12 +82601,12 @@ function Input({
               flexDirection: "row",
               children: [
                 /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Box_default, {
-                  width: 2,
+                  width: promptVisualWidth,
                   flexShrink: 0,
                   children: [
                     /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
                       color: isBashMode ? colors.bash.prompt : colors.input.prompt,
-                      children: isBashMode ? "!" : ">"
+                      children: promptChar
                     }, undefined, false, undefined, this),
                     /* @__PURE__ */ jsx_dev_runtime45.jsxDEV(Text2, {
                       children: " "
@@ -82363,7 +82706,9 @@ function Input({
     inputChromeHeight,
     statusLineText,
     statusLineRight,
-    statusLinePadding
+    statusLinePadding,
+    promptChar,
+    promptVisualWidth
   ]);
   if (!visible) {
     return null;
@@ -82409,6 +82754,7 @@ function formatElapsedLabel(ms) {
 var import_react68, jsx_dev_runtime45, Spinner2, ESC_CLEAR_WINDOW_MS = 2500, FOOTER_WIDTH_STREAMING_DELTA = 2, OSC8_REGEX, InputFooter, StreamingStatus;
 var init_InputRich = __esm(async () => {
   init_source();
+  init_string_width();
   init_oauth();
   init_constants();
   init_mode();
@@ -82712,7 +83058,7 @@ var init_InputRich = __esm(async () => {
 async function connectMcpServer(config, options = {}) {
   const { onEvent, abortSignal } = options;
   const settings = await settingsManager.getSettingsWithSecureTokens();
-  const baseUrl = getServerUrl2();
+  const baseUrl = getServerUrl();
   const apiKey = process.env.LETTA_API_KEY || settings.env?.LETTA_API_KEY;
   if (!apiKey) {
     throw new Error("Missing LETTA_API_KEY");
@@ -84121,7 +84467,7 @@ var init_McpSelector = __esm(async () => {
 
 // src/cli/components/MemfsTreeViewer.tsx
 import { existsSync as existsSync16, readdirSync as readdirSync6, readFileSync as readFileSync5, statSync as statSync6 } from "node:fs";
-import { join as join26, relative as relative4 } from "node:path";
+import { join as join27, relative as relative4 } from "node:path";
 function scanMemoryFilesystem(memoryRoot) {
   const nodes = [];
   const scanDir = (dir, depth, parentIsLast) => {
@@ -84133,8 +84479,8 @@ function scanMemoryFilesystem(memoryRoot) {
     }
     const filtered = entries.filter((name) => !name.startsWith("."));
     const sorted = filtered.sort((a, b) => {
-      const aPath = join26(dir, a);
-      const bPath = join26(dir, b);
+      const aPath = join27(dir, a);
+      const bPath = join27(dir, b);
       let aIsDir = false;
       let bIsDir = false;
       try {
@@ -84154,7 +84500,7 @@ function scanMemoryFilesystem(memoryRoot) {
       return a.localeCompare(b);
     });
     sorted.forEach((name, index) => {
-      const fullPath = join26(dir, name);
+      const fullPath = join27(dir, name);
       let isDir = false;
       try {
         isDir = statSync6(fullPath).isDirectory();
@@ -86612,10 +86958,10 @@ var init_byok_providers = __esm(async () => {
 // src/utils/aws-credentials.ts
 import { readFile as readFile10 } from "node:fs/promises";
 import { homedir as homedir17 } from "node:os";
-import { join as join27 } from "node:path";
+import { join as join28 } from "node:path";
 async function parseAwsCredentials() {
-  const credentialsPath = join27(homedir17(), ".aws", "credentials");
-  const configPath = join27(homedir17(), ".aws", "config");
+  const credentialsPath = join28(homedir17(), ".aws", "credentials");
+  const configPath = join28(homedir17(), ".aws", "config");
   const profiles = new Map;
   try {
     const content = await readFile10(credentialsPath, "utf-8");
@@ -87847,7 +88193,7 @@ function SleeptimeSelector({
       /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
         bold: true,
         color: colors.selector.title,
-        children: "Configure your sleeptime (reflection) settings"
+        children: "Configure your sleep-time (reflection) settings"
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Box_default, {
         height: 1
@@ -87862,7 +88208,7 @@ function SleeptimeSelector({
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
                 bold: true,
-                children: "Trigger:"
+                children: "Trigger event:"
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
                 children: "   "
@@ -87906,7 +88252,7 @@ function SleeptimeSelector({
                   }, undefined, false, undefined, this),
                   /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
                     bold: true,
-                    children: "Trigger behavior:"
+                    children: "Forced:"
                   }, undefined, false, undefined, this),
                   /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
                     children: "  "
@@ -87915,7 +88261,7 @@ function SleeptimeSelector({
                     backgroundColor: behavior === "reminder" ? colors.selector.itemHighlighted : undefined,
                     color: behavior === "reminder" ? "black" : undefined,
                     bold: behavior === "reminder",
-                    children: " Reminder "
+                    children: " No (reminder only) "
                   }, undefined, false, undefined, this),
                   /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
                     children: " "
@@ -87924,7 +88270,7 @@ function SleeptimeSelector({
                     backgroundColor: behavior === "auto-launch" ? colors.selector.itemHighlighted : undefined,
                     color: behavior === "auto-launch" ? "black" : undefined,
                     bold: behavior === "auto-launch",
-                    children: " Auto-launch "
+                    children: " Yes (auto-launch) "
                   }, undefined, false, undefined, this)
                 ]
               }, undefined, true, undefined, this)
@@ -87970,7 +88316,7 @@ function SleeptimeSelector({
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
                 bold: true,
-                children: "Trigger:"
+                children: "Trigger event:"
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
                 children: "   "
@@ -91022,18 +91368,20 @@ function wordWrap(text, width) {
 }
 function splitSystemReminderBlocks(text) {
   const blocks = [];
-  const tagOpen = SYSTEM_REMINDER_OPEN;
-  const tagClose = SYSTEM_REMINDER_CLOSE;
+  const tags = [
+    { open: SYSTEM_REMINDER_OPEN, close: SYSTEM_REMINDER_CLOSE },
+    { open: SYSTEM_ALERT_OPEN, close: SYSTEM_ALERT_CLOSE }
+  ];
   let remaining = text;
   while (remaining.length > 0) {
-    const openIdx = remaining.indexOf(tagOpen);
-    if (openIdx === -1) {
+    const nextTag = tags.map((tag) => ({ ...tag, idx: remaining.indexOf(tag.open) })).filter((tag) => tag.idx >= 0).sort((a, b) => a.idx - b.idx)[0];
+    if (!nextTag) {
       if (remaining.trim()) {
         blocks.push({ text: remaining.trim(), isSystemReminder: false });
       }
       break;
     }
-    const closeIdx = remaining.indexOf(tagClose, openIdx);
+    const closeIdx = remaining.indexOf(nextTag.close, nextTag.idx);
     if (closeIdx === -1) {
       const literal = remaining.trim();
       if (literal) {
@@ -91041,19 +91389,19 @@ function splitSystemReminderBlocks(text) {
       }
       break;
     }
-    if (openIdx > 0) {
-      const before = remaining.slice(0, openIdx).trim();
+    if (nextTag.idx > 0) {
+      const before = remaining.slice(0, nextTag.idx).trim();
       if (before) {
         blocks.push({ text: before, isSystemReminder: false });
       }
     }
-    const sysBlock = remaining.slice(openIdx, closeIdx + tagClose.length);
+    const sysBlock = remaining.slice(nextTag.idx, closeIdx + nextTag.close.length);
     blocks.push({ text: sysBlock, isSystemReminder: true });
-    remaining = remaining.slice(closeIdx + tagClose.length);
+    remaining = remaining.slice(closeIdx + nextTag.close.length);
   }
   return blocks;
 }
-function renderBlock(text, contentWidth, columns, highlighted, colorAnsi) {
+function renderBlock(text, contentWidth, columns, highlighted, colorAnsi, promptPrefix, continuationPrefix) {
   const inputLines = text.split(`
 `);
   const outputLines = [];
@@ -91071,11 +91419,11 @@ function renderBlock(text, contentWidth, columns, highlighted, colorAnsi) {
     return [];
   const isSingleLine = outputLines.length === 1;
   return outputLines.map((ol, i) => {
-    const prefix = i === 0 ? "> " : "  ";
-    const content = prefix + ol;
+    const prefix = i === 0 ? promptPrefix : continuationPrefix;
     if (!highlighted) {
-      return content;
+      return prefix + ol;
     }
+    const content = i === 0 ? `${promptPrefix.slice(0, -1)}${colorAnsi} ${ol}` : `${prefix}${ol}`;
     const visWidth = stringWidth(content);
     if (isSingleLine) {
       return `${colorAnsi}${content}${" ".repeat(COMPACT_PAD)}\x1B[0m`;
@@ -91093,9 +91441,12 @@ var init_UserMessageRich = __esm(async () => {
   await init_Text2();
   import_react89 = __toESM(require_react(), 1);
   jsx_dev_runtime69 = __toESM(require_jsx_dev_runtime(), 1);
-  UserMessage = import_react89.memo(({ line }) => {
+  UserMessage = import_react89.memo(({ line, prompt }) => {
     const columns = useTerminalWidth();
-    const contentWidth = Math.max(1, columns - 2);
+    const promptPrefix = `${prompt || ">"} `;
+    const prefixWidth = stringWidth(promptPrefix);
+    const continuationPrefix = " ".repeat(prefixWidth);
+    const contentWidth = Math.max(1, columns - prefixWidth);
     const cleanedText = extractTaskNotificationsForDisplay(line.text).cleanedText;
     const displayText = cleanedText.trim();
     if (!displayText) {
@@ -91113,7 +91464,7 @@ var init_UserMessageRich = __esm(async () => {
       if (allLines.length > 0) {
         allLines.push("");
       }
-      const blockLines = renderBlock(block.text, contentWidth, columns, !block.isSystemReminder, colorAnsi);
+      const blockLines = renderBlock(block.text, contentWidth, columns, !block.isSystemReminder, colorAnsi, promptPrefix, continuationPrefix);
       allLines.push(...blockLines);
     }
     return /* @__PURE__ */ jsx_dev_runtime69.jsxDEV(Text2, {
@@ -91597,7 +91948,7 @@ var init_memoryReminder = __esm(async () => {
   init_debug();
   await init_settings_manager();
   DEFAULT_REFLECTION_SETTINGS = {
-    trigger: "step-count",
+    trigger: "compaction-event",
     behavior: "reminder",
     stepCount: DEFAULT_STEP_COUNT2
   };
@@ -91823,7 +92174,8 @@ function normalizeStatusLineConfig(config) {
     timeout: Math.min(MAX_STATUS_LINE_TIMEOUT_MS, Math.max(1000, config.timeout ?? DEFAULT_STATUS_LINE_TIMEOUT_MS)),
     debounceMs: Math.max(MIN_STATUS_LINE_DEBOUNCE_MS, Math.min(MAX_STATUS_LINE_DEBOUNCE_MS, config.debounceMs ?? DEFAULT_STATUS_LINE_DEBOUNCE_MS)),
     ...refreshIntervalMs !== undefined && { refreshIntervalMs },
-    ...config.disabled !== undefined && { disabled: config.disabled }
+    ...config.disabled !== undefined && { disabled: config.disabled },
+    ...config.prompt !== undefined && { prompt: config.prompt }
   };
 }
 function isStatusLineDisabled(workingDirectory = process.cwd()) {
@@ -91874,6 +92226,31 @@ function resolveStatusLineConfig(workingDirectory = process.cwd()) {
     return null;
   }
 }
+function resolvePromptChar(workingDirectory = process.cwd()) {
+  try {
+    if (isStatusLineDisabled(workingDirectory))
+      return ">";
+    try {
+      const local = settingsManager.getLocalProjectSettings(workingDirectory)?.statusLine;
+      if (local?.prompt !== undefined)
+        return local.prompt;
+    } catch {}
+    try {
+      const project = settingsManager.getProjectSettings(workingDirectory)?.statusLine;
+      if (project?.prompt !== undefined)
+        return project.prompt;
+    } catch {}
+    try {
+      const global2 = settingsManager.getSettings().statusLine;
+      if (global2?.prompt !== undefined)
+        return global2.prompt;
+    } catch {}
+    return ">";
+  } catch (error) {
+    debugLog("statusline", "resolvePromptChar: Failed to resolve prompt", error);
+    return ">";
+  }
+}
 var MIN_STATUS_LINE_INTERVAL_MS = 1000, DEFAULT_STATUS_LINE_TIMEOUT_MS = 5000, MAX_STATUS_LINE_TIMEOUT_MS = 30000, DEFAULT_STATUS_LINE_DEBOUNCE_MS = 300, MIN_STATUS_LINE_DEBOUNCE_MS = 50, MAX_STATUS_LINE_DEBOUNCE_MS = 5000, MAX_STATUS_LINE_PADDING = 16;
 var init_statusLineConfig = __esm(async () => {
   init_debug();
@@ -91939,7 +92316,8 @@ function formatStatusLineHelp() {
     '    "padding": 2,',
     '    "timeout": 5000,',
     '    "debounceMs": 300,',
-    '    "refreshIntervalMs": 10000',
+    '    "refreshIntervalMs": 10000,',
+    '    "prompt": "→"',
     "  }",
     "",
     '  type               must be "command"',
@@ -91948,6 +92326,7 @@ function formatStatusLineHelp() {
     "  timeout            command timeout in ms (default 5000, max 30000)",
     "  debounceMs         event debounce in ms (default 300)",
     "  refreshIntervalMs  optional polling interval in ms (off by default)",
+    '  prompt             custom input prompt character (default ">")',
     "",
     "INPUT (via JSON stdin)",
     fieldList
@@ -92382,6 +92761,7 @@ function useConfigurableStatusLine(inputs) {
   const [executing, setExecuting] = import_react90.useState(false);
   const [lastError, setLastError] = import_react90.useState(null);
   const [padding, setPadding] = import_react90.useState(0);
+  const [prompt, setPrompt] = import_react90.useState(">");
   const inputsRef = import_react90.useRef(inputs);
   const configRef = import_react90.useRef(null);
   const abortRef = import_react90.useRef(null);
@@ -92405,6 +92785,7 @@ function useConfigurableStatusLine(inputs) {
   const resolveActiveConfig = import_react90.useCallback(() => {
     const workingDirectory = inputsRef.current.currentDirectory;
     const config = resolveStatusLineConfig(workingDirectory);
+    setPrompt(resolvePromptChar(workingDirectory));
     if (!config) {
       configRef.current = null;
       abortRef.current?.abort();
@@ -92497,7 +92878,7 @@ function useConfigurableStatusLine(inputs) {
     scheduleDebouncedRun,
     currentDirectory
   ]);
-  return { text, rightText, active, executing, lastError, padding };
+  return { text, rightText, active, executing, lastError, padding, prompt };
 }
 var import_react90, RS = "\x1E";
 var init_useConfigurableStatusLine = __esm(async () => {
@@ -92568,7 +92949,7 @@ __export(exports_shellAliases, {
 });
 import { existsSync as existsSync17, readFileSync as readFileSync6 } from "node:fs";
 import { homedir as homedir18 } from "node:os";
-import { join as join28 } from "node:path";
+import { join as join29 } from "node:path";
 function parseAliasesFromFile(filePath) {
   const aliases = new Map;
   if (!existsSync17(filePath)) {
@@ -92640,7 +93021,7 @@ function loadAliases(forceReload = false) {
   const home = homedir18();
   const allAliases = new Map;
   for (const file of ALIAS_FILES) {
-    const filePath = join28(home, file);
+    const filePath = join29(home, file);
     const fileAliases = parseAliasesFromFile(filePath);
     for (const [name, value] of fileAliases) {
       allAliases.set(name, value);
@@ -93783,9 +94164,9 @@ var exports_App = {};
 __export(exports_App, {
   default: () => App2
 });
-import { existsSync as existsSync18, readFileSync as readFileSync7, renameSync as renameSync2, writeFileSync as writeFileSync6 } from "node:fs";
-import { homedir as homedir19, tmpdir as tmpdir3 } from "node:os";
-import { join as join29 } from "node:path";
+import { existsSync as existsSync18, readFileSync as readFileSync7, renameSync as renameSync2, writeFileSync as writeFileSync7 } from "node:fs";
+import { homedir as homedir19, tmpdir as tmpdir4 } from "node:os";
+import { join as join30 } from "node:path";
 function getErrorHintForStopReason(stopReason, currentModelId) {
   if (currentModelId === "opus" && stopReason === "llm_api_error" && getModelInfo("bedrock-opus")) {
     return OPUS_BEDROCK_FALLBACK_HINT;
@@ -94036,7 +94417,7 @@ ${SYSTEM_REMINDER_CLOSE}`;
   }
 }
 function stripSystemReminders(text) {
-  return text.replace(new RegExp(`${SYSTEM_REMINDER_OPEN}[\\s\\S]*?${SYSTEM_REMINDER_CLOSE}`, "g"), "").trim();
+  return text.replace(new RegExp(`${SYSTEM_REMINDER_OPEN}[\\s\\S]*?${SYSTEM_REMINDER_CLOSE}`, "g"), "").replace(new RegExp(`${SYSTEM_ALERT_OPEN}[\\s\\S]*?${SYSTEM_ALERT_CLOSE}`, "g"), "").trim();
 }
 function formatReflectionSettings(settings) {
   if (settings.trigger === "off") {
@@ -94422,6 +94803,7 @@ function App2({
     restoreQueueOnCancelRef.current = restoreQueueOnCancel;
   }, [restoreQueueOnCancel]);
   const lastSentInputRef = import_react93.useRef(null);
+  const pendingInterruptRecoveryConversationIdRef = import_react93.useRef(null);
   const [dequeueEpoch, setDequeueEpoch] = import_react93.useState(0);
   const lastDequeuedMessageRef = import_react93.useRef(null);
   const [restoredInput, setRestoredInput] = import_react93.useState(null);
@@ -95393,7 +95775,8 @@ ${newState.originalPrompt}`
       abortControllerRef.current = new AbortController;
       const originalInput = currentInput;
       const cacheIsAllUserMsgs = lastSentInputRef.current?.every((m) => m.type === "message" && m.role === "user");
-      if (cacheIsAllUserMsgs && lastSentInputRef.current) {
+      const canInjectInterruptRecovery = pendingInterruptRecoveryConversationIdRef.current !== null && pendingInterruptRecoveryConversationIdRef.current === conversationIdRef.current;
+      if (cacheIsAllUserMsgs && lastSentInputRef.current && canInjectInterruptRecovery) {
         currentInput = [
           ...lastSentInputRef.current,
           ...currentInput.map((m) => m.type === "message" && m.role === "user" ? {
@@ -95404,11 +95787,13 @@ ${newState.originalPrompt}`
             ]
           } : m)
         ];
+        pendingInterruptRecoveryConversationIdRef.current = null;
         lastSentInputRef.current = [
           ...lastSentInputRef.current,
           ...originalInput
         ];
       } else {
+        pendingInterruptRecoveryConversationIdRef.current = null;
         lastSentInputRef.current = originalInput;
       }
       if (!allowReentry) {
@@ -95447,21 +95832,26 @@ ${newState.originalPrompt}`
         try {
           stream2 = await sendMessageStream(conversationIdRef.current, currentInput, { agentId: agentIdRef.current });
         } catch (preStreamError) {
-          let errorDetail = "";
-          if (preStreamError instanceof APIError2 && preStreamError.error && typeof preStreamError.error === "object") {
-            const errObj = preStreamError.error;
-            if (errObj.error && typeof errObj.error === "object" && "detail" in errObj.error) {
-              const nested = errObj.error;
-              errorDetail = typeof nested.detail === "string" ? nested.detail : "";
-            }
-            if (!errorDetail && typeof errObj.detail === "string") {
-              errorDetail = errObj.detail;
+          const errorDetail = extractConflictDetail(preStreamError);
+          const preStreamAction = getPreStreamErrorAction(errorDetail, conversationBusyRetriesRef.current, CONVERSATION_BUSY_MAX_RETRIES2);
+          if (shouldAttemptApprovalRecovery({
+            approvalPendingDetected: preStreamAction === "resolve_approval_pending",
+            retries: llmApiErrorRetriesRef.current,
+            maxRetries: LLM_API_ERROR_MAX_RETRIES2
+          })) {
+            llmApiErrorRetriesRef.current += 1;
+            try {
+              const client = await getClient2();
+              const agent = await client.agents.retrieve(agentIdRef.current);
+              const { pendingApprovals: existingApprovals } = await getResumeData2(client, agent, conversationIdRef.current);
+              currentInput = rebuildInputWithFreshDenials(currentInput, existingApprovals ?? [], "Auto-denied: stale approval from interrupted session");
+            } catch {
+              currentInput = rebuildInputWithFreshDenials(currentInput, [], "");
             }
+            buffersRef.current.interrupted = false;
+            continue;
           }
-          if (!errorDetail && preStreamError instanceof Error) {
-            errorDetail = preStreamError.message;
-          }
-          if (isConversationBusyError(errorDetail) && conversationBusyRetriesRef.current < CONVERSATION_BUSY_MAX_RETRIES2) {
+          if (preStreamAction === "retry_conversation_busy") {
             conversationBusyRetriesRef.current += 1;
             const retryDelayMs = CONVERSATION_BUSY_RETRY_BASE_DELAY_MS * 2 ** (conversationBusyRetriesRef.current - 1);
             const statusId = uid4("status");
@@ -95505,7 +95895,7 @@ ${newState.originalPrompt}`
                     if (typeof content === "string") {
                       textToRestore = stripSystemReminders(content);
                     } else if (Array.isArray(content)) {
-                      textToRestore = content.filter((c) => typeof c === "object" && c !== null && ("type" in c) && c.type === "text" && ("text" in c) && typeof c.text === "string" && !c.text.includes(SYSTEM_REMINDER_OPEN)).map((c) => c.text).join(`
+                      textToRestore = content.filter((c) => typeof c === "object" && c !== null && ("type" in c) && c.type === "text" && ("text" in c) && typeof c.text === "string" && !c.text.includes(SYSTEM_REMINDER_OPEN) && !c.text.includes(SYSTEM_ALERT_OPEN)).map((c) => c.text).join(`
 `);
                     }
                     if (textToRestore.trim()) {
@@ -95630,6 +96020,7 @@ ${newState.originalPrompt}`
           conversationBusyRetriesRef.current = 0;
           lastDequeuedMessageRef.current = null;
           lastSentInputRef.current = null;
+          pendingInterruptRecoveryConversationIdRef.current = null;
           const lastAssistant = Array.from(buffersRef.current.byId.values()).findLast((item) => item.kind === "assistant" && ("text" in item));
           const assistantMessage = lastAssistant && "text" in lastAssistant ? lastAssistant.text : undefined;
           const lastUser = Array.from(buffersRef.current.byId.values()).findLast((item) => item.kind === "user" && ("text" in item));
@@ -95750,6 +96141,7 @@ ${feedback}
           setAutoHandledResults([]);
           setAutoDeniedApprovals([]);
           lastSentInputRef.current = null;
+          pendingInterruptRecoveryConversationIdRef.current = null;
           const approvalsToProcess = approvals && approvals.length > 0 ? approvals : approval ? [approval] : [];
           if (approvalsToProcess.length === 0) {
             appendError(`Unexpected empty approvals with stop reason: ${stopReason}`);
@@ -96080,7 +96472,7 @@ ${feedback}
                 if (typeof content === "string") {
                   textToRestore = stripSystemReminders(content);
                 } else if (Array.isArray(content)) {
-                  textToRestore = content.filter((c) => typeof c === "object" && c !== null && ("type" in c) && c.type === "text" && ("text" in c) && typeof c.text === "string" && !c.text.includes(SYSTEM_REMINDER_OPEN)).map((c) => c.text).join(`
+                  textToRestore = content.filter((c) => typeof c === "object" && c !== null && ("type" in c) && c.type === "text" && ("text" in c) && typeof c.text === "string" && !c.text.includes(SYSTEM_REMINDER_OPEN) && !c.text.includes(SYSTEM_ALERT_OPEN)).map((c) => c.text).join(`
 `);
                 }
                 if (textToRestore.trim()) {
@@ -96107,26 +96499,20 @@ ${feedback}
           } catch {}
         }
         const approvalPendingDetected = isApprovalPendingError(detailFromRun) || isApprovalPendingError(latestErrorText);
-        if (!hasApprovalInPayload && approvalPendingDetected && llmApiErrorRetriesRef.current < LLM_API_ERROR_MAX_RETRIES2) {
+        if (shouldAttemptApprovalRecovery({
+          approvalPendingDetected,
+          retries: llmApiErrorRetriesRef.current,
+          maxRetries: LLM_API_ERROR_MAX_RETRIES2
+        })) {
           llmApiErrorRetriesRef.current += 1;
           try {
             const client = await getClient2();
             const agent = await client.agents.retrieve(agentIdRef.current);
             const { pendingApprovals: existingApprovals } = await getResumeData2(client, agent, conversationIdRef.current);
-            if (existingApprovals && existingApprovals.length > 0) {
-              const denialResults = existingApprovals.map((approval2) => ({
-                type: "approval",
-                tool_call_id: approval2.toolCallId,
-                approve: false,
-                reason: "Auto-denied: stale approval from interrupted session"
-              }));
-              const approvalPayload = {
-                type: "approval",
-                approvals: denialResults
-              };
-              currentInput.unshift(approvalPayload);
-            }
-          } catch {}
+            currentInput = rebuildInputWithFreshDenials(currentInput, existingApprovals ?? [], "Auto-denied: stale approval from interrupted session");
+          } catch {
+            currentInput = rebuildInputWithFreshDenials(currentInput, [], "");
+          }
           buffersRef.current.interrupted = false;
           continue;
         }
@@ -96136,9 +96522,7 @@ ${feedback}
           const attempt = llmApiErrorRetriesRef.current;
           const delayMs = 1000 * 2 ** (attempt - 1);
           const statusId = uid4("status");
-          const statusLines = [
-            "Unexpected downstream LLM API error, retrying..."
-          ];
+          const statusLines = [getRetryStatusMessage(detailFromRun)];
           buffersRef.current.byId.set(statusId, {
             kind: "status",
             id: statusId,
@@ -96356,11 +96740,18 @@ ${feedback}
         abortControllerRef.current.abort();
         abortControllerRef.current = null;
       }
+      pendingInterruptRecoveryConversationIdRef.current = conversationIdRef.current;
       userCancelledRef.current = true;
       setStreaming(false);
       setIsExecutingTool(false);
       toolResultsInFlightRef.current = false;
       refreshDerived();
+      getClient2().then((client) => {
+        if (conversationIdRef.current === "default") {
+          return client.agents.messages.cancel(agentIdRef.current);
+        }
+        return client.conversations.cancel(conversationIdRef.current);
+      }).catch(() => {});
       setTimeout(() => {
         userCancelledRef.current = false;
       }, 50);
@@ -96381,6 +96772,7 @@ ${feedback}
         abortControllerRef.current.abort();
         abortControllerRef.current = null;
       }
+      pendingInterruptRecoveryConversationIdRef.current = conversationIdRef.current;
       userCancelledRef.current = true;
       conversationGenerationRef.current += 1;
       processingConversationRef.current = 0;
@@ -96446,6 +96838,7 @@ ${feedback}
         if (abortControllerRef.current) {
           abortControllerRef.current.abort();
         }
+        pendingInterruptRecoveryConversationIdRef.current = conversationIdRef.current;
       } catch (e) {
         const errorDetails = formatErrorDetails(e, agentId);
         appendError(`Failed to interrupt stream: ${errorDetails}`);
@@ -96956,7 +97349,7 @@ ${SYSTEM_REMINDER_CLOSE}` : "";
         return { submitted: true };
       }
       if (trimmed === "/ade") {
-        const adeUrl = `https://app.letta.com/agents/${agentId}?conversation=${conversationIdRef.current}`;
+        const adeUrl = conversationIdRef.current === "default" ? `https://app.letta.com/agents/${agentId}` : `https://app.letta.com/agents/${agentId}?conversation=${conversationIdRef.current}`;
         const cmd = commandRunner.start("/ade", "Opening ADE...");
         Promise.resolve().then(() => (init_open(), exports_open)).then(({ default: open2 }) => open2(adeUrl, { wait: false })).catch(() => {});
         cmd.finish(`Opening ADE...
@@ -97110,6 +97503,8 @@ ${SYSTEM_REMINDER_CLOSE}` : "";
               }
               const effective = resolveStatusLineConfig(wd);
               lines2.push(`Effective: ${effective ? `command="${effective.command}" refreshInterval=${effective.refreshIntervalMs ?? "off"} timeout=${effective.timeout}ms debounce=${effective.debounceMs}ms padding=${effective.padding}` : "(inactive)"}`);
+              const effectivePrompt = resolvePromptChar(wd);
+              lines2.push(`Prompt: "${effectivePrompt}"`);
               cmd.finish(lines2.join(`
 `), true);
             } else if (sub === "set") {
@@ -97243,7 +97638,7 @@ ${SYSTEM_REMINDER_CLOSE}` : "";
         try {
           const settings = await settingsManager.getSettingsWithSecureTokens();
           const apiKey = process.env.LETTA_API_KEY || settings.env?.LETTA_API_KEY;
-          const baseUrl = getServerUrl2();
+          const baseUrl = getServerUrl();
           const controller = new AbortController;
           const timeoutId = setTimeout(() => controller.abort(), 5000);
           const res = await fetch(`${baseUrl}/v1/agents/${agentIdRef.current}/context`, {
@@ -97856,10 +98251,10 @@ Press Enter to continue, or type anything to cancel.`, false, "running");
           let fileContent;
           if (skills.length > 0) {
             const { settingsManager: settingsManager3 } = await init_settings_manager().then(() => exports_settings_manager);
-            const { getServerUrl: getServerUrl3 } = await init_client2().then(() => exports_client);
+            const { getServerUrl: getServerUrl2 } = await init_client2().then(() => exports_client);
             const settings = await settingsManager3.getSettingsWithSecureTokens();
             const apiKey = process.env.LETTA_API_KEY || settings.env?.LETTA_API_KEY;
-            const baseUrl = getServerUrl3();
+            const baseUrl = getServerUrl2();
             const body = {
               ...exportParams,
               skills
@@ -97880,7 +98275,7 @@ Press Enter to continue, or type anything to cancel.`, false, "running");
             fileContent = await client.agents.exportFile(agentId, exportParams);
           }
           const fileName = exportParams.conversation_id ? `${exportParams.conversation_id}.af` : `${agentId}.af`;
-          writeFileSync6(fileName, JSON.stringify(fileContent, null, 2));
+          writeFileSync7(fileName, JSON.stringify(fileContent, null, 2));
           let summary = `AgentFile exported to ${fileName}`;
           if (skills.length > 0) {
             summary += `
@@ -97926,27 +98321,13 @@ Path: ${memoryDir}`;
           return { submitted: true };
         }
         if (subcommand === "enable") {
-          const serverUrl = getServerUrl2();
-          if (!serverUrl.includes("api.letta.com")) {
-            cmd.fail("Memory filesystem is only available on Letta Cloud (api.letta.com).");
-            return { submitted: true };
-          }
           updateMemorySyncCommand(cmdId, "Enabling memory filesystem...", true, msg, true);
           setCommandRunning(true);
           try {
-            const { detachMemoryTools: detachMemoryTools2 } = await init_toolset().then(() => exports_toolset);
-            await detachMemoryTools2(agentId);
-            settingsManager.setMemfsEnabled(agentId, true);
-            const { updateAgentSystemPromptMemfs: updateAgentSystemPromptMemfs2 } = await init_modify().then(() => exports_modify);
-            await updateAgentSystemPromptMemfs2(agentId, true);
-            const { addGitMemoryTag: addGitMemoryTag2, isGitRepo: isGitRepo2, cloneMemoryRepo: cloneMemoryRepo2 } = await init_memoryGit().then(() => exports_memoryGit);
-            await addGitMemoryTag2(agentId);
-            if (!isGitRepo2(agentId)) {
-              await cloneMemoryRepo2(agentId);
-            }
-            const memoryDir = getMemoryFilesystemRoot(agentId);
+            const { applyMemfsFlags: applyMemfsFlags2 } = await Promise.resolve().then(() => (init_memoryFilesystem(), exports_memoryFilesystem));
+            const result2 = await applyMemfsFlags2(agentId, true, false);
             updateMemorySyncCommand(cmdId, `Memory filesystem enabled (git-backed).
-Path: ${memoryDir}`, true, msg);
+Path: ${result2.memoryDir}`, true, msg);
           } catch (error) {
             const errorText = error instanceof Error ? error.message : String(error);
             updateMemorySyncCommand(cmdId, `Failed to enable memfs: ${errorText}`, false, msg);
@@ -97983,7 +98364,7 @@ Path: ${memoryDir}`, true, msg);
               updateMemorySyncCommand(cmdId, "No local memory filesystem found to reset.", true, msg);
               return { submitted: true };
             }
-            const backupDir = join29(tmpdir3(), `letta-memfs-reset-${agentId}-${Date.now()}`);
+            const backupDir = join30(tmpdir4(), `letta-memfs-reset-${agentId}-${Date.now()}`);
             renameSync2(memoryDir, backupDir);
             ensureMemoryFilesystemDirs(agentId);
             updateMemorySyncCommand(cmdId, `Memory filesystem reset.
@@ -98012,7 +98393,7 @@ Run \`/memfs sync\` to repopulate from API.`, true, msg);
             let backupInfo = "";
             const memoryDir = getMemoryFilesystemRoot(agentId);
             if (existsSync18(memoryDir)) {
-              const backupDir = join29(tmpdir3(), `letta-memfs-disable-${agentId}-${Date.now()}`);
+              const backupDir = join30(tmpdir4(), `letta-memfs-disable-${agentId}-${Date.now()}`);
               renameSync2(memoryDir, backupDir);
               backupInfo = `
 Local files backed up to ${backupDir}`;
@@ -98356,7 +98737,7 @@ ${SYSTEM_REMINDER_CLOSE}
         plan: "Read-only mode. Focus on exploration and planning.",
         bypassPermissions: "All tools auto-approved. Bias toward action."
       };
-      permissionModeAlert = `<system-alert>Permission mode changed to: ${currentMode}. ${modeDescriptions[currentMode]}</system-alert>
+      permissionModeAlert = `${SYSTEM_REMINDER_OPEN}Permission mode changed to: ${currentMode}. ${modeDescriptions[currentMode]}${SYSTEM_REMINDER_CLOSE}
 
 `;
       lastNotifiedModeRef.current = currentMode;
@@ -98394,9 +98775,11 @@ ${SYSTEM_REMINDER_CLOSE}
       if (!discoveredSkillsRef.current) {
         try {
           const { discoverSkills: discover, SKILLS_DIR: defaultDir } = await Promise.resolve().then(() => (init_skills(), exports_skills));
-          const { getSkillsDirectory: getSkillsDirectory2 } = await Promise.resolve().then(() => (init_context(), exports_context));
-          const skillsDir = getSkillsDirectory2() || join29(process.cwd(), defaultDir);
-          const { skills } = await discover(skillsDir, agentId);
+          const { getSkillsDirectory: getSkillsDirectory2, getNoSkills: getNoSkills2 } = await Promise.resolve().then(() => (init_context(), exports_context));
+          const skillsDir = getSkillsDirectory2() || join30(process.cwd(), defaultDir);
+          const { skills } = await discover(skillsDir, agentId, {
+            skipBundled: getNoSkills2()
+          });
           discoveredSkillsRef.current = skills;
         } catch {
           discoveredSkillsRef.current = [];
@@ -99783,7 +100166,7 @@ ${guidance}`);
       }
       if (!planFileExists()) {
         const planFilePath = permissionMode2.getPlanFilePath();
-        const plansDir = join29(homedir19(), ".letta", "plans");
+        const plansDir = join30(homedir19(), ".letta", "plans");
         handlePlanKeepPlanning(`You must write your plan to a plan file before exiting plan mode.
 ` + (planFilePath ? `Plan file path: ${planFilePath}
 ` : "") + `Use a write tool to create your plan in ${plansDir}, then use ExitPlanMode to present the plan to the user.`);
@@ -100069,7 +100452,8 @@ Plan file path: ${planFilePath}`;
               loadingState: "ready",
               ...item.snapshot
             }, undefined, false, undefined, this) : item.kind === "user" ? /* @__PURE__ */ jsx_dev_runtime70.jsxDEV(UserMessage, {
-              line: item
+              line: item,
+              prompt: statusLine.prompt
             }, undefined, false, undefined, this) : item.kind === "reasoning" ? /* @__PURE__ */ jsx_dev_runtime70.jsxDEV(ReasoningMessage, {
               line: item
             }, undefined, false, undefined, this) : item.kind === "assistant" ? /* @__PURE__ */ jsx_dev_runtime70.jsxDEV(AssistantMessage, {
@@ -100156,7 +100540,8 @@ Plan file path: ${planFilePath}`;
                           allowPersistence: currentApprovalContext?.allowPersistence ?? true,
                           showPreview: showApprovalPreview
                         }, undefined, false, undefined, this) : ln.kind === "user" ? /* @__PURE__ */ jsx_dev_runtime70.jsxDEV(UserMessage, {
-                          line: ln
+                          line: ln,
+                          prompt: statusLine.prompt
                         }, undefined, false, undefined, this) : ln.kind === "reasoning" ? /* @__PURE__ */ jsx_dev_runtime70.jsxDEV(ReasoningMessage, {
                           line: ln
                         }, undefined, false, undefined, this) : ln.kind === "assistant" ? /* @__PURE__ */ jsx_dev_runtime70.jsxDEV(AssistantMessage, {
@@ -100337,7 +100722,8 @@ Plan file path: ${planFilePath}`;
                   shouldAnimate,
                   statusLineText: statusLine.text || undefined,
                   statusLineRight: statusLine.rightText || undefined,
-                  statusLinePadding: statusLine.padding || 0
+                  statusLinePadding: statusLine.padding || 0,
+                  statusLinePrompt: statusLine.prompt
                 }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
               activeOverlay === "model" && /* @__PURE__ */ jsx_dev_runtime70.jsxDEV(ModelSelector, {
@@ -100999,12 +101385,12 @@ __export(exports_terminalKeybindingInstaller2, {
 import {
   copyFileSync as copyFileSync2,
   existsSync as existsSync19,
-  mkdirSync as mkdirSync9,
+  mkdirSync as mkdirSync10,
   readFileSync as readFileSync8,
-  writeFileSync as writeFileSync7
+  writeFileSync as writeFileSync8
 } from "node:fs";
 import { homedir as homedir20, platform as platform5 } from "node:os";
-import { dirname as dirname13, join as join30 } from "node:path";
+import { dirname as dirname13, join as join31 } from "node:path";
 function detectTerminalType2() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
     return "cursor";
@@ -101036,16 +101422,16 @@ function getKeybindingsPath2(terminal) {
   }[terminal];
   const os6 = platform5();
   if (os6 === "darwin") {
-    return join30(homedir20(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join31(homedir20(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os6 === "win32") {
     const appData = process.env.APPDATA;
     if (!appData)
       return null;
-    return join30(appData, appName, "User", "keybindings.json");
+    return join31(appData, appName, "User", "keybindings.json");
   }
   if (os6 === "linux") {
-    return join30(homedir20(), ".config", appName, "User", "keybindings.json");
+    return join31(homedir20(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -101097,7 +101483,7 @@ function installKeybinding2(keybindingsPath) {
     }
     const parentDir = dirname13(keybindingsPath);
     if (!existsSync19(parentDir)) {
-      mkdirSync9(parentDir, { recursive: true });
+      mkdirSync10(parentDir, { recursive: true });
     }
     let keybindings = [];
     let backupPath = null;
@@ -101116,7 +101502,7 @@ function installKeybinding2(keybindingsPath) {
     keybindings.push(SHIFT_ENTER_KEYBINDING2);
     const newContent = `${JSON.stringify(keybindings, null, 2)}
 `;
-    writeFileSync7(keybindingsPath, newContent, { encoding: "utf-8" });
+    writeFileSync8(keybindingsPath, newContent, { encoding: "utf-8" });
     return {
       success: true,
       backupPath: backupPath ?? undefined
@@ -101145,7 +101531,7 @@ function removeKeybinding2(keybindingsPath) {
     const filtered = keybindings.filter((kb) => !(kb.key?.toLowerCase() === "shift+enter" && kb.command === "workbench.action.terminal.sendSequence" && kb.when?.includes("terminalFocus")));
     const newContent = `${JSON.stringify(filtered, null, 2)}
 `;
-    writeFileSync7(keybindingsPath, newContent, { encoding: "utf-8" });
+    writeFileSync8(keybindingsPath, newContent, { encoding: "utf-8" });
     return { success: true };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -101198,14 +101584,14 @@ function getWezTermConfigPath2() {
   }
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig) {
-    const xdgPath = join30(xdgConfig, "wezterm", "wezterm.lua");
+    const xdgPath = join31(xdgConfig, "wezterm", "wezterm.lua");
     if (existsSync19(xdgPath))
       return xdgPath;
   }
-  const configPath = join30(homedir20(), ".config", "wezterm", "wezterm.lua");
+  const configPath = join31(homedir20(), ".config", "wezterm", "wezterm.lua");
   if (existsSync19(configPath))
     return configPath;
-  return join30(homedir20(), ".wezterm.lua");
+  return join31(homedir20(), ".wezterm.lua");
 }
 function wezTermDeleteFixExists2(configPath) {
   if (!existsSync19(configPath))
@@ -101256,9 +101642,9 @@ ${WEZTERM_DELETE_FIX2}
     }
     const parentDir = dirname13(configPath);
     if (!existsSync19(parentDir)) {
-      mkdirSync9(parentDir, { recursive: true });
+      mkdirSync10(parentDir, { recursive: true });
     }
-    writeFileSync7(configPath, content, { encoding: "utf-8" });
+    writeFileSync8(configPath, content, { encoding: "utf-8" });
     return {
       success: true,
       backupPath: backupPath ?? undefined
@@ -101304,9 +101690,9 @@ __export(exports_settings2, {
   getSetting: () => getSetting2
 });
 import { homedir as homedir21 } from "node:os";
-import { join as join31 } from "node:path";
+import { join as join32 } from "node:path";
 function getSettingsPath2() {
-  return join31(homedir21(), ".letta", "settings.json");
+  return join32(homedir21(), ".letta", "settings.json");
 }
 async function loadSettings2() {
   const settingsPath = getSettingsPath2();
@@ -101343,7 +101729,7 @@ async function getSetting2(key) {
   return settings[key];
 }
 function getProjectSettingsPath2() {
-  return join31(process.cwd(), ".letta", "settings.local.json");
+  return join32(process.cwd(), ".letta", "settings.local.json");
 }
 async function loadProjectSettings2() {
   const settingsPath = getProjectSettingsPath2();
@@ -101361,7 +101747,7 @@ async function loadProjectSettings2() {
 }
 async function saveProjectSettings2(settings) {
   const settingsPath = getProjectSettingsPath2();
-  const dirPath = join31(process.cwd(), ".letta");
+  const dirPath = join32(process.cwd(), ".letta");
   try {
     if (!exists(dirPath)) {
       await mkdir(dirPath, { recursive: true });
@@ -101623,7 +102009,7 @@ var init_defaults2 = __esm(async () => {
       name: "Incognito",
       description: INCOGNITO_DESCRIPTION2,
       initBlocks: [],
-      baseTools: ["web_search", "conversation_search", "fetch_webpage"]
+      baseTools: ["web_search", "fetch_webpage"]
     }
   };
 });
@@ -101741,6 +102127,8 @@ async function createAgent2(nameOrOptions = DEFAULT_AGENT_NAME, model, embedding
   } else {
     systemPromptContent = await resolveSystemPrompt(options.systemPromptPreset);
   }
+  systemPromptContent = `${systemPromptContent}
+${SYSTEM_PROMPT_MEMORY_ADDON}`;
   if (options.systemPromptAppend) {
     systemPromptContent = `${systemPromptContent}
 
@@ -101751,6 +102139,9 @@ ${options.systemPromptAppend}`;
   if (isSubagent) {
     tags.push("role:subagent");
   }
+  if (options.tags && Array.isArray(options.tags)) {
+    tags.push(...options.tags);
+  }
   const agentDescription = options.description ?? `Letta Code agent created in ${process.cwd()}`;
   const agent = await client.agents.create({
     agent_type: "letta_v1_agent",
@@ -101932,8 +102323,8 @@ function parseRegistryHandle2(handle) {
   return { author: parts[0], name: parts[1] };
 }
 async function importAgentFromRegistry2(options) {
-  const { tmpdir: tmpdir4 } = await import("node:os");
-  const { join: join32 } = await import("node:path");
+  const { tmpdir: tmpdir5 } = await import("node:os");
+  const { join: join33 } = await import("node:path");
   const { writeFile: writeFile5, unlink } = await import("node:fs/promises");
   const { author, name } = parseRegistryHandle2(options.handle);
   const rawUrl = `https://raw.githubusercontent.com/${AGENT_REGISTRY_OWNER2}/${AGENT_REGISTRY_REPO2}/refs/heads/${AGENT_REGISTRY_BRANCH2}/agents/@${author}/${name}/${name}.af`;
@@ -101945,7 +102336,7 @@ async function importAgentFromRegistry2(options) {
     throw new Error(`Failed to download agent @${author}/${name}: ${response.statusText}`);
   }
   const afContent = await response.text();
-  const tempPath = join32(tmpdir4(), `letta-import-${author}-${name}-${Date.now()}.af`);
+  const tempPath = join33(tmpdir5(), `letta-import-${author}-${name}-${Date.now()}.af`);
   await writeFile5(tempPath, afContent, "utf-8");
   try {
     const result = await importAgentFromFile2({
@@ -102102,8 +102493,10 @@ async function updateAgentSystemPromptRaw2(agentId, systemPromptContent) {
 }
 async function updateAgentSystemPrompt2(agentId, systemPromptId) {
   try {
-    const { resolveSystemPrompt: resolveSystemPrompt3 } = await Promise.resolve().then(() => (init_promptAssets(), exports_promptAssets));
-    const systemPromptContent = await resolveSystemPrompt3(systemPromptId);
+    const { resolveSystemPrompt: resolveSystemPrompt3, SYSTEM_PROMPT_MEMORY_ADDON: SYSTEM_PROMPT_MEMORY_ADDON3 } = await Promise.resolve().then(() => (init_promptAssets(), exports_promptAssets));
+    const baseContent = await resolveSystemPrompt3(systemPromptId);
+    const systemPromptContent = `${baseContent}
+${SYSTEM_PROMPT_MEMORY_ADDON3}`;
     const updateResult = await updateAgentSystemPromptRaw2(agentId, systemPromptContent);
     if (!updateResult.success) {
       return {
@@ -102132,18 +102525,18 @@ async function updateAgentSystemPromptMemfs2(agentId, enableMemfs) {
     const client = await getClient2();
     const agent = await client.agents.retrieve(agentId);
     let currentSystemPrompt = agent.system || "";
-    const { SYSTEM_PROMPT_MEMFS_ADDON: SYSTEM_PROMPT_MEMFS_ADDON3 } = await Promise.resolve().then(() => (init_promptAssets(), exports_promptAssets));
-    const memfsHeaderRegex = /\n## Memory Filesystem[\s\S]*?(?=\n# |$)/;
-    currentSystemPrompt = currentSystemPrompt.replace(memfsHeaderRegex, "");
-    if (enableMemfs) {
-      currentSystemPrompt = `${currentSystemPrompt}${SYSTEM_PROMPT_MEMFS_ADDON3}`;
-    }
+    const { SYSTEM_PROMPT_MEMFS_ADDON: SYSTEM_PROMPT_MEMFS_ADDON3, SYSTEM_PROMPT_MEMORY_ADDON: SYSTEM_PROMPT_MEMORY_ADDON3 } = await Promise.resolve().then(() => (init_promptAssets(), exports_promptAssets));
+    const memoryHeaderRegex = /\n#{1,2} Memory\b[\s\S]*?(?=\n#{1,2} (?!Memory|Filesystem|Structure|How It Works|Syncing|History)[^\n]|$)/;
+    currentSystemPrompt = currentSystemPrompt.replace(memoryHeaderRegex, "");
+    const addon = enableMemfs ? SYSTEM_PROMPT_MEMFS_ADDON3 : SYSTEM_PROMPT_MEMORY_ADDON3;
+    currentSystemPrompt = `${currentSystemPrompt}
+${addon}`;
     await client.agents.update(agentId, {
       system: currentSystemPrompt
     });
     return {
       success: true,
-      message: enableMemfs ? "System prompt updated to include Memory Filesystem section" : "System prompt updated to remove Memory Filesystem section"
+      message: enableMemfs ? "System prompt updated to include Memory Filesystem section" : "System prompt updated to include standard Memory section"
     };
   } catch (error) {
     return {
@@ -102160,488 +102553,136 @@ var init_modify2 = __esm(async () => {
   ]);
 });
 
-// src/tools/toolset.ts
-var exports_toolset2 = {};
-__export(exports_toolset2, {
-  switchToolsetForModel: () => switchToolsetForModel2,
-  reattachMemoryTool: () => reattachMemoryTool2,
-  forceToolsetSwitch: () => forceToolsetSwitch2,
-  ensureCorrectMemoryTool: () => ensureCorrectMemoryTool2,
-  detachMemoryTools: () => detachMemoryTools2,
-  MEMORY_TOOL_NAMES: () => MEMORY_TOOL_NAMES2
-});
-async function ensureCorrectMemoryTool2(agentId, modelIdentifier, useMemoryPatch) {
-  const resolvedModel = resolveModel(modelIdentifier) ?? modelIdentifier;
-  const client = await getClient2();
-  const shouldUsePatch = useMemoryPatch !== undefined ? useMemoryPatch : isOpenAIModel(resolvedModel);
-  try {
-    const agentWithTools = await client.agents.retrieve(agentId, {
-      include: ["agent.tools"]
-    });
-    const currentTools = agentWithTools.tools || [];
-    const mapByName = new Map(currentTools.map((t) => [t.name, t.id]));
-    const hasAnyMemoryTool = mapByName.has("memory") || mapByName.has("memory_apply_patch");
-    if (!hasAnyMemoryTool) {
-      return;
-    }
-    const desiredMemoryTool = shouldUsePatch ? "memory_apply_patch" : "memory";
-    const otherMemoryTool = desiredMemoryTool === "memory" ? "memory_apply_patch" : "memory";
-    let desiredId = mapByName.get(desiredMemoryTool);
-    if (!desiredId) {
-      const resp = await client.tools.list({ name: desiredMemoryTool });
-      desiredId = resp.items[0]?.id;
-    }
-    if (!desiredId) {
-      return;
-    }
-    const otherId = mapByName.get(otherMemoryTool);
-    if (mapByName.has(desiredMemoryTool) && !otherId) {
-      return;
-    }
-    const currentIds = currentTools.map((t) => t.id).filter((id) => typeof id === "string");
-    const newIds = new Set(currentIds);
-    if (otherId)
-      newIds.delete(otherId);
-    newIds.add(desiredId);
-    const updatedRules = (agentWithTools.tool_rules || []).map((r) => r.tool_name === otherMemoryTool ? { ...r, tool_name: desiredMemoryTool } : r);
-    await client.agents.update(agentId, {
-      tool_ids: Array.from(newIds),
-      tool_rules: updatedRules
-    });
-  } catch (err) {
-    console.warn(`Warning: Failed to sync memory tool: ${err instanceof Error ? err.message : String(err)}`);
-  }
-}
-async function detachMemoryTools2(agentId) {
-  const client = await getClient2();
-  try {
-    const agentWithTools = await client.agents.retrieve(agentId, {
-      include: ["agent.tools"]
-    });
-    const currentTools = agentWithTools.tools || [];
-    let detachedAny = false;
-    for (const tool of currentTools) {
-      if (tool.name && MEMORY_TOOL_NAMES2.has(tool.name)) {
-        if (tool.id) {
-          await client.agents.tools.detach(tool.id, { agent_id: agentId });
-          detachedAny = true;
-        }
-      }
-    }
-    return detachedAny;
-  } catch (err) {
-    console.warn(`Warning: Failed to detach memory tools: ${err instanceof Error ? err.message : String(err)}`);
-    return false;
-  }
-}
-async function reattachMemoryTool2(agentId, modelIdentifier) {
-  const resolvedModel = resolveModel(modelIdentifier) ?? modelIdentifier;
-  const client = await getClient2();
-  const shouldUsePatch = isOpenAIModel(resolvedModel);
-  try {
-    const agentWithTools = await client.agents.retrieve(agentId, {
-      include: ["agent.tools"]
-    });
-    const currentTools = agentWithTools.tools || [];
-    const mapByName = new Map(currentTools.map((t) => [t.name, t.id]));
-    const desiredMemoryTool = shouldUsePatch ? "memory_apply_patch" : "memory";
-    if (mapByName.has(desiredMemoryTool)) {
-      return;
-    }
-    const resp = await client.tools.list({ name: desiredMemoryTool });
-    const toolId = resp.items[0]?.id;
-    if (!toolId) {
-      console.warn(`Memory tool "${desiredMemoryTool}" not found on server`);
-      return;
-    }
-    await client.agents.tools.attach(toolId, { agent_id: agentId });
-  } catch (err) {
-    console.warn(`Warning: Failed to reattach memory tool: ${err instanceof Error ? err.message : String(err)}`);
-  }
-}
-async function forceToolsetSwitch2(toolsetName, agentId) {
-  let modelForLoading;
-  if (toolsetName === "none") {
-    clearToolsWithLock();
-    return;
-  } else if (toolsetName === "codex") {
-    await loadSpecificTools([...CODEX_TOOLS2]);
-    modelForLoading = "openai/gpt-4";
-  } else if (toolsetName === "codex_snake") {
-    await loadTools("openai/gpt-4");
-    modelForLoading = "openai/gpt-4";
-  } else if (toolsetName === "gemini") {
-    await loadSpecificTools([...GEMINI_TOOLS2]);
-    modelForLoading = "google_ai/gemini-3-pro-preview";
-  } else if (toolsetName === "gemini_snake") {
-    await loadTools("google_ai/gemini-3-pro-preview");
-    modelForLoading = "google_ai/gemini-3-pro-preview";
-  } else {
-    await loadTools("anthropic/claude-sonnet-4");
-    modelForLoading = "anthropic/claude-sonnet-4";
-  }
-  const useMemoryPatch = toolsetName === "codex" || toolsetName === "codex_snake";
-  await ensureCorrectMemoryTool2(agentId, modelForLoading, useMemoryPatch);
-}
-async function switchToolsetForModel2(modelIdentifier, agentId) {
-  const resolvedModel = resolveModel(modelIdentifier) ?? modelIdentifier;
-  await loadTools(resolvedModel);
-  const loadedAfterPrimary = getToolNames().length;
-  if (loadedAfterPrimary === 0 && !toolFilter.isActive()) {
-    await loadTools();
-    if (getToolNames().length === 0) {
-      throw new Error(`Failed to load any Letta tools for model "${resolvedModel}".`);
-    }
-  }
-  await ensureCorrectMemoryTool2(agentId, resolvedModel);
-  const { isGeminiModel: isGeminiModel3 } = await init_manager3().then(() => exports_manager2);
-  const toolsetName = isOpenAIModel(resolvedModel) ? "codex" : isGeminiModel3(resolvedModel) ? "gemini" : "default";
-  return toolsetName;
-}
-var CODEX_TOOLS2, GEMINI_TOOLS2, MEMORY_TOOL_NAMES2;
-var init_toolset2 = __esm(async () => {
-  init_model();
-  init_filter();
-  await __promiseAll([
-    init_client2(),
-    init_manager3()
-  ]);
-  CODEX_TOOLS2 = OPENAI_PASCAL_TOOLS;
-  GEMINI_TOOLS2 = GEMINI_PASCAL_TOOLS;
-  MEMORY_TOOL_NAMES2 = new Set([
-    "memory",
-    "memory_apply_patch",
-    "memory_insert",
-    "memory_replace",
-    "memory_rethink"
-  ]);
-});
-
-// src/agent/memoryGit.ts
-var exports_memoryGit2 = {};
-__export(exports_memoryGit2, {
-  removeGitMemoryTag: () => removeGitMemoryTag2,
-  pullMemory: () => pullMemory2,
-  isGitRepo: () => isGitRepo2,
-  getMemoryRepoDir: () => getMemoryRepoDir2,
-  getMemoryGitStatus: () => getMemoryGitStatus2,
-  getAgentRootDir: () => getAgentRootDir2,
-  cloneMemoryRepo: () => cloneMemoryRepo2,
-  addGitMemoryTag: () => addGitMemoryTag2,
-  PRE_COMMIT_HOOK_SCRIPT: () => PRE_COMMIT_HOOK_SCRIPT2
-});
-import { execFile as execFileCb2 } from "node:child_process";
-import {
-  chmodSync as chmodSync2,
-  existsSync as existsSync20,
-  mkdirSync as mkdirSync10,
-  renameSync as renameSync3,
-  rmSync as rmSync3,
-  writeFileSync as writeFileSync8
-} from "node:fs";
+// src/agent/memoryFilesystem.ts
+var exports_memoryFilesystem2 = {};
+__export(exports_memoryFilesystem2, {
+  renderMemoryFilesystemTree: () => renderMemoryFilesystemTree2,
+  labelFromRelativePath: () => labelFromRelativePath2,
+  getMemorySystemDir: () => getMemorySystemDir2,
+  getMemoryFilesystemRoot: () => getMemoryFilesystemRoot2,
+  ensureMemoryFilesystemDirs: () => ensureMemoryFilesystemDirs2,
+  applyMemfsFlags: () => applyMemfsFlags2,
+  MEMORY_SYSTEM_DIR: () => MEMORY_SYSTEM_DIR2,
+  MEMORY_FS_ROOT: () => MEMORY_FS_ROOT2,
+  MEMORY_FS_MEMORY_DIR: () => MEMORY_FS_MEMORY_DIR2,
+  MEMORY_FS_AGENTS_DIR: () => MEMORY_FS_AGENTS_DIR2
+});
+import { existsSync as existsSync20, mkdirSync as mkdirSync11 } from "node:fs";
 import { homedir as homedir22 } from "node:os";
-import { join as join32 } from "node:path";
-import { promisify as promisify10 } from "node:util";
-function getAgentRootDir2(agentId) {
-  return join32(homedir22(), ".letta", "agents", agentId);
+import { join as join33 } from "node:path";
+function getMemoryFilesystemRoot2(agentId, homeDir = homedir22()) {
+  return join33(homeDir, MEMORY_FS_ROOT2, MEMORY_FS_AGENTS_DIR2, agentId, MEMORY_FS_MEMORY_DIR2);
 }
-function getMemoryRepoDir2(agentId) {
-  return join32(getAgentRootDir2(agentId), "memory");
+function getMemorySystemDir2(agentId, homeDir = homedir22()) {
+  return join33(getMemoryFilesystemRoot2(agentId, homeDir), MEMORY_SYSTEM_DIR2);
 }
-function getGitRemoteUrl2(agentId) {
-  const baseUrl = getServerUrl2();
-  return `${baseUrl}/v1/git/${agentId}/state.git`;
-}
-async function getAuthToken2() {
-  const client = await getClient2();
-  return client._options?.apiKey ?? "";
-}
-async function runGit2(cwd2, args, token) {
-  const authArgs = token ? [
-    "-c",
-    `http.extraHeader=Authorization: Basic ${Buffer.from(`letta:${token}`).toString("base64")}`
-  ] : [];
-  const allArgs = [...authArgs, ...args];
-  debugLog("memfs-git", `git ${args.join(" ")} (in ${cwd2})`);
-  const result = await execFile9("git", allArgs, {
-    cwd: cwd2,
-    maxBuffer: 10 * 1024 * 1024,
-    timeout: 60000
-  });
-  return {
-    stdout: result.stdout?.toString() ?? "",
-    stderr: result.stderr?.toString() ?? ""
-  };
-}
-async function configureLocalCredentialHelper2(dir, token) {
-  const baseUrl = getServerUrl2();
-  const helper = `!f() { echo "username=letta"; echo "password=${token}"; }; f`;
-  await runGit2(dir, ["config", `credential.${baseUrl}.helper`, helper]);
-  debugLog("memfs-git", "Configured local credential helper");
-}
-function installPreCommitHook2(dir) {
-  const hooksDir = join32(dir, ".git", "hooks");
-  const hookPath = join32(hooksDir, "pre-commit");
-  if (!existsSync20(hooksDir)) {
-    mkdirSync10(hooksDir, { recursive: true });
+function ensureMemoryFilesystemDirs2(agentId, homeDir = homedir22()) {
+  const root = getMemoryFilesystemRoot2(agentId, homeDir);
+  const systemDir = getMemorySystemDir2(agentId, homeDir);
+  if (!existsSync20(root)) {
+    mkdirSync11(root, { recursive: true });
+  }
+  if (!existsSync20(systemDir)) {
+    mkdirSync11(systemDir, { recursive: true });
   }
-  writeFileSync8(hookPath, PRE_COMMIT_HOOK_SCRIPT2, "utf-8");
-  chmodSync2(hookPath, 493);
-  debugLog("memfs-git", "Installed pre-commit hook");
 }
-function isGitRepo2(agentId) {
-  return existsSync20(join32(getMemoryRepoDir2(agentId), ".git"));
+function labelFromRelativePath2(relativePath) {
+  const normalized = relativePath.replace(/\\/g, "/");
+  return normalized.replace(/\.md$/, "");
 }
-async function cloneMemoryRepo2(agentId) {
-  const token = await getAuthToken2();
-  const url = getGitRemoteUrl2(agentId);
-  const dir = getMemoryRepoDir2(agentId);
-  debugLog("memfs-git", `Cloning ${url} → ${dir}`);
-  if (!existsSync20(dir)) {
-    mkdirSync10(dir, { recursive: true });
-    await runGit2(dir, ["clone", url, "."], token);
-  } else if (!existsSync20(join32(dir, ".git"))) {
-    const tmpDir = `${dir}-git-clone-tmp`;
-    try {
-      if (existsSync20(tmpDir)) {
-        rmSync3(tmpDir, { recursive: true, force: true });
+function renderMemoryFilesystemTree2(systemLabels, detachedLabels) {
+  const makeNode = () => ({ children: new Map, isFile: false });
+  const root = makeNode();
+  const insertPath = (base2, label) => {
+    const parts = base2 ? [base2, ...label.split("/")] : label.split("/");
+    let current = root;
+    for (const [i, partName] of parts.entries()) {
+      const part = i === parts.length - 1 ? `${partName}.md` : partName;
+      if (!current.children.has(part)) {
+        current.children.set(part, makeNode());
       }
-      mkdirSync10(tmpDir, { recursive: true });
-      await runGit2(tmpDir, ["clone", url, "."], token);
-      renameSync3(join32(tmpDir, ".git"), join32(dir, ".git"));
-      await runGit2(dir, ["checkout", "--", "."], token);
-      debugLog("memfs-git", "Migrated existing memory directory to git repo");
-    } finally {
-      if (existsSync20(tmpDir)) {
-        rmSync3(tmpDir, { recursive: true, force: true });
+      current = current.children.get(part);
+      if (i === parts.length - 1) {
+        current.isFile = true;
       }
     }
+  };
+  for (const label of systemLabels) {
+    insertPath(MEMORY_SYSTEM_DIR2, label);
   }
-  await configureLocalCredentialHelper2(dir, token);
-  installPreCommitHook2(dir);
-}
-async function pullMemory2(agentId) {
-  const token = await getAuthToken2();
-  const dir = getMemoryRepoDir2(agentId);
-  await configureLocalCredentialHelper2(dir, token);
-  installPreCommitHook2(dir);
-  try {
-    const { stdout, stderr } = await runGit2(dir, ["pull", "--ff-only"]);
-    const output = stdout + stderr;
-    const updated = !output.includes("Already up to date");
-    return {
-      updated,
-      summary: updated ? output.trim() : "Already up to date"
-    };
-  } catch {
-    debugWarn("memfs-git", "Fast-forward pull failed, trying rebase");
-    try {
-      const { stdout, stderr } = await runGit2(dir, ["pull", "--rebase"]);
-      return { updated: true, summary: (stdout + stderr).trim() };
-    } catch (rebaseErr) {
-      const msg = rebaseErr instanceof Error ? rebaseErr.message : String(rebaseErr);
-      debugWarn("memfs-git", `Pull failed: ${msg}`);
-      return { updated: false, summary: `Pull failed: ${msg}` };
-    }
-  }
-}
-async function getMemoryGitStatus2(agentId) {
-  const dir = getMemoryRepoDir2(agentId);
-  const { stdout: statusOut } = await runGit2(dir, ["status", "--porcelain"]);
-  const dirty = statusOut.trim().length > 0;
-  let aheadOfRemote = false;
-  try {
-    const { stdout: revListOut } = await runGit2(dir, [
-      "rev-list",
-      "--count",
-      "@{u}..HEAD"
-    ]);
-    const aheadCount = parseInt(revListOut.trim(), 10);
-    aheadOfRemote = aheadCount > 0;
-  } catch {}
-  const parts = [];
-  if (dirty) {
-    const changedFiles = statusOut.trim().split(`
-`).filter((l) => l.trim()).map((l) => l.trim());
-    parts.push(`${changedFiles.length} uncommitted change(s)`);
+  for (const label of detachedLabels) {
+    insertPath(null, label);
   }
-  if (aheadOfRemote) {
-    parts.push("local commits not pushed to remote");
+  if (!root.children.has(MEMORY_SYSTEM_DIR2)) {
+    root.children.set(MEMORY_SYSTEM_DIR2, makeNode());
   }
-  return {
-    dirty,
-    aheadOfRemote,
-    summary: parts.length > 0 ? parts.join(", ") : "clean"
+  const sortedEntries = (node) => {
+    const entries = Array.from(node.children.entries());
+    return entries.sort(([nameA, nodeA], [nameB, nodeB]) => {
+      if (nodeA.isFile !== nodeB.isFile) {
+        return nodeA.isFile ? 1 : -1;
+      }
+      return nameA.localeCompare(nameB);
+    });
   };
+  const lines = ["/memory/"];
+  const render2 = (node, prefix) => {
+    const entries = sortedEntries(node);
+    entries.forEach(([name, child], index) => {
+      const isLast = index === entries.length - 1;
+      const branch = isLast ? "└──" : "├──";
+      lines.push(`${prefix}${branch} ${name}${child.isFile ? "" : "/"}`);
+      if (child.children.size > 0) {
+        const nextPrefix = `${prefix}${isLast ? "    " : "│   "}`;
+        render2(child, nextPrefix);
+      }
+    });
+  };
+  render2(root, "");
+  return lines.join(`
+`);
 }
-async function addGitMemoryTag2(agentId) {
-  const client = await getClient2();
-  try {
-    const agent = await client.agents.retrieve(agentId);
-    const tags = agent.tags || [];
-    if (!tags.includes(GIT_MEMORY_ENABLED_TAG2)) {
-      await client.agents.update(agentId, {
-        tags: [...tags, GIT_MEMORY_ENABLED_TAG2]
-      });
-      debugLog("memfs-git", `Added ${GIT_MEMORY_ENABLED_TAG2} tag`);
+async function applyMemfsFlags2(agentId, memfsFlag, noMemfsFlag, options) {
+  const { getServerUrl: getServerUrl2 } = await init_client2().then(() => exports_client);
+  const { settingsManager: settingsManager3 } = await init_settings_manager().then(() => exports_settings_manager);
+  if (memfsFlag) {
+    const serverUrl = getServerUrl2();
+    if (!serverUrl.includes("api.letta.com")) {
+      throw new Error("--memfs is only available on Letta Cloud (api.letta.com).");
     }
-  } catch (err) {
-    debugWarn("memfs-git", `Failed to add git-memory tag: ${err instanceof Error ? err.message : String(err)}`);
+    settingsManager3.setMemfsEnabled(agentId, true);
+  } else if (noMemfsFlag) {
+    settingsManager3.setMemfsEnabled(agentId, false);
   }
-}
-async function removeGitMemoryTag2(agentId) {
-  const client = await getClient2();
-  try {
-    const agent = await client.agents.retrieve(agentId);
-    const tags = agent.tags || [];
-    if (tags.includes(GIT_MEMORY_ENABLED_TAG2)) {
-      await client.agents.update(agentId, {
-        tags: tags.filter((t) => t !== GIT_MEMORY_ENABLED_TAG2)
-      });
-      debugLog("memfs-git", `Removed ${GIT_MEMORY_ENABLED_TAG2} tag`);
+  const isEnabled = settingsManager3.isMemfsEnabled(agentId);
+  if (isEnabled && memfsFlag) {
+    const { detachMemoryTools: detachMemoryTools2 } = await init_toolset().then(() => exports_toolset);
+    await detachMemoryTools2(agentId);
+  }
+  if (memfsFlag || noMemfsFlag) {
+    const { updateAgentSystemPromptMemfs: updateAgentSystemPromptMemfs3 } = await init_modify().then(() => exports_modify);
+    await updateAgentSystemPromptMemfs3(agentId, isEnabled);
+  }
+  let pullSummary;
+  if (isEnabled) {
+    const { addGitMemoryTag: addGitMemoryTag2, isGitRepo: isGitRepo2, cloneMemoryRepo: cloneMemoryRepo2, pullMemory: pullMemory2 } = await init_memoryGit().then(() => exports_memoryGit);
+    await addGitMemoryTag2(agentId);
+    if (!isGitRepo2(agentId)) {
+      await cloneMemoryRepo2(agentId);
+    } else if (options?.pullOnExistingRepo) {
+      const result = await pullMemory2(agentId);
+      pullSummary = result.summary;
     }
-  } catch (err) {
-    debugWarn("memfs-git", `Failed to remove git-memory tag: ${err instanceof Error ? err.message : String(err)}`);
   }
+  const action = memfsFlag ? "enabled" : noMemfsFlag ? "disabled" : "unchanged";
+  return {
+    action,
+    memoryDir: isEnabled ? getMemoryFilesystemRoot2(agentId) : undefined,
+    pullSummary
+  };
 }
-var execFile9, GIT_MEMORY_ENABLED_TAG2 = "git-memory-enabled", PRE_COMMIT_HOOK_SCRIPT2 = `#!/usr/bin/env bash
-# Validate frontmatter in staged memory .md files
-# Installed by Letta Code CLI
-
-AGENT_EDITABLE_KEYS="description limit"
-PROTECTED_KEYS="read_only"
-ALL_KNOWN_KEYS="description limit read_only"
-errors=""
-
-# Helper: extract a frontmatter value from content
-get_fm_value() {
-  local content="$1" key="$2"
-  local closing_line
-  closing_line=$(echo "$content" | tail -n +2 | grep -n '^---$' | head -1 | cut -d: -f1)
-  [ -z "$closing_line" ] && return
-  echo "$content" | tail -n +2 | head -n $((closing_line - 1)) | grep "^$key:" | cut -d: -f2- | sed 's/^ *//;s/ *$//'
-}
-
-for file in $(git diff --cached --name-only --diff-filter=ACM | grep '^memory/.*\\.md$'); do
-  staged=$(git show ":$file")
-
-  # Frontmatter is required
-  first_line=$(echo "$staged" | head -1)
-  if [ "$first_line" != "---" ]; then
-    errors="$errors\\n  $file: missing frontmatter (must start with ---)"
-    continue
-  fi
-
-  # Check frontmatter is properly closed
-  closing_line=$(echo "$staged" | tail -n +2 | grep -n '^---$' | head -1 | cut -d: -f1)
-  if [ -z "$closing_line" ]; then
-    errors="$errors\\n  $file: frontmatter opened but never closed (missing closing ---)"
-    continue
-  fi
-
-  # Check read_only protection against HEAD version
-  head_content=$(git show "HEAD:$file" 2>/dev/null || true)
-  if [ -n "$head_content" ]; then
-    head_ro=$(get_fm_value "$head_content" "read_only")
-    if [ "$head_ro" = "true" ]; then
-      errors="$errors\\n  $file: file is read_only and cannot be modified"
-      continue
-    fi
-  fi
-
-  # Extract frontmatter lines
-  frontmatter=$(echo "$staged" | tail -n +2 | head -n $((closing_line - 1)))
-
-  # Track required fields
-  has_description=false
-  has_limit=false
-
-  # Validate each line
-  while IFS= read -r line; do
-    [ -z "$line" ] && continue
-
-    key=$(echo "$line" | cut -d: -f1 | tr -d ' ')
-    value=$(echo "$line" | cut -d: -f2- | sed 's/^ *//;s/ *$//')
-
-    # Check key is known
-    known=false
-    for k in $ALL_KNOWN_KEYS; do
-      if [ "$key" = "$k" ]; then
-        known=true
-        break
-      fi
-    done
-    if [ "$known" = "false" ]; then
-      errors="$errors\\n  $file: unknown frontmatter key '$key' (allowed: $ALL_KNOWN_KEYS)"
-      continue
-    fi
-
-    # Check if agent is trying to modify a protected key
-    for k in $PROTECTED_KEYS; do
-      if [ "$key" = "$k" ]; then
-        # Compare against HEAD — if value changed (or key was added), reject
-        if [ -n "$head_content" ]; then
-          head_val=$(get_fm_value "$head_content" "$key")
-          if [ "$value" != "$head_val" ]; then
-            errors="$errors\\n  $file: '$key' is a protected field and cannot be changed by the agent"
-          fi
-        else
-          # New file with read_only — agent shouldn't set this
-          errors="$errors\\n  $file: '$key' is a protected field and cannot be set by the agent"
-        fi
-      fi
-    done
-
-    # Validate value types
-    case "$key" in
-      limit)
-        has_limit=true
-        if ! echo "$value" | grep -qE '^[0-9]+$' || [ "$value" = "0" ]; then
-          errors="$errors\\n  $file: 'limit' must be a positive integer, got '$value'"
-        fi
-        ;;
-      description)
-        has_description=true
-        if [ -z "$value" ]; then
-          errors="$errors\\n  $file: 'description' must not be empty"
-        fi
-        ;;
-    esac
-  done <<< "$frontmatter"
-
-  # Check required fields
-  if [ "$has_description" = "false" ]; then
-    errors="$errors\\n  $file: missing required field 'description'"
-  fi
-  if [ "$has_limit" = "false" ]; then
-    errors="$errors\\n  $file: missing required field 'limit'"
-  fi
-
-  # Check if protected keys were removed (existed in HEAD but not in staged)
-  if [ -n "$head_content" ]; then
-    for k in $PROTECTED_KEYS; do
-      head_val=$(get_fm_value "$head_content" "$k")
-      if [ -n "$head_val" ]; then
-        staged_val=$(get_fm_value "$staged" "$k")
-        if [ -z "$staged_val" ]; then
-          errors="$errors\\n  $file: '$k' is a protected field and cannot be removed by the agent"
-        fi
-      fi
-    done
-  fi
-done
-
-if [ -n "$errors" ]; then
-  echo "Frontmatter validation failed:"
-  echo -e "$errors"
-  exit 1
-fi
-`;
-var init_memoryGit2 = __esm(async () => {
-  init_debug();
-  await init_client2();
-  execFile9 = promisify10(execFileCb2);
-});
+var MEMORY_FS_ROOT2 = ".letta", MEMORY_FS_AGENTS_DIR2 = "agents", MEMORY_FS_MEMORY_DIR2 = "memory", MEMORY_SYSTEM_DIR2 = "system";
+var init_memoryFilesystem2 = () => {};
 
 // src/index.ts
 import { parseArgs as parseArgs6 } from "util";
@@ -102905,10 +102946,6 @@ init_oauth();
 init_timing();
 await init_settings_manager();
 import { hostname } from "node:os";
-function getServerUrl() {
-  const settings = settingsManager.getSettings();
-  return process.env.LETTA_BASE_URL || settings.env?.LETTA_BASE_URL || LETTA_CLOUD_API_URL;
-}
 async function getClient() {
   const settings = await settingsManager.getSettingsWithSecureTokens();
   let apiKey = process.env.LETTA_API_KEY || settings.env?.LETTA_API_KEY;
@@ -102958,15 +102995,17 @@ function getContext() {
     global2[CONTEXT_KEY] = {
       agentId: null,
       skillsDirectory: null,
+      noSkills: false,
       conversationId: null
     };
   }
   return global2[CONTEXT_KEY];
 }
 var context = getContext();
-function setAgentContext(agentId, skillsDirectory) {
+function setAgentContext(agentId, skillsDirectory, noSkills) {
   context.agentId = agentId;
   context.skillsDirectory = skillsDirectory || null;
+  context.noSkills = noSkills ?? false;
 }
 function setConversationId(conversationId) {
   context.conversationId = conversationId;
@@ -103043,8 +103082,9 @@ function extractUserMessagePreview(message) {
     for (let i = content.length - 1;i >= 0; i--) {
       const part = content[i];
       if (part?.type === "text" && part.text) {
-        if (part.text.startsWith(SYSTEM_REMINDER_OPEN))
+        if (part.text.startsWith(SYSTEM_REMINDER_OPEN) || part.text.startsWith(SYSTEM_ALERT_OPEN)) {
           continue;
+        }
         textToShow = part.text;
         break;
       }
@@ -106270,12 +106310,12 @@ EXAMPLES
   console.log(usage);
 }
 async function printInfo() {
-  const { join: join33 } = await import("path");
+  const { join: join34 } = await import("path");
   const { getVersion: getVersion3 } = await Promise.resolve().then(() => (init_version2(), exports_version));
   const { SKILLS_DIR: SKILLS_DIR3 } = await Promise.resolve().then(() => (init_skills2(), exports_skills2));
   const { exists: exists3 } = await Promise.resolve().then(() => (init_fs2(), exports_fs));
   const cwd2 = process.cwd();
-  const skillsDir = join33(cwd2, SKILLS_DIR3);
+  const skillsDir = join34(cwd2, SKILLS_DIR3);
   const skillsExist = exists3(skillsDir);
   await settingsManager2.loadLocalProjectSettings(cwd2);
   const localPinned = settingsManager2.getLocalPinnedAgents(cwd2);
@@ -106476,8 +106516,10 @@ Auto-update failed due to filesystem issue (ENOTEMPTY).`);
         "pre-load-skills": { type: "string" },
         "from-af": { type: "string" },
         import: { type: "string" },
+        tags: { type: "string" },
         memfs: { type: "boolean" },
         "no-memfs": { type: "boolean" },
+        "no-skills": { type: "boolean" },
         "max-turns": { type: "string" }
       },
       strict: true,
@@ -106556,6 +106598,7 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
   const skillsDirectory = values.skills ?? undefined;
   const memfsFlag = values.memfs;
   const noMemfsFlag = values["no-memfs"];
+  const noSkillsFlag = values["no-skills"];
   const fromAfFile = values.import ?? values["from-af"];
   const isHeadless = values.prompt || values.run || !process.stdin.isTTY;
   if (command && !isHeadless) {
@@ -106821,7 +106864,7 @@ Error: ${message}`);
     await loadTools2(modelForTools);
     markMilestone2("TOOLS_LOADED");
     const { handleHeadlessCommand: handleHeadlessCommand2 } = await init_headless().then(() => exports_headless);
-    await handleHeadlessCommand2(process.argv, specifiedModel, skillsDirectory);
+    await handleHeadlessCommand2(process.argv, specifiedModel, skillsDirectory, noSkillsFlag);
     return;
   }
   markMilestone2("TUI_MODE_START");
@@ -107269,32 +107312,14 @@ Error: ${message}`);
             }
           } catch {}
         }
-        setAgentContext(agent.id, skillsDirectory2);
+        setAgentContext(agent.id, skillsDirectory2, noSkillsFlag);
         const isSubagent = process.env.LETTA_CODE_AGENT_ROLE === "subagent";
-        if (memfsFlag) {
-          const serverUrl = getServerUrl();
-          if (!serverUrl.includes("api.letta.com")) {
-            console.error("--memfs is only available on Letta Cloud (api.letta.com).");
-            process.exit(1);
-          }
-          settingsManager2.setMemfsEnabled(agent.id, true);
-        } else if (noMemfsFlag) {
-          settingsManager2.setMemfsEnabled(agent.id, false);
-        }
-        if (settingsManager2.isMemfsEnabled(agent.id) && memfsFlag) {
-          const { detachMemoryTools: detachMemoryTools3 } = await init_toolset2().then(() => exports_toolset2);
-          await detachMemoryTools3(agent.id);
-        }
-        if (memfsFlag || noMemfsFlag) {
-          const { updateAgentSystemPromptMemfs: updateAgentSystemPromptMemfs3 } = await init_modify2().then(() => exports_modify2);
-          await updateAgentSystemPromptMemfs3(agent.id, settingsManager2.isMemfsEnabled(agent.id));
-        }
-        if (settingsManager2.isMemfsEnabled(agent.id)) {
-          const { addGitMemoryTag: addGitMemoryTag3, isGitRepo: isGitRepo3, cloneMemoryRepo: cloneMemoryRepo3 } = await init_memoryGit2().then(() => exports_memoryGit2);
-          await addGitMemoryTag3(agent.id);
-          if (!isGitRepo3(agent.id)) {
-            await cloneMemoryRepo3(agent.id);
-          }
+        try {
+          const { applyMemfsFlags: applyMemfsFlags3 } = await Promise.resolve().then(() => (init_memoryFilesystem2(), exports_memoryFilesystem2));
+          await applyMemfsFlags3(agent.id, memfsFlag, noMemfsFlag);
+        } catch (error) {
+          console.error(error instanceof Error ? error.message : String(error));
+          process.exit(1);
         }
         const isResumingProject = !shouldCreateNew && !!resumingAgentId;
         const isReusingExistingAgent = !shouldCreateNew && !fromAfFile2 && agent && agent.id;
@@ -107547,4 +107572,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=3372F396AE7A3CDF64756E2164756E21
+//# debugId=90C1BD0F21F7961E64756E2164756E21