agent-rev 0.3.1 → 0.3.3

package/dist/commands/repl.js

@@ -7,7 +7,7 @@ import chalk from 'chalk';
 import { execSync } from 'child_process';
 import { CLI_REGISTRY } from '../types.js';
 import { writeJson, ensureDir, readJson, listDir, fileExists } from '../utils/fs.js';
-import { loadAuth, saveAuth, loadCliConfig, saveCliConfig, loadProjectConfig, PKG_NAME } from '../utils/config.js';
+import { loadAuth, saveAuth, loadCliConfig, saveCliConfig, loadProjectConfig } from '../utils/config.js';
 import { log } from '../utils/logger.js';
 import { AgentEngine, ExitError } from '../core/engine.js';
 import { qwenAuthStatus, QWEN_AGENT_HOME, fetchQwenModels } from '../utils/qwen-auth.js';
@@ -1227,17 +1227,8 @@ export async function runRole(role, arg, model) {
             }
             case 'explorer':
             case 'exp': {
-                const explorerCli = config.roles.explorer?.cli;
-                if (explorerCli && explorerCli === PKG_NAME) {
-                    // This binary IS the configured explorer CLI — avoid recursion.
-                    // Call Qwen API directly using own credentials.
-                    const result = await engine.runExplorerDirect(arg || undefined);
-                    console.log(result);
-                }
-                else {
-                    const result = await engine.runExplorer(arg || undefined);
-                    console.log(result);
-                }
+                const result = await engine.runExplorer(arg || undefined);
+                console.log(result);
                 break;
             }
             case 'coordinator':

package/dist/core/engine.js

@@ -6,7 +6,7 @@ import { CLI_REGISTRY } from '../types.js';
 import { writeJson, readJson, fileExists, writeFile, readFile } from '../utils/fs.js';
 import { log } from '../utils/logger.js';
 import chalk from 'chalk';
