@claudexor/cli 3.9.4 → 3.9.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/claude-oauth-usage.d.ts +8 -2
- package/dist/claude-oauth-usage.d.ts.map +1 -1
- package/dist/claude-oauth-usage.js +68 -1
- package/dist/claude-oauth-usage.js.map +1 -1
- package/dist/credential-status-invalidation.d.ts.map +1 -1
- package/dist/credential-status-invalidation.js +4 -0
- package/dist/credential-status-invalidation.js.map +1 -1
- package/dist/daemon-admission-runtime.d.ts.map +1 -1
- package/dist/daemon-admission-runtime.js +2 -2
- package/dist/daemon-admission-runtime.js.map +1 -1
- package/dist/quota-refreshers.d.ts +8 -7
- package/dist/quota-refreshers.d.ts.map +1 -1
- package/dist/quota-refreshers.js +11 -4
- package/dist/quota-refreshers.js.map +1 -1
- package/package.json +24 -24
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { QuotaRefreshResult } from "@claudexor/daemon";
|
|
1
|
+
import type { QuotaRefreshCycle, QuotaRefreshResult } from "@claudexor/daemon";
|
|
2
2
|
import { type QuotaSnapshot } from "@claudexor/schema";
|
|
3
3
|
/**
|
|
4
4
|
* The PRIMARY subscription-quota source (W5.3, live-proven 2026-07-17):
|
|
@@ -29,6 +29,10 @@ export interface ClaudeOauthCredential {
|
|
|
29
29
|
export declare function readClaudeOauthCredential(configDir: string, platform?: NodeJS.Platform): Promise<ClaudeOauthCredential | null>;
|
|
30
30
|
/** Accepts both credential shapes seen in the wild: flat and `{claudeAiOauth}`. */
|
|
31
31
|
export declare function parseClaudeOauthCredential(raw: string): ClaudeOauthCredential | null;
|
|
32
|
+
/** Daemon-side credential change (login/logout/profile mutation): every
|
|
33
|
+
* remembered rejection is re-verified on the next cycle. Fail-open by
|
|
34
|
+
* contract — over-clearing costs at most one probe. */
|
|
35
|
+
export declare function forgetClaudeOauthRejections(): void;
|
|
32
36
|
export type ClaudeOauthCredentialRefresher = (configDir: string, platform: NodeJS.Platform, readCredential: typeof readClaudeOauthCredential) => Promise<ClaudeOauthCredential | null>;
|
|
33
37
|
/** Pure mapping of the oauth/usage response onto QuotaSnapshot (testable). */
|
|
34
38
|
export declare function parseClaudeOauthUsage(value: unknown, subjectId: string | null, planLabel: string | null, observedAt?: Date): QuotaSnapshot | null;
|
|
@@ -56,6 +60,8 @@ export declare function parseRetryAfterHeaderMs(header: string | null, nowMs?: n
|
|
|
56
60
|
* read fault is the tagged reason it carries, an expired refreshable token is
|
|
57
61
|
* automatically refreshed by Claude Code without inference, and a fetch
|
|
58
62
|
* refusal is refresh_failed unless a known-fresh credential is explicitly rejected.
|
|
63
|
+
* A remembered rejection is re-stated without re-presenting the token on
|
|
64
|
+
* background cycles (see `rejectedTokens`); a foreground cycle always asks.
|
|
59
65
|
* Absence is stated, never inferred. */
|
|
60
|
-
export declare function refreshClaudeOauthUsageQuota(deps?: Partial<ClaudeOauthUsageDeps
|
|
66
|
+
export declare function refreshClaudeOauthUsageQuota(deps?: Partial<ClaudeOauthUsageDeps>, cycle?: QuotaRefreshCycle): Promise<QuotaRefreshResult>;
|
|
61
67
|
//# sourceMappingURL=claude-oauth-usage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-oauth-usage.d.ts","sourceRoot":"","sources":["../src/claude-oauth-usage.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-oauth-usage.d.ts","sourceRoot":"","sources":["../src/claude-oauth-usage.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAU/E,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,mBAAmB,CAAC;AAS3B;;;;;;;;;;;;;;GAcG;AAEH,wFAAwF;AACxF,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAID;;8EAE8E;AAC9E,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,MAAM,EACjB,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAmBvC;AA8BD,mFAAmF;AACnF,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,GAAG,IAAI,CAuBpF;AA2BD;;uDAEuD;AACvD,wBAAgB,2BAA2B,IAAI,IAAI,CAGlD;AA8BD,MAAM,MAAM,8BAA8B,GAAG,CAC3C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,cAAc,EAAE,OAAO,yBAAyB,KAC7C,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAAC;AAsB3C,8EAA8E;AAC9E,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,OAAO,EACd,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,UAAU,OAAa,GACtB,aAAa,GAAG,IAAI,CAqBtB;AAgDD,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,OAAO,yBAAyB,CAAC;IACjD,iBAAiB,EAAE,8BAA8B,CAAC;IAClD,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACtD,GAAG,EAAE,MAAM,IAAI,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;CAC3B;AASD;;;;;0BAK0B;AAC1B,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,GAAE,MAAmB,GACzB,MAAM,GAAG,IAAI,CAWf;AAuDD;;;;;;;;;;;;wCAYwC;AACxC,wBAAsB,4BAA4B,CAChD,IAAI,GAAE,OAAO,CAAC,oBAAoB,CAAM,EACxC,KAAK,CAAC,EAAE,iBAAiB,GACxB,OAAO,CAAC,kBAAkB,CAAC,CA4L7B"}
|
|
@@ -102,6 +102,52 @@ export function parseClaudeOauthCredential(raw) {
|
|
|
102
102
|
return null;
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
|
+
/** A vendor rejection remembered per PRESENTED token (INV-062: the token's
|
|
106
|
+
* hash, never the token; process memory only; never persisted or logged).
|
|
107
|
+
* Re-presenting a credential the vendor has already rejected buys nothing and
|
|
108
|
+
* costs a lot: the vendor answers a 401 storm with a one-hour 429, and the
|
|
109
|
+
* per-vendor poll floor then blacks out every healthy sibling (live journal:
|
|
110
|
+
* healthy profiles fresh 20 % of the day beside one revoked row). So a
|
|
111
|
+
* background cycle re-states the typed `auth_revoked` absence for a
|
|
112
|
+
* remembered token WITHOUT an HTTP request — the same doctrine as the codex
|
|
113
|
+
* source's logged-out precheck — until the token bytes change (any re-login,
|
|
114
|
+
* daemon-side or external), a daemon-side credential change clears the
|
|
115
|
+
* memory (`forgetClaudeOauthRejections`), an explicit foreground refresh
|
|
116
|
+
* re-asks, or the safety TTL below elapses (bounds a spurious vendor 401) —
|
|
117
|
+
* and then ONE remembered token is re-verified per cycle, never all at once:
|
|
118
|
+
* N dead tokens expiring together must not become an N-request burst, the
|
|
119
|
+
* very storm the memory exists to prevent. The memory is bounded by recent
|
|
120
|
+
* rejection churn: each cycle releases the oldest expired entry whether or
|
|
121
|
+
* not its token is still presented, so an entry lives at most the TTL plus
|
|
122
|
+
* one cycle per older expired sibling. */
|
|
123
|
+
const REVOKED_TOKEN_REPROBE_MS = 6 * 60 * 60_000;
|
|
124
|
+
const rejectedTokens = new Map();
|
|
125
|
+
/** Bumped by every forget: a cycle that started before a credential change
|
|
126
|
+
* must not restore a rejection it observed with the pre-change credentials
|
|
127
|
+
* (the same fence the registry's credential generation gives its own writes). */
|
|
128
|
+
let rejectionEpoch = 0;
|
|
129
|
+
/** Daemon-side credential change (login/logout/profile mutation): every
|
|
130
|
+
* remembered rejection is re-verified on the next cycle. Fail-open by
|
|
131
|
+
* contract — over-clearing costs at most one probe. */
|
|
132
|
+
export function forgetClaudeOauthRejections() {
|
|
133
|
+
rejectedTokens.clear();
|
|
134
|
+
rejectionEpoch += 1;
|
|
135
|
+
}
|
|
136
|
+
/** Release the OLDEST expired entry (age past the TTL, or a negative age
|
|
137
|
+
* after a wall-clock step) so its token is re-verified this cycle; younger
|
|
138
|
+
* expired siblings wait for a later cycle. */
|
|
139
|
+
function releaseExpiredRejection(nowMs) {
|
|
140
|
+
let oldest = null;
|
|
141
|
+
for (const entry of rejectedTokens) {
|
|
142
|
+
const age = nowMs - entry[1];
|
|
143
|
+
if (age < REVOKED_TOKEN_REPROBE_MS && age >= 0)
|
|
144
|
+
continue;
|
|
145
|
+
if (oldest === null || entry[1] < oldest[1])
|
|
146
|
+
oldest = entry;
|
|
147
|
+
}
|
|
148
|
+
if (oldest !== null)
|
|
149
|
+
rejectedTokens.delete(oldest[0]);
|
|
150
|
+
}
|
|
105
151
|
const VENDOR_REFRESH_REQUIRED_DETAIL = "OAuth access token freshness is unknown; Claude Code did not expose a refreshable expiry for quota reading";
|
|
106
152
|
const VENDOR_REFRESH_FAILED_DETAIL = "Claude Code's automatic OAuth refresh did not publish a fresh access token before quota reading";
|
|
107
153
|
/** Expiry and refresh-token PRESENCE are the only refresh metadata retained.
|
|
@@ -276,13 +322,19 @@ function claudeOauthAbsence(subjectId, reason, detail, observedAt) {
|
|
|
276
322
|
* read fault is the tagged reason it carries, an expired refreshable token is
|
|
277
323
|
* automatically refreshed by Claude Code without inference, and a fetch
|
|
278
324
|
* refusal is refresh_failed unless a known-fresh credential is explicitly rejected.
|
|
325
|
+
* A remembered rejection is re-stated without re-presenting the token on
|
|
326
|
+
* background cycles (see `rejectedTokens`); a foreground cycle always asks.
|
|
279
327
|
* Absence is stated, never inferred. */
|
|
280
|
-
export async function refreshClaudeOauthUsageQuota(deps = {}) {
|
|
328
|
+
export async function refreshClaudeOauthUsageQuota(deps = {}, cycle) {
|
|
281
329
|
const readCredential = deps.readCredential ?? readClaudeOauthCredential;
|
|
282
330
|
const refreshCredential = deps.refreshCredential ?? refreshCredentialDefault;
|
|
283
331
|
const fetchUsage = deps.fetchUsage ?? fetchUsageDefault;
|
|
284
332
|
const now = deps.now ?? (() => new Date());
|
|
285
333
|
const platform = deps.platform ?? process.platform;
|
|
334
|
+
// Rejections observed by THIS cycle count only if no credential change
|
|
335
|
+
// intervened; one expired memory is released for re-verification per cycle.
|
|
336
|
+
const epoch = rejectionEpoch;
|
|
337
|
+
releaseExpiredRejection(now().getTime());
|
|
286
338
|
const notLoggedInDetail = platform === "darwin"
|
|
287
339
|
? "no OAuth credential in the keychain item (no login, or the keychain tool is unavailable)"
|
|
288
340
|
: "no vendor credential file in the config dir (not logged in)";
|
|
@@ -352,8 +404,18 @@ export async function refreshClaudeOauthUsageQuota(deps = {}) {
|
|
|
352
404
|
}
|
|
353
405
|
}
|
|
354
406
|
}
|
|
407
|
+
const tokenKey = sha256(credential.accessToken);
|
|
408
|
+
const rejectedAt = rejectedTokens.get(tokenKey);
|
|
409
|
+
if (rejectedAt !== undefined && !cycle?.foreground) {
|
|
410
|
+
// The SAME observation re-stated: its instant is the vendor's real
|
|
411
|
+
// rejection time, not this cycle's clock (stable projection signature,
|
|
412
|
+
// honest "revoked at" for downstream readers).
|
|
413
|
+
absences.push(claudeOauthAbsence(candidate.subjectId, "auth_revoked", `oauth/usage rejected this token at ${new Date(rejectedAt).toISOString()}; not re-asked until the token changes, a login or profile change, an explicit refresh, or ${REVOKED_TOKEN_REPROBE_MS / 3_600_000} h elapse (then one remembered token is re-verified per cycle)`, new Date(rejectedAt)));
|
|
414
|
+
continue;
|
|
415
|
+
}
|
|
355
416
|
try {
|
|
356
417
|
const usage = await fetchUsage(credential.accessToken);
|
|
418
|
+
rejectedTokens.delete(tokenKey);
|
|
357
419
|
const snapshot = parseClaudeOauthUsage(usage, candidate.subjectId, credential.subscriptionType, now());
|
|
358
420
|
if (snapshot)
|
|
359
421
|
snapshots.push(snapshot);
|
|
@@ -376,6 +438,11 @@ export async function refreshClaudeOauthUsageQuota(deps = {}) {
|
|
|
376
438
|
const rejectedWithoutFreshnessProof = tagged === "auth_revoked" &&
|
|
377
439
|
credential.hasRefreshToken &&
|
|
378
440
|
(credential.expiresAtMs === null || needsVendorRefresh(credential, observedAt));
|
|
441
|
+
// Only a PROVEN rejection is remembered: an unproven one waits for the
|
|
442
|
+
// vendor-owned token refresh and is re-presented once that happened.
|
|
443
|
+
if (tagged === "auth_revoked" && !rejectedWithoutFreshnessProof && epoch === rejectionEpoch) {
|
|
444
|
+
rejectedTokens.set(tokenKey, observedAt.getTime());
|
|
445
|
+
}
|
|
379
446
|
absences.push({
|
|
380
447
|
...claudeOauthAbsence(candidate.subjectId, rejectedWithoutFreshnessProof ? "refresh_failed" : (tagged ?? "refresh_failed"), rejectedWithoutFreshnessProof
|
|
381
448
|
? VENDOR_REFRESH_REQUIRED_DETAIL
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-oauth-usage.js","sourceRoot":"","sources":["../src/claude-oauth-usage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"claude-oauth-usage.js","sourceRoot":"","sources":["../src/claude-oauth-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-status-invalidation.d.ts","sourceRoot":"","sources":["../src/credential-status-invalidation.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"credential-status-invalidation.d.ts","sourceRoot":"","sources":["../src/credential-status-invalidation.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAMvD;qEACqE;AACrE,MAAM,MAAM,yBAAyB,GACnC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpE,wBAAgB,0BAA0B,CACxC,aAAa,EAAE,MAAM,aAAa,EAClC,OAAO,CAAC,EAAE,yBAAyB,GAClC,IAAI,CAwBN;AAED,iFAAiF;AACjF,wBAAgB,gCAAgC,CAAC,aAAa,EAAE,MAAM,aAAa,GAAG,IAAI,CAGzF"}
|
|
@@ -12,6 +12,7 @@ import { loadConfig } from "@claudexor/config";
|
|
|
12
12
|
import { invalidateDoctorCache } from "@claudexor/core";
|
|
13
13
|
import { clearClaudeAuthStatusCache } from "@claudexor/harness-claude";
|
|
14
14
|
import { noProjectRepoRoot } from "@claudexor/util";
|
|
15
|
+
import { forgetClaudeOauthRejections } from "./claude-oauth-usage.js";
|
|
15
16
|
import { invalidateStatusProjections } from "./status-projection-cache.js";
|
|
16
17
|
import { credentialUnusableLedger } from "./run-orchestrator.js";
|
|
17
18
|
export function bustCredentialStatusCaches(quotaRegistry, subject) {
|
|
@@ -19,6 +20,9 @@ export function bustCredentialStatusCaches(quotaRegistry, subject) {
|
|
|
19
20
|
// probe transport error. Any explicit credential mutation must invalidate it
|
|
20
21
|
// before status/probe consumers can observe the changed store.
|
|
21
22
|
clearClaudeAuthStatusCache();
|
|
23
|
+
// The quota poller's remembered vendor rejections are credential state too:
|
|
24
|
+
// a login or profile change makes every remembered token worth re-asking.
|
|
25
|
+
forgetClaudeOauthRejections();
|
|
22
26
|
invalidateDoctorCache();
|
|
23
27
|
invalidateStatusProjections();
|
|
24
28
|
quotaRegistry().noteCredentialChange();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-status-invalidation.js","sourceRoot":"","sources":["../src/credential-status-invalidation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAOjE,MAAM,UAAU,0BAA0B,CACxC,aAAkC,EAClC,OAAmC;IAEnC,0EAA0E;IAC1E,6EAA6E;IAC7E,+DAA+D;IAC/D,0BAA0B,EAAE,CAAC;IAC7B,qBAAqB,EAAE,CAAC;IACxB,2BAA2B,EAAE,CAAC;IAC9B,aAAa,EAAE,CAAC,oBAAoB,EAAE,CAAC;IACvC,IAAI,CAAC,OAAO;QAAE,OAAO;IACrB,IAAI,WAAW,IAAI,OAAO,EAAE,CAAC;QAC3B,wBAAwB,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5E,OAAO;IACT,CAAC;IACD,4EAA4E;IAC5E,6EAA6E;IAC7E,sEAAsE;IACtE,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,iBAAiB,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;QACjF,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU;YAC3C,wBAAwB,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAClF,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,wBAAwB,CAAC,oBAAoB,EAAE,CAAC;AACzF,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,gCAAgC,CAAC,aAAkC;IACjF,0BAA0B,CAAC,aAAa,CAAC,CAAC;IAC1C,wBAAwB,CAAC,oBAAoB,EAAE,CAAC;AAClD,CAAC"}
|
|
1
|
+
{"version":3,"file":"credential-status-invalidation.js","sourceRoot":"","sources":["../src/credential-status-invalidation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAOjE,MAAM,UAAU,0BAA0B,CACxC,aAAkC,EAClC,OAAmC;IAEnC,0EAA0E;IAC1E,6EAA6E;IAC7E,+DAA+D;IAC/D,0BAA0B,EAAE,CAAC;IAC7B,4EAA4E;IAC5E,0EAA0E;IAC1E,2BAA2B,EAAE,CAAC;IAC9B,qBAAqB,EAAE,CAAC;IACxB,2BAA2B,EAAE,CAAC;IAC9B,aAAa,EAAE,CAAC,oBAAoB,EAAE,CAAC;IACvC,IAAI,CAAC,OAAO;QAAE,OAAO;IACrB,IAAI,WAAW,IAAI,OAAO,EAAE,CAAC;QAC3B,wBAAwB,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5E,OAAO;IACT,CAAC;IACD,4EAA4E;IAC5E,6EAA6E;IAC7E,sEAAsE;IACtE,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,iBAAiB,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;QACjF,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU;YAC3C,wBAAwB,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAClF,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,wBAAwB,CAAC,oBAAoB,EAAE,CAAC;AACzF,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,gCAAgC,CAAC,aAAkC;IACjF,0BAA0B,CAAC,aAAa,CAAC,CAAC;IAC1C,wBAAwB,CAAC,oBAAoB,EAAE,CAAC;AAClD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-admission-runtime.d.ts","sourceRoot":"","sources":["../src/daemon-admission-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"daemon-admission-runtime.d.ts","sourceRoot":"","sources":["../src/daemon-admission-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAC7C,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IACrD,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;oEAEoE;AACpE,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,GAAG,wBAAwB,CAoC3B;AAED;;;uEAGuE;AACvE,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG;IAAE,GAAG,IAAI,IAAI,CAAC;IAAC,IAAI,IAAI,IAAI,CAAA;CAAE,CAcvF;AAED;;;yBAGyB;AACzB,MAAM,WAAW,iBAAiB;IAChC,SAAS,IAAI,OAAO,CAAC;IACrB,eAAe,IAAI,IAAI,CAAC;IACxB,iBAAiB,IAAI,IAAI,CAAC;IAC1B;;;uEAGmE;IACnE,eAAe,IAAI,IAAI,CAAC;IACxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,gBAAgB,IAAI,IAAI,CAAC;IACzB,iBAAiB,IAAI,IAAI,CAAC;CAC3B;AAED;;uDAEuD;AACvD,wBAAgB,6BAA6B,CAAC,KAAK,EAAE;IACnD,SAAS,EAAE,sBAAsB,CAAC;IAClC,KAAK,EAAE,IAAI,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,wBAAwB,CAAC;IACtC,WAAW,EAAE,iBAAiB,CAAC;CAChC,GAAG;IACF,sBAAsB,CAAC,iBAAiB,EAAE,MAAM,MAAM,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACtF,wBAAwB,CAAC,CAAC,EACxB,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,GAC3D,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;CACxD,CAqIA"}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
* and the C6b recovery-route reopen, which re-runs it with a LIVE
|
|
10
10
|
* re-verdict so the daemon transitions to normal without a restart.
|
|
11
11
|
*/
|
|
12
|
-
import { daemonDir, logPath, } from "@claudexor/daemon";
|
|
12
|
+
import { daemonDir, logPath, QUOTA_POLL_INTERVAL_MS, } from "@claudexor/daemon";
|
|
13
13
|
import { sweepRetiredConfigKeysAtStartup } from "@claudexor/config";
|
|
14
14
|
import { redactSecrets } from "@claudexor/util";
|
|
15
15
|
import { DAEMON_LAUNCH_SOURCE_ENV } from "./daemon-launch.js";
|
|
@@ -63,7 +63,7 @@ export function createDaemonQuotaPoller(poll) {
|
|
|
63
63
|
arm: () => {
|
|
64
64
|
if (timer)
|
|
65
65
|
return;
|
|
66
|
-
timer = setInterval(poll,
|
|
66
|
+
timer = setInterval(poll, QUOTA_POLL_INTERVAL_MS);
|
|
67
67
|
timer.unref();
|
|
68
68
|
poll();
|
|
69
69
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-admission-runtime.js","sourceRoot":"","sources":["../src/daemon-admission-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EACL,SAAS,EACT,OAAO,
|
|
1
|
+
{"version":3,"file":"daemon-admission-runtime.js","sourceRoot":"","sources":["../src/daemon-admission-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import type { QuotaVendorRefresher } from "@claudexor/daemon";
|
|
1
|
+
import type { QuotaRefreshCycle, QuotaVendorRefresher } from "@claudexor/daemon";
|
|
2
2
|
import type { QuotaSource } from "@claudexor/schema";
|
|
3
|
-
import { refreshClaudeStatuslineQuota } from "./claude-statusline.js";
|
|
4
|
-
import { refreshCodexQuota } from "./codex-quota-source.js";
|
|
5
3
|
export interface QuotaRefresherRegistration {
|
|
6
4
|
readonly source: QuotaSource;
|
|
7
5
|
/** Pacing lane (per-vendor poll pacing): the vendor whose credential
|
|
@@ -14,19 +12,22 @@ export interface QuotaRefresherRegistration {
|
|
|
14
12
|
}
|
|
15
13
|
/** The daemon's top-level refreshers and the source each owns. Schema traits
|
|
16
14
|
* independently declare which sources must appear here; the parity test keeps
|
|
17
|
-
* composition, vocabulary, and pacing-lane assignment in lockstep.
|
|
15
|
+
* composition, vocabulary, and pacing-lane assignment in lockstep. Only the
|
|
16
|
+
* claude OAuth source reads the cycle kind (an explicit foreground refresh
|
|
17
|
+
* re-presents a token it remembers as rejected); the others take no options
|
|
18
|
+
* from the cycle. */
|
|
18
19
|
export declare const QUOTA_REFRESHER_REGISTRATIONS: readonly [{
|
|
19
20
|
readonly source: "codex_app_server";
|
|
20
21
|
readonly vendor: "codex";
|
|
21
|
-
readonly refresh:
|
|
22
|
+
readonly refresh: () => Promise<import("@claudexor/daemon").QuotaRefreshResult>;
|
|
22
23
|
}, {
|
|
23
24
|
readonly source: "claude_statusline";
|
|
24
25
|
readonly vendor: "claude";
|
|
25
|
-
readonly refresh:
|
|
26
|
+
readonly refresh: () => Promise<import("@claudexor/daemon").QuotaRefreshResult>;
|
|
26
27
|
}, {
|
|
27
28
|
readonly source: "claude_oauth_usage";
|
|
28
29
|
readonly vendor: "claude";
|
|
29
|
-
readonly refresh: () => Promise<import("@claudexor/daemon").QuotaRefreshResult>;
|
|
30
|
+
readonly refresh: (cycle?: QuotaRefreshCycle) => Promise<import("@claudexor/daemon").QuotaRefreshResult>;
|
|
30
31
|
}, {
|
|
31
32
|
readonly source: "agy_command_usage";
|
|
32
33
|
readonly vendor: "agy";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-refreshers.d.ts","sourceRoot":"","sources":["../src/quota-refreshers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"quota-refreshers.d.ts","sourceRoot":"","sources":["../src/quota-refreshers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAMrD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B;;;;gDAI4C;IAC5C,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAChD,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;CACnD;AAED;;;;;qBAKqB;AACrB,eAAO,MAAM,6BAA6B;qBAC9B,kBAAkB;qBAAU,OAAO;;;qBACnC,mBAAmB;qBAAU,QAAQ;;;qBAErC,oBAAoB;qBACpB,QAAQ;+BACE,iBAAiB;;qBAE3B,mBAAmB;qBAAU,KAAK;;EACY,CAAC;AAE3D,wBAAgB,eAAe,IAAI,oBAAoB,EAAE,CAExD"}
|
package/dist/quota-refreshers.js
CHANGED
|
@@ -4,11 +4,18 @@ import { refreshCodexQuota } from "./codex-quota-source.js";
|
|
|
4
4
|
import { refreshAgyQuota } from "./agy-quota-source.js";
|
|
5
5
|
/** The daemon's top-level refreshers and the source each owns. Schema traits
|
|
6
6
|
* independently declare which sources must appear here; the parity test keeps
|
|
7
|
-
* composition, vocabulary, and pacing-lane assignment in lockstep.
|
|
7
|
+
* composition, vocabulary, and pacing-lane assignment in lockstep. Only the
|
|
8
|
+
* claude OAuth source reads the cycle kind (an explicit foreground refresh
|
|
9
|
+
* re-presents a token it remembers as rejected); the others take no options
|
|
10
|
+
* from the cycle. */
|
|
8
11
|
export const QUOTA_REFRESHER_REGISTRATIONS = [
|
|
9
|
-
{ source: "codex_app_server", vendor: "codex", refresh: refreshCodexQuota },
|
|
10
|
-
{ source: "claude_statusline", vendor: "claude", refresh: refreshClaudeStatuslineQuota },
|
|
11
|
-
{
|
|
12
|
+
{ source: "codex_app_server", vendor: "codex", refresh: () => refreshCodexQuota() },
|
|
13
|
+
{ source: "claude_statusline", vendor: "claude", refresh: () => refreshClaudeStatuslineQuota() },
|
|
14
|
+
{
|
|
15
|
+
source: "claude_oauth_usage",
|
|
16
|
+
vendor: "claude",
|
|
17
|
+
refresh: (cycle) => refreshClaudeOauthUsageQuota({}, cycle),
|
|
18
|
+
},
|
|
12
19
|
{ source: "agy_command_usage", vendor: "agy", refresh: () => refreshAgyQuota() },
|
|
13
20
|
];
|
|
14
21
|
export function quotaRefreshers() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-refreshers.js","sourceRoot":"","sources":["../src/quota-refreshers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAaxD
|
|
1
|
+
{"version":3,"file":"quota-refreshers.js","sourceRoot":"","sources":["../src/quota-refreshers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAaxD;;;;;qBAKqB;AACrB,MAAM,CAAC,MAAM,6BAA6B,GAAG;IAC3C,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,iBAAiB,EAAE,EAAE;IACnF,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,4BAA4B,EAAE,EAAE;IAChG;QACE,MAAM,EAAE,oBAAoB;QAC5B,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,CAAC,KAAyB,EAAE,EAAE,CAAC,4BAA4B,CAAC,EAAE,EAAE,KAAK,CAAC;KAChF;IACD,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,eAAe,EAAE,EAAE;CACxB,CAAC;AAE3D,MAAM,UAAU,eAAe;IAC7B,OAAO,6BAA6B,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;AAC3F,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@claudexor/cli",
|
|
3
|
-
"version": "3.9.
|
|
3
|
+
"version": "3.9.7",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "Claudexor CLI (claudexor). Thin surface over the orchestrator.",
|
|
6
6
|
"type": "module",
|
|
@@ -10,29 +10,29 @@
|
|
|
10
10
|
"dist"
|
|
11
11
|
],
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@claudexor/acp-server": "3.9.
|
|
14
|
-
"@claudexor/artifact-store": "3.9.
|
|
15
|
-
"@claudexor/config": "3.9.
|
|
16
|
-
"@claudexor/control-api": "3.9.
|
|
17
|
-
"@claudexor/core": "3.9.
|
|
18
|
-
"@claudexor/
|
|
19
|
-
"@claudexor/
|
|
20
|
-
"@claudexor/gateway": "3.9.
|
|
21
|
-
"@claudexor/harness-agy": "3.9.
|
|
22
|
-
"@claudexor/harness-claude": "3.9.
|
|
23
|
-
"@claudexor/harness-codex": "3.9.
|
|
24
|
-
"@claudexor/harness-cursor": "3.9.
|
|
25
|
-
"@claudexor/harness-
|
|
26
|
-
"@claudexor/harness-
|
|
27
|
-
"@claudexor/harness-raw-api": "3.9.
|
|
28
|
-
"@claudexor/journal": "3.9.
|
|
29
|
-
"@claudexor/mcp-server": "3.9.
|
|
30
|
-
"@claudexor/orchestrator": "3.9.
|
|
31
|
-
"@claudexor/review": "3.9.
|
|
32
|
-
"@claudexor/schema": "3.9.
|
|
33
|
-
"@claudexor/secrets": "3.9.
|
|
34
|
-
"@claudexor/util": "3.9.
|
|
35
|
-
"@claudexor/workspace": "3.9.
|
|
13
|
+
"@claudexor/acp-server": "3.9.7",
|
|
14
|
+
"@claudexor/artifact-store": "3.9.7",
|
|
15
|
+
"@claudexor/config": "3.9.7",
|
|
16
|
+
"@claudexor/control-api": "3.9.7",
|
|
17
|
+
"@claudexor/core": "3.9.7",
|
|
18
|
+
"@claudexor/delivery": "3.9.7",
|
|
19
|
+
"@claudexor/daemon": "3.9.7",
|
|
20
|
+
"@claudexor/gateway": "3.9.7",
|
|
21
|
+
"@claudexor/harness-agy": "3.9.7",
|
|
22
|
+
"@claudexor/harness-claude": "3.9.7",
|
|
23
|
+
"@claudexor/harness-codex": "3.9.7",
|
|
24
|
+
"@claudexor/harness-cursor": "3.9.7",
|
|
25
|
+
"@claudexor/harness-opencode": "3.9.7",
|
|
26
|
+
"@claudexor/harness-fake": "3.9.7",
|
|
27
|
+
"@claudexor/harness-raw-api": "3.9.7",
|
|
28
|
+
"@claudexor/journal": "3.9.7",
|
|
29
|
+
"@claudexor/mcp-server": "3.9.7",
|
|
30
|
+
"@claudexor/orchestrator": "3.9.7",
|
|
31
|
+
"@claudexor/review": "3.9.7",
|
|
32
|
+
"@claudexor/schema": "3.9.7",
|
|
33
|
+
"@claudexor/secrets": "3.9.7",
|
|
34
|
+
"@claudexor/util": "3.9.7",
|
|
35
|
+
"@claudexor/workspace": "3.9.7"
|
|
36
36
|
},
|
|
37
37
|
"repository": {
|
|
38
38
|
"type": "git",
|