agent-mp 0.4.12 → 0.4.13

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 { callQwenAPIFromCreds } 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 {
@@ -89,9 +89,12 @@ 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", redirigir a qwen CLI subprocess
+    // Si el comando es "qwen-direct", usar la API directa sin CLI
     if (cmd.startsWith('qwen-direct')) {
-        return runCli('qwen --yolo', prompt, timeoutMs, envOverride, onData);
+        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 new Promise((resolve, reject) => {
         const parts = cmd.trim().split(/\s+/);
@@ -297,18 +300,24 @@ INSTRUCCIONES:
             const envOverride = {};
             let res;
             if (this.coordinatorCmd.startsWith('qwen')) {
-                // 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`);
+                // 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}`);
                 try {
-                    res = await runCli(coCmd, prompt, 600000, envOverride, (chunk) => {
-                        this._parseChunk(chunk).forEach(l => sp.push(l));
-                    });
+                    const result = await callQwenAPI(prompt, model, (c) => this._parseChunk(c).forEach(l => sp.push(l)));
                     sp.stop();
+                    return result;
                 }
                 catch (err) {
                     sp.stop();
-                    console.log(chalk.red(`\n  ✗ Error coordinador: ${err.message}`));
+                    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 '';
                 }
             }
@@ -574,19 +583,28 @@ INSTRUCCIONES:
                 }
             }
         }
-        // Try global fallback — use CLI subprocess (direct API calls fail with 401 for OAuth tokens)
+        // Try global fallback — use callQwenAPI directly for streaming (no subprocess)
         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 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));
-                });
+                const globalResult = await callQwenAPI(rolePrompt, fb.model, onChunk);
+                if (lineBuf.trim())
+                    sp.push(lineBuf.trim());
                 sp.stop();
-                trackTokens(globalResult.output, fb.cli, fb.model);
-                return globalResult.output;
+                trackTokens(globalResult, fb.cli, fb.model);
+                return globalResult;
             }
             catch (err) {
                 sp.stop();
@@ -1043,17 +1061,17 @@ REGLAS:
         let result;
         const sp = this._startSpinner(`agent-explorer  ${role.model}`);
         try {
-            // 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;
+            result = await callQwenAPI(prompt, role.model, (c) => this._parseChunk(c).forEach(l => sp.push(l)));
             sp.stop();
         }
         catch (err) {
             sp.stop();
-            console.log(chalk.red(`\n  ✗ Error explorer: ${err.message}`));
-            return '';
+            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 {
             await writeFile(path.join(contextDir, 'explorer-last.md'), `# Explorer Report\n\nTask: ${effectiveTask}\nDate: ${new Date().toISOString()}\n\n${result}\n`);

package/dist/utils/qwen-auth.js

@@ -235,7 +235,8 @@ export async function fetchQwenModels() {
     if (!token)
         return [];
     try {
-        const res = await fetch('https://chat.qwen.ai/api/models', {
+        const host = token.resourceUrl ? `https://${token.resourceUrl}` : 'https://chat.qwen.ai';
+        const res = await fetch(`${host}/api/models`, {
             headers: { Authorization: `Bearer ${token.accessToken}` },
         });
         if (!res.ok)
@@ -252,17 +253,35 @@ export async function getQwenAccessToken() {
     return token?.accessToken || null;
 }
 async function callQwenAPIWithToken(token, prompt, model, onData) {
-    const baseUrl = 'https://chat.qwen.ai/api/v1';
+    // Use resource_url from token (e.g. "portal.qwen.ai"), fallback to DashScope
+    const rawHost = token.resourceUrl || 'dashscope.aliyuncs.com/compatible-mode';
+    const host = rawHost.startsWith('http') ? rawHost : `https://${rawHost}`;
+    const baseUrl = host.endsWith('/v1') ? host : `${host}/v1`;
     const useStream = !!onData;
+    const userAgent = `QwenCode/0.14.2 (${process.platform}; ${process.arch})`;
+    // portal.qwen.ai requires content parts format (plain strings return 400)
+    const toContentParts = (text) => [{ type: 'text', text }];
     const response = await fetch(`${baseUrl}/chat/completions`, {
         method: 'POST',
         headers: {
             'Authorization': `Bearer ${token.accessToken}`,
             'Content-Type': 'application/json',
+            'Accept': 'application/json',
+            'User-Agent': userAgent,
+            'x-dashscope-authtype': 'qwen-oauth',
+            'x-dashscope-cachecontrol': 'enable',
+            'x-dashscope-useragent': userAgent,
+            'x-stainless-lang': 'js',
+            'x-stainless-package-version': '5.11.0',
+            'x-stainless-os': process.platform,
+            'x-stainless-arch': process.arch,
+            'x-stainless-runtime': 'node',
+            'x-stainless-runtime-version': process.version,
+            'x-stainless-retry-count': '0',
         },
         body: JSON.stringify({
             model: model || 'coder-model',
-            messages: [{ role: 'user', content: prompt }],
+            messages: [{ role: 'user', content: toContentParts(prompt) }],
             stream: useStream,
         }),
     });

package/package.json

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