@bitkyc08/opencodex 2.94.0 → 2.95.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.
Files changed (249) hide show
  1. package/gui/dist/assets/App-8yedBkhm.js +58 -0
  2. package/gui/dist/assets/App-B4j-Txmb.css +1 -0
  3. package/gui/dist/assets/{Tray-CZatQdoF.js → Tray-erSMzxPG.js} +1 -1
  4. package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
  5. package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
  6. package/gui/dist/index.html +1 -1
  7. package/package.json +1 -1
  8. package/src/adapters/anthropic.ts +10 -3
  9. package/src/adapters/command-code-project-context.ts +3 -3
  10. package/src/adapters/kiro/adapter.ts +4 -1
  11. package/src/adapters/kiro/stream.ts +1 -0
  12. package/src/adapters/kiro-events.ts +1 -0
  13. package/src/adapters/openai-chat/messages.ts +20 -7
  14. package/src/adapters/openai-chat/passthrough.ts +4 -2
  15. package/src/adapters/openai-chat/single-system.ts +24 -0
  16. package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
  17. package/src/adapters/openai-responses/passthrough.ts +42 -7
  18. package/src/adapters/openai-responses/prompt-cache.ts +3 -1
  19. package/src/adapters/openai-responses/request-strips.ts +23 -4
  20. package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
  21. package/src/adapters/openai-responses/tool-schema.ts +20 -8
  22. package/src/adapters/opencode-go-additional-tools.ts +39 -6
  23. package/src/adapters/routed-agent-messages.ts +3 -0
  24. package/src/adapters/xai-web-search.ts +6 -3
  25. package/src/adapters/zed-additional-tools.ts +7 -7
  26. package/src/adapters/zed.ts +1 -6
  27. package/src/advisor/consult.ts +22 -10
  28. package/src/advisor/runtime.ts +10 -4
  29. package/src/bridge/max-output-completion.ts +41 -0
  30. package/src/bridge/response-json.ts +9 -4
  31. package/src/bridge/sse.ts +13 -2
  32. package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +5 -0
  33. package/src/chatgpt/app-server-shim/launcher.ts +40 -6
  34. package/src/claude/compatibility.ts +5 -1
  35. package/src/claude/desktop-3p.ts +27 -6
  36. package/src/claude/desktop-model-visibility.ts +141 -0
  37. package/src/claude/desktop-remote-store-io.ts +8 -8
  38. package/src/claude/inbound-content-options.ts +11 -1
  39. package/src/claude/intercept/proxy-auth.ts +16 -16
  40. package/src/cli/account-main.ts +3 -2
  41. package/src/cli/capabilities-provider-models.ts +7 -0
  42. package/src/cli/chatgpt-command.ts +1 -1
  43. package/src/cli/codex-launcher.ts +20 -8
  44. package/src/cli/codex-shim-autorestore.ts +19 -1
  45. package/src/cli/dispatch.ts +6 -6
  46. package/src/cli/doctor.ts +5 -5
  47. package/src/cli/index.ts +4 -9
  48. package/src/cli/init.ts +2 -2
  49. package/src/cli/internal-command.ts +29 -2
  50. package/src/cli/provider-cc-switch-import.ts +185 -0
  51. package/src/cli/provider.ts +5 -0
  52. package/src/cli/registry.ts +1 -0
  53. package/src/cli/restart-scope.ts +2 -2
  54. package/src/cli/root.ts +6 -6
  55. package/src/cli/stop-approval.ts +15 -1
  56. package/src/cli/v2.ts +69 -19
  57. package/src/client/machine-api.ts +2 -2
  58. package/src/clients/config-export.ts +14 -3
  59. package/src/codex/account-cooldown-response.ts +18 -0
  60. package/src/codex/app-server-restart-service.ts +2 -2
  61. package/src/codex/auth-api/login-flow.ts +2 -2
  62. package/src/codex/auth-api/pool-quota-probe.ts +2 -2
  63. package/src/codex/auth-context.ts +4 -4
  64. package/src/codex/catalog/bundled.ts +10 -3
  65. package/src/codex/catalog/metadata.ts +4 -5
  66. package/src/codex/catalog/native-omission.ts +28 -0
  67. package/src/codex/catalog/native-template.ts +58 -0
  68. package/src/codex/catalog/parsing.ts +3 -29
  69. package/src/codex/catalog/provider-models.ts +2 -1
  70. package/src/codex/catalog/retained-sync.ts +15 -5
  71. package/src/codex/catalog/write-audit.ts +18 -18
  72. package/src/codex/cli-install-provenance.ts +46 -45
  73. package/src/codex/cli-update-artifacts.ts +8 -6
  74. package/src/codex/cli-update-job-store-windows.ts +99 -27
  75. package/src/codex/cli-update-job-worker.ts +3 -11
  76. package/src/codex/cli-update-recovery.ts +54 -8
  77. package/src/codex/cli-update-selection-gate.ts +74 -4
  78. package/src/codex/cli-windows-plan-provenance.ts +37 -19
  79. package/src/codex/codex-home-owner.ts +9 -8
  80. package/src/codex/convergence.ts +13 -3
  81. package/src/codex/coordinator-doctor.ts +14 -8
  82. package/src/codex/desktop-app/handoff.ts +1 -1
  83. package/src/codex/desktop-app-restart.ts +11 -1
  84. package/src/codex/exec-boundary.ts +26 -5
  85. package/src/codex/history-provider.ts +11 -10
  86. package/src/codex/inject/bounded-config-reader.ts +14 -13
  87. package/src/codex/main-account.ts +6 -6
  88. package/src/codex/native-main-lock-file.ts +13 -12
  89. package/src/codex/native-residue.ts +18 -14
  90. package/src/codex/orca-auth-source.ts +8 -7
  91. package/src/codex/quota-types.ts +5 -0
  92. package/src/codex/quota.ts +49 -7
  93. package/src/codex/role-auto-assign.ts +50 -26
  94. package/src/codex/role-capability.ts +160 -0
  95. package/src/codex/role-sizing.ts +24 -6
  96. package/src/codex/routing/cooldown-math.ts +3 -2
  97. package/src/codex/runtime.ts +43 -3
  98. package/src/codex/shim-fingerprint.ts +11 -9
  99. package/src/codex/shim-inspect.ts +3 -2
  100. package/src/codex/shim-restore-lock.ts +11 -14
  101. package/src/codex/shim-state-file.ts +22 -14
  102. package/src/codex/shim-wrapper-write.ts +7 -6
  103. package/src/codex/shim.ts +25 -2
  104. package/src/codex/transition-state.ts +5 -4
  105. package/src/combos/failover.ts +43 -4
  106. package/src/config/atomic-write.ts +38 -7
  107. package/src/config/diagnostics.ts +3 -0
  108. package/src/config/initialize.ts +6 -6
  109. package/src/config/load-degrade.ts +2 -0
  110. package/src/config/process-state.ts +23 -5
  111. package/src/config/salvage.ts +1 -0
  112. package/src/config/schema/config-schema.ts +29 -1
  113. package/src/config/schema/leaf-validators.ts +7 -0
  114. package/src/config/schema/workflow-budget.ts +43 -0
  115. package/src/config/tracked-runtime-inspection.ts +188 -0
  116. package/src/generated/compatibility-version.json +313 -213
  117. package/src/integrations/aside-profile-context.ts +1 -1
  118. package/src/integrations/droid-settings.ts +4 -4
  119. package/src/integrations/hermes-profiles.ts +3 -3
  120. package/src/lib/bounded-file-read.ts +3 -9
  121. package/src/lib/bun-runtime-preflight.ts +9 -8
  122. package/src/lib/file-identity.ts +15 -0
  123. package/src/lib/local-chat-completion.ts +8 -6
  124. package/src/lib/local-destinations.ts +32 -3
  125. package/src/lib/redact-folding.ts +9 -0
  126. package/src/lib/spend-pool-alias-validation.ts +6 -6
  127. package/src/lib/state-store-registrations.ts +2 -0
  128. package/src/lib/test-home-guard.ts +37 -9
  129. package/src/lib/windows-secret-acl.ts +47 -29
  130. package/src/lib/workflow-budget-config.ts +39 -0
  131. package/src/local-credentials/generation.ts +6 -2
  132. package/src/local-credentials/inventory.ts +132 -8
  133. package/src/messaging/remote-forward-failure.ts +35 -0
  134. package/src/messaging/remote-ports.ts +27 -5
  135. package/src/messaging/remote-process.ts +30 -4
  136. package/src/messaging/remote-tunnels.ts +80 -15
  137. package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
  138. package/src/oauth/google-antigravity.ts +23 -10
  139. package/src/oauth/index.ts +2 -0
  140. package/src/oauth/kiro-device-login.ts +87 -30
  141. package/src/oauth/kiro-iam-identity-center.ts +107 -0
  142. package/src/oauth/store.ts +9 -7
  143. package/src/providers/account-quota-disk.ts +18 -4
  144. package/src/providers/cc-switch-import-bytes.ts +991 -0
  145. package/src/providers/cc-switch-import-source.ts +1083 -0
  146. package/src/providers/cc-switch-import.ts +942 -0
  147. package/src/providers/derive.ts +6 -0
  148. package/src/providers/model-discovery-diagnostic.ts +4 -0
  149. package/src/providers/model-discovery.ts +4 -4
  150. package/src/providers/model-rename-fields.ts +2 -0
  151. package/src/providers/model-rename-migration.ts +41 -6
  152. package/src/providers/quota/report-cache.ts +17 -4
  153. package/src/providers/quota.ts +2 -2
  154. package/src/providers/reasoning-metadata.ts +31 -15
  155. package/src/providers/registry/entries-core.ts +1 -1
  156. package/src/providers/registry/entries-extended.ts +1 -1
  157. package/src/providers/registry/model-ids.ts +1 -0
  158. package/src/providers/registry/model-seeds.ts +2 -1
  159. package/src/providers/registry/types.ts +3 -1
  160. package/src/providers/resolved-model-policy.ts +2 -2
  161. package/src/providers/routed-config.ts +2 -0
  162. package/src/providers/stale-model-roster-migration.ts +5 -1
  163. package/src/providers/xai-transport.ts +4 -4
  164. package/src/remote-control/workspace-codex-runtime.ts +2 -2
  165. package/src/remote-control/workspace-executor.ts +14 -13
  166. package/src/responses/custom-tool-compat.ts +2 -1
  167. package/src/responses/item-provenance.ts +79 -0
  168. package/src/responses/namespace-tool-compat.ts +21 -3
  169. package/src/router.ts +21 -2
  170. package/src/routing/analytics.ts +3 -5
  171. package/src/routing/fallback-policy.ts +7 -3
  172. package/src/routing/health.ts +5 -3
  173. package/src/routing/history/build-file.ts +6 -0
  174. package/src/routing/history/indexer.ts +158 -31
  175. package/src/routing/history/ingest.ts +1 -1
  176. package/src/routing/history/integrity.ts +208 -0
  177. package/src/routing/history/rebuild-job.ts +20 -6
  178. package/src/routing/history/rebuild-protocol.ts +2 -1
  179. package/src/routing/history/rebuild-worker.ts +18 -0
  180. package/src/routing/history/sqlite-errors.ts +9 -0
  181. package/src/server/admission-model-scope.ts +21 -4
  182. package/src/server/advisor-admission-scope.ts +29 -0
  183. package/src/server/auth-cors.ts +5 -2
  184. package/src/server/capture-admission-policy.ts +91 -0
  185. package/src/server/chat-completions.ts +33 -7
  186. package/src/server/claude-messages.ts +90 -2
  187. package/src/server/codex-model-list.ts +2 -1
  188. package/src/server/configured-credentials.ts +5 -0
  189. package/src/server/index/serve-options.ts +12 -2
  190. package/src/server/index/websocket-handler.ts +3 -0
  191. package/src/server/management/agent-settings-routes.ts +34 -9
  192. package/src/server/management/codex-agent-role-routes.ts +1 -0
  193. package/src/server/management/codex-role-auto-assign.ts +50 -6
  194. package/src/server/management/config-routes.ts +15 -4
  195. package/src/server/management/context.ts +3 -0
  196. package/src/server/management/native-integration-routes.ts +22 -0
  197. package/src/server/management/oauth-account-routes.ts +20 -4
  198. package/src/server/management/provider-overwrite-carry.ts +21 -0
  199. package/src/server/management/provider-routes.ts +3 -1
  200. package/src/server/management/route-registry.ts +2 -0
  201. package/src/server/management/shared.ts +17 -1
  202. package/src/server/management/workflow-budget-routes.ts +70 -3
  203. package/src/server/messages-native-eligibility.ts +6 -5
  204. package/src/server/messages-native-scope.ts +6 -1
  205. package/src/server/messages-shared.ts +57 -17
  206. package/src/server/persistent-gui-session.ts +4 -4
  207. package/src/server/request-log.ts +30 -2
  208. package/src/server/responses/adapter-delivery.ts +4 -0
  209. package/src/server/responses/advisor-plan-slot.ts +4 -0
  210. package/src/server/responses/advisor-slot.ts +73 -46
  211. package/src/server/responses/codex-auth-error.ts +5 -1
  212. package/src/server/responses/combo-required-tool-contract.ts +27 -0
  213. package/src/server/responses/compact.ts +4 -1
  214. package/src/server/responses/core-combo-failure.ts +2 -0
  215. package/src/server/responses/core-combo.ts +66 -5
  216. package/src/server/responses/core-lifetime.ts +4 -0
  217. package/src/server/responses/core-options.ts +9 -0
  218. package/src/server/responses/core.ts +2 -0
  219. package/src/server/responses/jev-model-invoke.ts +4 -2
  220. package/src/server/responses/passthrough-dispatch.ts +5 -4
  221. package/src/server/responses/policy-fallback.ts +2 -0
  222. package/src/server/responses/request-prepare.ts +4 -5
  223. package/src/server/responses/request-send-budget.ts +2 -1
  224. package/src/server/responses/request-sidecar-auth.ts +1 -0
  225. package/src/server/responses/request-transport.ts +2 -3
  226. package/src/server/responses/run-turn-execution.ts +4 -0
  227. package/src/server/responses/sidecar-execution.ts +21 -5
  228. package/src/server/responses-snapshot-repair.ts +18 -4
  229. package/src/server/responses-undeclared-tool-guard.ts +4 -0
  230. package/src/server/workflow-refusal.ts +2 -1
  231. package/src/service/state-lock.ts +12 -11
  232. package/src/service-manager-probe.ts +53 -8
  233. package/src/types/admission-policy.ts +13 -0
  234. package/src/types/config.ts +25 -0
  235. package/src/types/provider.ts +10 -0
  236. package/src/types/request.ts +7 -0
  237. package/src/types.ts +1 -0
  238. package/src/update/job.ts +20 -0
  239. package/src/update/worker-launch.ts +71 -1
  240. package/src/usage/log.ts +25 -4
  241. package/src/vision/index.ts +2 -0
  242. package/src/vision/plan.ts +4 -0
  243. package/src/vision/routed-describe.ts +38 -23
  244. package/src/web-search/loop.ts +104 -9
  245. package/src/web-search/parse.ts +10 -2
  246. package/gui/dist/assets/App-DMps4OLk.css +0 -1
  247. package/gui/dist/assets/App-DmvwlhQq.js +0 -58
  248. package/gui/dist/assets/index-3EPO_KbX.js +0 -94
  249. package/gui/dist/assets/quota-summary-BHvWg9mi.js +0 -1
@@ -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 groups = collectResponsesToolGroups(body);
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 rewrittenInput = body.input.map(item => {
364
- const next = rewriteInputItem(item, plan, emitted);
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
  });
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) ?? decoded;
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,
@@ -13,7 +13,7 @@
13
13
 
14
14
  import { normalizePersistedUsageRow, type PersistedUsageEntry } from "../usage/log";
15
15
  import { computeEntryCost } from "../usage/summary";
16
- import { openRequestHistoryIndex, requestHistoryDb } from "./history/indexer";
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
- const deviceIds = fallbackDeviceIds(config, hop.admission, now);
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
- const decision = resolveFallbackPolicy(config, { kind, routes, provider: hop.from.provider, deviceIds });
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,
@@ -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
- const handle = requestHistoryDb();
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");