-import { QWEN_AGENT_HOME, callQwenAPI } from '../utils/qwen-auth.js';
+import { callQwenAPI, callQwenAPIFromCreds } from '../utils/qwen-auth.js';
 import * as fs from 'fs/promises';
 /** Thrown when a slash command inside a conversation requests exit */
 export class ExitError extends Error {
@@ -251,55 +251,50 @@ INSTRUCCIONES:
             const envOverride = {};
             let res;
             if (this.coordinatorCmd.startsWith('qwen')) {
-                const corporateCreds = path.join(QWEN_AGENT_HOME, 'oauth_creds.json');
-                const personalCreds = path.join(os.homedir(), '.qwen', 'oauth_creds.json');
-                let corporateCredsContent = null;
+                // Use Qwen API directly — avoids the qwen CLI's own OAuth flow
+                // which causes mid-session auth popups and breaks display.
                 try {
-                    corporateCredsContent = await fs.readFile(corporateCreds, 'utf-8');
+                    const model = this.coordinatorCmd.match(/(?:-m|--model)\s+(\S+)/)?.[1] || 'coder-model';
+                    return await callQwenAPI(prompt, model);
                 }
-                catch {
-                    console.log(chalk.red('\n  ✗ No hay credenciales corporativas de Qwen.'));
-                    console.log(chalk.yellow('  Ejecutá /login para autenticarte.\n'));
+                catch (err) {
+                    if (err.message?.startsWith('QWEN_AUTH_EXPIRED')) {
+                        console.log(chalk.red('\n  ✗ Sesión Qwen expirada.'));
+                        console.log(chalk.yellow('  Ejecutá: /login  para re-autenticarte.\n'));
+                    }
+                    else {
+                        console.log(chalk.red(`\n  ✗ Error Qwen: ${err.message}`));
+                    }
                     return '';
                 }
-                let personalBackup = null;
-                try {
-                    personalBackup = await fs.readFile(personalCreds, 'utf-8');
-                }
-                catch { }
-                await fs.writeFile(personalCreds, corporateCredsContent);
-                res = await runCli(this.coordinatorCmd, prompt, 600000, envOverride);
-                if (personalBackup) {
-                    await fs.writeFile(personalCreds, personalBackup);
-                }
-                else {
-                    await fs.unlink(personalCreds).catch(() => { });
-                }
             }
             else {
                 res = await runCli(this.coordinatorCmd, prompt, 600000, envOverride);
             }
-            // Extract readable text (Qwen CLI returns JSON events)
+            // Extract readable text — search for JSON array even if there's prefix text
             let responseText = res.output.trim();
-            try {
-                const json = JSON.parse(res.output);
-                if (Array.isArray(json)) {
-                    for (const item of json) {
-                        if (item.type === 'result' && typeof item.result === 'string') {
-                            responseText = item.result;
-                            break;
-                        }
-                        if (item.type === 'assistant' && item.message?.content?.length > 0) {
-                            const t = item.message.content.find((c) => c.type === 'text');
-                            if (t?.text) {
-                                responseText = t.text;
+            const arrayStart = res.output.indexOf('[{');
+            if (arrayStart !== -1) {
+                try {
+                    const json = JSON.parse(res.output.slice(arrayStart));
+                    if (Array.isArray(json)) {
+                        for (const item of json) {
+                            if (item.type === 'result' && typeof item.result === 'string') {
+                                responseText = item.result;
                                 break;
                             }
+                            if (item.type === 'assistant' && item.message?.content?.length > 0) {
+                                const t = item.message.content.find((c) => c.type === 'text');
+                                if (t?.text) {
+                                    responseText = t.text;
+                                    break;
+                                }
+                            }
                         }
                     }
                 }
+                catch { }
             }
-            catch { }
             return responseText;
         };
         // Clarification loop — coordinator is only called when there is new user input
@@ -446,14 +441,39 @@ INSTRUCCIONES:
                 }
             }
         };
-        // Role binaries (agent-orch, agent-impl, etc.) are wrappers, not AI CLIs.
-        // runExplorer handles them separately by spawning with the short task.
-        // For orch/impl/rev the full cycle never spawns role binaries via runWithFallback.
+        // Role binaries (agent-orch, agent-impl, etc.) require an interactive TTY and can't
+        // be spawned as subprocesses. Instead, if they have their own Qwen credentials
+        // (~/.agent-<name>/oauth_creds.json from running `agent-<name> --login`), call
+        // the Qwen API directly with those creds. Otherwise skip to fallback.
         const ROLE_BINARIES = new Set(['agent-orch', 'agent-impl', 'agent-rev', 'agent-explorer']);
+        const tryRoleBinaryCreds = async (cliName, model) => {
+            const credsPath = path.join(os.homedir(), `.${cliName}`, 'oauth_creds.json');
+            if (!(await fileExists(credsPath))) {
+                log.warn(`${cliName} has no credentials — run: ${cliName} --login`);
+                return null;
+            }
+            try {
+                log.info(`${cliName}: calling Qwen API with own credentials (${model})`);
+                return await callQwenAPIFromCreds(rolePrompt, model, credsPath);
+            }
+            catch (err) {
+                if (err.message?.startsWith('QWEN_AUTH_EXPIRED')) {
+                    console.log(chalk.red(`\n  ✗ Sesión expirada para ${cliName}.`));
+                    console.log(chalk.yellow(`  Ejecutá: ${cliName} --login\n`));
+                    return null;
+                }
+                log.warn(`${cliName} direct API call failed: ${err.message}`);
+                return null;
+            }
+        };
         // Try primary
         log.info(`Launching ${roleName}: ${role.cli} (${role.model})`);
         if (ROLE_BINARIES.has(role.cli)) {
-            log.warn(`${role.cli} is a role binary — skipping to fallback`);
+            const directResult = await tryRoleBinaryCreds(role.cli, role.model);
+            if (directResult !== null) {
+                trackTokens(directResult, role.cli, role.model);
+                return directResult;
+            }
         }
         else {
             const primaryResult = await tryWithAutoRepair(role.cli, role.model, role.cmd);
@@ -463,12 +483,21 @@ INSTRUCCIONES:
             }
         }
         // Try individual fallback
-        if (role.fallback && !ROLE_BINARIES.has(role.fallback.cli)) {
+        if (role.fallback) {
             log.warn(`Trying individual fallback for ${roleName}: ${role.fallback.cli} (${role.fallback.model})`);
-            const fallbackResult = await tryWithAutoRepair(role.fallback.cli, role.fallback.model, role.fallback.cmd);
-            if (fallbackResult !== null) {
-                trackTokens(fallbackResult, role.fallback.cli, role.fallback.model);
-                return fallbackResult;
+            if (ROLE_BINARIES.has(role.fallback.cli)) {
+                const directResult = await tryRoleBinaryCreds(role.fallback.cli, role.fallback.model);
+                if (directResult !== null) {
+                    trackTokens(directResult, role.fallback.cli, role.fallback.model);
+                    return directResult;
+                }
+            }
+            else {
+                const fallbackResult = await tryWithAutoRepair(role.fallback.cli, role.fallback.model, role.fallback.cmd);
+                if (fallbackResult !== null) {
+                    trackTokens(fallbackResult, role.fallback.cli, role.fallback.model);
+                    return fallbackResult;
+                }
             }
         }
         // Try global fallback
@@ -783,26 +812,7 @@ REGLAS:
 - NO modifiques archivos de aplicacion (solo .agent/context/)
 - NO ejecutes comandos que cambien estado (npm install, migraciones, etc.)
 - Si un directorio esta en node_modules, dist, .git: ignoralo`;
-        const ROLE_BINS = new Set(['agent-orch', 'agent-impl', 'agent-rev', 'agent-explorer']);
-        let res;
-        if (ROLE_BINS.has(this.config.roles.explorer.cli)) {
-            // Spawn the role binary as a separate process with its own credentials.
-            // Pass only the short task — the binary builds its own full prompt internally.
-            const explorerRole = this.config.roles.explorer;
-            const spawnCmd = `${explorerRole.cli} --model ${explorerRole.model}`;
-            log.info(`Spawning ${explorerRole.cli} (${explorerRole.model}) as separate process`);
-            const result = await runCli(spawnCmd, effectiveTask);
-            if (result.exitCode !== 0) {
-                log.warn(`${explorerRole.cli} exited with code ${result.exitCode} — trying fallback`);
-                res = await this.runWithFallback('explorer', prompt, 'Exploracion');
-            }
-            else {
-                res = result.output;
-            }
-        }
-        else {
-            res = await this.runWithFallback('explorer', prompt, 'Exploracion');
-        }
+        const res = await this.runWithFallback('explorer', prompt, 'Exploracion');
         const text = extractCliText(res);
         // Always save a timestamped explorer report
         try {
@@ -843,7 +853,18 @@ INSTRUCCIONES:
 3. Identifica dependencias entre servicios.
 4. Crea/actualiza ${archPath} con tabla resumen y detalle por servicio.
 5. Crea/actualiza ${contextDir}/<servicio>/architecture.md para cada servicio.`);
-        const result = await callQwenAPI(prompt, role.model);
+        let result;
+        try {
+            result = await callQwenAPI(prompt, role.model);
+        }
+        catch (err) {
+            if (err.message?.startsWith('QWEN_AUTH_EXPIRED')) {
+                console.log(chalk.red('\n  ✗ Sesión Qwen expirada.'));
+                console.log(chalk.yellow('  Ejecutá: agent-mp --login  (o agent-explorer --login)\n'));
+                return '';
+            }
+            throw err;
+        }
         try {
             const ts = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
             await writeFile(path.join(contextDir, `explorer-${ts}.md`), `# Explorer Report\n\nTask: ${effectiveTask}\n\n${result}\n`);

package/dist/utils/qwen-auth.js

@@ -254,6 +254,9 @@ async function callQwenAPIWithToken(token, prompt, model) {
     });
     if (!response.ok) {
         const errorText = await response.text();
+        if (response.status === 401) {
+            throw new Error(`QWEN_AUTH_EXPIRED: ${errorText}`);
+        }
         throw new Error(`Qwen API error: ${response.status} - ${errorText}`);
     }
     const data = await response.json();
@@ -262,9 +265,17 @@ async function callQwenAPIWithToken(token, prompt, model) {
 export async function callQwenAPI(prompt, model = 'coder-model') {
     const token = await loadToken();
     if (!token) {
-        throw new Error('No hay token de Qwen. Ejecutá /login primero.');
+        throw new Error('QWEN_AUTH_EXPIRED: No hay token de Qwen. Ejecutá --login primero.');
+    }
+    try {
+        return await callQwenAPIWithToken(token, prompt, model);
+    }
+    catch (err) {
+        if (err.message?.startsWith('QWEN_AUTH_EXPIRED')) {
+            throw new Error('QWEN_AUTH_EXPIRED: Sesión expirada. Ejecutá: agent-mp --login');
+        }
+        throw err;
     }
-    return callQwenAPIWithToken(token, prompt, model);
 }
 /** Call Qwen API using credentials from a specific file path (for role binaries) */
 export async function callQwenAPIFromCreds(prompt, model, credsPath) {
@@ -293,5 +304,14 @@ export async function callQwenAPIFromCreds(prompt, model, credsPath) {
             await fs.writeFile(credsPath, JSON.stringify(token, null, 2), 'utf-8');
         }
     }
-    return callQwenAPIWithToken(token, prompt, model);
+    try {
+        return await callQwenAPIWithToken(token, prompt, model);
+    }
+    catch (err) {
+        if (err.message?.startsWith('QWEN_AUTH_EXPIRED')) {
+            const cliName = path.basename(path.dirname(credsPath)).replace(/^\./, '');
+            throw new Error(`QWEN_AUTH_EXPIRED: Sesión expirada. Ejecutá: ${cliName} --login`);
+        }
+        throw err;
+    }
 }

package/package.json

@@ -1 +1 @@
-{"name":"agent-rev","version":"0.3.1","description":"agent-rev agent","type":"module","main":"./dist/index.js","files":["dist/"],"bin":{"agent-rev":"dist/index.js"},"scripts":{"build":"tsc"},"keywords":["ai","agent","cli"],"license":"MIT","dependencies":{"@anthropic-ai/sdk":"^0.39.0","@google/generative-ai":"^0.24.0","chalk":"^5.4.1","commander":"^13.1.0","open":"^11.0.0","openai":"^4.91.0"},"engines":{"node":">=18.0.0"}}
+{"name":"agent-rev","version":"0.3.3","description":"agent-rev agent","type":"module","main":"./dist/index.js","files":["dist/"],"bin":{"agent-rev":"dist/index.js"},"scripts":{"build":"tsc"},"keywords":["ai","agent","cli"],"license":"MIT","dependencies":{"@anthropic-ai/sdk":"^0.39.0","@google/generative-ai":"^0.24.0","chalk":"^5.4.1","commander":"^13.1.0","open":"^11.0.0","openai":"^4.91.0"},"engines":{"node":">=18.0.0"}}