@jungjaehoon/mama-os 0.7.0 → 0.8.0

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":"AAAA;;;;;;;;;;GAUG;AAWH,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;AAwIpB;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,UAAQ,EACf,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACvC,MAAM,EAAE,CAwEV;AAED,wBAAgB,wBAAwB,CAAC,OAAO,UAAQ,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM,CAsDxF;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAuB9C;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA4D;IAClF,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiC;IAC3D,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,gBAAgB,CAAU;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,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;gBAGjC,aAAa,EAAE,YAAY,EAC3B,OAAO,GAAE,gBAAqB,EAC9B,cAAc,CAAC,EAAE,mBAAmB,EACpC,eAAe,CAAC,EAAE,0BAA0B;IA4K9C;;;OAGG;IACH,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIhC;;OAEG;IACH,aAAa,IAAI,MAAM;IAIvB;;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;IAe/E;;;;;;;;;OASG;IACG,cAAc,CAClB,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,eAAe,CAAC;IAc3B;;OAEG;YACW,sBAAsB;IAuZpC;;OAEG;YACW,YAAY;IAuD1B;;;;;;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;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IA8E7B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAmE7B;;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"}
+{"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

@@ -10,6 +10,39 @@
  * - Sends tool_result back to Claude
  * - Loops until stop_reason is "end_turn" or max turns reached
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentLoop = void 0;
 exports.loadInstalledSkills = loadInstalledSkills;
@@ -31,6 +64,9 @@ const context_prompt_builder_js_1 = require("./context-prompt-builder.js");
 const post_tool_handler_js_1 = require("./post-tool-handler.js");
 const stop_continuation_handler_js_1 = require("./stop-continuation-handler.js");
 const pre_compact_handler_js_1 = require("./pre-compact-handler.js");
+const debugLogger = __importStar(require("@jungjaehoon/mama-core/debug-logger"));
+const { DebugLogger } = debugLogger;
+const logger = new DebugLogger('AgentLoop');
 /**
  * Default configuration
  */
@@ -208,14 +244,22 @@ function loadInstalledSkills(verbose = false, options = {}) {
     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) {
+                continue;
+            }
             // Skip if already loaded from subdirectory
-            if (blocks.some((b) => b.includes(`[Skill: mama/${id}]`)))
+            if (blocks.some((b) => b.includes(`[Skill: mama/${id}]`))) {
                 continue;
+            }
             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) {
@@ -235,6 +279,18 @@ function loadComposedSystemPrompt(verbose = false, context) {
     const mamaHome = (0, path_1.join)((0, os_1.homedir)(), '.mama');
     const layers = [];
     const backend = process.env.MAMA_BACKEND ?? 'claude';
+    // Load state for conditional loading (skills + system docs)
+    const stateFile = (0, path_1.join)(mamaHome, 'skills', 'state.json');
+    let state = {};
+    try {
+        if ((0, fs_1.existsSync)(stateFile)) {
+            state = JSON.parse((0, fs_1.readFileSync)(stateFile, 'utf-8'));
+        }
+    }
+    catch (err) {
+        logger.error(`Failed to parse state file ${stateFile}:`, err);
+        throw new Error(`Failed to parse state file ${stateFile}: ${err instanceof Error ? err.message : String(err)}`);
+    }
     // Load persona files: SOUL.md, IDENTITY.md, USER.md
     const personaFiles = backend === 'codex' ? ['USER.md'] : ['SOUL.md', 'IDENTITY.md', 'USER.md'];
     for (const file of personaFiles) {
@@ -281,6 +337,23 @@ function loadComposedSystemPrompt(verbose = false, context) {
     // Load CLAUDE.md (base instructions)
     const claudeMd = loadSystemPrompt(verbose, backend);
     layers.push(claudeMd);
+    // Load ONBOARDING.md only if not disabled in state
+    // This contains config schema + bot setup guides - only needed during initial setup
+    if (state['system/onboarding']?.enabled !== false) {
+        const onboardingPath = (0, path_1.join)(mamaHome, 'ONBOARDING.md');
+        if ((0, fs_1.existsSync)(onboardingPath)) {
+            const onboardingContent = (0, fs_1.readFileSync)(onboardingPath, 'utf-8');
+            layers.push(onboardingContent);
+            if (verbose) {
+                logger.debug('Loaded ONBOARDING.md (setup reference)');
+            }
+        }
+    }
+    else {
+        if (verbose) {
+            logger.debug('Skipped ONBOARDING.md (disabled in state)');
+        }
+    }
     return layers.join('\n\n---\n\n');
 }
 /**
@@ -294,7 +367,7 @@ function getGatewayToolsPrompt() {
     }
     // TODO: Consider generating both gateway-tools.md and this fallback from a single source
     // to prevent tool list drift (CodeRabbit review suggestion)
-    console.warn('[AgentLoop] gateway-tools.md not found, using minimal prompt');
+    logger.warn('gateway-tools.md not found, using minimal prompt');
     return `
 ## Gateway Tools
 
@@ -341,44 +414,61 @@ class AgentLoop {
         const mcpConfigPath = this.toolsConfig.mcp_config?.replace('~', (0, os_1.homedir)()) ||
             (0, path_1.join)((0, os_1.homedir)(), '.mama/mama-mcp-config.json');
         const sessionId = (0, crypto_1.randomUUID)();
-        // Determine tool mode: Gateway (default) or MCP
-        // Currently only '*' (all tools) is supported for mode selection
-        // Partial patterns like 'mama_*' or 'browser_*' are reserved for future hybrid routing
+        // Determine tool mode: Gateway, MCP, or Hybrid
+        // - gateway: ['*'] → Use internal GatewayToolExecutor for mama_*, discord_send, etc.
+        // - mcp: ['*'] or [...] → Use MCP servers for external tools (brave-devtools, etc.)
+        // - Both can be enabled for hybrid mode
         const mcpTools = this.toolsConfig.mcp || [];
         const gatewayTools = this.toolsConfig.gateway || [];
-        // Warn if partial patterns are used (not yet supported)
-        const hasPartialPattern = (arr) => arr.some((t) => t.includes('*') && t !== '*');
-        if (hasPartialPattern(mcpTools) || hasPartialPattern(gatewayTools)) {
-            console.warn('[AgentLoop] Warning: Partial patterns (e.g., "mama_*") are not yet supported. ' +
-                'Use "*" for all tools or specific tool names. Falling back to Gateway mode.');
-        }
-        const useMCPMode = mcpTools.includes('*');
-        const useGatewayMode = !useMCPMode;
+        // Hybrid mode: Gateway + MCP both enabled
+        const useGatewayMode = gatewayTools.includes('*') || gatewayTools.length > 0;
+        const useMCPMode = mcpTools.includes('*') || mcpTools.length > 0;
         this.isGatewayMode = useGatewayMode;
+        if (useGatewayMode && useMCPMode) {
+            logger.debug('🔀 Hybrid mode: Gateway + MCP tools enabled');
+        }
+        else if (useMCPMode) {
+            logger.debug('🔌 MCP-only mode');
+        }
+        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() : '';
-        const defaultSystemPrompt = gatewayToolsPrompt
+        let defaultSystemPrompt = gatewayToolsPrompt
             ? `${basePrompt}\n\n---\n\n${gatewayToolsPrompt}`
             : basePrompt;
-        // Monitor prompt size
+        // Monitor and enforce prompt size limits
         const monitor = new prompt_size_monitor_js_1.PromptSizeMonitor();
-        const checkResult = monitor.check([
+        const promptLayers = [
             { name: 'base', content: basePrompt, priority: 1 },
             ...(gatewayToolsPrompt
                 ? [{ name: 'gatewayTools', content: gatewayToolsPrompt, priority: 2 }]
                 : []),
-        ]);
+        ];
+        const checkResult = monitor.check(promptLayers);
         if (checkResult.warning) {
-            console.warn(`[AgentLoop] ${checkResult.warning}`);
+            logger.warn(checkResult.warning);
+        }
+        // Actually enforce truncation if over budget
+        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`);
         }
         // Choose backend (default: claude)
         this.backend = options.backend ?? 'claude';
         // Choose CLI mode: Persistent (fast, experimental) or Standard (stable)
         this.usePersistentCLI = this.backend === 'codex' ? false : (options.usePersistentCLI ?? false);
         if (this.backend === 'codex' && options.usePersistentCLI) {
-            console.warn('[AgentLoop] Codex backend does not support persistent CLI mode; disabling');
+            logger.warn('Codex backend does not support persistent CLI mode; disabling');
         }
         if (this.usePersistentCLI) {
             // Persistent CLI mode: keeps Claude process alive for multi-turn conversations
@@ -387,13 +477,17 @@ class AgentLoop {
                 model: options.model ?? 'claude-sonnet-4-20250514',
                 sessionId,
                 systemPrompt: defaultSystemPrompt,
+                // Hybrid mode: pass MCP config even with Gateway tools enabled
                 mcpConfigPath: useMCPMode ? mcpConfigPath : undefined,
-                // Headless daemon — no interactive permission prompts possible
-                dangerouslySkipPermissions: false, // Changed to false for safety
+                // 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),
+                // Gateway tools are processed by GatewayToolExecutor (hybrid with MCP)
                 useGatewayTools: useGatewayMode,
             });
             this.agent = this.persistentCLI;
-            console.log('[AgentLoop] 🚀 Persistent CLI mode enabled - faster responses');
+            logger.debug('🚀 Persistent CLI mode enabled - faster responses');
         }
         else {
             if (this.backend === 'codex') {
@@ -405,7 +499,7 @@ class AgentLoop {
                     sandbox: 'read-only',
                     skipGitRepoCheck: true,
                 });
-                console.log('[AgentLoop] Codex CLI backend enabled');
+                logger.debug('Codex CLI backend enabled');
             }
             else {
                 // Standard Claude CLI mode: spawns new process per message
@@ -413,22 +507,20 @@ class AgentLoop {
                     model: options.model ?? 'claude-sonnet-4-20250514',
                     sessionId,
                     systemPrompt: defaultSystemPrompt,
+                    // Hybrid mode: pass MCP config even with Gateway tools enabled
                     mcpConfigPath: useMCPMode ? mcpConfigPath : undefined,
-                    // Headless daemon — no interactive permission prompts possible
-                    dangerouslySkipPermissions: false, // Changed to false for safety
+                    // 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),
+                    // Gateway tools are processed by GatewayToolExecutor (hybrid with MCP)
                     useGatewayTools: useGatewayMode,
                 });
                 this.agent = this.claudeCLI;
             }
         }
-        // Log tool mode for transparency
-        if (useMCPMode) {
-            console.log('[AgentLoop] MCP mode enabled - tools via MCP server (' + mcpConfigPath + ')');
-        }
-        else {
-            console.log('[AgentLoop] Gateway mode enabled - tools via GatewayToolExecutor');
-        }
-        console.log('[AgentLoop] Config: gateway=' +
+        logger.debug('Config: gateway=' +
             JSON.stringify(this.toolsConfig.gateway) +
             ' mcp=' +
             JSON.stringify(this.toolsConfig.mcp));
@@ -559,7 +651,7 @@ class AgentLoop {
         // Infinite loop prevention
         let consecutiveToolCalls = 0;
         let lastToolName = '';
-        const MAX_CONSECUTIVE_SAME_TOOL = 5;
+        const MAX_CONSECUTIVE_SAME_TOOL = 15; // Increased from 5 - normal coding tasks often need 10+ consecutive Bash calls
         const EMERGENCY_MAX_TURNS = Math.max(this.maxTurns + 10, 50); // Always above maxTurns
         // Track channel key for session release
         const channelKey = (0, session_pool_js_1.buildChannelKey)(options?.source ?? 'default', options?.channelId ?? this.sessionKey);
@@ -583,23 +675,37 @@ class AgentLoop {
         }
         try {
             if (options?.systemPrompt) {
-                const gatewayToolsPrompt = this.isGatewayMode ? getGatewayToolsPrompt() : '';
+                // Skip gateway tools if already embedded in systemPrompt (e.g. by MessageRouter)
+                const alreadyHasTools = options.systemPrompt.includes('# Gateway Tools');
+                const gatewayToolsPrompt = this.isGatewayMode && !alreadyHasTools ? getGatewayToolsPrompt() : '';
                 const fullPrompt = gatewayToolsPrompt
                     ? `${options.systemPrompt}\n\n---\n\n${gatewayToolsPrompt}`
                     : options.systemPrompt;
-                // Monitor prompt size
+                // Monitor and enforce prompt size
                 const monitor = new prompt_size_monitor_js_1.PromptSizeMonitor();
-                const checkResult = monitor.check([
+                const runLayers = [
                     { name: 'systemPrompt', content: options.systemPrompt, priority: 1 },
                     ...(gatewayToolsPrompt
                         ? [{ name: 'gatewayTools', content: gatewayToolsPrompt, priority: 2 }]
                         : []),
-                ]);
+                ];
+                const checkResult = monitor.check(runLayers);
                 if (checkResult.warning) {
                     console.warn(`[AgentLoop] ${checkResult.warning}`);
                 }
-                console.log(`[AgentLoop] Setting systemPrompt: ${fullPrompt.length} chars (base: ${options.systemPrompt.length}, tools: ${gatewayToolsPrompt.length})`);
-                this.agent.setSystemPrompt(fullPrompt);
+                let effectivePrompt = fullPrompt;
+                if (!checkResult.withinBudget) {
+                    const { layers: trimmed, result: enforceResult } = monitor.enforce(runLayers);
+                    if (enforceResult.truncatedLayers.length > 0) {
+                        console.warn(`[AgentLoop] Truncated layers: ${enforceResult.truncatedLayers.join(', ')}`);
+                    }
+                    const tBase = trimmed.find((l) => l.name === 'systemPrompt')?.content || options.systemPrompt;
+                    const tTools = trimmed.find((l) => l.name === 'gatewayTools')?.content || '';
+                    effectivePrompt = tTools ? `${tBase}\n\n---\n\n${tTools}` : tBase;
+                    console.log(`[AgentLoop] System prompt truncated: ${fullPrompt.length} → ${effectivePrompt.length} chars`);
+                }
+                console.log(`[AgentLoop] Setting systemPrompt: ${effectivePrompt.length} chars (base: ${options.systemPrompt.length}, tools: ${gatewayToolsPrompt.length})`);
+                this.agent.setSystemPrompt(effectivePrompt);
             }
             else {
                 console.log(`[AgentLoop] No systemPrompt in options, using default`);
@@ -667,10 +773,18 @@ class AgentLoop {
                     // Check if this is a recoverable session error
                     // 1. "No conversation found" - CLI session was lost (daemon restart, timeout)
                     // 2. "Session ID already in use" - concurrent request conflict
+                    // 3. "Prompt is too long" - session context exceeded API limits
                     const isSessionNotFound = errorMessage.includes('No conversation found with session ID');
                     const isSessionInUse = errorMessage.includes('is already in use');
-                    if (isSessionNotFound || isSessionInUse) {
-                        const reason = isSessionNotFound ? 'not found in CLI' : 'already in use';
+                    const isPromptTooLong = errorMessage.includes('Prompt is too long') ||
+                        errorMessage.includes('prompt is too long') ||
+                        errorMessage.includes('request_too_large');
+                    if (isSessionNotFound || isSessionInUse || isPromptTooLong) {
+                        const reason = isSessionNotFound
+                            ? 'not found in CLI'
+                            : isSessionInUse
+                                ? 'already in use'
+                                : 'prompt too long (context overflow)';
                         console.log(`[AgentLoop] Session ${reason}, retrying with new session`);
                         // Reset session in pool so it creates a new one
                         this.sessionPool.resetSession(channelKey);
@@ -681,6 +795,10 @@ class AgentLoop {
                             model: options?.model,
                             resumeSession: false, // Force new session
                         });
+                        // Prepend reset notice so user knows context was lost
+                        if (isPromptTooLong && piResult.response) {
+                            piResult.response = `⚠️ Session reset: The previous conversation was too long, starting a new session.\n⚠️ 이전 대화가 너무 길어져 새 세션으로 전환되었습니다.\n\n${piResult.response}`;
+                        }
                         console.log(`[AgentLoop] Retry successful with new session: ${newSessionId}`);
                     }
                     else {
@@ -1045,27 +1163,37 @@ class AgentLoop {
                         parts.push(`[Tool Result: ${status}]\n${block.content}`);
                     }
                     else if (block.type === 'image') {
-                        // Convert image to file path instruction for Claude Code
-                        // MANDATORY: Claude MUST use Read tool to view the image before responding
                         if (block.localPath) {
-                            parts.push(`**[MANDATORY IMAGE]** The user has attached an image at: ${block.localPath}\n` +
-                                `YOU MUST use the Read tool to view this image BEFORE responding to the user's request.\n` +
-                                `Do NOT respond without first reading the image. The user expects you to see and analyze the image content.`);
+                            parts.push(`⚠️ CRITICAL: The user has uploaded an image file.\n` +
+                                `Image path: ${block.localPath}\n` +
+                                `You MUST call the Read tool on "${block.localPath}" to view this image FIRST.\n` +
+                                `DO NOT describe or guess the image contents without reading it.\n` +
+                                `DO NOT say you cannot read images - the Read tool supports image files.`);
                         }
                         else if (block.source?.data) {
-                            // Base64 image - save to workspace and reference it
                             // eslint-disable-next-line @typescript-eslint/no-require-imports
                             const fs = require('fs');
                             // eslint-disable-next-line @typescript-eslint/no-require-imports
                             const path = require('path');
-                            const mediaDir = path.join(process.env.HOME || '', '.mama', 'workspace', 'media', 'inbound');
+                            const mediaDir = path.join((0, os_1.homedir)(), '.mama', 'workspace', 'media', 'inbound');
                             fs.mkdirSync(mediaDir, { recursive: true });
-                            const imagePath = path.join(mediaDir, `${Date.now()}.jpg`);
+                            // Map MIME type to file extension (support PNG, JPEG, GIF, WebP)
+                            const mimeToExt = {
+                                'image/png': '.png',
+                                'image/jpeg': '.jpg',
+                                'image/jpg': '.jpg',
+                                'image/gif': '.gif',
+                                'image/webp': '.webp',
+                            };
+                            const ext = mimeToExt[block.source.media_type?.toLowerCase() || ''] || '.jpg';
+                            const imagePath = path.join(mediaDir, `${Date.now()}-${(0, crypto_1.randomUUID)().slice(0, 8)}${ext}`);
                             try {
                                 fs.writeFileSync(imagePath, Buffer.from(block.source.data, 'base64'));
-                                parts.push(`**[MANDATORY IMAGE]** The user has attached an image at: ${imagePath}\n` +
-                                    `YOU MUST use the Read tool to view this image BEFORE responding to the user's request.\n` +
-                                    `Do NOT respond without first reading the image. The user expects you to see and analyze the image content.`);
+                                parts.push(`⚠️ CRITICAL: The user has uploaded an image file.\n` +
+                                    `Image path: ${imagePath}\n` +
+                                    `You MUST call the Read tool on "${imagePath}" to view this image FIRST.\n` +
+                                    `DO NOT describe or guess the image contents without reading it.\n` +
+                                    `DO NOT say you cannot read images - the Read tool supports image files.`);
                             }
                             catch {
                                 parts.push('[Image attached but could not be processed]');
@@ -1111,9 +1239,11 @@ class AgentLoop {
                             parts.push(block.text);
                         }
                         else if (block.type === 'image' && block.localPath) {
-                            // Include image instructions for persistent CLI as well
-                            parts.push(`**[MANDATORY IMAGE]** The user has attached an image at: ${block.localPath}\n` +
-                                `YOU MUST use the Read tool to view this image BEFORE responding to the user's request.`);
+                            parts.push(`⚠️ CRITICAL: The user has uploaded an image file.\n` +
+                                `Image path: ${block.localPath}\n` +
+                                `You MUST call the Read tool on "${block.localPath}" to view this image FIRST.\n` +
+                                `DO NOT describe or guess the image contents without reading it.\n` +
+                                `DO NOT say you cannot read images - the Read tool supports image files.`);
                         }
                         else if (block.type === 'image' && block.source?.data) {
                             // Base64-encoded image — save to disk so persistent CLI can read it
@@ -1121,13 +1251,25 @@ class AgentLoop {
                             const fs = require('fs');
                             // eslint-disable-next-line @typescript-eslint/no-require-imports
                             const path = require('path');
-                            const mediaDir = path.join(process.env.HOME || '', '.mama', 'workspace', 'media', 'inbound');
+                            const mediaDir = path.join((0, os_1.homedir)(), '.mama', 'workspace', 'media', 'inbound');
                             fs.mkdirSync(mediaDir, { recursive: true });
-                            const imagePath = path.join(mediaDir, `${Date.now()}.jpg`);
+                            // Map MIME type to file extension (support PNG, JPEG, GIF, WebP)
+                            const mimeToExt = {
+                                'image/png': '.png',
+                                'image/jpeg': '.jpg',
+                                'image/jpg': '.jpg',
+                                'image/gif': '.gif',
+                                'image/webp': '.webp',
+                            };
+                            const ext = mimeToExt[block.source.media_type?.toLowerCase() || ''] || '.jpg';
+                            const imagePath = path.join(mediaDir, `${Date.now()}-${(0, crypto_1.randomUUID)().slice(0, 8)}${ext}`);
                             try {
                                 fs.writeFileSync(imagePath, Buffer.from(block.source.data, 'base64'));
-                                parts.push(`**[MANDATORY IMAGE]** The user has attached an image at: ${imagePath}\n` +
-                                    `YOU MUST use the Read tool to view this image BEFORE responding to the user's request.`);
+                                parts.push(`⚠️ CRITICAL: The user has uploaded an image file.\n` +
+                                    `Image path: ${imagePath}\n` +
+                                    `You MUST call the Read tool on "${imagePath}" to view this image FIRST.\n` +
+                                    `DO NOT describe or guess the image contents without reading it.\n` +
+                                    `DO NOT say you cannot read images - the Read tool supports image files.`);
                             }
                             catch {
                                 parts.push('[Image attached but could not be processed]');