@georgedong32/ccs 7.67.1 → 8.0.1

package/dist/cliproxy/services/catalog-cache.js

@@ -0,0 +1,347 @@
+"use strict";
+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.getResolvedCatalogSnapshot = exports.getAllResolvedCatalogs = exports.getResolvedCatalog = exports.mergeCatalog = exports.refreshCatalogFromProxy = exports.getCacheAge = exports.clearCatalogCache = exports.setCachedCatalog = exports.getCachedCatalog = exports.SYNCABLE_PROVIDERS = exports.PROVIDER_TO_CHANNEL = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const model_catalog_1 = require("../model-catalog");
+const model_id_normalizer_1 = require("../ai-providers/model-id-normalizer");
+const proxy_target_resolver_1 = require("../proxy/proxy-target-resolver");
+const config_loader_facade_1 = require("../../config/config-loader-facade");
+const CACHE_FILE_NAME = 'model-catalog-cache.json';
+const CACHE_TTL_MS = 24 * 60 * 60 * 1000; // 24 hours
+const LIVE_FETCH_TIMEOUT_MS = 3000;
+/** Channel name → CCS provider mapping */
+const CHANNEL_TO_PROVIDER = {
+    antigravity: 'agy',
+    claude: 'claude',
+    gemini: 'gemini',
+    codex: 'codex',
+    qwen: 'qwen',
+    iflow: 'iflow',
+    kimi: 'kimi',
+    kiro: 'kiro',
+    'github-copilot': 'ghcp',
+};
+/** CCS provider → channel name mapping (reverse) */
+exports.PROVIDER_TO_CHANNEL = Object.fromEntries(Object.entries(CHANNEL_TO_PROVIDER).map(([k, v]) => [v, k]));
+/** Providers to sync from CLIProxyAPI */
+exports.SYNCABLE_PROVIDERS = [
+    ...new Set(Object.values(CHANNEL_TO_PROVIDER)),
+];
+function getCacheFilePath() {
+    return path.join((0, config_loader_facade_1.getCcsDir)(), CACHE_FILE_NAME);
+}
+/** Read cached catalog data, null if expired or missing */
+function getCachedCatalog() {
+    try {
+        const filePath = getCacheFilePath();
+        if (!fs.existsSync(filePath))
+            return null;
+        const data = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        if (Date.now() - data.fetchedAt > CACHE_TTL_MS)
+            return null;
+        return data;
+    }
+    catch {
+        return null;
+    }
+}
+exports.getCachedCatalog = getCachedCatalog;
+/** Save catalog data to cache */
+function setCachedCatalog(providers) {
+    try {
+        const filePath = getCacheFilePath();
+        const dir = path.dirname(filePath);
+        if (!fs.existsSync(dir))
+            fs.mkdirSync(dir, { recursive: true });
+        fs.writeFileSync(filePath, JSON.stringify({ providers, fetchedAt: Date.now() }));
+    }
+    catch {
+        // Ignore cache write errors
+    }
+}
+exports.setCachedCatalog = setCachedCatalog;
+/** Delete cache file */
+function clearCatalogCache() {
+    try {
+        const filePath = getCacheFilePath();
+        if (fs.existsSync(filePath)) {
+            fs.unlinkSync(filePath);
+            return true;
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
+exports.clearCatalogCache = clearCatalogCache;
+/** Get cache age in human-readable format, or null if no cache */
+function getCacheAge() {
+    try {
+        const filePath = getCacheFilePath();
+        if (!fs.existsSync(filePath))
+            return null;
+        const data = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        const ageMs = Date.now() - data.fetchedAt;
+        const hours = Math.floor(ageMs / (60 * 60 * 1000));
+        const minutes = Math.floor((ageMs % (60 * 60 * 1000)) / (60 * 1000));
+        if (hours > 0)
+            return `${hours}h ${minutes}m ago`;
+        return `${minutes}m ago`;
+    }
+    catch {
+        return null;
+    }
+}
+exports.getCacheAge = getCacheAge;
+async function fetchProviderCatalog(provider) {
+    const channel = exports.PROVIDER_TO_CHANNEL[provider];
+    if (!channel) {
+        return [provider, null];
+    }
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), LIVE_FETCH_TIMEOUT_MS);
+    try {
+        const target = (0, proxy_target_resolver_1.getProxyTarget)();
+        const response = await fetch((0, proxy_target_resolver_1.buildProxyUrl)(target, `/v0/management/model-definitions/${channel}`), {
+            signal: controller.signal,
+            headers: (0, proxy_target_resolver_1.buildManagementHeaders)(target),
+        });
+        if (!response.ok) {
+            return [provider, null];
+        }
+        const data = (await response.json());
+        return [provider, Array.isArray(data.models) ? data.models : null];
+    }
+    catch {
+        return [provider, null];
+    }
+    finally {
+        clearTimeout(timeoutId);
+    }
+}
+async function isProxyCatalogReachable() {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 1000);
+    try {
+        const target = (0, proxy_target_resolver_1.getProxyTarget)();
+        const response = await fetch((0, proxy_target_resolver_1.buildProxyUrl)(target, '/'), {
+            signal: controller.signal,
+        });
+        return response.ok;
+    }
+    catch {
+        return false;
+    }
+    finally {
+        clearTimeout(timeoutId);
+    }
+}
+async function refreshCatalogFromProxy() {
+    if (!(await isProxyCatalogReachable())) {
+        return null;
+    }
+    const settled = await Promise.all(exports.SYNCABLE_PROVIDERS.map((provider) => fetchProviderCatalog(provider)));
+    const providers = Object.fromEntries(settled.filter(([, models]) => Array.isArray(models) && models.length > 0));
+    if (Object.keys(providers).length === 0) {
+        return null;
+    }
+    setCachedCatalog(providers);
+    return providers;
+}
+exports.refreshCatalogFromProxy = refreshCatalogFromProxy;
+/** Map remote thinking support to CCS ThinkingSupport */
+function mapThinking(remote) {
+    if (!remote)
+        return undefined;
+    // If levels are provided, it's a levels-type thinking
+    if (remote.levels && remote.levels.length > 0) {
+        return {
+            type: 'levels',
+            levels: remote.levels,
+            dynamicAllowed: remote.dynamic_allowed,
+        };
+    }
+    // If min/max budget are provided, it's budget-type
+    if (remote.min !== undefined || remote.max !== undefined) {
+        return {
+            type: 'budget',
+            min: remote.min,
+            max: remote.max,
+            zeroAllowed: remote.zero_allowed,
+            dynamicAllowed: remote.dynamic_allowed,
+        };
+    }
+    return { type: 'none' };
+}
+/** Map RemoteModelInfo to ModelEntry */
+function mapRemoteToModelEntry(remote) {
+    const entry = {
+        id: remote.id,
+        name: remote.display_name || remote.id,
+    };
+    if (remote.description)
+        entry.description = remote.description;
+    if (remote.context_length && remote.context_length >= 1000000) {
+        entry.extendedContext = true;
+    }
+    const thinking = mapThinking(remote.thinking);
+    if (thinking)
+        entry.thinking = thinking;
+    return entry;
+}
+/**
+ * Merge remote models with static catalog for a provider.
+ * Remote fields override static where present.
+ * Static-only fields preserved: broken, deprecated, deprecationReason, issueUrl, tier.
+ * Models in remote but not in static → added.
+ * Models removed upstream stay hidden; UI falls back to static only when live data is unavailable.
+ */
+function mergeCatalog(provider, remoteModels) {
+    const filteredRemoteModels = provider === 'agy'
+        ? remoteModels.filter((remoteModel) => !(0, model_id_normalizer_1.getDeniedModelIdReasonForProvider)(remoteModel.id, provider))
+        : remoteModels;
+    const staticCatalog = model_catalog_1.MODEL_CATALOG[provider];
+    if (!staticCatalog && filteredRemoteModels.length === 0)
+        return undefined;
+    const displayName = staticCatalog?.displayName || provider;
+    const defaultModel = staticCatalog?.defaultModel || (filteredRemoteModels[0]?.id ?? '');
+    // Build map of static models by lowercase ID for fast lookup
+    const staticMap = new Map();
+    if (staticCatalog) {
+        for (const model of staticCatalog.models) {
+            staticMap.set(model.id.toLowerCase(), model);
+        }
+    }
+    // Process remote models: merge with static entries
+    const mergedIds = new Set();
+    const mergedModels = [];
+    for (const remote of filteredRemoteModels) {
+        const remoteEntry = mapRemoteToModelEntry(remote);
+        const staticEntry = staticMap.get(remote.id.toLowerCase());
+        mergedIds.add(remote.id.toLowerCase());
+        if (staticEntry) {
+            const mergedThinking = remoteEntry.thinking
+                ? {
+                    ...remoteEntry.thinking,
+                    maxLevel: remoteEntry.thinking.maxLevel ?? staticEntry.thinking?.maxLevel,
+                }
+                : staticEntry.thinking;
+            // Merge: remote overrides, static fills gaps
+            mergedModels.push({
+                ...remoteEntry,
+                thinking: mergedThinking,
+                // Preserve static-only fields
+                tier: staticEntry.tier,
+                broken: staticEntry.broken,
+                issueUrl: staticEntry.issueUrl,
+                deprecated: staticEntry.deprecated,
+                deprecationReason: staticEntry.deprecationReason,
+            });
+        }
+        else {
+            mergedModels.push(remoteEntry);
+        }
+    }
+    return {
+        provider,
+        displayName,
+        defaultModel,
+        models: mergedModels,
+    };
+}
+exports.mergeCatalog = mergeCatalog;
+function getResolvedCatalogFromProviders(provider, providers) {
+    if (providers?.[provider]) {
+        return mergeCatalog(provider, providers[provider]);
+    }
+    return model_catalog_1.MODEL_CATALOG[provider];
+}
+function getAllResolvedCatalogsFromProviders(providers) {
+    const result = {};
+    const providerIds = new Set();
+    for (const provider of Object.keys(model_catalog_1.MODEL_CATALOG)) {
+        providerIds.add(provider);
+    }
+    if (providers) {
+        for (const provider of Object.keys(providers)) {
+            providerIds.add(provider);
+        }
+    }
+    for (const provider of providerIds) {
+        const catalog = getResolvedCatalogFromProviders(provider, providers);
+        if (catalog) {
+            result[provider] = catalog;
+        }
+    }
+    return result;
+}
+/**
+ * Get resolved catalog for a provider.
+ * Uses cached remote data if available, falls back to static.
+ */
+function getResolvedCatalog(provider) {
+    const cached = getCachedCatalog();
+    if (cached && cached.providers[provider]) {
+        return mergeCatalog(provider, cached.providers[provider]);
+    }
+    return model_catalog_1.MODEL_CATALOG[provider];
+}
+exports.getResolvedCatalog = getResolvedCatalog;
+/**
+ * Get all resolved catalogs (for Dashboard).
+ */
+function getAllResolvedCatalogs() {
+    const cached = getCachedCatalog();
+    return getAllResolvedCatalogsFromProviders(cached?.providers);
+}
+exports.getAllResolvedCatalogs = getAllResolvedCatalogs;
+async function getResolvedCatalogSnapshot() {
+    const liveProviders = await refreshCatalogFromProxy();
+    if (liveProviders) {
+        return {
+            catalogs: getAllResolvedCatalogsFromProviders(liveProviders),
+            source: 'live',
+            cacheAge: getCacheAge(),
+        };
+    }
+    const cached = getCachedCatalog();
+    if (cached?.providers) {
+        return {
+            catalogs: getAllResolvedCatalogsFromProviders(cached.providers),
+            source: 'cache',
+            cacheAge: getCacheAge(),
+        };
+    }
+    return {
+        catalogs: getAllResolvedCatalogsFromProviders(),
+        source: 'static',
+        cacheAge: null,
+    };
+}
+exports.getResolvedCatalogSnapshot = getResolvedCatalogSnapshot;
+//# sourceMappingURL=catalog-cache.js.map

