@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.
Files changed (289) hide show
  1. package/gui/dist/assets/App-B4j-Txmb.css +1 -0
  2. package/gui/dist/assets/App-bwugJRKn.js +58 -0
  3. package/gui/dist/assets/{Tray-CZatQdoF.js → Tray-BOPQyDbH.js} +1 -1
  4. package/gui/dist/assets/index-ebuVUtB7.js +94 -0
  5. package/gui/dist/assets/quota-summary-6HsrHQAy.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/ollama-native.ts +10 -6
  14. package/src/adapters/openai-chat/messages.ts +20 -7
  15. package/src/adapters/openai-chat/passthrough.ts +4 -2
  16. package/src/adapters/openai-chat/single-system.ts +24 -0
  17. package/src/adapters/openai-responses/canonical-forward.ts +50 -13
  18. package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
  19. package/src/adapters/openai-responses/passthrough.ts +45 -11
  20. package/src/adapters/openai-responses/prompt-cache.ts +3 -1
  21. package/src/adapters/openai-responses/request-strips.ts +23 -4
  22. package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
  23. package/src/adapters/openai-responses/tool-schema.ts +20 -8
  24. package/src/adapters/openai-responses/transport.ts +17 -26
  25. package/src/adapters/opencode-go-additional-tools.ts +39 -6
  26. package/src/adapters/qoder/adapter.ts +1 -1
  27. package/src/adapters/qoder/image-input.ts +5 -2
  28. package/src/adapters/routed-agent-messages.ts +3 -0
  29. package/src/adapters/xai-web-search.ts +6 -3
  30. package/src/adapters/zed-additional-tools.ts +7 -7
  31. package/src/adapters/zed.ts +1 -6
  32. package/src/advisor/consult.ts +22 -10
  33. package/src/advisor/runtime.ts +10 -4
  34. package/src/bridge/max-output-completion.ts +41 -0
  35. package/src/bridge/response-json.ts +9 -4
  36. package/src/bridge/sse.ts +13 -2
  37. package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +5 -0
  38. package/src/chatgpt/app-server-shim/launcher.ts +40 -6
  39. package/src/claude/compatibility.ts +5 -1
  40. package/src/claude/desktop-3p.ts +27 -6
  41. package/src/claude/desktop-model-visibility.ts +141 -0
  42. package/src/claude/desktop-remote-store-io.ts +8 -8
  43. package/src/claude/inbound-content-options.ts +11 -1
  44. package/src/claude/intercept/proxy-auth.ts +16 -16
  45. package/src/cli/account-main.ts +3 -2
  46. package/src/cli/agent.ts +44 -15
  47. package/src/cli/capabilities-agents-routing.ts +9 -0
  48. package/src/cli/capabilities-provider-models.ts +7 -0
  49. package/src/cli/chatgpt-command.ts +1 -1
  50. package/src/cli/codex-launcher.ts +20 -8
  51. package/src/cli/codex-shim-autorestore.ts +19 -1
  52. package/src/cli/dispatch.ts +6 -6
  53. package/src/cli/doctor.ts +5 -5
  54. package/src/cli/ensure-desired-integrations.ts +4 -3
  55. package/src/cli/index.ts +8 -10
  56. package/src/cli/init.ts +2 -2
  57. package/src/cli/internal-command.ts +29 -2
  58. package/src/cli/message-command.ts +2 -1
  59. package/src/cli/message-mcp-command.ts +29 -0
  60. package/src/cli/provider-cc-switch-import.ts +185 -0
  61. package/src/cli/provider.ts +5 -0
  62. package/src/cli/registry.ts +2 -1
  63. package/src/cli/restart-scope.ts +2 -2
  64. package/src/cli/root.ts +6 -6
  65. package/src/cli/stop-approval.ts +15 -1
  66. package/src/cli/v2.ts +69 -19
  67. package/src/client/machine-api.ts +2 -2
  68. package/src/clients/config-export.ts +14 -3
  69. package/src/codex/account-cooldown-response.ts +18 -0
  70. package/src/codex/account-store.ts +1 -0
  71. package/src/codex/app-server-restart-service.ts +2 -2
  72. package/src/codex/auth-api/login-flow.ts +2 -2
  73. package/src/codex/auth-api/pool-quota-probe.ts +2 -2
  74. package/src/codex/auth-context-provider.ts +15 -0
  75. package/src/codex/auth-context.ts +14 -23
  76. package/src/codex/catalog/bundled.ts +10 -3
  77. package/src/codex/catalog/metadata.ts +4 -5
  78. package/src/codex/catalog/native-omission.ts +28 -0
  79. package/src/codex/catalog/native-template.ts +58 -0
  80. package/src/codex/catalog/parsing.ts +3 -29
  81. package/src/codex/catalog/provider-models.ts +2 -1
  82. package/src/codex/catalog/retained-sync.ts +15 -5
  83. package/src/codex/catalog/write-audit.ts +18 -18
  84. package/src/codex/cli-install-provenance.ts +46 -45
  85. package/src/codex/cli-update-artifacts.ts +8 -6
  86. package/src/codex/cli-update-job-store-windows.ts +99 -27
  87. package/src/codex/cli-update-job-worker.ts +3 -11
  88. package/src/codex/cli-update-recovery.ts +54 -8
  89. package/src/codex/cli-update-selection-gate.ts +74 -4
  90. package/src/codex/cli-windows-plan-provenance.ts +37 -19
  91. package/src/codex/codex-home-owner.ts +9 -8
  92. package/src/codex/convergence.ts +13 -3
  93. package/src/codex/coordinator-doctor.ts +14 -8
  94. package/src/codex/desktop-app/handoff.ts +1 -1
  95. package/src/codex/desktop-app-restart.ts +11 -1
  96. package/src/codex/exec-boundary.ts +26 -5
  97. package/src/codex/forward-transport-headers.ts +33 -33
  98. package/src/codex/history-provider.ts +11 -10
  99. package/src/codex/inject/bounded-config-reader.ts +14 -13
  100. package/src/codex/installation-id.ts +72 -0
  101. package/src/codex/main-account.ts +6 -6
  102. package/src/codex/native-main-lock-file.ts +13 -12
  103. package/src/codex/native-residue.ts +18 -14
  104. package/src/codex/orca-auth-source.ts +8 -7
  105. package/src/codex/quota-types.ts +5 -0
  106. package/src/codex/quota.ts +49 -7
  107. package/src/codex/role-auto-assign.ts +50 -26
  108. package/src/codex/role-capability.ts +160 -0
  109. package/src/codex/role-sizing.ts +24 -6
  110. package/src/codex/routing/cooldown-math.ts +3 -2
  111. package/src/codex/runtime.ts +43 -3
  112. package/src/codex/shim-fingerprint.ts +11 -9
  113. package/src/codex/shim-inspect.ts +3 -2
  114. package/src/codex/shim-restore-lock.ts +11 -14
  115. package/src/codex/shim-state-file.ts +22 -14
  116. package/src/codex/shim-wrapper-write.ts +7 -6
  117. package/src/codex/shim.ts +25 -2
  118. package/src/codex/transition-state.ts +5 -4
  119. package/src/combos/failover.ts +43 -4
  120. package/src/config/atomic-write.ts +38 -7
  121. package/src/config/diagnostics.ts +3 -0
  122. package/src/config/initialize.ts +6 -6
  123. package/src/config/load-degrade.ts +2 -0
  124. package/src/config/process-state.ts +23 -5
  125. package/src/config/salvage.ts +1 -0
  126. package/src/config/schema/config-schema.ts +29 -1
  127. package/src/config/schema/leaf-validators.ts +7 -0
  128. package/src/config/schema/workflow-budget.ts +43 -0
  129. package/src/config/tracked-runtime-inspection.ts +188 -0
  130. package/src/generated/compatibility-version.json +380 -244
  131. package/src/grok/sync.ts +10 -1
  132. package/src/integrations/aside-profile-context.ts +1 -1
  133. package/src/integrations/droid-settings.ts +4 -4
  134. package/src/integrations/hermes-profiles.ts +3 -3
  135. package/src/lib/bounded-file-read.ts +3 -9
  136. package/src/lib/bun-runtime-preflight.ts +9 -8
  137. package/src/lib/file-identity.ts +15 -0
  138. package/src/lib/local-chat-completion.ts +8 -6
  139. package/src/lib/local-destinations.ts +32 -3
  140. package/src/lib/redact-folding.ts +9 -0
  141. package/src/lib/spend-pool-alias-validation.ts +6 -6
  142. package/src/lib/state-store-registrations.ts +2 -0
  143. package/src/lib/test-home-guard.ts +37 -9
  144. package/src/lib/windows-secret-acl.ts +49 -31
  145. package/src/lib/workflow-budget-config.ts +39 -0
  146. package/src/local-credentials/generation.ts +6 -2
  147. package/src/local-credentials/inventory.ts +132 -8
  148. package/src/messaging/mcp-queue-rpc.ts +102 -0
  149. package/src/messaging/mcp-queue-server.ts +42 -0
  150. package/src/messaging/mcp-queue-tools.ts +39 -0
  151. package/src/messaging/remote-forward-failure.ts +35 -0
  152. package/src/messaging/remote-ports.ts +27 -5
  153. package/src/messaging/remote-process.ts +30 -4
  154. package/src/messaging/remote-tunnels.ts +80 -15
  155. package/src/oauth/anthropic-identity.ts +2 -6
  156. package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
  157. package/src/oauth/google-antigravity.ts +23 -10
  158. package/src/oauth/index.ts +7 -0
  159. package/src/oauth/kiro-device-login.ts +87 -30
  160. package/src/oauth/kiro-iam-identity-center.ts +107 -0
  161. package/src/oauth/store.ts +9 -7
  162. package/src/providers/account-quota-disk.ts +18 -4
  163. package/src/providers/anthropic-subscription.ts +25 -0
  164. package/src/providers/cc-switch-import-bytes.ts +991 -0
  165. package/src/providers/cc-switch-import-source.ts +1083 -0
  166. package/src/providers/cc-switch-import.ts +942 -0
  167. package/src/providers/claude-cli-usage.ts +15 -67
  168. package/src/providers/derive.ts +6 -0
  169. package/src/providers/model-discovery-diagnostic.ts +4 -0
  170. package/src/providers/model-discovery.ts +4 -4
  171. package/src/providers/model-rename-fields.ts +2 -0
  172. package/src/providers/model-rename-migration.ts +41 -6
  173. package/src/providers/quota/anthropic-decision-windows.ts +5 -19
  174. package/src/providers/quota/anthropic-usage-windows.ts +55 -0
  175. package/src/providers/quota/report-cache.ts +17 -4
  176. package/src/providers/quota.ts +2 -2
  177. package/src/providers/reasoning-metadata.ts +31 -15
  178. package/src/providers/registry/entries-core.ts +1 -1
  179. package/src/providers/registry/entries-extended.ts +1 -1
  180. package/src/providers/registry/model-ids.ts +1 -0
  181. package/src/providers/registry/model-seeds.ts +2 -1
  182. package/src/providers/registry/types.ts +3 -1
  183. package/src/providers/resolved-model-policy.ts +2 -2
  184. package/src/providers/routed-config.ts +2 -0
  185. package/src/providers/stale-model-roster-migration.ts +5 -1
  186. package/src/providers/xai-transport.ts +4 -4
  187. package/src/remote-control/workspace-codex-runtime.ts +2 -2
  188. package/src/remote-control/workspace-executor.ts +14 -13
  189. package/src/responses/custom-tool-compat.ts +2 -1
  190. package/src/responses/item-provenance.ts +79 -0
  191. package/src/responses/namespace-tool-compat.ts +21 -3
  192. package/src/responses/parser-tools.ts +1 -0
  193. package/src/responses/schema.ts +5 -2
  194. package/src/router.ts +21 -2
  195. package/src/routing/analytics.ts +3 -5
  196. package/src/routing/fallback-policy.ts +7 -3
  197. package/src/routing/health.ts +5 -3
  198. package/src/routing/history/build-file.ts +6 -0
  199. package/src/routing/history/indexer.ts +158 -31
  200. package/src/routing/history/ingest.ts +1 -1
  201. package/src/routing/history/integrity.ts +208 -0
  202. package/src/routing/history/rebuild-job.ts +20 -6
  203. package/src/routing/history/rebuild-protocol.ts +2 -1
  204. package/src/routing/history/rebuild-worker.ts +18 -0
  205. package/src/routing/history/sqlite-errors.ts +9 -0
  206. package/src/server/admission-model-scope.ts +21 -4
  207. package/src/server/advisor-admission-scope.ts +29 -0
  208. package/src/server/audio-dictation.ts +3 -0
  209. package/src/server/audio-live.ts +8 -2
  210. package/src/server/audio-upstream.ts +2 -0
  211. package/src/server/auth-cors.ts +5 -2
  212. package/src/server/capture-admission-policy.ts +91 -0
  213. package/src/server/chat-completions.ts +33 -7
  214. package/src/server/claude-messages.ts +93 -2
  215. package/src/server/codex-model-list.ts +2 -1
  216. package/src/server/configured-credentials.ts +5 -0
  217. package/src/server/context-history.ts +9 -6
  218. package/src/server/images.ts +14 -5
  219. package/src/server/index/live-sideband.ts +16 -2
  220. package/src/server/index/serve-options.ts +13 -2
  221. package/src/server/index/websocket-handler.ts +4 -1
  222. package/src/server/live.ts +30 -5
  223. package/src/server/management/agent-settings-routes.ts +34 -9
  224. package/src/server/management/codex-agent-role-routes.ts +1 -0
  225. package/src/server/management/codex-role-auto-assign.ts +50 -6
  226. package/src/server/management/config-routes.ts +15 -4
  227. package/src/server/management/context.ts +3 -0
  228. package/src/server/management/native-integration-routes.ts +22 -0
  229. package/src/server/management/oauth-account-routes.ts +20 -4
  230. package/src/server/management/provider-overwrite-carry.ts +21 -0
  231. package/src/server/management/provider-routes.ts +3 -1
  232. package/src/server/management/route-registry.ts +2 -0
  233. package/src/server/management/shared.ts +17 -1
  234. package/src/server/management/workflow-budget-routes.ts +70 -3
  235. package/src/server/messages-native-eligibility.ts +6 -5
  236. package/src/server/messages-native-scope.ts +6 -1
  237. package/src/server/messages-shared.ts +57 -17
  238. package/src/server/persistent-gui-session.ts +4 -4
  239. package/src/server/request-log.ts +30 -2
  240. package/src/server/responses/adapter-delivery.ts +4 -0
  241. package/src/server/responses/adapter-dispatch.ts +5 -0
  242. package/src/server/responses/advisor-plan-slot.ts +4 -0
  243. package/src/server/responses/advisor-slot.ts +73 -46
  244. package/src/server/responses/codex-auth-error.ts +9 -1
  245. package/src/server/responses/combo-required-tool-contract.ts +39 -0
  246. package/src/server/responses/compact.ts +41 -20
  247. package/src/server/responses/core-codex-account.ts +17 -6
  248. package/src/server/responses/core-combo-failure.ts +2 -0
  249. package/src/server/responses/core-combo.ts +70 -5
  250. package/src/server/responses/core-lifetime.ts +4 -0
  251. package/src/server/responses/core-normalize.ts +7 -1
  252. package/src/server/responses/core-options.ts +9 -0
  253. package/src/server/responses/core.ts +2 -0
  254. package/src/server/responses/jev-model-invoke.ts +4 -2
  255. package/src/server/responses/passthrough-build-error.ts +36 -0
  256. package/src/server/responses/passthrough-dispatch.ts +10 -24
  257. package/src/server/responses/policy-fallback.ts +2 -0
  258. package/src/server/responses/request-prepare.ts +4 -5
  259. package/src/server/responses/request-send-budget.ts +2 -1
  260. package/src/server/responses/request-sidecar-auth.ts +4 -1
  261. package/src/server/responses/request-transport.ts +2 -3
  262. package/src/server/responses/run-turn-execution.ts +4 -0
  263. package/src/server/responses/sidecar-execution.ts +21 -5
  264. package/src/server/responses-snapshot-repair.ts +18 -4
  265. package/src/server/responses-undeclared-tool-guard.ts +4 -0
  266. package/src/server/search.ts +13 -4
  267. package/src/server/workflow-refusal.ts +2 -1
  268. package/src/server/ws-bridge.ts +5 -2
  269. package/src/service/state-lock.ts +12 -11
  270. package/src/service-manager-probe.ts +53 -8
  271. package/src/types/admission-policy.ts +13 -0
  272. package/src/types/config.ts +25 -0
  273. package/src/types/provider.ts +10 -0
  274. package/src/types/request.ts +7 -0
  275. package/src/types.ts +1 -0
  276. package/src/update/job.ts +20 -0
  277. package/src/update/worker-launch.ts +71 -1
  278. package/src/usage/log.ts +25 -4
  279. package/src/vision/describe.ts +4 -7
  280. package/src/vision/index.ts +2 -0
  281. package/src/vision/plan.ts +4 -0
  282. package/src/vision/routed-describe.ts +38 -23
  283. package/src/web-search/executor.ts +4 -7
  284. package/src/web-search/loop.ts +104 -9
  285. package/src/web-search/parse.ts +10 -2
  286. package/gui/dist/assets/App-DMps4OLk.css +0 -1
  287. package/gui/dist/assets/App-DmvwlhQq.js +0 -58
  288. package/gui/dist/assets/index-3EPO_KbX.js +0 -94
  289. package/gui/dist/assets/quota-summary-BHvWg9mi.js +0 -1
