@bitkyc08/opencodex 2.93.0 → 2.95.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -109,6 +109,7 @@ import {
|
|
|
109
109
|
} from "../auth-cors";
|
|
110
110
|
import { managementSessionIssuance } from "../management-auth";
|
|
111
111
|
import { resolveAdmissionModelScope, routeAllowedByScope } from "../admission-model-scope";
|
|
112
|
+
import { captureAdmissionPolicy } from "../capture-admission-policy";
|
|
112
113
|
import {
|
|
113
114
|
disableResponsesRequestTimeout,
|
|
114
115
|
handleResponses,
|
|
@@ -953,7 +954,7 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
953
954
|
}
|
|
954
955
|
throw error;
|
|
955
956
|
}
|
|
956
|
-
const { accountBoundNativeOpenAiSlugsBySelector,
|
|
957
|
+
const { accountBoundNativeOpenAiSlugsBySelector, configuredNativeAliasSlugs, desktopAllowlistSuppressedNativeSlugs, disabledNativeSlugs, exactComboCatalogSlugs, NATIVE_OPENAI_MODELS, nativeContextLimits, nativeInputModalities, nativeOpenAiContextWindow, nativeOpenAiMaxOutputTokens, nativeOpenAiContextTier, nativeOpenAiSlugs, nativeReasoningEfforts, nativeDefaultReasoningEffort, shouldIncludeAccountBoundNativeOpenAi, shouldIncludeNativeOpenAi, uniqueCatalogModelsForRawPublicList, visibleCodexAccountSelectors, visibleNativeSlugs, desktopVisibleNativeSlugs } = await import("../../codex/catalog");
|
|
957
958
|
const { ACCOUNT_GATED_NATIVE_OPENAI_MODELS } = await import("../../codex/catalog/native-models");
|
|
958
959
|
const includeNativeOpenAi = shouldIncludeNativeOpenAi(config);
|
|
959
960
|
const includeAccountBoundNativeOpenAi = shouldIncludeAccountBoundNativeOpenAi(config);
|
|
@@ -1069,7 +1070,7 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
1069
1070
|
config.claudeCode?.desktopProfile,
|
|
1070
1071
|
desktopInputs.nativeContextCap,
|
|
1071
1072
|
);
|
|
1072
|
-
const { buildAnthropicModelInfos } = await import("../../claude/model-info");
|
|
1073
|
+
const { buildAnthropicModelInfos, configuredRoutedDisplayName } = await import("../../claude/model-info");
|
|
1073
1074
|
const { resolveAutoContext } = await import("../../claude/context-windows");
|
|
1074
1075
|
const { resolvableDesktop3pAlias } = await import("../../claude/desktop-3p");
|
|
1075
1076
|
// Per-surface id family (devlog 050): explicit ?ids= wins; otherwise the
|
|
@@ -1097,51 +1098,17 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
1097
1098
|
? nativeFastEligible(model.id)
|
|
1098
1099
|
: catalogRowFastEligible(model)
|
|
1099
1100
|
: undefined,
|
|
1100
|
-
{ modelPickerOrder: config.modelPickerOrder, featured: config.subagentModels },
|
|
1101
|
+
{ modelPickerOrder: config.modelPickerOrder, featured: config.subagentModels }, configuredRoutedDisplayName(config),
|
|
1101
1102
|
);
|
|
1102
1103
|
return jsonResponse({ data }, 200, req, policy);
|
|
1103
1104
|
}
|
|
1104
1105
|
if (url.searchParams.has("client_version")) {
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1109
|
-
|
|
1110
|
-
|
|
1111
|
-
// Account rows use the same hidden-inclusive supported set as on-disk sync. This lets a
|
|
1112
|
-
// newly re-enabled native reappear under each selector before the next sync, while the
|
|
1113
|
-
// no-selector path keeps nativeOpenAiSlugs()'s existing visibility-sensitive behavior.
|
|
1114
|
-
const catalogNativeSlugs = accountSelectors.length > 0
|
|
1115
|
-
? [...new Set([
|
|
1116
|
-
...availableAccountNativeSlugs,
|
|
1117
|
-
...accountNativeSlugs,
|
|
1118
|
-
])]
|
|
1119
|
-
: nativeSlugs;
|
|
1120
|
-
const entries = buildCatalogEntries(
|
|
1121
|
-
loadCatalogTemplate(),
|
|
1122
|
-
catalogNativeSlugs,
|
|
1123
|
-
goOrdered,
|
|
1124
|
-
config.subagentModels,
|
|
1125
|
-
websocketsEnabled(config),
|
|
1126
|
-
maMode as "v1" | "default" | "v2",
|
|
1127
|
-
exactComboSlugs,
|
|
1128
|
-
accountSelectors,
|
|
1129
|
-
suppressedBareNativeSlugs,
|
|
1130
|
-
new Set(),
|
|
1131
|
-
nativeContextLimits(config),
|
|
1132
|
-
accountNativeSlugs,
|
|
1133
|
-
accountNativeSlugsBySelector,
|
|
1134
|
-
config.keepNativeChatGptOnV1 === true,
|
|
1135
|
-
config.modelPickerOrder,
|
|
1136
|
-
);
|
|
1137
|
-
return jsonResponse({
|
|
1138
|
-
models: applyNativeVisibility(
|
|
1139
|
-
entries,
|
|
1140
|
-
disabledModels,
|
|
1141
|
-
accountSelectors.length > 0,
|
|
1142
|
-
new Set(accountNativeSlugs),
|
|
1143
|
-
),
|
|
1144
|
-
}, 200, req, policy);
|
|
1106
|
+
const { buildCodexModelList } = await import("../codex-model-list");
|
|
1107
|
+
return jsonResponse(buildCodexModelList({
|
|
1108
|
+
config, nativeSlugs, availableAccountNativeSlugs, accountNativeSlugs,
|
|
1109
|
+
accountNativeSlugsBySelector, goOrdered, exactComboSlugs, accountSelectors,
|
|
1110
|
+
suppressedBareNativeSlugs, disabledModels,
|
|
1111
|
+
}), 200, req, policy);
|
|
1145
1112
|
}
|
|
1146
1113
|
// OpenAI list shape: native gpt bare + routed models namespaced "<provider>/<id>"
|
|
1147
1114
|
// (pure availability list — disabled natives are omitted entirely).
|
|
@@ -1357,10 +1324,12 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
1357
1324
|
...admissionFields(admission),
|
|
1358
1325
|
inboundProtocol: "responses",
|
|
1359
1326
|
};
|
|
1327
|
+
const advisorAdmissionPolicy = captureAdmissionPolicy(config, admission);
|
|
1360
1328
|
return runAdmittedHttpTurn(req, policy, async turnAdmissionLease => {
|
|
1361
1329
|
let response: Response;
|
|
1362
1330
|
try {
|
|
1363
1331
|
response = await handleResponsesCompact(req, config, logCtx, turnAdmissionLease, admission, {
|
|
1332
|
+
advisorAdmissionPolicy,
|
|
1364
1333
|
onRequestBodyRead: () => disableResponsesRequestTimeout(req, requestServer),
|
|
1365
1334
|
});
|
|
1366
1335
|
} catch (error) {
|
|
@@ -1516,12 +1485,15 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
1516
1485
|
addFinalRequestLog(requestId, start, logCtx, status, meta);
|
|
1517
1486
|
};
|
|
1518
1487
|
const sessionReq = withCallerSessionIdentity(withGrokSessionIdentity(req), admission);
|
|
1488
|
+
// Capture at authentication: runAdmittedHttpTurn can wait for body capacity first (#7859).
|
|
1489
|
+
const advisorAdmissionPolicy = captureAdmissionPolicy(config, admission);
|
|
1519
1490
|
return runAdmittedHttpTurn(sessionReq, policy, async turnAdmissionLease => {
|
|
1520
1491
|
let response: Response;
|
|
1521
1492
|
try {
|
|
1522
1493
|
response = await handleResponses(sessionReq, config, logCtx, {
|
|
1523
1494
|
turnAdmissionLease,
|
|
1524
1495
|
admission,
|
|
1496
|
+
advisorAdmissionPolicy,
|
|
1525
1497
|
onRequestBodyRead: () => disableResponsesRequestTimeout(req, requestServer),
|
|
1526
1498
|
abortSignal: req.signal,
|
|
1527
1499
|
onFirstOutput: () => recordFirstOutput(logCtx, start),
|
|
@@ -1605,8 +1577,10 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
1605
1577
|
let ownsRequestLog = false;
|
|
1606
1578
|
const claimRequestLog = (work: (lease: ActiveTurnLease) => Promise<Response>) =>
|
|
1607
1579
|
(lease: ActiveTurnLease) => { ownsRequestLog = true; return work(lease); };
|
|
1580
|
+
// Capture at authentication: runAdmittedHttpTurn can wait for body capacity first (#7859).
|
|
1581
|
+
const advisorAdmissionPolicy = captureAdmissionPolicy(config, admission);
|
|
1608
1582
|
const response = await runAdmittedHttpTurn(sessionReq, policy, claimRequestLog(async turnAdmissionLease => withCors(
|
|
1609
|
-
await handleClaudeMessages(sessionReq, config, logCtx, { requestId, start, turnAdmissionLease, admission }, policy, { claudeIntercept: ingress === "claude-intercept" }),
|
|
1583
|
+
await handleClaudeMessages(sessionReq, config, logCtx, { requestId, start, turnAdmissionLease, admission, advisorAdmissionPolicy }, policy, { claudeIntercept: ingress === "claude-intercept" }),
|
|
1610
1584
|
req,
|
|
1611
1585
|
policy,
|
|
1612
1586
|
)), { requestId, start, logCtx, onLogged: () => { ownsRequestLog = true; } });
|
|
@@ -1641,10 +1615,12 @@ export function createServeOptions(ctx: ServeOptionsContext) {
|
|
|
1641
1615
|
const sessionReq = withCallerSessionIdentity(req, admission);
|
|
1642
1616
|
// Only expose an id when the handler or a logged refusal owns its history row.
|
|
1643
1617
|
let ownsRequestLog = false;
|
|
1618
|
+
// Capture at authentication: runAdmittedHttpTurn can wait for body capacity first (#7859).
|
|
1619
|
+
const advisorAdmissionPolicy = captureAdmissionPolicy(config, admission);
|
|
1644
1620
|
const response = await runAdmittedHttpTurn(sessionReq, policy, async turnAdmissionLease => {
|
|
1645
1621
|
ownsRequestLog = true;
|
|
1646
1622
|
return withCors(
|
|
1647
|
-
await handleChatCompletions(sessionReq, config, logCtx, { requestId, start, turnAdmissionLease, admission }),
|
|
1623
|
+
await handleChatCompletions(sessionReq, config, logCtx, { requestId, start, turnAdmissionLease, admission, advisorAdmissionPolicy }),
|
|
1648
1624
|
req,
|
|
1649
1625
|
policy,
|
|
1650
1626
|
);
|
|
@@ -3,6 +3,7 @@ import { NativeInjectionChannel } from "../responses/native-injection";
|
|
|
3
3
|
import { NativeSteeringChannel, NativeSteeringError } from "../responses/native-steering";
|
|
4
4
|
import { createNativeSteeringLogObserver } from "../responses/native-steering-log";
|
|
5
5
|
import { reasoningArchiveErrorResponse } from "../responses/reasoning-archive-error";
|
|
6
|
+
import { captureAdmissionPolicy } from "../capture-admission-policy";
|
|
6
7
|
import type { Server, ServerWebSocket } from "bun";
|
|
7
8
|
import {
|
|
8
9
|
LIVE_SIDEBAND_UPSTREAM_OPEN_TIMEOUT_MS,
|
|
@@ -19,6 +20,7 @@ import {
|
|
|
19
20
|
webSocketFrameBytes,
|
|
20
21
|
} from "./live-sideband";
|
|
21
22
|
import { markActivity } from "../../lib/sidecar-tracker";
|
|
23
|
+
import { isReplayRefusalResponse } from "../../lib/upstream-retry";
|
|
22
24
|
import {
|
|
23
25
|
buildWarmupCompletionFrames,
|
|
24
26
|
buildWsErrorFrame,
|
|
@@ -302,6 +304,7 @@ export function createWebsocketHandler(
|
|
|
302
304
|
}
|
|
303
305
|
|
|
304
306
|
// Only a genuinely admitted turn may receive steering or continuations.
|
|
307
|
+
const advisorAdmissionPolicy = captureAdmissionPolicy(config, ws.data.admission);
|
|
305
308
|
const finishActivity = ws.data.responsesActivity?.beginTurn(frame.input);
|
|
306
309
|
ws.data.nativeControl = nativeControl;
|
|
307
310
|
const payload: Record<string, unknown> = { ...frame };
|
|
@@ -342,6 +345,7 @@ export function createWebsocketHandler(
|
|
|
342
345
|
try {
|
|
343
346
|
let terminalRecorder: ((status: ResponsesTerminalStatus, httpStatusOverride?: number) => void) | undefined;
|
|
344
347
|
const response = await handleResponses(req, config, logCtx, {
|
|
348
|
+
advisorAdmissionPolicy,
|
|
345
349
|
...(wsAdmission ? { admission: wsAdmission } : {}),
|
|
346
350
|
forceEmptyResponseId: true,
|
|
347
351
|
inboundTransport: "websocket",
|
|
@@ -355,6 +359,12 @@ export function createWebsocketHandler(
|
|
|
355
359
|
terminalRecorder = recorder;
|
|
356
360
|
},
|
|
357
361
|
});
|
|
362
|
+
// This ingress finalizes directly, without the HTTP deferred logger.
|
|
363
|
+
// Preserve recorder provenance before framing a synthetic 429 as a WS error.
|
|
364
|
+
if (isReplayRefusalResponse(response)) {
|
|
365
|
+
logCtx.causeHint = "transport-ambiguous";
|
|
366
|
+
logCtx.terminalSource = "synthetic";
|
|
367
|
+
}
|
|
358
368
|
const observeLog = nativeControl?.relayActive
|
|
359
369
|
? createNativeSteeringLogObserver(logCtx, () => recordFirstOutput(logCtx, start))
|
|
360
370
|
: (payload: string) => inspectResponseLogSsePayload(logCtx, payload);
|
package/src/server/index.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { remoteWorkspaceEnabled } from "../remote-control/workspace-activation";
|
|
2
2
|
import { scheduleDesktopCompatibilityStartup } from "./index/desktop-compatibility-startup";
|
|
3
3
|
import { AuxiliaryListenerBindError } from "./ports";
|
|
4
|
-
import {
|
|
4
|
+
import { normalizeBindHostname } from "./bind-host";
|
|
5
|
+
import { configureInboundBodyBudget, runAdmittedBodyWork } from "./inbound-body-admission";
|
|
5
6
|
import {
|
|
6
7
|
buildWarmupCompletionFrames,
|
|
7
8
|
buildWsErrorFrame,
|
|
@@ -203,11 +204,12 @@ import { createOptionalListenerSet, LINK_INGRESS_HOSTNAME } from "./index/option
|
|
|
203
204
|
import { createPackageTreeIntegrityGuardForServer } from "./index/package-tree-guard";
|
|
204
205
|
import { inspectStartupOwnership, logProxyEndpoints, resolveInboundBodyLimitWithWarning, setStartupCacheInvalidationWrite, warnAgentTaskRecoveryStartup, warnPlaintextV2AgentMessagesStartup, type StartServerDeps } from "./index/startup-warnings";
|
|
205
206
|
import { acquireSpendLedgerServerLifecycle, recordFailedStartRollback, type SpendLedgerServerLifecycle } from "./index/spend-ledger-lifecycle";
|
|
207
|
+
import { withLocalCredentialObservation } from "../local-credentials/runtime-observation";
|
|
206
208
|
export { waitForFailedStartRollback } from "./index/spend-ledger-lifecycle";
|
|
207
209
|
|
|
208
210
|
export function startServer(port?: number, deps: StartServerDeps = {}): Server<WsData> {
|
|
209
211
|
const spendLedgerLifecycle = acquireSpendLedgerServerLifecycle(getConfigDir());
|
|
210
|
-
try { return startServerWithSpendLedgerOwner(port, deps, spendLedgerLifecycle); }
|
|
212
|
+
try { return withLocalCredentialObservation(() => startServerWithSpendLedgerOwner(port, deps, spendLedgerLifecycle)); }
|
|
211
213
|
catch (error) { recordFailedStartRollback(error, spendLedgerLifecycle.releaseAfterFailedStart()); throw error; }
|
|
212
214
|
}
|
|
213
215
|
|
|
@@ -326,8 +328,7 @@ function startServerWithSpendLedgerOwner(port: number | undefined, deps: StartSe
|
|
|
326
328
|
// resolves localhost→127.0.0.1): on Windows `localhost` resolves ::1-first, but the injected URL
|
|
327
329
|
// is 127.0.0.1, so binding literal "localhost" would reintroduce the F4 refusal. Wildcards
|
|
328
330
|
// (0.0.0.0/::) and specific hosts are left untouched so intentional exposure is preserved.
|
|
329
|
-
const
|
|
330
|
-
const bindHost = !configuredHost || /^localhost\.?$/i.test(configuredHost) ? "127.0.0.1" : configuredHost;
|
|
331
|
+
const bindHost = normalizeBindHostname(config.hostname);
|
|
331
332
|
|
|
332
333
|
// Unauthenticated loopback listener (#1102). Off unless explicitly enabled.
|
|
333
334
|
// A port-less enabled entry is the companion form: same port as the public listener, on
|
|
@@ -696,7 +697,6 @@ function startServerWithSpendLedgerOwner(port: number | undefined, deps: StartSe
|
|
|
696
697
|
});
|
|
697
698
|
|
|
698
699
|
server = spendLedgerLifecycle.track(Bun.serve<WsData>({ ...serveOptions, port: listenPort, hostname: bindHost }));
|
|
699
|
-
|
|
700
700
|
// Both binds are one startup transaction (#1102). If the loopback bind fails after the
|
|
701
701
|
// public one succeeded, leaving the public listener up would strand it: the CLI's port
|
|
702
702
|
// retry would read the failure as a public-port conflict and pick a different port,
|
|
@@ -738,6 +738,7 @@ function startServerWithSpendLedgerOwner(port: number | undefined, deps: StartSe
|
|
|
738
738
|
throw new AuxiliaryListenerBindError("hub.managementIngress", managementIngressPort, "127.0.0.1", error);
|
|
739
739
|
}
|
|
740
740
|
}
|
|
741
|
+
configureInboundBodyBudget(config.maxConcurrentInboundBodyBytes);
|
|
741
742
|
optionalListeners.start({ config, publicPort: server.port ?? listenPort, requestedPort: listenPort, startProxy: deps.startClaudeInterceptProxy,
|
|
742
743
|
maxRequestBodySize: inboundBodyLimitBytes, dispatch: (req, requestServer) => serveOptions.fetch(req, requestServer) });
|
|
743
744
|
} catch (error) {
|
|
@@ -87,6 +87,7 @@ export interface ClientEncodedDelivery {
|
|
|
87
87
|
fold: {
|
|
88
88
|
replayCacheScope?: OcxReasoningReplayScopeRef;
|
|
89
89
|
hideThinkingSummary?: boolean;
|
|
90
|
+
chatRawReasoningVisible?: boolean;
|
|
90
91
|
hideRawReasoning?: boolean;
|
|
91
92
|
toolNsMap?: Map<string, { namespace: string; name: string; freeform?: true }>;
|
|
92
93
|
declaredToolNames?: ReadonlySet<string>;
|
|
@@ -219,13 +220,14 @@ export async function deliverClientEncodedResponse(input: ClientEncodedDelivery)
|
|
|
219
220
|
translatorBudget,
|
|
220
221
|
...input.fold,
|
|
221
222
|
...(input.stallTimeoutSec !== undefined ? { stallTimeoutSec: input.stallTimeoutSec } : {}),
|
|
222
|
-
|
|
223
|
+
get localUpstream() { return input.localUpstream; },
|
|
223
224
|
hooks,
|
|
224
225
|
};
|
|
225
226
|
const encoded = encoder.protocol === "chat"
|
|
226
227
|
? encodeChatCompletionSse(events, encodeOptions)
|
|
227
228
|
: encodeAnthropicMessageSse(events, {
|
|
228
229
|
...encodeOptions,
|
|
230
|
+
get localUpstream() { return input.localUpstream; },
|
|
229
231
|
...(encoder.inputTokenFloor !== undefined ? { inputTokenFloor: encoder.inputTokenFloor } : {}),
|
|
230
232
|
});
|
|
231
233
|
const tracked = trackStreamLifetime(encoded, new AbortController(), input.onStreamDone, input.turnAdmissionLease);
|
package/src/server/lifecycle.ts
CHANGED
|
@@ -520,6 +520,7 @@ export function trackStreamLifetime(
|
|
|
520
520
|
export async function drainAndShutdown(
|
|
521
521
|
server: ReturnType<typeof Bun.serve> | undefined,
|
|
522
522
|
timeoutMs: number,
|
|
523
|
+
beforeListenerStop?: () => undefined,
|
|
523
524
|
): Promise<boolean> {
|
|
524
525
|
const s = server ?? _serverRef;
|
|
525
526
|
let shutdownSucceeded = true;
|
|
@@ -605,7 +606,13 @@ export async function drainAndShutdown(
|
|
|
605
606
|
setStorageCleanupPolicyJobLiveApply(null);
|
|
606
607
|
} finally {
|
|
607
608
|
try {
|
|
608
|
-
|
|
609
|
+
// Signal cleanup restores owned client routing while this listener still owns its port.
|
|
610
|
+
// Cleanup is synchronous only; a throw still releases listener and startup ownership.
|
|
611
|
+
try {
|
|
612
|
+
beforeListenerStop?.();
|
|
613
|
+
} finally {
|
|
614
|
+
await stopServerListener(s);
|
|
615
|
+
}
|
|
609
616
|
} finally {
|
|
610
617
|
await releaseServerStartupLifecycle(s);
|
|
611
618
|
// shutdownDraining is a process-lifetime latch. A stopped server must
|
|
@@ -12,6 +12,9 @@ import { activateAdvisor } from "../../lib/advisor-activation";
|
|
|
12
12
|
import { jsonResponse } from "../auth-cors";
|
|
13
13
|
import { readManagementJsonBodyOr } from "./body";
|
|
14
14
|
import type { ManagementContext } from "./context";
|
|
15
|
+
import { getConfigDir, withConfigDirHardeningSettled } from "../../config/paths";
|
|
16
|
+
import { readConfigDiagnostics } from "../../config/diagnostics";
|
|
17
|
+
import { adoptPersistedAdvisor, armDetachedConfigBaseline } from "../../config/live-reconcile";
|
|
15
18
|
import {
|
|
16
19
|
ADVISOR_CONTEXT_SHARING_CONSENT_VERSION,
|
|
17
20
|
ADVISOR_EFFORTS,
|
|
@@ -184,19 +187,33 @@ async function putAdvisorSettings(ctx: ManagementContext): Promise<Response> {
|
|
|
184
187
|
// `deps.` first: route tests with an in-memory fixture must never write the real config.
|
|
185
188
|
const persist = ctx.deps.saveConfigPreservingClaudeCode
|
|
186
189
|
?? (await import("../../config")).saveConfigPreservingClaudeCode;
|
|
187
|
-
|
|
188
|
-
applyPatchInMemory(config, parsed.patch);
|
|
190
|
+
let published = false;
|
|
189
191
|
try {
|
|
190
|
-
|
|
192
|
+
return await withConfigDirHardeningSettled(getConfigDir(), () => {
|
|
193
|
+
const disk = ctx.deps.saveConfigPreservingClaudeCode ? undefined : readConfigDiagnostics();
|
|
194
|
+
if (disk?.source === "fallback" || disk?.error) throw new Error("config_unavailable");
|
|
195
|
+
const candidate = disk?.source === "file" ? disk.config : config;
|
|
196
|
+
// This fresh authority owns no live socket. Arm the same object passed to the
|
|
197
|
+
// saver so even new disk-only fields reconcile against its admitted read.
|
|
198
|
+
if (candidate !== config) armDetachedConfigBaseline(candidate);
|
|
199
|
+
const snapshot = isRec(config.advisor) ? { ...config.advisor } : undefined;
|
|
200
|
+
applyPatchInMemory(candidate, parsed.patch);
|
|
201
|
+
try { persist(candidate); }
|
|
202
|
+
catch (error) {
|
|
203
|
+
// Keep the rollback in the same synchronous phase as the live edit and save.
|
|
204
|
+
if (snapshot === undefined) delete config.advisor;
|
|
205
|
+
else config.advisor = snapshot as ManagementContext["config"]["advisor"];
|
|
206
|
+
throw error;
|
|
207
|
+
}
|
|
208
|
+
published = true;
|
|
209
|
+
adoptPersistedAdvisor(config, candidate.advisor);
|
|
210
|
+
activateAdvisor(config);
|
|
211
|
+
return jsonResponse(advisorInfo(config), 200, req, config);
|
|
212
|
+
});
|
|
191
213
|
} catch (error) {
|
|
192
|
-
|
|
193
|
-
// mislead every GET until the next restart.
|
|
194
|
-
if (snapshot === undefined) delete config.advisor;
|
|
195
|
-
else config.advisor = snapshot as ManagementContext["config"]["advisor"];
|
|
214
|
+
if (published) throw error;
|
|
196
215
|
return isConfigLockContention(error)
|
|
197
216
|
? jsonResponse({ error: { code: "config_busy", message: "Another process is saving the configuration. Try again in a moment." } }, 409, req, config)
|
|
198
217
|
: jsonResponse({ error: { code: "write_failed", message: "The configuration could not be saved." } }, 500, req, config);
|
|
199
218
|
}
|
|
200
|
-
activateAdvisor(config);
|
|
201
|
-
return jsonResponse(advisorInfo(config), 200, req, config);
|
|
202
219
|
}
|