agent-mp 0.5.8 → 0.5.10

package/dist/commands/repl.js

@@ -683,6 +683,57 @@ async function cmdAuthStatus(fi) {
         }));
     fi.println(renderSectionBox('Auth Status', rows));
 }
+async function cmdUsage(fi) {
+    const { qwenUsage } = await import('../utils/qwen-auth.js');
+    const { PKG_NAME, getConfigDir } = await import('../utils/config.js');
+    const { loadProjectConfig } = await import('../utils/config.js');
+    fi.println(chalk.bold.cyan('\n  Uso / Quota\n'));
+    // Check each role CLI
+    const dir = await resolveProjectDir(process.cwd());
+    let config;
+    try {
+        config = await loadProjectConfig(dir);
+    }
+    catch {
+        config = null;
+    }
+    const checks = [];
+    // Check main PKG_NAME (this CLI's own credentials)
+    const mainResult = await qwenUsage();
+    const mainLabel = `${PKG_NAME} (${mainResult.token ? 'coder-model' : '?'})`;
+    if (mainResult.ok) {
+        const exp = mainResult.token ? new Date(mainResult.token.expiresAt).toLocaleTimeString() : '?';
+        checks.push({ key: mainLabel, value: chalk.green(`✓ quota OK — expires ${exp}`) });
+    }
+    else {
+        checks.push({ key: mainLabel, value: chalk.red(`✗ ${mainResult.error}`) });
+    }
+    // Check each configured role CLI
+    if (config?.roles) {
+        for (const [roleName, roleCfg] of Object.entries(config.roles)) {
+            const r = roleCfg;
+            if (!r?.cli)
+                continue;
+            const homeDir = path.join(os.homedir(), '.' + r.cli);
+            const credsPath = path.join(homeDir, 'oauth_creds.json');
+            if (await fileExists(credsPath)) {
+                const result = await qwenUsage(credsPath);
+                const exp = result.token ? new Date(result.token.expiresAt).toLocaleTimeString() : '?';
+                if (result.ok) {
+                    checks.push({ key: `${r.cli} (${roleName})`, value: chalk.green(`✓ quota OK — expires ${exp}`) });
+                }
+                else {
+                    checks.push({ key: `${r.cli} (${roleName})`, value: chalk.red(`✗ ${result.error}`) });
+                }
+            }
+            else {
+                checks.push({ key: `${r.cli} (${roleName})`, value: chalk.yellow('not logged in') });
+            }
+        }
+    }
+    fi.println(renderSectionBox('Quota Status', checks));
+    fi.println('');
+}
 function cmdHelp(fi) {
     const commands = [
         { key: '/setup', value: 'Full interactive setup wizard' },
@@ -703,6 +754,7 @@ function cmdHelp(fi) {
         { key: '/login', value: 'Login (Qwen OAuth or CLI auth)' },
         { key: '/logout', value: 'Logout and clear credentials' },
         { key: '/auth-status', value: 'Show authentication status' },
+        { key: '/usage', value: 'Check quota status for all role CLIs' },
         { key: '/tasks', value: 'List all tasks' },
         { key: '/clear', value: 'Clear the screen' },
         { key: '/help', value: 'Show this help' },
@@ -1067,6 +1119,9 @@ export async function runRepl(resumeSession) {
             case 'auth-status':
                 await cmdAuthStatus(fi);
                 break;
+            case 'usage':
+                await cmdUsage(fi);
+                break;
             case 'tasks':
                 await cmdTasks(fi);
                 break;

package/dist/core/engine.js

@@ -545,6 +545,10 @@ INSTRUCCIONES:
                     log.warn(`${cliName} session expired — using fallback`);
                     return null;
                 }
+                if (err.message?.startsWith('QWEN_QUOTA_EXCEEDED')) {
+                    log.warn(`${cliName} quota exhausted — using fallback`);
+                    return null;
+                }
                 log.warn(`${cliName} direct API call failed: ${err.message}`);
                 return null;
             }

package/dist/index.js

@@ -38,6 +38,7 @@ program
     .option('--model [cli]', 'Alias for --models')
     .option('--reset-coordinator', 'Clear coordinator selection (re-pick on next run)')
     .option('--reset-auth', 'Wipe all auth credentials and start fresh')
+    .option('--usage', 'Check quota status for all role CLIs')
     .addHelpText('after', `
 Setup subcommands:
   agent-mp setup init            Full interactive wizard (login + roles + project)
@@ -131,6 +132,22 @@ if (nativeRole) {
         }
         process.exit(0);
     }
+    // --usage: check quota status with test API call
+    if (args.includes('--usage') || args.includes('usage')) {
+        const { qwenUsage, getTokenPath } = await import('./utils/qwen-auth.js');
+        const result = await qwenUsage();
+        const exp = result.token ? new Date(result.token.expiresAt).toLocaleString() : 'N/A';
+        if (result.ok) {
+            console.log(chalk.green(`  ✓ ${PKG_NAME}: quota OK`));
+            console.log(chalk.dim(`  Token expires: ${exp}`));
+            console.log(chalk.dim(`  Model: ${result.model}`));
+        }
+        else {
+            console.log(chalk.red(`  ✗ ${PKG_NAME}: ${result.error}`));
+            console.log(chalk.dim(`  Token expires: ${exp}`));
+        }
+        process.exit(result.ok ? 0 : 1);
+    }
     // Parse --model flag if provided
     const modelIdx = args.findIndex(a => a === '--model' || a === '-m');
     let model;
@@ -150,6 +167,23 @@ if (nativeRole) {
 }
 // ─────────────────────────────────────────────────────────────────────────────
 program.action(async (task, options) => {
+    // --usage: check quota status
+    if (options.usage) {
+        const { qwenUsage } = await import('./utils/qwen-auth.js');
+        const { PKG_NAME } = await import('./utils/config.js');
+        const result = await qwenUsage();
+        const exp = result.token ? new Date(result.token.expiresAt).toLocaleString() : 'N/A';
+        if (result.ok) {
+            console.log(chalk.green(`  ✓ ${PKG_NAME}: quota OK`));
+            console.log(chalk.dim(`  Token expires: ${exp}`));
+            console.log(chalk.dim(`  Model: ${result.model}`));
+        }
+        else {
+            console.log(chalk.red(`  ✗ ${PKG_NAME}: ${result.error}`));
+            console.log(chalk.dim(`  Token expires: ${exp}`));
+        }
+        process.exit(result.ok ? 0 : 1);
+    }
     if (options.resetCoordinator || options.resetAuth) {
         const authFile = path.join(AGENT_HOME, 'auth.json');
         const qwenCreds = path.join(AGENT_HOME, 'oauth_creds.json');

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

@@ -2,6 +2,13 @@
 export declare const QWEN_AGENT_HOME: string;
 /** Dynamic getter (recommended for runtime changes) */
 export declare function getQwenHome(): string;
+interface QwenToken {
+    accessToken: string;
+    refreshToken: string;
+    expiresAt: number;
+    idToken?: string;
+    resourceUrl?: string;
+}
 export declare function getTokenPath(): Promise<string>;
 export declare function qwenLogin(): Promise<boolean>;
 export declare function qwenAuthStatus(): Promise<{
@@ -20,3 +27,11 @@ export declare function callQwenAPI(prompt: string, model?: string, onData?: (ch
  * Calls the Qwen REST API directly — no dependency on any qwen CLI binary.
  */
 export declare function callQwenAPIFromCreds(prompt: string, model: string, credsPath: string, onData?: (chunk: string) => void): Promise<string>;
+/** Check quota status by making a minimal test API call */
+export declare function qwenUsage(credsPath?: string): Promise<{
+    ok: boolean;
+    token: QwenToken | null;
+    error?: string;
+    model?: string;
+}>;
+export {};

package/dist/utils/qwen-auth.js

@@ -286,9 +286,14 @@ async function callQwenAPIWithToken(token, prompt, model, onData) {
     });
     if (!response.ok) {
         const errorText = await response.text();
-        if (response.status === 401 || (response.status === 429 && errorText.includes('insufficient_quota'))) {
+        // 401 = auth error, refresh may help
+        if (response.status === 401) {
             throw new Error(`QWEN_AUTH_EXPIRED: ${errorText}`);
         }
+        // 429 insufficient_quota = daily quota exhausted, refresh won't help
+        if (response.status === 429 && errorText.includes('insufficient_quota')) {
+            throw new Error(`QWEN_QUOTA_EXCEEDED: ${errorText}`);
+        }
         throw new Error(`Qwen API error: ${response.status} - ${errorText}`);
     }
     if (!useStream) {
@@ -342,6 +347,9 @@ export async function callQwenAPI(prompt, model = 'coder-model', onData) {
         return await callQwenAPIWithToken(token, prompt, model, onData);
     }
     catch (err) {
+        // Quota errors: refresh won't help, propagate immediately
+        if (err.message?.startsWith('QWEN_QUOTA_EXCEEDED'))
+            throw err;
         if (!err.message?.startsWith('QWEN_AUTH_EXPIRED'))
             throw err;
         if (token.refreshToken) {
@@ -390,6 +398,9 @@ export async function callQwenAPIFromCreds(prompt, model, credsPath, onData) {
         return await callQwenAPIWithToken(token, prompt, model, onData);
     }
     catch (err) {
+        // Quota errors: refresh won't help, propagate immediately
+        if (err.message?.startsWith('QWEN_QUOTA_EXCEEDED'))
+            throw err;
         if (!err.message?.startsWith('QWEN_AUTH_EXPIRED'))
             throw err;
         if (token.refreshToken) {
@@ -402,3 +413,80 @@ export async function callQwenAPIFromCreds(prompt, model, credsPath, onData) {
         throw new Error(`QWEN_AUTH_EXPIRED: Sesión expirada. Ejecutá: ${cliName} --login`);
     }
 }
+/** Check quota status by making a minimal test API call */
+export async function qwenUsage(credsPath) {
+    let token;
+    if (credsPath) {
+        try {
+            const raw = JSON.parse(await fs.readFile(credsPath, 'utf-8'));
+            token = {
+                accessToken: raw.accessToken || raw.access_token || '',
+                refreshToken: raw.refreshToken || raw.refresh_token || '',
+                expiresAt: raw.expiresAt || raw.expiry_date || 0,
+                idToken: raw.idToken || raw.id_token,
+                resourceUrl: raw.resourceUrl || raw.resource_url,
+            };
+        }
+        catch {
+            return { ok: false, token: null, error: 'No credentials found' };
+        }
+    }
+    else {
+        token = await loadToken();
+    }
+    if (!token || !token.accessToken) {
+        return { ok: false, token, error: 'No access token — run --login' };
+    }
+    if (token.expiresAt < Date.now()) {
+        // Try refresh
+        if (token.refreshToken) {
+            const refreshed = await doRefreshToken(token.refreshToken);
+            if (refreshed) {
+                token = refreshed;
+                if (!credsPath)
+                    await saveToken(refreshed);
+                else
+                    await fs.writeFile(credsPath, JSON.stringify(refreshed, null, 2), 'utf-8');
+            }
+            else {
+                return { ok: false, token, error: 'Token expired and refresh failed' };
+            }
+        }
+        else {
+            return { ok: false, token, error: 'Token expired, no refresh token' };
+        }
+    }
+    // Make a minimal test call to check quota
+    try {
+        const result = await callQwenAPIWithToken(token, 'ping', 'coder-model');
+        return { ok: true, token, model: 'coder-model' };
+    }
+    catch (err) {
+        // If auth failed, try refresh even if expiresAt hasn't passed yet
+        if (err.message?.startsWith('QWEN_AUTH_EXPIRED') && token.refreshToken) {
+            const refreshed = await doRefreshToken(token.refreshToken);
+            if (refreshed) {
+                token = refreshed;
+                if (!credsPath)
+                    await saveToken(refreshed);
+                else
+                    await fs.writeFile(credsPath, JSON.stringify(refreshed, null, 2), 'utf-8');
+                // Retry with new token
+                try {
+                    await callQwenAPIWithToken(refreshed, 'ping', 'coder-model');
+                    return { ok: true, token: refreshed, model: 'coder-model' };
+                }
+                catch (err2) {
+                    if (err2.message?.startsWith('QWEN_QUOTA_EXCEEDED')) {
+                        return { ok: false, token: refreshed, error: 'Daily quota exhausted — wait or --login with different account' };
+                    }
+                    return { ok: false, token: refreshed, error: err2.message };
+                }
+            }
+        }
+        if (err.message?.startsWith('QWEN_QUOTA_EXCEEDED')) {
+            return { ok: false, token, error: 'Daily quota exhausted — wait or --login with different account' };
+        }
+        return { ok: false, token, error: err.message };
+    }
+}

package/package.json

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