@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,30 @@
|
|
|
1
|
+
import { TurnTokenCodec } from "../../responses/turn-membership";
|
|
2
|
+
import { resolveDurableReplayPrincipal, type DataPlaneAdmission } from "../auth-cors";
|
|
3
|
+
import { reasoningReplayConversationIdFromResponsesRequest } from "../request-log-conversation";
|
|
4
|
+
import type { OcxConfig } from "../../types";
|
|
5
|
+
|
|
6
|
+
/** Explicit embedding-shell opt-in. No disk, timers, secret recovery, or implicit key generation. */
|
|
7
|
+
export function responseTurnMembership(
|
|
8
|
+
req: Request,
|
|
9
|
+
config: Pick<OcxConfig, "apiKeys">,
|
|
10
|
+
admission: DataPlaneAdmission | undefined,
|
|
11
|
+
material = process.env.OPENCODEX_RESPONSE_TURN_SIGNING_KEY,
|
|
12
|
+
) {
|
|
13
|
+
if (!material || !/^dr_turn_v1_[A-Za-z0-9_-]{43}$/.test(material)) return undefined;
|
|
14
|
+
const encoded = material.slice("dr_turn_v1_".length);
|
|
15
|
+
const key = Buffer.from(encoded, "base64url");
|
|
16
|
+
if (key.length !== 32 || key.toString("base64url") !== encoded) return undefined;
|
|
17
|
+
const principal = resolveDurableReplayPrincipal(req, config, admission, key);
|
|
18
|
+
if (!principal) return undefined;
|
|
19
|
+
// Only the request's own thread identifies this chat. Parents and session/cache cohorts include siblings.
|
|
20
|
+
const thread = reasoningReplayConversationIdFromResponsesRequest({
|
|
21
|
+
threadIdHeader: req.headers.get("thread-id"),
|
|
22
|
+
});
|
|
23
|
+
if (!thread) return undefined;
|
|
24
|
+
const scope = { principal, thread };
|
|
25
|
+
const codec = new TurnTokenCodec(new Map([["k1", key]]), "k1");
|
|
26
|
+
return {
|
|
27
|
+
begin: () => codec.begin(scope),
|
|
28
|
+
normalize: (input: unknown[]) => codec.normalize(scope, input),
|
|
29
|
+
};
|
|
30
|
+
}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import type { TranslatorBudget } from "../lib/translator-budget";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
mayBecomePatchEnvelope,
|
|
4
|
+
normalizeApplyPatchDelimiters,
|
|
5
|
+
stableCanonicalPatchPrefix,
|
|
6
|
+
} from "../responses/apply-patch-envelope";
|
|
3
7
|
import { compileCodeModeHelperInput, resolveCodeModeHelperName } from "../responses/code-mode-helper-compat";
|
|
4
8
|
import { mayBecomeCodeModeShellInput } from "../responses/code-mode-shell-input";
|
|
5
9
|
import { progressiveFreeformInput } from "../responses/progressive-freeform-input";
|
|
@@ -38,9 +42,17 @@ function replaceSseEventName(block: string, type: string): string {
|
|
|
38
42
|
type OpenCustomCall = {
|
|
39
43
|
argumentsText: string;
|
|
40
44
|
emittedInput: string;
|
|
45
|
+
canonicalPatchProgress: boolean;
|
|
41
46
|
retainedBytes: number;
|
|
42
47
|
};
|
|
43
48
|
|
|
49
|
+
export class RoutedCustomToolProgressError extends Error {
|
|
50
|
+
constructor() {
|
|
51
|
+
super("routed custom tool progress disagreed with authoritative completion");
|
|
52
|
+
this.name = "RoutedCustomToolProgressError";
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
44
56
|
type PendingArgumentBlock = {
|
|
45
57
|
block: string;
|
|
46
58
|
itemId?: string;
|
|
@@ -63,6 +75,13 @@ export function createRoutedCustomToolRestoreBlockRewrite(
|
|
|
63
75
|
let pendingArguments: PendingArgumentBlock[] = [];
|
|
64
76
|
let disposed = false;
|
|
65
77
|
|
|
78
|
+
const emptyOpenCall = (): OpenCustomCall => ({
|
|
79
|
+
argumentsText: "",
|
|
80
|
+
emittedInput: "",
|
|
81
|
+
canonicalPatchProgress: false,
|
|
82
|
+
retainedBytes: 0,
|
|
83
|
+
});
|
|
84
|
+
|
|
66
85
|
const releaseCall = (itemId: string): void => {
|
|
67
86
|
const open = openCalls.get(itemId);
|
|
68
87
|
if (!open) return;
|
|
@@ -87,6 +106,31 @@ export function createRoutedCustomToolRestoreBlockRewrite(
|
|
|
87
106
|
ordinaryItemIds.clear();
|
|
88
107
|
};
|
|
89
108
|
|
|
109
|
+
const authoritativeInput = (itemId: string, source: string): string => {
|
|
110
|
+
const itemName = itemNames.get(itemId);
|
|
111
|
+
const helper = itemName?.aliased
|
|
112
|
+
? itemName.name
|
|
113
|
+
: resolveCodeModeHelperName(
|
|
114
|
+
undefined,
|
|
115
|
+
itemName?.name ?? "",
|
|
116
|
+
source,
|
|
117
|
+
itemName?.namespace,
|
|
118
|
+
declaredNames,
|
|
119
|
+
);
|
|
120
|
+
return helper
|
|
121
|
+
? compileCodeModeHelperInput(source, helper, itemName?.name ?? "")
|
|
122
|
+
: unwrapRoutedCustomToolArguments(source, itemName?.name ?? "", itemName?.namespace);
|
|
123
|
+
};
|
|
124
|
+
|
|
125
|
+
const assertProgressMatchesCompletion = (itemId: string, source: string): void => {
|
|
126
|
+
const open = openCalls.get(itemId);
|
|
127
|
+
if (!open?.canonicalPatchProgress) return;
|
|
128
|
+
const finalInput = authoritativeInput(itemId, source);
|
|
129
|
+
if (finalInput.startsWith(open.emittedInput)) return;
|
|
130
|
+
releaseAll();
|
|
131
|
+
throw new RoutedCustomToolProgressError();
|
|
132
|
+
};
|
|
133
|
+
|
|
90
134
|
const retainPendingArgument = (
|
|
91
135
|
block: string,
|
|
92
136
|
itemId: string | undefined,
|
|
@@ -163,7 +207,7 @@ export function createRoutedCustomToolRestoreBlockRewrite(
|
|
|
163
207
|
if (upstreamItemId && (aliased || codeModeExec)) {
|
|
164
208
|
customExecItemNames.set(upstreamItemId, parsed.item.name);
|
|
165
209
|
if (type === "response.output_item.added") {
|
|
166
|
-
openCalls.set(upstreamItemId,
|
|
210
|
+
openCalls.set(upstreamItemId, emptyOpenCall());
|
|
167
211
|
}
|
|
168
212
|
}
|
|
169
213
|
const repairable = wireName !== undefined && repairNames.has(wireName);
|
|
@@ -198,7 +242,7 @@ export function createRoutedCustomToolRestoreBlockRewrite(
|
|
|
198
242
|
ordinaryItemIds.add(upstreamItemId);
|
|
199
243
|
}
|
|
200
244
|
if (routed && type === "response.output_item.added") {
|
|
201
|
-
openCalls.set(upstreamItemId,
|
|
245
|
+
openCalls.set(upstreamItemId, emptyOpenCall());
|
|
202
246
|
}
|
|
203
247
|
}
|
|
204
248
|
const pending = takePendingArguments(upstreamItemId, outputIndex);
|
|
@@ -207,7 +251,14 @@ export function createRoutedCustomToolRestoreBlockRewrite(
|
|
|
207
251
|
return [...pending, block];
|
|
208
252
|
}
|
|
209
253
|
if (upstreamItemId && pending.length > 0 && !openCalls.has(upstreamItemId)) {
|
|
210
|
-
openCalls.set(upstreamItemId,
|
|
254
|
+
openCalls.set(upstreamItemId, emptyOpenCall());
|
|
255
|
+
}
|
|
256
|
+
if (
|
|
257
|
+
type === "response.output_item.done"
|
|
258
|
+
&& upstreamItemId
|
|
259
|
+
&& typeof parsed.item.arguments === "string"
|
|
260
|
+
) {
|
|
261
|
+
assertProgressMatchesCompletion(upstreamItemId, parsed.item.arguments);
|
|
211
262
|
}
|
|
212
263
|
const restored = restoreRoutedCustomCalls(parsed, names, repairNames, declaredNames);
|
|
213
264
|
const restoredBlock = restored.changed
|
|
@@ -226,7 +277,7 @@ export function createRoutedCustomToolRestoreBlockRewrite(
|
|
|
226
277
|
&& upstreamItemId
|
|
227
278
|
&& customExecItemNames.has(upstreamItemId)
|
|
228
279
|
) {
|
|
229
|
-
const open = openCalls.get(upstreamItemId) ??
|
|
280
|
+
const open = openCalls.get(upstreamItemId) ?? emptyOpenCall();
|
|
230
281
|
const delta = typeof parsed.delta === "string" ? parsed.delta : "";
|
|
231
282
|
const deltaBytes = Buffer.byteLength(delta, "utf8");
|
|
232
283
|
if (deltaBytes > 0) budget?.chargeRetained(deltaBytes, { kind: "retained_collectors" });
|
|
@@ -285,7 +336,7 @@ export function createRoutedCustomToolRestoreBlockRewrite(
|
|
|
285
336
|
&& upstreamItemId
|
|
286
337
|
&& itemNames.has(upstreamItemId)
|
|
287
338
|
) {
|
|
288
|
-
const open = openCalls.get(upstreamItemId) ??
|
|
339
|
+
const open = openCalls.get(upstreamItemId) ?? emptyOpenCall();
|
|
289
340
|
const delta = typeof parsed.delta === "string" ? parsed.delta : "";
|
|
290
341
|
const deltaBytes = Buffer.byteLength(delta, "utf8");
|
|
291
342
|
if (deltaBytes > 0) budget?.chargeRetained(deltaBytes, { kind: "retained_collectors" });
|
|
@@ -320,11 +371,18 @@ export function createRoutedCustomToolRestoreBlockRewrite(
|
|
|
320
371
|
&& itemName?.namespace === undefined
|
|
321
372
|
&& itemName?.name === "exec";
|
|
322
373
|
const mayNormalize = ownsFreeformGrammar && itemName?.name === "apply_patch";
|
|
323
|
-
if (
|
|
374
|
+
if (mayCompile && mayBecomePatchEnvelope(fullInput)) return [];
|
|
375
|
+
let streamInput = fullInput;
|
|
376
|
+
if (mayNormalize && mayBecomePatchEnvelope(fullInput)) {
|
|
377
|
+
const stablePrefix = stableCanonicalPatchPrefix(fullInput);
|
|
378
|
+
if (stablePrefix === null) return [];
|
|
379
|
+
streamInput = stablePrefix;
|
|
380
|
+
if (stablePrefix.length > 0) open.canonicalPatchProgress = true;
|
|
381
|
+
}
|
|
324
382
|
if (mayCompile && mayBecomeCodeModeShellInput(open.argumentsText, fullInput)) return [];
|
|
325
|
-
if (!
|
|
326
|
-
const inputDelta =
|
|
327
|
-
open.emittedInput =
|
|
383
|
+
if (!streamInput.startsWith(open.emittedInput) || streamInput.length === open.emittedInput.length) return [];
|
|
384
|
+
const inputDelta = streamInput.slice(open.emittedInput.length);
|
|
385
|
+
open.emittedInput = streamInput;
|
|
328
386
|
const nextType = "response.custom_tool_call_input.delta";
|
|
329
387
|
const next = {
|
|
330
388
|
...parsed,
|
|
@@ -351,6 +409,7 @@ export function createRoutedCustomToolRestoreBlockRewrite(
|
|
|
351
409
|
const helper = itemName?.aliased
|
|
352
410
|
? itemName.name
|
|
353
411
|
: resolveCodeModeHelperName(undefined, itemName?.name ?? "", source, itemName?.namespace, declaredNames);
|
|
412
|
+
assertProgressMatchesCompletion(upstreamItemId, source);
|
|
354
413
|
const next = {
|
|
355
414
|
...rest,
|
|
356
415
|
type: nextType,
|
|
@@ -362,8 +421,24 @@ export function createRoutedCustomToolRestoreBlockRewrite(
|
|
|
362
421
|
return [replaceSseDataPayload(replaceSseEventName(block, nextType), JSON.stringify(next))];
|
|
363
422
|
}
|
|
364
423
|
|
|
365
|
-
const restored = restoreRoutedCustomCalls(parsed, names, repairNames, declaredNames);
|
|
366
424
|
const terminal = type === "response.completed" || type === "response.failed" || type === "response.incomplete";
|
|
425
|
+
if (
|
|
426
|
+
type === "response.completed"
|
|
427
|
+
&& isPlainObject(parsed.response)
|
|
428
|
+
&& Array.isArray(parsed.response.output)
|
|
429
|
+
) {
|
|
430
|
+
for (const item of parsed.response.output) {
|
|
431
|
+
if (
|
|
432
|
+
isPlainObject(item)
|
|
433
|
+
&& item.type === "function_call"
|
|
434
|
+
&& typeof item.id === "string"
|
|
435
|
+
&& typeof item.arguments === "string"
|
|
436
|
+
) {
|
|
437
|
+
assertProgressMatchesCompletion(item.id, item.arguments);
|
|
438
|
+
}
|
|
439
|
+
}
|
|
440
|
+
}
|
|
441
|
+
const restored = restoreRoutedCustomCalls(parsed, names, repairNames, declaredNames);
|
|
367
442
|
if (terminal) releaseAll();
|
|
368
443
|
return restored.changed
|
|
369
444
|
? [replaceSseDataPayload(block, JSON.stringify(restored.value))]
|
|
@@ -61,7 +61,7 @@ export function imageGenToolCallAliases(
|
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
/** Recursively restore only exact image-gen function-call aliases in a parsed Responses payload. */
|
|
64
|
-
function restoreImageGenCalls(
|
|
64
|
+
export function restoreImageGenCalls(
|
|
65
65
|
value: unknown,
|
|
66
66
|
aliases: ReadonlyMap<string, NamespacedTool>,
|
|
67
67
|
): { value: unknown; changed: boolean } {
|
|
@@ -169,6 +169,9 @@ type OpenItem = {
|
|
|
169
169
|
/** The gateway sent content_part.done for this item. */
|
|
170
170
|
partDone: boolean;
|
|
171
171
|
text: string;
|
|
172
|
+
/** Exact UTF-8 size and boundary unit, without rescanning the accumulated text. */
|
|
173
|
+
textBytes: number;
|
|
174
|
+
lastCodeUnit: number;
|
|
172
175
|
item: Record<string, unknown>;
|
|
173
176
|
};
|
|
174
177
|
|
|
@@ -219,7 +222,7 @@ export function createResponsesSnapshotBlockRewrite(
|
|
|
219
222
|
const closeOpenItem = (index: number): void => {
|
|
220
223
|
const open = openItems.get(index);
|
|
221
224
|
if (!open) return;
|
|
222
|
-
aggregateOpenTextBytes -=
|
|
225
|
+
aggregateOpenTextBytes -= open.textBytes;
|
|
223
226
|
openItems.delete(index);
|
|
224
227
|
};
|
|
225
228
|
|
|
@@ -313,6 +316,8 @@ export function createResponsesSnapshotBlockRewrite(
|
|
|
313
316
|
textDone: false,
|
|
314
317
|
partDone: false,
|
|
315
318
|
text: "",
|
|
319
|
+
textBytes: 0,
|
|
320
|
+
lastCodeUnit: -1,
|
|
316
321
|
item: event.item,
|
|
317
322
|
});
|
|
318
323
|
}
|
|
@@ -407,12 +412,19 @@ export function createResponsesSnapshotBlockRewrite(
|
|
|
407
412
|
return [changed ? jsonBlock(nextEvent) : block];
|
|
408
413
|
}
|
|
409
414
|
if (open && (itemId === undefined || itemId === open.itemId)) {
|
|
410
|
-
|
|
415
|
+
let deltaBytes = Buffer.byteLength(event.delta, "utf8");
|
|
416
|
+
const first = event.delta.charCodeAt(0);
|
|
417
|
+
// Joining two isolated surrogate halves replaces two 3-byte replacements with 4 bytes.
|
|
418
|
+
if (open.lastCodeUnit >= 0xd800 && open.lastCodeUnit <= 0xdbff && first >= 0xdc00 && first <= 0xdfff) {
|
|
419
|
+
deltaBytes -= 2;
|
|
420
|
+
}
|
|
421
|
+
if (event.delta.length > 0) open.lastCodeUnit = event.delta.charCodeAt(event.delta.length - 1);
|
|
411
422
|
open.text += event.delta;
|
|
423
|
+
open.textBytes += deltaBytes;
|
|
412
424
|
aggregateOpenTextBytes += deltaBytes;
|
|
413
425
|
// Unbounded text accumulation is a retention hole (#893 review):
|
|
414
426
|
// overshoot per-item or aggregate caps and the stream goes fail-closed.
|
|
415
|
-
if (
|
|
427
|
+
if (open.textBytes > MAX_COMPLETED_OUTPUT_ITEM_SOURCE_BYTES
|
|
416
428
|
|| aggregateOpenTextBytes > MAX_OPEN_ITEM_AGGREGATE_TEXT_BYTES) {
|
|
417
429
|
taintAndRelease();
|
|
418
430
|
}
|
|
@@ -437,9 +449,11 @@ export function createResponsesSnapshotBlockRewrite(
|
|
|
437
449
|
if (typeof event.text === "string") {
|
|
438
450
|
// Replacement must keep the aggregate honest and bounded, the
|
|
439
451
|
// same as delta accumulation (#893 review).
|
|
440
|
-
const previousBytes =
|
|
452
|
+
const previousBytes = open.textBytes;
|
|
441
453
|
const nextBytes = Buffer.byteLength(event.text, "utf8");
|
|
442
454
|
open.text = event.text;
|
|
455
|
+
open.textBytes = nextBytes;
|
|
456
|
+
open.lastCodeUnit = event.text.charCodeAt(event.text.length - 1);
|
|
443
457
|
aggregateOpenTextBytes += nextBytes - previousBytes;
|
|
444
458
|
if (nextBytes > MAX_COMPLETED_OUTPUT_ITEM_SOURCE_BYTES
|
|
445
459
|
|| aggregateOpenTextBytes > MAX_OPEN_ITEM_AGGREGATE_TEXT_BYTES) {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { UNDECLARED_TOOL_CALL_ERROR_CODE } from "../lib/errors";
|
|
2
|
+
import { hasItemProvenance, isHistoricalItem } from "../responses/item-provenance";
|
|
2
3
|
import {
|
|
3
4
|
collectAmbiguousDottedAliases,
|
|
4
5
|
dottedAliasIsUnambiguous,
|
|
@@ -136,6 +137,9 @@ export function currentTurnWireToolCatalogBody(
|
|
|
136
137
|
replayPrefixLength: number | undefined,
|
|
137
138
|
): unknown {
|
|
138
139
|
if (!isPlainObject(body) || !Array.isArray(body.input)) return body;
|
|
140
|
+
if (body.input.some(hasItemProvenance)) {
|
|
141
|
+
return { ...body, input: body.input.filter(item => !isHistoricalItem(item)) };
|
|
142
|
+
}
|
|
139
143
|
if (typeof replayPrefixLength !== "number" || !Number.isFinite(replayPrefixLength)) return body;
|
|
140
144
|
const start = Math.min(body.input.length, Math.max(0, Math.trunc(replayPrefixLength)));
|
|
141
145
|
if (start === 0) return body;
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { lstatSync } from "node:fs";
|
|
2
|
+
import {
|
|
3
|
+
getPidPath, getRuntimePortPath, readPidFileValue, readRuntimePort, removePid, removeRuntimePort,
|
|
4
|
+
} from "../config/process-state";
|
|
5
|
+
import { acquireOwnershipMutationLease } from "../service/ownership-mutation-lease.mjs";
|
|
6
|
+
import { serviceStatePaths } from "../service/state";
|
|
7
|
+
|
|
8
|
+
function refusal(): Error {
|
|
9
|
+
return Object.assign(new Error("Restart parent ownership could not be retired safely"), {
|
|
10
|
+
code: "RESTART_PARENT_OWNERSHIP_UNVERIFIED",
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
/** Only ENOENT proves absence; an unreadable, malformed or linked record is not ours to retire. */
|
|
15
|
+
function recordExists(path: string): boolean {
|
|
16
|
+
try {
|
|
17
|
+
if (!lstatSync(path).isFile()) throw refusal();
|
|
18
|
+
return true;
|
|
19
|
+
} catch (error) {
|
|
20
|
+
if ((error as NodeJS.ErrnoException).code === "ENOENT") return false;
|
|
21
|
+
throw refusal();
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* Called only after completed drain and successful listener stop, before waiting for child health.
|
|
27
|
+
* The parent is still alive, but no longer owns a listener or startup recovery. Retire only this
|
|
28
|
+
* process's records under the same lease that serializes child recovery and publication. Ordinary
|
|
29
|
+
* live/unknown owners retain the startup fence; no child marker grants an exemption from it.
|
|
30
|
+
*/
|
|
31
|
+
export function retireRestartParentOwnership(port?: number): void {
|
|
32
|
+
const lease = acquireOwnershipMutationLease(serviceStatePaths());
|
|
33
|
+
try {
|
|
34
|
+
const pidPath = getPidPath(), runtimePath = getRuntimePortPath();
|
|
35
|
+
const hasPid = recordExists(pidPath), hasRuntime = recordExists(runtimePath);
|
|
36
|
+
const runtime = readRuntimePort();
|
|
37
|
+
if ((hasPid && readPidFileValue() !== process.pid)
|
|
38
|
+
|| (hasRuntime && (!runtime || runtime.pid !== process.pid
|
|
39
|
+
|| (port !== undefined && runtime.port !== port)))) throw refusal();
|
|
40
|
+
// Keep the alive-PID fence if runtime retirement fails. The helpers also recheck the PID
|
|
41
|
+
// immediately before unlink, so a successor's record is never unconditional cleanup.
|
|
42
|
+
if (hasRuntime) removeRuntimePort(process.pid);
|
|
43
|
+
if (recordExists(runtimePath)) throw refusal();
|
|
44
|
+
if (hasPid) removePid(process.pid);
|
|
45
|
+
if (recordExists(pidPath)) throw refusal();
|
|
46
|
+
} finally {
|
|
47
|
+
lease.release();
|
|
48
|
+
}
|
|
49
|
+
}
|
|
@@ -3,6 +3,8 @@ import { siblingOfLivePort, siblingSkipMessage } from "../codex/sibling-start";
|
|
|
3
3
|
import { deferralMatchesReceipt } from "../config/pending-teardown";
|
|
4
4
|
import { isDesktopSupervised } from "../lib/system-restart-contract";
|
|
5
5
|
import type { ManagementPrincipal } from "./management-auth";
|
|
6
|
+
import type { RestoreConfigOptions } from "../codex/inject/restore";
|
|
7
|
+
import { stopRestoreWriteGuard } from "../cli/stop-restore-guard";
|
|
6
8
|
|
|
7
9
|
/**
|
|
8
10
|
* Shared-teardown decision and execution for `POST /api/stop` (#3008).
|
|
@@ -15,6 +17,11 @@ import type { ManagementPrincipal } from "./management-auth";
|
|
|
15
17
|
|
|
16
18
|
export type GrokStripResult = { ok: boolean; changed: boolean; message: string };
|
|
17
19
|
|
|
20
|
+
// A verified receipt transfers shared restoration to the parent until this process exits.
|
|
21
|
+
// Keep this separate from recycling and connected-client capability/ownership decisions.
|
|
22
|
+
let sharedTeardownDeferredOnExit = false;
|
|
23
|
+
export function isSharedTeardownDeferredOnExit(): boolean { return sharedTeardownDeferredOnExit; }
|
|
24
|
+
|
|
18
25
|
/** Read-only promise covering API teardown and the CLI runtime's signal/manager exit cleanup. */
|
|
19
26
|
export function stopCapabilities() {
|
|
20
27
|
return { schema: "ocx-stop-capabilities/1", connectedClientOwnership: true, pid: process.pid };
|
|
@@ -27,7 +34,7 @@ export type StopTeardownIo = {
|
|
|
27
34
|
isHandoverReceipt?: (nonce: string | null) => boolean;
|
|
28
35
|
/** Keep Codex, Grok and env fences in place when this process exits. */
|
|
29
36
|
keepClientConfigOnExit?: () => void;
|
|
30
|
-
restoreNativeCodex?: () => Promise<CodexNativeRestoreResult>;
|
|
37
|
+
restoreNativeCodex?: (options?: RestoreConfigOptions) => Promise<CodexNativeRestoreResult>;
|
|
31
38
|
stripGrok?: () => GrokStripResult;
|
|
32
39
|
};
|
|
33
40
|
|
|
@@ -35,9 +42,24 @@ export type StopTeardownBody = {
|
|
|
35
42
|
success: boolean;
|
|
36
43
|
message: string;
|
|
37
44
|
/** `not-owned`: shared routing belongs to a live sibling owner or a client connection. */
|
|
38
|
-
sharedTeardown: "deferred" | "performed" | "not-owned";
|
|
45
|
+
sharedTeardown: "deferred" | "performed" | "not-owned" | "refused";
|
|
39
46
|
};
|
|
40
47
|
|
|
48
|
+
function stopOwnershipRefusal(): StopTeardownBody {
|
|
49
|
+
return { success: false, message: "Stop refused: client connection ownership may be changing; remaining restoration and obligations are preserved. Retry once connect or disconnect finishes.", sharedTeardown: "refused" };
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/** Read under C before manager mutation; every later write still revalidates independently. */
|
|
53
|
+
export function preflightStopTeardownOwnership(): StopTeardownBody | null {
|
|
54
|
+
const guard = stopRestoreWriteGuard();
|
|
55
|
+
try { guard.run(() => {}); }
|
|
56
|
+
catch (error) {
|
|
57
|
+
if (guard.boundary() === "unproven") return stopOwnershipRefusal();
|
|
58
|
+
if (guard.boundary() !== "hub-owned") throw error;
|
|
59
|
+
}
|
|
60
|
+
return null;
|
|
61
|
+
}
|
|
62
|
+
|
|
41
63
|
/**
|
|
42
64
|
* A deferral is honoured only when the caller proves it owns the obligation.
|
|
43
65
|
*
|
|
@@ -91,7 +113,9 @@ export async function performStopTeardown(url: URL, io: StopTeardownIo = {}): Pr
|
|
|
91
113
|
// A connection owns its integrations across stop/start, even for a successful API stop.
|
|
92
114
|
// This is persisted authority, not a caller's request to skip an obligation it owns.
|
|
93
115
|
const connection = (await import("../client/state")).readClientConnectionState();
|
|
94
|
-
|
|
116
|
+
// A Link Child's route is an unauthenticated loopback listener. Once this process exits,
|
|
117
|
+
// preserving that route would let another local process claim the released port.
|
|
118
|
+
if (connection.kind === "connected" && connection.value.transport !== "link") {
|
|
95
119
|
return {
|
|
96
120
|
success: true,
|
|
97
121
|
message: "Proxy stopping; connection-owned Codex routing, catalog and Grok config preserved. Run `ocx disconnect` to release them.",
|
|
@@ -100,6 +124,7 @@ export async function performStopTeardown(url: URL, io: StopTeardownIo = {}): Pr
|
|
|
100
124
|
}
|
|
101
125
|
const ownsReceipt = io.ownsReceipt ?? deferralMatchesReceipt;
|
|
102
126
|
if (deferralHonored(url, ownsReceipt)) {
|
|
127
|
+
sharedTeardownDeferredOnExit = true;
|
|
103
128
|
// A handover outlives this process: the exit cleanup would otherwise restore native
|
|
104
129
|
// Codex and put the pristine catalog back right after the stop kept them (#7423).
|
|
105
130
|
// Exiting as a recycle leaves them for the replacement, as a dashboard restart does.
|
|
@@ -124,12 +149,24 @@ export async function performStopTeardown(url: URL, io: StopTeardownIo = {}): Pr
|
|
|
124
149
|
sharedTeardown: "deferred",
|
|
125
150
|
};
|
|
126
151
|
}
|
|
127
|
-
const
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
:
|
|
152
|
+
const guard = stopRestoreWriteGuard();
|
|
153
|
+
let restore: CodexNativeRestoreResult;
|
|
154
|
+
let grok: GrokStripResult;
|
|
155
|
+
try {
|
|
156
|
+
guard.run(() => {}); // Refuse pending ownership before entering an asynchronous writer.
|
|
157
|
+
const options = { withWriteGuard: guard.run };
|
|
158
|
+
restore = io.restoreNativeCodex
|
|
159
|
+
? await io.restoreNativeCodex(options)
|
|
160
|
+
: await (await import("../codex/inject")).restoreNativeCodexAsync(options);
|
|
161
|
+
const strip = io.stripGrok ?? (await import("../grok/inject")).stripGrokConfig;
|
|
162
|
+
grok = guard.run(() => strip());
|
|
163
|
+
} catch (error) {
|
|
164
|
+
const boundary = guard.boundary();
|
|
165
|
+
if (boundary === "restore") throw error;
|
|
166
|
+
return boundary === "hub-owned"
|
|
167
|
+
? { success: true, message: "Proxy stopping; a hub connection owns Codex routing, catalog and Grok config, so restoration stopped.", sharedTeardown: "not-owned" }
|
|
168
|
+
: stopOwnershipRefusal();
|
|
169
|
+
}
|
|
133
170
|
// Success means BOTH halves came down. Deciding it from the native restore alone and
|
|
134
171
|
// appending the Grok text let a caller read `success: true` while the fence still
|
|
135
172
|
// pointed at a proxy that was exiting — the teardown reported done with half of it
|
|
@@ -137,7 +137,7 @@ function readNetstatAno(): string {
|
|
|
137
137
|
* Bare IPv6 rows (`::1`, `::`, etc.) are skipped (not coerced into IPv4 wildcards);
|
|
138
138
|
* IPv6 TCB reclamation is unsupported on this path.
|
|
139
139
|
*/
|
|
140
|
-
export function dropWindowsTcpRowsForLocalPort(port: number): WindowsTcpDropResult {
|
|
140
|
+
export function dropWindowsTcpRowsForLocalPort(port: number, mayMutate?: () => boolean): WindowsTcpDropResult {
|
|
141
141
|
if (process.platform !== "win32" || !Number.isFinite(port) || port <= 0) {
|
|
142
142
|
return { dropped: 0, skippedIpv6: 0, accessDenied: 0 };
|
|
143
143
|
}
|
|
@@ -171,8 +171,10 @@ export function dropWindowsTcpRowsForLocalPort(port: number): WindowsTcpDropResu
|
|
|
171
171
|
view.setUint32(8, htons(row.localPort), true);
|
|
172
172
|
view.setUint32(12, remoteDw, true);
|
|
173
173
|
view.setUint32(16, htons(row.remotePort), true);
|
|
174
|
+
const pointer = ptr(buf);
|
|
175
|
+
if (mayMutate && mayMutate() !== true) throw Object.assign(new Error("TCP deletion refused"), { code: "EUPDATEAUTHORITY" });
|
|
174
176
|
try {
|
|
175
|
-
const rc = setTcpEntry(
|
|
177
|
+
const rc = setTcpEntry(pointer);
|
|
176
178
|
if (rc === 0) dropped += 1;
|
|
177
179
|
// 5 = ERROR_ACCESS_DENIED, 317 = non-elevated SetTcpEntry (MSDN).
|
|
178
180
|
else if (rc === 5 || rc === 317) accessDenied += 1;
|
|
@@ -27,6 +27,7 @@ import {
|
|
|
27
27
|
type WorkflowLane,
|
|
28
28
|
type WorkflowSpendDenialDetail,
|
|
29
29
|
} from "../lib/workflow-budget";
|
|
30
|
+
import { currentWorkflowBudgetPolicy } from "../lib/workflow-budget-config";
|
|
30
31
|
|
|
31
32
|
/**
|
|
32
33
|
* What a caller needs to hand over for the refusal to become a row on `/api/logs`.
|
|
@@ -142,7 +143,7 @@ export function admitHttpWorkflowTurn(headers: Headers): WorkflowDecision | unde
|
|
|
142
143
|
const lane: WorkflowLane = rootId !== undefined && threadId !== undefined && threadId !== rootId
|
|
143
144
|
? "worker"
|
|
144
145
|
: "interactive";
|
|
145
|
-
return admitWorkflowTurn(rootId, lane,
|
|
146
|
+
return admitWorkflowTurn(rootId, lane, currentWorkflowBudgetPolicy(), threadId);
|
|
146
147
|
}
|
|
147
148
|
|
|
148
149
|
/**
|