@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
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { ZedJsonError, ZedJsonScanner, zedJsonTokens } from "./zed-json-tokens";
|
|
3
|
+
|
|
4
|
+
/** Ordered lexical tokens are shared by equality, incremental validation and replay hashes. */
|
|
5
|
+
export function zedArgumentFingerprint(text: string, custom: boolean): string {
|
|
6
|
+
const hash = createHash("sha256");
|
|
7
|
+
// UTF-16 hashing also distinguishes lone surrogates, which UTF-8 replacement would collapse.
|
|
8
|
+
if (custom) return hash.update("custom:").update(text, "utf16le").digest("hex");
|
|
9
|
+
let tokens: Uint32Array;
|
|
10
|
+
try { tokens = zedJsonTokens(text); }
|
|
11
|
+
catch (error) {
|
|
12
|
+
if (error instanceof ZedJsonError && error.message.includes('depth limit')) throw error;
|
|
13
|
+
return hash.update("raw:").update(text, "utf16le").digest("hex");
|
|
14
|
+
}
|
|
15
|
+
return hash.update("json:").update(Buffer.from(tokens.buffer, tokens.byteOffset, tokens.byteLength)).digest("hex");
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
/** Retained authoritative token stream; each late source unit is scanned exactly once. */
|
|
19
|
+
export class ZedArgumentAuthority {
|
|
20
|
+
private tokens?: Uint32Array;
|
|
21
|
+
private scanner?: ZedJsonScanner;
|
|
22
|
+
private at = 0;
|
|
23
|
+
get steps(): number { return this.scanner?.steps ?? this.at; }
|
|
24
|
+
|
|
25
|
+
constructor(private full: string, private custom: boolean, prefix = '') {
|
|
26
|
+
// The existing protocol uses an empty field for a parameter-free call (not JSON null).
|
|
27
|
+
if (!custom && full !== '') {
|
|
28
|
+
this.tokens = zedJsonTokens(full);
|
|
29
|
+
this.scanner = new ZedJsonScanner(token => {
|
|
30
|
+
if (token !== this.tokens![this.at++]) throw new ZedJsonError('conflicting arguments');
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
this.push(prefix);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
push(fragment: string): void {
|
|
37
|
+
if (this.scanner) this.scanner.push(fragment);
|
|
38
|
+
else {
|
|
39
|
+
if (!this.full.startsWith(fragment, this.at)) throw new ZedJsonError('conflicting custom input');
|
|
40
|
+
this.at += fragment.length;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** Retained bytes cover the token buffer and the bounded incremental grammar stack. */
|
|
46
|
+
export function zedArgumentAuthorityBytes(text: string, custom: boolean): number {
|
|
47
|
+
return custom ? 0 : text.length * 4 + Math.min(text.length, 65_536) * 8 + 64;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/** Keep delivered bytes; append only a suffix of the same ordered lexical JSON value. */
|
|
51
|
+
export function reconcileZedArguments(prefix: string, full: string, custom: boolean): string | undefined {
|
|
52
|
+
if (custom) return full.startsWith(prefix) ? full : undefined;
|
|
53
|
+
if (full === '') return prefix === '' ? '' : undefined;
|
|
54
|
+
const positions = new Uint32Array(full.length);
|
|
55
|
+
const tokens = zedJsonTokens(full, positions);
|
|
56
|
+
let at = 0;
|
|
57
|
+
let end = 0;
|
|
58
|
+
const scanner = new ZedJsonScanner((token) => {
|
|
59
|
+
if (token !== tokens[at]) throw new ZedJsonError('conflicting arguments');
|
|
60
|
+
end = positions[at++]!;
|
|
61
|
+
});
|
|
62
|
+
try {
|
|
63
|
+
scanner.push(prefix);
|
|
64
|
+
if (scanner.complete) {
|
|
65
|
+
scanner.finish();
|
|
66
|
+
return at === tokens.length ? prefix : undefined;
|
|
67
|
+
}
|
|
68
|
+
const escape = scanner.escapeSuffix(tokens[at]);
|
|
69
|
+
if (escape === undefined) return;
|
|
70
|
+
if (escape) end = positions[at]!;
|
|
71
|
+
const suffix = escape + full.slice(end);
|
|
72
|
+
scanner.push(suffix);
|
|
73
|
+
scanner.finish();
|
|
74
|
+
return at === tokens.length ? prefix + suffix : undefined;
|
|
75
|
+
} catch (error) {
|
|
76
|
+
if (error instanceof ZedJsonError && !error.message.includes('depth limit')) return;
|
|
77
|
+
throw error;
|
|
78
|
+
}
|
|
79
|
+
}
|
package/src/adapters/zed.ts
CHANGED
|
@@ -5,6 +5,8 @@ import type { AnthropicCacheRetention } from "./anthropic/cache-retention";
|
|
|
5
5
|
import { createGoogleAdapter } from "./google";
|
|
6
6
|
import { createOpenAIChatAdapter } from "./openai-chat";
|
|
7
7
|
import { createResponsesPassthroughAdapter } from "./openai-responses";
|
|
8
|
+
import { liftZedAdditionalTools, translateZedOpenAiStream } from "./zed-openai-stream";
|
|
9
|
+
import { zedDiagnosticUsage } from "./zed-diagnostic-usage";
|
|
8
10
|
import { createAdapterPhysicalSend } from "./physical-send";
|
|
9
11
|
import type { AdapterEvent, OcxParsedRequest, OcxProviderConfig } from "../types";
|
|
10
12
|
import { createTranslatorBudget, releaseTranslatedEvent, retainTranslatedEvent, type TranslatorBudget } from "../lib/translator-budget";
|
|
@@ -66,6 +68,27 @@ function forceStreaming(parsed: OcxParsedRequest): OcxParsedRequest {
|
|
|
66
68
|
return { ...parsed, stream: true, _rawBody: rawBody };
|
|
67
69
|
}
|
|
68
70
|
|
|
71
|
+
/**
|
|
72
|
+
* Promote the current turn's additional_tools before the Responses delegate repairs input.
|
|
73
|
+
* Repair can drop a replayed reasoning item and slide the wrapper under the original prefix
|
|
74
|
+
* length, which then hides the current catalog. The caller's raw body stays untouched.
|
|
75
|
+
*/
|
|
76
|
+
function promoteOpenAiToolsBeforeRepair(parsed: OcxParsedRequest): OcxParsedRequest {
|
|
77
|
+
if (!isRecord(parsed._rawBody)) return forceStreaming(parsed);
|
|
78
|
+
const raw = parsed._rawBody;
|
|
79
|
+
const copy: Record<string, unknown> = { ...raw, stream: true };
|
|
80
|
+
if (Array.isArray(raw.input)) {
|
|
81
|
+
copy.input = raw.input.map(item => (
|
|
82
|
+
isRecord(item) && item.type === "additional_tools" && Array.isArray(item.tools)
|
|
83
|
+
? { ...item, tools: [...item.tools] }
|
|
84
|
+
: item
|
|
85
|
+
));
|
|
86
|
+
}
|
|
87
|
+
if (Array.isArray(raw.tools)) copy.tools = [...raw.tools];
|
|
88
|
+
liftZedAdditionalTools(copy, parsed._replayPrefixLen ?? 0);
|
|
89
|
+
return { ...parsed, stream: true, _rawBody: copy };
|
|
90
|
+
}
|
|
91
|
+
|
|
69
92
|
function providerFromCatalog(catalog: Awaited<ReturnType<typeof resolveZedModels>> | undefined, model: string): ZedProvider {
|
|
70
93
|
const raw = catalog?.rawById.get(model);
|
|
71
94
|
return normalizeZedProvider(raw?.provider, model);
|
|
@@ -213,7 +236,23 @@ export function zedEventStream(
|
|
|
213
236
|
return;
|
|
214
237
|
}
|
|
215
238
|
if (isNativeTerminalEvent(event)) sawNativeTerminal = true;
|
|
216
|
-
|
|
239
|
+
// Native diagnostics can echo the same account credential as status failures.
|
|
240
|
+
const diagnostic = Object.hasOwn(event, "error") || event.type === "response.failed" || event.type === "response.incomplete"
|
|
241
|
+
|| event.type === "error" || (isRecord(event.response) && Object.hasOwn(event.response, "error"));
|
|
242
|
+
const scrubFields = (record: Record<string, unknown>, preserveType = false): Record<string, unknown> => Object.fromEntries(
|
|
243
|
+
Object.entries(record).map(([key, value]) => [key, typeof value === "string" && !(preserveType && key === "type") ? scrub(value) : value]),
|
|
244
|
+
);
|
|
245
|
+
const scrubRecord = (record: Record<string, unknown>, preserveType = false): Record<string, unknown> => ({
|
|
246
|
+
...scrubFields(record, preserveType),
|
|
247
|
+
...(provider === "open_ai" ? { usage: zedDiagnosticUsage(record.usage) } : {}),
|
|
248
|
+
...(typeof record.error === "string" ? { error: scrub(record.error) }
|
|
249
|
+
: isRecord(record.error) ? { error: { ...scrubFields(record.error), metadata: undefined } } : {}),
|
|
250
|
+
...(isRecord(record.incomplete_details) ? { incomplete_details: scrubFields(record.incomplete_details) } : {}),
|
|
251
|
+
});
|
|
252
|
+
emit(controller, diagnostic ? {
|
|
253
|
+
...scrubRecord(event, true),
|
|
254
|
+
...(isRecord(event.response) ? { response: scrubRecord(event.response) } : {}),
|
|
255
|
+
} : event);
|
|
217
256
|
}
|
|
218
257
|
|
|
219
258
|
return body.pipeThrough(output);
|
|
@@ -256,7 +295,8 @@ export function createZedAdapter(provider: OcxProviderConfig, cacheRetention?: A
|
|
|
256
295
|
...(incoming?.providerFetch ? { providerFetch: incoming.providerFetch } : {}),
|
|
257
296
|
...(incoming?.abortSignal ? { abortSignal: incoming.abortSignal } : {}),
|
|
258
297
|
};
|
|
259
|
-
const
|
|
298
|
+
const delegateParsed = zedProvider === "open_ai" ? promoteOpenAiToolsBeforeRepair(parsed) : forceStreaming(parsed);
|
|
299
|
+
const built = await selected.buildRequest(delegateParsed, safeIncoming);
|
|
260
300
|
let providerRequest: unknown;
|
|
261
301
|
try { providerRequest = JSON.parse(built.body) as unknown; } catch { throw new Error("Zed delegate produced an invalid request body"); }
|
|
262
302
|
if (zedProvider === "google" && isRecord(providerRequest)) delete providerRequest.safetySettings;
|
|
@@ -314,6 +354,7 @@ export function createZedAdapter(provider: OcxProviderConfig, cacheRetention?: A
|
|
|
314
354
|
: item,
|
|
315
355
|
);
|
|
316
356
|
}
|
|
357
|
+
// OpenAI wrappers were promoted before delegation; serialized input has no provenance tags.
|
|
317
358
|
if (zedProvider === "open_ai" && Array.isArray(providerRequest.tools)) {
|
|
318
359
|
// Zed's Responses decoder supports function/custom tools, not Codex's built-in web_search.
|
|
319
360
|
const supported = (tool: unknown) => isRecord(tool) && (tool.type === "function" || tool.type === "custom");
|
|
@@ -410,7 +451,11 @@ export function createZedAdapter(provider: OcxProviderConfig, cacheRetention?: A
|
|
|
410
451
|
headers: { "Content-Type": "text/event-stream" },
|
|
411
452
|
});
|
|
412
453
|
try {
|
|
413
|
-
|
|
454
|
+
// The Responses passthrough parser only keeps compaction text. Zed is not a
|
|
455
|
+
// passthrough route, so function and custom calls have to be translated or
|
|
456
|
+
// Codex ends the turn on the first sentence.
|
|
457
|
+
if (delegate.provider === "open_ai") yield* translateZedOpenAiStream(translated.body, budget);
|
|
458
|
+
else yield* delegate.adapter.parseStream(translated, budget);
|
|
414
459
|
} finally {
|
|
415
460
|
// Some delegates only unlock their reader when a collector stops early.
|
|
416
461
|
try { await translated.body?.cancel(); } catch { /* already closed/errored */ }
|
package/src/advisor/consult.ts
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
* unavailable context or with nothing, depending on the trigger.
|
|
19
19
|
*/
|
|
20
20
|
import type { OcxConfig } from "../types";
|
|
21
|
-
import {
|
|
21
|
+
import { localInferenceDestination, selfFetchAdmissionToken, type LocalInferenceDestination } from "../lib/local-destinations";
|
|
22
22
|
import { signalWithTimeout, cancelBodyOnAbort } from "../lib/abort";
|
|
23
23
|
import { redactSecretString } from "../lib/redact";
|
|
24
24
|
import { sidecarEnter } from "../lib/sidecar-tracker";
|
|
@@ -29,6 +29,16 @@ import {
|
|
|
29
29
|
import { configuredPort } from "../server/auth-cors";
|
|
30
30
|
import { readAdvisorReasoning } from "../server/inference/advisor-diagnostics";
|
|
31
31
|
import { ADVISOR_SYSTEM_INSTRUCTION, buildAdvisorUserPrompt, type AdvisorContextInput } from "./context";
|
|
32
|
+
import {
|
|
33
|
+
ADVISOR_ADMISSION_SCOPE_HEADER,
|
|
34
|
+
AdvisorAdmissionScopeEncodedBoundExceeded,
|
|
35
|
+
encodeAdvisorAdmissionScope,
|
|
36
|
+
ADVISOR_ADMISSION_POLICY_HEADER,
|
|
37
|
+
registerAdvisorAdmissionPolicy,
|
|
38
|
+
} from "../server/advisor-admission-scope";
|
|
39
|
+
import type { AdmissionModelScope } from "../server/admission-model-scope";
|
|
40
|
+
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
41
|
+
import { captureAdmissionPolicy } from "../server/capture-admission-policy";
|
|
32
42
|
|
|
33
43
|
/**
|
|
34
44
|
* The header the advisor presents on its own loopback request. Its VALUE is this process's
|
|
@@ -60,12 +70,18 @@ export interface AdvisorConsultationResult {
|
|
|
60
70
|
export function advisorDestinationOrigin(
|
|
61
71
|
config: Pick<OcxConfig, "port" | "hostname" | "unauthenticatedLoopbackListener">,
|
|
62
72
|
): string {
|
|
73
|
+
return advisorDestination(config).origin;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
function advisorDestination(
|
|
77
|
+
config: Pick<OcxConfig, "port" | "hostname" | "unauthenticatedLoopbackListener">,
|
|
78
|
+
): LocalInferenceDestination {
|
|
63
79
|
// Same port resolution rule as the vision sidecar: config.port can be 0 (ephemeral bind, tests)
|
|
64
80
|
// or stale after a live port override, so prefer the recorded actual bind port when present.
|
|
65
81
|
const port = config.port && config.port > 0
|
|
66
82
|
? config.port
|
|
67
83
|
: Number(configuredPort()) || 10_100;
|
|
68
|
-
return localInferenceDestination(config, port)
|
|
84
|
+
return localInferenceDestination(config, port);
|
|
69
85
|
}
|
|
70
86
|
|
|
71
87
|
function extractContent(payload: unknown): string | undefined {
|
|
@@ -116,6 +132,8 @@ export async function consultAdvisor(
|
|
|
116
132
|
timeoutMs: number,
|
|
117
133
|
abortSignal?: AbortSignal,
|
|
118
134
|
baseUrlOverride?: string,
|
|
135
|
+
admissionScope?: AdmissionModelScope,
|
|
136
|
+
admissionPolicy?: CapturedAdmissionPolicy,
|
|
119
137
|
): Promise<AdvisorConsultationResult> {
|
|
120
138
|
const t0 = Date.now();
|
|
121
139
|
const headers: Record<string, string> = {
|
|
@@ -123,10 +141,22 @@ export async function consultAdvisor(
|
|
|
123
141
|
[ADVISOR_INTERNAL_CAPABILITY_HEADER]: internalCallCapability(),
|
|
124
142
|
};
|
|
125
143
|
// Admission ladder identical to the vision sidecar: env token || service token file || first
|
|
126
|
-
// configured API key, sent as `x-opencodex-api-key` — never Authorization.
|
|
127
|
-
//
|
|
128
|
-
const admission =
|
|
144
|
+
// configured API key, sent as `x-opencodex-api-key` — never Authorization. A destination that
|
|
145
|
+
// requires no admission gets only a credential this data plane recognizes (#7894).
|
|
146
|
+
const admission = selfFetchAdmissionToken(config, advisorDestination(config));
|
|
129
147
|
if (admission) headers["x-opencodex-api-key"] = admission;
|
|
148
|
+
// Keep the bounded scope envelope for transport validation; the process-local policy
|
|
149
|
+
// registration below owns the complete snapshot. The receiver also enforces host limits.
|
|
150
|
+
try {
|
|
151
|
+
headers[ADVISOR_ADMISSION_SCOPE_HEADER] = encodeAdvisorAdmissionScope(admissionScope ?? { providers: [], models: [] });
|
|
152
|
+
} catch (error) {
|
|
153
|
+
if (error instanceof AdvisorAdmissionScopeEncodedBoundExceeded) {
|
|
154
|
+
// Controlled failure before fetch: an over-bound scope must never reach the peer —
|
|
155
|
+
// it would be rejected mid-request — and must never be narrowed silently either.
|
|
156
|
+
return { ok: false, advice: "", advisorModel: input.advisorModel, error: error.message, durationMs: Date.now() - t0 };
|
|
157
|
+
}
|
|
158
|
+
throw error;
|
|
159
|
+
}
|
|
130
160
|
|
|
131
161
|
const requestBody = {
|
|
132
162
|
model: input.advisorModel,
|
|
@@ -145,7 +175,10 @@ export async function consultAdvisor(
|
|
|
145
175
|
linkedSignal.cleanup();
|
|
146
176
|
return { ok: false, cancelled: true, advice: "", advisorModel: input.advisorModel, error: "advisor cancelled before dispatch", durationMs: Date.now() - t0 };
|
|
147
177
|
}
|
|
178
|
+
let policyRegistration: ReturnType<typeof registerAdvisorAdmissionPolicy> | undefined;
|
|
148
179
|
try {
|
|
180
|
+
policyRegistration = registerAdvisorAdmissionPolicy(admissionPolicy ?? captureAdmissionPolicy(config, undefined, admissionScope), linkedSignal.signal);
|
|
181
|
+
headers[ADVISOR_ADMISSION_POLICY_HEADER] = policyRegistration.token;
|
|
149
182
|
const res = await fetch(`${baseUrlOverride ?? advisorBaseUrl(config)}/v1/chat/completions`, {
|
|
150
183
|
method: "POST",
|
|
151
184
|
headers,
|
|
@@ -217,6 +250,7 @@ export async function consultAdvisor(
|
|
|
217
250
|
durationMs,
|
|
218
251
|
};
|
|
219
252
|
} finally {
|
|
253
|
+
policyRegistration?.release();
|
|
220
254
|
sidecarExit();
|
|
221
255
|
linkedSignal.cleanup();
|
|
222
256
|
}
|
package/src/advisor/runtime.ts
CHANGED
|
@@ -38,6 +38,7 @@ import { formatAdvisorAdvice, advisorPreflightMessages, formatAdvisorUnavailable
|
|
|
38
38
|
import { advisorActivityStore, type AdvisorActivityStore, type AdvisorTrigger } from "./activity";
|
|
39
39
|
import { createAdvisorTaskBudget, type AdvisorTaskBudget } from "./budget";
|
|
40
40
|
import { collectAdvisorRepairEvidence, type AdvisorRepairEvidence } from "./evidence";
|
|
41
|
+
import type { AdmissionModelScope } from "../server/admission-model-scope";
|
|
41
42
|
|
|
42
43
|
/**
|
|
43
44
|
* Process-local task ledger. Bounded (entries + per-state TTL) in src/advisor/state.ts; one
|
|
@@ -53,6 +54,8 @@ export interface AdvisorRuntimeDeps {
|
|
|
53
54
|
/** Routed worker identity for logs and the advisor payload, e.g. "deepseek-chat (provider deepseek)". */
|
|
54
55
|
workerIdentity: string;
|
|
55
56
|
workerModelId: string;
|
|
57
|
+
admissionScope?: AdmissionModelScope;
|
|
58
|
+
admissionPolicy?: import("../types/admission-policy").CapturedAdmissionPolicy;
|
|
56
59
|
abortSignal?: AbortSignal;
|
|
57
60
|
/** Test seam; production always self-fetches the resolved local destination. */
|
|
58
61
|
baseUrlOverride?: string;
|
|
@@ -137,7 +140,11 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
|
|
|
137
140
|
reason: AdvisorTrigger,
|
|
138
141
|
question: string | undefined,
|
|
139
142
|
evidence?: AdvisorRepairEvidence,
|
|
143
|
+
abortSignal?: AbortSignal,
|
|
140
144
|
): Promise<AdvisorConsultOutcome> => {
|
|
145
|
+
const consultationSignal = abortSignal && deps.abortSignal
|
|
146
|
+
? AbortSignal.any([deps.abortSignal, abortSignal])
|
|
147
|
+
: abortSignal ?? deps.abortSignal;
|
|
141
148
|
const current = liveSettings();
|
|
142
149
|
if (!current.enabled || current.model.trim() === "") {
|
|
143
150
|
return {
|
|
@@ -185,7 +192,7 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
|
|
|
185
192
|
content: formatAdvisorUnavailable(reason === "manual" ? "manual" : "preflight", result.error),
|
|
186
193
|
};
|
|
187
194
|
}
|
|
188
|
-
if (
|
|
195
|
+
if (consultationSignal?.aborted) return { ok: false, isError: true, cancelled: true, content: "" };
|
|
189
196
|
const budgetKey = identify(parsed).budget;
|
|
190
197
|
const requestCapped = consultations >= MAX_ADVISOR_CONSULTATIONS_PER_REQUEST;
|
|
191
198
|
if (requestCapped
|
|
@@ -214,8 +221,10 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
|
|
|
214
221
|
deps.config,
|
|
215
222
|
current.effort,
|
|
216
223
|
current.timeoutMs,
|
|
217
|
-
|
|
224
|
+
consultationSignal,
|
|
218
225
|
deps.baseUrlOverride,
|
|
226
|
+
deps.admissionScope,
|
|
227
|
+
deps.admissionPolicy,
|
|
219
228
|
);
|
|
220
229
|
} catch (error) {
|
|
221
230
|
activities.finish(activityId, { status: "failed", durationMs: Math.max(0, now() - startedAt) });
|
|
@@ -331,7 +340,7 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
|
|
|
331
340
|
};
|
|
332
341
|
|
|
333
342
|
const plan: AdvisorPlan = {
|
|
334
|
-
consult: (parsed, reason, question) => runConsultation(parsed, reason, question),
|
|
343
|
+
consult: (parsed, reason, question, abortSignal) => runConsultation(parsed, reason, question, undefined, abortSignal),
|
|
335
344
|
// The guard's own failure/limit text goes through the same runtime-owned, marker-neutralized
|
|
336
345
|
// formatter so no guard path can emit text that looks like a genuine advice wrapper.
|
|
337
346
|
formatUnavailable: (kind, error) => formatAdvisorUnavailable(kind, error),
|
package/src/bridge/errors.ts
CHANGED
|
@@ -23,12 +23,24 @@ import {
|
|
|
23
23
|
|
|
24
24
|
const PINNED_VERDICT_CODES = new Set([CYBER_POLICY_ERROR_CODE, "client_closed_request"]);
|
|
25
25
|
|
|
26
|
+
// A serialized classifier verdict is not an upstream code. Keep the original code out of
|
|
27
|
+
// the wire body so a combo cannot mistake prose-derived insufficient_quota for evidence.
|
|
28
|
+
const formattedQuotaSources = new WeakMap<Response, string | null>();
|
|
29
|
+
const STRUCTURED_QUOTA_CODES = new Set(["usage_limit_exceeded", "usage_limit_reached", "1308", "insufficient_quota"]);
|
|
30
|
+
|
|
31
|
+
export function upstreamCodeForComboFailure(response: Response, bodyCode: string | undefined): string | undefined {
|
|
32
|
+
return bodyCode === "insufficient_quota" && formattedQuotaSources.has(response)
|
|
33
|
+
? formattedQuotaSources.get(response) ?? undefined
|
|
34
|
+
: bodyCode;
|
|
35
|
+
}
|
|
36
|
+
|
|
26
37
|
export function formatErrorResponse(
|
|
27
38
|
status: number,
|
|
28
39
|
type: string,
|
|
29
40
|
message: string,
|
|
30
|
-
options?: { code?: string | null; retryAfter?: string | null; classified?: boolean },
|
|
41
|
+
options?: { code?: string | null; retryAfter?: string | null; classified?: boolean; upstreamCode?: string | null },
|
|
31
42
|
): Response {
|
|
43
|
+
const validationStatus = status === 400 || status === 422;
|
|
32
44
|
const error = classifyError(status, type, message);
|
|
33
45
|
// A combo child holding an adapterFailureFromEvent verdict has already classified this
|
|
34
46
|
// failure. Re-deriving it from the status folded insufficient_quota into rate_limit_exceeded
|
|
@@ -54,6 +66,11 @@ export function formatErrorResponse(
|
|
|
54
66
|
error.code = CYBER_POLICY_ERROR_CODE;
|
|
55
67
|
error.type = cyberPolicyErrorType(type);
|
|
56
68
|
}
|
|
69
|
+
// Only the adapter event's original code can retain this hop identity. Its classified
|
|
70
|
+
// code may have come from reflected prose, and a generic 422 type can erase a real one.
|
|
71
|
+
if (validationStatus && options?.upstreamCode
|
|
72
|
+
&& STRUCTURED_QUOTA_CODES.has(options.upstreamCode.trim().toLowerCase().replaceAll("-", "_"))
|
|
73
|
+
&& !PINNED_VERDICT_CODES.has(error.code ?? "")) error.code = options.upstreamCode;
|
|
57
74
|
// The undeclared-tool refusal is deterministic, not a transient upstream failure: its code
|
|
58
75
|
// survives so the Anthropic translator can classify it instead of folding it into a
|
|
59
76
|
// retryable overload (and so clients see the SSE path's rejection identity).
|
|
@@ -94,6 +111,10 @@ export function formatErrorResponse(
|
|
|
94
111
|
status: finalStatus,
|
|
95
112
|
headers,
|
|
96
113
|
});
|
|
114
|
+
if (validationStatus && error.code === "insufficient_quota") {
|
|
115
|
+
formattedQuotaSources.set(response, options?.upstreamCode !== undefined
|
|
116
|
+
? options.upstreamCode : options?.classified ? null : options?.code ?? null);
|
|
117
|
+
}
|
|
97
118
|
if (replayBlocked) markResponseNonReplayable(response);
|
|
98
119
|
// Re-wrapping is where the refusal loses its provenance: combo failure consumption parses
|
|
99
120
|
// the JSON and builds a new Response, and the code alone does not tell a later quota
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { AdapterEvent, OcxRequestOptions } from "../types";
|
|
2
|
+
|
|
3
|
+
export interface MaxOutputCompletionOptions {
|
|
4
|
+
/** Set only for an explicitly opted-in Responses inbound request. */
|
|
5
|
+
completeOnMaxOutputTokens?: boolean;
|
|
6
|
+
textFormat?: OcxRequestOptions["textFormat"];
|
|
7
|
+
compaction?: boolean;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
/** Track the original event stream: bridge cleanup must not erase an unfinished operation. */
|
|
11
|
+
export function createMaxOutputCompletion(options?: MaxOutputCompletionOptions) {
|
|
12
|
+
let textOnly = options?.completeOnMaxOutputTokens === true && !options.compaction && !options.textFormat;
|
|
13
|
+
let hasText = false;
|
|
14
|
+
let completed = false;
|
|
15
|
+
return {
|
|
16
|
+
observe(event: AdapterEvent): void {
|
|
17
|
+
switch (event.type) {
|
|
18
|
+
case "text_delta":
|
|
19
|
+
if (event.anthropicThinkingSignature !== undefined) textOnly = false;
|
|
20
|
+
if (event.text.length > 0) hasText = true;
|
|
21
|
+
break;
|
|
22
|
+
case "heartbeat":
|
|
23
|
+
case "assistant_boundary":
|
|
24
|
+
break;
|
|
25
|
+
case "done":
|
|
26
|
+
case "incomplete": {
|
|
27
|
+
const reason = event.type === "done" ? event.stopReason : event.reason;
|
|
28
|
+
completed = textOnly && hasText && event.endTurn !== false
|
|
29
|
+
&& (event.type !== "done" || event.compactionEncryptedContent === undefined)
|
|
30
|
+
&& (reason === "max_tokens" || reason === "length" || reason === "max_output_tokens");
|
|
31
|
+
break;
|
|
32
|
+
}
|
|
33
|
+
default:
|
|
34
|
+
// All non-text output and unknown future operations are excluded, even if hidden or closed.
|
|
35
|
+
textOnly = false;
|
|
36
|
+
completed = false;
|
|
37
|
+
}
|
|
38
|
+
},
|
|
39
|
+
get completed(): boolean { return completed; },
|
|
40
|
+
};
|
|
41
|
+
}
|
|
@@ -45,6 +45,7 @@ import {
|
|
|
45
45
|
import { adapterFailureFromEvent, emptyChunks, joinChunks, responsesUsage, toolCallArgumentsUsable, uuid, webSearchAction, webSearchCellItemId } from "./internal";
|
|
46
46
|
import type { OutputItem, StringChunks } from "./internal";
|
|
47
47
|
import { bridgeToResponsesSSE } from "./sse";
|
|
48
|
+
import { createMaxOutputCompletion, type MaxOutputCompletionOptions } from "./max-output-completion";
|
|
48
49
|
|
|
49
50
|
/** Build a buffered Responses result within a caller-owned or temporary translator budget. */
|
|
50
51
|
export function buildResponseJSON(
|
|
@@ -84,8 +85,10 @@ export function buildResponseJSON(
|
|
|
84
85
|
function buildResponseJSONWithBudget(
|
|
85
86
|
events: AdapterEvent[],
|
|
86
87
|
modelId: string,
|
|
87
|
-
options?: {
|
|
88
|
+
options?: MaxOutputCompletionOptions & {
|
|
88
89
|
hideThinkingSummary?: boolean;
|
|
90
|
+
/** Internal Chat delivery override for raw reasoning only; summaries keep their policy. */
|
|
91
|
+
chatRawReasoningVisible?: boolean;
|
|
89
92
|
/** Provider policy: suppress raw content-channel reasoning, keep provider-authored summaries. */
|
|
90
93
|
hideRawReasoning?: boolean;
|
|
91
94
|
toolNsMap?: Map<string, { namespace: string; name: string; freeform?: true }>;
|
|
@@ -200,6 +203,7 @@ function buildResponseJSONWithBudget(
|
|
|
200
203
|
// which is only true for a `done` without a stop reason. A buffered turn whose adapter simply
|
|
201
204
|
// stopped emitting has no terminal at all, and must not be reported as a success.
|
|
202
205
|
let sawTerminal = false;
|
|
206
|
+
const maxOutputCompletion = createMaxOutputCompletion(options);
|
|
203
207
|
let batchCompaction = emptyChunks();
|
|
204
208
|
let compactionEncryptedContent: string | undefined;
|
|
205
209
|
|
|
@@ -297,7 +301,7 @@ function buildResponseJSONWithBudget(
|
|
|
297
301
|
const rawText = joinChunks(currentRawReasoning);
|
|
298
302
|
if (!rawText) return;
|
|
299
303
|
rawReasoningForNextToolCall = rawText;
|
|
300
|
-
if (options?.
|
|
304
|
+
if (!(options?.chatRawReasoningVisible ?? !options?.hideThinkingSummary) || options?.hideRawReasoning === true) {
|
|
301
305
|
if (options?.omitHiddenReasoningEnvelope === true) {
|
|
302
306
|
budget?.releaseRetained(currentRawReasoning.bytes, { kind: "reasoning" });
|
|
303
307
|
currentRawReasoning = emptyChunks();
|
|
@@ -369,6 +373,7 @@ function buildResponseJSONWithBudget(
|
|
|
369
373
|
};
|
|
370
374
|
|
|
371
375
|
for (const e of events) {
|
|
376
|
+
maxOutputCompletion.observe(e);
|
|
372
377
|
if (errorEvent) {
|
|
373
378
|
// Match streaming: once the turn fails, later parallel calls must not become executable
|
|
374
379
|
// completed output. Still release every retained event in order and preserve terminal usage.
|
|
@@ -514,6 +519,7 @@ function buildResponseJSONWithBudget(
|
|
|
514
519
|
}
|
|
515
520
|
break;
|
|
516
521
|
case "tool_call_end":
|
|
522
|
+
if (e.incomplete) { flushToolCall("incomplete"); break; }
|
|
517
523
|
if (!toolCallArgumentsUsable(currentToolCallArgs) && currentToolCallId) {
|
|
518
524
|
// Mirror the streaming path: refuse to complete unusable arguments.
|
|
519
525
|
const mapped = options?.toolNsMap?.get(currentToolCallName);
|
|
@@ -567,6 +573,7 @@ function buildResponseJSONWithBudget(
|
|
|
567
573
|
break;
|
|
568
574
|
case "incomplete":
|
|
569
575
|
incompleteEvent = e;
|
|
576
|
+
usage = e.usage ?? usage;
|
|
570
577
|
sawTerminal = true;
|
|
571
578
|
endTurn = e.endTurn;
|
|
572
579
|
if (e.providerState) options?.onProviderState?.(e.providerState);
|
|
@@ -637,9 +644,10 @@ function buildResponseJSONWithBudget(
|
|
|
637
644
|
}
|
|
638
645
|
|
|
639
646
|
const failure = errorEvent ? adapterFailureFromEvent(errorEvent) : undefined;
|
|
647
|
+
const gracefulComplete = maxOutputCompletion.completed && !errorEvent;
|
|
640
648
|
const status = errorEvent
|
|
641
649
|
? "failed"
|
|
642
|
-
: incompleteEvent || stopReason === "max_tokens" || stopReason === "content_filter"
|
|
650
|
+
: !gracefulComplete && (incompleteEvent || stopReason === "max_tokens" || stopReason === "content_filter")
|
|
643
651
|
? "incomplete"
|
|
644
652
|
: sawTerminal
|
|
645
653
|
? "completed"
|
|
@@ -659,13 +667,13 @@ function buildResponseJSONWithBudget(
|
|
|
659
667
|
...(failure && isCyberPolicyCode(failure.error.code)
|
|
660
668
|
? { retryable: false }
|
|
661
669
|
: errorEvent?.retryable !== undefined ? { retryable: errorEvent.retryable } : {}),
|
|
662
|
-
...(incompleteEvent ? {
|
|
670
|
+
...(!gracefulComplete && incompleteEvent ? {
|
|
663
671
|
incomplete_details: {
|
|
664
672
|
reason: truncationReasonFor(incompleteEvent.reason) ?? incompleteEvent.reason,
|
|
665
673
|
...(incompleteEvent.message ? { message: incompleteEvent.message } : {}),
|
|
666
674
|
...(incompleteEvent.retryable !== undefined ? { retryable: incompleteEvent.retryable } : {}),
|
|
667
675
|
},
|
|
668
|
-
} : stopReason === "max_tokens" ? {
|
|
676
|
+
} : !gracefulComplete && stopReason === "max_tokens" ? {
|
|
669
677
|
incomplete_details: { reason: "max_output_tokens" },
|
|
670
678
|
} : stopReason === "content_filter" ? {
|
|
671
679
|
incomplete_details: { reason: "content_filter" },
|