@jingyi0605/codingns4dsh 0.2.1-rc.4 → 0.2.1-rc.6

package/data/build/dist/host/cli-adapters/magpie-context.js

@@ -0,0 +1,128 @@
+const PART_KINDS = ['system', 'tools', 'memory', 'files', 'results', 'chat'];
+const MAX_PARTS = 6;
+const MAX_ITEMS = 24;
+const MAX_POINTS = 160;
+const MAX_TEXT = 240;
+const MAX_IDENTITY = 512;
+/** Reduce Magpie's internal context response to the metadata needed by the UI. */
+export function parseMagpieContextResponse(value, options) {
+    const root = asRecord(value);
+    const sessions = root?.sessions;
+    if (!Array.isArray(sessions) || sessions.length > 80)
+        return null;
+    const agents = new Set(options.agents.map(cleanIdentity).filter((item) => item !== null));
+    const sessionIds = new Set(options.sessionIds.map(cleanIdentity).filter((item) => item !== null));
+    if (agents.size === 0 || sessionIds.size === 0)
+        return null;
+    const selected = sessions
+        .map(asRecord)
+        .filter((record) => record !== null)
+        .filter((record) => agents.has(cleanIdentity(record.agent) ?? '') && sessionIds.has(cleanIdentity(record.key) ?? ''))
+        .sort((left, right) => safeInt(right.latestId) - safeInt(left.latestId))[0];
+    if (selected === undefined)
+        return null;
+    const latest = asRecord(selected.latest);
+    const usedTokens = safeInt(latest?.tokens);
+    if (latest === null || usedTokens <= 0)
+        return null;
+    const parts = parseParts(latest.parts);
+    if (parts.length === 0)
+        return null;
+    const points = parsePoints(selected.points);
+    const contextWindow = positiveInt(latest.window) ?? positiveInt(selected.window);
+    if (contextWindow === null)
+        return null;
+    const countedTokens = points.reduce((sum, point) => sum + point.tokens, 0);
+    const cacheTokens = points.reduce((sum, point) => sum + point.cacheTokens, 0);
+    const cacheRate = countedTokens > 0 ? Math.min(1, cacheTokens / countedTokens) : 0;
+    const agent = cleanIdentity(selected.agent);
+    const key = cleanIdentity(selected.key);
+    const model = cleanText(selected.model);
+    if (agent === null || key === null || model === null)
+        return null;
+    return {
+        agent,
+        key,
+        title: cleanText(selected.title),
+        model,
+        requests: safeInt(selected.requests),
+        turns: safeInt(latest.turns),
+        usedTokens,
+        contextWindow,
+        cacheTokens,
+        cacheRate,
+        compacts: safeInt(selected.compacts),
+        latestId: positiveInt(selected.latestId),
+        parts,
+        points,
+    };
+}
+function parseParts(value) {
+    if (!Array.isArray(value) || value.length > MAX_PARTS)
+        return [];
+    return value.flatMap((item) => {
+        const record = asRecord(item);
+        const kind = readPartKind(record?.kind);
+        if (record === null || kind === null)
+            return [];
+        return [{ kind, tokens: safeInt(record.tokens), items: parseItems(record.items) }];
+    });
+}
+function parseItems(value) {
+    if (!Array.isArray(value) || value.length > MAX_ITEMS)
+        return [];
+    return value.flatMap((item) => {
+        const record = asRecord(item);
+        const name = cleanText(record?.name);
+        if (record === null || name === null)
+            return [];
+        const tag = cleanText(record.tag);
+        const count = positiveInt(record.n);
+        return [{ name, ...(tag === null ? {} : { tag }), ...(count === null ? {} : { count }), tokens: safeInt(record.tokens) }];
+    });
+}
+function parsePoints(value) {
+    if (!Array.isArray(value) || value.length > MAX_POINTS)
+        return [];
+    return value.flatMap((item) => {
+        const record = asRecord(item);
+        const id = positiveInt(record?.id);
+        if (record === null || id === null)
+            return [];
+        return [{
+                id,
+                time: cleanTime(record.time),
+                tokens: safeInt(record.tokens),
+                window: positiveInt(record.window),
+                cacheTokens: safeInt(record.cache),
+            }];
+    });
+}
+function readPartKind(value) {
+    const kind = cleanText(value);
+    return kind !== null && PART_KINDS.includes(kind) ? kind : null;
+}
+function asRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value) ? value : null;
+}
+function cleanIdentity(value) {
+    const text = cleanText(value);
+    return text !== null && text.length <= MAX_IDENTITY ? text : null;
+}
+function cleanText(value) {
+    if (typeof value !== 'string')
+        return null;
+    const text = value.trim().replace(/[\u0000-\u001f\u007f]/gu, '').slice(0, MAX_TEXT);
+    return text === '' ? null : text;
+}
+function cleanTime(value) {
+    const text = cleanText(value);
+    return text === null || Number.isNaN(Date.parse(text)) ? null : text;
+}
+function positiveInt(value) {
+    return typeof value === 'number' && Number.isSafeInteger(value) && value > 0 ? value : null;
+}
+function safeInt(value) {
+    return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0 ? value : 0;
+}
+//# sourceMappingURL=magpie-context.js.map