package/dist/cliproxy/services/catalog-cache.js.map

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

package/dist/cliproxy/services/catalog-routing.d.ts

@@ -0,0 +1,12 @@
+import { type CliproxyProviderRoutingHints } from '../../shared/cliproxy-model-routing';
+import { type CatalogSource } from './catalog-cache';
+import type { ProviderCatalog } from '../model-catalog';
+import type { CLIProxyProvider } from '../types';
+export interface CatalogRoutingSnapshot {
+    catalogs: Partial<Record<CLIProxyProvider, ProviderCatalog>>;
+    source: CatalogSource;
+    cacheAge: string | null;
+    routing: Partial<Record<string, CliproxyProviderRoutingHints>>;
+}
+export declare function getCatalogRoutingSnapshot(): Promise<CatalogRoutingSnapshot>;
+//# sourceMappingURL=catalog-routing.d.ts.map

package/dist/cliproxy/services/catalog-routing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog-routing.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/catalog-routing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAEL,KAAK,aAAa,EAEnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEjD,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC;IAC7D,MAAM,EAAE,aAAa,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC,CAAC;CAChE;AAED,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,sBAAsB,CAAC,CAWjF"}

package/dist/cliproxy/services/catalog-routing.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCatalogRoutingSnapshot = void 0;
+const cliproxy_model_routing_1 = require("../../shared/cliproxy-model-routing");
+const stats_fetcher_1 = require("./stats-fetcher");
+const catalog_cache_1 = require("./catalog-cache");
+async function getCatalogRoutingSnapshot() {
+    const snapshot = await (0, catalog_cache_1.getResolvedCatalogSnapshot)();
+    const modelsResponse = snapshot.source === 'live' ? await (0, stats_fetcher_1.fetchCliproxyModels)() : null;
+    const routing = (0, cliproxy_model_routing_1.buildCliproxyRoutingHints)(snapshot.catalogs, modelsResponse?.models ?? []);
+    return {
+        catalogs: snapshot.catalogs,
+        source: snapshot.source,
+        cacheAge: snapshot.cacheAge,
+        routing,
+    };
+}
+exports.getCatalogRoutingSnapshot = getCatalogRoutingSnapshot;
+//# sourceMappingURL=catalog-routing.js.map

