@bitkyc08/opencodex 2.94.0 → 2.96.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/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/App-bwugJRKn.js +58 -0
- package/gui/dist/assets/{Tray-CZatQdoF.js → Tray-BOPQyDbH.js} +1 -1
- package/gui/dist/assets/index-ebuVUtB7.js +94 -0
- package/gui/dist/assets/quota-summary-6HsrHQAy.js +1 -0
- package/gui/dist/index.html +1 -1
- package/package.json +1 -1
- package/src/adapters/anthropic.ts +10 -3
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/kiro/adapter.ts +4 -1
- package/src/adapters/kiro/stream.ts +1 -0
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/ollama-native.ts +10 -6
- package/src/adapters/openai-chat/messages.ts +20 -7
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-responses/canonical-forward.ts +50 -13
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +45 -11
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +17 -26
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +1 -1
- package/src/adapters/qoder/image-input.ts +5 -2
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +7 -7
- package/src/adapters/zed.ts +1 -6
- package/src/advisor/consult.ts +22 -10
- package/src/advisor/runtime.ts +10 -4
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +9 -4
- package/src/bridge/sse.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +5 -0
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/cli/account-main.ts +3 -2
- package/src/cli/agent.ts +44 -15
- package/src/cli/capabilities-agents-routing.ts +9 -0
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/codex-launcher.ts +20 -8
- package/src/cli/codex-shim-autorestore.ts +19 -1
- package/src/cli/dispatch.ts +6 -6
- package/src/cli/doctor.ts +5 -5
- package/src/cli/ensure-desired-integrations.ts +4 -3
- package/src/cli/index.ts +8 -10
- package/src/cli/init.ts +2 -2
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/message-command.ts +2 -1
- package/src/cli/message-mcp-command.ts +29 -0
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +5 -0
- package/src/cli/registry.ts +2 -1
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +6 -6
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/v2.ts +69 -19
- package/src/client/machine-api.ts +2 -2
- package/src/clients/config-export.ts +14 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-store.ts +1 -0
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context-provider.ts +15 -0
- package/src/codex/auth-context.ts +14 -23
- package/src/codex/catalog/bundled.ts +10 -3
- package/src/codex/catalog/metadata.ts +4 -5
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +2 -1
- package/src/codex/catalog/retained-sync.ts +15 -5
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/cli-install-provenance.ts +46 -45
- package/src/codex/cli-update-artifacts.ts +8 -6
- package/src/codex/cli-update-job-store-windows.ts +99 -27
- package/src/codex/cli-update-job-worker.ts +3 -11
- package/src/codex/cli-update-recovery.ts +54 -8
- package/src/codex/cli-update-selection-gate.ts +74 -4
- package/src/codex/cli-windows-plan-provenance.ts +37 -19
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +11 -1
- package/src/codex/exec-boundary.ts +26 -5
- package/src/codex/forward-transport-headers.ts +33 -33
- package/src/codex/history-provider.ts +11 -10
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/installation-id.ts +72 -0
- package/src/codex/main-account.ts +6 -6
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +49 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +43 -3
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-wrapper-write.ts +7 -6
- package/src/codex/shim.ts +25 -2
- package/src/codex/transition-state.ts +5 -4
- package/src/combos/failover.ts +43 -4
- package/src/config/atomic-write.ts +38 -7
- package/src/config/diagnostics.ts +3 -0
- package/src/config/initialize.ts +6 -6
- package/src/config/load-degrade.ts +2 -0
- package/src/config/process-state.ts +23 -5
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +29 -1
- package/src/config/schema/leaf-validators.ts +7 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/generated/compatibility-version.json +380 -244
- package/src/grok/sync.ts +10 -1
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/windows-secret-acl.ts +49 -31
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/local-credentials/generation.ts +6 -2
- package/src/local-credentials/inventory.ts +132 -8
- package/src/messaging/mcp-queue-rpc.ts +102 -0
- package/src/messaging/mcp-queue-server.ts +42 -0
- package/src/messaging/mcp-queue-tools.ts +39 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/anthropic-identity.ts +2 -6
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/google-antigravity.ts +23 -10
- package/src/oauth/index.ts +7 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +9 -7
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/anthropic-subscription.ts +25 -0
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-usage.ts +15 -67
- package/src/providers/derive.ts +6 -0
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/quota/anthropic-decision-windows.ts +5 -19
- package/src/providers/quota/anthropic-usage-windows.ts +55 -0
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +5 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/remote-control/workspace-codex-runtime.ts +2 -2
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/parser-tools.ts +1 -0
- package/src/responses/schema.ts +5 -2
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +29 -0
- package/src/server/audio-dictation.ts +3 -0
- package/src/server/audio-live.ts +8 -2
- package/src/server/audio-upstream.ts +2 -0
- package/src/server/auth-cors.ts +5 -2
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +33 -7
- package/src/server/claude-messages.ts +93 -2
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/context-history.ts +9 -6
- package/src/server/images.ts +14 -5
- package/src/server/index/live-sideband.ts +16 -2
- package/src/server/index/serve-options.ts +13 -2
- package/src/server/index/websocket-handler.ts +4 -1
- package/src/server/live.ts +30 -5
- package/src/server/management/agent-settings-routes.ts +34 -9
- package/src/server/management/codex-agent-role-routes.ts +1 -0
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +15 -4
- package/src/server/management/context.ts +3 -0
- package/src/server/management/native-integration-routes.ts +22 -0
- package/src/server/management/oauth-account-routes.ts +20 -4
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +2 -0
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-shared.ts +57 -17
- package/src/server/persistent-gui-session.ts +4 -4
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +5 -0
- package/src/server/responses/advisor-plan-slot.ts +4 -0
- package/src/server/responses/advisor-slot.ts +73 -46
- package/src/server/responses/codex-auth-error.ts +9 -1
- package/src/server/responses/combo-required-tool-contract.ts +39 -0
- package/src/server/responses/compact.ts +41 -20
- package/src/server/responses/core-codex-account.ts +17 -6
- package/src/server/responses/core-combo-failure.ts +2 -0
- package/src/server/responses/core-combo.ts +70 -5
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-normalize.ts +7 -1
- package/src/server/responses/core-options.ts +9 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/jev-model-invoke.ts +4 -2
- package/src/server/responses/passthrough-build-error.ts +36 -0
- package/src/server/responses/passthrough-dispatch.ts +10 -24
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +4 -5
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +4 -1
- package/src/server/responses/request-transport.ts +2 -3
- package/src/server/responses/run-turn-execution.ts +4 -0
- package/src/server/responses/sidecar-execution.ts +21 -5
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/search.ts +13 -4
- package/src/server/workflow-refusal.ts +2 -1
- package/src/server/ws-bridge.ts +5 -2
- package/src/service/state-lock.ts +12 -11
- package/src/service-manager-probe.ts +53 -8
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +25 -0
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +7 -0
- package/src/types.ts +1 -0
- package/src/update/job.ts +20 -0
- package/src/update/worker-launch.ts +71 -1
- package/src/usage/log.ts +25 -4
- package/src/vision/describe.ts +4 -7
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/executor.ts +4 -7
- package/src/web-search/loop.ts +104 -9
- package/src/web-search/parse.ts +10 -2
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/App-DmvwlhQq.js +0 -58
- package/gui/dist/assets/index-3EPO_KbX.js +0 -94
- package/gui/dist/assets/quota-summary-BHvWg9mi.js +0 -1
|
@@ -373,6 +373,8 @@ export interface ProviderRegistryEntry {
|
|
|
373
373
|
* `system` instead. Seeds `foldDeveloperRoleToSystem` on the provider config; a user value wins.
|
|
374
374
|
*/
|
|
375
375
|
foldDeveloperRoleToSystem?: boolean;
|
|
376
|
+
/** Seed the text-only single-leading-system Chat compatibility policy. A user value wins. */
|
|
377
|
+
singleLeadingSystemMessage?: boolean;
|
|
376
378
|
autoToolChoiceOnlyModels?: string[];
|
|
377
379
|
preserveReasoningContentModels?: string[];
|
|
378
380
|
requiresReasoningPlaceholderModels?: string[];
|
|
@@ -409,6 +411,6 @@ export type ProviderConfigSeed = Pick<
|
|
|
409
411
|
| "modelMaxInputTokens" | "defaultMaxOutputTokens" | "modelMaxOutputTokens"
|
|
410
412
|
| "reasoningEfforts" | "modelReasoningEfforts" | "modelDefaultReasoningEfforts" | "reasoningEffortMap" | "modelReasoningEffortMap" | "reasoningWireFormat"
|
|
411
413
|
| "noVisionModels" | "noReasoningModels" | "noTemperatureModels" | "noTopPModels" | "noStopModels" | "noPenaltyModels"
|
|
412
|
-
| "autoToolChoiceOnlyModels" | "preserveReasoningContentModels" | "requiresReasoningPlaceholderModels" | "reasoningSplitModels" | "inlineThinkTagModels" | "reasoningDetailsModels" | "thinkingToggleModels" | "thinkingBudgetModels" | "escapeBuiltinToolNames" | "openaiChatEofTolerance" | "foldDeveloperRoleToSystem" | "showThinkingSummary"
|
|
414
|
+
| "autoToolChoiceOnlyModels" | "preserveReasoningContentModels" | "requiresReasoningPlaceholderModels" | "reasoningSplitModels" | "inlineThinkTagModels" | "reasoningDetailsModels" | "thinkingToggleModels" | "thinkingBudgetModels" | "escapeBuiltinToolNames" | "openaiChatEofTolerance" | "foldDeveloperRoleToSystem" | "singleLeadingSystemMessage" | "showThinkingSummary"
|
|
413
415
|
| "googleMode" | "project" | "location" | "headers"
|
|
414
416
|
>;
|
|
@@ -33,7 +33,7 @@ export type StaticProviderPolicyField =
|
|
|
33
33
|
| "modelDefaultReasoningEfforts" | "reasoningEffortMap" | "modelReasoningEffortMap"
|
|
34
34
|
| "reasoningWireFormat" | "noVisionModels" | "noReasoningModels" | "noTemperatureModels"
|
|
35
35
|
| "noTopPModels" | "noStopModels" | "noPenaltyModels" | "noJsonSchemaModels" | "noStructuredOutputModels" | "parallelToolCalls"
|
|
36
|
-
| "promptCacheKey" | "chatServiceTier" | "openaiChatEofTolerance" | "foldDeveloperRoleToSystem" | "statelessResponses"
|
|
36
|
+
| "promptCacheKey" | "chatServiceTier" | "openaiChatEofTolerance" | "foldDeveloperRoleToSystem" | "singleLeadingSystemMessage" | "statelessResponses"
|
|
37
37
|
| "requiresAdjacentResponsesToolResults" | "requiresPairedResponsesToolResults" | "annotateEmptyToolOutputs"
|
|
38
38
|
| "fastWire" | "supportsServiceTier" | "modelSupportsServiceTier" | "supportsOpenAiWebSearchToolFields"
|
|
39
39
|
| "supportsResponsesCustomTools" | "preserveResponsesReasoningContent" | "dropResponsesReasoningItems"
|
|
@@ -174,7 +174,7 @@ export function resolveModelPolicy(input: ResolveModelPolicyInput): ResolvedMode
|
|
|
174
174
|
"responsesPath", "chatCompletionsPath", "keyOptional", "freeTier", "modelSuffixBracketStrip",
|
|
175
175
|
"defaultModel", "models", "liveModels", "contextWindow", "defaultMaxOutputTokens",
|
|
176
176
|
"reasoningWireFormat", "parallelToolCalls", "promptCacheKey",
|
|
177
|
-
"openaiChatEofTolerance", "foldDeveloperRoleToSystem", "statelessResponses",
|
|
177
|
+
"openaiChatEofTolerance", "foldDeveloperRoleToSystem", "singleLeadingSystemMessage", "statelessResponses",
|
|
178
178
|
"requiresAdjacentResponsesToolResults", "requiresPairedResponsesToolResults",
|
|
179
179
|
"annotateEmptyToolOutputs", "fastWire", "supportsServiceTier",
|
|
180
180
|
"supportsOpenAiWebSearchToolFields", "supportsResponsesCustomTools",
|
|
@@ -324,6 +324,8 @@ export function routedProviderConfig(providerName: string, provider: OcxProvider
|
|
|
324
324
|
...(provider.foldDeveloperRoleToSystem === undefined && registryEntry.foldDeveloperRoleToSystem !== undefined
|
|
325
325
|
? { foldDeveloperRoleToSystem: registryEntry.foldDeveloperRoleToSystem }
|
|
326
326
|
: {}),
|
|
327
|
+
...(provider.singleLeadingSystemMessage === undefined && registryEntry.singleLeadingSystemMessage !== undefined
|
|
328
|
+
? { singleLeadingSystemMessage: registryEntry.singleLeadingSystemMessage } : {}),
|
|
327
329
|
...(provider.reasoningWireFormat === undefined && registryEntry.reasoningWireFormat !== undefined
|
|
328
330
|
? { reasoningWireFormat: registryEntry.reasoningWireFormat }
|
|
329
331
|
: {}),
|
|
@@ -45,6 +45,8 @@ export interface StaleModelRoster {
|
|
|
45
45
|
provider: string;
|
|
46
46
|
/** The exact saved roster this migration may replace, and nothing else. */
|
|
47
47
|
from: readonly string[];
|
|
48
|
+
/** Exact old roster after id renames; metadata additions still compare against `from`. */
|
|
49
|
+
afterModelRenames?: readonly string[];
|
|
48
50
|
to: readonly string[];
|
|
49
51
|
/** Per-model seed values for the added ids, written only into containers that exist. */
|
|
50
52
|
contextWindows?: Readonly<Record<string, number>>;
|
|
@@ -131,6 +133,7 @@ export const STALE_MODEL_ROSTERS: readonly StaleModelRoster[] = [
|
|
|
131
133
|
{
|
|
132
134
|
provider: "moonshot",
|
|
133
135
|
from: KIMI_API_MODELS_BEFORE_K31,
|
|
136
|
+
afterModelRenames: KIMI_API_MODELS_BEFORE_K31.map(id => id === "kimi-k2.5" ? "kimi-k3.1-pro" : id),
|
|
134
137
|
to: KIMI_API_MODELS,
|
|
135
138
|
contextWindows: KIMI_API_MODEL_CONTEXT_WINDOWS,
|
|
136
139
|
defaultReasoningEfforts: KIMI_API_DEFAULT_REASONING_EFFORTS,
|
|
@@ -193,7 +196,8 @@ export function projectStaleModelRosters(
|
|
|
193
196
|
}
|
|
194
197
|
continue;
|
|
195
198
|
}
|
|
196
|
-
if (!sameList(prov.models, entry.from)
|
|
199
|
+
if (!sameList(prov.models, entry.from)
|
|
200
|
+
&& !(entry.afterModelRenames && sameList(prov.models, entry.afterModelRenames))) continue;
|
|
197
201
|
prov.models = [...entry.to];
|
|
198
202
|
fillExisting(prov.modelContextWindows, entry.contextWindows, added);
|
|
199
203
|
fillExisting(prov.modelMaxOutputTokens, entry.maxOutputTokens, added);
|
|
@@ -7,14 +7,14 @@ import { resolveMistralTransport } from "./mistral-transport";
|
|
|
7
7
|
|
|
8
8
|
export const XAI_GROK_CLI_BASE_URL = "https://cli-chat-proxy.grok.com/v1";
|
|
9
9
|
|
|
10
|
-
/**
|
|
11
|
-
const XAI_RESPONSES_HOSTS = new Set(["api.x.ai", "cli-chat-proxy.grok.com"]);
|
|
10
|
+
/** Exact xAI Responses hosts: global and US public APIs, and the Grok CLI proxy. */
|
|
11
|
+
const XAI_RESPONSES_HOSTS = new Set(["api.x.ai", "us.api.x.ai", "cli-chat-proxy.grok.com"]);
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
14
|
* True when this provider's Responses traffic terminates at xAI itself.
|
|
15
15
|
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
16
|
+
* The global API and CLI proxy were probed 2026-08-22; the US regional API documents
|
|
17
|
+
* the same request parameters. Matching is exact-host over
|
|
18
18
|
* https, which keeps lookalikes (`api.x.ai.evil.test`) and nonstandard ports out.
|
|
19
19
|
*/
|
|
20
20
|
export function isXaiResponsesDestination(provider: Pick<OcxProviderConfig, "baseUrl">): boolean {
|
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
type CodexExecBoundaryAsyncDeps,
|
|
8
8
|
} from "../codex/exec-boundary";
|
|
9
9
|
import {
|
|
10
|
-
|
|
10
|
+
beginCodexCliSelectionParentWriteAsync,
|
|
11
11
|
CodexCliSelectionMutationBusyError,
|
|
12
12
|
} from "../codex/cli-update-selection-gate";
|
|
13
13
|
import { remoteWorkspaceThreadStartParams } from "./workspace-coordinator";
|
|
@@ -371,7 +371,7 @@ export class CodexRemoteWorkspaceRuntimeFactory implements RemoteWorkspaceRuntim
|
|
|
371
371
|
// installer termination/readback; a new session must not appear inside that
|
|
372
372
|
// window. Busy is the same explicit pre-spawn failure path as a spawn
|
|
373
373
|
// throw, so the bridge and isolation are reclaimed identically.
|
|
374
|
-
const selectionWrite =
|
|
374
|
+
const selectionWrite = await beginCodexCliSelectionParentWriteAsync();
|
|
375
375
|
if (!selectionWrite.entered) {
|
|
376
376
|
// Both teardown steps are attempted before the refusal leaves: the
|
|
377
377
|
// ordered runner keeps a rejected bridge stop from skipping isolation
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
} from "node:fs";
|
|
15
15
|
import { basename, dirname, isAbsolute, posix, relative, resolve, sep, win32 } from "node:path";
|
|
16
16
|
import { renameAtomicFile } from "../lib/windows-atomic-replace";
|
|
17
|
+
import { sameFileIdentity, statTimeMs } from "../lib/file-identity";
|
|
17
18
|
import {
|
|
18
19
|
REMOTE_WORKSPACE_MAX_TOOL_RESULT_BYTES,
|
|
19
20
|
type RemoteWorkspaceToolName,
|
|
@@ -65,8 +66,8 @@ export interface RemoteWorkspaceCommandRunner {
|
|
|
65
66
|
interface ApprovedRoot {
|
|
66
67
|
id: string;
|
|
67
68
|
path: string;
|
|
68
|
-
dev:
|
|
69
|
-
ino:
|
|
69
|
+
dev: bigint;
|
|
70
|
+
ino: bigint;
|
|
70
71
|
birthtimeMs: number;
|
|
71
72
|
}
|
|
72
73
|
|
|
@@ -170,20 +171,20 @@ function decodeUtf8(value: Uint8Array): string {
|
|
|
170
171
|
}
|
|
171
172
|
|
|
172
173
|
function assertOpenedRegularFile(root: string, target: string, descriptor: number, maximum: number) {
|
|
173
|
-
const opened = fstatSync(descriptor);
|
|
174
|
-
const linked = lstatSync(target);
|
|
175
|
-
if (opened.isFile() && linked.isFile() && (opened.nlink !==
|
|
174
|
+
const opened = fstatSync(descriptor, { bigint: true });
|
|
175
|
+
const linked = lstatSync(target, { bigint: true });
|
|
176
|
+
if (opened.isFile() && linked.isFile() && (opened.nlink !== 1n || linked.nlink !== 1n)) {
|
|
176
177
|
throw new Error("remote workspace hard-linked files are not allowed");
|
|
177
178
|
}
|
|
178
179
|
if (!opened.isFile() || !linked.isFile() || linked.isSymbolicLink()
|
|
179
|
-
|| opened
|
|
180
|
-
|| opened.
|
|
180
|
+
|| !sameFileIdentity(opened, linked)
|
|
181
|
+
|| statTimeMs(opened.birthtimeNs) !== statTimeMs(linked.birthtimeNs)) {
|
|
181
182
|
throw new Error("remote workspace file identity changed during access");
|
|
182
183
|
}
|
|
183
184
|
const canonical = realpathSync(target);
|
|
184
185
|
if (!inside(root, canonical)) throw new Error("remote workspace path escapes the approved root");
|
|
185
186
|
if (opened.size > maximum) throw new Error("remote workspace file exceeds the read limit");
|
|
186
|
-
return opened;
|
|
187
|
+
return { size: Number(opened.size), mode: Number(opened.mode) };
|
|
187
188
|
}
|
|
188
189
|
|
|
189
190
|
function readBoundedRegularFile(root: string, target: string, maximum: number): { body: Buffer; mode: number } {
|
|
@@ -216,11 +217,11 @@ function assertStableWritableParent(root: string, target: string): void {
|
|
|
216
217
|
}
|
|
217
218
|
|
|
218
219
|
function assertApprovedRootIdentity(root: ApprovedRoot): void {
|
|
219
|
-
const linked = lstatSync(root.path);
|
|
220
|
+
const linked = lstatSync(root.path, { bigint: true });
|
|
220
221
|
const canonical = realpathSync(root.path);
|
|
221
222
|
if (!linked.isDirectory() || linked.isSymbolicLink()
|
|
222
|
-
|| linked
|
|
223
|
-
|| linked.
|
|
223
|
+
|| !sameFileIdentity(linked, root)
|
|
224
|
+
|| statTimeMs(linked.birthtimeNs) !== root.birthtimeMs
|
|
224
225
|
|| relative(root.path, canonical) !== "") {
|
|
225
226
|
throw new Error("remote workspace approved root identity changed; pair the folder again");
|
|
226
227
|
}
|
|
@@ -256,13 +257,13 @@ export class RemoteWorkspaceExecutor {
|
|
|
256
257
|
const metadata = lstatSync(root.path);
|
|
257
258
|
if (!metadata.isDirectory() || metadata.isSymbolicLink()) throw new Error("remote workspace root must be a real directory");
|
|
258
259
|
const canonical = realpathSync(root.path);
|
|
259
|
-
const identity = lstatSync(canonical);
|
|
260
|
+
const identity = lstatSync(canonical, { bigint: true });
|
|
260
261
|
this.roots.set(root.id, {
|
|
261
262
|
id: root.id,
|
|
262
263
|
path: canonical,
|
|
263
264
|
dev: identity.dev,
|
|
264
265
|
ino: identity.ino,
|
|
265
|
-
birthtimeMs: identity.
|
|
266
|
+
birthtimeMs: statTimeMs(identity.birthtimeNs),
|
|
266
267
|
});
|
|
267
268
|
}
|
|
268
269
|
if (this.roots.size === 0) throw new Error("remote workspace executor needs one approved root");
|
|
@@ -232,7 +232,8 @@ function rewriteForUpstream(
|
|
|
232
232
|
}
|
|
233
233
|
|
|
234
234
|
let changed = false;
|
|
235
|
-
|
|
235
|
+
// Recursive tool lowering must retain the input item's historical/live symbol marker.
|
|
236
|
+
const next: Record<string, unknown> = { ...value };
|
|
236
237
|
for (const [key, entry] of Object.entries(value)) {
|
|
237
238
|
const rewritten = rewriteForUpstream(entry, names, callIds);
|
|
238
239
|
next[key] = rewritten;
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
export const REPLAY_HISTORICAL_ITEM = Symbol.for("ocx.responses.replayHistoricalItem");
|
|
2
|
+
|
|
3
|
+
function isPlainObject(value: unknown): value is Record<string, unknown> {
|
|
4
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Mark an input item object as belonging to the historical replay prefix.
|
|
9
|
+
* Uses an enumerable symbol so it is preserved across shallow object spreads (`{ ...item }`),
|
|
10
|
+
* but completely ignored by `JSON.stringify` and `Object.keys`.
|
|
11
|
+
*/
|
|
12
|
+
export function markHistoricalItem<T extends object>(item: T): T {
|
|
13
|
+
Object.defineProperty(item, REPLAY_HISTORICAL_ITEM, {
|
|
14
|
+
value: true,
|
|
15
|
+
enumerable: true,
|
|
16
|
+
configurable: true,
|
|
17
|
+
writable: true,
|
|
18
|
+
});
|
|
19
|
+
return item;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Check whether an input item originated in the historical replay.
|
|
24
|
+
*/
|
|
25
|
+
export function isHistoricalItem(item: unknown): boolean {
|
|
26
|
+
return (
|
|
27
|
+
typeof item === "object"
|
|
28
|
+
&& item !== null
|
|
29
|
+
&& (item as Record<string | symbol, unknown>)[REPLAY_HISTORICAL_ITEM] === true
|
|
30
|
+
);
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/** A live marker survives even when a rewrite removes every historical item. */
|
|
34
|
+
export function hasItemProvenance(item: unknown): boolean {
|
|
35
|
+
return typeof item === "object" && item !== null
|
|
36
|
+
&& typeof (item as Record<string | symbol, unknown>)[REPLAY_HISTORICAL_ITEM] === "boolean";
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** Replacement and synthesized items inherit the source's historical or live tag. */
|
|
40
|
+
export function copyItemProvenance<T extends object>(source: unknown, target: T): T {
|
|
41
|
+
if (hasItemProvenance(source)) {
|
|
42
|
+
Object.assign(target, { [REPLAY_HISTORICAL_ITEM]: isHistoricalItem(source) });
|
|
43
|
+
}
|
|
44
|
+
return target;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* Tag both historical and live items so an empty replay prefix remains distinguishable
|
|
49
|
+
* from an input that has never been tagged. Input that already carries provenance keeps it:
|
|
50
|
+
* an earlier rewrite (Zed lifting a replayed wrapper) may have shifted items past the
|
|
51
|
+
* numeric prefix, so re-tagging by index would mislabel current-turn items as history.
|
|
52
|
+
*/
|
|
53
|
+
export function tagHistoricalInputItems(input: unknown[], prefixLength: number): unknown[] {
|
|
54
|
+
if (!Array.isArray(input)) return input;
|
|
55
|
+
if (input.some(hasItemProvenance)) return input;
|
|
56
|
+
const prefix = Math.min(input.length, Math.max(0, Math.trunc(prefixLength)));
|
|
57
|
+
if (prefix <= 0) return input;
|
|
58
|
+
return input.map((item, index) => {
|
|
59
|
+
if (isPlainObject(item)) {
|
|
60
|
+
return { ...item, [REPLAY_HISTORICAL_ITEM]: index < prefix };
|
|
61
|
+
}
|
|
62
|
+
return item;
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Compute the current replay prefix length dynamically.
|
|
68
|
+
* If items carry provenance markers, the boundary is the index of the first non-historical item.
|
|
69
|
+
* Otherwise, falls back to the provided fallback prefix length.
|
|
70
|
+
*/
|
|
71
|
+
export function computeReplayPrefixLength(input: unknown[], fallback = 0): number {
|
|
72
|
+
if (!Array.isArray(input)) return fallback;
|
|
73
|
+
const hasProvenance = input.some(hasItemProvenance);
|
|
74
|
+
if (!hasProvenance) {
|
|
75
|
+
return Math.min(input.length, Math.max(0, Math.trunc(fallback)));
|
|
76
|
+
}
|
|
77
|
+
const firstLiveIndex = input.findIndex(item => !isHistoricalItem(item));
|
|
78
|
+
return firstLiveIndex === -1 ? input.length : firstLiveIndex;
|
|
79
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { dottedToolName, namespacedToolName } from "../types";
|
|
2
2
|
import { collectResponsesToolGroups } from "./tool-groups";
|
|
3
3
|
import { collectAmbiguousDottedAliases, dottedAliasIsUnambiguous } from "./tool-name-aliases";
|
|
4
|
+
import { hasItemProvenance, isHistoricalItem } from "./item-provenance";
|
|
4
5
|
|
|
5
6
|
export interface RoutedNamespaceToolIdentity {
|
|
6
7
|
namespace: string;
|
|
@@ -344,13 +345,25 @@ function rewriteInputItem(item: unknown, plan: NamespaceRewritePlan, emitted: Se
|
|
|
344
345
|
export function rewriteRoutedNamespaceToolsForUpstream(
|
|
345
346
|
body: unknown,
|
|
346
347
|
convertedCustomToolNames?: ReadonlySet<string>,
|
|
348
|
+
replayPrefixLength?: number,
|
|
347
349
|
): {
|
|
348
350
|
body: unknown;
|
|
349
351
|
aliases: Map<string, RoutedNamespaceToolIdentity>;
|
|
350
352
|
} {
|
|
351
353
|
if (!isPlainObject(body)) return { body, aliases: new Map() };
|
|
352
|
-
const
|
|
354
|
+
const currentTurnStart = Number.isFinite(replayPrefixLength)
|
|
355
|
+
? Math.max(0, Math.trunc(replayPrefixLength!))
|
|
356
|
+
: 0;
|
|
357
|
+
const hasProvenance = Array.isArray(body.input) && body.input.some(hasItemProvenance);
|
|
358
|
+
const isHistorical = (item: unknown, index: number) =>
|
|
359
|
+
hasProvenance ? isHistoricalItem(item) : index < currentTurnStart;
|
|
360
|
+
const groups = collectResponsesToolGroups(Array.isArray(body.input)
|
|
361
|
+
? { ...body, input: body.input.filter((item, index) => !isHistorical(item, index)) }
|
|
362
|
+
: body);
|
|
353
363
|
const plan = buildRewritePlan(groups);
|
|
364
|
+
const historicalPlan = buildRewritePlan(collectResponsesToolGroups({
|
|
365
|
+
input: Array.isArray(body.input) ? body.input.filter(isHistorical) : [],
|
|
366
|
+
}));
|
|
354
367
|
|
|
355
368
|
// Deliberately not gated on the plan being non-empty: a turn whose catalog is absent can still
|
|
356
369
|
// replay call items carrying a private `namespace`.
|
|
@@ -360,8 +373,13 @@ export function rewriteRoutedNamespaceToolsForUpstream(
|
|
|
360
373
|
let input = body.input;
|
|
361
374
|
if (Array.isArray(body.input)) {
|
|
362
375
|
let inputChanged = false;
|
|
363
|
-
const
|
|
364
|
-
|
|
376
|
+
const historicalEmitted = new Set<string>();
|
|
377
|
+
const rewrittenInput = body.input.map((item, index) => {
|
|
378
|
+
const historicalCatalog = isHistorical(item, index) && isPlainObject(item) && item.type === "additional_tools";
|
|
379
|
+
const itemEmitted = historicalCatalog
|
|
380
|
+
? historicalEmitted
|
|
381
|
+
: emitted;
|
|
382
|
+
const next = rewriteInputItem(item, historicalCatalog ? historicalPlan : plan, itemEmitted);
|
|
365
383
|
if (next !== item) inputChanged = true;
|
|
366
384
|
return next;
|
|
367
385
|
});
|
|
@@ -16,6 +16,7 @@ export function mapToolChoice(value: unknown): OcxRequestOptions["toolChoice"] {
|
|
|
16
16
|
if (t === "image_generation" || t === "image_gen") {
|
|
17
17
|
return { name: IMAGE_GEN_TOOL_NAME };
|
|
18
18
|
}
|
|
19
|
+
if (t === "tool_search") return { name: "tool_search" };
|
|
19
20
|
if (t === "allowed_tools" && Array.isArray(value.tools)) {
|
|
20
21
|
const names = value.tools
|
|
21
22
|
.map(allowedToolName)
|
package/src/responses/schema.ts
CHANGED
|
@@ -162,12 +162,15 @@ const builtinToolSchema = z.object({ type: z.string() }).loose();
|
|
|
162
162
|
*/
|
|
163
163
|
export const HOSTED_TOOL_TYPES = [
|
|
164
164
|
"web_search", "web_search_preview", "file_search", "computer_use_preview",
|
|
165
|
-
"code_interpreter", "image_generation", "mcp",
|
|
165
|
+
"code_interpreter", "image_generation", "mcp", "tool_search", "computer_use", "image_gen",
|
|
166
166
|
] as const;
|
|
167
167
|
|
|
168
168
|
const hostedToolType = z.enum(HOSTED_TOOL_TYPES);
|
|
169
169
|
|
|
170
|
-
const allowedToolEntrySchema = z.
|
|
170
|
+
const allowedToolEntrySchema = z.union([
|
|
171
|
+
z.object({ type: z.literal("mcp"), server_label: z.string().min(1), name: z.string().nullable().optional() }),
|
|
172
|
+
z.object({ type: z.string(), name: z.string().optional() }),
|
|
173
|
+
]);
|
|
171
174
|
|
|
172
175
|
export const toolChoiceSchema = z.union([
|
|
173
176
|
z.literal("auto"),
|
package/src/router.ts
CHANGED
|
@@ -30,7 +30,7 @@ import {
|
|
|
30
30
|
LEGACY_OPENAI_MULTI_PROVIDER_ID,
|
|
31
31
|
OPENAI_CODEX_PROVIDER_ID,
|
|
32
32
|
} from "./providers/openai-tiers";
|
|
33
|
-
import { decodeRoutedModelIdOrThrow, encodeRoutedModelId } from "./providers/slug-codec";
|
|
33
|
+
import { decodeRoutedModelId, decodeRoutedModelIdOrThrow, encodeRoutedModelId } from "./providers/slug-codec";
|
|
34
34
|
import { effectiveProviderAliasDecision, resolveModelAlias } from "./providers/default-aliases";
|
|
35
35
|
import { resolveBlockedModelRedirect } from "./lib/shadow-call";
|
|
36
36
|
import { workBuddyCatalogIdentity } from "./providers/workbuddy";
|
|
@@ -200,6 +200,20 @@ export function knownModelIdsForProvider(
|
|
|
200
200
|
* (never a caller-supplied string), so the log carries no request content.
|
|
201
201
|
*/
|
|
202
202
|
const compactionFallbackWarnings = new Set<string>();
|
|
203
|
+
/**
|
|
204
|
+
* Last-resort decode for a direct provider-qualified slug the live roster cannot resolve yet.
|
|
205
|
+
* Retained ids win (an encoded slash-valued retained id included), then the operator-declared
|
|
206
|
+
* modelDisplayNames keys. Neither list feeds alias generation.
|
|
207
|
+
*/
|
|
208
|
+
function decodeDisplayNameFallback(prov: OcxProviderConfig, decoded: string): string {
|
|
209
|
+
const retained = prov.retainModels ?? [];
|
|
210
|
+
// Any retained claim, even an ambiguous one the codec refuses to guess, ends the fallback.
|
|
211
|
+
if (retained.some(id => id === decoded || encodeRoutedModelId(id) === decoded)) {
|
|
212
|
+
return decodeRoutedModelId(decoded, retained);
|
|
213
|
+
}
|
|
214
|
+
return decodeRoutedModelId(decoded, Object.keys(prov.modelDisplayNames ?? {}));
|
|
215
|
+
}
|
|
216
|
+
|
|
203
217
|
function warnCompactionDefaultProviderFallbackOnce(providerName: string): void {
|
|
204
218
|
if (compactionFallbackWarnings.has(providerName)) return;
|
|
205
219
|
compactionFallbackWarnings.add(providerName);
|
|
@@ -583,7 +597,12 @@ function routeModelInternal(
|
|
|
583
597
|
const decoded = decodeRoutedModelIdOrThrow(requestedModel, known);
|
|
584
598
|
const nativeModel = known.includes(decoded)
|
|
585
599
|
? decoded
|
|
586
|
-
: resolveModelAlias(config, prov, known, requestedModel)
|
|
600
|
+
: resolveModelAlias(config, prov, known, requestedModel)
|
|
601
|
+
// Last resort for direct requests while the live roster is cold: display-name keys are
|
|
602
|
+
// operator-declared native ids, consulted only here so they never claim aliases or shadow
|
|
603
|
+
// known or retained ids. Concrete policy/combo/redirect targets (bypassCombos) keep the
|
|
604
|
+
// exact model their evaluator selected, so evidence and eligibility describe what is sent.
|
|
605
|
+
?? (bypassCombos ? decoded : decodeDisplayNameFallback(prov, decoded));
|
|
587
606
|
return routeResult(
|
|
588
607
|
config,
|
|
589
608
|
provName,
|
package/src/routing/analytics.ts
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
|
|
14
14
|
import { normalizePersistedUsageRow, type PersistedUsageEntry } from "../usage/log";
|
|
15
15
|
import { computeEntryCost } from "../usage/summary";
|
|
16
|
-
import {
|
|
16
|
+
import { withRequestHistoryRead } from "./history/indexer";
|
|
17
17
|
|
|
18
18
|
export const ANALYTICS_MAX_ROWS = 50_000;
|
|
19
19
|
/** Default row cap for the management API (full cap remains available via `limit`). */
|
|
@@ -168,8 +168,6 @@ export async function computeRoutingAnalytics(
|
|
|
168
168
|
filters: RoutingAnalyticsFilters,
|
|
169
169
|
options: { maxRows?: number } = {},
|
|
170
170
|
): Promise<RoutingAnalyticsResult> {
|
|
171
|
-
await openRequestHistoryIndex();
|
|
172
|
-
const handle = requestHistoryDb();
|
|
173
171
|
const maxRows = Math.min(
|
|
174
172
|
Math.max(1, Math.trunc(options.maxRows ?? ANALYTICS_MAX_ROWS)),
|
|
175
173
|
ANALYTICS_MAX_ROWS,
|
|
@@ -189,7 +187,7 @@ export async function computeRoutingAnalytics(
|
|
|
189
187
|
if (filters.to !== undefined) add("timestamp <= ?", filters.to);
|
|
190
188
|
const whereSql = where.length > 0 ? ` WHERE ${where.join(" AND ")}` : "";
|
|
191
189
|
|
|
192
|
-
const rows = handle.query(
|
|
190
|
+
const rows = await withRequestHistoryRead(handle => handle.query(
|
|
193
191
|
`SELECT provider, model, api_key_id AS apiKeyId, profile_id AS profileId,
|
|
194
192
|
profile_revision AS profileRevision, status,
|
|
195
193
|
duration_ms AS durationMs, first_output_ms AS firstOutputMs,
|
|
@@ -197,7 +195,7 @@ export async function computeRoutingAnalytics(
|
|
|
197
195
|
usage_status AS usageStatus, usage_json AS usageJson,
|
|
198
196
|
attempt_count AS attemptCount, fallback, row_json AS rowJson
|
|
199
197
|
FROM requests${whereSql} ORDER BY timestamp DESC LIMIT ?`,
|
|
200
|
-
).all(...values, maxRows + 1) as ScannedRow[];
|
|
198
|
+
).all(...values, maxRows + 1) as ScannedRow[]);
|
|
201
199
|
|
|
202
200
|
const scanned = rows.slice(0, maxRows);
|
|
203
201
|
const historyTruncated = rows.length > maxRows;
|
|
@@ -46,7 +46,7 @@ export interface FallbackEvent {
|
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
/** The admission slice this module reads; a configured key is the only device identity. */
|
|
49
|
-
export type FallbackAdmission = { kind: string; keyId?: string } | null | undefined;
|
|
49
|
+
export type FallbackAdmission = { kind: string; keyId?: string; readonly callerPolicy?: import("../types/admission-policy").CapturedAdmissionPolicy } | null | undefined;
|
|
50
50
|
|
|
51
51
|
const RING_SIZE = 20;
|
|
52
52
|
const ring: FallbackEvent[] = [];
|
|
@@ -210,9 +210,13 @@ export function guardFallbackHop(config: OcxConfig, hop: FallbackHop): FallbackG
|
|
|
210
210
|
const kind = fallbackHopKind(hop.from, hop.to);
|
|
211
211
|
if (kind === null) return { ok: true, kind: null, commit: NO_COMMIT };
|
|
212
212
|
const now = hop.now ?? Date.now();
|
|
213
|
-
|
|
213
|
+
let deviceIds = fallbackDeviceIds(config, hop.admission, now);
|
|
214
214
|
const routes = [hop.route, ...(hop.aliases ?? [])].filter((value, index, all) => value && all.indexOf(value) === index);
|
|
215
|
-
|
|
215
|
+
let decision = resolveFallbackPolicy(config, { kind, routes, provider: hop.from.provider, deviceIds });
|
|
216
|
+
for (const captured of hop.admission?.callerPolicy?.fallbackPolicies ?? []) {
|
|
217
|
+
const caller = resolveFallbackPolicy(captured.config, { kind, routes, provider: hop.from.provider, deviceIds: captured.deviceIds });
|
|
218
|
+
if (!caller.allowed) { decision = caller; deviceIds = [...captured.deviceIds]; break; }
|
|
219
|
+
}
|
|
216
220
|
const event: FallbackEvent = {
|
|
217
221
|
at: new Date(now).toISOString(),
|
|
218
222
|
site: hop.site,
|
package/src/routing/health.ts
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
|
|
19
19
|
import type { OcxConfig } from "../types";
|
|
20
|
-
import { openRequestHistoryIndexSync, requestHistoryDb } from "./history/indexer";
|
|
20
|
+
import { openRequestHistoryIndexSync, reportRequestHistoryCorruption, requestHistoryDb } from "./history/indexer";
|
|
21
21
|
import { OPENAI_CODEX_PROVIDER_ID } from "../providers/openai-tiers";
|
|
22
22
|
import {
|
|
23
23
|
getCodexAccountCooldownUntil,
|
|
@@ -251,9 +251,10 @@ function computeHistoricalHealthEvidence(
|
|
|
251
251
|
input: Pick<HealthEvidenceInput, "provider" | "model" | "accountRef">,
|
|
252
252
|
now: number,
|
|
253
253
|
): HistoricalHealthEvidence {
|
|
254
|
+
let handle: ReturnType<typeof requestHistoryDb> | undefined;
|
|
254
255
|
try {
|
|
255
256
|
openRequestHistoryIndexSync();
|
|
256
|
-
|
|
257
|
+
handle = requestHistoryDb();
|
|
257
258
|
const where: string[] = ["provider = ?", "model = ?", "timestamp >= ?"];
|
|
258
259
|
const values: Array<string | number> = [input.provider, input.model, now - HEALTH_WINDOW_MS];
|
|
259
260
|
if (input.accountRef) {
|
|
@@ -341,7 +342,8 @@ function computeHistoricalHealthEvidence(
|
|
|
341
342
|
out.recencyWeight = decayWeight(samples[0]!.timestamp, now);
|
|
342
343
|
}
|
|
343
344
|
return out;
|
|
344
|
-
} catch {
|
|
345
|
+
} catch (error) {
|
|
346
|
+
if (handle) reportRequestHistoryCorruption(error, handle);
|
|
345
347
|
/* index unreadable: evidence stays unknown */
|
|
346
348
|
return {};
|
|
347
349
|
}
|
|
@@ -79,6 +79,12 @@ export function buildIndexFile(buildPath: string, reason: string, revision: Usag
|
|
|
79
79
|
expected: revision,
|
|
80
80
|
endOffset: Number(revision.size),
|
|
81
81
|
});
|
|
82
|
+
// Validate before publication while still off the serving thread. The
|
|
83
|
+
// published handle can then be trusted until its periodic worker check.
|
|
84
|
+
const check = build.query("PRAGMA quick_check").get() as { quick_check?: string } | undefined;
|
|
85
|
+
if (check?.quick_check !== "ok") {
|
|
86
|
+
throw Object.assign(new Error("rebuilt history index failed integrity check"), { code: "SQLITE_CORRUPT" });
|
|
87
|
+
}
|
|
82
88
|
// The serving thread opens the published file in WAL mode; switching here
|
|
83
89
|
// keeps that first open from rewriting the database header.
|
|
84
90
|
build.exec("PRAGMA journal_mode = WAL");
|