package/data/build/dist/host/cli-adapters/magpie-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"magpie-context.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/magpie-context.ts"],"names":[],"mappings":"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"}

package/data/build/dist/host/cli-adapters/magpie-update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"magpie-update.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/magpie-update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EACxB,iBAAiB,EAGjB,kBAAkB,EACnB,MAAM,6CAA6C,CAAA;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAA2B,MAAM,iBAAiB,CAAA;AAEhF,eAAO,MAAM,6BAA6B,EAAG,UAAmB,CAAA;AAUhE,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,wBAAwB,CAAC,CAAC,CAAA;IACnH,oFAAoF;IACpF,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAA;IACtC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAC3B,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACxD,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAChC;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IAC9B,QAAQ,CAAC,IAAI,EAAE,oCAAoC,GAAG,gCAAgC,GAAG,8CAA8C;gBAA9H,IAAI,EAAE,oCAAoC,GAAG,gCAAgC,GAAG,8CAA8C,EAAE,OAAO,EAAE,MAAM;CAIrK;AAED;;;;;GAKG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAC7D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyC;IAC/D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IACtC,OAAO,CAAC,eAAe,CAA8C;IACrE,OAAO,CAAC,cAAc,CAA6B;gBAEvC,OAAO,GAAE,0BAA+B;IAS9C,UAAU,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAM7D,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAMjE,iFAAiF;IAC3E,cAAc,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAcvE;;;;;OAKG;IACG,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAiB5F;;;OAGG;IACH,qBAAqB,IAAI,IAAI;IAQ7B,oBAAoB,IAAI,IAAI;IAM5B,OAAO,IAAI,IAAI;YAID,mBAAmB;IASjC,OAAO,CAAC,eAAe;YAUT,WAAW;YAKX,sBAAsB;YAQtB,eAAe;CAQ9B;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,kBAAkB,CAqB1E;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,iBAAiB,CAmBxE"}
+{"version":3,"file":"magpie-update.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/magpie-update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EACxB,iBAAiB,EAGjB,kBAAkB,EACnB,MAAM,6CAA6C,CAAA;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAA2B,MAAM,iBAAiB,CAAA;AAEhF,eAAO,MAAM,6BAA6B,EAAG,UAAmB,CAAA;AAUhE,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,wBAAwB,CAAC,CAAC,CAAA;IACnH,oFAAoF;IACpF,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAA;IACtC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAC3B,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACxD,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAChC;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IAC9B,QAAQ,CAAC,IAAI,EAAE,oCAAoC,GAAG,gCAAgC,GAAG,8CAA8C;gBAA9H,IAAI,EAAE,oCAAoC,GAAG,gCAAgC,GAAG,8CAA8C,EAAE,OAAO,EAAE,MAAM;CAIrK;AAED;;;;;GAKG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAC7D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyC;IAC/D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IACtC,OAAO,CAAC,eAAe,CAA8C;IACrE,OAAO,CAAC,cAAc,CAA6B;gBAEvC,OAAO,GAAE,0BAA+B;IAS9C,UAAU,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAM7D,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAMjE,iFAAiF;IAC3E,cAAc,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAcvE;;;;;OAKG;IACG,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAkB5F;;;OAGG;IACH,qBAAqB,IAAI,IAAI;IAQ7B,oBAAoB,IAAI,IAAI;IAM5B,OAAO,IAAI,IAAI;YAID,mBAAmB;IASjC,OAAO,CAAC,eAAe;YAUT,WAAW;YAKX,sBAAsB;YAQtB,eAAe;CAQ9B;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,kBAAkB,CAqB1E;AAWD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,iBAAiB,CAmBxE"}

