@jungjaehoon/mama-os 0.10.4 → 0.12.0

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

@@ -12,18 +12,19 @@
 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 catalog lines for system prompt injection (on-demand mode).
- * Full skill content is injected per-message via detectSkillMatch() in PromptEnhancer.
+ * Load composed system prompt with persona layers + CLAUDE.md + optional context
+ * Tries to load persona files from ~/.mama/ in order:
+ * 1. SOUL.md (philosophical principles)
+ * 2. IDENTITY.md (role and character)
+ * 3. USER.md (user preferences)
+ * 4. **Context Prompt** (if AgentContext provided - role awareness)
+ * 5. CLAUDE.md (base instructions)
+ *
+ * If persona files are missing, logs warning and continues with CLAUDE.md alone.
+ *
+ * @param verbose - Enable verbose logging
+ * @param context - Optional AgentContext for role-aware prompt injection
  */
-export declare function loadInstalledSkills(verbose?: boolean, _options?: {
-    onlyCommands?: boolean;
-}): string[];
 /**
  * Load backend-specific AGENTS.md from ~/.mama/
  * Maps backend to file: 'claude' → AGENTS.claude.md, 'codex-mcp' → AGENTS.codex.md
@@ -45,6 +46,7 @@ export declare class AgentLoop {
     private readonly onTurn?;
     private readonly onToolUse?;
     private readonly onTokenUsage?;
+    private readonly onMetric?;
     private readonly laneManager;
     private readonly useLanes;
     private sessionKey;

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":"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"}

package/dist/agent/agent-loop.js

@@ -45,16 +45,16 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentLoop = void 0;
-exports.loadSkillContent = loadSkillContent;
-exports.loadInstalledSkills = loadInstalledSkills;
 exports.loadBackendAgentsMd = loadBackendAgentsMd;
 exports.loadComposedSystemPrompt = loadComposedSystemPrompt;
 exports.getGatewayToolsPrompt = getGatewayToolsPrompt;
 const fs_1 = require("fs");
 const prompt_size_monitor_js_1 = require("./prompt-size-monitor.js");
-const codex_mcp_process_js_1 = require("./codex-mcp-process.js");
+const skill_loader_js_1 = require("./skill-loader.js");
 const persistent_cli_adapter_js_1 = require("./persistent-cli-adapter.js");
+const runtime_process_js_1 = require("../multi-agent/runtime-process.js");
 const gateway_tool_executor_js_1 = require("./gateway-tool-executor.js");
+const tool_registry_js_1 = require("./tool-registry.js");
 const index_js_1 = require("./code-act/index.js");
 const index_js_2 = require("../concurrency/index.js");
 const session_pool_js_1 = require("./session-pool.js");
@@ -81,21 +81,6 @@ const DEFAULT_TOOLS_CONFIG = {
     mcp: [],
     mcp_config: '~/.mama/mama-mcp-config.json',
 };
-/**
- * Check if a tool name matches a pattern (supports wildcards like "browser_*")
- * Reserved for future hybrid tool routing
- */
-function _matchToolPattern(toolName, pattern) {
-    if (pattern === '*')
-        return true;
-    if (pattern.endsWith('*')) {
-        const prefix = pattern.slice(0, -1);
-        return toolName.startsWith(prefix);
-    }
-    return toolName === pattern;
-}
-// _matchToolPattern is reserved for future hybrid routing
-void _matchToolPattern;
 /**
  * Load CLAUDE.md system prompt
  * Tries multiple paths: project root, ~/.mama, /etc/mama
@@ -133,225 +118,6 @@ function loadSystemPrompt(verbose = false) {
  * @param verbose - Enable verbose logging
  * @param context - Optional AgentContext for role-aware prompt injection
  */