@@ -18,7 +18,7 @@
18
18
  * unavailable context or with nothing, depending on the trigger.
19
19
  */
20
20
  import type { OcxConfig } from "../types";
21
- import { localAdmissionToken, localInferenceDestination } from "../lib/local-destinations";
21
+ import { localInferenceDestination, selfFetchAdmissionToken, type LocalInferenceDestination } from "../lib/local-destinations";
22
22
  import { signalWithTimeout, cancelBodyOnAbort } from "../lib/abort";
23
23
  import { redactSecretString } from "../lib/redact";
24
24
  import { sidecarEnter } from "../lib/sidecar-tracker";
@@ -33,8 +33,12 @@ import {
33
33
  ADVISOR_ADMISSION_SCOPE_HEADER,
34
34
  AdvisorAdmissionScopeEncodedBoundExceeded,
35
35
  encodeAdvisorAdmissionScope,
36
+ ADVISOR_ADMISSION_POLICY_HEADER,
37
+ registerAdvisorAdmissionPolicy,
36
38
  } from "../server/advisor-admission-scope";
37
39
  import type { AdmissionModelScope } from "../server/admission-model-scope";
40
+ import type { CapturedAdmissionPolicy } from "../types/admission-policy";
41
+ import { captureAdmissionPolicy } from "../server/capture-admission-policy";
38
42
 
