agent-mp 0.5.22 → 0.5.24

package/dist/core/engine.js

@@ -69,7 +69,7 @@ function rebuildCmd(cliName, model, flags) {
 }
 async function ask(prompt, rl, fi) {
     if (fi) {
-        fi.println(chalk.cyan(`  ${prompt}`));
+        fi.println(chalk.cyan(prompt));
         const answer = await fi.readLine();
         // Echo user response right-aligned (chat style, per line)
         const userLines = answer.trim().split('\n').filter(l => l.trim());
@@ -329,17 +329,25 @@ export class AgentEngine {
         if (!this.fi)
             return noop;
         const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+        const dotFrames = ['·  ', '·· ', '···'];
         let i = 0;
+        let ti = 0;
         const t0 = Date.now();
         const fi = this.fi;
+        let streaming = false;
         fi.startActivity(`${frames[0]}  ${label}  0s`);
+        fi.setActivityLines([`  ${dotFrames[0]}  esperando respuesta...`]);
         const iv = setInterval(() => {
             const s = Math.floor((Date.now() - t0) / 1000);
+            ti++;
             fi.updateActivityHeader(`${frames[i++ % frames.length]}  ${label}  ${s}s`);
-        }, 100);
+            if (!streaming) {
+                fi.setActivityLines([`  ${dotFrames[ti % dotFrames.length]}  esperando respuesta...`]);
+            }
+        }, 300);
         return {
             stop() { clearInterval(iv); fi.stopActivity(); },
-            push(line) { fi.pushActivity(line); },
+            push(_chunk) { streaming = true; },
         };
     }
     /** Extract readable text lines from a qwen/CLI streaming chunk. */
@@ -409,7 +417,7 @@ INSTRUCCIONES:
                 const model = this.coordinatorCmd.match(/(?:-m|--model)\s+(\S+)/)?.[1] || 'coder-model';
                 const sp = this._startSpinner(`coordinador  ${model}`);
                 try {
-                    const result = await callQwenAPI(prompt, model, (c) => this._parseChunk(c).forEach(l => sp.push(l)));
+                    const result = await callQwenAPI(prompt, model, (c) => sp.push(c));
                     sp.stop();
                     return result;
                 }
@@ -620,26 +628,22 @@ INSTRUCCIONES:
         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;
+            const hasOAuthCreds = await fileExists(credsPath);
+            if (!hasOAuthCreds) {
+                // No role OAuth creds — try global API key config before giving up
+                const { loadApiKeyConfig } = await import('../utils/qwen-auth.js');
+                const apiKeyCfg = await loadApiKeyConfig();
+                if (!apiKeyCfg) {
+                    log.warn(`${cliName} has no credentials — run: agent-mp setup api-key  or  ${cliName} --login`);
+                    return null;
+                }
+                // Fall through: callQwenAPIFromCreds will use the API key config
             }
             const sp = this._startSpinner(`${cliName}  ${model}`);
-            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());
-                }
-            };
+            const onChunk = (delta) => sp.push(delta);
             try {
                 log.info(`${cliName}: calling Qwen API with own credentials (${model})`);
                 const result = await callQwenAPIFromCreds(rolePrompt, model, credsPath, onChunk);
-                if (lineBuf.trim())
-                    sp.push(lineBuf.trim());
                 sp.stop();
                 return result;
             }
@@ -696,20 +700,9 @@ INSTRUCCIONES:
             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());
