@iam-brain/opencode-codex-auth 1.1.0 → 1.1.1
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 +15 -13
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +17 -12
- package/dist/index.js.map +1 -1
- package/dist/lib/account-auth-types.d.ts +3 -0
- package/dist/lib/account-auth-types.d.ts.map +1 -0
- package/dist/lib/account-auth-types.js +18 -0
- package/dist/lib/account-auth-types.js.map +1 -0
- package/dist/lib/auth-messages.d.ts +16 -0
- package/dist/lib/auth-messages.d.ts.map +1 -0
- package/dist/lib/auth-messages.js +15 -0
- package/dist/lib/auth-messages.js.map +1 -0
- package/dist/lib/cache-io.d.ts.map +1 -1
- package/dist/lib/cache-io.js +26 -2
- package/dist/lib/cache-io.js.map +1 -1
- package/dist/lib/codex-native/accounts.d.ts +1 -4
- package/dist/lib/codex-native/accounts.d.ts.map +1 -1
- package/dist/lib/codex-native/accounts.js +1 -24
- package/dist/lib/codex-native/accounts.js.map +1 -1
- package/dist/lib/codex-native/acquire-auth.d.ts.map +1 -1
- package/dist/lib/codex-native/acquire-auth.js +9 -2
- package/dist/lib/codex-native/acquire-auth.js.map +1 -1
- package/dist/lib/codex-native/auth-menu-flow.js +2 -2
- package/dist/lib/codex-native/auth-menu-flow.js.map +1 -1
- package/dist/lib/codex-native/chat-hooks.d.ts +0 -2
- package/dist/lib/codex-native/chat-hooks.d.ts.map +1 -1
- package/dist/lib/codex-native/chat-hooks.js +16 -11
- package/dist/lib/codex-native/chat-hooks.js.map +1 -1
- package/dist/lib/codex-native/collaboration.d.ts +2 -4
- package/dist/lib/codex-native/collaboration.d.ts.map +1 -1
- package/dist/lib/codex-native/collaboration.js +21 -35
- package/dist/lib/codex-native/collaboration.js.map +1 -1
- package/dist/lib/codex-native/oauth-auth-methods.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-auth-methods.js +5 -1
- package/dist/lib/codex-native/oauth-auth-methods.js.map +1 -1
- package/dist/lib/codex-native/oauth-server.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-server.js +52 -9
- package/dist/lib/codex-native/oauth-server.js.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.d.ts.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.js +105 -78
- package/dist/lib/codex-native/openai-loader-fetch.js.map +1 -1
- package/dist/lib/codex-native/request-routing.d.ts.map +1 -1
- package/dist/lib/codex-native/request-routing.js +18 -1
- package/dist/lib/codex-native/request-routing.js.map +1 -1
- package/dist/lib/codex-native/request-transform-pipeline.d.ts +9 -2
- package/dist/lib/codex-native/request-transform-pipeline.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-pipeline.js +11 -7
- package/dist/lib/codex-native/request-transform-pipeline.js.map +1 -1
- package/dist/lib/codex-native/request-transform.d.ts +39 -0
- package/dist/lib/codex-native/request-transform.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform.js +321 -276
- package/dist/lib/codex-native/request-transform.js.map +1 -1
- package/dist/lib/codex-native.d.ts +0 -2
- package/dist/lib/codex-native.d.ts.map +1 -1
- package/dist/lib/codex-native.js +5 -6
- package/dist/lib/codex-native.js.map +1 -1
- package/dist/lib/codex-status-storage.d.ts.map +1 -1
- package/dist/lib/codex-status-storage.js +3 -0
- package/dist/lib/codex-status-storage.js.map +1 -1
- package/dist/lib/config-dir-gitignore.d.ts +1 -1
- package/dist/lib/config-dir-gitignore.d.ts.map +1 -1
- package/dist/lib/config-dir-gitignore.js +2 -0
- package/dist/lib/config-dir-gitignore.js.map +1 -1
- package/dist/lib/config.d.ts +0 -3
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +9 -31
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/fetch-orchestrator.js +2 -2
- package/dist/lib/fetch-orchestrator.js.map +1 -1
- package/dist/lib/model-catalog.d.ts.map +1 -1
- package/dist/lib/model-catalog.js +44 -27
- package/dist/lib/model-catalog.js.map +1 -1
- package/dist/lib/oauth-pages.d.ts +1 -1
- package/dist/lib/oauth-pages.d.ts.map +1 -1
- package/dist/lib/oauth-pages.js +6 -1
- package/dist/lib/oauth-pages.js.map +1 -1
- package/dist/lib/orchestrator-agent.d.ts.map +1 -1
- package/dist/lib/orchestrator-agent.js +3 -1
- package/dist/lib/orchestrator-agent.js.map +1 -1
- package/dist/lib/quarantine.d.ts.map +1 -1
- package/dist/lib/quarantine.js +27 -5
- package/dist/lib/quarantine.js.map +1 -1
- package/dist/lib/request-snapshots.d.ts.map +1 -1
- package/dist/lib/request-snapshots.js +72 -9
- package/dist/lib/request-snapshots.js.map +1 -1
- package/dist/lib/rotation.d.ts.map +1 -1
- package/dist/lib/rotation.js +9 -9
- package/dist/lib/rotation.js.map +1 -1
- package/dist/lib/storage.d.ts.map +1 -1
- package/dist/lib/storage.js +38 -29
- package/dist/lib/storage.js.map +1 -1
- package/dist/lib/toast.d.ts.map +1 -1
- package/dist/lib/toast.js +7 -1
- package/dist/lib/toast.js.map +1 -1
- package/dist/lib/ui/auth-menu.d.ts.map +1 -1
- package/dist/lib/ui/auth-menu.js +4 -17
- package/dist/lib/ui/auth-menu.js.map +1 -1
- package/package.json +1 -1
- package/schemas/codex-config.schema.json +0 -4
- package/dist/lib/auth-refresh.d.ts +0 -2
- package/dist/lib/auth-refresh.d.ts.map +0 -1
- package/dist/lib/auth-refresh.js +0 -2
- package/dist/lib/auth-refresh.js.map +0 -1
- package/dist/lib/constants.d.ts +0 -2
- package/dist/lib/constants.d.ts.map +0 -1
- package/dist/lib/constants.js +0 -2
- package/dist/lib/constants.js.map +0 -1
- package/dist/lib/tools-output.d.ts +0 -6
- package/dist/lib/tools-output.d.ts.map +0 -1
- package/dist/lib/tools-output.js +0 -6
- package/dist/lib/tools-output.js.map +0 -1
package/README.md
CHANGED
|
@@ -42,31 +42,33 @@ This plugin is intended for personal development use with your own ChatGPT accou
|
|
|
42
42
|
|
|
43
43
|
## Install behavior
|
|
44
44
|
|
|
45
|
-
By default, `npx -y @iam-brain/opencode-codex-auth` runs the installer.
|
|
45
|
+
By default, `npx -y @iam-brain/opencode-codex-auth@latest` runs the installer.
|
|
46
46
|
|
|
47
47
|
The installer does four things:
|
|
48
48
|
|
|
49
|
-
1. Ensures `@iam-brain/opencode-codex-auth@latest` is present in
|
|
50
|
-
2. Creates
|
|
51
|
-
3. Synchronizes
|
|
52
|
-
4. Synchronizes
|
|
49
|
+
1. Ensures `@iam-brain/opencode-codex-auth@latest` is present in resolved `<config-root>/opencode.json` (`$XDG_CONFIG_HOME/opencode` when set, otherwise `~/.config/opencode`).
|
|
50
|
+
2. Creates `codex-config.json` with defaults at resolved config root (`$XDG_CONFIG_HOME/opencode` when set, otherwise `~/.config/opencode`) when missing.
|
|
51
|
+
3. Synchronizes `<config-root>/commands/create-personality.md` for `/create-personality` (created/updated as needed).
|
|
52
|
+
4. Synchronizes `<config-root>/skills/personality-builder/SKILL.md` (plus references) for skill-driven personality workflows.
|
|
53
53
|
|
|
54
54
|
At plugin startup, managed templates are synchronized to the latest version:
|
|
55
55
|
|
|
56
56
|
- `/create-personality` command template
|
|
57
57
|
- `personality-builder` skill bundle
|
|
58
|
+
- pinned Codex prompts cache (`codex-prompts-cache*.json`) is refreshed best-effort
|
|
59
|
+
- orchestrator agent visibility is reconciled based on effective collaboration profile
|
|
58
60
|
|
|
59
61
|
Re-run installer (idempotent):
|
|
60
62
|
|
|
61
63
|
```bash
|
|
62
|
-
npx -y @iam-brain/opencode-codex-auth install
|
|
64
|
+
npx -y @iam-brain/opencode-codex-auth@latest install
|
|
63
65
|
```
|
|
64
66
|
|
|
65
67
|
## Config split
|
|
66
68
|
|
|
67
69
|
Keep `opencode.json` minimal (plugin enablement only). Put runtime behavior in:
|
|
68
70
|
|
|
69
|
-
-
|
|
71
|
+
- resolved `<config-root>/codex-config.json`
|
|
70
72
|
|
|
71
73
|
Canonical config/env docs (complete key + variable reference) are in `docs/configuration.md`.
|
|
72
74
|
|
|
@@ -79,7 +81,7 @@ Schemas for user-edited JSON files are in:
|
|
|
79
81
|
Personality files live in lowercase directories:
|
|
80
82
|
|
|
81
83
|
- project-local: `.opencode/personalities/`
|
|
82
|
-
- global:
|
|
84
|
+
- global: resolved `<config-root>/personalities/`
|
|
83
85
|
|
|
84
86
|
Create guided custom personalities with:
|
|
85
87
|
|
|
@@ -94,14 +96,14 @@ Create guided custom personalities with:
|
|
|
94
96
|
|
|
95
97
|
## Account storage
|
|
96
98
|
|
|
97
|
-
-
|
|
98
|
-
-
|
|
99
|
-
- Session affinity cache:
|
|
100
|
-
- Quota snapshot cache:
|
|
99
|
+
- Primary runtime store: resolved `<config-root>/codex-accounts.json` (`$XDG_CONFIG_HOME/opencode` when set, otherwise `~/.config/opencode`)
|
|
100
|
+
- OpenCode provider auth marker (import source only): `~/.local/share/opencode/auth.json`
|
|
101
|
+
- Session affinity cache: resolved `<config-root>/cache/codex-session-affinity.json`
|
|
102
|
+
- Quota snapshot cache: resolved `<config-root>/cache/codex-snapshots.json`
|
|
101
103
|
|
|
102
104
|
Legacy sources can be imported explicitly from the auth menu:
|
|
103
105
|
|
|
104
|
-
-
|
|
106
|
+
- resolved `<config-root>/openai-codex-accounts.json`
|
|
105
107
|
- `~/.local/share/opencode/auth.json`
|
|
106
108
|
|
|
107
109
|
## Documentation
|
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;AAiDjD,eAAO,MAAM,qBAAqB,EAAE,MAyNnC,CAAA;AAED,eAAe,qBAAqB,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { tool } from "@opencode-ai/plugin";
|
|
2
2
|
import { listAccountsForTools, removeAccountByIndex, switchAccountByIndex, toggleAccountEnabledByIndex } from "./lib/accounts-tools";
|
|
3
|
+
import { removedAccountMessage, switchedAccountMessage, toggledAccountMessage } from "./lib/auth-messages";
|
|
3
4
|
import { CodexAuthPlugin, refreshAccessToken } from "./lib/codex-native";
|
|
4
|
-
import { ensureDefaultConfigFile, getCompatInputSanitizerEnabled, getCodexCompactionOverrideEnabled, getBehaviorSettings,
|
|
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";
|
|
5
6
|
import { createLogger } from "./lib/logger";
|
|
6
7
|
import { generatePersonaSpec } from "./lib/persona-tool";
|
|
7
8
|
import { createPersonalityFile } from "./lib/personality-create";
|
|
@@ -11,7 +12,6 @@ import { reconcileOrchestratorAgentVisibility } from "./lib/orchestrator-agent";
|
|
|
11
12
|
import { runOneProactiveRefreshTick } from "./lib/proactive-refresh";
|
|
12
13
|
import { toolOutputForStatus } from "./lib/codex-status-tool";
|
|
13
14
|
import { requireOpenAIMultiOauthAuth, saveAuthStorage } from "./lib/storage";
|
|
14
|
-
import { switchToolMessage } from "./lib/tools-output";
|
|
15
15
|
import { refreshCachedCodexPrompts } from "./lib/codex-prompts-cache";
|
|
16
16
|
import { setCodexPlanModeInstructions } from "./lib/codex-native/collaboration";
|
|
17
17
|
let scheduler;
|
|
@@ -96,7 +96,6 @@ export const OpenAIMultiAuthPlugin = async (input) => {
|
|
|
96
96
|
headerTransformDebug: getHeaderTransformDebugEnabled(cfg),
|
|
97
97
|
collaborationProfileEnabled,
|
|
98
98
|
orchestratorSubagentsEnabled: getOrchestratorSubagentsEnabled(cfg),
|
|
99
|
-
collaborationToolProfile: getCollaborationToolProfile(cfg),
|
|
100
99
|
behaviorSettings: getBehaviorSettings(cfg)
|
|
101
100
|
});
|
|
102
101
|
const z = tool.schema;
|
|
@@ -119,7 +118,7 @@ export const OpenAIMultiAuthPlugin = async (input) => {
|
|
|
119
118
|
const row = listAccountsForTools(openai)[index - 1];
|
|
120
119
|
const next = switchAccountByIndex(openai, index);
|
|
121
120
|
authFile.openai = next;
|
|
122
|
-
message =
|
|
121
|
+
message = switchedAccountMessage({ email: row?.email, plan: row?.plan, index1: index });
|
|
123
122
|
});
|
|
124
123
|
return message;
|
|
125
124
|
}
|
|
@@ -131,13 +130,17 @@ export const OpenAIMultiAuthPlugin = async (input) => {
|
|
|
131
130
|
let message = "";
|
|
132
131
|
await saveAuthStorage(undefined, (authFile) => {
|
|
133
132
|
const openai = requireOpenAIMultiOauthAuth(authFile);
|
|
134
|
-
const
|
|
133
|
+
const rowsBefore = listAccountsForTools(openai);
|
|
134
|
+
const row = rowsBefore[index - 1];
|
|
135
135
|
const next = toggleAccountEnabledByIndex(openai, index);
|
|
136
136
|
authFile.openai = next;
|
|
137
|
-
const
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
137
|
+
const enabled = listAccountsForTools(next)[index - 1]?.enabled === true;
|
|
138
|
+
message = toggledAccountMessage({
|
|
139
|
+
index1: index,
|
|
140
|
+
email: row?.email,
|
|
141
|
+
plan: row?.plan,
|
|
142
|
+
enabled
|
|
143
|
+
});
|
|
141
144
|
});
|
|
142
145
|
return message;
|
|
143
146
|
}
|
|
@@ -155,9 +158,11 @@ export const OpenAIMultiAuthPlugin = async (input) => {
|
|
|
155
158
|
const row = listAccountsForTools(openai)[index - 1];
|
|
156
159
|
const next = removeAccountByIndex(openai, index);
|
|
157
160
|
authFile.openai = next;
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
+
message = removedAccountMessage({
|
|
162
|
+
index1: index,
|
|
163
|
+
email: row?.email,
|
|
164
|
+
plan: row?.plan
|
|
165
|
+
});
|
|
161
166
|
});
|
|
162
167
|
return message;
|
|
163
168
|
}
|
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,qBAAqB,CAAA;AAE1C,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,2BAA2B,EAC5B,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACxE,OAAO,EACL,uBAAuB,EACvB,8BAA8B,EAC9B,iCAAiC,EACjC,mBAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account-auth-types.d.ts","sourceRoot":"","sources":["../../lib/account-auth-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,EAAE,CAe3E"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
const ACCOUNT_AUTH_TYPE_ORDER = ["native", "codex"];
|
|
2
|
+
export function normalizeAccountAuthTypes(input) {
|
|
3
|
+
const source = Array.isArray(input) ? input : ["native"];
|
|
4
|
+
const seen = new Set();
|
|
5
|
+
const out = [];
|
|
6
|
+
for (const rawType of source) {
|
|
7
|
+
const type = rawType === "codex" ? "codex" : rawType === "native" ? "native" : undefined;
|
|
8
|
+
if (!type || seen.has(type))
|
|
9
|
+
continue;
|
|
10
|
+
seen.add(type);
|
|
11
|
+
out.push(type);
|
|
12
|
+
}
|
|
13
|
+
if (out.length === 0)
|
|
14
|
+
out.push("native");
|
|
15
|
+
out.sort((a, b) => ACCOUNT_AUTH_TYPE_ORDER.indexOf(a) - ACCOUNT_AUTH_TYPE_ORDER.indexOf(b));
|
|
16
|
+
return out;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=account-auth-types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account-auth-types.js","sourceRoot":"","sources":["../../lib/account-auth-types.ts"],"names":[],"mappings":"AAEA,MAAM,uBAAuB,GAAsB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;AAEtE,MAAM,UAAU,yBAAyB,CAAC,KAAc;IACtD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;IACxD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAmB,CAAA;IACvC,MAAM,GAAG,GAAsB,EAAE,CAAA;IAEjC,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;QACxF,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAQ;QACrC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACd,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAChB,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACxC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IAC3F,OAAO,GAAG,CAAA;AACZ,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
type AccountLabelInput = {
|
|
2
|
+
email?: string;
|
|
3
|
+
plan?: string;
|
|
4
|
+
};
|
|
5
|
+
export declare function switchedAccountMessage(input: AccountLabelInput & {
|
|
6
|
+
index1: number;
|
|
7
|
+
}): string;
|
|
8
|
+
export declare function toggledAccountMessage(input: AccountLabelInput & {
|
|
9
|
+
index1: number;
|
|
10
|
+
enabled: boolean;
|
|
11
|
+
}): string;
|
|
12
|
+
export declare function removedAccountMessage(input: AccountLabelInput & {
|
|
13
|
+
index1: number;
|
|
14
|
+
}): string;
|
|
15
|
+
export {};
|
|
16
|
+
//# sourceMappingURL=auth-messages.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-messages.d.ts","sourceRoot":"","sources":["../../lib/auth-messages.ts"],"names":[],"mappings":"AAAA,KAAK,iBAAiB,GAAG;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAQD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,iBAAiB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAE5F;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,iBAAiB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAE7G;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,iBAAiB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAE3F"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
function accountLabel(input) {
|
|
2
|
+
const label = input.email ?? "account";
|
|
3
|
+
const plan = input.plan ? ` (${input.plan})` : "";
|
|
4
|
+
return `${label}${plan}`;
|
|
5
|
+
}
|
|
6
|
+
export function switchedAccountMessage(input) {
|
|
7
|
+
return `Switched to #${input.index1}: ${accountLabel(input)}`;
|
|
8
|
+
}
|
|
9
|
+
export function toggledAccountMessage(input) {
|
|
10
|
+
return `Updated #${input.index1}: ${accountLabel(input)} -> ${input.enabled ? "enabled" : "disabled"}`;
|
|
11
|
+
}
|
|
12
|
+
export function removedAccountMessage(input) {
|
|
13
|
+
return `Removed #${input.index1}: ${accountLabel(input)}`;
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=auth-messages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-messages.js","sourceRoot":"","sources":["../../lib/auth-messages.ts"],"names":[],"mappings":"AAKA,SAAS,YAAY,CAAC,KAAwB;IAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,SAAS,CAAA;IACtC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;IACjD,OAAO,GAAG,KAAK,GAAG,IAAI,EAAE,CAAA;AAC1B,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAA6C;IAClF,OAAO,gBAAgB,KAAK,CAAC,MAAM,KAAK,YAAY,CAAC,KAAK,CAAC,EAAE,CAAA;AAC/D,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAA+D;IACnG,OAAO,YAAY,KAAK,CAAC,MAAM,KAAK,YAAY,CAAC,KAAK,CAAC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAA;AACxG,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAA6C;IACjF,OAAO,YAAY,KAAK,CAAC,MAAM,KAAK,YAAY,CAAC,KAAK,CAAC,EAAE,CAAA;AAC3D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-io.d.ts","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEtC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,KAAK,IAAI,CAAA;AAI3F,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAEjF;AAYD,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED,wBAAsB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQjF;AAED,wBAAsB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAa3F;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAInF;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"cache-io.d.ts","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEtC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,KAAK,IAAI,CAAA;AAI3F,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAEjF;AAYD,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED,wBAAsB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQjF;AAED,wBAAsB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAa3F;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAInF;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BzF;AAED,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAS7F;AAED,wBAAsB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CASnG;AAED,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAAC,IAAI,CAAC,CAOf"}
|
package/dist/lib/cache-io.js
CHANGED
|
@@ -50,8 +50,32 @@ export async function writeJsonFile(filePath, value) {
|
|
|
50
50
|
export async function writeJsonFileAtomic(filePath, value) {
|
|
51
51
|
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
|
52
52
|
const tempPath = `${filePath}.tmp.${Date.now().toString(36)}.${Math.random().toString(36).slice(2, 8)}`;
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
try {
|
|
54
|
+
await fs.writeFile(tempPath, `${JSON.stringify(value, null, 2)}\n`, { mode: 0o600 });
|
|
55
|
+
const tempHandle = await fs.open(tempPath, "r");
|
|
56
|
+
try {
|
|
57
|
+
await tempHandle.sync();
|
|
58
|
+
}
|
|
59
|
+
finally {
|
|
60
|
+
await tempHandle.close();
|
|
61
|
+
}
|
|
62
|
+
await fs.rename(tempPath, filePath);
|
|
63
|
+
const dirHandle = await fs.open(path.dirname(filePath), "r");
|
|
64
|
+
try {
|
|
65
|
+
await dirHandle.sync();
|
|
66
|
+
}
|
|
67
|
+
finally {
|
|
68
|
+
await dirHandle.close();
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
await fs.unlink(tempPath).catch((unlinkError) => {
|
|
73
|
+
if (!isFsErrorCode(unlinkError, "ENOENT")) {
|
|
74
|
+
// best-effort temp cleanup only
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
throw error;
|
|
78
|
+
}
|
|
55
79
|
await enforceOwnerOnlyPermissions(filePath);
|
|
56
80
|
}
|
|
57
81
|
export async function writeJsonFileBestEffort(filePath, value) {
|
package/dist/lib/cache-io.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-io.js","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACjC,OAAO,IAAI,MAAM,WAAW,CAAA;AAK5B,IAAI,sBAA+C,CAAA;AAEnD,MAAM,UAAU,yBAAyB,CAAC,QAAiC;IACzE,sBAAsB,GAAG,QAAQ,CAAA;AACnC,CAAC;AAED,SAAS,oBAAoB,CAAC,SAAiB,EAAE,QAAgB,EAAE,KAAc;IAC/E,IAAI,CAAC;QACH,sBAAsB,EAAE,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAA;IAC1D,CAAC;IAAC,OAAO,aAAa,EAAE,CAAC;QACvB,IAAI,aAAa,YAAY,KAAK,EAAE,CAAC;YACnC,+BAA+B;QACjC,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAc,EAAE,IAAY;IACxD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,CAAA;AAC9F,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,QAAgB;IAChE,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;IACjC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC;YACtE,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,QAAgB;IAC3D,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAA;IACnC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;YACpC,oBAAoB,CAAC,wBAAwB,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;QACjE,CAAC;QACD,IAAI,KAAK,YAAY,WAAW,IAAI,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;YACnE,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,QAAgB,EAAE,KAAc;IAClE,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3D,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;IACpF,MAAM,2BAA2B,CAAC,QAAQ,CAAC,CAAA;AAC7C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,QAAgB,EAAE,KAAc;IACxE,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3D,MAAM,QAAQ,GAAG,GAAG,QAAQ,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAA;IACvG,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"cache-io.js","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import type { AccountAuthType, AccountRecord, OpenAIAuthMode, OpenAIOAuthDomain } from "../types";
|
|
2
|
-
import type { AccountInfo
|
|
3
|
-
export declare function normalizeAccountAuthTypes(input: unknown): AccountAuthType[];
|
|
4
|
-
export declare function mergeAccountAuthTypes(existing: unknown, incoming: unknown): AccountAuthType[];
|
|
5
|
-
export declare function removeAccountAuthType(existing: unknown, scope: Exclude<DeleteScope, "both">): AccountAuthType[];
|
|
2
|
+
import type { AccountInfo } from "../ui/auth-menu";
|
|
6
3
|
export declare function upsertAccount(openai: OpenAIOAuthDomain, incoming: AccountRecord): AccountRecord;
|
|
7
4
|
export declare function formatAccountLabel(account: {
|
|
8
5
|
email?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/accounts.ts"],"names":[],"mappings":"
|
|
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,UAAU,CAAA;AACjG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAElD,wBAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,aAAa,GAAG,aAAa,CAyD/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,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,WAAW,GAAG,MAAM,CAW9F;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,CAoEhB;AAED,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAWnF"}
|
|
@@ -1,29 +1,6 @@
|
|
|
1
1
|
import { extractAccountIdFromClaims, extractEmailFromClaims, extractPlanFromClaims, parseJwtClaims } from "../claims";
|
|
2
|
+
import { normalizeAccountAuthTypes } from "../account-auth-types";
|
|
2
3
|
import { buildIdentityKey, normalizeEmail, normalizePlan, synchronizeIdentityKey } from "../identity";
|
|
3
|
-
const ACCOUNT_AUTH_TYPE_ORDER = ["native", "codex"];
|
|
4
|
-
export function normalizeAccountAuthTypes(input) {
|
|
5
|
-
const source = Array.isArray(input) ? input : ["native"];
|
|
6
|
-
const seen = new Set();
|
|
7
|
-
const out = [];
|
|
8
|
-
for (const rawType of source) {
|
|
9
|
-
const type = rawType === "codex" ? "codex" : rawType === "native" ? "native" : undefined;
|
|
10
|
-
if (!type || seen.has(type))
|
|
11
|
-
continue;
|
|
12
|
-
seen.add(type);
|
|
13
|
-
out.push(type);
|
|
14
|
-
}
|
|
15
|
-
if (out.length === 0)
|
|
16
|
-
out.push("native");
|
|
17
|
-
out.sort((a, b) => ACCOUNT_AUTH_TYPE_ORDER.indexOf(a) - ACCOUNT_AUTH_TYPE_ORDER.indexOf(b));
|
|
18
|
-
return out;
|
|
19
|
-
}
|
|
20
|
-
export function mergeAccountAuthTypes(existing, incoming) {
|
|
21
|
-
const merged = [...normalizeAccountAuthTypes(existing), ...normalizeAccountAuthTypes(incoming)];
|
|
22
|
-
return normalizeAccountAuthTypes(merged);
|
|
23
|
-
}
|
|
24
|
-
export function removeAccountAuthType(existing, scope) {
|
|
25
|
-
return normalizeAccountAuthTypes(existing).filter((type) => type !== scope);
|
|
26
|
-
}
|
|
27
4
|
export function upsertAccount(openai, incoming) {
|
|
28
5
|
const normalizedEmail = normalizeEmail(incoming.email);
|
|
29
6
|
const normalizedPlan = normalizePlan(incoming.plan);
|
|
@@ -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,WAAW,CAAA;AACrH,OAAO,EAAE,
|
|
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,WAAW,CAAA;AACrH,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAA;AACjE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAIrG,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,MAAM,oBAAoB,GACxB,WAAW,IAAI,CAAC,QAAQ,CAAC,OAAO;QAC9B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO,CAAC,CAAA;IAE/E,MAAM,KAAK,GAAG,WAAW,IAAI,oBAAoB,CAAA;IACjD,MAAM,wBAAwB,GAAG,oBAAoB,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,CAAA;IAChG,MAAM,cAAc,GAClB,wBAAwB;QACxB,iBAAiB,KAAK,SAAS;QAC/B,KAAK,EAAE,WAAW,KAAK,SAAS;QAChC,KAAK,CAAC,WAAW,KAAK,iBAAiB,CAAA;IAEzC,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,cAAc,CAAC,CAAC,CAAE,EAAoB,CAAC,CAAC,CAAC,KAAK,CAAA;IACvE,IAAI,CAAC,KAAK,IAAI,cAAc,EAAE,CAAC;QAC7B,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC9B,CAAC;IAED,IAAI,CAAC,wBAAwB,IAAI,cAAc,EAAE,CAAC;QAChD,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,CAAC,MAAyB,EAAE,OAAoB;IACpF,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;QACzC,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,CAAC,CAAA;AACJ,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,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,sBAAsB,CAAC,OAAO,CAAC,CAAA;YAC/B,MAAM,QAAQ,GACZ,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;gBACF,GAAG,QAAQ,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,IAAI,SAAS,EAAE,CAAA;YAElF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YACnC,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,MAAM,CAAC,iBAAiB,IAAI,OAAO,CAAC,WAAW,KAAK,MAAM,CAAC,iBAAiB,CAAC,CAAA;gBACvF,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;oBACjB,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,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,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,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acquire-auth.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/acquire-auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAyB,QAAQ,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAA;AAG1G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAA2C,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAE9F,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"acquire-auth.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/acquire-auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAyB,QAAQ,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAA;AAG1G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAA2C,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAE9F,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAoBhE,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,cAAc,CAAA;IACxB,OAAO,CAAC,EAAE,4BAA4B,CAAA;IACtC,iBAAiB,EAAE,OAAO,CAAA;IAC1B,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACpC,2BAA2B,EAAE,MAAM,IAAI,CAAA;IACvC,gBAAgB,EAAE,OAAO,CAAA;IACzB,0BAA0B,CAAC,EAAE,gBAAgB,CAAA;IAC7C,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED,wBAAgB,oCAAoC,IAAI;IACtD,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,kBAAkB,EAAE,kBAAkB,CAAA;CACvC,CAKA;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,QAAQ,CAAC,CA6ZxF"}
|
|
@@ -7,6 +7,7 @@ import { formatAccountLabel } from "./accounts";
|
|
|
7
7
|
import { extractAccountId, refreshAccessToken } from "./oauth-utils";
|
|
8
8
|
const AUTH_REFRESH_FAILURE_COOLDOWN_MS = 30_000;
|
|
9
9
|
const AUTH_REFRESH_LEASE_MS = 30_000;
|
|
10
|
+
const LAST_USED_WRITE_INTERVAL_MS = 5_000;
|
|
10
11
|
function isOAuthTokenRefreshError(value) {
|
|
11
12
|
return value instanceof Error && ("status" in value || "oauthCode" in value);
|
|
12
13
|
}
|
|
@@ -162,7 +163,10 @@ export async function acquireOpenAIAuth(input) {
|
|
|
162
163
|
email = selected.email;
|
|
163
164
|
plan = selected.plan;
|
|
164
165
|
if (selected.access && selected.expires && selected.expires > now) {
|
|
165
|
-
selected.lastUsed
|
|
166
|
+
const previousLastUsed = typeof selected.lastUsed === "number" ? selected.lastUsed : undefined;
|
|
167
|
+
if (previousLastUsed === undefined || now - previousLastUsed >= LAST_USED_WRITE_INTERVAL_MS) {
|
|
168
|
+
selected.lastUsed = now;
|
|
169
|
+
}
|
|
166
170
|
access = selected.access;
|
|
167
171
|
accountId = selected.accountId;
|
|
168
172
|
identityKey = selected.identityKey;
|
|
@@ -229,7 +233,10 @@ export async function acquireOpenAIAuth(input) {
|
|
|
229
233
|
if (claims?.plan)
|
|
230
234
|
selected.plan = normalizePlan(claims.plan);
|
|
231
235
|
ensureIdentityKey(selected);
|
|
232
|
-
selected.lastUsed
|
|
236
|
+
const previousLastUsed = typeof selected.lastUsed === "number" ? selected.lastUsed : undefined;
|
|
237
|
+
if (previousLastUsed === undefined || now - previousLastUsed >= LAST_USED_WRITE_INTERVAL_MS) {
|
|
238
|
+
selected.lastUsed = now;
|
|
239
|
+
}
|
|
233
240
|
delete selected.refreshLeaseUntil;
|
|
234
241
|
delete selected.cooldownUntil;
|
|
235
242
|
if (selected.identityKey)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acquire-auth.js","sourceRoot":"","sources":["../../../lib/codex-native/acquire-auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"acquire-auth.js","sourceRoot":"","sources":["../../../lib/codex-native/acquire-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -172,7 +172,7 @@ export async function runInteractiveAuthMenu(input) {
|
|
|
172
172
|
}
|
|
173
173
|
return authFile;
|
|
174
174
|
});
|
|
175
|
-
process.stdout.write("\
|
|
175
|
+
process.stdout.write("\nAccount status updated.\n\n");
|
|
176
176
|
},
|
|
177
177
|
onRefreshAccount: async (account) => {
|
|
178
178
|
let refreshed = false;
|
|
@@ -268,7 +268,7 @@ export async function runInteractiveAuthMenu(input) {
|
|
|
268
268
|
}
|
|
269
269
|
process.stdout.write(refreshed
|
|
270
270
|
? "\nAccount refreshed successfully.\n\n"
|
|
271
|
-
: "\nAccount refresh failed. Run login to reauthenticate.\n\n");
|
|
271
|
+
: "\nAccount refresh failed. Run `opencode auth login` to reauthenticate.\n\n");
|
|
272
272
|
},
|
|
273
273
|
onDeleteAccount: async (account, scope) => {
|
|
274
274
|
await saveAuthStorage(undefined, (authFile) => {
|