@kaitranntt/ccs 5.9.0-dev.7 → 5.10.0-dev.1

package/VERSION

@@ -1 +1 @@
-5.9.0-dev.7
+5.10.0-dev.1

package/dist/cliproxy/account-manager.d.ts

@@ -0,0 +1,97 @@
+/**
+ * Account Manager for CLIProxyAPI Multi-Account Support
+ *
+ * Manages multiple OAuth accounts per provider (Gemini, Codex, etc.).
+ * Each provider can have multiple accounts, with one designated as default.
+ *
+ * Account storage: ~/.ccs/cliproxy/accounts.json
+ * Token storage: ~/.ccs/cliproxy/auth/ (flat structure, CLIProxyAPI discovers by type field)
+ */
+import { CLIProxyProvider } from './types';
+/** Account information */
+export interface AccountInfo {
+    /** Account identifier (email or custom name) */
+    id: string;
+    /** Email address from OAuth (if available) */
+    email?: string;
+    /** Provider this account belongs to */
+    provider: CLIProxyProvider;
+    /** Whether this is the default account for the provider */
+    isDefault: boolean;
+    /** Token file name in auth directory */
+    tokenFile: string;
+    /** When account was added */
+    createdAt: string;
+    /** Last usage time */
+    lastUsedAt?: string;
+}
+/** Provider accounts configuration */
+interface ProviderAccounts {
+    /** Default account ID for this provider */
+    default: string;
+    /** Map of account ID to account metadata */
+    accounts: Record<string, Omit<AccountInfo, 'id' | 'provider' | 'isDefault'>>;
+}
+/** Accounts registry structure */
+interface AccountsRegistry {
+    /** Version for future migrations */
+    version: number;
+    /** Accounts organized by provider */
+    providers: Partial<Record<CLIProxyProvider, ProviderAccounts>>;
+}
+/**
+ * Get path to accounts registry file
+ */
+export declare function getAccountsRegistryPath(): string;
+/**
+ * Load accounts registry
+ */
+export declare function loadAccountsRegistry(): AccountsRegistry;
+/**
+ * Save accounts registry
+ */
+export declare function saveAccountsRegistry(registry: AccountsRegistry): void;
+/**
+ * Get all accounts for a provider
+ */
+export declare function getProviderAccounts(provider: CLIProxyProvider): AccountInfo[];
+/**
+ * Get default account for a provider
+ */
+export declare function getDefaultAccount(provider: CLIProxyProvider): AccountInfo | null;
+/**
+ * Get specific account by ID
+ */
+export declare function getAccount(provider: CLIProxyProvider, accountId: string): AccountInfo | null;
+/**
+ * Register a new account
+ * Called after successful OAuth to record the account
+ */
+export declare function registerAccount(provider: CLIProxyProvider, tokenFile: string, email?: string): AccountInfo;
+/**
+ * Set default account for a provider
+ */
+export declare function setDefaultAccount(provider: CLIProxyProvider, accountId: string): boolean;
+/**
+ * Remove an account
+ */
+export declare function removeAccount(provider: CLIProxyProvider, accountId: string): boolean;
+/**
+ * Update last used timestamp for an account
+ */
+export declare function touchAccount(provider: CLIProxyProvider, accountId: string): void;
+/**
+ * Get token file path for an account
+ */
+export declare function getAccountTokenPath(provider: CLIProxyProvider, accountId?: string): string | null;
+/**
+ * Auto-discover accounts from existing token files
+ * Called during migration or first run to populate accounts registry
+ */
+export declare function discoverExistingAccounts(): void;
+/**
+ * Get summary of all accounts across providers
+ */
+export declare function getAllAccountsSummary(): Record<CLIProxyProvider, AccountInfo[]>;
+export {};
+//# sourceMappingURL=account-manager.d.ts.map

