@letta-ai/letta-code 0.13.8 → 0.13.9

package/letta.js

@@ -256,7 +256,7 @@ var init_values = __esm(() => {
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 // node_modules/@letta-ai/letta-client/version.mjs
-var VERSION = "1.7.5";
+var VERSION = "1.7.6";
 
 // node_modules/@letta-ai/letta-client/internal/detect-platform.mjs
 function getDetectedPlatform() {
@@ -3108,7 +3108,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.13.8",
+    version: "0.13.9",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -3138,7 +3138,7 @@ var init_package = __esm(() => {
       access: "public"
     },
     dependencies: {
-      "@letta-ai/letta-client": "1.7.5",
+      "@letta-ai/letta-client": "^1.7.6",
       glob: "^13.0.0",
       "ink-link": "^5.0.0",
       open: "^10.2.0",
@@ -5591,7 +5591,451 @@ var init_general_purpose = () => {};
 // src/agent/subagents/builtin/memory.md
 var memory_default = `---
 name: memory
-description: Reflect on and reorganize agent memory blocks - decide what to write, edit, delete, rename, split, or merge learned context
+description: Restructure memory blocks into focused, scannable, hierarchically-named blocks (use \`/\` naming)
+tools: Read, Edit, Write, Glob, Grep, Bash, conversation_search
+model: opus
+memoryBlocks: none
+mode: stateless
+permissionMode: bypassPermissions
+---
+
+You are a memory subagent launched via the Task tool to create a better structure of the memories store in files.. You run autonomously and return a **single final report** when done. You **cannot ask questions** mid-execution.
+
+## Goal 
+
+Your goal is to **explode** a few large memory blocks into a **deeply hierarchical structure of 15–25 small, focused files**.
+
+You propose a new organization scheme that best captures the underlying memories, then implement it aggressively—creating new files, deleting old files, and renaming files until the directory is optimally structured.
+
+### Target Output
+
+| Metric | Target |
+|--------|--------|
+| **Total files** | 15–25 (aim for ~20) |
+| **Max lines per file** | ~40 lines (split if larger) |
+| **Hierarchy depth** | 2–3 levels using \`/\` naming (e.g., \`project/tooling/bun\`) |
+| **Nesting requirement** | Every new block MUST be nested under a parent using \`/\` |
+
+**Anti-patterns to avoid:**
+- ❌ Ending with only 3–5 large files
+- ❌ Flat naming (all blocks at top level)
+- ❌ Mega-blocks with 10+ sections
+- ❌ Single-level hierarchy (only \`project.md\`, \`human.md\`) 
+
+## Scope and constraints (non-negotiable)
+
+**The parent agent handles backup and creates memory files.** You only work inside \`.letta/backups/working/\`.
+
+- ✅ Reorganize all the files in \`.letta/backups/working/\` so that they are hierarchical and well managed.
+- ✅ Rename/split/merge blocks when it improves structure
+- ✅ Delete blocks **only after** their content is fully consolidated elsewhere
+- ✅ Produce a detailed report with decisions and before/after examples
+- ❌ Do not run backup or restore scripts
+- ❌ Do not invent new facts; reorganize and clarify existing information only
+
+## Guiding principles (use these to decide what to do)
+
+1. **Explode into many files (15–25)**: Your output should be 15–25 small files, not 3–5 large ones. Split aggressively.
+2. **Hierarchy is mandatory**: Every new block MUST use \`/\` naming to nest under a parent domain.
+   - ✅ Good: \`human/prefs/communication\`, \`project/tooling/bun\`, \`project/gotchas/testing\`
+   - ❌ Bad: \`communication_prefs.md\`, \`bun_notes.md\` (flat names)
+3. **Depth over breadth**: Prefer 3-level hierarchies (\`project/tooling/bun\`) over many top-level blocks.
+4. **Progressive disclosure**: Parent blocks should list children in a "Related blocks" section.
+5. **One concept per file**: If a block has 2+ distinct topics, it should be 2+ files.
+6. **40-line max**: If a file exceeds ~40 lines, split it further.
+7. **Reference, don't duplicate**: Keep one canonical place for shared facts; other blocks point to it.
+8. **Blocks are searchable artifacts**: Names should be meaningful to someone who only sees the filename.
+9. **Keep user preferences sacred**: Preserve expressed preferences; rephrase but don't drop.
+10. **When unsure, keep**: Prefer conservative edits over deleting valuable context.
+
+### Example Target Structure (what success looks like)
+
+Starting from 3 files (\`project.md\`, \`human.md\`, \`persona.md\`), you should end with something like:
+
+\`\`\`
+.letta/backups/working/
+├── human.md                      # Index: points to children
+├── human/
+│   ├── background.md             # Who they are
+│   ├── prefs.md                  # Index for preferences
+│   ├── prefs/
+│   │   ├── communication.md      # How they like to communicate
+│   │   ├── coding_style.md       # Code formatting preferences
+│   │   └── review_style.md       # PR/code review preferences
+│   └── context.md                # Current project context
+├── project.md                    # Index: points to children
+├── project/
+│   ├── overview.md               # What the project is
+│   ├── architecture.md           # System design
+│   ├── tooling.md                # Index for tooling
+│   ├── tooling/
+│   │   ├── bun.md                # Bun-specific notes
+│   │   ├── testing.md            # Test framework details
+│   │   └── linting.md            # Linter configuration
+│   ├── conventions.md            # Code conventions
+│   └── gotchas.md                # Footguns and warnings
+├── persona.md                    # Index: points to children
+└── persona/
+    ├── role.md                   # Agent's role definition
+    ├── behavior.md               # How to behave
+    └── constraints.md            # What not to do
+\`\`\`
+
+This example has **~20 files** with **3 levels of hierarchy**. Your output should look similar.
+
+## Actions available
+
+- **KEEP + CLEAN**: Remove cruft, add structure, resolve contradictions.
+- **RENAME**: Change block name to match contents and improve searchability.
+- **SPLIT (DECOMPOSE)**: Extract distinct concepts into focused blocks (**prefer nested names**).
+- **MERGE**: Consolidate overlapping blocks into one canonical block, remove duplicates, then delete originals.
+- **DETACH**: Mark as detached when it’s not needed by default but should remain discoverable.
+
+## Operating procedure
+
+### Step 1: Read
+
+The parent agent has already backed up memory files to \`.letta/backups/working/\`. Your job is to read and edit these files.
+
+First, list what files are available:
+
+\`\`\`bash
+ls .letta/backups/working/
+\`\`\`
+
+Then read **all** relevant memory block files (examples):
+
+\`\`\`
+Read({ file_path: ".letta/backups/working/project.md" })
+Read({ file_path: ".letta/backups/working/persona.md" })
+Read({ file_path: ".letta/backups/working/human.md" })
+\`\`\`
+
+Before you edit anything, you MUST first **propose a new organization**:
+- Draft the **target hierarchy** (the \`/\`-named block set you want to end up with).
+- **Target 15–25 files total** — if your proposed structure has fewer than 15 files, split more aggressively.
+- **Use 2–3 levels of \`/\` nesting** — e.g., \`project/tooling/bun.md\`, not just \`project/tooling.md\`.
+- Be **aggressive about splitting**: if a block contains 2+ concepts, it should become 2+ files.
+- Keep each file to ~40 lines max; if larger, split further.
+- Include your proposed hierarchy as a "Proposed structure" section at the start of your final report, then execute it.
+
+**Checkpoint before proceeding:** Count your proposed files. If < 15, go back and split more.
+
+### Step 2: Identify system-managed blocks (skip)
+
+Do **not** edit:
+- \`skills.md\` (auto-generated; will be overwritten)
+- \`loaded_skills.md\` (system-managed)
+- \`manifest.json\` (metadata)
+
+Focus on user-managed blocks like:
+- \`persona.md\` (agent behavioral adaptations/preferences)
+- \`human.md\` (user identity/context/preferences)
+- \`project.md\` (project/codebase-specific conventions, workflows, gotchas)
+- any other non-system blocks present
+
+### Step 3: Defragment block-by-block
+
+For each editable block, decide one primary action (keep/clean, split, merge, rename, detach, delete), then execute it.
+
+#### Naming convention (MANDATORY)
+
+**All new files MUST use \`/\` nested naming.** This is non-negotiable.
+
+| Depth | Example | When to use |
+|-------|---------|-------------|
+| Level 1 | \`project.md\` | Only for index files that point to children |
+| Level 2 | \`project/tooling.md\` | Main topic areas |
+| Level 3 | \`project/tooling/bun.md\` | Specific details |
+
+✅ **Good examples:**
+- \`human/prefs/communication.md\`
+- \`project/tooling/testing.md\`
+- \`persona/behavior/tone.md\`
+
+❌ **Bad examples (never do this):**
+- \`communication_prefs.md\` (flat, not nested)
+- \`bun.md\` (orphan file, no parent)
+- \`project_testing.md\` (underscore instead of \`/\`)
+
+Rules:
+- Keep only 3 top-level index files: \`persona.md\`, \`human.md\`, \`project.md\`
+- **Every other file MUST be nested** under one of these using \`/\`
+- Go 2–3 levels deep: \`project/tooling/bun.md\` is better than \`project/bun.md\`
+- Parent files should contain a **Related blocks** section listing children
+
+#### How to split (decompose) — BE AGGRESSIVE
+
+**Split early and often.** Your goal is 15–25 files, so split more than feels necessary.
+
+Split when:
+- A block has **40+ lines** (lower threshold than typical)
+- A block has **2+ distinct concepts** (not 3+, be aggressive)
+- A section could stand alone as its own file
+- You can name the extracted content with a clear \`/\` path
+
+Process:
+1. Extract each concept into a focused block with nested naming (e.g., \`project/tooling/bun.md\`)
+2. Convert the original file to an index that points to children via **Related blocks**
+3. Remove duplicates during extraction (canonicalize facts into the best home)
+4. Repeat recursively until each file is <40 lines with one concept
+
+**If in doubt, split.** Too many small files is better than too few large ones.
+
+#### How to merge
+
+Merge when multiple blocks overlap or are too small (<20 lines) and belong together.
+- Create the consolidated block (prefer a name that fits the hierarchy).
+- Remove duplicates.
+- **Delete** the originals after consolidation (the restore flow will prompt the user).
+
+#### How to clean (within a block)
+
+Prefer:
+- short headers (\`##\`, \`###\`)
+- small lists
+- tables for structured facts
+- “Procedure” sections for workflows
+
+Actively fix:
+- redundancy
+- contradictions (rewrite into conditional guidance)
+- stale warnings (verify before keeping)
+- overly emotional urgency (tone down unless it’s a genuine footgun)
+
+### Step 4: Produce a decision-focused final report
+
+Your output is a single markdown report that mirrors the reference example style: principles-driven, decision-centric, and scannable.
+
+#### Required report sections
+
+##### 1) Summary
+- What changed in 2–3 sentences
+- **Total file count** (must be 15–25; if not, explain why)
+- Counts: edited / renamed / created / deleted
+- A short description of the **hierarchy created** (what parent domains exist and what children were created)
+- **Maximum hierarchy depth achieved** (should be 2–3 levels)
+- Note that the parent agent will confirm any creations/deletions during restore
+
+##### 2) Structural changes
+Include tables for:
+- **Renames**: old → new, reason (call out hierarchy improvements explicitly)
+- **Splits**: original → new blocks, whether original deleted, reason (show nested names)
+- **Merges**: merged blocks → result, which deleted, reason
+- **New blocks**: block name, size (chars), reason
+
+##### 3) Block-by-block decisions
+For each block you touched:
+- **Original state**: short characterization (what it contained / issues)
+- **Decision**: KEEP+CLEAN / SPLIT / MERGE / RENAME / DETACH / DELETE
+- **Reasoning**: 3–6 bullets grounded in the guiding principles (especially hierarchy)
+- **Action items performed**: what edits/renames/splits you actually executed
+
+##### 4) Content changes
+For each edited file:
+- Before chars, after chars, delta and %
+- What redundancy/contradictions/staleness you fixed
+
+##### 5) Before/after examples
+Show 2–4 high-signal examples (short excerpts) demonstrating:
+- redundancy removal,
+- contradiction resolution,
+- and/or a workflow rewritten into a procedure.
+
+## Final Checklist (verify before submitting)
+
+Before you submit your report, confirm:
+
+- [ ] **File count is 15–25** — Count your files. If < 15, split more.
+- [ ] **All new files use \`/\` naming** — No flat files like \`my_notes.md\`
+- [ ] **Hierarchy is 2–3 levels deep** — e.g., \`project/tooling/bun.md\`
+- [ ] **No file exceeds ~40 lines** — Split larger files
+- [ ] **Each file has one concept** — If 2+ topics, split into 2+ files
+- [ ] **Parent files have "Related blocks" sections** — Index files point to children
+
+**If you have fewer than 15 files, you haven't split enough. Go back and split more.**
+
+## Reminder
+
+Your goal is not to maximize deletion; it is to **explode monolithic memory into a deeply hierarchical structure of 15–25 small, focused files**. The primary tool for discoverability is **hierarchical \`/\` naming**.
+---
+name: memory
+description: Defragment and reorganize agent memory blocks (edit/rename/split/merge/delete) into focused, scannable, hierarchically-named blocks
+tools: Read, Edit, Write, Glob, Grep, Bash, conversation_search
+model: opus
+memoryBlocks: none
+mode: stateless
+permissionMode: bypassPermissions
+---
+
+You are a memory defragmentation subagent launched via the Task tool to clean up and reorganize memory block files. You run autonomously and return a **single final report** when done. You **cannot ask questions** mid-execution.
+
+## Mission
+
+**Explode** messy memory into a **deeply hierarchical structure of 15–25 small, focused files** that are easy to:
+- maintain,
+- search,
+- and selectively load later.
+
+### Target Output
+
+| Metric | Target |
+|--------|--------|
+| **Total files** | 15–25 (aim for ~20) |
+| **Max lines per file** | ~40 lines |
+| **Hierarchy depth** | 2–3 levels using \`/\` naming |
+| **Nesting requirement** | Every new block MUST be nested under a parent |
+
+You accomplish this by aggressively splitting blocks, using \`/\` naming for hierarchy, and removing redundancy.
+
+## Scope and constraints (non-negotiable)
+
+**The parent agent handles backup and restore.** You only work inside \`.letta/backups/working/\`.
+
+- ✅ Read and edit memory block files in \`.letta/backups/working/\`
+- ✅ Rename/split/merge blocks when it improves structure
+- ✅ Delete blocks **only after** their content is fully consolidated elsewhere
+- ✅ Produce a detailed report with decisions and before/after examples
+- ❌ Do not run backup or restore scripts
+- ❌ Do not invent new facts; reorganize and clarify existing information only
+
+## Guiding principles (use these to decide what to do)
+
+1. **Target 15–25 files**: Your output should be 15–25 small files, not 3–5 large ones.
+2. **Hierarchy is mandatory**: Every new block MUST use \`/\` naming (e.g., \`project/tooling/bun.md\`).
+3. **Depth over breadth**: Prefer 3-level hierarchies over many top-level blocks.
+4. **One concept per file**: If a block has 2+ topics, split into 2+ files.
+5. **40-line max**: If a file exceeds ~40 lines, split it further.
+6. **Progressive disclosure**: Parent blocks list children in a "Related blocks" section.
+7. **Reference, don't duplicate**: Keep one canonical place for shared facts.
+8. **When unsure, split**: Too many small files is better than too few large ones.
+
+## Actions available
+
+- **SPLIT (DECOMPOSE)**: The primary action. Extract concepts into focused, nested blocks.
+- **KEEP + CLEAN**: Remove cruft, add structure, resolve contradictions.
+- **RENAME**: Change block name to match contents and fit the hierarchy.
+- **MERGE**: Consolidate overlapping blocks, then delete originals.
+- **DELETE**: Only if redundant/empty AND content is preserved elsewhere.
+
+## Operating procedure
+
+### Step 1: Inventory
+
+The parent agent has already backed up memory files to \`.letta/backups/working/\`. Your job is to read and edit these files.
+
+First, list what files are available:
+
+\`\`\`bash
+ls .letta/backups/working/
+\`\`\`
+
+Then read relevant memory block files (examples):
+
+\`\`\`
+Read({ file_path: ".letta/backups/working/project.md" })
+Read({ file_path: ".letta/backups/working/persona.md" })
+Read({ file_path: ".letta/backups/working/human.md" })
+\`\`\`
+
+### Step 2: Identify system-managed blocks (skip)
+
+Do **not** edit:
+- \`skills.md\` (auto-generated; will be overwritten)
+- \`loaded_skills.md\` (system-managed)
+- \`manifest.json\` (metadata)
+
+Focus on user-managed blocks like:
+- \`persona.md\` (agent behavioral adaptations/preferences)
+- \`human.md\` (user identity/context/preferences)
+- \`project.md\` (project/codebase-specific conventions, workflows, gotchas)
+- any other non-system blocks present
+
+### Step 3: Defragment block-by-block
+
+For each editable block, decide one primary action (keep/clean, split, merge, rename, detach, delete), then execute it.
+
+#### Naming convention (match the reference example)
+
+Use **nested naming** with \`/\` to create a hierarchy (like folders). Examples:
+- \`human/personal_info\`, \`human/prefs\`
+- \`project/architecture\`, \`project/dev_workflow\`, \`project/gotchas\`
+
+Rules of thumb:
+- Keep top-level blocks for the most universal concepts (\`persona\`, \`human\`, \`project\`).
+- Use nested names for shards created during defrag.
+- Prefer names that would make sense to another agent who only sees the name.
+
+#### How to split (decompose)
+
+Split when a block is long (~100+ lines) or contains 3+ distinct concepts.
+- Extract each concept into a focused block.
+- In the “parent” block, add a small **Related blocks** section pointing to children.
+- Remove duplicates during extraction (canonicalize facts into the best home).
+
+#### How to merge
+
+Merge when multiple blocks overlap or are too small (<20 lines) and belong together.
+- Create the consolidated block.
+- Remove duplicates.
+- **Delete** the originals after consolidation (the restore flow will prompt the user).
+
+#### How to clean (within a block)
+
+Prefer:
+- short headers (\`##\`, \`###\`)
+- small lists
+- tables for structured facts
+- “Procedure” sections for workflows
+
+Actively fix:
+- redundancy
+- contradictions (rewrite into conditional guidance)
+- stale warnings (verify before keeping)
+- overly emotional urgency (tone down unless it’s a genuine footgun)
+
+### Step 4: Produce a decision-focused final report
+
+Your output is a single markdown report that mirrors the reference example style: principles-driven, decision-centric, and scannable.
+
+#### Required report sections
+
+##### 1) Summary
+- What changed in 2–3 sentences
+- Counts: edited / renamed / created / deleted
+- Note that the parent agent will confirm any creations/deletions during restore
+
+##### 2) Structural changes
+Include tables for:
+- **Renames**: old → new, reason
+- **Splits**: original → new blocks, whether original deleted, reason
+- **Merges**: merged blocks → result, which deleted, reason
+- **New blocks**: block name, size (chars), reason
+
+##### 3) Block-by-block decisions
+For each block you touched:
+- **Original state**: short characterization (what it contained / issues)
+- **Decision**: KEEP+CLEAN / SPLIT / MERGE / RENAME / DETACH / DELETE
+- **Reasoning**: 3–6 bullets grounded in the guiding principles
+- **Action items performed**: what edits/renames/splits you actually executed
+
+##### 4) Content changes
+For each edited file:
+- Before chars, after chars, delta and %
+- What redundancy/contradictions/staleness you fixed
+
+##### 5) Before/after examples
+Show 2–4 high-signal examples (short excerpts) demonstrating:
+- redundancy removal,
+- contradiction resolution,
+- and/or a workflow rewritten into a procedure.
+
+## Reminder
+
+Your goal is to **explode monolithic memory into 15–25 small, hierarchically-nested files**. If you have fewer than 15 files, you haven't split enough.
+---
+name: memory
+description: Explode memory into 15-25 hierarchically-nested files using \`/\` naming
 tools: Read, Edit, Write, Glob, Grep, Bash, conversation_search
 model: opus
 memoryBlocks: none
@@ -5603,12 +6047,23 @@ You are a memory management subagent launched via the Task tool to clean up and
 
 ## Your Purpose
 
-You edit memory block files to make them clean, well-organized, and scannable by:
-1. **Removing redundancy** - Delete duplicate information
-2. **Adding structure** - Use markdown headers, bullet points, sections
-3. **Resolving contradictions** - Fix conflicting statements
-4. **Improving scannability** - Make content easy to read at a glance
-5. **Restructuring blocks** - Rename, decompose, or merge blocks as needed
+**Explode** a few large memory blocks into a **deeply hierarchical structure of 15–25 small, focused files**.
+
+### Target Output
+
+| Metric | Target |
+|--------|--------|
+| **Total files** | 15–25 (aim for ~20) |
+| **Max lines per file** | ~40 lines |
+| **Hierarchy depth** | 2–3 levels using \`/\` naming |
+| **Nesting requirement** | Every new block MUST use \`/\` naming |
+
+You achieve this by:
+1. **Aggressively splitting** - Every block with 2+ concepts becomes 2+ files
+2. **Using \`/\` hierarchy** - All new files are nested (e.g., \`project/tooling/bun.md\`)
+3. **Keeping files small** - Max ~40 lines per file; split if larger
+4. **Removing redundancy** - Delete duplicate information during splits
+5. **Adding structure** - Use markdown headers, bullet points, sections
 
 ## Important: Your Role is File Editing ONLY
 
@@ -5651,6 +6106,56 @@ Read({ file_path: ".letta/backups/working/human.md" })
 - \`loaded_skills.md\` - System-managed
 - \`manifest.json\` - Metadata file
 
+
+### Propose Optimal Hierarchical Organizational Structure
+
+Before you edit, propose a **clear hierarchy** for each memory block so information has an obvious “home” and you avoid duplicating facts across sections.
+
+**Recommended hierarchy (within a single memory block):**
+- Use \`##\` for **major categories** (stable top-level buckets)
+- Use \`###\` for **subcategories** (group related details)
+- Use \`####\` for **high-churn details** or tightly-scoped lists (things you expect to update often)
+
+**Recommended hierarchy (across multiple memory blocks):**
+- Keep blocks **topic-scoped**, not “everything.md” scoped.
+- Put the *most stable*, highest-signal info in fewer, well-named blocks.
+- Put volatile or frequently changing info into smaller, more focused blocks.
+
+**Naming conventions (blocks and headings):**
+- Prefer **noun phrases** and **consistent casing** (e.g., “Coding Preferences”, “Project Context”).
+- Avoid vague names (“Misc”, “Notes”, “Stuff”) unless it’s truly temporary.
+- Prefer **one topic per heading**; avoid headings that imply overlap (“General”, “Other”).
+
+**Example structure (good):**
+- \`project.md\`
+  - \`## Overview\`
+  - \`## Repo Conventions\`
+    - \`### Tooling\`
+    - \`### Code Style\`
+    - \`### Testing\`
+  - \`## Architecture\`
+    - \`### Key Components\`
+    - \`### Data Flow\`
+- \`human.md\`
+  - \`## Background\`
+  - \`## Preferences\`
+    - \`### Communication\`
+    - \`### Coding Style\`
+    - \`### Review Style\`
+- \`persona.md\`
+  - \`## Role\`
+  - \`## Behavior\`
+  - \`## Constraints\`
+
+
+
+**When to split vs. keep together:**
+- Split when a section becomes a “grab bag” (3+ unrelated bullets) or exceeds ~1–2 screens of scrolling.
+- Keep together when items share a single decision context (e.g., all “Code Style” rules used during editing).
+
+**Output format expectation:**
+- End this step with a short proposed outline per file (just headings), then implement it during the edits in Step 2.
+
 ### Step 2: Edit Files to Clean Them Up
 
 Edit each file using the Edit tool:
@@ -5662,29 +6167,17 @@ Edit({
   new_string: "..."
 })
 \`\`\`
+## Output Format
 
-**What to fix:**
-- **Redundancy**: Remove duplicate information (version mentioned 3x, preferences repeated)
-- **Structure**: Add markdown headers (##, ###), bullet points, sections
-- **Clarity**: Resolve contradictions ("be detailed" vs "be concise")
-- **Scannability**: Make content easy to read at a glance
-
-**Good memory structure:**
-- Use markdown headers (##, ###) for sections
-- Use bullet points for lists
-- Keep related information together
-- Make it scannable
-
-### Step 2b: Structural Changes (Rename, Decompose, Merge)
+### Implement The Organizational Structure
 
-Beyond editing content, you can restructure memory blocks when needed:
+Once you've proposed the hierarchy, execute it using file operations. Keep iterating until the directory matches your proposed structure exactly.
 
 #### Renaming Blocks
 
-When a block's name doesn't reflect its content, rename it:
+When a block's name doesn't reflect its content:
 
 \`\`\`bash
-# Rename a memory block file
 mv .letta/backups/working/old_name.md .letta/backups/working/new_name.md
 \`\`\`
 
@@ -5693,140 +6186,101 @@ mv .letta/backups/working/old_name.md .letta/backups/working/new_name.md
 - Block name doesn't match content (e.g., \`project.md\` contains user info → \`user_context.md\`)
 - Name uses poor conventions (e.g., \`NOTES.md\` → \`notes.md\`)
 
+#### Creating New Blocks
+
+Create new \`.md\` files when content needs a new home:
+
+\`\`\`
+Write({ 
+  file_path: ".letta/backups/working/new_block.md", 
+  content: "## New Block\\n\\nContent here..." 
+})
+\`\`\`
+
+**When to create:**
+- Splitting a large block into focused smaller blocks
+- Content doesn't fit any existing block
+- A new category emerges from reorganization
+
 #### Decomposing Blocks (Split)
 
-When a single block contains too many unrelated topics, split it into focused blocks:
+When a block covers too many topics, split it:
 
 \`\`\`bash
-# 1. Read the original block
+# 1. Read the original
 Read({ file_path: ".letta/backups/working/everything.md" })
 
-# 2. Create new focused blocks
+# 2. Create focused blocks
 Write({ file_path: ".letta/backups/working/coding_preferences.md", content: "..." })
 Write({ file_path: ".letta/backups/working/user_info.md", content: "..." })
 
-# 3. Delete the original bloated block
+# 3. Delete the original
 rm .letta/backups/working/everything.md
 \`\`\`
 
-**When to decompose:**
-- Block exceeds ~100 lines with multiple unrelated sections
-- Block contains 3+ distinct topic areas (e.g., user info + coding prefs + project details)
-- Block name can't capture all its content accurately
-- Finding specific info requires scanning the whole block
-
-**Decomposition guidelines:**
-- Each new block should have ONE clear purpose
-- Use descriptive names: \`coding_style.md\`, \`user_preferences.md\`, \`project_context.md\`
-- Preserve all information - just reorganize it
-- Keep related information together in the same block
+**When to split (be aggressive):**
+- Block exceeds ~60 lines or has 2+ distinct topics
+- Block name can't capture all its content
+- Finding info requires scanning the whole block
 
-#### Creating New Blocks
+#### Merging Blocks
 
-You can create entirely new memory blocks by writing new \`.md\` files:
+When multiple blocks overlap, consolidate them:
 
 \`\`\`bash
-Write({ 
-  file_path: ".letta/backups/working/new_block.md", 
-  content: "## New Block\\n\\nContent here..." 
-})
-\`\`\`
+# 1. Read blocks to merge
+Read({ file_path: ".letta/backups/working/user_info.md" })
+Read({ file_path: ".letta/backups/working/user_prefs.md" })
 
-**When to create new blocks:**
-- Splitting a large block (>150 lines) into focused smaller blocks
-- Organizing content into a new category that doesn't fit existing blocks
-- The parent agent will prompt the user for confirmation before creating
+# 2. Create unified block
+Write({ file_path: ".letta/backups/working/user.md", content: "..." })
 
-#### Merging and Deleting Blocks
+# 3. Delete old blocks
+rm .letta/backups/working/user_info.md .letta/backups/working/user_prefs.md
+\`\`\`
 
-When multiple blocks contain related/overlapping content, consolidate them and DELETE the old blocks:
+**When to merge:**
+- Multiple blocks cover the same topic
+- Small blocks (<20 lines) logically belong together
+- Overlapping/duplicate content exists
 
-\`\`\`bash
-# 1. Read all blocks to merge
-Read({ file_path: ".letta/backups/working/user_info.md" })
-Read({ file_path: ".letta/backups/working/user_prefs.md" })
+#### Editing Content Within Blocks
 
-# 2. Create unified block with combined content
-Write({ file_path: ".letta/backups/working/user.md", content: "..." })
+Use the Edit tool for in-place changes:
 
-# 3. DELETE the old blocks using Bash
-Bash({ command: "rm .letta/backups/working/user_info.md .letta/backups/working/user_prefs.md" })
+\`\`\`
+Edit({
+  file_path: ".letta/backups/working/project.md",
+  old_string: "...",
+  new_string: "..."
+})
 \`\`\`
 
-**IMPORTANT: When to delete blocks:**
-- After consolidating content from multiple blocks into one
-- When a block becomes nearly empty after moving content elsewhere
-- When a block is redundant or no longer serves a purpose
-- The parent agent will prompt the user for confirmation before deleting
+**What to fix:**
+- **Redundancy**: Remove duplicate information
+- **Structure**: Add markdown headers, bullet points
+- **Clarity**: Resolve contradictions
+- **Scannability**: Make content easy to read at a glance
 
-**When to merge:**
-- Multiple blocks cover the same topic area
-- Information is fragmented across blocks, causing redundancy
-- Small blocks (<20 lines) that logically belong together
-- Blocks with overlapping/duplicate content
-
-**Merge guidelines:**
-- Remove duplicates when combining
-- Organize merged content with clear sections
-- Choose the most descriptive name for the merged block
-- Don't create blocks larger than ~150 lines
-- **DELETE the old block files** after consolidating their content
-
-### Step 3: Report Results
-
-Provide a comprehensive report showing what you changed and why.
-
-## What to Write to Memory
-
-**DO write to memory:**
-- Patterns that repeat across multiple sessions
-- User corrections or clarifications (especially if repeated)
-- Project conventions discovered through research or experience
-- Important context that will be needed in future sessions
-- Preferences expressed by the user about behavior or communication
-- "Aha!" moments or insights about the codebase
-- Footguns or gotchas discovered the hard way
-
-**DON'T write to memory:**
-- Transient task details that won't matter tomorrow
-- Information easily found in files (unless it's a critical pattern)
-- Overly specific details that will quickly become stale
-- Things that should go in TODO lists or plan files instead
-
-**Key principle**: Memory is for **persistent, important context** that makes the agent more effective over time. Not a dumping ground for everything.
-
-## How to Decide What to Write
-
-Ask yourself:
-1. **Will future-me need this?** If the agent encounters a similar situation in a week, would this memory help?
-2. **Is this a pattern or one-off?** One-off details fade in importance; patterns persist.
-3. **Can I find this easily later?** If it's in a README that's always read, maybe it doesn't need to be in memory.
-4. **Did the user correct me?** User corrections are strong signals of what to remember.
-5. **Would I want to know this on day one?** Insights that would have saved time are worth storing.
-
-## How to Reorganize Memory
-
-**Signs memory needs reorganization:**
-- Blocks are long and hard to scan (>100 lines)
-- Related content is scattered across blocks
-- No clear structure (just walls of text)
-- Redundant information in multiple places
-- Outdated information mixed with current
-
-**Reorganization strategies:**
-- **Add structure**: Use section headers, bullet points, categories
-- **Rename blocks**: Give blocks names that accurately reflect their content
-- **Decompose large blocks**: Break monolithic blocks (>100 lines, 3+ topics) into focused ones
-- **Merge fragmented blocks**: Consolidate small/overlapping blocks into unified ones
-- **Archive stale content**: Remove information that's no longer relevant
-- **Improve scannability**: Use consistent formatting, clear hierarchies
+#### Iteration Checklist
 
-## Output Format
+Keep editing until:
+- [ ] **Total file count is 15–25** — Count your files; if < 15, split more
+- [ ] **All files use \`/\` naming** — No flat files like \`my_notes.md\`
+- [ ] **Hierarchy is 2–3 levels deep** — e.g., \`project/tooling/bun.md\`
+- [ ] **No file exceeds ~40 lines** — Split larger files
+- [ ] **Each file has one concept** — If 2+ topics, split into 2+ files
+- [ ] Content has been migrated (no data loss)
+- [ ] No duplicate information across blocks
+
+**If you have fewer than 15 files, you haven't split enough. Go back and split more.**
 
 Return a structured report with these sections:
 
 ### 1. Summary
 - Brief overview of what you edited (2-3 sentences)
+- **Total file count** (must be 15–25)
+- **Maximum hierarchy depth achieved** (should be 2–3 levels)
 - Number of files modified, renamed, created, or deleted
 - The parent agent will prompt the user to confirm any creations or deletions
 
@@ -5839,15 +6293,16 @@ Report any renames, decompositions, or merges:
 |----------|----------|--------|
 | stuff.md | coding_preferences.md | Name now reflects content |
 
-**Decompositions (splitting large blocks):**
+**Decompositions (using \`/\` hierarchy):**
 | Original Block | New Blocks | Deleted | Reason |
 |----------------|------------|---------|--------|
-| everything.md | user.md, coding.md, project.md | ✅ everything.md | Block contained 3 unrelated topics |
+| project.md | project/overview.md, project/tooling/bun.md, project/tooling/testing.md, project/conventions.md, project/gotchas.md | ✅ content moved | Exploded into 5 nested files |
 
-**New Blocks (created from scratch):**
+**New Blocks (all using \`/\` naming):**
 | Block Name | Size | Reason |
 |------------|------|--------|
-| security_practices.md | 156 chars | New category for security-related conventions discovered |
+| project/security/auth.md | 156 chars | Nested under project/security |
+| human/prefs/communication.md | 98 chars | Split from human.md |
 
 **Merges:**
 | Merged Blocks | Result | Deleted | Reason |
@@ -5936,13 +6391,13 @@ Why: Resolved contradictions by explaining when to use each approach.
 
 ## Critical Reminders
 
-1. **You only edit files** - The parent agent handles backup and restore
-2. **Be conservative with deletions** - When in doubt, keep information
-3. **Preserve user preferences** - If the user expressed a preference, that's sacred
-4. **Don't invent information** - Only reorganize existing content
-5. **Test your changes mentally** - Imagine the parent agent reading this tomorrow
+1. **Create new files** — Reorganize large blocks into 15–25 small, nested files
+2. **Remove old files** — After moving content to new nested files, delete the originals
+3. **Use \`/\` naming for ALL new files** — Every new file must be nested (e.g., \`project/tooling/bun.md\`)
+4. **Preserve user preferences** — Keep expressed preferences, just reorganize them into the right files
+5. **Don't invent information** — Only reorganize existing content into better structure
 
-Remember: Your goal is to make memory clean, scannable, and well-organized. You're improving the parent agent's long-term capabilities by maintaining quality memory.
+Remember: Your goal is to **completely reorganize** memory into a deeply hierarchical structure of 15–25 small files. You're not tidying up — you're exploding monolithic blocks into a proper file tree.
 `;
 var init_memory = () => {};
 
@@ -8156,7 +8611,17 @@ function buildShellLaunchers(command) {
 var SEP = "\x00";
 
 // src/hooks/types.ts
-var init_types = () => {};
+function isToolEvent(event) {
+  return TOOL_EVENTS.has(event);
+}
+var TOOL_EVENTS;
+var init_types = __esm(() => {
+  TOOL_EVENTS = new Set([
+    "PreToolUse",
+    "PostToolUse",
+    "PermissionRequest"
+  ]);
+});
 
 // src/hooks/executor.ts
 import { spawn } from "node:child_process";
@@ -8222,11 +8687,25 @@ function executeWithLauncher(launcher, inputJson, workingDirectory, input, timeo
       if (!resolved) {
         resolved = true;
         const exitLabel = result.exitCode === 0 /* ALLOW */ ? "\x1B[32m✓ allowed\x1B[0m" : result.exitCode === 2 /* BLOCK */ ? "\x1B[31m✗ blocked\x1B[0m" : "\x1B[33m⚠ error\x1B[0m";
-        console.log(`\x1B[90m[hook] ${exitLabel} (${result.durationMs}ms)${result.stdout ? ` stdout: ${result.stdout.slice(0, 100)}` : ""}${result.stderr ? ` stderr: ${result.stderr.slice(0, 100)}` : ""}\x1B[0m`);
+        console.log(`\x1B[90m[hook] ${command}\x1B[0m`);
+        console.log(`\x1B[90m  ⎿ ${exitLabel} (${result.durationMs}ms)\x1B[0m`);
+        if (result.stdout) {
+          console.log(`\x1B[90m  ⎿ (stdout)\x1B[0m`);
+          const indented = result.stdout.split(`
+`).map((line) => `    ${line}`).join(`
+`);
+          console.log(`\x1B[90m${indented}\x1B[0m`);
+        }
+        if (result.stderr) {
+          console.log(`\x1B[90m  ⎿ (stderr)\x1B[0m`);
+          const indented = result.stderr.split(`
+`).map((line) => `    ${line}`).join(`
+`);
+          console.log(`\x1B[90m${indented}\x1B[0m`);
+        }
         resolve2(result);
       }
     };
-    console.log(`\x1B[90m[hook] Running: ${command}\x1B[0m`);
     let child;
     try {
       child = trySpawnWithLauncher(launcher, workingDirectory, input);
@@ -8404,14 +8883,27 @@ function mergeHooksConfigs(global2, project, projectLocal = {}) {
     ...Object.keys(projectLocal)
   ]);
   for (const event of allEvents) {
-    const globalMatchers = global2[event] || [];
-    const projectMatchers = project[event] || [];
-    const projectLocalMatchers = projectLocal[event] || [];
-    merged[event] = [
-      ...projectLocalMatchers,
-      ...projectMatchers,
-      ...globalMatchers
-    ];
+    if (isToolEvent(event)) {
+      const toolEvent = event;
+      const globalMatchers = global2[toolEvent] || [];
+      const projectMatchers = project[toolEvent] || [];
+      const projectLocalMatchers = projectLocal[toolEvent] || [];
+      merged[toolEvent] = [
+        ...projectLocalMatchers,
+        ...projectMatchers,
+        ...globalMatchers
+      ];
+    } else {
+      const simpleEvent = event;
+      const globalMatchers = global2[simpleEvent] || [];
+      const projectMatchers = project[simpleEvent] || [];
+      const projectLocalMatchers = projectLocal[simpleEvent] || [];
+      merged[simpleEvent] = [
+        ...projectLocalMatchers,
+        ...projectMatchers,
+        ...globalMatchers
+      ];
+    }
   }
   return merged;
 }
@@ -8434,23 +8926,36 @@ function matchesTool(pattern, toolName) {
   return pattern === toolName;
 }
 function getMatchingHooks(config, event, toolName) {
-  const matchers = config[event];
-  if (!matchers || matchers.length === 0) {
-    return [];
-  }
-  const hooks = [];
-  for (const matcher of matchers) {
-    if (!toolName || matchesTool(matcher.matcher, toolName)) {
+  if (isToolEvent(event)) {
+    const matchers = config[event];
+    if (!matchers || matchers.length === 0) {
+      return [];
+    }
+    const hooks = [];
+    for (const matcher of matchers) {
+      if (!toolName || matchesTool(matcher.matcher, toolName)) {
+        hooks.push(...matcher.hooks);
+      }
+    }
+    return hooks;
+  } else {
+    const matchers = config[event];
+    if (!matchers || matchers.length === 0) {
+      return [];
+    }
+    const hooks = [];
+    for (const matcher of matchers) {
       hooks.push(...matcher.hooks);
     }
+    return hooks;
   }
-  return hooks;
 }
 async function getHooksForEvent(event, toolName, workingDirectory = process.cwd()) {
   const config = await loadHooks(workingDirectory);
   return getMatchingHooks(config, event, toolName);
 }
 var init_loader = __esm(async () => {
+  init_types();
   await init_settings_manager();
 });
 
@@ -61124,7 +61629,7 @@ function sortChronological2(messages) {
 async function getResumeData2(client, agent, conversationId) {
   try {
     let inContextMessageIds;
-    let messages;
+    let messages = [];
     const useConversationsApi = conversationId && conversationId !== "default";
     if (process.env.DEBUG) {
       console.log(`[DEBUG] getResumeData: conversationId=${conversationId}, useConversationsApi=${useConversationsApi}, agentId=${agent.id}`);
@@ -61135,12 +61640,16 @@ async function getResumeData2(client, agent, conversationId) {
       if (!inContextMessageIds || inContextMessageIds.length === 0) {
         debugWarn("check-approval", "No in-context messages - no pending approvals");
         if (isBackfillEnabled2()) {
-          const backfill = await client.conversations.messages.list(conversationId, { limit: MESSAGE_HISTORY_LIMIT2, order: "desc" });
-          return {
-            pendingApproval: null,
-            pendingApprovals: [],
-            messageHistory: sortChronological2(backfill.getPaginatedItems())
-          };
+          try {
+            const backfill = await client.conversations.messages.list(conversationId, { limit: MESSAGE_HISTORY_LIMIT2, order: "desc" });
+            return {
+              pendingApproval: null,
+              pendingApprovals: [],
+              messageHistory: sortChronological2(backfill.getPaginatedItems())
+            };
+          } catch (backfillError) {
+            debugWarn("check-approval", `Failed to load message history: ${backfillError instanceof Error ? backfillError.message : String(backfillError)}`);
+          }
         }
         return {
           pendingApproval: null,
@@ -61153,11 +61662,17 @@ async function getResumeData2(client, agent, conversationId) {
         throw new Error("Expected at least one in-context message");
       }
       const retrievedMessages = await client.messages.retrieve(lastInContextId);
-      const backfillPage = isBackfillEnabled2() ? await client.conversations.messages.list(conversationId, {
-        limit: MESSAGE_HISTORY_LIMIT2,
-        order: "desc"
-      }) : null;
-      messages = backfillPage ? sortChronological2(backfillPage.getPaginatedItems()) : [];
+      if (isBackfillEnabled2()) {
+        try {
+          const backfillPage = await client.conversations.messages.list(conversationId, {
+            limit: MESSAGE_HISTORY_LIMIT2,
+            order: "desc"
+          });
+          messages = sortChronological2(backfillPage.getPaginatedItems());
+        } catch (backfillError) {
+          debugWarn("check-approval", `Failed to load message history: ${backfillError instanceof Error ? backfillError.message : String(backfillError)}`);
+        }
+      }
       const messageToCheck = retrievedMessages.find((msg) => msg.message_type === "approval_request_message") ?? retrievedMessages[0];
       if (messageToCheck) {
         debugWarn("check-approval", `Found last in-context message: ${messageToCheck.id} (type: ${messageToCheck.message_type})` + (retrievedMessages.length > 1 ? ` - had ${retrievedMessages.length} variants` : ""));
@@ -61192,14 +61707,20 @@ async function getResumeData2(client, agent, conversationId) {
         throw new Error("Expected at least one in-context message");
       }
       const retrievedMessages = await client.messages.retrieve(lastInContextId);
-      const messagesPage = isBackfillEnabled2() ? await client.agents.messages.list(agent.id, {
-        limit: MESSAGE_HISTORY_LIMIT2,
-        order: "desc",
-        conversation_id: "default"
-      }) : null;
-      messages = messagesPage ? sortChronological2(messagesPage.items) : [];
-      if (process.env.DEBUG && messagesPage) {
-        console.log(`[DEBUG] agents.messages.list(conversation_id=default) returned ${messagesPage.items.length} messages`);
+      if (isBackfillEnabled2()) {
+        try {
+          const messagesPage = await client.agents.messages.list(agent.id, {
+            limit: MESSAGE_HISTORY_LIMIT2,
+            order: "desc",
+            conversation_id: "default"
+          });
+          messages = sortChronological2(messagesPage.items);
+          if (process.env.DEBUG) {
+            console.log(`[DEBUG] agents.messages.list(conversation_id=default) returned ${messagesPage.items.length} messages`);
+          }
+        } catch (backfillError) {
+          debugWarn("check-approval", `Failed to load message history: ${backfillError instanceof Error ? backfillError.message : String(backfillError)}`);
+        }
       }
       const messageToCheck = retrievedMessages.find((msg) => msg.message_type === "approval_request_message") ?? retrievedMessages[0];
       if (messageToCheck) {
@@ -71705,24 +72226,61 @@ async function addHookMatcher(event, matcher, location, workingDirectory = proce
     hooks[event] = [];
   }
   const eventMatchers = hooks[event];
-  if (eventMatchers) {
-    eventMatchers.push(matcher);
-  }
+  eventMatchers.push(matcher);
   await saveHooksToLocation(hooks, location, workingDirectory);
 }
-async function removeHookMatcher(event, matcherIndex, location, workingDirectory = process.cwd()) {
+async function addSimpleHookMatcher(event, matcher, location, workingDirectory = process.cwd()) {
   const hooks = loadHooksFromLocation(location, workingDirectory);
-  const eventMatchers = hooks[event];
-  if (!eventMatchers || matcherIndex < 0 || matcherIndex >= eventMatchers.length) {
-    throw new Error(`Invalid matcher index ${matcherIndex} for event ${event}`);
+  if (!hooks[event]) {
+    hooks[event] = [];
   }
-  eventMatchers.splice(matcherIndex, 1);
-  if (eventMatchers.length === 0) {
-    delete hooks[event];
+  const eventMatchers = hooks[event];
+  eventMatchers.push(matcher);
+  await saveHooksToLocation(hooks, location, workingDirectory);
+}
+async function removeHook(event, index, location, workingDirectory = process.cwd()) {
+  const hooks = loadHooksFromLocation(location, workingDirectory);
+  if (isToolEvent(event)) {
+    const eventMatchers = hooks[event];
+    if (!eventMatchers || index < 0 || index >= eventMatchers.length) {
+      throw new Error(`Invalid matcher index ${index} for event ${event}`);
+    }
+    eventMatchers.splice(index, 1);
+    if (eventMatchers.length === 0) {
+      delete hooks[event];
+    }
+  } else {
+    const eventMatchers = hooks[event];
+    if (!eventMatchers || index < 0 || index >= eventMatchers.length) {
+      throw new Error(`Invalid matcher index ${index} for event ${event}`);
+    }
+    eventMatchers.splice(index, 1);
+    if (eventMatchers.length === 0) {
+      delete hooks[event];
+    }
   }
   await saveHooksToLocation(hooks, location, workingDirectory);
 }
-function loadHooksWithSource(event, workingDirectory = process.cwd()) {
+function loadMatchersWithSource(event, workingDirectory = process.cwd()) {
+  const result = [];
+  const locations = ["project-local", "project", "user"];
+  for (const location of locations) {
+    const hooks = loadHooksFromLocation(location, workingDirectory);
+    const matchers = hooks[event] || [];
+    for (let i = 0;i < matchers.length; i++) {
+      const matcher = matchers[i];
+      if (matcher) {
+        result.push({
+          ...matcher,
+          source: location,
+          sourceIndex: i
+        });
+      }
+    }
+  }
+  return result;
+}
+function loadSimpleMatchersWithSource(event, workingDirectory = process.cwd()) {
   const result = [];
   const locations = ["project-local", "project", "user"];
   for (const location of locations) {
@@ -71747,9 +72305,16 @@ function countTotalHooks(workingDirectory = process.cwd()) {
   for (const location of locations) {
     const hooks = loadHooksFromLocation(location, workingDirectory);
     for (const event of Object.keys(hooks)) {
-      const matchers = hooks[event] || [];
-      for (const matcher of matchers) {
-        count += matcher.hooks.length;
+      if (isToolEvent(event)) {
+        const matchers = hooks[event] || [];
+        for (const matcher of matchers) {
+          count += matcher.hooks.length;
+        }
+      } else {
+        const matchers = hooks[event] || [];
+        for (const matcher of matchers) {
+          count += matcher.hooks.length;
+        }
       }
     }
   }
@@ -71760,14 +72325,22 @@ function countHooksForEvent(event, workingDirectory = process.cwd()) {
   const locations = ["project-local", "project", "user"];
   for (const location of locations) {
     const hooks = loadHooksFromLocation(location, workingDirectory);
-    const matchers = hooks[event] || [];
-    for (const matcher of matchers) {
-      count += matcher.hooks.length;
+    if (isToolEvent(event)) {
+      const matchers = hooks[event] || [];
+      for (const matcher of matchers) {
+        count += matcher.hooks.length;
+      }
+    } else {
+      const matchers = hooks[event] || [];
+      for (const matcher of matchers) {
+        count += matcher.hooks.length;
+      }
     }
   }
   return count;
 }
 var init_writer = __esm(async () => {
+  init_types();
   await init_settings_manager();
 });
 
@@ -71795,6 +72368,7 @@ function boxBottom(width) {
 }
 var import_react57, jsx_dev_runtime34, BOX_TOP_LEFT = "╭", BOX_TOP_RIGHT = "╮", BOX_BOTTOM_LEFT = "╰", BOX_BOTTOM_RIGHT = "╯", BOX_HORIZONTAL = "─", BOX_VERTICAL = "│", HOOK_EVENTS, TOOL_NAMES3, SAVE_LOCATIONS, HooksManager;
 var init_HooksManager = __esm(async () => {
+  init_types();
   init_useTerminalWidth();
   init_colors();
   await __promiseAll([
@@ -71855,13 +72429,14 @@ var init_HooksManager = __esm(async () => {
     const [screen, setScreen] = import_react57.useState("events");
     const [selectedIndex, setSelectedIndex] = import_react57.useState(0);
     const [selectedEvent, setSelectedEvent] = import_react57.useState(null);
-    const [matchers, setMatchers] = import_react57.useState([]);
+    const [hooks, setHooks] = import_react57.useState([]);
     const [totalHooks, setTotalHooks] = import_react57.useState(0);
     const [newMatcher, setNewMatcher] = import_react57.useState("");
     const [newCommand, setNewCommand] = import_react57.useState("");
     const [selectedLocation, setSelectedLocation] = import_react57.useState(0);
-    const [deleteMatcherIndex, setDeleteMatcherIndex] = import_react57.useState(-1);
+    const [deleteHookIndex, setDeleteHookIndex] = import_react57.useState(-1);
     const [deleteConfirmIndex, setDeleteConfirmIndex] = import_react57.useState(1);
+    const isCurrentToolEvent = selectedEvent ? isToolEvent(selectedEvent) : false;
     const refreshCounts = import_react57.useCallback(() => {
       setTotalHooks(countTotalHooks());
     }, []);
@@ -71870,9 +72445,12 @@ var init_HooksManager = __esm(async () => {
         refreshCounts();
       }
     }, [screen, refreshCounts]);
-    const loadMatchers = import_react57.useCallback((event) => {
-      const loaded = loadHooksWithSource(event);
-      setMatchers(loaded);
+    const loadHooks2 = import_react57.useCallback((event) => {
+      if (isToolEvent(event)) {
+        setHooks(loadMatchersWithSource(event));
+      } else {
+        setHooks(loadSimpleMatchersWithSource(event));
+      }
     }, []);
     const handleAddHook = import_react57.useCallback(async () => {
       if (!selectedEvent || !newCommand.trim())
@@ -71880,45 +72458,46 @@ var init_HooksManager = __esm(async () => {
       const location = SAVE_LOCATIONS[selectedLocation]?.location;
       if (!location)
         return;
-      const matcher = {
-        matcher: newMatcher.trim() || "*",
-        hooks: [{ type: "command", command: newCommand.trim() }]
-      };
-      await addHookMatcher(selectedEvent, matcher, location);
-      loadMatchers(selectedEvent);
+      if (isToolEvent(selectedEvent)) {
+        const matcher = {
+          matcher: newMatcher.trim() || "*",
+          hooks: [{ type: "command", command: newCommand.trim() }]
+        };
+        await addHookMatcher(selectedEvent, matcher, location);
+      } else {
+        const matcher = {
+          hooks: [{ type: "command", command: newCommand.trim() }]
+        };
+        await addSimpleHookMatcher(selectedEvent, matcher, location);
+      }
+      loadHooks2(selectedEvent);
       refreshCounts();
       setNewMatcher("");
       setNewCommand("");
       setSelectedLocation(0);
-      setScreen("matchers");
+      setScreen("hooks-list");
       setSelectedIndex(0);
     }, [
       selectedEvent,
       newMatcher,
       newCommand,
       selectedLocation,
-      loadMatchers,
+      loadHooks2,
       refreshCounts
     ]);
     const handleDeleteHook = import_react57.useCallback(async () => {
-      if (deleteMatcherIndex < 0 || !selectedEvent)
+      if (deleteHookIndex < 0 || !selectedEvent)
         return;
-      const matcher = matchers[deleteMatcherIndex];
-      if (!matcher)
+      const hook = hooks[deleteHookIndex];
+      if (!hook)
         return;
-      await removeHookMatcher(selectedEvent, matcher.sourceIndex, matcher.source);
-      loadMatchers(selectedEvent);
+      await removeHook(selectedEvent, hook.sourceIndex, hook.source);
+      loadHooks2(selectedEvent);
       refreshCounts();
-      setDeleteMatcherIndex(-1);
-      setScreen("matchers");
+      setDeleteHookIndex(-1);
+      setScreen("hooks-list");
       setSelectedIndex(0);
-    }, [
-      deleteMatcherIndex,
-      selectedEvent,
-      matchers,
-      loadMatchers,
-      refreshCounts
-    ]);
+    }, [deleteHookIndex, selectedEvent, hooks, loadHooks2, refreshCounts]);
     use_input_default((input, key) => {
       if (key.ctrl && input === "c") {
         onClose();
@@ -71933,26 +72512,31 @@ var init_HooksManager = __esm(async () => {
           const selected = HOOK_EVENTS[selectedIndex];
           if (selected) {
             setSelectedEvent(selected.event);
-            loadMatchers(selected.event);
-            setScreen("matchers");
+            loadHooks2(selected.event);
+            setScreen("hooks-list");
             setSelectedIndex(0);
           }
         } else if (key.escape) {
           onClose();
         }
-      } else if (screen === "matchers") {
-        const itemCount = matchers.length + 1;
+      } else if (screen === "hooks-list") {
+        const itemCount = hooks.length + 1;
         if (key.upArrow) {
           setSelectedIndex((prev) => Math.max(0, prev - 1));
         } else if (key.downArrow) {
           setSelectedIndex((prev) => Math.min(itemCount - 1, prev + 1));
         } else if (key.return) {
           if (selectedIndex === 0) {
-            setScreen("add-matcher");
-            setNewMatcher("");
+            if (isCurrentToolEvent) {
+              setScreen("add-matcher");
+              setNewMatcher("");
+            } else {
+              setScreen("add-command");
+              setNewCommand("");
+            }
           } else {}
         } else if ((input === "d" || input === "D") && selectedIndex > 0) {
-          setDeleteMatcherIndex(selectedIndex - 1);
+          setDeleteHookIndex(selectedIndex - 1);
           setDeleteConfirmIndex(1);
           setScreen("delete-confirm");
         } else if (key.escape) {
@@ -71965,7 +72549,7 @@ var init_HooksManager = __esm(async () => {
           setScreen("add-command");
           setNewCommand("");
         } else if (key.escape) {
-          setScreen("matchers");
+          setScreen("hooks-list");
           setSelectedIndex(0);
           setNewMatcher("");
         }
@@ -71974,7 +72558,12 @@ var init_HooksManager = __esm(async () => {
           setScreen("save-location");
           setSelectedLocation(0);
         } else if (key.escape) {
-          setScreen("add-matcher");
+          if (isCurrentToolEvent) {
+            setScreen("add-matcher");
+          } else {
+            setScreen("hooks-list");
+            setSelectedIndex(0);
+          }
         }
       } else if (screen === "save-location") {
         if (key.upArrow) {
@@ -71993,10 +72582,10 @@ var init_HooksManager = __esm(async () => {
           if (deleteConfirmIndex === 0) {
             handleDeleteHook();
           } else {
-            setScreen("matchers");
+            setScreen("hooks-list");
           }
         } else if (key.escape) {
-          setScreen("matchers");
+          setScreen("hooks-list");
         }
       }
     });
@@ -72058,7 +72647,9 @@ var init_HooksManager = __esm(async () => {
         ]
       }, undefined, true, undefined, this);
     }
-    if (screen === "matchers" && selectedEvent) {
+    if (screen === "hooks-list" && selectedEvent) {
+      const title = isCurrentToolEvent ? ` ${selectedEvent} - Tool Matchers ` : ` ${selectedEvent} - Hooks `;
+      const addLabel = isCurrentToolEvent ? "+ Add new matcher..." : "+ Add new hook...";
       return /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Box_default, {
         flexDirection: "column",
         paddingX: 1,
@@ -72067,27 +72658,46 @@ var init_HooksManager = __esm(async () => {
             children: boxTop(boxWidth)
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
-            children: boxLine(` ${selectedEvent} - Tool Matchers `, boxWidth)
+            children: boxLine(title, boxWidth)
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
             children: boxBottom(boxWidth)
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
-            dimColor: true,
-            children: "Input to command is JSON of tool call arguments."
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
-            dimColor: true,
-            children: "Exit code 0 - stdout/stderr not shown"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
-            dimColor: true,
-            children: "Exit code 2 - show stderr to model and block tool call"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
-            dimColor: true,
-            children: "Other exit codes - show stderr to user only but continue"
-          }, undefined, false, undefined, this),
+          isCurrentToolEvent ? /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(jsx_dev_runtime34.Fragment, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+                dimColor: true,
+                children: "Input to command is JSON of tool call arguments."
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+                dimColor: true,
+                children: "Exit code 0 - stdout/stderr not shown"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+                dimColor: true,
+                children: "Exit code 2 - show stderr to model and block tool call"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+                dimColor: true,
+                children: "Other exit codes - show stderr to user only but continue"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(jsx_dev_runtime34.Fragment, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+                dimColor: true,
+                children: "Exit code 0 - success, continue"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+                dimColor: true,
+                children: "Exit code 2 - show stderr to model and block"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+                dimColor: true,
+                children: "Other exit codes - show stderr to user only"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
             children: " "
           }, undefined, false, undefined, this),
@@ -72103,16 +72713,17 @@ var init_HooksManager = __esm(async () => {
               }, undefined, true, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
                 color: "green",
-                children: "+ Add new matcher..."
+                children: addLabel
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          matchers.map((matcher, index) => {
+          hooks.map((hook, index) => {
             const isSelected = index + 1 === selectedIndex;
             const prefix = isSelected ? "❯" : " ";
-            const sourceLabel = `[${getSourceLabel(matcher.source)}]`;
-            const matcherPattern = matcher.matcher || "*";
-            const command = matcher.hooks[0]?.command || "";
+            const sourceLabel = `[${getSourceLabel(hook.source)}]`;
+            const isToolMatcher = "matcher" in hook;
+            const matcherPattern = isToolMatcher ? hook.matcher || "*" : null;
+            const command = "hooks" in hook ? hook.hooks[0]?.command || "" : "";
             const truncatedCommand = command.length > 30 ? `${command.slice(0, 27)}...` : command;
             return /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
               children: [
@@ -72130,7 +72741,7 @@ var init_HooksManager = __esm(async () => {
                   color: "cyan",
                   children: sourceLabel
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+                matcherPattern !== null && /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
                   children: [
                     " ",
                     matcherPattern.padEnd(12),
@@ -72142,7 +72753,7 @@ var init_HooksManager = __esm(async () => {
                   children: truncatedCommand
                 }, undefined, false, undefined, this)
               ]
-            }, `${matcher.source}-${index}`, true, undefined, this);
+            }, `${hook.source}-${index}`, true, undefined, this);
           }),
           /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
             children: " "
@@ -72248,6 +72859,7 @@ var init_HooksManager = __esm(async () => {
       }, undefined, true, undefined, this);
     }
     if (screen === "add-command" && selectedEvent) {
+      const title = isCurrentToolEvent ? ` Add new matcher for ${selectedEvent} ` : ` Add new hook for ${selectedEvent} `;
       return /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Box_default, {
         flexDirection: "column",
         paddingX: 1,
@@ -72256,18 +72868,18 @@ var init_HooksManager = __esm(async () => {
             children: boxTop(boxWidth)
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
-            children: boxLine(` Add new matcher for ${selectedEvent} `, boxWidth)
+            children: boxLine(title, boxWidth)
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
             children: boxBottom(boxWidth)
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+          isCurrentToolEvent && /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
             children: [
               "Matcher: ",
               newMatcher || "*"
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+          isCurrentToolEvent && /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
             children: " "
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
@@ -72327,7 +72939,7 @@ var init_HooksManager = __esm(async () => {
               selectedEvent
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+          isCurrentToolEvent && /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
             children: [
               "Matcher: ",
               newMatcher || "*"
@@ -72383,8 +72995,11 @@ var init_HooksManager = __esm(async () => {
         ]
       }, undefined, true, undefined, this);
     }
-    if (screen === "delete-confirm" && deleteMatcherIndex >= 0) {
-      const matcher = matchers[deleteMatcherIndex];
+    if (screen === "delete-confirm" && deleteHookIndex >= 0) {
+      const hook = hooks[deleteHookIndex];
+      const isToolMatcher = hook && "matcher" in hook;
+      const matcherPattern = isToolMatcher ? hook.matcher || "*" : null;
+      const command = hook && "hooks" in hook ? hook.hooks[0]?.command : "";
       return /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Box_default, {
         flexDirection: "column",
         paddingX: 1,
@@ -72401,22 +73016,22 @@ var init_HooksManager = __esm(async () => {
           /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
             children: " "
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
+          matcherPattern !== null && /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
             children: [
               "Matcher: ",
-              matcher?.matcher || "*"
+              matcherPattern
             ]
           }, undefined, true, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
             children: [
               "Command: ",
-              matcher?.hooks[0]?.command
+              command
             ]
           }, undefined, true, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
             children: [
               "Source: ",
-              matcher ? getSourceLabel(matcher.source) : ""
+              hook ? getSourceLabel(hook.source) : ""
             ]
           }, undefined, true, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime34.jsxDEV(Text, {
@@ -84542,6 +85157,13 @@ function App2({
       runSessionEndHooks(durationMs, undefined, undefined, agentIdRef.current ?? undefined, conversationIdRef.current ?? undefined).catch(() => {});
     };
   }, []);
+  import_react86.useEffect(() => {
+    return () => {
+      if (queueAppendTimeoutRef.current) {
+        clearTimeout(queueAppendTimeoutRef.current);
+      }
+    };
+  }, []);
   const [showExitStats, setShowExitStats] = import_react86.useState(false);
   const hasSentSessionContextRef = import_react86.useRef(false);
   const turnCountRef = import_react86.useRef(0);
@@ -84554,6 +85176,10 @@ function App2({
   const llmApiErrorRetriesRef = import_react86.useRef(0);
   const conversationBusyRetriesRef = import_react86.useRef(0);
   const [messageQueue, setMessageQueue] = import_react86.useState([]);
+  const messageQueueRef = import_react86.useRef([]);
+  import_react86.useEffect(() => {
+    messageQueueRef.current = messageQueue;
+  }, [messageQueue]);
   const waitingForQueueCancelRef = import_react86.useRef(false);
   const queueSnapshotRef = import_react86.useRef([]);
   const [restoreQueueOnCancel, setRestoreQueueOnCancel] = import_react86.useState(false);
@@ -84561,12 +85187,24 @@ function App2({
   import_react86.useEffect(() => {
     restoreQueueOnCancelRef.current = restoreQueueOnCancel;
   }, [restoreQueueOnCancel]);
+  const queueAppendTimeoutRef = import_react86.useRef(null);
   const [dequeueEpoch, setDequeueEpoch] = import_react86.useState(0);
   const lastDequeuedMessageRef = import_react86.useRef(null);
   const [restoredInput, setRestoredInput] = import_react86.useState(null);
   const isAgentBusy = import_react86.useCallback(() => {
     return streamingRef.current || isExecutingTool || commandRunningRef.current || abortControllerRef.current !== null;
   }, [isExecutingTool]);
+  const consumeQueuedMessages = import_react86.useCallback(() => {
+    if (messageQueueRef.current.length === 0)
+      return null;
+    if (queueAppendTimeoutRef.current) {
+      clearTimeout(queueAppendTimeoutRef.current);
+      queueAppendTimeoutRef.current = null;
+    }
+    const messages = [...messageQueueRef.current];
+    setMessageQueue([]);
+    return messages;
+  }, []);
   const withCommandLock = import_react86.useCallback(async (asyncFn) => {
     setActiveOverlay(null);
     setCommandRunning(true);
@@ -85225,7 +85863,35 @@ ${newState.originalPrompt}`
           llmApiErrorRetriesRef.current = 0;
           conversationBusyRetriesRef.current = 0;
           lastDequeuedMessageRef.current = null;
-          runStopHooks(stopReasonToHandle, buffersRef.current.order.length, Array.from(buffersRef.current.byId.values()).filter((item) => item.kind === "tool_call").length).catch(() => {});
+          const stopHookResult = await runStopHooks(stopReasonToHandle, buffersRef.current.order.length, Array.from(buffersRef.current.byId.values()).filter((item) => item.kind === "tool_call").length);
+          if (stopHookResult.blocked) {
+            const stderrOutput = stopHookResult.results.map((r) => r.stderr).filter(Boolean).join(`
+`);
+            const feedback = stderrOutput || "Stop hook blocked";
+            const hookMessage = `<stop-hook>
+${feedback}
+</stop-hook>`;
+            const statusId = uid4("status");
+            buffersRef.current.byId.set(statusId, {
+              kind: "status",
+              id: statusId,
+              lines: [
+                "Stop hook encountered blocking error, continuing loop with stderr feedback."
+              ]
+            });
+            buffersRef.current.order.push(statusId);
+            refreshDerived();
+            setTimeout(() => {
+              processConversation([
+                {
+                  type: "message",
+                  role: "user",
+                  content: hookMessage
+                }
+              ], { allowReentry: true });
+            }, 0);
+            return;
+          }
           if (needsEagerApprovalCheck) {
             setNeedsEagerApprovalCheck(false);
           }
@@ -85481,6 +86147,31 @@ ${newState.originalPrompt}`
                 refreshDerived();
                 return;
               }
+              const queuedMessagesToAppend = consumeQueuedMessages();
+              if (queuedMessagesToAppend?.length) {
+                for (const msg of queuedMessagesToAppend) {
+                  const userId = uid4("user");
+                  buffersRef.current.byId.set(userId, {
+                    kind: "user",
+                    id: userId,
+                    text: msg
+                  });
+                  buffersRef.current.order.push(userId);
+                }
+                setThinkingMessage(getRandomThinkingVerb());
+                refreshDerived();
+                toolResultsInFlightRef.current = true;
+                await processConversation([
+                  { type: "approval", approvals: allResults },
+                  ...queuedMessagesToAppend.map((msg) => ({
+                    type: "message",
+                    role: "user",
+                    content: msg
+                  }))
+                ], { allowReentry: true });
+                toolResultsInFlightRef.current = false;
+                return;
+              }
               if (waitingForQueueCancelRef.current) {
                 if (allResults.length > 0) {
                   queueApprovalResults(allResults, autoAllowedMetadata);
@@ -85829,7 +86520,8 @@ ${newState.originalPrompt}`
     currentModelId,
     updateStreamingOutput,
     needsEagerApprovalCheck,
-    queueApprovalResults
+    queueApprovalResults,
+    consumeQueuedMessages
   ]);
   const handleExit = import_react86.useCallback(async () => {
     saveLastAgentBeforeExit();
@@ -86475,29 +87167,34 @@ ${expanded.command}` : expanded.command;
       setMessageQueue((prev) => {
         const newQueue = [...prev, msg];
         const isSlashCommand = msg.startsWith("/");
-        if (!isSlashCommand && streamingRef.current && !waitingForQueueCancelRef.current) {
-          waitingForQueueCancelRef.current = true;
-          queueSnapshotRef.current = [...newQueue];
-          debugLog("queue", `Initiating queue-cancel: queueing "${msg.slice(0, 50)}${msg.length > 50 ? "..." : ""}", sending cancel to server`);
-          if (toolAbortControllerRef.current) {
-            toolAbortControllerRef.current.abort();
-          }
-          getClient2().then((client) => {
-            if (conversationIdRef.current === "default") {
-              return client.agents.messages.cancel(agentIdRef.current);
-            }
-            return client.conversations.cancel(conversationIdRef.current);
-          }).then(() => {}).catch(() => {
-            waitingForQueueCancelRef.current = false;
-          });
-          setTimeout(() => {
-            if (waitingForQueueCancelRef.current && abortControllerRef.current) {
-              debugLog("queue", "Timeout fallback: aborting stream after 3s (server cancel was slow/failed)");
-              abortControllerRef.current.abort();
-              waitingForQueueCancelRef.current = false;
-              queueSnapshotRef.current = [];
+        if (!isSlashCommand && streamingRef.current && !waitingForQueueCancelRef.current && !queueAppendTimeoutRef.current) {
+          queueAppendTimeoutRef.current = setTimeout(() => {
+            if (messageQueueRef.current.length === 0) {
+              queueAppendTimeoutRef.current = null;
+              return;
+            }
+            queueAppendTimeoutRef.current = null;
+            waitingForQueueCancelRef.current = true;
+            queueSnapshotRef.current = [...messageQueueRef.current];
+            if (toolAbortControllerRef.current) {
+              toolAbortControllerRef.current.abort();
             }
-          }, 3000);
+            getClient2().then((client) => {
+              if (conversationIdRef.current === "default") {
+                return client.agents.messages.cancel(agentIdRef.current);
+              }
+              return client.conversations.cancel(conversationIdRef.current);
+            }).catch(() => {
+              waitingForQueueCancelRef.current = false;
+            });
+            setTimeout(() => {
+              if (waitingForQueueCancelRef.current && abortControllerRef.current) {
+                abortControllerRef.current.abort();
+                waitingForQueueCancelRef.current = false;
+                queueSnapshotRef.current = [];
+              }
+            }, 3000);
+          }, 15000);
         }
         return newQueue;
       });
@@ -88416,13 +89113,29 @@ ${SYSTEM_REMINDER_CLOSE}
         waitingForQueueCancelRef.current = false;
         queueSnapshotRef.current = [];
       } else {
-        toolResultsInFlightRef.current = true;
-        await processConversation([
-          {
-            type: "approval",
-            approvals: allResults
+        const queuedMessagesToAppend = consumeQueuedMessages();
+        const input = [
+          { type: "approval", approvals: allResults }
+        ];
+        if (queuedMessagesToAppend?.length) {
+          for (const msg of queuedMessagesToAppend) {
+            const userId = uid4("user");
+            buffersRef.current.byId.set(userId, {
+              kind: "user",
+              id: userId,
+              text: msg
+            });
+            buffersRef.current.order.push(userId);
+            input.push({
+              type: "message",
+              role: "user",
+              content: msg
+            });
           }
-        ]);
+          refreshDerived();
+        }
+        toolResultsInFlightRef.current = true;
+        await processConversation(input);
         toolResultsInFlightRef.current = false;
         queueApprovalResults(null);
       }
@@ -88443,7 +89156,8 @@ ${SYSTEM_REMINDER_CLOSE}
     appendError,
     setStreaming,
     updateStreamingOutput,
-    queueApprovalResults
+    queueApprovalResults,
+    consumeQueuedMessages
   ]);
   const handleApproveCurrent = import_react86.useCallback(async (diffs) => {
     if (isExecutingTool)
@@ -91408,7 +92122,7 @@ function sortChronological(messages) {
 async function getResumeData(client, agent, conversationId) {
   try {
     let inContextMessageIds;
-    let messages;
+    let messages = [];
     const useConversationsApi = conversationId && conversationId !== "default";
     if (process.env.DEBUG) {
       console.log(`[DEBUG] getResumeData: conversationId=${conversationId}, useConversationsApi=${useConversationsApi}, agentId=${agent.id}`);
@@ -91419,12 +92133,16 @@ async function getResumeData(client, agent, conversationId) {
       if (!inContextMessageIds || inContextMessageIds.length === 0) {
         debugWarn("check-approval", "No in-context messages - no pending approvals");
         if (isBackfillEnabled()) {
-          const backfill = await client.conversations.messages.list(conversationId, { limit: MESSAGE_HISTORY_LIMIT, order: "desc" });
-          return {
-            pendingApproval: null,
-            pendingApprovals: [],
-            messageHistory: sortChronological(backfill.getPaginatedItems())
-          };
+          try {
+            const backfill = await client.conversations.messages.list(conversationId, { limit: MESSAGE_HISTORY_LIMIT, order: "desc" });
+            return {
+              pendingApproval: null,
+              pendingApprovals: [],
+              messageHistory: sortChronological(backfill.getPaginatedItems())
+            };
+          } catch (backfillError) {
+            debugWarn("check-approval", `Failed to load message history: ${backfillError instanceof Error ? backfillError.message : String(backfillError)}`);
+          }
         }
         return {
           pendingApproval: null,
@@ -91437,11 +92155,17 @@ async function getResumeData(client, agent, conversationId) {
         throw new Error("Expected at least one in-context message");
       }
       const retrievedMessages = await client.messages.retrieve(lastInContextId);
-      const backfillPage = isBackfillEnabled() ? await client.conversations.messages.list(conversationId, {
-        limit: MESSAGE_HISTORY_LIMIT,
-        order: "desc"
-      }) : null;
-      messages = backfillPage ? sortChronological(backfillPage.getPaginatedItems()) : [];
+      if (isBackfillEnabled()) {
+        try {
+          const backfillPage = await client.conversations.messages.list(conversationId, {
+            limit: MESSAGE_HISTORY_LIMIT,
+            order: "desc"
+          });
+          messages = sortChronological(backfillPage.getPaginatedItems());
+        } catch (backfillError) {
+          debugWarn("check-approval", `Failed to load message history: ${backfillError instanceof Error ? backfillError.message : String(backfillError)}`);
+        }
+      }
       const messageToCheck = retrievedMessages.find((msg) => msg.message_type === "approval_request_message") ?? retrievedMessages[0];
       if (messageToCheck) {
         debugWarn("check-approval", `Found last in-context message: ${messageToCheck.id} (type: ${messageToCheck.message_type})` + (retrievedMessages.length > 1 ? ` - had ${retrievedMessages.length} variants` : ""));
@@ -91476,14 +92200,20 @@ async function getResumeData(client, agent, conversationId) {
         throw new Error("Expected at least one in-context message");
       }
       const retrievedMessages = await client.messages.retrieve(lastInContextId);
-      const messagesPage = isBackfillEnabled() ? await client.agents.messages.list(agent.id, {
-        limit: MESSAGE_HISTORY_LIMIT,
-        order: "desc",
-        conversation_id: "default"
-      }) : null;
-      messages = messagesPage ? sortChronological(messagesPage.items) : [];
-      if (process.env.DEBUG && messagesPage) {
-        console.log(`[DEBUG] agents.messages.list(conversation_id=default) returned ${messagesPage.items.length} messages`);
+      if (isBackfillEnabled()) {
+        try {
+          const messagesPage = await client.agents.messages.list(agent.id, {
+            limit: MESSAGE_HISTORY_LIMIT,
+            order: "desc",
+            conversation_id: "default"
+          });
+          messages = sortChronological(messagesPage.items);
+          if (process.env.DEBUG) {
+            console.log(`[DEBUG] agents.messages.list(conversation_id=default) returned ${messagesPage.items.length} messages`);
+          }
+        } catch (backfillError) {
+          debugWarn("check-approval", `Failed to load message history: ${backfillError instanceof Error ? backfillError.message : String(backfillError)}`);
+        }
       }
       const messageToCheck = retrievedMessages.find((msg) => msg.message_type === "approval_request_message") ?? retrievedMessages[0];
       if (messageToCheck) {
@@ -94989,4 +95719,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=0D26B6A9B64965F064756E2164756E21
+//# debugId=4B93041AB98FEDD564756E2164756E21