Import Codex accounts registered in Orca #4394
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| import type { importOrcaAccounts } from "../codex/orca-import"; | ||
|
|
||
| const USAGE = "Usage: ocx account import-orca --source <orca-data-directory> --registry <orca-data.json> [--apply] [--json]"; | ||
|
|
||
| export interface OrcaImportCommandDeps { | ||
| importAccounts?: typeof importOrcaAccounts; | ||
| } | ||
|
|
||
| /** Local-only: never sends source paths or credentials to a management listener. */ | ||
| export async function cmdOrcaImport(args: string[], deps: OrcaImportCommandDeps = {}): Promise<number> { | ||
| let sourceDir: string | undefined; | ||
| let registryPath: string | undefined; | ||
| let apply = false; | ||
| const wantsJson = args.includes("--json"); | ||
| const seen = new Set<string>(); | ||
| for (let index = 0; index < args.length; index++) { | ||
| const arg = args[index]!; | ||
| if (seen.has(arg) || !["--source", "--registry", "--apply", "--json"].includes(arg)) { | ||
| console.error(USAGE); | ||
| return 1; | ||
| } | ||
| seen.add(arg); | ||
| if (arg === "--source" || arg === "--registry") { | ||
| const value = args[++index]; | ||
| if (!value || value.startsWith("--")) { | ||
| console.error(USAGE); | ||
| return 1; | ||
| } | ||
| if (arg === "--source") sourceDir = value; | ||
| else registryPath = value; | ||
| } else if (arg === "--apply") apply = true; | ||
| } | ||
| if (!sourceDir || !registryPath) { | ||
| console.error(USAGE); | ||
| return 1; | ||
| } | ||
| try { | ||
| const run = deps.importAccounts ?? (await import("../codex/orca-import")).importOrcaAccounts; | ||
| const result = await run({ sourceDir, registryPath, apply }); | ||
| if (wantsJson) console.log(JSON.stringify({ | ||
| mode: result.mode, discovered: result.discovered, eligible: result.eligible, | ||
| imported: result.imported, duplicates: result.duplicates, invalid: result.invalid, | ||
| })); | ||
| else { | ||
| console.log(`Orca: ${result.discovered} discovered, ${result.eligible} eligible, ${result.imported} imported, ${result.duplicates} duplicates, ${result.invalid} invalid.`); | ||
| console.log(apply | ||
| ? "Start the proxy and use Refresh quotas in Codex Auth to validate new accounts. Orca retains refresh ownership." | ||
| : "Preview only. Stop the proxy before repeating with --apply. Orca authentication files stay read-only."); | ||
| } | ||
| return result.invalid > 0 ? 1 : 0; | ||
| } catch { | ||
| // Filesystem/JSON exceptions may contain source paths or token fragments. | ||
| const error = "Orca import failed. Check the source, destination config, and stopped proxy; no successful completion is confirmed."; | ||
| if (wantsJson) console.log(JSON.stringify({ error: "orca_import_failed" })); | ||
| else console.error(error); | ||
| return 1; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚀 Performance & Scalability | 🔵 Trivial | 🏗️ Heavy lift
🔎 Supported by static analysis
🏁 Script executed:
Repository: lidge-jun/opencodex
Length of output: 4814
🏁 Script executed:
Repository: lidge-jun/opencodex
Length of output: 37419
🏁 Script executed:
Repository: lidge-jun/opencodex
Length of output: 50376
🏁 Script executed:
Repository: lidge-jun/opencodex
Length of output: 50376
🏁 Script executed:
Repository: lidge-jun/opencodex
Length of output: 16379
🏁 Script executed:
Repository: lidge-jun/opencodex
Length of output: 24426
🏁 Script executed:
Repository: lidge-jun/opencodex
Length of output: 4107
Avoid the mutation lock for unchanged source credentials.
resolveCodexTokenloads the account store, thenresolveOrcaSourceTokenloads it again underwithCredentialMutationLockSyncand reads both Orca files synchronously.BEGIN IMMEDIATEusesbusy_timeout = 0, so another process holding the configuration transaction raisesCodexCredentialRefreshLockTimeoutError; quota handling reportsquotaProbeSkipped.Read the source without the mutation lock first. When the source credential changed, acquire the lock, reload the account record, reread the source, and persist only after the identity and generation checks pass. Do not add a plain 5-second TTL:
tests/codex-integration/orca-import.test.tsrequires an immediate reread after source rotation, andreadCodexAccountRecordstill reparses the store rather than providing a zero-I/O cache.🤖 Prompt for AI Agents