@jungjaehoon/mama-os 0.32.0 → 0.32.2

package/dist/multi-agent/agent-process-manager.d.ts

@@ -7,12 +7,17 @@
  * Channel key format: {source}:{channelId}:{agentId}
  * Example: "discord:123456789:developer"
  */
+export { projectClineNativeTools } from '../agent/cline-native-tool-policy.js';
 import { EventEmitter } from 'events';
 import { PersistentProcessPool, type PersistentProcessOptions } from '../agent/persistent-cli-process.js';
 import type { MultiAgentConfig, MultiAgentRuntimeOptions } from './types.js';
 import { type AgentRuntimeProcess } from './runtime-process.js';
 import type { EphemeralAgentDef } from './workflow-types.js';
 import type { GatewayToolExecutor } from '../agent/gateway-tool-executor.js';
+import { type PrivateConnectorPolicy } from '../connectors/private-connector-policy.js';
+type PrivateAwareMultiAgentRuntimeOptions = MultiAgentRuntimeOptions & {
+    privateConnectorPolicy?: PrivateConnectorPolicy;
+};
 /**
  * Agent Process Manager
  *
@@ -31,6 +36,7 @@ export declare class AgentProcessManager extends EventEmitter {
     private codexShutdowns;
     private permissionManager;
     private runtimeOptions;
+    private readonly privateConnectorPolicy;
     private gatewayToolExecutor;
     private readonly tracePromptMs;
     private readonly dumpConductorPrompt;
@@ -42,7 +48,7 @@ export declare class AgentProcessManager extends EventEmitter {
     private mentionDelegationEnabled;
     /** Default options for all processes */
     private defaultOptions;
-    constructor(config: MultiAgentConfig, defaultOptions?: Partial<PersistentProcessOptions>, runtimeOptions?: MultiAgentRuntimeOptions);
+    constructor(config: MultiAgentConfig, defaultOptions?: Partial<PersistentProcessOptions>, runtimeOptions?: PrivateAwareMultiAgentRuntimeOptions);
     /**
      * Update configuration (for hot reload)
      */