-                }
-            };
+            const onChunk = (delta) => sp.push(delta);
             try {
                 const globalResult = await callQwenAPI(rolePrompt, fb.model, onChunk);
-                if (lineBuf.trim())
-                    sp.push(lineBuf.trim());
                 sp.stop();
                 trackTokens(globalResult, fb.cli, fb.model);
                 return globalResult;

package/dist/index.js

@@ -61,8 +61,8 @@ REPL commands (type inside the session):
   /run orch <task>   Run only orchestrator
   /run impl <id>     Run only implementor
   /run rev <id>      Run only reviewer
-  /login             Login (OAuth)
-  /logout            Logout and clear credentials
+  /login             Configure API key
+  /logout            Clear API key and credentials
   /models [cli]      List available models
   /tasks             List all tasks
   /clear             Clear screen
@@ -100,25 +100,32 @@ if (nativeRole) {
         console.log(chalk.dim(`  Version: ${PKG_NAME} --version\n`));
         process.exit(0);
     }
-    // --login: OAuth login for this role's account
+    // --login: configure API key for this role
     if (args.includes('--login') || args.includes('login')) {
-        const { qwenLogin, fetchQwenModels } = await import('./utils/qwen-auth.js');
-        const { loadCliConfig, saveCliConfig } = await import('./utils/config.js');
-        const ok = await qwenLogin();
-        if (ok) {
-            // Fetch and cache available models so /setup can show them
-            const models = await fetchQwenModels();
-            if (models.length) {
-                const cliConfig = await loadCliConfig();
-                cliConfig.availableModels = models;
-                if (!cliConfig.coordinatorModel)
-                    cliConfig.coordinatorModel = models[0];
-                await saveCliConfig(cliConfig);
-                console.log(chalk.green(`  ✓ Models cached: ${models.slice(0, 3).join(', ')}${models.length > 3 ? '...' : ''}`));
-                console.log(chalk.dim(`  Default model: ${cliConfig.coordinatorModel}`));
-            }
+        const { saveApiKeyConfig, loadApiKeyConfig, DEFAULT_API_BASE_URL } = await import('./utils/qwen-auth.js');
+        const rl = (await import('readline')).createInterface({ input: process.stdin, output: process.stdout });
+        const ask = (q) => new Promise((res) => rl.question(q, res));
+        const existing = await loadApiKeyConfig();
+        console.log(chalk.bold.cyan(`\n  ${PKG_NAME} — API Key Setup\n`));
+        if (existing) {
+            console.log(chalk.dim(`  Current: ${existing.provider} / ${existing.model}`));
+        }
+        const apiKey = await ask(`  API Key${existing ? ' [Enter to keep]' : ''}: `);
+        const model = await ask(`  Model [${existing?.model ?? 'qwen-plus'}]: `);
+        rl.close();
+        const cfg = {
+            provider: existing?.provider ?? 'openai-compatible',
+            api_key: apiKey.trim() || existing?.api_key || '',
+            base_url: DEFAULT_API_BASE_URL,
+            model: model.trim() || existing?.model || 'qwen-plus',
+        };
+        if (!cfg.api_key) {
+            console.log(chalk.red('  API key is required.'));
+            process.exit(1);
         }
-        process.exit(ok ? 0 : 1);
+        await saveApiKeyConfig(cfg);
+        console.log(chalk.green(`\n  ✓ API key saved — ${cfg.provider} / ${cfg.model}\n`));
+        process.exit(0);
     }
     // --status: show auth status
     if (args.includes('--status') || args.includes('status')) {

package/dist/ui/input.d.ts

@@ -1,41 +1,39 @@
+/**
+ * Inline prompt, styled like Gemini/Qwen CLI.
+ * Draws at the current cursor line; when output arrives we erase the area
+ * (line-by-line, \x1b[2K) and redraw below. No absolute positioning.
+ */
 export declare class FixedInput {
-    private buf;
     private history;
-    private histIdx;
     private origLog;
-    private _pasting;
-    private _pasteAccum;
-    private _drawPending;
     private _activityHeader;
     private _activityLines;
-    private get rows();
+    private _inputBuffer;
+    private _cursorPos;
+    private _pasting;
+    private _pasteAccum;
+    private _resolveInput?;
+    private _inputActive;
+    private _areaRows;
+    private _cursorRow;
+    private _onResize?;
     get cols(): number;
-    private get _reservedRows();
-    private get scrollBottom();
-    private _contentRows;
     setup(): void;
     teardown(): void;
-    redrawBox(): void;
     suspend(): () => void;
-    /** Enter activity mode: show the 5-line log box instead of the input box. */
     startActivity(header: string): void;
-    /** Update the header line (spinner frame + elapsed time) without clearing lines. */
     updateActivityHeader(header: string): void;
-    /**
-     * Append a line to the activity log (keeps last ACTIVITY_LINES lines).
-     * Strips ANSI codes and skips blank or pure-JSON lines.
-     */
     pushActivity(rawLine: string): void;
-    /** Leave activity mode and restore the normal input box. */
+    /** Replace all content lines at once (for streaming preview). */
+    setActivityLines(lines: string[]): void;
     stopActivity(): void;
-    readLine(): Promise<string>;
     println(text: string): void;
     printSeparator(): void;
-    private _scheduleDraw;
-    private _setScrollRegion;
-    private _clearReserved;
-    private _drawBox;
-    private _drawActivityBox;
-    private _drawInputBox;
-    private _wrapText;
+    redrawBox(): void;
+    readLine(): Promise<string>;
+    private _commitPaste;
+    /** Build a string that erases the currently-drawn area and leaves the cursor at col 0 of the top row. */
+    private _buildClear;
+    private _clearArea;
+    private _redraw;
 }