package/dist/cliproxy/account-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-manager.d.ts","sourceRoot":"","sources":["../../src/cliproxy/account-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAG3C,0BAA0B;AAC1B,MAAM,WAAW,WAAW;IAC1B,gDAAgD;IAChD,EAAE,EAAE,MAAM,CAAC;IACX,8CAA8C;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,2DAA2D;IAC3D,SAAS,EAAE,OAAO,CAAC;IACnB,wCAAwC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,6BAA6B;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,sCAAsC;AACtC,UAAU,gBAAgB;IACxB,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC;CAC9E;AAED,kCAAkC;AAClC,UAAU,gBAAgB;IACxB,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,qCAAqC;IACrC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC;CAChE;AAQD;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,gBAAgB,CAiBvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAWrE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,WAAW,EAAE,CAc7E;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,WAAW,GAAG,IAAI,CAGhF;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAG5F;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,GACb,WAAW,CA4Cb;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAWxF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAgCpF;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAQhF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQjG;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CA6E/C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAAC,gBAAgB,EAAE,WAAW,EAAE,CAAC,CAY/E"}

package/dist/cliproxy/account-manager.js

@@ -0,0 +1,314 @@
+"use strict";
+/**
+ * Account Manager for CLIProxyAPI Multi-Account Support
+ *
+ * Manages multiple OAuth accounts per provider (Gemini, Codex, etc.).
+ * Each provider can have multiple accounts, with one designated as default.
+ *
+ * Account storage: ~/.ccs/cliproxy/accounts.json
+ * Token storage: ~/.ccs/cliproxy/auth/ (flat structure, CLIProxyAPI discovers by type field)
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllAccountsSummary = exports.discoverExistingAccounts = exports.getAccountTokenPath = exports.touchAccount = exports.removeAccount = exports.setDefaultAccount = exports.registerAccount = exports.getAccount = exports.getDefaultAccount = exports.getProviderAccounts = exports.saveAccountsRegistry = exports.loadAccountsRegistry = exports.getAccountsRegistryPath = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const config_generator_1 = require("./config-generator");
+/** Default registry structure */
+const DEFAULT_REGISTRY = {
+    version: 1,
+    providers: {},
+};
+/**
+ * Get path to accounts registry file
+ */
+function getAccountsRegistryPath() {
+    return path.join((0, config_generator_1.getCliproxyDir)(), 'accounts.json');
+}
+exports.getAccountsRegistryPath = getAccountsRegistryPath;
+/**
+ * Load accounts registry
+ */
+function loadAccountsRegistry() {
+    const registryPath = getAccountsRegistryPath();
+    if (!fs.existsSync(registryPath)) {
+        return { ...DEFAULT_REGISTRY };
+    }
+    try {
+        const content = fs.readFileSync(registryPath, 'utf-8');
+        const data = JSON.parse(content);
+        return {
+            version: data.version || 1,
+            providers: data.providers || {},
+        };
+    }
+    catch {
+        return { ...DEFAULT_REGISTRY };
+    }
+}
+exports.loadAccountsRegistry = loadAccountsRegistry;
+/**
+ * Save accounts registry
+ */
+function saveAccountsRegistry(registry) {
+    const registryPath = getAccountsRegistryPath();
+    const dir = path.dirname(registryPath);
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
+    }
+    fs.writeFileSync(registryPath, JSON.stringify(registry, null, 2) + '\n', {
+        mode: 0o600,
+    });
+}
+exports.saveAccountsRegistry = saveAccountsRegistry;
+/**
+ * Get all accounts for a provider
+ */
+function getProviderAccounts(provider) {
+    const registry = loadAccountsRegistry();
+    const providerAccounts = registry.providers[provider];
+    if (!providerAccounts) {
+        return [];
+    }
+    return Object.entries(providerAccounts.accounts).map(([id, meta]) => ({
+        id,
+        provider,
+        isDefault: id === providerAccounts.default,
+        ...meta,
+    }));
+}
+exports.getProviderAccounts = getProviderAccounts;
+/**
+ * Get default account for a provider
+ */
+function getDefaultAccount(provider) {
+    const accounts = getProviderAccounts(provider);
+    return accounts.find((a) => a.isDefault) || accounts[0] || null;
+}
+exports.getDefaultAccount = getDefaultAccount;
+/**
+ * Get specific account by ID
+ */
+function getAccount(provider, accountId) {
+    const accounts = getProviderAccounts(provider);
+    return accounts.find((a) => a.id === accountId) || null;
+}
+exports.getAccount = getAccount;
+/**
+ * Register a new account
+ * Called after successful OAuth to record the account
+ */
+function registerAccount(provider, tokenFile, email) {
+    const registry = loadAccountsRegistry();
+    // Initialize provider section if needed
+    if (!registry.providers[provider]) {
+        registry.providers[provider] = {
+            default: 'default',
+            accounts: {},
+        };
+    }
+    const providerAccounts = registry.providers[provider];
+    if (!providerAccounts) {
+        throw new Error('Failed to initialize provider accounts');
+    }
+    // Determine account ID
+    const accountId = email || 'default';
+    const isFirstAccount = Object.keys(providerAccounts.accounts).length === 0;
+    // Create or update account
+    providerAccounts.accounts[accountId] = {
+        email,
+        tokenFile,
+        createdAt: new Date().toISOString(),
+        lastUsedAt: new Date().toISOString(),
+    };
+    // Set as default if first account
+    if (isFirstAccount) {
+        providerAccounts.default = accountId;
+    }
+    saveAccountsRegistry(registry);
+    return {
+        id: accountId,
+        provider,
+        isDefault: accountId === providerAccounts.default,
+        email,
+        tokenFile,
+        createdAt: providerAccounts.accounts[accountId].createdAt,
+        lastUsedAt: providerAccounts.accounts[accountId].lastUsedAt,
+    };
+}
+exports.registerAccount = registerAccount;
+/**
+ * Set default account for a provider
+ */
+function setDefaultAccount(provider, accountId) {
+    const registry = loadAccountsRegistry();
+    const providerAccounts = registry.providers[provider];
+    if (!providerAccounts || !providerAccounts.accounts[accountId]) {
+        return false;
+    }
+    providerAccounts.default = accountId;
+    saveAccountsRegistry(registry);
+    return true;
+}
+exports.setDefaultAccount = setDefaultAccount;
+/**
+ * Remove an account
+ */
+function removeAccount(provider, accountId) {
+    const registry = loadAccountsRegistry();
+    const providerAccounts = registry.providers[provider];
+    if (!providerAccounts || !providerAccounts.accounts[accountId]) {
+        return false;
+    }
+    // Get token file to delete
+    const tokenFile = providerAccounts.accounts[accountId].tokenFile;
+    const tokenPath = path.join((0, config_generator_1.getAuthDir)(), tokenFile);
+    // Delete token file
+    if (fs.existsSync(tokenPath)) {
+        try {
+            fs.unlinkSync(tokenPath);
+        }
+        catch {
+            // Ignore deletion errors
+        }
+    }
+    // Remove from registry
+    delete providerAccounts.accounts[accountId];
+    // Update default if needed
+    const remainingAccounts = Object.keys(providerAccounts.accounts);
+    if (providerAccounts.default === accountId && remainingAccounts.length > 0) {
+        providerAccounts.default = remainingAccounts[0];
+    }
+    saveAccountsRegistry(registry);
+    return true;
+}
+exports.removeAccount = removeAccount;
+/**
+ * Update last used timestamp for an account
+ */
+function touchAccount(provider, accountId) {
+    const registry = loadAccountsRegistry();
+    const providerAccounts = registry.providers[provider];
+    if (providerAccounts?.accounts[accountId]) {
+        providerAccounts.accounts[accountId].lastUsedAt = new Date().toISOString();
+        saveAccountsRegistry(registry);
+    }
+}
+exports.touchAccount = touchAccount;
+/**
+ * Get token file path for an account
+ */
+function getAccountTokenPath(provider, accountId) {
+    const account = accountId ? getAccount(provider, accountId) : getDefaultAccount(provider);
+    if (!account) {
+        return null;
+    }
+    return path.join((0, config_generator_1.getAuthDir)(), account.tokenFile);
+}
+exports.getAccountTokenPath = getAccountTokenPath;
+/**
+ * Auto-discover accounts from existing token files
+ * Called during migration or first run to populate accounts registry
+ */
+function discoverExistingAccounts() {
+    const authDir = (0, config_generator_1.getAuthDir)();
+    if (!fs.existsSync(authDir)) {
+        return;
+    }
+    const registry = loadAccountsRegistry();
+    const files = fs.readdirSync(authDir);
+    for (const file of files) {
+        if (!file.endsWith('.json'))
+            continue;
+        const filePath = path.join(authDir, file);
+        try {
+            const content = fs.readFileSync(filePath, 'utf-8');
+            const data = JSON.parse(content);
+            // Skip if no type field
+            if (!data.type)
+                continue;
+            // Map token type values to internal provider names
+            // CLIProxyAPI uses different type values in tokens (e.g., "antigravity" vs "agy")
+            const typeToProvider = {
+                gemini: 'gemini',
+                antigravity: 'agy',
+                codex: 'codex',
+                qwen: 'qwen',
+                iflow: 'iflow',
+            };
+            const typeValue = data.type.toLowerCase();
+            const provider = typeToProvider[typeValue];
+            // Skip if unknown provider type
+            if (!provider) {
+                continue;
+            }
+            // Extract email if available
+            const email = data.email || undefined;
+            const accountId = email || 'default';
+            // Initialize provider section if needed
+            if (!registry.providers[provider]) {
+                registry.providers[provider] = {
+                    default: accountId,
+                    accounts: {},
+                };
+            }
+            const providerAccounts = registry.providers[provider];
+            if (!providerAccounts)
+                continue;
+            // Skip if account already registered
+            if (providerAccounts.accounts[accountId]) {
+                continue;
+            }
+            // Get file stats for creation time
+            const stats = fs.statSync(filePath);
+            // Register account
+            providerAccounts.accounts[accountId] = {
+                email,
+                tokenFile: file,
+                createdAt: stats.birthtime?.toISOString() || new Date().toISOString(),
+                lastUsedAt: stats.mtime?.toISOString(),
+            };
+        }
+        catch {
+            // Skip invalid files
+            continue;
+        }
+    }
+    saveAccountsRegistry(registry);
+}
+exports.discoverExistingAccounts = discoverExistingAccounts;
+/**
+ * Get summary of all accounts across providers
+ */
+function getAllAccountsSummary() {
+    const providers = ['gemini', 'codex', 'agy', 'qwen', 'iflow'];
+    const summary = {};
+    for (const provider of providers) {
+        summary[provider] = getProviderAccounts(provider);
+    }
+    return summary;
+}
+exports.getAllAccountsSummary = getAllAccountsSummary;
+//# sourceMappingURL=account-manager.js.map

