@asframe/opencode-iflow-auth 1.0.3 → 1.0.4

package/dist/plugin-proxy.js

@@ -3,10 +3,11 @@ import { AccountManager, generateAccountId } from "./plugin/accounts.js";
 import { authorizeIFlowOAuth } from "./iflow/oauth.js";
 import { validateApiKey } from "./iflow/apikey.js";
 import { startOAuthServer } from "./plugin/server.js";
-import { startProxy } from "./iflow/proxy.js";
+import { startProxy, getProxyInstance } from "./iflow/proxy.js";
 import { promptApiKey, promptEmail, } from "./plugin/cli.js";
 import { IFLOW_CONSTANTS, registerIFlowModels } from "./constants.js";
 const DEBUG = process.env.IFLOW_PROXY_DEBUG === 'true';
+const AUTO_START_PROXY = process.env.IFLOW_AUTO_START_PROXY !== 'false';
 function log(...args) {
     if (DEBUG) {
         console.error('[iflow-proxy]', ...args);
@@ -20,11 +21,25 @@ const openBrowser = (url) => {
         });
     }
 };
+let proxyStarted = false;
+async function ensureProxyStarted() {
+    if (!proxyStarted) {
+        if (AUTO_START_PROXY) {
+            log('Starting CLI proxy...');
+            const proxy = await startProxy();
+            proxyStarted = true;
+            log('CLI proxy started at:', proxy.getBaseUrl());
+            return proxy.getBaseUrl();
+        }
+    }
+    return getProxyInstance().getBaseUrl();
+}
 export const IFlowProxyPlugin = async (input) => {
     const config = loadConfig();
     const showToast = (message, variant) => {
         input.client.tui.showToast({ body: { message, variant } }).catch(() => { });
     };
+    await ensureProxyStarted();
     return {
         auth: {
             provider: "iflow-proxy",
@@ -35,34 +50,39 @@ export const IFlowProxyPlugin = async (input) => {
                 const am = await AccountManager.loadFromDisk(config.account_selection_strategy);
                 log('account count:', am.getAccountCount());
                 registerIFlowModels(provider);
-                const accountCount = am.getAccountCount();
-                if (accountCount === 0) {
-                    log('No accounts found in loader');
+                const proxyUrl = getProxyInstance().getBaseUrl();
+                const proxy = getProxyInstance();
+                if (!proxy.isCLIAvailable()) {
+                    log('CLI not available, returning error');
+                    showToast('iflow CLI is not available. Please install: npm install -g iflow-cli', 'error');
                     return {};
                 }
-                const firstAccount = am.getCurrentOrNext();
-                if (!firstAccount) {
-                    log('No available account');
+                if (!proxy.isCLILoggedIn()) {
+                    log('CLI not logged in, returning error');
+                    showToast('iflow CLI is not logged in. Please run: iflow login', 'error');
                     return {};
                 }
-                log('Using account:', firstAccount.email, 'apiKey:', firstAccount.apiKey.substring(0, 10) + '...');
-                try {
-                    log('Starting CLI proxy...');
-                    const proxy = await startProxy();
-                    const proxyUrl = proxy.getBaseUrl();
-                    log('CLI proxy started at:', proxyUrl);
+                const accountCount = am.getAccountCount();
+                if (accountCount === 0) {
+                    log('No accounts found, using CLI auth directly');
                     return {
-                        apiKey: firstAccount.apiKey,
+                        apiKey: 'cli-auth',
                         baseURL: proxyUrl,
                     };
                 }
-                catch (err) {
-                    log('Failed to start proxy, using direct API:', err.message);
+                const firstAccount = am.getCurrentOrNext();
+                if (!firstAccount) {
+                    log('No available account');
                     return {
-                        apiKey: firstAccount.apiKey,
-                        baseURL: IFLOW_CONSTANTS.BASE_URL,
+                        apiKey: 'cli-auth',
+                        baseURL: proxyUrl,
                     };
                 }
+                log('Using account:', firstAccount.email, 'apiKey:', firstAccount.apiKey.substring(0, 10) + '...');
+                return {
+                    apiKey: firstAccount.apiKey,
+                    baseURL: proxyUrl,
+                };
             },
             methods: [
                 {
@@ -109,7 +129,7 @@ export const IFlowProxyPlugin = async (input) => {
                                 url: "",
                                 instructions: "Authorization failed",
                                 method: "auto",
-                                callback: async () => ({ type: "failed" }),
+                                callback: async () => ({ type: "failed" })
                             });
                         }
                     }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asframe/opencode-iflow-auth",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "OpenCode plugin for iFlow.cn - Access Qwen, DeepSeek, Kimi, GLM-5 models with OAuth 2.0, API Key, and CLI Proxy support",
   "type": "module",
   "main": "dist/index.js",