@iam-brain/opencode-codex-auth 0.3.2 → 1.1.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 +12 -10
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +44 -5
- package/dist/index.js.map +1 -1
- package/dist/lib/accounts-tools.d.ts.map +1 -1
- package/dist/lib/accounts-tools.js +88 -4
- package/dist/lib/accounts-tools.js.map +1 -1
- package/dist/lib/auth-refresh.d.ts +2 -0
- package/dist/lib/auth-refresh.d.ts.map +1 -0
- package/dist/lib/auth-refresh.js +2 -0
- package/dist/lib/auth-refresh.js.map +1 -0
- package/dist/lib/cache-io.d.ts +24 -0
- package/dist/lib/cache-io.d.ts.map +1 -0
- package/dist/lib/cache-io.js +95 -0
- package/dist/lib/cache-io.js.map +1 -0
- package/dist/lib/cache-lock.d.ts +7 -0
- package/dist/lib/cache-lock.d.ts.map +1 -0
- package/dist/lib/cache-lock.js +37 -0
- package/dist/lib/cache-lock.js.map +1 -0
- package/dist/lib/claims.d.ts.map +1 -1
- package/dist/lib/claims.js +4 -1
- package/dist/lib/claims.js.map +1 -1
- package/dist/lib/codex-cache-layout.d.ts +15 -0
- package/dist/lib/codex-cache-layout.d.ts.map +1 -0
- package/dist/lib/codex-cache-layout.js +52 -0
- package/dist/lib/codex-cache-layout.js.map +1 -0
- package/dist/lib/codex-native/acquire-auth.d.ts.map +1 -1
- package/dist/lib/codex-native/acquire-auth.js +61 -10
- 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 +154 -42
- 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 +158 -56
- 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 -1
- package/dist/lib/codex-native/catalog-auth.js.map +1 -1
- package/dist/lib/codex-native/chat-hooks.d.ts +9 -0
- package/dist/lib/codex-native/chat-hooks.d.ts.map +1 -1
- package/dist/lib/codex-native/chat-hooks.js +42 -2
- 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 +55 -40
- package/dist/lib/codex-native/client-identity.js.map +1 -1
- package/dist/lib/codex-native/collaboration.d.ts +28 -0
- package/dist/lib/codex-native/collaboration.d.ts.map +1 -0
- package/dist/lib/codex-native/collaboration.js +332 -0
- package/dist/lib/codex-native/collaboration.js.map +1 -0
- package/dist/lib/codex-native/oauth-auth-methods.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-auth-methods.js +14 -3
- package/dist/lib/codex-native/oauth-auth-methods.js.map +1 -1
- package/dist/lib/codex-native/oauth-server.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-server.js +34 -6
- package/dist/lib/codex-native/oauth-server.js.map +1 -1
- package/dist/lib/codex-native/oauth-utils.d.ts +3 -3
- package/dist/lib/codex-native/oauth-utils.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-utils.js +6 -9
- package/dist/lib/codex-native/oauth-utils.js.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.d.ts +4 -1
- package/dist/lib/codex-native/openai-loader-fetch.d.ts.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.js +157 -11
- package/dist/lib/codex-native/openai-loader-fetch.js.map +1 -1
- package/dist/lib/codex-native/rate-limit-snapshots.d.ts.map +1 -1
- package/dist/lib/codex-native/rate-limit-snapshots.js +5 -1
- package/dist/lib/codex-native/rate-limit-snapshots.js.map +1 -1
- package/dist/lib/codex-native/request-transform-pipeline.d.ts +1 -0
- package/dist/lib/codex-native/request-transform-pipeline.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-pipeline.js +2 -1
- package/dist/lib/codex-native/request-transform-pipeline.js.map +1 -1
- package/dist/lib/codex-native/request-transform.d.ts +20 -0
- package/dist/lib/codex-native/request-transform.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform.js +251 -8
- package/dist/lib/codex-native/request-transform.js.map +1 -1
- package/dist/lib/codex-native/session-affinity-state.d.ts +2 -0
- package/dist/lib/codex-native/session-affinity-state.d.ts.map +1 -1
- package/dist/lib/codex-native/session-affinity-state.js +10 -3
- package/dist/lib/codex-native/session-affinity-state.js.map +1 -1
- package/dist/lib/codex-native/session-messages.d.ts.map +1 -1
- package/dist/lib/codex-native/session-messages.js +4 -1
- package/dist/lib/codex-native/session-messages.js.map +1 -1
- package/dist/lib/codex-native.d.ts +7 -1
- package/dist/lib/codex-native.d.ts.map +1 -1
- package/dist/lib/codex-native.js +30 -5
- package/dist/lib/codex-native.js.map +1 -1
- package/dist/lib/codex-prompts-cache.d.ts +17 -0
- package/dist/lib/codex-prompts-cache.d.ts.map +1 -0
- package/dist/lib/codex-prompts-cache.js +184 -0
- package/dist/lib/codex-prompts-cache.js.map +1 -0
- package/dist/lib/codex-status-storage.d.ts.map +1 -1
- package/dist/lib/codex-status-storage.js +8 -43
- package/dist/lib/codex-status-storage.js.map +1 -1
- package/dist/lib/codex-status-tool.js +1 -1
- package/dist/lib/codex-status-tool.js.map +1 -1
- package/dist/lib/codex-status-ui.d.ts.map +1 -1
- package/dist/lib/codex-status-ui.js +14 -8
- package/dist/lib/codex-status-ui.js.map +1 -1
- package/dist/lib/codex-status.d.ts.map +1 -1
- package/dist/lib/codex-status.js +28 -2
- package/dist/lib/codex-status.js.map +1 -1
- package/dist/lib/compat-sanitizer.d.ts.map +1 -1
- package/dist/lib/compat-sanitizer.js +5 -4
- package/dist/lib/compat-sanitizer.js.map +1 -1
- package/dist/lib/config-dir-gitignore.d.ts +3 -0
- package/dist/lib/config-dir-gitignore.d.ts.map +1 -0
- package/dist/lib/config-dir-gitignore.js +45 -0
- package/dist/lib/config-dir-gitignore.js.map +1 -0
- package/dist/lib/config.d.ts +19 -0
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +252 -3
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/fetch-orchestrator.d.ts +19 -0
- package/dist/lib/fetch-orchestrator.d.ts.map +1 -1
- package/dist/lib/fetch-orchestrator.js +33 -6
- package/dist/lib/fetch-orchestrator.js.map +1 -1
- package/dist/lib/installer-cli.d.ts.map +1 -1
- package/dist/lib/installer-cli.js +14 -1
- package/dist/lib/installer-cli.js.map +1 -1
- package/dist/lib/logger.d.ts.map +1 -1
- package/dist/lib/logger.js +4 -1
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/model-catalog.d.ts.map +1 -1
- package/dist/lib/model-catalog.js +105 -168
- 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 +30 -6
- package/dist/lib/opencode-install.js.map +1 -1
- package/dist/lib/orchestrator-agent.d.ts +31 -0
- package/dist/lib/orchestrator-agent.d.ts.map +1 -0
- package/dist/lib/orchestrator-agent.js +268 -0
- package/dist/lib/orchestrator-agent.js.map +1 -0
- package/dist/lib/paths.d.ts +1 -1
- package/dist/lib/paths.d.ts.map +1 -1
- package/dist/lib/paths.js +1 -1
- package/dist/lib/paths.js.map +1 -1
- package/dist/lib/persona-tool-cli.d.ts.map +1 -1
- package/dist/lib/persona-tool-cli.js +4 -1
- package/dist/lib/persona-tool-cli.js.map +1 -1
- package/dist/lib/personalities.d.ts.map +1 -1
- package/dist/lib/personalities.js +9 -2
- package/dist/lib/personalities.js.map +1 -1
- package/dist/lib/personality-command.d.ts.map +1 -1
- package/dist/lib/personality-command.js +4 -1
- package/dist/lib/personality-command.js.map +1 -1
- package/dist/lib/personality-create.d.ts.map +1 -1
- package/dist/lib/personality-create.js +5 -1
- package/dist/lib/personality-create.js.map +1 -1
- package/dist/lib/personality-skill.d.ts.map +1 -1
- package/dist/lib/personality-skill.js +4 -1
- package/dist/lib/personality-skill.js.map +1 -1
- package/dist/lib/prompt-cache-key.d.ts +7 -0
- package/dist/lib/prompt-cache-key.d.ts.map +1 -0
- package/dist/lib/prompt-cache-key.js +17 -0
- package/dist/lib/prompt-cache-key.js.map +1 -0
- package/dist/lib/quarantine.d.ts.map +1 -1
- package/dist/lib/quarantine.js +22 -5
- package/dist/lib/quarantine.js.map +1 -1
- package/dist/lib/quota-threshold-alerts.d.ts +31 -0
- package/dist/lib/quota-threshold-alerts.d.ts.map +1 -0
- package/dist/lib/quota-threshold-alerts.js +97 -0
- package/dist/lib/quota-threshold-alerts.js.map +1 -0
- package/dist/lib/refresh-queue.d.ts.map +1 -1
- package/dist/lib/refresh-queue.js +9 -2
- package/dist/lib/refresh-queue.js.map +1 -1
- package/dist/lib/remote-cache-fetch.d.ts +28 -0
- package/dist/lib/remote-cache-fetch.d.ts.map +1 -0
- package/dist/lib/remote-cache-fetch.js +67 -0
- package/dist/lib/remote-cache-fetch.js.map +1 -0
- package/dist/lib/request-snapshots.d.ts +1 -0
- package/dist/lib/request-snapshots.d.ts.map +1 -1
- package/dist/lib/request-snapshots.js +44 -16
- package/dist/lib/request-snapshots.js.map +1 -1
- package/dist/lib/rotation.d.ts +4 -0
- package/dist/lib/rotation.d.ts.map +1 -1
- package/dist/lib/rotation.js +54 -10
- package/dist/lib/rotation.js.map +1 -1
- package/dist/lib/session-affinity.d.ts.map +1 -1
- package/dist/lib/session-affinity.js +22 -36
- package/dist/lib/session-affinity.js.map +1 -1
- package/dist/lib/storage.d.ts +8 -5
- package/dist/lib/storage.d.ts.map +1 -1
- package/dist/lib/storage.js +50 -39
- package/dist/lib/storage.js.map +1 -1
- package/dist/lib/ui/tty/select.d.ts.map +1 -1
- package/dist/lib/ui/tty/select.js +8 -2
- package/dist/lib/ui/tty/select.js.map +1 -1
- package/dist/lib/util.d.ts +2 -0
- package/dist/lib/util.d.ts.map +1 -0
- package/dist/lib/util.js +4 -0
- package/dist/lib/util.js.map +1 -0
- package/package.json +6 -4
- package/schemas/codex-config.schema.json +17 -0
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import { resolveRequestUserAgent } from "./client-identity";
|
|
2
2
|
import { resolveCodexOriginator } from "./originator";
|
|
3
3
|
import { buildAuthorizeUrl, CLIENT_ID, extractAccountId, fetchWithTimeout, generatePKCE, generateState, ISSUER, OAUTH_DEVICE_AUTH_TIMEOUT_MS, OAUTH_HTTP_TIMEOUT_MS, OAUTH_POLLING_SAFETY_MARGIN_MS, sleep } from "./oauth-utils";
|
|
4
|
+
function resolveDeviceAuthUserAgent(spoofMode) {
|
|
5
|
+
const originator = resolveCodexOriginator(spoofMode);
|
|
6
|
+
const userAgent = resolveRequestUserAgent(spoofMode, originator);
|
|
7
|
+
if (spoofMode !== "native")
|
|
8
|
+
return userAgent;
|
|
9
|
+
const prefix = userAgent.split(" ", 1)[0];
|
|
10
|
+
return prefix || userAgent;
|
|
11
|
+
}
|
|
4
12
|
function toOAuthSuccess(tokens) {
|
|
5
13
|
return {
|
|
6
14
|
type: "success",
|
|
@@ -92,7 +100,10 @@ export function createBrowserOAuthAuthorize(deps) {
|
|
|
92
100
|
await deps.persistOAuthTokens(tokens);
|
|
93
101
|
return toOAuthSuccess(tokens);
|
|
94
102
|
}
|
|
95
|
-
catch {
|
|
103
|
+
catch (error) {
|
|
104
|
+
if (error instanceof Error) {
|
|
105
|
+
// callback failures map to a generic failed result
|
|
106
|
+
}
|
|
96
107
|
authFailed = true;
|
|
97
108
|
return { type: "failed" };
|
|
98
109
|
}
|
|
@@ -109,7 +120,7 @@ export function createHeadlessOAuthAuthorize(deps) {
|
|
|
109
120
|
method: "POST",
|
|
110
121
|
headers: {
|
|
111
122
|
"Content-Type": "application/json",
|
|
112
|
-
"User-Agent":
|
|
123
|
+
"User-Agent": resolveDeviceAuthUserAgent(deps.spoofMode)
|
|
113
124
|
},
|
|
114
125
|
body: JSON.stringify({ client_id: CLIENT_ID })
|
|
115
126
|
}, OAUTH_HTTP_TIMEOUT_MS);
|
|
@@ -132,7 +143,7 @@ export function createHeadlessOAuthAuthorize(deps) {
|
|
|
132
143
|
method: "POST",
|
|
133
144
|
headers: {
|
|
134
145
|
"Content-Type": "application/json",
|
|
135
|
-
"User-Agent":
|
|
146
|
+
"User-Agent": resolveDeviceAuthUserAgent(deps.spoofMode)
|
|
136
147
|
},
|
|
137
148
|
body: JSON.stringify({
|
|
138
149
|
device_auth_id: deviceData.device_auth_id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-auth-methods.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-auth-methods.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oauth-auth-methods.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-auth-methods.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-server.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"oauth-server.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAG9C,KAAK,qBAAqB,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,CAAA;AAE1D,KAAK,0BAA0B,CAAC,KAAK,EAAE,OAAO,IAAI;IAChD,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9C,qBAAqB,EAAE,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,KAAK,MAAM,CAAA;IAC3D,8BAA8B,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAA;IAC3D,qBAAqB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5F,CAAA;AA0CD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,EACxD,KAAK,EAAE,0BAA0B,CAAC,KAAK,EAAE,OAAO,CAAC,GAChD;IACD,cAAc,EAAE,MAAM,OAAO,CAAA;IAC7B,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IAClE,KAAK,EAAE,MAAM,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC7C,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,KAAK,IAAI,CAAA;IACtE,eAAe,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5F,CA2SA"}
|
|
@@ -2,6 +2,7 @@ import http from "node:http";
|
|
|
2
2
|
import os from "node:os";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { appendFileSync, chmodSync, mkdirSync, renameSync, statSync, unlinkSync } from "node:fs";
|
|
5
|
+
import { isFsErrorCode } from "../cache-io";
|
|
5
6
|
const DEFAULT_DEBUG_LOG_MAX_BYTES = 1_000_000;
|
|
6
7
|
function resolveDebugLogMaxBytes() {
|
|
7
8
|
const raw = process.env.CODEX_AUTH_DEBUG_MAX_BYTES;
|
|
@@ -21,12 +22,18 @@ function rotateDebugLogIfNeeded(debugLogFile, maxBytes) {
|
|
|
21
22
|
try {
|
|
22
23
|
unlinkSync(rotatedPath);
|
|
23
24
|
}
|
|
24
|
-
catch {
|
|
25
|
+
catch (error) {
|
|
26
|
+
if (!isFsErrorCode(error, "ENOENT")) {
|
|
27
|
+
// ignore missing previous rotation file
|
|
28
|
+
}
|
|
25
29
|
// ignore missing previous rotation file
|
|
26
30
|
}
|
|
27
31
|
renameSync(debugLogFile, rotatedPath);
|
|
28
32
|
}
|
|
29
|
-
catch {
|
|
33
|
+
catch (error) {
|
|
34
|
+
if (!isFsErrorCode(error, "ENOENT")) {
|
|
35
|
+
// ignore when file does not exist or cannot be inspected
|
|
36
|
+
}
|
|
30
37
|
// ignore when file does not exist or cannot be inspected
|
|
31
38
|
}
|
|
32
39
|
}
|
|
@@ -54,7 +61,10 @@ export function createOAuthServerController(input) {
|
|
|
54
61
|
try {
|
|
55
62
|
console.error(`[codex-auth-debug] ${line}`);
|
|
56
63
|
}
|
|
57
|
-
catch {
|
|
64
|
+
catch (error) {
|
|
65
|
+
if (error instanceof Error) {
|
|
66
|
+
// best effort stderr logging
|
|
67
|
+
}
|
|
58
68
|
// best effort stderr logging
|
|
59
69
|
}
|
|
60
70
|
try {
|
|
@@ -63,7 +73,10 @@ export function createOAuthServerController(input) {
|
|
|
63
73
|
appendFileSync(debugLogFile, `${line}\n`, { encoding: "utf8", mode: 0o600 });
|
|
64
74
|
chmodSync(debugLogFile, 0o600);
|
|
65
75
|
}
|
|
66
|
-
catch {
|
|
76
|
+
catch (error) {
|
|
77
|
+
if (error instanceof Error) {
|
|
78
|
+
// best effort file logging
|
|
79
|
+
}
|
|
67
80
|
// best effort file logging
|
|
68
81
|
}
|
|
69
82
|
}
|
|
@@ -187,8 +200,20 @@ export function createOAuthServerController(input) {
|
|
|
187
200
|
return;
|
|
188
201
|
}
|
|
189
202
|
if (url.pathname === "/cancel") {
|
|
203
|
+
const state = url.searchParams.get("state");
|
|
204
|
+
if (!pendingOAuth || !state || state !== pendingOAuth.state) {
|
|
205
|
+
emitDebug("callback_cancel_rejected", {
|
|
206
|
+
hasPendingOAuth: Boolean(pendingOAuth),
|
|
207
|
+
hasState: Boolean(state),
|
|
208
|
+
stateMatches: Boolean(state) && state === pendingOAuth?.state
|
|
209
|
+
});
|
|
210
|
+
res.statusCode = 400;
|
|
211
|
+
setResponseHeaders(res, { contentType: "text/plain; charset=utf-8" });
|
|
212
|
+
res.end("Invalid cancel state");
|
|
213
|
+
return;
|
|
214
|
+
}
|
|
190
215
|
emitDebug("callback_cancel");
|
|
191
|
-
pendingOAuth
|
|
216
|
+
pendingOAuth.reject(new Error("Login cancelled"));
|
|
192
217
|
pendingOAuth = undefined;
|
|
193
218
|
res.statusCode = 200;
|
|
194
219
|
setResponseHeaders(res, { contentType: "text/plain; charset=utf-8" });
|
|
@@ -221,7 +246,10 @@ export function createOAuthServerController(input) {
|
|
|
221
246
|
try {
|
|
222
247
|
server?.close();
|
|
223
248
|
}
|
|
224
|
-
catch {
|
|
249
|
+
catch (error) {
|
|
250
|
+
if (error instanceof Error) {
|
|
251
|
+
// best-effort cleanup
|
|
252
|
+
}
|
|
225
253
|
// best-effort cleanup
|
|
226
254
|
}
|
|
227
255
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-server.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth-server.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,10 @@ import type { CodexSpoofMode } from "../config";
|
|
|
3
3
|
export declare const CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
|
|
4
4
|
export declare const ISSUER = "https://auth.openai.com";
|
|
5
5
|
export declare const OAUTH_PORT = 1455;
|
|
6
|
-
export declare const OAUTH_LOOPBACK_HOST = "
|
|
7
|
-
export declare const OAUTH_CALLBACK_ORIGIN = "http://
|
|
6
|
+
export declare const OAUTH_LOOPBACK_HOST = "localhost";
|
|
7
|
+
export declare const OAUTH_CALLBACK_ORIGIN = "http://localhost:1455";
|
|
8
8
|
export declare const OAUTH_CALLBACK_PATH = "/auth/callback";
|
|
9
|
-
export declare const OAUTH_CALLBACK_URI = "http://
|
|
9
|
+
export declare const OAUTH_CALLBACK_URI = "http://localhost:1455/auth/callback";
|
|
10
10
|
export declare const OAUTH_DUMMY_KEY = "oauth_dummy_key";
|
|
11
11
|
export declare const OAUTH_POLLING_SAFETY_MARGIN_MS = 3000;
|
|
12
12
|
export declare const OAUTH_HTTP_TIMEOUT_MS: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-utils.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,WAAW,CAAA;AAClB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAG/C,eAAO,MAAM,SAAS,iCAAiC,CAAA;AACvD,eAAO,MAAM,MAAM,4BAA4B,CAAA;AAC/C,eAAO,MAAM,UAAU,OAAO,CAAA;AAC9B,eAAO,MAAM,mBAAmB,cAAc,CAAA;AAC9C,eAAO,MAAM,qBAAqB,0BAAgD,CAAA;AAClF,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AACnD,eAAO,MAAM,kBAAkB,wCAAmD,CAAA;AAClF,eAAO,MAAM,eAAe,oBAAoB,CAAA;AAChD,eAAO,MAAM,8BAA8B,OAAO,CAAA;AAQlD,eAAO,MAAM,qBAAqB,QAAgF,CAAA;AAClH,eAAO,MAAM,4BAA4B,QAIxC,CAAA;AACD,eAAO,MAAM,yBAAyB,QAIrC,CAAA;AACD,eAAO,MAAM,8BAA8B,QAI1C,CAAA;AACD,eAAO,MAAM,oCAAoC,QAIhD,CAAA;AAWD,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAMD,wBAAsB,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC,CAKvD;AAED,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAEhG;AAED,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAazF;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,KAAK,GAAG;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAC7B,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,QAAQ,CAAC,CAanB;AAED,wBAAsB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErD;AAED,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,UAAU,GAAG,cAAc,GACtC,MAAM,CAiBR;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,CAqBxB;AAED,wBAAsB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"oauth-utils.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { CODEX_OAUTH_SUCCESS_HTML } from "../oauth-pages";
|
|
|
3
3
|
export const CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
|
|
4
4
|
export const ISSUER = "https://auth.openai.com";
|
|
5
5
|
export const OAUTH_PORT = 1455;
|
|
6
|
-
export const OAUTH_LOOPBACK_HOST = "
|
|
6
|
+
export const OAUTH_LOOPBACK_HOST = "localhost";
|
|
7
7
|
export const OAUTH_CALLBACK_ORIGIN = `http://${OAUTH_LOOPBACK_HOST}:${OAUTH_PORT}`;
|
|
8
8
|
export const OAUTH_CALLBACK_PATH = "/auth/callback";
|
|
9
9
|
export const OAUTH_CALLBACK_URI = `${OAUTH_CALLBACK_ORIGIN}${OAUTH_CALLBACK_PATH}`;
|
|
@@ -121,24 +121,21 @@ export async function refreshAccessToken(refreshToken) {
|
|
|
121
121
|
}, OAUTH_HTTP_TIMEOUT_MS);
|
|
122
122
|
if (!response.ok) {
|
|
123
123
|
let oauthCode;
|
|
124
|
-
let oauthDescription;
|
|
125
124
|
try {
|
|
126
125
|
const raw = await response.text();
|
|
127
126
|
if (raw) {
|
|
128
127
|
const payload = JSON.parse(raw);
|
|
129
128
|
if (typeof payload.error === "string")
|
|
130
129
|
oauthCode = payload.error;
|
|
131
|
-
if (typeof payload.error_description === "string") {
|
|
132
|
-
oauthDescription = payload.error_description;
|
|
133
|
-
}
|
|
134
130
|
}
|
|
135
131
|
}
|
|
136
|
-
catch {
|
|
132
|
+
catch (error) {
|
|
133
|
+
if (!(error instanceof SyntaxError)) {
|
|
134
|
+
// Best effort parse only.
|
|
135
|
+
}
|
|
137
136
|
// Best effort parse only.
|
|
138
137
|
}
|
|
139
|
-
const detail = oauthCode
|
|
140
|
-
? `${oauthCode}${oauthDescription ? `: ${oauthDescription}` : ""}`
|
|
141
|
-
: `status ${response.status}`;
|
|
138
|
+
const detail = oauthCode ? `${oauthCode}` : `status ${response.status}`;
|
|
142
139
|
const error = new Error(`Token refresh failed (${detail})`);
|
|
143
140
|
error.status = response.status;
|
|
144
141
|
error.oauthCode = oauthCode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-utils.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,IAAI,8BAA8B,EAC5D,cAAc,EAEf,MAAM,WAAW,CAAA;AAElB,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAA;AAEzD,MAAM,CAAC,MAAM,SAAS,GAAG,8BAA8B,CAAA;AACvD,MAAM,CAAC,MAAM,MAAM,GAAG,yBAAyB,CAAA;AAC/C,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAA;AAC9B,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAA;AAC9C,MAAM,CAAC,MAAM,qBAAqB,GAAG,UAAU,mBAAmB,IAAI,UAAU,EAAE,CAAA;AAClF,MAAM,CAAC,MAAM,mBAAmB,GAAG,gBAAgB,CAAA;AACnD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,qBAAqB,GAAG,mBAAmB,EAAE,CAAA;AAClF,MAAM,CAAC,MAAM,eAAe,GAAG,iBAAiB,CAAA;AAChD,MAAM,CAAC,MAAM,8BAA8B,GAAG,IAAI,CAAA;AAElD,SAAS,qBAAqB,CAAC,GAAuB,EAAE,UAAkB,EAAE,KAAa;IACvF,IAAI,CAAC,GAAG;QAAE,OAAO,UAAU,CAAA;IAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;IAC1B,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAA;AACzE,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AAClH,MAAM,CAAC,MAAM,4BAA4B,GAAG,qBAAqB,CAC/D,OAAO,CAAC,GAAG,CAAC,4BAA4B,EACxC,EAAE,GAAG,EAAE,GAAG,IAAI,EACd,KAAK,CACN,CAAA;AACD,MAAM,CAAC,MAAM,yBAAyB,GAAG,qBAAqB,CAC5D,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAC3C,EAAE,GAAG,EAAE,GAAG,IAAI,EACd,MAAM,CACP,CAAA;AACD,MAAM,CAAC,MAAM,8BAA8B,GAAG,qBAAqB,CACjE,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAChD,IAAI,EACJ,CAAC,CACF,CAAA;AACD,MAAM,CAAC,MAAM,oCAAoC,GAAG,qBAAqB,CACvE,OAAO,CAAC,GAAG,CAAC,0CAA0C,EACtD,MAAM,EACN,CAAC,CACF,CAAA;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,KAAK;SACT,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC;SACvB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AAC3B,CAAC;AAOD,SAAS,eAAe,CAAC,KAAiB;IACxC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAC1G,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC5E,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;IACtF,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;IACvD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;AAChC,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AACpE,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,MAAiC;IAC1E,OAAO,8BAA8B,CAAC,MAAM,CAAC,CAAA;AAC/C,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAAC,MAAoC;IACnE,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAA;IAE7B,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,MAAM,SAAS,GAAG,0BAA0B,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC7E,IAAI,SAAS;YAAE,OAAO,SAAS,CAAA;IACjC,CAAC;IAED,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,OAAO,0BAA0B,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;IACxE,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAcD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAA6B,EAC7B,IAAiB,EACjB,SAAiB;IAEjB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IACxC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IACxF,IAAI,CAAC;QACH,OAAO,MAAM,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;IACnE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YAC1D,MAAM,IAAI,KAAK,CAAC,iCAAiC,SAAS,IAAI,CAAC,CAAA;QACjE,CAAC;QACD,MAAM,KAAK,CAAA;IACb,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,EAAU;IACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;AAC1D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,WAAmB,EACnB,IAAe,EACf,KAAa,EACb,UAAuC;IAEvC,MAAM,KAAK,GAAG;QACZ,CAAC,eAAe,EAAE,MAAM,CAAC;QACzB,CAAC,WAAW,EAAE,SAAS,CAAC;QACxB,CAAC,cAAc,EAAE,WAAW,CAAC;QAC7B,CAAC,OAAO,EAAE,qCAAqC,CAAC;QAChD,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC;QAClC,CAAC,uBAAuB,EAAE,MAAM,CAAC;QACjC,CAAC,4BAA4B,EAAE,MAAM,CAAC;QACtC,CAAC,2BAA2B,EAAE,MAAM,CAAC;QACrC,CAAC,OAAO,EAAE,KAAK,CAAC;QAChB,CAAC,YAAY,EAAE,UAAU,CAAC;KAC3B;SACE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;SAC5D,IAAI,CAAC,GAAG,CAAC,CAAA;IAEZ,OAAO,GAAG,MAAM,oBAAoB,KAAK,EAAE,CAAA;AAC7C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,IAAY,EACZ,WAAmB,EACnB,IAAe;IAEf,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CACrC,GAAG,MAAM,cAAc,EACvB;QACE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;QAChE,IAAI,EAAE,IAAI,eAAe,CAAC;YACxB,UAAU,EAAE,oBAAoB;YAChC,IAAI;YACJ,YAAY,EAAE,WAAW;YACzB,SAAS,EAAE,SAAS;YACpB,aAAa,EAAE,IAAI,CAAC,QAAQ;SAC7B,CAAC,CAAC,QAAQ,EAAE;KACd,EACD,qBAAqB,CACtB,CAAA;IAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;IAC9D,CAAC;IACD,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAkB,CAAA;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,YAAoB;IAC3D,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CACrC,GAAG,MAAM,cAAc,EACvB;QACE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;QAChE,IAAI,EAAE,IAAI,eAAe,CAAC;YACxB,UAAU,EAAE,eAAe;YAC3B,aAAa,EAAE,YAAY;YAC3B,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC,QAAQ,EAAE;KACd,EACD,qBAAqB,CACtB,CAAA;IAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,IAAI,SAA6B,CAAA;QACjC,IAAI,
|
|
1
|
+
{"version":3,"file":"oauth-utils.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Logger } from "../logger";
|
|
2
2
|
import type { CodexModelInfo } from "../model-catalog";
|
|
3
3
|
import type { RotationStrategy } from "../types";
|
|
4
|
-
import type { BehaviorSettings, CodexSpoofMode, PersonalityOption } from "../config";
|
|
4
|
+
import type { BehaviorSettings, CodexSpoofMode, PersonalityOption, PromptCacheKeyStrategy } from "../config";
|
|
5
5
|
import type { OpenAIAuthMode } from "../types";
|
|
6
6
|
import type { SessionAffinityRuntimeState } from "./session-affinity-state";
|
|
7
7
|
type SnapshotRecorder = {
|
|
@@ -14,6 +14,8 @@ export type CreateOpenAIFetchHandlerInput = {
|
|
|
14
14
|
remapDeveloperMessagesToUserEnabled: boolean;
|
|
15
15
|
behaviorSettings?: BehaviorSettings;
|
|
16
16
|
personality?: PersonalityOption;
|
|
17
|
+
promptCacheKeyStrategy?: PromptCacheKeyStrategy;
|
|
18
|
+
projectPath?: string;
|
|
17
19
|
log?: Logger;
|
|
18
20
|
quietMode: boolean;
|
|
19
21
|
pidOffsetEnabled: boolean;
|
|
@@ -21,6 +23,7 @@ export type CreateOpenAIFetchHandlerInput = {
|
|
|
21
23
|
headerTransformDebug: boolean;
|
|
22
24
|
compatInputSanitizerEnabled: boolean;
|
|
23
25
|
internalCollaborationModeHeader: string;
|
|
26
|
+
internalCollaborationAgentHeader?: string;
|
|
24
27
|
requestSnapshots: SnapshotRecorder;
|
|
25
28
|
sessionAffinityState: SessionAffinityRuntimeState;
|
|
26
29
|
getCatalogModels: () => CodexModelInfo[] | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-loader-fetch.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/openai-loader-fetch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openai-loader-fetch.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/openai-loader-fetch.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAC5G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAkB9C,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAA;AAE3E,KAAK,gBAAgB,GAAG;IACtB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtG,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1G,CAAA;AAED,MAAM,MAAM,6BAA6B,GAAG;IAC1C,QAAQ,EAAE,cAAc,CAAA;IACxB,SAAS,EAAE,cAAc,CAAA;IACzB,mCAAmC,EAAE,OAAO,CAAA;IAC5C,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,WAAW,CAAC,EAAE,iBAAiB,CAAA;IAC/B,sBAAsB,CAAC,EAAE,sBAAsB,CAAA;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE,OAAO,CAAA;IACzB,0BAA0B,CAAC,EAAE,gBAAgB,CAAA;IAC7C,oBAAoB,EAAE,OAAO,CAAA;IAC7B,2BAA2B,EAAE,OAAO,CAAA;IACpC,+BAA+B,EAAE,MAAM,CAAA;IACvC,gCAAgC,CAAC,EAAE,MAAM,CAAA;IACzC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,oBAAoB,EAAE,2BAA2B,CAAA;IACjD,gBAAgB,EAAE,MAAM,cAAc,EAAE,GAAG,SAAS,CAAA;IACpD,mBAAmB,EAAE,CAAC,IAAI,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC,CAAA;IAClH,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACpE,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,EAAE,SAAS,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACvH,CAAA;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,6BAA6B,IAQ7D,cAAc,MAAM,GAAG,GAAG,GAAG,OAAO,EAAE,OAAO,WAAW,KAAG,OAAO,CAAC,QAAQ,CAAC,CAwV3F"}
|
|
@@ -1,13 +1,24 @@
|
|
|
1
1
|
import { FetchOrchestrator } from "../fetch-orchestrator";
|
|
2
|
+
import { saveSnapshots } from "../codex-status-storage";
|
|
3
|
+
import { fetchQuotaSnapshotFromBackend } from "../codex-quota-fetch";
|
|
2
4
|
import { PluginFatalError, isPluginFatalError, toSyntheticErrorResponse } from "../fatal-errors";
|
|
5
|
+
import { defaultSnapshotsPath } from "../paths";
|
|
6
|
+
import { DEFAULT_QUOTA_THRESHOLD_TRACKER_STATE, evaluateQuotaThresholds } from "../quota-threshold-alerts";
|
|
3
7
|
import { acquireOpenAIAuth } from "./acquire-auth";
|
|
4
8
|
import { resolveRequestUserAgent } from "./client-identity";
|
|
5
9
|
import { resolveCodexOriginator } from "./originator";
|
|
10
|
+
import { buildProjectPromptCacheKey } from "../prompt-cache-key";
|
|
6
11
|
import { persistRateLimitSnapshotFromResponse } from "./rate-limit-snapshots";
|
|
7
12
|
import { assertAllowedOutboundUrl, rewriteUrl } from "./request-routing";
|
|
8
13
|
import { applyRequestTransformPipeline } from "./request-transform-pipeline";
|
|
9
|
-
import { sanitizeOutboundRequestIfNeeded } from "./request-transform";
|
|
14
|
+
import { applyPromptCacheKeyOverrideToRequest, sanitizeOutboundRequestIfNeeded, stripReasoningReplayFromRequest } from "./request-transform";
|
|
10
15
|
export function createOpenAIFetchHandler(input) {
|
|
16
|
+
const internalCollaborationAgentHeader = input.internalCollaborationAgentHeader ?? "x-opencode-collaboration-agent-kind";
|
|
17
|
+
const quotaTrackerByIdentity = new Map();
|
|
18
|
+
const quotaRefreshAtByIdentity = new Map();
|
|
19
|
+
const QUOTA_REFRESH_TTL_MS = 60_000;
|
|
20
|
+
const QUOTA_FETCH_TIMEOUT_MS = 3000;
|
|
21
|
+
const QUOTA_EXHAUSTED_FALLBACK_COOLDOWN_MS = 5 * 60 * 1000;
|
|
11
22
|
return async (requestInput, init) => {
|
|
12
23
|
const baseRequest = new Request(requestInput, init);
|
|
13
24
|
if (input.headerTransformDebug) {
|
|
@@ -16,6 +27,7 @@ export function createOpenAIFetchHandler(input) {
|
|
|
16
27
|
});
|
|
17
28
|
}
|
|
18
29
|
let outbound = new Request(rewriteUrl(baseRequest), baseRequest);
|
|
30
|
+
const collaborationAgentKind = outbound.headers.get(internalCollaborationAgentHeader)?.trim() || undefined;
|
|
19
31
|
const inboundOriginator = outbound.headers.get("originator")?.trim();
|
|
20
32
|
const outboundOriginator = inboundOriginator === "opencode" || inboundOriginator === "codex_exec" || inboundOriginator === "codex_cli_rs"
|
|
21
33
|
? inboundOriginator
|
|
@@ -31,13 +43,17 @@ export function createOpenAIFetchHandler(input) {
|
|
|
31
43
|
if (outbound.headers.has(input.internalCollaborationModeHeader)) {
|
|
32
44
|
outbound.headers.delete(input.internalCollaborationModeHeader);
|
|
33
45
|
}
|
|
46
|
+
if (outbound.headers.has(internalCollaborationAgentHeader)) {
|
|
47
|
+
outbound.headers.delete(internalCollaborationAgentHeader);
|
|
48
|
+
}
|
|
34
49
|
const transformed = await applyRequestTransformPipeline({
|
|
35
50
|
request: outbound,
|
|
36
51
|
spoofMode: input.spoofMode,
|
|
37
52
|
remapDeveloperMessagesToUserEnabled: input.remapDeveloperMessagesToUserEnabled,
|
|
38
53
|
catalogModels: input.getCatalogModels(),
|
|
39
54
|
behaviorSettings: input.behaviorSettings,
|
|
40
|
-
fallbackPersonality: input.personality
|
|
55
|
+
fallbackPersonality: input.personality,
|
|
56
|
+
preserveOrchestratorInstructions: collaborationAgentKind === "orchestrator"
|
|
41
57
|
});
|
|
42
58
|
outbound = transformed.request;
|
|
43
59
|
const isSubagentRequest = transformed.isSubagentRequest;
|
|
@@ -54,6 +70,18 @@ export function createOpenAIFetchHandler(input) {
|
|
|
54
70
|
});
|
|
55
71
|
}
|
|
56
72
|
let selectedIdentityKey;
|
|
73
|
+
let selectedAuthForQuota;
|
|
74
|
+
const replaySanitized = await stripReasoningReplayFromRequest({
|
|
75
|
+
request: outbound,
|
|
76
|
+
enabled: true
|
|
77
|
+
});
|
|
78
|
+
outbound = replaySanitized.request;
|
|
79
|
+
if (replaySanitized.changed) {
|
|
80
|
+
input.log?.debug("reasoning replay stripped", {
|
|
81
|
+
removedPartCount: replaySanitized.removedPartCount,
|
|
82
|
+
removedFieldCount: replaySanitized.removedFieldCount
|
|
83
|
+
});
|
|
84
|
+
}
|
|
57
85
|
await input.requestSnapshots.captureRequest("before-auth", outbound, { spoofMode: input.spoofMode });
|
|
58
86
|
const { orchestratorState, stickySessionState, hybridSessionState, persistSessionAffinityState } = input.sessionAffinityState;
|
|
59
87
|
const orchestrator = new FetchOrchestrator({
|
|
@@ -77,18 +105,34 @@ export function createOpenAIFetchHandler(input) {
|
|
|
77
105
|
try {
|
|
78
106
|
await input.syncCatalogFromAuth({ accessToken: auth.access, accountId: auth.accountId });
|
|
79
107
|
}
|
|
80
|
-
catch {
|
|
108
|
+
catch (error) {
|
|
109
|
+
if (error instanceof Error) {
|
|
110
|
+
// best-effort catalog load; request can still proceed
|
|
111
|
+
}
|
|
81
112
|
// best-effort catalog load; request can still proceed
|
|
82
113
|
}
|
|
83
114
|
}
|
|
84
115
|
else {
|
|
85
|
-
void input.syncCatalogFromAuth({ accessToken: auth.access, accountId: auth.accountId }).catch(() => {
|
|
116
|
+
void input.syncCatalogFromAuth({ accessToken: auth.access, accountId: auth.accountId }).catch((error) => {
|
|
117
|
+
if (error instanceof Error) {
|
|
118
|
+
// best-effort background catalog refresh
|
|
119
|
+
}
|
|
120
|
+
});
|
|
86
121
|
}
|
|
87
122
|
}
|
|
88
123
|
else {
|
|
89
|
-
void input.syncCatalogFromAuth({ accessToken: auth.access, accountId: auth.accountId }).catch(() => {
|
|
124
|
+
void input.syncCatalogFromAuth({ accessToken: auth.access, accountId: auth.accountId }).catch((error) => {
|
|
125
|
+
if (error instanceof Error) {
|
|
126
|
+
// best-effort background catalog refresh
|
|
127
|
+
}
|
|
128
|
+
});
|
|
90
129
|
}
|
|
91
130
|
selectedIdentityKey = auth.identityKey;
|
|
131
|
+
selectedAuthForQuota = {
|
|
132
|
+
access: auth.access,
|
|
133
|
+
accountId: auth.accountId,
|
|
134
|
+
identityKey: auth.identityKey
|
|
135
|
+
};
|
|
92
136
|
return auth;
|
|
93
137
|
},
|
|
94
138
|
setCooldown: input.setCooldown,
|
|
@@ -106,18 +150,35 @@ export function createOpenAIFetchHandler(input) {
|
|
|
106
150
|
}
|
|
107
151
|
},
|
|
108
152
|
showToast: input.showToast,
|
|
109
|
-
onAttemptRequest: async ({ attempt, maxAttempts, request, auth, sessionKey }) => {
|
|
153
|
+
onAttemptRequest: async ({ attempt, maxAttempts, attemptReasonCode, request, auth, sessionKey }) => {
|
|
110
154
|
const transformed = await applyRequestTransformPipeline({
|
|
111
155
|
request,
|
|
112
156
|
spoofMode: input.spoofMode,
|
|
113
157
|
remapDeveloperMessagesToUserEnabled: input.remapDeveloperMessagesToUserEnabled,
|
|
114
158
|
catalogModels: input.getCatalogModels(),
|
|
115
159
|
behaviorSettings: input.behaviorSettings,
|
|
116
|
-
fallbackPersonality: input.personality
|
|
160
|
+
fallbackPersonality: input.personality,
|
|
161
|
+
preserveOrchestratorInstructions: collaborationAgentKind === "orchestrator"
|
|
117
162
|
});
|
|
118
|
-
|
|
163
|
+
const promptCacheKeyStrategy = input.promptCacheKeyStrategy ?? "default";
|
|
164
|
+
const promptCacheKeyOverride = promptCacheKeyStrategy === "project"
|
|
165
|
+
? await applyPromptCacheKeyOverrideToRequest({
|
|
166
|
+
request: transformed.request,
|
|
167
|
+
enabled: true,
|
|
168
|
+
promptCacheKey: buildProjectPromptCacheKey({
|
|
169
|
+
projectPath: input.projectPath ?? process.cwd(),
|
|
170
|
+
spoofMode: input.spoofMode
|
|
171
|
+
})
|
|
172
|
+
})
|
|
173
|
+
: {
|
|
174
|
+
request: transformed.request,
|
|
175
|
+
changed: false,
|
|
176
|
+
reason: "default_strategy"
|
|
177
|
+
};
|
|
178
|
+
await input.requestSnapshots.captureRequest("outbound-attempt", promptCacheKeyOverride.request, {
|
|
119
179
|
attempt: attempt + 1,
|
|
120
180
|
maxAttempts,
|
|
181
|
+
attemptReasonCode,
|
|
121
182
|
sessionKey,
|
|
122
183
|
identityKey: auth.identityKey,
|
|
123
184
|
accountLabel: auth.accountLabel,
|
|
@@ -126,14 +187,42 @@ export function createOpenAIFetchHandler(input) {
|
|
|
126
187
|
developerMessagesRemapped: transformed.developerRoleRemap.changed,
|
|
127
188
|
developerMessageRemapReason: transformed.developerRoleRemap.reason,
|
|
128
189
|
developerMessageRemapCount: transformed.developerRoleRemap.remappedCount,
|
|
129
|
-
developerMessagePreservedCount: transformed.developerRoleRemap.preservedCount
|
|
190
|
+
developerMessagePreservedCount: transformed.developerRoleRemap.preservedCount,
|
|
191
|
+
promptCacheKeyOverridden: promptCacheKeyOverride.changed,
|
|
192
|
+
promptCacheKeyOverrideReason: promptCacheKeyOverride.reason,
|
|
193
|
+
...(input.headerTransformDebug === true && auth.selectionTrace
|
|
194
|
+
? {
|
|
195
|
+
selectionStrategy: auth.selectionTrace.strategy,
|
|
196
|
+
selectionDecision: auth.selectionTrace.decision,
|
|
197
|
+
selectionTotalCount: auth.selectionTrace.totalCount,
|
|
198
|
+
selectionDisabledCount: auth.selectionTrace.disabledCount,
|
|
199
|
+
selectionCooldownCount: auth.selectionTrace.cooldownCount,
|
|
200
|
+
selectionRefreshLeaseCount: auth.selectionTrace.refreshLeaseCount,
|
|
201
|
+
selectionEligibleCount: auth.selectionTrace.eligibleCount,
|
|
202
|
+
...(typeof auth.selectionTrace.attemptedCount === "number"
|
|
203
|
+
? { selectionAttemptedCount: auth.selectionTrace.attemptedCount }
|
|
204
|
+
: null),
|
|
205
|
+
...(auth.selectionTrace.selectedIdentityKey
|
|
206
|
+
? { selectionSelectedIdentityKey: auth.selectionTrace.selectedIdentityKey }
|
|
207
|
+
: null),
|
|
208
|
+
...(typeof auth.selectionTrace.selectedIndex === "number"
|
|
209
|
+
? { selectionSelectedIndex: auth.selectionTrace.selectedIndex }
|
|
210
|
+
: null),
|
|
211
|
+
...(auth.selectionTrace.attemptKey ? { selectionAttemptKey: auth.selectionTrace.attemptKey } : null),
|
|
212
|
+
...(auth.selectionTrace.activeIdentityKey
|
|
213
|
+
? { selectionActiveIdentityKey: auth.selectionTrace.activeIdentityKey }
|
|
214
|
+
: null),
|
|
215
|
+
...(auth.selectionTrace.sessionKey ? { selectionSessionKey: auth.selectionTrace.sessionKey } : null)
|
|
216
|
+
}
|
|
217
|
+
: null)
|
|
130
218
|
});
|
|
131
|
-
return
|
|
219
|
+
return promptCacheKeyOverride.request;
|
|
132
220
|
},
|
|
133
|
-
onAttemptResponse: async ({ attempt, maxAttempts, response, auth, sessionKey }) => {
|
|
221
|
+
onAttemptResponse: async ({ attempt, maxAttempts, attemptReasonCode, response, auth, sessionKey }) => {
|
|
134
222
|
await input.requestSnapshots.captureResponse("outbound-response", response, {
|
|
135
223
|
attempt: attempt + 1,
|
|
136
224
|
maxAttempts,
|
|
225
|
+
attemptReasonCode,
|
|
137
226
|
sessionKey,
|
|
138
227
|
identityKey: auth.identityKey,
|
|
139
228
|
accountLabel: auth.accountLabel
|
|
@@ -185,6 +274,63 @@ export function createOpenAIFetchHandler(input) {
|
|
|
185
274
|
}));
|
|
186
275
|
}
|
|
187
276
|
persistRateLimitSnapshotFromResponse(response, selectedIdentityKey);
|
|
277
|
+
const identityForQuota = selectedAuthForQuota?.identityKey;
|
|
278
|
+
if (identityForQuota && selectedAuthForQuota?.access) {
|
|
279
|
+
try {
|
|
280
|
+
const now = Date.now();
|
|
281
|
+
const nextRefreshAt = quotaRefreshAtByIdentity.get(identityForQuota);
|
|
282
|
+
if (nextRefreshAt === undefined || now >= nextRefreshAt) {
|
|
283
|
+
quotaRefreshAtByIdentity.set(identityForQuota, now + QUOTA_REFRESH_TTL_MS);
|
|
284
|
+
const quotaSnapshot = await fetchQuotaSnapshotFromBackend({
|
|
285
|
+
accessToken: selectedAuthForQuota.access,
|
|
286
|
+
accountId: selectedAuthForQuota.accountId,
|
|
287
|
+
now,
|
|
288
|
+
modelFamily: "gpt-5.3-codex",
|
|
289
|
+
userAgent: resolveRequestUserAgent(input.spoofMode, resolveCodexOriginator(input.spoofMode)),
|
|
290
|
+
log: input.log,
|
|
291
|
+
timeoutMs: QUOTA_FETCH_TIMEOUT_MS
|
|
292
|
+
});
|
|
293
|
+
if (quotaSnapshot) {
|
|
294
|
+
await saveSnapshots(defaultSnapshotsPath(), (current) => ({
|
|
295
|
+
...current,
|
|
296
|
+
[identityForQuota]: quotaSnapshot
|
|
297
|
+
}));
|
|
298
|
+
const previousTracker = quotaTrackerByIdentity.get(identityForQuota) ?? DEFAULT_QUOTA_THRESHOLD_TRACKER_STATE;
|
|
299
|
+
const evaluated = evaluateQuotaThresholds({
|
|
300
|
+
snapshot: quotaSnapshot,
|
|
301
|
+
previousState: previousTracker
|
|
302
|
+
});
|
|
303
|
+
quotaTrackerByIdentity.set(identityForQuota, evaluated.nextState);
|
|
304
|
+
for (const warning of evaluated.warnings) {
|
|
305
|
+
await input.showToast(warning.message, "warning", input.quietMode);
|
|
306
|
+
}
|
|
307
|
+
if (evaluated.exhaustedCrossings.length > 0) {
|
|
308
|
+
const cooldownCandidates = evaluated.exhaustedCrossings
|
|
309
|
+
.map((crossing) => crossing.resetsAt)
|
|
310
|
+
.filter((value) => typeof value === "number" && Number.isFinite(value) && value > now);
|
|
311
|
+
const cooldownUntil = cooldownCandidates.length > 0
|
|
312
|
+
? Math.max(...cooldownCandidates)
|
|
313
|
+
: now + QUOTA_EXHAUSTED_FALLBACK_COOLDOWN_MS;
|
|
314
|
+
await input.setCooldown(identityForQuota, cooldownUntil);
|
|
315
|
+
if (evaluated.exhaustedCrossings.length === 1) {
|
|
316
|
+
const only = evaluated.exhaustedCrossings[0];
|
|
317
|
+
const label = only.window === "weekly" ? "weekly" : "5h";
|
|
318
|
+
await input.showToast(`Switching account due to ${label} quota limit`, "warning", input.quietMode);
|
|
319
|
+
}
|
|
320
|
+
else {
|
|
321
|
+
await input.showToast("Switching account due to 5h and weekly quota limits", "warning", input.quietMode);
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
catch (error) {
|
|
328
|
+
input.log?.debug("quota refresh during request failed", {
|
|
329
|
+
identityKey: identityForQuota,
|
|
330
|
+
error: error instanceof Error ? error.message : String(error)
|
|
331
|
+
});
|
|
332
|
+
}
|
|
333
|
+
}
|
|
188
334
|
return response;
|
|
189
335
|
};
|
|
190
336
|
}
|