package/dist/cliproxy/services/catalog-routing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog-routing.js","sourceRoot":"","sources":["../../../src/cliproxy/services/catalog-routing.ts"],"names":[],"mappings":";;;AAAA,gFAG6C;AAC7C,mDAAsD;AACtD,mDAIyB;AAWlB,KAAK,UAAU,yBAAyB;IAC7C,MAAM,QAAQ,GAA4B,MAAM,IAAA,0CAA0B,GAAE,CAAC;IAC7E,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,IAAA,mCAAmB,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACvF,MAAM,OAAO,GAAG,IAAA,kDAAyB,EAAC,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC;IAE3F,OAAO;QACL,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,OAAO;KACR,CAAC;AACJ,CAAC;AAXD,8DAWC"}

package/dist/cliproxy/services/oauth-usage-log-transformer.d.ts

@@ -0,0 +1,4 @@
+import type { CliproxyUsageApiResponse } from './stats-fetcher';
+export declare function buildUsageResponseFromCliproxyLogLines(lines: string[]): CliproxyUsageApiResponse;
+export declare function buildUsageResponseFromCliproxyMainLog(): CliproxyUsageApiResponse | null;
+//# sourceMappingURL=oauth-usage-log-transformer.d.ts.map

package/dist/cliproxy/services/oauth-usage-log-transformer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-usage-log-transformer.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/oauth-usage-log-transformer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAyIhE,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,CAmChG;AAUD,wBAAgB,qCAAqC,IAAI,wBAAwB,GAAG,IAAI,CASvF"}

