@jungjaehoon/mama-os 0.9.4 → 0.9.5

package/README.md

@@ -156,6 +156,9 @@ gateways:
 # In Slack
 @mama what's the status?
 @mama /report
+
+# File upload support
+@mama [attach image] translate this
 ```
 
 ### Telegram Bot
@@ -222,6 +225,20 @@ Built-in web interface for managing MAMA and chatting with your configured backe
 - Topic filtering and search
 - Export decisions (JSON, Markdown, CSV)
 
+**🧩 Skills Tab**
+
+- Browse installed skills with status badges (published/draft/coworking)
+- Click to open in Skill Lab Playground for editing
+- Skill verification with 12-point checklist
+
+**🧪 Playground Tab**
+
+- **Skill Lab** — Step-by-step skill creation, modification, and verification
+- **Cron Workflow Lab** — Visual cron-scheduled workflow designer
+- **Wave Visualizer** — Audio waveform playground for voice skill development
+- Bidirectional sync with Skills Tab (select skill → opens in Skill Lab)
+- "Open in new tab" for full-screen editing
+
 **⚙️ Settings Tab**
 
 - Configure gateway tokens
@@ -400,7 +417,6 @@ multi_agent:
       bot_token: 'DISCORD_BOT_TOKEN_2'
       tier: 1 # Full access for code changes
       auto_continue: true
-      pool_size: 3 # Enable 3 parallel processes for this agent
       auto_respond_keywords: ['bug', 'code', 'implement', '구현']
 
     reviewer:
@@ -439,38 +455,6 @@ multi_agent:
     global_cooldown_ms: 2000
 ```
 
-### Process Pool (Parallel Execution)
-
-Each agent runs as a separate backend CLI subprocess. By default, each agent has **1 process** (sequential execution). Configure `pool_size` to enable parallel task execution per agent.
-
-```yaml
-multi_agent:
-  agents:
-    developer:
-      pool_size: 5 # 5 parallel backend CLI processes for this agent
-```
-
-**How it works:**
-
-- When a task arrives and all processes are busy, a new process is spawned (up to `pool_size`)
-- Idle processes are reused automatically (no cold start penalty)
-- Processes auto-terminate after 5 minutes of inactivity (`idleTimeoutMs`)
-- Hung processes (busy > 15 minutes) are auto-killed (`hungTimeoutMs`)
-
-**Pool status per agent:**
-
-| State   | Description                         |
-| ------- | ----------------------------------- |
-| `total` | Total processes currently in pool   |
-| `busy`  | Processes handling active requests  |
-| `idle`  | Processes ready for immediate reuse |
-
-**Default:** `pool_size: 1` (sequential execution, safe default)
-
-**Recommendation:** Start with `pool_size: 3` for implementation agents (Developer) and keep `pool_size: 1` for advisory agents (Reviewer, Explorer).
-
-> **Note:** Each process spawns a separate backend CLI subprocess. Higher pool sizes increase memory and API usage proportionally.
-
 ### Delegation
 
 Tier 1 agents can delegate tasks to other agents:
@@ -910,4 +894,4 @@ The multi-agent swarm architecture was inspired by [oh-my-opencode](https://gith
 ---
 
 **Author:** SpineLift Team
-**Last Updated:** 2026-02-06
+**Last Updated:** 2026-02-20

package/dist/agent/agent-loop.d.ts

@@ -11,12 +11,17 @@
  */
 import type { OAuthManager } from '../auth/index.js';
 import type { ContentBlock, ToolDefinition, AgentLoopOptions, AgentLoopResult, ClaudeClientOptions, GatewayToolExecutorOptions, AgentContext } from './types.js';
+/**
+ * Load full skill content on-demand for per-message injection.
+ * @param skillId - Skill identifier like "mama/playground"
+ */
+export declare function loadSkillContent(skillId: string): string | null;
 /**
  * Load installed & enabled skills from ~/.mama/skills/
- * Returns skill content blocks for system prompt injection.
- * Reads all .md files recursively (commands/, skills/, etc.)
+ * Returns skill catalog lines for system prompt injection (on-demand mode).
+ * Full skill content is injected per-message via detectSkillMatch() in PromptEnhancer.
  */
-export declare function loadInstalledSkills(verbose?: boolean, options?: {
+export declare function loadInstalledSkills(verbose?: boolean, _options?: {
     onlyCommands?: boolean;
 }): string[];
 export declare function loadComposedSystemPrompt(verbose?: boolean, context?: AgentContext): string;
@@ -46,6 +51,7 @@ export declare class AgentLoop {
     private readonly stopContinuationHandler;
     private readonly preCompactHandler;
     private preCompactInjected;
+    private currentStreamCallbacks?;
     constructor(_oauthManager: OAuthManager, options?: AgentLoopOptions, _clientOptions?: ClaudeClientOptions, executorOptions?: GatewayToolExecutorOptions);
     /**
      * Set session key for lane-based concurrency

package/dist/agent/agent-loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-loop.d.ts","sourceRoot":"","sources":["../../src/agent/agent-loop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-loop.d.ts","sourceRoot":"","sources":["../../src/agent/agent-loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAUH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIrD,OAAO,KAAK,EAEV,YAAY,EAIZ,cAAc,EACd,gBAAgB,EAChB,eAAe,EAIf,mBAAmB,EACnB,0BAA0B,EAE1B,YAAY,EACb,MAAM,YAAY,CAAC;AA4QpB;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA2B/D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,UAAQ,EACf,QAAQ,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACxC,MAAM,EAAE,CAEV;AAED,wBAAgB,wBAAwB,CAAC,OAAO,UAAQ,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM,CA8ExF;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAuB9C;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqC;IACnE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsB;IAClD,OAAO,CAAC,oBAAoB,CAAC,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAA2B;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAA8D;IACzF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAOnB;IACX,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAU;IACxC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IACjD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyB;IACzD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAiC;IACzE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA2B;IAC7D,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,sBAAsB,CAAC,CAAkB;gBAG/C,aAAa,EAAE,YAAY,EAC3B,OAAO,GAAE,gBAAqB,EAC9B,cAAc,CAAC,EAAE,mBAAmB,EACpC,eAAe,CAAC,EAAE,0BAA0B;IA+N9C;;;OAGG;IACH,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIhC;;OAEG;IACH,aAAa,IAAI,MAAM;IAIvB,OAAO,CAAC,2BAA2B;IASnC;;OAEG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAIjD;;OAEG;IACH,iBAAiB,CAAC,OAAO,EAAE;QACzB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/D,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/E,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAClF,GAAG,IAAI;IAIR;;;;;;;;;;;;OAYG;IACG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC;IAkB/E;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,eAAe,CAAC;IAiB3B;;OAEG;YACW,sBAAsB;IAybpC;;OAEG;YACW,YAAY;IAmE1B;;;;;;OAMG;YACW,sBAAsB;IA4CpC;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IA0B9B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,sBAAsB;IAO9B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAuB3B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IA8E7B;;OAEG;IACH,MAAM,CAAC,kBAAkB,IAAI,cAAc,EAAE;IAI7C;;OAEG;IACH,MAAM,CAAC,sBAAsB,IAAI,MAAM;IAIvC;;OAEG;IACH,OAAO,CAAC,OAAO,CAAS;IAExB,IAAI,IAAI,IAAI;CAmBb"}

package/dist/agent/agent-loop.js

@@ -45,6 +45,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentLoop = void 0;
+exports.loadSkillContent = loadSkillContent;
 exports.loadInstalledSkills = loadInstalledSkills;
 exports.loadComposedSystemPrompt = loadComposedSystemPrompt;
 exports.getGatewayToolsPrompt = getGatewayToolsPrompt;
@@ -183,16 +184,57 @@ function collectMarkdownFiles(dir, prefix = '') {
     }
     return results;
 }
+// ─── Skill On-Demand Injection ───────────────────────────────────────────────
 /**
- * Load installed & enabled skills from ~/.mama/skills/
- * Returns skill content blocks for system prompt injection.
- * Reads all .md files recursively (commands/, skills/, etc.)
+ * Parse YAML frontmatter from skill .md file
+ */
+function parseSkillFrontmatter(content) {
+    const match = content.match(/^---\n([\s\S]*?)\n---/);
+    if (!match)
+        return { name: '', description: '', keywords: [] };
+    const block = match[1];
+    const name = (block.match(/^name:\s*(.+)$/m)?.[1] ?? '').trim();
+    const description = (block.match(/^description:\s*(.+)$/m)?.[1] ?? '').trim();
+    const kwBlock = block.match(/^keywords:\n((?:[ \t]+-[ \t]*.+\n?)+)/m);
+    const keywords = kwBlock
+        ? kwBlock[1]
+            .trim()
+            .split('\n')
+            .map((l) => l.replace(/^[ \t]*-[ \t]*/, '').trim())
+            .filter((k) => k.length > 0)
+        : [];
+    return { name, description, keywords };
+}
+/**
+ * Find the main .md file for a directory skill (for frontmatter parsing)
+ */
+function findMainSkillFile(skillDir, skillName) {
+    for (const name of [`${skillName}.md`, 'skill.md', 'index.md']) {
+        const p = (0, path_1.join)(skillDir, name);
+        if ((0, fs_1.existsSync)(p))
+            return p;
+    }
+    try {
+        const entries = (0, fs_1.readdirSync)(skillDir, { withFileTypes: true });
+        for (const e of entries) {
+            if (e.isFile() && e.name.endsWith('.md') && !EXCLUDED_SKILL_FILES.has(e.name)) {
+                return (0, path_1.join)(skillDir, e.name);
+            }
+        }
+    }
+    catch {
+        /* ignore */
+    }
+    return null;
+}
+/**
+ * Build skill catalog (one line per enabled skill) for system prompt.
+ * Format: "- [source/skillId] keywords: kw1, kw2 | description"
  */
-function loadInstalledSkills(verbose = false, options = {}) {
+function buildSkillCatalog(verbose = false) {
     const skillsBase = (0, path_1.join)((0, os_1.homedir)(), '.mama', 'skills');
     const stateFile = (0, path_1.join)(skillsBase, 'state.json');
-    const blocks = [];
-    // Load state (enabled/disabled tracking)
+    const catalog = [];
     let state = {};
     try {
         if ((0, fs_1.existsSync)(stateFile)) {
@@ -200,7 +242,7 @@ function loadInstalledSkills(verbose = false, options = {}) {
         }
     }
     catch {
-        // No state file
+        /* no state file */
     }
     const sources = ['mama', 'cowork', 'external'];
     for (const source of sources) {
@@ -213,60 +255,100 @@ function loadInstalledSkills(verbose = false, options = {}) {
                 if (!entry.isDirectory())
                     continue;
                 const stateKey = `${source}/${entry.name}`;
-                // Skip disabled skills
                 if (state[stateKey]?.enabled === false)
                     continue;
                 const skillDir = (0, path_1.join)(sourceDir, entry.name);
-                let mdFiles = collectMarkdownFiles(skillDir);
-                if (options.onlyCommands) {
-                    mdFiles = mdFiles.filter((f) => f.path.startsWith('commands/'));
-                }
-                if (mdFiles.length > 0) {
-                    const parts = mdFiles.map((f) => `## ${f.path}\n\n${f.content}`);
-                    blocks.push(`# [Skill: ${source}/${entry.name}]\n\n${parts.join('\n\n---\n\n')}`);
+                const mainFile = findMainSkillFile(skillDir, entry.name);
+                if (!mainFile)
+                    continue;
+                try {
+                    const content = (0, fs_1.readFileSync)(mainFile, 'utf-8');
+                    const fm = parseSkillFrontmatter(content);
+                    const description = fm.description || '';
+                    const keywords = fm.keywords.length > 0 ? fm.keywords.join(', ') : entry.name;
+                    catalog.push(`- [${stateKey}] keywords: ${keywords} | ${description}`);
                     if (verbose)
-                        console.log(`[AgentLoop] Loaded skill: ${source}/${entry.name} (${mdFiles.length} files)`);
+                        console.log(`[AgentLoop] Skill catalog: ${stateKey}`);
+                }
+                catch {
+                    /* skip unreadable */
                 }
             }
         }
         catch {
-            // Directory read failed
+            /* directory read failed */
         }
     }
-    // Also load flat .md skill files from ~/.mama/skills/ root
+    // Flat .md files at root
     try {
         const rootEntries = (0, fs_1.readdirSync)(skillsBase, { withFileTypes: true });
         for (const entry of rootEntries) {
-            if (!entry.isFile() || !entry.name.endsWith('.md')) {
+            if (!entry.isFile() || !entry.name.endsWith('.md'))
                 continue;
-            }
-            if (EXCLUDED_SKILL_FILES.has(entry.name)) {
+            if (EXCLUDED_SKILL_FILES.has(entry.name))
                 continue;
-            }
             const id = entry.name.replace(/\.md$/, '');
             const stateKey = `mama/${id}`;
-            // Skip disabled skills (check state like subdirectory skills)
-            if (state[stateKey]?.enabled === false) {
+            if (state[stateKey]?.enabled === false)
                 continue;
-            }
-            // Skip if already loaded from subdirectory
-            if (blocks.some((b) => b.includes(`[Skill: mama/${id}]`))) {
+            if (catalog.some((l) => l.includes(`[${stateKey}]`)))
                 continue;
+            try {
+                const content = (0, fs_1.readFileSync)((0, path_1.join)(skillsBase, entry.name), 'utf-8');
+                const fm = parseSkillFrontmatter(content);
+                const description = fm.description || '';
+                const keywords = fm.keywords.length > 0 ? fm.keywords.join(', ') : id;
+                catalog.push(`- [${stateKey}] keywords: ${keywords} | ${description}`);
+                if (verbose)
+                    console.log(`[AgentLoop] Skill catalog (flat): ${stateKey}`);
             }
-            const fullPath = (0, path_1.join)(skillsBase, entry.name);
-            let content = (0, fs_1.readFileSync)(fullPath, 'utf-8');
-            if (content.length > MAX_SKILL_FILE_CHARS) {
-                content = content.slice(0, MAX_SKILL_FILE_CHARS) + '\n\n[... truncated]';
+            catch {
+                /* skip */
             }
-            blocks.push(`# [Skill: mama/${id}]\n\n${content}`);
-            if (verbose)
-                console.log(`[AgentLoop] Loaded root skill: ${id}`);
         }
     }
     catch {
-        // Root directory read failed
+        /* root directory read failed */
+    }
+    return catalog;
+}
+/**
+ * Load full skill content on-demand for per-message injection.
+ * @param skillId - Skill identifier like "mama/playground"
+ */
+function loadSkillContent(skillId) {
+    const skillsBase = (0, path_1.join)((0, os_1.homedir)(), '.mama', 'skills');
+    // Try directory skill first
+    const skillDir = (0, path_1.join)(skillsBase, skillId);
+    if ((0, fs_1.existsSync)(skillDir)) {
+        const mdFiles = collectMarkdownFiles(skillDir);
+        if (mdFiles.length > 0) {
+            const parts = mdFiles.map((f) => `## ${f.path}\n\n${f.content}`);
+            return `# [Skill: ${skillId}]\n\n${parts.join('\n\n---\n\n')}`;
+        }
+    }
+    // Try flat .md file: "mama/playground" → skills/playground.md
+    const idParts = skillId.split('/');
+    if (idParts.length >= 2) {
+        const flatPath = (0, path_1.join)(skillsBase, `${idParts[idParts.length - 1]}.md`);
+        if ((0, fs_1.existsSync)(flatPath)) {
+            try {
+                return (0, fs_1.readFileSync)(flatPath, 'utf-8');
+            }
+            catch {
+                /* skip */
+            }
+        }
     }
-    return blocks;
+    return null;
+}
+/**
+ * Load installed & enabled skills from ~/.mama/skills/
+ * Returns skill catalog lines for system prompt injection (on-demand mode).
+ * Full skill content is injected per-message via detectSkillMatch() in PromptEnhancer.
+ */
+function loadInstalledSkills(verbose = false, _options = {}) {
+    return buildSkillCatalog(verbose);
 }
 function loadComposedSystemPrompt(verbose = false, context) {
     const mamaHome = (0, path_1.join)((0, os_1.homedir)(), '.mama');
@@ -298,26 +380,20 @@ function loadComposedSystemPrompt(verbose = false, context) {
                 console.log(`[AgentLoop] Persona file not found (skipping): ${file}`);
         }
     }
-    // Load installed & enabled skills (HIGH PRIORITY — before CLAUDE.md)
-    const skillBlocks = loadInstalledSkills(verbose);
-    if (skillBlocks.length > 0) {
+    // Load skill catalog (on-demand mode — full content injected per-message by PromptEnhancer)
+    const skillCatalog = loadInstalledSkills(verbose);
+    if (skillCatalog.length > 0) {
         const skillDirective = [
-            '# Installed Skills (PRIORITY)',
+            '# Installed Skills',
             '',
-            '**IMPORTANT:** The following skills/plugins are installed by the user.',
-            'When a user request matches a skill by keywords or description, you MUST:',
-            '1. Find the matching skill section below (check "keywords" in frontmatter or skill name)',
-            '2. Follow its "지시사항" / instructions EXACTLY as written — do NOT improvise alternatives',
-            '3. Use the tools available to you (fetch, Bash, etc.) as the skill directs',
-            '4. DO NOT create separate scripts or files unless the skill explicitly instructs it',
-            '5. For [INSTALLED PLUGIN COMMAND] messages, find matching "commands/{name}.md"',
-            '6. DO NOT use the Skill tool — these are NOT system skills',
+            'To invoke a skill, include its keywords in your message.',
+            'The full skill instructions will be injected automatically when matched.',
             '',
-            skillBlocks.join('\n\n---\n\n'),
+            ...skillCatalog,
         ].join('\n');
         layers.push(skillDirective);
         if (verbose)
-            console.log(`[AgentLoop] Injected ${skillBlocks.length} installed skills`);
+            console.log(`[AgentLoop] Skill catalog: ${skillCatalog.length} skills`);
     }
     // Add context prompt if AgentContext is provided (role awareness)
     if (context) {
@@ -395,6 +471,7 @@ class AgentLoop {
     stopContinuationHandler;
     preCompactHandler;
     preCompactInjected = false;
+    currentStreamCallbacks;
     constructor(_oauthManager, options = {}, _clientOptions, executorOptions) {
         // Initialize tools config (hybrid Gateway/MCP routing)
         this.toolsConfig = {
@@ -423,38 +500,88 @@ class AgentLoop {
         else {
             logger.debug('⚙️ Gateway-only mode');
         }
-        // Build system prompt
-        const basePrompt = options.systemPrompt || loadComposedSystemPrompt();
-        // Only include Gateway Tools prompt if using Gateway mode
-        const gatewayToolsPrompt = useGatewayMode ? getGatewayToolsPrompt() : '';
-        let defaultSystemPrompt = gatewayToolsPrompt
-            ? `${basePrompt}\n\n---\n\n${gatewayToolsPrompt}`
-            : basePrompt;
-        // Monitor and enforce prompt size limits
+        // Build system prompt with layered truncation support
         const monitor = new prompt_size_monitor_js_1.PromptSizeMonitor();
-        const promptLayers = [
-            { name: 'base', content: basePrompt, priority: 1 },
-            ...(gatewayToolsPrompt
-                ? [{ name: 'gatewayTools', content: gatewayToolsPrompt, priority: 2 }]
-                : []),
-        ];
+        let promptLayers;
+        if (options.systemPrompt) {
+            // Custom system prompt (e.g., multi-agent): treat as a single critical layer
+            promptLayers = [{ name: 'custom', content: options.systemPrompt, priority: 1 }];
+        }
+        else {
+            // Composed prompt: build layers with individual priorities for graceful truncation
+            // Priority 1 (never cut): CLAUDE.md base instructions
+            // Priority 2 (cut if extreme): personas (SOUL, IDENTITY, USER) + gateway tools
+            // Priority 3 (cut first): context prompt + skills + onboarding
+            const mamaHome = (0, path_1.join)((0, os_1.homedir)(), '.mama');
+            const claudeMd = loadSystemPrompt();
+            const personaFiles = ['SOUL.md', 'IDENTITY.md', 'USER.md'];
+            const personaParts = [];
+            for (const file of personaFiles) {
+                const p = (0, path_1.join)(mamaHome, file);
+                if ((0, fs_1.existsSync)(p))
+                    personaParts.push((0, fs_1.readFileSync)(p, 'utf-8'));
+            }
+            const skillCatalog = loadInstalledSkills();
+            const onboardingPath = (0, path_1.join)(mamaHome, 'ONBOARDING.md');
+            const onboardingContent = (0, fs_1.existsSync)(onboardingPath)
+                ? (0, fs_1.readFileSync)(onboardingPath, 'utf-8')
+                : '';
+            promptLayers = [
+                { name: 'claudeMd', content: claudeMd, priority: 1 },
+                ...(personaParts.length > 0
+                    ? [
+                        {
+                            name: 'personas',
+                            content: personaParts.join('\n\n---\n\n'),
+                            priority: 2,
+                        },
+                    ]
+                    : []),
+                ...(skillCatalog.length > 0
+                    ? [
+                        {
+                            name: 'skills',
+                            content: [
+                                '# Installed Skills',
+                                '',
+                                'To invoke a skill, include its keywords in your message.',
+                                '',
+                                ...skillCatalog,
+                            ].join('\n'),
+                            priority: 3,
+                        },
+                    ]
+                    : []),
+                ...(onboardingContent
+                    ? [{ name: 'onboarding', content: onboardingContent, priority: 4 }]
+                    : []),
+            ];
+        }
+        if (useGatewayMode) {
+            const gatewayToolsPrompt = getGatewayToolsPrompt();
+            if (gatewayToolsPrompt) {
+                promptLayers.push({ name: 'gatewayTools', content: gatewayToolsPrompt, priority: 2 });
+            }
+        }
         const checkResult = monitor.check(promptLayers);
         if (checkResult.warning) {
             logger.warn(checkResult.warning);
         }
-        // Actually enforce truncation if over budget
+        // Enforce truncation if over budget (priority > 1 layers trimmed first)
         if (!checkResult.withinBudget) {
             const { layers: trimmedLayers, result: enforceResult } = monitor.enforce(promptLayers);
             if (enforceResult.truncatedLayers.length > 0) {
                 logger.warn(`Truncated layers: ${enforceResult.truncatedLayers.join(', ')}`);
             }
-            const trimmedBase = trimmedLayers.find((l) => l.name === 'base')?.content || basePrompt;
-            const trimmedTools = trimmedLayers.find((l) => l.name === 'gatewayTools')?.content || '';
-            defaultSystemPrompt = trimmedTools ? `${trimmedBase}\n\n---\n\n${trimmedTools}` : trimmedBase;
-            logger.debug(`System prompt truncated: ${checkResult.totalChars} → ${defaultSystemPrompt.length} chars`);
+            promptLayers = trimmedLayers;
+            logger.debug(`System prompt truncated: ${checkResult.totalChars} → ${enforceResult.totalChars} chars`);
         }
+        const defaultSystemPrompt = promptLayers
+            .filter((l) => l.content.length > 0)
+            .map((l) => l.content)
+            .join('\n\n---\n\n');
         // Choose backend (default: claude)
-        this.backend = options.backend ?? 'claude';
+        this.backend = options.backend;
         if (this.backend === 'codex-mcp') {
             // Codex MCP mode: standard MCP protocol
             const workspaceDir = (0, path_1.join)((0, os_1.homedir)(), '.mama', 'workspace');
@@ -480,12 +607,14 @@ class AgentLoop {
                 systemPrompt: defaultSystemPrompt,
                 // Hybrid mode: pass MCP config even with Gateway tools enabled
                 mcpConfigPath: useMCPMode ? mcpConfigPath : undefined,
-                // Headless daemon requires skipping permission prompts (no TTY available).
-                // Security is enforced by MAMA's RoleManager, not Claude CLI's interactive prompts.
-                // MAMA_TRUSTED_ENV must be set to enable this flag (defense in depth)
-                dangerouslySkipPermissions: process.env.MAMA_TRUSTED_ENV === 'true' && (options.dangerouslySkipPermissions ?? false),
+                // MAMA OS is a headless daemon (no TTY) — Claude CLI's interactive permission prompts
+                // cannot work. Security is enforced by MAMA's own RoleManager layer (config.yaml roles).
+                // DO NOT gate this on env vars — MAMA manages permissions via its config, not Claude CLI.
+                dangerouslySkipPermissions: options.dangerouslySkipPermissions ?? false,
                 // Gateway tools are processed by GatewayToolExecutor (hybrid with MCP)
                 useGatewayTools: useGatewayMode,
+                // Pass configured timeout (default in PersistentCLI: 120s — too short for complex tasks)
+                requestTimeout: options.timeoutMs,
             });
             this.agent = this.persistentCLI;
             logger.debug('🚀 Claude PersistentCLI mode enabled - faster responses');
@@ -623,6 +752,7 @@ class AgentLoop {
      * Internal implementation of runWithContent (without lane queueing)
      */
     async runWithContentInternal(content, options) {
+        this.currentStreamCallbacks = options?.streamCallbacks;
         const history = [];
         const totalUsage = { input_tokens: 0, output_tokens: 0 };
         let turn = 0;
@@ -710,19 +840,19 @@ class AgentLoop {
                     throw new types_js_1.AgentError(`Emergency stop: Agent loop exceeded emergency maximum turns (${EMERGENCY_MAX_TURNS})`, 'EMERGENCY_MAX_TURNS', undefined, false);
                 }
                 let response;
+                const ext = this.currentStreamCallbacks;
                 const callbacks = {
                     onDelta: (text) => {
-                        console.log('[Streaming] Delta received:', text.length, 'chars');
+                        ext?.onDelta?.(text);
                     },
-                    onToolUse: (name, _input) => {
-                        console.log(`[Streaming] Tool called: ${name}`);
+                    onToolUse: (name, input) => {
+                        ext?.onToolUse?.(name, input);
                     },
-                    onFinal: (_finalResponse) => {
-                        console.log('[Streaming] Stream complete');
+                    onFinal: (finalResponse) => {
+                        ext?.onFinal?.(finalResponse);
                     },
                     onError: (error) => {
-                        console.error('[Streaming] Error:', error);
-                        // Don't throw - let the promise rejection handle it
+                        ext?.onError?.(error);
                     },
                 };
                 let piResult;
@@ -970,6 +1100,7 @@ class AgentLoop {
             if (ownedSession) {
                 this.sessionPool.releaseSession(channelKey);
             }
+            this.currentStreamCallbacks = undefined;
         }
     }
     /**
@@ -981,6 +1112,8 @@ class AgentLoop {
         for (const toolUse of toolUseBlocks) {
             let result;
             let isError = false;
+            // Notify stream: tool execution starting
+            this.currentStreamCallbacks?.onToolUse?.(toolUse.name, toolUse.input);
             try {
                 // PreToolUse: search MAMA for contracts before Write operations
                 let contractContext = '';
@@ -996,12 +1129,16 @@ class AgentLoop {
                 this.onToolUse?.(toolUse.name, toolUse.input, toolResult);
                 // PostToolUse: auto-extract contracts (fire-and-forget)
                 this.postToolHandler?.processInBackground(toolUse.name, toolUse.input, toolResult);
+                // Notify stream: tool completed successfully
+                this.currentStreamCallbacks?.onToolComplete?.(toolUse.name, toolUse.id, false);
             }
             catch (error) {
                 isError = true;
                 result = error instanceof Error ? error.message : String(error);
                 // Notify tool use callback with error
                 this.onToolUse?.(toolUse.name, toolUse.input, { error: result });
+                // Notify stream: tool completed with error
+                this.currentStreamCallbacks?.onToolComplete?.(toolUse.name, toolUse.id, true);
             }
             results.push({
                 type: 'tool_result',