agent-mp 0.4.10 → 0.4.12

package/dist/commands/repl.js

@@ -10,7 +10,7 @@ import { writeJson, ensureDir, readJson, listDir, fileExists } from '../utils/fs
 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';
+import { qwenLogin, qwenAuthStatus, QWEN_AGENT_HOME, fetchQwenModels } 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';
@@ -258,42 +258,18 @@ function buildCmd(cliName, model) {
 }
 async function cmdLogin(rl) {
     console.log(chalk.bold.cyan('\n  Login\n'));
-    // If active provider is Qwen, do fresh OAuth for corporate account
+    // 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('  Qwen login for corporate account\n'));
-        console.log(chalk.dim('  Corporate credentials stored in: ~/.agent-cli/\n'));
-        console.log(chalk.yellow('  IMPORTANT: Use your CORPORATE account when prompted.\n'));
-        console.log(chalk.yellow('  The browser will open. If you see your personal account,'));
-        console.log(chalk.yellow('  log out and sign in with your corporate account.\n'));
+        console.log(chalk.dim(`  Credentials will be saved to: ${QWEN_AGENT_HOME}/\n`));
         try {
-            const { execSync } = await import('child_process');
-            const personalCreds = path.join(os.homedir(), '.qwen', 'oauth_creds.json');
-            const corporateCreds = path.join(QWEN_AGENT_HOME, 'oauth_creds.json');
-            // Backup personal credentials
-            let personalBackup = null;
-            if (await fileExists(personalCreds)) {
-                personalBackup = await fs.readFile(personalCreds, 'utf-8');
-                await fs.unlink(personalCreds);
-            }
-            // Remove corporate creds to force fresh login
-            await fs.unlink(corporateCreds).catch(() => { });
-            // Login with Qwen CLI - forces fresh login since personal creds are backed up
-            execSync('qwen auth qwen-oauth', { stdio: 'inherit' });
-            // Copy NEW credentials to corporate directory
-            if (await fileExists(personalCreds)) {
-                const newCreds = await fs.readFile(personalCreds, 'utf-8');
-                await fs.writeFile(corporateCreds, newCreds);
-            }
-            // Restore personal credentials
-            if (personalBackup) {
-                await fs.writeFile(personalCreds, personalBackup);
-            }
+            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);
-            console.log(chalk.green('  Corporate auth recorded'));
             return true;
         }
         catch (err) {

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 { callQwenAPI, callQwenAPIFromCreds } from '../utils/qwen-auth.js';
+import { 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 {
@@ -89,12 +89,9 @@ async function ask(prompt, rl, fi) {
     return new Promise((resolve) => tempRl.question(prompt, (a) => { tempRl.close(); resolve(a); }));
 }
 function runCli(cmd, prompt, timeoutMs = 600000, envOverride, onData) {
-    // Si el comando es "qwen-direct", usar la API directa sin CLI
+    // Si el comando es "qwen-direct", redirigir a qwen CLI subprocess
     if (cmd.startsWith('qwen-direct')) {
-        const model = cmd.includes('-m') ? cmd.split('-m')[1]?.trim().split(/\s/)[0] : 'coder-model';
-        return callQwenAPI(prompt, model)
-            .then(output => ({ output, exitCode: 0 }))
-            .catch(err => ({ output: `Error: ${err.message}`, exitCode: 1 }));
+        return runCli('qwen --yolo', prompt, timeoutMs, envOverride, onData);
     }
     return new Promise((resolve, reject) => {
         const parts = cmd.trim().split(/\s+/);
@@ -300,24 +297,18 @@ INSTRUCCIONES:
             const envOverride = {};
             let res;
             if (this.coordinatorCmd.startsWith('qwen')) {
-                // Use Qwen API directly — avoids the qwen CLI's own OAuth flow
-                // which causes mid-session auth popups and breaks display.
-                const model = this.coordinatorCmd.match(/(?:-m|--model)\s+(\S+)/)?.[1] || 'coder-model';
-                const sp = this._startSpinner(`coordinador  ${model}`);
+                // Use qwen CLI subprocess — direct API calls fail with 401 for OAuth tokens
+                const coCmd = this.coordinatorCmd.includes('--yolo') ? this.coordinatorCmd : `${this.coordinatorCmd} --yolo`;
+                const sp = this._startSpinner(`coordinador`);
                 try {
-                    const result = await callQwenAPI(prompt, model, (c) => this._parseChunk(c).forEach(l => sp.push(l)));
+                    res = await runCli(coCmd, prompt, 600000, envOverride, (chunk) => {
+                        this._parseChunk(chunk).forEach(l => sp.push(l));
+                    });
                     sp.stop();
-                    return result;
                 }
                 catch (err) {
                     sp.stop();
-                    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}`));
-                    }
+                    console.log(chalk.red(`\n  ✗ Error coordinador: ${err.message}`));
                     return '';
                 }
             }
@@ -583,28 +574,19 @@ INSTRUCCIONES:
                 }
             }
         }
-        // Try global fallback — use callQwenAPI directly for streaming (no subprocess)
+        // Try global fallback — use CLI subprocess (direct API calls fail with 401 for OAuth tokens)
         if (this.config.fallback_global) {
             const fb = this.config.fallback_global;
             log.warn(`Using global fallback: ${fb.cli} (${fb.model})`);
             const sp = this._startSpinner(`${fb.cli}  ${fb.model}  (fallback)`);
-            let lineBuf = '';
-            const onChunk = (delta) => {
-                lineBuf += delta;
-                const lines = lineBuf.split('\n');
-                lineBuf = lines.pop() || '';
-                for (const l of lines) {
-                    if (l.trim())
-                        sp.push(l.trim());
-                }
-            };
             try {
-                const globalResult = await callQwenAPI(rolePrompt, fb.model, onChunk);
-                if (lineBuf.trim())
-                    sp.push(lineBuf.trim());
+                const fbCmd = fb.cli.includes('--yolo') ? fb.cli : `${fb.cli} --yolo`;
+                const globalResult = await runCli(fbCmd, rolePrompt, 600000, undefined, (chunk) => {
+                    this._parseChunk(chunk).forEach(l => sp.push(l));
+                });
                 sp.stop();
-                trackTokens(globalResult, fb.cli, fb.model);
-                return globalResult;
+                trackTokens(globalResult.output, fb.cli, fb.model);
+                return globalResult.output;
             }
             catch (err) {
                 sp.stop();
@@ -1061,17 +1043,17 @@ REGLAS:
         let result;
         const sp = this._startSpinner(`agent-explorer  ${role.model}`);
         try {
-            result = await callQwenAPI(prompt, role.model, (c) => this._parseChunk(c).forEach(l => sp.push(l)));
+            // Use qwen CLI subprocess — direct API calls fail with 401 for OAuth tokens
+            const explorerCliRes = await runCli('qwen --yolo', prompt, 600000, undefined, (chunk) => {
+                this._parseChunk(chunk).forEach(l => sp.push(l));
+            });
+            result = explorerCliRes.output;
             sp.stop();
         }
         catch (err) {
             sp.stop();
-            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;
+            console.log(chalk.red(`\n  ✗ Error explorer: ${err.message}`));
+            return '';
         }
         try {
             await writeFile(path.join(contextDir, 'explorer-last.md'), `# Explorer Report\n\nTask: ${effectiveTask}\nDate: ${new Date().toISOString()}\n\n${result}\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-mp",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "Deterministic multi-agent CLI orchestrator — plan, code, review",
   "type": "module",
   "main": "./dist/index.js",