package/dist/cliproxy/services/oauth-usage-log-transformer.js

@@ -0,0 +1,162 @@
+"use strict";
+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.buildUsageResponseFromCliproxyMainLog = exports.buildUsageResponseFromCliproxyLogLines = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const path_resolver_1 = require("../config/path-resolver");
+const usage_compatibility_transformer_1 = require("./usage-compatibility-transformer");
+function unquote(value) {
+    return value.trim().replace(/^['"]|['"]$/g, '');
+}
+function extractTimestamp(line) {
+    const isoTimestamp = line.match(/\d{4}-\d{2}-\d{2}T[^\s\]]+/)?.[0];
+    if (isoTimestamp) {
+        return isoTimestamp.replace(/[,\]]+$/, '');
+    }
+    const bracketedTimestamp = line
+        .match(/^\[(\d{4}-\d{2}-\d{2})[ T](\d{2}:\d{2}:\d{2})\]/)
+        ?.slice(1, 3);
+    if (!bracketedTimestamp) {
+        return undefined;
+    }
+    const [datePart, timePart] = bracketedTimestamp;
+    const [year, month, day] = datePart.split('-').map(Number);
+    const [hour, minute, second] = timePart.split(':').map(Number);
+    return new Date(year, month - 1, day, hour, minute, second).toISOString();
+}
+function extractRequestId(line) {
+    const explicitRequestId = line.match(/\b(?:request[_-]?id|req[_-]?id|rid)[=:]\s*([A-Za-z0-9._:-]+)/i)?.[1];
+    if (explicitRequestId) {
+        return explicitRequestId;
+    }
+    const bracketedRequestId = line.match(/^\[[^\]]+\]\s+\[([^\]]+)\]/)?.[1]?.trim();
+    return bracketedRequestId && bracketedRequestId !== '--------' ? bracketedRequestId : undefined;
+}
+function parseOAuthSelection(line) {
+    const match = line.match(/Use OAuth\s+provider=([^\s]+)\s+auth_file=("[^"]+"|'[^']+'|[^\s]+)\s+for model\s+("[^"]+"|'[^']+'|[^\s]+)/i);
+    if (!match) {
+        return null;
+    }
+    return {
+        timestamp: extractTimestamp(line),
+        provider: unquote(match[1] ?? 'unknown'),
+        authFile: unquote(match[2] ?? 'unknown'),
+        model: unquote(match[3] ?? 'unknown'),
+        requestId: extractRequestId(line),
+    };
+}
+function parseProviderCompletion(line) {
+    const match = line.match(/\b(?:POST|GET)\s+"?\/api\/provider\/([^/"\s]+)\//i);
+    if (!match) {
+        return null;
+    }
+    return {
+        timestamp: extractTimestamp(line),
+        provider: unquote(match[1] ?? 'unknown'),
+        requestId: extractRequestId(line),
+        failed: /\b(?:failed|failure|error)\b/i.test(line) ||
+            /\bstatus[=:]\s*[45]\d\d\b/i.test(line) ||
+            /\s[45]\d\d(?:\s|$)/.test(line),
+    };
+}
+function addPendingRequest(pending, byRequestId, byProvider) {
+    if (pending.requestId) {
+        const previous = byRequestId.get(pending.requestId);
+        if (previous) {
+            const previousProviderQueue = byProvider.get(previous.provider) ?? [];
+            byProvider.set(previous.provider, previousProviderQueue.filter((entry) => entry !== previous));
+        }
+        byRequestId.set(pending.requestId, pending);
+    }
+    const providerQueue = byProvider.get(pending.provider) ?? [];
+    providerQueue.push(pending);
+    byProvider.set(pending.provider, providerQueue);
+}
+function takePendingRequest(completion, byRequestId, byProvider) {
+    const byId = completion.requestId ? byRequestId.get(completion.requestId) : undefined;
+    if (byId) {
+        byRequestId.delete(completion.requestId ?? '');
+        const providerQueue = byProvider.get(byId.provider) ?? [];
+        byProvider.set(byId.provider, providerQueue.filter((entry) => entry !== byId));
+        return byId;
+    }
+    const providerQueue = byProvider.get(completion.provider) ?? [];
+    const next = providerQueue.shift();
+    byProvider.set(completion.provider, providerQueue);
+    if (next?.requestId) {
+        byRequestId.delete(next.requestId);
+    }
+    return next ?? null;
+}
+function buildUsageResponseFromCliproxyLogLines(lines) {
+    const pendingByRequestId = new Map();
+    const pendingByProvider = new Map();
+    const records = [];
+    for (const line of lines) {
+        const selection = parseOAuthSelection(line);
+        if (selection) {
+            addPendingRequest(selection, pendingByRequestId, pendingByProvider);
+            continue;
+        }
+        const completion = parseProviderCompletion(line);
+        if (!completion) {
+            continue;
+        }
+        const pending = takePendingRequest(completion, pendingByRequestId, pendingByProvider);
+        if (!pending) {
+            continue;
+        }
+        records.push({
+            timestamp: completion.timestamp ?? pending.timestamp ?? '1970-01-01T00:00:00.000Z',
+            provider: pending.provider,
+            model: pending.model,
+            source: `provider=${pending.provider} auth_file=${pending.authFile}`,
+            auth_index: pending.authFile,
+            request_id: completion.requestId ?? pending.requestId,
+            failed: completion.failed,
+            tokens: {},
+        });
+    }
+    return (0, usage_compatibility_transformer_1.buildUsageResponseFromQueueRecords)(records);
+}
+exports.buildUsageResponseFromCliproxyLogLines = buildUsageResponseFromCliproxyLogLines;
+function readLogFile(filePath) {
+    if (!fs.existsSync(filePath)) {
+        return null;
+    }
+    return fs.readFileSync(filePath, 'utf-8');
+}
+function buildUsageResponseFromCliproxyMainLog() {
+    const logPath = path.join((0, path_resolver_1.getCliproxyWritablePath)(), 'logs', 'main.log');
+    const contents = readLogFile(logPath);
+    if (!contents) {
+        return null;
+    }
+    const response = buildUsageResponseFromCliproxyLogLines(contents.split(/\r?\n/));
+    return (0, usage_compatibility_transformer_1.hasUsageDetails)(response) ? response : null;
+}
+exports.buildUsageResponseFromCliproxyMainLog = buildUsageResponseFromCliproxyMainLog;
+//# sourceMappingURL=oauth-usage-log-transformer.js.map

