codex-multi-auth 0.1.8 → 0.1.9
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 +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +36 -63
- package/dist/index.js.map +1 -1
- package/dist/lib/accounts.d.ts.map +1 -1
- package/dist/lib/accounts.js +29 -10
- package/dist/lib/accounts.js.map +1 -1
- package/dist/lib/codex-manager.d.ts.map +1 -1
- package/dist/lib/codex-manager.js +238 -209
- package/dist/lib/codex-manager.js.map +1 -1
- package/dist/lib/entitlement-cache.d.ts +8 -5
- package/dist/lib/entitlement-cache.d.ts.map +1 -1
- package/dist/lib/entitlement-cache.js +24 -9
- package/dist/lib/entitlement-cache.js.map +1 -1
- package/dist/lib/oc-chatgpt-import-adapter.d.ts.map +1 -1
- package/dist/lib/oc-chatgpt-import-adapter.js +49 -33
- package/dist/lib/oc-chatgpt-import-adapter.js.map +1 -1
- package/dist/lib/storage.d.ts +25 -13
- package/dist/lib/storage.d.ts.map +1 -1
- package/dist/lib/storage.js +303 -143
- package/dist/lib/storage.js.map +1 -1
- package/package.json +132 -132
|
@@ -10,20 +10,23 @@ export interface EntitlementCacheSnapshot {
|
|
|
10
10
|
export interface EntitlementAccountRef {
|
|
11
11
|
accountId?: string;
|
|
12
12
|
email?: string;
|
|
13
|
+
refreshToken?: string;
|
|
13
14
|
index?: number;
|
|
14
15
|
}
|
|
15
16
|
/**
|
|
16
17
|
* Derives a stable cache key for an entitlement account reference.
|
|
17
18
|
*
|
|
18
|
-
* Produces one of
|
|
19
|
-
* - `
|
|
20
|
-
* - `email:<lowercased trimmed email>` when `email` is present
|
|
19
|
+
* Produces one of five deterministic keys:
|
|
20
|
+
* - `account:<trimmed accountId>::email:<lowercased trimmed email>` when both are present,
|
|
21
|
+
* - `email:<lowercased trimmed email>` when only `email` is present,
|
|
22
|
+
* - `account:<trimmed accountId>::idx:<non-negative integer>` when `accountId` is present without email,
|
|
23
|
+
* - `account:<trimmed accountId>` when only `accountId` is present and no index is available,
|
|
21
24
|
* - `idx:<non-negative integer>` otherwise (index defaults to 0).
|
|
22
25
|
*
|
|
23
|
-
* This function is pure and concurrency-safe; it performs no I/O and is not affected by Windows filesystem semantics. It
|
|
26
|
+
* This function is pure and concurrency-safe; it performs no I/O and is not affected by Windows filesystem semantics. It never serializes refresh tokens or other secrets into the returned key.
|
|
24
27
|
*
|
|
25
28
|
* @param ref - Reference identifying an account (may include `accountId`, `email`, or `index`)
|
|
26
|
-
* @returns A deterministic string key prefixed with `
|
|
29
|
+
* @returns A deterministic string key prefixed with `account:`, `email:`, or `idx:` as described above
|
|
27
30
|
*/
|
|
28
31
|
export declare function resolveEntitlementAccountKey(ref: EntitlementAccountRef): string;
|
|
29
32
|
export declare class EntitlementCache {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entitlement-cache.d.ts","sourceRoot":"","sources":["../../lib/entitlement-cache.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,gBAAgB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,mBAAmB,GAAG,kBAAkB,CAAC;IACjD,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,wBAAwB;IACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;CAC7C;AAKD,MAAM,WAAW,qBAAqB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;
|
|
1
|
+
{"version":3,"file":"entitlement-cache.d.ts","sourceRoot":"","sources":["../../lib/entitlement-cache.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,gBAAgB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,mBAAmB,GAAG,kBAAkB,CAAC;IACjD,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,wBAAwB;IACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;CAC7C;AAKD,MAAM,WAAW,qBAAqB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AA0BD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,qBAAqB,GAAG,MAAM,CAU/E;AAED,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoD;IAEpF,WAAW,CACV,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAClC,KAAK,SAAuB,EAC5B,GAAG,SAAa,GACd,IAAI;IAqBP,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAc/C,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;KAAE;IAmBzI,KAAK,CAAC,GAAG,SAAa,GAAG,MAAM;IAmB/B,QAAQ,CAAC,GAAG,SAAa,GAAG,wBAAwB;CAUpD"}
|
|
@@ -20,27 +20,42 @@ function normalizeModel(model) {
|
|
|
20
20
|
const stripped = trimmed.includes("/") ? (trimmed.split("/").pop() ?? trimmed) : trimmed;
|
|
21
21
|
return stripped.replace(/-(none|minimal|low|medium|high|xhigh)$/i, "");
|
|
22
22
|
}
|
|
23
|
+
function normalizeEntitlementEmail(email) {
|
|
24
|
+
if (!email)
|
|
25
|
+
return undefined;
|
|
26
|
+
const trimmed = email.trim();
|
|
27
|
+
if (!trimmed)
|
|
28
|
+
return undefined;
|
|
29
|
+
return trimmed.toLowerCase();
|
|
30
|
+
}
|
|
23
31
|
/**
|
|
24
32
|
* Derives a stable cache key for an entitlement account reference.
|
|
25
33
|
*
|
|
26
|
-
* Produces one of
|
|
27
|
-
* - `
|
|
28
|
-
* - `email:<lowercased trimmed email>` when `email` is present
|
|
34
|
+
* Produces one of five deterministic keys:
|
|
35
|
+
* - `account:<trimmed accountId>::email:<lowercased trimmed email>` when both are present,
|
|
36
|
+
* - `email:<lowercased trimmed email>` when only `email` is present,
|
|
37
|
+
* - `account:<trimmed accountId>::idx:<non-negative integer>` when `accountId` is present without email,
|
|
38
|
+
* - `account:<trimmed accountId>` when only `accountId` is present and no index is available,
|
|
29
39
|
* - `idx:<non-negative integer>` otherwise (index defaults to 0).
|
|
30
40
|
*
|
|
31
|
-
* This function is pure and concurrency-safe; it performs no I/O and is not affected by Windows filesystem semantics. It
|
|
41
|
+
* This function is pure and concurrency-safe; it performs no I/O and is not affected by Windows filesystem semantics. It never serializes refresh tokens or other secrets into the returned key.
|
|
32
42
|
*
|
|
33
43
|
* @param ref - Reference identifying an account (may include `accountId`, `email`, or `index`)
|
|
34
|
-
* @returns A deterministic string key prefixed with `
|
|
44
|
+
* @returns A deterministic string key prefixed with `account:`, `email:`, or `idx:` as described above
|
|
35
45
|
*/
|
|
36
46
|
export function resolveEntitlementAccountKey(ref) {
|
|
37
47
|
const accountId = typeof ref.accountId === "string" ? ref.accountId.trim() : "";
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
const email =
|
|
48
|
+
const hasIndex = Number.isFinite(ref.index);
|
|
49
|
+
const index = hasIndex ? Math.max(0, Math.floor(ref.index ?? 0)) : 0;
|
|
50
|
+
const email = normalizeEntitlementEmail(ref.email);
|
|
51
|
+
if (accountId && email)
|
|
52
|
+
return `account:${accountId}::email:${email}`;
|
|
41
53
|
if (email)
|
|
42
54
|
return `email:${email}`;
|
|
43
|
-
|
|
55
|
+
if (accountId && hasIndex)
|
|
56
|
+
return `account:${accountId}::idx:${index}`;
|
|
57
|
+
if (accountId)
|
|
58
|
+
return `account:${accountId}`;
|
|
44
59
|
return `idx:${index}`;
|
|
45
60
|
}
|
|
46
61
|
export class EntitlementCache {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entitlement-cache.js","sourceRoot":"","sources":["../../lib/entitlement-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,GAAG,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAC;AAa9C,MAAM,oBAAoB,GAAG,EAAE,GAAG,MAAM,CAAC;AACzC,MAAM,mBAAmB,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"entitlement-cache.js","sourceRoot":"","sources":["../../lib/entitlement-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oc-chatgpt-import-adapter.d.ts","sourceRoot":"","sources":["../../lib/oc-chatgpt-import-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAEN,KAAK,gBAAgB,
|
|
1
|
+
{"version":3,"file":"oc-chatgpt-import-adapter.d.ts","sourceRoot":"","sources":["../../lib/oc-chatgpt-import-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAEN,KAAK,gBAAgB,EAIrB,MAAM,cAAc,CAAC;AAEtB,KAAK,aAAa,GAAG,WAAW,GAAG,OAAO,GAAG,cAAc,CAAC;AAE5D,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,CAAC;AAEtD,MAAM,MAAM,uBAAuB,GAAG;IACrC,OAAO,EAAE,CAAC,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;IAC9D,QAAQ,EAAE,mBAAmB,EAAE,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IACnC,OAAO,EAAE,uBAAuB,CAAC;IACjC,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,EAAE,mBAAmB,EAAE,CAAC;IAC7B,QAAQ,EAAE,KAAK,CAAC;QACf,QAAQ,EAAE,mBAAmB,CAAC;QAC9B,IAAI,EAAE,mBAAmB,CAAC;QAC1B,SAAS,EAAE,aAAa,CAAC;KACzB,CAAC,CAAC;IACH,MAAM,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,mBAAmB,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/D,wBAAwB,EAAE,mBAAmB,EAAE,CAAC;IAChD,uBAAuB,EAAE,sBAAsB,CAAC;CAChD,CAAC;AAseF;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAC1C,MAAM,EAAE,gBAAgB,GAAG,IAAI,GAC7B,sBAAsB,CAGxB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE;IACpD,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAC;CACrC,GAAG,qBAAqB,CA2ExB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MODEL_FAMILIES } from "./prompts/codex.js";
|
|
2
|
-
import { normalizeEmailKey, } from "./storage.js";
|
|
2
|
+
import { findMatchingAccountIndex, getAccountIdentityKey, normalizeEmailKey, } from "./storage.js";
|
|
3
3
|
/**
|
|
4
4
|
* Clamp a numeric index to the valid range for an array of the given length.
|
|
5
5
|
*
|
|
@@ -125,9 +125,9 @@ function buildPreviewPayload(storage) {
|
|
|
125
125
|
* Finds the index of an account in `accounts` that corresponds to `target` using normalized matching rules.
|
|
126
126
|
*
|
|
127
127
|
* Matching precedence:
|
|
128
|
-
* 1.
|
|
129
|
-
* 2.
|
|
130
|
-
* 3.
|
|
128
|
+
* 1. Exact `accountId + email` match when both are present.
|
|
129
|
+
* 2. Safe shared matcher fallback, which only uses bare `accountId` when it is unique.
|
|
130
|
+
* 3. Caller fallback to the original position when no safe match exists.
|
|
131
131
|
*
|
|
132
132
|
* @param accounts - The list of normalized destination accounts to search.
|
|
133
133
|
* @param target - The account to match against `accounts`.
|
|
@@ -136,22 +136,7 @@ function buildPreviewPayload(storage) {
|
|
|
136
136
|
function findNormalizedAccountIndex(accounts, target) {
|
|
137
137
|
if (!target)
|
|
138
138
|
return null;
|
|
139
|
-
|
|
140
|
-
if (targetAccountId) {
|
|
141
|
-
const idx = accounts.findIndex((account) => account.accountId?.trim() === targetAccountId);
|
|
142
|
-
if (idx >= 0)
|
|
143
|
-
return idx;
|
|
144
|
-
}
|
|
145
|
-
const targetEmail = normalizeEmailKey(target.email);
|
|
146
|
-
if (targetEmail) {
|
|
147
|
-
const idx = accounts.findIndex((account) => !account.accountId && normalizeEmailKey(account.email) === targetEmail);
|
|
148
|
-
if (idx >= 0)
|
|
149
|
-
return idx;
|
|
150
|
-
}
|
|
151
|
-
const idx = accounts.findIndex((account) => !account.accountId &&
|
|
152
|
-
!normalizeEmailKey(account.email) &&
|
|
153
|
-
account.refreshToken === target.refreshToken);
|
|
154
|
-
return idx >= 0 ? idx : null;
|
|
139
|
+
return findMatchingAccountIndex(accounts, target) ?? null;
|
|
155
140
|
}
|
|
156
141
|
/**
|
|
157
142
|
* Map an active account index from an original accounts list to the corresponding index in a normalized accounts list.
|
|
@@ -197,7 +182,9 @@ function normalizeActiveIndexByFamily(activeIndexByFamily, originalAccounts, nor
|
|
|
197
182
|
* Normalize and de-duplicate a list of account metadata for import into a target store.
|
|
198
183
|
*
|
|
199
184
|
* Processes input accounts by sanitizing entries, removing invalid refresh tokens, and
|
|
200
|
-
* de-duplicating with the following precedence: accountId
|
|
185
|
+
* de-duplicating with the following precedence: `accountId + email`, normalized email,
|
|
186
|
+
* then refreshToken. Bare `accountId` rows without an email stay on the refresh-token
|
|
187
|
+
* path so distinct business accounts are not collapsed by a shared workspace id.
|
|
201
188
|
* When duplicates are found the most recently used/added account is kept and the other is recorded
|
|
202
189
|
* in `skipped` with a reason code.
|
|
203
190
|
*
|
|
@@ -208,7 +195,8 @@ function normalizeActiveIndexByFamily(activeIndexByFamily, originalAccounts, nor
|
|
|
208
195
|
*
|
|
209
196
|
* @param accounts - Array of AccountMetadataV3 to normalize (may contain untrimmed or invalid fields)
|
|
210
197
|
* @returns An object with:
|
|
211
|
-
* - `accounts`: sanitized, de-duplicated AccountMetadataV3 in order of precedence
|
|
198
|
+
* - `accounts`: sanitized, de-duplicated AccountMetadataV3 in order of precedence
|
|
199
|
+
* (by `accountId + email`, unique bare `accountId`, by email, by refreshToken)
|
|
212
200
|
* - `skipped`: array of sources summarized as OcChatgptAccountRef with a `reason` string; possible reasons include
|
|
213
201
|
* "invalid-refresh-token", "duplicate-account-id", "duplicate-email", and "duplicate-refresh-token"
|
|
214
202
|
*/
|
|
@@ -229,18 +217,23 @@ function normalizeAccountsForTarget(accounts) {
|
|
|
229
217
|
}
|
|
230
218
|
valid.push(sanitized);
|
|
231
219
|
}
|
|
232
|
-
const
|
|
220
|
+
const byAccountIdentity = new Map();
|
|
233
221
|
const withoutAccountId = [];
|
|
234
222
|
for (const account of valid) {
|
|
235
|
-
if (account.accountId) {
|
|
236
|
-
const
|
|
223
|
+
if (account.accountId && normalizeEmailKey(account.email)) {
|
|
224
|
+
const identityKey = getAccountIdentityKey(account);
|
|
225
|
+
if (!identityKey) {
|
|
226
|
+
withoutAccountId.push(account);
|
|
227
|
+
continue;
|
|
228
|
+
}
|
|
229
|
+
const existing = byAccountIdentity.get(identityKey);
|
|
237
230
|
if (!existing) {
|
|
238
|
-
|
|
231
|
+
byAccountIdentity.set(identityKey, account);
|
|
239
232
|
continue;
|
|
240
233
|
}
|
|
241
234
|
const newest = pickNewest(existing, account);
|
|
242
235
|
if (newest === account) {
|
|
243
|
-
|
|
236
|
+
byAccountIdentity.set(identityKey, account);
|
|
244
237
|
skipped.push({
|
|
245
238
|
source: summarizeAccount(existing),
|
|
246
239
|
reason: "duplicate-account-id",
|
|
@@ -309,7 +302,7 @@ function normalizeAccountsForTarget(accounts) {
|
|
|
309
302
|
}
|
|
310
303
|
return {
|
|
311
304
|
accounts: [
|
|
312
|
-
...
|
|
305
|
+
...byAccountIdentity.values(),
|
|
313
306
|
...byEmail.values(),
|
|
314
307
|
...byRefreshToken.values(),
|
|
315
308
|
],
|
|
@@ -361,7 +354,7 @@ function cloneStorage(storage) {
|
|
|
361
354
|
}
|
|
362
355
|
/**
|
|
363
356
|
* Finds a destination account that corresponds to the given source account by matching
|
|
364
|
-
* in the order:
|
|
357
|
+
* in the order: exact `accountId + email`, unique bare `accountId`, normalized `email` (only against destination entries
|
|
365
358
|
* without an `accountId`), then exact `refreshToken` equality across any remaining destination entry.
|
|
366
359
|
*
|
|
367
360
|
* Concurrency: caller must manage concurrent access to the destination array and `usedIndexes`.
|
|
@@ -376,14 +369,37 @@ function cloneStorage(storage) {
|
|
|
376
369
|
*/
|
|
377
370
|
function matchDestination(source, destination, usedIndexes) {
|
|
378
371
|
const sourceAccountId = source.accountId?.trim();
|
|
379
|
-
|
|
372
|
+
const sourceEmail = normalizeEmailKey(source.email);
|
|
373
|
+
if (sourceAccountId && sourceEmail) {
|
|
374
|
+
const sourceIdentityKey = getAccountIdentityKey(source);
|
|
380
375
|
const idx = destination.findIndex((account, i) => !usedIndexes.has(i) &&
|
|
381
|
-
|
|
382
|
-
account.accountId.trim() === sourceAccountId);
|
|
376
|
+
getAccountIdentityKey(account) === sourceIdentityKey);
|
|
383
377
|
if (idx >= 0)
|
|
384
378
|
return { index: idx, matchedBy: "accountId" };
|
|
385
379
|
}
|
|
386
|
-
|
|
380
|
+
if (sourceAccountId) {
|
|
381
|
+
let idx = null;
|
|
382
|
+
let matchedEmail;
|
|
383
|
+
for (let i = 0; i < destination.length; i += 1) {
|
|
384
|
+
if (usedIndexes.has(i))
|
|
385
|
+
continue;
|
|
386
|
+
const account = destination[i];
|
|
387
|
+
if (!account)
|
|
388
|
+
continue;
|
|
389
|
+
if (account.accountId?.trim() !== sourceAccountId)
|
|
390
|
+
continue;
|
|
391
|
+
if (idx !== null) {
|
|
392
|
+
idx = null;
|
|
393
|
+
break;
|
|
394
|
+
}
|
|
395
|
+
idx = i;
|
|
396
|
+
matchedEmail = normalizeEmailKey(account.email);
|
|
397
|
+
}
|
|
398
|
+
if (idx !== null &&
|
|
399
|
+
(!sourceEmail || !matchedEmail || matchedEmail === sourceEmail)) {
|
|
400
|
+
return { index: idx, matchedBy: "accountId" };
|
|
401
|
+
}
|
|
402
|
+
}
|
|
387
403
|
if (sourceEmail) {
|
|
388
404
|
const idx = destination.findIndex((account, i) => {
|
|
389
405
|
if (usedIndexes.has(i))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oc-chatgpt-import-adapter.js","sourceRoot":"","sources":["../../lib/oc-chatgpt-import-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAoB,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAGN,iBAAiB,GACjB,MAAM,cAAc,CAAC;AAsCtB;;;;;;GAMG;AACH,SAAS,UAAU,CAAC,KAAa,EAAE,MAAc;IAChD,IAAI,MAAM,IAAI,CAAC;QAAE,OAAO,CAAC,CAAC;IAC1B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IACtC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,UAAU,CAClB,OAAU,EACV,SAAY;IAEZ,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC;QACxD,CAAC,CAAE,OAAO,CAAC,QAAmB;QAC9B,CAAC,CAAC,CAAC,CAAC;IACL,MAAM,iBAAiB,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC5D,CAAC,CAAE,SAAS,CAAC,QAAmB;QAChC,CAAC,CAAC,CAAC,CAAC;IACL,IAAI,iBAAiB,GAAG,eAAe;QAAE,OAAO,SAAS,CAAC;IAC1D,IAAI,iBAAiB,GAAG,eAAe;QAAE,OAAO,OAAO,CAAC;IAExD,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;QACpD,CAAC,CAAE,OAAO,CAAC,OAAkB;QAC7B,CAAC,CAAC,CAAC,CAAC;IACL,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC;QACxD,CAAC,CAAE,SAAS,CAAC,OAAkB;QAC/B,CAAC,CAAC,CAAC,CAAC;IACL,OAAO,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;AAC5D,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,eAAe,CAAC,OAA0B;IAClD,MAAM,YAAY,GACjB,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7E,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAC/B,MAAM,SAAS,GACd,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ;QACpC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE;QAC1B,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,KAAK,GACV,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACtE,MAAM,YAAY,GACjB,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ;QACvC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE;QAC7B,CAAC,CAAC,SAAS,CAAC;IACd,OAAO;QACN,GAAG,OAAO;QACV,SAAS,EAAE,SAAS,IAAI,SAAS;QACjC,KAAK,EAAE,KAAK,IAAI,SAAS;QACzB,YAAY,EAAE,YAAY,IAAI,SAAS;QACvC,YAAY;QACZ,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAE,OAAO,CAAC,OAAkB,CAAC,CAAC,CAAC,CAAC;QAC3E,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC;YAC1C,CAAC,CAAE,OAAO,CAAC,QAAmB;YAC9B,CAAC,CAAC,CAAC;KACJ,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,UAAU,CAAC,KAAa;IAChC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3D,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1B,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,gBAAgB,CAAC,OAA0B;IACnD,OAAO;QACN,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,iBAAiB,EAAE,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC;KACnD,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,mBAAmB,CAC3B,OAAyB;IAEzB,OAAO;QACN,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAC/C,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,mBAAmB,EAAE;YACpC,CAAC,CAAC,SAAS;QACZ,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC;KAChD,CAAC;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,0BAA0B,CAClC,QAA6B,EAC7B,MAA4C;IAE5C,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IACjD,IAAI,eAAe,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAC7B,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,eAAe,CAC1D,CAAC;QACF,IAAI,GAAG,IAAI,CAAC;YAAE,OAAO,GAAG,CAAC;IAC1B,CAAC;IACD,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpD,IAAI,WAAW,EAAE,CAAC;QACjB,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAC7B,CAAC,OAAO,EAAE,EAAE,CACX,CAAC,OAAO,CAAC,SAAS,IAAI,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,WAAW,CACvE,CAAC;QACF,IAAI,GAAG,IAAI,CAAC;YAAE,OAAO,GAAG,CAAC;IAC1B,CAAC;IACD,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAC7B,CAAC,OAAO,EAAE,EAAE,CACX,CAAC,OAAO,CAAC,SAAS;QAClB,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC;QACjC,OAAO,CAAC,YAAY,KAAK,MAAM,CAAC,YAAY,CAC7C,CAAC;IACF,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AAC9B,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,gBAAgB,CACxB,gBAAiD,EACjD,aAAiC,EACjC,kBAAuC;IAEvC,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC;QACrD,OAAO,UAAU,CAAC,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACjD,MAAM,iBAAiB,GAAG,UAAU,CACnC,aAAa,IAAI,CAAC,EAClB,gBAAgB,CAAC,MAAM,CACvB,CAAC;IACF,MAAM,cAAc,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,0BAA0B,CAC1C,kBAAkB,EAClB,cAAc,CACd,CAAC;IACF,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC;IACvC,OAAO,UAAU,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACjE,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,4BAA4B,CACpC,mBAA4D,EAC5D,gBAAiD,EACjD,kBAAuC;IAEvC,IAAI,CAAC,mBAAmB;QAAE,OAAO,SAAS,CAAC;IAC3C,MAAM,UAAU,GAAyC,EAAE,CAAC;IAC5D,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;QACrC,MAAM,GAAG,GAAI,mBAA6D,CACzE,MAAM,CACN,CAAC;QACF,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,SAAS;QAC/D,UAAU,CAAC,MAAM,CAAC,GAAG,gBAAgB,CACpC,gBAAgB,EAChB,GAAG,EACH,kBAAkB,CAClB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AACpE,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAS,0BAA0B,CAAC,QAA6B;IAIhE,MAAM,OAAO,GAA2D,EAAE,CAAC;IAC3E,MAAM,KAAK,GAAwB,EAAE,CAAC;IAEtC,KAAK,MAAM,SAAS,IAAI,QAAQ,EAAE,CAAC;QAClC,MAAM,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC;gBACZ,MAAM,EAAE,gBAAgB,CAAC;oBACxB,GAAG,SAAS;oBACZ,YAAY,EAAE,SAAS,CAAC,YAAY,IAAI,EAAE;iBACrB,CAAC;gBACvB,MAAM,EAAE,uBAAuB;aAC/B,CAAC,CAAC;YACH,SAAS;QACV,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAA6B,CAAC;IACzD,MAAM,gBAAgB,GAAwB,EAAE,CAAC;IAEjD,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE,CAAC;QAC7B,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAC5C,SAAS;YACV,CAAC;YACD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC7C,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBACxB,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAC5C,OAAO,CAAC,IAAI,CAAC;oBACZ,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC;oBAClC,MAAM,EAAE,sBAAsB;iBAC9B,CAAC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC;oBACZ,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC;oBACjC,MAAM,EAAE,sBAAsB;iBAC9B,CAAC,CAAC;YACJ,CAAC;YACD,SAAS;QACV,CAAC;QACD,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAA6B,CAAC;IACrD,MAAM,eAAe,GAAwB,EAAE,CAAC;IAEhD,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;QACxC,MAAM,eAAe,GAAG,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,eAAe,EAAE,CAAC;YACrB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAC9C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;gBACtC,SAAS;YACV,CAAC;YACD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC7C,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBACxB,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;gBACtC,OAAO,CAAC,IAAI,CAAC;oBACZ,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC;oBAClC,MAAM,EAAE,iBAAiB;iBACzB,CAAC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC;oBACZ,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC;oBACjC,MAAM,EAAE,iBAAiB;iBACzB,CAAC,CAAC;YACJ,CAAC;YACD,SAAS;QACV,CAAC;QACD,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,GAAG,EAA6B,CAAC;IAC5D,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC;QACjC,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YACjC,SAAS;QACV,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YACxB,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC;gBACZ,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC;gBAClC,MAAM,EAAE,yBAAyB;aACjC,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,IAAI,CAAC;gBACZ,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC;gBACjC,MAAM,EAAE,yBAAyB;aACjC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,OAAO;QACN,QAAQ,EAAE;YACT,GAAG,WAAW,CAAC,MAAM,EAAE;YACvB,GAAG,OAAO,CAAC,MAAM,EAAE;YACnB,GAAG,cAAc,CAAC,MAAM,EAAE;SAC1B;QACD,OAAO;KACP,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,yBAAyB,CACjC,OAA4C;IAE5C,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,0BAA0B,CACvD,OAAO,EAAE,QAAQ,IAAI,EAAE,CACvB,CAAC;IACF,MAAM,WAAW,GAAG,gBAAgB,CACnC,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,WAAW,EACpB,QAAQ,CACR,CAAC;IACF,MAAM,mBAAmB,GAAG,4BAA4B,CACvD,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,QAAQ,EACjB,QAAQ,CACR,CAAC;IACF,OAAO;QACN,OAAO,EAAE;YACR,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;YACrD,WAAW;YACX,mBAAmB;SACnB;QACD,OAAO;KACP,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAS,YAAY,CAAC,OAAyB;IAC9C,OAAO;QACN,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QAC7D,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAC/C,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,mBAAmB,EAAE;YACpC,CAAC,CAAC,SAAS;KACZ,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAS,gBAAgB,CACxB,MAAyB,EACzB,WAAgC,EAChC,WAAwB;IAExB,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IACjD,IAAI,eAAe,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,WAAW,CAAC,SAAS,CAChC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CACd,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;YACnB,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ;YACrC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,eAAe,CAC7C,CAAC;QACF,IAAI,GAAG,IAAI,CAAC;YAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;IAC7D,CAAC;IAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpD,IAAI,WAAW,EAAE,CAAC;QACjB,MAAM,GAAG,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;YAChD,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAC;YACrC,IAAI,OAAO,CAAC,SAAS;gBAAE,OAAO,KAAK,CAAC;YACpC,OAAO,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,WAAW,CAAC;QACzD,CAAC,CAAC,CAAC;QACH,IAAI,GAAG,IAAI,CAAC;YAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;IACzD,CAAC;IAED,MAAM,GAAG,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;QAChD,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QACrC,IAAI,OAAO,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QACpC,IAAI,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACnD,OAAO,OAAO,CAAC,YAAY,KAAK,MAAM,CAAC,YAAY,CAAC;IACrD,CAAC,CAAC,CAAC;IACH,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC;IAE/D,OAAO,IAAI,CAAC;AACb,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,2BAA2B,CAC1C,MAA+B;IAE/B,MAAM,EAAE,OAAO,EAAE,GAAG,yBAAyB,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC;IAC9D,OAAO,OAAO,CAAC;AAChB,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,2BAA2B,CAAC,OAG3C;IACA,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACnE,MAAM,qBAAqB,GAAG,yBAAyB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE7E,MAAM,MAAM,GAAG,YAAY,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC3D,MAAM,mBAAmB,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAChD,CAAC,EACD,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAC7C,CAAC;IACF,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAU,CAAC;IAEjD,MAAM,KAAK,GAA0B,EAAE,CAAC;IACxC,MAAM,QAAQ,GAAsC,EAAE,CAAC;IACvD,MAAM,MAAM,GAAoC;QAC/C,GAAG,gBAAgB,CAAC,OAAO;QAC3B,GAAG,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7D,MAAM;YACN,MAAM,EAAE,eAAe,MAAM,EAAE;SAC/B,CAAC,CAAC;KACH,CAAC;IAEF,KAAK,MAAM,OAAO,IAAI,gBAAgB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzD,MAAM,KAAK,GAAG,gBAAgB,CAC7B,OAAO,EACP,mBAAmB,EACnB,sBAAsB,CACtB,CAAC;QACF,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;YACrC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;YACtC,SAAS;QACV,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;YAC9C,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;YACtC,SAAS;QACV,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5C,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC;gBACX,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC;gBACjC,MAAM,EAAE,qCAAqC;aAC7C,CAAC,CAAC;YACH,SAAS;QACV,CAAC;QAED,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;QAC7C,QAAQ,CAAC,IAAI,CAAC;YACb,QAAQ,EAAE,gBAAgB,CAAC,OAAO,CAAC;YACnC,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC;YAC9B,SAAS,EAAE,KAAK,CAAC,SAAS;SAC1B,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IACxE,MAAM,wBAAwB,GAA0B,EAAE,CAAC;IAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/C,IAAI,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,SAAS;QAC5C,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO;YAAE,SAAS;QACvB,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO;QACN,OAAO,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,OAAO,CAAC;QACtD,MAAM;QACN,KAAK;QACL,QAAQ;QACR,MAAM;QACN,wBAAwB;QACxB,uBAAuB,EAAE,sBAAsB;KAC/C,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"oc-chatgpt-import-adapter.js","sourceRoot":"","sources":["../../lib/oc-chatgpt-import-adapter.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/storage.d.ts
CHANGED
|
@@ -55,6 +55,13 @@ export declare class StorageError extends Error {
|
|
|
55
55
|
* Generate platform-aware troubleshooting hint based on error code.
|
|
56
56
|
*/
|
|
57
57
|
export declare function formatStorageErrorHint(error: unknown, path: string): string;
|
|
58
|
+
type AccountLike = {
|
|
59
|
+
accountId?: string;
|
|
60
|
+
email?: string;
|
|
61
|
+
refreshToken?: string;
|
|
62
|
+
addedAt?: number;
|
|
63
|
+
lastUsed?: number;
|
|
64
|
+
};
|
|
58
65
|
export declare function setStorageBackupEnabled(enabled: boolean): void;
|
|
59
66
|
export declare function getLastAccountsSaveTimestamp(): number;
|
|
60
67
|
export declare function setStoragePath(projectPath: string | null): void;
|
|
@@ -70,26 +77,30 @@ export declare function exportNamedBackup(name: string, options?: {
|
|
|
70
77
|
}): Promise<string>;
|
|
71
78
|
export declare function getFlaggedAccountsPath(): string;
|
|
72
79
|
/**
|
|
73
|
-
*
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
80
|
+
* Normalize email keys for case-insensitive account identity matching.
|
|
81
|
+
*/
|
|
82
|
+
export declare function normalizeEmailKey(email: string | undefined): string | undefined;
|
|
83
|
+
type AccountMatchOptions = {
|
|
84
|
+
allowUniqueAccountIdFallbackWithoutEmail?: boolean;
|
|
85
|
+
};
|
|
86
|
+
export declare function getAccountIdentityKey(account: Pick<AccountLike, "accountId" | "email" | "refreshToken">): string | undefined;
|
|
87
|
+
export declare function findMatchingAccountIndex<T extends Pick<AccountLike, "accountId" | "email" | "refreshToken">>(accounts: readonly T[], candidate: Pick<AccountLike, "accountId" | "email" | "refreshToken">, options?: AccountMatchOptions): number | undefined;
|
|
88
|
+
export declare function resolveAccountSelectionIndex<T extends Pick<AccountLike, "accountId" | "email" | "refreshToken">>(accounts: readonly T[], candidate: Pick<AccountLike, "accountId" | "email" | "refreshToken">, fallbackIndex?: number): number;
|
|
89
|
+
/**
|
|
90
|
+
* Removes duplicate accounts, keeping the most recently used entry for each
|
|
91
|
+
* safely matched identity.
|
|
77
92
|
*/
|
|
78
93
|
export declare function deduplicateAccounts<T extends {
|
|
79
94
|
accountId?: string;
|
|
80
|
-
|
|
95
|
+
email?: string;
|
|
96
|
+
refreshToken?: string;
|
|
81
97
|
lastUsed?: number;
|
|
82
98
|
addedAt?: number;
|
|
83
99
|
}>(accounts: T[]): T[];
|
|
84
|
-
/**
|
|
85
|
-
* Removes duplicate accounts by email, keeping the most recently used entry.
|
|
86
|
-
* Accounts without email are always preserved.
|
|
87
|
-
* @param accounts - Array of accounts to deduplicate
|
|
88
|
-
* @returns New array with email duplicates removed
|
|
89
|
-
*/
|
|
90
|
-
export declare function normalizeEmailKey(email: string | undefined): string | undefined;
|
|
91
100
|
export declare function deduplicateAccountsByEmail<T extends {
|
|
101
|
+
accountId?: string;
|
|
92
102
|
email?: string;
|
|
103
|
+
refreshToken?: string;
|
|
93
104
|
lastUsed?: number;
|
|
94
105
|
addedAt?: number;
|
|
95
106
|
}>(accounts: T[]): T[];
|
|
@@ -109,6 +120,7 @@ export declare function loadAccounts(): Promise<AccountStorageV3 | null>;
|
|
|
109
120
|
export declare function getBackupMetadata(): Promise<BackupMetadata>;
|
|
110
121
|
export declare function getRestoreAssessment(): Promise<RestoreAssessment>;
|
|
111
122
|
export declare function withAccountStorageTransaction<T>(handler: (current: AccountStorageV3 | null, persist: (storage: AccountStorageV3) => Promise<void>) => Promise<T>): Promise<T>;
|
|
123
|
+
export declare function withAccountAndFlaggedStorageTransaction<T>(handler: (current: AccountStorageV3 | null, persist: (accountStorage: AccountStorageV3, flaggedStorage: FlaggedAccountStorageV1) => Promise<void>) => Promise<T>): Promise<T>;
|
|
112
124
|
/**
|
|
113
125
|
* Persists account storage to disk using atomic write (temp file + rename).
|
|
114
126
|
* Creates the Codex multi-auth storage directory if it doesn't exist.
|
|
@@ -134,7 +146,7 @@ export declare function clearFlaggedAccounts(): Promise<void>;
|
|
|
134
146
|
export declare function exportAccounts(filePath: string, force?: boolean, beforeCommit?: (resolvedPath: string) => Promise<void> | void): Promise<void>;
|
|
135
147
|
/**
|
|
136
148
|
* Imports accounts from a JSON file, merging with existing accounts.
|
|
137
|
-
* Deduplicates by
|
|
149
|
+
* Deduplicates by safe account identity, preserving most recently used entries.
|
|
138
150
|
* @param filePath - Source file path
|
|
139
151
|
* @throws Error if file is invalid or would exceed MAX_ACCOUNTS
|
|
140
152
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../lib/storage.ts"],"names":[],"mappings":"AAYA,OAAO,EACN,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EAEnB,KAAK,gBAAgB,EACrB,MAAM,yBAAyB,CAAC;AAUjC,YAAY,EACX,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,GAChB,CAAC;AAeF,MAAM,WAAW,wBAAyB,SAAQ,iBAAiB;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,uBAAuB;IACvC,OAAO,EAAE,CAAC,CAAC;IACX,QAAQ,EAAE,wBAAwB,EAAE,CAAC;CACrC;AAED,KAAK,aAAa,GAAG,eAAe,GAAG,mBAAmB,GAAG,iBAAiB,CAAC;AAO/E,KAAK,kBAAkB,GACpB,kBAAkB,GAClB,cAAc,GACd,iBAAiB,GACjB,yBAAyB,GACzB,4BAA4B,GAC5B,iBAAiB,GACjB,gBAAgB,GAChB,wBAAwB,GACxB,2BAA2B,CAAC;AAE/B,KAAK,sBAAsB,GAAG;IAC7B,IAAI,EAAE,kBAAkB,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,sBAAsB,EAAE,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC5B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,eAAe,EAAE,qBAAqB,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,cAAc,CAAC,EAAE,sBAAsB,CAAC;IACxC,cAAc,EAAE,cAAc,CAAC;CAC/B,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAa,SAAQ,KAAK;IACtC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAGrB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,KAAK;CAQd;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAsB3E;
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../lib/storage.ts"],"names":[],"mappings":"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"}
|