-/**
- * Files to exclude from skill prompt injection (reduce token bloat)
- */
-const EXCLUDED_SKILL_FILES = new Set([
-    'CONNECTORS.md',
-    'connectors.md',
-    'LICENSE.md',
-    'license.md',
-    'CHANGELOG.md',
-    'changelog.md',
-    'CONTRIBUTING.md',
-    'contributing.md',
-    'README.md',
-    'readme.md',
-]);
-/** Max chars per skill file to prevent prompt bloat */
-const MAX_SKILL_FILE_CHARS = 4000;
-/**
- * Recursively collect all .md files from a directory (sync)
- * Filters out non-essential files (LICENSE, CONNECTORS, etc.)
- */
-function collectMarkdownFiles(dir, prefix = '') {
-    const results = [];
-    if (!(0, fs_1.existsSync)(dir))
-        return results;
-    try {
-        const entries = (0, fs_1.readdirSync)(dir, { withFileTypes: true });
-        for (const entry of entries) {
-            if (entry.name.startsWith('.'))
-                continue;
-            const fullPath = (0, path_1.join)(dir, entry.name);
-            const relativePath = prefix ? `${prefix}/${entry.name}` : entry.name;
-            if (entry.isDirectory()) {
-                results.push(...collectMarkdownFiles(fullPath, relativePath));
-            }
-            else if (entry.isFile() && entry.name.endsWith('.md')) {
-                if (EXCLUDED_SKILL_FILES.has(entry.name))
-                    continue;
-                let content = (0, fs_1.readFileSync)(fullPath, 'utf-8');
-                // Only truncate supplementary files, never command files
-                const isCommand = relativePath.startsWith('commands/');
-                if (!isCommand && content.length > MAX_SKILL_FILE_CHARS) {
-                    content = content.slice(0, MAX_SKILL_FILE_CHARS) + '\n\n[... truncated]';
-                }
-                results.push({ path: relativePath, content });
-            }
-        }
-    }
-    catch {
-        // Read failed
-    }
-    return results;
-}
-// ─── Skill On-Demand Injection ───────────────────────────────────────────────
-/**
- * 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 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 catalog = [];
-    let state = {};
-    try {
-        if ((0, fs_1.existsSync)(stateFile)) {
-            state = JSON.parse((0, fs_1.readFileSync)(stateFile, 'utf-8'));
-        }
-    }
-    catch {
-        /* no state file */
-    }
-    const sources = ['mama', 'cowork', 'external'];
-    for (const source of sources) {
-        const sourceDir = (0, path_1.join)(skillsBase, source);
-        if (!(0, fs_1.existsSync)(sourceDir))
-            continue;
-        try {
-            const entries = (0, fs_1.readdirSync)(sourceDir, { withFileTypes: true });
-            for (const entry of entries) {
-                if (!entry.isDirectory())
-                    continue;
-                const stateKey = `${source}/${entry.name}`;
-                if (state[stateKey]?.enabled === false)
-                    continue;
-                const skillDir = (0, path_1.join)(sourceDir, entry.name);
-                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] Skill catalog: ${stateKey}`);
-                }
-                catch {
-                    /* skip unreadable */
-                }
-            }
-        }
-        catch {
-            /* directory read failed */
-        }
-    }
-    // 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'))
-                continue;
-            if (EXCLUDED_SKILL_FILES.has(entry.name))
-                continue;
-            const id = entry.name.replace(/\.md$/, '');
-            const stateKey = `mama/${id}`;
-            if (state[stateKey]?.enabled === false)
-                continue;
-            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}`);
-            }
-            catch {
-                /* skip */
-            }
-        }
-    }
-    catch {
-        /* 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 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);
-}
 /**
  * Load backend-specific AGENTS.md from ~/.mama/
  * Maps backend to file: 'claude' → AGENTS.claude.md, 'codex-mcp' → AGENTS.codex.md
@@ -399,7 +165,7 @@ function loadComposedSystemPrompt(verbose = false, context) {
         }
     }
     // Load skill catalog (on-demand mode — full content injected per-message by PromptEnhancer)
-    const skillCatalog = loadInstalledSkills(verbose);
+    const skillCatalog = (0, skill_loader_js_1.loadInstalledSkills)(verbose);
     if (skillCatalog.length > 0) {
         const skillDirective = [
             '# Installed Skills',
@@ -456,22 +222,9 @@ function getGatewayToolsPrompt() {
     if ((0, fs_1.existsSync)(gatewayToolsPath)) {
         return (0, fs_1.readFileSync)(gatewayToolsPath, 'utf-8');
     }
-    // TODO: Consider generating both gateway-tools.md and this fallback from a single source
-    // to prevent tool list drift (CodeRabbit review suggestion)
-    logger.warn('gateway-tools.md not found, using minimal prompt');
-    return `
-## Gateway Tools
-
-To call a Gateway Tool, output a JSON block:
-
-\`\`\`tool_call
-{"name": "tool_name", "input": {"param1": "value1"}}
-\`\`\`
-
-**MAMA Memory:** mama_search, mama_save, mama_update, mama_load_checkpoint
-**Browser:** browser_navigate, browser_screenshot, browser_click, browser_type, browser_get_text, browser_scroll, browser_wait_for, browser_evaluate, browser_pdf, browser_close
-**Utility:** discord_send, Read, Write, Bash
-`;
+    // Fallback generated from ToolRegistry (SSOT) — no manual list to drift
+    logger.warn('gateway-tools.md not found, using registry fallback');
+    return `# Gateway Tools\n\n${tool_registry_js_1.ToolRegistry.generateFallbackPrompt()}`;
 }
 class AgentLoop {
     agent;
@@ -483,6 +236,7 @@ class AgentLoop {
     onTurn;
     onToolUse;
     onTokenUsage;
+    onMetric;
     laneManager;
     useLanes;
     sessionKey;
@@ -547,7 +301,7 @@ class AgentLoop {
                 if ((0, fs_1.existsSync)(p))
                     personaParts.push((0, fs_1.readFileSync)(p, 'utf-8'));
             }
-            const skillCatalog = loadInstalledSkills();
+            const skillCatalog = (0, skill_loader_js_1.loadInstalledSkills)();
             // Only load ONBOARDING.md during initial setup (before SOUL.md exists)
             const onboardingContent = !(0, fs_1.existsSync)((0, path_1.join)(mamaHome, 'SOUL.md'))
                 ? (() => {
@@ -638,14 +392,12 @@ class AgentLoop {
             if (!(0, fs_1.existsSync)(workspaceDir)) {
                 (0, fs_1.mkdirSync)(workspaceDir, { recursive: true });
             }
-            this.agent = new codex_mcp_process_js_1.CodexMCPProcess({
+            this.agent = new runtime_process_js_1.CodexRuntimeProcess({
                 model: options.model,
                 cwd: workspaceDir,
                 sandbox: 'workspace-write',
                 systemPrompt: defaultSystemPrompt,
-                compactPrompt: 'Summarize the conversation concisely, preserving key decisions and context.',
-                timeoutMs: options.timeoutMs,
-                codexHome: (0, path_1.join)((0, os_1.homedir)(), '.mama', '.codex'),
+                requestTimeout: options.timeoutMs,
             });
             logger.debug('Codex MCP backend enabled');
         }
@@ -682,6 +434,7 @@ class AgentLoop {
         this.onTurn = options.onTurn;
         this.onToolUse = options.onToolUse;
         this.onTokenUsage = options.onTokenUsage;
+        this.onMetric = options.onMetric;
         this.laneManager = (0, index_js_2.getGlobalLaneManager)();
         this.useLanes = options.useLanes ?? false;
         this.sessionKey = options.sessionKey ?? 'default';
@@ -949,11 +702,17 @@ class AgentLoop {
                 const shouldResume = !sessionIsNew || turn > 1;
                 // Both Claude PersistentCLI and Codex MCP preserve context - only send new messages
                 const promptText = this.formatLastMessageOnly(history);
+                const promptStart = Date.now();
                 try {
                     piResult = await this.agent.prompt(promptText, callbacks, {
                         model: options?.model,
                         resumeSession: shouldResume,
                     });
+                    // Emit prompt latency metric
+                    this.onMetric?.('prompt_latency_ms', Date.now() - promptStart, {
+                        backend: this.backend,
+                        turn: String(turn),
+                    });
                     // After first successful call, mark session as not new for subsequent turns
                     if (turn === 1)
                         sessionIsNew = false;
@@ -994,6 +753,7 @@ class AgentLoop {
                         console.log(`[AgentLoop] Retry successful with new session: ${newSessionId}`);
                     }
                     else {
+                        this.onMetric?.('prompt_error', 1, { backend: this.backend, error_type: 'CLI_ERROR' });
                         throw new types_js_1.AgentError(`CLI error: ${errorMessage}`, 'CLI_ERROR', error instanceof Error ? error : undefined, true // retryable
                         );
                     }
@@ -1209,6 +969,7 @@ class AgentLoop {
             let isError = false;
             // Notify stream: tool execution starting
             this.currentStreamCallbacks?.onToolUse?.(toolUse.name, toolUse.input);
+            const toolStart = Date.now();
             try {
                 // Code-Act: execute JS code in sandbox
                 if (toolUse.name === index_js_1.CODE_ACT_MARKER) {
@@ -1256,12 +1017,21 @@ class AgentLoop {
                     // Notify stream: tool completed (check actual status)
                     this.currentStreamCallbacks?.onToolComplete?.(toolUse.name, toolUse.id, isError);
                 }
+                // Emit tool execution metric
+                this.onMetric?.('tool_duration_ms', Date.now() - toolStart, {
+                    tool: toolUse.name,
+                    error: String(isError),
+                });
             }
             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 });
+                this.onMetric?.('tool_duration_ms', Date.now() - toolStart, {
+                    tool: toolUse.name,
+                    error: 'true',
+                });
                 // Notify stream: tool completed with error
                 this.currentStreamCallbacks?.onToolComplete?.(toolUse.name, toolUse.id, true);
             }
@@ -1534,10 +1304,8 @@ class AgentLoop {
             return;
         this.stopped = true;
         try {
-            // Stop persistent CLI if it exists
-            if (this.persistentCLI?.stopAll) {
-                this.persistentCLI.stopAll();
-            }
+            // Stop the model runner
+            this.agent.stop();
             // NOTE: sessionPool is a shared global singleton — do NOT dispose here.
             // It will be cleaned up when the process exits or via a global shutdown handler.
             // Lane manager doesn't have explicit stop method