codex-multi-auth 0.1.2 → 0.1.4
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 +6 -9
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +51 -13
- package/dist/index.js.map +1 -1
- package/dist/lib/auth/auth.d.ts +6 -2
- package/dist/lib/auth/auth.d.ts.map +1 -1
- package/dist/lib/auth/auth.js +34 -11
- package/dist/lib/auth/auth.js.map +1 -1
- package/dist/lib/auth/server.d.ts +1 -1
- package/dist/lib/auth/server.js +3 -3
- package/dist/lib/codex-cli/state.d.ts +9 -0
- package/dist/lib/codex-cli/state.d.ts.map +1 -1
- package/dist/lib/codex-cli/state.js +14 -0
- package/dist/lib/codex-cli/state.js.map +1 -1
- package/dist/lib/codex-cli/writer.d.ts.map +1 -1
- package/dist/lib/codex-cli/writer.js +106 -14
- package/dist/lib/codex-cli/writer.js.map +1 -1
- package/dist/lib/codex-manager/settings-hub.d.ts +16 -1
- package/dist/lib/codex-manager/settings-hub.d.ts.map +1 -1
- package/dist/lib/codex-manager/settings-hub.js +28 -2
- package/dist/lib/codex-manager/settings-hub.js.map +1 -1
- package/dist/lib/codex-manager.d.ts +1 -0
- package/dist/lib/codex-manager.d.ts.map +1 -1
- package/dist/lib/codex-manager.js +320 -18
- package/dist/lib/codex-manager.js.map +1 -1
- package/dist/lib/oauth-success.html +192 -260
- package/dist/lib/parallel-probe.d.ts +7 -0
- package/dist/lib/parallel-probe.d.ts.map +1 -1
- package/dist/lib/parallel-probe.js +37 -9
- package/dist/lib/parallel-probe.js.map +1 -1
- package/dist/lib/refresh-queue.d.ts +4 -5
- package/dist/lib/refresh-queue.d.ts.map +1 -1
- package/dist/lib/refresh-queue.js +99 -21
- package/dist/lib/refresh-queue.js.map +1 -1
- package/dist/lib/request/fetch-helpers.d.ts +12 -4
- package/dist/lib/request/fetch-helpers.d.ts.map +1 -1
- package/dist/lib/request/fetch-helpers.js +53 -25
- package/dist/lib/request/fetch-helpers.js.map +1 -1
- package/dist/lib/request/helpers/tool-utils.d.ts.map +1 -1
- package/dist/lib/request/helpers/tool-utils.js +36 -6
- package/dist/lib/request/helpers/tool-utils.js.map +1 -1
- package/dist/lib/request/rate-limit-backoff.d.ts +7 -0
- package/dist/lib/request/rate-limit-backoff.d.ts.map +1 -1
- package/dist/lib/request/rate-limit-backoff.js +24 -4
- package/dist/lib/request/rate-limit-backoff.js.map +1 -1
- package/dist/lib/request/request-transformer.d.ts +10 -0
- package/dist/lib/request/request-transformer.d.ts.map +1 -1
- package/dist/lib/request/request-transformer.js +61 -37
- package/dist/lib/request/request-transformer.js.map +1 -1
- package/dist/lib/rotation.d.ts +19 -0
- package/dist/lib/rotation.d.ts.map +1 -1
- package/dist/lib/rotation.js +60 -39
- package/dist/lib/rotation.js.map +1 -1
- package/dist/lib/ui/copy.d.ts +1 -1
- package/dist/lib/ui/copy.js +1 -1
- package/dist/lib/utils.d.ts +6 -0
- package/dist/lib/utils.d.ts.map +1 -1
- package/dist/lib/utils.js +11 -0
- package/dist/lib/utils.js.map +1 -1
- package/package.json +9 -5
- package/scripts/audit-dev-allowlist.js +186 -94
- package/scripts/benchmark-runtime-path.mjs +166 -0
- package/scripts/codex.js +57 -1
- package/scripts/copy-oauth-success.js +42 -3
- package/scripts/install-codex-auth-utils.js +69 -0
- package/scripts/install-codex-auth.js +16 -7
|
@@ -43,6 +43,7 @@ import { RefreshLeaseCoordinator } from "./refresh-lease.js";
|
|
|
43
43
|
export declare class RefreshQueue {
|
|
44
44
|
private pending;
|
|
45
45
|
private readonly leaseCoordinator;
|
|
46
|
+
private nextGeneration;
|
|
46
47
|
/**
|
|
47
48
|
* Maps old refresh tokens to new tokens after rotation.
|
|
48
49
|
* This allows lookups with either old or new token to find the same entry.
|
|
@@ -50,9 +51,7 @@ export declare class RefreshQueue {
|
|
|
50
51
|
*/
|
|
51
52
|
private tokenRotationMap;
|
|
52
53
|
/**
|
|
53
|
-
*
|
|
54
|
-
* from stuck requests). After this timeout, the entry is removed and new
|
|
55
|
-
* callers will trigger a fresh refresh.
|
|
54
|
+
* Age threshold for stale pending refresh operations.
|
|
56
55
|
*/
|
|
57
56
|
private readonly maxEntryAgeMs;
|
|
58
57
|
/**
|
|
@@ -78,8 +77,8 @@ export declare class RefreshQueue {
|
|
|
78
77
|
*/
|
|
79
78
|
private executeRefresh;
|
|
80
79
|
/**
|
|
81
|
-
*
|
|
82
|
-
*
|
|
80
|
+
* Cleanup stale entries that have been pending too long.
|
|
81
|
+
* Acquire-stage entries are evicted to prevent deadlocked refresh lanes.
|
|
83
82
|
*/
|
|
84
83
|
private cleanup;
|
|
85
84
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh-queue.d.ts","sourceRoot":"","sources":["../../lib/refresh-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"refresh-queue.d.ts","sourceRoot":"","sources":["../../lib/refresh-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAgB7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,OAAO,CAAwC;IACvD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA0B;IAC3D,OAAO,CAAC,cAAc,CAAK;IAE3B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB,CAAkC;IAE1D;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC;;;OAGG;gBAED,aAAa,GAAE,MAAe,EAC9B,gBAAgB,GAAE,uBAAmE;IAMvF;;;;;;;;OAQG;IACG,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAuHzD,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,sBAAsB;YAShB,kCAAkC;IAchD;;OAEG;YACW,cAAc;IAsE5B;;;OAGG;IACH,OAAO,CAAC,OAAO;IAwBf;;;;OAIG;IACH,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAI3C;;;OAGG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;OAEG;IACH,KAAK,IAAI,IAAI;CAId;AAQD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,YAAY,CAKpE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAGxC;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAE9E"}
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
import { refreshAccessToken } from "./auth/auth.js";
|
|
11
11
|
import { createLogger } from "./logger.js";
|
|
12
12
|
import { RefreshLeaseCoordinator } from "./refresh-lease.js";
|
|
13
|
+
import { isAbortError } from "./utils.js";
|
|
13
14
|
const log = createLogger("refresh-queue");
|
|
14
15
|
/**
|
|
15
16
|
* Manages queued token refresh operations to prevent race conditions.
|
|
@@ -45,6 +46,7 @@ const log = createLogger("refresh-queue");
|
|
|
45
46
|
export class RefreshQueue {
|
|
46
47
|
pending = new Map();
|
|
47
48
|
leaseCoordinator;
|
|
49
|
+
nextGeneration = 0;
|
|
48
50
|
/**
|
|
49
51
|
* Maps old refresh tokens to new tokens after rotation.
|
|
50
52
|
* This allows lookups with either old or new token to find the same entry.
|
|
@@ -52,9 +54,7 @@ export class RefreshQueue {
|
|
|
52
54
|
*/
|
|
53
55
|
tokenRotationMap = new Map();
|
|
54
56
|
/**
|
|
55
|
-
*
|
|
56
|
-
* from stuck requests). After this timeout, the entry is removed and new
|
|
57
|
-
* callers will trigger a fresh refresh.
|
|
57
|
+
* Age threshold for stale pending refresh operations.
|
|
58
58
|
*/
|
|
59
59
|
maxEntryAgeMs;
|
|
60
60
|
/**
|
|
@@ -102,6 +102,27 @@ export class RefreshQueue {
|
|
|
102
102
|
// Start a new refresh immediately so local state reflects "in-flight"
|
|
103
103
|
// without waiting on cross-process lease checks.
|
|
104
104
|
const startedAt = Date.now();
|
|
105
|
+
const generation = ++this.nextGeneration;
|
|
106
|
+
const markStage = (stage) => {
|
|
107
|
+
const entry = this.pending.get(refreshToken);
|
|
108
|
+
if (!entry || entry.generation !== generation)
|
|
109
|
+
return;
|
|
110
|
+
entry.stage = stage;
|
|
111
|
+
entry.startedAt = Date.now();
|
|
112
|
+
entry.staleWarningLogged = false;
|
|
113
|
+
};
|
|
114
|
+
const getSupersedingPromise = () => {
|
|
115
|
+
const current = this.pending.get(refreshToken);
|
|
116
|
+
if (!current || current.generation === generation) {
|
|
117
|
+
return undefined;
|
|
118
|
+
}
|
|
119
|
+
log.info("Refresh generation superseded; joining newer in-flight refresh", {
|
|
120
|
+
tokenSuffix: refreshToken.slice(-6),
|
|
121
|
+
staleGeneration: generation,
|
|
122
|
+
activeGeneration: current.generation,
|
|
123
|
+
});
|
|
124
|
+
return current.promise;
|
|
125
|
+
};
|
|
105
126
|
const promise = (async () => {
|
|
106
127
|
let lease;
|
|
107
128
|
try {
|
|
@@ -112,6 +133,11 @@ export class RefreshQueue {
|
|
|
112
133
|
tokenSuffix: refreshToken.slice(-6),
|
|
113
134
|
error: error?.message ?? String(error),
|
|
114
135
|
});
|
|
136
|
+
const supersedingPromise = getSupersedingPromise();
|
|
137
|
+
if (supersedingPromise) {
|
|
138
|
+
return supersedingPromise;
|
|
139
|
+
}
|
|
140
|
+
markStage("refresh");
|
|
115
141
|
return this.executeRefreshWithRotationTracking(refreshToken);
|
|
116
142
|
}
|
|
117
143
|
if (lease.role === "follower" && lease.result) {
|
|
@@ -121,6 +147,11 @@ export class RefreshQueue {
|
|
|
121
147
|
return lease.result;
|
|
122
148
|
}
|
|
123
149
|
try {
|
|
150
|
+
const supersedingPromise = getSupersedingPromise();
|
|
151
|
+
if (supersedingPromise) {
|
|
152
|
+
return supersedingPromise;
|
|
153
|
+
}
|
|
154
|
+
markStage("refresh");
|
|
124
155
|
const result = await this.executeRefreshWithRotationTracking(refreshToken);
|
|
125
156
|
try {
|
|
126
157
|
await lease.release(result);
|
|
@@ -145,13 +176,21 @@ export class RefreshQueue {
|
|
|
145
176
|
}
|
|
146
177
|
}
|
|
147
178
|
})();
|
|
148
|
-
this.pending.set(refreshToken, {
|
|
179
|
+
this.pending.set(refreshToken, {
|
|
180
|
+
promise,
|
|
181
|
+
startedAt,
|
|
182
|
+
stage: "acquire",
|
|
183
|
+
generation,
|
|
184
|
+
});
|
|
149
185
|
try {
|
|
150
186
|
return await promise;
|
|
151
187
|
}
|
|
152
188
|
finally {
|
|
153
|
-
this.pending.
|
|
154
|
-
|
|
189
|
+
const entry = this.pending.get(refreshToken);
|
|
190
|
+
if (!entry || entry.generation === generation) {
|
|
191
|
+
this.pending.delete(refreshToken);
|
|
192
|
+
this.cleanupRotationMapping(refreshToken);
|
|
193
|
+
}
|
|
155
194
|
}
|
|
156
195
|
}
|
|
157
196
|
findOriginalToken(newToken) {
|
|
@@ -187,8 +226,24 @@ export class RefreshQueue {
|
|
|
187
226
|
async executeRefresh(refreshToken) {
|
|
188
227
|
const startTime = Date.now();
|
|
189
228
|
log.info("Starting token refresh", { tokenSuffix: refreshToken.slice(-6) });
|
|
229
|
+
const timeoutMs = Math.max(1_000, this.maxEntryAgeMs);
|
|
230
|
+
const timeoutController = new AbortController();
|
|
231
|
+
let timeoutId;
|
|
190
232
|
try {
|
|
191
|
-
const
|
|
233
|
+
const timeoutErrorMessage = `Refresh timeout after ${timeoutMs}ms`;
|
|
234
|
+
const timeoutPromise = new Promise((_resolve, reject) => {
|
|
235
|
+
timeoutId = setTimeout(() => {
|
|
236
|
+
const timeoutError = new Error(timeoutErrorMessage);
|
|
237
|
+
timeoutError.name = "AbortError";
|
|
238
|
+
timeoutError.code = "ABORT_ERR";
|
|
239
|
+
timeoutController.abort(timeoutError);
|
|
240
|
+
reject(timeoutError);
|
|
241
|
+
}, timeoutMs);
|
|
242
|
+
});
|
|
243
|
+
const refreshPromise = refreshAccessToken(refreshToken, {
|
|
244
|
+
signal: timeoutController.signal,
|
|
245
|
+
});
|
|
246
|
+
const result = await Promise.race([refreshPromise, timeoutPromise]);
|
|
192
247
|
const duration = Date.now() - startTime;
|
|
193
248
|
if (result.type === "success") {
|
|
194
249
|
log.info("Token refresh succeeded", {
|
|
@@ -207,6 +262,18 @@ export class RefreshQueue {
|
|
|
207
262
|
}
|
|
208
263
|
catch (error) {
|
|
209
264
|
const duration = Date.now() - startTime;
|
|
265
|
+
if (isAbortError(error)) {
|
|
266
|
+
log.warn("Token refresh aborted", {
|
|
267
|
+
tokenSuffix: refreshToken.slice(-6),
|
|
268
|
+
error: error?.message ?? String(error),
|
|
269
|
+
durationMs: duration,
|
|
270
|
+
});
|
|
271
|
+
return {
|
|
272
|
+
type: "failed",
|
|
273
|
+
reason: "unknown",
|
|
274
|
+
message: error?.message ?? "Refresh aborted",
|
|
275
|
+
};
|
|
276
|
+
}
|
|
210
277
|
log.error("Token refresh threw exception", {
|
|
211
278
|
tokenSuffix: refreshToken.slice(-6),
|
|
212
279
|
error: error?.message ?? String(error),
|
|
@@ -218,27 +285,38 @@ export class RefreshQueue {
|
|
|
218
285
|
message: error?.message ?? "Unknown error during refresh",
|
|
219
286
|
};
|
|
220
287
|
}
|
|
288
|
+
finally {
|
|
289
|
+
if (timeoutId) {
|
|
290
|
+
clearTimeout(timeoutId);
|
|
291
|
+
}
|
|
292
|
+
}
|
|
221
293
|
}
|
|
222
294
|
/**
|
|
223
|
-
*
|
|
224
|
-
*
|
|
295
|
+
* Cleanup stale entries that have been pending too long.
|
|
296
|
+
* Acquire-stage entries are evicted to prevent deadlocked refresh lanes.
|
|
225
297
|
*/
|
|
226
298
|
cleanup() {
|
|
227
299
|
const now = Date.now();
|
|
228
|
-
const staleTokens = [];
|
|
229
300
|
for (const [token, entry] of this.pending.entries()) {
|
|
230
|
-
|
|
231
|
-
|
|
301
|
+
const ageMs = now - entry.startedAt;
|
|
302
|
+
if (ageMs <= this.maxEntryAgeMs)
|
|
303
|
+
continue;
|
|
304
|
+
if (entry.stage === "acquire") {
|
|
305
|
+
log.warn("Evicting stale refresh entry during lease acquire stage", {
|
|
306
|
+
tokenSuffix: token.slice(-6),
|
|
307
|
+
ageMs,
|
|
308
|
+
});
|
|
309
|
+
this.pending.delete(token);
|
|
310
|
+
this.cleanupRotationMapping(token);
|
|
311
|
+
continue;
|
|
312
|
+
}
|
|
313
|
+
if (!entry.staleWarningLogged) {
|
|
314
|
+
log.warn("Refresh entry exceeded stale warning threshold", {
|
|
315
|
+
tokenSuffix: token.slice(-6),
|
|
316
|
+
ageMs,
|
|
317
|
+
});
|
|
318
|
+
entry.staleWarningLogged = true;
|
|
232
319
|
}
|
|
233
|
-
}
|
|
234
|
-
for (const token of staleTokens) {
|
|
235
|
-
// istanbul ignore next -- defensive: token always exists in pending at this point (not yet deleted)
|
|
236
|
-
const ageMs = now - (this.pending.get(token)?.startedAt ?? now);
|
|
237
|
-
log.warn("Removing stale refresh entry", {
|
|
238
|
-
tokenSuffix: token.slice(-6),
|
|
239
|
-
ageMs,
|
|
240
|
-
});
|
|
241
|
-
this.pending.delete(token);
|
|
242
320
|
}
|
|
243
321
|
}
|
|
244
322
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh-queue.js","sourceRoot":"","sources":["../../lib/refresh-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"refresh-queue.js","sourceRoot":"","sources":["../../lib/refresh-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,6 +77,16 @@ export interface ErrorDiagnostics {
|
|
|
77
77
|
threadId?: string;
|
|
78
78
|
httpStatus?: number;
|
|
79
79
|
}
|
|
80
|
+
export interface CreateCodexHeadersOptions {
|
|
81
|
+
model?: string;
|
|
82
|
+
promptCacheKey?: string;
|
|
83
|
+
}
|
|
84
|
+
export interface CreateCodexHeadersParams {
|
|
85
|
+
init?: RequestInit;
|
|
86
|
+
accountId: string;
|
|
87
|
+
accessToken: string;
|
|
88
|
+
opts?: CreateCodexHeadersOptions;
|
|
89
|
+
}
|
|
80
90
|
/**
|
|
81
91
|
* Determines if the current auth token needs to be refreshed
|
|
82
92
|
* @param auth - Current authentication state
|
|
@@ -128,10 +138,8 @@ export declare function transformRequestForCodex(init: RequestInit | undefined,
|
|
|
128
138
|
* @param accessToken - OAuth access token
|
|
129
139
|
* @returns Headers object with all required Codex headers
|
|
130
140
|
*/
|
|
131
|
-
export declare function createCodexHeaders(
|
|
132
|
-
|
|
133
|
-
promptCacheKey?: string;
|
|
134
|
-
}): Headers;
|
|
141
|
+
export declare function createCodexHeaders(params: CreateCodexHeadersParams): Headers;
|
|
142
|
+
export declare function createCodexHeaders(init: RequestInit | undefined, accountId: string, accessToken: string, opts?: CreateCodexHeadersOptions): Headers;
|
|
135
143
|
/**
|
|
136
144
|
* Handles error responses from the Codex API
|
|
137
145
|
* @param response - Error response from API
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-helpers.d.ts","sourceRoot":"","sources":["../../../lib/request/fetch-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAMvD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AA2B3D,MAAM,WAAW,aAAa;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IACzB,aAAa,EAAE,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACvB;
|
|
1
|
+
{"version":3,"file":"fetch-helpers.d.ts","sourceRoot":"","sources":["../../../lib/request/fetch-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,8 @@ const CODEX_BASE_PATH_PREFIX = CODEX_BASE_URL_OBJECT.pathname.endsWith("/")
|
|
|
17
17
|
const CHATGPT_CODEX_UNSUPPORTED_MODEL_CODE = "model_not_supported_with_chatgpt_account";
|
|
18
18
|
const CHATGPT_CODEX_UNSUPPORTED_MODEL_PATTERN = /model is not supported when using codex with a chatgpt account/i;
|
|
19
19
|
const NORMALIZED_UNSUPPORTED_MODEL_PATTERN = /the model ['"]([^'"]+)['"] is not currently available for this chatgpt account/i;
|
|
20
|
+
const MAX_RETRY_DELAY_MS = 5 * 60 * 1000;
|
|
21
|
+
const CREATE_CODEX_HEADERS_PARAM_KEYS = new Set(["init", "accountId", "accessToken", "opts"]);
|
|
20
22
|
export const DEFAULT_UNSUPPORTED_CODEX_FALLBACK_CHAIN = {
|
|
21
23
|
"gpt-5.3-codex-spark": ["gpt-5-codex", "gpt-5.3-codex", "gpt-5.2-codex"],
|
|
22
24
|
"gpt-5.3-codex": ["gpt-5-codex", "gpt-5.2-codex"],
|
|
@@ -201,6 +203,13 @@ export function createEntitlementErrorResponse(_bodyText) {
|
|
|
201
203
|
headers: { "content-type": "application/json; charset=utf-8" },
|
|
202
204
|
});
|
|
203
205
|
}
|
|
206
|
+
function isCreateCodexHeadersNamedParams(value) {
|
|
207
|
+
if (!isRecord(value))
|
|
208
|
+
return false;
|
|
209
|
+
if (typeof value.accountId !== "string" || typeof value.accessToken !== "string")
|
|
210
|
+
return false;
|
|
211
|
+
return Object.keys(value).every((key) => CREATE_CODEX_HEADERS_PARAM_KEYS.has(key));
|
|
212
|
+
}
|
|
204
213
|
/**
|
|
205
214
|
* Determines if the current auth token needs to be refreshed
|
|
206
215
|
* @param auth - Current authentication state
|
|
@@ -354,21 +363,29 @@ export async function transformRequestForCodex(init, url, userConfig, codexMode
|
|
|
354
363
|
return undefined;
|
|
355
364
|
}
|
|
356
365
|
}
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
+
export function createCodexHeaders(initOrParams, accountId, accessToken, opts) {
|
|
367
|
+
const useNamedParams = typeof accountId === "undefined" &&
|
|
368
|
+
typeof accessToken === "undefined" &&
|
|
369
|
+
isCreateCodexHeadersNamedParams(initOrParams);
|
|
370
|
+
const namedParams = useNamedParams
|
|
371
|
+
? initOrParams
|
|
372
|
+
: null;
|
|
373
|
+
const resolvedInit = useNamedParams
|
|
374
|
+
? namedParams?.init
|
|
375
|
+
: initOrParams;
|
|
376
|
+
const resolvedAccountId = useNamedParams ? namedParams?.accountId : accountId;
|
|
377
|
+
const resolvedAccessToken = useNamedParams ? namedParams?.accessToken : accessToken;
|
|
378
|
+
const resolvedOpts = useNamedParams ? namedParams?.opts : opts;
|
|
379
|
+
if (!resolvedAccountId || !resolvedAccessToken) {
|
|
380
|
+
throw new TypeError("createCodexHeaders requires accountId and accessToken");
|
|
381
|
+
}
|
|
382
|
+
const headers = new Headers(resolvedInit?.headers ?? {});
|
|
366
383
|
headers.delete("x-api-key"); // Remove any existing API key
|
|
367
|
-
headers.set("Authorization", `Bearer ${
|
|
368
|
-
headers.set(OPENAI_HEADERS.ACCOUNT_ID,
|
|
384
|
+
headers.set("Authorization", `Bearer ${resolvedAccessToken}`);
|
|
385
|
+
headers.set(OPENAI_HEADERS.ACCOUNT_ID, resolvedAccountId);
|
|
369
386
|
headers.set(OPENAI_HEADERS.BETA, OPENAI_HEADER_VALUES.BETA_RESPONSES);
|
|
370
387
|
headers.set(OPENAI_HEADERS.ORIGINATOR, OPENAI_HEADER_VALUES.ORIGINATOR_CODEX);
|
|
371
|
-
const cacheKey =
|
|
388
|
+
const cacheKey = resolvedOpts?.promptCacheKey;
|
|
372
389
|
if (cacheKey) {
|
|
373
390
|
headers.set(OPENAI_HEADERS.CONVERSATION_ID, cacheKey);
|
|
374
391
|
headers.set(OPENAI_HEADERS.SESSION_ID, cacheKey);
|
|
@@ -500,8 +517,9 @@ function parseRateLimitBody(body) {
|
|
|
500
517
|
const error = parsed?.error ?? {};
|
|
501
518
|
const code = (error.code ?? error.type ?? "").toString();
|
|
502
519
|
const resetsAt = toNumber(error.resets_at ?? error.reset_at);
|
|
503
|
-
const retryAfterMs = toNumber(error.retry_after_ms
|
|
504
|
-
|
|
520
|
+
const retryAfterMs = toNumber(error.retry_after_ms);
|
|
521
|
+
const retryAfterSeconds = toNumber(error.retry_after);
|
|
522
|
+
return { code, resetsAt, retryAfterMs, retryAfterSeconds };
|
|
505
523
|
}
|
|
506
524
|
catch {
|
|
507
525
|
return undefined;
|
|
@@ -617,7 +635,14 @@ function ensureJsonErrorResponse(response, payload) {
|
|
|
617
635
|
}
|
|
618
636
|
function parseRetryAfterMs(response, parsedBody) {
|
|
619
637
|
if (parsedBody?.retryAfterMs !== undefined) {
|
|
620
|
-
|
|
638
|
+
const normalized = normalizeRetryAfterMs(parsedBody.retryAfterMs);
|
|
639
|
+
if (normalized !== null)
|
|
640
|
+
return normalized;
|
|
641
|
+
}
|
|
642
|
+
if (parsedBody?.retryAfterSeconds !== undefined) {
|
|
643
|
+
const normalized = normalizeRetryAfterSeconds(parsedBody.retryAfterSeconds);
|
|
644
|
+
if (normalized !== null)
|
|
645
|
+
return normalized;
|
|
621
646
|
}
|
|
622
647
|
const retryAfterMsHeader = response.headers.get("retry-after-ms");
|
|
623
648
|
if (retryAfterMsHeader) {
|
|
@@ -665,17 +690,20 @@ function parseRetryAfterMs(response, parsedBody) {
|
|
|
665
690
|
}
|
|
666
691
|
return null;
|
|
667
692
|
}
|
|
668
|
-
function
|
|
693
|
+
function normalizeRetryAfterMs(value) {
|
|
669
694
|
if (!Number.isFinite(value))
|
|
670
|
-
return
|
|
671
|
-
|
|
672
|
-
if (
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
695
|
+
return null;
|
|
696
|
+
const ms = Math.floor(value);
|
|
697
|
+
if (ms <= 0)
|
|
698
|
+
return null;
|
|
699
|
+
return Math.min(ms, MAX_RETRY_DELAY_MS);
|
|
700
|
+
}
|
|
701
|
+
function normalizeRetryAfterSeconds(value) {
|
|
702
|
+
if (!Number.isFinite(value))
|
|
703
|
+
return null;
|
|
704
|
+
const ms = Math.floor(value * 1000);
|
|
705
|
+
if (ms <= 0)
|
|
706
|
+
return null;
|
|
679
707
|
return Math.min(ms, MAX_RETRY_DELAY_MS);
|
|
680
708
|
}
|
|
681
709
|
function toNumber(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-helpers.js","sourceRoot":"","sources":["../../../lib/request/fetch-helpers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"fetch-helpers.js","sourceRoot":"","sources":["../../../lib/request/fetch-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE5E,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EACC,cAAc,EACd,WAAW,EACX,cAAc,EACd,oBAAoB,EACpB,SAAS,EACT,cAAc,EACd,UAAU,GACjB,MAAM,iBAAiB,CAAC;AA2BzB,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;AACtD,MAAM,sBAAsB,GAAG,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;IAC1E,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAC;AAElC,MAAM,oCAAoC,GAAG,0CAA0C,CAAC;AACxF,MAAM,uCAAuC,GAC5C,iEAAiE,CAAC;AACnE,MAAM,oCAAoC,GACzC,iFAAiF,CAAC;AACnF,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AACzC,MAAM,+BAA+B,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,wCAAwC,GAA6B;IACjF,qBAAqB,EAAE,CAAC,aAAa,EAAE,eAAe,EAAE,eAAe,CAAC;IACxE,eAAe,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;IACjD,eAAe,EAAE,CAAC,aAAa,CAAC;IAChC,eAAe,EAAE,CAAC,aAAa,CAAC;CAChC,CAAC;AAkBF,SAAS,qBAAqB,CAAC,KAAyB;IACvD,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC3C,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QACrC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,OAAO,CAAC;QACvC,CAAC,CAAC,OAAO,CAAC;IACX,OAAO,QAAQ,CAAC,OAAO,CAAC,yCAAyC,EAAE,EAAE,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,sBAAsB,CAC9B,WAAiD;IAEjD,MAAM,UAAU,GAA6B,EAAE,CAAC;IAChD,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,wCAAwC,CAAC,EAAE,CAAC;QACtF,MAAM,aAAa,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,CAAC,aAAa;YAAE,SAAS;QAC7B,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM;aAChC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;aAC5C,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,WAAW,EAAE,CAAC;QAClB,OAAO,UAAU,CAAC;IACnB,CAAC;IAED,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACzD,MAAM,aAAa,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,CAAC,aAAa,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,SAAS;QACvD,MAAM,gBAAgB,GAAG,MAAM;aAC7B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;aAC5C,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,UAAU,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAAC;QAC9C,CAAC;IACF,CAAC;IAED,OAAO,UAAU,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,oCAAoC,CAAC,QAAgB;IACpE,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CACjC,oFAAoF,CACpF,CAAC;IACF,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtB,OAAO,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAC7E,IAAI,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1B,OAAO,qBAAqB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,SAAS,iCAAiC,CAAC,MAAc,EAAE,QAAgB;IAC1E,IAAI,MAAM,KAAK,WAAW,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IACrD,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5B,OAAO,uCAAuC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC3C,SAAkB;IAElB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC;IACnC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,MAAM,OAAO,GACZ,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACzE,MAAM,2BAA2B,GAChC,OAAO,UAAU,CAAC,iBAAiB,KAAK,QAAQ;QAC/C,CAAC,CAAC,UAAU,CAAC,iBAAiB;QAC9B,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,gBAAgB,GAAG,2BAA2B;QACnD,CAAC,CAAC,qBAAqB,CAAC,2BAA2B,CAAC;QACpD,CAAC,CAAC,oCAAoC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACvD,MAAM,aAAa,GAClB,IAAI,KAAK,oCAAoC;QAC7C,CAAC,OAAO,CAAC,CAAC,CAAC,uCAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAE3E,OAAO;QACN,aAAa;QACb,IAAI;QACJ,OAAO;QACP,gBAAgB,EAAE,gBAAgB,IAAI,SAAS;KAC/C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oCAAoC,CACnD,OAA+C;IAE/C,IAAI,CAAC,OAAO,CAAC,+BAA+B;QAAE,OAAO,SAAS,CAAC;IAE/D,MAAM,WAAW,GAAG,4BAA4B,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpE,IAAI,CAAC,WAAW,CAAC,aAAa;QAAE,OAAO,SAAS,CAAC;IAEjD,MAAM,cAAc,GAAG,qBAAqB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACrE,MAAM,YAAY,GAAG,cAAc,IAAI,WAAW,CAAC,gBAAgB,CAAC;IACpE,IAAI,CAAC,YAAY;QAAE,OAAO,SAAS,CAAC;IAEpC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,eAAe,IAAI,EAAE,EAAE,CAAC;QACnD,MAAM,UAAU,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,UAAU;YAAE,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,KAAK,GAAG,sBAAsB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAC1C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAE3C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,OAAO,CAAC,iCAAiC;YAC7C,YAAY,KAAK,eAAe;YAChC,MAAM,KAAK,eAAe,EAAE,CAAC;YAC7B,SAAS;QACV,CAAC;QACD,IAAI,MAAM,KAAK,YAAY;YAAE,SAAS;QACtC,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,SAAS;QACpC,OAAO,MAAM,CAAC;IACf,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,uCAAuC,CACtD,cAAkC,EAClC,SAAkB;IAElB,IAAI,qBAAqB,CAAC,cAAc,CAAC,KAAK,eAAe,EAAE,CAAC;QAC/D,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO,CACN,oCAAoC,CAAC;QACpC,cAAc;QACd,SAAS;QACT,qEAAqE;QACrE,6DAA6D;QAC7D,eAAe,EAAE,CAAC,aAAa,CAAC;QAChC,+BAA+B,EAAE,IAAI;QACrC,iCAAiC,EAAE,IAAI;KACvC,CAAC,KAAK,eAAe,CACtB,CAAC;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,QAAgB;IACzD,MAAM,QAAQ,GAAG,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC;IACrD,2EAA2E;IAC3E,gFAAgF;IAChF,OAAO,6EAA6E,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC5G,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,8BAA8B,CAAC,SAAiB;IACxD,MAAM,OAAO,GACL,2DAA2D;QAC3D,yGAAyG;QACzG,oGAAoG,CAAC;IAE7G,MAAM,OAAO,GAAG;QACR,KAAK,EAAE;YACC,OAAO;YACP,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,oBAAoB;SACjC;KACR,CAAC;IAEF,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QACrC,MAAM,EAAE,GAAG,EAAE,+BAA+B;QAC5C,UAAU,EAAE,WAAW;QACvB,OAAO,EAAE,EAAE,cAAc,EAAE,iCAAiC,EAAE;KACrE,CAAC,CAAC;AACX,CAAC;AAiCD,SAAS,+BAA+B,CAAC,KAAc;IACtD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACnC,IAAI,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC/F,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,+BAA+B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AACpF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAU,EAAE,MAAM,GAAG,CAAC;IACxD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAE9B,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC;AAChD,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAC1C,WAAiB,EACjB,MAAmB;IAEnB,MAAM,UAAU,GAAI,MAAmC,CAAC,IAAI,CAAC;IAC7D,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,CAAC,GAAG,KAAK,UAAU,EAAE,CAAC;QACzD,MAAM,IAAI,cAAc,CAAC,cAAc,CAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7E,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,CAAC;IAExD,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACrC,MAAM,IAAI,cAAc,CAAC,cAAc,CAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,UAAU,CAAC,GAAG,CAAC;QACpB,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;QACtB,IAAI,EAAE;YACL,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,aAAa,CAAC,MAAM;YAC5B,OAAO,EAAE,aAAa,CAAC,OAAO;YAC9B,OAAO,EAAE,aAAa,CAAC,OAAO;YAC9B,YAAY,EAAE,IAAI;SAClB;KACD,CAAC,CAAC;IAEH,mDAAmD;IACnD,IAAI,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAClC,WAAW,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;QAC1C,WAAW,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC;QAC5C,WAAW,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC;IAC7C,CAAC;IAED,OAAO,WAAW,CAAC;AACpB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAA6B;IAC9D,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,KAAK,YAAY,GAAG;QAAE,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;IAClD,OAAO,KAAK,CAAC,GAAG,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC7C,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC;QACrE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,eAAe,CAAC;QAC5E,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC;IACtB,MAAM,cAAc,GACnB,aAAa,KAAK,sBAAsB;QACxC,aAAa,CAAC,UAAU,CAAC,GAAG,sBAAsB,GAAG,CAAC;QACrD,CAAC,CAAC,aAAa;QACf,CAAC,CAAC,GAAG,sBAAsB,GAAG,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,aAAa,EAAE,EAAE,CAAC;IAEtG,SAAS,CAAC,QAAQ,GAAG,qBAAqB,CAAC,QAAQ,CAAC;IACpD,SAAS,CAAC,QAAQ,GAAG,EAAE,CAAC;IACxB,SAAS,CAAC,QAAQ,GAAG,EAAE,CAAC;IACxB,SAAS,CAAC,IAAI,GAAG,qBAAqB,CAAC,IAAI,CAAC;IAC5C,SAAS,CAAC,QAAQ,GAAG,cAAc,CAAC;IAEpC,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;AAC7B,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC7C,IAA6B,EAC7B,GAAW,EACX,UAAsB,EACtB,SAAS,GAAG,IAAI,EAChB,UAAoC,EACpC,OAIC;IAED,MAAM,aAAa,GAClB,UAAU,KAAK,SAAS;QACxB,UAAU,KAAK,IAAI;QACnB,OAAO,UAAU,KAAK,QAAQ;QAC9B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACpC,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,aAAa;QAAE,OAAO,SAAS,CAAC;IAEpD,IAAI,CAAC;QACJ,kEAAkE;QAClE,IAAI,IAAiB,CAAC;QACtB,IAAI,aAAa,EAAE,CAAC;YACnB,IAAI,GAAG,UAAyB,CAAC;QAClC,CAAC;aAAM,CAAC;YACP,IAAI,OAAO,IAAI,EAAE,IAAI,KAAK,QAAQ;gBAAE,OAAO,SAAS,CAAC;YACrD,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAgB,CAAC;QAC7C,CAAC;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC;QAEjC,iEAAiE;QACjE,wDAAwD;QACxD,MAAM,eAAe,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;QAEpD,uBAAuB;QACvB,UAAU,CAAC,UAAU,CAAC,gBAAgB,EAAE;YACvC,GAAG;YACH,aAAa;YACb,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK;YACtB,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK;YACtB,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM;YAC/B,SAAS;YACT,IAAI,EAAE,IAA0C;SAChD,CAAC,CAAC;QAEH,oEAAoE;QACpE,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,eAAe,CAAC,CAAC;QAEtE,yBAAyB;QACzB,MAAM,eAAe,GAAG,MAAM,oBAAoB,CACjD,IAAI,EACJ,iBAAiB,EACjB,UAAU,EACV,SAAS,EACT,OAAO,EAAE,WAAW,IAAI,KAAK,EAC7B,OAAO,EAAE,mBAAmB,IAAI,QAAQ,EACxC,OAAO,EAAE,wBAAwB,IAAI,EAAE,CACvC,CAAC;QAEF,0BAA0B;QAC1B,UAAU,CAAC,UAAU,CAAC,eAAe,EAAE;YACtC,GAAG;YACH,aAAa;YACb,eAAe,EAAE,eAAe,CAAC,KAAK;YACtC,WAAW;YACX,QAAQ,EAAE,CAAC,CAAC,eAAe,CAAC,KAAK;YACjC,QAAQ,EAAE,CAAC,CAAC,eAAe,CAAC,KAAK;YACjC,WAAW,EAAE,eAAe,CAAC,KAAK,EAAE,MAAM;YAC1C,SAAS,EAAE,eAAe,CAAC,SAAoB;YAC/C,aAAa,EAAE,eAAe,CAAC,IAAI,EAAE,SAAS;YAC9C,OAAO,EAAE,eAAe,CAAC,OAAO;YAChC,IAAI,EAAE,eAAqD;SAC3D,CAAC,CAAC;QAEF,OAAO;YACN,IAAI,EAAE,eAAe;YACrB,WAAW,EAAE,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE;SACvE,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,QAAQ,CAAC,GAAG,cAAc,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,CAAC;QACrD,OAAO,SAAS,CAAC;IAClB,CAAC;AACF,CAAC;AAkBD,MAAM,UAAU,kBAAkB,CAC9B,YAAgE,EAChE,SAAkB,EAClB,WAAoB,EACpB,IAAgC;IAEnC,MAAM,cAAc,GACnB,OAAO,SAAS,KAAK,WAAW;QAChC,OAAO,WAAW,KAAK,WAAW;QAClC,+BAA+B,CAAC,YAAY,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,cAAc;QACjC,CAAC,CAAE,YAAyC;QAC5C,CAAC,CAAC,IAAI,CAAC;IACR,MAAM,YAAY,GAAG,cAAc;QAClC,CAAC,CAAC,WAAW,EAAE,IAAI;QACnB,CAAC,CAAE,YAAwC,CAAC;IAC7C,MAAM,iBAAiB,GAAG,cAAc,CAAC,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9E,MAAM,mBAAmB,GAAG,cAAc,CAAC,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC;IACpF,MAAM,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,IAAI,CAAC,iBAAiB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAChD,MAAM,IAAI,SAAS,CAAC,uDAAuD,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;IACzD,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,8BAA8B;IAC3D,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,mBAAmB,EAAE,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAC1D,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,oBAAoB,CAAC,cAAc,CAAC,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,EAAE,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;IAE3E,MAAM,QAAQ,GAAG,YAAY,EAAE,cAAc,CAAC;IAC9C,IAAI,QAAQ,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QACtD,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACrD,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QAC/C,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;IAC3C,OAAO,OAAO,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACjC,QAAkB,EAClB,OAA8B;IAE9B,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE5D,oEAAoE;IACpE,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC,SAAS,EAAE,CAAC;QAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;IAChF,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,IAAI,QAAQ,CAAC;IACzC,MAAM,SAAS,GAAG,4BAA4B,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAExE,IAAI,SAAkB,CAAC;IACvB,IAAI,CAAC;QACG,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChE,CAAC;IAAC,MAAM,CAAC;QACD,SAAS,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IAC1C,CAAC;IAED,MAAM,WAAW,GAAG,uBAAuB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,qBAAqB,CACrC,SAAS,EACT,QAAQ,EACR,aAAa,CAAC,UAAU,EACxB,aAAa,CAAC,MAAM,EACpB,WAAW,CAClB,CAAC;IACF,MAAM,aAAa,GAAG,uBAAuB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAE9E,IAAI,aAAa,CAAC,MAAM,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC;QAChD,OAAO,CAAC,0CAA0C,EAAE,WAAW,CAAC,CAAC;IACzE,CAAC;IAED,UAAU,CAAC,UAAU,CAAC,cAAc,EAAE;QAC9B,MAAM,EAAE,aAAa,CAAC,MAAM;QAC5B,UAAU,EAAE,aAAa,CAAC,UAAU;QACpC,WAAW;KAClB,CAAC,CAAC;IAEH,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;AAClF,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACvC,QAAkB,EAClB,WAAoB,EACpB,OAA2C;IAE3C,2CAA2C;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9C,IAAI,WAAW,IAAI,MAAM,EAAE,CAAC;QACxB,OAAO,CAAC,wBAAwB,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,eAAe,GAAG,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE/D,iEAAiE;IACjE,IAAI,CAAC,WAAW,EAAE,CAAC;QAClB,OAAO,MAAM,gBAAgB,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IAED,2DAA2D;IAC3D,OAAO,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClC,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,OAAO,EAAE,eAAe;KACxB,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,QAAkB;IACtC,IAAI,CAAC;QACG,OAAO,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;IAC7C,CAAC;IAAC,MAAM,CAAC;QACD,OAAO,EAAE,CAAC;IAClB,CAAC;AACT,CAAC;AAED,SAAS,wBAAwB,CAAC,QAAkB,EAAE,QAAgB;IAC9D,IAAI,QAAQ,CAAC,MAAM,KAAK,WAAW,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAC3D,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAElC,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAA0D,CAAC;QAC7F,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,IAAI,MAAM,EAAE,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtE,CAAC;IAAC,MAAM,CAAC;QACR,IAAI,GAAG,EAAE,CAAC;IACX,CAAC;IAED,kFAAkF;IAClF,IAAI,kBAAkB,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;QACxC,OAAO,8BAA8B,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC;IACrD,IAAI,CAAC,sDAAsD,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5E,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9C,OAAO,IAAI,QAAQ,CAAC,QAAQ,EAAE;QACtB,MAAM,EAAE,WAAW,CAAC,iBAAiB;QACrC,UAAU,EAAE,mBAAmB;QAC/B,OAAO;KACd,CAAC,CAAC;AACX,CAAC;AAED,SAAS,4BAA4B,CAC7B,QAAkB,EAClB,QAAgB;IAEhB,MAAM,iBAAiB,GACf,QAAQ,CAAC,MAAM,KAAK,WAAW,CAAC,iBAAiB,CAAC;IAC1D,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,GAAG,MAAM,EAAE,IAAI,IAAI,EAAE,IAAI,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC;IAEnE,0DAA0D;IAC1D,IAAI,kBAAkB,CAAC,MAAM,EAAE,IAAI,IAAI,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC/C,OAAO,SAAS,CAAC;IACzB,CAAC;IAED,MAAM,WAAW,GACT,iBAAiB;QACjB,iEAAiE,CAAC,IAAI,CAC9D,QAAQ,CACf,CAAC;IACV,IAAI,CAAC,WAAW;QAAE,OAAO,SAAS,CAAC;IAEnC,MAAM,YAAY,GACV,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,KAAK,CAAC;IAErD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AACpD,CAAC;AAaD,SAAS,kBAAkB,CAC1B,IAAY;IAOZ,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAuB,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzD,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7D,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACpD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACtD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,SAAS,CAAC;IAClB,CAAC;AACF,CAAC;AAYD;;;;;;;;;;;;;;;GAeG;AACH,SAAS,qBAAqB,CACtB,SAAkB,EAClB,QAAgB,EAChB,UAAkB,EAClB,MAAc,EACd,WAA8B;IAE9B,IAAI,iCAAiC,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;QAClD,MAAM,gBAAgB,GACnC,oCAAoC,CAAC,QAAQ,CAAC,IAAI,iBAAiB,CAAC;QACnE,MAAM,OAAO,GAAiB;YAC5B,KAAK,EAAE;gBACL,OAAO,EACL,cAAc,gBAAgB,gFAAgF;oBAC9G,6EAA6E;oBAC7E,0HAA0H;oBAC1H,wFAAwF;oBACxF,uFAAuF;gBACzF,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,oCAAoC;gBAC1C,iBAAiB,EAAE,gBAAgB;aACpC;SACF,CAAC;QACU,IAAI,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjD,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;QAChD,CAAC;QACD,OAAO,OAAO,CAAC;IACvB,CAAC;IAED,IAAI,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAClB,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC;QACnC,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC7D,MAAM,OAAO,GAAiB;gBACtB,KAAK,EAAE;oBACC,OAAO,EAAE,UAAU,CAAC,OAAO;iBAClC;aACR,CAAC;YACF,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAClC,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;YAC7C,CAAC;YACD,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACzE,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;YAC7C,CAAC;YACD,IAAI,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjD,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;YAChD,CAAC;YACD,IAAI,MAAM,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC;gBAClC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,yCAAyC,CAAC;YAClG,CAAC;YACD,OAAO,OAAO,CAAC;QACvB,CAAC;QAED,IAAI,OAAO,SAAS,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACpC,MAAM,OAAO,GAAiB,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YACxE,IAAI,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjD,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;YAChD,CAAC;YACD,IAAI,MAAM,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC;gBAClC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,yCAAyC,CAAC;YAClG,CAAC;YACD,OAAO,OAAO,CAAC;QACvB,CAAC;IACT,CAAC;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,OAAO,EAAE,CAAC;QACN,MAAM,OAAO,GAAiB,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC;QAC9D,IAAI,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjD,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;QAChD,CAAC;QACD,IAAI,MAAM,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC;YAClC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,yCAAyC,CAAC;QAClG,CAAC;QACD,OAAO,OAAO,CAAC;IACvB,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACT,MAAM,OAAO,GAAiB,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC;QACjE,IAAI,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjD,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;QAChD,CAAC;QACD,IAAI,MAAM,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC;YAClC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,yCAAyC,CAAC;QAClG,CAAC;QACD,OAAO,OAAO,CAAC;IACvB,CAAC;IAED,MAAM,OAAO,GAAiB,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,CAAC;IACvE,IAAI,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjD,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;IAChD,CAAC;IACD,IAAI,MAAM,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC;QAClC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,yCAAyC,CAAC;IAClG,CAAC;IACD,OAAO,OAAO,CAAC;AACvB,CAAC;AAED,SAAS,uBAAuB,CAAC,QAAkB,EAAE,OAAqB;IAClE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,iCAAiC,CAAC,CAAC;IAC/D,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QACrC,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,OAAO;KACrB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACzB,QAAkB,EAClB,UAAqF;IAErF,IAAI,UAAU,EAAE,YAAY,KAAK,SAAS,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,qBAAqB,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAClE,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO,UAAU,CAAC;IAC5C,CAAC;IAED,IAAI,UAAU,EAAE,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACjD,MAAM,UAAU,GAAG,0BAA0B,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;QAC5E,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO,UAAU,CAAC;IAC5C,CAAC;IAEM,MAAM,kBAAkB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAClE,IAAI,kBAAkB,EAAE,CAAC;QACjB,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,OAAO,MAAM,CAAC;QACtB,CAAC;IACT,CAAC;IAED,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC7D,IAAI,gBAAgB,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,OAAO,MAAM,GAAG,IAAI,CAAC;QAC7B,CAAC;IACT,CAAC;IAED,MAAM,cAAc,GAAG;QACf,0BAA0B;QAC1B,4BAA4B;QAC5B,mBAAmB;KAC1B,CAAC;IACF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,SAAS,GACP,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;YACzD,MAAM,KAAK,GAAG,SAAS,GAAG,GAAG,CAAC;YAC9B,IAAI,KAAK,GAAG,CAAC;gBAAE,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnD,CAAC;IACT,CAAC;IAED,IAAI,UAAU,EAAE,QAAQ,EAAE,CAAC;QACnB,MAAM,SAAS,GACP,UAAU,CAAC,QAAQ,GAAG,cAAc;YAC5B,CAAC,CAAC,UAAU,CAAC,QAAQ,GAAG,IAAI;YAC5B,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC;QACtC,MAAM,KAAK,GAAG,SAAS,GAAG,GAAG,CAAC;QAC9B,IAAI,KAAK,GAAG,CAAC;YAAE,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,IAAI,CAAC;AACpB,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAa;IAC3C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACzC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,EAAE,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACzB,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAa;IAChD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACzC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IACpC,IAAI,EAAE,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACzB,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IACxB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC5D,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5D,CAAC;AAED,SAAS,uBAAuB,CACxB,QAAkB,EAClB,OAA8B;IAE9B,MAAM,SAAS,GACP,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;QACpC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;QAClC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QACzC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;QAC3C,SAAS,CAAC;IAClB,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC;IAE1D,MAAM,WAAW,GAAqB;QAC9B,UAAU,EAAE,QAAQ,CAAC,MAAM;QAC3B,SAAS;QACT,KAAK;QACL,aAAa,EAAE,OAAO,EAAE,oBAAoB;QAC5C,QAAQ,EAAE,OAAO,EAAE,QAAQ;KAClC,CAAC;IAEF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACjD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;YAClC,OAAO,WAAW,CAAC,GAA6B,CAAC,CAAC;QAC1D,CAAC;IACT,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-utils.d.ts","sourceRoot":"","sources":["../../../../lib/request/helpers/tool-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tool-utils.d.ts","sourceRoot":"","sources":["../../../../lib/request/helpers/tool-utils.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,YAAY;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE;QACZ,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACvB,CAAC;CACF;AAED,MAAM,WAAW,IAAI;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;CACvB;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAiC9D"}
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
import { isRecord } from "../../utils.js";
|
|
2
|
+
function cloneRecord(value) {
|
|
3
|
+
return JSON.parse(JSON.stringify(value));
|
|
4
|
+
}
|
|
1
5
|
/**
|
|
2
6
|
* Cleans up tool definitions to ensure strict JSON Schema compliance.
|
|
3
7
|
*
|
|
@@ -15,15 +19,33 @@ export function cleanupToolDefinitions(tools) {
|
|
|
15
19
|
if (!Array.isArray(tools))
|
|
16
20
|
return tools;
|
|
17
21
|
return tools.map((tool) => {
|
|
18
|
-
if (tool
|
|
22
|
+
if (!isRecord(tool) || tool.type !== "function") {
|
|
23
|
+
return tool;
|
|
24
|
+
}
|
|
25
|
+
const functionDef = tool.function;
|
|
26
|
+
if (!isRecord(functionDef)) {
|
|
19
27
|
return tool;
|
|
20
28
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
29
|
+
const parameters = functionDef.parameters;
|
|
30
|
+
if (!isRecord(parameters)) {
|
|
31
|
+
return tool;
|
|
32
|
+
}
|
|
33
|
+
// Clone only the schema tree we mutate to avoid heavy deep cloning of entire tools.
|
|
34
|
+
let cleanedParameters;
|
|
35
|
+
try {
|
|
36
|
+
cleanedParameters = cloneRecord(parameters);
|
|
37
|
+
}
|
|
38
|
+
catch {
|
|
39
|
+
return tool;
|
|
25
40
|
}
|
|
26
|
-
|
|
41
|
+
cleanupSchema(cleanedParameters);
|
|
42
|
+
return {
|
|
43
|
+
...tool,
|
|
44
|
+
function: {
|
|
45
|
+
...functionDef,
|
|
46
|
+
parameters: cleanedParameters,
|
|
47
|
+
},
|
|
48
|
+
};
|
|
27
49
|
});
|
|
28
50
|
}
|
|
29
51
|
/**
|
|
@@ -32,6 +54,14 @@ export function cleanupToolDefinitions(tools) {
|
|
|
32
54
|
function cleanupSchema(schema) {
|
|
33
55
|
if (!schema || typeof schema !== "object")
|
|
34
56
|
return;
|
|
57
|
+
if (schema.properties && typeof schema.properties === "object") {
|
|
58
|
+
const properties = schema.properties;
|
|
59
|
+
for (const key of Object.keys(properties)) {
|
|
60
|
+
if (properties[key] === undefined) {
|
|
61
|
+
delete properties[key];
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
35
65
|
// 1. Flatten Unions (anyOf -> enum)
|
|
36
66
|
if (Array.isArray(schema.anyOf)) {
|
|
37
67
|
const anyOf = schema.anyOf;
|