codex-multi-auth 0.1.0 → 0.1.2
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/LICENSE +1 -1
- package/README.md +223 -98
- package/assets/readme-hero.svg +31 -31
- package/config/README.md +30 -87
- package/config/{opencode-legacy.json → codex-legacy.json} +571 -571
- package/config/{opencode-modern.json → codex-modern.json} +241 -239
- package/config/{minimal-opencode.json → minimal-codex.json} +15 -13
- package/config/schema/config.schema.json +21 -0
- package/dist/index.d.ts +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +23 -20
- package/dist/index.js.map +1 -1
- package/dist/lib/accounts.d.ts +1 -1
- package/dist/lib/accounts.d.ts.map +1 -1
- package/dist/lib/auth/auth.d.ts +1 -1
- package/dist/lib/auth/auth.js +1 -1
- package/dist/lib/cli.d.ts +1 -1
- package/dist/lib/cli.js +4 -4
- package/dist/lib/cli.js.map +1 -1
- package/dist/lib/codex-manager/settings-hub.d.ts +6 -0
- package/dist/lib/codex-manager/settings-hub.d.ts.map +1 -0
- package/dist/lib/codex-manager/settings-hub.js +1786 -0
- package/dist/lib/codex-manager/settings-hub.js.map +1 -0
- package/dist/lib/codex-manager.d.ts.map +1 -1
- package/dist/lib/codex-manager.js +5 -1637
- package/dist/lib/codex-manager.js.map +1 -1
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +20 -11
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/context-overflow.d.ts +1 -1
- package/dist/lib/context-overflow.js +11 -11
- package/dist/lib/oauth-success.html +1 -1
- package/dist/lib/prompts/codex-host-bridge.d.ts +19 -0
- package/dist/lib/prompts/codex-host-bridge.d.ts.map +1 -0
- package/dist/lib/prompts/{codex-opencode-bridge.js → codex-host-bridge.js} +143 -143
- package/dist/lib/prompts/codex-host-bridge.js.map +1 -0
- package/dist/lib/prompts/codex.d.ts +2 -2
- package/dist/lib/prompts/codex.d.ts.map +1 -1
- package/dist/lib/prompts/codex.js +3 -3
- package/dist/lib/prompts/host-codex-prompt.d.ts +25 -0
- package/dist/lib/prompts/host-codex-prompt.d.ts.map +1 -0
- package/dist/lib/prompts/{opencode-codex.js → host-codex-prompt.js} +136 -47
- package/dist/lib/prompts/host-codex-prompt.js.map +1 -0
- package/dist/lib/recovery/storage.d.ts +2 -2
- package/dist/lib/recovery/storage.js +2 -2
- package/dist/lib/recovery/types.d.ts +1 -1
- package/dist/lib/recovery/types.js +1 -1
- package/dist/lib/recovery.d.ts +1 -1
- package/dist/lib/recovery.d.ts.map +1 -1
- package/dist/lib/recovery.js +1 -4
- package/dist/lib/recovery.js.map +1 -1
- package/dist/lib/request/fetch-helpers.d.ts +3 -3
- package/dist/lib/request/fetch-helpers.d.ts.map +1 -1
- package/dist/lib/request/fetch-helpers.js +6 -2
- package/dist/lib/request/fetch-helpers.js.map +1 -1
- package/dist/lib/request/helpers/input-utils.d.ts +2 -2
- package/dist/lib/request/helpers/input-utils.d.ts.map +1 -1
- package/dist/lib/request/helpers/input-utils.js +14 -14
- package/dist/lib/request/helpers/input-utils.js.map +1 -1
- package/dist/lib/request/helpers/model-map.d.ts +2 -2
- package/dist/lib/request/helpers/model-map.js +2 -2
- package/dist/lib/request/request-transformer.d.ts +12 -12
- package/dist/lib/request/request-transformer.d.ts.map +1 -1
- package/dist/lib/request/request-transformer.js +23 -24
- package/dist/lib/request/request-transformer.js.map +1 -1
- package/dist/lib/runtime-paths.d.ts +4 -4
- package/dist/lib/runtime-paths.d.ts.map +1 -1
- package/dist/lib/runtime-paths.js +57 -13
- package/dist/lib/runtime-paths.js.map +1 -1
- package/dist/lib/storage/paths.d.ts +11 -0
- package/dist/lib/storage/paths.d.ts.map +1 -1
- package/dist/lib/storage/paths.js +167 -5
- package/dist/lib/storage/paths.js.map +1 -1
- package/dist/lib/storage.d.ts +1 -0
- package/dist/lib/storage.d.ts.map +1 -1
- package/dist/lib/storage.js +290 -81
- package/dist/lib/storage.js.map +1 -1
- package/dist/lib/tools/hashline-tools.d.ts +1 -1
- package/dist/lib/tools/hashline-tools.d.ts.map +1 -1
- package/dist/lib/tools/hashline-tools.js +1 -1
- package/dist/lib/tools/hashline-tools.js.map +1 -1
- package/dist/lib/types.d.ts +1 -1
- package/dist/lib/types.d.ts.map +1 -1
- package/dist/lib/ui/copy.d.ts +6 -6
- package/dist/lib/ui/copy.js +6 -6
- package/dist/lib/ui/copy.js.map +1 -1
- package/node_modules/@codex-ai/plugin/dist/index.d.ts +2 -0
- package/node_modules/@codex-ai/plugin/dist/index.js +2 -0
- package/node_modules/@codex-ai/plugin/dist/tool.d.ts +42 -0
- package/node_modules/@codex-ai/plugin/dist/tool.js +29 -0
- package/node_modules/@codex-ai/plugin/package.json +9 -0
- package/package.json +30 -16
- package/scripts/audit-dev-allowlist.js +128 -128
- package/scripts/bench-format/{opencode.mjs → codex-host.mjs} +206 -205
- package/scripts/bench-format/hashline-v2.mjs +642 -642
- package/scripts/bench-format/models.mjs +111 -105
- package/scripts/bench-format/render.mjs +496 -496
- package/scripts/bench-format/stats.mjs +54 -54
- package/scripts/bench-format/tasks.mjs +151 -151
- package/scripts/benchmark-edit-formats.mjs +1162 -1161
- package/scripts/benchmark-render-dashboard.mjs +49 -49
- package/scripts/codex.js +40 -2
- package/scripts/copy-oauth-success.js +37 -37
- package/scripts/install-codex-auth-utils.js +49 -0
- package/scripts/{install-opencode-codex-auth.js → install-codex-auth.js} +220 -193
- package/scripts/repo-hygiene.js +320 -0
- package/scripts/test-all-models.sh +7 -7
- package/scripts/test-model-matrix.js +475 -423
- package/scripts/validate-model-map.sh +7 -7
- package/vendor/codex-ai-plugin/dist/index.d.ts +2 -0
- package/vendor/codex-ai-plugin/dist/index.js +2 -0
- package/vendor/codex-ai-plugin/dist/tool.d.ts +42 -0
- package/vendor/codex-ai-plugin/dist/tool.js +29 -0
- package/vendor/codex-ai-plugin/package.json +9 -0
- package/vendor/codex-ai-sdk/dist/index.d.ts +4 -0
- package/vendor/codex-ai-sdk/dist/index.js +2 -0
- package/vendor/codex-ai-sdk/package.json +8 -0
- package/assets/opencode-logo-ornate-dark.svg +0 -18
- package/dist/lib/prompts/codex-opencode-bridge.d.ts +0 -19
- package/dist/lib/prompts/codex-opencode-bridge.d.ts.map +0 -1
- package/dist/lib/prompts/codex-opencode-bridge.js.map +0 -1
- package/dist/lib/prompts/opencode-codex.d.ts +0 -25
- package/dist/lib/prompts/opencode-codex.d.ts.map +0 -1
- package/dist/lib/prompts/opencode-codex.js.map +0 -1
|
@@ -298,7 +298,7 @@ export function prewarmCodexInstructions(models = []) {
|
|
|
298
298
|
}
|
|
299
299
|
}
|
|
300
300
|
/**
|
|
301
|
-
* Tool remapping instructions for
|
|
301
|
+
* Tool remapping instructions for host runtime tools
|
|
302
302
|
*/
|
|
303
303
|
export const TOOL_REMAP_MESSAGE = `<user_instructions priority="0">
|
|
304
304
|
<environment_override priority="0">
|
|
@@ -307,7 +307,7 @@ YOU ARE IN A DIFFERENT ENVIRONMENT. These instructions override ALL previous too
|
|
|
307
307
|
|
|
308
308
|
<tool_replacements priority="0">
|
|
309
309
|
<critical_rule priority="0">
|
|
310
|
-
apply_patch/applyPatch are Codex names, but
|
|
310
|
+
apply_patch/applyPatch are Codex names, but host tool names vary by version.
|
|
311
311
|
- Inspect the actual tool list before editing.
|
|
312
312
|
- If edit exists: use edit for precise in-place string replacements and hashline edits.
|
|
313
313
|
- If edit is absent and apply_patch exists: use apply_patch for those precise/hashline edits in this plugin.
|
|
@@ -329,7 +329,7 @@ File Operations:
|
|
|
329
329
|
- write - Create new files (if available)
|
|
330
330
|
- edit - Modify existing files with string replacement (version-dependent)
|
|
331
331
|
- oldString must be literal text from the current file; never pass unresolved placeholders like \${TARGET_SNIPPET}
|
|
332
|
-
- apply_patch - May be the edit/patch tool name in newer
|
|
332
|
+
- apply_patch - May be the edit/patch tool name in newer host builds (version-dependent)
|
|
333
333
|
- hashline_read - Read lines with hashline refs (L<line>#<hash>) for deterministic edits
|
|
334
334
|
- patch - Apply diff patches (version-dependent)
|
|
335
335
|
- read - Read file contents
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Codex Prompt Fetcher
|
|
3
|
+
*
|
|
4
|
+
* Fetches and caches the codex.txt system prompt from upstream GitHub sources.
|
|
5
|
+
* Uses ETag-based caching to efficiently track updates.
|
|
6
|
+
*/
|
|
7
|
+
/**
|
|
8
|
+
* Fetch codex.txt prompt with ETag-based caching
|
|
9
|
+
* Uses HTTP conditional requests to efficiently check for updates
|
|
10
|
+
*
|
|
11
|
+
* Rate limit protection: Only checks GitHub if cache is older than 15 minutes
|
|
12
|
+
* @returns The codex.txt content
|
|
13
|
+
*/
|
|
14
|
+
export declare function getHostCodexPrompt(): Promise<string>;
|
|
15
|
+
/**
|
|
16
|
+
* Get first N characters of the cached prompt for verification
|
|
17
|
+
* @param chars Number of characters to get (default: 50)
|
|
18
|
+
* @returns First N characters or null if not cached
|
|
19
|
+
*/
|
|
20
|
+
export declare function getCachedPromptPrefix(chars?: number): Promise<string | null>;
|
|
21
|
+
/**
|
|
22
|
+
* Prewarm the prompt cache without blocking startup.
|
|
23
|
+
*/
|
|
24
|
+
export declare function prewarmHostCodexPrompt(): void;
|
|
25
|
+
//# sourceMappingURL=host-codex-prompt.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"host-codex-prompt.d.ts","sourceRoot":"","sources":["../../../lib/prompts/host-codex-prompt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA6UH;;;;;;GAMG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CA+B1D;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,SAAK,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAO9E;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAI7C"}
|
|
@@ -1,29 +1,39 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* Codex Prompt Fetcher
|
|
3
3
|
*
|
|
4
|
-
* Fetches and caches the codex.txt system prompt from
|
|
4
|
+
* Fetches and caches the codex.txt system prompt from upstream GitHub sources.
|
|
5
5
|
* Uses ETag-based caching to efficiently track updates.
|
|
6
6
|
*/
|
|
7
7
|
import { join } from "node:path";
|
|
8
|
-
import { mkdir, readFile, writeFile } from "node:fs/promises";
|
|
8
|
+
import { mkdir, readFile, writeFile, rename, rm } from "node:fs/promises";
|
|
9
9
|
import { logDebug } from "../logger.js";
|
|
10
10
|
import { getCodexCacheDir } from "../runtime-paths.js";
|
|
11
11
|
import { sleep } from "../utils.js";
|
|
12
|
-
const
|
|
13
|
-
"https://raw.githubusercontent.com/anomalyco/
|
|
14
|
-
"https://raw.githubusercontent.com/sst/
|
|
15
|
-
"https://raw.githubusercontent.com/anomalyco/
|
|
16
|
-
"https://raw.githubusercontent.com/sst/
|
|
17
|
-
"https://raw.githubusercontent.com/anomalyco/
|
|
18
|
-
"https://raw.githubusercontent.com/sst/
|
|
19
|
-
"https://raw.githubusercontent.com/anomalyco/
|
|
20
|
-
"https://raw.githubusercontent.com/sst/
|
|
12
|
+
const DEFAULT_HOST_CODEX_PROMPT_URLS = [
|
|
13
|
+
"https://raw.githubusercontent.com/anomalyco/Codex/dev/packages/Codex/src/session/prompt/codex.txt",
|
|
14
|
+
"https://raw.githubusercontent.com/sst/Codex/dev/packages/Codex/src/session/prompt/codex.txt",
|
|
15
|
+
"https://raw.githubusercontent.com/anomalyco/Codex/main/packages/Codex/src/session/prompt/codex.txt",
|
|
16
|
+
"https://raw.githubusercontent.com/sst/Codex/main/packages/Codex/src/session/prompt/codex.txt",
|
|
17
|
+
"https://raw.githubusercontent.com/anomalyco/Codex/dev/packages/Codex/src/session/prompt/codex.md",
|
|
18
|
+
"https://raw.githubusercontent.com/sst/Codex/dev/packages/Codex/src/session/prompt/codex.md",
|
|
19
|
+
"https://raw.githubusercontent.com/anomalyco/Codex/main/packages/Codex/src/session/prompt/codex.md",
|
|
20
|
+
"https://raw.githubusercontent.com/sst/Codex/main/packages/Codex/src/session/prompt/codex.md",
|
|
21
21
|
];
|
|
22
22
|
const CODEX_PROMPT_URL_OVERRIDE_ENV = "CODEX_PROMPT_SOURCE_URL";
|
|
23
|
-
const
|
|
23
|
+
const LEGACY_HOST_CODEX_URL_OVERRIDE_ENV = "CODEX_CODEX_PROMPT_URL";
|
|
24
24
|
const CACHE_DIR = getCodexCacheDir();
|
|
25
|
-
const CACHE_FILE = join(CACHE_DIR, "
|
|
26
|
-
const CACHE_META_FILE = join(CACHE_DIR, "
|
|
25
|
+
const CACHE_FILE = join(CACHE_DIR, "host-codex-prompt.txt");
|
|
26
|
+
const CACHE_META_FILE = join(CACHE_DIR, "host-codex-prompt-meta.json");
|
|
27
|
+
const LEGACY_CACHE_FILES = [
|
|
28
|
+
{
|
|
29
|
+
content: join(CACHE_DIR, "opencode-codex-prompt.txt"),
|
|
30
|
+
meta: join(CACHE_DIR, "opencode-codex-prompt-meta.json"),
|
|
31
|
+
},
|
|
32
|
+
{
|
|
33
|
+
content: join(CACHE_DIR, "codex-prompt.txt"),
|
|
34
|
+
meta: join(CACHE_DIR, "codex-prompt-meta.json"),
|
|
35
|
+
},
|
|
36
|
+
];
|
|
27
37
|
const CACHE_TTL_MS = 15 * 60 * 1000;
|
|
28
38
|
const RETRYABLE_FS_ERROR_CODES = new Set(["EBUSY", "EPERM"]);
|
|
29
39
|
const WRITE_RETRY_ATTEMPTS = 5;
|
|
@@ -51,7 +61,7 @@ function parseSourceUrl(source) {
|
|
|
51
61
|
try {
|
|
52
62
|
const parsed = new URL(trimmed);
|
|
53
63
|
if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
|
|
54
|
-
logDebug("Ignoring
|
|
64
|
+
logDebug("Ignoring codex prompt source override due to protocol", {
|
|
55
65
|
source: redactSourceForLog(trimmed),
|
|
56
66
|
});
|
|
57
67
|
return undefined;
|
|
@@ -59,7 +69,7 @@ function parseSourceUrl(source) {
|
|
|
59
69
|
return trimmed;
|
|
60
70
|
}
|
|
61
71
|
catch {
|
|
62
|
-
logDebug("Ignoring invalid
|
|
72
|
+
logDebug("Ignoring invalid codex prompt source override", {
|
|
63
73
|
source: redactSourceForLog(trimmed),
|
|
64
74
|
});
|
|
65
75
|
return undefined;
|
|
@@ -95,6 +105,68 @@ async function writeFileWithRetry(filePath, content) {
|
|
|
95
105
|
}
|
|
96
106
|
throw lastError instanceof Error ? lastError : new Error("Failed to write prompt cache file");
|
|
97
107
|
}
|
|
108
|
+
async function renameWithRetry(fromPath, toPath) {
|
|
109
|
+
let lastError;
|
|
110
|
+
for (let attempt = 0; attempt < WRITE_RETRY_ATTEMPTS; attempt += 1) {
|
|
111
|
+
try {
|
|
112
|
+
await rename(fromPath, toPath);
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
catch (error) {
|
|
116
|
+
if (!isRetryableFsError(error) || attempt + 1 >= WRITE_RETRY_ATTEMPTS) {
|
|
117
|
+
throw error;
|
|
118
|
+
}
|
|
119
|
+
lastError = error;
|
|
120
|
+
await sleep(WRITE_RETRY_BASE_DELAY_MS * 2 ** attempt);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
throw lastError instanceof Error ? lastError : new Error("Failed to rename prompt cache file");
|
|
124
|
+
}
|
|
125
|
+
async function removeFileQuietly(path) {
|
|
126
|
+
try {
|
|
127
|
+
await rm(path, { force: true });
|
|
128
|
+
}
|
|
129
|
+
catch {
|
|
130
|
+
// Best-effort cleanup only.
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
async function writeCacheFilesAtomically(content, meta) {
|
|
134
|
+
await mkdir(CACHE_DIR, { recursive: true });
|
|
135
|
+
const nonce = `${Date.now()}-${process.pid}-${Math.random().toString(36).slice(2, 8)}`;
|
|
136
|
+
const contentTmp = `${CACHE_FILE}.${nonce}.tmp`;
|
|
137
|
+
const metaTmp = `${CACHE_META_FILE}.${nonce}.tmp`;
|
|
138
|
+
const metaJson = JSON.stringify(meta, null, 2);
|
|
139
|
+
await writeFileWithRetry(contentTmp, content);
|
|
140
|
+
try {
|
|
141
|
+
await writeFileWithRetry(metaTmp, metaJson);
|
|
142
|
+
}
|
|
143
|
+
catch (error) {
|
|
144
|
+
await removeFileQuietly(contentTmp);
|
|
145
|
+
throw error;
|
|
146
|
+
}
|
|
147
|
+
let renamedContent = false;
|
|
148
|
+
try {
|
|
149
|
+
await renameWithRetry(contentTmp, CACHE_FILE);
|
|
150
|
+
renamedContent = true;
|
|
151
|
+
await renameWithRetry(metaTmp, CACHE_META_FILE);
|
|
152
|
+
}
|
|
153
|
+
catch (error) {
|
|
154
|
+
if (renamedContent) {
|
|
155
|
+
// If only one rename succeeded, restore consistency by rewriting the content file.
|
|
156
|
+
try {
|
|
157
|
+
await writeFileWithRetry(CACHE_FILE, content);
|
|
158
|
+
}
|
|
159
|
+
catch (recoveryError) {
|
|
160
|
+
logDebug("Failed to restore host-codex prompt content after partial rename failure", {
|
|
161
|
+
error: String(recoveryError),
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
await removeFileQuietly(contentTmp);
|
|
166
|
+
await removeFileQuietly(metaTmp);
|
|
167
|
+
throw error;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
98
170
|
function resolvePromptSources() {
|
|
99
171
|
const sources = [];
|
|
100
172
|
const seen = new Set();
|
|
@@ -106,40 +178,57 @@ function resolvePromptSources() {
|
|
|
106
178
|
sources.push(parsed);
|
|
107
179
|
};
|
|
108
180
|
add(process.env[CODEX_PROMPT_URL_OVERRIDE_ENV]);
|
|
109
|
-
add(process.env[
|
|
110
|
-
for (const source of
|
|
181
|
+
add(process.env[LEGACY_HOST_CODEX_URL_OVERRIDE_ENV]);
|
|
182
|
+
for (const source of DEFAULT_HOST_CODEX_PROMPT_URLS) {
|
|
111
183
|
add(source);
|
|
112
184
|
}
|
|
113
185
|
return sources;
|
|
114
186
|
}
|
|
115
187
|
async function readDiskCache() {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
188
|
+
const tryRead = async (contentPath, metaPath) => {
|
|
189
|
+
try {
|
|
190
|
+
const [content, metaContent] = await Promise.all([
|
|
191
|
+
readFile(contentPath, "utf-8"),
|
|
192
|
+
readFile(metaPath, "utf-8"),
|
|
193
|
+
]);
|
|
194
|
+
const meta = JSON.parse(metaContent);
|
|
195
|
+
if (!meta.lastChecked) {
|
|
196
|
+
return null;
|
|
197
|
+
}
|
|
198
|
+
return { content, meta };
|
|
199
|
+
}
|
|
200
|
+
catch {
|
|
123
201
|
return null;
|
|
124
202
|
}
|
|
125
|
-
|
|
203
|
+
};
|
|
204
|
+
const currentCache = await tryRead(CACHE_FILE, CACHE_META_FILE);
|
|
205
|
+
if (currentCache) {
|
|
206
|
+
return currentCache;
|
|
126
207
|
}
|
|
127
|
-
|
|
128
|
-
|
|
208
|
+
for (const legacy of LEGACY_CACHE_FILES) {
|
|
209
|
+
const legacyCache = await tryRead(legacy.content, legacy.meta);
|
|
210
|
+
if (!legacyCache)
|
|
211
|
+
continue;
|
|
212
|
+
try {
|
|
213
|
+
await writeCacheFilesAtomically(legacyCache.content, legacyCache.meta);
|
|
214
|
+
}
|
|
215
|
+
catch (error) {
|
|
216
|
+
logDebug("Failed to migrate legacy host-codex prompt cache; using legacy cache in memory", {
|
|
217
|
+
error: String(error),
|
|
218
|
+
});
|
|
219
|
+
}
|
|
220
|
+
return legacyCache;
|
|
129
221
|
}
|
|
222
|
+
return null;
|
|
130
223
|
}
|
|
131
224
|
async function saveDiskCache(content, etag, sourceUrl) {
|
|
132
|
-
await mkdir(CACHE_DIR, { recursive: true });
|
|
133
225
|
const meta = {
|
|
134
226
|
etag,
|
|
135
227
|
lastFetch: new Date().toISOString(),
|
|
136
228
|
lastChecked: Date.now(),
|
|
137
229
|
sourceKey: sourceCacheKey(sourceUrl),
|
|
138
230
|
};
|
|
139
|
-
await
|
|
140
|
-
writeFileWithRetry(CACHE_FILE, content),
|
|
141
|
-
writeFileWithRetry(CACHE_META_FILE, JSON.stringify(meta, null, 2)),
|
|
142
|
-
]);
|
|
231
|
+
await writeCacheFilesAtomically(content, meta);
|
|
143
232
|
return meta;
|
|
144
233
|
}
|
|
145
234
|
async function refreshPrompt(cachedMeta, cachedContent) {
|
|
@@ -161,7 +250,7 @@ async function refreshPrompt(cachedMeta, cachedContent) {
|
|
|
161
250
|
}
|
|
162
251
|
catch (error) {
|
|
163
252
|
lastFailure = `${redactSourceForLog(sourceUrl)}: ${String(error)}`;
|
|
164
|
-
logDebug("
|
|
253
|
+
logDebug("Codex prompt source fetch failed", {
|
|
165
254
|
sourceUrl: redactSourceForLog(sourceUrl),
|
|
166
255
|
error: String(error),
|
|
167
256
|
});
|
|
@@ -181,7 +270,7 @@ async function refreshPrompt(cachedMeta, cachedContent) {
|
|
|
181
270
|
}
|
|
182
271
|
if (!response.ok) {
|
|
183
272
|
lastFailure = `${redactSourceForLog(sourceUrl)}: HTTP ${response.status}`;
|
|
184
|
-
logDebug("
|
|
273
|
+
logDebug("Codex prompt source returned non-OK response", {
|
|
185
274
|
sourceUrl: redactSourceForLog(sourceUrl),
|
|
186
275
|
status: response.status,
|
|
187
276
|
});
|
|
@@ -193,7 +282,7 @@ async function refreshPrompt(cachedMeta, cachedContent) {
|
|
|
193
282
|
memoryCache = { content, meta };
|
|
194
283
|
return content;
|
|
195
284
|
}
|
|
196
|
-
throw new Error(`Failed to fetch
|
|
285
|
+
throw new Error(`Failed to fetch codex prompt from all sources${lastFailure ? ` (${lastFailure})` : ""}`);
|
|
197
286
|
}
|
|
198
287
|
function scheduleRefresh(cachedMeta, cachedContent) {
|
|
199
288
|
if (refreshPromise)
|
|
@@ -201,7 +290,7 @@ function scheduleRefresh(cachedMeta, cachedContent) {
|
|
|
201
290
|
refreshPromise = refreshPrompt(cachedMeta, cachedContent)
|
|
202
291
|
.then(() => undefined)
|
|
203
292
|
.catch((error) => {
|
|
204
|
-
logDebug("
|
|
293
|
+
logDebug("Codex prompt background refresh failed", {
|
|
205
294
|
error: String(error),
|
|
206
295
|
});
|
|
207
296
|
})
|
|
@@ -210,13 +299,13 @@ function scheduleRefresh(cachedMeta, cachedContent) {
|
|
|
210
299
|
});
|
|
211
300
|
}
|
|
212
301
|
/**
|
|
213
|
-
* Fetch
|
|
302
|
+
* Fetch codex.txt prompt with ETag-based caching
|
|
214
303
|
* Uses HTTP conditional requests to efficiently check for updates
|
|
215
304
|
*
|
|
216
305
|
* Rate limit protection: Only checks GitHub if cache is older than 15 minutes
|
|
217
306
|
* @returns The codex.txt content
|
|
218
307
|
*/
|
|
219
|
-
export async function
|
|
308
|
+
export async function getHostCodexPrompt() {
|
|
220
309
|
if (memoryCache && isFresh(memoryCache.meta.lastChecked)) {
|
|
221
310
|
return memoryCache.content;
|
|
222
311
|
}
|
|
@@ -242,11 +331,11 @@ export async function getOpenCodeCodexPrompt() {
|
|
|
242
331
|
if (staleContent) {
|
|
243
332
|
return staleContent;
|
|
244
333
|
}
|
|
245
|
-
throw new Error(`Failed to fetch
|
|
334
|
+
throw new Error(`Failed to fetch codex.txt and no cache available: ${error}`);
|
|
246
335
|
}
|
|
247
336
|
}
|
|
248
337
|
/**
|
|
249
|
-
* Get first N characters of the cached
|
|
338
|
+
* Get first N characters of the cached prompt for verification
|
|
250
339
|
* @param chars Number of characters to get (default: 50)
|
|
251
340
|
* @returns First N characters or null if not cached
|
|
252
341
|
*/
|
|
@@ -260,11 +349,11 @@ export async function getCachedPromptPrefix(chars = 50) {
|
|
|
260
349
|
}
|
|
261
350
|
}
|
|
262
351
|
/**
|
|
263
|
-
* Prewarm the
|
|
352
|
+
* Prewarm the prompt cache without blocking startup.
|
|
264
353
|
*/
|
|
265
|
-
export function
|
|
266
|
-
void
|
|
267
|
-
logDebug("
|
|
354
|
+
export function prewarmHostCodexPrompt() {
|
|
355
|
+
void getHostCodexPrompt().catch((error) => {
|
|
356
|
+
logDebug("Codex prompt prewarm failed", { error: String(error) });
|
|
268
357
|
});
|
|
269
358
|
}
|
|
270
|
-
//# sourceMappingURL=
|
|
359
|
+
//# sourceMappingURL=host-codex-prompt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"host-codex-prompt.js","sourceRoot":"","sources":["../../../lib/prompts/host-codex-prompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Storage utilities for reading
|
|
2
|
+
* Storage utilities for reading host runtime session data.
|
|
3
3
|
*
|
|
4
|
-
* Based on
|
|
4
|
+
* Based on Codex-antigravity-auth recovery module.
|
|
5
5
|
*/
|
|
6
6
|
import type { StoredMessageMeta, StoredPart } from "./types.js";
|
|
7
7
|
export declare function generatePartId(): string;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Storage utilities for reading
|
|
2
|
+
* Storage utilities for reading host runtime session data.
|
|
3
3
|
*
|
|
4
|
-
* Based on
|
|
4
|
+
* Based on Codex-antigravity-auth recovery module.
|
|
5
5
|
*/
|
|
6
6
|
import { existsSync, mkdirSync, readdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
|
|
7
7
|
import { join } from "node:path";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Types for session recovery.
|
|
3
3
|
*
|
|
4
|
-
* Based on
|
|
4
|
+
* Based on Codex-antigravity-auth recovery module.
|
|
5
5
|
*/
|
|
6
6
|
export type ThinkingPartType = "thinking" | "redacted_thinking" | "reasoning";
|
|
7
7
|
export type MetaPartType = "step-start" | "step-finish";
|
package/dist/lib/recovery.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { PluginInput } from "@
|
|
1
|
+
import type { PluginInput } from "@codex-ai/plugin";
|
|
2
2
|
import type { PluginConfig } from "./types.js";
|
|
3
3
|
import type { MessageInfo, MessageData, RecoveryErrorType, ResumeConfig } from "./recovery/types.js";
|
|
4
4
|
export type { RecoveryErrorType, MessageInfo, MessageData, ResumeConfig };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../lib/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../lib/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAS/C,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EAEX,iBAAiB,EACjB,YAAY,EAEb,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AAE1E,KAAK,YAAY,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AAuC1C,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,iBAAiB,CAsBjE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAE1D;AAkKD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,iBAAiB,GAAG;IACrE,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAWA;AAED,wBAAgB,uBAAuB,IAAI;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAKA;AAED,wBAAgB,uBAAuB,IAAI;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAKA;AAED,MAAM,WAAW,mBAAmB;IAClC,qBAAqB,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/D,kBAAkB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;IAChD,kBAAkB,EAAE,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,KAAK,IAAI,CAAC;IACpE,6BAA6B,EAAE,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,KAAK,IAAI,CAAC;CAChF;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,sBAAsB,EAC3B,MAAM,EAAE,YAAY,GACnB,mBAAmB,GAAG,IAAI,CA6H5B"}
|
package/dist/lib/recovery.js
CHANGED
|
@@ -61,12 +61,9 @@ function extractToolUseIds(parts) {
|
|
|
61
61
|
.map((p) => p.id);
|
|
62
62
|
}
|
|
63
63
|
async function sendToolResultsForRecovery(client, sessionID, toolResultParts) {
|
|
64
|
-
const bodyWithParts = {
|
|
65
|
-
parts: toolResultParts,
|
|
66
|
-
};
|
|
67
64
|
await client.session.prompt({
|
|
68
65
|
path: { id: sessionID },
|
|
69
|
-
body:
|
|
66
|
+
body: { parts: toolResultParts },
|
|
70
67
|
});
|
|
71
68
|
}
|
|
72
69
|
async function recoverToolResultMissing(client, sessionID, failedMsg) {
|
package/dist/lib/recovery.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../lib/recovery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EACL,SAAS,EACT,8BAA8B,EAC9B,8BAA8B,EAC9B,iCAAiC,EACjC,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../lib/recovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Helper functions for the custom fetch implementation
|
|
3
3
|
* These functions break down the complex fetch logic into manageable, testable units
|
|
4
4
|
*/
|
|
5
|
-
import type { Auth,
|
|
5
|
+
import type { Auth, CodexClient } from "@codex-ai/sdk";
|
|
6
6
|
import type { UserConfig, RequestBody } from "../types.js";
|
|
7
7
|
export interface RateLimitInfo {
|
|
8
8
|
retryAfterMs: number;
|
|
@@ -86,10 +86,10 @@ export declare function shouldRefreshToken(auth: Auth, skewMs?: number): boolean
|
|
|
86
86
|
/**
|
|
87
87
|
* Refreshes the OAuth token and updates stored credentials
|
|
88
88
|
* @param currentAuth - Current auth state
|
|
89
|
-
* @param client -
|
|
89
|
+
* @param client - Codex client for updating stored credentials
|
|
90
90
|
* @returns Updated auth (throws on failure)
|
|
91
91
|
*/
|
|
92
|
-
export declare function refreshAndUpdateToken(currentAuth: Auth, client:
|
|
92
|
+
export declare function refreshAndUpdateToken(currentAuth: Auth, client: CodexClient): Promise<Auth>;
|
|
93
93
|
/**
|
|
94
94
|
* Extracts URL string from various request input types
|
|
95
95
|
* @param input - Request input (string, URL, or Request object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-helpers.d.ts","sourceRoot":"","sources":["../../../lib/request/fetch-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"fetch-helpers.d.ts","sourceRoot":"","sources":["../../../lib/request/fetch-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -217,16 +217,20 @@ export function shouldRefreshToken(auth, skewMs = 0) {
|
|
|
217
217
|
/**
|
|
218
218
|
* Refreshes the OAuth token and updates stored credentials
|
|
219
219
|
* @param currentAuth - Current auth state
|
|
220
|
-
* @param client -
|
|
220
|
+
* @param client - Codex client for updating stored credentials
|
|
221
221
|
* @returns Updated auth (throws on failure)
|
|
222
222
|
*/
|
|
223
223
|
export async function refreshAndUpdateToken(currentAuth, client) {
|
|
224
|
+
const authSetter = client.auth;
|
|
225
|
+
if (!authSetter || typeof authSetter.set !== "function") {
|
|
226
|
+
throw new CodexAuthError(ERROR_MESSAGES.TOKEN_REFRESH_FAILED, { retryable: false });
|
|
227
|
+
}
|
|
224
228
|
const refreshToken = currentAuth.type === "oauth" ? currentAuth.refresh : "";
|
|
225
229
|
const refreshResult = await queuedRefresh(refreshToken);
|
|
226
230
|
if (refreshResult.type === "failed") {
|
|
227
231
|
throw new CodexAuthError(ERROR_MESSAGES.TOKEN_REFRESH_FAILED, { retryable: false });
|
|
228
232
|
}
|
|
229
|
-
await
|
|
233
|
+
await authSetter.set({
|
|
230
234
|
path: { id: "openai" },
|
|
231
235
|
body: {
|
|
232
236
|
type: "oauth",
|