package/data/build/dist/host/cli-adapters/magpie-update.js

@@ -83,10 +83,10 @@ export class MagpieUpdateService {
             method: 'POST',
             body: { view: 'codingns-magpie-management', when: 'now' },
         });
-        const restartExpected = before.state === 'ready' || response === null;
-        if (response === null)
-            return { requested: true, restartExpected, status: null };
-        const status = parseMagpieUpdateStatus(response);
+        // A successful install may return an acknowledgement before Magpie hands the Web
+        // process over to the new binary. Only status reads/checks require a full status shape.
+        const status = response === null ? null : parseInstallResponse(response);
+        const restartExpected = before.state === 'ready' || status === null;
         return { requested: true, restartExpected, status };
     }
     /**
@@ -175,6 +175,16 @@ export function parseMagpieUpdateStatus(value) {
         gaveUp: optionalBoolean(record.gaveUp, 'gaveUp'),
     };
 }
+function parseInstallResponse(value) {
+    try {
+        return parseMagpieUpdateStatus(value);
+    }
+    catch (error) {
+        if (error instanceof MagpieUpdateError && error.code === 'CODINGNS_MAGPIE_UPDATE_INVALID')
+            return null;
+        throw error;
+    }
+}
 export function parseMagpieUpdateNotes(value) {
     const record = asRecord(value);
     if (record === null || !Array.isArray(record.releases) || record.releases.length > MAX_RELEASES) {

package/data/build/dist/host/cli-adapters/magpie-update.js.map

@@ -1 +1 @@
-{"version":3,"file":"magpie-update.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/magpie-update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"magpie-update.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/magpie-update.ts"],"names":[],"mappings":"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"}

package/data/build/dist/host/cli-adapters/magpie-usage.d.ts

@@ -1,6 +1,6 @@
 import type { CodingNsCliAdapterId, CodingNsCliModelCatalog, CodingNsCliServiceTier, CodingNsCliSessionConfig } from '../../shared/contracts/cli-adapter.js';
 import type { MagpieQuota, MagpieUsageSnapshot } from '../../shared/contracts/subscription.js';
-import type { MagpieDashboardPeriod, MagpieDashboardStreamChunk, MagpieDashboardStreamPart, MagpieDashboardQuota, MagpieQuotaHistory, MagpieUsageDashboard, MagpieUsageGroup, MagpieUsageMetrics, MagpieUsageRequestPage, MagpieUsageSeriesPoint, MagpieUsageSession } from '../../shared/contracts/magpie-management.js';
+import type { MagpieDashboardPeriod, MagpieDashboardStreamChunk, MagpieDashboardStreamPart, MagpieDashboardQuota, MagpieContextSession, MagpieQuotaHistory, MagpieUsageDashboard, MagpieUsageGroup, MagpieUsageMetrics, MagpieUsageRequestPage, MagpieUsageSeriesPoint, MagpieUsageSession } from '../../shared/contracts/magpie-management.js';
 import type { MagpieWebService } from './magpie-web.js';
 /** A safe, non-sensitive title associated with a DSH session identity. */
 export interface MagpieSessionNameBinding {
@@ -61,6 +61,11 @@ export interface MagpieUsageRequestOptions {
     readonly sessionIds?: readonly string[];
     readonly sessionAgent?: string;
 }
+export interface MagpieContextRequestOptions {
+    readonly agents: readonly string[];
+    readonly sessionIds: readonly string[];
+    readonly days?: number;
+}
 /** Reads usage from the authenticated local Magpie Web API and exact-matches session identity. */
 export declare class MagpieUsageService {
     private readonly readModels;
@@ -84,7 +89,9 @@ export declare class MagpieUsageService {
     private readonly quotaLogoCache;
     private providerCatalog;
     constructor(options?: MagpieUsageServiceOptions);
-    read(session: Pick<CodingNsCliSessionConfig, 'adapterId' | 'modelId' | 'providerSessionId'>, signal?: AbortSignal, includeRoute?: boolean, dshSessionId?: string): Promise<MagpieUsageSnapshot | null>;
+    read(session: Pick<CodingNsCliSessionConfig, 'adapterId' | 'modelId' | 'providerSessionId'>, signal?: AbortSignal, includeRoute?: boolean, dshSessionId?: string, options?: {
+        readonly allowPendingSession?: boolean;
+    }): Promise<MagpieUsageSnapshot | null>;
     /**
      * Mark Magpie models and enrich their public metadata. The marker is
      * transient catalog data used by model-list UIs, not session provenance.
@@ -92,6 +99,8 @@ export declare class MagpieUsageService {
     enrichModelCatalog(adapterId: CodingNsCliAdapterId, catalog: CodingNsCliModelCatalog | Promise<CodingNsCliModelCatalog>, signal?: AbortSignal): Promise<CodingNsCliModelCatalog>;
     /** Return an exact, CLI-confirmed Magpie model record for trusted Host use. */
     readModelMetadata(adapterId: CodingNsCliAdapterId, modelId: string, signal?: AbortSignal): Promise<MagpieModelMetadata | null>;
+    /** Read one exact, sanitized context session from Magpie's internal Web API. */
+    readContext(options: MagpieContextRequestOptions, signal?: AbortSignal): Promise<MagpieContextSession | null>;
     /** Read bounded, graph-ready usage and quota data through authenticated Magpie Web. */
     readDashboard(period: MagpieDashboardPeriod, signal?: AbortSignal): Promise<MagpieUsageDashboard>;
     /** Stream cumulative dashboard snapshots as each independent Web API part is ready. */
@@ -101,6 +110,7 @@ export declare class MagpieUsageService {
     private timedDashboardRead;
     /** Read one bounded Web API ledger page and exact-match session identities on Host. */
     readRequestPage(options: MagpieUsageRequestOptions, signal?: AbortSignal): Promise<MagpieUsageRequestPage | null>;
+    private readRequestAggregate;
     private readFromWeb;
     private attachQuotaLogos;
     private readMagpieLogoDataUrl;

package/data/build/dist/host/cli-adapters/magpie-usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"magpie-usage.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/magpie-usage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"magpie-usage.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/magpie-usage.ts"],"names":[],"mappings":"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"}

package/data/build/dist/host/cli-adapters/magpie-usage.js

@@ -1,6 +1,7 @@
 import { spawnSync } from 'node:child_process';
 import { commandEnvironment, resolveCommandPath, runAsyncCommand, WINDOWS, withCommandSignal } from './process-utils.js';
 import { parseMagpieWebProviders } from './magpie-management.js';
+import { parseMagpieContextResponse } from './magpie-context.js';
 const MAGPIE_CATALOG_TTL_MS = 60_000;
 const MAGPIE_MODEL_METADATA_TTL_MS = 60_000;
 const MAGPIE_FAILURE_CACHE_TTL_MS = 5_000;
@@ -81,7 +82,7 @@ export class MagpieUsageService {
         this.webApi = options.webApi;
         this.onDashboardTiming = options.onDashboardTiming;
     }
-    async read(session, signal, includeRoute = false, dshSessionId) {
+    async read(session, signal, includeRoute = false, dshSessionId, options = {}) {
         signal?.throwIfAborted();
         const agent = magpieAgentForAdapter(session.adapterId);
         const requestedModelId = cleanText(session.modelId);
@@ -89,24 +90,25 @@ export class MagpieUsageService {
             return null;
         const providerSessionId = cleanText(session.providerSessionId);
         const nativeSessionId = cleanText(dshSessionId);
-        // Native DSH requests use the DSH session ID as their Magpie session
-        // identity. Other drivers must never treat that fallback as a provider ID.
-        const sessionId = providerSessionId !== null && providerSessionId !== nativeSessionId
+        // Native DSH requests are tagged with the DSH session ID. Keep the older
+        // provider-session fallback for callers that do not have the native ID yet,
+        // and for Magpie ledgers written before native_session tagging was added.
+        const sessionId = agent === 'dsh'
+            ? nativeSessionId ?? providerSessionId
+            : providerSessionId !== null && providerSessionId !== nativeSessionId ? providerSessionId : null;
+        // Current Codex and Command Code gateway requests carry the Host's native
+        // session tag. Codex may use it only after the caller confirms Magpie.
+        const nativeTagged = agent === 'dsh' || agent === 'commandcode'
+            || agent === 'codex' && options.allowPendingSession === true;
+        const magpieSessionId = nativeTagged ? nativeSessionId ?? sessionId : sessionId;
+        // Older gateways can still index the same session by its provider ID.
+        const fallbackSessionId = nativeTagged
+            && nativeSessionId !== null && providerSessionId !== null && nativeSessionId !== providerSessionId
             ? providerSessionId
-            : agent === 'dsh' ? nativeSessionId : null;
-        // Command Code's ACP child tags loopback Magpie requests with the DSH
-        // session ID injected by the Host, so the ledger key differs from the ACP
-        // session ID shown in the panel. Older Hosts without that ID keep the
-        // provider ID so the panel still reports the same "no usage" state.
-        const magpieSessionId = agent === 'commandcode' ? nativeSessionId ?? sessionId : sessionId;
-        // During a rolling update the ACP child may still tag requests with its ACP
-        // session ID; fall back to it when the DSH-ID ledger row is absent.
-        const fallbackSessionId = agent === 'commandcode' && nativeSessionId !== null && sessionId !== null && nativeSessionId !== sessionId
-            ? sessionId
             : null;
-        if (magpieSessionId === null)
+        if (magpieSessionId === null && !options.allowPendingSession)
             return null;
-        return this.readFromWeb(agent, requestedModelId, sessionId, magpieSessionId, fallbackSessionId, signal, includeRoute);
+        return this.readFromWeb(agent, requestedModelId, sessionId, magpieSessionId, fallbackSessionId, signal, includeRoute, options.allowPendingSession === true);
     }
     /**
      * Mark Magpie models and enrich their public metadata. The marker is
@@ -133,9 +135,12 @@ export class MagpieUsageService {
                 if (id === null)
                     return model;
                 const record = metadata?.get(id);
-                const enriched = record === undefined
+                const metadataModel = record === undefined
                     ? model.source === 'magpie' ? model : { ...model, source: 'magpie' }
                     : mergeMagpieModelMetadata(model, record);
+                const providerId = providerFromModel(id);
+                const enriched = providerId === null || metadataModel.magpieProviderId === providerId
+                    ? metadataModel : { ...metadataModel, magpieProviderId: providerId };
                 if (enriched === model)
                     return model;
                 groupChanged = true;
@@ -152,11 +157,13 @@ export class MagpieUsageService {
                 .filter((id) => !existingModelIds.has(id))
                 .map((id) => {
                 const record = metadata?.get(id);
+                const providerId = providerFromModel(id);
                 const model = {
                     id,
                     name: record?.name ?? agentCatalog.displayNames.get(id) ?? id,
                     efforts: record?.efforts ?? [],
                     source: 'magpie',
+                    ...(providerId === null ? {} : { magpieProviderId: providerId }),
                 };
                 return record === undefined ? model : mergeMagpieModelMetadata(model, record);
             });
@@ -192,6 +199,15 @@ export class MagpieUsageService {
         const metadata = await this.loadModelMetadata(catalog, signal);
         return metadata?.get(id) ?? null;
     }
+    /** Read one exact, sanitized context session from Magpie's internal Web API. */
+    async readContext(options, signal) {
+        signal?.throwIfAborted();
+        const days = options.days === undefined ? 7 : Math.max(1, Math.min(30, Math.trunc(options.days)));
+        const response = await this.readWebJson(`/api/context?days=${days}`, signal);
+        if (!response.ok)
+            return null;
+        return parseMagpieContextResponse(response.value, options);
+    }
     /** Read bounded, graph-ready usage and quota data through authenticated Magpie Web. */
     async readDashboard(period, signal) {
         signal?.throwIfAborted();
@@ -326,6 +342,9 @@ export class MagpieUsageService {
             : [...new Set([sessionId, ...sessionIds.filter((value) => value !== null)])];
         if (requestedSessionIds.length > MAX_MAGPIE_SESSION_IDENTITIES)
             return null;
+        // Usage summaries are returned separately from the request ledger. This keeps
+        // the cards complete without preloading rows that belong to later pages.
+        const aggregatePromise = this.readRequestAggregate(options.period, sessionAgent, requestedSessionIds, signal);
         const readCandidatePage = async (offset, limit, querySessionId) => {
             const query = new URLSearchParams({ period: magpieWebPeriod(options.period), limit: String(limit), offset: String(offset) });
             if (querySessionId !== null)
@@ -355,6 +374,7 @@ export class MagpieUsageService {
                 hasMore: page.total === null ? page.rows.length >= options.limit : options.offset + page.rows.length < page.total,
                 sessionId,
                 sessionAgent,
+                aggregate: await aggregatePromise,
                 items: items.slice(0, options.limit),
             };
         }
@@ -422,29 +442,63 @@ export class MagpieUsageService {
             hasMore: !fullyScanned || matching.length > requestedEnd,
             sessionId,
             sessionAgent,
+            aggregate: await aggregatePromise,
             items: matching.slice(options.offset, requestedEnd),
         };
     }
-    async readFromWeb(agent, modelId, sessionId, magpieSessionId, fallbackSessionId, signal, includeRoute) {
+    async readRequestAggregate(period, sessionAgent, sessionIds, signal) {
+        const response = await this.readWebJson(`/api/usage?period=${magpieWebPeriod(period)}`, signal);
+        if (!response.ok)
+            return null;
+        const root = usageRecord(response.value);
+        if (root === null)
+            return null;
+        if (sessionIds.length === 0)
+            return readMagpieUsageMetrics(root);
+        const sessions = root.sessions;
+        if (!Array.isArray(sessions) || sessionAgent === null)
+            return null;
+        const acceptedAgents = MAGPIE_USAGE_AGENT_ALIASES[sessionAgent] ?? [sessionAgent];
+        const acceptedIds = new Set(sessionIds);
+        let aggregate = null;
+        for (const item of sessions) {
+            const record = asRecord(item);
+            if (record === null || !acceptedIds.has(usageSessionId(record) ?? '')
+                || !acceptedAgents.includes(cleanText(record.agent) ?? ''))
+                continue;
+            aggregate = aggregate === null
+                ? readMagpieUsageMetrics(record)
+                : sumMagpieUsageMetrics(aggregate, readMagpieUsageMetrics(record));
+        }
+        return aggregate;
+    }
+    async readFromWeb(agent, modelId, sessionId, magpieSessionId, fallbackSessionId, signal, includeRoute, allowPendingSession) {
         const capturedAt = new Date(this.now()).toISOString();
-        const [usageResult, quotaResult] = await Promise.all([
+        const [usageResult, sessionResult, quotaResult] = await Promise.all([
             this.readWebJson('/api/usage?period=today', signal),
+            this.readWebJson('/api/usage?period=all', signal),
             this.readWebJson('/api/usage/quotas', signal),
         ]);
         const aggregate = usageResult.ok ? readTotals(usageResult.value) : null;
-        const primarySession = usageResult.ok && magpieSessionId !== null
-            ? readSession(usageResult.value, agent, magpieSessionId)
+        const primarySession = sessionResult.ok && magpieSessionId !== null
+            ? readSession(sessionResult.value, agent, magpieSessionId)
             : null;
-        const fallbackSession = primarySession === null && usageResult.ok && fallbackSessionId !== null
-            ? readSession(usageResult.value, agent, fallbackSessionId)
+        const fallbackSession = primarySession === null && sessionResult.ok && fallbackSessionId !== null
+            ? readSession(sessionResult.value, agent, fallbackSessionId)
             : null;
-        const sessionUsage = primarySession ?? fallbackSession;
-        const resolvedSessionId = primarySession !== null ? magpieSessionId : fallbackSession !== null ? fallbackSessionId : magpieSessionId;
-        if (sessionUsage === null)
+        // Magpie's all-time summary can omit a session already present today.
+        // Preserve that exact daily match with its scope, rather than hiding it.
+        const todaySession = primarySession === null && fallbackSession === null && allowPendingSession && usageResult.ok
+            ? (magpieSessionId === null ? null : readSession(usageResult.value, agent, magpieSessionId))
+                ?? (fallbackSessionId === null ? null : readSession(usageResult.value, agent, fallbackSessionId))
+            : null;
+        const sessionUsage = primarySession ?? fallbackSession ?? todaySession;
+        const resolvedSessionId = sessionUsage?.id ?? magpieSessionId;
+        if (sessionUsage === null && (!allowPendingSession || aggregate === null))
             return null;
-        const canReadRoute = includeRoute && resolvedSessionId !== null && resolvedSessionId.length <= 128;
+        const canReadRoute = sessionUsage !== null && includeRoute && resolvedSessionId !== null && resolvedSessionId.length <= 128;
         const routeHistoryResult = canReadRoute
-            ? await this.readWebJson(`/api/usage/requests?period=today&offset=0&limit=100&q=${encodeURIComponent(resolvedSessionId)}`, signal)
+            ? await this.readWebJson(`/api/usage/requests?period=all&offset=0&limit=100&q=${encodeURIComponent(resolvedSessionId)}`, signal)
             : { ok: false };
         const routeRows = routeHistoryResult.ok ? asRecord(routeHistoryResult.value)?.rows : null;
         const routeHistoryValid = Array.isArray(routeRows) && routeRows.length <= 500;
@@ -458,7 +512,7 @@ export class MagpieUsageService {
         const route = routeHistory[0]?.route ?? null;
         const routeStatus = route !== null
             ? 'available'
-            : resolvedSessionId === null
+            : sessionUsage === null || resolvedSessionId === null
                 ? 'session-unavailable'
                 : !includeRoute
                     ? 'not-requested'
@@ -470,7 +524,7 @@ export class MagpieUsageService {
                 providerFromRoute(route),
                 ...routeHistory.map((record) => record.provider),
             ].filter((provider) => provider !== null))];
-        const upstreamProviders = routeProviders.length > 0
+        const upstreamProviders = sessionUsage === null ? [] : routeProviders.length > 0
             ? routeProviders
             : [providerFromModelId(modelId, agent)].filter((provider) => provider !== null);
         const upstreamProvider = upstreamProviders[0] ?? null;
@@ -489,9 +543,10 @@ export class MagpieUsageService {
             capturedAt,
             usageStatus: aggregate === null ? 'unavailable' : 'available',
             aggregate,
-            sessionId,
+            sessionId: sessionId ?? (sessionUsage === null ? null : resolvedSessionId),
             ...(resolvedSessionId === null ? {} : { requestSessionId: resolvedSessionId }),
             session: sessionUsage,
+            ...(todaySession === null ? {} : { sessionPeriod: 'today' }),
             routeStatus,
             route,
             upstreamProvider,
@@ -1052,30 +1107,35 @@ export function attachMagpieSessionNames(dashboard, bindings) {
 function mergeMagpieUsageSessions(current, row, owner) {
     return {
         ...current,
+        ...sumMagpieUsageMetrics(current, row),
         id: owner?.dshSessionId ?? current.id,
         agent: owner?.agent ?? current.agent,
-        calls: sumMagpieUsageMetric(current.calls, row.calls),
-        errors: sumMagpieUsageMetric(current.errors, row.errors),
-        retried: sumMagpieUsageMetric(current.retried, row.retried),
-        inputTokens: sumMagpieUsageMetric(current.inputTokens, row.inputTokens),
-        outputTokens: sumMagpieUsageMetric(current.outputTokens, row.outputTokens),
-        cacheReadTokens: sumMagpieUsageMetric(current.cacheReadTokens, row.cacheReadTokens),
-        cacheWriteTokens: sumMagpieUsageMetric(current.cacheWriteTokens, row.cacheWriteTokens),
-        reasoningTokens: sumMagpieUsageMetric(current.reasoningTokens, row.reasoningTokens),
-        cost: sumMagpieUsageMetric(current.cost, row.cost),
-        unpriced: sumMagpieUsageMetric(current.unpriced, row.unpriced),
-        credits: sumMagpieUsageMetric(current.credits, row.credits),
-        credited: sumMagpieUsageMetric(current.credited, row.credited),
-        timed: sumMagpieUsageMetric(current.timed, row.timed),
-        ttftMs: sumMagpieUsageMetric(current.ttftMs, row.ttftMs),
-        decodeMs: sumMagpieUsageMetric(current.decodeMs, row.decodeMs),
-        decodeTokens: sumMagpieUsageMetric(current.decodeTokens, row.decodeTokens),
-        decodeCount: sumMagpieUsageMetric(current.decodeCount, row.decodeCount),
         ...(current.dshSessionName === undefined && owner?.name !== null && owner?.name !== undefined
             ? { dshSessionName: owner.name }
             : {}),
     };
 }
+function sumMagpieUsageMetrics(left, right) {
+    return {
+        calls: sumMagpieUsageMetric(left.calls, right.calls),
+        errors: sumMagpieUsageMetric(left.errors, right.errors),
+        retried: sumMagpieUsageMetric(left.retried, right.retried),
+        inputTokens: sumMagpieUsageMetric(left.inputTokens, right.inputTokens),
+        outputTokens: sumMagpieUsageMetric(left.outputTokens, right.outputTokens),
+        cacheReadTokens: sumMagpieUsageMetric(left.cacheReadTokens, right.cacheReadTokens),
+        cacheWriteTokens: sumMagpieUsageMetric(left.cacheWriteTokens, right.cacheWriteTokens),
+        reasoningTokens: sumMagpieUsageMetric(left.reasoningTokens, right.reasoningTokens),
+        cost: sumMagpieUsageMetric(left.cost, right.cost),
+        unpriced: sumMagpieUsageMetric(left.unpriced, right.unpriced),
+        credits: sumMagpieUsageMetric(left.credits, right.credits),
+        credited: sumMagpieUsageMetric(left.credited, right.credited),
+        timed: sumMagpieUsageMetric(left.timed, right.timed),
+        ttftMs: sumMagpieUsageMetric(left.ttftMs, right.ttftMs),
+        decodeMs: sumMagpieUsageMetric(left.decodeMs, right.decodeMs),
+        decodeTokens: sumMagpieUsageMetric(left.decodeTokens, right.decodeTokens),
+        decodeCount: sumMagpieUsageMetric(left.decodeCount, right.decodeCount),
+    };
+}
 function sumMagpieUsageMetric(left, right) {
     return left === null && right === null ? null : (left ?? 0) + (right ?? 0);
 }
@@ -1136,7 +1196,7 @@ async function readBoundedJson(response) {
     }
 }
 function readTotals(value) {
-    const record = asRecord(value);
+    const record = usageRecord(value);
     if (record === null)
         return null;
     const calls = safeCount(record.calls);
@@ -1151,20 +1211,29 @@ function readTotals(value) {
     return { calls, errors, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens, costUsd };
 }
 function readSession(value, agent, sessionId) {
-    const sessions = asRecord(value)?.sessions;
+    const sessions = usageRecord(value)?.sessions;
     if (!Array.isArray(sessions))
         return null;
     const usageAgents = MAGPIE_USAGE_AGENT_ALIASES[agent] ?? [agent];
     const row = sessions.find((item) => {
         const record = asRecord(item);
         const usageAgent = cleanText(record?.agent);
-        return cleanText(record?.id) === sessionId && usageAgent !== null && usageAgents.includes(usageAgent);
+        return usageSessionId(record) === sessionId && usageAgent !== null && usageAgents.includes(usageAgent);
     });
     const record = asRecord(row);
     const totals = readTotals(record);
     const usageAgent = cleanText(record?.agent);
     return record !== null && usageAgent !== null && totals !== null ? { id: sessionId, agent: usageAgent, ...totals } : null;
 }
+/** Magpie 0.1.14xx can wrap usage payloads in `data`; older versions do not. */
+function usageRecord(value) {
+    const record = asRecord(value);
+    const data = asRecord(record?.data);
+    return data ?? record;
+}
+function usageSessionId(record) {
+    return cleanText(record?.id) ?? cleanText(record?.session) ?? cleanText(record?.native_session);
+}
 /** Read the durable request ledger when Magpie's short in-memory trace has expired. */
 function readSessionRouteHistory(value, agent, sessionId, providerRecords = []) {
     const rows = asRecord(value)?.rows;