dsh-subscriptions 0.1.4 → 0.2.0

package/lib/providers/cursor-adapter.js

@@ -17,23 +17,264 @@ export function projectCursorMessages(messages) {
         }
         : message);
 }
+/**
+ * Vendor `LlmError` codes whose whole message is a local literal (no response
+ * header, trailer, body or end-stream text). Provider-derived failures can only
+ * carry a `classifyCursorError` code or `CURSOR_PROTOCOL`, never these, so the
+ * code is a sound discriminator for them.
+ */
+const LOCAL_VENDOR_CODES = new Set(['UNSUPPORTED_OPTION', 'UNSUPPORTED_CONTENT', 'TOOL_LIMIT']);
+/**
+ * Plain-error messages the vendor throws as fixed literals (`vendor/cursor/
+ * index.js`: `waitForResponse`, the request write, the tool-continuation write,
+ * the stream `close` handler, the frame reader, the stall watchdog and the
+ * settings validation). None
+ * interpolates response text, so they are matched by exact message, the same way
+ * the auth messages are. A provider that echoed one of these sentences would
+ * only make the user read a local literal.
+ */
+const LOCAL_VENDOR_MESSAGES = new Set([
+    'Cursor HTTP response timeout',
+    'Cursor HTTP stream closed before response',
+    'Cursor agent bridge closed before accepting the request',
+    'Cursor tool continuation bridge closed before accepting the result',
+    'Cursor sent an unreadable compressed frame',
+    'Cursor stream idle timeout',
+    // `resolveCursorSettings`, run at the top of every stream.
+    'cursor-subscription: maxToolRounds must be an integer between 1 and 1000',
+    'cursor-subscription: retryCount must be an integer between 0 and 10',
+    'cursor-subscription: retryIntervalMs must be an integer between 0 and 300000',
+    'cursor-subscription: retryHttpStatusCodes must contain only HTTP status integers from 400 to 599',
+    'cursor-subscription: retryHttpStatusCodes must not contain duplicates',
+    'cursor-subscription: replayHistoryEachStep must be a boolean',
+]);
+/**
+ * The same, for the two literals that embed a number the vendor computes: the
+ * response status (`Number(headers[':status'])`, so digits or `NaN`) and the
+ * configured progress timeout.
+ */
+const LOCAL_VENDOR_PATTERNS = [
+    /^Cursor agent returned HTTP \d{3}$/,
+    /^Cursor stream progress timeout: no content for \d+ms$/,
+];
+/**
+ * Operating-system network error codes. An `Error` carrying one of these on
+ * itself, or on its `cause` (Node wraps a refused connection in
+ * `ERR_HTTP2_STREAM_CANCEL`), was produced by the local socket layer, so its
+ * message is local: `connect ECONNREFUSED 127.0.0.1:443`, `getaddrinfo ENOTFOUND
+ * host`. This is a property of the thrown object, which a provider cannot
+ * forge. It is deliberately not a test on the vendor's `TRANSPORT` code: the
+ * vendor derives that code from message text, so a provider's end-stream
+ * message or `grpc-message` containing "connection" or "socket" gets it too.
+ * Transport failures with no such code (TLS and certificate errors, HTTP/2
+ * protocol errors) are not recognised and stay replaced.
+ */
+const LOCAL_SYSTEM_ERRNO = new Set([
+    'ECONNREFUSED', 'ECONNRESET', 'ECONNABORTED', 'ENOTFOUND', 'EAI_AGAIN', 'ETIMEDOUT',
+    'ENETUNREACH', 'ENETDOWN', 'EHOSTUNREACH', 'EHOSTDOWN', 'EPIPE',
+]);
+function errorCode(value) {
+    return typeof value === 'object' && value !== null ? value.code : undefined;
+}
+function isLocalSystemError(error) {
+    if (!(error instanceof Error))
+        return false;
+    const own = errorCode(error);
+    const cause = errorCode(error.cause);
+    return (typeof own === 'string' && LOCAL_SYSTEM_ERRNO.has(own))
+        || (typeof cause === 'string' && LOCAL_SYSTEM_ERRNO.has(cause));
+}
+function messageOf(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+/** Bound on remembered local failure messages; they are short and few. */
+const MAX_LOCAL_MESSAGES = 64;
+/**
+ * Remembers the messages of failures raised by this machine rather than read
+ * from the provider: whatever the auth service threw, whatever the host
+ * attachment store threw while reading an image, and a socket-layer network
+ * error seen on the run. The vendor stream turns each of these into
+ * `finish/error` carrying exactly `error.message`, so a failure whose message
+ * equals a remembered one originated locally and may keep its text. The match
+ * is by exact text: a provider that echoed a remembered message would only
+ * display a local literal.
+ */
+class LocalFailureMessages {
+    messages = new Set();
+    /** Wrap `auth` so its failures are remembered and rethrown unchanged. */
+    wrap(auth) {
+        return {
+            accessToken: async (options) => {
+                try {
+                    return await auth.accessToken(options);
+                }
+                catch (error) {
+                    this.remember(messageOf(error));
+                    throw error;
+                }
+            },
+        };
+    }
+    /**
+     * Wrap the host attachment store the vendor reads images through, so a read
+     * failure keeps its own message. The store is a local service; its errors
+     * carry no provider text. Anything that is not a store passes through.
+     */
+    wrapAttachments(resolve) {
+        return () => {
+            const store = resolve();
+            const readImage = store?.readImage;
+            if (typeof readImage !== 'function')
+                return store;
+            return Object.create(store, {
+                readImage: {
+                    value: async (...args) => {
+                        try {
+                            return await readImage.apply(store, args);
+                        }
+                        catch (error) {
+                            this.remember(messageOf(error));
+                            throw error;
+                        }
+                    },
+                },
+            });
+        };
+    }
+    /**
+     * Observe a vendor run's two failure channels, the response promise and the
+     * frame reader, and remember the message of an error the socket layer raised.
+     * The run's behavior is unchanged: the same error is rethrown.
+     */
+    observeRun(run) {
+        if (typeof run !== 'object' || run === null)
+            return run;
+        const target = run;
+        const observe = (error) => {
+            if (isLocalSystemError(error))
+                this.remember(messageOf(error));
+            throw error;
+        };
+        const wait = target.waitForResponse;
+        if (typeof wait === 'function') {
+            target.waitForResponse = (...args) => Promise.resolve(wait.apply(target, args)).catch(observe);
+        }
+        const frames = target.frames;
+        const next = frames?.next;
+        if (frames !== undefined && typeof next === 'function') {
+            frames.next = (...args) => Promise.resolve(next.apply(frames, args)).catch(observe);
+        }
+        return run;
+    }
+    has(message) {
+        return this.messages.has(message);
+    }
+    remember(message) {
+        // An empty message displays nothing; remembering it would exempt every
+        // empty failure from the boundary for no benefit.
+        if (message === '')
+            return;
+        this.messages.delete(message);
+        this.messages.add(message);
+        if (this.messages.size > MAX_LOCAL_MESSAGES) {
+            const oldest = this.messages.values().next().value;
+            if (oldest !== undefined)
+                this.messages.delete(oldest);
+        }
+    }
+}
+function isVendorLocalMessage(message) {
+    return LOCAL_VENDOR_MESSAGES.has(message) || LOCAL_VENDOR_PATTERNS.some(pattern => pattern.test(message));
+}
+/**
+ * Cursor adapter for the DSH host.
+ *
+ * Failure text contract: `finish/error` messages that originate from the
+ * vendor stream and can quote provider-controlled text (the response content
+ * type, trailers, end-stream errors, a frame-reader or other error whose message
+ * is not one of the literals below, and a transport-coded failure that is not a
+ * socket-layer error) are replaced by `<code> [provider response text omitted]`. Failures that are
+ * wholly local keep their own message and code:
+ *
+ * - anything the auth service threw (not signed in, sign-in expired, token
+ *   refresh status), and a host attachment read failure;
+ * - the vendor's own request validation, by code (`UNSUPPORTED_OPTION`,
+ *   `UNSUPPORTED_CONTENT`, `TOOL_LIMIT`);
+ * - the vendor's fixed-literal plain errors, by exact message: the HTTP status
+ *   (`Cursor agent returned HTTP 429`), the response, idle and progress
+ *   timeouts, a closed bridge or stream, an unreadable compressed frame, and
+ *   an invalid Cursor setting;
+ * - a network error raised by the operating system (`ECONNREFUSED`,
+ *   `ENOTFOUND`, ...), recognised from the thrown error's own code, not from
+ *   the vendor's classification.
+ *
+ * Not a provider-origin class: a network error such as `ECONNREFUSED` is a
+ * local failure (no network, daemon down, DNS), and is kept. What is still
+ * replaced although it is probably local is a transport failure with no
+ * socket-layer errno: a TLS or certificate failure and an HTTP/2 protocol
+ * error. The vendor's `TRANSPORT` code cannot decide those, because
+ * `classifyCursorError` derives it from message text (`network`, `connection`,
+ * `socket`, `fetch`, `ECONN`, `http2`) and a provider's end-stream message or
+ * `grpc-message` can contain any of them; so the code is never trusted alone.
+ * Telling these apart would need a check on the thrown error object, as the
+ * errno check above does, extended to the TLS and HTTP/2 error codes. That is
+ * not done here and is not verified.
+ */
 export class CursorCompatAdapter extends CursorAdapter {
     visibleModels;
+    localFailures;
     constructor(options) {
-        super(options);
+        const localFailures = new LocalFailureMessages();
+        super({
+            ...options,
+            auth: localFailures.wrap(options.auth),
+            ...(options.resolveAttachments === undefined
+                ? {}
+                : { resolveAttachments: localFailures.wrapAttachments(options.resolveAttachments) }),
+        });
+        this.localFailures = localFailures;
         this.visibleModels = options.visibleModels;
+        // The vendor assigns `createAgentRun` (the injected one, or its own
+        // `AgentRun` factory) in its constructor but does not type it as a member.
+        const vendor = this;
+        const createRun = vendor.createAgentRun;
+        vendor.createAgentRun = access => localFailures.observeRun(createRun(access));
     }
     async listModels(provider) {
         const models = await super.listModels(provider);
         const visible = this.visibleModels?.();
         return visible === undefined ? models : models.filter(model => visible.includes(model.id));
     }
-    stream(options) {
-        return super.stream({
+    async *stream(options) {
+        for await (const chunk of super.stream({
             ...options,
             // Existing DSH sessions may still hold this retired selection.
             model: options.model === 'composer-2' ? 'composer-2.5' : options.model,
             messages: projectCursorMessages(options.messages),
-        });
+        })) {
+            if (chunk.type === 'finish' && chunk.reason.kind === 'error'
+                && !LOCAL_VENDOR_CODES.has(chunk.reason.failure.code)
+                && !isVendorLocalMessage(chunk.reason.failure.message)
+                && !this.localFailures.has(chunk.reason.failure.message)) {
+                // The vendor uses raw headers, trailers and end-stream errors for protocol
+                // checks and classification before this boundary. Keep its code and retry
+                // decisions; do not reclassify the replacement text. "Safe" here means no
+                // provider-controlled free text is displayed in failures, not that no
+                // secret can exist anywhere internally.
+                yield {
+                    ...chunk,
+                    reason: {
+                        ...chunk.reason,
+                        failure: {
+                            ...chunk.reason.failure,
+                            message: `${chunk.reason.failure.code} [provider response text omitted]`,
+                        },
+                    },
+                };
+            }
+            else {
+                yield chunk;
+            }
+        }
     }
 }

package/lib/providers/cursor-auth.js

@@ -1,13 +1,20 @@
 /** Cursor OAuth session and browser-login lifecycle. Credentials stay in DSH. */
 import { createHash, randomBytes, randomUUID } from 'node:crypto';
 import { credentialRef } from '@deepseek-ai/dsh-credentials';
+import { parseProviderJson } from './common.js';
 export const CURSOR_CREDENTIAL_REF = credentialRef('CURSOR_SUBSCRIPTION_OAUTH');
 const API_ORIGIN = 'https://api2.cursor.sh';
 const REFRESH_AHEAD_MS = 5 * 60_000;
-function parseCredential(value) {
+async function parseCredential(value) {
     if (value === undefined || value.length === 0)
         return undefined;
-    const parsed = JSON.parse(value);
+    // A parse failure here is a local shape error, not a provider signal. That is a
+    // deliberate change: the vendor classifies a stream failure from the message
+    // text, and the raw JSON.parse message used to carry a body excerpt, so a
+    // corrupt credential whose body happened to contain a word like `quota` was
+    // classified as a rate limit. Sanitising the message removes that accident, so
+    // a malformed credential now fails as a general provider error instead.
+    const parsed = await parseProviderJson(value, 'Cursor stored credential');
     if (parsed === null || typeof parsed !== 'object')
         throw new Error('Cursor credential is malformed');
     const item = parsed;
@@ -89,7 +96,7 @@ export class CursorAuth {
         });
         if (!response.ok)
             throw new Error(`Cursor token refresh failed (HTTP ${response.status})`);
-        const body = await response.json();
+        const body = await parseProviderJson(response, 'Cursor token refresh');
         if (typeof body.accessToken !== 'string' || body.accessToken.length === 0) {
             throw new Error('Cursor token refresh returned no access token');
         }
@@ -136,7 +143,7 @@ export class CursorAuth {
             }
             if (!response.ok)
                 throw new Error(`Cursor login failed (HTTP ${response.status})`);
-            const body = await response.json();
+            const body = await parseProviderJson(response, 'Cursor login poll');
             signal.throwIfAborted();
             if (typeof body.accessToken !== 'string' || body.accessToken.length === 0) {
                 throw new Error('Cursor login returned no access token');

package/lib/providers/cursor-usage.js

@@ -1,4 +1,5 @@
 /** Cursor individual-account quota projection from its dashboard endpoints. */
+import { parseProviderJson } from './common.js';
 const ORIGIN = 'https://cursor.com';
 function record(value) {
     return value !== null && typeof value === 'object' && !Array.isArray(value)
@@ -44,7 +45,7 @@ async function dashboardJson(url, cookie, http, signal) {
     });
     if (!response.ok)
         throw new Error(`Cursor usage endpoint returned HTTP ${response.status}`);
-    return response.json();
+    return parseProviderJson(response, 'Cursor usage');
 }
 function legacyRequestWindow(body, resetsAt) {
     const usage = record(body);

package/lib/providers/external-usage-controller.d.ts

@@ -1,6 +1,6 @@
 import type { ProviderUsage } from './common.js';
 /** Usage-only sources whose model routes are supplied by the DSH base install. */
-export type ExternalUsageSource = 'opencode-go' | 'kimi-code' | 'minimax' | 'minimax-cn';
+export type ExternalUsageSource = 'opencode-go' | 'kimi-code' | 'minimax' | 'minimax-cn' | 'ollama-cloud';
 export declare const EXTERNAL_USAGE_SOURCES: readonly ExternalUsageSource[];
 export interface ExternalUsageStatus {
     configured: boolean;
@@ -8,11 +8,18 @@ export interface ExternalUsageStatus {
 type ResolveCredential = (name: string) => Promise<{
     value: string;
 } | undefined>;
+/**
+ * A setting the controller reads per call. The function form keeps the Ollama
+ * reference and base URL live: the Settings card can change them after the
+ * controller was constructed.
+ */
+type LiveValue = string | (() => string);
 export declare class ExternalUsageController {
     private readonly resolveCredential;
     private readonly http;
     private readonly refs;
-    constructor(resolveCredential: ResolveCredential, http?: typeof fetch, refs?: Partial<Record<ExternalUsageSource, string>>);
+    private readonly ollamaBaseURL;
+    constructor(resolveCredential: ResolveCredential, http?: typeof fetch, refs?: Partial<Record<ExternalUsageSource, LiveValue>>, ollamaBaseURL?: LiveValue);
     status(): Promise<Record<ExternalUsageSource, ExternalUsageStatus>>;
     usage(source: ExternalUsageSource, signal?: AbortSignal): Promise<ProviderUsage>;
 }

package/lib/providers/external-usage-controller.js

@@ -1,35 +1,49 @@
 import { fetchMiniMaxUsage } from './minimax-usage.js';
-import { fetchKimiCodeUsage, fetchOpenCodeGoUsage } from './external-usage.js';
-export const EXTERNAL_USAGE_SOURCES = ['opencode-go', 'kimi-code', 'minimax', 'minimax-cn'];
+import { fetchKimiCodeUsage, fetchOllamaUsage, fetchOpenCodeGoUsage } from './external-usage.js';
+import { DEFAULT_OLLAMA_API_KEY_REF, DEFAULT_OLLAMA_BASE_URL } from './ollama.js';
+export const EXTERNAL_USAGE_SOURCES = ['opencode-go', 'kimi-code', 'minimax', 'minimax-cn', 'ollama-cloud'];
+function valueOf(value) {
+    return typeof value === 'function' ? value() : value;
+}
 const DEFAULT_REFS = {
     'opencode-go': 'OPENCODE_GO_API_KEY',
     'kimi-code': 'KIMI_CODING_API_KEY',
     'minimax': 'MINIMAX_API_KEY',
     'minimax-cn': 'MINIMAX_CN_API_KEY',
+    'ollama-cloud': DEFAULT_OLLAMA_API_KEY_REF,
 };
 export class ExternalUsageController {
     resolveCredential;
     http;
     refs;
-    constructor(resolveCredential, http = fetch, refs = {}) {
+    ollamaBaseURL;
+    constructor(resolveCredential, http = fetch, refs = {}, ollamaBaseURL = DEFAULT_OLLAMA_BASE_URL) {
         this.resolveCredential = resolveCredential;
         this.http = http;
         this.refs = { ...DEFAULT_REFS, ...refs };
+        this.ollamaBaseURL = ollamaBaseURL;
     }
     async status() {
         const values = await Promise.all(EXTERNAL_USAGE_SOURCES.map(async (source) => {
-            const value = await this.resolveCredential(this.refs[source]);
+            const value = await this.resolveCredential(valueOf(this.refs[source]));
             return typeof value?.value === 'string' && value.value.length > 0;
         }));
         return Object.fromEntries(EXTERNAL_USAGE_SOURCES.map((source, i) => [source, { configured: values[i] ?? false }]));
     }
     async usage(source, signal) {
-        const credential = await this.resolveCredential(this.refs[source]);
+        // Snapshot the endpoint facts before the first await: a save that
+        // switches the ref or host mid-flight must not send the old
+        // reference's key to the new host.
+        const ref = valueOf(this.refs[source]);
+        const ollamaBase = valueOf(this.ollamaBaseURL);
+        const credential = await this.resolveCredential(ref);
         if (credential?.value === undefined || credential.value.length === 0) {
             throw new Error(`${source} API key is not configured`);
         }
         if (source === 'minimax' || source === 'minimax-cn')
             return fetchMiniMaxUsage(credential.value, source === 'minimax-cn' ? 'cn' : 'global', this.http, signal);
+        if (source === 'ollama-cloud')
+            return fetchOllamaUsage(credential.value, ollamaBase, this.http, signal);
         return source === 'opencode-go'
             ? fetchOpenCodeGoUsage(credential.value, this.http, signal)
             : fetchKimiCodeUsage(credential.value, this.http, signal);

package/lib/providers/external-usage.d.ts

@@ -5,4 +5,12 @@ type HttpFetch = typeof fetch;
 export declare function fetchOpenCodeGoUsage(apiKey: string, http?: HttpFetch, signal?: AbortSignal): Promise<ProviderUsage>;
 /** Read official CLI count windows and retain compatibility with older ratio pools. */
 export declare function fetchKimiCodeUsage(apiKey: string, http?: HttpFetch, signal?: AbortSignal): Promise<ProviderUsage>;
+/**
+ * Read Ollama Cloud quota from `GET {base}/balance`. The Cloud has no
+ * `limits` object: quota is the included allowance against its remaining
+ * balance (`included.allowance_usd`, `included.balance_usd`) over the
+ * reported period. A 404 means a self-hosted endpoint without the
+ * surface: not an error, the card renders an unsupported note instead.
+ */
+export declare function fetchOllamaUsage(apiKey: string, baseURL: string, http?: HttpFetch, signal?: AbortSignal): Promise<ProviderUsage>;
 export {};

package/lib/providers/external-usage.js

@@ -1,4 +1,6 @@
 /** Usage readers for subscriptions whose model adapters are built into DSH. */
+import { attributionHeaders } from '@deepseek-ai/dsh-llm';
+import { parseProviderJson, readBoundedJson } from './common.js';
 function numeric(value) {
     const n = typeof value === 'string' && value.trim() !== '' ? Number(value) : value;
     return typeof n === 'number' && Number.isFinite(n) ? n : undefined;
@@ -39,7 +41,7 @@ async function getUsage(url, apiKey, http, signal) {
     });
     if (!response.ok)
         throw new Error(`Usage endpoint returned HTTP ${response.status}`);
-    return response.json();
+    return parseProviderJson(response, 'external usage');
 }
 /** Read the three account-wide OpenCode Go windows from its Go gateway. */
 export async function fetchOpenCodeGoUsage(apiKey, http = fetch, signal) {
@@ -58,6 +60,12 @@ export async function fetchOpenCodeGoUsage(apiKey, http = fetch, signal) {
         if (usedPercent === undefined)
             continue;
         const resetsAt = resetTime(value?.resetsAt);
+        // Monthly has no interval fields. Both key providers' monthly pools
+        // read the same display assumption: a 30-day span back from the
+        // reset, clamped to now. Only the marker may ride it — pace never.
+        const monthlyDisplay = field === 'monthly' && resetsAt !== undefined
+            ? { displayStartsAt: Math.min(resetsAt - 30 * 86_400_000, Date.now()) }
+            : {};
         windows.push({
             kind,
             ...(scope === undefined ? {} : { scope }),
@@ -66,6 +74,7 @@ export async function fetchOpenCodeGoUsage(apiKey, http = fetch, signal) {
             ...(field === 'rolling' ? { fixedWindow: true, windowDurationMs: 18_000_000 }
                 : field === 'weekly' ? { fixedWindow: true, windowDurationMs: 604_800_000 } : {}),
             ...(resetsAt === undefined ? {} : { resetsAt }),
+            ...monthlyDisplay,
         });
     }
     if (windows.length === 0)
@@ -78,11 +87,13 @@ export async function fetchKimiCodeUsage(apiKey, http = fetch, signal) {
     if (body === undefined)
         throw new Error('Kimi Code usage response is not an object');
     const modern = [];
+    // Only the top-level `usage` object is the summary the official CLI labels
+    // "Weekly limit"; an anonymous `limits[]` entry is "Limit #n" there.
     const rows = [
-        ...(record(body.usage) ? [{ detail: body.usage }] : []),
-        ...(Array.isArray(body.limits) ? body.limits : []),
+        ...(record(body.usage) ? [{ raw: { detail: body.usage }, summary: true }] : []),
+        ...(Array.isArray(body.limits) ? body.limits.map(raw => ({ raw, summary: false })) : []),
     ];
-    for (const raw of rows) {
+    for (const { raw, summary } of rows) {
         const item = record(raw);
         if (!item)
             continue;
@@ -102,16 +113,34 @@ export async function fetchKimiCodeUsage(apiKey, http = fetch, signal) {
             : unit.includes('DAY') ? 86_400_000 : unit.includes('SECOND') ? 1000 : undefined;
         const durationMs = duration === undefined || duration <= 0 || multiplier === undefined
             ? undefined : duration * multiplier;
-        const kind = durationMs === 18_000_000 ? 'session' : durationMs === 604_800_000 ? 'weekly' : 'other';
+        const kind = durationMs === 18_000_000 ? 'session'
+            : durationMs === 604_800_000 ? 'weekly'
+                // No period fields at all: the official CLI labels the top-level
+                // summary the weekly limit, so use that kind rather than 'other'.
+                : durationMs === undefined && unit === '' ? 'weekly' : 'other';
         const resetsAt = kimiReset(detail);
         const scope = detail.name ?? detail.title ?? item.name ?? item.title;
+        // A vendor-declared span anchors the display marker at
+        // min(reset − span, now); pace stays unverified (rolling semantics
+        // are not established), so the assumed instant rides displayStartsAt.
+        // The top-level summary without a usable period (absent, zero, or no
+        // unit) is read as the weekly limit (above), so its marker assumes seven
+        // days. The official CLI
+        // gives only the label, not a span; the span rests on a live account
+        // whose summary reset matched `usages.limit_7d` to within a second.
+        // An anonymous `limits[]` entry gets no such assumption. Display only.
+        const markerSpan = durationMs ?? (summary && kind === 'weekly' ? 604_800_000 : undefined);
+        const displayStart = resetsAt !== undefined && markerSpan !== undefined
+            ? { displayStartsAt: Math.min(resetsAt - markerSpan, Date.now()) }
+            : {};
         modern.push({ kind, usedPercent,
             ...(typeof scope === 'string' ? { scope } : {}),
             ...(resetsAt === undefined ? {} : { resetsAt }),
             ...(durationMs === undefined ? {} : { windowDurationMs: durationMs }),
-            // Legacy weekly plans reset as whole seven-day buckets; five-hour semantics
-            // are documented as rolling, so no fixed-window assertion is made there.
-            ...(kind === 'weekly' ? { fixedWindow: true } : {}),
+            // A whole seven-day bucket reset, not a rolling span, only where the
+            // endpoint actually said 7 DAY.
+            ...(durationMs === 604_800_000 ? { fixedWindow: true } : {}),
+            ...displayStart,
         });
     }
     if (modern.length)
@@ -130,13 +159,69 @@ export async function fetchKimiCodeUsage(apiKey, http = fetch, signal) {
         if (typeof ratio !== 'number' || !Number.isFinite(ratio) || ratio < 0 || ratio > 1)
             continue;
         const resetsAt = resetTime(value?.reset_time ?? value?.resetAt);
+        // The monthly total resets on the subscription's cycle, not the
+        // calendar month; the display marker assumes ~30 days back. It only
+        // moves the marker — pace never rides it.
+        const monthlyDisplay = field === 'limit_month_total' && resetsAt !== undefined
+            ? { displayStartsAt: Math.min(resetsAt - 30 * 86_400_000, Date.now()) }
+            : {};
         windows.push({
             kind,
             ...(scope === undefined ? {} : { scope }),
             usedPercent: ratio * 100,
             ...(field === 'limit_7d' ? { fixedWindow: true, windowDurationMs: 604_800_000 } : {}),
             ...(resetsAt === undefined ? {} : { resetsAt }),
+            ...monthlyDisplay,
         });
     }
     return { supported: true, windows, plan: 'Kimi Code' };
 }
+/**
+ * Read Ollama Cloud quota from `GET {base}/balance`. The Cloud has no
+ * `limits` object: quota is the included allowance against its remaining
+ * balance (`included.allowance_usd`, `included.balance_usd`) over the
+ * reported period. A 404 means a self-hosted endpoint without the
+ * surface: not an error, the card renders an unsupported note instead.
+ */
+export async function fetchOllamaUsage(apiKey, baseURL, http = fetch, signal) {
+    const combined = signal === undefined
+        ? AbortSignal.timeout(15_000)
+        : AbortSignal.any([AbortSignal.timeout(15_000), signal]);
+    const response = await http(`${baseURL.replace(/\/+$/, '')}/balance`, {
+        headers: {
+            accept: 'application/json',
+            authorization: `Bearer ${apiKey}`,
+            ...attributionHeaders(),
+        },
+        redirect: 'error',
+        signal: combined,
+    });
+    if (signal?.aborted)
+        throw signal.reason;
+    if (response.status === 404)
+        return { supported: false };
+    if (!response.ok)
+        throw new Error(`Usage endpoint returned HTTP ${response.status}`);
+    const body = record(await readBoundedJson(response, 'usage', 1 * 1024 * 1024));
+    const included = record(body?.included);
+    const allowance = numeric(included?.allowance_usd);
+    const balance = numeric(included?.balance_usd);
+    if (included === undefined || allowance === undefined || allowance <= 0 || balance === undefined) {
+        throw new Error('Ollama balance response has no usable included allowance');
+    }
+    const period = record(included.period);
+    const resetsAt = period === undefined ? undefined : resetTime(period.until);
+    const startsAt = period === undefined ? undefined : resetTime(period.from);
+    return {
+        supported: true,
+        windows: [{
+                kind: 'other',
+                scope: 'Credits',
+                // An overdrawn balance stays visible instead of dropping the window.
+                usedPercent: (allowance - balance) / allowance * 100,
+                ...(resetsAt === undefined ? {} : { resetsAt }),
+                ...(startsAt === undefined ? {} : { startsAt }),
+            }],
+        plan: 'Ollama Cloud',
+    };
+}