39
43
  /**
40
44
  * The header the advisor presents on its own loopback request. Its VALUE is this process's
@@ -66,12 +70,18 @@ export interface AdvisorConsultationResult {
66
70
  export function advisorDestinationOrigin(
67
71
  config: Pick<OcxConfig, "port" | "hostname" | "unauthenticatedLoopbackListener">,
68
72
  ): string {
73
+ return advisorDestination(config).origin;
74
+ }
75
+
76
+ function advisorDestination(
77
+ config: Pick<OcxConfig, "port" | "hostname" | "unauthenticatedLoopbackListener">,
78
+ ): LocalInferenceDestination {
69
79
  // Same port resolution rule as the vision sidecar: config.port can be 0 (ephemeral bind, tests)
70
80
  // or stale after a live port override, so prefer the recorded actual bind port when present.
71
81
  const port = config.port && config.port > 0
72
82
  ? config.port
73
83
  : Number(configuredPort()) || 10_100;
74
- return localInferenceDestination(config, port).origin;
84
+ return localInferenceDestination(config, port);
75
85
  }
76
86
 
77
87
  function extractContent(payload: unknown): string | undefined {
@@ -123,6 +133,7 @@ export async function consultAdvisor(
123
133
  abortSignal?: AbortSignal,
124
134
  baseUrlOverride?: string,
125
135
  admissionScope?: AdmissionModelScope,
136
+ admissionPolicy?: CapturedAdmissionPolicy,
126
137
  ): Promise<AdvisorConsultationResult> {
127
138
  const t0 = Date.now();
128
139
  const headers: Record<string, string> = {
@@ -130,15 +141,12 @@ export async function consultAdvisor(
130
141
  [ADVISOR_INTERNAL_CAPABILITY_HEADER]: internalCallCapability(),
131
142
  };
132
143
  // Admission ladder identical to the vision sidecar: env token || service token file || first
133
- // configured API key, sent as `x-opencodex-api-key` — never Authorization. Loopback binds that
134
- // require no token simply omit it.
135
- const admission = localAdmissionToken(config);
144
+ // configured API key, sent as `x-opencodex-api-key` — never Authorization. A destination that
145
+ // requires no admission gets only a credential this data plane recognizes (#7894).
146
+ const admission = selfFetchAdmissionToken(config, advisorDestination(config));
136
147
  if (admission) headers["x-opencodex-api-key"] = admission;
137
- // Always send the caller's resolved snapshot, including the unrestricted empty form: an
138
- // omitted header would be re-resolved against the host admission token above, and a
139
- // restricted host key would then narrow a caller whose own scope allows the destination.
140
- // Empty lists decode as a defined-but-unrestricted scope, so the capability fence and the
141
- // malformed-header refusal are unchanged.
148
+ // Keep the bounded scope envelope for transport validation; the process-local policy
149
+ // registration below owns the complete snapshot. The receiver also enforces host limits.
142
150
  try {
143
151
  headers[ADVISOR_ADMISSION_SCOPE_HEADER] = encodeAdvisorAdmissionScope(admissionScope ?? { providers: [], models: [] });
144
152
  } catch (error) {
@@ -167,7 +175,10 @@ export async function consultAdvisor(
167
175
  linkedSignal.cleanup();
168
176
  return { ok: false, cancelled: true, advice: "", advisorModel: input.advisorModel, error: "advisor cancelled before dispatch", durationMs: Date.now() - t0 };
169
177
  }
178
+ let policyRegistration: ReturnType<typeof registerAdvisorAdmissionPolicy> | undefined;
170
179
  try {
180
+ policyRegistration = registerAdvisorAdmissionPolicy(admissionPolicy ?? captureAdmissionPolicy(config, undefined, admissionScope), linkedSignal.signal);
181
+ headers[ADVISOR_ADMISSION_POLICY_HEADER] = policyRegistration.token;
171
182
  const res = await fetch(`${baseUrlOverride ?? advisorBaseUrl(config)}/v1/chat/completions`, {
172
183
  method: "POST",
173
184
  headers,
@@ -239,6 +250,7 @@ export async function consultAdvisor(
239
250
  durationMs,
240
251
  };
241
252
  } finally {
253
+ policyRegistration?.release();
242
254
  sidecarExit();
243
255
  linkedSignal.cleanup();
244
256
  }
@@ -55,6 +55,7 @@ export interface AdvisorRuntimeDeps {
55
55
  workerIdentity: string;
56
56
  workerModelId: string;
57
57
  admissionScope?: AdmissionModelScope;
58
+ admissionPolicy?: import("../types/admission-policy").CapturedAdmissionPolicy;
58
59
  abortSignal?: AbortSignal;
59
60
  /** Test seam; production always self-fetches the resolved local destination. */
