@iam-brain/opencode-codex-auth 1.5.0 → 1.6.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 +7 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -4
- package/dist/index.js.map +1 -1
- package/dist/lib/codex-native/accounts.d.ts +1 -1
- package/dist/lib/codex-native/accounts.d.ts.map +1 -1
- package/dist/lib/codex-native/accounts.js +54 -17
- package/dist/lib/codex-native/accounts.js.map +1 -1
- package/dist/lib/codex-native/auth-menu-flow.js +4 -4
- package/dist/lib/codex-native/auth-menu-flow.js.map +1 -1
- package/dist/lib/codex-native/chat-hooks.d.ts +8 -1
- package/dist/lib/codex-native/chat-hooks.d.ts.map +1 -1
- package/dist/lib/codex-native/chat-hooks.js +76 -25
- package/dist/lib/codex-native/chat-hooks.js.map +1 -1
- package/dist/lib/codex-native/oauth-persistence.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-persistence.js +2 -0
- package/dist/lib/codex-native/oauth-persistence.js.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.d.ts +3 -1
- package/dist/lib/codex-native/openai-loader-fetch.d.ts.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.js +50 -7
- package/dist/lib/codex-native/openai-loader-fetch.js.map +1 -1
- package/dist/lib/codex-native/reasoning-summary.d.ts +30 -0
- package/dist/lib/codex-native/reasoning-summary.d.ts.map +1 -0
- package/dist/lib/codex-native/reasoning-summary.js +98 -0
- package/dist/lib/codex-native/reasoning-summary.js.map +1 -0
- package/dist/lib/codex-native/request-routing.d.ts.map +1 -1
- package/dist/lib/codex-native/request-routing.js +12 -4
- package/dist/lib/codex-native/request-routing.js.map +1 -1
- package/dist/lib/codex-native/request-transform-model-service-tier.d.ts +2 -0
- package/dist/lib/codex-native/request-transform-model-service-tier.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-model-service-tier.js +35 -1
- package/dist/lib/codex-native/request-transform-model-service-tier.js.map +1 -1
- package/dist/lib/codex-native/request-transform-model.d.ts +41 -10
- package/dist/lib/codex-native/request-transform-model.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-model.js +261 -98
- package/dist/lib/codex-native/request-transform-model.js.map +1 -1
- package/dist/lib/codex-native/request-transform-payload.d.ts +9 -1
- package/dist/lib/codex-native/request-transform-payload.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-payload.js +170 -44
- package/dist/lib/codex-native/request-transform-payload.js.map +1 -1
- package/dist/lib/codex-native/session-messages.d.ts.map +1 -1
- package/dist/lib/codex-native/session-messages.js +18 -1
- package/dist/lib/codex-native/session-messages.js.map +1 -1
- package/dist/lib/codex-native.d.ts +2 -1
- package/dist/lib/codex-native.d.ts.map +1 -1
- package/dist/lib/codex-native.js +152 -11
- package/dist/lib/codex-native.js.map +1 -1
- package/dist/lib/config/file.d.ts +3 -1
- package/dist/lib/config/file.d.ts.map +1 -1
- package/dist/lib/config/file.js +461 -52
- package/dist/lib/config/file.js.map +1 -1
- package/dist/lib/config/resolve.d.ts +6 -2
- package/dist/lib/config/resolve.d.ts.map +1 -1
- package/dist/lib/config/resolve.js +69 -11
- package/dist/lib/config/resolve.js.map +1 -1
- package/dist/lib/config/types.d.ts +22 -5
- package/dist/lib/config/types.d.ts.map +1 -1
- package/dist/lib/config/types.js +76 -31
- package/dist/lib/config/types.js.map +1 -1
- package/dist/lib/config.d.ts +3 -3
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +3 -3
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/fatal-errors.d.ts +5 -1
- package/dist/lib/fatal-errors.d.ts.map +1 -1
- package/dist/lib/fatal-errors.js +12 -2
- package/dist/lib/fatal-errors.js.map +1 -1
- package/dist/lib/fetch-orchestrator.d.ts.map +1 -1
- package/dist/lib/fetch-orchestrator.js +4 -1
- package/dist/lib/fetch-orchestrator.js.map +1 -1
- package/dist/lib/installer-cli.d.ts.map +1 -1
- package/dist/lib/installer-cli.js +38 -9
- package/dist/lib/installer-cli.js.map +1 -1
- package/dist/lib/model-catalog/catalog-fetch.d.ts.map +1 -1
- package/dist/lib/model-catalog/catalog-fetch.js +2 -3
- package/dist/lib/model-catalog/catalog-fetch.js.map +1 -1
- package/dist/lib/model-catalog/provider.d.ts +4 -1
- package/dist/lib/model-catalog/provider.d.ts.map +1 -1
- package/dist/lib/model-catalog/provider.js +77 -9
- package/dist/lib/model-catalog/provider.js.map +1 -1
- package/dist/lib/model-catalog/shared.d.ts +24 -1
- package/dist/lib/model-catalog/shared.d.ts.map +1 -1
- package/dist/lib/model-catalog/shared.js +0 -31
- package/dist/lib/model-catalog/shared.js.map +1 -1
- package/dist/lib/model-catalog.d.ts +1 -1
- package/dist/lib/model-catalog.d.ts.map +1 -1
- package/dist/lib/model-catalog.js.map +1 -1
- package/dist/lib/persona-tool-cli.d.ts.map +1 -1
- package/dist/lib/persona-tool-cli.js +19 -7
- package/dist/lib/persona-tool-cli.js.map +1 -1
- package/dist/lib/personality-command.js +1 -1
- package/dist/lib/personality-create.d.ts.map +1 -1
- package/dist/lib/personality-create.js +28 -10
- package/dist/lib/personality-create.js.map +1 -1
- package/dist/lib/personality-skill.js +1 -1
- package/dist/lib/storage/auth-state.d.ts.map +1 -1
- package/dist/lib/storage/auth-state.js +4 -3
- package/dist/lib/storage/auth-state.js.map +1 -1
- package/dist/lib/ui/auth-menu.d.ts +1 -0
- package/dist/lib/ui/auth-menu.d.ts.map +1 -1
- package/dist/lib/ui/auth-menu.js +1 -1
- package/dist/lib/ui/auth-menu.js.map +1 -1
- package/package.json +4 -1
- package/schemas/codex-config.schema.json +153 -11
package/README.md
CHANGED
|
@@ -38,7 +38,7 @@ opencode run "say hi" --model=openai/gpt-5
|
|
|
38
38
|
|
|
39
39
|
## Configuration
|
|
40
40
|
|
|
41
|
-
Keep plugin install/enablement in `opencode.json`, and runtime behavior in `codex-config.json
|
|
41
|
+
Keep plugin install/enablement in `opencode.json`, and runtime behavior in `codex-config.jsonc`. The plugin still accepts commented legacy `codex-config.json` files for compatibility.
|
|
42
42
|
|
|
43
43
|
- Config reference: [docs/configuration.md](docs/configuration.md)
|
|
44
44
|
- Multi-account behavior: [docs/multi-account.md](docs/multi-account.md)
|
|
@@ -56,18 +56,23 @@ Keep plugin install/enablement in `opencode.json`, and runtime behavior in `code
|
|
|
56
56
|
|
|
57
57
|
```bash
|
|
58
58
|
npm install
|
|
59
|
+
npm run hooks:install
|
|
59
60
|
npm run verify
|
|
60
61
|
```
|
|
61
62
|
|
|
62
63
|
Helpful local commands:
|
|
63
64
|
|
|
64
65
|
```bash
|
|
66
|
+
npm run verify:local
|
|
67
|
+
npm run prepush
|
|
65
68
|
npm run lint
|
|
66
69
|
npm run test:coverage
|
|
67
70
|
npm run check:docs
|
|
68
71
|
```
|
|
69
72
|
|
|
70
|
-
`npm run verify`
|
|
73
|
+
Local git hooks now enforce `npm run verify` before both `git commit` and `git push`. The commit hook accepts staged-only commit-ready changes, and the push hook requires a clean tree so it verifies the exact commits being pushed. `npm run verify:local` runs the same enforcement manually, with a cache so unchanged trees do not rerun the full suite twice in a row.
|
|
74
|
+
|
|
75
|
+
Pull request CI stays intentionally lean: GitHub still runs clean-room verify, tarball smoke, Windows smoke, dependency review, and secret scanning. Dependency vulnerability auditing via `npm audit` now runs on default-branch pushes instead of every PR.
|
|
71
76
|
|
|
72
77
|
## Usage Note
|
|
73
78
|
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAmDjD,eAAO,MAAM,qBAAqB,EAAE,MAgPnC,CAAA;AAED,eAAe,qBAAqB,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -2,7 +2,7 @@ import { tool } from "@opencode-ai/plugin/tool";
|
|
|
2
2
|
import { listAccountsForTools, removeAccountByIndex, switchAccountByIndex, toggleAccountEnabledByIndex } from "./lib/accounts-tools.js";
|
|
3
3
|
import { removedAccountMessage, switchedAccountMessage, toggledAccountMessage } from "./lib/auth-messages.js";
|
|
4
4
|
import { CodexAuthPlugin, refreshAccessToken } from "./lib/codex-native.js";
|
|
5
|
-
import { ensureDefaultConfigFile, getCompatInputSanitizerEnabled, getCodexCompactionOverrideEnabled, getBehaviorSettings, getCollaborationProfileEnabled, getDebugEnabled, getHeaderSnapshotBodiesEnabled, getHeaderTransformDebugEnabled, getHeaderSnapshotsEnabled, getOrchestratorSubagentsEnabled, getMode, getRemapDeveloperMessagesToUserEnabled, getRotationStrategy, getPromptCacheKeyStrategy, getPidOffsetEnabled, getPersonality, getProactiveRefreshBufferMs, getProactiveRefreshEnabled, getSpoofMode, getQuietMode, loadConfigFile, resolveConfig } from "./lib/config.js";
|
|
5
|
+
import { ensureDefaultConfigFile, getCompatInputSanitizerEnabled, getCodexCompactionOverrideEnabled, getBehaviorSettings, getCustomModels, getCollaborationProfileEnabled, getDebugEnabled, getHeaderSnapshotBodiesEnabled, getHeaderTransformDebugEnabled, getHeaderSnapshotsEnabled, getOrchestratorSubagentsEnabled, getMode, getRemapDeveloperMessagesToUserEnabled, getRotationStrategy, getPromptCacheKeyStrategy, getPidOffsetEnabled, getPersonality, getProactiveRefreshBufferMs, getProactiveRefreshEnabled, getSpoofMode, getQuietMode, loadConfigFile, resolveConfig } from "./lib/config.js";
|
|
6
6
|
import { createLogger } from "./lib/logger.js";
|
|
7
7
|
import { generatePersonaSpec } from "./lib/persona-tool.js";
|
|
8
8
|
import { createPersonalityFile } from "./lib/personality-create.js";
|
|
@@ -26,12 +26,12 @@ export const OpenAIMultiAuthPlugin = async (input) => {
|
|
|
26
26
|
console.warn(`[opencode-codex-auth] bootstrap: ensureDefaultConfigFile failed: ${error.message}`);
|
|
27
27
|
}
|
|
28
28
|
});
|
|
29
|
-
await installCreatePersonalityCommand(
|
|
29
|
+
await installCreatePersonalityCommand().catch((error) => {
|
|
30
30
|
if (error instanceof Error) {
|
|
31
31
|
console.warn(`[opencode-codex-auth] bootstrap: installCreatePersonalityCommand failed: ${error.message}`);
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
|
-
await installPersonalityBuilderSkill(
|
|
34
|
+
await installPersonalityBuilderSkill().catch((error) => {
|
|
35
35
|
if (error instanceof Error) {
|
|
36
36
|
console.warn(`[opencode-codex-auth] bootstrap: installPersonalityBuilderSkill failed: ${error.message}`);
|
|
37
37
|
}
|
|
@@ -119,7 +119,8 @@ export const OpenAIMultiAuthPlugin = async (input) => {
|
|
|
119
119
|
headerTransformDebug: getHeaderTransformDebugEnabled(cfg),
|
|
120
120
|
collaborationProfileEnabled,
|
|
121
121
|
orchestratorSubagentsEnabled: getOrchestratorSubagentsEnabled(cfg),
|
|
122
|
-
behaviorSettings: getBehaviorSettings(cfg)
|
|
122
|
+
behaviorSettings: getBehaviorSettings(cfg),
|
|
123
|
+
customModels: getCustomModels(cfg)
|
|
123
124
|
});
|
|
124
125
|
const z = tool.schema;
|
|
125
126
|
hooks.tool = {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAE/C,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,2BAA2B,EAC5B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC7G,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,EACL,uBAAuB,EACvB,8BAA8B,EAC9B,iCAAiC,EACjC,mBAAmB,EACnB,8BAA8B,EAC9B,eAAe,EACf,8BAA8B,EAC9B,8BAA8B,EAC9B,yBAAyB,EACzB,+BAA+B,EAC/B,OAAO,EACP,sCAAsC,EACtC,mBAAmB,EACnB,yBAAyB,EACzB,mBAAmB,EACnB,cAAc,EACd,2BAA2B,EAC3B,0BAA0B,EAC1B,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,aAAa,EACd,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,+BAA+B,EAAE,MAAM,8BAA8B,CAAA;AAC9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAC3E,OAAO,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAA;AAClF,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,2BAA2B,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAA;AACxE,OAAO,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAA;AAElF,IAAI,SAA2C,CAAA;AAE/C,MAAM,CAAC,MAAM,qBAAqB,GAAW,KAAK,EAAE,KAAK,EAAE,EAAE;IAC3D,IAAI,SAAS,EAAE,CAAC;QACd,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,SAAS,GAAG,SAAS,CAAA;IACvB,CAAC;IAED,MAAM,uBAAuB,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QAClE,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,oEAAoE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACnG,CAAC;IACH,CAAC,CAAC,CAAA;IACF,MAAM,+BAA+B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export declare function formatAccountLabel(account: {
|
|
|
8
8
|
} | undefined, index: number): string;
|
|
9
9
|
export declare function ensureAccountAuthTypes(account: AccountRecord): AccountAuthType[];
|
|
10
10
|
export declare function reconcileActiveIdentityKey(openai: OpenAIOAuthDomain): void;
|
|
11
|
-
export declare function findDomainAccountIndex(domain: OpenAIOAuthDomain, account: AccountInfo): number;
|
|
11
|
+
export declare function findDomainAccountIndex(domain: OpenAIOAuthDomain, account: AccountInfo, preferredAuthMode?: OpenAIAuthMode): number;
|
|
12
12
|
export declare function buildAuthMenuAccounts(input: {
|
|
13
13
|
native?: OpenAIOAuthDomain;
|
|
14
14
|
codex?: OpenAIOAuthDomain;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/accounts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AACpG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD,wBAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,aAAa,GAAG,aAAa,
|
|
1
|
+
{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/accounts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AACpG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD,wBAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,aAAa,GAAG,aAAa,CAwE/F;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,EAC1E,KAAK,EAAE,MAAM,GACZ,MAAM,CAUR;AAQD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,aAAa,GAAG,eAAe,EAAE,CAIhF;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAU1E;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,WAAW,EACpB,iBAAiB,CAAC,EAAE,cAAc,GACjC,MAAM,CA4BR;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,MAAM,CAAC,EAAE,iBAAiB,CAAA;IAC1B,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,UAAU,EAAE,cAAc,CAAA;CAC3B,GAAG,WAAW,EAAE,CA2EhB;AAED,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAWnF"}
|
|
@@ -22,16 +22,27 @@ export function upsertAccount(openai, incoming) {
|
|
|
22
22
|
: undefined;
|
|
23
23
|
let match;
|
|
24
24
|
let matchedByRefreshFallback = false;
|
|
25
|
+
let allowIdentityUpgrade = false;
|
|
25
26
|
if (strictMatch) {
|
|
26
27
|
match = strictMatch;
|
|
27
28
|
}
|
|
28
|
-
else
|
|
29
|
+
else {
|
|
29
30
|
const incomingRefresh = incoming.refresh?.trim();
|
|
30
31
|
if (incomingRefresh) {
|
|
31
32
|
const refreshMatches = openai.accounts.filter((existing) => existing.refresh?.trim() === incomingRefresh);
|
|
32
33
|
if (refreshMatches.length === 1) {
|
|
33
|
-
|
|
34
|
-
|
|
34
|
+
const candidate = refreshMatches[0];
|
|
35
|
+
const candidateStrictIdentity = buildIdentityKey({
|
|
36
|
+
accountId: candidate.accountId?.trim(),
|
|
37
|
+
email: normalizeEmail(candidate.email),
|
|
38
|
+
plan: normalizePlan(candidate.plan)
|
|
39
|
+
});
|
|
40
|
+
const canUpgradeLegacyRecord = !strictIdentityKey || !candidateStrictIdentity || candidateStrictIdentity === strictIdentityKey;
|
|
41
|
+
if (canUpgradeLegacyRecord) {
|
|
42
|
+
match = candidate;
|
|
43
|
+
matchedByRefreshFallback = true;
|
|
44
|
+
allowIdentityUpgrade = !candidateStrictIdentity && Boolean(strictIdentityKey);
|
|
45
|
+
}
|
|
35
46
|
}
|
|
36
47
|
}
|
|
37
48
|
}
|
|
@@ -39,7 +50,7 @@ export function upsertAccount(openai, incoming) {
|
|
|
39
50
|
if (!match) {
|
|
40
51
|
openai.accounts.push(target);
|
|
41
52
|
}
|
|
42
|
-
if (!matchedByRefreshFallback) {
|
|
53
|
+
if (!matchedByRefreshFallback || allowIdentityUpgrade) {
|
|
43
54
|
if (normalizedAccountId)
|
|
44
55
|
target.accountId = normalizedAccountId;
|
|
45
56
|
if (normalizedEmail)
|
|
@@ -92,18 +103,37 @@ export function reconcileActiveIdentityKey(openai) {
|
|
|
92
103
|
const fallback = openai.accounts.find((account) => account.enabled !== false && account.identityKey);
|
|
93
104
|
openai.activeIdentityKey = fallback?.identityKey;
|
|
94
105
|
}
|
|
95
|
-
export function findDomainAccountIndex(domain, account) {
|
|
106
|
+
export function findDomainAccountIndex(domain, account, preferredAuthMode) {
|
|
107
|
+
const matchesAccountInfo = (entry) => {
|
|
108
|
+
if (!entry)
|
|
109
|
+
return false;
|
|
110
|
+
if (account.identityKey && entry.identityKey) {
|
|
111
|
+
return entry.identityKey === account.identityKey;
|
|
112
|
+
}
|
|
113
|
+
const sameId = (entry.accountId?.trim() ?? "") === (account.accountId?.trim() ?? "");
|
|
114
|
+
const sameEmail = normalizeEmail(entry.email) === normalizeEmail(account.email);
|
|
115
|
+
const samePlan = normalizePlan(entry.plan) === normalizePlan(account.plan);
|
|
116
|
+
return sameId && sameEmail && samePlan;
|
|
117
|
+
};
|
|
118
|
+
const sourceIndices = account.sourceIndices;
|
|
119
|
+
if (sourceIndices) {
|
|
120
|
+
const orderedAuthTypes = preferredAuthMode
|
|
121
|
+
? [preferredAuthMode, ...(preferredAuthMode === "native" ? ["codex"] : ["native"])]
|
|
122
|
+
: ["native", "codex"];
|
|
123
|
+
for (const authType of orderedAuthTypes) {
|
|
124
|
+
const sourceIndex = sourceIndices[authType];
|
|
125
|
+
if (typeof sourceIndex !== "number" || !Number.isInteger(sourceIndex) || sourceIndex < 0)
|
|
126
|
+
continue;
|
|
127
|
+
if (matchesAccountInfo(domain.accounts[sourceIndex]))
|
|
128
|
+
return sourceIndex;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
96
131
|
if (account.identityKey) {
|
|
97
132
|
const byIdentity = domain.accounts.findIndex((entry) => entry.identityKey === account.identityKey);
|
|
98
133
|
if (byIdentity >= 0)
|
|
99
134
|
return byIdentity;
|
|
100
135
|
}
|
|
101
|
-
return domain.accounts.findIndex((entry) =>
|
|
102
|
-
const sameId = (entry.accountId?.trim() ?? "") === (account.accountId?.trim() ?? "");
|
|
103
|
-
const sameEmail = normalizeEmail(entry.email) === normalizeEmail(account.email);
|
|
104
|
-
const samePlan = normalizePlan(entry.plan) === normalizePlan(account.plan);
|
|
105
|
-
return sameId && sameEmail && samePlan;
|
|
106
|
-
});
|
|
136
|
+
return domain.accounts.findIndex((entry) => matchesAccountInfo(entry));
|
|
107
137
|
}
|
|
108
138
|
export function buildAuthMenuAccounts(input) {
|
|
109
139
|
const now = Date.now();
|
|
@@ -111,16 +141,16 @@ export function buildAuthMenuAccounts(input) {
|
|
|
111
141
|
const mergeFromDomain = (authMode, domain) => {
|
|
112
142
|
if (!domain)
|
|
113
143
|
return;
|
|
114
|
-
for (const account of domain.accounts) {
|
|
144
|
+
for (const [sourceIndex, account] of domain.accounts.entries()) {
|
|
115
145
|
ensureAccountAuthTypes(account);
|
|
116
|
-
const
|
|
146
|
+
const strictIdentity = account.identityKey ??
|
|
117
147
|
buildIdentityKey({
|
|
118
148
|
accountId: account.accountId,
|
|
119
149
|
email: normalizeEmail(account.email),
|
|
120
150
|
plan: normalizePlan(account.plan)
|
|
121
|
-
})
|
|
122
|
-
|
|
123
|
-
const existing = rows.get(
|
|
151
|
+
});
|
|
152
|
+
const rowKey = strictIdentity ?? `${authMode}:source-index:${sourceIndex}`;
|
|
153
|
+
const existing = rows.get(rowKey);
|
|
124
154
|
const currentStatus = hasActiveCooldown(account, now)
|
|
125
155
|
? "rate-limited"
|
|
126
156
|
: typeof account.expires === "number" && Number.isFinite(account.expires) && account.expires <= now
|
|
@@ -128,13 +158,15 @@ export function buildAuthMenuAccounts(input) {
|
|
|
128
158
|
: "unknown";
|
|
129
159
|
if (!existing) {
|
|
130
160
|
const isCurrentAccount = authMode === input.activeMode &&
|
|
161
|
+
account.enabled !== false &&
|
|
131
162
|
Boolean(domain.activeIdentityKey && account.identityKey === domain.activeIdentityKey);
|
|
132
|
-
rows.set(
|
|
163
|
+
rows.set(rowKey, {
|
|
133
164
|
identityKey: account.identityKey,
|
|
134
165
|
index: rows.size,
|
|
135
166
|
accountId: account.accountId,
|
|
136
167
|
email: account.email,
|
|
137
168
|
plan: account.plan,
|
|
169
|
+
sourceIndices: { [authMode]: sourceIndex },
|
|
138
170
|
authTypes: [authMode],
|
|
139
171
|
lastUsed: account.lastUsed,
|
|
140
172
|
enabled: account.enabled,
|
|
@@ -144,6 +176,10 @@ export function buildAuthMenuAccounts(input) {
|
|
|
144
176
|
continue;
|
|
145
177
|
}
|
|
146
178
|
existing.authTypes = normalizeAccountAuthTypes([...(existing.authTypes ?? []), authMode]);
|
|
179
|
+
existing.sourceIndices = {
|
|
180
|
+
...(existing.sourceIndices ?? {}),
|
|
181
|
+
[authMode]: sourceIndex
|
|
182
|
+
};
|
|
147
183
|
if (typeof account.lastUsed === "number" && (!existing.lastUsed || account.lastUsed > existing.lastUsed)) {
|
|
148
184
|
existing.lastUsed = account.lastUsed;
|
|
149
185
|
}
|
|
@@ -157,6 +193,7 @@ export function buildAuthMenuAccounts(input) {
|
|
|
157
193
|
existing.status = "expired";
|
|
158
194
|
}
|
|
159
195
|
const isCurrentAccount = authMode === input.activeMode &&
|
|
196
|
+
account.enabled !== false &&
|
|
160
197
|
Boolean(domain.activeIdentityKey && account.identityKey === domain.activeIdentityKey);
|
|
161
198
|
if (isCurrentAccount) {
|
|
162
199
|
existing.isCurrentAccount = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../../lib/codex-native/accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AACxH,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAIxG,MAAM,UAAU,aAAa,CAAC,MAAyB,EAAE,QAAuB;IAC9E,MAAM,eAAe,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACtD,MAAM,cAAc,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACnD,MAAM,mBAAmB,GAAG,QAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,CAAA;IACtD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC;QACzC,SAAS,EAAE,mBAAmB;QAC9B,KAAK,EAAE,eAAe;QACtB,IAAI,EAAE,cAAc;KACrB,CAAC,CAAA;IACF,MAAM,WAAW,GAAG,iBAAiB;QACnC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,CAAA;YACpD,MAAM,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACpD,MAAM,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACjD,OAAO,CACL,iBAAiB,KAAK,mBAAmB;gBACzC,aAAa,KAAK,eAAe;gBACjC,YAAY,KAAK,cAAc,CAChC,CAAA;QACH,CAAC,CAAC;QACJ,CAAC,CAAC,SAAS,CAAA;IAEb,IAAI,KAAgC,CAAA;IACpC,IAAI,wBAAwB,GAAG,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../../lib/codex-native/accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AACxH,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAIxG,MAAM,UAAU,aAAa,CAAC,MAAyB,EAAE,QAAuB;IAC9E,MAAM,eAAe,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACtD,MAAM,cAAc,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACnD,MAAM,mBAAmB,GAAG,QAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,CAAA;IACtD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC;QACzC,SAAS,EAAE,mBAAmB;QAC9B,KAAK,EAAE,eAAe;QACtB,IAAI,EAAE,cAAc;KACrB,CAAC,CAAA;IACF,MAAM,WAAW,GAAG,iBAAiB;QACnC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,CAAA;YACpD,MAAM,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACpD,MAAM,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACjD,OAAO,CACL,iBAAiB,KAAK,mBAAmB;gBACzC,aAAa,KAAK,eAAe;gBACjC,YAAY,KAAK,cAAc,CAChC,CAAA;QACH,CAAC,CAAC;QACJ,CAAC,CAAC,SAAS,CAAA;IAEb,IAAI,KAAgC,CAAA;IACpC,IAAI,wBAAwB,GAAG,KAAK,CAAA;IACpC,IAAI,oBAAoB,GAAG,KAAK,CAAA;IAEhC,IAAI,WAAW,EAAE,CAAC;QAChB,KAAK,GAAG,WAAW,CAAA;IACrB,CAAC;SAAM,CAAC;QACN,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,CAAA;QAChD,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,eAAe,CAAC,CAAA;YACzG,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAChC,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;gBACnC,MAAM,uBAAuB,GAAG,gBAAgB,CAAC;oBAC/C,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE;oBACtC,KAAK,EAAE,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC;oBACtC,IAAI,EAAE,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC;iBACpC,CAAC,CAAA;gBACF,MAAM,sBAAsB,GAC1B,CAAC,iBAAiB,IAAI,CAAC,uBAAuB,IAAI,uBAAuB,KAAK,iBAAiB,CAAA;gBACjG,IAAI,sBAAsB,EAAE,CAAC;oBAC3B,KAAK,GAAG,SAAS,CAAA;oBACjB,wBAAwB,GAAG,IAAI,CAAA;oBAC/B,oBAAoB,GAAG,CAAC,uBAAuB,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAA;gBAC/E,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,IAAK,EAAoB,CAAA;IAC7C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC9B,CAAC;IAED,IAAI,CAAC,wBAAwB,IAAI,oBAAoB,EAAE,CAAC;QACtD,IAAI,mBAAmB;YAAE,MAAM,CAAC,SAAS,GAAG,mBAAmB,CAAA;QAC/D,IAAI,eAAe;YAAE,MAAM,CAAC,KAAK,GAAG,eAAe,CAAA;QACnD,IAAI,cAAc;YAAE,MAAM,CAAC,IAAI,GAAG,cAAc,CAAA;IAClD,CAAC;IAED,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS;QAAE,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;IACrE,IAAI,QAAQ,CAAC,OAAO;QAAE,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;IACvD,IAAI,QAAQ,CAAC,MAAM;QAAE,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;IACpD,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS;QAAE,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;IACrE,IAAI,QAAQ,CAAC,QAAQ,KAAK,SAAS;QAAE,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;IACxE,MAAM,CAAC,SAAS,GAAG,yBAAyB,CAAC,QAAQ,CAAC,SAAS,IAAI,KAAK,EAAE,SAAS,CAAC,CAAA;IAEpF,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC9B,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,iBAAiB;QAAE,MAAM,CAAC,WAAW,GAAG,iBAAiB,CAAA;IAEpF,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,OAA0E,EAC1E,KAAa;IAEb,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;IACpC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;IAClC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAA;IAC5C,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAE5F,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,GAAG,KAAK,KAAK,IAAI,GAAG,CAAA;IAC9C,IAAI,KAAK;QAAE,OAAO,KAAK,CAAA;IACvB,IAAI,QAAQ;QAAE,OAAO,MAAM,QAAQ,EAAE,CAAA;IACrC,OAAO,WAAW,KAAK,GAAG,CAAC,EAAE,CAAA;AAC/B,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAsB,EAAE,GAAW;IAC5D,OAAO,CACL,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,aAAa,GAAG,GAAG,CACnH,CAAA;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAsB;IAC3D,MAAM,UAAU,GAAG,yBAAyB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAC/D,OAAO,CAAC,SAAS,GAAG,UAAU,CAAA;IAC9B,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,MAAyB;IAClE,IACE,MAAM,CAAC,iBAAiB;QACxB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,MAAM,CAAC,iBAAiB,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC,EAChH,CAAC;QACD,OAAM;IACR,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,CAAC,WAAW,CAAC,CAAA;IACpG,MAAM,CAAC,iBAAiB,GAAG,QAAQ,EAAE,WAAW,CAAA;AAClD,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,MAAyB,EACzB,OAAoB,EACpB,iBAAkC;IAElC,MAAM,kBAAkB,GAAG,CAAC,KAAgC,EAAW,EAAE;QACvE,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAA;QACxB,IAAI,OAAO,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YAC7C,OAAO,KAAK,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,CAAA;QAClD,CAAC;QACD,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QACpF,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC/E,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC1E,OAAO,MAAM,IAAI,SAAS,IAAI,QAAQ,CAAA;IACxC,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;IAC3C,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,gBAAgB,GAAqB,iBAAiB;YAC1D,CAAC,CAAC,CAAC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAE,CAAC,OAAO,CAAW,CAAC,CAAC,CAAE,CAAC,QAAQ,CAAW,CAAC,CAAC;YACzG,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QACvB,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;YACxC,MAAM,WAAW,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAA;YAC3C,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,WAAW,GAAG,CAAC;gBAAE,SAAQ;YAClG,IAAI,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAAE,OAAO,WAAW,CAAA;QAC1E,CAAC;IACH,CAAC;IACD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;QAClG,IAAI,UAAU,IAAI,CAAC;YAAE,OAAO,UAAU,CAAA;IACxC,CAAC;IACD,OAAO,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAA;AACxE,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAIrC;IACC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IACtB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAuB,CAAA;IAE3C,MAAM,eAAe,GAAG,CAAC,QAAwB,EAAE,MAA0B,EAAE,EAAE;QAC/E,IAAI,CAAC,MAAM;YAAE,OAAM;QACnB,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/D,sBAAsB,CAAC,OAAO,CAAC,CAAA;YAC/B,MAAM,cAAc,GAClB,OAAO,CAAC,WAAW;gBACnB,gBAAgB,CAAC;oBACf,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC;oBACpC,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC;iBAClC,CAAC,CAAA;YACJ,MAAM,MAAM,GAAG,cAAc,IAAI,GAAG,QAAQ,iBAAiB,WAAW,EAAE,CAAA;YAE1E,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACjC,MAAM,aAAa,GAA0B,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC;gBAC1E,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAC,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,IAAI,GAAG;oBACjG,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,SAAS,CAAA;YAEf,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,gBAAgB,GACpB,QAAQ,KAAK,KAAK,CAAC,UAAU;oBAC7B,OAAO,CAAC,OAAO,KAAK,KAAK;oBACzB,OAAO,CAAC,MAAM,CAAC,iBAAiB,IAAI,OAAO,CAAC,WAAW,KAAK,MAAM,CAAC,iBAAiB,CAAC,CAAA;gBACvF,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;oBACf,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,KAAK,EAAE,IAAI,CAAC,IAAI;oBAChB,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,aAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE;oBAC1C,SAAS,EAAE,CAAC,QAAQ,CAAC;oBACrB,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa;oBACnD,gBAAgB;iBACjB,CAAC,CAAA;gBACF,SAAQ;YACV,CAAC;YAED,QAAQ,CAAC,SAAS,GAAG,yBAAyB,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAA;YACzF,QAAQ,CAAC,aAAa,GAAG;gBACvB,GAAG,CAAC,QAAQ,CAAC,aAAa,IAAI,EAAE,CAAC;gBACjC,CAAC,QAAQ,CAAC,EAAE,WAAW;aACxB,CAAA;YACD,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACzG,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;YACtC,CAAC;YACD,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;gBAC5D,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAA;YACzB,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,KAAK,cAAc,IAAI,aAAa,KAAK,cAAc,EAAE,CAAC;gBAC3E,QAAQ,CAAC,MAAM,GAAG,cAAc,CAAA;YAClC,CAAC;iBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,cAAc,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAC9G,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAA;YAC7B,CAAC;YACD,MAAM,gBAAgB,GACpB,QAAQ,KAAK,KAAK,CAAC,UAAU;gBAC7B,OAAO,CAAC,OAAO,KAAK,KAAK;gBACzB,OAAO,CAAC,MAAM,CAAC,iBAAiB,IAAI,OAAO,CAAC,WAAW,KAAK,MAAM,CAAC,iBAAiB,CAAC,CAAA;YACvF,IAAI,gBAAgB,EAAE,CAAC;gBACrB,QAAQ,CAAC,gBAAgB,GAAG,IAAI,CAAA;gBAChC,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAA;YAC5B,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IAED,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IACvC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IACrC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;AAC3E,CAAC;AAED,MAAM,UAAU,sCAAsC,CAAC,OAAsB;IAC3E,MAAM,MAAM,GACV,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC9G,IAAI,CAAC,OAAO,CAAC,SAAS;QAAE,OAAO,CAAC,SAAS,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAA;IAC9E,IAAI,CAAC,OAAO,CAAC,KAAK;QAAE,OAAO,CAAC,KAAK,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAClE,IAAI,CAAC,OAAO,CAAC,IAAI;QAAE,OAAO,CAAC,IAAI,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAA;IAC/D,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC7C,OAAO,CAAC,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1C,IAAI,OAAO,CAAC,SAAS;QAAE,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAA;IACnE,sBAAsB,CAAC,OAAO,CAAC,CAAA;IAC/B,sBAAsB,CAAC,OAAO,CAAC,CAAA;AACjC,CAAC"}
|
|
@@ -33,7 +33,7 @@ export async function runInteractiveAuthMenu(input) {
|
|
|
33
33
|
process.stdout.write(`\n${report}\n\n`);
|
|
34
34
|
},
|
|
35
35
|
onConfigureModels: async () => {
|
|
36
|
-
process.stdout.write("\nConfigure provider models in opencode.json and runtime flags in codex-config.
|
|
36
|
+
process.stdout.write("\nConfigure provider models in opencode.json and runtime flags in codex-config.jsonc.\n\n");
|
|
37
37
|
},
|
|
38
38
|
onTransfer: async () => {
|
|
39
39
|
const transfer = await importLegacyInstallData();
|
|
@@ -170,7 +170,7 @@ export async function runInteractiveAuthMenu(input) {
|
|
|
170
170
|
const domain = getOpenAIOAuthDomain(authFile, mode);
|
|
171
171
|
if (!domain)
|
|
172
172
|
continue;
|
|
173
|
-
const idx = findDomainAccountIndex(domain, account);
|
|
173
|
+
const idx = findDomainAccountIndex(domain, account, mode);
|
|
174
174
|
if (idx < 0)
|
|
175
175
|
continue;
|
|
176
176
|
const target = domain.accounts[idx];
|
|
@@ -195,7 +195,7 @@ export async function runInteractiveAuthMenu(input) {
|
|
|
195
195
|
const domain = getOpenAIOAuthDomain(authFile, mode);
|
|
196
196
|
if (!domain)
|
|
197
197
|
return authFile;
|
|
198
|
-
const idx = findDomainAccountIndex(domain, account);
|
|
198
|
+
const idx = findDomainAccountIndex(domain, account, mode);
|
|
199
199
|
if (idx < 0)
|
|
200
200
|
return authFile;
|
|
201
201
|
const target = domain.accounts[idx];
|
|
@@ -292,7 +292,7 @@ export async function runInteractiveAuthMenu(input) {
|
|
|
292
292
|
const domain = getOpenAIOAuthDomain(authFile, mode);
|
|
293
293
|
if (!domain)
|
|
294
294
|
continue;
|
|
295
|
-
const idx = findDomainAccountIndex(domain, account);
|
|
295
|
+
const idx = findDomainAccountIndex(domain, account, mode);
|
|
296
296
|
if (idx < 0)
|
|
297
297
|
continue;
|
|
298
298
|
domain.accounts.splice(idx, 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-menu-flow.js","sourceRoot":"","sources":["../../../lib/codex-native/auth-menu-flow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC5F,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AACpE,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,uBAAuB,EACvB,eAAe,EACf,eAAe,EACf,yBAAyB,EAC1B,MAAM,eAAe,CAAA;AAEtB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,EACtB,sCAAsC,EACtC,0BAA0B,EAC3B,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAQvE,MAAM,0BAA0B,GAAG,MAAM,CAAA;AAEzC,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,KAAkC;IAC7E,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,MAAM,eAAe,EAAE,CAAA;QACpC,MAAM,YAAY,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QACzD,MAAM,WAAW,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACvD,MAAM,YAAY,GAAG,qBAAqB,CAAC;YACzC,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,WAAW;YAClB,UAAU,EAAE,KAAK,CAAC,QAAQ;SAC3B,CAAC,CAAA;QACF,MAAM,aAAa,GAAG,MAAM,yBAAyB,EAAE,CAAA;QAEvD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;YACnC,QAAQ,EAAE,YAAY;YACtB,aAAa;YACb,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ,EAAE;gBACR,aAAa,EAAE,KAAK,IAAI,EAAE;oBACxB,MAAM,KAAK,CAAC,gCAAgC,EAAE,CAAA;oBAC9C,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,SAAS,EAAE,SAAS,EAAE;wBAC7D,KAAK,EAAE,MAAM;wBACb,QAAQ,EAAE,cAAc,EAAE;qBAC3B,CAAC,CAAA;oBACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,MAAM,CAAC,CAAA;gBACzC,CAAC;gBACD,iBAAiB,EAAE,KAAK,IAAI,EAAE;oBAC5B,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,0FAA0F,CAC3F,CAAA;gBACH,CAAC;gBACD,UAAU,EAAE,KAAK,IAAI,EAAE;oBACrB,MAAM,QAAQ,GAAG,MAAM,uBAAuB,EAAE,CAAA;oBAChD,IAAI,QAAQ,GAAG,CAAC,CAAA;oBAChB,IAAI,SAAS,GAAG,CAAC,CAAA;oBACjB,MAAM,aAAa,GAMd,EAAE,CAAA;oBAEP,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;wBAC5C,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAU,EAAE,CAAC;4BAChD,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;4BACnD,IAAI,CAAC,MAAM;gCAAE,SAAQ;4BAErB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;gCAC/D,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gCACtC,IAAI,CAAC,OAAO;oCAAE,SAAQ;gCACtB,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAA;gCACtD,sCAAsC,CAAC,OAAO,CAAC,CAAA;gCAC/C,MAAM,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAA;gCACjE,IAAI,CAAC,WAAW,IAAI,sBAAsB;oCAAE,QAAQ,IAAI,CAAC,CAAA;gCAEzD,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;oCAClD,SAAQ;gCACV,CAAC;gCACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;gCACtB,IAAI,OAAO,OAAO,CAAC,iBAAiB,KAAK,QAAQ,IAAI,OAAO,CAAC,iBAAiB,GAAG,GAAG,EAAE,CAAC;oCACrF,SAAQ;gCACV,CAAC;gCACD,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC;oCAC7C,OAAO,OAAO,CAAC,iBAAiB,CAAA;oCAChC,SAAQ;gCACV,CAAC;gCACD,MAAM,UAAU,GAAG,GAAG,GAAG,0BAA0B,CAAA;gCACnD,OAAO,CAAC,iBAAiB,GAAG,UAAU,CAAA;gCACtC,aAAa,CAAC,IAAI,CAAC;oCACjB,IAAI;oCACJ,YAAY,EAAE,KAAK;oCACnB,WAAW,EAAE,OAAO,CAAC,WAAW;oCAChC,YAAY,EAAE,OAAO,CAAC,OAAO;oCAC7B,UAAU;iCACX,CAAC,CAAA;4BACJ,CAAC;wBACH,CAAC;wBACD,OAAO,QAAQ,CAAA;oBACjB,CAAC,CAAC,CAAA;oBAEF,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;wBAClC,IAAI,CAAC;4BACH,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;4BAC3D,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;gCAC5C,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;gCACzD,IAAI,CAAC,MAAM;oCAAE,OAAO,QAAQ,CAAA;gCAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;gCACnD,IAAI,CAAC,OAAO;oCAAE,OAAO,QAAQ,CAAA;gCAC7B,IACE,OAAO,CAAC,iBAAiB,KAAK,KAAK,CAAC,UAAU;oCAC9C,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC,YAAY;oCACtC,CAAC,KAAK,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,KAAK,KAAK,CAAC,WAAW,CAAC,EAChE,CAAC;oCACD,OAAO,QAAQ,CAAA;gCACjB,CAAC;gCAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;gCACtB,IACE,OAAO,CAAC,OAAO,KAAK,KAAK;oCACzB,OAAO,OAAO,CAAC,iBAAiB,KAAK,QAAQ;oCAC7C,OAAO,CAAC,iBAAiB,KAAK,KAAK,CAAC,UAAU;oCAC9C,OAAO,CAAC,iBAAiB,IAAI,GAAG,EAChC,CAAC;oCACD,OAAO,OAAO,CAAC,iBAAiB,CAAA;oCAChC,OAAO,QAAQ,CAAA;gCACjB,CAAC;gCAED,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAA;gCACtD,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,YAAY,CAAC,CAAA;gCACrE,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,aAAa,CAAA;gCACtC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY,CAAA;gCACpC,OAAO,CAAC,OAAO,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,IAAI,CAAA;gCAC1D,OAAO,CAAC,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,SAAS,CAAA;gCACjE,OAAO,CAAC,KAAK,GAAG,sBAAsB,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,KAAK,CAAA;gCAC/D,OAAO,CAAC,IAAI,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,IAAI,CAAA;gCAC5D,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAA;gCACtB,sCAAsC,CAAC,OAAO,CAAC,CAAA;gCAC/C,IAAI,CAAC,WAAW,IAAI,gBAAgB,CAAC,OAAO,CAAC;oCAAE,QAAQ,IAAI,CAAC,CAAA;gCAC5D,SAAS,IAAI,CAAC,CAAA;gCACd,OAAO,OAAO,CAAC,iBAAiB,CAAA;gCAChC,OAAO,OAAO,CAAC,aAAa,CAAA;gCAC5B,OAAO,QAAQ,CAAA;4BACjB,CAAC,CAAC,CAAA;wBACJ,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACf,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;gCAC5C,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;gCACzD,IAAI,CAAC,MAAM;oCAAE,OAAO,QAAQ,CAAA;gCAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;gCACnD,IAAI,CAAC,OAAO;oCAAE,OAAO,QAAQ,CAAA;gCAC7B,IACE,OAAO,CAAC,iBAAiB,KAAK,KAAK,CAAC,UAAU;oCAC9C,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC,YAAY;oCACtC,CAAC,KAAK,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,KAAK,KAAK,CAAC,WAAW,CAAC,EAChE,CAAC;oCACD,OAAO,QAAQ,CAAA;gCACjB,CAAC;gCACD,IAAI,OAAO,CAAC,iBAAiB,KAAK,KAAK,CAAC,UAAU,EAAE,CAAC;oCACnD,OAAO,OAAO,CAAC,iBAAiB,CAAA;oCAChC,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;wCAC9B,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,0BAA0B,CAAA;oCACjE,CAAC;gCACH,CAAC;gCACD,OAAO,QAAQ,CAAA;4BACjB,CAAC,CAAC,CAAA;4BACF,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gCAC3B,oCAAoC;4BACtC,CAAC;wBACH,CAAC;oBACH,CAAC;oBAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,iCAAiC,QAAQ,CAAC,QAAQ,yBAAyB,QAAQ,aAAa;wBAC9F,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,SAAS,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,CACrE,CAAA;gBACH,CAAC;gBACD,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;oBAC3B,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;wBAC5C,MAAM,OAAO,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,CAAE,CAAC,QAAQ,EAAE,OAAO,CAAW,CAAC,CAAC,CAAE,CAAC,KAAK,CAAW,CAAA;wBACtF,KAAK,MAAM,UAAU,IAAI,OAAO,EAAE,CAAC;4BACjC,MAAM,MAAM,GAAG,uBAAuB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;4BAC5D,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAA;4BACpB,MAAM,CAAC,iBAAiB,GAAG,SAAS,CAAA;wBACtC,CAAC;wBACD,OAAO,QAAQ,CAAA;oBACjB,CAAC,CAAC,CAAA;oBACF,MAAM,YAAY,GAChB,KAAK,KAAK,MAAM;wBACd,CAAC,CAAC,8BAA8B;wBAChC,CAAC,CAAC,WAAW,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,0BAA0B,CAAA;oBAClF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,YAAY,MAAM,CAAC,CAAA;gBAC/C,CAAC;gBACD,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;oBACjC,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;wBAC5C,MAAM,SAAS,GACb,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;wBACzF,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;4BAC7B,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;4BACnD,IAAI,CAAC,MAAM;gCAAE,SAAQ;4BACrB,MAAM,GAAG,GAAG,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;4BACnD,IAAI,GAAG,GAAG,CAAC;gCAAE,SAAQ;4BACrB,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;4BACnC,IAAI,CAAC,MAAM;gCAAE,SAAQ;4BACrB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,KAAK,KAAK,CAAA;4BACzC,0BAA0B,CAAC,MAAM,CAAC,CAAA;wBACpC,CAAC;wBACD,OAAO,QAAQ,CAAA;oBACjB,CAAC,CAAC,CAAA;oBACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;gBACvD,CAAC;gBACD,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;oBAClC,IAAI,SAAS,GAAG,KAAK,CAAA;oBACrB,MAAM,SAAS,GAAG;wBAChB,KAAK,CAAC,QAAQ;wBACd,GAAI,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,QAAQ,CAAsB;qBAC7F,CAAA;oBAED,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;wBAC7B,IAAI,KAOS,CAAA;wBAEb,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;4BAC5C,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;4BACnD,IAAI,CAAC,MAAM;gCAAE,OAAO,QAAQ,CAAA;4BAC5B,MAAM,GAAG,GAAG,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;4BACnD,IAAI,GAAG,GAAG,CAAC;gCAAE,OAAO,QAAQ,CAAA;4BAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;4BACnC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW;gCAAE,OAAO,QAAQ,CAAA;4BAElG,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;4BACtB,IAAI,OAAO,MAAM,CAAC,iBAAiB,KAAK,QAAQ,IAAI,MAAM,CAAC,iBAAiB,GAAG,GAAG;gCAAE,OAAO,QAAQ,CAAA;4BAEnG,MAAM,UAAU,GAAG,GAAG,GAAG,0BAA0B,CAAA;4BACnD,MAAM,CAAC,iBAAiB,GAAG,UAAU,CAAA;4BACrC,KAAK,GAAG;gCACN,IAAI;gCACJ,WAAW,EAAE,MAAM,CAAC,WAAW;gCAC/B,YAAY,EAAE,MAAM,CAAC,OAAO;gCAC5B,UAAU;6BACX,CAAA;4BACD,OAAO,QAAQ,CAAA;wBACjB,CAAC,CAAC,CAAA;wBAEF,IAAI,CAAC,KAAK;4BAAE,SAAQ;wBACpB,MAAM,OAAO,GAAG,KAAK,CAAA;wBAErB,IAAI,CAAC;4BACH,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;4BAC7D,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;gCAC5C,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;gCAC3D,IAAI,CAAC,MAAM;oCAAE,OAAO,QAAQ,CAAA;gCAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;gCACzF,IAAI,CAAC,MAAM;oCAAE,OAAO,QAAQ,CAAA;gCAE5B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;gCACtB,IACE,MAAM,CAAC,OAAO,KAAK,KAAK;oCACxB,OAAO,MAAM,CAAC,iBAAiB,KAAK,QAAQ;oCAC5C,MAAM,CAAC,iBAAiB,KAAK,OAAO,CAAC,UAAU;oCAC/C,MAAM,CAAC,iBAAiB,IAAI,GAAG;oCAC/B,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,YAAY,EACvC,CAAC;oCACD,IAAI,MAAM,CAAC,iBAAiB,KAAK,OAAO,CAAC,UAAU,EAAE,CAAC;wCACpD,OAAO,MAAM,CAAC,iBAAiB,CAAA;oCACjC,CAAC;oCACD,OAAO,QAAQ,CAAA;gCACjB,CAAC;gCAED,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,YAAY,CAAC,CAAA;gCACrE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,aAAa,CAAA;gCACrC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY,CAAA;gCACnC,MAAM,CAAC,OAAO,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,IAAI,CAAA;gCACzD,MAAM,CAAC,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,CAAA;gCAC/D,MAAM,CAAC,KAAK,GAAG,sBAAsB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAA;gCAC7D,MAAM,CAAC,IAAI,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAA;gCAC1D,MAAM,CAAC,QAAQ,GAAG,GAAG,CAAA;gCACrB,sBAAsB,CAAC,MAAM,CAAC,CAAA;gCAC9B,iBAAiB,CAAC,MAAM,CAAC,CAAA;gCACzB,IAAI,MAAM,CAAC,WAAW;oCAAE,MAAM,CAAC,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAA;gCACrE,OAAO,MAAM,CAAC,iBAAiB,CAAA;gCAC/B,OAAO,MAAM,CAAC,aAAa,CAAA;gCAC3B,SAAS,GAAG,IAAI,CAAA;gCAChB,OAAO,QAAQ,CAAA;4BACjB,CAAC,CAAC,CAAA;wBACJ,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACf,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;gCAC5C,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;gCAC3D,IAAI,CAAC,MAAM;oCAAE,OAAO,QAAQ,CAAA;gCAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;gCACzF,IAAI,CAAC,MAAM;oCAAE,OAAO,QAAQ,CAAA;gCAC5B,IAAI,MAAM,CAAC,iBAAiB,KAAK,OAAO,CAAC,UAAU,IAAI,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC;oCAC/F,OAAO,MAAM,CAAC,iBAAiB,CAAA;oCAC/B,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;wCAC7B,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,0BAA0B,CAAA;oCAChE,CAAC;gCACH,CAAC;qCAAM,IAAI,MAAM,CAAC,iBAAiB,KAAK,OAAO,CAAC,UAAU,EAAE,CAAC;oCAC3D,OAAO,MAAM,CAAC,iBAAiB,CAAA;gCACjC,CAAC;gCACD,OAAO,QAAQ,CAAA;4BACjB,CAAC,CAAC,CAAA;4BACF,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gCAC3B,8DAA8D;4BAChE,CAAC;wBACH,CAAC;wBAED,IAAI,SAAS;4BAAE,MAAK;oBACtB,CAAC;oBACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,SAAS;wBACP,CAAC,CAAC,uCAAuC;wBACzC,CAAC,CAAC,4EAA4E,CACjF,CAAA;gBACH,CAAC;gBACD,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;oBACxC,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;wBAC5C,MAAM,OAAO,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,CAAE,CAAC,QAAQ,EAAE,OAAO,CAAW,CAAC,CAAC,CAAE,CAAC,KAAK,CAAW,CAAA;wBACtF,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;4BAC3B,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;4BACnD,IAAI,CAAC,MAAM;gCAAE,SAAQ;4BACrB,MAAM,GAAG,GAAG,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;4BACnD,IAAI,GAAG,GAAG,CAAC;gCAAE,SAAQ;4BACrB,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;4BAC9B,0BAA0B,CAAC,MAAM,CAAC,CAAA;wBACpC,CAAC;wBACD,OAAO,QAAQ,CAAA;oBACjB,CAAC,CAAC,CAAA;oBACF,MAAM,YAAY,GAChB,KAAK,KAAK,MAAM;wBACd,CAAC,CAAC,kBAAkB;wBACpB,CAAC,CAAC,WAAW,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,qBAAqB,CAAA;oBAC7E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,YAAY,MAAM,CAAC,CAAA;gBAC/C,CAAC;aACF;SACF,CAAC,CAAA;QAEF,IAAI,MAAM,KAAK,KAAK;YAAE,OAAO,KAAK,CAAA;QAClC,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,IAAI,KAAK,CAAC,SAAS;gBAAE,OAAO,MAAM,CAAA;YAClC,SAAQ;QACV,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"auth-menu-flow.js","sourceRoot":"","sources":["../../../lib/codex-native/auth-menu-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,14 +35,18 @@ export declare function handleChatParamsHook(input: {
|
|
|
35
35
|
lastCatalogModels: CodexModelInfo[] | undefined;
|
|
36
36
|
behaviorSettings?: BehaviorSettings;
|
|
37
37
|
fallbackPersonality?: PersonalityOption;
|
|
38
|
+
projectRoot?: string;
|
|
38
39
|
spoofMode: CodexSpoofMode;
|
|
39
40
|
collaborationProfileEnabled: boolean;
|
|
40
41
|
orchestratorSubagentsEnabled: boolean;
|
|
41
|
-
}): Promise<
|
|
42
|
+
}): Promise<{
|
|
43
|
+
injectedCatalogDefaultFields: string[];
|
|
44
|
+
}>;
|
|
42
45
|
export declare function handleChatHeadersHook(input: {
|
|
43
46
|
hookInput: {
|
|
44
47
|
model: {
|
|
45
48
|
providerID?: string;
|
|
49
|
+
id?: string;
|
|
46
50
|
};
|
|
47
51
|
sessionID: string;
|
|
48
52
|
agent?: unknown;
|
|
@@ -52,7 +56,10 @@ export declare function handleChatHeadersHook(input: {
|
|
|
52
56
|
};
|
|
53
57
|
spoofMode: CodexSpoofMode;
|
|
54
58
|
requestCatalogScopeKey?: string;
|
|
59
|
+
injectedCatalogDefaultFields?: string[];
|
|
55
60
|
internalCatalogScopeHeader: string;
|
|
61
|
+
internalCatalogDefaultsHeader: string;
|
|
62
|
+
internalSelectedModelHeader: string;
|
|
56
63
|
internalCollaborationModeHeader: string;
|
|
57
64
|
internalCollaborationAgentHeader: string;
|
|
58
65
|
collaborationProfileEnabled: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-hooks.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/chat-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,OAAO,EACL,iCAAiC,
|
|
1
|
+
{"version":3,"file":"chat-hooks.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/chat-hooks.ts"],"names":[],"mappings":"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"}
|