@iam-brain/opencode-codex-auth 1.4.2 → 1.5.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 +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/catalog-sync.d.ts +12 -6
- package/dist/lib/codex-native/catalog-sync.d.ts.map +1 -1
- package/dist/lib/codex-native/catalog-sync.js +42 -15
- package/dist/lib/codex-native/catalog-sync.js.map +1 -1
- package/dist/lib/codex-native/chat-hooks.d.ts +4 -1
- package/dist/lib/codex-native/chat-hooks.d.ts.map +1 -1
- package/dist/lib/codex-native/chat-hooks.js +18 -1
- package/dist/lib/codex-native/chat-hooks.js.map +1 -1
- package/dist/lib/codex-native/oauth-server.d.ts +17 -2
- package/dist/lib/codex-native/oauth-server.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-server.js +123 -3
- package/dist/lib/codex-native/oauth-server.js.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch-state.d.ts.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch-state.js +2 -0
- package/dist/lib/codex-native/openai-loader-fetch-state.js.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.d.ts +10 -1
- package/dist/lib/codex-native/openai-loader-fetch.d.ts.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.js +79 -70
- package/dist/lib/codex-native/openai-loader-fetch.js.map +1 -1
- 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 +7 -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 +18 -0
- package/dist/lib/codex-native/request-transform-model.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-model.js +65 -6
- package/dist/lib/codex-native/request-transform-model.js.map +1 -1
- package/dist/lib/codex-native/request-transform-payload-helpers.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-payload-helpers.js +6 -1
- package/dist/lib/codex-native/request-transform-payload-helpers.js.map +1 -1
- package/dist/lib/codex-native/request-transform-payload.d.ts +16 -5
- package/dist/lib/codex-native/request-transform-payload.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-payload.js +368 -62
- package/dist/lib/codex-native/request-transform-payload.js.map +1 -1
- package/dist/lib/codex-native.d.ts.map +1 -1
- package/dist/lib/codex-native.js +70 -11
- package/dist/lib/codex-native.js.map +1 -1
- package/dist/lib/codex-status-tool.js +1 -1
- package/dist/lib/codex-status-tool.js.map +1 -1
- package/dist/lib/codex-status-ui.js +1 -1
- package/dist/lib/codex-status-ui.js.map +1 -1
- package/dist/lib/config/file.d.ts +33 -0
- package/dist/lib/config/file.d.ts.map +1 -0
- package/dist/lib/config/file.js +503 -0
- package/dist/lib/config/file.js.map +1 -0
- package/dist/lib/config/resolve.d.ts +10 -1
- package/dist/lib/config/resolve.d.ts.map +1 -1
- package/dist/lib/config/resolve.js +62 -1
- package/dist/lib/config/resolve.js.map +1 -1
- package/dist/lib/config.d.ts +2 -5
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +2 -5
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/model-catalog/cache-helpers.d.ts +2 -4
- package/dist/lib/model-catalog/cache-helpers.d.ts.map +1 -1
- package/dist/lib/model-catalog/cache-helpers.js +18 -52
- package/dist/lib/model-catalog/cache-helpers.js.map +1 -1
- package/dist/lib/model-catalog/catalog-fetch.d.ts.map +1 -1
- package/dist/lib/model-catalog/catalog-fetch.js +30 -14
- package/dist/lib/model-catalog/catalog-fetch.js.map +1 -1
- package/dist/lib/model-catalog/provider.d.ts.map +1 -1
- package/dist/lib/model-catalog/provider.js +169 -99
- package/dist/lib/model-catalog/provider.js.map +1 -1
- package/dist/lib/model-catalog/shared.d.ts +4 -1
- package/dist/lib/model-catalog/shared.d.ts.map +1 -1
- package/dist/lib/model-catalog/shared.js +48 -0
- package/dist/lib/model-catalog/shared.js.map +1 -1
- package/dist/lib/storage/{domain-state.d.ts → auth-state.d.ts} +13 -2
- package/dist/lib/storage/auth-state.d.ts.map +1 -0
- package/dist/lib/storage/{domain-state.js → auth-state.js} +246 -26
- package/dist/lib/storage/auth-state.js.map +1 -0
- package/dist/lib/storage.d.ts +1 -1
- package/dist/lib/storage.d.ts.map +1 -1
- package/dist/lib/storage.js +2 -3
- package/dist/lib/storage.js.map +1 -1
- package/dist/lib/ui/auth-menu.d.ts +18 -1
- package/dist/lib/ui/auth-menu.d.ts.map +1 -1
- package/dist/lib/ui/auth-menu.js +78 -3
- package/dist/lib/ui/auth-menu.js.map +1 -1
- package/dist/lib/ui/tty.d.ts +40 -0
- package/dist/lib/ui/tty.d.ts.map +1 -0
- package/dist/lib/ui/{tty/select.js → tty.js} +57 -6
- package/dist/lib/ui/tty.js.map +1 -0
- package/package.json +3 -4
- package/dist/lib/codex-native/catalog-auth.d.ts +0 -6
- package/dist/lib/codex-native/catalog-auth.d.ts.map +0 -1
- package/dist/lib/codex-native/catalog-auth.js +0 -37
- package/dist/lib/codex-native/catalog-auth.js.map +0 -1
- package/dist/lib/codex-native/oauth-server-debug.d.ts +0 -10
- package/dist/lib/codex-native/oauth-server-debug.d.ts.map +0 -1
- package/dist/lib/codex-native/oauth-server-debug.js +0 -92
- package/dist/lib/codex-native/oauth-server-debug.js.map +0 -1
- package/dist/lib/codex-native/oauth-server-network.d.ts +0 -5
- package/dist/lib/codex-native/oauth-server-network.d.ts.map +0 -1
- package/dist/lib/codex-native/oauth-server-network.js +0 -39
- package/dist/lib/codex-native/oauth-server-network.js.map +0 -1
- package/dist/lib/codex-native/oauth-server-types.d.ts +0 -24
- package/dist/lib/codex-native/oauth-server-types.d.ts.map +0 -1
- package/dist/lib/codex-native/oauth-server-types.js +0 -2
- package/dist/lib/codex-native/oauth-server-types.js.map +0 -1
- package/dist/lib/codex-native/request-transform-gpt54-limits.d.ts +0 -2
- package/dist/lib/codex-native/request-transform-gpt54-limits.d.ts.map +0 -1
- package/dist/lib/codex-native/request-transform-gpt54-limits.js +0 -40
- package/dist/lib/codex-native/request-transform-gpt54-limits.js.map +0 -1
- package/dist/lib/codex-native/request-transform-instructions.d.ts +0 -16
- package/dist/lib/codex-native/request-transform-instructions.d.ts.map +0 -1
- package/dist/lib/codex-native/request-transform-instructions.js +0 -96
- package/dist/lib/codex-native/request-transform-instructions.js.map +0 -1
- package/dist/lib/codex-native/request-transform-pipeline.d.ts +0 -28
- package/dist/lib/codex-native/request-transform-pipeline.d.ts.map +0 -1
- package/dist/lib/codex-native/request-transform-pipeline.js +0 -35
- package/dist/lib/codex-native/request-transform-pipeline.js.map +0 -1
- package/dist/lib/codex-native/request-transform-shared.d.ts +0 -8
- package/dist/lib/codex-native/request-transform-shared.d.ts.map +0 -1
- package/dist/lib/codex-native/request-transform-shared.js +0 -49
- package/dist/lib/codex-native/request-transform-shared.js.map +0 -1
- package/dist/lib/codex-native/request-transform.d.ts +0 -5
- package/dist/lib/codex-native/request-transform.d.ts.map +0 -1
- package/dist/lib/codex-native/request-transform.js +0 -5
- package/dist/lib/codex-native/request-transform.js.map +0 -1
- package/dist/lib/codex-native/static-fallback-models.d.ts +0 -2
- package/dist/lib/codex-native/static-fallback-models.d.ts.map +0 -1
- package/dist/lib/codex-native/static-fallback-models.js +0 -15
- package/dist/lib/codex-native/static-fallback-models.js.map +0 -1
- package/dist/lib/config/behavior-settings.d.ts +0 -3
- package/dist/lib/config/behavior-settings.d.ts.map +0 -1
- package/dist/lib/config/behavior-settings.js +0 -33
- package/dist/lib/config/behavior-settings.js.map +0 -1
- package/dist/lib/config/io.d.ts +0 -16
- package/dist/lib/config/io.d.ts.map +0 -1
- package/dist/lib/config/io.js +0 -64
- package/dist/lib/config/io.js.map +0 -1
- package/dist/lib/config/parse.d.ts +0 -22
- package/dist/lib/config/parse.d.ts.map +0 -1
- package/dist/lib/config/parse.js +0 -327
- package/dist/lib/config/parse.js.map +0 -1
- package/dist/lib/config/validation.d.ts +0 -6
- package/dist/lib/config/validation.d.ts.map +0 -1
- package/dist/lib/config/validation.js +0 -171
- package/dist/lib/config/validation.js.map +0 -1
- package/dist/lib/storage/domain-state.d.ts.map +0 -1
- package/dist/lib/storage/domain-state.js.map +0 -1
- package/dist/lib/storage/migration.d.ts +0 -13
- package/dist/lib/storage/migration.d.ts.map +0 -1
- package/dist/lib/storage/migration.js +0 -225
- package/dist/lib/storage/migration.js.map +0 -1
- package/dist/lib/ui/auth-menu-runner.d.ts +0 -19
- package/dist/lib/ui/auth-menu-runner.d.ts.map +0 -1
- package/dist/lib/ui/auth-menu-runner.js +0 -79
- package/dist/lib/ui/auth-menu-runner.js.map +0 -1
- package/dist/lib/ui/tty/ansi.d.ts +0 -18
- package/dist/lib/ui/tty/ansi.d.ts.map +0 -1
- package/dist/lib/ui/tty/ansi.js +0 -37
- package/dist/lib/ui/tty/ansi.js.map +0 -1
- package/dist/lib/ui/tty/confirm.d.ts +0 -7
- package/dist/lib/ui/tty/confirm.d.ts.map +0 -1
- package/dist/lib/ui/tty/confirm.js +0 -20
- package/dist/lib/ui/tty/confirm.js.map +0 -1
- package/dist/lib/ui/tty/select.d.ts +0 -17
- package/dist/lib/ui/tty/select.d.ts.map +0 -1
- package/dist/lib/ui/tty/select.js.map +0 -1
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
import { resolveCustomPersonalityDescription } from "../personalities.js";
|
|
2
2
|
import { compareModelSlugs, EFFORT_SUFFIX_REGEX, normalizeReasoningEffort, normalizeVerbosity } from "./shared.js";
|
|
3
|
+
const DEFAULT_OPENAI_NPM = "@ai-sdk/openai";
|
|
4
|
+
const DEFAULT_OPENAI_API_URL = "https://chatgpt.com/backend-api/codex";
|
|
5
|
+
const DEFAULT_OUTPUT_TOKEN_LIMIT = 128_000;
|
|
6
|
+
const DEFAULT_OUTPUT_CAPABILITIES = {
|
|
7
|
+
text: true,
|
|
8
|
+
audio: false,
|
|
9
|
+
image: false,
|
|
10
|
+
video: false,
|
|
11
|
+
pdf: false
|
|
12
|
+
};
|
|
13
|
+
const DEFAULT_INPUT_CAPABILITIES = {
|
|
14
|
+
text: true,
|
|
15
|
+
audio: false,
|
|
16
|
+
image: false,
|
|
17
|
+
video: false,
|
|
18
|
+
pdf: false
|
|
19
|
+
};
|
|
3
20
|
const UNRESOLVED_TEMPLATE_MARKER_REGEX = /\{\{\s*[^}]+\s*\}\}/;
|
|
4
21
|
const STALE_BRIDGE_MARKERS = [
|
|
5
22
|
/multi_tool_use\.parallel/i,
|
|
@@ -7,11 +24,19 @@ const STALE_BRIDGE_MARKERS = [
|
|
|
7
24
|
/functions\.(read|exec_command|write_stdin|apply_patch|edit|grep|glob|list)\b/i,
|
|
8
25
|
/recipient_name\s*[:=]/i
|
|
9
26
|
];
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
27
|
+
function asRecord(value) {
|
|
28
|
+
if (typeof value !== "object" || value === null || Array.isArray(value))
|
|
29
|
+
return undefined;
|
|
30
|
+
return value;
|
|
31
|
+
}
|
|
32
|
+
function asString(value) {
|
|
33
|
+
if (typeof value !== "string")
|
|
34
|
+
return undefined;
|
|
35
|
+
const trimmed = value.trim();
|
|
36
|
+
return trimmed ? trimmed : undefined;
|
|
37
|
+
}
|
|
38
|
+
function asFiniteNumber(value) {
|
|
39
|
+
return typeof value === "number" && Number.isFinite(value) ? value : undefined;
|
|
15
40
|
}
|
|
16
41
|
function formatModelDisplayNameFromSlug(slug) {
|
|
17
42
|
const tokens = slug
|
|
@@ -34,53 +59,117 @@ function formatModelDisplayNameFromSlug(slug) {
|
|
|
34
59
|
return words.join(" ");
|
|
35
60
|
}
|
|
36
61
|
function isRawCatalogSlugDisplayName(slug, displayName) {
|
|
37
|
-
return displayName.trim() === slug.trim();
|
|
62
|
+
return displayName.trim().toLowerCase() === slug.trim().toLowerCase();
|
|
38
63
|
}
|
|
39
|
-
function
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
if (trimmed)
|
|
47
|
-
candidates.push(trimmed);
|
|
48
|
-
}
|
|
49
|
-
return candidates[0];
|
|
64
|
+
function resolveDisplayName(slug, catalogDisplayName) {
|
|
65
|
+
const trimmed = catalogDisplayName?.trim();
|
|
66
|
+
if (!trimmed)
|
|
67
|
+
return formatModelDisplayNameFromSlug(slug);
|
|
68
|
+
if (isRawCatalogSlugDisplayName(slug, trimmed))
|
|
69
|
+
return formatModelDisplayNameFromSlug(slug);
|
|
70
|
+
return trimmed;
|
|
50
71
|
}
|
|
51
|
-
function
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
return candidates.find((candidate) => !isRawCatalogSlugDisplayName(slug, candidate)) ?? candidates[0];
|
|
72
|
+
function resolveProviderTransport(providerModels, existingModel) {
|
|
73
|
+
const source = existingModel ?? Object.values(providerModels)[0] ?? {};
|
|
74
|
+
const api = asRecord(source.api);
|
|
75
|
+
return {
|
|
76
|
+
providerID: asString(source.providerID) ?? "openai",
|
|
77
|
+
apiUrl: asString(api?.url) ?? DEFAULT_OPENAI_API_URL,
|
|
78
|
+
apiNpm: asString(api?.npm) ?? DEFAULT_OPENAI_NPM,
|
|
79
|
+
status: asString(source.status) ?? "active",
|
|
80
|
+
headers: Object.fromEntries(Object.entries(asRecord(source.headers) ?? {}).filter((entry) => {
|
|
81
|
+
return typeof entry[1] === "string";
|
|
82
|
+
}))
|
|
83
|
+
};
|
|
64
84
|
}
|
|
65
|
-
function
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
}
|
|
74
|
-
return getExistingDisplayName(model) ?? formatModelDisplayNameFromSlug(slug);
|
|
85
|
+
function resolveFamily(slug) {
|
|
86
|
+
if (slug.includes("codex"))
|
|
87
|
+
return "gpt-codex";
|
|
88
|
+
if (slug.startsWith("gpt-"))
|
|
89
|
+
return "gpt-5";
|
|
90
|
+
if (slug.startsWith("o"))
|
|
91
|
+
return "o-series";
|
|
92
|
+
return "openai";
|
|
75
93
|
}
|
|
76
|
-
function
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
94
|
+
function readCapabilityMap(value, fallback) {
|
|
95
|
+
const source = asRecord(value);
|
|
96
|
+
return {
|
|
97
|
+
text: source?.text !== false,
|
|
98
|
+
audio: source?.audio === true,
|
|
99
|
+
image: source?.image === true,
|
|
100
|
+
video: source?.video === true,
|
|
101
|
+
pdf: source?.pdf === true
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
function buildInputCapabilities(model) {
|
|
105
|
+
const modalities = new Set(model.input_modalities ?? ["text"]);
|
|
106
|
+
return {
|
|
107
|
+
text: modalities.has("text"),
|
|
108
|
+
audio: modalities.has("audio"),
|
|
109
|
+
image: modalities.has("image"),
|
|
110
|
+
video: modalities.has("video"),
|
|
111
|
+
pdf: modalities.has("pdf")
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
function buildVariants(model) {
|
|
115
|
+
const efforts = Array.from(new Set((model.supported_reasoning_levels ?? [])
|
|
116
|
+
.map((level) => normalizeReasoningEffort(level.effort))
|
|
117
|
+
.filter((value) => value !== undefined)));
|
|
118
|
+
return Object.fromEntries(efforts.map((effort) => [effort, { reasoningEffort: effort }]));
|
|
119
|
+
}
|
|
120
|
+
function buildProviderModelFromCatalog(model, providerModels, existingModel) {
|
|
121
|
+
const display = resolveDisplayName(model.slug, model.display_name);
|
|
122
|
+
const transport = resolveProviderTransport(providerModels, existingModel);
|
|
123
|
+
const inputCapabilities = buildInputCapabilities(model);
|
|
124
|
+
const outputCapabilities = readCapabilityMap(undefined, DEFAULT_OUTPUT_CAPABILITIES);
|
|
125
|
+
const attachment = inputCapabilities.audio || inputCapabilities.image || inputCapabilities.video || inputCapabilities.pdf;
|
|
126
|
+
const hasReasoning = (model.supported_reasoning_levels?.length ?? 0) > 0 ||
|
|
127
|
+
normalizeReasoningEffort(model.default_reasoning_level) !== undefined ||
|
|
128
|
+
model.supports_reasoning_summaries === true;
|
|
129
|
+
const contextWindow = asFiniteNumber(model.context_window);
|
|
130
|
+
if (contextWindow === undefined)
|
|
131
|
+
return undefined;
|
|
132
|
+
const outputLimit = DEFAULT_OUTPUT_TOKEN_LIMIT;
|
|
133
|
+
const variants = buildVariants(model);
|
|
134
|
+
return {
|
|
135
|
+
id: model.slug,
|
|
136
|
+
slug: model.slug,
|
|
137
|
+
model: model.slug,
|
|
138
|
+
name: display,
|
|
139
|
+
displayName: display,
|
|
140
|
+
display_name: display,
|
|
141
|
+
providerID: transport.providerID,
|
|
142
|
+
api: {
|
|
143
|
+
id: model.slug,
|
|
144
|
+
url: transport.apiUrl,
|
|
145
|
+
npm: transport.apiNpm
|
|
146
|
+
},
|
|
147
|
+
status: transport.status,
|
|
148
|
+
headers: { ...transport.headers },
|
|
149
|
+
options: {},
|
|
150
|
+
cost: {
|
|
151
|
+
input: 0,
|
|
152
|
+
output: 0,
|
|
153
|
+
cache: { read: 0, write: 0 }
|
|
154
|
+
},
|
|
155
|
+
limit: {
|
|
156
|
+
context: contextWindow,
|
|
157
|
+
input: contextWindow,
|
|
158
|
+
output: outputLimit
|
|
159
|
+
},
|
|
160
|
+
capabilities: {
|
|
161
|
+
temperature: false,
|
|
162
|
+
reasoning: hasReasoning,
|
|
163
|
+
attachment,
|
|
164
|
+
toolcall: true,
|
|
165
|
+
input: inputCapabilities,
|
|
166
|
+
output: outputCapabilities,
|
|
167
|
+
interleaved: false
|
|
168
|
+
},
|
|
169
|
+
family: resolveFamily(model.slug),
|
|
170
|
+
release_date: "",
|
|
171
|
+
variants
|
|
172
|
+
};
|
|
84
173
|
}
|
|
85
174
|
function resolvePersonalityText(model, personality) {
|
|
86
175
|
const vars = model.model_messages?.instructions_variables;
|
|
@@ -146,28 +235,6 @@ export function resolveInstructionsForModel(model, personality) {
|
|
|
146
235
|
.trim();
|
|
147
236
|
return normalizeSafeInstructions(rendered) ?? safeBase;
|
|
148
237
|
}
|
|
149
|
-
function resolveAllowedSlugs(catalogModels, fallback) {
|
|
150
|
-
const preferred = (catalogModels ?? []).map((model) => model.slug).filter((slug) => slug.length > 0);
|
|
151
|
-
if (preferred.length > 0) {
|
|
152
|
-
return Array.from(new Set(preferred)).sort(compareModelSlugs);
|
|
153
|
-
}
|
|
154
|
-
return Array.from(new Set(fallback.map((slug) => slug.trim().toLowerCase()).filter(Boolean))).sort(compareModelSlugs);
|
|
155
|
-
}
|
|
156
|
-
function resolveAllowedSlugsFromBaselineProvider(providerModels, fallback) {
|
|
157
|
-
const providerBaseline = Object.keys(providerModels)
|
|
158
|
-
.map((slug) => slug.trim().toLowerCase())
|
|
159
|
-
.filter((slug) => BASELINE_PROVIDER_MODEL_SLUG_REGEX.test(slug));
|
|
160
|
-
return Array.from(new Set([...fallback.map((slug) => slug.trim().toLowerCase()), ...providerBaseline].filter(Boolean))).sort(compareModelSlugs);
|
|
161
|
-
}
|
|
162
|
-
function resolveTemplateSource(providerModels) {
|
|
163
|
-
for (const candidate of ["gpt-5.4", "gpt-5.3-codex", "gpt-5.2-codex", "gpt-5.1-codex", "gpt-5.2"]) {
|
|
164
|
-
const found = providerModels[candidate];
|
|
165
|
-
if (found)
|
|
166
|
-
return found;
|
|
167
|
-
}
|
|
168
|
-
const first = Object.values(providerModels)[0];
|
|
169
|
-
return first;
|
|
170
|
-
}
|
|
171
238
|
function stripEffortSuffix(slug) {
|
|
172
239
|
return slug.replace(EFFORT_SUFFIX_REGEX, "");
|
|
173
240
|
}
|
|
@@ -180,6 +247,13 @@ function ensureModelOptions(model) {
|
|
|
180
247
|
model.options = options;
|
|
181
248
|
return options;
|
|
182
249
|
}
|
|
250
|
+
function clearCatalogInstructionState(model, options) {
|
|
251
|
+
const priorInstructions = typeof options.codexInstructions === "string" ? options.codexInstructions : undefined;
|
|
252
|
+
if (priorInstructions && model.instructions === priorInstructions) {
|
|
253
|
+
delete model.instructions;
|
|
254
|
+
}
|
|
255
|
+
delete options.codexInstructions;
|
|
256
|
+
}
|
|
183
257
|
function findModelBySlug(catalogModels, slug) {
|
|
184
258
|
if (!catalogModels || catalogModels.length === 0)
|
|
185
259
|
return undefined;
|
|
@@ -234,42 +308,38 @@ export function getRuntimeDefaultsForSlug(slug, catalogModels) {
|
|
|
234
308
|
return getRuntimeDefaultsForModel(model);
|
|
235
309
|
}
|
|
236
310
|
export function applyCodexCatalogToProviderModels(input) {
|
|
237
|
-
const
|
|
238
|
-
|
|
239
|
-
|
|
311
|
+
const catalogModels = input.catalogModels ?? [];
|
|
312
|
+
if (catalogModels.length === 0) {
|
|
313
|
+
for (const modelId of Object.keys(input.providerModels)) {
|
|
314
|
+
delete input.providerModels[modelId];
|
|
315
|
+
}
|
|
316
|
+
return;
|
|
317
|
+
}
|
|
318
|
+
const allowedSlugs = Array.from(new Set(catalogModels.map((model) => model.slug))).sort(compareModelSlugs);
|
|
240
319
|
const allowed = new Set(allowedSlugs);
|
|
241
|
-
const bySlug = new Map(
|
|
242
|
-
const templateSource = resolveTemplateSource(input.providerModels);
|
|
320
|
+
const bySlug = new Map(catalogModels.map((model) => [model.slug, model]));
|
|
243
321
|
for (const slug of allowedSlugs) {
|
|
244
|
-
if (!input.providerModels[slug]) {
|
|
245
|
-
if (templateSource) {
|
|
246
|
-
input.providerModels[slug] = cloneModelTemplate(templateSource, slug);
|
|
247
|
-
}
|
|
248
|
-
else {
|
|
249
|
-
input.providerModels[slug] = { id: slug, model: slug };
|
|
250
|
-
}
|
|
251
|
-
}
|
|
252
|
-
else {
|
|
253
|
-
setModelIdentityFields(input.providerModels[slug], slug, bySlug.get(slug)?.display_name);
|
|
254
|
-
}
|
|
255
|
-
setModelIdentityFields(input.providerModels[slug], slug, bySlug.get(slug)?.display_name);
|
|
256
322
|
const catalogModel = bySlug.get(slug);
|
|
323
|
+
if (!catalogModel)
|
|
324
|
+
continue;
|
|
325
|
+
const existingModel = input.providerModels[slug];
|
|
326
|
+
const nextModel = buildProviderModelFromCatalog(catalogModel, input.providerModels, existingModel);
|
|
327
|
+
if (!nextModel) {
|
|
328
|
+
delete input.providerModels[slug];
|
|
329
|
+
continue;
|
|
330
|
+
}
|
|
331
|
+
input.providerModels[slug] = nextModel;
|
|
257
332
|
const options = ensureModelOptions(input.providerModels[slug]);
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
options.codexInstructions = instructions;
|
|
264
|
-
}
|
|
265
|
-
else {
|
|
266
|
-
delete options.codexInstructions;
|
|
267
|
-
}
|
|
333
|
+
const instructions = resolveInstructionsForModel(catalogModel, input.personality);
|
|
334
|
+
options.codexCatalogModel = catalogModel;
|
|
335
|
+
if (instructions) {
|
|
336
|
+
input.providerModels[slug].instructions = instructions;
|
|
337
|
+
options.codexInstructions = instructions;
|
|
268
338
|
}
|
|
269
339
|
else {
|
|
270
|
-
|
|
340
|
+
clearCatalogInstructionState(input.providerModels[slug], options);
|
|
271
341
|
}
|
|
272
|
-
const runtimeDefaults = getRuntimeDefaultsForSlug(slug,
|
|
342
|
+
const runtimeDefaults = getRuntimeDefaultsForSlug(slug, catalogModels);
|
|
273
343
|
if (runtimeDefaults) {
|
|
274
344
|
input.providerModels[slug].codexRuntimeDefaults = runtimeDefaults;
|
|
275
345
|
options.codexRuntimeDefaults = runtimeDefaults;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../lib/model-catalog/provider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../lib/model-catalog/provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,10 +13,13 @@ type ModelMessages = {
|
|
|
13
13
|
type ModelReasoningLevel = {
|
|
14
14
|
effort?: string | null;
|
|
15
15
|
};
|
|
16
|
+
type CatalogInputModality = "text" | "audio" | "image" | "video" | "pdf";
|
|
16
17
|
export type CodexModelInfo = {
|
|
17
18
|
slug: string;
|
|
18
19
|
display_name?: string | null;
|
|
19
20
|
priority?: number | null;
|
|
21
|
+
context_window?: number | null;
|
|
22
|
+
input_modalities?: readonly CatalogInputModality[] | null;
|
|
20
23
|
model_messages?: ModelMessages | null;
|
|
21
24
|
base_instructions?: string | null;
|
|
22
25
|
apply_patch_tool_type?: string | null;
|
|
@@ -66,7 +69,6 @@ export type GetCodexModelCatalogInput = {
|
|
|
66
69
|
export type ApplyCodexCatalogInput = {
|
|
67
70
|
providerModels: Record<string, Record<string, unknown>>;
|
|
68
71
|
catalogModels?: CodexModelInfo[];
|
|
69
|
-
fallbackModels: readonly string[];
|
|
70
72
|
personality?: PersonalityOption;
|
|
71
73
|
};
|
|
72
74
|
export declare const CODEX_MODELS_ENDPOINT = "https://chatgpt.com/backend-api/codex/models";
|
|
@@ -88,6 +90,7 @@ export declare function normalizeReasoningEffort(value: unknown): CodexModelRunt
|
|
|
88
90
|
export declare function normalizeVerbosity(value: unknown): CodexModelRuntimeDefaults["defaultVerbosity"] | undefined;
|
|
89
91
|
export declare function parseReasoningLevels(value: unknown): ModelReasoningLevel[] | null;
|
|
90
92
|
export declare function parseCatalogResponse(payload: unknown): CodexModelInfo[];
|
|
93
|
+
export declare function mergeCatalogModels(primaryModels: readonly CodexModelInfo[], fallbackModels: readonly CodexModelInfo[] | undefined): CodexModelInfo[];
|
|
91
94
|
export declare function parseFetchedAtFromUnknown(value: unknown): number;
|
|
92
95
|
export declare function parseSemver(value: unknown): [number, number, number] | undefined;
|
|
93
96
|
export declare function compareSemver(a: [number, number, number], b: [number, number, number]): number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../lib/model-catalog/shared.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../lib/model-catalog/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export const FETCH_TIMEOUT_MS = 5000;
|
|
|
6
6
|
export const EFFORT_SUFFIX_REGEX = /-(none|minimal|low|medium|high|xhigh)$/i;
|
|
7
7
|
const REASONING_EFFORTS = new Set(["none", "minimal", "low", "medium", "high", "xhigh"]);
|
|
8
8
|
const TEXT_VERBOSITY = new Set(["low", "medium", "high"]);
|
|
9
|
+
const INPUT_MODALITIES = new Set(["text", "audio", "image", "video", "pdf"]);
|
|
9
10
|
export function isRecord(value) {
|
|
10
11
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
11
12
|
}
|
|
@@ -50,6 +51,20 @@ export function parseReasoningLevels(value) {
|
|
|
50
51
|
}
|
|
51
52
|
return out.length > 0 ? out : null;
|
|
52
53
|
}
|
|
54
|
+
function parseInputModalities(value) {
|
|
55
|
+
if (!Array.isArray(value))
|
|
56
|
+
return null;
|
|
57
|
+
const out = [];
|
|
58
|
+
for (const item of value) {
|
|
59
|
+
if (typeof item !== "string")
|
|
60
|
+
continue;
|
|
61
|
+
const normalized = item.trim().toLowerCase();
|
|
62
|
+
if (INPUT_MODALITIES.has(normalized)) {
|
|
63
|
+
out.push(normalized);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
return out.length > 0 ? Array.from(new Set(out)) : null;
|
|
67
|
+
}
|
|
53
68
|
export function parseCatalogResponse(payload) {
|
|
54
69
|
if (!isRecord(payload))
|
|
55
70
|
return [];
|
|
@@ -67,6 +82,8 @@ export function parseCatalogResponse(payload) {
|
|
|
67
82
|
slug,
|
|
68
83
|
display_name: typeof item.display_name === "string" ? item.display_name : null,
|
|
69
84
|
priority: typeof item.priority === "number" && Number.isFinite(item.priority) ? item.priority : null,
|
|
85
|
+
context_window: typeof item.context_window === "number" && Number.isFinite(item.context_window) ? item.context_window : null,
|
|
86
|
+
input_modalities: parseInputModalities(item.input_modalities),
|
|
70
87
|
model_messages: isRecord(item.model_messages)
|
|
71
88
|
? {
|
|
72
89
|
instructions_template: typeof item.model_messages.instructions_template === "string"
|
|
@@ -106,6 +123,37 @@ export function parseCatalogResponse(payload) {
|
|
|
106
123
|
}
|
|
107
124
|
return Array.from(deduped.values()).sort((a, b) => compareModelSlugs(a.slug, b.slug));
|
|
108
125
|
}
|
|
126
|
+
function preferCatalogField(primary, fallback) {
|
|
127
|
+
return primary ?? fallback ?? null;
|
|
128
|
+
}
|
|
129
|
+
export function mergeCatalogModels(primaryModels, fallbackModels) {
|
|
130
|
+
if (!fallbackModels || fallbackModels.length === 0) {
|
|
131
|
+
return [...primaryModels];
|
|
132
|
+
}
|
|
133
|
+
const fallbackBySlug = new Map(fallbackModels.map((model) => [model.slug, model]));
|
|
134
|
+
return primaryModels.map((model) => {
|
|
135
|
+
const fallback = fallbackBySlug.get(model.slug);
|
|
136
|
+
if (!fallback)
|
|
137
|
+
return model;
|
|
138
|
+
return {
|
|
139
|
+
slug: model.slug,
|
|
140
|
+
display_name: preferCatalogField(model.display_name, fallback.display_name),
|
|
141
|
+
priority: preferCatalogField(model.priority, fallback.priority),
|
|
142
|
+
context_window: preferCatalogField(model.context_window, fallback.context_window),
|
|
143
|
+
input_modalities: preferCatalogField(model.input_modalities, fallback.input_modalities),
|
|
144
|
+
model_messages: preferCatalogField(model.model_messages, fallback.model_messages),
|
|
145
|
+
base_instructions: preferCatalogField(model.base_instructions, fallback.base_instructions),
|
|
146
|
+
apply_patch_tool_type: preferCatalogField(model.apply_patch_tool_type, fallback.apply_patch_tool_type),
|
|
147
|
+
supported_reasoning_levels: preferCatalogField(model.supported_reasoning_levels, fallback.supported_reasoning_levels),
|
|
148
|
+
default_reasoning_level: preferCatalogField(model.default_reasoning_level, fallback.default_reasoning_level),
|
|
149
|
+
supports_reasoning_summaries: preferCatalogField(model.supports_reasoning_summaries, fallback.supports_reasoning_summaries),
|
|
150
|
+
reasoning_summary_format: preferCatalogField(model.reasoning_summary_format, fallback.reasoning_summary_format),
|
|
151
|
+
supports_parallel_tool_calls: preferCatalogField(model.supports_parallel_tool_calls, fallback.supports_parallel_tool_calls),
|
|
152
|
+
support_verbosity: preferCatalogField(model.support_verbosity, fallback.support_verbosity),
|
|
153
|
+
default_verbosity: preferCatalogField(model.default_verbosity, fallback.default_verbosity)
|
|
154
|
+
};
|
|
155
|
+
});
|
|
156
|
+
}
|
|
109
157
|
export function parseFetchedAtFromUnknown(value) {
|
|
110
158
|
if (typeof value === "number" && Number.isFinite(value)) {
|
|
111
159
|
return value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../lib/model-catalog/shared.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../lib/model-catalog/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,21 @@ export declare function normalizeOpenAIOAuthState(openai: OpenAIMultiOauthAuth):
|
|
|
14
14
|
export declare function isMultiOauthAuth(value: unknown): value is OpenAIMultiOauthAuth;
|
|
15
15
|
export declare function isLegacyOauthAuth(value: unknown): value is LegacyOpenAIOauth;
|
|
16
16
|
export declare function getOpenAIOAuthDomain(auth: AuthFile, authMode: OpenAIAuthMode): OpenAIOAuthDomain | undefined;
|
|
17
|
+
export declare function requireOpenAIMultiOauthAuth(auth: AuthFile): OpenAIMultiOauthAuth;
|
|
17
18
|
export declare function ensureOpenAIOAuthDomain(auth: AuthFile, authMode: OpenAIAuthMode): OpenAIOAuthDomain;
|
|
18
19
|
export declare function listOpenAIOAuthDomains(auth: AuthFile): Array<{
|
|
19
20
|
mode: OpenAIAuthMode;
|
|
20
21
|
domain: OpenAIOAuthDomain;
|
|
21
22
|
}>;
|
|
22
|
-
export declare function
|
|
23
|
-
|
|
23
|
+
export declare function listLegacyProviderAuthCandidates(env?: Record<string, string | undefined>): string[];
|
|
24
|
+
export declare function listLegacyAuthCandidates(filePath: string): string[];
|
|
25
|
+
export declare function sanitizeAuthFile(input: AuthFile, options?: {
|
|
26
|
+
openAIOnly?: boolean;
|
|
27
|
+
}): AuthFile;
|
|
28
|
+
export declare function shouldEnforceOpenAIOnlyStorage(filePath: string): boolean;
|
|
29
|
+
export declare function hasUsableOpenAIOAuth(auth: AuthFile): boolean;
|
|
30
|
+
export declare function migrateAuthFile(input: AuthFile): AuthFile;
|
|
31
|
+
export declare function migrateLegacyCodexAccounts(input: Record<string, unknown>): AuthFile | undefined;
|
|
32
|
+
export declare function ensureMultiOauthState(auth: AuthFile): OpenAIMultiOauthAuth;
|
|
33
|
+
export declare function upsertDomainAccount(domain: OpenAIOAuthDomain, input: AccountRecord, authMode: OpenAIAuthMode): boolean;
|
|
34
|
+
//# sourceMappingURL=auth-state.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-state.d.ts","sourceRoot":"","sources":["../../../lib/storage/auth-state.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAEnH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAkBD,eAAO,MAAM,iBAAiB,EAAE,cAAc,EAAwB,CAAA;AAWtE,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,CAe9F;AA4HD,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB,CAuD5F;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,oBAAoB,CAQ9E;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,iBAAiB,CAI5E;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,GAAG,iBAAiB,GAAG,SAAS,CAM5G;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,QAAQ,GAAG,oBAAoB,CAuChF;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,GAAG,iBAAiB,CAgBnG;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,iBAAiB,CAAA;CAAE,CAAC,CAQjH;AAED,wBAAgB,gCAAgC,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,EAAE,CAKhH;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAEnE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,QAAQ,CAa9F;AAED,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAExE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAY5D;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAiCzD;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,QAAQ,GAAG,SAAS,CAmE/F;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,QAAQ,GAAG,oBAAoB,CA2B1E;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,iBAAiB,EACzB,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,cAAc,GACvB,OAAO,CA0DT"}
|