@slkiser/opencode-quota 4.3.0 → 4.4.0

package/dist/lib/ollama-cloud-config.js

@@ -1,148 +1,26 @@
-import { readFile } from "fs/promises";
-import { join } from "path";
-import { homedir } from "os";
-import { xdgConfig } from "xdg-basedir";
-import { getOpencodeRuntimeDirCandidates } from "./opencode-runtime-paths.js";
-function getConfigCandidatePaths() {
-    const { configDirs } = getOpencodeRuntimeDirCandidates();
-    const paths = configDirs.map((dir) => join(dir, "opencode-quota", "ollama-cloud.json"));
-    const xdgConfigDir = xdgConfig || join(homedir(), ".config");
-    paths.push(join(xdgConfigDir, "ollama-usage", "config.yaml"));
-    const home = homedir();
-    paths.push(join(home, ".ollama-usage", "config.yaml"));
-    return paths;
+import { getAuthPaths, readAuthFile } from "./opencode-auth.js";
+import { createProviderApiKeyResolver, getGlobalOpencodeConfigCandidatePaths, } from "./api-key-resolver.js";
+export { getGlobalOpencodeConfigCandidatePaths as getOpencodeConfigCandidatePaths } from "./api-key-resolver.js";
+const ollamaCloudApiKeyResolver = createProviderApiKeyResolver({
+    envVars: [{ name: "OLLAMA_API_KEY", source: "env:OLLAMA_API_KEY" }],
+    providerKeys: ["ollama-cloud"],
+    allowedEnvVars: ["OLLAMA_API_KEY"],
+    configJsonSource: "opencode.json",
+    configJsoncSource: "opencode.jsonc",
+    getConfigCandidates: getGlobalOpencodeConfigCandidatePaths,
+    auth: {
+        readAuth: readAuthFile,
+        getAuthPaths,
+        authSource: "auth.json",
+    },
+});
+export async function resolveOllamaCloudApiKey() {
+    return ollamaCloudApiKeyResolver.resolve();
+}
+export async function hasOllamaCloudApiKey() {
+    return ollamaCloudApiKeyResolver.has();
+}
+export async function getOllamaCloudKeyDiagnostics() {
+    return ollamaCloudApiKeyResolver.diagnostics();
 }
-function getOllamaUsageConfigPath() {
-    const xdgConfigDir = xdgConfig || join(homedir(), ".config");
-    return join(xdgConfigDir, "ollama-usage", "config.yaml");
-}
-function getOllamaUsageLegacyPath() {
-    return join(homedir(), ".ollama-usage", "config.yaml");
-}
-function getConfigFileError(error) {
-    if (error instanceof SyntaxError) {
-        return `Failed to parse config: ${error.message}`;
-    }
-    if (error instanceof Error && error.message) {
-        return `Failed to read config file: ${error.message}`;
-    }
-    return `Failed to read config file: ${String(error)}`;
-}
-async function readJsonConfigFile(path) {
-    try {
-        const data = await readFile(path, "utf-8");
-        const parsed = JSON.parse(data);
-        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-            return { state: "invalid", error: "Config file must contain a JSON object" };
-        }
-        return { state: "loaded", config: parsed };
-    }
-    catch (error) {
-        if (error?.code === "ENOENT") {
-            return { state: "missing" };
-        }
-        return { state: "invalid", error: getConfigFileError(error) };
-    }
-}
-async function readYamlConfigFile(path) {
-    try {
-        const data = await readFile(path, "utf-8");
-        const cookieMatch = data.match(/(?:^|\n)\s*cookie\s*:\s*["']?\s*(.+?)\s*["']?\s*(?:\n|$)/);
-        if (cookieMatch && cookieMatch[1]) {
-            return { state: "loaded", config: { cookie: cookieMatch[1].trim() } };
-        }
-        return { state: "missing" };
-    }
-    catch (error) {
-        if (error?.code === "ENOENT") {
-            return { state: "missing" };
-        }
-        return { state: "invalid", error: getConfigFileError(error) };
-    }
-}
-export function resolveOllamaCloudConfigFromEnv(env = process.env) {
-    const cookie = env.OLLAMA_USAGE_COOKIE?.trim();
-    if (!cookie)
-        return null;
-    return {
-        state: "configured",
-        config: { cookie },
-        source: "env",
-    };
-}
-export async function resolveOllamaCloudConfig() {
-    const envResult = resolveOllamaCloudConfigFromEnv();
-    if (envResult)
-        return envResult;
-    const candidates = getConfigCandidatePaths();
-    for (const path of candidates) {
-        const isYaml = path.endsWith(".yaml");
-        const fileResult = isYaml
-            ? await readYamlConfigFile(path)
-            : await readJsonConfigFile(path);
-        if (fileResult.state === "missing")
-            continue;
-        if (fileResult.state === "invalid") {
-            return { state: "invalid", source: path, error: fileResult.error };
-        }
-        const config = fileResult.config;
-        const cookie = typeof config.cookie === "string" ? config.cookie.trim() : "";
-        if (cookie) {
-            return {
-                state: "configured",
-                config: { cookie },
-                source: path,
-            };
-        }
-        return { state: "incomplete", source: path, missing: "cookie" };
-    }
-    return { state: "none" };
-}
-let cachedConfig = null;
-let cachedAt = 0;
-const DEFAULT_CACHE_MAX_AGE_MS = 30_000;
-export { DEFAULT_CACHE_MAX_AGE_MS as DEFAULT_OLLAMA_CLOUD_CONFIG_CACHE_MAX_AGE_MS };
-export async function resolveOllamaCloudConfigCached(params) {
-    const maxAgeMs = Math.max(0, params?.maxAgeMs ?? DEFAULT_CACHE_MAX_AGE_MS);
-    const now = Date.now();
-    if (cachedConfig && now - cachedAt < maxAgeMs) {
-        return cachedConfig;
-    }
-    cachedConfig = await resolveOllamaCloudConfig();
-    cachedAt = now;
-    return cachedConfig;
-}
-export async function getOllamaCloudConfigDiagnostics() {
-    const resolved = await resolveOllamaCloudConfig();
-    const checkedPaths = getConfigCandidatePaths();
-    if (resolved.state === "none") {
-        return { state: "none", source: null, missing: null, error: null, checkedPaths };
-    }
-    if (resolved.state === "incomplete") {
-        return {
-            state: "incomplete",
-            source: resolved.source,
-            missing: resolved.missing,
-            error: null,
-            checkedPaths,
-        };
-    }
-    if (resolved.state === "invalid") {
-        return {
-            state: "invalid",
-            source: resolved.source,
-            missing: null,
-            error: resolved.error,
-            checkedPaths,
-        };
-    }
-    return {
-        state: "configured",
-        source: resolved.source,
-        missing: null,
-        error: null,
-        checkedPaths,
-    };
-}
-export { getOllamaUsageConfigPath, getOllamaUsageLegacyPath };
 //# sourceMappingURL=ollama-cloud-config.js.map

package/dist/lib/ollama-cloud-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"ollama-cloud-config.js","sourceRoot":"","sources":["../../src/lib/ollama-cloud-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ollama-cloud-config.js","sourceRoot":"","sources":["../../src/lib/ollama-cloud-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EACL,4BAA4B,EAC5B,qCAAqC,GACtC,MAAM,uBAAuB,CAAC;AAa/B,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAEjH,MAAM,yBAAyB,GAAG,4BAA4B,CAAuB;IACnF,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;IACnE,YAAY,EAAE,CAAC,cAAc,CAAC;IAC9B,cAAc,EAAE,CAAC,gBAAgB,CAAC;IAClC,gBAAgB,EAAE,eAAe;IACjC,iBAAiB,EAAE,gBAAgB;IACnC,mBAAmB,EAAE,qCAAqC;IAC1D,IAAI,EAAE;QACJ,QAAQ,EAAE,YAAY;QACtB,YAAY;QACZ,UAAU,EAAE,WAAW;KACxB;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,wBAAwB;IAC5C,OAAO,yBAAyB,CAAC,OAAO,EAAE,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,OAAO,yBAAyB,CAAC,GAAG,EAAE,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B;IAMhD,OAAO,yBAAyB,CAAC,WAAW,EAAE,CAAC;AACjD,CAAC"}

package/dist/lib/ollama-cloud.d.ts

@@ -1,17 +1,13 @@
 /**
- * Ollama Cloud settings page scraper.
+ * Ollama Cloud usage API client.
  *
- * Fetches the Ollama Cloud settings page and parses the HTML for session
- * and weekly usage percentages, plan tier, and reset times from the
- * `data-usage-track` aria-labels, `usage-meter__fill` style attributes,
- * and `.local-time` data-time attributes.
+ * Fetches session and weekly usage fractions plus per-model request counts
+ * from the authenticated Ollama Cloud usage endpoint.
  */
 import type { OllamaCloudResult } from "./types.js";
-declare function extractUsagePercentFromTrack(trackHtml: string): number | null;
-declare function extractResetTimes(html: string): string[];
-declare function extractPlanTier(html: string): string | null;
-export declare function queryOllamaCloudQuota(cookie: string, options?: {
+declare function parseOllamaCloudUsage(payload: unknown): OllamaCloudResult;
+export declare function queryOllamaCloudQuota(options?: {
     requestTimeoutMs?: number;
 }): Promise<OllamaCloudResult>;
-export { extractUsagePercentFromTrack as _extractUsagePercentFromTrack, extractResetTimes as _extractResetTimes, extractPlanTier as _extractPlanTier, };
+export { parseOllamaCloudUsage as _parseOllamaCloudUsage };
 //# sourceMappingURL=ollama-cloud.d.ts.map

package/dist/lib/ollama-cloud.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama-cloud.d.ts","sourceRoot":"","sources":["../../src/lib/ollama-cloud.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAkBpD,iBAAS,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqBtE;AAED,iBAAS,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAQjD;AAED,iBAAS,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGpD;AAeD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAO,GAC1C,OAAO,CAAC,iBAAiB,CAAC,CAmG5B;AAED,OAAO,EACL,4BAA4B,IAAI,6BAA6B,EAC7D,iBAAiB,IAAI,kBAAkB,EACvC,eAAe,IAAI,gBAAgB,GACpC,CAAC"}
+{"version":3,"file":"ollama-cloud.d.ts","sourceRoot":"","sources":["../../src/lib/ollama-cloud.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAyB,iBAAiB,EAAqB,MAAM,YAAY,CAAC;AAkH9F,iBAAS,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,iBAAiB,CA6ClE;AAED,wBAAsB,qBAAqB,CACzC,OAAO,GAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAO,GAC1C,OAAO,CAAC,iBAAiB,CAAC,CAkC5B;AAED,OAAO,EAAE,qBAAqB,IAAI,sBAAsB,EAAE,CAAC"}

package/dist/lib/ollama-cloud.js

@@ -1,155 +1,181 @@
 /**
- * Ollama Cloud settings page scraper.
+ * Ollama Cloud usage API client.
  *
- * Fetches the Ollama Cloud settings page and parses the HTML for session
- * and weekly usage percentages, plan tier, and reset times from the
- * `data-usage-track` aria-labels, `usage-meter__fill` style attributes,
- * and `.local-time` data-time attributes.
+ * Fetches session and weekly usage fractions plus per-model request counts
+ * from the authenticated Ollama Cloud usage endpoint.
  */
-import { fetchWithTimeout } from "./http.js";
 import { sanitizeSingleLineDisplayText } from "./display-sanitize.js";
-const SETTINGS_URL = "https://ollama.com/settings";
-const USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) Gecko/20100101 Firefox/148.0";
-const SCRAPE_TIMEOUT_MS = 10_000;
-const USAGE_PERCENT_RE = /(\d+(?:\.\d+)?)%\s*used/;
-const WIDTH_PERCENT_RE = /(?:^|;)\s*width\s*:\s*([0-9.]+)%/;
-const DATA_USAGE_TRACK_RE = /<[^>]*\bdata-usage-track\b[^>]*>/gs;
-const LOCAL_TIME_RE = /class="[^"]*local-time[^"]*"[^>]*data-time="([^"]*)"/gs;
-const PLAN_TIER_RE = /class="[^"]*capitalize[^"]*"[^>]*>([^<]*)</;
-function extractUsagePercentFromTrack(trackHtml) {
-    const ariaMatch = trackHtml.match(USAGE_PERCENT_RE);
-    if (ariaMatch) {
-        const pct = Number(ariaMatch[1]);
-        if (Number.isFinite(pct) && pct >= 0 && pct <= 100) {
-            return pct;
+import { fetchWithTimeout } from "./http.js";
+import { resolveOllamaCloudApiKey } from "./ollama-cloud-config.js";
+const OLLAMA_CLOUD_USAGE_URL = "https://ollama.com/api/usage";
+const MAX_RESPONSE_BYTES = 256 * 1024;
+const MAX_MODEL_ROWS = 100;
+function isRecord(value) {
+    return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function sanitizeRemoteSingleLineText(text) {
+    return sanitizeSingleLineDisplayText(text).replace(/\p{Cf}/gu, "");
+}
+function sanitizeMessage(text, secret, maxLength = 200) {
+    const redacted = secret ? text.split(secret).join("[redacted]") : text;
+    const sanitized = sanitizeRemoteSingleLineText(redacted);
+    return (sanitized || "unknown").slice(0, maxLength);
+}
+async function readBoundedText(response, maxBytes) {
+    if (!response.body) {
+        const text = await response.text();
+        if (new TextEncoder().encode(text).byteLength > maxBytes) {
+            throw new Error(`Ollama Cloud usage API response exceeded ${maxBytes} bytes`);
         }
+        return text;
     }
-    const styleMatch = trackHtml.match(/style="([^"]*)"/);
-    if (styleMatch) {
-        const widthMatch = styleMatch[1].match(WIDTH_PERCENT_RE);
-        if (widthMatch) {
-            const pct = Number(widthMatch[1]);
-            if (Number.isFinite(pct) && pct >= 0 && pct <= 100) {
-                return pct;
+    const reader = response.body.getReader();
+    const decoder = new TextDecoder();
+    let text = "";
+    let byteLength = 0;
+    try {
+        while (true) {
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            byteLength += value.byteLength;
+            if (byteLength > maxBytes) {
+                await reader.cancel();
+                throw new Error(`Ollama Cloud usage API response exceeded ${maxBytes} bytes`);
             }
+            text += decoder.decode(value, { stream: true });
         }
+        return text + decoder.decode();
     }
-    return null;
-}
-function extractResetTimes(html) {
-    const times = [];
-    let match;
-    const re = new RegExp(LOCAL_TIME_RE.source, LOCAL_TIME_RE.flags);
-    while ((match = re.exec(html)) !== null) {
-        times.push(match[1]);
+    finally {
+        reader.releaseLock();
     }
-    return times;
-}
-function extractPlanTier(html) {
-    const match = html.match(PLAN_TIER_RE);
-    return match ? match[1].trim() : null;
 }
-function sanitizeMessage(text, maxLength = 200) {
-    const sanitized = sanitizeSingleLineDisplayText(text);
-    return (sanitized || "unknown").slice(0, maxLength);
+function parseWindow(value) {
+    if (!isRecord(value))
+        return undefined;
+    const usageFraction = value.usage;
+    if (typeof usageFraction !== "number" ||
+        !Number.isFinite(usageFraction) ||
+        usageFraction < 0 ||
+        usageFraction > 1) {
+        return undefined;
+    }
+    const usagePercent = usageFraction * 100;
+    return {
+        usageFraction,
+        usagePercent,
+        percentRemaining: 100 - usagePercent,
+    };
 }
-const COOKIE_NAME_PREFIX = "__Secure-session=";
-function normalizeCookie(raw) {
-    let value = raw.trim();
-    if (value.startsWith(COOKIE_NAME_PREFIX))
-        value = value.slice(COOKIE_NAME_PREFIX.length);
-    return value;
+function parseModels(value, rowErrors) {
+    if (!Array.isArray(value)) {
+        rowErrors.push("Models: expected an array");
+        return [];
+    }
+    const models = [];
+    const seenModels = new Set();
+    for (const candidate of value) {
+        if (!isRecord(candidate)) {
+            rowErrors.push("Models: ignored an invalid row");
+            continue;
+        }
+        const model = typeof candidate.model === "string"
+            ? sanitizeRemoteSingleLineText(candidate.model).slice(0, 160)
+            : "";
+        const requests = candidate.requests;
+        if (!model) {
+            rowErrors.push("Models: ignored a row without a model name");
+            continue;
+        }
+        if (typeof requests !== "number" || !Number.isSafeInteger(requests) || requests < 0) {
+            rowErrors.push(`Models: ignored invalid request count for ${model}`);
+            continue;
+        }
+        if (seenModels.has(model)) {
+            rowErrors.push(`Models: ignored duplicate model ${model}`);
+            continue;
+        }
+        seenModels.add(model);
+        models.push({ model, requests });
+    }
+    return models.sort((left, right) => left.model.localeCompare(right.model));
 }
-export async function queryOllamaCloudQuota(cookie, options = {}) {
-    if (cookie.includes("\r") || cookie.includes("\n")) {
+function parseOllamaCloudUsage(payload) {
+    if (!isRecord(payload)) {
+        return {
+            success: false,
+            error: "Ollama Cloud usage API returned an unexpected response shape",
+        };
+    }
+    if (Array.isArray(payload.models) && payload.models.length > MAX_MODEL_ROWS) {
         return {
             success: false,
-            error: "Cookie contains invalid CRLF characters",
+            error: `Ollama Cloud usage API returned more than ${MAX_MODEL_ROWS} model rows`,
         };
     }
+    const rowErrors = [];
+    const limits = isRecord(payload.limits) ? payload.limits : undefined;
+    const session = parseWindow(limits?.session);
+    const weekly = parseWindow(limits?.weekly);
+    if (limits?.session !== undefined && !session) {
+        rowErrors.push("Session: ignored invalid usage fraction");
+    }
+    if (limits?.weekly !== undefined && !weekly) {
+        rowErrors.push("Weekly: ignored invalid usage fraction");
+    }
+    if (!limits) {
+        rowErrors.push("Limits: expected an object");
+    }
+    const models = parseModels(payload.models, rowErrors);
+    if (!session && !weekly && models.length === 0) {
+        return {
+            success: false,
+            error: "Ollama Cloud usage API returned no usable usage data",
+        };
+    }
+    return {
+        success: true,
+        ...(session ? { session } : {}),
+        ...(weekly ? { weekly } : {}),
+        models,
+        ...(rowErrors.length > 0 ? { rowErrors } : {}),
+    };
+}
+export async function queryOllamaCloudQuota(options = {}) {
+    const resolved = await resolveOllamaCloudApiKey();
+    if (!resolved)
+        return null;
     try {
-        return await fetchWithTimeout(SETTINGS_URL, {
+        return await fetchWithTimeout(OLLAMA_CLOUD_USAGE_URL, {
             request: {
                 method: "GET",
                 headers: {
-                    "User-Agent": USER_AGENT,
-                    Accept: "text/html",
-                    Cookie: `${COOKIE_NAME_PREFIX}${normalizeCookie(cookie)}`,
+                    Accept: "application/json",
+                    Authorization: resolved.key,
                 },
                 redirect: "manual",
             },
-            timeoutMs: options.requestTimeoutMs ?? SCRAPE_TIMEOUT_MS,
+            timeoutMs: options.requestTimeoutMs,
             consume: async (response) => {
-                if (response.status >= 300 && response.status < 400) {
-                    const location = response.headers.get("location") || "";
-                    return {
-                        success: false,
-                        error: `Authentication error: redirected to ${sanitizeMessage(location, 80)} — cookie may be expired`,
-                    };
-                }
+                const text = await readBoundedText(response, MAX_RESPONSE_BYTES);
                 if (!response.ok) {
-                    const text = await response.text();
-                    return {
-                        success: false,
-                        error: `Ollama Cloud settings error ${response.status}: ${sanitizeMessage(text)}`,
-                    };
-                }
-                const html = await response.text();
-                const planTier = extractPlanTier(html);
-                const tracks = [];
-                let trackMatch;
-                const trackRe = new RegExp(DATA_USAGE_TRACK_RE.source, DATA_USAGE_TRACK_RE.flags);
-                while ((trackMatch = trackRe.exec(html)) !== null) {
-                    tracks.push(trackMatch[0]);
-                }
-                if (tracks.length === 0) {
-                    return {
-                        success: false,
-                        error: "Could not parse usage tracks from Ollama Cloud settings page (found 0)",
-                    };
-                }
-                const sessionPercent = tracks[0] ? extractUsagePercentFromTrack(tracks[0]) : null;
-                const weeklyPercent = tracks[1] ? extractUsagePercentFromTrack(tracks[1]) : null;
-                if (sessionPercent === null && weeklyPercent === null) {
+                    const snippet = sanitizeMessage(text, resolved.key);
                     return {
                         success: false,
-                        error: "Could not extract any usage percentages from Ollama Cloud settings page",
+                        error: `Ollama Cloud usage API error ${response.status}: ${snippet}`,
                     };
                 }
-                const resetTimes = extractResetTimes(html);
-                const sessionResetsAt = resetTimes[0] || undefined;
-                const weeklyResetsAt = resetTimes[1] || undefined;
-                return {
-                    success: true,
-                    ...(sessionPercent !== null
-                        ? {
-                            session: {
-                                usagePercent: sessionPercent,
-                                percentRemaining: 100 - sessionPercent,
-                                resetTimeIso: sessionResetsAt,
-                            },
-                        }
-                        : {}),
-                    ...(weeklyPercent !== null
-                        ? {
-                            weekly: {
-                                usagePercent: weeklyPercent,
-                                percentRemaining: 100 - weeklyPercent,
-                                resetTimeIso: weeklyResetsAt,
-                            },
-                        }
-                        : {}),
-                    ...(planTier ? { planTier } : {}),
-                };
+                return parseOllamaCloudUsage(JSON.parse(text));
             },
         });
     }
-    catch (err) {
+    catch (error) {
         return {
             success: false,
-            error: sanitizeMessage(err instanceof Error ? err.message : String(err)),
+            error: sanitizeMessage(error instanceof Error ? error.message : String(error), resolved.key),
         };
     }
 }
-export { extractUsagePercentFromTrack as _extractUsagePercentFromTrack, extractResetTimes as _extractResetTimes, extractPlanTier as _extractPlanTier, };
+export { parseOllamaCloudUsage as _parseOllamaCloudUsage };
 //# sourceMappingURL=ollama-cloud.js.map

package/dist/lib/ollama-cloud.js.map

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

package/dist/lib/provider-metadata.d.ts

@@ -46,6 +46,18 @@ declare const PROVIDER_CATALOG_SOURCE: {
             readonly quota: "remote_api";
         };
     };
+    readonly kilo: {
+        readonly label: "Kilo Gateway";
+        readonly runtimeIds: readonly ["kilo"];
+        readonly synonyms: readonly [];
+        readonly shape: {
+            readonly autoSetup: "usually";
+            readonly authentication: "opencode_auth_api_key";
+            readonly authFallbacks: readonly ["env_api_key", "global_opencode_config"];
+            readonly quota: "remote_api";
+            readonly notes: "Queries the documented Kilo profile balance API; reports personal USD balance only";
+        };
+    };
     readonly cursor: {
         readonly label: "Cursor";
         readonly runtimeIds: readonly ["cursor", "cursor-acp"];
@@ -271,10 +283,11 @@ declare const PROVIDER_CATALOG_SOURCE: {
         readonly runtimeIds: readonly ["ollama-cloud"];
         readonly synonyms: readonly [];
         readonly shape: {
-            readonly autoSetup: "manual_env_config";
-            readonly authentication: "state_only";
+            readonly autoSetup: "usually";
+            readonly authentication: "opencode_auth_api_key";
+            readonly authFallbacks: readonly ["env_api_key", "global_opencode_config"];
             readonly quota: "remote_api";
-            readonly notes: "Scrapes the Ollama Cloud settings page; requires __Secure-session cookie via OLLAMA_USAGE_COOKIE env or ollama-usage config";
+            readonly notes: "Queries the Ollama Cloud usage API; reports session and weekly quota plus model request counts";
         };
     };
     readonly "quota-providers": {

package/dist/lib/provider-metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-metadata.d.ts","sourceRoot":"","sources":["../../src/lib/provider-metadata.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG,KAAK,GAAG,SAAS,GAAG,mBAAmB,GAAG,mBAAmB,CAAC;AAEnG,MAAM,MAAM,2BAA2B,GACnC,2BAA2B,GAC3B,uBAAuB,GACvB,4BAA4B,GAC5B,gBAAgB,GAChB,qBAAqB,GACrB,kBAAkB,GAClB,YAAY,CAAC;AAEjB,MAAM,MAAM,yBAAyB,GAAG,aAAa,GAAG,wBAAwB,CAAC;AAEjF,MAAM,MAAM,wBAAwB,GAChC,YAAY,GACZ,kBAAkB,GAClB,0BAA0B,GAC1B,kBAAkB,CAAC;AAsBvB,QAAA,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0SuC,CAAC;AAErE,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,uBAAuB,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,wBAAwB,CAAC;IAC7B,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,SAAS,EAAE,sBAAsB,CAAC;IAClC,cAAc,EAAE,2BAA2B,CAAC;IAC5C,aAAa,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAC5C,KAAK,EAAE,wBAAwB,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,KAAK,EAAE,kBAAkB,CAAC;CAC3B;AAED,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC,MAAM,CAAC,wBAAwB,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,CAAC;AAuCpG,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAC3C,MAAM,CAAC,wBAAwB,EAAE,yBAAyB,CAAC,CAe5D,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAKlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAIvE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,uBAExC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,SAAS,kBAAkB,EAE9D,CAAC;AASF,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAG3D;AAED,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAKhF;AAED,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAG/D;AAED,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAOxE;AAED,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE9D"}
+{"version":3,"file":"provider-metadata.d.ts","sourceRoot":"","sources":["../../src/lib/provider-metadata.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG,KAAK,GAAG,SAAS,GAAG,mBAAmB,GAAG,mBAAmB,CAAC;AAEnG,MAAM,MAAM,2BAA2B,GACnC,2BAA2B,GAC3B,uBAAuB,GACvB,4BAA4B,GAC5B,gBAAgB,GAChB,qBAAqB,GACrB,kBAAkB,GAClB,YAAY,CAAC;AAEjB,MAAM,MAAM,yBAAyB,GAAG,aAAa,GAAG,wBAAwB,CAAC;AAEjF,MAAM,MAAM,wBAAwB,GAChC,YAAY,GACZ,kBAAkB,GAClB,0BAA0B,GAC1B,kBAAkB,CAAC;AAsBvB,QAAA,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuTuC,CAAC;AAErE,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,uBAAuB,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,wBAAwB,CAAC;IAC7B,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,SAAS,EAAE,sBAAsB,CAAC;IAClC,cAAc,EAAE,2BAA2B,CAAC;IAC5C,aAAa,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAC5C,KAAK,EAAE,wBAAwB,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,KAAK,EAAE,kBAAkB,CAAC;CAC3B;AAED,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC,MAAM,CAAC,wBAAwB,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,CAAC;AAuCpG,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAC3C,MAAM,CAAC,wBAAwB,EAAE,yBAAyB,CAAC,CAe5D,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAKlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAIvE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,uBAExC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,SAAS,kBAAkB,EAE9D,CAAC;AASF,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAG3D;AAED,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAKhF;AAED,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAG/D;AAED,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAOxE;AAED,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE9D"}