@bitkyc08/opencodex 2.100.2 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +36 -13
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -11,6 +11,11 @@
|
|
|
11
11
|
//! Lock order everywhere: local lifecycle lock, then this lock, then the daemon start gate.
|
|
12
12
|
//! The guarantee covers ocx-child against ocx-child; a full OpenCodex install is detected
|
|
13
13
|
//! separately by `journal::assert_no_full_ocx_conflict`.
|
|
14
|
+
//!
|
|
15
|
+
//! Schema /2 adds the id of the link an attach is for. Attach writes it while holding both
|
|
16
|
+
//! locks, in the attaching phase, before any `CODEX_HOME` write, so a later
|
|
17
|
+
//! `detach --expect-link` can tell which link a leftover attachment belongs to. A /1 record
|
|
18
|
+
//! (written by an older ocx-child, or by the adoption path below) names no link.
|
|
14
19
|
|
|
15
20
|
use std::fs;
|
|
16
21
|
use std::io::{self, Read};
|
|
@@ -23,11 +28,15 @@ use crate::platform::{
|
|
|
23
28
|
DirectoryIdentity, FileLock, LockAcquireError, constant_time_eq, directory_identity,
|
|
24
29
|
random_hex, reject_symlink, write_private_atomic, write_regular_atomic,
|
|
25
30
|
};
|
|
31
|
+
use crate::relay_auth::is_valid_link_id;
|
|
26
32
|
use crate::state::ChildPaths;
|
|
27
33
|
|
|
28
34
|
pub const CODEX_HOME_LOCK_FILE: &str = ".ocx-child.lock";
|
|
29
35
|
pub const CODEX_HOME_OWNER_FILE: &str = ".ocx-child-owner.json";
|
|
36
|
+
/// Record without a link id: older ocx-child, or an adopted pre-ownership attachment.
|
|
30
37
|
pub const CODEX_HOME_OWNER_SCHEMA: &str = "ocx.child.codex-home-owner/1";
|
|
38
|
+
/// Record naming the link the attach was for.
|
|
39
|
+
pub const CODEX_HOME_OWNER_SCHEMA_V2: &str = "ocx.child.codex-home-owner/2";
|
|
31
40
|
const MAX_OWNER_RECORD_BYTES: u64 = 16 * 1024;
|
|
32
41
|
|
|
33
42
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
|
@@ -50,6 +59,9 @@ pub struct CodexHomeOwnerRecord {
|
|
|
50
59
|
pub codex_home: String,
|
|
51
60
|
pub codex_home_identity: DirectoryIdentity,
|
|
52
61
|
pub phase: OwnershipPhase,
|
|
62
|
+
/// Present exactly in schema /2: the link this attachment is for.
|
|
63
|
+
#[serde(default, skip_serializing_if = "Option::is_none")]
|
|
64
|
+
pub link_id: Option<String>,
|
|
53
65
|
}
|
|
54
66
|
|
|
55
67
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
@@ -117,7 +129,10 @@ pub struct CodexHomeGuard {
|
|
|
117
129
|
codex_identity: DirectoryIdentity,
|
|
118
130
|
owner: Option<CodexHomeOwnerRecord>,
|
|
119
131
|
newly_claimed: bool,
|
|
120
|
-
|
|
132
|
+
/// The record an attach replaced, restored exactly by `revert_claim`.
|
|
133
|
+
record_before_claim: Option<CodexHomeOwnerRecord>,
|
|
134
|
+
/// Link an attach claims the home for; recorded as schema /2.
|
|
135
|
+
attach_link: Option<String>,
|
|
121
136
|
}
|
|
122
137
|
|
|
123
138
|
fn canonical_utf8(path: &Path, what: &str) -> Result<(PathBuf, String), CodexHomeError> {
|
|
@@ -155,6 +170,36 @@ impl CodexHomeGuard {
|
|
|
155
170
|
blocking: bool,
|
|
156
171
|
create_codex_home_if_missing: bool,
|
|
157
172
|
policy: ClaimPolicy,
|
|
173
|
+
) -> Result<Self, CodexHomeError> {
|
|
174
|
+
Self::acquire_inner(paths, blocking, create_codex_home_if_missing, policy, None)
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
/// Lock `CODEX_HOME` for an attach to `link_id`: the ownership record names that link
|
|
178
|
+
/// (schema /2, phase attaching) before this returns, so before any `CODEX_HOME` write.
|
|
179
|
+
pub fn acquire_for_attach(
|
|
180
|
+
paths: &ChildPaths,
|
|
181
|
+
blocking: bool,
|
|
182
|
+
create_codex_home_if_missing: bool,
|
|
183
|
+
link_id: &str,
|
|
184
|
+
) -> Result<Self, CodexHomeError> {
|
|
185
|
+
if !is_valid_link_id(link_id) {
|
|
186
|
+
return Err(CodexHomeError::Refused("invalid link id".to_owned()));
|
|
187
|
+
}
|
|
188
|
+
Self::acquire_inner(
|
|
189
|
+
paths,
|
|
190
|
+
blocking,
|
|
191
|
+
create_codex_home_if_missing,
|
|
192
|
+
ClaimPolicy::Attach,
|
|
193
|
+
Some(link_id.to_owned()),
|
|
194
|
+
)
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
fn acquire_inner(
|
|
198
|
+
paths: &ChildPaths,
|
|
199
|
+
blocking: bool,
|
|
200
|
+
create_codex_home_if_missing: bool,
|
|
201
|
+
policy: ClaimPolicy,
|
|
202
|
+
attach_link: Option<String>,
|
|
158
203
|
) -> Result<Self, CodexHomeError> {
|
|
159
204
|
if create_codex_home_if_missing {
|
|
160
205
|
create_codex_home(&paths.codex_home)?;
|
|
@@ -184,7 +229,8 @@ impl CodexHomeGuard {
|
|
|
184
229
|
codex_identity,
|
|
185
230
|
owner: None,
|
|
186
231
|
newly_claimed: false,
|
|
187
|
-
|
|
232
|
+
record_before_claim: None,
|
|
233
|
+
attach_link,
|
|
188
234
|
};
|
|
189
235
|
// The directory could have been replaced between resolution and locking.
|
|
190
236
|
guard.verify_homes().map_err(CodexHomeError::Refused)?;
|
|
@@ -210,6 +256,11 @@ impl CodexHomeGuard {
|
|
|
210
256
|
self.owner.as_ref().map(|r| r.phase)
|
|
211
257
|
}
|
|
212
258
|
|
|
259
|
+
/// The ownership record this guard holds, when the home is ours.
|
|
260
|
+
pub fn owner_record(&self) -> Option<&CodexHomeOwnerRecord> {
|
|
261
|
+
self.owner.as_ref()
|
|
262
|
+
}
|
|
263
|
+
|
|
213
264
|
/// Confirm both homes are still the directories identified when the lock was taken.
|
|
214
265
|
pub fn verify_homes(&self) -> Result<(), String> {
|
|
215
266
|
let ocx = directory_identity(&self.paths.opencodex_home)
|
|
@@ -267,8 +318,13 @@ impl CodexHomeGuard {
|
|
|
267
318
|
}
|
|
268
319
|
let record: CodexHomeOwnerRecord =
|
|
269
320
|
serde_json::from_slice(&bytes).map_err(|e| corrupt(e.to_string()))?;
|
|
270
|
-
|
|
271
|
-
|
|
321
|
+
match (record.schema.as_str(), record.link_id.as_deref()) {
|
|
322
|
+
(CODEX_HOME_OWNER_SCHEMA, None) => {}
|
|
323
|
+
(CODEX_HOME_OWNER_SCHEMA_V2, Some(id)) if is_valid_link_id(id) => {}
|
|
324
|
+
(CODEX_HOME_OWNER_SCHEMA | CODEX_HOME_OWNER_SCHEMA_V2, _) => {
|
|
325
|
+
return Err(corrupt("link id does not match the schema".to_owned()));
|
|
326
|
+
}
|
|
327
|
+
_ => return Err(corrupt(format!("unsupported schema {}", record.schema))),
|
|
272
328
|
}
|
|
273
329
|
let ours = record.opencodex_home == path_text(&self.paths.opencodex_home)
|
|
274
330
|
&& record.opencodex_home_identity == self.opencodex_identity
|
|
@@ -325,9 +381,21 @@ impl CodexHomeGuard {
|
|
|
325
381
|
))
|
|
326
382
|
}
|
|
327
383
|
(ClaimPolicy::Attach, _) => {
|
|
328
|
-
|
|
329
|
-
self.
|
|
330
|
-
|
|
384
|
+
let previous = self.owner.clone();
|
|
385
|
+
self.record_before_claim = previous.clone();
|
|
386
|
+
match (previous, self.attach_link.clone()) {
|
|
387
|
+
(Some(mut record), Some(link_id)) => {
|
|
388
|
+
record.schema = CODEX_HOME_OWNER_SCHEMA_V2.to_owned();
|
|
389
|
+
record.link_id = Some(link_id);
|
|
390
|
+
record.phase = OwnershipPhase::Attaching;
|
|
391
|
+
self.write_record(&record).map_err(CodexHomeError::Io)?;
|
|
392
|
+
self.owner = Some(record);
|
|
393
|
+
Ok(())
|
|
394
|
+
}
|
|
395
|
+
_ => self
|
|
396
|
+
.set_phase(OwnershipPhase::Attaching)
|
|
397
|
+
.map_err(CodexHomeError::Io),
|
|
398
|
+
}
|
|
331
399
|
}
|
|
332
400
|
(ClaimPolicy::Continue, _) => Ok(()),
|
|
333
401
|
}
|
|
@@ -339,10 +407,11 @@ impl CodexHomeGuard {
|
|
|
339
407
|
// second ownership record; journal validation reports the conflict.
|
|
340
408
|
validate_existing_journal_paths(&self.paths)
|
|
341
409
|
.map_err(CodexHomeError::Refused)?;
|
|
342
|
-
self.claim(OwnershipPhase::Attaching)
|
|
410
|
+
self.claim(OwnershipPhase::Attaching, self.attach_link.clone())
|
|
343
411
|
}
|
|
344
412
|
ClaimPolicy::Continue => match validate_existing_journal_paths(&self.paths) {
|
|
345
|
-
|
|
413
|
+
// Adopting a pre-ownership attachment: the link is not known here.
|
|
414
|
+
Ok(true) => self.claim(OwnershipPhase::Attached, None),
|
|
346
415
|
Ok(false) => Ok(()),
|
|
347
416
|
Err(e) => Err(CodexHomeError::Refused(e)),
|
|
348
417
|
},
|
|
@@ -350,7 +419,11 @@ impl CodexHomeGuard {
|
|
|
350
419
|
}
|
|
351
420
|
}
|
|
352
421
|
|
|
353
|
-
fn claim(
|
|
422
|
+
fn claim(
|
|
423
|
+
&mut self,
|
|
424
|
+
phase: OwnershipPhase,
|
|
425
|
+
link_id: Option<String>,
|
|
426
|
+
) -> Result<(), CodexHomeError> {
|
|
354
427
|
let owner_id = match self.local_owner_id().map_err(CodexHomeError::Io)? {
|
|
355
428
|
Some(id) => id,
|
|
356
429
|
None => {
|
|
@@ -361,13 +434,19 @@ impl CodexHomeGuard {
|
|
|
361
434
|
}
|
|
362
435
|
};
|
|
363
436
|
let record = CodexHomeOwnerRecord {
|
|
364
|
-
schema:
|
|
437
|
+
schema: if link_id.is_some() {
|
|
438
|
+
CODEX_HOME_OWNER_SCHEMA_V2
|
|
439
|
+
} else {
|
|
440
|
+
CODEX_HOME_OWNER_SCHEMA
|
|
441
|
+
}
|
|
442
|
+
.to_owned(),
|
|
365
443
|
owner_id,
|
|
366
444
|
opencodex_home: path_text(&self.paths.opencodex_home),
|
|
367
445
|
opencodex_home_identity: self.opencodex_identity.clone(),
|
|
368
446
|
codex_home: path_text(&self.paths.codex_home),
|
|
369
447
|
codex_home_identity: self.codex_identity.clone(),
|
|
370
448
|
phase,
|
|
449
|
+
link_id,
|
|
371
450
|
};
|
|
372
451
|
self.write_record(&record).map_err(CodexHomeError::Io)?;
|
|
373
452
|
self.owner = Some(record);
|
|
@@ -398,13 +477,18 @@ impl CodexHomeGuard {
|
|
|
398
477
|
}
|
|
399
478
|
|
|
400
479
|
/// Undo this guard's claim after an attach failed without leaving changes behind: release
|
|
401
|
-
/// a record this guard created, or put back the
|
|
480
|
+
/// a record this guard created, or put back the record an attach replaced, link id included.
|
|
402
481
|
pub fn revert_claim(&mut self) -> Result<(), String> {
|
|
403
482
|
if self.newly_claimed {
|
|
404
483
|
return self.release();
|
|
405
484
|
}
|
|
406
|
-
match self.
|
|
407
|
-
Some(
|
|
485
|
+
match self.record_before_claim.take() {
|
|
486
|
+
Some(record) if self.owner.as_ref() != Some(&record) => {
|
|
487
|
+
self.write_record(&record)?;
|
|
488
|
+
self.owner = Some(record);
|
|
489
|
+
Ok(())
|
|
490
|
+
}
|
|
491
|
+
Some(_) => Ok(()),
|
|
408
492
|
None => Ok(()),
|
|
409
493
|
}
|
|
410
494
|
}
|
|
@@ -94,7 +94,8 @@ pub fn ensure_port_available_for_attach(port: u16, owned_pid: Option<u32>) -> Re
|
|
|
94
94
|
Ok(())
|
|
95
95
|
}
|
|
96
96
|
|
|
97
|
-
|
|
97
|
+
/// The authenticated shutdown `stop_owned_daemon` sends (public for the link WebSocket's integration test).
|
|
98
|
+
pub fn send_attested_shutdown(port: u16, shutdown_secret: &str) -> bool {
|
|
98
99
|
let Ok(nonce) = random_hex(32) else {
|
|
99
100
|
return false;
|
|
100
101
|
};
|