@iam-brain/opencode-codex-auth 1.2.4 → 1.3.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 +42 -83
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +41 -18
- package/dist/index.js.map +1 -1
- package/dist/lib/accounts-tools.d.ts.map +1 -1
- package/dist/lib/accounts-tools.js +112 -29
- package/dist/lib/accounts-tools.js.map +1 -1
- package/dist/lib/cache-io.d.ts.map +1 -1
- package/dist/lib/cache-io.js +6 -1
- package/dist/lib/cache-io.js.map +1 -1
- package/dist/lib/codex-native/accounts.d.ts.map +1 -1
- package/dist/lib/codex-native/accounts.js +18 -12
- package/dist/lib/codex-native/accounts.js.map +1 -1
- package/dist/lib/codex-native/acquire-auth.d.ts +1 -1
- package/dist/lib/codex-native/acquire-auth.d.ts.map +1 -1
- package/dist/lib/codex-native/acquire-auth.js +318 -204
- package/dist/lib/codex-native/acquire-auth.js.map +1 -1
- package/dist/lib/codex-native/auth-menu-flow.d.ts.map +1 -1
- package/dist/lib/codex-native/auth-menu-flow.js +27 -12
- package/dist/lib/codex-native/auth-menu-flow.js.map +1 -1
- package/dist/lib/codex-native/auth-menu-quotas.d.ts.map +1 -1
- package/dist/lib/codex-native/auth-menu-quotas.js +11 -4
- package/dist/lib/codex-native/auth-menu-quotas.js.map +1 -1
- package/dist/lib/codex-native/catalog-auth.d.ts.map +1 -1
- package/dist/lib/codex-native/catalog-auth.js +4 -2
- package/dist/lib/codex-native/catalog-auth.js.map +1 -1
- package/dist/lib/codex-native/chat-hooks.d.ts.map +1 -1
- package/dist/lib/codex-native/chat-hooks.js +0 -8
- package/dist/lib/codex-native/chat-hooks.js.map +1 -1
- package/dist/lib/codex-native/client-identity.d.ts.map +1 -1
- package/dist/lib/codex-native/client-identity.js +11 -4
- package/dist/lib/codex-native/client-identity.js.map +1 -1
- package/dist/lib/codex-native/collaboration.d.ts +1 -1
- package/dist/lib/codex-native/collaboration.d.ts.map +1 -1
- package/dist/lib/codex-native/collaboration.js +9 -116
- package/dist/lib/codex-native/collaboration.js.map +1 -1
- package/dist/lib/codex-native/oauth-auth-methods.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-auth-methods.js +25 -6
- package/dist/lib/codex-native/oauth-auth-methods.js.map +1 -1
- package/dist/lib/codex-native/oauth-server-debug.d.ts +10 -0
- package/dist/lib/codex-native/oauth-server-debug.d.ts.map +1 -0
- package/dist/lib/codex-native/oauth-server-debug.js +92 -0
- package/dist/lib/codex-native/oauth-server-debug.js.map +1 -0
- package/dist/lib/codex-native/oauth-server-network.d.ts +5 -0
- package/dist/lib/codex-native/oauth-server-network.d.ts.map +1 -0
- package/dist/lib/codex-native/oauth-server-network.js +39 -0
- package/dist/lib/codex-native/oauth-server-network.js.map +1 -0
- package/dist/lib/codex-native/oauth-server-types.d.ts +24 -0
- package/dist/lib/codex-native/oauth-server-types.d.ts.map +1 -0
- package/dist/lib/codex-native/oauth-server-types.js +2 -0
- package/dist/lib/codex-native/oauth-server-types.js.map +1 -0
- package/dist/lib/codex-native/oauth-server.d.ts +2 -16
- package/dist/lib/codex-native/oauth-server.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-server.js +63 -118
- package/dist/lib/codex-native/oauth-server.js.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch-quota.d.ts +18 -0
- package/dist/lib/codex-native/openai-loader-fetch-quota.d.ts.map +1 -0
- package/dist/lib/codex-native/openai-loader-fetch-quota.js +71 -0
- package/dist/lib/codex-native/openai-loader-fetch-quota.js.map +1 -0
- package/dist/lib/codex-native/openai-loader-fetch-state.d.ts +27 -0
- package/dist/lib/codex-native/openai-loader-fetch-state.d.ts.map +1 -0
- package/dist/lib/codex-native/openai-loader-fetch-state.js +91 -0
- package/dist/lib/codex-native/openai-loader-fetch-state.js.map +1 -0
- package/dist/lib/codex-native/openai-loader-fetch.d.ts.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.js +49 -131
- package/dist/lib/codex-native/openai-loader-fetch.js.map +1 -1
- package/dist/lib/codex-native/originator.d.ts.map +1 -1
- package/dist/lib/codex-native/originator.js +18 -1
- package/dist/lib/codex-native/originator.js.map +1 -1
- package/dist/lib/codex-native/request-transform-instructions.d.ts +16 -0
- package/dist/lib/codex-native/request-transform-instructions.d.ts.map +1 -0
- package/dist/lib/codex-native/request-transform-instructions.js +114 -0
- package/dist/lib/codex-native/request-transform-instructions.js.map +1 -0
- package/dist/lib/codex-native/request-transform-model.d.ts +39 -0
- package/dist/lib/codex-native/request-transform-model.d.ts.map +1 -0
- package/dist/lib/codex-native/request-transform-model.js +270 -0
- package/dist/lib/codex-native/request-transform-model.js.map +1 -0
- package/dist/lib/codex-native/request-transform-payload-helpers.d.ts +26 -0
- package/dist/lib/codex-native/request-transform-payload-helpers.d.ts.map +1 -0
- package/dist/lib/codex-native/request-transform-payload-helpers.js +232 -0
- package/dist/lib/codex-native/request-transform-payload-helpers.js.map +1 -0
- package/dist/lib/codex-native/request-transform-payload.d.ts +53 -0
- package/dist/lib/codex-native/request-transform-payload.d.ts.map +1 -0
- package/dist/lib/codex-native/request-transform-payload.js +214 -0
- package/dist/lib/codex-native/request-transform-payload.js.map +1 -0
- package/dist/lib/codex-native/request-transform-shared.d.ts +8 -0
- package/dist/lib/codex-native/request-transform-shared.d.ts.map +1 -0
- package/dist/lib/codex-native/request-transform-shared.js +49 -0
- package/dist/lib/codex-native/request-transform-shared.js.map +1 -0
- package/dist/lib/codex-native/request-transform.d.ts +3 -122
- package/dist/lib/codex-native/request-transform.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform.js +3 -831
- package/dist/lib/codex-native/request-transform.js.map +1 -1
- package/dist/lib/codex-native/session-affinity-state.d.ts +14 -1
- package/dist/lib/codex-native/session-affinity-state.d.ts.map +1 -1
- package/dist/lib/codex-native/session-affinity-state.js +21 -8
- package/dist/lib/codex-native/session-affinity-state.js.map +1 -1
- package/dist/lib/codex-native.js.map +1 -1
- package/dist/lib/codex-prompts-cache.d.ts.map +1 -1
- package/dist/lib/codex-prompts-cache.js.map +1 -1
- package/dist/lib/codex-quota-fetch.d.ts.map +1 -1
- package/dist/lib/codex-quota-fetch.js +13 -10
- package/dist/lib/codex-quota-fetch.js.map +1 -1
- package/dist/lib/codex-status-storage.d.ts.map +1 -1
- package/dist/lib/codex-status-storage.js.map +1 -1
- package/dist/lib/codex-status.d.ts.map +1 -1
- package/dist/lib/codex-status.js +28 -3
- package/dist/lib/codex-status.js.map +1 -1
- package/dist/lib/config/io.d.ts +16 -0
- package/dist/lib/config/io.d.ts.map +1 -0
- package/dist/lib/config/io.js +64 -0
- package/dist/lib/config/io.js.map +1 -0
- package/dist/lib/config/parse.d.ts +21 -0
- package/dist/lib/config/parse.d.ts.map +1 -0
- package/dist/lib/config/parse.js +347 -0
- package/dist/lib/config/parse.js.map +1 -0
- package/dist/lib/config/resolve.d.ts +27 -0
- package/dist/lib/config/resolve.d.ts.map +1 -0
- package/dist/lib/config/resolve.js +152 -0
- package/dist/lib/config/resolve.js.map +1 -0
- package/dist/lib/config/types.d.ts +72 -0
- package/dist/lib/config/types.d.ts.map +1 -0
- package/dist/lib/config/types.js +151 -0
- package/dist/lib/config/types.js.map +1 -0
- package/dist/lib/config/validation.d.ts +6 -0
- package/dist/lib/config/validation.d.ts.map +1 -0
- package/dist/lib/config/validation.js +160 -0
- package/dist/lib/config/validation.js.map +1 -0
- package/dist/lib/config.d.ts +5 -111
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +5 -835
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/fetch-orchestrator-helpers.d.ts +13 -0
- package/dist/lib/fetch-orchestrator-helpers.d.ts.map +1 -0
- package/dist/lib/fetch-orchestrator-helpers.js +63 -0
- package/dist/lib/fetch-orchestrator-helpers.js.map +1 -0
- package/dist/lib/fetch-orchestrator-types.d.ts +71 -0
- package/dist/lib/fetch-orchestrator-types.d.ts.map +1 -0
- package/dist/lib/fetch-orchestrator-types.js +11 -0
- package/dist/lib/fetch-orchestrator-types.js.map +1 -0
- package/dist/lib/fetch-orchestrator.d.ts +3 -69
- package/dist/lib/fetch-orchestrator.d.ts.map +1 -1
- package/dist/lib/fetch-orchestrator.js +78 -57
- package/dist/lib/fetch-orchestrator.js.map +1 -1
- package/dist/lib/identity.d.ts +6 -0
- package/dist/lib/identity.d.ts.map +1 -1
- package/dist/lib/identity.js +25 -4
- package/dist/lib/identity.js.map +1 -1
- package/dist/lib/model-catalog/cache-helpers.d.ts +23 -0
- package/dist/lib/model-catalog/cache-helpers.d.ts.map +1 -0
- package/dist/lib/model-catalog/cache-helpers.js +210 -0
- package/dist/lib/model-catalog/cache-helpers.js.map +1 -0
- package/dist/lib/model-catalog/catalog-fetch.d.ts +3 -0
- package/dist/lib/model-catalog/catalog-fetch.d.ts.map +1 -0
- package/dist/lib/model-catalog/catalog-fetch.js +159 -0
- package/dist/lib/model-catalog/catalog-fetch.js.map +1 -0
- package/dist/lib/model-catalog/provider.d.ts +6 -0
- package/dist/lib/model-catalog/provider.d.ts.map +1 -0
- package/dist/lib/model-catalog/provider.js +254 -0
- package/dist/lib/model-catalog/provider.js.map +1 -0
- package/dist/lib/model-catalog/shared.d.ts +95 -0
- package/dist/lib/model-catalog/shared.d.ts.map +1 -0
- package/dist/lib/model-catalog/shared.js +154 -0
- package/dist/lib/model-catalog/shared.js.map +1 -0
- package/dist/lib/model-catalog.d.ts +3 -68
- package/dist/lib/model-catalog.d.ts.map +1 -1
- package/dist/lib/model-catalog.js +3 -767
- package/dist/lib/model-catalog.js.map +1 -1
- package/dist/lib/opencode-install.d.ts.map +1 -1
- package/dist/lib/opencode-install.js +5 -6
- package/dist/lib/opencode-install.js.map +1 -1
- package/dist/lib/orchestrator-agent.d.ts.map +1 -1
- package/dist/lib/orchestrator-agent.js +2 -1
- package/dist/lib/orchestrator-agent.js.map +1 -1
- package/dist/lib/paths.d.ts.map +1 -1
- package/dist/lib/paths.js +8 -2
- package/dist/lib/paths.js.map +1 -1
- package/dist/lib/proactive-refresh.d.ts.map +1 -1
- package/dist/lib/proactive-refresh.js +48 -13
- package/dist/lib/proactive-refresh.js.map +1 -1
- package/dist/lib/quarantine.js.map +1 -1
- package/dist/lib/quota-threshold-alerts.d.ts.map +1 -1
- package/dist/lib/quota-threshold-alerts.js +3 -1
- package/dist/lib/quota-threshold-alerts.js.map +1 -1
- package/dist/lib/refresh-queue.d.ts.map +1 -1
- package/dist/lib/refresh-queue.js +1 -0
- package/dist/lib/refresh-queue.js.map +1 -1
- package/dist/lib/request-snapshots.d.ts.map +1 -1
- package/dist/lib/request-snapshots.js +46 -10
- package/dist/lib/request-snapshots.js.map +1 -1
- package/dist/lib/rotation.d.ts.map +1 -1
- package/dist/lib/rotation.js +3 -2
- package/dist/lib/rotation.js.map +1 -1
- package/dist/lib/session-affinity.d.ts.map +1 -1
- package/dist/lib/session-affinity.js +35 -20
- package/dist/lib/session-affinity.js.map +1 -1
- package/dist/lib/storage/domain-state.d.ts +23 -0
- package/dist/lib/storage/domain-state.d.ts.map +1 -0
- package/dist/lib/storage/domain-state.js +275 -0
- package/dist/lib/storage/domain-state.js.map +1 -0
- package/dist/lib/storage/migration.d.ts +13 -0
- package/dist/lib/storage/migration.d.ts.map +1 -0
- package/dist/lib/storage/migration.js +225 -0
- package/dist/lib/storage/migration.js.map +1 -0
- package/dist/lib/storage.d.ts +2 -9
- package/dist/lib/storage.d.ts.map +1 -1
- package/dist/lib/storage.js +44 -470
- package/dist/lib/storage.js.map +1 -1
- package/dist/lib/ui/auth-menu.d.ts +3 -2
- package/dist/lib/ui/auth-menu.d.ts.map +1 -1
- package/dist/lib/ui/auth-menu.js +1 -1
- package/dist/lib/ui/auth-menu.js.map +1 -1
- package/package.json +28 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-orchestrator.js","sourceRoot":"","sources":["../../lib/fetch-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"fetch-orchestrator.js","sourceRoot":"","sources":["../../lib/fetch-orchestrator.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/identity.d.ts
CHANGED
|
@@ -6,6 +6,12 @@ export declare function buildIdentityKey(input: {
|
|
|
6
6
|
email?: string;
|
|
7
7
|
plan?: string;
|
|
8
8
|
}): string | undefined;
|
|
9
|
+
export declare function buildLegacyIdentityFingerprint(input: {
|
|
10
|
+
accountId?: string;
|
|
11
|
+
email?: string;
|
|
12
|
+
plan?: string;
|
|
13
|
+
}): string;
|
|
14
|
+
export declare function assignDeterministicFallbackIdentityKey(account: AccountRecord, occurrence?: number): AccountRecord;
|
|
9
15
|
export declare function ensureIdentityKey(account: AccountRecord): AccountRecord;
|
|
10
16
|
export declare function synchronizeIdentityKey(account: AccountRecord): AccountRecord;
|
|
11
17
|
//# sourceMappingURL=identity.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../lib/identity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE/C,wBAAgB,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKjE;AAED,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK/D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAMjH;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAKvE;AAQD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAiB5E"}
|
|
1
|
+
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../lib/identity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE/C,wBAAgB,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKjE;AAED,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK/D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAMjH;AAQD,wBAAgB,8BAA8B,CAAC,KAAK,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAKnH;AAED,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,SAAI,GAAG,aAAa,CAK5G;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAKvE;AAQD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAiB5E"}
|
package/dist/lib/identity.js
CHANGED
|
@@ -22,6 +22,25 @@ export function buildIdentityKey(input) {
|
|
|
22
22
|
return undefined;
|
|
23
23
|
return `${accountId}|${email}|${plan}`;
|
|
24
24
|
}
|
|
25
|
+
function normalizeLegacyIdentitySegment(value) {
|
|
26
|
+
const trimmed = value?.trim();
|
|
27
|
+
if (!trimmed)
|
|
28
|
+
return "_";
|
|
29
|
+
return encodeURIComponent(trimmed);
|
|
30
|
+
}
|
|
31
|
+
export function buildLegacyIdentityFingerprint(input) {
|
|
32
|
+
const accountId = normalizeLegacyIdentitySegment(input.accountId);
|
|
33
|
+
const email = normalizeLegacyIdentitySegment(normalizeEmail(input.email));
|
|
34
|
+
const plan = normalizeLegacyIdentitySegment(normalizePlan(input.plan));
|
|
35
|
+
return `legacy|${accountId}|${email}|${plan}`;
|
|
36
|
+
}
|
|
37
|
+
export function assignDeterministicFallbackIdentityKey(account, occurrence = 0) {
|
|
38
|
+
if (account.identityKey)
|
|
39
|
+
return account;
|
|
40
|
+
const base = buildLegacyIdentityFingerprint(account);
|
|
41
|
+
account.identityKey = occurrence > 0 ? `${base}|dup:${occurrence + 1}` : base;
|
|
42
|
+
return account;
|
|
43
|
+
}
|
|
25
44
|
export function ensureIdentityKey(account) {
|
|
26
45
|
if (!account.identityKey) {
|
|
27
46
|
account.identityKey = buildIdentityKey(account);
|
|
@@ -38,14 +57,16 @@ export function synchronizeIdentityKey(account) {
|
|
|
38
57
|
const canonical = buildIdentityKey(account);
|
|
39
58
|
if (!canonical)
|
|
40
59
|
return account;
|
|
41
|
-
|
|
60
|
+
const current = account.identityKey;
|
|
61
|
+
if (!current) {
|
|
42
62
|
account.identityKey = canonical;
|
|
43
63
|
return account;
|
|
44
64
|
}
|
|
45
|
-
if (
|
|
65
|
+
if (current === canonical)
|
|
46
66
|
return account;
|
|
47
|
-
|
|
48
|
-
|
|
67
|
+
// Migrate strict tuple keys and legacy fallback keys, but avoid rewriting
|
|
68
|
+
// arbitrary non-canonical identifiers that may still be in active use.
|
|
69
|
+
if (current.startsWith("legacy|") || isCanonicalIdentityKey(current)) {
|
|
49
70
|
account.identityKey = canonical;
|
|
50
71
|
}
|
|
51
72
|
return account;
|
package/dist/lib/identity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../lib/identity.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAA;IAC5B,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IAC5B,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAC9B,OAAO,OAAO,CAAC,WAAW,EAAE,CAAA;AAC9B,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAa;IACzC,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAA;IAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;IAC3B,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAC9B,OAAO,OAAO,CAAC,WAAW,EAAE,CAAA;AAC9B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAA4D;IAC3F,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAA;IACzC,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACzC,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACtC,IAAI,CAAC,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAA;IACnD,OAAO,GAAG,SAAS,IAAI,KAAK,IAAI,IAAI,EAAE,CAAA;AACxC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAsB;IACtD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,CAAC,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACjD,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAa;IAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC9B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IACpC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAsB;IAC3D,MAAM,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAC3C,IAAI,CAAC,SAAS;QAAE,OAAO,OAAO,CAAA;IAE9B,
|
|
1
|
+
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../lib/identity.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { type CodexModelCatalogEvent, type CodexModelInfo, type CodexModelsCache, type GetCodexModelCatalogInput } from "./shared.js";
|
|
2
|
+
export declare function cacheKey(cacheDir: string, accountId?: string): string;
|
|
3
|
+
export declare function cachePath(cacheDir: string, accountId?: string): string;
|
|
4
|
+
export declare function opencodeShardCachePath(cacheDir: string, accountId?: string): string | undefined;
|
|
5
|
+
export declare function refreshSharedGitHubModelsCache(input: {
|
|
6
|
+
cacheDir: string;
|
|
7
|
+
targetClientVersion: string | undefined;
|
|
8
|
+
now: number;
|
|
9
|
+
fetchImpl: typeof fetch;
|
|
10
|
+
}): Promise<void>;
|
|
11
|
+
export declare function isFresh(cache: CodexModelsCache, now: number): boolean;
|
|
12
|
+
export declare function readCatalogFromDisk(cacheDir: string, accountId?: string): Promise<CodexModelsCache | undefined>;
|
|
13
|
+
export declare function readCatalogFromOpencodeCache(cacheDir: string): Promise<CodexModelsCache | undefined>;
|
|
14
|
+
export declare function readCatalogFromCodexCliCache(): Promise<CodexModelsCache | undefined>;
|
|
15
|
+
export declare function writeCatalogToDisk(cacheDir: string, accountId: string | undefined, cache: CodexModelsCache): Promise<void>;
|
|
16
|
+
export declare function emitEvent(input: GetCodexModelCatalogInput, event: Omit<CodexModelCatalogEvent, "scope">): void;
|
|
17
|
+
export declare function deriveReason(value: unknown): string;
|
|
18
|
+
export declare function emitStaleCacheFallback(input: GetCodexModelCatalogInput, fallback: {
|
|
19
|
+
disk?: CodexModelsCache;
|
|
20
|
+
opencode?: CodexModelsCache;
|
|
21
|
+
codexCli?: CodexModelsCache;
|
|
22
|
+
}): CodexModelInfo[] | undefined;
|
|
23
|
+
//# sourceMappingURL=cache-helpers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cache-helpers.d.ts","sourceRoot":"","sources":["../../../lib/model-catalog/cache-helpers.ts"],"names":[],"mappings":"AAcA,OAAO,EAGL,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,yBAAyB,EAW/B,MAAM,aAAa,CAAA;AAEpB,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAErE;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE/F;AA0BD,wBAAsB,8BAA8B,CAAC,KAAK,EAAE;IAC1D,QAAQ,EAAE,MAAM,CAAA;IAChB,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,EAAE,OAAO,KAAK,CAAA;CACxB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyDhB;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAErE;AAMD,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAYrH;AAED,wBAAsB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CA8B1G;AAED,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAU1F;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,yBAAyB,EAAE,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,OAAO,CAAC,GAAG,IAAI,CAY9G;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAKnD;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,yBAAyB,EAChC,QAAQ,EAAE;IACR,IAAI,CAAC,EAAE,gBAAgB,CAAA;IACvB,QAAQ,CAAC,EAAE,gBAAgB,CAAA;IAC3B,QAAQ,CAAC,EAAE,gBAAgB,CAAA;CAC5B,GACA,cAAc,EAAE,GAAG,SAAS,CAc9B"}
|
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
import fs from "node:fs/promises";
|
|
2
|
+
import os from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { fetchRemoteText } from "../remote-cache-fetch.js";
|
|
5
|
+
import { isFsErrorCode, readJsonFileBestEffort, writeJsonFileBestEffort } from "../cache-io.js";
|
|
6
|
+
import { withLockedDirectory } from "../cache-lock.js";
|
|
7
|
+
import { buildCodexModelsMemoryCacheKey, codexAuthModelsCachePath, codexModelsCompatShardPath, codexModelsMetaPath, codexModelsSharedCachePath, isCodexModelsCacheFileName } from "../codex-cache-layout.js";
|
|
8
|
+
import { CACHE_TTL_MS, compareSemver, FETCH_TIMEOUT_MS, githubModelsTag, githubModelsUrl, isRecord, normalizeSemver, parseCatalogResponse, parseSemver, parseFetchedAtFromUnknown, semverFromTag } from "./shared.js";
|
|
9
|
+
export function cacheKey(cacheDir, accountId) {
|
|
10
|
+
return buildCodexModelsMemoryCacheKey(cacheDir, accountId);
|
|
11
|
+
}
|
|
12
|
+
export function cachePath(cacheDir, accountId) {
|
|
13
|
+
return codexAuthModelsCachePath(cacheDir, accountId);
|
|
14
|
+
}
|
|
15
|
+
export function opencodeShardCachePath(cacheDir, accountId) {
|
|
16
|
+
return codexModelsCompatShardPath(cacheDir, accountId);
|
|
17
|
+
}
|
|
18
|
+
function opencodeSharedCachePath(cacheDir) {
|
|
19
|
+
return codexModelsSharedCachePath(cacheDir);
|
|
20
|
+
}
|
|
21
|
+
async function readGitHubModelsCacheMeta(cacheDir) {
|
|
22
|
+
const file = codexModelsMetaPath(cacheDir);
|
|
23
|
+
const parsed = await readJsonFileBestEffort(file);
|
|
24
|
+
if (!isRecord(parsed))
|
|
25
|
+
return undefined;
|
|
26
|
+
const parsedVersion = normalizeSemver(typeof parsed.version === "string" ? parsed.version : undefined);
|
|
27
|
+
const parsedTag = typeof parsed.tag === "string" ? parsed.tag.trim() : "";
|
|
28
|
+
const tag = parsedTag || (parsedVersion ? githubModelsTag(parsedVersion) : "");
|
|
29
|
+
const url = typeof parsed.url === "string" ? parsed.url.trim() : "";
|
|
30
|
+
const lastChecked = typeof parsed.lastChecked === "number" && Number.isFinite(parsed.lastChecked) ? parsed.lastChecked : 0;
|
|
31
|
+
const etag = typeof parsed.etag === "string" ? parsed.etag.trim() : undefined;
|
|
32
|
+
if (!tag || !url)
|
|
33
|
+
return undefined;
|
|
34
|
+
return { etag, tag, url, lastChecked };
|
|
35
|
+
}
|
|
36
|
+
async function writeGitHubModelsCacheMeta(cacheDir, meta) {
|
|
37
|
+
const file = codexModelsMetaPath(cacheDir);
|
|
38
|
+
await writeJsonFileBestEffort(file, meta);
|
|
39
|
+
}
|
|
40
|
+
export async function refreshSharedGitHubModelsCache(input) {
|
|
41
|
+
const targetVersion = normalizeSemver(input.targetClientVersion);
|
|
42
|
+
if (!targetVersion)
|
|
43
|
+
return;
|
|
44
|
+
const existingMeta = await readGitHubModelsCacheMeta(input.cacheDir);
|
|
45
|
+
const existingVersion = parseSemver(semverFromTag(existingMeta?.tag));
|
|
46
|
+
const target = parseSemver(targetVersion);
|
|
47
|
+
if (!target)
|
|
48
|
+
return;
|
|
49
|
+
if (existingVersion && compareSemver(existingVersion, target) >= 0)
|
|
50
|
+
return;
|
|
51
|
+
const tag = githubModelsTag(targetVersion);
|
|
52
|
+
const url = githubModelsUrl(targetVersion);
|
|
53
|
+
const result = await fetchRemoteText({
|
|
54
|
+
key: "models",
|
|
55
|
+
url,
|
|
56
|
+
etag: existingMeta?.url === url ? existingMeta.etag : undefined
|
|
57
|
+
}, {
|
|
58
|
+
fetchImpl: input.fetchImpl,
|
|
59
|
+
timeoutMs: FETCH_TIMEOUT_MS,
|
|
60
|
+
allowedHosts: ["raw.githubusercontent.com"]
|
|
61
|
+
});
|
|
62
|
+
if (result.status === "not_modified" && existingMeta) {
|
|
63
|
+
await writeGitHubModelsCacheMeta(input.cacheDir, {
|
|
64
|
+
etag: existingMeta.etag,
|
|
65
|
+
tag,
|
|
66
|
+
lastChecked: input.now,
|
|
67
|
+
url
|
|
68
|
+
});
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
if (result.status !== "ok") {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
try {
|
|
75
|
+
const payload = JSON.parse(result.text);
|
|
76
|
+
const models = parseCatalogResponse(payload);
|
|
77
|
+
if (models.length === 0)
|
|
78
|
+
return;
|
|
79
|
+
const etag = result.etag || (existingMeta?.url === url ? existingMeta.etag : undefined);
|
|
80
|
+
const file = opencodeSharedCachePath(input.cacheDir);
|
|
81
|
+
await writeJsonFileBestEffort(file, { fetchedAt: input.now, source: "github", models });
|
|
82
|
+
await writeGitHubModelsCacheMeta(input.cacheDir, {
|
|
83
|
+
etag,
|
|
84
|
+
tag,
|
|
85
|
+
lastChecked: input.now,
|
|
86
|
+
url
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
catch (_error) {
|
|
90
|
+
// Best effort refresh; continue without blocking catalog load.
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
export function isFresh(cache, now) {
|
|
94
|
+
return now - cache.fetchedAt < CACHE_TTL_MS;
|
|
95
|
+
}
|
|
96
|
+
async function withCacheLock(cacheDir, fn) {
|
|
97
|
+
return withLockedDirectory(cacheDir, fn, { staleMs: 10_000 });
|
|
98
|
+
}
|
|
99
|
+
export async function readCatalogFromDisk(cacheDir, accountId) {
|
|
100
|
+
return withCacheLock(cacheDir, async () => {
|
|
101
|
+
const file = cachePath(cacheDir, accountId);
|
|
102
|
+
const parsed = await readJsonFileBestEffort(file);
|
|
103
|
+
if (!isRecord(parsed))
|
|
104
|
+
return undefined;
|
|
105
|
+
if (typeof parsed.fetchedAt !== "number")
|
|
106
|
+
return undefined;
|
|
107
|
+
const models = parseCatalogResponse({ models: parsed.models });
|
|
108
|
+
return {
|
|
109
|
+
fetchedAt: parsed.fetchedAt,
|
|
110
|
+
models
|
|
111
|
+
};
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
export async function readCatalogFromOpencodeCache(cacheDir) {
|
|
115
|
+
try {
|
|
116
|
+
const entries = await fs.readdir(cacheDir);
|
|
117
|
+
const candidates = entries.filter((name) => {
|
|
118
|
+
return isCodexModelsCacheFileName(name);
|
|
119
|
+
});
|
|
120
|
+
if (candidates.length === 0)
|
|
121
|
+
return undefined;
|
|
122
|
+
let best;
|
|
123
|
+
for (const fileName of candidates) {
|
|
124
|
+
const parsed = await readJsonFileBestEffort(path.join(cacheDir, fileName));
|
|
125
|
+
if (!isRecord(parsed))
|
|
126
|
+
continue;
|
|
127
|
+
const models = parseCatalogResponse({ models: parsed.models });
|
|
128
|
+
if (models.length === 0)
|
|
129
|
+
continue;
|
|
130
|
+
const fetchedAt = typeof parsed.fetchedAt === "number" ? parsed.fetchedAt : 0;
|
|
131
|
+
if (!best || fetchedAt > best.fetchedAt) {
|
|
132
|
+
best = {
|
|
133
|
+
fetchedAt,
|
|
134
|
+
models
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
return best;
|
|
139
|
+
}
|
|
140
|
+
catch (error) {
|
|
141
|
+
if (!isFsErrorCode(error, "ENOENT")) {
|
|
142
|
+
// Best effort fallback discovery.
|
|
143
|
+
}
|
|
144
|
+
return undefined;
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
export async function readCatalogFromCodexCliCache() {
|
|
148
|
+
const file = path.join(os.homedir(), ".codex", "models_cache.json");
|
|
149
|
+
const parsed = await readJsonFileBestEffort(file);
|
|
150
|
+
if (!isRecord(parsed))
|
|
151
|
+
return undefined;
|
|
152
|
+
const models = parseCatalogResponse({ models: parsed.models });
|
|
153
|
+
if (models.length === 0)
|
|
154
|
+
return undefined;
|
|
155
|
+
return {
|
|
156
|
+
fetchedAt: parseFetchedAtFromUnknown(parsed.fetched_at ?? parsed.fetchedAt),
|
|
157
|
+
models
|
|
158
|
+
};
|
|
159
|
+
}
|
|
160
|
+
export async function writeCatalogToDisk(cacheDir, accountId, cache) {
|
|
161
|
+
await withCacheLock(cacheDir, async () => {
|
|
162
|
+
const primaryFile = cachePath(cacheDir, accountId);
|
|
163
|
+
const compatFile = opencodeShardCachePath(cacheDir, accountId);
|
|
164
|
+
const files = compatFile ? [primaryFile, compatFile] : [primaryFile];
|
|
165
|
+
for (const file of files) {
|
|
166
|
+
await writeJsonFileBestEffort(file, cache);
|
|
167
|
+
}
|
|
168
|
+
}).catch((error) => {
|
|
169
|
+
if (error instanceof Error) {
|
|
170
|
+
// Best effort cache persistence.
|
|
171
|
+
}
|
|
172
|
+
// Best effort cache persistence.
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
export function emitEvent(input, event) {
|
|
176
|
+
try {
|
|
177
|
+
input.onEvent?.({
|
|
178
|
+
...event,
|
|
179
|
+
scope: input.accountId?.trim() ? "account" : "shared"
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
catch (error) {
|
|
183
|
+
if (error instanceof Error) {
|
|
184
|
+
// Keep catalog path side-effect free even if observer callback throws.
|
|
185
|
+
}
|
|
186
|
+
// Keep catalog path side-effect free.
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
export function deriveReason(value) {
|
|
190
|
+
if (value instanceof Error) {
|
|
191
|
+
return value.name || "error";
|
|
192
|
+
}
|
|
193
|
+
return "error";
|
|
194
|
+
}
|
|
195
|
+
export function emitStaleCacheFallback(input, fallback) {
|
|
196
|
+
if (fallback.disk) {
|
|
197
|
+
emitEvent(input, { type: "stale_cache_used", reason: "network_fetch_failed" });
|
|
198
|
+
return fallback.disk.models;
|
|
199
|
+
}
|
|
200
|
+
if (fallback.opencode) {
|
|
201
|
+
emitEvent(input, { type: "stale_cache_used", reason: "opencode_cache_fallback" });
|
|
202
|
+
return fallback.opencode.models;
|
|
203
|
+
}
|
|
204
|
+
if (fallback.codexCli) {
|
|
205
|
+
emitEvent(input, { type: "stale_cache_used", reason: "codex_cli_cache_fallback" });
|
|
206
|
+
return fallback.codexCli.models;
|
|
207
|
+
}
|
|
208
|
+
return undefined;
|
|
209
|
+
}
|
|
210
|
+
//# sourceMappingURL=cache-helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cache-helpers.js","sourceRoot":"","sources":["../../../lib/model-catalog/cache-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"catalog-fetch.d.ts","sourceRoot":"","sources":["../../../lib/model-catalog/catalog-fetch.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,KAAK,cAAc,EAInB,KAAK,yBAAyB,EAG/B,MAAM,aAAa,CAAA;AAkBpB,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC,CAqJlH"}
|
|
@@ -0,0 +1,159 @@
|
|
|
1
|
+
import { cacheKey, deriveReason, emitEvent, emitStaleCacheFallback, isFresh, readCatalogFromCodexCliCache, readCatalogFromDisk, readCatalogFromOpencodeCache, refreshSharedGitHubModelsCache, writeCatalogToDisk } from "./cache-helpers.js";
|
|
2
|
+
import { CODEX_MODELS_ENDPOINT, DEFAULT_CLIENT_VERSION, FETCH_TIMEOUT_MS, parseCatalogResponse, normalizeSemver } from "./shared.js";
|
|
3
|
+
import { resolveCodexCacheDir } from "../codex-cache-layout.js";
|
|
4
|
+
const inMemoryCatalog = new Map();
|
|
5
|
+
const inFlightCatalogFetches = new Map();
|
|
6
|
+
function normalizeClientVersion(value, fallback) {
|
|
7
|
+
const trimmed = value?.trim();
|
|
8
|
+
if (trimmed)
|
|
9
|
+
return trimmed;
|
|
10
|
+
const fallbackTrimmed = fallback?.trim();
|
|
11
|
+
return fallbackTrimmed || DEFAULT_CLIENT_VERSION;
|
|
12
|
+
}
|
|
13
|
+
function buildModelsEndpoint(clientVersion) {
|
|
14
|
+
const separator = CODEX_MODELS_ENDPOINT.includes("?") ? "&" : "?";
|
|
15
|
+
return `${CODEX_MODELS_ENDPOINT}${separator}client_version=${encodeURIComponent(clientVersion)}`;
|
|
16
|
+
}
|
|
17
|
+
export async function getCodexModelCatalog(input) {
|
|
18
|
+
const now = (input.now ?? Date.now)();
|
|
19
|
+
const cacheDir = resolveCodexCacheDir(input.cacheDir);
|
|
20
|
+
const key = cacheKey(cacheDir, input.accountId);
|
|
21
|
+
const fetchImpl = input.fetchImpl ?? fetch;
|
|
22
|
+
const accessToken = input.accessToken?.trim();
|
|
23
|
+
const targetClientVersion = normalizeSemver(input.clientVersion) ?? normalizeSemver(input.versionHeader);
|
|
24
|
+
const defaultGithubModelsRefresh = Boolean(accessToken) && input.fetchImpl === undefined && targetClientVersion !== undefined;
|
|
25
|
+
const shouldRefreshGithubModelsCache = input.refreshGithubModelsCache ?? defaultGithubModelsRefresh;
|
|
26
|
+
if (shouldRefreshGithubModelsCache) {
|
|
27
|
+
await refreshSharedGitHubModelsCache({
|
|
28
|
+
cacheDir,
|
|
29
|
+
targetClientVersion,
|
|
30
|
+
now,
|
|
31
|
+
fetchImpl
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
const memory = inMemoryCatalog.get(key);
|
|
35
|
+
const allowMemoryHit = !memory?.staleFallback || !accessToken;
|
|
36
|
+
if (memory && !input.forceRefresh && isFresh(memory, now) && allowMemoryHit) {
|
|
37
|
+
emitEvent(input, { type: "memory_cache_hit" });
|
|
38
|
+
return memory.models;
|
|
39
|
+
}
|
|
40
|
+
const disk = await readCatalogFromDisk(cacheDir, input.accountId);
|
|
41
|
+
const hasFreshDisk = !!disk && isFresh(disk, now);
|
|
42
|
+
if (hasFreshDisk && !input.forceRefresh) {
|
|
43
|
+
inMemoryCatalog.set(key, disk);
|
|
44
|
+
emitEvent(input, { type: "disk_cache_hit" });
|
|
45
|
+
return disk.models;
|
|
46
|
+
}
|
|
47
|
+
let opencodeCacheFallback;
|
|
48
|
+
let codexCliCacheFallback;
|
|
49
|
+
const ensureFallbackCaches = async () => {
|
|
50
|
+
if (opencodeCacheFallback !== undefined || codexCliCacheFallback !== undefined)
|
|
51
|
+
return;
|
|
52
|
+
opencodeCacheFallback = await readCatalogFromOpencodeCache(cacheDir);
|
|
53
|
+
codexCliCacheFallback = await readCatalogFromCodexCliCache();
|
|
54
|
+
};
|
|
55
|
+
if (!accessToken) {
|
|
56
|
+
await ensureFallbackCaches();
|
|
57
|
+
if (disk) {
|
|
58
|
+
emitEvent(input, { type: "stale_cache_used", reason: "missing_access_token" });
|
|
59
|
+
inMemoryCatalog.set(key, disk);
|
|
60
|
+
return disk.models;
|
|
61
|
+
}
|
|
62
|
+
const stale = emitStaleCacheFallback(input, {
|
|
63
|
+
opencode: opencodeCacheFallback,
|
|
64
|
+
codexCli: codexCliCacheFallback
|
|
65
|
+
});
|
|
66
|
+
if (stale) {
|
|
67
|
+
inMemoryCatalog.set(key, {
|
|
68
|
+
fetchedAt: now,
|
|
69
|
+
models: stale,
|
|
70
|
+
staleFallback: true
|
|
71
|
+
});
|
|
72
|
+
return stale;
|
|
73
|
+
}
|
|
74
|
+
emitEvent(input, { type: "catalog_unavailable", reason: "missing_access_token" });
|
|
75
|
+
return undefined;
|
|
76
|
+
}
|
|
77
|
+
const headers = {
|
|
78
|
+
authorization: `Bearer ${accessToken}`,
|
|
79
|
+
originator: input.originator?.trim() || "opencode"
|
|
80
|
+
};
|
|
81
|
+
const clientVersion = normalizeClientVersion(input.clientVersion, input.versionHeader);
|
|
82
|
+
const versionHeader = normalizeClientVersion(input.versionHeader, input.clientVersion);
|
|
83
|
+
if (versionHeader)
|
|
84
|
+
headers.version = versionHeader;
|
|
85
|
+
const userAgent = input.userAgent?.trim();
|
|
86
|
+
if (userAgent)
|
|
87
|
+
headers["user-agent"] = userAgent;
|
|
88
|
+
const betaValue = input.openaiBeta?.trim();
|
|
89
|
+
if (betaValue)
|
|
90
|
+
headers["openai-beta"] = betaValue;
|
|
91
|
+
const accountId = input.accountId?.trim() || undefined;
|
|
92
|
+
if (accountId) {
|
|
93
|
+
headers["chatgpt-account-id"] = accountId;
|
|
94
|
+
}
|
|
95
|
+
const existingInFlight = inFlightCatalogFetches.get(key);
|
|
96
|
+
if (existingInFlight) {
|
|
97
|
+
return existingInFlight;
|
|
98
|
+
}
|
|
99
|
+
const inFlight = (async () => {
|
|
100
|
+
try {
|
|
101
|
+
const controller = new AbortController();
|
|
102
|
+
const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
|
|
103
|
+
let response;
|
|
104
|
+
try {
|
|
105
|
+
const endpoint = buildModelsEndpoint(clientVersion);
|
|
106
|
+
response = await fetchImpl(endpoint, {
|
|
107
|
+
method: "GET",
|
|
108
|
+
headers,
|
|
109
|
+
signal: controller.signal
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
finally {
|
|
113
|
+
clearTimeout(timeout);
|
|
114
|
+
}
|
|
115
|
+
if (!response.ok) {
|
|
116
|
+
throw new Error(`codex models request failed with status ${response.status}`);
|
|
117
|
+
}
|
|
118
|
+
const payload = await response.json();
|
|
119
|
+
const models = parseCatalogResponse(payload);
|
|
120
|
+
if (models.length === 0) {
|
|
121
|
+
throw new Error("codex models response did not contain usable models");
|
|
122
|
+
}
|
|
123
|
+
const nextCache = {
|
|
124
|
+
fetchedAt: now,
|
|
125
|
+
models
|
|
126
|
+
};
|
|
127
|
+
inMemoryCatalog.set(key, nextCache);
|
|
128
|
+
await writeCatalogToDisk(cacheDir, accountId, nextCache);
|
|
129
|
+
emitEvent(input, { type: "network_fetch_success" });
|
|
130
|
+
return nextCache.models;
|
|
131
|
+
}
|
|
132
|
+
catch (error) {
|
|
133
|
+
emitEvent(input, { type: "network_fetch_failed", reason: deriveReason(error) });
|
|
134
|
+
await ensureFallbackCaches();
|
|
135
|
+
const stale = emitStaleCacheFallback(input, {
|
|
136
|
+
disk,
|
|
137
|
+
opencode: opencodeCacheFallback,
|
|
138
|
+
codexCli: codexCliCacheFallback
|
|
139
|
+
});
|
|
140
|
+
if (stale) {
|
|
141
|
+
inMemoryCatalog.set(key, {
|
|
142
|
+
fetchedAt: now,
|
|
143
|
+
models: stale,
|
|
144
|
+
staleFallback: true
|
|
145
|
+
});
|
|
146
|
+
return stale;
|
|
147
|
+
}
|
|
148
|
+
emitEvent(input, { type: "catalog_unavailable", reason: "network_fetch_failed" });
|
|
149
|
+
return undefined;
|
|
150
|
+
}
|
|
151
|
+
})();
|
|
152
|
+
inFlightCatalogFetches.set(key, inFlight);
|
|
153
|
+
return inFlight.finally(() => {
|
|
154
|
+
if (inFlightCatalogFetches.get(key) === inFlight) {
|
|
155
|
+
inFlightCatalogFetches.delete(key);
|
|
156
|
+
}
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
//# sourceMappingURL=catalog-fetch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"catalog-fetch.js","sourceRoot":"","sources":["../../../lib/model-catalog/catalog-fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type ApplyCodexCatalogInput, type CodexModelInfo, type CodexModelRuntimeDefaults, type PersonalityOption } from "./shared.js";
|
|
2
|
+
export declare function resolveInstructionsForModel(model: CodexModelInfo, personality?: PersonalityOption): string | undefined;
|
|
3
|
+
export declare function getRuntimeDefaultsForModel(model: CodexModelInfo | undefined): CodexModelRuntimeDefaults | undefined;
|
|
4
|
+
export declare function getRuntimeDefaultsForSlug(slug: string, catalogModels: CodexModelInfo[] | undefined): CodexModelRuntimeDefaults | undefined;
|
|
5
|
+
export declare function applyCodexCatalogToProviderModels(input: ApplyCodexCatalogInput): void;
|
|
6
|
+
//# sourceMappingURL=provider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../lib/model-catalog/provider.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EACnB,KAAK,yBAAyB,EAK9B,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAA;AAqGpB,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,cAAc,EACrB,WAAW,CAAC,EAAE,iBAAiB,GAC9B,MAAM,GAAG,SAAS,CAiBpB;AA4CD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,GAAG,yBAAyB,GAAG,SAAS,CA6CnH;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,cAAc,EAAE,GAAG,SAAS,GAC1C,yBAAyB,GAAG,SAAS,CAGvC;AAED,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,sBAAsB,GAAG,IAAI,CAqErF"}
|