package/dist/cliproxy/account-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-manager.js","sourceRoot":"","sources":["../../src/cliproxy/account-manager.ts"],"names":[],"mappings":"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"}

package/dist/cliproxy/auth-handler.d.ts

@@ -12,6 +12,7 @@
  * Each provider has its own directory to avoid conflicts.
  */
 import { CLIProxyProvider } from './types';
+import { AccountInfo } from './account-manager';
 /**
  * Auth status for a provider
  */
@@ -26,6 +27,10 @@ export interface AuthStatus {
     tokenFiles: string[];
     /** When last authenticated (if known) */
     lastAuth?: Date;
+    /** Accounts registered for this provider (multi-account support) */
+    accounts: AccountInfo[];
+    /** Default account ID */
+    defaultAccount?: string;
 }
 /**
  * OAuth config for each provider
@@ -76,19 +81,32 @@ export declare function clearAuth(provider: CLIProxyProvider): boolean;
 /**
  * Trigger OAuth flow for provider
  * Auto-detects headless environment and uses --no-browser flag accordingly
+ * @param provider - The CLIProxy provider to authenticate
+ * @param options - OAuth options
+ * @returns Account info if successful, null otherwise
  */
 export declare function triggerOAuth(provider: CLIProxyProvider, options?: {
     verbose?: boolean;
     headless?: boolean;
-}): Promise<boolean>;
+    account?: string;
+}): Promise<AccountInfo | null>;
 /**
  * Ensure provider is authenticated
  * Triggers OAuth flow if not authenticated
+ * @param provider - The CLIProxy provider
+ * @param options - Auth options including optional account
+ * @returns true if authenticated, false otherwise
  */
 export declare function ensureAuth(provider: CLIProxyProvider, options?: {
     verbose?: boolean;
     headless?: boolean;
+    account?: string;
 }): Promise<boolean>;
