agent-rev 0.3.3 → 0.3.5

package/dist/utils/qwen-auth.js

@@ -42,14 +42,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;
@@ -59,7 +65,8 @@ async function saveToken(token) {
     const tokenPath = await getTokenPath();
     await fs.writeFile(tokenPath, JSON.stringify(token, null, 2), 'utf-8');
 }
-async function refreshAccessToken(refreshToken) {
+/** Calls the refresh endpoint and returns the new token (does NOT save). */
+async function doRefreshToken(refreshToken) {
     try {
         const response = await fetch(QWEN_OAUTH_TOKEN_ENDPOINT, {
             method: 'POST',
@@ -70,25 +77,29 @@ async function refreshAccessToken(refreshToken) {
                 client_id: QWEN_OAUTH_CLIENT_ID,
             }),
         });
-        if (!response.ok) {
-            throw new Error(`Token refresh failed: ${response.status}`);
-        }
+        if (!response.ok)
+            return null;
         const data = await response.json();
-        const token = {
+        if (!data.access_token)
+            return null;
+        return {
             accessToken: data.access_token,
             refreshToken: data.refresh_token || refreshToken,
             expiresAt: Date.now() + (data.expires_in || 3600) * 1000,
             idToken: data.id_token,
             resourceUrl: data.resource_url,
         };
-        await saveToken(token);
-        return token;
     }
-    catch (error) {
-        console.error('Error refreshing token:', error);
+    catch {
         return null;
     }
 }
+async function refreshAccessToken(refreshToken) {
+    const token = await doRefreshToken(refreshToken);
+    if (token)
+        await saveToken(token);
+    return token;
+}
 // Generate PKCE code verifier and challenge
 function generatePKCE() {
     const codeVerifier = crypto.randomBytes(32).toString('base64url');
@@ -263,7 +274,7 @@ async function callQwenAPIWithToken(token, prompt, model) {
     return data.choices?.[0]?.message?.content || '';
 }
 export async function callQwenAPI(prompt, model = 'coder-model') {
-    const token = await loadToken();
+    let token = await loadToken();
     if (!token) {
         throw new Error('QWEN_AUTH_EXPIRED: No hay token de Qwen. Ejecutá --login primero.');
     }
@@ -271,10 +282,17 @@ export async function callQwenAPI(prompt, model = 'coder-model') {
         return await callQwenAPIWithToken(token, prompt, model);
     }
     catch (err) {
-        if (err.message?.startsWith('QWEN_AUTH_EXPIRED')) {
-            throw new Error('QWEN_AUTH_EXPIRED: Sesión expirada. Ejecutá: agent-mp --login');
+        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) {
+                await saveToken(refreshed);
+                return callQwenAPIWithToken(refreshed, prompt, model);
+            }
         }
-        throw err;
+        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) */
@@ -296,9 +314,10 @@ export async function callQwenAPIFromCreds(prompt, model, credsPath) {
     if (!token.accessToken) {
         throw new Error(`Invalid credentials at ${credsPath}. Run the role binary with --login first.`);
     }
-    // Refresh if expired
-    if (token.expiresAt <= Date.now() && token.refreshToken) {
-        const refreshed = await 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) {
             token = refreshed;
             await fs.writeFile(credsPath, JSON.stringify(token, null, 2), 'utf-8');
@@ -308,10 +327,17 @@ export async function callQwenAPIFromCreds(prompt, model, credsPath) {
         return await callQwenAPIWithToken(token, prompt, model);
     }
     catch (err) {
-        if (err.message?.startsWith('QWEN_AUTH_EXPIRED')) {
-            const cliName = path.basename(path.dirname(credsPath)).replace(/^\./, '');
-            throw new Error(`QWEN_AUTH_EXPIRED: Sesión expirada. Ejecutá: ${cliName} --login`);
+        if (!err.message?.startsWith('QWEN_AUTH_EXPIRED'))
+            throw err;
+        // 401 server-side — intentar refresh aunque expiresAt no haya vencido
+        if (token.refreshToken) {
+            const refreshed = await doRefreshToken(token.refreshToken);
+            if (refreshed) {
+                await fs.writeFile(credsPath, JSON.stringify(refreshed, null, 2), 'utf-8');
+                return callQwenAPIWithToken(refreshed, prompt, model);
+            }
         }
-        throw err;
+        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.3","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.5","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"}}