@iam-brain/opencode-codex-auth 1.5.0 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -4
- package/dist/index.js.map +1 -1
- package/dist/lib/codex-native/accounts.d.ts +1 -1
- package/dist/lib/codex-native/accounts.d.ts.map +1 -1
- package/dist/lib/codex-native/accounts.js +54 -17
- package/dist/lib/codex-native/accounts.js.map +1 -1
- package/dist/lib/codex-native/auth-menu-flow.js +4 -4
- package/dist/lib/codex-native/auth-menu-flow.js.map +1 -1
- package/dist/lib/codex-native/chat-hooks.d.ts +8 -1
- package/dist/lib/codex-native/chat-hooks.d.ts.map +1 -1
- package/dist/lib/codex-native/chat-hooks.js +76 -25
- package/dist/lib/codex-native/chat-hooks.js.map +1 -1
- package/dist/lib/codex-native/oauth-persistence.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-persistence.js +2 -0
- package/dist/lib/codex-native/oauth-persistence.js.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.d.ts +3 -1
- package/dist/lib/codex-native/openai-loader-fetch.d.ts.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.js +50 -7
- package/dist/lib/codex-native/openai-loader-fetch.js.map +1 -1
- package/dist/lib/codex-native/reasoning-summary.d.ts +30 -0
- package/dist/lib/codex-native/reasoning-summary.d.ts.map +1 -0
- package/dist/lib/codex-native/reasoning-summary.js +98 -0
- package/dist/lib/codex-native/reasoning-summary.js.map +1 -0
- package/dist/lib/codex-native/request-routing.d.ts.map +1 -1
- package/dist/lib/codex-native/request-routing.js +12 -4
- package/dist/lib/codex-native/request-routing.js.map +1 -1
- package/dist/lib/codex-native/request-transform-model-service-tier.d.ts +2 -0
- package/dist/lib/codex-native/request-transform-model-service-tier.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-model-service-tier.js +35 -1
- package/dist/lib/codex-native/request-transform-model-service-tier.js.map +1 -1
- package/dist/lib/codex-native/request-transform-model.d.ts +41 -10
- package/dist/lib/codex-native/request-transform-model.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-model.js +261 -98
- package/dist/lib/codex-native/request-transform-model.js.map +1 -1
- package/dist/lib/codex-native/request-transform-payload.d.ts +9 -1
- package/dist/lib/codex-native/request-transform-payload.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform-payload.js +170 -44
- package/dist/lib/codex-native/request-transform-payload.js.map +1 -1
- package/dist/lib/codex-native/session-messages.d.ts.map +1 -1
- package/dist/lib/codex-native/session-messages.js +18 -1
- package/dist/lib/codex-native/session-messages.js.map +1 -1
- package/dist/lib/codex-native.d.ts +2 -1
- package/dist/lib/codex-native.d.ts.map +1 -1
- package/dist/lib/codex-native.js +152 -11
- package/dist/lib/codex-native.js.map +1 -1
- package/dist/lib/config/file.d.ts +3 -1
- package/dist/lib/config/file.d.ts.map +1 -1
- package/dist/lib/config/file.js +461 -52
- package/dist/lib/config/file.js.map +1 -1
- package/dist/lib/config/resolve.d.ts +6 -2
- package/dist/lib/config/resolve.d.ts.map +1 -1
- package/dist/lib/config/resolve.js +69 -11
- package/dist/lib/config/resolve.js.map +1 -1
- package/dist/lib/config/types.d.ts +22 -5
- package/dist/lib/config/types.d.ts.map +1 -1
- package/dist/lib/config/types.js +76 -31
- package/dist/lib/config/types.js.map +1 -1
- package/dist/lib/config.d.ts +3 -3
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +3 -3
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/fatal-errors.d.ts +5 -1
- package/dist/lib/fatal-errors.d.ts.map +1 -1
- package/dist/lib/fatal-errors.js +12 -2
- package/dist/lib/fatal-errors.js.map +1 -1
- package/dist/lib/fetch-orchestrator.d.ts.map +1 -1
- package/dist/lib/fetch-orchestrator.js +4 -1
- package/dist/lib/fetch-orchestrator.js.map +1 -1
- package/dist/lib/installer-cli.d.ts.map +1 -1
- package/dist/lib/installer-cli.js +38 -9
- package/dist/lib/installer-cli.js.map +1 -1
- package/dist/lib/model-catalog/catalog-fetch.d.ts.map +1 -1
- package/dist/lib/model-catalog/catalog-fetch.js +2 -3
- package/dist/lib/model-catalog/catalog-fetch.js.map +1 -1
- package/dist/lib/model-catalog/provider.d.ts +4 -1
- package/dist/lib/model-catalog/provider.d.ts.map +1 -1
- package/dist/lib/model-catalog/provider.js +77 -9
- package/dist/lib/model-catalog/provider.js.map +1 -1
- package/dist/lib/model-catalog/shared.d.ts +24 -1
- package/dist/lib/model-catalog/shared.d.ts.map +1 -1
- package/dist/lib/model-catalog/shared.js +0 -31
- package/dist/lib/model-catalog/shared.js.map +1 -1
- package/dist/lib/model-catalog.d.ts +1 -1
- package/dist/lib/model-catalog.d.ts.map +1 -1
- package/dist/lib/model-catalog.js.map +1 -1
- package/dist/lib/persona-tool-cli.d.ts.map +1 -1
- package/dist/lib/persona-tool-cli.js +19 -7
- package/dist/lib/persona-tool-cli.js.map +1 -1
- package/dist/lib/personality-command.js +1 -1
- package/dist/lib/personality-create.d.ts.map +1 -1
- package/dist/lib/personality-create.js +28 -10
- package/dist/lib/personality-create.js.map +1 -1
- package/dist/lib/personality-skill.js +1 -1
- package/dist/lib/storage/auth-state.d.ts.map +1 -1
- package/dist/lib/storage/auth-state.js +4 -3
- package/dist/lib/storage/auth-state.js.map +1 -1
- package/dist/lib/ui/auth-menu.d.ts +1 -0
- package/dist/lib/ui/auth-menu.d.ts.map +1 -1
- package/dist/lib/ui/auth-menu.js +1 -1
- package/dist/lib/ui/auth-menu.js.map +1 -1
- package/package.json +4 -1
- package/schemas/codex-config.schema.json +153 -11
package/dist/lib/config.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { CONFIG_FILE, DEFAULT_CODEX_CONFIG, DEFAULT_CODEX_CONFIG_TEMPLATE, type BehaviorSettings, type CodexSpoofMode, type ModelBehaviorOverride, type ModelConfigOverride, type PersonalityOption, type PluginConfig, type PluginRuntimeMode, type PromptCacheKeyStrategy, type ServiceTierOption, type VerbosityOption } from "./config/types.js";
|
|
2
|
-
export { type ConfigValidationResult, ensureDefaultConfigFile, loadConfigFile, normalizePersonalityOption, normalizeServiceTierOption, normalizeVerbosityOption, parseConfigFileObject, parseConfigJsonWithComments, parseEnvBoolean, parseEnvNumber, parsePromptCacheKeyStrategy, parseRotationStrategy, parseRuntimeMode, parseSpoofMode, resolveDefaultConfigPath, type EnsureDefaultConfigFileResult, validateConfigFileObject } from "./config/file.js";
|
|
3
|
-
export { buildResolvedBehaviorSettings, cloneBehaviorSettings, getBehaviorSettings, getCodexCompactionOverrideEnabled, getCollaborationProfileEnabled, getCompatInputSanitizerEnabled, getDebugEnabled, getHeaderSnapshotBodiesEnabled, getHeaderSnapshotsEnabled, getHeaderTransformDebugEnabled, getMode, getOrchestratorSubagentsEnabled, getPersonality, getPidOffsetEnabled, getProactiveRefreshBufferMs, getProactiveRefreshEnabled, getPromptCacheKeyStrategy, getQuietMode, getRemapDeveloperMessagesToUserEnabled, getRotationStrategy, getSpoofMode, getThinkingSummariesOverride, resolveConfig } from "./config/resolve.js";
|
|
1
|
+
export { CONFIG_FILE, type CustomModelConfig, DEFAULT_CODEX_CONFIG, DEFAULT_CODEX_CONFIG_TEMPLATE, LEGACY_CONFIG_FILE, type BehaviorSettings, type CodexSpoofMode, type IncludeOption, type ModelBehaviorOverride, type ModelConfigOverride, type PersonalityOption, type PluginConfig, type PluginRuntimeMode, type PromptCacheKeyStrategy, type ReasoningSummaryOption, type ServiceTierOption, type TextVerbosityOption, type VerbosityOption } from "./config/types.js";
|
|
2
|
+
export { type ConfigValidationResult, ensureDefaultConfigFile, loadConfigFile, normalizePersonalityOption, normalizeServiceTierOption, normalizeTextVerbosityOption, normalizeVerbosityOption, parseConfigFileObject, parseConfigJsonWithComments, parseEnvBoolean, parseEnvNumber, parsePromptCacheKeyStrategy, parseRotationStrategy, parseRuntimeMode, parseSpoofMode, resolveDefaultConfigPath, resolveLegacyDefaultConfigPath, type EnsureDefaultConfigFileResult, validateConfigFileObject } from "./config/file.js";
|
|
3
|
+
export { buildResolvedBehaviorSettings, cloneBehaviorSettings, getBehaviorSettings, getCodexCompactionOverrideEnabled, getCollaborationProfileEnabled, getCompatInputSanitizerEnabled, getCustomModels, getDebugEnabled, getHeaderSnapshotBodiesEnabled, getHeaderSnapshotsEnabled, getHeaderTransformDebugEnabled, getMode, getOrchestratorSubagentsEnabled, getPersonality, getPidOffsetEnabled, getProactiveRefreshBufferMs, getProactiveRefreshEnabled, getPromptCacheKeyStrategy, getQuietMode, getReasoningSummaryOverride, getReasoningSummariesOverride, getRemapDeveloperMessagesToUserEnabled, getRotationStrategy, getSpoofMode, getThinkingSummariesOverride, resolveConfig } from "./config/resolve.js";
|
|
4
4
|
//# sourceMappingURL=config.d.ts.map
|
package/dist/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,6BAA6B,EAC7B,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EACL,KAAK,sBAAsB,EAC3B,uBAAuB,EACvB,cAAc,EACd,0BAA0B,EAC1B,0BAA0B,EAC1B,wBAAwB,EACxB,qBAAqB,EACrB,2BAA2B,EAC3B,eAAe,EACf,cAAc,EACd,2BAA2B,EAC3B,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,EACd,wBAAwB,EACxB,KAAK,6BAA6B,EAClC,wBAAwB,EACzB,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EACL,6BAA6B,EAC7B,qBAAqB,EACrB,mBAAmB,EACnB,iCAAiC,EACjC,8BAA8B,EAC9B,8BAA8B,EAC9B,eAAe,EACf,8BAA8B,EAC9B,yBAAyB,EACzB,8BAA8B,EAC9B,OAAO,EACP,+BAA+B,EAC/B,cAAc,EACd,mBAAmB,EACnB,2BAA2B,EAC3B,0BAA0B,EAC1B,yBAAyB,EACzB,YAAY,EACZ,sCAAsC,EACtC,mBAAmB,EACnB,YAAY,EACZ,4BAA4B,EAC5B,aAAa,EACd,MAAM,qBAAqB,CAAA"}
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,KAAK,iBAAiB,EACtB,oBAAoB,EACpB,6BAA6B,EAC7B,kBAAkB,EAClB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAC3B,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EACL,KAAK,sBAAsB,EAC3B,uBAAuB,EACvB,cAAc,EACd,0BAA0B,EAC1B,0BAA0B,EAC1B,4BAA4B,EAC5B,wBAAwB,EACxB,qBAAqB,EACrB,2BAA2B,EAC3B,eAAe,EACf,cAAc,EACd,2BAA2B,EAC3B,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,EACd,wBAAwB,EACxB,8BAA8B,EAC9B,KAAK,6BAA6B,EAClC,wBAAwB,EACzB,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EACL,6BAA6B,EAC7B,qBAAqB,EACrB,mBAAmB,EACnB,iCAAiC,EACjC,8BAA8B,EAC9B,8BAA8B,EAC9B,eAAe,EACf,eAAe,EACf,8BAA8B,EAC9B,yBAAyB,EACzB,8BAA8B,EAC9B,OAAO,EACP,+BAA+B,EAC/B,cAAc,EACd,mBAAmB,EACnB,2BAA2B,EAC3B,0BAA0B,EAC1B,yBAAyB,EACzB,YAAY,EACZ,2BAA2B,EAC3B,6BAA6B,EAC7B,sCAAsC,EACtC,mBAAmB,EACnB,YAAY,EACZ,4BAA4B,EAC5B,aAAa,EACd,MAAM,qBAAqB,CAAA"}
|
package/dist/lib/config.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { CONFIG_FILE, DEFAULT_CODEX_CONFIG, DEFAULT_CODEX_CONFIG_TEMPLATE } from "./config/types.js";
|
|
2
|
-
export { ensureDefaultConfigFile, loadConfigFile, normalizePersonalityOption, normalizeServiceTierOption, normalizeVerbosityOption, parseConfigFileObject, parseConfigJsonWithComments, parseEnvBoolean, parseEnvNumber, parsePromptCacheKeyStrategy, parseRotationStrategy, parseRuntimeMode, parseSpoofMode, resolveDefaultConfigPath, validateConfigFileObject } from "./config/file.js";
|
|
3
|
-
export { buildResolvedBehaviorSettings, cloneBehaviorSettings, getBehaviorSettings, getCodexCompactionOverrideEnabled, getCollaborationProfileEnabled, getCompatInputSanitizerEnabled, getDebugEnabled, getHeaderSnapshotBodiesEnabled, getHeaderSnapshotsEnabled, getHeaderTransformDebugEnabled, getMode, getOrchestratorSubagentsEnabled, getPersonality, getPidOffsetEnabled, getProactiveRefreshBufferMs, getProactiveRefreshEnabled, getPromptCacheKeyStrategy, getQuietMode, getRemapDeveloperMessagesToUserEnabled, getRotationStrategy, getSpoofMode, getThinkingSummariesOverride, resolveConfig } from "./config/resolve.js";
|
|
1
|
+
export { CONFIG_FILE, DEFAULT_CODEX_CONFIG, DEFAULT_CODEX_CONFIG_TEMPLATE, LEGACY_CONFIG_FILE } from "./config/types.js";
|
|
2
|
+
export { ensureDefaultConfigFile, loadConfigFile, normalizePersonalityOption, normalizeServiceTierOption, normalizeTextVerbosityOption, normalizeVerbosityOption, parseConfigFileObject, parseConfigJsonWithComments, parseEnvBoolean, parseEnvNumber, parsePromptCacheKeyStrategy, parseRotationStrategy, parseRuntimeMode, parseSpoofMode, resolveDefaultConfigPath, resolveLegacyDefaultConfigPath, validateConfigFileObject } from "./config/file.js";
|
|
3
|
+
export { buildResolvedBehaviorSettings, cloneBehaviorSettings, getBehaviorSettings, getCodexCompactionOverrideEnabled, getCollaborationProfileEnabled, getCompatInputSanitizerEnabled, getCustomModels, getDebugEnabled, getHeaderSnapshotBodiesEnabled, getHeaderSnapshotsEnabled, getHeaderTransformDebugEnabled, getMode, getOrchestratorSubagentsEnabled, getPersonality, getPidOffsetEnabled, getProactiveRefreshBufferMs, getProactiveRefreshEnabled, getPromptCacheKeyStrategy, getQuietMode, getReasoningSummaryOverride, getReasoningSummariesOverride, getRemapDeveloperMessagesToUserEnabled, getRotationStrategy, getSpoofMode, getThinkingSummariesOverride, resolveConfig } from "./config/resolve.js";
|
|
4
4
|
//# sourceMappingURL=config.js.map
|
package/dist/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAEX,oBAAoB,EACpB,6BAA6B,EAC7B,kBAAkB,EAcnB,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAEL,uBAAuB,EACvB,cAAc,EACd,0BAA0B,EAC1B,0BAA0B,EAC1B,4BAA4B,EAC5B,wBAAwB,EACxB,qBAAqB,EACrB,2BAA2B,EAC3B,eAAe,EACf,cAAc,EACd,2BAA2B,EAC3B,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,EACd,wBAAwB,EACxB,8BAA8B,EAE9B,wBAAwB,EACzB,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EACL,6BAA6B,EAC7B,qBAAqB,EACrB,mBAAmB,EACnB,iCAAiC,EACjC,8BAA8B,EAC9B,8BAA8B,EAC9B,eAAe,EACf,eAAe,EACf,8BAA8B,EAC9B,yBAAyB,EACzB,8BAA8B,EAC9B,OAAO,EACP,+BAA+B,EAC/B,cAAc,EACd,mBAAmB,EACnB,2BAA2B,EAC3B,0BAA0B,EAC1B,yBAAyB,EACzB,YAAY,EACZ,2BAA2B,EAC3B,6BAA6B,EAC7B,sCAAsC,EACtC,mBAAmB,EACnB,YAAY,EACZ,4BAA4B,EAC5B,aAAa,EACd,MAAM,qBAAqB,CAAA"}
|
|
@@ -3,15 +3,19 @@ export type PluginFatalErrorInput = {
|
|
|
3
3
|
status?: number;
|
|
4
4
|
type?: string;
|
|
5
5
|
param?: string;
|
|
6
|
+
source?: string;
|
|
7
|
+
hint?: string;
|
|
6
8
|
};
|
|
7
9
|
export declare class PluginFatalError extends Error {
|
|
8
10
|
readonly status: number;
|
|
9
11
|
readonly type: string;
|
|
10
12
|
readonly param?: string;
|
|
13
|
+
readonly source?: string;
|
|
14
|
+
readonly hint?: string;
|
|
11
15
|
constructor(input: PluginFatalErrorInput);
|
|
12
16
|
}
|
|
13
17
|
export declare function isPluginFatalError(value: unknown): value is PluginFatalError;
|
|
14
|
-
export declare function createSyntheticErrorResponse(message: string, status?: number, type?: string, param?: string): Response;
|
|
18
|
+
export declare function createSyntheticErrorResponse(message: string, status?: number, type?: string, param?: string, source?: string, hint?: string): Response;
|
|
15
19
|
export declare function toSyntheticErrorResponse(error: PluginFatalError): Response;
|
|
16
20
|
export declare function formatWaitTime(ms: number): string;
|
|
17
21
|
//# sourceMappingURL=fatal-errors.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fatal-errors.d.ts","sourceRoot":"","sources":["../../lib/fatal-errors.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"fatal-errors.d.ts","sourceRoot":"","sources":["../../lib/fatal-errors.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;gBAEV,KAAK,EAAE,qBAAqB;CASzC;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAE5E;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,EACf,MAAM,SAAM,EACZ,IAAI,SAAc,EAClB,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,GACZ,QAAQ,CAsBV;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,GAAG,QAAQ,CAE1E;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAMjD"}
|
package/dist/lib/fatal-errors.js
CHANGED
|
@@ -2,18 +2,22 @@ export class PluginFatalError extends Error {
|
|
|
2
2
|
status;
|
|
3
3
|
type;
|
|
4
4
|
param;
|
|
5
|
+
source;
|
|
6
|
+
hint;
|
|
5
7
|
constructor(input) {
|
|
6
8
|
super(input.message);
|
|
7
9
|
this.name = "PluginFatalError";
|
|
8
10
|
this.status = input.status ?? 400;
|
|
9
11
|
this.type = input.type ?? "hard_stop";
|
|
10
12
|
this.param = input.param;
|
|
13
|
+
this.source = input.source;
|
|
14
|
+
this.hint = input.hint;
|
|
11
15
|
}
|
|
12
16
|
}
|
|
13
17
|
export function isPluginFatalError(value) {
|
|
14
18
|
return value instanceof PluginFatalError;
|
|
15
19
|
}
|
|
16
|
-
export function createSyntheticErrorResponse(message, status = 400, type = "hard_stop", param) {
|
|
20
|
+
export function createSyntheticErrorResponse(message, status = 400, type = "hard_stop", param, source, hint) {
|
|
17
21
|
const errorPayload = {
|
|
18
22
|
error: {
|
|
19
23
|
message,
|
|
@@ -23,13 +27,19 @@ export function createSyntheticErrorResponse(message, status = 400, type = "hard
|
|
|
23
27
|
if (param) {
|
|
24
28
|
errorPayload.error.param = param;
|
|
25
29
|
}
|
|
30
|
+
if (source) {
|
|
31
|
+
errorPayload.error.source = source;
|
|
32
|
+
}
|
|
33
|
+
if (hint) {
|
|
34
|
+
errorPayload.error.hint = hint;
|
|
35
|
+
}
|
|
26
36
|
return new Response(JSON.stringify(errorPayload), {
|
|
27
37
|
status,
|
|
28
38
|
headers: { "content-type": "application/json; charset=utf-8" }
|
|
29
39
|
});
|
|
30
40
|
}
|
|
31
41
|
export function toSyntheticErrorResponse(error) {
|
|
32
|
-
return createSyntheticErrorResponse(error.message, error.status, error.type, error.param);
|
|
42
|
+
return createSyntheticErrorResponse(error.message, error.status, error.type, error.param, error.source, error.hint);
|
|
33
43
|
}
|
|
34
44
|
export function formatWaitTime(ms) {
|
|
35
45
|
const totalSeconds = Math.max(0, Math.floor(ms / 1000));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fatal-errors.js","sourceRoot":"","sources":["../../lib/fatal-errors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fatal-errors.js","sourceRoot":"","sources":["../../lib/fatal-errors.ts"],"names":[],"mappings":"AASA,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAChC,MAAM,CAAQ;IACd,IAAI,CAAQ;IACZ,KAAK,CAAS;IACd,MAAM,CAAS;IACf,IAAI,CAAS;IAEtB,YAAY,KAA4B;QACtC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAA;QAC9B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,GAAG,CAAA;QACjC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,WAAW,CAAA;QACrC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;IACxB,CAAC;CACF;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,KAAK,YAAY,gBAAgB,CAAA;AAC1C,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,OAAe,EACf,MAAM,GAAG,GAAG,EACZ,IAAI,GAAG,WAAW,EAClB,KAAc,EACd,MAAe,EACf,IAAa;IAEb,MAAM,YAAY,GAAiG;QACjH,KAAK,EAAE;YACL,OAAO;YACP,IAAI;SACL;KACF,CAAA;IAED,IAAI,KAAK,EAAE,CAAC;QACV,YAAY,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAA;IAClC,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,YAAY,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAA;IACpC,CAAC;IACD,IAAI,IAAI,EAAE,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAA;IAChC,CAAC;IAED,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;QAChD,MAAM;QACN,OAAO,EAAE,EAAE,cAAc,EAAE,iCAAiC,EAAE;KAC/D,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAAuB;IAC9D,OAAO,4BAA4B,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;AACrH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAAU;IACvC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IACvD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;IAC7C,MAAM,OAAO,GAAG,YAAY,GAAG,EAAE,CAAA;IACjC,IAAI,OAAO,GAAG,CAAC;QAAE,OAAO,GAAG,OAAO,KAAK,OAAO,GAAG,CAAA;IACjD,OAAO,GAAG,OAAO,GAAG,CAAA;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-orchestrator.d.ts","sourceRoot":"","sources":["../../lib/fetch-orchestrator.ts"],"names":[],"mappings":"AAeA,OAAO,EAGL,KAAK,qBAAqB,EAE3B,MAAM,+BAA+B,CAAA;AAEtC,OAAO,EACL,4BAA4B,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAC3B,KAAK,4BAA4B,EACjC,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAA;AAEtC,qBAAa,iBAAiB;IAGhB,OAAO,CAAC,IAAI;IAFxB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAwB;gBAE1B,IAAI,EAAE,qBAAqB;YAIjC,uBAAuB;IA6DrC,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,wBAAwB;IAehC,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,mBAAmB;YAgBb,cAAc;IA0BtB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch-orchestrator.d.ts","sourceRoot":"","sources":["../../lib/fetch-orchestrator.ts"],"names":[],"mappings":"AAeA,OAAO,EAGL,KAAK,qBAAqB,EAE3B,MAAM,+BAA+B,CAAA;AAEtC,OAAO,EACL,4BAA4B,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAC3B,KAAK,4BAA4B,EACjC,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAA;AAEtC,qBAAa,iBAAiB;IAGhB,OAAO,CAAC,IAAI;IAFxB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAwB;gBAE1B,IAAI,EAAE,qBAAqB;YAIjC,uBAAuB;IA6DrC,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,wBAAwB;IAehC,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,mBAAmB;YAgBb,cAAc;IA0BtB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;CAmNpF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { computeBackoffMs, parseRetryAfterMs } from "./rate-limit.js";
|
|
2
|
-
import { createSyntheticErrorResponse, formatWaitTime } from "./fatal-errors.js";
|
|
2
|
+
import { createSyntheticErrorResponse, formatWaitTime, isPluginFatalError } from "./fatal-errors.js";
|
|
3
3
|
import { DEFAULT_ACCOUNT_SWITCH_TOAST_DEBOUNCE_MS, DEFAULT_RATE_LIMIT_TOAST_DEBOUNCE_MS, DEFAULT_SESSION_TOAST_DEBOUNCE_MS, formatAccountLabel, MAX_SESSION_KEYS, MAX_TOAST_DEDUPE_KEYS, resolveRetryAccountKey, resolveSessionKey, SESSION_KEY_TTL_MS, stripCrossOriginRedirectHeaders, TOAST_DEDUPE_TTL_MS } from "./fetch-orchestrator-helpers.js";
|
|
4
4
|
import { createFetchOrchestratorState } from "./fetch-orchestrator-types.js";
|
|
5
5
|
export { createFetchOrchestratorState } from "./fetch-orchestrator-types.js";
|
|
@@ -247,6 +247,9 @@ export class FetchOrchestrator {
|
|
|
247
247
|
}
|
|
248
248
|
}
|
|
249
249
|
catch (error) {
|
|
250
|
+
if (isPluginFatalError(error)) {
|
|
251
|
+
throw error;
|
|
252
|
+
}
|
|
250
253
|
if (error instanceof Error) {
|
|
251
254
|
// Snapshot/debug hooks should never block request execution.
|
|
252
255
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-orchestrator.js","sourceRoot":"","sources":["../../lib/fetch-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"fetch-orchestrator.js","sourceRoot":"","sources":["../../lib/fetch-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installer-cli.d.ts","sourceRoot":"","sources":["../../lib/installer-cli.ts"],"names":[],"mappings":"AAeA,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9B,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAC/B,CAAA;
|
|
1
|
+
{"version":3,"file":"installer-cli.d.ts","sourceRoot":"","sources":["../../lib/installer-cli.ts"],"names":[],"mappings":"AAeA,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9B,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAC/B,CAAA;AAoFD,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,GAAE,WAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqEnG"}
|
|
@@ -10,32 +10,55 @@ const DEFAULT_IO = {
|
|
|
10
10
|
err: (message) => process.stderr.write(`${message}\n`)
|
|
11
11
|
};
|
|
12
12
|
function parseArgs(args) {
|
|
13
|
-
const
|
|
14
|
-
const
|
|
13
|
+
const hasCommand = Boolean(args[0] && !args[0].startsWith("-"));
|
|
14
|
+
const command = hasCommand ? args[0] : "install";
|
|
15
|
+
const tail = hasCommand ? args.slice(1) : args;
|
|
15
16
|
let configPath;
|
|
16
17
|
let pluginSpecifier;
|
|
17
18
|
for (let i = 0; i < tail.length; i += 1) {
|
|
18
19
|
const token = tail[i];
|
|
20
|
+
if (!token)
|
|
21
|
+
continue;
|
|
19
22
|
if (token === "--config") {
|
|
20
|
-
|
|
23
|
+
const value = tail[i + 1];
|
|
24
|
+
if (!value || value.startsWith("-")) {
|
|
25
|
+
return { ok: false, error: "Missing value for --config" };
|
|
26
|
+
}
|
|
27
|
+
configPath = value;
|
|
21
28
|
i += 1;
|
|
22
29
|
continue;
|
|
23
30
|
}
|
|
24
31
|
if (token.startsWith("--config=")) {
|
|
25
|
-
|
|
32
|
+
const value = token.slice("--config=".length);
|
|
33
|
+
if (!value) {
|
|
34
|
+
return { ok: false, error: "Missing value for --config" };
|
|
35
|
+
}
|
|
36
|
+
configPath = value;
|
|
26
37
|
continue;
|
|
27
38
|
}
|
|
28
39
|
if (token === "--plugin") {
|
|
29
|
-
|
|
40
|
+
const value = tail[i + 1];
|
|
41
|
+
if (!value || value.startsWith("-")) {
|
|
42
|
+
return { ok: false, error: "Missing value for --plugin" };
|
|
43
|
+
}
|
|
44
|
+
pluginSpecifier = value;
|
|
30
45
|
i += 1;
|
|
31
46
|
continue;
|
|
32
47
|
}
|
|
33
48
|
if (token.startsWith("--plugin=")) {
|
|
34
|
-
|
|
49
|
+
const value = token.slice("--plugin=".length);
|
|
50
|
+
if (!value) {
|
|
51
|
+
return { ok: false, error: "Missing value for --plugin" };
|
|
52
|
+
}
|
|
53
|
+
pluginSpecifier = value;
|
|
35
54
|
continue;
|
|
36
55
|
}
|
|
56
|
+
if (token.startsWith("-")) {
|
|
57
|
+
return { ok: false, error: `Unknown option: ${token}` };
|
|
58
|
+
}
|
|
59
|
+
return { ok: false, error: `Unexpected argument: ${token}` };
|
|
37
60
|
}
|
|
38
|
-
return { command, configPath, pluginSpecifier };
|
|
61
|
+
return { ok: true, command, configPath, pluginSpecifier };
|
|
39
62
|
}
|
|
40
63
|
function helpText() {
|
|
41
64
|
return [
|
|
@@ -58,6 +81,12 @@ export async function runInstallerCli(args, io = DEFAULT_IO) {
|
|
|
58
81
|
return 0;
|
|
59
82
|
}
|
|
60
83
|
const parsed = parseArgs(args);
|
|
84
|
+
if (!parsed.ok) {
|
|
85
|
+
io.err(parsed.error);
|
|
86
|
+
io.err("");
|
|
87
|
+
io.err(helpText());
|
|
88
|
+
return 1;
|
|
89
|
+
}
|
|
61
90
|
if (parsed.command !== "install") {
|
|
62
91
|
io.err(`Unknown command: ${parsed.command}`);
|
|
63
92
|
io.err("");
|
|
@@ -76,10 +105,10 @@ export async function runInstallerCli(args, io = DEFAULT_IO) {
|
|
|
76
105
|
const defaultConfig = await ensureDefaultConfigFile({ env: process.env });
|
|
77
106
|
io.out(`Codex config: ${defaultConfig.filePath}`);
|
|
78
107
|
io.out(`Codex config created: ${defaultConfig.created ? "yes" : "no"}`);
|
|
79
|
-
const commandResult = await installCreatePersonalityCommand(
|
|
108
|
+
const commandResult = await installCreatePersonalityCommand();
|
|
80
109
|
io.out(`Commands directory: ${commandResult.commandsDir}`);
|
|
81
110
|
io.out(`/create-personality synchronized: ${commandResult.created ? "created" : commandResult.updated ? "updated" : "unchanged"}`);
|
|
82
|
-
const skillResult = await installPersonalityBuilderSkill(
|
|
111
|
+
const skillResult = await installPersonalityBuilderSkill();
|
|
83
112
|
io.out(`Skills directory: ${skillResult.skillsDir}`);
|
|
84
113
|
io.out(`personality-builder skill synchronized: ${skillResult.created ? "created" : skillResult.updated ? "updated" : "unchanged"}`);
|
|
85
114
|
const promptsResult = await refreshCachedCodexPrompts({ forceRefresh: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installer-cli.js","sourceRoot":"","sources":["../../lib/installer-cli.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAA;AAC1E,OAAO,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAA;AACvE,OAAO,EACL,uBAAuB,EACvB,8BAA8B,EAC9B,OAAO,EACP,cAAc,EACd,aAAa,EACd,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,oCAAoC,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAA;AAOpE,MAAM,UAAU,GAAgB;IAC9B,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC;IACtD,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC;CACvD,CAAA;AAED,SAAS,SAAS,CAAC,IAAc;
|
|
1
|
+
{"version":3,"file":"installer-cli.js","sourceRoot":"","sources":["../../lib/installer-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-fetch.d.ts","sourceRoot":"","sources":["../../../lib/model-catalog/catalog-fetch.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,KAAK,cAAc,EAInB,KAAK,yBAAyB,
|
|
1
|
+
{"version":3,"file":"catalog-fetch.d.ts","sourceRoot":"","sources":["../../../lib/model-catalog/catalog-fetch.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,KAAK,cAAc,EAInB,KAAK,yBAAyB,EAG/B,MAAM,aAAa,CAAA;AAkBpB,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC,CAsKlH"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { cacheKey, deriveReason, emitEvent, emitStaleCacheFallback, isFresh, readCatalogFromDisk, readCatalogFromGitHubCache, refreshSharedGitHubModelsCache, writeCatalogToDisk } from "./cache-helpers.js";
|
|
2
|
-
import { CODEX_MODELS_ENDPOINT, DEFAULT_CLIENT_VERSION, FETCH_TIMEOUT_MS,
|
|
2
|
+
import { CODEX_MODELS_ENDPOINT, DEFAULT_CLIENT_VERSION, FETCH_TIMEOUT_MS, parseCatalogResponse, normalizeSemver } from "./shared.js";
|
|
3
3
|
import { resolveCodexCacheDir } from "../codex-cache-layout.js";
|
|
4
4
|
const inMemoryCatalog = new Map();
|
|
5
5
|
const inFlightCatalogFetches = new Map();
|
|
@@ -133,10 +133,9 @@ export async function getCodexModelCatalog(input) {
|
|
|
133
133
|
throw new Error("codex models response did not contain usable models");
|
|
134
134
|
}
|
|
135
135
|
await ensureFallbackCaches(true);
|
|
136
|
-
const mergedModels = mergeCatalogModels(models, githubCacheFallback?.models);
|
|
137
136
|
const nextCache = {
|
|
138
137
|
fetchedAt: now,
|
|
139
|
-
models
|
|
138
|
+
models
|
|
140
139
|
};
|
|
141
140
|
inMemoryCatalog.set(key, nextCache);
|
|
142
141
|
await writeCatalogToDisk(cacheDir, accountId, nextCache);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-fetch.js","sourceRoot":"","sources":["../../../lib/model-catalog/catalog-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,sBAAsB,EACtB,OAAO,EACP,mBAAmB,EACnB,0BAA0B,EAC1B,8BAA8B,EAC9B,kBAAkB,EACnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAEL,qBAAqB,EACrB,sBAAsB,EACtB,gBAAgB,EAEhB,
|
|
1
|
+
{"version":3,"file":"catalog-fetch.js","sourceRoot":"","sources":["../../../lib/model-catalog/catalog-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,sBAAsB,EACtB,OAAO,EACP,mBAAmB,EACnB,0BAA0B,EAC1B,8BAA8B,EAC9B,kBAAkB,EACnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAEL,qBAAqB,EACrB,sBAAsB,EACtB,gBAAgB,EAEhB,oBAAoB,EACpB,eAAe,EAChB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAE/D,MAAM,eAAe,GAAG,IAAI,GAAG,EAAoF,CAAA;AACnH,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAiD,CAAA;AAEvF,SAAS,sBAAsB,CAAC,KAAyB,EAAE,QAAiB;IAC1E,MAAM,OAAO,GAAG,KAAK,EAAE,IAAI,EAAE,CAAA;IAC7B,IAAI,OAAO;QAAE,OAAO,OAAO,CAAA;IAC3B,MAAM,eAAe,GAAG,QAAQ,EAAE,IAAI,EAAE,CAAA;IACxC,OAAO,eAAe,IAAI,sBAAsB,CAAA;AAClD,CAAC;AAED,SAAS,mBAAmB,CAAC,aAAqB;IAChD,MAAM,SAAS,GAAG,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;IACjE,OAAO,GAAG,qBAAqB,GAAG,SAAS,kBAAkB,kBAAkB,CAAC,aAAa,CAAC,EAAE,CAAA;AAClG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,KAAgC;IACzE,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;IACrC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IACrD,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;IAC/C,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,KAAK,CAAA;IAC1C,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,CAAA;IAC7C,MAAM,mBAAmB,GAAG,eAAe,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,eAAe,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;IACxG,MAAM,qBAAqB,GACzB,eAAe,CAAC,sBAAsB,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;QACjF,eAAe,CAAC,sBAAsB,CAAC;QACvC,sBAAsB,CAAA;IACxB,MAAM,0BAA0B,GAC9B,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,mBAAmB,KAAK,SAAS,CAAA;IAC5F,MAAM,8BAA8B,GAAG,KAAK,CAAC,wBAAwB,IAAI,0BAA0B,CAAA;IAEnG,IAAI,8BAA8B,EAAE,CAAC;QACnC,MAAM,8BAA8B,CAAC;YACnC,QAAQ;YACR,mBAAmB;YACnB,GAAG;YACH,SAAS;SACV,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACvC,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,aAAa,IAAI,CAAC,WAAW,CAAA;IAC7D,IAAI,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,cAAc,EAAE,CAAC;QAC5E,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAA;QAC9C,OAAO,MAAM,CAAC,MAAM,CAAA;IACtB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;IACjE,MAAM,YAAY,GAAG,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IACjD,IAAI,YAAY,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QACxC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAC9B,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAC5C,OAAO,IAAI,CAAC,MAAM,CAAA;IACpB,CAAC;IAED,IAAI,mBAAgF,CAAA;IAEpF,MAAM,oBAAoB,GAAG,KAAK,EAAE,aAAa,GAAG,KAAK,EAAiB,EAAE;QAC1E,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,mBAAmB,GAAG,MAAM,0BAA0B,CAAC,QAAQ,CAAC,CAAA;QAClE,CAAC;QACD,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,8BAA8B,CAAC;gBACnC,QAAQ;gBACR,mBAAmB,EAAE,qBAAqB;gBAC1C,GAAG;gBACH,SAAS;aACV,CAAC,CAAA;YACF,mBAAmB,GAAG,CAAC,MAAM,0BAA0B,CAAC,QAAQ,CAAC,CAAC,IAAI,mBAAmB,CAAA;QAC3F,CAAC;IACH,CAAC,CAAA;IAED,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,oBAAoB,EAAE,CAAA;QAC5B,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAA;QAClC,CAAC;QACD,IAAI,IAAI,EAAE,CAAC;YACT,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAA;YAC9E,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;YAC9B,OAAO,IAAI,CAAC,MAAM,CAAA;QACpB,CAAC;QACD,MAAM,KAAK,GAAG,sBAAsB,CAAC,KAAK,EAAE;YAC1C,MAAM,EAAE,mBAAmB;SAC5B,CAAC,CAAA;QACF,IAAI,KAAK,EAAE,CAAC;YACV,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE;gBACvB,SAAS,EAAE,GAAG;gBACd,MAAM,EAAE,KAAK;gBACb,aAAa,EAAE,IAAI;aACpB,CAAC,CAAA;YACF,OAAO,KAAK,CAAA;QACd,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAA;QACjF,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,MAAM,OAAO,GAA2B;QACtC,aAAa,EAAE,UAAU,WAAW,EAAE;QACtC,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,UAAU;KACnD,CAAA;IACD,MAAM,aAAa,GAAG,sBAAsB,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;IACtF,MAAM,aAAa,GAAG,sBAAsB,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;IACtF,IAAI,aAAa;QAAE,OAAO,CAAC,OAAO,GAAG,aAAa,CAAA;IAClD,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAA;IACzC,IAAI,SAAS;QAAE,OAAO,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IAChD,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,CAAA;IAC1C,IAAI,SAAS;QAAE,OAAO,CAAC,aAAa,CAAC,GAAG,SAAS,CAAA;IACjD,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,SAAS,CAAA;IACtD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,oBAAoB,CAAC,GAAG,SAAS,CAAA;IAC3C,CAAC;IAED,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACxD,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,gBAAgB,CAAA;IACzB,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,KAAK,IAA2C,EAAE;QAClE,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;YACxC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,gBAAgB,CAAC,CAAA;YACtE,IAAI,QAAkB,CAAA;YACtB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAA;gBACnD,QAAQ,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE;oBACnC,MAAM,EAAE,KAAK;oBACb,OAAO;oBACP,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAC,CAAA;YACJ,CAAC;oBAAS,CAAC;gBACT,YAAY,CAAC,OAAO,CAAC,CAAA;YACvB,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,2CAA2C,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;YAC/E,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YACrC,MAAM,MAAM,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAA;YAC5C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAA;YACxE,CAAC;YACD,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAA;YAEhC,MAAM,SAAS,GAAG;gBAChB,SAAS,EAAE,GAAG;gBACd,MAAM;aACP,CAAA;YACD,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;YACnC,MAAM,kBAAkB,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;YACxD,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC,CAAA;YACnD,OAAO,SAAS,CAAC,MAAM,CAAA;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,sBAAsB,EAAE,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YAC/E,MAAM,oBAAoB,EAAE,CAAA;YAC5B,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACzB,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAA;YAClC,CAAC;YACD,MAAM,KAAK,GAAG,sBAAsB,CAAC,KAAK,EAAE;gBAC1C,IAAI;gBACJ,MAAM,EAAE,mBAAmB;aAC5B,CAAC,CAAA;YACF,IAAI,KAAK,EAAE,CAAC;gBACV,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE;oBACvB,SAAS,EAAE,GAAG;oBACd,MAAM,EAAE,KAAK;oBACb,aAAa,EAAE,IAAI;iBACpB,CAAC,CAAA;gBACF,OAAO,KAAK,CAAA;YACd,CAAC;YACD,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAA;YACjF,OAAO,SAAS,CAAA;QAClB,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;IAEJ,sBAAsB,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IACzC,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE;QAC3B,IAAI,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YACjD,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACpC,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { type ApplyCodexCatalogInput, type CodexModelInfo, type CodexModelRuntimeDefaults, type PersonalityOption } from "./shared.js";
|
|
2
|
-
export declare function resolveInstructionsForModel(model: CodexModelInfo, personality?: PersonalityOption
|
|
2
|
+
export declare function resolveInstructionsForModel(model: CodexModelInfo, personality?: PersonalityOption, options?: {
|
|
3
|
+
projectRoot?: string;
|
|
4
|
+
configRoot?: string;
|
|
5
|
+
}): string | undefined;
|
|
3
6
|
export declare function getRuntimeDefaultsForModel(model: CodexModelInfo | undefined): CodexModelRuntimeDefaults | undefined;
|
|
4
7
|
export declare function getRuntimeDefaultsForSlug(slug: string, catalogModels: CodexModelInfo[] | undefined): CodexModelRuntimeDefaults | undefined;
|
|
5
8
|
export declare function applyCodexCatalogToProviderModels(input: ApplyCodexCatalogInput): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../lib/model-catalog/provider.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,sBAAsB,
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../lib/model-catalog/provider.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,sBAAsB,EAE3B,KAAK,cAAc,EACnB,KAAK,yBAAyB,EAK9B,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAA;AA4UpB,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,cAAc,EACrB,WAAW,CAAC,EAAE,iBAAiB,EAC/B,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GAC1D,MAAM,GAAG,SAAS,CAiBpB;AAiCD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,GAAG,yBAAyB,GAAG,SAAS,CAiDnH;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,cAAc,EAAE,GAAG,SAAS,GAC1C,yBAAyB,GAAG,SAAS,CAGvC;AAED,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,sBAAsB,GAAG,IAAI,CA6GrF"}
|
|
@@ -70,7 +70,7 @@ function resolveDisplayName(slug, catalogDisplayName) {
|
|
|
70
70
|
return trimmed;
|
|
71
71
|
}
|
|
72
72
|
function resolveProviderTransport(providerModels, existingModel) {
|
|
73
|
-
const source = existingModel ??
|
|
73
|
+
const source = existingModel ?? {};
|
|
74
74
|
const api = asRecord(source.api);
|
|
75
75
|
return {
|
|
76
76
|
providerID: asString(source.providerID) ?? "openai",
|
|
@@ -117,6 +117,28 @@ function buildVariants(model) {
|
|
|
117
117
|
.filter((value) => value !== undefined)));
|
|
118
118
|
return Object.fromEntries(efforts.map((effort) => [effort, { reasoningEffort: effort }]));
|
|
119
119
|
}
|
|
120
|
+
function cloneValue(value) {
|
|
121
|
+
if (Array.isArray(value)) {
|
|
122
|
+
return value.map((entry) => cloneValue(entry));
|
|
123
|
+
}
|
|
124
|
+
if (typeof value === "object" && value !== null) {
|
|
125
|
+
return Object.fromEntries(Object.entries(value).map(([key, entry]) => [key, cloneValue(entry)]));
|
|
126
|
+
}
|
|
127
|
+
return value;
|
|
128
|
+
}
|
|
129
|
+
function mergeVariantMaps(baseVariants, overlayVariants) {
|
|
130
|
+
const nextVariants = {};
|
|
131
|
+
for (const [variantName, variantValue] of Object.entries(baseVariants ?? {})) {
|
|
132
|
+
nextVariants[variantName] = cloneValue(variantValue);
|
|
133
|
+
}
|
|
134
|
+
for (const [variantName, variantValue] of Object.entries(overlayVariants ?? {})) {
|
|
135
|
+
nextVariants[variantName] = {
|
|
136
|
+
...(nextVariants[variantName] ?? {}),
|
|
137
|
+
...cloneValue(variantValue ?? {})
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
return Object.keys(nextVariants).length > 0 ? nextVariants : undefined;
|
|
141
|
+
}
|
|
120
142
|
function buildProviderModelFromCatalog(model, providerModels, existingModel) {
|
|
121
143
|
const display = resolveDisplayName(model.slug, model.display_name);
|
|
122
144
|
const transport = resolveProviderTransport(providerModels, existingModel);
|
|
@@ -171,13 +193,36 @@ function buildProviderModelFromCatalog(model, providerModels, existingModel) {
|
|
|
171
193
|
variants
|
|
172
194
|
};
|
|
173
195
|
}
|
|
174
|
-
function
|
|
196
|
+
function buildCustomProviderModel(input) {
|
|
197
|
+
const nextModel = cloneValue(input.targetModel);
|
|
198
|
+
nextModel.id = input.slug;
|
|
199
|
+
nextModel.slug = input.slug;
|
|
200
|
+
nextModel.model = input.slug;
|
|
201
|
+
if (input.config.name) {
|
|
202
|
+
nextModel.name = input.config.name;
|
|
203
|
+
nextModel.displayName = input.config.name;
|
|
204
|
+
nextModel.display_name = input.config.name;
|
|
205
|
+
}
|
|
206
|
+
const api = typeof nextModel.api === "object" && nextModel.api !== null && !Array.isArray(nextModel.api)
|
|
207
|
+
? nextModel.api
|
|
208
|
+
: {};
|
|
209
|
+
api.id = input.config.targetModel;
|
|
210
|
+
nextModel.api = api;
|
|
211
|
+
nextModel.variants = mergeVariantMaps(asRecord(nextModel.variants), input.config.variants);
|
|
212
|
+
const options = ensureModelOptions(nextModel);
|
|
213
|
+
options.codexCustomModelConfig = cloneValue({
|
|
214
|
+
slug: input.slug,
|
|
215
|
+
...input.config
|
|
216
|
+
});
|
|
217
|
+
return nextModel;
|
|
218
|
+
}
|
|
219
|
+
function resolvePersonalityText(model, personality, options = {}) {
|
|
175
220
|
const vars = model.model_messages?.instructions_variables;
|
|
176
221
|
const normalized = (personality ?? "none").trim().toLowerCase();
|
|
177
222
|
if (!normalized)
|
|
178
223
|
return undefined;
|
|
179
224
|
if (normalized !== "none") {
|
|
180
|
-
const fromFile = resolveCustomPersonalityDescription(normalized);
|
|
225
|
+
const fromFile = resolveCustomPersonalityDescription(normalized, options);
|
|
181
226
|
if (typeof fromFile === "string" && fromFile.trim()) {
|
|
182
227
|
return fromFile;
|
|
183
228
|
}
|
|
@@ -219,7 +264,7 @@ function normalizeSafeInstructions(value) {
|
|
|
219
264
|
return undefined;
|
|
220
265
|
return isCompatibleInstructionsText(trimmed) ? trimmed : undefined;
|
|
221
266
|
}
|
|
222
|
-
export function resolveInstructionsForModel(model, personality) {
|
|
267
|
+
export function resolveInstructionsForModel(model, personality, options = {}) {
|
|
223
268
|
const template = model.model_messages?.instructions_template?.trim();
|
|
224
269
|
const base = model.base_instructions?.trim();
|
|
225
270
|
const safeBase = normalizeSafeInstructions(base);
|
|
@@ -228,7 +273,7 @@ export function resolveInstructionsForModel(model, personality) {
|
|
|
228
273
|
if (!template.includes("{{") && !template.includes("}}")) {
|
|
229
274
|
return normalizeSafeInstructions(template) ?? safeBase;
|
|
230
275
|
}
|
|
231
|
-
const personalityText = resolvePersonalityText(model, personality) ?? "";
|
|
276
|
+
const personalityText = resolvePersonalityText(model, personality, options) ?? "";
|
|
232
277
|
const rendered = template
|
|
233
278
|
.replace(/\{\{\s*personality\s*\}\}/gi, personalityText)
|
|
234
279
|
.replace(/\n{3,}/g, "\n\n")
|
|
@@ -308,7 +353,10 @@ export function getRuntimeDefaultsForSlug(slug, catalogModels) {
|
|
|
308
353
|
return getRuntimeDefaultsForModel(model);
|
|
309
354
|
}
|
|
310
355
|
export function applyCodexCatalogToProviderModels(input) {
|
|
311
|
-
const catalogModels = input.catalogModels
|
|
356
|
+
const catalogModels = input.catalogModels;
|
|
357
|
+
if (catalogModels === undefined) {
|
|
358
|
+
return;
|
|
359
|
+
}
|
|
312
360
|
if (catalogModels.length === 0) {
|
|
313
361
|
for (const modelId of Object.keys(input.providerModels)) {
|
|
314
362
|
delete input.providerModels[modelId];
|
|
@@ -318,6 +366,7 @@ export function applyCodexCatalogToProviderModels(input) {
|
|
|
318
366
|
const allowedSlugs = Array.from(new Set(catalogModels.map((model) => model.slug))).sort(compareModelSlugs);
|
|
319
367
|
const allowed = new Set(allowedSlugs);
|
|
320
368
|
const bySlug = new Map(catalogModels.map((model) => [model.slug, model]));
|
|
369
|
+
const customTargetBySlug = new Map();
|
|
321
370
|
for (const slug of allowedSlugs) {
|
|
322
371
|
const catalogModel = bySlug.get(slug);
|
|
323
372
|
if (!catalogModel)
|
|
@@ -330,7 +379,10 @@ export function applyCodexCatalogToProviderModels(input) {
|
|
|
330
379
|
}
|
|
331
380
|
input.providerModels[slug] = nextModel;
|
|
332
381
|
const options = ensureModelOptions(input.providerModels[slug]);
|
|
333
|
-
const instructions = resolveInstructionsForModel(catalogModel, input.personality
|
|
382
|
+
const instructions = resolveInstructionsForModel(catalogModel, input.personality, {
|
|
383
|
+
projectRoot: input.projectRoot,
|
|
384
|
+
configRoot: input.configRoot
|
|
385
|
+
});
|
|
334
386
|
options.codexCatalogModel = catalogModel;
|
|
335
387
|
if (instructions) {
|
|
336
388
|
input.providerModels[slug].instructions = instructions;
|
|
@@ -349,14 +401,30 @@ export function applyCodexCatalogToProviderModels(input) {
|
|
|
349
401
|
delete options.codexRuntimeDefaults;
|
|
350
402
|
}
|
|
351
403
|
}
|
|
404
|
+
for (const [slug, customModel] of Object.entries(input.customModels ?? {})) {
|
|
405
|
+
const targetSlug = customModel.targetModel.trim().toLowerCase();
|
|
406
|
+
const targetModel = input.providerModels[targetSlug];
|
|
407
|
+
if (!targetModel) {
|
|
408
|
+
input.warn?.(`[opencode-codex-auth] customModels.${slug}.targetModel points to ${JSON.stringify(customModel.targetModel)}, but that model was not present in the active Codex catalog. Skipping custom model synthesis.`);
|
|
409
|
+
delete input.providerModels[slug];
|
|
410
|
+
continue;
|
|
411
|
+
}
|
|
412
|
+
input.providerModels[slug] = buildCustomProviderModel({
|
|
413
|
+
slug,
|
|
414
|
+
config: customModel,
|
|
415
|
+
targetModel
|
|
416
|
+
});
|
|
417
|
+
allowed.add(slug);
|
|
418
|
+
customTargetBySlug.set(slug, targetSlug);
|
|
419
|
+
}
|
|
352
420
|
for (const modelId of Object.keys(input.providerModels)) {
|
|
353
421
|
if (!allowed.has(modelId)) {
|
|
354
422
|
delete input.providerModels[modelId];
|
|
355
423
|
}
|
|
356
424
|
}
|
|
357
425
|
const orderedModelIds = Object.keys(input.providerModels).sort((a, b) => {
|
|
358
|
-
const aPriority = bySlug.get(a)?.priority;
|
|
359
|
-
const bPriority = bySlug.get(b)?.priority;
|
|
426
|
+
const aPriority = bySlug.get(a)?.priority ?? bySlug.get(customTargetBySlug.get(a) ?? "")?.priority;
|
|
427
|
+
const bPriority = bySlug.get(b)?.priority ?? bySlug.get(customTargetBySlug.get(b) ?? "")?.priority;
|
|
360
428
|
const normalizedAPriority = typeof aPriority === "number" && Number.isFinite(aPriority) ? aPriority : Number.POSITIVE_INFINITY;
|
|
361
429
|
const normalizedBPriority = typeof bPriority === "number" && Number.isFinite(bPriority) ? bPriority : Number.POSITIVE_INFINITY;
|
|
362
430
|
if (normalizedAPriority !== normalizedBPriority) {
|