+/**
+ * Initialize accounts registry from existing tokens
+ * Should be called on startup to populate accounts from existing token files
+ */
+export declare function initializeAccounts(): void;
 /**
  * Display auth status for all providers
  */

package/dist/cliproxy/auth-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-handler.d.ts","sourceRoot":"","sources":["../../src/cliproxy/auth-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAQH,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAsF3C;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,oBAAoB;IACpB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,oCAAoC;IACpC,aAAa,EAAE,OAAO,CAAC;IACvB,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,6BAA6B;IAC7B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,yCAAyC;IACzC,QAAQ,CAAC,EAAE,IAAI,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,mBAAmB;IAC3B,0BAA0B;IAC1B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,mBAAmB;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,gDAAgD;IAChD,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,wBAAwB;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB;AA4CD;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,GAAG,mBAAmB,CAM9E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAEtE;AA2CD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAkCnE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,UAAU,CA8CpE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,UAAU,EAAE,CAG/C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAkC7D;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAO,GACtD,OAAO,CAAC,OAAO,CAAC,CA6KlB;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAO,GACtD,OAAO,CAAC,OAAO,CAAC,CAclB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAkBxC"}
+{"version":3,"file":"auth-handler.d.ts","sourceRoot":"","sources":["../../src/cliproxy/auth-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAQH,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EACL,WAAW,EAMZ,MAAM,mBAAmB,CAAC;AAsF3B;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,oBAAoB;IACpB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,oCAAoC;IACpC,aAAa,EAAE,OAAO,CAAC;IACvB,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,6BAA6B;IAC7B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,yCAAyC;IACzC,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,oEAAoE;IACpE,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,yBAAyB;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,UAAU,mBAAmB;IAC3B,0BAA0B;IAC1B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,mBAAmB;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,gDAAgD;IAChD,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,wBAAwB;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB;AA4CD;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,GAAG,mBAAmB,CAM9E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAEtE;AA2CD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAkCnE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,UAAU,CAoDpE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,UAAU,EAAE,CAG/C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAkC7D;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACxE,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAgL7B;AA8CD;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACxE,OAAO,CAAC,OAAO,CAAC,CAoBlB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAkBxC"}

package/dist/cliproxy/auth-handler.js

@@ -36,13 +36,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.displayAuthStatus = exports.ensureAuth = exports.triggerOAuth = exports.clearAuth = exports.getAllAuthStatus = exports.getAuthStatus = exports.isAuthenticated = exports.getProviderTokenDir = exports.getOAuthConfig = void 0;
+exports.displayAuthStatus = exports.initializeAccounts = exports.ensureAuth = exports.triggerOAuth = exports.clearAuth = exports.getAllAuthStatus = exports.getAuthStatus = exports.isAuthenticated = exports.getProviderTokenDir = exports.getOAuthConfig = void 0;
 const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const progress_indicator_1 = require("../utils/progress-indicator");
 const binary_manager_1 = require("./binary-manager");
 const config_generator_1 = require("./config-generator");
+const account_manager_1 = require("./account-manager");
 /**
  * OAuth callback ports used by CLIProxyAPI (hardcoded in binary)
  * See: https://github.com/router-for-me/CLIProxyAPI/tree/main/internal/auth
@@ -297,12 +298,17 @@ function getAuthStatus(provider) {
             }
         }
     }
+    // Get registered accounts for multi-account support
+    const accounts = (0, account_manager_1.getProviderAccounts)(provider);
+    const defaultAccount = (0, account_manager_1.getDefaultAccount)(provider);
     return {
         provider,
         authenticated: tokenFiles.length > 0,
         tokenDir,
         tokenFiles,
         lastAuth,
+        accounts,
+        defaultAccount: defaultAccount?.id,
     };
 }
 exports.getAuthStatus = getAuthStatus;
@@ -352,6 +358,9 @@ exports.clearAuth = clearAuth;
 /**
  * Trigger OAuth flow for provider
  * Auto-detects headless environment and uses --no-browser flag accordingly
+ * @param provider - The CLIProxy provider to authenticate
+ * @param options - OAuth options
+ * @returns Account info if successful, null otherwise
  */
 async function triggerOAuth(provider, options = {}) {
     const oauthConfig = getOAuthConfig(provider);
@@ -465,7 +474,7 @@ async function triggerOAuth(provider, options = {}) {
                 console.error('  - Make sure a browser is available');
                 console.error('  - Try running with --verbose for details');
             }
-            resolve(false);
+            resolve(null);
         }, timeoutMs);
         authProcess.on('exit', (code) => {
             clearTimeout(timeout);
@@ -475,7 +484,9 @@ async function triggerOAuth(provider, options = {}) {
                     if (!headless)
                         spinner.succeed(`Authenticated with ${oauthConfig.displayName}`);
                     console.log('[OK] Authentication successful');
-                    resolve(true);
+                    // Register the account in accounts registry
+                    const account = registerAccountFromToken(provider, tokenDir);
+                    resolve(account);
                 }
                 else {
                     if (!headless)
@@ -491,7 +502,7 @@ async function triggerOAuth(provider, options = {}) {
                         console.error('    The OAuth flow may have been cancelled or callback port was in use');
                         console.error(`    Try: pkill -f cli-proxy-api && ccs ${provider} --auth`);
                     }
-                    resolve(false);
+                    resolve(null);
                 }
             }
             else {
@@ -506,7 +517,7 @@ async function triggerOAuth(provider, options = {}) {
                     console.error('');
                     console.error('[i] No OAuth URL was displayed. Try with --verbose for details.');
                 }
-                resolve(false);
+                resolve(null);
             }
         });
         authProcess.on('error', (error) => {
@@ -514,14 +525,53 @@ async function triggerOAuth(provider, options = {}) {
             if (!headless)
                 spinner.fail('Authentication error');
             console.error(`[X] Failed to start auth process: ${error.message}`);
-            resolve(false);
+            resolve(null);
         });
     });
 }
 exports.triggerOAuth = triggerOAuth;
