@botiverse/oar 0.94.0 → 0.95.0
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/README.md +4 -0
- package/dist/contracts/account-usage.d.ts +80 -0
- package/dist/contracts/account-usage.d.ts.map +1 -1
- package/dist/contracts/index.d.ts +1 -1
- package/dist/contracts/index.d.ts.map +1 -1
- package/dist/contracts/index.js.map +1 -1
- package/dist/contracts/runtime.d.ts +3 -1
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/runtimes/codex/account-request.d.ts +48 -0
- package/dist/runtimes/codex/account-request.d.ts.map +1 -0
- package/dist/runtimes/codex/account-request.js +93 -0
- package/dist/runtimes/codex/account-request.js.map +1 -0
- package/dist/runtimes/codex/account-usage.d.ts +3 -36
- package/dist/runtimes/codex/account-usage.d.ts.map +1 -1
- package/dist/runtimes/codex/account-usage.js +11 -74
- package/dist/runtimes/codex/account-usage.js.map +1 -1
- package/dist/runtimes/codex/index.d.ts +2 -0
- package/dist/runtimes/codex/index.d.ts.map +1 -1
- package/dist/runtimes/codex/index.js +3 -0
- package/dist/runtimes/codex/index.js.map +1 -1
- package/dist/runtimes/codex/limit-reset.d.ts +8 -0
- package/dist/runtimes/codex/limit-reset.d.ts.map +1 -0
- package/dist/runtimes/codex/limit-reset.js +34 -0
- package/dist/runtimes/codex/limit-reset.js.map +1 -0
- package/dist/runtimes/codex/reset-credits.d.ts +15 -0
- package/dist/runtimes/codex/reset-credits.d.ts.map +1 -0
- package/dist/runtimes/codex/reset-credits.js +64 -0
- package/dist/runtimes/codex/reset-credits.js.map +1 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -377,6 +377,10 @@ tier. Unsupported runtimes reject the option before opening.
|
|
|
377
377
|
`runtime.accountUsage(installation)` reads account quota on claude,
|
|
378
378
|
codex, grok and kimi; its failure semantics are in the
|
|
379
379
|
[account usage reference](https://github.com/botiverse/oar/blob/main/docs/spec/account-usage.md).
|
|
380
|
+
On codex it also reports the account's limit resets, and
|
|
381
|
+
`runtime.redeemLimitReset(installation, { idempotencyKey })` spends one;
|
|
382
|
+
oar never spends one on its own
|
|
383
|
+
([limit resets](https://github.com/botiverse/oar/blob/main/docs/spec/account-usage.md#limit-resets)).
|
|
380
384
|
|
|
381
385
|
`runtime.checkUpdate(installation)` reports the version the runtime's own
|
|
382
386
|
updater would install and where that answer came from;
|
|
@@ -22,6 +22,29 @@ export interface AccountUsageWindow {
|
|
|
22
22
|
/** The window's length in milliseconds, when the runtime reports it or its key names it; with `resetsAt` it places the window's start. Omitted otherwise. */
|
|
23
23
|
readonly durationMs?: number;
|
|
24
24
|
}
|
|
25
|
+
/** One limit reset the account holds, as the runtime details it. */
|
|
26
|
+
export interface AccountLimitReset {
|
|
27
|
+
/** The runtime's own identifier, for `LimitResetOptions.resetId`. */
|
|
28
|
+
readonly id: string;
|
|
29
|
+
/** The runtime's state for this reset; `unknown` when it reports a state it cannot name. */
|
|
30
|
+
readonly status: "available" | "redeeming" | "redeemed" | "unknown";
|
|
31
|
+
readonly grantedAt?: UtcInstant;
|
|
32
|
+
/** Omitted when the reset does not expire. */
|
|
33
|
+
readonly expiresAt?: UtcInstant;
|
|
34
|
+
/** Runtime-provided display text; omitted when it gives none. */
|
|
35
|
+
readonly title?: string;
|
|
36
|
+
readonly description?: string;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Resets the account can spend on its usage limits. `available` is the
|
|
40
|
+
* runtime's count. `resets` is its detail list, which it may cap below
|
|
41
|
+
* `available`; omitted when the runtime gave only the count, empty when it
|
|
42
|
+
* looked and found none.
|
|
43
|
+
*/
|
|
44
|
+
export interface AccountLimitResets {
|
|
45
|
+
readonly available: number;
|
|
46
|
+
readonly resets?: readonly AccountLimitReset[];
|
|
47
|
+
}
|
|
25
48
|
/** Stable reason codes; no credentials or provider response bodies are included. */
|
|
26
49
|
export type AccountUsageUnsupportedReason = "capability_unavailable" | "unsupported_installation" | "unsupported_auth_mode" | "unsupported_auth_storage" | "auth_configuration_unavailable" | "endpoint_unavailable" | "quota_unavailable";
|
|
27
50
|
export type AccountUsageReauthReason = "not_authenticated" | "credentials_missing" | "scope_missing" | "credentials_rejected";
|
|
@@ -38,6 +61,8 @@ export type AccountUsageSnapshot = {
|
|
|
38
61
|
readonly displayName?: string;
|
|
39
62
|
readonly rateLimited: boolean;
|
|
40
63
|
readonly windows: readonly AccountUsageWindow[];
|
|
64
|
+
/** The account's limit resets, when the runtime reports them (codex); see `Runtime.redeemLimitReset`. */
|
|
65
|
+
readonly limitResets?: AccountLimitResets;
|
|
41
66
|
} | {
|
|
42
67
|
readonly kind: "reauth_required";
|
|
43
68
|
/** Built-in readers always report a reason; optional for older adapters. */
|
|
@@ -52,7 +77,62 @@ export interface AccountUsageReadOptions {
|
|
|
52
77
|
readonly env?: SessionOptions["env"];
|
|
53
78
|
/** Bounds the whole read, every process it starts and request it sends included; each reader has its own default. Past it the read rejects. */
|
|
54
79
|
readonly timeoutMs?: number;
|
|
80
|
+
/**
|
|
81
|
+
* `false` asks only for the count of limit resets, without their detail
|
|
82
|
+
* rows, for a host that polls (codex skips a backend lookup per read).
|
|
83
|
+
* Default `true`. A runtime that reports no limit resets ignores it.
|
|
84
|
+
*/
|
|
85
|
+
readonly limitResetDetails?: boolean;
|
|
55
86
|
}
|
|
56
87
|
export type AccountUsageReader = (installation: AvailableInstallation, options?: AccountUsageReadOptions) => Promise<AccountUsageSnapshot>;
|
|
88
|
+
export interface LimitResetOptions {
|
|
89
|
+
/**
|
|
90
|
+
* Names one attempt: a fresh unique value (a UUID) for each attempt, and
|
|
91
|
+
* the same value when retrying it, so a retry never spends a second reset.
|
|
92
|
+
* Required because only the caller can keep it across a retry.
|
|
93
|
+
*/
|
|
94
|
+
readonly idempotencyKey: string;
|
|
95
|
+
/** Which reset to spend, an `id` from `limitResets.resets`; omitted lets the runtime choose. */
|
|
96
|
+
readonly resetId?: string;
|
|
97
|
+
/** Same overlay as sessions: strings override, null removes, and the host is untouched. */
|
|
98
|
+
readonly env?: SessionOptions["env"];
|
|
99
|
+
/** Bounds the whole call, every process it starts included; each runtime has its own default. Past it the call rejects. */
|
|
100
|
+
readonly timeoutMs?: number;
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* How a redemption ended, as the runtime reports it. After any of the
|
|
104
|
+
* available outcomes, read `accountUsage` again for the account's state;
|
|
105
|
+
* none of them says what the limits are now.
|
|
106
|
+
*/
|
|
107
|
+
export type LimitResetResult =
|
|
108
|
+
/** The runtime reset the account's limits and spent a reset. */
|
|
109
|
+
{
|
|
110
|
+
readonly kind: "reset";
|
|
111
|
+
}
|
|
112
|
+
/** No limit needed resetting; no reset was spent. */
|
|
113
|
+
| {
|
|
114
|
+
readonly kind: "nothing_to_reset";
|
|
115
|
+
}
|
|
116
|
+
/** The account holds no reset to spend (or not the one `resetId` names). */
|
|
117
|
+
| {
|
|
118
|
+
readonly kind: "no_reset";
|
|
119
|
+
}
|
|
120
|
+
/** This attempt already went through: a retry with the key of an earlier call that reached the runtime. */
|
|
121
|
+
| {
|
|
122
|
+
readonly kind: "already_redeemed";
|
|
123
|
+
} | {
|
|
124
|
+
readonly kind: "reauth_required";
|
|
125
|
+
readonly reason: AccountUsageReauthReason;
|
|
126
|
+
} | {
|
|
127
|
+
readonly kind: "unsupported";
|
|
128
|
+
readonly reason: AccountUsageUnsupportedReason;
|
|
129
|
+
};
|
|
130
|
+
/**
|
|
131
|
+
* Spends one of the account's limit resets through the runtime's own call.
|
|
132
|
+
* It uses up the account owner's reset, so oar never calls it on its own.
|
|
133
|
+
* A rejection (timeout, network, malformed answer) leaves unknown whether
|
|
134
|
+
* the reset was spent: retry with the same `idempotencyKey`.
|
|
135
|
+
*/
|
|
136
|
+
export type LimitResetRedeemer = (installation: AvailableInstallation, options: LimitResetOptions) => Promise<LimitResetResult>;
|
|
57
137
|
export {};
|
|
58
138
|
//# sourceMappingURL=account-usage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-usage.d.ts","sources":["../../src/contracts/account-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,CAAC,MAAM,eAAe,EAAE,OAAO,MAAM,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,CAAC,eAAe,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAEvE,MAAM,WAAW,kBAAkB;IACjC,iEAAiE;IACjE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,uEAAuE;IACvE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,iFAAiF;IACjF,QAAQ,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC;IAC/B,6KAA6K;IAC7K,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,6JAA6J;IAC7J,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,oFAAoF;AACpF,MAAM,MAAM,6BAA6B,GACrC,wBAAwB,GACxB,0BAA0B,GAC1B,uBAAuB,GACvB,0BAA0B,GAC1B,gCAAgC,GAChC,sBAAsB,GACtB,mBAAmB,CAAC;AAExB,MAAM,MAAM,wBAAwB,GAChC,mBAAmB,GACnB,qBAAqB,GACrB,eAAe,GACf,sBAAsB,CAAC;AAE3B,MAAM,MAAM,oBAAoB,GAC5B;IACE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,4EAA4E;IAC5E,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,6EAA6E;IAC7E,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,SAAS,kBAAkB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"account-usage.d.ts","sources":["../../src/contracts/account-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ export type { CompactionOptions, CompactionOutcome, ManualCompaction } from "./c
|
|
|
2
2
|
export type { GoalControl, AdapterGoalControl, GoalSnapshot, GoalStatus, KnownGoalStatus, GoalSetOptions } from "./goal.js";
|
|
3
3
|
export type { InventoryScope, InventoryOptions, SkillEntry, CommandEntry, McpServerEntry, ToolEntry, InventoryResult, InventoryReader, RuntimeInventories } from "./inventory.js";
|
|
4
4
|
export type { Probe, OrientOptions, OrientationDepth, Orientation, RuntimeOrientation, Customization, RuntimeUsability, UsabilityOptions, UnusableReason } from "./orientation.js";
|
|
5
|
-
export type { AccountUsageUnsupportedReason, AccountUsageReauthReason, AccountUsageReader, AccountUsageReadOptions, AccountUsageSnapshot, AccountUsageWindow, UtcInstant, } from "./account-usage.js";
|
|
5
|
+
export type { AccountLimitReset, AccountLimitResets, LimitResetOptions, LimitResetRedeemer, LimitResetResult, AccountUsageUnsupportedReason, AccountUsageReauthReason, AccountUsageReader, AccountUsageReadOptions, AccountUsageSnapshot, AccountUsageWindow, UtcInstant, } from "./account-usage.js";
|
|
6
6
|
export type { AvailableInstallation, BundledInstallation, ExecutableInstallation, InstallationProbe, InstallationProbeOptions, InstallationSnapshot, } from "./installation.js";
|
|
7
7
|
export type { LoginProvider, LoginProviderMethod, ProviderAuthFacade, ProviderAuthStatus, ProviderAuthReader, ProviderAuthReadOptions, ProviderLoginEvent, ProviderLoginInteraction, ProviderLoginMethod, ProviderLoginOptions, ProviderLoginPrompt, } from "./provider-auth.js";
|
|
8
8
|
export type { CatalogModel, CatalogProvider, CatalogRefreshOptions, CatalogRefreshResult, ModelCatalogFacade, } from "./model-catalog.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sources":["../../src/contracts/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../../src/contracts/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../src/contracts/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../src/contracts/index.ts"],"names":[],"mappings":"AAyJA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAiC,MAAM,gCAAgC,CAAC;AACxG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import type { AccountUsageReader, LimitResetRedeemer } from "./account-usage.js";
|
|
1
2
|
import type { AuthStatusReader, RuntimeLogin, RuntimeLogout } from "./login.js";
|
|
2
3
|
import type { InstallLine, InstallPlanner, Installer } from "./install.js";
|
|
3
4
|
import type { RuntimeInventories } from "./inventory.js";
|
|
4
5
|
import { type PlacementRequest, type RuntimePlacementOptions } from "./placement.js";
|
|
5
6
|
import type { UpdateChecker, Upgrader } from "./update.js";
|
|
6
|
-
import type { AccountUsageReader } from "./account-usage.js";
|
|
7
7
|
import type { InstallationProbe } from "./installation.js";
|
|
8
8
|
import type { ManualCompaction } from "./compaction.js";
|
|
9
9
|
import type { ModelLister } from "./list-models.js";
|
|
@@ -114,6 +114,8 @@ export interface Runtime extends RuntimeInventories {
|
|
|
114
114
|
*/
|
|
115
115
|
readonly installLines?: readonly InstallLine[];
|
|
116
116
|
readonly accountUsage?: AccountUsageReader;
|
|
117
|
+
/** Spends one of the account's limit resets (`limitResets` in `accountUsage`); uses up the account owner's reset, so only on the host's explicit call. */
|
|
118
|
+
readonly redeemLimitReset?: LimitResetRedeemer;
|
|
117
119
|
readonly listModels?: ModelLister;
|
|
118
120
|
/** Read only: the version the runtime's own updater would install. */
|
|
119
121
|
readonly checkUpdate?: UpdateChecker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sources":["../../src/contracts/runtime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,KAAK,EAAmB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAE1E,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,uBAAuB,EAAoB,MAAM,gBAAgB,CAAC;AACvG,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sources":["../../src/contracts/runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sources":["../../src/contracts/runtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runtime.js","sources":["../../src/contracts/runtime.ts"],"names":[],"mappings":"AAKA,yIAAyI;AACzI,OAAO,EAAuD,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAuIvG,KAAK,UAAU,WAAW;IACxB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;IACxB,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,uBAAuB;QAC7B,MAAM,EAAE,+DAA+D;KACxE,CAAC;AACJ,CAAC;AAKD,MAAM,UAAU,aAAa,CAAoC,OAAU,EAAE,OAAO,GAA4B,EAAE;IAChH,2HAA2H;IAC3H,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAAC,CAAC;IACzI,MAAM,MAAM,GAAG,CAAC,SAA2B,EAAqB,EAAE,CAAC,CACjE;QACE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW;QACvF,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,SAAS;QAC1F,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;QACpC,aAAa,EAAE,MAAM;QACrB,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC;KAC/D,CACF,CAAC;IACF,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import type { SessionOptions } from "../../contracts/session-options.js";
|
|
2
|
+
import type { AccountUsageReauthReason, AccountUsageUnsupportedReason } from "../../contracts/account-usage.js";
|
|
3
|
+
import { type AppServerClient } from "./app-server-client.js";
|
|
4
|
+
export type ReadOutcome = {
|
|
5
|
+
readonly kind: "ok";
|
|
6
|
+
readonly result: unknown;
|
|
7
|
+
readonly email: string | undefined;
|
|
8
|
+
} | {
|
|
9
|
+
readonly kind: "reauth_required";
|
|
10
|
+
readonly reason: AccountUsageReauthReason;
|
|
11
|
+
} | {
|
|
12
|
+
readonly kind: "unsupported";
|
|
13
|
+
readonly reason: AccountUsageUnsupportedReason;
|
|
14
|
+
} | {
|
|
15
|
+
readonly kind: "error";
|
|
16
|
+
};
|
|
17
|
+
export type StartAppServerClient = (command: string, env?: SessionOptions["env"]) => AppServerClient;
|
|
18
|
+
/**
|
|
19
|
+
* One account request. `legacyParams` is sent instead when the app-server
|
|
20
|
+
* refuses `params` as one older than its fields (`invalid type: map,
|
|
21
|
+
* expected unit`, codex 0.131.0 for `account/rateLimits/read`).
|
|
22
|
+
*/
|
|
23
|
+
export interface AccountCall {
|
|
24
|
+
readonly method: string;
|
|
25
|
+
readonly params: Record<string, unknown>;
|
|
26
|
+
readonly legacyParams?: Record<string, unknown>;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Native evidence from `account/read` on the same app-server session:
|
|
30
|
+
*
|
|
31
|
+
* ```json
|
|
32
|
+
* { "account": { "type": "chatgpt", "email": "user@example.com", "planType": "pro" },
|
|
33
|
+
* "requiresOpenaiAuth": true }
|
|
34
|
+
* ```
|
|
35
|
+
*
|
|
36
|
+
* Only a ChatGPT (subscription) login carries a meaningful account email; an
|
|
37
|
+
* API-key account is dropped per the owner's `type === "chatgpt"` requirement.
|
|
38
|
+
*/
|
|
39
|
+
export declare function accountEmail(result: unknown): string | undefined;
|
|
40
|
+
/**
|
|
41
|
+
* Codex exposes ChatGPT rate-limit windows only for a ChatGPT account. API-key
|
|
42
|
+
* and provider-managed runtimes are valid, but have no subscription usage for
|
|
43
|
+
* this capability to report.
|
|
44
|
+
*/
|
|
45
|
+
export declare function isNonSubscriptionAccount(result: unknown): boolean;
|
|
46
|
+
/** One ChatGPT-account request on a fresh app-server, after `account/read` rules out other account modes. */
|
|
47
|
+
export declare function callAppServer(command: string, timeoutMs: number, call: AccountCall, startClient?: StartAppServerClient, env?: SessionOptions["env"]): Promise<ReadOutcome>;
|
|
48
|
+
//# sourceMappingURL=account-request.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account-request.d.ts","sources":["../../../src/runtimes/codex/account-request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAC;AAChH,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGpF,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GACrF;IAAE,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,wBAAwB,CAAA;CAAE,GAC/E;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,6BAA6B,CAAA;CAAE,GAChF;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAE/B,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,KAAK,eAAe,CAAC;AAErG;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjD;AAaD;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAMhE;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAMjE;AAED,6GAA6G;AAC7G,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,WAAW,EACjB,WAAW,GAAE,oBAA2C,EACxD,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,GAC1B,OAAO,CAAC,WAAW,CAAC,CA8CtB"}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { startAppServerClient } from "./app-server-client.js";
|
|
2
|
+
import { asRecord } from "../../shared/json.js";
|
|
3
|
+
async function request(client, call) {
|
|
4
|
+
try {
|
|
5
|
+
return await client.request(call.method, call.params);
|
|
6
|
+
}
|
|
7
|
+
catch (error) {
|
|
8
|
+
if (call.legacyParams === undefined || !(error instanceof Error) || !/expected unit/iu.test(error.message)) {
|
|
9
|
+
throw error;
|
|
10
|
+
}
|
|
11
|
+
return client.request(call.method, call.legacyParams);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Native evidence from `account/read` on the same app-server session:
|
|
16
|
+
*
|
|
17
|
+
* ```json
|
|
18
|
+
* { "account": { "type": "chatgpt", "email": "user@example.com", "planType": "pro" },
|
|
19
|
+
* "requiresOpenaiAuth": true }
|
|
20
|
+
* ```
|
|
21
|
+
*
|
|
22
|
+
* Only a ChatGPT (subscription) login carries a meaningful account email; an
|
|
23
|
+
* API-key account is dropped per the owner's `type === "chatgpt"` requirement.
|
|
24
|
+
*/
|
|
25
|
+
export function accountEmail(result) {
|
|
26
|
+
const account = asRecord(asRecord(result)?.account);
|
|
27
|
+
if (account?.type !== "chatgpt" || typeof account.email !== "string") {
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
return account.email;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Codex exposes ChatGPT rate-limit windows only for a ChatGPT account. API-key
|
|
34
|
+
* and provider-managed runtimes are valid, but have no subscription usage for
|
|
35
|
+
* this capability to report.
|
|
36
|
+
*/
|
|
37
|
+
export function isNonSubscriptionAccount(result) {
|
|
38
|
+
const root = asRecord(result);
|
|
39
|
+
const account = asRecord(root?.account);
|
|
40
|
+
return account?.type === "apiKey"
|
|
41
|
+
|| account?.type === "amazonBedrock"
|
|
42
|
+
|| root?.requiresOpenaiAuth === false;
|
|
43
|
+
}
|
|
44
|
+
/** One ChatGPT-account request on a fresh app-server, after `account/read` rules out other account modes. */
|
|
45
|
+
export async function callAppServer(command, timeoutMs, call, startClient = startAppServerClient, env) {
|
|
46
|
+
const client = startClient(command, env);
|
|
47
|
+
const deadline = setTimeout(() => {
|
|
48
|
+
client.kill();
|
|
49
|
+
}, timeoutMs);
|
|
50
|
+
try {
|
|
51
|
+
await client.request("initialize", {
|
|
52
|
+
clientInfo: { name: "oar", version: "0.0.0" },
|
|
53
|
+
capabilities: { experimentalApi: true },
|
|
54
|
+
});
|
|
55
|
+
client.notify("initialized", {});
|
|
56
|
+
// Read auth mode before the ChatGPT-only account endpoints. In API-key
|
|
57
|
+
// mode that endpoint rejects with "ChatGPT authentication required" even
|
|
58
|
+
// though Codex itself is correctly authenticated; treating that as expired
|
|
59
|
+
// OAuth would tell the user to perform a login that cannot fix the state.
|
|
60
|
+
let account = undefined;
|
|
61
|
+
try {
|
|
62
|
+
account = await client.request("account/read", {});
|
|
63
|
+
}
|
|
64
|
+
catch {
|
|
65
|
+
// Older app-servers may not expose account/read. Preserve the existing
|
|
66
|
+
// rate-limit read in that case instead of making identity mandatory.
|
|
67
|
+
}
|
|
68
|
+
if (isNonSubscriptionAccount(account)) {
|
|
69
|
+
return { kind: "unsupported", reason: "unsupported_auth_mode" };
|
|
70
|
+
}
|
|
71
|
+
const result = await request(client, call);
|
|
72
|
+
return { kind: "ok", result, email: accountEmail(account) };
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
const message = error instanceof Error ? error.message : "";
|
|
76
|
+
if (/chatgpt authentication required for rate limit reset/iu.test(message)) {
|
|
77
|
+
return { kind: "unsupported", reason: "unsupported_auth_mode" };
|
|
78
|
+
}
|
|
79
|
+
if (/authentication required/iu.test(message)) {
|
|
80
|
+
return { kind: "reauth_required", reason: "not_authenticated" };
|
|
81
|
+
}
|
|
82
|
+
// Codex answers a method it predates with `unknown variant` and the method name.
|
|
83
|
+
if (/method not found|not supported/iu.test(message) || message.includes(`unknown variant \`${call.method}\``)) {
|
|
84
|
+
return { kind: "unsupported", reason: "endpoint_unavailable" };
|
|
85
|
+
}
|
|
86
|
+
return { kind: "error" };
|
|
87
|
+
}
|
|
88
|
+
finally {
|
|
89
|
+
clearTimeout(deadline);
|
|
90
|
+
client.kill();
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
//# sourceMappingURL=account-request.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account-request.js","sources":["../../../src/runtimes/codex/account-request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,6 @@
|
|
|
1
1
|
import type { SessionOptions } from "../../contracts/session-options.js";
|
|
2
|
-
import type {
|
|
3
|
-
import { type
|
|
4
|
-
type ReadOutcome = {
|
|
5
|
-
readonly kind: "ok";
|
|
6
|
-
readonly result: unknown;
|
|
7
|
-
readonly email: string | undefined;
|
|
8
|
-
} | {
|
|
9
|
-
readonly kind: "reauth_required";
|
|
10
|
-
readonly reason: AccountUsageReauthReason;
|
|
11
|
-
} | {
|
|
12
|
-
readonly kind: "unsupported";
|
|
13
|
-
readonly reason: AccountUsageUnsupportedReason;
|
|
14
|
-
} | {
|
|
15
|
-
readonly kind: "error";
|
|
16
|
-
};
|
|
17
|
-
type StartAppServerClient = (command: string, env?: SessionOptions["env"]) => AppServerClient;
|
|
2
|
+
import type { AccountUsageReader, AccountUsageSnapshot } from "../../contracts/account-usage.js";
|
|
3
|
+
import { type ReadOutcome, type StartAppServerClient } from "./account-request.js";
|
|
18
4
|
/**
|
|
19
5
|
* Native evidence comes from `codex app-server --listen stdio://`, followed by
|
|
20
6
|
* `initialize` and `account/rateLimits/read`. `rateLimits` is the
|
|
@@ -52,25 +38,6 @@ type StartAppServerClient = (command: string, env?: SessionOptions["env"]) => Ap
|
|
|
52
38
|
* ```
|
|
53
39
|
*/
|
|
54
40
|
export declare function projectCodexUsage(result: unknown, email?: string): AccountUsageSnapshot;
|
|
55
|
-
|
|
56
|
-
* Native evidence from `account/read` on the same app-server session:
|
|
57
|
-
*
|
|
58
|
-
* ```json
|
|
59
|
-
* { "account": { "type": "chatgpt", "email": "user@example.com", "planType": "pro" },
|
|
60
|
-
* "requiresOpenaiAuth": true }
|
|
61
|
-
* ```
|
|
62
|
-
*
|
|
63
|
-
* Only a ChatGPT (subscription) login carries a meaningful account email; an
|
|
64
|
-
* API-key account is dropped per the owner's `type === "chatgpt"` requirement.
|
|
65
|
-
*/
|
|
66
|
-
export declare function accountEmail(result: unknown): string | undefined;
|
|
67
|
-
/**
|
|
68
|
-
* Codex exposes ChatGPT rate-limit windows only for a ChatGPT account. API-key
|
|
69
|
-
* and provider-managed runtimes are valid, but have no subscription usage for
|
|
70
|
-
* this capability to report.
|
|
71
|
-
*/
|
|
72
|
-
export declare function isNonSubscriptionAccount(result: unknown): boolean;
|
|
73
|
-
export declare function readFromAppServer(command: string, timeoutMs: number, startClient?: StartAppServerClient, env?: SessionOptions["env"]): Promise<ReadOutcome>;
|
|
41
|
+
export declare function readFromAppServer(command: string, timeoutMs: number, startClient?: StartAppServerClient, env?: SessionOptions["env"], limitResetDetails?: boolean): Promise<ReadOutcome>;
|
|
74
42
|
export declare const codexAccountUsage: AccountUsageReader;
|
|
75
|
-
export {};
|
|
76
43
|
//# sourceMappingURL=account-usage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-usage.d.ts","sources":["../../../src/runtimes/codex/account-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EACV,
|
|
1
|
+
{"version":3,"file":"account-usage.d.ts","sources":["../../../src/runtimes/codex/account-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EACV,kBAAkB,EAClB,oBAAoB,EAErB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAiB,KAAK,WAAW,EAAE,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAsElG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAmDvF;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,oBAA2C,EACxD,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,EAC3B,iBAAiB,UAAO,GACvB,OAAO,CAAC,WAAW,CAAC,CAMtB;AAGD,eAAO,MAAM,iBAAiB,EAAE,kBAgB/B,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { callAppServer } from "./account-request.js";
|
|
1
2
|
import { startAppServerClient } from "./app-server-client.js";
|
|
2
3
|
import { asEpochInstant, asNumber, asRecord } from "../../shared/json.js";
|
|
4
|
+
import { projectLimitResets } from "./reset-credits.js";
|
|
3
5
|
function text(value) {
|
|
4
6
|
if (typeof value !== "string") {
|
|
5
7
|
return undefined;
|
|
@@ -133,93 +135,28 @@ export function projectCodexUsage(result, email) {
|
|
|
133
135
|
if (windows.length === 0) {
|
|
134
136
|
throw new Error("Codex returned no usable account usage windows");
|
|
135
137
|
}
|
|
138
|
+
const limitResets = projectLimitResets(root?.rateLimitResetCredits);
|
|
136
139
|
return {
|
|
137
140
|
kind: "available",
|
|
138
141
|
...(plan === undefined ? {} : { plan }),
|
|
139
142
|
...(email === undefined ? {} : { email }),
|
|
140
143
|
rateLimited,
|
|
141
144
|
windows,
|
|
145
|
+
...(limitResets === undefined ? {} : { limitResets }),
|
|
142
146
|
};
|
|
143
147
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
* ```
|
|
151
|
-
*
|
|
152
|
-
* Only a ChatGPT (subscription) login carries a meaningful account email; an
|
|
153
|
-
* API-key account is dropped per the owner's `type === "chatgpt"` requirement.
|
|
154
|
-
*/
|
|
155
|
-
export function accountEmail(result) {
|
|
156
|
-
const account = asRecord(asRecord(result)?.account);
|
|
157
|
-
if (account?.type !== "chatgpt" || typeof account.email !== "string") {
|
|
158
|
-
return undefined;
|
|
159
|
-
}
|
|
160
|
-
return account.email;
|
|
161
|
-
}
|
|
162
|
-
/**
|
|
163
|
-
* Codex exposes ChatGPT rate-limit windows only for a ChatGPT account. API-key
|
|
164
|
-
* and provider-managed runtimes are valid, but have no subscription usage for
|
|
165
|
-
* this capability to report.
|
|
166
|
-
*/
|
|
167
|
-
export function isNonSubscriptionAccount(result) {
|
|
168
|
-
const root = asRecord(result);
|
|
169
|
-
const account = asRecord(root?.account);
|
|
170
|
-
return account?.type === "apiKey"
|
|
171
|
-
|| account?.type === "amazonBedrock"
|
|
172
|
-
|| root?.requiresOpenaiAuth === false;
|
|
173
|
-
}
|
|
174
|
-
export async function readFromAppServer(command, timeoutMs, startClient = startAppServerClient, env) {
|
|
175
|
-
const client = startClient(command, env);
|
|
176
|
-
const deadline = setTimeout(() => {
|
|
177
|
-
client.kill();
|
|
178
|
-
}, timeoutMs);
|
|
179
|
-
try {
|
|
180
|
-
await client.request("initialize", {
|
|
181
|
-
clientInfo: { name: "oar", version: "0.0.0" },
|
|
182
|
-
capabilities: { experimentalApi: true },
|
|
183
|
-
});
|
|
184
|
-
client.notify("initialized", {});
|
|
185
|
-
// Read auth mode before the ChatGPT-only rate-limit endpoint. In API-key
|
|
186
|
-
// mode that endpoint rejects with "ChatGPT authentication required" even
|
|
187
|
-
// though Codex itself is correctly authenticated; treating that as expired
|
|
188
|
-
// OAuth would tell the user to perform a login that cannot fix the state.
|
|
189
|
-
let account = undefined;
|
|
190
|
-
try {
|
|
191
|
-
account = await client.request("account/read", {});
|
|
192
|
-
}
|
|
193
|
-
catch {
|
|
194
|
-
// Older app-servers may not expose account/read. Preserve the existing
|
|
195
|
-
// rate-limit read in that case instead of making identity mandatory.
|
|
196
|
-
}
|
|
197
|
-
if (isNonSubscriptionAccount(account)) {
|
|
198
|
-
return { kind: "unsupported", reason: "unsupported_auth_mode" };
|
|
199
|
-
}
|
|
200
|
-
const result = await client.request("account/rateLimits/read", {});
|
|
201
|
-
return { kind: "ok", result, email: accountEmail(account) };
|
|
202
|
-
}
|
|
203
|
-
catch (error) {
|
|
204
|
-
const message = error instanceof Error ? error.message : "";
|
|
205
|
-
if (/authentication required/iu.test(message)) {
|
|
206
|
-
return { kind: "reauth_required", reason: "not_authenticated" };
|
|
207
|
-
}
|
|
208
|
-
if (/method not found|not supported/iu.test(message)) {
|
|
209
|
-
return { kind: "unsupported", reason: "endpoint_unavailable" };
|
|
210
|
-
}
|
|
211
|
-
return { kind: "error" };
|
|
212
|
-
}
|
|
213
|
-
finally {
|
|
214
|
-
clearTimeout(deadline);
|
|
215
|
-
client.kill();
|
|
216
|
-
}
|
|
148
|
+
export async function readFromAppServer(command, timeoutMs, startClient = startAppServerClient, env, limitResetDetails = true) {
|
|
149
|
+
// Older app-servers take this read with no params and refuse any field;
|
|
150
|
+
// they report no reset credits either, so the bare read loses nothing.
|
|
151
|
+
const params = limitResetDetails ? {} : { excludeResetCreditDetails: true };
|
|
152
|
+
const outcome = await callAppServer(command, timeoutMs, { method: "account/rateLimits/read", params, legacyParams: {} }, startClient, env);
|
|
153
|
+
return outcome;
|
|
217
154
|
}
|
|
218
155
|
export const codexAccountUsage = async (installation, options = {}) => {
|
|
219
156
|
if (installation.via !== "executable") {
|
|
220
157
|
return { kind: "unsupported", reason: "unsupported_installation" };
|
|
221
158
|
}
|
|
222
|
-
const outcome = await readFromAppServer(installation.command, options.timeoutMs ?? 8000, undefined, options.env);
|
|
159
|
+
const outcome = await readFromAppServer(installation.command, options.timeoutMs ?? 8000, undefined, options.env, options.limitResetDetails ?? true);
|
|
223
160
|
switch (outcome.kind) {
|
|
224
161
|
case "ok":
|
|
225
162
|
return projectCodexUsage(outcome.result, outcome.email);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-usage.js","sources":["../../../src/runtimes/codex/account-usage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"account-usage.js","sources":["../../../src/runtimes/codex/account-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,7 @@ export declare const codexRuntime: Omit<{
|
|
|
34
34
|
readonly installPlan: import("../../browser.js").InstallPlanner;
|
|
35
35
|
readonly install: import("../../browser.js").Installer;
|
|
36
36
|
readonly accountUsage: import("../../browser.js").AccountUsageReader;
|
|
37
|
+
readonly redeemLimitReset: import("../../browser.js").LimitResetRedeemer;
|
|
37
38
|
readonly listModels: import("../../browser.js").ModelLister;
|
|
38
39
|
readonly checkUpdate: typeof codexCheckUpdate;
|
|
39
40
|
readonly upgrade: typeof codexUpgrade;
|
|
@@ -43,6 +44,7 @@ export declare const codexRuntime: Omit<{
|
|
|
43
44
|
readonly session: import("../../browser.js").StartSession;
|
|
44
45
|
}, "execution" | "placement" | "session" | "withPlacement"> & import("../../contracts/runtime.js").Runtime;
|
|
45
46
|
export { codexAccountUsage, projectCodexUsage } from "./account-usage.js";
|
|
47
|
+
export { codexRedeemLimitReset } from "./limit-reset.js";
|
|
46
48
|
export { codexListModels, projectCodexModels } from "./list-models.js";
|
|
47
49
|
export { codexSession } from "./session.js";
|
|
48
50
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/codex/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,UAAU,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/codex/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,UAAU,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAM1C,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI7D,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0GAyBG,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC"}
|
|
@@ -5,6 +5,7 @@ import { defineRuntime } from "../../contracts/runtime.js";
|
|
|
5
5
|
import { codexAuthStatus, codexLogin } from "./login.js";
|
|
6
6
|
import { codexLogout } from "./logout.js";
|
|
7
7
|
import { codexAccountUsage } from "./account-usage.js";
|
|
8
|
+
import { codexRedeemLimitReset } from "./limit-reset.js";
|
|
8
9
|
import { codexInstallation } from "./installation.js";
|
|
9
10
|
import { codexInstall, codexInstallPlan } from "./install.js";
|
|
10
11
|
import { codexListModels } from "./list-models.js";
|
|
@@ -28,6 +29,7 @@ export const codexRuntime = defineRuntime({
|
|
|
28
29
|
installPlan: codexInstallPlan,
|
|
29
30
|
install: codexInstall,
|
|
30
31
|
accountUsage: codexAccountUsage,
|
|
32
|
+
redeemLimitReset: codexRedeemLimitReset,
|
|
31
33
|
listModels: codexListModels,
|
|
32
34
|
checkUpdate: codexCheckUpdate,
|
|
33
35
|
upgrade: codexUpgrade,
|
|
@@ -37,6 +39,7 @@ export const codexRuntime = defineRuntime({
|
|
|
37
39
|
session: codexSession,
|
|
38
40
|
}, { execution: "process" });
|
|
39
41
|
export { codexAccountUsage, projectCodexUsage } from "./account-usage.js";
|
|
42
|
+
export { codexRedeemLimitReset } from "./limit-reset.js";
|
|
40
43
|
export { codexListModels, projectCodexModels } from "./list-models.js";
|
|
41
44
|
export { codexSession } from "./session.js";
|
|
42
45
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../src/runtimes/codex/index.ts"],"names":[],"mappings":"AAAA,0GAA0G;AAC1G,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC;IACxC,EAAE,EAAE,OAAO;IACX,gBAAgB,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE;IAC7D,qBAAqB,EAAE,0BAA0B;IACjD,qBAAqB,EAAE;QACrB,YAAY,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE;QACzD,kBAAkB,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,wBAAwB,EAAE;KACvF;IACD,KAAK,EAAE,aAAa,CAAC,KAAK;IAC1B,MAAM,EAAE,WAAW;IACnB,UAAU,EAAE,eAAe;IAC3B,KAAK,EAAE,UAAU;IACjB,mBAAmB,EAAE,MAAM;IAC3B,YAAY,EAAE,iBAAiB;IAC/B,WAAW,EAAE,gBAAgB;IAC7B,OAAO,EAAE,YAAY;IACrB,YAAY,EAAE,iBAAiB;IAC/B,UAAU,EAAE,eAAe;IAC3B,WAAW,EAAE,gBAAgB;IAC7B,OAAO,EAAE,YAAY;IACrB,KAAK,EAAE,UAAU;IACjB,MAAM,EAAE,WAAW;IACnB,UAAU,EAAE,eAAe;IAC3B,OAAO,EAAE,YAAY;CACtB,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../src/runtimes/codex/index.ts"],"names":[],"mappings":"AAAA,0GAA0G;AAC1G,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC;IACxC,EAAE,EAAE,OAAO;IACX,gBAAgB,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE;IAC7D,qBAAqB,EAAE,0BAA0B;IACjD,qBAAqB,EAAE;QACrB,YAAY,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE;QACzD,kBAAkB,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,wBAAwB,EAAE;KACvF;IACD,KAAK,EAAE,aAAa,CAAC,KAAK;IAC1B,MAAM,EAAE,WAAW;IACnB,UAAU,EAAE,eAAe;IAC3B,KAAK,EAAE,UAAU;IACjB,mBAAmB,EAAE,MAAM;IAC3B,YAAY,EAAE,iBAAiB;IAC/B,WAAW,EAAE,gBAAgB;IAC7B,OAAO,EAAE,YAAY;IACrB,YAAY,EAAE,iBAAiB;IAC/B,gBAAgB,EAAE,qBAAqB;IACvC,UAAU,EAAE,eAAe;IAC3B,WAAW,EAAE,gBAAgB;IAC7B,OAAO,EAAE,YAAY;IACrB,KAAK,EAAE,UAAU;IACjB,MAAM,EAAE,WAAW;IACnB,UAAU,EAAE,eAAe;IAC3B,OAAO,EAAE,YAAY;CACtB,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { LimitResetRedeemer } from "../../contracts/account-usage.js";
|
|
2
|
+
/**
|
|
3
|
+
* Spends a reset credit through the call the codex TUI makes. The idempotency
|
|
4
|
+
* key goes to Codex's backend as its redeem request id; Codex bounds that
|
|
5
|
+
* backend call itself at 10 s.
|
|
6
|
+
*/
|
|
7
|
+
export declare const codexRedeemLimitReset: LimitResetRedeemer;
|
|
8
|
+
//# sourceMappingURL=limit-reset.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"limit-reset.d.ts","sources":["../../../src/runtimes/codex/limit-reset.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAI3E;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,EAAE,kBA+BnC,CAAC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { callAppServer } from "./account-request.js";
|
|
2
|
+
import { projectLimitResetOutcome } from "./reset-credits.js";
|
|
3
|
+
/**
|
|
4
|
+
* Spends a reset credit through the call the codex TUI makes. The idempotency
|
|
5
|
+
* key goes to Codex's backend as its redeem request id; Codex bounds that
|
|
6
|
+
* backend call itself at 10 s.
|
|
7
|
+
*/
|
|
8
|
+
export const codexRedeemLimitReset = async (installation, options) => {
|
|
9
|
+
if (options.idempotencyKey.length === 0) {
|
|
10
|
+
throw new Error("idempotencyKey must not be empty");
|
|
11
|
+
}
|
|
12
|
+
if (options.resetId?.length === 0) {
|
|
13
|
+
throw new Error("resetId must not be empty");
|
|
14
|
+
}
|
|
15
|
+
if (installation.via !== "executable") {
|
|
16
|
+
return { kind: "unsupported", reason: "unsupported_installation" };
|
|
17
|
+
}
|
|
18
|
+
const outcome = await callAppServer(installation.command, options.timeoutMs ?? 20_000, {
|
|
19
|
+
method: "account/rateLimitResetCredit/consume",
|
|
20
|
+
params: { idempotencyKey: options.idempotencyKey, ...(options.resetId === undefined ? {} : { creditId: options.resetId }) },
|
|
21
|
+
}, undefined, options.env);
|
|
22
|
+
switch (outcome.kind) {
|
|
23
|
+
case "ok":
|
|
24
|
+
return projectLimitResetOutcome(outcome.result);
|
|
25
|
+
case "reauth_required":
|
|
26
|
+
return outcome;
|
|
27
|
+
case "unsupported":
|
|
28
|
+
return outcome;
|
|
29
|
+
case "error":
|
|
30
|
+
break;
|
|
31
|
+
}
|
|
32
|
+
throw new Error("Failed to redeem a Codex limit reset; whether it was spent is unknown, so retry with the same idempotencyKey");
|
|
33
|
+
};
|
|
34
|
+
//# sourceMappingURL=limit-reset.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"limit-reset.js","sources":["../../../src/runtimes/codex/limit-reset.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAE9D;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAuB,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE;IACvF,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,YAAY,CAAC,GAAG,KAAK,YAAY,EAAE,CAAC;QACtC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC;IACrE,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,aAAa,CACjC,YAAY,CAAC,OAAO,EACpB,OAAO,CAAC,SAAS,IAAI,MAAM,EAC3B;QACE,MAAM,EAAE,sCAAsC;QAC9C,MAAM,EAAE,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE;KAC5H,EACD,SAAS,EACT,OAAO,CAAC,GAAG,CACZ,CAAC;IACF,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,IAAI;YACP,OAAO,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,KAAK,iBAAiB;YACpB,OAAO,OAAO,CAAC;QACjB,KAAK,aAAa;YAChB,OAAO,OAAO,CAAC;QACjB,KAAK,OAAO;YACV,MAAM;IACV,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,8GAA8G,CAAC,CAAC;AAClI,CAAC,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { AccountLimitResets, LimitResetResult } from "../../contracts/account-usage.js";
|
|
2
|
+
/**
|
|
3
|
+
* `rateLimitResetCredits` on `account/rateLimits/read`: `{ "availableCount": 1,
|
|
4
|
+
* "credits": [{ "id": "credit-1", "resetType": "codexRateLimits",
|
|
5
|
+
* "status": "available", "grantedAt": 1794000000, "expiresAt": null,
|
|
6
|
+
* "title": null, "description": null }] }`. `credits: null` means Codex gave
|
|
7
|
+
* only the count.
|
|
8
|
+
*/
|
|
9
|
+
export declare function projectLimitResets(summary: unknown): AccountLimitResets | undefined;
|
|
10
|
+
/**
|
|
11
|
+
* The answer to `account/rateLimitResetCredit/consume`: `{ "outcome": "reset" }`.
|
|
12
|
+
* Source: https://github.com/openai/codex/blob/d7de4dd3ac3e4c489368c3985013e78622496962/codex-rs/app-server/src/request_processors/account_processor/rate_limit_resets.rs
|
|
13
|
+
*/
|
|
14
|
+
export declare function projectLimitResetOutcome(result: unknown): LimitResetResult;
|
|
15
|
+
//# sourceMappingURL=reset-credits.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reset-credits.d.ts","sources":["../../../src/runtimes/codex/reset-credits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AA6BhH;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,kBAAkB,GAAG,SAAS,CAWnF;AAUD;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,GAAG,gBAAgB,CAO1E"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { asEpochInstant, asNumber, asRecord, asRecordList } from "../../shared/json.js";
|
|
2
|
+
const STATUSES = {
|
|
3
|
+
available: "available",
|
|
4
|
+
redeeming: "redeeming",
|
|
5
|
+
redeemed: "redeemed",
|
|
6
|
+
};
|
|
7
|
+
function limitReset(credit) {
|
|
8
|
+
// A reset of another kind would not reset these limits; Codex names only one.
|
|
9
|
+
if (typeof credit.id !== "string" || credit.id.length === 0 || credit.resetType !== "codexRateLimits") {
|
|
10
|
+
return undefined;
|
|
11
|
+
}
|
|
12
|
+
const status = typeof credit.status === "string" && Object.hasOwn(STATUSES, credit.status) ? STATUSES[credit.status] : undefined;
|
|
13
|
+
const grantedAt = asEpochInstant(credit.grantedAt);
|
|
14
|
+
const expiresAt = asEpochInstant(credit.expiresAt);
|
|
15
|
+
const title = typeof credit.title === "string" ? credit.title : undefined;
|
|
16
|
+
const description = typeof credit.description === "string" ? credit.description : undefined;
|
|
17
|
+
return {
|
|
18
|
+
id: credit.id,
|
|
19
|
+
status: status ?? "unknown",
|
|
20
|
+
...(grantedAt === null ? {} : { grantedAt }),
|
|
21
|
+
...(expiresAt === null ? {} : { expiresAt }),
|
|
22
|
+
...(title === undefined ? {} : { title }),
|
|
23
|
+
...(description === undefined ? {} : { description }),
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* `rateLimitResetCredits` on `account/rateLimits/read`: `{ "availableCount": 1,
|
|
28
|
+
* "credits": [{ "id": "credit-1", "resetType": "codexRateLimits",
|
|
29
|
+
* "status": "available", "grantedAt": 1794000000, "expiresAt": null,
|
|
30
|
+
* "title": null, "description": null }] }`. `credits: null` means Codex gave
|
|
31
|
+
* only the count.
|
|
32
|
+
*/
|
|
33
|
+
export function projectLimitResets(summary) {
|
|
34
|
+
const root = asRecord(summary);
|
|
35
|
+
const available = asNumber(root?.availableCount);
|
|
36
|
+
if (root === null || available === null || !Number.isInteger(available) || available < 0) {
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
if (!Array.isArray(root.credits)) {
|
|
40
|
+
return { available };
|
|
41
|
+
}
|
|
42
|
+
const resets = asRecordList(root.credits).flatMap((credit) => limitReset(credit) ?? []);
|
|
43
|
+
return { available, resets };
|
|
44
|
+
}
|
|
45
|
+
/** Codex's own outcomes for `account/rateLimitResetCredit/consume`. */
|
|
46
|
+
const OUTCOMES = {
|
|
47
|
+
reset: { kind: "reset" },
|
|
48
|
+
nothingToReset: { kind: "nothing_to_reset" },
|
|
49
|
+
noCredit: { kind: "no_reset" },
|
|
50
|
+
alreadyRedeemed: { kind: "already_redeemed" },
|
|
51
|
+
};
|
|
52
|
+
/**
|
|
53
|
+
* The answer to `account/rateLimitResetCredit/consume`: `{ "outcome": "reset" }`.
|
|
54
|
+
* Source: https://github.com/openai/codex/blob/d7de4dd3ac3e4c489368c3985013e78622496962/codex-rs/app-server/src/request_processors/account_processor/rate_limit_resets.rs
|
|
55
|
+
*/
|
|
56
|
+
export function projectLimitResetOutcome(result) {
|
|
57
|
+
const outcome = asRecord(result)?.outcome;
|
|
58
|
+
const known = typeof outcome === "string" && Object.hasOwn(OUTCOMES, outcome) ? OUTCOMES[outcome] : undefined;
|
|
59
|
+
if (known === undefined) {
|
|
60
|
+
throw new Error("Codex returned no known limit reset outcome");
|
|
61
|
+
}
|
|
62
|
+
return known;
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=reset-credits.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reset-credits.js","sources":["../../../src/runtimes/codex/reset-credits.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@botiverse/oar",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.95.0",
|
|
4
4
|
"description": "A programming interface for all agent harnesses: provider-independent contracts for controlling and observing agent runtimes",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|