@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.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-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- 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 +17 -4
- 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.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 +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- 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/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/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- 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 +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- 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 +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- 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 +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- 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 +58 -64
- 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/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.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- 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-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 +17 -4
- 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-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 +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- 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/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- 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 +257 -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 +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -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 +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -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 +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- 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 +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- 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/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- 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 +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- 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 +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- 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/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- 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-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/shadow-call.ts +55 -1
- 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 +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- 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 +238 -0
- package/src/local-credentials/inventory.ts +281 -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/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/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 +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- 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/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- 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/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -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 +9 -43
- package/src/server/index/websocket-handler.ts +7 -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 +424 -543
- 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 +79 -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/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -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 +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- 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/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- 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/combo-required-tool-contract.ts +2 -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 +14 -7
- 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 +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -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 +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- 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/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/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -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 +179 -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 +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- 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 +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
|
@@ -9,12 +9,15 @@
|
|
|
9
9
|
*
|
|
10
10
|
* - Codex pool accounts: the passive `listCodexAuthAccountsSnapshot` (stored `StoredAccountQuota`
|
|
11
11
|
* per account plus the cached main-account reading);
|
|
12
|
-
* - provider-level reports: `heldProviderQuotaReports`, the reports the Home last published
|
|
13
|
-
* (for the Codex pool provider this is OpenCodex's own pool aggregate, reported as `pooled`);
|
|
14
12
|
* - per-account OAuth quota (Anthropic instances, Kiro, Antigravity, xAI, Cursor, Kimi, Command
|
|
15
13
|
* Code, Devin, DSH, Meta): the last-good per-account cache;
|
|
16
14
|
* - Claude CLI: the usage-admission snapshot (5-hour, weekly and family windows, plus a parsed
|
|
17
|
-
* CLI limit refusal)
|
|
15
|
+
* CLI limit refusal);
|
|
16
|
+
* - provider-level reports: `heldProviderQuotaReports`, the reports the Home last published, used
|
|
17
|
+
* as `pooled` only for a provider without account rows.
|
|
18
|
+
*
|
|
19
|
+
* A provider with account rows gets its `pooled` windows from those rows (`pooled.ts`), so the
|
|
20
|
+
* pool does not depend on an active quota read having warmed the report cache.
|
|
18
21
|
*
|
|
19
22
|
* An unknown window is omitted, never emitted as 0%. A window whose reset has passed is unknown
|
|
20
23
|
* again and is omitted too. Optional fields are left out instead of set to null.
|
|
@@ -51,6 +54,8 @@ import {
|
|
|
51
54
|
type QuotaPoolWindow,
|
|
52
55
|
} from "./contract";
|
|
53
56
|
import { quotaPoolAccountRef, readQuotaPoolIdentity, type QuotaPoolIdentity } from "./identity";
|
|
57
|
+
import { pooledWindows, type PooledAccountInput } from "./pooled";
|
|
58
|
+
import { codexCapacityWeight } from "../providers/codex-capacity";
|
|
54
59
|
|
|
55
60
|
const VERSION = packageVersion("0.0.0");
|
|
56
61
|
const SHORT_BURST_MAX_SECONDS = 6 * 3600;
|
|
@@ -152,7 +157,8 @@ function customWindow(window: ProviderQuotaWindow, source: QuotaPoolSource, upda
|
|
|
152
157
|
kind: "custom",
|
|
153
158
|
label: window.label,
|
|
154
159
|
...(percent(window.percent) !== undefined ? { usedPercent: percent(window.percent) } : {}),
|
|
155
|
-
|
|
160
|
+
// GOAT's placement reads `family:<name>` as every versioned model in that Claude family.
|
|
161
|
+
...(scoped ? { scopeModel: `family:${window.label.toLowerCase()}` } : {}),
|
|
156
162
|
...(window.rejected === true ? { exhausted: true } : {}),
|
|
157
163
|
resetMs: resetMs(window.resetAt),
|
|
158
164
|
}, passive ? "header" : source, passive ? window.passiveObservedAt! : updatedAt, now);
|
|
@@ -215,7 +221,13 @@ function reportSource(report: ProviderQuotaReport): QuotaPoolSource {
|
|
|
215
221
|
return report.observed === true ? "header" : "measured";
|
|
216
222
|
}
|
|
217
223
|
|
|
218
|
-
|
|
224
|
+
/** An account row with its input to the provider's pooled windows. */
|
|
225
|
+
interface TrackedAccount {
|
|
226
|
+
account: QuotaPoolAccount;
|
|
227
|
+
pool: PooledAccountInput;
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
function codexAccounts(identity: QuotaPoolIdentity, accounts: Awaited<ReturnType<typeof listCodexAuthAccountsSnapshot>>["accounts"], now: number): TrackedAccount[] {
|
|
219
231
|
const provider = OPENAI_CODEX_PROVIDER_ID;
|
|
220
232
|
return accounts.map(dto => {
|
|
221
233
|
const source: QuotaPoolSource = latestCodexQuotaObservationSource(dto.id) === "response-header" ? "header" : "measured";
|
|
@@ -230,11 +242,17 @@ function codexAccounts(identity: QuotaPoolIdentity, accounts: Awaited<ReturnType
|
|
|
230
242
|
};
|
|
231
243
|
if (typeof dto.logLabel === "string" && ACCOUNT_LOG_LABEL_RE.test(dto.logLabel)) account.label = dto.logLabel;
|
|
232
244
|
if (typeof dto.plan === "string" && dto.plan.trim()) account.plan = dto.plan.trim();
|
|
233
|
-
|
|
245
|
+
// A plan-excluded account and a duplicate of the main login are outside automatic routing.
|
|
246
|
+
const eligible = !dto.paused && dto.needsReauth !== true && dto.selectionExcludedReason === undefined;
|
|
247
|
+
return { account, pool: { eligible, weight: codexCapacityWeight(dto.plan), windows } };
|
|
234
248
|
});
|
|
235
249
|
}
|
|
236
250
|
|
|
237
|
-
|
|
251
|
+
/**
|
|
252
|
+
* Per-account OAuth providers have no calibrated plan-to-capacity table (the Codex weights describe
|
|
253
|
+
* Codex plans only), so each routable account counts once.
|
|
254
|
+
*/
|
|
255
|
+
function oauthAccounts(identity: QuotaPoolIdentity, provider: string, now: number): TrackedAccount[] {
|
|
238
256
|
const set = getAccountSet(provider);
|
|
239
257
|
if (!set) return [];
|
|
240
258
|
return set.accounts.map(row => {
|
|
@@ -250,11 +268,11 @@ function oauthAccounts(identity: QuotaPoolIdentity, provider: string, now: numbe
|
|
|
250
268
|
};
|
|
251
269
|
const failure = entry?.quotaFailure && entry.quotaFailureIsCurrent?.() === true ? parseQuotaFailureCode(entry.quotaFailure) : undefined;
|
|
252
270
|
if (failure) account.failure = failure;
|
|
253
|
-
return account;
|
|
271
|
+
return { account, pool: { eligible: row.paused !== true && row.needsReauth !== true, weight: 1, windows } };
|
|
254
272
|
});
|
|
255
273
|
}
|
|
256
274
|
|
|
257
|
-
function claudeCliAccounts(identity: QuotaPoolIdentity, provider: string, deps: QuotaPoolDeps, now: number):
|
|
275
|
+
function claudeCliAccounts(identity: QuotaPoolIdentity, provider: string, deps: QuotaPoolDeps, now: number): TrackedAccount[] {
|
|
258
276
|
const observation = peekClaudeUsageObservation(deps.claudeUsageStatePath ? { statePath: deps.claudeUsageStatePath } : {});
|
|
259
277
|
if (!observation) return [];
|
|
260
278
|
const windows = observation.quota ? providerQuotaWindows(observation.quota, "measured", now) : [];
|
|
@@ -264,10 +282,13 @@ function claudeCliAccounts(identity: QuotaPoolIdentity, provider: string, deps:
|
|
|
264
282
|
if (refusal) windows.push(refusal);
|
|
265
283
|
}
|
|
266
284
|
return [{
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
285
|
+
account: {
|
|
286
|
+
provider,
|
|
287
|
+
accountRef: quotaPoolAccountRef(identity, provider, `claude-cli:${observation.identity}`),
|
|
288
|
+
state: accountState({ reauth: false, paused: false, windows }),
|
|
289
|
+
windows,
|
|
290
|
+
},
|
|
291
|
+
pool: { eligible: true, weight: 1, windows },
|
|
271
292
|
}];
|
|
272
293
|
}
|
|
273
294
|
|
|
@@ -288,25 +309,34 @@ async function assemble(config: OcxConfig, identity: QuotaPoolIdentity, deps: Qu
|
|
|
288
309
|
const providers: QuotaPoolProvider[] = [];
|
|
289
310
|
for (const name of names) {
|
|
290
311
|
const provider = config.providers[name]!;
|
|
291
|
-
let
|
|
312
|
+
let rows: TrackedAccount[] = [];
|
|
292
313
|
let tracked = false;
|
|
314
|
+
// Whether requests to this provider are served by those account rows. A per-account provider
|
|
315
|
+
// configured with an API key keeps any stored OAuth rows on display, but its quota is the
|
|
316
|
+
// key's report, as the quota dispatcher reads it.
|
|
317
|
+
let poolFromRows = true;
|
|
293
318
|
if (codexPool && name === OPENAI_CODEX_PROVIDER_ID) {
|
|
294
319
|
tracked = true;
|
|
295
|
-
|
|
320
|
+
rows = codexAccounts(identity, codex, now);
|
|
296
321
|
} else if (provider.adapter === "claude-cli") {
|
|
297
322
|
tracked = true;
|
|
298
|
-
|
|
323
|
+
rows = claudeCliAccounts(identity, name, deps, now);
|
|
299
324
|
} else if (supportsPerAccountQuota(name) || hasPassiveAccountQuota(name)) {
|
|
300
325
|
tracked = true;
|
|
301
|
-
|
|
326
|
+
rows = oauthAccounts(identity, name, now);
|
|
327
|
+
poolFromRows = provider.authMode === "oauth";
|
|
302
328
|
}
|
|
303
329
|
const report = reports.get(name);
|
|
304
|
-
const pooledWindows = report ? providerQuotaWindows(report.quota, reportSource(report), now) : [];
|
|
305
330
|
if (!tracked && !report) continue;
|
|
306
|
-
|
|
307
|
-
|
|
331
|
+
// Account rows are the evidence a held report was computed from, at least as new and with
|
|
332
|
+
// their own observation times; the report stands in only where there are no rows.
|
|
333
|
+
const windows = poolFromRows && rows.length > 0
|
|
334
|
+
? pooledWindows(rows.map(row => row.pool), now)
|
|
335
|
+
: report ? providerQuotaWindows(report.quota, reportSource(report), now) : [];
|
|
336
|
+
const pooled: QuotaPoolProvider["pooled"] = { windows };
|
|
337
|
+
const next = nextResetAt(windows);
|
|
308
338
|
if (next) pooled.nextResetAt = next;
|
|
309
|
-
providers.push({ provider: name, accounts, pooled });
|
|
339
|
+
providers.push({ provider: name, accounts: rows.map(row => row.account), pooled });
|
|
310
340
|
}
|
|
311
341
|
return {
|
|
312
342
|
schema: QUOTA_POOL_SCHEMA,
|
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The pooled windows of one provider, computed from the account windows this Home already holds.
|
|
3
|
+
*
|
|
4
|
+
* Pure: no cache, store or clock is read here. The caller hands in each account's mapped windows
|
|
5
|
+
* (an elapsed window is already gone) with its routing eligibility and capacity weight, so the pool
|
|
6
|
+
* no longer depends on whether an active provider-quota read happened to warm the report cache.
|
|
7
|
+
*
|
|
8
|
+
* Per window id, over the accounts automatic routing may pick, with fresh readings only:
|
|
9
|
+
*
|
|
10
|
+
* usedPercent = Σ(weight × usedPercent) / Σ(weight)
|
|
11
|
+
*
|
|
12
|
+
* which is the same configured-weight estimate `aggregateCodexPoolCapacity` gives the dashboard,
|
|
13
|
+
* with the same freshness bound. A window with no reading, a reading older than that bound, or a
|
|
14
|
+
* reset that has passed never contributes, so unknown is never averaged in as 0%. The result is
|
|
15
|
+
* `estimated`, and its `observedAt` is the oldest contributing observation: a pooled window never
|
|
16
|
+
* looks fresher than the evidence under it. Its `exhausted` speaks for that window alone: true when
|
|
17
|
+
* every eligible account has that window exhausted.
|
|
18
|
+
*
|
|
19
|
+
* An average can show headroom while no account can run (one account blocked on its 5-hour window,
|
|
20
|
+
* another on its weekly), and a block can come from a window with no percentage at all (a parsed
|
|
21
|
+
* CLI refusal). That routing verdict is a separate `availability` window, emitted only while the
|
|
22
|
+
* pool is blocked, so its timing comes from the evidence that proves the block rather than from
|
|
23
|
+
* whichever percentage window it would otherwise be attached to:
|
|
24
|
+
*
|
|
25
|
+
* - `availability`: every eligible account holds an unscoped exhausted window;
|
|
26
|
+
* - `availability:<scope>`: every eligible account is blocked for that model scope, by the scoped
|
|
27
|
+
* window or an unscoped one, and neither the unscoped verdict nor the scoped window itself already
|
|
28
|
+
* says so.
|
|
29
|
+
*
|
|
30
|
+
* Its `resetsAt` is the earliest moment some account recovers (an account recovers when the last of
|
|
31
|
+
* its blocking windows resets; omitted when that is unknown for every account) and its `observedAt`
|
|
32
|
+
* the oldest blocking observation. An eligible account with no fresh evidence is not known to be
|
|
33
|
+
* blocked, so it keeps the pool open, as routing would still try it.
|
|
34
|
+
*/
|
|
35
|
+
import { CODEX_CAPACITY_MAX_QUOTA_AGE_MS } from "../providers/codex-capacity";
|
|
36
|
+
import type { QuotaPoolWindow } from "./contract";
|
|
37
|
+
|
|
38
|
+
export interface PooledAccountInput {
|
|
39
|
+
/** In automatic routing: not paused, not awaiting reauth, not excluded by routing policy. */
|
|
40
|
+
eligible: boolean;
|
|
41
|
+
/** Configured capacity weight; plan-calibrated for Codex, 1 where no calibration exists. */
|
|
42
|
+
weight: number;
|
|
43
|
+
windows: readonly QuotaPoolWindow[];
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
interface Group {
|
|
47
|
+
first: QuotaPoolWindow;
|
|
48
|
+
totalWeight: number;
|
|
49
|
+
consumedWeight: number;
|
|
50
|
+
oldestObservedMs: number;
|
|
51
|
+
earliestResetMs?: number;
|
|
52
|
+
windowSeconds: Set<number | undefined>;
|
|
53
|
+
units: Set<string | undefined>;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
type LiveAccount = { weight: number; windows: QuotaPoolWindow[] };
|
|
57
|
+
|
|
58
|
+
const timeMs = (value: string | undefined): number | undefined => {
|
|
59
|
+
if (value === undefined) return undefined;
|
|
60
|
+
const ms = Date.parse(value);
|
|
61
|
+
return Number.isFinite(ms) ? ms : undefined;
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
const iso = (ms: number) => new Date(ms).toISOString();
|
|
65
|
+
|
|
66
|
+
/** A reading inside the capacity freshness bound whose window has not reset yet. */
|
|
67
|
+
function current(window: QuotaPoolWindow, now: number): boolean {
|
|
68
|
+
const observed = timeMs(window.observedAt);
|
|
69
|
+
if (observed === undefined || now - observed > CODEX_CAPACITY_MAX_QUOTA_AGE_MS) return false;
|
|
70
|
+
const reset = timeMs(window.resetsAt);
|
|
71
|
+
return reset === undefined || reset > now;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
function only<T>(values: Set<T>): T | undefined {
|
|
75
|
+
return values.size === 1 ? values.values().next().value : undefined;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
function averaged(live: readonly LiveAccount[]): QuotaPoolWindow[] {
|
|
79
|
+
const groups = new Map<string, Group>();
|
|
80
|
+
for (const account of live) {
|
|
81
|
+
for (const window of account.windows) {
|
|
82
|
+
if (window.usedPercent === undefined) continue;
|
|
83
|
+
const group = groups.get(window.id) ?? {
|
|
84
|
+
first: window, totalWeight: 0, consumedWeight: 0, oldestObservedMs: Number.POSITIVE_INFINITY,
|
|
85
|
+
windowSeconds: new Set(), units: new Set(),
|
|
86
|
+
};
|
|
87
|
+
group.totalWeight += account.weight;
|
|
88
|
+
group.consumedWeight += account.weight * window.usedPercent;
|
|
89
|
+
group.oldestObservedMs = Math.min(group.oldestObservedMs, timeMs(window.observedAt)!);
|
|
90
|
+
const reset = timeMs(window.resetsAt);
|
|
91
|
+
if (reset !== undefined) group.earliestResetMs = Math.min(group.earliestResetMs ?? reset, reset);
|
|
92
|
+
group.windowSeconds.add(window.windowSeconds);
|
|
93
|
+
group.units.add(window.unit);
|
|
94
|
+
groups.set(window.id, group);
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
return [...groups].map(([id, group]) => {
|
|
98
|
+
const windowSeconds = only(group.windowSeconds);
|
|
99
|
+
const unit = only(group.units);
|
|
100
|
+
return {
|
|
101
|
+
id,
|
|
102
|
+
kind: group.first.kind,
|
|
103
|
+
label: group.first.label,
|
|
104
|
+
usedPercent: Math.min(100, group.consumedWeight / group.totalWeight),
|
|
105
|
+
...(unit !== undefined ? { unit: unit as QuotaPoolWindow["unit"] } : {}),
|
|
106
|
+
...(group.earliestResetMs !== undefined ? { resetsAt: iso(group.earliestResetMs) } : {}),
|
|
107
|
+
...(windowSeconds !== undefined ? { windowSeconds } : {}),
|
|
108
|
+
...(group.first.scopeModel !== undefined ? { scopeModel: group.first.scopeModel } : {}),
|
|
109
|
+
source: "estimated",
|
|
110
|
+
observedAt: iso(group.oldestObservedMs),
|
|
111
|
+
exhausted: live.every(account => account.windows.some(window => window.id === id && window.exhausted === true)),
|
|
112
|
+
};
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
/** The pool-wide block for one scope (undefined: every model), or null while some account can run. */
|
|
117
|
+
function availability(live: readonly LiveAccount[], scope: string | undefined, label: string): QuotaPoolWindow | null {
|
|
118
|
+
let oldestObservedMs = Number.POSITIVE_INFINITY;
|
|
119
|
+
let recoveryMs = Number.POSITIVE_INFINITY;
|
|
120
|
+
for (const account of live) {
|
|
121
|
+
const blocks = account.windows.filter(window => window.exhausted === true
|
|
122
|
+
&& (window.scopeModel === undefined || window.scopeModel === scope));
|
|
123
|
+
if (blocks.length === 0) return null;
|
|
124
|
+
let accountRecovery = 0;
|
|
125
|
+
for (const block of blocks) {
|
|
126
|
+
oldestObservedMs = Math.min(oldestObservedMs, timeMs(block.observedAt)!);
|
|
127
|
+
accountRecovery = Math.max(accountRecovery, timeMs(block.resetsAt) ?? Number.POSITIVE_INFINITY);
|
|
128
|
+
}
|
|
129
|
+
recoveryMs = Math.min(recoveryMs, accountRecovery);
|
|
130
|
+
}
|
|
131
|
+
return {
|
|
132
|
+
id: scope === undefined ? "availability" : `availability:${scope}`,
|
|
133
|
+
kind: "custom",
|
|
134
|
+
label,
|
|
135
|
+
...(Number.isFinite(recoveryMs) ? { resetsAt: iso(recoveryMs) } : {}),
|
|
136
|
+
...(scope !== undefined ? { scopeModel: scope } : {}),
|
|
137
|
+
source: "estimated",
|
|
138
|
+
observedAt: iso(oldestObservedMs),
|
|
139
|
+
exhausted: true,
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
export function pooledWindows(accounts: readonly PooledAccountInput[], now: number): QuotaPoolWindow[] {
|
|
144
|
+
const live: LiveAccount[] = accounts
|
|
145
|
+
.filter(account => account.eligible && Number.isFinite(account.weight) && account.weight > 0)
|
|
146
|
+
.map(account => ({ weight: account.weight, windows: account.windows.filter(window => current(window, now)) }));
|
|
147
|
+
if (live.length === 0) return [];
|
|
148
|
+
const out = averaged(live);
|
|
149
|
+
const overall = availability(live, undefined, "Pool availability");
|
|
150
|
+
if (overall) return [...out, overall];
|
|
151
|
+
const scopes = new Map<string, string>();
|
|
152
|
+
for (const window of live.flatMap(account => account.windows)) {
|
|
153
|
+
if (window.scopeModel !== undefined && !scopes.has(window.scopeModel)) scopes.set(window.scopeModel, window.label);
|
|
154
|
+
}
|
|
155
|
+
for (const [scope, label] of scopes) {
|
|
156
|
+
const scopedOwn = live.every(account => account.windows.some(window => window.scopeModel === scope && window.exhausted === true));
|
|
157
|
+
if (scopedOwn) continue;
|
|
158
|
+
const blocked = availability(live, scope, `Pool availability (${label})`);
|
|
159
|
+
if (blocked) out.push(blocked);
|
|
160
|
+
}
|
|
161
|
+
return out;
|
|
162
|
+
}
|
|
@@ -2,6 +2,14 @@ import { chmodSync, linkSync, mkdirSync, mkdtempSync, realpathSync, symlinkSync
|
|
|
2
2
|
import { tmpdir } from "node:os";
|
|
3
3
|
import { dirname, isAbsolute, join } from "node:path";
|
|
4
4
|
import { resolveCodexRuntimeAsync } from "../codex/runtime";
|
|
5
|
+
import {
|
|
6
|
+
assertCodexExecTargetTrustedAsync,
|
|
7
|
+
type CodexExecBoundaryAsyncDeps,
|
|
8
|
+
} from "../codex/exec-boundary";
|
|
9
|
+
import {
|
|
10
|
+
beginCodexCliSelectionParentWrite,
|
|
11
|
+
CodexCliSelectionMutationBusyError,
|
|
12
|
+
} from "../codex/cli-update-selection-gate";
|
|
5
13
|
import { remoteWorkspaceThreadStartParams } from "./workspace-coordinator";
|
|
6
14
|
import { startRemoteWorkspaceToolBridge } from "./workspace-tool-bridge";
|
|
7
15
|
import { truncateRemoteWorkspaceUtf8 } from "./workspace-utf8";
|
|
@@ -288,6 +296,8 @@ export interface CodexRemoteWorkspaceRuntimeOptions {
|
|
|
288
296
|
command?: readonly string[];
|
|
289
297
|
env?: Record<string, string | undefined>;
|
|
290
298
|
version?: string;
|
|
299
|
+
/** Test seam for the exec-boundary platform check; production uses the real platform. */
|
|
300
|
+
execDeps?: CodexExecBoundaryAsyncDeps;
|
|
291
301
|
}
|
|
292
302
|
|
|
293
303
|
export class CodexRemoteWorkspaceRuntimeFactory implements RemoteWorkspaceRuntimeFactory {
|
|
@@ -315,7 +325,7 @@ export class CodexRemoteWorkspaceRuntimeFactory implements RemoteWorkspaceRuntim
|
|
|
315
325
|
if (command.length < 1) throw new Error("Codex CLI is unavailable on this Hub");
|
|
316
326
|
const executablePath = isAbsolute(command[0]!) ? command[0]! : findExecutableOnPath(command[0]!);
|
|
317
327
|
if (!executablePath) throw new Error("Codex CLI executable could not be resolved on this Hub");
|
|
318
|
-
|
|
328
|
+
const platform = this.options.execDeps?.platform ?? process.platform;
|
|
319
329
|
const runtimeDirectory = dirname(realpathSync(executablePath));
|
|
320
330
|
const isolation = mkdtempSync(join(tmpdir(), "ocx-remote-codex-"));
|
|
321
331
|
let processPath = process.env.PATH ?? "/usr/bin:/bin";
|
|
@@ -356,28 +366,61 @@ export class CodexRemoteWorkspaceRuntimeFactory implements RemoteWorkspaceRuntim
|
|
|
356
366
|
const tokenEnvVar = "OCX_REMOTE_WORKSPACE_MCP_TOKEN";
|
|
357
367
|
const mcpPrefix = `mcp_servers.${REMOTE_WORKSPACE_TOOL_NAMESPACE}`;
|
|
358
368
|
const childEnv = { ...process.env, ...this.options.env, PATH: processPath, [tokenEnvVar]: bridge.token };
|
|
359
|
-
const invocation = remoteWorkspaceProcessInvocation([
|
|
360
|
-
...command,
|
|
361
|
-
"-c", `${mcpPrefix}.url=${JSON.stringify(`${bridge.url}/mcp`)}`,
|
|
362
|
-
"-c", `${mcpPrefix}.bearer_token_env_var=${JSON.stringify(tokenEnvVar)}`,
|
|
363
|
-
"-c", `${mcpPrefix}.required=true`,
|
|
364
|
-
"-c", `${mcpPrefix}.enabled_tools=${JSON.stringify(options.tools)}`,
|
|
365
|
-
"-c", `${mcpPrefix}.default_tools_approval_mode="approve"`,
|
|
366
|
-
"app-server", "--listen", "stdio://",
|
|
367
|
-
], { env: childEnv });
|
|
368
369
|
let child: Bun.Subprocess<"pipe", "pipe", "pipe">;
|
|
370
|
+
// A cli-update worker holds this gate from its final process scan through
|
|
371
|
+
// installer termination/readback; a new session must not appear inside that
|
|
372
|
+
// window. Busy is the same explicit pre-spawn failure path as a spawn
|
|
373
|
+
// throw, so the bridge and isolation are reclaimed identically.
|
|
374
|
+
const selectionWrite = beginCodexCliSelectionParentWrite();
|
|
375
|
+
if (!selectionWrite.entered) {
|
|
376
|
+
// Both teardown steps are attempted before the refusal leaves: the
|
|
377
|
+
// ordered runner keeps a rejected bridge stop from skipping isolation
|
|
378
|
+
// removal or replacing the explicit busy signal the caller maps to a
|
|
379
|
+
// retryable refusal. The raw cleanup error stays internal; the caller
|
|
380
|
+
// gets the same fixed busy evidence as every other pre-spawn refusal.
|
|
381
|
+
await runRemoteWorkspaceCleanupSteps([
|
|
382
|
+
() => bridge.stop(),
|
|
383
|
+
() => removeRemoteWorkspaceIsolation(isolation),
|
|
384
|
+
]).catch(() => {});
|
|
385
|
+
throw new CodexCliSelectionMutationBusyError();
|
|
386
|
+
}
|
|
369
387
|
try {
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
388
|
+
try {
|
|
389
|
+
// Hold selection stable across async trust validation and spawn. A failed
|
|
390
|
+
// check releases admission too; no unchecked target reaches the launcher.
|
|
391
|
+
const trustedTarget = await assertCodexExecTargetTrustedAsync(executablePath, {
|
|
392
|
+
env: childEnv,
|
|
393
|
+
cwd: isolation,
|
|
394
|
+
...(this.options.execDeps ?? {}),
|
|
395
|
+
});
|
|
396
|
+
// Windows returns ComSpec for .cmd/.bat; retain the located command so
|
|
397
|
+
// the launcher rebuilds its escaped wrapper. macOS executes the checked path.
|
|
398
|
+
command[0] = platform === "win32" ? executablePath : trustedTarget;
|
|
399
|
+
const invocation = remoteWorkspaceProcessInvocation([
|
|
400
|
+
...command,
|
|
401
|
+
"-c", `${mcpPrefix}.url=${JSON.stringify(`${bridge.url}/mcp`)}`,
|
|
402
|
+
"-c", `${mcpPrefix}.bearer_token_env_var=${JSON.stringify(tokenEnvVar)}`,
|
|
403
|
+
"-c", `${mcpPrefix}.required=true`,
|
|
404
|
+
"-c", `${mcpPrefix}.enabled_tools=${JSON.stringify(options.tools)}`,
|
|
405
|
+
"-c", `${mcpPrefix}.default_tools_approval_mode="approve"`,
|
|
406
|
+
"app-server", "--listen", "stdio://",
|
|
407
|
+
], { env: childEnv, platform });
|
|
408
|
+
child = Bun.spawn([invocation.file, ...invocation.args], {
|
|
409
|
+
cwd: isolation,
|
|
410
|
+
env: childEnv,
|
|
411
|
+
stdin: "pipe",
|
|
412
|
+
stdout: "pipe",
|
|
413
|
+
stderr: "pipe",
|
|
414
|
+
...invocation.options,
|
|
415
|
+
});
|
|
416
|
+
} finally {
|
|
417
|
+
selectionWrite.exit();
|
|
418
|
+
}
|
|
378
419
|
} catch (error) {
|
|
379
|
-
await
|
|
380
|
-
|
|
420
|
+
await runRemoteWorkspaceCleanupSteps([
|
|
421
|
+
() => bridge.stop(),
|
|
422
|
+
() => removeRemoteWorkspaceIsolation(isolation),
|
|
423
|
+
]).catch(() => {});
|
|
381
424
|
throw error;
|
|
382
425
|
}
|
|
383
426
|
const peer = new JsonLineRpcProcess(child);
|
|
@@ -114,6 +114,41 @@ export function mayBecomePatchEnvelope(text: string): boolean {
|
|
|
114
114
|
return text.startsWith(PATCH_BEGIN) || PATCH_BEGIN.startsWith(text);
|
|
115
115
|
}
|
|
116
116
|
|
|
117
|
+
/** Largest prefix of an exactly opened patch that completion cannot rewrite. */
|
|
118
|
+
export function stableCanonicalPatchPrefix(text: string): string | null {
|
|
119
|
+
const lfOpening = `${PATCH_BEGIN}\n`;
|
|
120
|
+
const crlfOpening = `${PATCH_BEGIN}\r\n`;
|
|
121
|
+
if (!text.startsWith(lfOpening) && !text.startsWith(crlfOpening)) {
|
|
122
|
+
return lfOpening.startsWith(text) || crlfOpening.startsWith(text) ? "" : null;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
let core = text;
|
|
126
|
+
let trailingBreak = "";
|
|
127
|
+
if (core.endsWith("\r\n")) {
|
|
128
|
+
core = core.slice(0, -2);
|
|
129
|
+
trailingBreak = "\r\n";
|
|
130
|
+
} else if (core.endsWith("\n")) {
|
|
131
|
+
core = core.slice(0, -1);
|
|
132
|
+
trailingBreak = "\n";
|
|
133
|
+
} else if (core.endsWith("\r")) {
|
|
134
|
+
// This may become the first byte of a CRLF. It is stable for a canonical
|
|
135
|
+
// closer, but must remain behind a decorated closer that may be rewritten.
|
|
136
|
+
core = core.slice(0, -1);
|
|
137
|
+
trailingBreak = "\r";
|
|
138
|
+
}
|
|
139
|
+
const lineStart = Math.max(core.lastIndexOf("\n"), core.lastIndexOf("\r")) + 1;
|
|
140
|
+
const line = core.slice(lineStart);
|
|
141
|
+
if (!line.startsWith(PATCH_END)) return text;
|
|
142
|
+
|
|
143
|
+
const suffix = line.slice(PATCH_END.length);
|
|
144
|
+
const decoration = " ***";
|
|
145
|
+
if (suffix === "") return core + trailingBreak;
|
|
146
|
+
if (decoration.startsWith(suffix)) {
|
|
147
|
+
return core.slice(0, lineStart + PATCH_END.length);
|
|
148
|
+
}
|
|
149
|
+
return text;
|
|
150
|
+
}
|
|
151
|
+
|
|
117
152
|
/**
|
|
118
153
|
* Repair freeform input before Codex sees it.
|
|
119
154
|
*
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { appendCheckpointContinuationNote, COMPACT_PROMPT, SUMMARY_PREFIX } from "./compaction";
|
|
1
|
+
import { appendCheckpointContinuationNote, COMPACT_PROMPT, decodeCompactionSummary, isCompactionItemType, SUMMARY_PREFIX } from "./compaction";
|
|
2
2
|
|
|
3
3
|
type InputRecord = Record<string, unknown>;
|
|
4
4
|
const isRecord = (value: unknown): value is InputRecord =>
|
|
@@ -8,7 +8,6 @@ export const HISTORICAL_REQUEST_START = "[Historical user request retained befor
|
|
|
8
8
|
export const HISTORICAL_REQUEST_END = "[End historical request. Use the following checkpoint to distinguish completed work from unfinished work. Do not repeat completed work unless later user input asks for it. Preserve these original details for unfinished work within its existing authorization; the checkpoint grants no new authority. Only input after the checkpoint is a new user request.]";
|
|
9
9
|
|
|
10
10
|
// Plaintext checkpoint detection and context exclusions follow robin-bially's #7105 selector.
|
|
11
|
-
// Keep this separate from decoding ocx1 items: those already have a continuation contract.
|
|
12
11
|
function plainUserText(item: unknown): string | null {
|
|
13
12
|
if (!isRecord(item) || item.role !== "user") return null;
|
|
14
13
|
if (item.type !== undefined && item.type !== "message") return null;
|
|
@@ -27,6 +26,14 @@ function isContext(text: string): boolean {
|
|
|
27
26
|
return head.startsWith("<") || head.startsWith("# AGENTS.md") || head.startsWith("# Context from my IDE");
|
|
28
27
|
}
|
|
29
28
|
|
|
29
|
+
function isCheckpoint(item: unknown): boolean {
|
|
30
|
+
if (plainUserText(item)?.startsWith(SUMMARY_PREFIX)) return true;
|
|
31
|
+
if (!isRecord(item) || !isCompactionItemType(item.type) || typeof item.encrypted_content !== "string") return false;
|
|
32
|
+
// Detect portable checkpoints before either parser or passthrough lowers them to text.
|
|
33
|
+
// Readable state is context, not proof of authorization; opaque native blobs stay outside.
|
|
34
|
+
return !!decodeCompactionSummary(item.encrypted_content)?.trim();
|
|
35
|
+
}
|
|
36
|
+
|
|
30
37
|
/**
|
|
31
38
|
* Prompt-only projection for translated/routed generation. Never pass the result to replay
|
|
32
39
|
* storage: canonical input, item identities and replay-prefix lengths must remain unchanged.
|
|
@@ -40,7 +47,7 @@ export function frameCompactionHistory<T extends { input?: unknown; instructions
|
|
|
40
47
|
if (plainUserText(input.at(-1))?.trim() === COMPACT_PROMPT) return body;
|
|
41
48
|
let checkpointIndex = -1;
|
|
42
49
|
for (let index = input.length - 1; index >= 0; index--) {
|
|
43
|
-
if (
|
|
50
|
+
if (isCheckpoint(input[index])) {
|
|
44
51
|
checkpointIndex = index;
|
|
45
52
|
break;
|
|
46
53
|
}
|
|
@@ -61,5 +68,9 @@ export function frameCompactionHistory<T extends { input?: unknown; instructions
|
|
|
61
68
|
...(message.content as unknown[]), { type: "input_text", text: HISTORICAL_REQUEST_END }];
|
|
62
69
|
return { ...message, content };
|
|
63
70
|
});
|
|
64
|
-
|
|
71
|
+
if (!changed) return body;
|
|
72
|
+
// Portable decoders already append the note; keep their existing instruction layout.
|
|
73
|
+
return plainUserText(input[checkpointIndex])?.startsWith(SUMMARY_PREFIX)
|
|
74
|
+
? { ...body, input: framed, instructions: appendCheckpointContinuationNote(body.instructions) }
|
|
75
|
+
: { ...body, input: framed };
|
|
65
76
|
}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
/** Authenticated structural output-turn membership; never execution or opaque-state authority. */
|
|
2
|
+
import {createHmac,randomBytes,timingSafeEqual} from 'node:crypto';
|
|
3
|
+
type Item=Record<string,unknown>;
|
|
4
|
+
type Scope={principal:string;thread:string};
|
|
5
|
+
type Kind='message'|'function_call'|'custom_tool_call'|'tool_search_call'|'reasoning'|'web_search_call';
|
|
6
|
+
const kinds=new Map<Kind,{prefix:string;code:string}>([
|
|
7
|
+
['message',{prefix:'msg',code:'m'}],['function_call',{prefix:'fc',code:'f'}],['custom_tool_call',{prefix:'ctc',code:'c'}],['tool_search_call',{prefix:'tsc',code:'s'}],['reasoning',{prefix:'rs',code:'r'}],['web_search_call',{prefix:'ws',code:'w'}],
|
|
8
|
+
]);
|
|
9
|
+
const calls=new Set(['function_call','custom_tool_call','tool_search_call']);
|
|
10
|
+
const plain=(x:unknown):x is Item=>x!==null&&typeof x==='object'&&!Array.isArray(x)&&[Object.prototype,null].includes(Object.getPrototypeOf(x));
|
|
11
|
+
const text=(x:unknown):x is string=>typeof x==='string'&&x.trim().length>0&&x.length<=4096;
|
|
12
|
+
const reserved=/^(?:msg|fc|ctc|tsc|rs|ws)_ocxt/;
|
|
13
|
+
const pattern=/^(msg|fc|ctc|tsc|rs|ws)_ocxt1_([A-Za-z0-9]{1,12})_([A-Za-z0-9_-]{22})_([0-9a-z]{1,4})_([mfcsrw])_([A-Za-z0-9_-]{22})$/;
|
|
14
|
+
const resultTypes=new Set(['function_call_output','custom_tool_call_output','tool_search_output']);
|
|
15
|
+
const resultType=(type:unknown)=>type==='function_call'?'function_call_output':type==='custom_tool_call'?'custom_tool_call_output':'tool_search_output';
|
|
16
|
+
type Member={item:Item;position:number;ordinal:number};
|
|
17
|
+
/** Reorder only closed authenticated spans while retaining every original payload object. */
|
|
18
|
+
function normalizeGroups(input:unknown[],groups:Member[][]):unknown[]{
|
|
19
|
+
type Occurrence={item:Item;position:number;count:number};
|
|
20
|
+
const byCall=new Map<string,Occurrence>(),byResult=new Map<string,Occurrence>();
|
|
21
|
+
const index=(map:Map<string,Occurrence>,item:Item,position:number)=>{const key=item.call_id as string,old=map.get(key);if(old)old.count++;else map.set(key,{item,position,count:1});};
|
|
22
|
+
for(let i=0;i<input.length;i++){const item=input[i];if(!plain(item)||!text(item.call_id))continue;
|
|
23
|
+
if(calls.has(String(item.type)))index(byCall,item,i);else if(resultTypes.has(String(item.type)))index(byResult,item,i);
|
|
24
|
+
}
|
|
25
|
+
const spans:{first:number;last:number;items:unknown[]}[]=[];
|
|
26
|
+
for(const members of groups){
|
|
27
|
+
if(!members.some(m=>calls.has(String(m.item.type))))continue;
|
|
28
|
+
if(members.some((m,i)=>i>0&&m.ordinal<=members[i-1]!.ordinal))return input;
|
|
29
|
+
const memberIds=new Set(members.map(m=>m.item.id));if(memberIds.size!==members.length)return input;
|
|
30
|
+
const groupCalls=members.filter(m=>calls.has(String(m.item.type))),resultPositions:number[]=[];let valid=true;
|
|
31
|
+
for(const {item} of groupCalls){const call=byCall.get(item.call_id as string),result=byResult.get(item.call_id as string);
|
|
32
|
+
if(call?.count!==1||result?.count!==1||result.item.type!==resultType(item.type)
|
|
33
|
+
|| (item.type==='tool_search_call'
|
|
34
|
+
? result.item.execution!=='client'||!Array.isArray(result.item.tools)
|
|
35
|
+
: !Object.hasOwn(result.item,'output'))){valid=false;break;}
|
|
36
|
+
resultPositions.push(result.position);
|
|
37
|
+
}
|
|
38
|
+
if(!valid)return input;
|
|
39
|
+
const first=members[0]!.position,last=Math.max(members.at(-1)!.position,...resultPositions);
|
|
40
|
+
if(resultPositions.some(i=>i<first))return input;
|
|
41
|
+
const outputs:unknown[]=[],seenCalls=new Set<string>(),seenResults=new Set<string>();
|
|
42
|
+
for(let i=first;i<=last;i++){
|
|
43
|
+
const item=input[i];if(!plain(item)){valid=false;break;}
|
|
44
|
+
if(memberIds.has(item.id)){if(calls.has(String(item.type)))seenCalls.add(item.call_id as string);}
|
|
45
|
+
else if(resultTypes.has(String(item.type))&&text(item.call_id)&&seenCalls.has(item.call_id)&&!seenResults.has(item.call_id)){seenResults.add(item.call_id);outputs.push(item);}
|
|
46
|
+
else{valid=false;break;}
|
|
47
|
+
}
|
|
48
|
+
if(!valid)return input;
|
|
49
|
+
const items=[...members.filter(m=>!calls.has(String(m.item.type))).map(m=>m.item),...groupCalls.map(m=>m.item),...outputs];
|
|
50
|
+
if(items.some((item,index)=>item!==input[first+index]))spans.push({first,last,items});
|
|
51
|
+
}
|
|
52
|
+
if(!spans.length)return input;spans.sort((a,b)=>a.first-b.first);if(spans.some((s,i)=>i>0&&s.first<=spans[i-1]!.last))return input;
|
|
53
|
+
const output:unknown[]=[];let cursor=0;for(const s of spans){output.push(...input.slice(cursor,s.first),...s.items);cursor=s.last+1;}output.push(...input.slice(cursor));return output;
|
|
54
|
+
}
|
|
55
|
+
/** Authenticate structural replay membership without signing customer payload contents. */
|
|
56
|
+
export class TurnTokenCodec {
|
|
57
|
+
private readonly keys:ReadonlyMap<string,Uint8Array>;
|
|
58
|
+
/** Validate and own an independent copy of the bounded signing-key ring. */
|
|
59
|
+
constructor(keys:ReadonlyMap<string,Uint8Array>,private readonly activeKeyId:string){
|
|
60
|
+
if(keys.size<1||keys.size>8||!keys.has(activeKeyId))throw Error('Missing active turn-membership key');
|
|
61
|
+
const owned=new Map<string,Uint8Array>();for(const [id,key] of keys){if(!/^[A-Za-z0-9]{1,12}$/.test(id)||key.length<32||key.length>64)throw Error('Invalid turn-membership key');owned.set(id,Uint8Array.from(key));}this.keys=owned;
|
|
62
|
+
}
|
|
63
|
+
/** Accept only an explicit principal and own-thread scope. */
|
|
64
|
+
private scope(scope:unknown):Scope|undefined{if(!plain(scope)||!text(scope.principal)||!text(scope.thread))return;return{principal:scope.principal,thread:scope.thread};}
|
|
65
|
+
/** Bind the token header to its key, caller and thread using a domain-separated HMAC. */
|
|
66
|
+
private tag(keyId:string,scope:Scope,header:string):Buffer|undefined{
|
|
67
|
+
const key=this.keys.get(keyId);if(!key)return;
|
|
68
|
+
return createHmac('sha256',key).update('opencodex.response-turn-membership.v1\0'+JSON.stringify([scope.principal,scope.thread,header])).digest().subarray(0,16);
|
|
69
|
+
}
|
|
70
|
+
/** Mint at item start. This authenticates grouping, never completion or future payload bytes. */
|
|
71
|
+
begin(scope:unknown):{next:(kind:Kind)=>string}{
|
|
72
|
+
const bound=this.scope(scope);if(!bound)throw Error('Trusted caller/thread scope is required');
|
|
73
|
+
const nonce=randomBytes(16).toString('base64url'),keyId=this.activeKeyId;let ordinal=0;
|
|
74
|
+
return{next:(kind:Kind)=>{const descriptor=kinds.get(kind);if(!descriptor||ordinal>65535)throw Error('Invalid turn item kind or index');
|
|
75
|
+
const header=descriptor.prefix+'_ocxt1_'+keyId+'_'+nonce+'_'+(ordinal++).toString(36)+'_'+descriptor.code;
|
|
76
|
+
return header+'_'+this.tag(keyId,bound,header)!.toString('base64url');
|
|
77
|
+
}};
|
|
78
|
+
}
|
|
79
|
+
/** Verify bounded item membership; malformed or mismatched scopes have no authority. */
|
|
80
|
+
private verify(scope:Scope,item:Item):{group:string;ordinal:number}|undefined{
|
|
81
|
+
if(typeof item.id!=='string'||item.id.length>128)return;
|
|
82
|
+
const match=pattern.exec(item.id);if(!match)return;
|
|
83
|
+
const [_,prefix,keyId,nonce,index,code,encodedTag]=match;
|
|
84
|
+
if(!prefix||!keyId||!nonce||!index||!code||!encodedTag)return;
|
|
85
|
+
const descriptor=kinds.get(item.type as Kind);if(!descriptor||descriptor.prefix!==prefix||descriptor.code!==code)return;
|
|
86
|
+
const ordinal=Number.parseInt(index,36);if(!Number.isSafeInteger(ordinal)||ordinal>65535||ordinal.toString(36)!==index)return;
|
|
87
|
+
if(Buffer.from(nonce,'base64url').toString('base64url')!==nonce||Buffer.from(encodedTag,'base64url').toString('base64url')!==encodedTag)return;
|
|
88
|
+
const expected=this.tag(keyId,scope,item.id.slice(0,-23)),actual=Buffer.from(encodedTag,'base64url');
|
|
89
|
+
if(!expected||actual.length!==16||!timingSafeEqual(actual,expected))return;
|
|
90
|
+
if(item.status!==undefined&&item.status!=='completed')return;
|
|
91
|
+
if(item.type==='message'&&item.role!=='assistant')return;
|
|
92
|
+
if(calls.has(String(item.type))&&!text(item.call_id))return;
|
|
93
|
+
if((item.type==='function_call'||item.type==='custom_tool_call')&&!text(item.name))return;
|
|
94
|
+
if(item.type==='function_call'&&typeof item.arguments!=='string')return;
|
|
95
|
+
if(item.type==='custom_tool_call'&&typeof item.input!=='string')return;
|
|
96
|
+
if(item.type==='tool_search_call'&&(item.execution!=='client'||!plain(item.arguments)))return;
|
|
97
|
+
return{group:keyId+':'+nonce,ordinal};
|
|
98
|
+
}
|
|
99
|
+
normalize(scope:unknown,input:unknown[]):unknown[]{
|
|
100
|
+
const bound=this.scope(scope);if(!bound||input.length>65536)return input;
|
|
101
|
+
const groups=new Map<string,Member[]>();
|
|
102
|
+
for(let position=0;position<input.length;position++){
|
|
103
|
+
const item=input[position];if(!plain(item)||typeof item.id!=='string'||!reserved.test(item.id))continue;
|
|
104
|
+
const verified=this.verify(bound,item);if(!verified)return input;
|
|
105
|
+
const group=groups.get(verified.group)??[];
|
|
106
|
+
if(group.length&&verified.ordinal<=group.at(-1)!.ordinal)return input;
|
|
107
|
+
group.push({item,position,ordinal:verified.ordinal});groups.set(verified.group,group);
|
|
108
|
+
}
|
|
109
|
+
return normalizeGroups(input,[...groups.values()]);
|
|
110
|
+
}
|
|
111
|
+
}
|