60
61
  baseUrlOverride?: string;
@@ -139,7 +140,11 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
139
140
  reason: AdvisorTrigger,
140
141
  question: string | undefined,
141
142
  evidence?: AdvisorRepairEvidence,
143
+ abortSignal?: AbortSignal,
142
144
  ): Promise<AdvisorConsultOutcome> => {
145
+ const consultationSignal = abortSignal && deps.abortSignal
146
+ ? AbortSignal.any([deps.abortSignal, abortSignal])
147
+ : abortSignal ?? deps.abortSignal;
143
148
  const current = liveSettings();
144
149
  if (!current.enabled || current.model.trim() === "") {
145
150
  return {
@@ -187,7 +192,7 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
187
192
  content: formatAdvisorUnavailable(reason === "manual" ? "manual" : "preflight", result.error),
188
193
  };
189
194
  }
190
- if (deps.abortSignal?.aborted) return { ok: false, isError: true, cancelled: true, content: "" };
195
+ if (consultationSignal?.aborted) return { ok: false, isError: true, cancelled: true, content: "" };
191
196
  const budgetKey = identify(parsed).budget;
192
197
  const requestCapped = consultations >= MAX_ADVISOR_CONSULTATIONS_PER_REQUEST;
193
198
  if (requestCapped
@@ -216,9 +221,10 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
216
221
  deps.config,
217
222
  current.effort,
218
223
  current.timeoutMs,
219
- deps.abortSignal,
224
+ consultationSignal,
220
225
  deps.baseUrlOverride,
221
- deps.admissionScope,
226
+ deps.admissionScope,
227
+ deps.admissionPolicy,
222
228
  );
223
229
  } catch (error) {
224
230
  activities.finish(activityId, { status: "failed", durationMs: Math.max(0, now() - startedAt) });
@@ -334,7 +340,7 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
334
340
  };
