agent-rev 0.3.4 → 0.3.6

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';
@@ -42,14 +43,20 @@ async function loadToken() {
         };
         if (!token.accessToken)
             return null;
-        if (token.expiresAt > Date.now()) {
-            return token;
-        }
-        // Token expirado — intentar refresh
-        if (token.refreshToken) {
-            return refreshAccessToken(token.refreshToken);
+        // Refresh proactivo: si vence en menos de 2 minutos (o ya venció)
+        const TWO_MIN = 2 * 60 * 1000;
+        if (token.expiresAt - Date.now() < TWO_MIN && token.refreshToken) {
+            const refreshed = await doRefreshToken(token.refreshToken);
+            if (refreshed) {
+                await saveToken(refreshed);
+                return refreshed;
+            }
+            // Si el refresh falla pero el token aún no venció del todo, seguir con él
+            if (token.expiresAt > Date.now())
+                return token;
+            return null;
         }
-        return null;
+        return token;
     }
     catch {
         return null;
@@ -267,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.');
@@ -278,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) {
@@ -289,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 || '',
@@ -306,10 +360,11 @@ 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 if expired by timestamp
-    if (token.expiresAt <= Date.now() && token.refreshToken) {
+    // Refresh proactivo: si vence en menos de 2 minutos (o ya venció)
+    const TWO_MIN = 2 * 60 * 1000;
+    if (token.expiresAt - Date.now() < TWO_MIN && token.refreshToken) {
         const refreshed = await doRefreshToken(token.refreshToken);
         if (refreshed) {
             token = refreshed;
@@ -330,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 +1 @@
-{"name":"agent-rev","version":"0.3.4","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.6","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"}}