package/dist/cliproxy/services/oauth-usage-log-transformer.js.map

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

package/dist/cliproxy/services/proxy-lifecycle-service.d.ts

@@ -15,6 +15,7 @@ export interface ProxyStatusResult {
 /** Stop proxy result */
 export interface StopProxyResult {
     stopped: boolean;
+    port?: number;
     pid?: number;
     sessionCount?: number;
     error?: string;

package/dist/cliproxy/services/proxy-lifecycle-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-lifecycle-service.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/proxy-lifecycle-service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,0BAA0B;AAC1B,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAwB;AACxB,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,yBAAyB;AACzB,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAE/D;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAEvE;AAED;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,GAAE,MAA8B,EACpC,OAAO,GAAE,OAAe,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAE3B;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,OAAO,CAGxC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAG9C"}
+{"version":3,"file":"proxy-lifecycle-service.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/proxy-lifecycle-service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,0BAA0B;AAC1B,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAwB;AACxB,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,yBAAyB;AACzB,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,GAAE,MAA+B,GAAG,iBAAiB,CAEvF;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,IAAI,GAAE,MAA+B,GAAG,OAAO,CAAC,eAAe,CAAC,CAE/F;AAED;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,GAAE,MAA+B,EACrC,OAAO,GAAE,OAAe,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAE3B;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,OAAO,CAGxC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAG9C"}

package/dist/cliproxy/services/proxy-lifecycle-service.js

@@ -9,25 +9,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getActiveSessionCount = exports.isProxyRunning = exports.startProxy = exports.stopProxy = exports.getProxyStatus = void 0;
 const session_tracker_1 = require("../session-tracker");
 const service_manager_1 = require("../service-manager");
-const config_generator_1 = require("../config-generator");
+const port_manager_1 = require("../config/port-manager");
 /**
  * Get current proxy status
  */
-function getProxyStatus(port) {
+function getProxyStatus(port = (0, port_manager_1.resolveLifecyclePort)()) {
     return (0, session_tracker_1.getProxyStatus)(port);
 }
 exports.getProxyStatus = getProxyStatus;
 /**
  * Stop the running CLIProxy instance
  */
-async function stopProxy(port) {
+async function stopProxy(port = (0, port_manager_1.resolveLifecyclePort)()) {
     return (0, session_tracker_1.stopProxy)(port);
 }
 exports.stopProxy = stopProxy;
 /**
  * Start CLIProxy service (or reuse existing running instance)
  */
-async function startProxy(port = config_generator_1.CLIPROXY_DEFAULT_PORT, verbose = false) {
+async function startProxy(port = (0, port_manager_1.resolveLifecyclePort)(), verbose = false) {
     return (0, service_manager_1.ensureCliproxyService)(port, verbose);
 }
 exports.startProxy = startProxy;
@@ -35,7 +35,7 @@ exports.startProxy = startProxy;
  * Check if proxy is currently running
  */
 function isProxyRunning() {
-    const status = (0, session_tracker_1.getProxyStatus)();
+    const status = (0, session_tracker_1.getProxyStatus)((0, port_manager_1.resolveLifecyclePort)());
     return status.running;
 }
 exports.isProxyRunning = isProxyRunning;
@@ -43,7 +43,7 @@ exports.isProxyRunning = isProxyRunning;
  * Get active session count
  */
 function getActiveSessionCount() {
-    const status = (0, session_tracker_1.getProxyStatus)();
+    const status = (0, session_tracker_1.getProxyStatus)((0, port_manager_1.resolveLifecyclePort)());
     return status.sessionCount ?? 0;
 }
 exports.getActiveSessionCount = getActiveSessionCount;