agent-rev 0.5.14 → 0.5.24

package/dist/commands/repl.d.ts

@@ -1,4 +1,3 @@
-import * as readline from 'readline';
 import { CliInfo } from '../types.js';
 import { Session } from '../utils/sessions.js';
 /**
@@ -17,7 +16,6 @@ export declare function initCoordinator(): Promise<{
         info: CliInfo;
         path: string;
     }>;
-    rl: readline.Interface;
 } | null>;
 /** REPL mode — interactive loop */
 export declare function runRepl(resumeSession?: Session): Promise<void>;

package/dist/commands/repl.js

@@ -10,7 +10,7 @@ import { writeJson, ensureDir, readJson, listDir, fileExists } from '../utils/fs
 import { loadAuth, saveAuth, loadCliConfig, saveCliConfig, loadProjectConfig, resolveProjectDir } from '../utils/config.js';
 import { log } from '../utils/logger.js';
 import { AgentEngine, ExitError } from '../core/engine.js';
-import { qwenLogin, qwenAuthStatus, QWEN_AGENT_HOME, fetchQwenModels } from '../utils/qwen-auth.js';
+import { qwenAuthStatus, QWEN_AGENT_HOME, fetchQwenModels, loadApiKeyConfig, saveApiKeyConfig, fetchApiKeyModels, DEFAULT_API_BASE_URL } from '../utils/qwen-auth.js';
 import { renderWelcomePanel, renderHelpHint, renderSectionBox, renderMultiSectionBox } from '../ui/theme.js';
 import { FixedInput } from '../ui/input.js';
 import { newSession, saveSession } from '../utils/sessions.js';
@@ -256,55 +256,52 @@ function buildCmd(cliName, model) {
     const promptFlag = info.promptFlag ? ` ${info.promptFlag}` : '';
     return `${info.command} ${info.modelFlag} ${model}${extra}${promptFlag}`.trim();
 }
