@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
@@ -13,6 +13,7 @@ import { RequestHistoryIndexStaleError } from "./ingest";
13
13
  import type { RebuildWorkerReply, RebuildWorkerRequest } from "./rebuild-protocol";
14
14
 
15
15
  const CLOSE_TIMEOUT_MS = 5_000;
16
+ type WorkerSuccess = Exclude<RebuildWorkerReply, { type: "error" }>;
16
17
 
17
18
  function delay(ms: number): Promise<void> {
18
19
  return new Promise(resolve => setTimeout(resolve, ms));
@@ -34,7 +35,7 @@ function errorFromReply(reply: Extract<RebuildWorkerReply, { type: "error" }>):
34
35
 
35
36
  export class RebuildWorkerJob {
36
37
  private readonly worker: Worker;
37
- private pending: { resolve: (rows: number) => void; reject: (error: unknown) => void } | null = null;
38
+ private pending: { resolve: (reply: WorkerSuccess) => void; reject: (error: unknown) => void } | null = null;
38
39
  private exited = false;
39
40
  private exitedCleanly = false;
40
41
  private disposal: Promise<void> | null = null;
@@ -49,8 +50,8 @@ export class RebuildWorkerJob {
49
50
  this.pending = null;
50
51
  if (!pending) return;
51
52
  const reply = event.data;
52
- if (reply.type === "built") pending.resolve(reply.rows);
53
- else pending.reject(errorFromReply(reply));
53
+ if (reply.type === "error") pending.reject(errorFromReply(reply));
54
+ else pending.resolve(reply);
54
55
  });
55
56
  this.worker.addEventListener("error", (event: Event) => {
56
57
  this.fail(new Error((event as ErrorEvent).message || "request-history rebuild worker failed"));
@@ -68,16 +69,29 @@ export class RebuildWorkerJob {
68
69
  pending?.reject(error);
69
70
  }
70
71
 
71
- /** Build the complete private file; resolves with the ingested row count. */
72
- build(indexPath: string, buildPath: string, reason: string, revision: UsageLogRevision): Promise<number> {
72
+ private send(request: RebuildWorkerRequest): Promise<WorkerSuccess> {
73
73
  if (this.exited || this.disposal) return Promise.reject(new Error("request-history rebuild worker is not running"));
74
74
  if (this.pending) return Promise.reject(new Error("request-history rebuild worker is busy"));
75
75
  return new Promise((resolve, reject) => {
76
76
  this.pending = { resolve, reject };
77
- this.worker.postMessage({ type: "build", indexPath, buildPath, reason, revision } satisfies RebuildWorkerRequest);
77
+ this.worker.postMessage(request);
78
78
  });
79
79
  }
80
80
 
81
+ /** Build the complete private file; resolves with the ingested row count. */
82
+ async build(indexPath: string, buildPath: string, reason: string, revision: UsageLogRevision): Promise<number> {
83
+ const reply = await this.send({ type: "build", indexPath, buildPath, reason, revision });
84
+ if (reply.type !== "built") throw new Error("unexpected request-history build reply");
85
+ return reply.rows;
86
+ }
87
+
88
+ /** Scan a read-only connection off-loop; operational errors are not corruption. */
89
+ async check(indexPath: string): Promise<boolean> {
90
+ const reply = await this.send({ type: "check", indexPath });
91
+ if (reply.type !== "checked") throw new Error("unexpected request-history integrity reply");
92
+ return reply.healthy;
93
+ }
94
+
81
95
  /** Stop the thread; waits a bounded time for it to exit. */
82
96
  dispose(): Promise<void> {
83
97
  this.disposal ??= this.shutDown();
@@ -8,8 +8,9 @@ export type RebuildWorkerRequest = {
8
8
  buildPath: string;
9
9
  reason: string;
10
10
  revision: UsageLogRevision;
11
- };
11
+ } | { type: "check"; indexPath: string };
12
12
 
13
13
  export type RebuildWorkerReply =
14
14
  | { type: "built"; rows: number }
15
+ | { type: "checked"; healthy: boolean }
15
16
  | { type: "error"; name: string; message: string };
@@ -8,12 +8,30 @@
8
8
  * closes it. The serving thread then swaps the finished file in.
9
9
  */
10
10
 
11
+ import { Database } from "bun:sqlite";
11
12
  import { buildIndexFile, removeAbandonedBuilds } from "./build-file";
13
+ import { isHistoryIndexCorruption } from "./sqlite-errors";
12
14
  import type { RebuildWorkerReply, RebuildWorkerRequest } from "./rebuild-protocol";
13
15
 
14
16
  declare const self: Worker;
15
17
 
16
18
  function handle(request: RebuildWorkerRequest): RebuildWorkerReply {
19
+ if (request.type === "check") {
20
+ let handle: Database | undefined;
21
+ try {
22
+ handle = new Database(request.indexPath, { readonly: true });
23
+ handle.exec("PRAGMA busy_timeout = 5000");
24
+ const row = handle.query("PRAGMA quick_check").get() as { quick_check?: string } | undefined;
25
+ return { type: "checked", healthy: row?.quick_check === "ok" };
26
+ } catch (error) {
27
+ if (isHistoryIndexCorruption(error)) return { type: "checked", healthy: false };
28
+ throw error;
29
+ } finally {
30
+ // Release the live index before posting a verdict: the serving thread
31
+ // may immediately replace it, including on Windows.
32
+ handle?.close();
33
+ }
34
+ }
17
35
  removeAbandonedBuilds(request.indexPath);
18
36
  const rows = buildIndexFile(request.buildPath, request.reason, request.revision);
19
37
  return { type: "built", rows };
@@ -0,0 +1,9 @@
1
+ /** Only structural SQLite damage justifies discarding the derived index. */
2
+ export function isHistoryIndexCorruption(error: unknown): boolean {
3
+ if (!error || typeof error !== "object") return false;
4
+ const { code, errno } = error as { code?: unknown; errno?: unknown };
5
+ // Bun exposes extended result codes too; the low byte is the primary code.
6
+ if (typeof errno === "number" && ((errno & 0xff) === 11 || (errno & 0xff) === 26)) return true;
7
+ return typeof code === "string"
8
+ && /^(SQLITE_CORRUPT(?:_[A-Z]+)?|SQLITE_NOTADB)$/.test(code);
9
+ }
@@ -25,6 +25,8 @@ import { markResponseNonReplayable } from "../lib/upstream-retry";
25
25
  * the management credential.
26
26
  */
27
27
  export interface AdmissionModelScope {
28
+ /** Every inherited scope must also admit the final destination. */
29
+ readonly allOf?: readonly AdmissionModelScope[];
28
30
  /** Resolved provider names this key may reach. Empty means every provider. */
29
31
  readonly providers: readonly string[];
30
32
  /** Resolved destinations this key may reach. Empty means every model. */
@@ -44,6 +46,11 @@ function providerAllowedByScope(scope: AdmissionModelScope, providerName: string
44
46
  return scope.providers.length === 0 || scope.providers.includes(normalize(providerName));
45
47
  }
46
48
 
49
+ function unnamedDestinationAllowedByScope(scope: AdmissionModelScope, providerName: string): boolean {
50
+ return providerAllowedByScope(scope, providerName) && scope.models.length === 0
51
+ && (scope.allOf?.every(part => unnamedDestinationAllowedByScope(part, providerName)) ?? true);
52
+ }
53
+
47
54
  function normalizedList(values: readonly string[] | undefined): readonly string[] {
48
55
  if (!Array.isArray(values)) return [];
49
56
  const seen = new Set<string>();
@@ -73,9 +80,13 @@ export function resolveAdmissionModelScope(
73
80
  config: Pick<OcxConfig, "apiKeys">,
74
81
  admission: DataPlaneAdmission | undefined,
75
82
  ): AdmissionModelScope | undefined {
76
- if (!admission || admission.kind !== "configured") return undefined;
77
- const entry = (config.apiKeys ?? []).find(key => key.id === admission.keyId);
78
- return entry ? admissionModelScopeOf(entry) : undefined;
83
+ const entry = admission?.kind === "configured"
84
+ ? (config.apiKeys ?? []).find(key => key.id === admission.keyId) : undefined;
85
+ return intersectAdmissionModelScopes(entry ? admissionModelScopeOf(entry) : undefined, admission?.callerPolicy?.modelScope);
86
+ }
87
+
88
+ export function intersectAdmissionModelScopes(a: AdmissionModelScope | undefined, b: AdmissionModelScope | undefined): AdmissionModelScope | undefined {
89
+ return a && b ? { providers: [], models: [], allOf: [a, b] } : a ?? b;
79
90
  }
80
91
 
81
92
  /** Consent comes from stored operator config, never request headers. Use the full listener config. */
@@ -84,10 +95,15 @@ export function admissionMayUseMeteredComboTargets(
84
95
  admission: DataPlaneAdmission | undefined,
85
96
  combo?: { allowMeteredTargets?: boolean },
86
97
  ): boolean {
98
+ const caller = admission?.callerPolicy;
99
+ if (caller && (!caller.allowMeteredComboTargets || caller.meteredRequiresComboOptIn && combo?.allowMeteredTargets !== true)) return false;
87
100
  if (admission?.kind === "configured") {
88
101
  const entry = (config.apiKeys ?? []).find(key => key.id === admission.keyId);
89
102
  return entry?.allowMeteredComboTargets === true;
90
103
  }
104
+ // A loopback-admitted internal hop's captured policy already holds this branch's decision for
105
+ // its listener, or the consent of the validated key it presented (#7894); it was checked above.
106
+ if (admission?.kind === "loopback" && caller) return true;
91
107
  // Linked ingress always carries keyed admission, even when the primary bind is loopback.
92
108
  // A secondary loopback listener on a public proxy does not qualify either.
93
109
  return (!admission || admission.kind === "loopback")
@@ -111,6 +127,7 @@ export function routeAllowedByScope(
111
127
  route: ScopedRoute,
112
128
  ): boolean {
113
129
  if (!scope) return true;
130
+ if (scope.allOf?.some(part => !routeAllowedByScope(part, route))) return false;
114
131
  const model = normalize(route.modelId);
115
132
  if (!providerAllowedByScope(scope, route.providerName)) return false;
116
133
  if (scope.models.length === 0) return true;
@@ -226,7 +243,7 @@ export function admissionScopeDenial(
226
243
  const scope = resolveAdmissionModelScope(config, admission);
227
244
  if (!scope) return undefined;
228
245
  const allowed = destination.modelId === undefined
229
- ? providerAllowedByScope(scope, destination.providerName) && scope.models.length === 0
246
+ ? unnamedDestinationAllowedByScope(scope, destination.providerName)
230
247
  : routeAllowedByScope(scope, { providerName: destination.providerName, modelId: destination.modelId });
231
248
  if (allowed) return undefined;
232
249
  return admissionModelDeniedResponse(new AdmissionModelDeniedError(
@@ -1,4 +1,33 @@
1
1
  import type { AdmissionModelScope } from "./admission-model-scope";
2
+ import type { CapturedAdmissionPolicy } from "../types/admission-policy";
3
+ import { internalCallCapability, isInternalCallCapability } from "../lib/local-internal-call-capability";
4
+ import { immutableAdmissionPolicy } from "./capture-admission-policy";
5
+
6
+ export const ADVISOR_ADMISSION_POLICY_HEADER = "x-opencodex-advisor-admission-policy";
7
+ /** Routed helpers inherit policy without acquiring the Advisor recursion-suppression flag. */
8
+ export const SIDECAR_ADMISSION_POLICY_HEADER = "x-opencodex-sidecar-admission-policy";
9
+ export const SIDECAR_INTERNAL_CAPABILITY_HEADER = "x-opencodex-sidecar-internal";
10
+ const policies = new Map<string, { capability: string; policy: CapturedAdmissionPolicy }>();
11
+
12
+ /** A consult owns its registry entry until completion, failure or cancellation. */
13
+ export function registerAdvisorAdmissionPolicy(policy: CapturedAdmissionPolicy, signal?: AbortSignal) {
14
+ const token = Buffer.from(crypto.getRandomValues(new Uint8Array(32))).toString("base64url");
15
+ const release = () => {
16
+ policies.delete(token);
17
+ signal?.removeEventListener("abort", release);
18
+ };
19
+ if (!signal?.aborted) {
20
+ policies.set(token, { capability: internalCallCapability(), policy: immutableAdmissionPolicy(policy) });
21
+ signal?.addEventListener("abort", release, { once: true });
22
+ }
23
+ return { token, release };
24
+ }
25
+
26
+ export function readAdvisorAdmissionPolicy(token: string | null, capability: string | null): CapturedAdmissionPolicy | undefined {
27
+ if (!token || !isInternalCallCapability(capability)) return undefined;
28
+ const entry = policies.get(token);
29
+ return entry?.capability === capability ? entry.policy : undefined;
30
+ }
2
31
 
3
32
  /** Scope metadata accepted only alongside the process-owned Advisor capability. */
4
33
  export const ADVISOR_ADMISSION_SCOPE_HEADER = "x-opencodex-advisor-admission-scope";
@@ -433,10 +433,11 @@ function mintContextPrincipal(kind: string, keyId: string, credential: string):
433
433
  .digest("hex");
434
434
  }
435
435
 
436
- export type DataPlaneAdmission =
436
+ export type DataPlaneAdmission = (
437
437
  | { kind: "configured"; keyId: string; source: DataPlaneAdmissionSource; contextPrincipalId?: string }
438
438
  | { kind: "environment"; source: DataPlaneAdmissionSource; contextPrincipalId?: string }
439
- | { kind: "loopback"; source: "loopback" };
439
+ | { kind: "loopback"; source: "loopback" }
440
+ ) & { readonly callerPolicy?: import("../types/admission-policy").CapturedAdmissionPolicy };
440
441
 
441
442
  /**
442
443
  * Which admission secret `token` is, or null when it is none of them.
@@ -1088,6 +1089,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
1088
1089
  annotateEmptyToolOutputs: "editor",
1089
1090
  supportsServiceTier: "editor",
1090
1091
  modelSupportsServiceTier: "editor",
1092
+ promoteAdditionalTools: "editor",
1091
1093
  preserveResponsesReasoningContent: "editor",
1092
1094
  preserveResponsesInputItemIds: "editor",
1093
1095
  preserveResponsesMessageMetadata: "editor",
@@ -1193,6 +1195,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
1193
1195
  terminalContinuationGuard: "editor",
1194
1196
  openaiChatEofTolerance: "editor",
1195
1197
  foldDeveloperRoleToSystem: "editor",
1198
+ singleLeadingSystemMessage: "editor",
1196
1199
  promptCacheKey: "editor",
1197
1200
  chatServiceTier: "editor",
1198
1201
  responsesItemIdRepair: "editor",
@@ -0,0 +1,91 @@
1
+ import type { OcxConfig } from "../types";
2
+ import type { CapturedAdmissionPolicy } from "../types/admission-policy";
3
+ import type { DataPlaneAdmission } from "./auth-cors";
4
+ import { resolveDataPlaneAdmissionSecret } from "./auth-cors";
5
+ import { admissionMayUseMeteredComboTargets, intersectAdmissionModelScopes, resolveAdmissionModelScope } from "./admission-model-scope";
6
+ import { fallbackDeviceIds } from "../routing/fallback-policy";
7
+
8
+ function freeze<T>(value: T): T {
9
+ if (value && typeof value === "object") {
10
+ for (const child of Object.values(value)) freeze(child);
11
+ Object.freeze(value);
12
+ }
13
+ return value;
14
+ }
15
+
16
+ export function immutableAdmissionPolicy(policy: CapturedAdmissionPolicy): CapturedAdmissionPolicy {
17
+ return freeze(structuredClone(policy));
18
+ }
19
+
20
+ /** Combine already captured inputs without reading mutable caller or host configuration. */
21
+ export function intersectAdmissionPolicies(host: CapturedAdmissionPolicy, caller: CapturedAdmissionPolicy): CapturedAdmissionPolicy {
22
+ return immutableAdmissionPolicy({
23
+ modelScope: intersectAdmissionModelScopes(host.modelScope, caller.modelScope)!,
24
+ allowMeteredComboTargets: host.allowMeteredComboTargets && caller.allowMeteredComboTargets,
25
+ meteredRequiresComboOptIn: host.meteredRequiresComboOptIn || caller.meteredRequiresComboOptIn,
26
+ fallbackPolicies: [...host.fallbackPolicies, ...caller.fallbackPolicies],
27
+ });
28
+ }
29
+
30
+ export function captureAdmissionPolicy(
31
+ config: Pick<OcxConfig, "apiKeys" | "hostname" | "fallback">,
32
+ admission?: DataPlaneAdmission,
33
+ modelScope = resolveAdmissionModelScope(config, admission),
34
+ ): CapturedAdmissionPolicy {
35
+ return immutableAdmissionPolicy({
36
+ modelScope: modelScope ?? { providers: [], models: [] },
37
+ allowMeteredComboTargets: admissionMayUseMeteredComboTargets(config, admission, { allowMeteredTargets: true }),
38
+ meteredRequiresComboOptIn: !admission || admission.kind === "loopback"
39
+ || admission.callerPolicy?.meteredRequiresComboOptIn === true,
40
+ fallbackPolicies: [
41
+ ...(admission?.callerPolicy?.fallbackPolicies ?? []),
42
+ { config: { fallback: config.fallback }, deviceIds: fallbackDeviceIds(config, admission) },
43
+ ],
44
+ });
45
+ }
46
+
47
+ /** Attach constraints without changing the host's transport/principal identity. */
48
+ export function inheritAdmissionPolicy(
49
+ admission: DataPlaneAdmission | undefined,
50
+ callerPolicy: CapturedAdmissionPolicy,
51
+ ): DataPlaneAdmission {
52
+ return Object.freeze({ ...(admission ?? { kind: "loopback", source: "loopback" }), callerPolicy }) as DataPlaneAdmission;
53
+ }
54
+
55
+ /**
56
+ * Host policy of the data-plane credential an internal self-fetch presents (#7894).
57
+ *
58
+ * A loopback listener admits the self-fetch before it reads any token, so the listener snapshot
59
+ * says "loopback" and carries none of the selected key's model scope, paid-combo consent or
60
+ * device fallback identity. Call only after the internal capability and policy registration have
61
+ * been validated. Returns undefined when no credential is presented, and null when the data plane
62
+ * does not recognize it, which the caller must refuse rather than treat as unrestricted.
63
+ */
64
+ export function captureSelfFetchCredentialPolicy(
65
+ req: Request,
66
+ config: Pick<OcxConfig, "apiKeys" | "hostname" | "fallback">,
67
+ ): CapturedAdmissionPolicy | null | undefined {
68
+ const presented = req.headers.get("x-opencodex-api-key")?.trim();
69
+ if (!presented) return undefined;
70
+ const admission = resolveDataPlaneAdmissionSecret(presented, config, "dedicated");
71
+ return admission ? captureAdmissionPolicy(config, admission) : null;
72
+ }
73
+
74
+ /**
75
+ * Host policy of an internal self-fetch whose presented credential was validated (#7894).
76
+ *
77
+ * Scope and fallback limits of the listener snapshot and the key both apply. Paid-combo consent
78
+ * is the key's own when a loopback listener admitted the hop: that snapshot holds only the
79
+ * loopback default, which a public proxy always refuses, so a consenting key would otherwise be
80
+ * weaker over Advisor than on a direct request. The loopback snapshot still demands the combo's
81
+ * own opt-in, and the caller's consent is intersected afterwards.
82
+ */
83
+ export function selfFetchHostPolicy(
84
+ listener: CapturedAdmissionPolicy,
85
+ presented: CapturedAdmissionPolicy,
86
+ listenerAdmission: DataPlaneAdmission | undefined,
87
+ ): CapturedAdmissionPolicy {
88
+ const merged = intersectAdmissionPolicies(listener, presented);
89
+ if (listenerAdmission && listenerAdmission.kind !== "loopback") return merged;
90
+ return immutableAdmissionPolicy({ ...merged, allowMeteredComboTargets: presented.allowMeteredComboTargets });
91
+ }
@@ -23,7 +23,11 @@ import {
23
23
  responsesSseToChatCompletionsSse,
24
24
  } from "../chat/outbound";
25
25
  import { ADVISOR_INTERNAL_CAPABILITY_HEADER, isInternalCallCapability } from "../lib/local-internal-call-capability";
26
- import { ADVISOR_ADMISSION_SCOPE_HEADER, decodeAdvisorAdmissionScope } from "./advisor-admission-scope";
26
+ import type { CapturedAdmissionPolicy } from "../types/admission-policy";
27
+ import { ADVISOR_ADMISSION_SCOPE_HEADER, decodeAdvisorAdmissionScope, ADVISOR_ADMISSION_POLICY_HEADER, readAdvisorAdmissionPolicy, SIDECAR_ADMISSION_POLICY_HEADER, SIDECAR_INTERNAL_CAPABILITY_HEADER } from "./advisor-admission-scope";
28
+ import {
29
+ captureAdmissionPolicy, captureSelfFetchCredentialPolicy, inheritAdmissionPolicy, intersectAdmissionPolicies, selfFetchHostPolicy,
30
+ } from "./capture-admission-policy";
27
31
  import { classifyError, cyberPolicyErrorType, CYBER_POLICY_ERROR_CODE, isCyberPolicyCode, UNDECLARED_TOOL_CALL_ERROR_CODE } from "../lib/errors";
28
32
  import { redactSecretString } from "../lib/redact";
29
33
  import { resolveClientRetryAfter } from "../lib/retry-after";
@@ -118,7 +122,10 @@ export async function handleChatCompletions(
118
122
  req: Request,
119
123
  config: OcxConfig,
120
124
  logCtx: RequestLogContext,
121
- logIds?: { requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission },
125
+ logIds?: {
126
+ requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission;
127
+ advisorAdmissionPolicy?: CapturedAdmissionPolicy;
128
+ },
122
129
  ): Promise<Response> {
123
130
  // Set before routing so pre-dispatch refusals stay correlated. A Hermes-only id is marked as a
124
131
  // fallback, so a native id resolved later on the Responses bridge still replaces it.
@@ -152,17 +159,35 @@ async function handleChatCompletionsWithBudget(
152
159
  config: OcxConfig,
153
160
  logCtx: RequestLogContext,
154
161
  translatorBudget: TranslatorBudget,
155
- logIds?: { requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission },
162
+ logIds?: {
163
+ requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission;
164
+ advisorAdmissionPolicy?: CapturedAdmissionPolicy;
165
+ },
156
166
  ): Promise<Response> {
157
167
  const advisorInternal = isInternalCallCapability(req.headers.get(ADVISOR_INTERNAL_CAPABILITY_HEADER));
158
- const inheritedAdmissionScope = advisorInternal
168
+ const sidecarInternal = isInternalCallCapability(req.headers.get(SIDECAR_INTERNAL_CAPABILITY_HEADER));
169
+ const callerPolicy = advisorInternal
170
+ ? readAdvisorAdmissionPolicy(req.headers.get(ADVISOR_ADMISSION_POLICY_HEADER), req.headers.get(ADVISOR_INTERNAL_CAPABILITY_HEADER))
171
+ : readAdvisorAdmissionPolicy(req.headers.get(SIDECAR_ADMISSION_POLICY_HEADER), req.headers.get(SIDECAR_INTERNAL_CAPABILITY_HEADER));
172
+ const decodedScope = advisorInternal
159
173
  ? decodeAdvisorAdmissionScope(req.headers.get(ADVISOR_ADMISSION_SCOPE_HEADER))
160
174
  : undefined;
161
- if (advisorInternal && req.headers.has(ADVISOR_ADMISSION_SCOPE_HEADER) && !inheritedAdmissionScope) {
175
+ // Only a validated internal hop gets its presented credential resolved; loopback admission for
176
+ // every other caller is untouched. An unknown credential fails closed (#7894).
177
+ const selfFetchPolicy = callerPolicy ? captureSelfFetchCredentialPolicy(req, config) : undefined;
178
+ if ((advisorInternal || sidecarInternal) && (!callerPolicy || selfFetchPolicy === null
179
+ || advisorInternal && req.headers.has(ADVISOR_ADMISSION_SCOPE_HEADER) && !decodedScope)) {
162
180
  // Refused requests still own a final log row like every other early rejection.
163
181
  if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 403, { closeReason: "non_stream" });
164
182
  return chatCompletionsErrorResponse(403, "invalid inherited advisor admission scope", "permission_error", MODEL_NOT_ALLOWED_FOR_KEY);
165
183
  }
184
+ // The listener snapshot was captured at authentication; internal hops add the policy of the
185
+ // credential they selected (which loopback admission never read) and their frozen registration.
186
+ const listenerPolicy = logIds?.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, logIds?.admission);
187
+ const hostPolicy = selfFetchPolicy ? selfFetchHostPolicy(listenerPolicy, selfFetchPolicy, logIds?.admission) : listenerPolicy;
188
+ const advisorAdmissionPolicy = callerPolicy ? intersectAdmissionPolicies(hostPolicy, callerPolicy) : hostPolicy;
189
+ const admission = callerPolicy ? inheritAdmissionPolicy(logIds?.admission, advisorAdmissionPolicy) : logIds?.admission;
190
+ const inheritedAdmissionScope = callerPolicy ? advisorAdmissionPolicy.modelScope : undefined;
166
191
  let chatBody: Rec;
167
192
  try {
168
193
  const rawBody = await readChatBody(req, translatorBudget, resolveInboundBodyLimitBytes(config.maxInboundBodyBytes));
@@ -525,7 +550,8 @@ async function handleChatCompletionsWithBudget(
525
550
  ...(logIds?.turnAdmissionLease ? { turnAdmissionLease: logIds.turnAdmissionLease } : {}),
526
551
  // #1686: the Chat surface translates its body and replays here, so the admission fact has
527
552
  // to ride along or a bearer-admitted Chat caller would still be refused by Direct.
528
- ...(logIds?.admission ? { admission: logIds.admission } : {}),
553
+ ...(admission ? { admission } : {}),
554
+ advisorAdmissionPolicy,
529
555
  // The bridge request carries no caller credential, so resolve the replay principal here.
530
556
  replayPrincipal: { clientPrincipalId: resolveContextPrincipal(req, config, logIds?.admission) },
531
557
  abortSignal: req.signal,
@@ -545,7 +571,7 @@ async function handleChatCompletionsWithBudget(
545
571
  req, config, envelope, requestedModel, requestedStream: stream, translatorBudget,
546
572
  // Children run without logIds; the request's admission rides the source so their
547
573
  // replay scope resolves the same caller principal as every other surface.
548
- ...(logIds?.admission ? { admission: logIds.admission } : {}),
574
+ ...(admission ? { admission } : {}),
549
575
  }),
550
576
  } : {}),
551
577
  // Terminal vision-describe marker (roadmap 180): the bridge rebuilds
@@ -32,6 +32,8 @@ import { isKnownDesktop3pModelId, resolveDesktop3pAlias } from "../claude/deskto
32
32
  import { resolveAlias, claudeCodeNativeAlias, legacyAliasForNative } from "../claude/alias";
33
33
  import { recordDesktopRequest } from "../claude/desktop-health";
34
34
  import { stripOneMillionMarker } from "../claude/context-windows";
35
+ import { captureAdmissionPolicy } from "./capture-admission-policy";
36
+ import type { CapturedAdmissionPolicy } from "../types/admission-policy";
35
37
  import { captureClaudeInbound } from "../claude/inbound-debug";
36
38
  import { declaredAnthropicServerTools, replayedAnthropicServerBlocks } from "../claude/inbound-content-options";
37
39
  import { claudeCodeForIngress } from "../claude/intercept/model-bindings";
@@ -543,7 +545,10 @@ export async function handleClaudeMessages(
543
545
  req: Request,
544
546
  config: OcxConfig,
545
547
  logCtx: RequestLogContext,
546
- logIds?: { requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission },
548
+ logIds?: {
549
+ requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission;
550
+ advisorAdmissionPolicy?: CapturedAdmissionPolicy;
551
+ },
547
552
  requestPolicy: RequestPolicyView = config,
548
553
  ingress: ClaudeIngressOptions = {},
549
554
  ): Promise<Response> {
@@ -586,7 +591,10 @@ async function handleClaudeMessagesWithBudget(
586
591
  config: OcxConfig,
587
592
  logCtx: RequestLogContext,
588
593
  translatorBudget: TranslatorBudget,
589
- logIds?: { requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission },
594
+ logIds?: {
595
+ requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission;
596
+ advisorAdmissionPolicy?: CapturedAdmissionPolicy;
597
+ },
590
598
  requestPolicy: RequestPolicyView = config,
591
599
  ingress: ClaudeIngressOptions = {},
592
600
  ): Promise<Response> {
@@ -618,6 +626,8 @@ async function handleClaudeMessagesWithBudget(
618
626
  // Built only under the reject policy; the legacy default leaves this request untouched.
619
627
  let envelope: ProtocolEnvelope | undefined;
620
628
  let messagesFeatures: () => Iterable<ProtocolFeature> = () => [];
629
+ // The Advisor caller policy is the admitted snapshot: capture it before the first await (#7859).
630
+ const advisorAdmissionPolicy = logIds?.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, logIds?.admission);
621
631
  try {
622
632
  anthropicBody = await readAnthropicBody(req, translatorBudget, resolveInboundBodyLimitBytes(config.maxInboundBodyBytes));
623
633
  // Defensive [1m] strip (devlog 138): clients normally remove the context-variant
@@ -960,6 +970,83 @@ async function handleClaudeMessagesWithBudget(
960
970
  ...(settledRoute?.provider.authMode === "oauth" && settledInstance
961
971
  ? { oauthFailoverQuorum: anthropicRoutingFor(settledInstance).hasAnthropicFailoverQuorum() } : {}),
962
972
  };
973
+ if (settledRoute && isRec(anthropicBody)
974
+ && nativeMessagesDeclineReason(settledRoute, anthropicBody, config, nativeSelector) === "bridge-only-policy"
975
+ && nativeMessagesDeclineReason(settledRoute, anthropicBody, config, { ...nativeSelector, webSearchBackendAvailable: false }) === undefined) {
976
+ const { parseRequest } = await import("../responses/parser");
977
+ const { planWebSearch, shouldResolveOpenAiWebSearchSidecar } = await import("../web-search");
978
+ const replayConfig = buildClaudeReplayConfig(config);
979
+ const parsed = parseRequest(internalBody);
980
+ let openAiSidecar: import("../providers/openai-sidecar").ResolvedOpenAiForwardSidecar | undefined;
981
+ if (shouldResolveOpenAiWebSearchSidecar(replayConfig, parsed, false)) {
982
+ const { listOpenAiForwardSidecarCandidates, captureExplicitOpenAiCallerAuth, resolveFirstUsableOpenAiSidecar } = await import("../providers/openai-sidecar");
983
+ const candidates = listOpenAiForwardSidecarCandidates(replayConfig);
984
+ const headers = new Headers();
985
+ for (const name of FORWARD_HEADERS) {
986
+ if (name === "authorization" || name === "chatgpt-account-id") continue;
987
+ const value = req.headers.get(name);
988
+ if (value) headers.set(name, value);
989
+ }
990
+ const { codexAccountSelectionForTurn, tryAdmitTurn } = await import("./lifecycle");
991
+ // The probe owns its claim only until selection completes, not for the client turn.
992
+ const probeLease = logIds?.turnAdmissionLease && candidates.length ? tryAdmitTurn() : undefined;
993
+ const errors = await import("../codex/auth-context");
994
+ try {
995
+ req.signal.throwIfAborted();
996
+ if (logIds?.turnAdmissionLease && candidates.length && !probeLease) {
997
+ // No independent admission means availability is unknown; preserve the bridge.
998
+ nativeSelector.webSearchBackendAvailable = true;
999
+ } else {
1000
+ if (candidates.some(candidate => candidate.accountMode === "direct") && probeLease) {
1001
+ if (!tryClaimNativeMainProfileForTurn(probeLease)) {
1002
+ nativeSelector.webSearchBackendAvailable = true;
1003
+ } else {
1004
+ const { getMainAccountToken } = await import("../codex/main-account");
1005
+ const token = getMainAccountToken();
1006
+ if (token) {
1007
+ const auth = captureExplicitOpenAiCallerAuth(new Headers({ authorization: `Bearer ${token.accessToken}`, "chatgpt-account-id": token.chatgptAccountId }), replayConfig);
1008
+ if (auth) { headers.set("authorization", auth.authorization); headers.set("chatgpt-account-id", auth.chatgptAccountId); }
1009
+ }
1010
+ }
1011
+ }
1012
+ openAiSidecar = await resolveFirstUsableOpenAiSidecar(candidates, headers, replayConfig, {
1013
+ admission: logIds?.admission, codexAuthPolicy: config, signal: req.signal,
1014
+ beginCodexAccountSelection: codexAccountSelectionForTurn(probeLease ?? undefined),
1015
+ });
1016
+ req.signal.throwIfAborted();
1017
+ // The bridge can inject main auth into pool selection. Only a negative pool probe
1018
+ // needs this extra read; an unavailable claim or present token leaves it uncertain.
1019
+ if (!openAiSidecar && probeLease && candidates.some(candidate => candidate.accountMode === "pool")) {
1020
+ if (!tryClaimNativeMainProfileForTurn(probeLease)) nativeSelector.webSearchBackendAvailable = true;
1021
+ else {
1022
+ const { getMainAccountToken } = await import("../codex/main-account");
1023
+ if (getMainAccountToken()) nativeSelector.webSearchBackendAvailable = true;
1024
+ }
1025
+ }
1026
+ }
1027
+ } catch (err) {
1028
+ // Refresh wraps cancellation in CodexAuthContextError; a cancelled request must not continue.
1029
+ if (req.signal.aborted) {
1030
+ openAiSidecar?.releaseProbeLease?.();
1031
+ throw req.signal.reason ?? err;
1032
+ }
1033
+ if (!(err instanceof errors.CodexPoolAuthenticationError) && !(err instanceof errors.CodexAuthContextError)
1034
+ && !(err instanceof errors.CodexAccountCooldownError) && !(err instanceof errors.CodexThreadAffinityExpiredError)
1035
+ && !(err instanceof errors.CodexMainProfileDrainingError)) {
1036
+ openAiSidecar?.releaseProbeLease?.();
1037
+ throw err;
1038
+ }
1039
+ if (probeLease && candidates.some(candidate => candidate.accountMode === "pool")) nativeSelector.webSearchBackendAvailable = true;
1040
+ } finally { probeLease?.release(); }
1041
+ }
1042
+ try {
1043
+ nativeSelector.webSearchBackendAvailable ??= !!planWebSearch(replayConfig, parsed, false, settledRoute.provider, settledRoute.modelId, openAiSidecar, {
1044
+ admission: logIds?.admission, codexAuthPolicy: config, providerName: settledRoute.providerName,
1045
+ });
1046
+ } finally {
1047
+ openAiSidecar?.releaseProbeLease?.();
1048
+ }
1049
+ }
963
1050
  const nativeDecline = settledRoute && isRec(anthropicBody)
964
1051
  ? nativeMessagesDeclineReason(settledRoute, anthropicBody, config, nativeSelector)
965
1052
  : "rollout-disabled";
@@ -1122,6 +1209,7 @@ async function handleClaudeMessagesWithBudget(
1122
1209
  // Routing keeps Claude-only sidecar overrides; admission policy must follow the live owner.
1123
1210
  codexAuthPolicy: config,
1124
1211
  ...(logIds?.admission ? { admission: logIds.admission } : {}),
1212
+ advisorAdmissionPolicy,
1125
1213
  // The translated request never forwards the caller credential; resolve the principal first.
1126
1214
  replayPrincipal: { clientPrincipalId: resolveContextPrincipal(req, config, logIds?.admission) },
1127
1215
  ...(logIds?.turnAdmissionLease ? { turnAdmissionLease: logIds.turnAdmissionLease } : {}),
@@ -1,4 +1,5 @@
1
1
  import { websocketsEnabled } from "../config";
2
+ import { omitDisabledNativeCatalogEntries } from "../codex/catalog/native-omission";
2
3
  import type { OcxConfig } from "../types";
3
4
  import { buildCatalogEntries } from "../codex/catalog/build-entries";
4
5
  import { loadCatalogTemplate } from "../codex/catalog/bundled";
@@ -42,5 +43,5 @@ export function buildCodexModelList({
42
43
  accountNativeSlugsBySelector, config.keepNativeChatGptOnV1 === true, config.modelPickerOrder,
43
44
  nativeSource,
44
45
  );
45
- return { models: applyNativeVisibility(entries, disabledModels, accountSelectors.length > 0, new Set(accountNativeSlugs)) };
46
+ return { models: omitDisabledNativeCatalogEntries(applyNativeVisibility(entries, disabledModels, accountSelectors.length > 0, new Set(accountNativeSlugs)), config) };
46
47
  }
@@ -163,6 +163,11 @@ function build(configRead: StoreRead, authRead: StoreRead, signature: string, no
163
163
  || (config.value.providers !== undefined && !isRecord(config.value.providers)))) complete = false;
164
164
  if (authSig !== "absent" && auth.ok && !isRecord(auth.value)) complete = false;
165
165
  if (isRecord(config.value) && isRecord(config.value.providers)) walkProvider(config.value.providers, 0);
166
+ if (isRecord(config.value) && isRecord(config.value.codexRoleCapability)
167
+ && isRecord(config.value.codexRoleCapability.artificialAnalysis)) {
168
+ const key = config.value.codexRoleCapability.artificialAnalysis.apiKey;
169
+ addReference(typeof key === "string" ? key.trim() : key);
170
+ }
166
171
  if (isRecord(auth.value)) walkAuth(auth.value, 0);
167
172
 
168
173
  const names = [...envNames].sort();
@@ -109,6 +109,7 @@ import {
109
109
  } from "../auth-cors";
110
110
  import { managementSessionIssuance } from "../management-auth";
111
111
  import { resolveAdmissionModelScope, routeAllowedByScope } from "../admission-model-scope";
112
+ import { captureAdmissionPolicy } from "../capture-admission-policy";
112
113
  import {
113
114
  disableResponsesRequestTimeout,
114
115
  handleResponses,
@@ -1323,10 +1324,12 @@ export function createServeOptions(ctx: ServeOptionsContext) {
1323
1324
  ...admissionFields(admission),
1324
1325
  inboundProtocol: "responses",
1325
1326
  };
1327
+ const advisorAdmissionPolicy = captureAdmissionPolicy(config, admission);
1326
1328
  return runAdmittedHttpTurn(req, policy, async turnAdmissionLease => {
1327
1329
  let response: Response;
1328
1330
  try {
1329
1331
  response = await handleResponsesCompact(req, config, logCtx, turnAdmissionLease, admission, {
1332
+ advisorAdmissionPolicy,
1330
1333
  onRequestBodyRead: () => disableResponsesRequestTimeout(req, requestServer),
1331
1334
  });
1332
1335
  } catch (error) {
@@ -1482,12 +1485,15 @@ export function createServeOptions(ctx: ServeOptionsContext) {
1482
1485
  addFinalRequestLog(requestId, start, logCtx, status, meta);
1483
1486
  };
1484
1487
  const sessionReq = withCallerSessionIdentity(withGrokSessionIdentity(req), admission);
1488
+ // Capture at authentication: runAdmittedHttpTurn can wait for body capacity first (#7859).
1489
+ const advisorAdmissionPolicy = captureAdmissionPolicy(config, admission);
1485
1490
  return runAdmittedHttpTurn(sessionReq, policy, async turnAdmissionLease => {
1486
1491
  let response: Response;
1487
1492
  try {
1488
1493
  response = await handleResponses(sessionReq, config, logCtx, {
1489
1494
  turnAdmissionLease,
1490
1495
  admission,
1496
+ advisorAdmissionPolicy,
1491
1497
  onRequestBodyRead: () => disableResponsesRequestTimeout(req, requestServer),
1492
1498
  abortSignal: req.signal,
1493
1499
  onFirstOutput: () => recordFirstOutput(logCtx, start),
@@ -1571,8 +1577,10 @@ export function createServeOptions(ctx: ServeOptionsContext) {
1571
1577
  let ownsRequestLog = false;
1572
1578
  const claimRequestLog = (work: (lease: ActiveTurnLease) => Promise<Response>) =>
1573
1579
  (lease: ActiveTurnLease) => { ownsRequestLog = true; return work(lease); };
1580
+ // Capture at authentication: runAdmittedHttpTurn can wait for body capacity first (#7859).
1581
+ const advisorAdmissionPolicy = captureAdmissionPolicy(config, admission);
1574
1582
  const response = await runAdmittedHttpTurn(sessionReq, policy, claimRequestLog(async turnAdmissionLease => withCors(
1575
- await handleClaudeMessages(sessionReq, config, logCtx, { requestId, start, turnAdmissionLease, admission }, policy, { claudeIntercept: ingress === "claude-intercept" }),
1583
+ await handleClaudeMessages(sessionReq, config, logCtx, { requestId, start, turnAdmissionLease, admission, advisorAdmissionPolicy }, policy, { claudeIntercept: ingress === "claude-intercept" }),
1576
1584
  req,
1577
1585
  policy,
1578
1586
  )), { requestId, start, logCtx, onLogged: () => { ownsRequestLog = true; } });
@@ -1607,10 +1615,12 @@ export function createServeOptions(ctx: ServeOptionsContext) {
1607
1615
  const sessionReq = withCallerSessionIdentity(req, admission);
1608
1616
  // Only expose an id when the handler or a logged refusal owns its history row.
1609
1617
  let ownsRequestLog = false;
1618
+ // Capture at authentication: runAdmittedHttpTurn can wait for body capacity first (#7859).
1619
+ const advisorAdmissionPolicy = captureAdmissionPolicy(config, admission);
1610
1620
  const response = await runAdmittedHttpTurn(sessionReq, policy, async turnAdmissionLease => {
1611
1621
  ownsRequestLog = true;
1612
1622
  return withCors(
1613
- await handleChatCompletions(sessionReq, config, logCtx, { requestId, start, turnAdmissionLease, admission }),
1623
+ await handleChatCompletions(sessionReq, config, logCtx, { requestId, start, turnAdmissionLease, admission, advisorAdmissionPolicy }),
1614
1624
  req,
1615
1625
  policy,
1616
1626
  );