@@ -61,6 +67,9 @@ export declare class AgentProcessManager extends EventEmitter {
      */
     setMentionDelegation(enabled: boolean): void;
     private isEphemeralAgent;
+    private personaCacheKey;
+    private personaCacheAgentId;
+    private clearAgentPersonaCache;
     private clearPersonaCache;
     /**
      * Build channel key for process pool
@@ -97,11 +106,12 @@ export declare class AgentProcessManager extends EventEmitter {
      * Codex runners are created here as standalone instances.
      */
     private createCodexRunner;
-    private createCodexCodeActRunner;
+    private createClineRunner;
+    private createManagedCodeActRunner;
     /**
      * Load persona system prompt for an agent
      */
-    loadPersona(agentId: string): Promise<string>;
+    loadPersona(agentId: string, resolvedModel?: string): Promise<string>;
     /**
      * Build system prompt with persona content
      */
@@ -114,7 +124,7 @@ export declare class AgentProcessManager extends EventEmitter {
     /**
      * Resolve the preferred model ID for a given backend from config.
      * Scans registered agents to find the first model matching the backend.
-     * Falls back to runtimeOptions.model for claude, 'unknown' otherwise.
+     * Falls back to the configured backend default when no registered agent provides one.
      */
     resolveModelForBackend(backend: string): string;
     /**

package/dist/multi-agent/agent-process-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-process-manager.d.ts","sourceRoot":"","sources":["../../src/multi-agent/agent-process-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-process-manager.d.ts","sourceRoot":"","sources":["../../src/multi-agent/agent-process-manager.ts"],"names":[],"mappings":"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"}

package/dist/multi-agent/agent-process-manager.js

@@ -42,12 +42,17 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgentProcessManager = void 0;
+exports.AgentProcessManager = exports.projectClineNativeTools = void 0;
 const promises_1 = require("fs/promises");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const agent_loop_js_1 = require("../agent/agent-loop.js");
-const tool_registry_js_1 = require("../agent/tool-registry.js");
+const cline_cli_adapter_js_1 = require("../agent/cline-cli-adapter.js");
+const cline_native_tool_policy_js_1 = require("../agent/cline-native-tool-policy.js");
+const backend_model_policy_js_1 = require("../agent/backend-model-policy.js");
+var cline_native_tool_policy_js_2 = require("../agent/cline-native-tool-policy.js");
+Object.defineProperty(exports, "projectClineNativeTools", { enumerable: true, get: function () { return cline_native_tool_policy_js_2.projectClineNativeTools; } });
+const gateway_tool_catalog_js_1 = require("../agent/gateway-tool-catalog.js");
 const skill_loader_js_1 = require("../agent/skill-loader.js");
 const os_1 = require("os");
 const events_1 = require("events");
@@ -58,9 +63,15 @@ const runtime_process_js_1 = require("./runtime-process.js");
 const bmad_templates_js_1 = require("./bmad-templates.js");
 const index_js_1 = require("../agent/code-act/index.js");
 const host_bridge_js_1 = require("../agent/code-act/host-bridge.js");
+const private_connector_policy_js_1 = require("../connectors/private-connector-policy.js");
+const DEFAULT_PRIVATE_CONNECTOR_POLICY = (0, private_connector_policy_js_1.resolvePrivateConnectorPolicy)({
+    ok: true,
+    config: {},
+    enabledNames: [],
+});
 const { DebugLogger } = debugLogger;
 const processManagerLogger = new DebugLogger('AgentProcessManager');
-class ManagedCodexCodeActProcess extends events_1.EventEmitter {
+class ManagedCodeActProcess extends events_1.EventEmitter {
     loop;
     sessionKey;
     source;
@@ -215,6 +226,7 @@ class AgentProcessManager extends events_1.EventEmitter {
     codexShutdowns = new Map();
     permissionManager;
     runtimeOptions;
+    privateConnectorPolicy;
     gatewayToolExecutor = null;
     tracePromptMs = globalThis.process.env.MAMA_CONDUCTOR_PROMPT_MS === '1';
     dumpConductorPrompt = globalThis.process.env.MAMA_DUMP_CONDUCTOR_PROMPT === '1';
@@ -231,6 +243,8 @@ class AgentProcessManager extends events_1.EventEmitter {
         this.config = config;
         this.defaultOptions = defaultOptions;
         this.runtimeOptions = runtimeOptions;
+        this.privateConnectorPolicy =
+            runtimeOptions.privateConnectorPolicy ?? DEFAULT_PRIVATE_CONNECTOR_POLICY;
         this.processPool = new persistent_cli_process_js_1.PersistentProcessPool(defaultOptions);
         this.permissionManager = new tool_permission_manager_js_1.ToolPermissionManager();
     }
@@ -263,7 +277,7 @@ class AgentProcessManager extends events_1.EventEmitter {
         const backend = agentConfig.backend ?? this.runtimeOptions.backend;
         if (!backend) {
             throw new Error(`No backend configured for agent${agentId ? ` '${agentId}'` : ''}. ` +
-                `Set 'backend' in agent config or global agent.backend. Valid: 'claude' | 'codex'`);
+                `Set 'backend' in agent config or global agent.backend. Valid: 'claude' | 'codex' | 'cline'`);
         }
         return backend;
     }
@@ -286,14 +300,27 @@ class AgentProcessManager extends events_1.EventEmitter {
     isEphemeralAgent(agentId) {
         return this.config.agents[agentId]?.persona_file === '';
     }
+    personaCacheKey(agentId, model) {
+        return `${this.privateConnectorPolicy.fingerprint}\u0000${agentId}\u0000${model ?? ''}`;
+    }
+    personaCacheAgentId(cacheKey) {
+        return cacheKey.split('\u0000')[1] ?? '';
+    }
+    clearAgentPersonaCache(agentId) {
+        for (const cacheKey of this.personaCache.keys()) {
+            if (this.personaCacheAgentId(cacheKey) === agentId) {
+                this.personaCache.delete(cacheKey);
+            }
+        }
+    }
     clearPersonaCache(preserveEphemeral = false) {
         if (!preserveEphemeral) {
             this.personaCache.clear();
             return;
         }
-        for (const agentId of this.personaCache.keys()) {
-            if (!this.isEphemeralAgent(agentId)) {
-                this.personaCache.delete(agentId);
+        for (const cacheKey of this.personaCache.keys()) {
+            if (!this.isEphemeralAgent(this.personaCacheAgentId(cacheKey))) {
+                this.personaCache.delete(cacheKey);
             }
         }
     }
@@ -326,10 +353,18 @@ class AgentProcessManager extends events_1.EventEmitter {
         const channelKey = this.buildChannelKey(source, channelId, agentId);
         const agentConfig = this.config.agents[agentId];
         const agentBackend = this.getAgentBackend(agentConfig, agentId);
-        if (agentBackend === 'codex' && agentConfig?.useCodeAct && !this.gatewayToolExecutor) {
-            throw new Error(`Managed Codex Code-Act agent "${agentId}" cannot start: shared GatewayToolExecutor is not wired`);
+        if ((agentBackend === 'codex' || agentBackend === 'cline') &&
+            agentConfig?.useCodeAct &&
+            !this.gatewayToolExecutor) {
+            throw new Error(`Managed ${agentBackend} Code-Act agent "${agentId}" cannot start: shared GatewayToolExecutor is not wired`);
         }
-        const systemPrompt = await this.loadPersona(agentId);
+        const model = (0, backend_model_policy_js_1.resolveBackendScopedModel)({
+            backend: agentBackend,
+            model: agentConfig?.model,
+            inheritedBackend: this.runtimeOptions.backend,
+            inheritedModel: this.runtimeOptions.model ?? this.defaultOptions.model,
+        });
+        const systemPrompt = await this.loadPersona(agentId, model);
         const tier = agentConfig?.tier ?? 1;
         const options = {
             ...this.defaultOptions,
@@ -339,9 +374,7 @@ class AgentProcessManager extends events_1.EventEmitter {
                 this.runtimeOptions.requestTimeout ??
                 900000,
         };
-        if (agentConfig?.model) {
-            options.model = agentConfig.model;
-        }
+        options.model = model;
         const effort = agentConfig?.effort || this.runtimeOptions.effort;
         if (effort) {
             options.effort = effort;
@@ -351,7 +384,7 @@ class AgentProcessManager extends events_1.EventEmitter {
         // natively from AgentLoop and must not also load the retired MCP wrapper.
         const mcpConfigPath = (0, path_1.resolve)((0, os_1.homedir)(), '.mama', 'mama-mcp-config.json');
         if ((0, fs_1.existsSync)(mcpConfigPath)) {
-            if (agentConfig?.useCodeAct && agentBackend !== 'codex') {
+            if (agentConfig?.useCodeAct && agentBackend === 'claude') {
                 // Claude Code-Act agents: only provide code-act MCP server
                 const codeActOnlyConfig = (0, path_1.resolve)((0, os_1.homedir)(), '.mama', `code-act-only-mcp-config-${safeConfigId(agentId)}.json`);
                 try {
@@ -376,7 +409,7 @@ class AgentProcessManager extends events_1.EventEmitter {
                     throw new Error(`Code-Act MCP config unavailable for agent "${agentId}" at ${mcpConfigPath}: ${message}`);
                 }
             }
-            else if (!agentConfig?.useCodeAct) {
+            else if (!agentConfig?.useCodeAct && agentBackend === 'claude') {
                 options.mcpConfigPath = mcpConfigPath;
             }
         }
@@ -395,6 +428,9 @@ class AgentProcessManager extends events_1.EventEmitter {
         if (!permissions.allowed.includes('*')) {
             options.allowedTools = permissions.allowed;
         }
+        else if (agentBackend === 'cline') {
+            options.allowedTools = ['*'];
+        }
         if (permissions.blocked.length > 0) {
             options.disallowedTools = permissions.blocked;
         }
@@ -406,12 +442,25 @@ class AgentProcessManager extends events_1.EventEmitter {
                 return existing;
             }
             const runner = agentConfig.useCodeAct
-                ? this.createCodexCodeActRunner(options, channelKey, source, channelId, agentId, agentConfig, this.gatewayToolExecutor)
+                ? this.createManagedCodeActRunner('codex', options, channelKey, source, channelId, agentId, agentConfig, this.gatewayToolExecutor)
                 : this.createCodexRunner(options, channelKey);
             this.codexProcessPool.set(channelKey, runner);
             this.emit('process-created', { agentId, process: runner });
             return runner;
         }
+        if (agentBackend === 'cline') {
+            await this.waitForCodexShutdown(channelKey);
+            const existing = this.codexProcessPool.get(channelKey);
+            if (existing) {
+                return existing;
+            }
+            const runner = agentConfig.useCodeAct
+                ? this.createManagedCodeActRunner('cline', options, channelKey, source, channelId, agentId, agentConfig, this.gatewayToolExecutor)
+                : this.createClineRunner(options, channelKey, agentConfig);
+            this.codexProcessPool.set(channelKey, runner);
+            this.emit('process-created', { agentId, process: runner });
+            return runner;
+        }
         // Claude backend
         const { process, created } = await this.processPool.getProcessWithStatus(channelKey, options);
         if (created) {
@@ -449,7 +498,27 @@ class AgentProcessManager extends events_1.EventEmitter {
             mcpConfigPath: options.mcpConfigPath,
         });
     }
-    createCodexCodeActRunner(options, sessionKey, source, channelId, agentId, agentConfig, executor) {
+    createClineRunner(options, sessionKey, agentConfig) {
+        const allowedTools = (0, cline_native_tool_policy_js_1.projectClineNativeTools)(options.allowedTools);
+        const disallowedTools = (0, cline_native_tool_policy_js_1.projectClineNativeTools)(options.disallowedTools);
+        const canDelegate = (agentConfig.tier ?? 1) === 1 && agentConfig.can_delegate === true;
+        return new cline_cli_adapter_js_1.ClineCLIAdapter({
+            command: this.runtimeOptions.clineCommand,
+            provider: this.runtimeOptions.clineProvider ?? 'cline',
+            model: options.model || this.runtimeOptions.model,
+            systemPrompt: options.systemPrompt,
+            cwd: this.runtimeOptions.clineCwd ? resolvePath(this.runtimeOptions.clineCwd) : process.cwd(),
+            dataDir: this.runtimeOptions.clineDataDir,
+            requestTimeout: options.requestTimeout,
+            env: options.env,
+            sessionId: sessionKey,
+            allowedTools,
+            disallowedTools,
+            allowSpawnAgent: canDelegate,
+            allowAgentTeams: canDelegate,
+        });
+    }
+    createManagedCodeActRunner(backend, options, sessionKey, source, channelId, agentId, agentConfig, executor) {
         const allowedTools = this.deriveCodeActAllowedTools(agentConfig) ?? ['*'];
         const blockedTools = codeActBlockedTools(agentConfig) ?? [];
         const outerAllowedTools = [
@@ -485,10 +554,11 @@ class AgentProcessManager extends events_1.EventEmitter {
             capabilities,
             limitations: blockedTools.map((tool) => `Cannot use ${tool}`),
             tier: agentConfig.tier ?? 1,
-            backend: 'codex',
+            backend,
         };
+        const canDelegate = (agentConfig.tier ?? 1) === 1 && agentConfig.can_delegate === true;
         const loop = new agent_loop_js_1.AgentLoop(null, {
-            backend: 'codex',
+            backend,
             model: options.model ?? this.runtimeOptions.model,
             systemPrompt: options.systemPrompt,
             maxTurns: agentConfig.max_turns,
@@ -498,6 +568,20 @@ class AgentProcessManager extends events_1.EventEmitter {
             agentContext,
             toolsConfig: { gateway: ['*'], mcp: [] },
             executor,
+            ...(backend === 'cline'
+                ? {
+                    clineCwd: this.runtimeOptions.clineCwd
+                        ? resolvePath(this.runtimeOptions.clineCwd)
+                        : undefined,
+                    clineCommand: this.runtimeOptions.clineCommand,
+                    clineProvider: this.runtimeOptions.clineProvider,
+                    clineDataDir: this.runtimeOptions.clineDataDir,
+                    clineNativeAllowedTools: (0, cline_native_tool_policy_js_1.projectClineNativeTools)(options.allowedTools),
+                    clineNativeDisallowedTools: (0, cline_native_tool_policy_js_1.projectClineNativeTools)(options.disallowedTools),
+                    clineAllowSpawnAgent: canDelegate,
+                    clineAllowAgentTeams: canDelegate,
+                }
+                : {}),
             codexCwd: this.runtimeOptions.codexCwd
                 ? resolvePath(this.runtimeOptions.codexCwd)
                 : undefined,
@@ -507,20 +591,21 @@ class AgentProcessManager extends events_1.EventEmitter {
             codexIsolatedHome: this.runtimeOptions.codexIsolatedHome,
             codexRegistryRoot: this.runtimeOptions.codexRegistryRoot,
         });
-        return new ManagedCodexCodeActProcess(loop, sessionKey, source, channelId, agentContext, options.model ?? this.runtimeOptions.model);
+        return new ManagedCodeActProcess(loop, sessionKey, source, channelId, agentContext, options.model ?? this.runtimeOptions.model);
     }
     /**
      * Load persona system prompt for an agent
      */
-    async loadPersona(agentId) {
+    async loadPersona(agentId, resolvedModel) {
         const shouldTrace = this.shouldTracePrompt(agentId);
         const traceCacheKey = agentId.toLowerCase() === 'conductor' ? 'conductor' : agentId;
         // Check if a skill rules file exists for this agent (allows hot-reload)
         const skillPath = (0, path_1.resolve)((0, os_1.homedir)(), '.mama', 'skills', `${agentId}-rules.md`);
         const hasSkillFile = (0, fs_1.existsSync)(skillPath);
         // Check cache first — skip cache if skill file exists to allow hot-reload
-        if (this.personaCache.has(agentId) && !hasSkillFile) {
-            const cachedPrompt = this.personaCache.get(agentId);
+        const cacheKey = this.personaCacheKey(agentId, resolvedModel);
+        if (this.personaCache.has(cacheKey) && !hasSkillFile) {
+            const cachedPrompt = this.personaCache.get(cacheKey);
             if (shouldTrace) {
                 processManagerLogger.debug(`[Conductor] system prompt cache HIT | key=${traceCacheKey} len=${cachedPrompt.length}`);
             }
@@ -537,7 +622,7 @@ class AgentProcessManager extends events_1.EventEmitter {
             console.warn(`[AgentProcessManager] Persona file not found: ${personaPath}`);
             // Return default persona
             const defaultPersona = this.buildDefaultPersona(agentId, agentConfig);
-            this.personaCache.set(agentId, defaultPersona);
+            this.personaCache.set(cacheKey, defaultPersona);
             if (shouldTrace) {
                 processManagerLogger.warn(`[Conductor] persona file missing (${traceCacheKey}), using default in ${Date.now() - loadStart}ms`);
             }
@@ -551,7 +636,7 @@ class AgentProcessManager extends events_1.EventEmitter {
                 processManagerLogger.debug(`[Conductor] persona read complete key=${traceCacheKey} path=${personaPath} read_ms=${readDuration} bytes=${personaContent.length}`);
             }
             const buildStart = Date.now();
-            let systemPrompt = await this.buildSystemPrompt(agentId, agentConfig, personaContent);
+            let systemPrompt = await this.buildSystemPrompt(agentId, agentConfig, personaContent, resolvedModel);
             if (shouldTrace) {
                 processManagerLogger.debug(`[Conductor] system prompt built key=${traceCacheKey} build_ms=${Date.now() - buildStart} total_ms=${Date.now() - loadStart} len=${systemPrompt.length}`);
             }
@@ -570,7 +655,7 @@ class AgentProcessManager extends events_1.EventEmitter {
                     // Non-fatal: skill file read error
                 }
             }
-            this.personaCache.set(agentId, systemPrompt);
+            this.personaCache.set(cacheKey, systemPrompt);
             if (shouldTrace && this.dumpConductorPrompt) {
                 processManagerLogger.debug(`[Conductor] system prompt content:\n${systemPrompt}`);
             }
@@ -585,7 +670,7 @@ class AgentProcessManager extends events_1.EventEmitter {
     /**
      * Build system prompt with persona content
      */
-    async buildSystemPrompt(agentId, agentConfig, personaContent) {
+    async buildSystemPrompt(agentId, agentConfig, personaContent, resolvedModel) {
         const agent = { id: agentId, ...agentConfig };
         const buildStart = Date.now();
         // Replace @mentions in persona with platform-specific <@userId>
@@ -611,7 +696,7 @@ class AgentProcessManager extends events_1.EventEmitter {
             }
         }
         // Replace model placeholders with actual config values
-        const actualModel = agentConfig.model || this.runtimeOptions.model;
+        const actualModel = resolvedModel || agentConfig.model || this.runtimeOptions.model;
         if (!actualModel) {
             throw new Error(`No model configured for agent '${agentId}'. ` +
                 `Set 'model' in agent config or global agent.model`);
@@ -681,28 +766,34 @@ ${skillsPrompt}## Guidelines
     }
     buildToolsSection(agentConfig) {
         const tier = agentConfig.tier ?? 1;
+        const allowedTools = agentConfig.useCodeAct
+            ? (this.deriveCodeActAllowedTools(agentConfig) ?? ['*'])
+            : (agentConfig.tool_permissions?.allowed ?? ['*']);
+        const blockedTools = agentConfig.useCodeAct
+            ? codeActBlockedTools(agentConfig)
+            : agentConfig.tool_permissions?.blocked;
+        const catalog = (0, gateway_tool_catalog_js_1.buildGatewayToolCatalog)({
+            surface: 'multi-agent-generic',
+            allowedTools,
+            blockedTools,
+            privateConnectorPolicy: this.privateConnectorPolicy,
+        });
         // Code-Act mode: replace tool_call instructions with Code-Act JS execution
         if (agentConfig.useCodeAct && tier !== 3) {
-            const allowedTools = this.deriveCodeActAllowedTools(agentConfig);
             const policy = (0, index_js_1.projectCodeActToolPolicy)({
                 tier: tier,
-                role: { allowedTools },
+                role: { allowedTools: [...catalog.toolNames], blockedTools: [] },
             });
             const typeDefs = index_js_1.TypeDefinitionGenerator.generate(policy);
             const backend = agentConfig.backend ?? this.runtimeOptions.backend ?? 'claude';
-            const codeActBackend = backend === 'codex' ? 'codex' : 'claude';
+            const codeActBackend = backend;
             return ((0, index_js_1.getCodeActInstructions)(codeActBackend, policy.names) +
                 '\n```typescript\n' +
                 typeDefs +
                 '\n```\n');
         }
         // Per-agent tool filtering via ToolRegistry (STORY-018)
-        const allowedTools = agentConfig.tool_permissions?.allowed;
-        if (allowedTools && !allowedTools.includes('*')) {
-            return tool_registry_js_1.ToolRegistry.generatePrompt(allowedTools);
-        }
-        // Default: full gateway tools from gateway-tools.md
-        return (0, agent_loop_js_1.getGatewayToolsPrompt)();
+        return catalog.prompt;
     }
     deriveCodeActAllowedTools(agentConfig) {
         const explicitGatewayAllowed = agentConfig.gateway_tool_permissions?.allowed;
@@ -726,10 +817,16 @@ ${skillsPrompt}## Guidelines
         return undefined;
     }
     filterCodeActAllowedTools(allowedTools, blockedTools) {
+        const catalog = (0, gateway_tool_catalog_js_1.buildGatewayToolCatalog)({
+            surface: 'multi-agent-generic',
+            allowedTools,
+            blockedTools,
+            privateConnectorPolicy: this.privateConnectorPolicy,
+        });
         return [
             ...(0, index_js_1.projectCodeActToolPolicy)({
                 tier: 1,
-                role: { allowedTools, blockedTools },
+                role: { allowedTools: [...catalog.toolNames], blockedTools: [] },
             }).names,
         ];
     }
@@ -764,7 +861,7 @@ ${skillsPrompt}## Guidelines
     /**
      * Resolve the preferred model ID for a given backend from config.
      * Scans registered agents to find the first model matching the backend.
-     * Falls back to runtimeOptions.model for claude, 'unknown' otherwise.
+     * Falls back to the configured backend default when no registered agent provides one.
      */
     resolveModelForBackend(backend) {
         for (const [, cfg] of Object.entries(this.config.agents)) {
@@ -773,13 +870,13 @@ ${skillsPrompt}## Guidelines
                 return cfg.model;
             }
         }
-        if (backend === 'claude') {
-            if (!this.runtimeOptions.model) {
-                throw new Error(`No model configured for claude backend. Set agent.model in config.yaml`);
-            }
+        if (backend === this.runtimeOptions.backend && this.runtimeOptions.model) {
             return this.runtimeOptions.model;
         }
-        return 'unknown';
+        if (backend === 'claude' || backend === 'codex' || backend === 'cline') {
+            return (0, backend_model_policy_js_1.defaultModelForBackend)(backend);
+        }
+        throw new Error(`Unsupported backend: ${backend}`);
     }
     /**
      * Build installed skills prompt section
@@ -982,7 +1079,7 @@ Respond to messages in a helpful and professional manner.
         this.config.agents[agentDef.id] = agentConfig;
         // Build full system prompt (with gateway tools, permissions, etc.)
         const fullPrompt = await this.buildSystemPrompt(agentDef.id, agentConfig, agentDef.system_prompt);
-        this.personaCache.set(agentDef.id, fullPrompt);
+        this.personaCache.set(this.personaCacheKey(agentDef.id, agentDef.model), fullPrompt);
     }
     /**
      * Unregister ephemeral agents and clean up their processes.
@@ -990,7 +1087,7 @@ Respond to messages in a helpful and professional manner.
     unregisterEphemeralAgents(agentDefs) {
         for (const { id: agentId } of agentDefs) {
             this.stopAgentProcesses(agentId);
-            this.personaCache.delete(agentId);
+            this.clearAgentPersonaCache(agentId);
             delete this.config.agents[agentId];
         }
     }
@@ -998,7 +1095,7 @@ Respond to messages in a helpful and professional manner.
      * Reload persona for an agent (clears cache)
      */
     reloadPersona(agentId) {
-        this.personaCache.delete(agentId);
+        this.clearAgentPersonaCache(agentId);
         // Stop all processes for this agent to force reload
         this.stopAgentProcesses(agentId);
     }