+/**
+ * Register account from newly created token file
+ * Scans auth directory for new token and extracts email
+ */
+function registerAccountFromToken(provider, tokenDir) {
+    try {
+        const files = fs.readdirSync(tokenDir);
+        const jsonFiles = files.filter((f) => f.endsWith('.json'));
+        // Find newest token file for this provider
+        let newestFile = null;
+        let newestMtime = 0;
+        for (const file of jsonFiles) {
+            const filePath = path.join(tokenDir, file);
+            if (!isTokenFileForProvider(filePath, provider))
+                continue;
+            const stats = fs.statSync(filePath);
+            if (stats.mtimeMs > newestMtime) {
+                newestMtime = stats.mtimeMs;
+                newestFile = file;
+            }
+        }
+        if (!newestFile) {
+            return null;
+        }
+        // Read token to extract email
+        const tokenPath = path.join(tokenDir, newestFile);
+        const content = fs.readFileSync(tokenPath, 'utf-8');
+        const data = JSON.parse(content);
+        const email = data.email || undefined;
+        // Register the account
+        return (0, account_manager_1.registerAccount)(provider, newestFile, email);
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Ensure provider is authenticated
  * Triggers OAuth flow if not authenticated
+ * @param provider - The CLIProxy provider
+ * @param options - Auth options including optional account
+ * @returns true if authenticated, false otherwise
  */
 async function ensureAuth(provider, options = {}) {
     // Check if already authenticated
@@ -529,14 +579,28 @@ async function ensureAuth(provider, options = {}) {
         if (options.verbose) {
             console.error(`[auth] ${provider} already authenticated`);
         }
+        // Touch the account to update last used time
+        const defaultAccount = (0, account_manager_1.getDefaultAccount)(provider);
+        if (defaultAccount) {
+            (0, account_manager_1.touchAccount)(provider, options.account || defaultAccount.id);
+        }
         return true;
     }
     // Not authenticated - trigger OAuth
     const oauthConfig = getOAuthConfig(provider);
     console.log(`[i] ${oauthConfig.displayName} authentication required`);
-    return triggerOAuth(provider, options);
+    const account = await triggerOAuth(provider, options);
+    return account !== null;
 }
 exports.ensureAuth = ensureAuth;
+/**
+ * Initialize accounts registry from existing tokens
+ * Should be called on startup to populate accounts from existing token files
+ */
+function initializeAccounts() {
+    (0, account_manager_1.discoverExistingAccounts)();
+}
+exports.initializeAccounts = initializeAccounts;
 /**
  * Display auth status for all providers
  */