@jingyi0605/codingns4dsh 0.2.1-rc.5 → 0.2.1-rc.7

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

@@ -135,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;
@@ -154,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);
             });
@@ -178,6 +183,31 @@ export class MagpieUsageService {
         }
         return changed ? { ...resolvedCatalog, groups } : resolvedCatalog;
     }
+    async updateAccountPolicy(input, signal) {
+        const update = readMagpieAccountPolicyUpdate(input);
+        const path = update.policy === 'credits' ? '/api/settings/codex-credits' : '/api/settings/codex-auto-reset';
+        const body = update.policy === 'credits'
+            ? { user: update.user, on: update.enabled }
+            : { user: update.user, on: update.enabled, when: update.policy };
+        const result = await this.requestWebJson(path, { method: 'POST', body }, signal);
+        if (!result.ok)
+            throw new Error('Magpie account policy update failed');
+        const settings = parseMagpieAccountPolicies(result.value);
+        if (settings === null || !magpieAccountPolicyMatches(settings, update)) {
+            throw new Error('Magpie account policy update could not be verified');
+        }
+        return update;
+    }
+    async resetCodexAccount(input, signal) {
+        const user = readMagpieAccountUser(input);
+        const result = await this.requestWebJson('/api/usage/codex-reset', {
+            method: 'POST',
+            body: { user },
+        }, signal);
+        if (!result.ok)
+            throw new Error('Magpie Codex reset failed');
+        return { outcome: normalizeMagpieResetOutcome(result.value) };
+    }
     /** Return an exact, CLI-confirmed Magpie model record for trusted Host use. */
     async readModelMetadata(adapterId, modelId, signal) {
         signal?.throwIfAborted();
@@ -204,16 +234,16 @@ export class MagpieUsageService {
         return parseMagpieContextResponse(response.value, options);
     }
     /** Read bounded, graph-ready usage and quota data through authenticated Magpie Web. */
-    async readDashboard(period, signal) {
+    async readDashboard(period, signal, force = false) {
         signal?.throwIfAborted();
         const cached = this.dashboardCache.get(period);
-        if (cached !== undefined) {
+        if (!force && cached !== undefined) {
             if (this.now() - cached.loadedAt >= MAGPIE_DASHBOARD_CACHE_TTL_MS) {
                 void this.refreshDashboard(period).catch(() => undefined);
             }
             return cached.dashboard;
         }
-        return this.refreshDashboard(period, signal);
+        return this.refreshDashboard(period, signal, force);
     }
     /** Stream cumulative dashboard snapshots as each independent Web API part is ready. */
     async *readDashboardStream(period, signal, force = false) {
@@ -233,22 +263,25 @@ export class MagpieUsageService {
         if (latest !== undefined)
             this.dashboardCache.set(period, { dashboard: latest, loadedAt: this.now() });
     }
-    async refreshDashboard(period, signal) {
+    async refreshDashboard(period, signal, force = false) {
         const pending = this.dashboardRefreshes.get(period);
-        if (pending !== undefined)
+        if (!force && pending !== undefined)
             return awaitWithSignal(pending, signal);
-        const request = (async () => {
+        let request = null;
+        const task = (async () => {
             let latest;
             for await (const chunk of this.readDashboardNetwork(period, signal))
                 latest = chunk.dashboard;
             if (latest === undefined)
                 throw new Error('Magpie dashboard returned no snapshot');
-            this.dashboardCache.set(period, { dashboard: latest, loadedAt: this.now() });
+            if (request !== null && this.dashboardRefreshes.get(period) === request)
+                this.dashboardCache.set(period, { dashboard: latest, loadedAt: this.now() });
             return latest;
         })().finally(() => {
-            if (this.dashboardRefreshes.get(period) === request)
+            if (request !== null && this.dashboardRefreshes.get(period) === request)
                 this.dashboardRefreshes.delete(period);
         });
+        request = task;
         this.dashboardRefreshes.set(period, request);
         return awaitWithSignal(request, signal);
     }
@@ -257,19 +290,23 @@ export class MagpieUsageService {
         let dashboard = emptyMagpieDashboard(period, capturedAt);
         let quotas = null;
         let logoLoad;
+        let settingsRead = false;
         const results = new Map([
             ['usage', this.timedDashboardRead('usage', () => this.readWebJson(`/api/usage?period=${magpieWebPeriod(period)}`, signal))],
             ['quotas', this.timedDashboardRead('quotas', () => this.readWebJson('/api/usage/quotas', signal))],
+            ['settings', this.timedDashboardRead('settings', () => this.readWebJson('/api/settings', signal))],
             ['history', this.timedDashboardRead('history', () => this.readWebJson('/api/usage/quotas/history?days=30', signal))],
         ]);
         const completed = new Map();
+        let policies = null;
         while (results.size > 0) {
             const result = await Promise.race(results.values());
             results.delete(result.part);
             const response = asRecord(result.value);
             const partOk = result.ok && response?.ok === true;
             const partValue = partOk ? response.value : undefined;
-            completed.set(result.part, partOk);
+            if (result.part !== 'settings')
+                completed.set(result.part, partOk);
             if (result.part === 'usage') {
                 const parsed = partOk ? parseMagpieDashboardUsage(partValue) : null;
                 dashboard = {
@@ -286,10 +323,21 @@ export class MagpieUsageService {
                 };
             }
             else if (result.part === 'quotas') {
-                quotas = partOk ? parseMagpieQuotaCards(partValue) : null;
+                const parsedQuotas = partOk ? parseMagpieQuotaCards(partValue) : null;
+                quotas = parsedQuotas === null ? null : applyMagpieDashboardAccountPolicies(parsedQuotas, policies);
                 dashboard = { ...dashboard, quotaStatus: quotas === null ? 'unavailable' : 'available', quotas: quotas ?? [] };
+                if (quotas !== null && settingsRead)
+                    logoLoad = this.timedDashboardRead('quota-logos', () => this.attachQuotaLogos(quotas, signal)).then((logoResult) => logoResult.value);
+            }
+            else if (result.part === 'settings') {
+                settingsRead = true;
+                policies = partOk ? parseMagpieAccountPolicies(partValue) : null;
+                if (quotas !== null && policies !== null) {
+                    quotas = applyMagpieDashboardAccountPolicies(quotas, policies);
+                    dashboard = { ...dashboard, quotas };
+                }
                 if (quotas !== null)
-                    logoLoad = this.timedDashboardRead('quota-logos', () => this.attachQuotaLogos(quotas, signal)).then((result) => result.value);
+                    logoLoad = this.timedDashboardRead('quota-logos', () => this.attachQuotaLogos(quotas, signal)).then((logoResult) => logoResult.value);
             }
             else {
                 const parsed = partOk ? parseMagpieQuotaHistory(partValue) : null;
@@ -469,10 +517,11 @@ export class MagpieUsageService {
     }
     async readFromWeb(agent, modelId, sessionId, magpieSessionId, fallbackSessionId, signal, includeRoute, allowPendingSession) {
         const capturedAt = new Date(this.now()).toISOString();
-        const [usageResult, sessionResult, quotaResult] = await Promise.all([
+        const [usageResult, sessionResult, quotaResult, settingsResult] = await Promise.all([
             this.readWebJson('/api/usage?period=today', signal),
             this.readWebJson('/api/usage?period=all', signal),
             this.readWebJson('/api/usage/quotas', signal),
+            agent === 'codex' ? this.readWebJson('/api/settings', signal) : Promise.resolve({ ok: false }),
         ]);
         const aggregate = usageResult.ok ? readTotals(usageResult.value) : null;
         const primarySession = sessionResult.ok && magpieSessionId !== null
@@ -514,7 +563,9 @@ export class MagpieUsageService {
                     : !canReadRoute || !routeHistoryValid
                         ? 'unavailable'
                         : 'no-route';
-        const allQuotas = quotaResult.ok ? parseMagpieQuotas(quotaResult.value) : null;
+        const allQuotas = quotaResult.ok
+            ? applyMagpieAccountPolicies(parseMagpieQuotas(quotaResult.value), settingsResult.ok ? settingsResult.value : null)
+            : null;
         const routeProviders = [...new Set([
                 providerFromRoute(route),
                 ...routeHistory.map((record) => record.provider),
@@ -725,6 +776,20 @@ export class MagpieUsageService {
             return { ok: false };
         }
     }
+    async requestWebJson(path, options, signal) {
+        if (this.webApi === undefined)
+            return { ok: false };
+        try {
+            return {
+                ok: true,
+                value: await this.webApi.requestJson(path, signal === undefined ? options : { ...options, signal }),
+            };
+        }
+        catch {
+            signal?.throwIfAborted();
+            return { ok: false };
+        }
+    }
     /** Provider management data is the canonical source when a usage row mislabels its upstream. */
     async readProviderCatalog(signal) {
         const cached = this.providerCatalog;
@@ -1390,6 +1455,113 @@ export function parseMagpieQuotas(value) {
     }
     return quotas;
 }
+function parseMagpieAccountPolicies(value) {
+    const root = asRecord(value);
+    if (root === null)
+        return null;
+    const autoResetUsers = readLowercaseSet(root.codexAutoReset, 500);
+    const noCreditsUsers = readLowercaseSet(root.codexNoCredits, 500);
+    const autoResetOnly = new Map();
+    const only = asRecord(root.codexAutoResetOnly);
+    if (only !== null) {
+        for (const [user, value] of Object.entries(only).slice(0, 500)) {
+            if (value === 'week' || value === 'expiring')
+                autoResetOnly.set(user.toLocaleLowerCase(), value);
+        }
+    }
+    if (autoResetUsers === null || noCreditsUsers === null)
+        return null;
+    return { autoResetUsers, autoResetOnly, noCreditsUsers };
+}
+function applyMagpieAccountPolicies(quotas, settingsValue) {
+    if (quotas === null)
+        return null;
+    const settings = parseMagpieAccountPolicies(settingsValue);
+    if (settings === null)
+        return quotas;
+    return quotas.map((quota) => {
+        if (quota.provider.toLocaleLowerCase() !== 'codex' || quota.user === null)
+            return quota;
+        const user = quota.user.toLocaleLowerCase();
+        const enabled = settings.autoResetUsers.has(user);
+        const only = settings.autoResetOnly.get(user);
+        return {
+            ...quota,
+            autoReset: {
+                week: enabled && only !== 'expiring',
+                expiring: enabled && only !== 'week',
+            },
+            useCredits: !settings.noCreditsUsers.has(user),
+        };
+    });
+}
+function applyMagpieDashboardAccountPolicies(quotas, settings) {
+    return quotas.map((quota) => {
+        if (quota.provider.toLocaleLowerCase() !== 'codex' || quota.user === null)
+            return quota;
+        if (settings === null)
+            return { ...quota, policyStatus: 'unavailable' };
+        const user = quota.user.toLocaleLowerCase();
+        const enabled = settings.autoResetUsers.has(user);
+        const only = settings.autoResetOnly.get(user);
+        return {
+            ...quota,
+            autoReset: {
+                week: enabled && only !== 'expiring',
+                expiring: enabled && only !== 'week',
+            },
+            useCredits: !settings.noCreditsUsers.has(user),
+            policyStatus: 'available',
+        };
+    });
+}
+function readLowercaseSet(value, maxItems) {
+    if (value === undefined)
+        return new Set();
+    if (!Array.isArray(value) || value.length > maxItems)
+        return null;
+    const values = value.filter((item) => typeof item === 'string' && item.trim() !== '');
+    return values.length === value.length
+        ? new Set(values.map((item) => item.trim().toLocaleLowerCase()))
+        : null;
+}
+function readMagpieAccountUser(value) {
+    const record = asRecord(value);
+    const user = typeof record?.user === 'string' ? record.user.trim() : '';
+    if (user === '' || user.length > 180)
+        throw new TypeError('Magpie account user is invalid');
+    return user;
+}
+function readMagpieAccountPolicyUpdate(value) {
+    const record = asRecord(value);
+    const user = readMagpieAccountUser(value);
+    const policy = record?.policy;
+    if (policy !== 'week' && policy !== 'expiring' && policy !== 'credits') {
+        throw new TypeError('Magpie account policy is invalid');
+    }
+    if (typeof record?.enabled !== 'boolean')
+        throw new TypeError('Magpie account policy state is invalid');
+    return { user, policy, enabled: record.enabled };
+}
+function magpieAccountPolicyMatches(settings, update) {
+    const user = update.user.toLocaleLowerCase();
+    if (update.policy === 'credits')
+        return settings.noCreditsUsers.has(user) !== update.enabled;
+    const enabled = settings.autoResetUsers.has(user);
+    const only = settings.autoResetOnly.get(user);
+    const current = update.policy === 'week'
+        ? enabled && only !== 'expiring'
+        : enabled && only !== 'week';
+    return current === update.enabled;
+}
+function normalizeMagpieResetOutcome(value) {
+    const record = asRecord(value);
+    const outcome = record?.code ?? record?.outcome;
+    if (outcome === 'reset' || outcome === 'alreadyRedeemed' || outcome === 'nothingToReset' || outcome === 'noCredit') {
+        return outcome;
+    }
+    throw new Error('Magpie returned an unknown reset result');
+}
 /** Normalize the live aggregate and per-dimension usage response. */
 export function parseMagpieDashboardUsage(value) {
     const root = asRecord(value);