oc-codex-multi-auth 6.12.1 → 6.13.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 +6 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +15 -4
- package/dist/index.js.map +1 -1
- package/dist/lib/accounts/persistence.d.ts.map +1 -1
- package/dist/lib/accounts/persistence.js +1 -0
- package/dist/lib/accounts/persistence.js.map +1 -1
- package/dist/lib/accounts/pool-identity.d.ts +14 -0
- package/dist/lib/accounts/pool-identity.d.ts.map +1 -0
- package/dist/lib/accounts/pool-identity.js +45 -0
- package/dist/lib/accounts/pool-identity.js.map +1 -0
- package/dist/lib/accounts/recovery.d.ts.map +1 -1
- package/dist/lib/accounts/recovery.js +15 -1
- package/dist/lib/accounts/recovery.js.map +1 -1
- package/dist/lib/accounts/rotation.d.ts.map +1 -1
- package/dist/lib/accounts/rotation.js +2 -3
- package/dist/lib/accounts/rotation.js.map +1 -1
- package/dist/lib/accounts/stale-state.d.ts +14 -0
- package/dist/lib/accounts/stale-state.d.ts.map +1 -1
- package/dist/lib/accounts/stale-state.js +38 -0
- package/dist/lib/accounts/stale-state.js.map +1 -1
- package/dist/lib/accounts/state.d.ts +1 -0
- package/dist/lib/accounts/state.d.ts.map +1 -1
- package/dist/lib/accounts/state.js +112 -11
- package/dist/lib/accounts/state.js.map +1 -1
- package/dist/lib/auth/auth.d.ts.map +1 -1
- package/dist/lib/auth/auth.js +26 -3
- package/dist/lib/auth/auth.js.map +1 -1
- package/dist/lib/auth/login-runner.d.ts +1 -0
- package/dist/lib/auth/login-runner.d.ts.map +1 -1
- package/dist/lib/auth/login-runner.js +74 -8
- package/dist/lib/auth/login-runner.js.map +1 -1
- package/dist/lib/auth/token-utils.d.ts +8 -0
- package/dist/lib/auth/token-utils.d.ts.map +1 -1
- package/dist/lib/auth/token-utils.js +16 -0
- package/dist/lib/auth/token-utils.js.map +1 -1
- package/dist/lib/codex-usage.d.ts +9 -7
- package/dist/lib/codex-usage.d.ts.map +1 -1
- package/dist/lib/codex-usage.js +36 -12
- package/dist/lib/codex-usage.js.map +1 -1
- package/dist/lib/config.d.ts +6 -4
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +12 -4
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/logger.d.ts.map +1 -1
- package/dist/lib/logger.js +2 -0
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/schemas.d.ts +8 -1
- package/dist/lib/schemas.d.ts.map +1 -1
- package/dist/lib/schemas.js +4 -1
- package/dist/lib/schemas.js.map +1 -1
- package/dist/lib/storage/flagged.d.ts.map +1 -1
- package/dist/lib/storage/flagged.js +3 -0
- package/dist/lib/storage/flagged.js.map +1 -1
- package/dist/lib/storage/identity.d.ts +10 -7
- package/dist/lib/storage/identity.d.ts.map +1 -1
- package/dist/lib/storage/identity.js +82 -8
- package/dist/lib/storage/identity.js.map +1 -1
- package/dist/lib/storage/migrations.d.ts +4 -0
- package/dist/lib/storage/migrations.d.ts.map +1 -1
- package/dist/lib/storage/migrations.js +1 -0
- package/dist/lib/storage/migrations.js.map +1 -1
- package/dist/lib/storage/normalize.d.ts.map +1 -1
- package/dist/lib/storage/normalize.js +8 -1
- package/dist/lib/storage/normalize.js.map +1 -1
- package/dist/lib/tools/codex-diff.d.ts.map +1 -1
- package/dist/lib/tools/codex-diff.js +2 -0
- package/dist/lib/tools/codex-diff.js.map +1 -1
- package/dist/lib/tools/codex-doctor.d.ts.map +1 -1
- package/dist/lib/tools/codex-doctor.js +15 -1
- package/dist/lib/tools/codex-doctor.js.map +1 -1
- package/dist/lib/tools/codex-health.d.ts.map +1 -1
- package/dist/lib/tools/codex-health.js +7 -1
- package/dist/lib/tools/codex-health.js.map +1 -1
- package/dist/lib/tools/codex-pool.d.ts.map +1 -1
- package/dist/lib/tools/codex-pool.js +49 -12
- package/dist/lib/tools/codex-pool.js.map +1 -1
- package/dist/lib/tools/refresh-account.d.ts +1 -0
- package/dist/lib/tools/refresh-account.d.ts.map +1 -1
- package/dist/lib/tools/refresh-account.js +6 -0
- package/dist/lib/tools/refresh-account.js.map +1 -1
- package/dist/lib/types.d.ts +1 -0
- package/dist/lib/types.d.ts.map +1 -1
- package/package.json +3 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../lib/storage/normalize.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../lib/storage/normalize.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAcH,OAAO,EAOL,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,OAAO,EACb,UAAU,CAAC,EAAE,MAAM,GAClB,gBAAgB,GAAG,IAAI,CA6HzB"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* throws a typed `StorageError` for schemas we can't safely read).
|
|
8
8
|
*/
|
|
9
9
|
import { createLogger } from "../logger.js";
|
|
10
|
+
import { extractAccountUserId } from "../auth/token-utils.js";
|
|
10
11
|
import { MODEL_FAMILIES } from "../prompts/codex.js";
|
|
11
12
|
import { AccountStorageV2DetectionSchema } from "../schemas.js";
|
|
12
13
|
import { StorageError } from "./errors.js";
|
|
@@ -73,7 +74,13 @@ export function normalizeAccountStorage(data, sourcePath) {
|
|
|
73
74
|
? migrateV1ToV3(data)
|
|
74
75
|
: data;
|
|
75
76
|
const validAccounts = rawAccounts.filter((account) => isRecord(account) && typeof account.refreshToken === "string" && !!account.refreshToken.trim());
|
|
76
|
-
const
|
|
77
|
+
const accountsWithMemberIdentity = validAccounts.map((account) => {
|
|
78
|
+
if (account.accountUserId?.trim())
|
|
79
|
+
return account;
|
|
80
|
+
const accountUserId = extractAccountUserId(account.accessToken);
|
|
81
|
+
return accountUserId ? { ...account, accountUserId } : account;
|
|
82
|
+
});
|
|
83
|
+
const deduplicatedAccounts = deduplicateAccountsForStorage(accountsWithMemberIdentity);
|
|
77
84
|
const activeIndex = (() => {
|
|
78
85
|
if (deduplicatedAccounts.length === 0)
|
|
79
86
|
return 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../../lib/storage/normalize.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../../lib/storage/normalize.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-diff.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-diff.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAGrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,cAAc;IAC9B;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;IACtC,6DAA6D;IAC7D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;IACxC,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,OAAO,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,gBAAgB,EAAE,IAAI,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC9B,KAAK,EAAE,aAAa,GAAG,cAAc,CAAC;IACtC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,IAAI,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACpB;
|
|
1
|
+
{"version":3,"file":"codex-diff.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-diff.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAGrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,cAAc;IAC9B;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;IACtC,6DAA6D;IAC7D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;IACxC,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,OAAO,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,gBAAgB,EAAE,IAAI,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC9B,KAAK,EAAE,aAAa,GAAG,cAAc,CAAC;IACtC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,IAAI,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACpB;AA4JD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC/B,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,GACZ,cAAc,EAAE,CAyClB;AAmDD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW,GAAG,cAAc,CAsGrE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-diff.js","sourceRoot":"","sources":["../../../lib/tools/codex-diff.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex-diff.js","sourceRoot":"","sources":["../../../lib/tools/codex-diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-doctor.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-doctor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-doctor.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-doctor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAyCrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAY9C,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,CA+iBtE"}
|
|
@@ -6,7 +6,7 @@ import { tool } from "@opencode-ai/plugin/tool";
|
|
|
6
6
|
import { getStoragePath, loadAccounts, withAccountStorageTransaction, } from "../storage.js";
|
|
7
7
|
import { AccountManager } from "../accounts.js";
|
|
8
8
|
import { MODEL_FAMILIES } from "../prompts/codex.js";
|
|
9
|
-
import { clearRefreshedAccountsStaleState, findDisabledAccountsWithFreshCredential, findDisabledTokenSourceDuplicates, } from "../accounts/stale-state.js";
|
|
9
|
+
import { clearRefreshedAccountsStaleState, findDisabledAccountsWithFreshCredential, findDisabledTokenSourceDuplicates, findConflictingBusinessMemberCredentials, } from "../accounts/stale-state.js";
|
|
10
10
|
import { clearTuiQuotaSnapshot } from "../tui-quota-cache.js";
|
|
11
11
|
import { buildBeginnerDoctorFindings, formatPromptCacheSnapshot, recommendBeginnerNextAction, summarizeBeginnerAccounts, } from "../ui/beginner.js";
|
|
12
12
|
import { formatUiHeader, formatUiItem, formatUiKeyValue, formatUiSection, } from "../ui/format.js";
|
|
@@ -62,6 +62,19 @@ export function createCodexDoctorTool(ctx) {
|
|
|
62
62
|
.join(", ")}).`,
|
|
63
63
|
});
|
|
64
64
|
}
|
|
65
|
+
const businessMemberConflicts = storage
|
|
66
|
+
? findConflictingBusinessMemberCredentials(storage.accounts)
|
|
67
|
+
: [];
|
|
68
|
+
if (businessMemberConflicts.length > 0) {
|
|
69
|
+
findings.push({
|
|
70
|
+
severity: "error",
|
|
71
|
+
code: "business-member-credential-conflict",
|
|
72
|
+
summary: `${businessMemberConflicts.length} Business member group(s) use one OAuth credential under different emails.`,
|
|
73
|
+
action: `Remove and re-login the affected slots separately (${businessMemberConflicts
|
|
74
|
+
.map((indices) => indices.map((index) => index + 1).join("/"))
|
|
75
|
+
.join(", ")}).`,
|
|
76
|
+
});
|
|
77
|
+
}
|
|
65
78
|
// A user-disabled account that absorbed a fresh enabled re-login stays
|
|
66
79
|
// disabled (fail-closed) but is otherwise invisible to diagnostics (#171).
|
|
67
80
|
const disabledWithFreshCredential = storage
|
|
@@ -212,6 +225,7 @@ export function createCodexDoctorTool(ctx) {
|
|
|
212
225
|
const bestIdentity = {
|
|
213
226
|
organizationId: bestAccount.organizationId,
|
|
214
227
|
accountId: bestAccount.accountId,
|
|
228
|
+
accountUserId: bestAccount.accountUserId,
|
|
215
229
|
refreshToken: bestAccount.refreshToken,
|
|
216
230
|
};
|
|
217
231
|
const switchResult = await withAccountStorageTransaction(async (current, persist) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-doctor.js","sourceRoot":"","sources":["../../../lib/tools/codex-doctor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex-doctor.js","sourceRoot":"","sources":["../../../lib/tools/codex-doctor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-health.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-health.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-health.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-health.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAcrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,CA8LtE"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { tool } from "@opencode-ai/plugin/tool";
|
|
6
6
|
import { loadAccounts } from "../storage.js";
|
|
7
|
-
import { findDisabledAccountsWithFreshCredential, findDisabledTokenSourceDuplicates, findStaleRecoverableAccounts, } from "../accounts/stale-state.js";
|
|
7
|
+
import { findDisabledAccountsWithFreshCredential, findDisabledTokenSourceDuplicates, findConflictingBusinessMemberCredentials, findStaleRecoverableAccounts, } from "../accounts/stale-state.js";
|
|
8
8
|
import { formatUiHeader, formatUiItem, paintUiText } from "../ui/format.js";
|
|
9
9
|
import { normalizeToolOutputFormat, renderJsonOutput } from "../runtime.js";
|
|
10
10
|
import { buildRefreshInputs, refreshAndPersistAccount, } from "./refresh-account.js";
|
|
@@ -112,14 +112,19 @@ export function createCodexHealthTool(ctx) {
|
|
|
112
112
|
// tokens, but this tool persists rotations before reporting health.
|
|
113
113
|
const staleRecoverable = findStaleRecoverableAccounts(storage.accounts);
|
|
114
114
|
const duplicateSlots = findDisabledTokenSourceDuplicates(storage.accounts);
|
|
115
|
+
const memberCredentialConflicts = findConflictingBusinessMemberCredentials(storage.accounts);
|
|
115
116
|
const staleSlots = staleRecoverable.map((index) => index + 1);
|
|
116
117
|
const dupSlots = duplicateSlots.map((index) => index + 1);
|
|
118
|
+
const memberConflictSlots = memberCredentialConflicts.map((indices) => indices.map((index) => index + 1));
|
|
117
119
|
if (staleSlots.length > 0) {
|
|
118
120
|
results.push(`Stale state: ${staleSlots.length} account(s) blocked by a stale cooldown/rate-limit (slots: ${staleSlots.join(", ")}). Run \`codex-doctor --fix\`.`);
|
|
119
121
|
}
|
|
120
122
|
if (dupSlots.length > 0) {
|
|
121
123
|
results.push(`Duplicates: ${dupSlots.length} disabled duplicate entry(ies) shadow a real account (slots: ${dupSlots.join(", ")}). Remove with \`codex-remove\`.`);
|
|
122
124
|
}
|
|
125
|
+
if (memberConflictSlots.length > 0) {
|
|
126
|
+
results.push(`Business member conflict: ${memberConflictSlots.length} group(s) use one member credential under different emails (slots: ${memberConflictSlots.map((slots) => slots.join("/")).join(", ")}). Remove and re-login those slots separately.`);
|
|
127
|
+
}
|
|
123
128
|
const absorbedSlots = findDisabledAccountsWithFreshCredential(storage.accounts).map((index) => index + 1);
|
|
124
129
|
if (absorbedSlots.length > 0) {
|
|
125
130
|
results.push(`Disabled w/ fresh login: ${absorbedSlots.length} disabled account(s) hold a fresh credential (slots: ${absorbedSlots.join(", ")}) - a recent re-login landed on a disabled slot. Re-enable in oc-codex-multi-auth-accounts.json if intended.`);
|
|
@@ -132,6 +137,7 @@ export function createCodexHealthTool(ctx) {
|
|
|
132
137
|
skippedCount,
|
|
133
138
|
staleRecoverableSlots: staleSlots,
|
|
134
139
|
disabledDuplicateSlots: dupSlots,
|
|
140
|
+
businessMemberConflictSlots: memberConflictSlots,
|
|
135
141
|
disabledWithFreshCredentialSlots: absorbedSlots,
|
|
136
142
|
accounts: jsonAccounts,
|
|
137
143
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-health.js","sourceRoot":"","sources":["../../../lib/tools/codex-health.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex-health.js","sourceRoot":"","sources":["../../../lib/tools/codex-health.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-pool.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-pool.ts"],"names":[],"mappings":"AAAA,iFAAiF;AAEjF,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-pool.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-pool.ts"],"names":[],"mappings":"AAAA,iFAAiF;AAEjF,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAoBrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAgM9C,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,CAiLpE"}
|
|
@@ -5,6 +5,8 @@ import { ConfigLockContentionError, ErrorCode } from "../errors.js";
|
|
|
5
5
|
import { logWarn } from "../logger.js";
|
|
6
6
|
import { normalizeToolOutputFormat, renderJsonOutput } from "../runtime.js";
|
|
7
7
|
import { loadAccounts } from "../storage.js";
|
|
8
|
+
import { expandLegacyModelPoolKeys, getModelPoolAccountKey, isSeatPoolKey, matchesModelPoolAccountKey, } from "../accounts/pool-identity.js";
|
|
9
|
+
import { getCurrentProjectRoot, getCurrentStoragePath } from "../storage/state.js";
|
|
8
10
|
function normalizePoolAction(action) {
|
|
9
11
|
if (action === undefined || action === "status")
|
|
10
12
|
return "status";
|
|
@@ -44,7 +46,7 @@ function resolveAccountIds(storage, accountNumbers) {
|
|
|
44
46
|
throw new Error(`Invalid account number ${accountNumber}. Expected 1-${storage.accounts.length}.`);
|
|
45
47
|
}
|
|
46
48
|
const account = storage.accounts[accountNumber - 1];
|
|
47
|
-
const accountId = account
|
|
49
|
+
const accountId = account ? getModelPoolAccountKey(account) : undefined;
|
|
48
50
|
if (!accountId) {
|
|
49
51
|
throw new Error(`Account ${accountNumber} has no stable account ID and cannot be assigned to a model pool.`);
|
|
50
52
|
}
|
|
@@ -52,26 +54,56 @@ function resolveAccountIds(storage, accountNumbers) {
|
|
|
52
54
|
}
|
|
53
55
|
return ids;
|
|
54
56
|
}
|
|
57
|
+
/**
|
|
58
|
+
* Migrate legacy workspace-wide pool entries to member-scoped seat keys.
|
|
59
|
+
*
|
|
60
|
+
* `modelAccountPools` lives in the GLOBAL plugin config, but account storage is
|
|
61
|
+
* per-project by default (`perProjectAccounts`). Expanding a legacy key against
|
|
62
|
+
* a project-scoped account list would rewrite the global pool using only the
|
|
63
|
+
* seats visible from THIS project and silently drop the routing every other
|
|
64
|
+
* project depends on, so the migration is skipped whenever project-scoped
|
|
65
|
+
* storage is active.
|
|
66
|
+
*/
|
|
67
|
+
function normalizeExistingPoolAccountIds(ids, storage) {
|
|
68
|
+
const projectScoped = Boolean(getCurrentStoragePath() && getCurrentProjectRoot());
|
|
69
|
+
if (projectScoped) {
|
|
70
|
+
if (ids.some((id) => !isSeatPoolKey(id))) {
|
|
71
|
+
logWarn("Project-scoped account storage is active; leaving legacy workspace-wide model pool entries unmigrated so pools used by other projects are not rewritten.");
|
|
72
|
+
}
|
|
73
|
+
return ids;
|
|
74
|
+
}
|
|
75
|
+
return expandLegacyModelPoolKeys(ids, storage?.accounts ?? []);
|
|
76
|
+
}
|
|
55
77
|
function buildPoolSnapshot(model, accountIds, storage, ctx, includeSensitive, poolMode) {
|
|
56
78
|
const accounts = [];
|
|
57
79
|
const unresolvedAccountIds = [];
|
|
58
80
|
const storedAccounts = storage?.accounts ?? [];
|
|
59
81
|
const maskEmail = ctx.resolveMaskEmail();
|
|
82
|
+
const includedIndices = new Set();
|
|
60
83
|
for (const accountId of accountIds) {
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
|
|
84
|
+
const matchingIndices = storedAccounts
|
|
85
|
+
.map((account, index) => matchesModelPoolAccountKey(account, accountId) ? index : -1)
|
|
86
|
+
.filter((index) => index >= 0);
|
|
87
|
+
if (matchingIndices.length === 0) {
|
|
64
88
|
unresolvedAccountIds.push(accountId);
|
|
65
89
|
continue;
|
|
66
90
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
91
|
+
for (const index of matchingIndices) {
|
|
92
|
+
if (includedIndices.has(index))
|
|
93
|
+
continue;
|
|
94
|
+
includedIndices.add(index);
|
|
95
|
+
const account = storedAccounts[index];
|
|
96
|
+
if (!account)
|
|
97
|
+
continue;
|
|
98
|
+
accounts.push({
|
|
99
|
+
...ctx.buildJsonAccountIdentity(index, {
|
|
100
|
+
includeSensitive,
|
|
101
|
+
account,
|
|
102
|
+
label: ctx.formatCommandAccountLabel(account, index, { maskEmail }),
|
|
103
|
+
}),
|
|
104
|
+
enabled: account.enabled !== false,
|
|
105
|
+
});
|
|
106
|
+
}
|
|
75
107
|
}
|
|
76
108
|
return {
|
|
77
109
|
model,
|
|
@@ -173,6 +205,11 @@ export function createCodexPoolTool(ctx) {
|
|
|
173
205
|
result = await updateModelAccountPool(model, action, accountIds, {
|
|
174
206
|
dryRun: args.dryRun,
|
|
175
207
|
poolMode,
|
|
208
|
+
...(action === "add" || action === "remove"
|
|
209
|
+
? {
|
|
210
|
+
normalizeExistingAccountIds: (ids) => normalizeExistingPoolAccountIds(ids, storage),
|
|
211
|
+
}
|
|
212
|
+
: {}),
|
|
176
213
|
});
|
|
177
214
|
}
|
|
178
215
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-pool.js","sourceRoot":"","sources":["../../../lib/tools/codex-pool.ts"],"names":[],"mappings":"AAAA,iFAAiF;AAEjF,OAAO,EAAE,IAAI,EAAuB,MAAM,0BAA0B,CAAC;AACrE,OAAO,EACN,uBAAuB,EACvB,gBAAgB,EAGhB,sBAAsB,GAEtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAyB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-pool.js","sourceRoot":"","sources":["../../../lib/tools/codex-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh-account.d.ts","sourceRoot":"","sources":["../../../lib/tools/refresh-account.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"refresh-account.d.ts","sourceRoot":"","sources":["../../../lib/tools/refresh-account.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAEN,KAAK,iBAAiB,EACtB,MAAM,eAAe,CAAC;AAKvB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACtC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,sBAAsB,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,sBAAsB,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,qBAAqB,GAC9B;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,sBAAsB,CAAA;CAAE,GACtE;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,sBAAsB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpF;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAE1E,wBAAgB,0BAA0B,CACzC,QAAQ,EAAE,sBAAsB,EAAE,EAClC,QAAQ,EAAE,sBAAsB,GAC9B,MAAM,CAER;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACzC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,sBAAsB,EAChC,aAAa,EAAE,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,GACtD,OAAO,CAAC,sBAAsB,CAAC,CAwFjC;AAED;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAC7C,OAAO,EAAE,mBAAmB,GAC1B,OAAO,CAAC,qBAAqB,CAAC,CAsChC;AAED,wBAAgB,kBAAkB,CACjC,QAAQ,EAAE,iBAAiB,EAAE,GAC3B,mBAAmB,EAAE,CAYvB"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* reports `refresh_token_reused` for every account.
|
|
8
8
|
*/
|
|
9
9
|
import { queuedRefresh } from "../refresh-queue.js";
|
|
10
|
+
import { extractAccountUserId } from "../auth/token-utils.js";
|
|
10
11
|
import { withAccountStorageTransaction, } from "../storage.js";
|
|
11
12
|
import { findAccountIndexByIdentityKeys, toAccountIdentityKeys, } from "../storage/identity.js";
|
|
12
13
|
export function findAccountIndexByIdentity(accounts, identity) {
|
|
@@ -54,6 +55,8 @@ export async function persistRefreshResult(index, identity, refreshResult) {
|
|
|
54
55
|
}
|
|
55
56
|
}
|
|
56
57
|
target.refreshToken = refreshResult.refresh;
|
|
58
|
+
target.accountUserId =
|
|
59
|
+
extractAccountUserId(refreshResult.access) ?? target.accountUserId;
|
|
57
60
|
target.accessToken = refreshResult.access;
|
|
58
61
|
target.expiresAt = refreshResult.expires;
|
|
59
62
|
if (rotatedAt !== undefined) {
|
|
@@ -66,6 +69,8 @@ export async function persistRefreshResult(index, identity, refreshResult) {
|
|
|
66
69
|
// this workspace's freshly returned access token; do not overwrite
|
|
67
70
|
// non-credential state in the fresh snapshot.
|
|
68
71
|
target.accessToken = refreshResult.access;
|
|
72
|
+
target.accountUserId =
|
|
73
|
+
extractAccountUserId(refreshResult.access) ?? target.accountUserId;
|
|
69
74
|
target.expiresAt = refreshResult.expires;
|
|
70
75
|
}
|
|
71
76
|
else {
|
|
@@ -152,6 +157,7 @@ export function buildRefreshInputs(accounts) {
|
|
|
152
157
|
identity: {
|
|
153
158
|
organizationId: account.organizationId,
|
|
154
159
|
accountId: account.accountId,
|
|
160
|
+
accountUserId: account.accountUserId?.trim() || extractAccountUserId(account.accessToken),
|
|
155
161
|
refreshToken: account.refreshToken,
|
|
156
162
|
},
|
|
157
163
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh-account.js","sourceRoot":"","sources":["../../../lib/tools/refresh-account.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACN,6BAA6B,GAE7B,MAAM,eAAe,CAAC;AACvB,OAAO,EACN,8BAA8B,EAC9B,qBAAqB,GACrB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"refresh-account.js","sourceRoot":"","sources":["../../../lib/tools/refresh-account.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/types.d.ts
CHANGED
package/dist/lib/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9D,YAAY,EACX,sBAAsB,IAAI,YAAY,EACtC,yBAAyB,IAAI,eAAe,EAC5C,sBAAsB,IAAI,YAAY,EACtC,sBAAsB,IAAI,YAAY,EACtC,qBAAqB,IAAI,WAAW,EACpC,4BAA4B,IAAI,kBAAkB,GAClD,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,UAAU;IAC1B,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE;QACP,CAAC,SAAS,EAAE,MAAM,GAAG;YACpB,OAAO,CAAC,EAAE,aAAa,CAAC;YACxB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,aAAa,GAAG;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;aAAE,CAAC,GAAG,SAAS,CAAC,CAAC;YAChF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;SACvB,CAAC;KACF,CAAC;CACF;AAED,MAAM,WAAW,aAAa;IAC7B,eAAe,CAAC,EACb,MAAM,GACN,SAAS,GACT,KAAK,GACL,QAAQ,GACR,MAAM,GACN,OAAO,GACP,KAAK,GACL,OAAO,CAAC;IACX,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,KAAK,GAAG,IAAI,CAAC;IAClE,aAAa,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC1C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC/B,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC;IACzE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IACzC,OAAO,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,QAAQ;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IACjC,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,eAAe;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IAC1B,6BAA6B,CAAC,EAAE;QAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC5B,CAAC;IACF,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAGD;;GAEG;AACH,MAAM,WAAW,SAAS;IACzB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IACrC,IAAI,CAAC,EAAE;QACN,SAAS,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;KACtC,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE;QACjB,MAAM,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG;YAAE,KAAK,CAAC,EAAE,OAAO,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC;QAC1E,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACvB,CAAC;IACF,iEAAiE;IACjE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IACtB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAGD,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAEtC,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAI,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "oc-codex-multi-auth",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.13.0",
|
|
4
4
|
"description": "OpenCode plugin for ChatGPT Plus/Pro OAuth with Codex/GPT-5 routing, multi-account rotation, account switching, health checks, diagnostics, and recovery tools",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -120,11 +120,9 @@
|
|
|
120
120
|
},
|
|
121
121
|
"dependencies": {
|
|
122
122
|
"@napi-rs/keyring": "~1.2.0",
|
|
123
|
-
"@openauthjs/openauth": "^0.4.3",
|
|
124
123
|
"@opencode-ai/plugin": "^1.14.22",
|
|
125
124
|
"@opentui/core": "0.2.6",
|
|
126
125
|
"@opentui/solid": "0.2.6",
|
|
127
|
-
"hono": "4.12.32",
|
|
128
126
|
"proper-lockfile": "^4.1.2",
|
|
129
127
|
"solid-js": "^1.9.11",
|
|
130
128
|
"web-tree-sitter": "^0.25.10",
|
|
@@ -133,17 +131,17 @@
|
|
|
133
131
|
"overrides": {
|
|
134
132
|
"esbuild": "^0.28.1",
|
|
135
133
|
"flatted": "3.4.2",
|
|
136
|
-
"hono": "4.12.32",
|
|
137
134
|
"rollup": "4.60.0",
|
|
138
135
|
"vite": "^7.3.5",
|
|
139
136
|
"yaml": "^2.8.3",
|
|
140
137
|
"@babel/core": "^7.29.6",
|
|
141
138
|
"ajv@<6.14.0": "^6.14.0",
|
|
142
|
-
"brace-expansion": "^5.0.
|
|
139
|
+
"brace-expansion": "^5.0.9",
|
|
143
140
|
"seroval@<=1.5.2": "^1.5.6",
|
|
144
141
|
"seroval-plugins@<=1.5.2": "^1.5.6",
|
|
145
142
|
"minimatch@<9.0.7": "^9.0.7",
|
|
146
143
|
"minimatch@>=10.0.0 <10.2.3": "^10.2.3",
|
|
144
|
+
"nanoid": "^3.3.18",
|
|
147
145
|
"picomatch@<2.3.2": "^2.3.2",
|
|
148
146
|
"picomatch@>=4.0.0 <4.0.4": "^4.0.4",
|
|
149
147
|
"postcss@<8.5.24": "^8.5.24",
|