agent-mp 0.3.5 → 0.3.7

package/dist/ui/input.d.ts

@@ -3,6 +3,9 @@ export declare class FixedInput {
     private history;
     private histIdx;
     private origLog;
+    private _pasting;
+    private _pasteAccum;
+    private _drawPending;
     private get rows();
     get cols(): number;
     private get scrollBottom();
@@ -14,6 +17,8 @@ export declare class FixedInput {
     readLine(): Promise<string>;
     println(text: string): void;
     printSeparator(): void;
+    /** Debounced draw: coalesces rapid calls (e.g. during paste) into a single repaint. */
+    private _scheduleDraw;
     /** Set DECSTBM once — only called in setup() and on resize, never during typing. */
     private _setScrollRegion;
     /** Blank every row in the reserved area. */

package/dist/ui/input.js

@@ -20,6 +20,9 @@ export class FixedInput {
     history = [];
     histIdx = -1;
     origLog;
+    _pasting = false; // true while inside bracketed paste sequence
+    _pasteAccum = ''; // accumulates paste content between \x1b[200~ and \x1b[201~
+    _drawPending = false; // debounce flag
     get rows() { return process.stdout.rows || 24; }
     get cols() { return process.stdout.columns || 80; }
     // The scroll region always ends here — everything below is reserved for the box.
@@ -47,6 +50,7 @@ export class FixedInput {
         process.stdout.write(`\x1b[${this.scrollBottom};1H`);
         this._clearReserved();
         this._drawBox();
+        process.stdout.write('\x1b[?2004h'); // enable bracketed paste mode
         process.stdout.on('resize', () => {
             this._setScrollRegion();
             this._clearReserved();
@@ -55,6 +59,7 @@ export class FixedInput {
     }
     teardown() {
         console.log = this.origLog;
+        process.stdout.write('\x1b[?2004l'); // disable bracketed paste mode
         process.stdout.write('\x1b[r'); // reset scroll region
         process.stdout.write('\x1b[?25h'); // show cursor
         process.stdout.write(`\x1b[${this.rows};1H\n`);
@@ -62,6 +67,7 @@ export class FixedInput {
     redrawBox() { this._drawBox(); }
     suspend() {
         console.log = this.origLog;
+        process.stdout.write('\x1b[?2004l'); // disable bracketed paste while suspended
         process.stdout.write('\x1b[r');
         this._clearReserved();
         process.stdout.write(`\x1b[${this.scrollBottom};1H`);
@@ -73,6 +79,7 @@ export class FixedInput {
             this._setScrollRegion();
             this._clearReserved();
             this._drawBox();
+            process.stdout.write('\x1b[?2004h'); // re-enable bracketed paste mode
         };
     }
     // ── Input ──────────────────────────────────────────────────────────────────
@@ -94,6 +101,32 @@ export class FixedInput {
             const onData = (data) => {
                 const hex = data.toString('hex');
                 const key = data.toString();
+                // ── Bracketed paste: start ────────────────────────────────────
+                if (key.includes('\x1b[200~')) {
+                    this._pasting = true;
+                    this._pasteAccum = '';
+                    // Strip the start marker and handle any content after it in the same chunk
+                    const after = key.slice(key.indexOf('\x1b[200~') + 6);
+                    if (after)
+                        this._pasteAccum += after;
+                    return;
+                }
+                // ── Bracketed paste: accumulate ───────────────────────────────
+                if (this._pasting) {
+                    if (key.includes('\x1b[201~')) {
+                        // End marker — append everything before it, then commit
+                        const before = key.slice(0, key.indexOf('\x1b[201~'));
+                        this._pasteAccum += before;
+                        this.buf += this._pasteAccum;
+                        this._pasting = false;
+                        this._pasteAccum = '';
+                        this._scheduleDraw();
+                    }
+                    else {
+                        this._pasteAccum += key;
+                    }
+                    return;
+                }
                 // ── Shift+Enter → insert newline into buffer ──────────────────
                 // Different terminals send different sequences:
                 if (hex === '5c0d' || // \\\r   (GNOME Terminal, ThinkPad, many Linux)
@@ -103,7 +136,7 @@ export class FixedInput {
                     hex === '1b4f4d' // \x1bOM       DECNKP
                 ) {
                     this.buf += '\n';
-                    this._drawBox();
+                    this._scheduleDraw();
                     // ── Enter → submit ────────────────────────────────────────────
                 }
                 else if (key === '\r') {
@@ -118,7 +151,7 @@ export class FixedInput {
                 else if (key === '\x7f' || key === '\x08') { // Backspace
                     if (this.buf.length > 0) {
                         this.buf = this.buf.slice(0, -1);
-                        this._drawBox();
+                        this._scheduleDraw();
                     }
                 }
                 else if (key === '\x03') { // Ctrl+C
@@ -130,13 +163,13 @@ export class FixedInput {
                 }
                 else if (key === '\x15') { // Ctrl+U
                     this.buf = '';
-                    this._drawBox();
+                    this._scheduleDraw();
                 }
                 else if (hex === '1b5b41') { // Arrow ↑
                     if (this.histIdx + 1 < this.history.length) {
                         this.histIdx++;
                         this.buf = this.history[this.histIdx];
-                        this._drawBox();
+                        this._scheduleDraw();
                     }
                 }
                 else if (hex === '1b5b42') { // Arrow ↓
@@ -148,11 +181,11 @@ export class FixedInput {
                         this.histIdx = -1;
                         this.buf = '';
                     }
-                    this._drawBox();
+                    this._scheduleDraw();
                 }
                 else if (key.length >= 1 && key.charCodeAt(0) >= 32 && !key.startsWith('\x1b')) {
                     this.buf += key;
-                    this._drawBox();
+                    this._scheduleDraw();
                 }
             };
             process.stdin.on('data', onData);
@@ -168,6 +201,16 @@ export class FixedInput {
         this.println(chalk.rgb(0, 120, 116)('─'.repeat(this.cols - 1)));
     }
     // ── Private drawing ────────────────────────────────────────────────────────
+    /** Debounced draw: coalesces rapid calls (e.g. during paste) into a single repaint. */
+    _scheduleDraw() {
+        if (this._drawPending)
+            return;
+        this._drawPending = true;
+        setImmediate(() => {
+            this._drawPending = false;
+            this._drawBox();
+        });
+    }
     /** Set DECSTBM once — only called in setup() and on resize, never during typing. */
     _setScrollRegion() {
         const sb = this.scrollBottom;

package/dist/utils/qwen-auth.d.ts

@@ -10,6 +10,17 @@ export declare function qwenAuthStatus(): Promise<{
 }>;
 export declare function fetchQwenModels(): Promise<string[]>;
 export declare function getQwenAccessToken(): Promise<string | null>;
+/**
+ * Call Qwen by spawning the `qwen` CLI with piped stdin.
+ * The qwen CLI manages its own token refresh and uses the correct API format.
+ * Falls back to direct HTTP call if the qwen CLI is not available.
+ */
 export declare function callQwenAPI(prompt: string, model?: string): Promise<string>;
-/** Call Qwen API using credentials from a specific file path (for role binaries) */
+/**
+ * Call Qwen API using credentials from a specific file path (for role binaries).
+ * The role binary CLI (e.g. agent-explorer) manages its own qwen auth via the
+ * shared ~/.qwen/oauth_creds.json — we spawn it with piped stdin so it runs
+ * in non-interactive mode without TTY issues.
+ * Falls back to direct HTTP if the role binary is not found.
+ */
 export declare function callQwenAPIFromCreds(prompt: string, model: string, credsPath: string): Promise<string>;

package/dist/utils/qwen-auth.js

@@ -1,6 +1,7 @@
 import * as fs from 'fs/promises';
 import * as path from 'path';
 import * as crypto from 'crypto';
+import { spawnSync } from 'child_process';
 import open from 'open';
 import { AGENT_HOME } from './config.js';
 const QWEN_OAUTH_BASE_URL = 'https://chat.qwen.ai';
@@ -273,7 +274,30 @@ async function callQwenAPIWithToken(token, prompt, model) {
     const data = await response.json();
     return data.choices?.[0]?.message?.content || '';
 }
+/**
+ * Call Qwen by spawning the `qwen` CLI with piped stdin.
+ * The qwen CLI manages its own token refresh and uses the correct API format.
+ * Falls back to direct HTTP call if the qwen CLI is not available.
+ */
 export async function callQwenAPI(prompt, model = 'coder-model') {
+    // Try using the qwen CLI subprocess first — it handles auth/refresh/format automatically
+    const qwenBin = process.env.QWEN_BIN || 'qwen';
+    try {
+        const result = spawnSync(qwenBin, [], {
+            input: prompt,
+            encoding: 'utf-8',
+            timeout: 300000, // 5 minutes
+            maxBuffer: 10 * 1024 * 1024,
+        });
+        if (result.status === 0 && result.stdout?.trim()) {
+            return result.stdout.trim();
+        }
+        // qwen not available or failed — fall through to direct API
+    }
+    catch {
+        // qwen not installed — fall through
+    }
+    // Fallback: direct API call (requires valid token in AGENT_HOME)
     let token = await loadToken();
     if (!token) {
         throw new Error('QWEN_AUTH_EXPIRED: No hay token de Qwen. Ejecutá --login primero.');
@@ -284,7 +308,6 @@ export async function callQwenAPI(prompt, model = 'coder-model') {
     catch (err) {
         if (!err.message?.startsWith('QWEN_AUTH_EXPIRED'))
             throw err;
-        // 401 — intentar refresh antes de rendirse
         if (token.refreshToken) {
             const refreshed = await doRefreshToken(token.refreshToken);
             if (refreshed) {
@@ -295,14 +318,39 @@ export async function callQwenAPI(prompt, model = 'coder-model') {
         throw new Error('QWEN_AUTH_EXPIRED: Sesión expirada. Ejecutá: agent-mp --login');
     }
 }
-/** Call Qwen API using credentials from a specific file path (for role binaries) */
+/**
+ * Call Qwen API using credentials from a specific file path (for role binaries).
+ * The role binary CLI (e.g. agent-explorer) manages its own qwen auth via the
+ * shared ~/.qwen/oauth_creds.json — we spawn it with piped stdin so it runs
+ * in non-interactive mode without TTY issues.
+ * Falls back to direct HTTP if the role binary is not found.
+ */
 export async function callQwenAPIFromCreds(prompt, model, credsPath) {
+    // Derive the role binary name from the creds path (e.g. ~/.agent-explorer/ → agent-explorer)
+    const cliName = path.basename(path.dirname(credsPath)).replace(/^\./, '');
+    // Try spawning the role binary with piped stdin (non-interactive mode)
+    const qwenBin = process.env.QWEN_BIN || 'qwen';
+    try {
+        const result = spawnSync(qwenBin, [], {
+            input: prompt,
+            encoding: 'utf-8',
+            timeout: 300000,
+            maxBuffer: 10 * 1024 * 1024,
+        });
+        if (result.status === 0 && result.stdout?.trim()) {
+            return result.stdout.trim();
+        }
+    }
+    catch {
+        // qwen not available
+    }
+    // Fallback: direct HTTP with stored creds
     let raw;
     try {
         raw = JSON.parse(await fs.readFile(credsPath, 'utf-8'));
     }
     catch {
-        throw new Error(`No credentials found at ${credsPath}. Run the role binary with --login first.`);
+        throw new Error(`No credentials found at ${credsPath}. Run: ${cliName} --login`);
     }
     let token = {
         accessToken: raw.accessToken || raw.access_token || '',
@@ -312,7 +360,7 @@ export async function callQwenAPIFromCreds(prompt, model, credsPath) {
         resourceUrl: raw.resourceUrl || raw.resource_url,
     };
     if (!token.accessToken) {
-        throw new Error(`Invalid credentials at ${credsPath}. Run the role binary with --login first.`);
+        throw new Error(`Invalid credentials at ${credsPath}. Run: ${cliName} --login`);
     }
     // Refresh proactivo: si vence en menos de 2 minutos (o ya venció)
     const TWO_MIN = 2 * 60 * 1000;
@@ -337,7 +385,6 @@ export async function callQwenAPIFromCreds(prompt, model, credsPath) {
                 return callQwenAPIWithToken(refreshed, prompt, model);
             }
         }
-        const cliName = path.basename(path.dirname(credsPath)).replace(/^\./, '');
         throw new Error(`QWEN_AUTH_EXPIRED: Sesión expirada. Ejecutá: ${cliName} --login`);
     }
 }

package/package.json

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