@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Part B of the checked Windows service stop (#7771, 030 "Part B"), run by the caller
|
|
3
|
+
* after its graceful child stop: the port is free and stays free for one relaunch period,
|
|
4
|
+
* no wrapper of this home is running, and a remaining listener is classified.
|
|
5
|
+
*
|
|
6
|
+
* 1. Sample the port until it has been free for the 6 s hold, measured between sample
|
|
7
|
+
* starts, within the window from windowsPartBWindowMs (6-12 s, starting now). A loop that
|
|
8
|
+
* relaunches the proxy late breaks the streak.
|
|
9
|
+
* 2. Then, under one 5 s cap, run the final enumeration and, if the port is still held,
|
|
10
|
+
* identify its listener. The enumeration must show no wrapper-image process carrying
|
|
11
|
+
* this home's path token; an unreadable table is non-success, and a wrapper started
|
|
12
|
+
* after bind makes the stop survived even with the port free.
|
|
13
|
+
* 3. A remaining listener is ours (survived), foreign (portHeldByForeign) or left by an
|
|
14
|
+
* owner that has exited, which is not foreign: the caller's reclaim clears that one.
|
|
15
|
+
*
|
|
16
|
+
* Every effect is injected; nothing calls this yet.
|
|
17
|
+
*/
|
|
18
|
+
import type { WindowsStopProcessEntry } from "./windows-process-evidence";
|
|
19
|
+
import { windowsHomeWrapperPids } from "./windows-stop-binding";
|
|
20
|
+
import { runCapped, windowsStopClock, type WindowsStopClock } from "./windows-checked-stop";
|
|
21
|
+
import { commandLineHasPathToken } from "./windows-command-line-token";
|
|
22
|
+
import { WINDOWS_STOP_CAPS, windowsPartBWindowMs } from "./windows-stop-budget";
|
|
23
|
+
|
|
24
|
+
type MaybePromise<T> = T | Promise<T>;
|
|
25
|
+
|
|
26
|
+
export type WindowsPortSample =
|
|
27
|
+
| { state: "free" }
|
|
28
|
+
| { state: "listening"; ownerPid: number | null }
|
|
29
|
+
| { state: "unknown" };
|
|
30
|
+
|
|
31
|
+
/** ours = this installation's identity answers; exited = the owning process is gone. */
|
|
32
|
+
export type WindowsListenerIdentity = "ours" | "foreign" | "exited" | "unknown";
|
|
33
|
+
|
|
34
|
+
export interface WindowsStopConfirmDeps {
|
|
35
|
+
clock?: WindowsStopClock;
|
|
36
|
+
port: number;
|
|
37
|
+
/** Time left in the caller's deadline when Part B starts. */
|
|
38
|
+
remainingMs: number;
|
|
39
|
+
reserveMs?: number;
|
|
40
|
+
canonicalPaths: readonly string[];
|
|
41
|
+
selfPid?: number;
|
|
42
|
+
samplePort(port: number, timeoutMs: number): MaybePromise<WindowsPortSample>;
|
|
43
|
+
identifyListener(port: number, ownerPid: number | null, timeoutMs: number): MaybePromise<WindowsListenerIdentity>;
|
|
44
|
+
enumerate(timeoutMs: number): MaybePromise<readonly WindowsStopProcessEntry[] | null>;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export type WindowsStopConfirmOutcome = "freed" | "survived" | "port-held-by-foreign" | "unconfirmed" | "unknown";
|
|
48
|
+
|
|
49
|
+
export interface WindowsStopConfirmResult {
|
|
50
|
+
outcome: WindowsStopConfirmOutcome;
|
|
51
|
+
portHeldByForeign: boolean;
|
|
52
|
+
reason: "evidence-unreadable" | null;
|
|
53
|
+
detail: string;
|
|
54
|
+
port: number;
|
|
55
|
+
windowMs: number;
|
|
56
|
+
listener: { ownerPid: number | null; identity: WindowsListenerIdentity } | null;
|
|
57
|
+
/** Wrapper-image processes of this home found by the final enumeration. */
|
|
58
|
+
lateWrappers: number[];
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
const C = WINDOWS_STOP_CAPS;
|
|
62
|
+
const SAMPLE_INTERVAL_MS = 250;
|
|
63
|
+
|
|
64
|
+
export async function confirmWindowsStopFreed(deps: WindowsStopConfirmDeps): Promise<WindowsStopConfirmResult> {
|
|
65
|
+
const clock = deps.clock ?? windowsStopClock;
|
|
66
|
+
const windowMs = windowsPartBWindowMs(deps.remainingMs, deps.reserveMs ?? C.reserve);
|
|
67
|
+
const windowEnd = clock.now() + windowMs;
|
|
68
|
+
const result: WindowsStopConfirmResult = {
|
|
69
|
+
outcome: "unknown", portHeldByForeign: false, reason: null, detail: "",
|
|
70
|
+
port: deps.port, windowMs, listener: null, lateWrappers: [],
|
|
71
|
+
};
|
|
72
|
+
const finish = (outcome: WindowsStopConfirmOutcome, detail: string): WindowsStopConfirmResult => {
|
|
73
|
+
result.outcome = outcome;
|
|
74
|
+
result.portHeldByForeign = outcome === "port-held-by-foreign";
|
|
75
|
+
result.reason = outcome === "unknown" ? "evidence-unreadable" : null;
|
|
76
|
+
result.detail = detail;
|
|
77
|
+
return result;
|
|
78
|
+
};
|
|
79
|
+
|
|
80
|
+
let freeSince: number | null = null;
|
|
81
|
+
let held = false;
|
|
82
|
+
let last: WindowsPortSample = { state: "unknown" };
|
|
83
|
+
for (;;) {
|
|
84
|
+
const startedAt = clock.now();
|
|
85
|
+
const sample = await runCapped(clock, C.partBClosingSample, timeoutMs => deps.samplePort(deps.port, timeoutMs));
|
|
86
|
+
last = sample.ok ? sample.value : { state: "unknown" };
|
|
87
|
+
if (last.state === "free") {
|
|
88
|
+
freeSince ??= startedAt;
|
|
89
|
+
if (startedAt - freeSince >= C.partBHoldFloor) {
|
|
90
|
+
held = true;
|
|
91
|
+
break;
|
|
92
|
+
}
|
|
93
|
+
} else {
|
|
94
|
+
freeSince = null;
|
|
95
|
+
}
|
|
96
|
+
const left = windowEnd - clock.now();
|
|
97
|
+
if (left <= 0) break;
|
|
98
|
+
await clock.sleep(Math.min(SAMPLE_INTERVAL_MS, left));
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
const listening = last.state === "listening" ? last : null;
|
|
102
|
+
const [snapshot, identity] = await Promise.all([
|
|
103
|
+
runCapped(clock, C.partBFinalEnumeration, deps.enumerate),
|
|
104
|
+
listening
|
|
105
|
+
? runCapped(clock, C.partBFinalEnumeration,
|
|
106
|
+
timeoutMs => deps.identifyListener(deps.port, listening.ownerPid, timeoutMs))
|
|
107
|
+
: Promise.resolve(null),
|
|
108
|
+
]);
|
|
109
|
+
if (listening) {
|
|
110
|
+
result.listener = {
|
|
111
|
+
ownerPid: listening.ownerPid,
|
|
112
|
+
identity: identity && identity.ok ? identity.value : "unknown",
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
const processes = snapshot.ok ? snapshot.value : null;
|
|
117
|
+
if (processes) {
|
|
118
|
+
result.lateWrappers = windowsHomeWrapperPids(processes, deps.canonicalPaths, deps.selfPid ?? process.pid);
|
|
119
|
+
}
|
|
120
|
+
if (result.lateWrappers.length > 0) return finish("survived", "a wrapper of this home is running after the stop");
|
|
121
|
+
if (result.listener?.identity === "ours") return finish("survived", "this installation answers on the port again");
|
|
122
|
+
if (processes === null) return finish("unknown", "the final process list could not be read");
|
|
123
|
+
const unnamed = processes.some(entry => entry.name === null && entry.pid !== (deps.selfPid ?? process.pid)
|
|
124
|
+
&& deps.canonicalPaths.some(path => commandLineHasPathToken(entry.commandLine, path)));
|
|
125
|
+
if (unnamed) return finish("unknown", "a process carrying this home's paths has an unreadable image name");
|
|
126
|
+
if (held) return finish("freed", "the port stayed free for the hold and no wrapper of this home is running");
|
|
127
|
+
if (result.listener?.identity === "foreign") return finish("port-held-by-foreign", "another program holds the port");
|
|
128
|
+
if (result.listener?.identity === "exited") {
|
|
129
|
+
return finish("unconfirmed", "the port is held by a listener whose owner has exited");
|
|
130
|
+
}
|
|
131
|
+
if (last.state === "free") return finish("unconfirmed", "the port was not free for the whole hold within the window");
|
|
132
|
+
return finish("unknown", "the port state could not be read");
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* Which port Part B watches: the runtime-port record when present, else the port baked
|
|
137
|
+
* into the wrapper script, else the configured port.
|
|
138
|
+
*/
|
|
139
|
+
export function resolveWindowsStopPort(sources: {
|
|
140
|
+
runtimePort: () => number | null;
|
|
141
|
+
wrapperPort: () => number | null;
|
|
142
|
+
configuredPort: () => number;
|
|
143
|
+
}): { port: number; source: "runtime" | "wrapper" | "config" } {
|
|
144
|
+
const valid = (value: number | null): value is number =>
|
|
145
|
+
value !== null && Number.isSafeInteger(value) && value > 0 && value <= 65_535;
|
|
146
|
+
const read = (get: () => number | null): number | null => {
|
|
147
|
+
try {
|
|
148
|
+
return get();
|
|
149
|
+
} catch {
|
|
150
|
+
return null;
|
|
151
|
+
}
|
|
152
|
+
};
|
|
153
|
+
const runtime = read(sources.runtimePort);
|
|
154
|
+
if (valid(runtime)) return { port: runtime, source: "runtime" };
|
|
155
|
+
const wrapper = read(sources.wrapperPort);
|
|
156
|
+
if (valid(wrapper)) return { port: wrapper, source: "wrapper" };
|
|
157
|
+
return { port: sources.configuredPort(), source: "config" };
|
|
158
|
+
}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The checked Windows stop's deadline (#7771, 030 "Time budget"). Kept free of the stop
|
|
3
|
+
* machinery because the CLI dispatcher, which loads on every command, records it.
|
|
4
|
+
*
|
|
5
|
+
* ocx stop reads --deadline-ms <n> or OCX_STOP_DEADLINE_MS (the flag wins; an empty or
|
|
6
|
+
* invalid variable counts as absent) and records the resolved budget as a command-start
|
|
7
|
+
* deadline: performance.now() counts from performance.timeOrigin, so N ms of budget at
|
|
8
|
+
* command start is the Part A clock value N. Every other caller starts the default 60 s
|
|
9
|
+
* when its stop phase begins, not when the process did -- installFreshWindowsSchedulerSafely
|
|
10
|
+
* reaches the stop only after registration and the UAC prompt, so measuring from process
|
|
11
|
+
* start would refuse `unverified-budget` a stop that had its whole budget left.
|
|
12
|
+
*/
|
|
13
|
+
import { DEFAULT_WINDOWS_STOP_DEADLINE_MS } from "./windows-stop-budget";
|
|
14
|
+
|
|
15
|
+
export const STOP_DEADLINE_ENV = "OCX_STOP_DEADLINE_MS";
|
|
16
|
+
|
|
17
|
+
/** A positive decimal integer of milliseconds, or null (absent, empty or invalid). */
|
|
18
|
+
export function parseStopDeadlineMs(raw: string | undefined | null): number | null {
|
|
19
|
+
if (raw === undefined || raw === null) return null;
|
|
20
|
+
const trimmed = raw.trim();
|
|
21
|
+
if (!/^\d+$/.test(trimmed)) return null;
|
|
22
|
+
const value = Number(trimmed);
|
|
23
|
+
return Number.isSafeInteger(value) && value > 0 ? value : null;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/** The flag wins; an empty or invalid variable is absent; neither means 60 s. */
|
|
27
|
+
export function resolveStopDeadlineMs(flagMs: number | null | undefined, env: NodeJS.ProcessEnv = process.env): number {
|
|
28
|
+
if (typeof flagMs === "number" && Number.isSafeInteger(flagMs) && flagMs > 0) return flagMs;
|
|
29
|
+
return parseStopDeadlineMs(env[STOP_DEADLINE_ENV]) ?? DEFAULT_WINDOWS_STOP_DEADLINE_MS;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/** ocx stop's command-start deadline, or null while no command recorded one. */
|
|
33
|
+
let commandDeadlineMs: number | null = null;
|
|
34
|
+
/** The unconfigured caller's deadline, armed once when its stop phase first asks. */
|
|
35
|
+
let phaseDeadlineAt: number | null = null;
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* ocx stop records its resolved deadline here once its arguments are parsed. A new value
|
|
39
|
+
* is an absolute command-start deadline; null clears it and re-arms the stop phase, so the
|
|
40
|
+
* next unconfigured caller measures its own 60 s from when it gets there.
|
|
41
|
+
*/
|
|
42
|
+
export function setStopDeadlineMs(ms: number | null): void {
|
|
43
|
+
commandDeadlineMs = ms;
|
|
44
|
+
phaseDeadlineAt = null;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* The absolute deadline on the Part A clock (ms since process start). An explicit command
|
|
49
|
+
* deadline wins; otherwise the first call in a stop phase arms the default 60 s and every
|
|
50
|
+
* later call inside that phase keeps it -- one deadline governs the whole stop.
|
|
51
|
+
*/
|
|
52
|
+
export function windowsStopDeadlineAt(now: number = performance.now()): number {
|
|
53
|
+
if (commandDeadlineMs !== null) return commandDeadlineMs;
|
|
54
|
+
if (phaseDeadlineAt === null) phaseDeadlineAt = now + DEFAULT_WINDOWS_STOP_DEADLINE_MS;
|
|
55
|
+
return phaseDeadlineAt;
|
|
56
|
+
}
|
package/src/service.ts
CHANGED
|
@@ -25,13 +25,13 @@ export { decodeSchtasksOutput, setQuerySchtasksForTests, formatWindowsSchedulerS
|
|
|
25
25
|
export type { WindowsSchedulerXmlState } from "./service/windows-taskxml";
|
|
26
26
|
export { buildWindowsServiceScript, buildWindowsSchtasksCreateArgs, buildWindowsSchtasksCreateArgsForXml, buildWindowsLauncherVbs, buildWindowsTaskXml, buildWindowsTaskXmlDocument, windowsTaskRegistrationOwnedByAttempt, windowsTaskRegistrationHealthy, readWindowsSchedulerXmlState } from "./service/windows-taskxml";
|
|
27
27
|
export type { WindowsSchedulerRegistrationStageDeps, FreshWindowsSchedulerRegistrationDeps, RemoveNativeWindowsServiceDeps } from "./service/windows-ops";
|
|
28
|
-
export { windowsListenPort, winswListenPort, writeServiceDefinitionFile, definitionCarriesCredential, stageWindowsSchedulerRegistrationXml, stageElevatedSchedulerRegistration, describeElevatedRegistrationFailure, registerFreshWindowsSchedulerTask, removeNativeWindowsServiceForScheduler, assertWindowsNativeServiceAccountSupported, isWindowsSchedulerEndBenign, stopWindows
|
|
28
|
+
export { windowsListenPort, winswListenPort, writeServiceDefinitionFile, definitionCarriesCredential, stageWindowsSchedulerRegistrationXml, stageElevatedSchedulerRegistration, describeElevatedRegistrationFailure, registerFreshWindowsSchedulerTask, removeNativeWindowsServiceForScheduler, assertWindowsNativeServiceAccountSupported, isWindowsSchedulerEndBenign, stopWindows } from "./service/windows-ops";
|
|
29
29
|
export type { ServiceRepairVerb, RepairServiceDeps } from "./service/repair";
|
|
30
30
|
export { repairService, foreignServiceOwnerRefusal, unknownServiceOwnerRefusal } from "./service/repair";
|
|
31
31
|
export type { ServiceChildOwnershipDecision } from "./service/service-child-ownership";
|
|
32
32
|
export { serviceChildOwnershipDecision, serviceChildStayOutExitCode } from "./service/service-child-ownership";
|
|
33
33
|
export type { ServiceInstallPreparationDeps, FreshWindowsSchedulerInstallDeps, ServiceStopOutcome, ServiceUninstallOutcome } from "./service/orchestration";
|
|
34
|
-
export { proxyStillLiveAfterStop, prepareServiceInstall, installServiceSafely, installFreshWindowsSchedulerSafely, installedServiceRespawnRisk, stopServiceIfInstalledDetailed, setUninstallServiceHooksForTests, uninstallServiceDetailed, uninstallServiceIfInstalled, isServiceInstalled, isServiceViable } from "./service/orchestration";
|
|
34
|
+
export { proxyStillLiveAfterStop, prepareServiceInstall, installServiceSafely, installFreshWindowsSchedulerSafely, installedServiceRespawnRisk, stopServiceIfInstalledDetailed, stopServiceIfInstalledReport, setUninstallServiceHooksForTests, uninstallServiceDetailed, uninstallServiceIfInstalled, isServiceInstalled, isServiceViable } from "./service/orchestration";
|
|
35
35
|
export type { ServiceDiagnostic, WindowsTaskDiagnosticIdentityDeps, WindowsServiceDiagnosticInputs, LaunchdServiceDiagnosticInputs } from "./service/diagnostics";
|
|
36
36
|
export { bakedServicePathsDiagnostic, serviceStartableFromTray, resolveWindowsTaskDiagnosticUserId, deriveWindowsServiceDiagnostic, deriveWindowsServiceDiagnosticForCurrentUser, deriveLaunchdServiceDiagnostic, diagnoseService, serviceStatusSummary, serviceStatusReport } from "./service/diagnostics";
|
|
37
37
|
export type { ParsedServiceArgs, ServiceInstallationState, ServiceInstallationProbe, ServiceInstallationProbeHooks, ServiceCommandPlan } from "./service/cli";
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tool-loading settings of the Claude Code inbound (`claudeCode.*`). `OcxClaudeCodeConfig` in
|
|
3
|
+
* ./config extends this interface, so every reader still sees one `claudeCode` block; the fields
|
|
4
|
+
* live here because they share one contract (data-planes/claude-tool-loading.md).
|
|
5
|
+
*/
|
|
6
|
+
export interface OcxClaudeCodeToolLoadingConfig {
|
|
7
|
+
/**
|
|
8
|
+
* Opt-in resolved provider/model routes verified to accept Responses additional_tools.
|
|
9
|
+
* A single trailing '*' matches a provider-qualified prefix (for example 'gateway/gpt-*').
|
|
10
|
+
* Replays successful client ToolSearch discoveries in place without growing the initial
|
|
11
|
+
* catalog. Requires metadata.user_id. Absent/empty is off; native passthrough is unchanged.
|
|
12
|
+
* Applies only after routing settles on a direct openai-responses route; combos and policies are skipped.
|
|
13
|
+
*/
|
|
14
|
+
appendOnlyToolLoadingModels?: string[];
|
|
15
|
+
/**
|
|
16
|
+
* Opt-in direct openai-chat routes (same selector syntax, validation and skips): the catalog
|
|
17
|
+
* carries one stable `use_loaded_tool` dispatcher across ToolSearch loads, loaded definitions
|
|
18
|
+
* ride the ToolSearch result as text, and dispatcher calls are rewritten to the named tool
|
|
19
|
+
* before the client sees them. Absent/empty is off and byte-identical to an unset key.
|
|
20
|
+
*/
|
|
21
|
+
chatToolDispatchModels?: string[];
|
|
22
|
+
/**
|
|
23
|
+
* Opt-in ENABLE_TOOL_SEARCH injection for launched Claude Code sessions (#4838).
|
|
24
|
+
*
|
|
25
|
+
* Claude Code v2.1.304+ turns tool search on by default behind an
|
|
26
|
+
* ANTHROPIC_BASE_URL gateway; earlier versions keep it off there unless
|
|
27
|
+
* ENABLE_TOOL_SEARCH is true / auto / auto:N (#7963). Unset leaves the client's
|
|
28
|
+
* default; `false` injects nothing either, so a user who wants upfront loading
|
|
29
|
+
* exports ENABLE_TOOL_SEARCH=false themselves.
|
|
30
|
+
*
|
|
31
|
+
* Default OFF. Native Anthropic passthrough retains server-side search; the
|
|
32
|
+
* ordinary translated route drops the typed search tool and sends function schemas
|
|
33
|
+
* eagerly. appendOnlyToolLoadingModels (verified final Responses destinations) and
|
|
34
|
+
* chatToolDispatchModels (verified direct Chat routes) are separate opt-ins for an
|
|
35
|
+
* eager client-executed ToolSearch function: they keep currently declared deferred
|
|
36
|
+
* definitions out of the initial catalog and project them at successful discovery
|
|
37
|
+
* results. This launcher switch alone enables neither projection nor server-side search.
|
|
38
|
+
* Compatibility-enforcement admission remains unchanged and can reject unsupported
|
|
39
|
+
* tool_search/tool_reference/deferred_tools requests; no native-search parity or
|
|
40
|
+
* cache-hit guarantee is implied.
|
|
41
|
+
*
|
|
42
|
+
* `true` injects "true"; a string is passed through verbatim so Claude Code's own
|
|
43
|
+
* vocabulary (`auto`, `auto:N`, `force`) stays reachable. `false` and absent
|
|
44
|
+
* inject nothing — they do not force the variable off, because a value the
|
|
45
|
+
* operator exported themselves always wins.
|
|
46
|
+
*/
|
|
47
|
+
toolSearch?: boolean | string;
|
|
48
|
+
}
|
package/src/types/config.ts
CHANGED
|
@@ -3,9 +3,13 @@ import type { CodexAccount } from "./accounts";
|
|
|
3
3
|
import type { AnthropicAccountPoolConfig, OcxAccountPoolRotationStrategy } from "./anthropic-account-pool";
|
|
4
4
|
import type { AnthropicInstanceId } from "../providers/anthropic-instance-id";
|
|
5
5
|
import type { OcxFallbackConfig } from "./fallback";
|
|
6
|
+
import type { MultiAgentMode } from "./multi-agent";
|
|
6
7
|
import type { OcxTelemetryConfig } from "./telemetry";
|
|
8
|
+
import type { OcxClaudeCodeToolLoadingConfig } from "./claude-tool-loading";
|
|
9
|
+
import type { OcxLinkHomeConfig, OcxLinkTransportConfig } from "./link";
|
|
7
10
|
export type { AnthropicAccountPoolConfig, AnthropicModelRoute, OcxAccountPoolRotationStrategy, OcxAccountPoolQuotaWindow } from "./anthropic-account-pool";
|
|
8
11
|
export type { OcxFallbackConfig, OcxFallbackDeviceConfig, OcxFallbackKind, OcxFallbackSwitches } from "./fallback";
|
|
12
|
+
export type { OcxClaudeCodeToolLoadingConfig } from "./claude-tool-loading";
|
|
9
13
|
|
|
10
14
|
/** Public inference API exposure. Responses and Chat Completions are always served. */
|
|
11
15
|
export interface OcxApiSurfacesConfig {
|
|
@@ -45,9 +49,10 @@ export interface OcxProtocolsConfig {
|
|
|
45
49
|
|
|
46
50
|
/**
|
|
47
51
|
* Claude Code inbound settings (devlog/260711_claude_inbound). Consumed by the
|
|
48
|
-
* /v1/messages surface, the `ocx claude` launcher, and the GUI Claude page.
|
|
52
|
+
* /v1/messages surface, the `ocx claude` launcher, and the GUI Claude page. Tool-loading
|
|
53
|
+
* fields (toolSearch and the two tool-loading opt-ins) live in ./claude-tool-loading.
|
|
49
54
|
*/
|
|
50
|
-
export interface OcxClaudeCodeConfig {
|
|
55
|
+
export interface OcxClaudeCodeConfig extends OcxClaudeCodeToolLoadingConfig {
|
|
51
56
|
/** Route the standalone Claude Code CLI through the first-party intercept (settings.json env).
|
|
52
57
|
* Independent of Desktop's first-party mode. Absent/false = off. */
|
|
53
58
|
cliFirstParty?: boolean;
|
|
@@ -57,14 +62,6 @@ export interface OcxClaudeCodeConfig {
|
|
|
57
62
|
* Default: false; only literal true enables it. Native passthrough is unchanged.
|
|
58
63
|
*/
|
|
59
64
|
stabilizePromptCache?: boolean;
|
|
60
|
-
/**
|
|
61
|
-
* Opt-in resolved provider/model routes verified to accept Responses additional_tools.
|
|
62
|
-
* A single trailing '*' matches a provider-qualified prefix (for example 'gateway/gpt-*').
|
|
63
|
-
* Replays successful client ToolSearch discoveries in place without growing the initial
|
|
64
|
-
* catalog. Requires metadata.user_id. Absent/empty is off; native passthrough is unchanged.
|
|
65
|
-
* Applies only after routing settles on a direct openai-responses route; combos and policies are skipped.
|
|
66
|
-
*/
|
|
67
|
-
appendOnlyToolLoadingModels?: string[];
|
|
68
65
|
/** Opt-in translated Messages admission; unset keeps legacy behavior. Native passthrough is exempt. */
|
|
69
66
|
compatibility?: "shadow" | "enforce";
|
|
70
67
|
/** Kill switch for the /v1/messages inbound (GUI "Claude ON" toggle). Default: enabled. */
|
|
@@ -147,31 +144,6 @@ export interface OcxClaudeCodeConfig {
|
|
|
147
144
|
* forcing effort on every request can leak reasoning params to non-reasoning routes.
|
|
148
145
|
*/
|
|
149
146
|
alwaysEnableEffort?: boolean;
|
|
150
|
-
/**
|
|
151
|
-
* Opt-in ENABLE_TOOL_SEARCH injection for launched Claude Code sessions (#4838).
|
|
152
|
-
*
|
|
153
|
-
* Claude Code turns MCP tool deferral off whenever ANTHROPIC_BASE_URL names a
|
|
154
|
-
* non-first-party host, so an `ocx claude` session ships every tool schema in
|
|
155
|
-
* full on every request. Its own diagnostic states the precondition for turning
|
|
156
|
-
* that back on: "Set ENABLE_TOOL_SEARCH=true (or auto / auto:N) if your proxy
|
|
157
|
-
* forwards tool_reference blocks."
|
|
158
|
-
*
|
|
159
|
-
* Default OFF. Native Anthropic passthrough retains server-side search; the
|
|
160
|
-
* ordinary translated route drops the typed search tool and sends function schemas
|
|
161
|
-
* eagerly. appendOnlyToolLoadingModels is a separate opt-in for verified final
|
|
162
|
-
* Responses destinations and an eager client-executed ToolSearch function: it
|
|
163
|
-
* projects currently declared deferred definitions at successful discovery results.
|
|
164
|
-
* This launcher switch alone enables neither that projection nor server-side search.
|
|
165
|
-
* Compatibility-enforcement admission remains unchanged and can reject unsupported
|
|
166
|
-
* tool_search/tool_reference/deferred_tools requests; no native-search parity or
|
|
167
|
-
* cache-hit guarantee is implied.
|
|
168
|
-
*
|
|
169
|
-
* `true` injects "true"; a string is passed through verbatim so Claude Code's own
|
|
170
|
-
* vocabulary (`auto`, `auto:N`, `force`) stays reachable. `false` and absent
|
|
171
|
-
* inject nothing — they do not force the variable off, because a value the
|
|
172
|
-
* operator exported themselves always wins.
|
|
173
|
-
*/
|
|
174
|
-
toolSearch?: boolean | string;
|
|
175
147
|
/**
|
|
176
148
|
* Subagent tier slots (devlog 260712 B2): injected as ANTHROPIC_DEFAULT_*_MODEL so
|
|
177
149
|
* Claude Code's Agent-tool aliases (opus/sonnet/haiku/fable + parent-inherit) route
|
|
@@ -491,7 +463,7 @@ export interface OcxRemoteGuiConfig {
|
|
|
491
463
|
allowInsecureHttp?: boolean;
|
|
492
464
|
}
|
|
493
465
|
|
|
494
|
-
export type OcxConnectedClientId = "codex" | "claude";
|
|
466
|
+
export type OcxConnectedClientId = "codex" | "claude" | "claude-desktop" | "grok" | import("../clients/client-ids").ExportClientId;
|
|
495
467
|
|
|
496
468
|
/**
|
|
497
469
|
* Redaction policy for management and CLI projections (#3859).
|
|
@@ -513,11 +485,6 @@ export interface OcxPrivacyConfig {
|
|
|
513
485
|
maskEmails?: boolean;
|
|
514
486
|
}
|
|
515
487
|
|
|
516
|
-
export interface OcxLinkTransportConfig {
|
|
517
|
-
tunnelPort: number;
|
|
518
|
-
linkId: string;
|
|
519
|
-
}
|
|
520
|
-
|
|
521
488
|
export interface OcxClientConnectionConfig {
|
|
522
489
|
serverUrl: string;
|
|
523
490
|
managementUrl: string;
|
|
@@ -557,7 +524,7 @@ export interface OcxClientConnectionConfig {
|
|
|
557
524
|
};
|
|
558
525
|
}
|
|
559
526
|
|
|
560
|
-
export interface OcxConfig {
|
|
527
|
+
export interface OcxConfig extends OcxLinkHomeConfig {
|
|
561
528
|
/** Experimental macOS app-server stdout shim; absent or false disables it. */
|
|
562
529
|
chatgptDesktop?: { appServerShim?: boolean };
|
|
563
530
|
port: number;
|
|
@@ -611,7 +578,8 @@ export interface OcxConfig {
|
|
|
611
578
|
defaultProvider: string;
|
|
612
579
|
/** Persisted state for newly discovered provider models (#2464). Absent keeps legacy "on" behavior. */
|
|
613
580
|
modelDiscovery?: {
|
|
614
|
-
|
|
581
|
+
/** `admit` appends arrivals to custom provider selections (#8236); default `on`. */
|
|
582
|
+
newModelPolicy?: "on" | "off" | "admit";
|
|
615
583
|
knownModels?: Record<string, {
|
|
616
584
|
ids: string[];
|
|
617
585
|
removed: string[];
|
|
@@ -619,7 +587,14 @@ export interface OcxConfig {
|
|
|
619
587
|
/** Consecutive successful discoveries in which an active id was absent. */
|
|
620
588
|
missing?: Record<string, number>;
|
|
621
589
|
}>;
|
|
622
|
-
recentArrivals?: Record<string, Array<{
|
|
590
|
+
recentArrivals?: Record<string, Array<{
|
|
591
|
+
id: string;
|
|
592
|
+
at: string;
|
|
593
|
+
/** Appended to the provider's custom selection by the `admit` policy. */
|
|
594
|
+
admitted?: boolean;
|
|
595
|
+
/** Whether the `off` policy disabled it; absent on rows recorded before #8236. */
|
|
596
|
+
disabledByPolicy?: boolean;
|
|
597
|
+
}>>;
|
|
623
598
|
};
|
|
624
599
|
/** Enable the shipped model alias patterns for providers without an override. */
|
|
625
600
|
defaultModelAliases?: boolean;
|
|
@@ -966,13 +941,8 @@ export interface OcxConfig {
|
|
|
966
941
|
* Unset or omitted by default.
|
|
967
942
|
*/
|
|
968
943
|
blockedModelRedirects?: Record<string, string>;
|
|
969
|
-
/**
|
|
970
|
-
|
|
971
|
-
* - "v1": force ALL models to v1 surface (override upstream pins)
|
|
972
|
-
* - "default" | undefined: respect upstream model pins (sol/terra=v2, luna=v1, rest=codex flag)
|
|
973
|
-
* - "v2": force ALL models to v2 surface (override upstream pins)
|
|
974
|
-
*/
|
|
975
|
-
multiAgentMode?: "v1" | "default" | "v2";
|
|
944
|
+
/** Multi-agent surface override; mode selection and consent follow MultiAgentMode. */
|
|
945
|
+
multiAgentMode?: MultiAgentMode;
|
|
976
946
|
/**
|
|
977
947
|
* Which revision of the sub-agent surface advisory this install has answered.
|
|
978
948
|
* Absent means it has answered none. Written by the dashboard, never by a mode change.
|
|
@@ -981,6 +951,7 @@ export interface OcxConfig {
|
|
|
981
951
|
/**
|
|
982
952
|
* When `multiAgentMode` is `"v2"`, keep ChatGPT-native catalog rows on v1.
|
|
983
953
|
* Routed parents get v2 tools; Sol/Terra can still spawn Grok/Claude (issue #92).
|
|
954
|
+
* Stored but inactive under `"v2-plaintext"`, which pins ChatGPT-native rows on v2.
|
|
984
955
|
*/
|
|
985
956
|
keepNativeChatGptOnV1?: boolean;
|
|
986
957
|
/** Experimental plaintext delivery for native v2 collaboration messages; disabled unless true. */
|
|
@@ -1099,8 +1070,9 @@ export interface OcxConfig {
|
|
|
1099
1070
|
connectTimeoutMs?: number;
|
|
1100
1071
|
/** Graceful shutdown drain timeout (ms). Active turns are aborted after this deadline. Default 5000. */
|
|
1101
1072
|
shutdownTimeoutMs?: number;
|
|
1102
|
-
/** Advertise supports_websockets so Codex opens the WS endpoint. Default false; set true to opt in. */
|
|
1103
|
-
websockets?: boolean;
|
|
1073
|
+
/** Advertise supports_websockets so Codex opens the WS endpoint. Default false; set true to opt in. */ websockets?: boolean;
|
|
1074
|
+
/** Accept the Responses WebSocket from linked Children over the Remote Link. Default false; needs websockets too. */ linkResponsesWebsocket?: boolean;
|
|
1075
|
+
/** On a Remote Link Child: true keeps Codex on HTTP over the link even when the Home offers the link WebSocket. Default: follow the Home. */ linkResponsesWebsocketOptOut?: boolean;
|
|
1104
1076
|
/** Experimental single-lane native OpenAI WebSocket steering; default off. */
|
|
1105
1077
|
codexNativeSteering?: boolean;
|
|
1106
1078
|
/** Experimental, default-off saved function-result injection on native multi-agent WebSockets. */
|
|
@@ -1441,6 +1413,19 @@ export interface OcxConfig {
|
|
|
1441
1413
|
tokenGuardian?: OcxTokenGuardianConfig;
|
|
1442
1414
|
/** Additional exact origins allowed for CORS (e.g. HTTPS or chrome-extension://<id>). Loopback origins are always allowed. */
|
|
1443
1415
|
corsAllowOrigins?: string[];
|
|
1416
|
+
/**
|
|
1417
|
+
* #8338, opt-in, standalone only: the one reverse proxy a dashboard may sit behind and still
|
|
1418
|
+
* remember devices. `origin` is the exact https origin the browser uses; `proxyAddresses` are
|
|
1419
|
+
* the proxy hop's own IP addresses as this process observes them (never a range); and
|
|
1420
|
+
* `trustHeaders` names the forwarded headers that carry the browser's host and scheme (default:
|
|
1421
|
+
* Host only, scheme from `origin`). Absent, Remember stays direct HTTPS or loopback only. Parsed by
|
|
1422
|
+
* src/config/dashboard-trusted-proxy.ts; enforced in managementRequestOrigin (src/server/auth-cors.ts).
|
|
1423
|
+
*/
|
|
1424
|
+
dashboardTrustedProxy?: {
|
|
1425
|
+
origin: string;
|
|
1426
|
+
proxyAddresses: string[];
|
|
1427
|
+
trustHeaders?: Array<"x-forwarded-host" | "x-forwarded-proto">;
|
|
1428
|
+
};
|
|
1444
1429
|
/**
|
|
1445
1430
|
* OCX-11 fallback off: refuse model or provider fallback per scope, and record per-device local
|
|
1446
1431
|
* fallback permission. Absent keeps every chain as it was. See src/routing/fallback-policy.ts.
|
|
@@ -1776,6 +1761,8 @@ export interface OcxAdvisorConfig {
|
|
|
1776
1761
|
* or a tool result after the latest user message).
|
|
1777
1762
|
*/
|
|
1778
1763
|
policy?: "manual" | "preflight" | "adaptive";
|
|
1764
|
+
/** question-only sends only the worker's explicit question and disables automatic consultations. */
|
|
1765
|
+
contextMode?: "context" | "question-only";
|
|
1779
1766
|
/** Adaptive task consultation attempts (manual + automatic). Integer 1–3, default 3. */
|
|
1780
1767
|
maxConsultationsPerTask?: number;
|
|
1781
1768
|
/** Advisor fetch timeout (ms). Default 120000. */
|
|
@@ -1856,6 +1843,13 @@ export interface OcxCodexPoolConfig {
|
|
|
1856
1843
|
startIdleWindows?: boolean;
|
|
1857
1844
|
/** Enable process-local affinity for caller-owned credentials; defaults off. */
|
|
1858
1845
|
requestOwnedAffinity?: boolean;
|
|
1846
|
+
/**
|
|
1847
|
+
* Pool-only policy (#7410); defaults off. When true, automatic Pool resolution serves only
|
|
1848
|
+
* registered, eligible non-main accounts: no ordered or preserved native main, no caller-main
|
|
1849
|
+
* fallback, and a manual main pin is not honoured. An exhausted allowed pool refuses. Explicit
|
|
1850
|
+
* account selectors (including `__main__` and Reserve) and Direct mode stay outside the policy.
|
|
1851
|
+
*/
|
|
1852
|
+
poolOnly?: boolean;
|
|
1859
1853
|
/**
|
|
1860
1854
|
* Plan keys ordinary rotation skips, matched case-insensitively against the plan stored on each
|
|
1861
1855
|
* account. Absent or empty means no policy.
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/** A link-mode Child's saved tunnel: the local port its link reaches the Home through. */
|
|
2
|
+
export interface OcxLinkTransportConfig {
|
|
3
|
+
tunnelPort: number;
|
|
4
|
+
linkId: string;
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
/** Home-side Remote Link settings. */
|
|
8
|
+
export interface OcxLinkHomeConfig {
|
|
9
|
+
/**
|
|
10
|
+
* Whether this Home tells its Children it accepts per-body zstd request bodies (#3023). Absent or
|
|
11
|
+
* true: it does, and a Child compresses bodies above 1 KiB. False: it stops naming the capability,
|
|
12
|
+
* and its Children send identity bodies exactly as before it existed. Read at proxy start.
|
|
13
|
+
*
|
|
14
|
+
* Compression lets someone who can both put chosen text into a request body beside a secret and
|
|
15
|
+
* see the sizes of many such requests guess the secret from how well each one compresses. On a
|
|
16
|
+
* link that is whoever sees its traffic: a relay operator or anyone on the network path, because
|
|
17
|
+
* the tunnel hides content but not sizes.
|
|
18
|
+
*/
|
|
19
|
+
linkRequestCompression?: boolean;
|
|
20
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Multi-agent surface override:
|
|
3
|
+
* - "v1": force ALL models to v1 surface (override upstream pins)
|
|
4
|
+
* - "default" | undefined: respect upstream model pins (sol/terra=v2, luna=v1, rest=codex flag)
|
|
5
|
+
* - "v2": force ALL models to v2 surface (override upstream pins)
|
|
6
|
+
* - "v2-plaintext": force ALL models to v2 surface via catalog pins while the global
|
|
7
|
+
* `multi_agent_v2` feature stays disabled. Selecting the mode is itself the explicit
|
|
8
|
+
* opt-in to plaintext delivery of native v2 collaboration messages; the separate
|
|
9
|
+
* `plaintextV2AgentMessages` flag is not required and is never rewritten by a mode change.
|
|
10
|
+
* The "v2-plaintext" literal must never be written into `multi_agent_version`,
|
|
11
|
+
* whose values Codex validates.
|
|
12
|
+
*/
|
|
13
|
+
export type MultiAgentMode = "v1" | "default" | "v2" | "v2-plaintext";
|
package/src/types/provider.ts
CHANGED
|
@@ -10,6 +10,21 @@ import type { AnthropicAccountPoolConfig } from "./anthropic-account-pool";
|
|
|
10
10
|
*/
|
|
11
11
|
export type RefreshPolicy = "proactive" | "lazy-only" | "disabled";
|
|
12
12
|
|
|
13
|
+
/**
|
|
14
|
+
* Per-provider conversation affinity to the credential that served a conversation's
|
|
15
|
+
* last turn, so that credential's upstream prompt cache is read again instead of
|
|
16
|
+
* rebuilt on another key. `auto` keeps a binding only while the cache it built is
|
|
17
|
+
* measured to be worth keeping and still warm; `session` keeps it while the
|
|
18
|
+
* credential stays eligible; `turn` only across immediate continuations; `off`
|
|
19
|
+
* disables binding entirely. See src/providers/cache-affinity.ts.
|
|
20
|
+
*/
|
|
21
|
+
export type CacheAffinityMode = "auto" | "session" | "turn" | "off";
|
|
22
|
+
|
|
23
|
+
/** Provider cache-affinity outcome recorded on a request-log row. */
|
|
24
|
+
export type CacheAffinityOutcome = "kept" | "bound" | "released";
|
|
25
|
+
/** Why that outcome happened; mirrors the store's keep reasons plus lifecycle outcomes. */
|
|
26
|
+
export type CacheAffinityLogReason = "cache" | "session" | "turn" | "continuation" | "new" | "quota" | "auth";
|
|
27
|
+
|
|
13
28
|
/** Request-owned identity of the configured key, before env/keychain resolution. */
|
|
14
29
|
export interface ProviderApiKeySelection {
|
|
15
30
|
entryId?: string;
|
|
@@ -17,6 +32,10 @@ export interface ProviderApiKeySelection {
|
|
|
17
32
|
revision?: string;
|
|
18
33
|
/** Request-local allocation; does not replace the saved active key. */
|
|
19
34
|
distributed?: boolean;
|
|
35
|
+
/** Request-local cache-affinity pick; survives selection re-reads while its entry stays live. */
|
|
36
|
+
cacheAffinity?: boolean;
|
|
37
|
+
/** Opaque process-local credential and destination generation for an affinity pick. */
|
|
38
|
+
cacheAffinityGeneration?: string;
|
|
20
39
|
}
|
|
21
40
|
|
|
22
41
|
export interface OpenRouterProviderRouting {
|
|
@@ -296,6 +315,8 @@ export interface ModelCapabilities extends ReasoningCapabilities {
|
|
|
296
315
|
deepseekImageFiles?: boolean;
|
|
297
316
|
/** Images a first-party Mistral Chat request may carry for this model; older ones are pruned. */
|
|
298
317
|
mistralMaxImages?: number;
|
|
318
|
+
/** Exact-model Responses custom-tool support; absent inherits the provider contract. */
|
|
319
|
+
responsesCustomTools?: boolean;
|
|
299
320
|
}
|
|
300
321
|
|
|
301
322
|
/**
|
|
@@ -313,6 +334,12 @@ export interface OcxProviderConfig {
|
|
|
313
334
|
alias?: string;
|
|
314
335
|
/** Native model id -> short, slash-free request alias. */
|
|
315
336
|
modelAliases?: Record<string, string>;
|
|
337
|
+
/**
|
|
338
|
+
* Opt-in alias template for models without a manual or built-in alias (#7705), for example
|
|
339
|
+
* `{providerAlias}-{modelBasename}`. Derived at resolution time and never written back; only the
|
|
340
|
+
* literal `{providerAlias}` and `{modelBasename}` placeholders are allowed.
|
|
341
|
+
*/
|
|
342
|
+
aliasTemplate?: string;
|
|
316
343
|
/** Display-only labels for exact native model ids discovered under this provider. */
|
|
317
344
|
modelDisplayNames?: Record<string, string>;
|
|
318
345
|
/** Override the global built-in model-alias switch for this provider. */
|
|
@@ -616,6 +643,14 @@ export interface OcxProviderConfig {
|
|
|
616
643
|
* or too flaky for startup/catalog sync.
|
|
617
644
|
*/
|
|
618
645
|
liveModels?: boolean;
|
|
646
|
+
/**
|
|
647
|
+
* Per-provider live-discovery compatibility (#7910). `skipInvalidRows: true` skips individual
|
|
648
|
+
* `/models` rows whose id is missing, non-string, empty or otherwise invalid (and non-object
|
|
649
|
+
* rows) instead of rejecting the whole listing; a listing with no surviving row stays malformed.
|
|
650
|
+
* Absent or false keeps strict discovery. Unrelated to the top-level `OcxConfig.modelDiscovery`,
|
|
651
|
+
* which is persisted discovery state rather than provider configuration.
|
|
652
|
+
*/
|
|
653
|
+
modelDiscovery?: { skipInvalidRows?: boolean };
|
|
619
654
|
/**
|
|
620
655
|
* Per-provider catalog allowlist. When non-empty, ONLY these model ids are emitted to Codex's
|
|
621
656
|
* catalog and `/v1/models` — live discovery still runs, this just narrows what ships (so a proxy
|
|
@@ -641,8 +676,11 @@ export interface OcxProviderConfig {
|
|
|
641
676
|
* visible. Empty/undefined = no opt-in (default behavior). See #1690.
|
|
642
677
|
*/
|
|
643
678
|
retainModels?: string[];
|
|
644
|
-
/**
|
|
645
|
-
|
|
679
|
+
/**
|
|
680
|
+
* Override for newly discovered models. Absent/"inherit" uses the install policy. `admit`
|
|
681
|
+
* appends arrivals to a custom `selectedModels` (never a preset-derived one).
|
|
682
|
+
*/
|
|
683
|
+
newModelPolicy?: "on" | "off" | "admit" | "inherit";
|
|
646
684
|
/**
|
|
647
685
|
* Model-preset marker for `selectedModels` (#2465). Absent means "all", exactly today's
|
|
648
686
|
* semantics — an existing provider is never narrowed by an upgrade.
|
|
@@ -899,6 +937,19 @@ export interface OcxProviderConfig {
|
|
|
899
937
|
* tools; the two capabilities are independent and denied independently.
|
|
900
938
|
*/
|
|
901
939
|
unsupportedHostedTools?: string[];
|
|
940
|
+
/**
|
|
941
|
+
* Hosted tool declarations this Responses destination rejects only in combination with
|
|
942
|
+
* client tools, so they are stripped when the same request also declares a `function` or
|
|
943
|
+
* `custom` tool, or a namespace with members, in `tools`, a client-loaded
|
|
944
|
+
* `additional_tools` catalog, or a `tool_search_output` result. A request that declares
|
|
945
|
+
* only hosted tools keeps them.
|
|
946
|
+
*
|
|
947
|
+
* This describes a gateway that serves hosted `web_search` alone and function calling
|
|
948
|
+
* alone, but answers HTTP 400 when one request carries both (#8204). Same vocabulary and
|
|
949
|
+
* alias expansion as `unsupportedHostedTools`, which stays authoritative: a tool listed
|
|
950
|
+
* there is removed whether or not client tools are present.
|
|
951
|
+
*/
|
|
952
|
+
unsupportedHostedToolsWithClientTools?: string[];
|
|
902
953
|
/**
|
|
903
954
|
* Provider-local repair for Responses gateways whose lifecycle snapshots omit canonical
|
|
904
955
|
* fields or closing events (#893). Disabled by default and applied only to client-facing
|
|
@@ -1039,6 +1090,14 @@ export interface OcxProviderConfig {
|
|
|
1039
1090
|
* fields. Default off; only enable for providers that document this parameter.
|
|
1040
1091
|
*/
|
|
1041
1092
|
promptCacheKey?: boolean;
|
|
1093
|
+
/**
|
|
1094
|
+
* Conversation affinity to the key-pool credential that served a conversation's
|
|
1095
|
+
* last turn, so its upstream prompt cache is read again on the next turn instead
|
|
1096
|
+
* of rebuilt on another key. Only affects providers with 2+ key-pool entries;
|
|
1097
|
+
* eligibility (cooldowns, pacing, disabled keys) always outranks the preference.
|
|
1098
|
+
* Default `auto`. See src/providers/cache-affinity.ts.
|
|
1099
|
+
*/
|
|
1100
|
+
cacheAffinity?: CacheAffinityMode;
|
|
1042
1101
|
/**
|
|
1043
1102
|
* Opt-in: forward caller `service_tier` values to the upstream `/chat/completions` body.
|
|
1044
1103
|
* On a classified route it governs foreign values (for example `flex`), not proxy-owned
|
|
@@ -1147,6 +1206,13 @@ export interface OcxProviderConfig {
|
|
|
1147
1206
|
* other EOFs remain truncation errors. Absent = strict default behavior.
|
|
1148
1207
|
*/
|
|
1149
1208
|
anthropicEofTolerance?: boolean;
|
|
1209
|
+
/**
|
|
1210
|
+
* Claude Code's typed Advisor server tool (`advisor_20260301`) on the translated Messages lane.
|
|
1211
|
+
* Absent: forwarded only to an `anthropic`-adapter provider on first-party `api.anthropic.com`.
|
|
1212
|
+
* `true`: an Anthropic-compatible gateway that runs it receives the declaration, its history and
|
|
1213
|
+
* the `advisor-tool-2026-03-01` beta too. `false`: never forwarded, even first-party.
|
|
1214
|
+
*/
|
|
1215
|
+
forwardAdvisorTool?: boolean;
|
|
1150
1216
|
/**
|
|
1151
1217
|
* Model ids that do NOT accept image inputs. The proxy gives them "eyes" via the vision sidecar:
|
|
1152
1218
|
* attached images are described by a gpt vision model and replaced with text before the call.
|