335
341
 
336
342
  const plan: AdvisorPlan = {
337
- consult: (parsed, reason, question) => runConsultation(parsed, reason, question),
343
+ consult: (parsed, reason, question, abortSignal) => runConsultation(parsed, reason, question, undefined, abortSignal),
338
344
  // The guard's own failure/limit text goes through the same runtime-owned, marker-neutralized
339
345
  // formatter so no guard path can emit text that looks like a genuine advice wrapper.
340
346
  formatUnavailable: (kind, error) => formatAdvisorUnavailable(kind, error),
@@ -0,0 +1,41 @@
1
+ import type { AdapterEvent, OcxRequestOptions } from "../types";
2
+
3
+ export interface MaxOutputCompletionOptions {
4
+ /** Set only for an explicitly opted-in Responses inbound request. */
5
+ completeOnMaxOutputTokens?: boolean;
6
+ textFormat?: OcxRequestOptions["textFormat"];
7
+ compaction?: boolean;
8
+ }
9
+
10
+ /** Track the original event stream: bridge cleanup must not erase an unfinished operation. */
11
+ export function createMaxOutputCompletion(options?: MaxOutputCompletionOptions) {
12
+ let textOnly = options?.completeOnMaxOutputTokens === true && !options.compaction && !options.textFormat;
13
+ let hasText = false;
14
+ let completed = false;
15
+ return {
16
+ observe(event: AdapterEvent): void {
17
+ switch (event.type) {
18
+ case "text_delta":
19
+ if (event.anthropicThinkingSignature !== undefined) textOnly = false;
20
+ if (event.text.length > 0) hasText = true;
21
+ break;
22
+ case "heartbeat":
23
+ case "assistant_boundary":
24
+ break;
25
+ case "done":
26
+ case "incomplete": {
27
+ const reason = event.type === "done" ? event.stopReason : event.reason;
28
+ completed = textOnly && hasText && event.endTurn !== false
29
+ && (event.type !== "done" || event.compactionEncryptedContent === undefined)
30
+ && (reason === "max_tokens" || reason === "length" || reason === "max_output_tokens");
31
+ break;
32
+ }
33
+ default:
34
+ // All non-text output and unknown future operations are excluded, even if hidden or closed.
35
+ textOnly = false;
36
+ completed = false;
37
+ }
38
+ },
39
+ get completed(): boolean { return completed; },
40
+ };
41
+ }
@@ -45,6 +45,7 @@ import {
45
45
  import { adapterFailureFromEvent, emptyChunks, joinChunks, responsesUsage, toolCallArgumentsUsable, uuid, webSearchAction, webSearchCellItemId } from "./internal";
46
46
  import type { OutputItem, StringChunks } from "./internal";
47
47
  import { bridgeToResponsesSSE } from "./sse";
48
+ import { createMaxOutputCompletion, type MaxOutputCompletionOptions } from "./max-output-completion";
48
49
 
49
50
  /** Build a buffered Responses result within a caller-owned or temporary translator budget. */
50
51
  export function buildResponseJSON(
@@ -84,7 +85,7 @@ export function buildResponseJSON(
84
85
  function buildResponseJSONWithBudget(
85
86
  events: AdapterEvent[],
86
87
  modelId: string,
87
- options?: {
88
+ options?: MaxOutputCompletionOptions & {
88
89
  hideThinkingSummary?: boolean;
89
90
  /** Internal Chat delivery override for raw reasoning only; summaries keep their policy. */
90
91
  chatRawReasoningVisible?: boolean;
@@ -202,6 +203,7 @@ function buildResponseJSONWithBudget(
202
203
  // which is only true for a `done` without a stop reason. A buffered turn whose adapter simply
203
204
  // stopped emitting has no terminal at all, and must not be reported as a success.
204
205
  let sawTerminal = false;
206
+ const maxOutputCompletion = createMaxOutputCompletion(options);
205
207
  let batchCompaction = emptyChunks();
206
208
  let compactionEncryptedContent: string | undefined;
207
209
 
@@ -371,6 +373,7 @@ function buildResponseJSONWithBudget(
371
373
  };
372
374
 
373
375
  for (const e of events) {
376
+ maxOutputCompletion.observe(e);
374
377
  if (errorEvent) {
375
378
  // Match streaming: once the turn fails, later parallel calls must not become executable
376
379
  // completed output. Still release every retained event in order and preserve terminal usage.
@@ -570,6 +573,7 @@ function buildResponseJSONWithBudget(
570
573
  break;
571
574
  case "incomplete":
572
575
  incompleteEvent = e;
576
+ usage = e.usage ?? usage;
573
577
  sawTerminal = true;
574
578
  endTurn = e.endTurn;
575
579
  if (e.providerState) options?.onProviderState?.(e.providerState);
@@ -640,9 +644,10 @@ function buildResponseJSONWithBudget(
640
644
  }
641
645
 
642
646
  const failure = errorEvent ? adapterFailureFromEvent(errorEvent) : undefined;
647
+ const gracefulComplete = maxOutputCompletion.completed && !errorEvent;
643
648
  const status = errorEvent
644
649
  ? "failed"
645
- : incompleteEvent || stopReason === "max_tokens" || stopReason === "content_filter"
650
+ : !gracefulComplete && (incompleteEvent || stopReason === "max_tokens" || stopReason === "content_filter")
646
651
  ? "incomplete"
647
652
  : sawTerminal
648
653
  ? "completed"
@@ -662,13 +667,13 @@ function buildResponseJSONWithBudget(
662
667
  ...(failure && isCyberPolicyCode(failure.error.code)
663
668
  ? { retryable: false }
664
669
  : errorEvent?.retryable !== undefined ? { retryable: errorEvent.retryable } : {}),
665
- ...(incompleteEvent ? {
670
+ ...(!gracefulComplete && incompleteEvent ? {
666
671
  incomplete_details: {
667
672
  reason: truncationReasonFor(incompleteEvent.reason) ?? incompleteEvent.reason,
668
673
  ...(incompleteEvent.message ? { message: incompleteEvent.message } : {}),
669
674
  ...(incompleteEvent.retryable !== undefined ? { retryable: incompleteEvent.retryable } : {}),
670
675
  },
671
- } : stopReason === "max_tokens" ? {
676
+ } : !gracefulComplete && stopReason === "max_tokens" ? {
672
677
  incomplete_details: { reason: "max_output_tokens" },
673
678
  } : stopReason === "content_filter" ? {
674
679
  incomplete_details: { reason: "content_filter" },
package/src/bridge/sse.ts CHANGED
@@ -53,6 +53,7 @@ import {
53
53
  import { adapterFailureFromEvent, emptyChunks, joinChunks, ownedBudgetAbandonedMs, responsesUsage, toolCallArgumentsCouldBeJson, toolCallArgumentsUsable, uuid, webSearchAction, webSearchCellItemId } from "./internal";
54
54
  import type { OutputItem, StringChunks } from "./internal";
55
55
  import { terminalRefusalFailure } from "./terminal-refusal";
56
+ import { createMaxOutputCompletion, type MaxOutputCompletionOptions } from "./max-output-completion";
56
57
 
57
58
  function sseEvent(name: string, data: Record<string, unknown>): string {
58
59
  return `event: ${name}\ndata: ${JSON.stringify(data)}\n\n`;
@@ -73,7 +74,7 @@ export function bridgeToResponsesSSE(
73
74
  toolSearchToolNames?: Set<string>,
74
75
  onCancel?: () => void,
75
76
  heartbeatMs = 2_000,
76
- options?: {
77
+ options?: MaxOutputCompletionOptions & {
77
78
  responseId?: string;
78
79
  /** Trusted structural grouping only; never provider state or execution authority. */
79
80
  outputItemIds?: { next(kind: "message" | "reasoning" | "function_call" | "custom_tool_call" | "tool_search_call"): string };
@@ -165,6 +166,7 @@ export function bridgeToResponsesSSE(
165
166
  },
166
167
  ): ReadableStream<Uint8Array> {
167
168
  const replayCacheScope = options?.replayCacheScope;
169
+ const maxOutputCompletion = createMaxOutputCompletion(options);
168
170
  const outputItemId = (kind: "message" | "reasoning" | "function_call" | "custom_tool_call" | "tool_search_call", prefix: string): string =>
169
171
  options?.outputItemIds?.next(kind) ?? `${prefix}_${uuid()}`;
170
172
 
@@ -852,6 +854,7 @@ export function bridgeToResponsesSSE(
852
854
  }
853
855
  if (next.done) { upstreamDone = true; break; }
854
856
  const event = next.value;
857
+ maxOutputCompletion.observe(event);
855
858
  let terminalEvent = false;
856
859
  // Invisible adapter heartbeats (and buffered web-search progress) count as upstream
857
860
  // liveness only — they must not suppress wire keepalives that re-arm Codex idle timers.
@@ -1293,7 +1296,7 @@ export function bridgeToResponsesSSE(
1293
1296
  // Suppression and terminal status must agree: withholding the compaction item while
1294
1297
  // still reporting success hands codex-rs a completed response with zero compaction
1295
1298
  // items, which it treats as fatal.
1296
- if (truncationReasonFor(event.stopReason)) {
1299
+ if (truncationReasonFor(event.stopReason) && !maxOutputCompletion.completed) {
1297
1300
  // Upstream stopped before a normal completion. Surface as incomplete so the
1298
1301
  // client can distinguish a truncated/filtered turn from a finished one.
1299
1302
  // #1926 gap 2: bound the window in which a handed-out thought signature is
@@ -1337,6 +1340,14 @@ export function bridgeToResponsesSSE(
1337
1340
  flushHiddenReasoningEnvelope();
1338
1341
  options?.onUsage?.(event.usage);
1339
1342
  await awaitThoughtSignatureDurability();
1343
+ if (maxOutputCompletion.completed) {
1344
+ const response = { ...responseSnapshot("completed", finishedItems, event.endTurn), usage: responsesUsage(event.usage) };
1345
+ options?.onCompletedResponse?.(response, event.providerState);
1346
+ emit("response.completed", { response });
1347
+ reportTerminal("completed");
1348
+ terminalEvent = true;
1349
+ break;
1350
+ }
1340
1351
  const refusal = options?.terminalRefusalAsFailed ? terminalRefusalFailure(event) : undefined;
1341
1352
  if (refusal) {
1342
1353
  emit("response.failed", {
@@ -28,6 +28,11 @@ export function bundleTrustStat(path: string): ReturnType<BundleTrustDeps["stat"
28
28
 
29
29
  type FilesystemTrustDeps = Omit<BundleTrustDeps, "codesign">;
30
30
 
31
+ /** The inline bundle root is code: protect its file and directory entry like the bundle. */
32
+ export function untrustedLauncherFilesystemReason(path: string, deps: FilesystemTrustDeps, existing = true): string | null {
33
+ return (existing ? ownedSafely(deps, path, "file") : null) ?? untrustedAncestorReason(path, deps);
34
+ }
35
+
31
36
  function ownedSafely(deps: FilesystemTrustDeps, path: string, kind: "file" | "directory"): string | null {
32
37
  const s = deps.stat(path);
33
38
  if (!s) return "is missing";
@@ -3,6 +3,8 @@ import { randomBytes } from "node:crypto";
3
3
  import { join, posix } from "node:path";
4
4
  import { getConfigDir } from "../../config/paths";
5
5
  import { selfLaunchArgv } from "../../lib/self-launch-argv";
6
+ import { defaultBundleTrustDeps } from "./bundle-trust";
7
+ import { untrustedLauncherFilesystemReason, type BundleTrustDeps } from "./bundle-trust-policy";
6
8
 
7
9
  export const CHATGPT_APP_CODEX_BINARY = "/Applications/ChatGPT.app/Contents/Resources/codex-cli/CodexCLI.app/Contents/MacOS/codex";
8
10
 
@@ -47,24 +49,41 @@ function shellQuote(value: string): string {
47
49
  }
48
50
 
49
51
  /**
50
- * A failed precondition or a failed self-test runs the original binary with untouched stdout.
52
+ * A failed filter self-test runs the verified binary with untouched stdout.
53
+ * Executable verification is required on every invocation, including passthrough and respawns.
51
54
  * A filter that passes the self-test and then dies mid-session closes the pipe.
52
55
  * Expected (not yet validated against the bundled app-server): the server gets SIGPIPE or a
53
56
  * write error and Desktop respawns it through the same launcher.
54
57
  */
55
- export function buildChatgptShimLauncher(argv: readonly string[], real = CHATGPT_APP_CODEX_BINARY): string {
58
+ export function buildChatgptShimLauncher(
59
+ argv: readonly string[],
60
+ real = CHATGPT_APP_CODEX_BINARY,
61
+ validator: readonly string[] = [process.execPath, ...selfLaunchArgv(["internal", "codex-exec-target"])],
62
+ bundleRoot = /^(.*?\.app)\/Contents\//i.exec(real)?.[1],
63
+ ): string {
56
64
  return `#!/bin/bash
57
65
  # opencodex (experimental): ChatGPT app-server stdout passes through the quota-gate filter.
58
66
  REAL=${shellQuote(real)}
59
- FILTER=(${argv.map(shellQuote).join(" ")})
67
+ ${bundleRoot === undefined ? "" : `BUNDLE_ROOT=${shellQuote(bundleRoot)}\n`}FILTER=(${argv.map(shellQuote).join(" ")})
68
+ VALIDATE=(${validator.map(shellQuote).join(" ")})
60
69
  if [ ! -x "$REAL" ]; then
61
70
  echo "opencodex (experimental): the bundled app-server is no longer at $REAL; run 'ocx chatgpt launch' again or 'ocx chatgpt restore'." >&2
62
71
  exit 127
63
72
  fi
73
+ validate_real() {
74
+ local target
75
+ if [ ! -x "\${VALIDATE[0]}" ] || ! target=$("\${VALIDATE[@]}" ${bundleRoot === undefined ? "" : '--bundle-root "$BUNDLE_ROOT" '}-- "$REAL") || [ -z "$target" ]; then
76
+ echo "opencodex: app-server execution verification failed; run 'ocx chatgpt launch' again or 'ocx chatgpt restore'." >&2
77
+ return 126
78
+ fi
79
+ REAL="$target"
80
+ }
64
81
  if [ "$(uname -s)" = "Darwin" ] && [ -x "\${FILTER[0]}" ] \\
65
82
  && "\${FILTER[@]}" --self-test >/dev/null 2>&1; then
83
+ validate_real || exit 126
66
84
  exec "$REAL" "$@" > >(exec "\${FILTER[@]}")
67
85
  fi
86
+ validate_real || exit 126
68
87
  exec "$REAL" "$@"
69
88
  `;
70
89
  }
@@ -74,17 +93,32 @@ exec "$REAL" "$@"
74
93
  * launcher, so an existing symbolic link is replaced rather than followed and a respawn during
75
94
  * the write never runs a half-written script.
76
95
  */
77
- export function writeChatgptShimLauncher(configDir = getConfigDir(), real = CHATGPT_APP_CODEX_BINARY): string {
96
+ export function writeChatgptShimLauncher(
97
+ configDir = getConfigDir(), real = CHATGPT_APP_CODEX_BINARY,
98
+ bundleRoot = /^(.*?\.app)\/Contents\//i.exec(real)?.[1],
99
+ filesystem: Pick<BundleTrustDeps, "uid" | "stat" | "adminGroupId"> | undefined = process.platform === "darwin" ? defaultBundleTrustDeps() : undefined,
100
+ ): string {
101
+ if (!bundleRoot || !posix.isAbsolute(bundleRoot) || !real.startsWith(bundleRoot + "/Contents/")) {
102
+ throw new Error("the app-server launcher requires its discovered bundle root");
103
+ }
78
104
  mkdirSync(configDir, { recursive: true });
79
105
  const path = chatgptShimLauncherPath(configDir);
80
106
  const argv = [process.execPath, ...selfLaunchArgv(["internal", "chatgpt-app-server-filter"])];
81
107
  const temp = `${path}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`;
108
+ let created = false;
109
+ const assertFilesystem = (file: string, existing: boolean) => {
110
+ const reason = filesystem && untrustedLauncherFilesystemReason(file, filesystem, existing);
111
+ if (reason) throw new Error(`unsafe app-server launcher: ${reason}`);
112
+ };
82
113
  try {
83
- writeFileSync(temp, buildChatgptShimLauncher(argv, real), { mode: 0o755, flag: "wx" });
114
+ assertFilesystem(temp, false);
115
+ writeFileSync(temp, buildChatgptShimLauncher(argv, real, undefined, bundleRoot), { mode: 0o755, flag: "wx" });
116
+ created = true;
84
117
  chmodSync(temp, 0o755);
118
+ assertFilesystem(temp, true);
85
119
  renameSync(temp, path);
86
120
  } catch (error) {
87
- try { unlinkSync(temp); } catch { /* the temp file was never created */ }
121
+ if (created) { try { unlinkSync(temp); } catch { /* preserve the publication error */ } }
88
122
  throw error;
89
123
  }
90
124
  return path;
@@ -100,7 +100,11 @@ function detectFeatures(body: unknown, anthropicBeta?: string): Set<ClaudeFeatur
100
100
  if (Object.hasOwn(tool, "cache_control")) codes.add("cache_control");
101
101
  if (Object.hasOwn(tool, "input_examples")) codes.add("input_examples");
102
102
  if (tool.strict === true) codes.add("strict_tools");
103
- if (tool.defer === true || tool.defer_loading === true) codes.add("deferred_tools");
103
+ // Valid function definitions lower to eager tools when the destination lacks deferral.
104
+ // Top-level deferral and declarations without a callable definition remain unsupported.
105
+ const eagerFunction = typeof tool.name === "string" && tool.name.length > 0 && isRec(tool.input_schema)
106
+ && (tool.type === undefined || tool.type === "function" || tool.type === "custom");
107
+ if (tool.defer === true || (tool.defer_loading === true && !eagerFunction)) codes.add("deferred_tools");
104
108
  if (nonDirectCaller(tool.allowed_callers)) codes.add("caller_mode");
105
109
  const type = tool.type;
106
110
  // Ordinary client function names do not convey hosted execution semantics.
@@ -27,6 +27,7 @@ import {
27
27
  import { nativeOpenAiContextWindow, type NativeContextLimitsInput } from "../codex/catalog";
28
28
  import { localAdmissionToken, localInferenceDestination } from "../lib/local-destinations";
29
29
  import { assertDesktop3pModelsValid } from "./desktop-3p-guard";
30
+ import { filterDesktopModelsByVisibility, readDesktopModelVisibility, type DesktopModelVisibility } from "./desktop-model-visibility";
30
31
  import { claudeSurfaceSupportsOneMillion, ONE_MILLION } from "./long-context";
31
32
 
32
33
  export interface Desktop3pModelEntry {
@@ -170,9 +171,11 @@ function collectDesktop3pModels(
170
171
  routedModels: Array<Desktop3pRoutedModel>,
171
172
  profile?: OcxClaudeDesktopProfile,
172
173
  nativeContextCap?: NativeContextLimitsInput,
173
- ): { models: Desktop3pModelEntry[]; registry: Map<string, string>; realAnthropicIds: Set<string> } {
174
+ ): { models: Desktop3pModelEntry[]; routes: string[]; registry: Map<string, string>; realAnthropicIds: Set<string> } {
174
175
  const registry = new Map<string, string>();
175
176
  const models: Desktop3pModelEntry[] = [];
177
+ // routes[i] is the route models[i] serves; visibility filters by route, never by alias.
178
+ const routes: string[] = [];
176
179
  const candidates: Desktop3pRoutedModel[] = [
177
180
  // Native candidates carry their real context window from the same accessor the
178
181
  // Desktop DTO uses, so a native 1M/372k model resolves identically in the written
@@ -224,6 +227,7 @@ function collectDesktop3pModels(
224
227
  ...(model.isFamilyDefault ? { isFamilyDefault: true } : {}),
225
228
  ...(model.supports1m ? { supports1m: true, prefer1m: true } : {}),
226
229
  });
230
+ routes.push(model.route);
227
231
  }
228
232
  // Previous profile IDs and both hash generations are compatibility-only and can
229
233
  // collide. Bind them in stable route order so changing a family default or
@@ -248,7 +252,7 @@ function collectDesktop3pModels(
248
252
  }
249
253
  }
250
254
  desktop3pAliasesByRoute = aliasesByRoute;
251
- return { models, registry, realAnthropicIds };
255
+ return { models, routes, registry, realAnthropicIds };
252
256
  }
253
257
 
254
258
  const aliasesByRoute = new Map<string, string>();
@@ -272,6 +276,7 @@ function collectDesktop3pModels(
272
276
  ...(supports1m.supports1m ? { prefer1m: true as const } : {}),
273
277
  });
274
278
  emittedNames.add(alias);
279
+ routes.push(route);
275
280
  aliasesByRoute.set(route, alias);
276
281
  continue;
277
282
  }
@@ -300,12 +305,13 @@ function collectDesktop3pModels(
300
305
  ...supports1m,
301
306
  ...(supports1m.supports1m ? { prefer1m: true as const } : {}),
302
307
  });
308
+ routes.push(route);
303
309
  aliasesByRoute.set(route, alias);
304
310
  }
305
311
 
306
312
  if (models[0]) models[0].isFamilyDefault = true;
307
313
  desktop3pAliasesByRoute = aliasesByRoute;
308
- return { models, registry, realAnthropicIds };
314
+ return { models, routes, registry, realAnthropicIds };
309
315
  }
310
316
 
311
317
  /** Build and install the registry used to decode Desktop aliases. */
@@ -328,6 +334,11 @@ export interface Desktop3pModelOptions {
328
334
  * (`supports1m`) but no longer defaults to it (`prefer1m` dropped).
329
335
  */
330
336
  preferOneMillion?: boolean;
337
+ /**
338
+ * Rows Desktop lists (#7702). Filters only the emitted list: the decode registry keeps every
339
+ * route so a running session holding a just-hidden alias still routes.
340
+ */
341
+ visibility?: DesktopModelVisibility;
331
342
  }
332
343
 
333
344
  export function generateDesktop3pModels(
@@ -337,15 +348,25 @@ export function generateDesktop3pModels(
337
348
  nativeContextCap?: NativeContextLimitsInput,
338
349
  options: Desktop3pModelOptions = {},
339
350
  ): Desktop3pModelEntry[] {
340
- const { models, registry, realAnthropicIds } = collectDesktop3pModels(nativeSlugs, routedModels, profile, nativeContextCap);
351
+ const { models: all, routes, registry, realAnthropicIds } = collectDesktop3pModels(nativeSlugs, routedModels, profile, nativeContextCap);
341
352
  desktop3pRegistry = registry;
342
353
  desktop3pRealAnthropicIds = realAnthropicIds;
354
+ let models = filterDesktopModelsByVisibility(all, routes, options.visibility);
355
+ if (models.length === 0 && all.length > 0) {
356
+ // An empty static list leaves Desktop with no usable picker. The dashboard refuses to save
357
+ // such a selection; this covers selections whose every model has since disappeared.
358
+ console.warn("[opencodex] Claude Desktop model visibility hides every available model; listing all models instead");
359
+ models = all;
360
+ }
343
361
  return options.preferOneMillion === false ? models.map(({ prefer1m: _prefer1m, ...model }) => model) : models;
344
362
  }
345
363
 
346
364
  /** The Desktop model options a config asks for (one place, so writer and export agree). */
347
- export function desktop3pModelOptions(claudeCode: { contextAccounting?: string } | undefined): Desktop3pModelOptions {
348
- return { preferOneMillion: claudeCode?.contextAccounting !== "200k" };
365
+ export function desktop3pModelOptions(
366
+ claudeCode: { contextAccounting?: string; desktopModelVisibility?: unknown } | undefined,
367
+ ): Desktop3pModelOptions {
368
+ const visibility = readDesktopModelVisibility(claudeCode);
369
+ return { preferOneMillion: claudeCode?.contextAccounting !== "200k", ...(visibility ? { visibility } : {}) };
349
370
  }
350
371
 
351
372
  /** Resolve an alias using the most recently generated Desktop model registry. */