-async function cmdLogin(rl) {
-    console.log(chalk.bold.cyan('\n  Login\n'));
-    // If active provider is Qwen, use built-in OAuth device flow (no qwen CLI needed)
-    const auth = await loadAuth();
-    if (auth.activeProvider === 'qwen') {
-        console.log(chalk.dim(`  Credentials will be saved to: ${QWEN_AGENT_HOME}/\n`));
-        try {
-            const success = await qwenLogin();
-            if (!success)
-                return false;
-            const emailInput = await ask(rl, '  Your email (optional, for display): ');
-            auth.entries = auth.entries.filter((e) => e.provider !== 'qwen');
-            auth.entries.push({ provider: 'qwen', method: 'oauth', ...(emailInput.trim() ? { email: emailInput.trim() } : {}) });
-            await saveAuth(auth);
-            return true;
-        }
-        catch (err) {
-            console.log(chalk.red('  Login failed: ' + err.message));
-            return false;
-        }
-    }
-    // For other providers, use their CLI
-    console.log(chalk.dim('  Available providers:'));
-    for (const [id, cmd] of Object.entries(CLI_AUTH_COMMANDS)) {
-        const installed = isCliInstalled(id) ? chalk.green('✓') : chalk.red('✗');
-        console.log(chalk.dim(`    ${installed} ${id} - uses: ${cmd}`));
+async function promptApiKeySetup(rl, askFn) {
+    const existing = await loadApiKeyConfig();
+    if (existing) {
+        console.log(chalk.dim(`  Current: ${existing.provider} / ${existing.model}`));
     }
-    const provider = await ask(rl, '\n  Provider: ');
-    const authCmd = CLI_AUTH_COMMANDS[provider.trim()];
-    if (!authCmd) {
-        console.log(chalk.red(`  No auth command for: ${provider}`));
+    const apiKey = await askFn(`  API Key${existing ? ' [Enter to keep]' : ''}: `);
+    const resolvedKey = apiKey.trim() || existing?.api_key || '';
+    if (!resolvedKey) {
+        console.log(chalk.red('  API key is required.'));
         return false;
     }
-    console.log(chalk.blue(`  Running: ${authCmd}`));
-    console.log(chalk.dim('  (This will open your browser for login)\n'));
-    try {
-        execSync(authCmd, { stdio: 'inherit' });
-        const auth = await loadAuth();
-        auth.entries = auth.entries.filter((e) => e.provider !== provider.trim());
-        auth.entries.push({ provider: provider.trim(), method: 'oauth' });
-        auth.activeProvider = provider.trim();
-        await saveAuth(auth);
-        console.log(chalk.green(`  Auth recorded for ${provider}`));
-        return true;
+    console.log(chalk.dim('\n  Fetching available models...'));
+    const tempCfg = { provider: 'openai-compatible', api_key: resolvedKey, base_url: DEFAULT_API_BASE_URL, model: '' };
+    const models = await fetchApiKeyModels(tempCfg);
+    let chosenModel = existing?.model ?? 'qwen-plus';
+    if (models.length > 0) {
+        console.log(chalk.bold('\n  Available models:'));
+        models.forEach((m, i) => console.log(chalk.dim(`    ${i + 1}. ${m}`)));
+        const pick = await askFn(`\n  Model [${chosenModel}]: `);
+        const num = parseInt(pick.trim());
+        if (!isNaN(num) && num >= 1 && num <= models.length) {
+            chosenModel = models[num - 1];
+        }
+        else if (pick.trim()) {
+            chosenModel = pick.trim();
+        }
     }
-    catch {
-        console.log(chalk.red('  Login failed.'));
-        return false;
+    else {
+        console.log(chalk.yellow('  Could not fetch models — enter model name manually.'));
+        const pick = await askFn(`  Model [${chosenModel}]: `);
+        if (pick.trim())
+            chosenModel = pick.trim();
     }
+    const cfg = {
+        provider: existing?.provider ?? 'openai-compatible',
+        api_key: resolvedKey,
+        base_url: DEFAULT_API_BASE_URL,
+        model: chosenModel,
+    };
+    await saveApiKeyConfig(cfg);
+    console.log(chalk.green(`\n  ✓ API key saved — ${cfg.model}\n`));
+    return true;
+}
+async function cmdLogin(rl) {
+    console.log(chalk.bold.cyan('\n  Configure API Key\n'));
+    return promptApiKeySetup(rl, (q) => ask(rl, q));
 }
 async function cmdSetup(rl) {
     console.log(chalk.bold.cyan('\n  Setup Wizard\n'));
@@ -405,12 +402,15 @@ async function cmdSetup(rl) {
     await writeJson(path.join(projectDir, '.agent', 'config.json'), agentConfig);
     console.log(chalk.green('  .agent/config.json generated'));
     const templates = {
-        '.agent/INDEX.md': `# ${projectName} - Agent Entry Point\n\n## Navegacion por rol\n| Si sos... | Lee primero... |\n|-----------|----------------|\n| ORCHESTRATOR | .agent/rules/workflow.md |\n| IMPLEMENTOR | .agent/tasks/{ID}/plan.json |\n| REVIEWER | .agent/rules/workflow.md |\n`,
-        '.agent/rules/workflow.md': '# Agent Workflow Contract\n\n## REGLA #1 - Separacion de roles\nUn rol NUNCA ejecuta acciones de otro rol.\n\n## Roles\n- ORCHESTRATOR: planifica\n- IMPLEMENTOR: ejecuta\n- REVIEWER: valida\n',
-        '.agent/rules/structure.md': '# Estructura\n\n## Aprobados\n.\n\n## Prohibidos\nnode_modules, dist, .git\n',
-        '.agent/rules/patterns.md': '# Patrones\n\n- kebab-case: archivos\n- PascalCase: clases\n- camelCase: variables\n',
-        '.agent/context/architecture.md': '# Arquitectura - NIVEL 0\n\n| Servicio | Stack | Puerto | Detalle |\n|----------|-------|--------|---------|\n| - | - | - | - |\n',
-        '.agent/AGENT.md': '# Sub-Agentes\n\n1. Lee .agent/INDEX.md\n2. Lee .agent/rules/workflow.md\n3. Actua SOLO dentro de tu rol\n',
+        '.agent/INDEX.md': `# ${projectName} — Agent Entry Point\n\n> Leé este archivo antes de cualquier accion.\n\n## Proyecto\n${projectName}\n\n## Navegacion por rol\n| Si sos... | Lee primero... | Luego... |\n|-----------|----------------|----------|\n| ORCHESTRATOR | .agent/rules/workflow.md | .agent/rules/orchestrator.md |\n| IMPLEMENTOR | .agent/rules/implementor.md | .agent/tasks/{ID}/plan.json |\n| REVIEWER | .agent/rules/reviewer.md | .agent/rules/workflow.md |\n\n## Contexto del proyecto\n- Arquitectura: .agent/context/architecture.md\n- Stack: ver .agent/config.json\n`,
+        '.agent/rules/workflow.md': `# Workflow Contract — ${projectName}\n\n## Flujo general\n\`\`\`\n[ORCHESTRATOR] planifica → genera plan.json\n       ↓\n[IMPLEMENTOR] ejecuta el plan → modifica archivos\n       ↓\n[REVIEWER] valida → genera result.md\n\`\`\`\n\n## REGLA #1 — Separacion de roles\nCada CLI opera SOLO en su rol. Nunca ejecuta acciones de otro rol.\n\n## REGLA #2 — Orden estricto\nOrchestrator siempre primero. Implementor no actua sin plan. Reviewer no actua sin implementacion.\n\n## REGLA #3 — Sin inventar\nCada rol trabaja con los archivos reales del proyecto. No asume ni infiere sin leer.\n`,
+        '.agent/rules/orchestrator.md': `# Rol: ORCHESTRATOR — ${projectName}\n\n## Responsabilidad\nAnalizar el requerimiento, leer el contexto del proyecto y generar un plan de tareas claro y ejecutable.\n\n## Antes de planificar\n1. Leer .agent/context/architecture.md para entender los componentes\n2. Leer .agent/rules/structure.md para saber qué dirs son validos\n3. Leer .agent/rules/patterns.md para respetar convenciones del proyecto\n\n## Al generar el plan\n- Dividir el trabajo en pasos atomicos (1 paso = 1 cambio verificable)\n- Especificar rutas de archivos REALES (no genericas)\n- Indicar dependencias entre pasos si las hay\n\n## Prohibido\n- Modificar archivos de codigo directamente\n- Ejecutar comandos de build o test\n`,
+        '.agent/rules/implementor.md': `# Rol: IMPLEMENTOR — ${projectName}\n\n## Responsabilidad\nEjecutar el plan generado por el Orchestrator. Modificar archivos de codigo siguiendo las instrucciones exactas del plan.\n\n## Antes de implementar\n1. Leer .agent/tasks/{ID}/plan.json completo\n2. Leer .agent/rules/structure.md — no crear archivos en dirs prohibidos\n3. Leer .agent/rules/patterns.md — respetar convenciones\n\n## Al implementar\n- Seguir el plan paso a paso, en orden\n- No agregar cambios fuera del scope del plan\n- Marcar cada paso como completado al terminarlo\n\n## Prohibido\n- Modificar el plan\n- Hacer refactors no solicitados\n`,
+        '.agent/rules/reviewer.md': `# Rol: REVIEWER — ${projectName}\n\n## Responsabilidad\nValidar que la implementacion cumple el plan y respeta las reglas del proyecto.\n\n## Checklist de revision\n- [ ] Cada paso del plan fue implementado\n- [ ] No se modificaron archivos fuera del scope\n- [ ] Se respetan las convenciones de .agent/rules/patterns.md\n- [ ] La estructura cumple .agent/rules/structure.md\n- [ ] No hay codigo muerto ni imports sin usar\n\n## Al generar result.md\n- Indicar cada item como OK / FAIL / SKIP con razon\n- Si hay FAILs: describir exactamente que falta y en que archivo\n\n## Prohibido\n- Modificar archivos de codigo directamente\n- Aprobar implementaciones incompletas\n`,
+        '.agent/rules/structure.md': `# Estructura del proyecto — ${projectName}\n\n## Directorios aprobados\n- . (raiz del proyecto)\n\n## Directorios prohibidos\n- node_modules/\n- dist/\n- .git/\n- build/\n- target/\n- __pycache__/\n`,
+        '.agent/rules/patterns.md': `# Patrones y convenciones — ${projectName}\n\n## Nombrado\n- Archivos: kebab-case\n- Clases: PascalCase\n- Variables y funciones: camelCase\n- Constantes: UPPER_SNAKE_CASE\n\n## Reglas generales\n- No dejar console.log de debug en codigo productivo\n- Un archivo = una responsabilidad principal\n`,
+        '.agent/context/architecture.md': '# Arquitectura — NIVEL 0\n\n> Ejecuta `agent-mp explorer` para generar documentacion automatica.\n\n| Componente | Stack | Puerto | Proposito |\n|------------|-------|--------|-----------|\n| - | - | - | - |\n',
+        '.agent/AGENT.md': `# Instrucciones para Sub-Agentes — ${projectName}\n\n## Paso 1: Identificar tu rol\nLee .agent/INDEX.md para saber que archivo leer segun tu rol.\n\n## Paso 2: Leer el contexto\nAntes de cualquier accion, lee .agent/context/architecture.md.\n\n## Paso 3: Actua SOLO dentro de tu rol\nVer .agent/rules/workflow.md para las reglas de separacion de roles.\n`,
     };
     for (const [fp, content] of Object.entries(templates)) {
         await fs.mkdir(path.join(projectDir, path.dirname(fp)), { recursive: true });
@@ -751,7 +751,7 @@ function cmdHelp(fi) {
         { key: '/explorer [task]', value: 'Run explorer (shortcut)' },
         { key: '/models', value: 'List models for all installed CLIs' },
         { key: '/models <cli>', value: 'List models for a specific CLI' },
-        { key: '/login', value: 'Login (Qwen OAuth or CLI auth)' },
+        { key: '/login', value: 'Configure API key' },
         { key: '/logout', value: 'Logout and clear credentials' },
         { key: '/auth-status', value: 'Show authentication status' },
         { key: '/usage', value: 'Check quota status for all role CLIs' },
@@ -795,112 +795,59 @@ export async function initCoordinator() {
         input: process.stdin,
         output: process.stdout,
     });
-    // Step 1: Detect installed CLIs
-    const installed = detectInstalledClis();
-    if (installed.length === 0) {
-        console.log(chalk.red('  No CLIs detected. Install at least one: qwen, claude, gemini, codex'));
-        rl.close();
-        return null;
-    }
-    // Step 2: Pick coordinator
-    const auth = await loadAuth();
-    const currentAuth = auth.activeProvider;
-    let activeCli = installed.find((c) => c.name === currentAuth);
-    // Check if corporate credentials exist for qwen
-    const hasCorporateCreds = (() => {
-        if (currentAuth === 'qwen') {
-            const corporateCreds = path.join(QWEN_AGENT_HOME, 'oauth_creds.json');
-            try {
-                const stats = fsSync.statSync(corporateCreds);
-                return stats.isFile();
-            }
-            catch {
-                return false;
-            }
-        }
-        return true;
-    })();
-    // If no active provider OR no corporate credentials, show selector
-    if (!activeCli || !hasCorporateCreds) {
-        // No coordinator configured - show selector
-        const qwenInstalled = installed.find((c) => c.name === 'qwen');
-        if (!qwenInstalled) {
-            console.log(chalk.red('  Qwen CLI not found. Install with: npm install -g @qwen-code/qwen-code'));
-            rl.close();
+    try {
+        // Step 1: Detect installed CLIs
+        const installed = detectInstalledClis();
+        if (installed.length === 0) {
+            console.log(chalk.red('  No CLIs detected. Install at least one: qwen, claude, gemini, codex'));
             return null;
         }
-        // Show selector (even if only one option)
-        const selectedName = await selectOption(rl, 'Select AI service for coordinator:', ['qwen']);
-        activeCli = qwenInstalled;
-        auth.activeProvider = 'qwen';
-        auth.entries = auth.entries.filter((e) => e.provider !== 'qwen');
-        auth.entries.push({ provider: 'qwen', method: 'oauth' });
-        await saveAuth(auth);
-    }
-    // If activeCli is already set, skip selection and use existing coordinator
-    console.log(chalk.dim(`\n  Checking ${activeCli.name} auth...`));
-    let authResult = await checkCliAuth(activeCli.name);
-    if (!authResult.ok) {
-        console.log(chalk.yellow(`  ${activeCli.name} session not found.`));
-        console.log(chalk.blue(`  Opening browser for ${activeCli.name} login...`));
-        console.log(chalk.dim('  (Use your corporate account)\n'));
-        const authCmd = CLI_AUTH_COMMANDS[activeCli.name];
-        if (authCmd) {
-            try {
-                // For qwen, do corporate login flow
-                if (activeCli.name === 'qwen') {
-                    const personalCreds = path.join(os.homedir(), '.qwen', 'oauth_creds.json');
-                    const corporateCreds = path.join(QWEN_AGENT_HOME, 'oauth_creds.json');
-                    let personalBackup = null;
-                    if (await fileExists(personalCreds)) {
-                        personalBackup = await fs.readFile(personalCreds, 'utf-8');
-                        await fs.unlink(personalCreds);
-                    }
-                    await fs.unlink(corporateCreds).catch(() => { });
-                    execSync('qwen auth qwen-oauth', { stdio: 'inherit' });
-                    if (await fileExists(personalCreds)) {
-                        const newCreds = await fs.readFile(personalCreds, 'utf-8');
-                        await fs.writeFile(corporateCreds, newCreds);
-                    }
-                    if (personalBackup) {
-                        await fs.writeFile(personalCreds, personalBackup);
-                    }
-                    authResult = await checkCliAuth(activeCli.name);
-                }
-                else {
-                    execSync(authCmd, { stdio: 'inherit' });
-                    authResult = await checkCliAuth(activeCli.name);
-                }
-                if (authResult.ok) {
-                    console.log(chalk.green(`  ${activeCli.name} authenticated successfully\n`));
-                }
-                else {
-                    console.log(chalk.red(`  ${activeCli.name} auth failed. Try /login.\n`));
-                }
-            }
-            catch {
-                console.log(chalk.yellow(`  Login interrupted. Type /login to retry.\n`));
-            }
+        // Step 2: Pick coordinator
+        const auth = await loadAuth();
+        const currentAuth = auth.activeProvider;
+        let activeCli = installed.find((c) => c.name === currentAuth);
+        // Fast-path: API key configured
+        const apiKeyCfg = await loadApiKeyConfig();
+        if (apiKeyCfg?.api_key) {
+            const cliCfg = await loadCliConfig();
+            const model = cliCfg.coordinatorModel || apiKeyCfg.model;
+            gCoordinatorCmd = `qwen-direct -m ${model}`;
+            console.log(chalk.green(`  ✓ Auth: ${apiKeyCfg.provider} / ${model}\n`));
+            const syntheticCli = {
+                name: apiKeyCfg.provider,
+                info: { command: 'qwen-direct', modelFlag: '-m', promptFlag: '-p', description: 'API key' },
+                path: 'qwen-direct',
+            };
+            return { activeCli: syntheticCli, installed, coordinatorCmd: gCoordinatorCmd };
         }
+        // No API key — prompt to configure one
+        console.log(chalk.yellow('\n  No auth configured.'));
+        console.log(chalk.dim('  Configure an API key to continue.\n'));
+        const doSetup = await new Promise((resolve) => {
+            rl.question('  Set up API key now? (y/N): ', (a) => resolve(a.trim().toLowerCase() === 'y'));
+        });
+        if (doSetup) {
+            const askFn = (q) => new Promise((resolve) => rl.question(q, resolve));
+            const ok = await promptApiKeySetup(rl, askFn);
+            if (!ok)
+                return null;
+            const saved = await loadApiKeyConfig();
+            if (!saved)
+                return null;
+            gCoordinatorCmd = `qwen-direct -m ${saved.model}`;
+            const syntheticCli = {
+                name: saved.provider,
+                info: { command: 'qwen-direct', modelFlag: '-m', promptFlag: '-p', description: 'API key' },
+                path: 'qwen-direct',
+            };
+            return { coordinatorCmd: gCoordinatorCmd, activeCli: syntheticCli, installed };
+        }
+        console.log(chalk.dim('  Run: agent-mp setup api-key'));
+        return null;
     }
-    else {
-        const emailStr = authResult.email ? chalk.dim(` (${authResult.email})`) : '';
-        console.log(chalk.green(`  ${activeCli.name} session active${emailStr}\n`));
-    }
-    // Save email to auth store if we have it
-    if (authResult.email) {
-        const auth2 = await loadAuth();
-        const entry = auth2.entries.find((e) => e.provider === activeCli.name);
-        if (entry)
-            entry.email = authResult.email;
-        await saveAuth(auth2);
+    finally {
+        rl.close();
     }
-    // Build coordinator command using the ACTIVE CLI (not orchestrator)
-    // The coordinator converses naturally using whatever CLI is active (qwen, claude, etc.)
-    const cliCfg = await loadCliConfig();
-    const activeModel = cliCfg.coordinatorModel || detectModels(activeCli.name)[0] || 'default';
-    gCoordinatorCmd = buildCmd(activeCli.name, activeModel);
-    return { coordinatorCmd: gCoordinatorCmd, activeCli, installed, rl };
 }
 /** REPL mode — interactive loop */
 export async function runRepl(resumeSession) {
@@ -908,7 +855,6 @@ export async function runRepl(resumeSession) {
     if (!init)
         return;
     const { activeCli } = init;
-    const rl = init.rl;
     const session = resumeSession ?? newSession(process.cwd());
     // Resolve actual project root (may be deeper than cwd)
     const projectDir = await resolveProjectDir(process.cwd());
@@ -931,10 +877,48 @@ export async function runRepl(resumeSession) {
         }
     }
     catch { }
+    // Fixed-bottom input — owns the last terminal rows
+    const fi = new FixedInput();
+    fi.setup();
+    // Helper: run a wizard command that needs readline (suspends fixed input)
+    const withRl = async (fn) => {
+        const resume = fi.suspend();
+        const tempRl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout,
+        });
+        try {
+            await fn(tempRl);
+        }
+        finally {
+            tempRl.close();
+            resume();
+        }
+    };
+    // Helper to create engine with readline (suspends fixed input)
+    const withEngine = async (fn) => {
+        const resume = fi.suspend();
+        const tempRl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout,
+        });
+        try {
+            const dir = await resolveProjectDir(process.cwd());
+            const config = await loadProjectConfig(dir);
+            const engine = new AgentEngine(config, dir, gCoordinatorCmd, tempRl, fi, handleCmd);
+            return await fn(engine);
+        }
+        finally {
+            tempRl.close();
+            resume();
+        }
+    };
     if (!hasRoles) {
         console.log(chalk.yellow('\n  Todos los roles deben estar configurados antes de trabajar.'));
         console.log(chalk.yellow('  Configurando roles ahora...\n'));
-        await cmdConfigMulti(rl);
+        await withRl(async (tempRl) => {
+            await cmdConfigMulti(tempRl);
+        });
         // Re-check
         try {
             const config = await loadProjectConfig(process.cwd());
@@ -952,7 +936,6 @@ export async function runRepl(resumeSession) {
         catch { }
         if (!hasRoles) {
             console.log(chalk.red('\n  Error: roles no configurados. Saliendo.'));
-            rl.close();
             return;
         }
     }
@@ -984,9 +967,6 @@ export async function runRepl(resumeSession) {
         }
     }
     catch { }
-    // Fixed-bottom input — owns the last 3 terminal rows permanently
-    const fi = new FixedInput();
-    fi.setup();
     // If resuming, print past conversation history
     if (resumeSession && resumeSession.messages.length > 0) {
         const date = new Date(resumeSession.createdAt).toLocaleString();
@@ -1006,16 +986,6 @@ export async function runRepl(resumeSession) {
         fi.println(chalk.dim('  ─── Continue below ───'));
         fi.println('');
     }
-    // Helper: run a wizard command that needs readline (suspends fixed input)
-    const withRl = async (fn) => {
-        const resume = fi.suspend();
-        try {
-            await fn(rl);
-        }
-        finally {
-            resume();
-        }
-    };
     // Command handler — used by the main loop AND by the engine during mid-conversation
     const handleCmd = async (trimmed) => {
         const parts = trimmed.slice(1).split(/\s+/);
@@ -1043,58 +1013,53 @@ export async function runRepl(resumeSession) {
                 await cmdStatus(fi);
                 break;
             case 'run': {
-                const dir = await resolveProjectDir(process.cwd());
-                const config = await loadProjectConfig(dir);
-                if (args[0] === 'orch' || args[0] === 'orchestrator') {
-                    // Ensure documentation exists before orchestrator runs
-                    const contextDir = path.join(dir, '.agent', 'context');
-                    const archPath = path.join(contextDir, 'architecture.md');
-                    if (!(await fileExists(archPath))) {
-                        fi.println(chalk.yellow('\n  ── Generando documentación del proyecto ──'));
-                        fi.println(chalk.dim('  El orquestador necesita conocer la estructura del proyecto primero.\n'));
-                        const prepEngine = new AgentEngine(config, dir, gCoordinatorCmd, rl, fi, handleCmd);
-                        await prepEngine.runExplorer('Document the complete project structure, services, dependencies, and entry points. Create/update .agent/context/architecture.md');
-                        fi.println(chalk.green('  ✓ Documentación del proyecto generada.\n'));
+                await withEngine(async (engine) => {
+                    const dir = await resolveProjectDir(process.cwd());
+                    const config = await loadProjectConfig(dir);
+                    if (args[0] === 'orch' || args[0] === 'orchestrator') {
+                        // Ensure documentation exists before orchestrator runs
+                        const contextDir = path.join(dir, '.agent', 'context');
+                        const archPath = path.join(contextDir, 'architecture.md');
+                        if (!(await fileExists(archPath))) {
+                            fi.println(chalk.yellow('\n  ── Generando documentación del proyecto ──'));
+                            fi.println(chalk.dim('  El orquestador necesita conocer la estructura del proyecto primero.\n'));
+                            await engine.runExplorer('Document the complete project structure, services, dependencies, and entry points. Create/update .agent/context/architecture.md');
+                            fi.println(chalk.green('  ✓ Documentación del proyecto generada.\n'));
+                        }
+                        const task = args.slice(1).join(' ');
+                        const result = await engine.runOrchestrator(task);
+                        fi.println(chalk.green(`  Task ID: ${result.taskId}`));
                     }
-                    const task = args.slice(1).join(' ');
-                    const engine = new AgentEngine(config, dir, gCoordinatorCmd, rl, fi, handleCmd);
-                    const result = await engine.runOrchestrator(task);
-                    fi.println(chalk.green(`  Task ID: ${result.taskId}`));
-                }
-                else if (args[0] === 'impl' || args[0] === 'implementor') {
-                    const taskId = args[1];
-                    const engine = new AgentEngine(config, dir, gCoordinatorCmd, rl, fi, handleCmd);
-                    const taskDir = path.join(dir, '.agent', 'tasks', taskId);
-                    const plan = await readJson(path.join(taskDir, 'plan.json'));
-                    await engine.runImplementor(taskId, plan);
-                }
-                else if (args[0] === 'rev' || args[0] === 'reviewer') {
-                    const taskId = args[1];
-                    const engine = new AgentEngine(config, dir, gCoordinatorCmd, rl, fi, handleCmd);
-                    const taskDir = path.join(dir, '.agent', 'tasks', taskId);
-                    const plan = await readJson(path.join(taskDir, 'plan.json'));
-                    const progress = await readJson(path.join(taskDir, 'progress.json'));
-                    await engine.runReviewer(taskId, plan, progress);
-                }
-                else if (args[0] === 'exp' || args[0] === 'explorer') {
-                    const task = args.slice(1).join(' ');
-                    const engine = new AgentEngine(config, dir, gCoordinatorCmd, rl, fi, handleCmd);
-                    await engine.runExplorer(task);
-                }
-                else {
-                    const task = args.join(' ');
-                    const engine = new AgentEngine(config, dir, gCoordinatorCmd, rl, fi, handleCmd);
-                    await engine.runFullCycle(task);
-                }
+                    else if (args[0] === 'impl' || args[0] === 'implementor') {
+                        const taskId = args[1];
+                        const taskDir = path.join(dir, '.agent', 'tasks', taskId);
+                        const plan = await readJson(path.join(taskDir, 'plan.json'));
+                        await engine.runImplementor(taskId, plan);
+                    }
+                    else if (args[0] === 'rev' || args[0] === 'reviewer') {
+                        const taskId = args[1];
+                        const taskDir = path.join(dir, '.agent', 'tasks', taskId);
+                        const plan = await readJson(path.join(taskDir, 'plan.json'));
+                        const progress = await readJson(path.join(taskDir, 'progress.json'));
+                        await engine.runReviewer(taskId, plan, progress);
+                    }
+                    else if (args[0] === 'exp' || args[0] === 'explorer') {
+                        const task = args.slice(1).join(' ');
+                        await engine.runExplorer(task);
+                    }
+                    else {
+                        const task = args.join(' ');
+                        await engine.runFullCycle(task);
+                    }
+                });
                 break;
             }
             case 'explorer':
             case 'exp': {
-                const dir = await resolveProjectDir(process.cwd());
-                const config = await loadProjectConfig(dir);
-                const task = args.join(' ');
-                const engine = new AgentEngine(config, dir, gCoordinatorCmd, rl, fi, handleCmd);
-                await engine.runExplorer(task);
+                await withEngine(async (engine) => {
+                    const task = args.join(' ');
+                    await engine.runExplorer(task);
+                });
                 break;
             }
             case 'models':
@@ -1105,15 +1070,15 @@ export async function runRepl(resumeSession) {
                 await withRl(async (rl) => { await cmdLogin(rl); });
                 break;
             case 'logout': {
-                const credsPath = path.join(QWEN_AGENT_HOME, 'oauth_creds.json');
-                await fs.unlink(credsPath).catch(() => { });
+                const { getApiKeyConfigPath } = await import('../utils/qwen-auth.js');
+                await fs.unlink(path.join(QWEN_AGENT_HOME, 'oauth_creds.json')).catch(() => { });
+                await fs.unlink(await getApiKeyConfigPath()).catch(() => { });
                 const authStore = await loadAuth();
                 authStore.entries = [];
                 delete authStore.activeProvider;
                 await saveAuth(authStore);
                 fi.println(chalk.dim('  Logged out. Credentials cleared.'));
                 fi.teardown();
-                rl.close();
                 throw new ExitError();
             }
             case 'auth-status':
@@ -1137,7 +1102,6 @@ export async function runRepl(resumeSession) {
             case 'quit':
                 fi.println(chalk.dim('  Bye!'));
                 fi.teardown();
-                rl.close();
                 throw new ExitError();
             default:
                 fi.println(chalk.red(`  Unknown command: /${cmd}`));
@@ -1172,17 +1136,17 @@ export async function runRepl(resumeSession) {
                 }
                 else {
                     // Before running the orchestrator, ensure project documentation exists
-                    const contextDir = path.join(dir, '.agent', 'context');
-                    const archPath = path.join(contextDir, 'architecture.md');
-                    if (!(await fileExists(archPath))) {
-                        fi.println(chalk.yellow('\n  ── Generando documentación del proyecto ──'));
-                        fi.println(chalk.dim('  El orquestador necesita conocer la estructura del proyecto primero.\n'));
-                        const engine = new AgentEngine(config, dir, gCoordinatorCmd, rl, fi, handleCmd);
-                        await engine.runExplorer('Document the complete project structure, services, dependencies, and entry points. Create/update .agent/context/architecture.md');
-                        fi.println(chalk.green('  ✓ Documentación del proyecto generada.\n'));
-                    }
-                    const engine = new AgentEngine(config, dir, gCoordinatorCmd, rl, fi, handleCmd);
-                    await engine.runFullCycle(trimmed);
+                    await withEngine(async (engine) => {
+                        const contextDir = path.join(dir, '.agent', 'context');
+                        const archPath = path.join(contextDir, 'architecture.md');
+                        if (!(await fileExists(archPath))) {
+                            fi.println(chalk.yellow('\n  ── Generando documentación del proyecto ──'));
+                            fi.println(chalk.dim('  El orquestador necesita conocer la estructura del proyecto primero.\n'));
+                            await engine.runExplorer('Document the complete project structure, services, dependencies, and entry points. Create/update .agent/context/architecture.md');
+                            fi.println(chalk.green('  ✓ Documentación del proyecto generada.\n'));
+                        }
+                        await engine.runFullCycle(trimmed);
+                    });
                     session.messages.push({ role: 'agent', content: `[task cycle completed for: ${trimmed}]`, ts: new Date().toISOString() });
                     await saveSession(session);
                 }
@@ -1298,7 +1262,7 @@ export async function runRole(role, arg, model) {
     if (!init)
         process.exit(1);
     const { coordinatorCmd } = init;
-    const rl = init.rl;
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     const engine = new AgentEngine(config, dir, coordinatorCmd, rl);
     try {
         switch (role.toLowerCase()) {
@@ -1344,5 +1308,4 @@ export async function runRole(role, arg, model) {
         console.log(chalk.red(`  Error: ${err.message}`));
         process.exit(1);
     }
-    rl.close();
 }