agent-mp 0.5.22 → 0.5.24

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

@@ -1,3 +1,14 @@
+export declare const DEFAULT_API_BASE_URL = "https://dashscope-intl.aliyuncs.com/compatible-mode/v1";
+export interface ApiKeyConfig {
+    provider: string;
+    api_key: string;
+    base_url: string;
+    model: string;
+}
+export declare function getApiKeyConfigPath(): Promise<string>;
+export declare function loadApiKeyConfig(): Promise<ApiKeyConfig | null>;
+export declare function saveApiKeyConfig(cfg: ApiKeyConfig): Promise<void>;
+export declare function fetchApiKeyModels(cfg?: ApiKeyConfig | null): Promise<string[]>;
 /** Exported as const for backward compat */
 export declare const QWEN_AGENT_HOME: string;
 /** Dynamic getter (recommended for runtime changes) */
@@ -14,17 +25,16 @@ export declare function qwenLogin(): Promise<boolean>;
 export declare function qwenAuthStatus(): Promise<{
     authenticated: boolean;
     email?: string;
+    method?: string;
 }>;
 export declare function fetchQwenModels(): Promise<string[]>;
 export declare function getQwenAccessToken(): Promise<string | null>;
 /**
- * Call Qwen REST API directly using OAuth credentials stored locally.
- * No dependency on any qwen CLI binary.
+ * Call Qwen REST API directly. Tries API key first, falls back to OAuth.
  */
 export declare function callQwenAPI(prompt: string, model?: string, onData?: (chunk: string) => void): Promise<string>;
 /**
- * Call Qwen API using credentials stored at a specific path (for role binaries).
- * Calls the Qwen REST API directly — no dependency on any qwen CLI binary.
+ * Call Qwen API using role-specific OAuth creds or global API key config.
  */
 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 */

package/dist/utils/qwen-auth.js

@@ -2,7 +2,71 @@ import * as fs from 'fs/promises';
 import * as path from 'path';
 import * as crypto from 'crypto';
 import open from 'open';
+import OpenAI from 'openai';
 import { AGENT_HOME } from './config.js';
+// ── API Key (OpenAI-compatible) ───────────────────────────────────────────────
+export const DEFAULT_API_BASE_URL = 'https://dashscope-intl.aliyuncs.com/compatible-mode/v1';
+export async function getApiKeyConfigPath() {
+    await fs.mkdir(AGENT_HOME, { recursive: true });
+    return path.join(AGENT_HOME, 'api_key.json');
+}
+export async function loadApiKeyConfig() {
+    try {
+        const content = await fs.readFile(await getApiKeyConfigPath(), 'utf-8');
+        const cfg = JSON.parse(content);
+        if (!cfg.api_key || !cfg.base_url)
+            return null;
+        return cfg;
+    }
+    catch {
+        return null;
+    }
+}
+export async function saveApiKeyConfig(cfg) {
+    await fs.writeFile(await getApiKeyConfigPath(), JSON.stringify(cfg, null, 2), 'utf-8');
+}
+export async function fetchApiKeyModels(cfg) {
+    const resolved = cfg ?? await loadApiKeyConfig();
+    if (!resolved?.api_key)
+        return [];
+    try {
+        const client = new OpenAI({ apiKey: resolved.api_key, baseURL: resolved.base_url });
+        const list = await client.models.list();
+        return list.data.map((m) => m.id).sort();
+    }
+    catch {
+        return [];
+    }
+}
+async function callWithApiKey(cfg, prompt, model, onData) {
+    const useModel = (model && model !== 'coder-model') ? model : cfg.model;
+    const client = new OpenAI({
+        apiKey: cfg.api_key,
+        baseURL: cfg.base_url,
+    });
+    if (!onData) {
+        const completion = await client.chat.completions.create({
+            model: useModel,
+            messages: [{ role: 'user', content: prompt }],
+        });
+        return completion.choices[0]?.message?.content ?? '';
+    }
+    let fullText = '';
+    const stream = await client.chat.completions.create({
+        model: useModel,
+        messages: [{ role: 'user', content: prompt }],
+        stream: true,
+    });
+    for await (const chunk of stream) {
+        const delta = chunk.choices[0]?.delta?.content ?? '';
+        if (delta) {
+            fullText += delta;
+            onData(delta);
+        }
+    }
+    return fullText;
+}
+// ── OAuth ─────────────────────────────────────────────────────────────────────
 const QWEN_OAUTH_BASE_URL = 'https://chat.qwen.ai';
 const QWEN_OAUTH_DEVICE_CODE_ENDPOINT = `${QWEN_OAUTH_BASE_URL}/api/v1/oauth2/device/code`;
 const QWEN_OAUTH_TOKEN_ENDPOINT = `${QWEN_OAUTH_BASE_URL}/api/v1/oauth2/token`;
@@ -223,13 +287,16 @@ async function pollForToken(deviceCode, codeVerifier, interval, expiresIn) {
     return null;
 }
 export async function qwenAuthStatus() {
+    const apiKeyCfg = await loadApiKeyConfig();
+    if (apiKeyCfg?.api_key) {
+        return { authenticated: true, method: 'apikey', email: `${apiKeyCfg.provider} / ${apiKeyCfg.model}` };
+    }
     const token = await loadToken();
     if (!token)
         return { authenticated: false };
-    // Verify token is not expired (loadToken already refreshes if close to expiry)
     if (token.expiresAt > 0 && token.expiresAt < Date.now())
         return { authenticated: false };
-    return { authenticated: true };
+    return { authenticated: true, method: 'oauth' };
 }
 export async function fetchQwenModels() {
     const token = await loadToken();
@@ -335,19 +402,21 @@ async function callQwenAPIWithToken(token, prompt, model, onData) {
     return fullText;
 }
 /**
- * Call Qwen REST API directly using OAuth credentials stored locally.
- * No dependency on any qwen CLI binary.
+ * Call Qwen REST API directly. Tries API key first, falls back to OAuth.
  */
 export async function callQwenAPI(prompt, model = 'coder-model', onData) {
+    const apiKeyCfg = await loadApiKeyConfig();
+    if (apiKeyCfg) {
+        return callWithApiKey(apiKeyCfg, prompt, model, onData);
+    }
     let token = await loadToken();
     if (!token) {
-        throw new Error('QWEN_AUTH_EXPIRED: No hay token de Qwen. Ejecutá --login primero.');
+        throw new Error('No auth configured. Run: agent-mp --login  or  agent-mp setup api-key');
     }
     try {
         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'))
@@ -363,10 +432,14 @@ export async function callQwenAPI(prompt, model = 'coder-model', onData) {
     }
 }
 /**
- * Call Qwen API using credentials stored at a specific path (for role binaries).
- * Calls the Qwen REST API directly — no dependency on any qwen CLI binary.
+ * Call Qwen API using role-specific OAuth creds or global API key config.
  */
 export async function callQwenAPIFromCreds(prompt, model, credsPath, onData) {
+    // Prefer global API key config over role-specific OAuth creds
+    const apiKeyCfg = await loadApiKeyConfig();
+    if (apiKeyCfg) {
+        return callWithApiKey(apiKeyCfg, prompt, model, onData);
+    }
     const cliName = path.basename(path.dirname(credsPath)).replace(/^\./, '');
     let raw;
     try {

package/package.json

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