@bitkyc08/opencodex 2.100.5 → 2.100.6
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 +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -8,6 +8,7 @@ import { windowsSecretAclReapPendingAtOrBelow } from "../lib/windows-secret-acl"
|
|
|
8
8
|
import { supportsDesktopPicker } from "../claude/desktop-picker-platform";
|
|
9
9
|
import { sharedTeardownAuthorized, type UninstallObservation } from "./uninstall-plan";
|
|
10
10
|
import { cleanupOwnedIntegrationsBeforeUninstall } from "./uninstall-integrations";
|
|
11
|
+
import { disconnectRecordedGatewayClients, productionGatewayClientContext } from "../integrations/gateway-clients";
|
|
11
12
|
|
|
12
13
|
/** Outcome of retiring the Desktop picker profile and every picker root this install trusted. */
|
|
13
14
|
export interface PickerUninstallCleanup { ok: boolean; residual?: string[] }
|
|
@@ -19,6 +20,7 @@ export interface UninstallClientStateDeps {
|
|
|
19
20
|
disconnect: (options?: Parameters<typeof disconnectClient>[0]) => Promise<unknown>;
|
|
20
21
|
withLifecycle: typeof withClientLifecycle;
|
|
21
22
|
cleanupIntegrations: typeof cleanupOwnedIntegrationsBeforeUninstall;
|
|
23
|
+
gatewayContext: typeof productionGatewayClientContext;
|
|
22
24
|
remove: () => ConfigRemovalResult;
|
|
23
25
|
/** True while a timed-out icacls child still owns a path at or below the config directory. */
|
|
24
26
|
aclReapPending: (rootPath: string) => boolean;
|
|
@@ -50,6 +52,7 @@ const defaults: UninstallClientStateDeps = {
|
|
|
50
52
|
disconnect: options => disconnectClient(options),
|
|
51
53
|
withLifecycle: withClientLifecycle,
|
|
52
54
|
cleanupIntegrations: cleanupOwnedIntegrationsBeforeUninstall,
|
|
55
|
+
gatewayContext: productionGatewayClientContext,
|
|
53
56
|
remove: () => removeOwnedConfigState(getConfigDir()),
|
|
54
57
|
aclReapPending: rootPath => windowsSecretAclReapPendingAtOrBelow(rootPath),
|
|
55
58
|
removePickerArtifacts: removePickerArtifactsBeforeUninstall,
|
|
@@ -63,6 +66,9 @@ export async function removeOwnedConfigAfterDesktopCleanup(
|
|
|
63
66
|
if (!sharedTeardownAuthorized(observed)) {
|
|
64
67
|
throw new Error("Client cleanup refused: service or proxy teardown is not proven.");
|
|
65
68
|
}
|
|
69
|
+
if (typeof deps?.gatewayContext !== "function") {
|
|
70
|
+
throw new Error("Client cleanup refused: injected dependencies require a gateway context.");
|
|
71
|
+
}
|
|
66
72
|
// A rerun after an interrupted uninstall finds the tombstone; this process's own cleanup steps
|
|
67
73
|
// (picker, disconnect, integrations) still register state, which the remover below then removes.
|
|
68
74
|
const endTeardown = beginConfigOwnershipTeardown();
|
|
@@ -134,6 +140,7 @@ async function removeOwnedConfigInTeardown(deps: UninstallClientStateDeps): Prom
|
|
|
134
140
|
// Integration records are the authority that permits removing only OpenCodex-owned fragments
|
|
135
141
|
// from third-party files. Delete them only after every recorded contribution is retired.
|
|
136
142
|
await deps.cleanupIntegrations();
|
|
143
|
+
disconnectRecordedGatewayClients(deps.gatewayContext(), held);
|
|
137
144
|
return deps.remove();
|
|
138
145
|
});
|
|
139
146
|
}
|
package/src/client/connect.ts
CHANGED
|
@@ -54,6 +54,7 @@ import {
|
|
|
54
54
|
writeServiceApiTokenFile,
|
|
55
55
|
} from "../lib/service-secrets";
|
|
56
56
|
import { MAX_REMOTE_CATALOG_BYTES } from "../server/catalog-download";
|
|
57
|
+
import { readHubCredential, removeHubCredential, writeHubCredential, type HubRelayCredential } from "./hub-session";
|
|
57
58
|
import type {
|
|
58
59
|
OcxClientConnectionConfig,
|
|
59
60
|
OcxConfig,
|
|
@@ -69,7 +70,9 @@ import {
|
|
|
69
70
|
issueClientKey,
|
|
70
71
|
normalizeHubOrigin,
|
|
71
72
|
probeClientKeyId,
|
|
73
|
+
requestHubRelayCredential,
|
|
72
74
|
revokeClientKey,
|
|
75
|
+
revokeHubRelayLease,
|
|
73
76
|
startClientKeyRotation,
|
|
74
77
|
type ConnectGuiSession,
|
|
75
78
|
type IssuedClientKey,
|
|
@@ -250,6 +253,29 @@ function localGuiOrigin(): string {
|
|
|
250
253
|
return `http://localhost:${Number.isInteger(port) && port > 0 ? port : 10100}`;
|
|
251
254
|
}
|
|
252
255
|
|
|
256
|
+
type ConnectCredential = { kind: "admin"; value: Uint8Array } | { kind: "gui-session"; value: ConnectGuiSession };
|
|
257
|
+
|
|
258
|
+
async function provisionHubRelay(
|
|
259
|
+
connection: OcxClientConnectionConfig, authority: ConnectCredential, key: string, fetchImpl?: typeof fetch,
|
|
260
|
+
): Promise<HubRelayCredential | null> {
|
|
261
|
+
try {
|
|
262
|
+
return await requestHubRelayCredential(connection.managementUrl, authority, connection.apiKeyId, key, fetchImpl);
|
|
263
|
+
} catch {
|
|
264
|
+
console.warn("Warning: Hub relay credential unavailable. Local management reads require a current Hub relay credential.");
|
|
265
|
+
return null;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
/** The caller holds the configuration mutation lock for this connection generation. */
|
|
270
|
+
function persistHubRelay(connection: OcxClientConnectionConfig, credential: HubRelayCredential | null): void {
|
|
271
|
+
try {
|
|
272
|
+
if (credential) writeHubCredential(credential, connection);
|
|
273
|
+
else removeHubCredential();
|
|
274
|
+
} catch {
|
|
275
|
+
console.warn("Warning: could not update the local Hub relay credential.");
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
|
|
253
279
|
function clientKeyName(): string {
|
|
254
280
|
const raw = `ocx connect ${hostname() || "client"}`;
|
|
255
281
|
return raw.slice(0, 80);
|
|
@@ -267,7 +293,7 @@ async function rotationAuthority(
|
|
|
267
293
|
connection: OcxClientConnectionConfig,
|
|
268
294
|
options: RotateClientOptions,
|
|
269
295
|
deps: ClientConnectDeps,
|
|
270
|
-
): Promise<
|
|
296
|
+
): Promise<ConnectCredential> {
|
|
271
297
|
if (options.credential.kind === "admin") return { kind: "admin", value: options.credential.value };
|
|
272
298
|
const session = await exchangeConnectPairingGrant(
|
|
273
299
|
connection.managementUrl,
|
|
@@ -278,6 +304,22 @@ async function rotationAuthority(
|
|
|
278
304
|
return { kind: "gui-session", value: session };
|
|
279
305
|
}
|
|
280
306
|
|
|
307
|
+
async function replaceHubRelayCredential(
|
|
308
|
+
connection: ClientRotationResult, authority: ConnectCredential, key: string, deps: ClientConnectDeps,
|
|
309
|
+
): Promise<ClientRotationResult> {
|
|
310
|
+
const credential = await provisionHubRelay(connection, authority, key, deps.fetchImpl);
|
|
311
|
+
const { rotationOutcome: _rotationOutcome, ...committed } = connection;
|
|
312
|
+
try {
|
|
313
|
+
withConfigMutationLockSync(() => {
|
|
314
|
+
assertClientConnectionUnchanged(committed);
|
|
315
|
+
persistHubRelay(committed, credential);
|
|
316
|
+
});
|
|
317
|
+
} catch {
|
|
318
|
+
console.warn("Warning: the Hub key rotated but the local relay credential could not be published.");
|
|
319
|
+
}
|
|
320
|
+
return connection;
|
|
321
|
+
}
|
|
322
|
+
|
|
281
323
|
export type ClientRotationResult = OcxClientConnectionConfig & {
|
|
282
324
|
rotationOutcome: "committed" | "rolled_back";
|
|
283
325
|
};
|
|
@@ -368,7 +410,7 @@ function finalizeRotation(
|
|
|
368
410
|
async function recoverRotationWithAuthority(
|
|
369
411
|
held: ClientLifecycleHeld,
|
|
370
412
|
connection: OcxClientConnectionConfig,
|
|
371
|
-
authority:
|
|
413
|
+
authority: ConnectCredential,
|
|
372
414
|
deps: ClientConnectDeps,
|
|
373
415
|
): Promise<ClientRotationResult> {
|
|
374
416
|
try {
|
|
@@ -404,10 +446,10 @@ async function recoverRotationWithAuthority(
|
|
|
404
446
|
alignDesktopCredential(held, connection, backup.fingerprint, current);
|
|
405
447
|
await commitClientKeyRotation(connection.managementUrl, authority, connection.apiKeyId, pending.rotationId, { fetchImpl: deps.fetchImpl });
|
|
406
448
|
assertFresh();
|
|
407
|
-
return finalizeRotation(held, connection, backup.fingerprint, current, "committed");
|
|
449
|
+
return await replaceHubRelayCredential(finalizeRotation(held, connection, backup.fingerprint, current, "committed"), authority, current.token, deps);
|
|
408
450
|
}
|
|
409
451
|
if (currentAccepted && !backupAccepted) {
|
|
410
|
-
return finalizeRotation(held, connection, backup.fingerprint, current, "committed");
|
|
452
|
+
return await replaceHubRelayCredential(finalizeRotation(held, connection, backup.fingerprint, current, "committed"), authority, current.token, deps);
|
|
411
453
|
}
|
|
412
454
|
if (!currentAccepted && backupAccepted) {
|
|
413
455
|
// Remote abort is confirmed before either local credential is rolled back.
|
|
@@ -434,7 +476,6 @@ export async function recoverPendingClientRotation(
|
|
|
434
476
|
if (state.kind !== "connected" || !state.value.pendingOperation) throw new Error("no pending client key rotation to recover");
|
|
435
477
|
if (isLinkConnection(state.value)) throw new Error("connect rotate is unavailable in link mode");
|
|
436
478
|
const authority = await rotationAuthority(state.value, options, deps);
|
|
437
|
-
assertClientConnectionUnchanged(state.value);
|
|
438
479
|
return recoverRotationWithAuthority(held, state.value, authority, deps);
|
|
439
480
|
}, deps.lifecycleLockDeps);
|
|
440
481
|
} finally { releaseCredential(options.credential); }
|
|
@@ -455,7 +496,7 @@ async function rotateConnectedClientKeyHeld(
|
|
|
455
496
|
deps: ClientConnectDeps,
|
|
456
497
|
): Promise<ClientRotationResult> {
|
|
457
498
|
let connection: OcxClientConnectionConfig | null = null;
|
|
458
|
-
let authority:
|
|
499
|
+
let authority: ConnectCredential | null = null;
|
|
459
500
|
let started: { rotationId: string; key: string; createdAt: string } | null = null;
|
|
460
501
|
let markerPersisted = false;
|
|
461
502
|
let backupCreated = false;
|
|
@@ -485,7 +526,6 @@ async function rotateConnectedClientKeyHeld(
|
|
|
485
526
|
});
|
|
486
527
|
}
|
|
487
528
|
authority = await rotationAuthority(connection, options, deps);
|
|
488
|
-
assertClientConnectionUnchanged(connection);
|
|
489
529
|
if (connection.pendingOperation) return recoverRotationWithAuthority(held, connection, authority, deps);
|
|
490
530
|
withConfigMutationLockSync(() => {
|
|
491
531
|
assertClientConnectionUnchanged(connection!);
|
|
@@ -522,7 +562,8 @@ async function rotateConnectedClientKeyHeld(
|
|
|
522
562
|
return await recoverRotationWithAuthority(held, connection, authority, deps);
|
|
523
563
|
}
|
|
524
564
|
hubCommitted = true;
|
|
525
|
-
|
|
565
|
+
const finalized = finalizeRotation(held, connection, current.fingerprint, { token: rotation.key, fingerprint: replacement.fingerprint }, "committed");
|
|
566
|
+
return await replaceHubRelayCredential(finalized, authority, rotation.key, deps);
|
|
526
567
|
} catch (error) {
|
|
527
568
|
if (error instanceof RotationRecoveryRequiredError || hubCommitted) {
|
|
528
569
|
throw error instanceof RotationRecoveryRequiredError ? error : new RotationRecoveryRequiredError("committed rotation requires local recovery");
|
|
@@ -563,7 +604,7 @@ async function rotateConnectedClientKeyHeld(
|
|
|
563
604
|
|
|
564
605
|
async function cleanupIssuedKey(
|
|
565
606
|
managementUrl: string,
|
|
566
|
-
credential:
|
|
607
|
+
credential: ConnectCredential,
|
|
567
608
|
issuedId: string,
|
|
568
609
|
deps: ClientConnectDeps,
|
|
569
610
|
): Promise<string | null> {
|
|
@@ -624,7 +665,7 @@ async function connectClientUnlocked(
|
|
|
624
665
|
let linkMode = false;
|
|
625
666
|
let linkMetadata: { tunnelPort: number; linkId: string } | undefined;
|
|
626
667
|
let issued: IssuedClientKey | null = null;
|
|
627
|
-
let cleanupCredential:
|
|
668
|
+
let cleanupCredential: ConnectCredential | null = null;
|
|
628
669
|
let tokenFingerprint: string | null = null;
|
|
629
670
|
let pendingConnectFingerprint: string | null = null;
|
|
630
671
|
let priorCatalog: CatalogSnapshot | null = null;
|
|
@@ -830,6 +871,9 @@ async function connectClientUnlocked(
|
|
|
830
871
|
catalogSyncedAt: now,
|
|
831
872
|
...(linkMode ? { transport: "link" as const, link: linkMetadata } : {}),
|
|
832
873
|
};
|
|
874
|
+
const relayCredential = cleanupCredential && issued
|
|
875
|
+
? await provisionHubRelay(connection, cleanupCredential, issued.key, fetchImpl)
|
|
876
|
+
: null;
|
|
833
877
|
withClientLifecycleSync(() => withConfigMutationLockSync(() => {
|
|
834
878
|
assertActiveConnectingState(persisted.fingerprint);
|
|
835
879
|
if (linkMetadata && options.selectedClientsExplicit) {
|
|
@@ -841,6 +885,7 @@ async function connectClientUnlocked(
|
|
|
841
885
|
clearClientConnectPending(persisted.fingerprint);
|
|
842
886
|
commitClientConnection(connection);
|
|
843
887
|
committed = true;
|
|
888
|
+
if (!linkMode) persistHubRelay(connection, relayCredential);
|
|
844
889
|
}), deps.lifecycleLockDeps);
|
|
845
890
|
// Only now does the routing belong to this connection: take over a journal another owner wrote
|
|
846
891
|
// (src/codex/journal.ts adoptJournalForClient). A failure keeps the connection; sync retries.
|
|
@@ -1384,7 +1429,7 @@ function drainLoneNativeIntentOriginals(lifecycleLockDeps?: ClientLifecycleLockD
|
|
|
1384
1429
|
|
|
1385
1430
|
export async function disconnectClient(
|
|
1386
1431
|
options: Parameters<typeof disconnectClientAttempt>[0] = {},
|
|
1387
|
-
deps: Pick<ClientConnectDeps, "lifecycleLockDeps"> = {},
|
|
1432
|
+
deps: Pick<ClientConnectDeps, "lifecycleLockDeps" | "fetchImpl"> = {},
|
|
1388
1433
|
): ReturnType<typeof disconnectClientAttempt> {
|
|
1389
1434
|
// The attempt lock is a file under the config directory: wait for parent ACL admission first,
|
|
1390
1435
|
// as every other phase does, so nothing is created under a directory still being hardened.
|
|
@@ -1394,7 +1439,7 @@ export async function disconnectClient(
|
|
|
1394
1439
|
|
|
1395
1440
|
async function disconnectClientAttempt(
|
|
1396
1441
|
options: { keepCatalog?: boolean; expectedOwner?: DesktopRemoteOwner; expectLink?: string; recoverConfig?: boolean } = {},
|
|
1397
|
-
deps: Pick<ClientConnectDeps, "lifecycleLockDeps"> = {},
|
|
1442
|
+
deps: Pick<ClientConnectDeps, "lifecycleLockDeps" | "fetchImpl"> = {},
|
|
1398
1443
|
): Promise<{
|
|
1399
1444
|
restored: boolean; tokenRemoved: boolean; catalogRemoved: boolean; catalogRestored: boolean; apiKeyId: string;
|
|
1400
1445
|
desktopRestoration?: "owned_projection" | "standard_fallback" | "selection_preserved";
|
|
@@ -1472,7 +1517,8 @@ async function disconnectClientAttempt(
|
|
|
1472
1517
|
catch (error) { throw abortPreparedDisconnect(prepared, error, deps); }
|
|
1473
1518
|
}
|
|
1474
1519
|
|
|
1475
|
-
|
|
1520
|
+
let revokeRelay: (() => Promise<void>) | undefined;
|
|
1521
|
+
const result = await withConfigDirHardeningSettled(getConfigDir(), () => withClientLifecycleSync(held => withConfigMutationLockSync(() => {
|
|
1476
1522
|
const read = readDesktopDisconnectReceipt();
|
|
1477
1523
|
if (read.kind !== "valid" || JSON.stringify(read.value) !== JSON.stringify(prepared.receipt)) {
|
|
1478
1524
|
throw new Error("client_disconnect_receipt_changed");
|
|
@@ -1534,12 +1580,20 @@ async function disconnectClientAttempt(
|
|
|
1534
1580
|
// The locks and the receipt checked above already fence this; a retry is idempotent.
|
|
1535
1581
|
if (!disconnectAtLeast(receipt, "removing_token")) restoreNativeIntentOriginals(() => {});
|
|
1536
1582
|
if (!disconnectAtLeast(receipt, "removing_token")) advance("removing_token");
|
|
1583
|
+
if (connection && !isLinkConnection(connection) && token.kind === "present") {
|
|
1584
|
+
const stored = readHubCredential(connection);
|
|
1585
|
+
if (stored.kind === "present") {
|
|
1586
|
+
const { managementUrl, apiKeyId } = connection;
|
|
1587
|
+
revokeRelay = () => revokeHubRelayLease(managementUrl, apiKeyId, token.token, stored.credential, deps.fetchImpl);
|
|
1588
|
+
}
|
|
1589
|
+
}
|
|
1537
1590
|
const tokenRemoval = removeServiceApiTokenFileIfOwned(receipt.tokenFingerprint);
|
|
1538
1591
|
if (tokenRemoval === "changed") throw new Error("client_token_changed");
|
|
1539
1592
|
if (!disconnectAtLeast(receipt, "token_removed")) advance("token_removed");
|
|
1540
1593
|
if (!disconnectAtLeast(receipt, "clearing_connection")) advance("clearing_connection");
|
|
1541
1594
|
if (clearClientConnection(receipt.owner) === "conflict") throw new Error("client_disconnect_owner_changed");
|
|
1542
1595
|
if (!disconnectAtLeast(receipt, "connection_cleared")) advance("connection_cleared");
|
|
1596
|
+
removeHubCredential();
|
|
1543
1597
|
if (connection?.transport === "link" && connection.link) {
|
|
1544
1598
|
// A corrupt sidecar is left in place: the connection is already cleared, the client runtime
|
|
1545
1599
|
// will not start a tunnel for a disconnected client, and the next join overwrites the file.
|
|
@@ -1563,6 +1617,11 @@ async function disconnectClientAttempt(
|
|
|
1563
1617
|
...(desktop.restoration ? { desktopRestoration: desktop.restoration } : {}),
|
|
1564
1618
|
};
|
|
1565
1619
|
}), deps.lifecycleLockDeps));
|
|
1620
|
+
if (revokeRelay) {
|
|
1621
|
+
try { await revokeRelay(); }
|
|
1622
|
+
catch { console.warn("Warning: Hub relay revocation was not confirmed. Its credential expires after the Hub's idle timeout."); }
|
|
1623
|
+
}
|
|
1624
|
+
return result;
|
|
1566
1625
|
}
|
|
1567
1626
|
|
|
1568
1627
|
/**
|
package/src/client/hub-client.ts
CHANGED
|
@@ -5,6 +5,11 @@ import { readBoundedResponseBytes } from "../lib/bounded-body";
|
|
|
5
5
|
import { clearableDeadline } from "../lib/abort";
|
|
6
6
|
import type { Desktop3pModelEntry } from "../claude/desktop-3p";
|
|
7
7
|
import { assertDesktop3pModelsValid } from "../claude/desktop-3p-guard";
|
|
8
|
+
import {
|
|
9
|
+
HUB_RELAY_CREDENTIAL_PATH, HUB_RELAY_ENROLLMENT_ID_HEADER, HUB_RELAY_ENROLLMENT_PROOF_HEADER,
|
|
10
|
+
HUB_RELAY_REVOCATION_HEADER, hubRelayDigest, hubRelayEnrollmentProof,
|
|
11
|
+
} from "../remote/hub-management-relay";
|
|
12
|
+
import { parseHubCredential, type HubRelayCredential } from "./hub-session";
|
|
8
13
|
|
|
9
14
|
/** Hub traffic may cross loopback or authenticated HTTPS, and nothing else. */
|
|
10
15
|
function isHubTransportPermitted(origin: string): boolean {
|
|
@@ -374,6 +379,39 @@ function assertRotationAuthorityOrigin(origin: string, credential: { kind: "admi
|
|
|
374
379
|
}
|
|
375
380
|
}
|
|
376
381
|
|
|
382
|
+
export async function requestHubRelayCredential(
|
|
383
|
+
managementUrl: string, authority: Parameters<typeof rotationManagementHeaders>[0], keyId: string, key: string,
|
|
384
|
+
fetchImpl = fetch,
|
|
385
|
+
): Promise<HubRelayCredential> {
|
|
386
|
+
const origin = normalizeHubOrigin(managementUrl);
|
|
387
|
+
assertRotationAuthorityOrigin(origin, authority);
|
|
388
|
+
const headers = rotationManagementHeaders(authority);
|
|
389
|
+
headers.set(HUB_RELAY_ENROLLMENT_ID_HEADER, keyId);
|
|
390
|
+
headers.set(HUB_RELAY_ENROLLMENT_PROOF_HEADER, hubRelayEnrollmentProof(key, keyId, "issue"));
|
|
391
|
+
const response = await fetchBounded(fetchImpl, origin + HUB_RELAY_CREDENTIAL_PATH, { method: "POST", headers }, undefined);
|
|
392
|
+
if (response.status !== 201) throw new HubClientError("hub_relay_issue_refused", "Hub refused relay credential issuance", response.status);
|
|
393
|
+
const value = parseJson(await boundedText(response, 1024), "hub_relay_credential_invalid");
|
|
394
|
+
const token = value && typeof value === "object" && "token" in value ? value.token : undefined;
|
|
395
|
+
const parsed = parseHubCredential({ kind: "relay", token });
|
|
396
|
+
if (!parsed) throw new HubClientError("hub_relay_credential_invalid", "Hub returned an invalid relay credential", response.status);
|
|
397
|
+
return parsed;
|
|
398
|
+
}
|
|
399
|
+
|
|
400
|
+
export async function revokeHubRelayLease(
|
|
401
|
+
managementUrl: string, keyId: string, key: string, credential: HubRelayCredential, fetchImpl = fetch,
|
|
402
|
+
): Promise<void> {
|
|
403
|
+
const digest = hubRelayDigest(credential.token);
|
|
404
|
+
const response = await fetchBounded(fetchImpl, normalizeHubOrigin(managementUrl) + HUB_RELAY_CREDENTIAL_PATH, {
|
|
405
|
+
method: "DELETE",
|
|
406
|
+
headers: {
|
|
407
|
+
[HUB_RELAY_ENROLLMENT_ID_HEADER]: keyId,
|
|
408
|
+
[HUB_RELAY_ENROLLMENT_PROOF_HEADER]: hubRelayEnrollmentProof(key, keyId, "revoke", digest),
|
|
409
|
+
[HUB_RELAY_REVOCATION_HEADER]: digest,
|
|
410
|
+
},
|
|
411
|
+
}, 2_000);
|
|
412
|
+
if (response.status !== 204) throw new HubClientError("hub_relay_revoke_refused", "Hub did not acknowledge relay revocation", response.status);
|
|
413
|
+
}
|
|
414
|
+
|
|
377
415
|
export async function startClientKeyRotation(
|
|
378
416
|
managementUrl: string,
|
|
379
417
|
credential: { kind: "admin"; value: Uint8Array } | { kind: "gui-session"; value: ConnectGuiSession },
|
package/src/client/hub-relay.ts
CHANGED
|
@@ -1,19 +1,26 @@
|
|
|
1
1
|
import { stripMachineAuthHeaders } from "./machine-auth";
|
|
2
2
|
import { homeUnreachableBody } from "./home-unreachable";
|
|
3
|
+
import {
|
|
4
|
+
HUB_RELAY_ENROLLMENT_ID_HEADER, HUB_RELAY_ENROLLMENT_PROOF_HEADER, HUB_RELAY_PROOF_TIME_HEADER, HUB_RELAY_READ_PREFIX,
|
|
5
|
+
hubRelayBootstrapAllowed, hubRelayLogoutAllowed, hubRelayReadAllowed,
|
|
6
|
+
} from "../remote/hub-management-relay";
|
|
7
|
+
import type { readHubRelayAdmission } from "./hub-session";
|
|
3
8
|
|
|
4
9
|
export interface HubRelayTarget {
|
|
5
10
|
managementUrl: string;
|
|
6
11
|
browserOrigin: string;
|
|
7
12
|
}
|
|
8
13
|
|
|
14
|
+
type HubRelayCredentialSource = (method: string, target: string) => ReturnType<typeof readHubRelayAdmission>;
|
|
15
|
+
|
|
9
16
|
export const HUB_RELAY_REQUEST_BODY_MAX_BYTES = 4 * 1024 * 1024;
|
|
10
17
|
export const HUB_RELAY_RESPONSE_BODY_MAX_BYTES = 16 * 1024 * 1024;
|
|
11
18
|
export const HUB_RELAY_DEFAULT_TIMEOUT_MS = 15_000;
|
|
12
19
|
export const HUB_RELAY_HEADER_MAX_BYTES = 64 * 1024;
|
|
13
20
|
export const HUB_RELAY_EXPECTED_TARGET_HEADER = "x-opencodex-expected-target";
|
|
14
21
|
export const HUB_RELAY_EXPECTED_TARGET_MAX_BYTES = 512;
|
|
22
|
+
const HUB_RELAY_REFRESH_INTERVAL_MS = 60_000;
|
|
15
23
|
|
|
16
|
-
const ALLOWED_METHODS = new Set(["GET", "HEAD", "POST", "PUT", "PATCH", "DELETE"]);
|
|
17
24
|
const REQUEST_HEADERS = new Set([
|
|
18
25
|
"accept",
|
|
19
26
|
"accept-language",
|
|
@@ -100,26 +107,9 @@ function canonicalExpectedOrigin(value: string): string | null {
|
|
|
100
107
|
|
|
101
108
|
function relayDestination(suffix: string, target: HubRelayTarget, method: string): URL | null {
|
|
102
109
|
const origin = canonicalOrigin(target.managementUrl);
|
|
103
|
-
|
|
104
|
-
if (
|
|
105
|
-
|
|
106
|
-
if (/%(?:2f|5c)/i.test(suffix) || /%(?:2e)(?:%2e|\.)?/i.test(suffix)) return null;
|
|
107
|
-
const rawPath = suffix.split("?", 1)[0]!;
|
|
108
|
-
for (const segment of rawPath.split("/")) {
|
|
109
|
-
let decoded: string;
|
|
110
|
-
try { decoded = decodeURIComponent(segment); } catch { return null; }
|
|
111
|
-
if (decoded === "." || decoded === ".." || decoded.includes("/") || decoded.includes("\\")) return null;
|
|
112
|
-
}
|
|
113
|
-
if (rawPath === "/opencodex-session") {
|
|
114
|
-
if (suffix !== rawPath || (method !== "GET" && method !== "POST")) return null;
|
|
115
|
-
} else if (!rawPath.startsWith("/api/")) {
|
|
116
|
-
return null;
|
|
117
|
-
}
|
|
118
|
-
let destination: URL;
|
|
119
|
-
try { destination = new URL(suffix, `${origin}/`); } catch { return null; }
|
|
120
|
-
if (destination.origin !== origin || destination.username || destination.password || destination.hash) return null;
|
|
121
|
-
if (destination.pathname !== rawPath) return null;
|
|
122
|
-
return destination;
|
|
110
|
+
if (!origin) return null;
|
|
111
|
+
if (hubRelayBootstrapAllowed(method, suffix) || hubRelayLogoutAllowed(method, suffix)) return new URL(suffix, origin);
|
|
112
|
+
return hubRelayReadAllowed(method, suffix) ? new URL(HUB_RELAY_READ_PREFIX + suffix, origin) : null;
|
|
123
113
|
}
|
|
124
114
|
|
|
125
115
|
export async function readBoundedRelayRequestBody(
|
|
@@ -234,11 +224,11 @@ export async function relayHubManagementRequest(
|
|
|
234
224
|
req: Request,
|
|
235
225
|
suffix: string,
|
|
236
226
|
target: HubRelayTarget,
|
|
237
|
-
deps: { fetchImpl?: typeof fetch; timeoutMs?: number } = {},
|
|
227
|
+
deps: { fetchImpl?: typeof fetch; timeoutMs?: number; readCredential?: HubRelayCredentialSource } = {},
|
|
238
228
|
): Promise<Response> {
|
|
239
|
-
const method = req.method
|
|
229
|
+
const method = req.method;
|
|
240
230
|
const destination = relayDestination(suffix, target, method);
|
|
241
|
-
if (!destination) return relayError(404, "hub relay path refused");
|
|
231
|
+
if (!destination || (deps.readCredential && !hubRelayReadAllowed(method, suffix))) return relayError(404, "hub relay path refused");
|
|
242
232
|
const requestHeaderValidation = validateHubRelayRequestHeaders([...req.headers]);
|
|
243
233
|
if (!requestHeaderValidation.ok) return relayError(400, "hub relay request headers refused");
|
|
244
234
|
|
|
@@ -260,6 +250,12 @@ export async function relayHubManagementRequest(
|
|
|
260
250
|
}
|
|
261
251
|
}
|
|
262
252
|
|
|
253
|
+
const stripped = stripMachineAuthHeaders(req.headers);
|
|
254
|
+
const headers = filterRelayHeaders(stripped, REQUEST_HEADERS, requestHeaderValidation.connectionNamed);
|
|
255
|
+
if (hubRelayLogoutAllowed(method, suffix) && !headers.get("x-opencodex-api-key")?.startsWith("ocx_session_")) {
|
|
256
|
+
return relayError(401, "caller Hub GUI session required");
|
|
257
|
+
}
|
|
258
|
+
|
|
263
259
|
let body: Uint8Array<ArrayBuffer> | null;
|
|
264
260
|
try {
|
|
265
261
|
body = method === "GET" || method === "HEAD"
|
|
@@ -269,13 +265,20 @@ export async function relayHubManagementRequest(
|
|
|
269
265
|
return relayError(413, "hub relay request body too large");
|
|
270
266
|
}
|
|
271
267
|
|
|
272
|
-
const
|
|
273
|
-
|
|
268
|
+
const stored = deps.readCredential?.(method, destination.pathname + destination.search);
|
|
269
|
+
if (deps.readCredential && !stored) return relayError(401, "Hub relay credential unavailable");
|
|
270
|
+
if (stored) {
|
|
271
|
+
headers.set("x-opencodex-api-key", stored.token);
|
|
272
|
+
headers.set(HUB_RELAY_ENROLLMENT_ID_HEADER, stored.keyId);
|
|
273
|
+
headers.set(HUB_RELAY_ENROLLMENT_PROOF_HEADER, stored.proof);
|
|
274
|
+
headers.set(HUB_RELAY_PROOF_TIME_HEADER, stored.at);
|
|
275
|
+
for (const name of ["origin", "x-opencodex-gui-origin", "x-opencodex-csrf-token"]) headers.delete(name);
|
|
276
|
+
}
|
|
274
277
|
if (!headersWithinLimit(headers)) return relayError(431, "hub relay request headers too large");
|
|
275
278
|
const browserOrigin = canonicalOrigin(target.browserOrigin);
|
|
276
279
|
const mutation = method !== "GET" && method !== "HEAD";
|
|
277
280
|
const suppliedOrigin = headers.get("origin");
|
|
278
|
-
if (!browserOrigin || (mutation ? suppliedOrigin !== browserOrigin : suppliedOrigin !== null && suppliedOrigin !== browserOrigin)) {
|
|
281
|
+
if (!stored && (!browserOrigin || (mutation ? suppliedOrigin !== browserOrigin : suppliedOrigin !== null && suppliedOrigin !== browserOrigin))) {
|
|
279
282
|
return relayError(403, "hub relay browser origin refused");
|
|
280
283
|
}
|
|
281
284
|
|
|
@@ -285,9 +288,8 @@ export async function relayHubManagementRequest(
|
|
|
285
288
|
const timeoutSignal = AbortSignal.timeout(timeoutMs);
|
|
286
289
|
const relayAbort = new AbortController();
|
|
287
290
|
const signal = relayAbort.signal;
|
|
288
|
-
const stopDeadline = () => timeoutSignal.removeEventListener("abort", onTimeout);
|
|
289
291
|
const cleanup = () => {
|
|
290
|
-
|
|
292
|
+
timeoutSignal.removeEventListener("abort", onTimeout);
|
|
291
293
|
req.signal.removeEventListener("abort", onClientAbort);
|
|
292
294
|
};
|
|
293
295
|
const onTimeout = () => { relayAbort.abort(timeoutSignal.reason); cleanup(); };
|
|
@@ -334,13 +336,6 @@ export async function relayHubManagementRequest(
|
|
|
334
336
|
try { await upstream.body?.cancel(); } catch { /* best effort */ }
|
|
335
337
|
return relayError(502, "hub relay response body too large");
|
|
336
338
|
}
|
|
337
|
-
// Only this known, successfully established SSE endpoint outlives the handshake.
|
|
338
|
-
// Its body remains byte-bounded and connected to the browser's abort signal.
|
|
339
|
-
if (method === "GET" && destination.pathname === "/api/accounts/events" && !destination.search
|
|
340
|
-
&& upstream.status === 200
|
|
341
|
-
&& responseHeaders.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase() === "text/event-stream") {
|
|
342
|
-
stopDeadline();
|
|
343
|
-
}
|
|
344
339
|
let responseBody: ReadableStream<Uint8Array> | null = null;
|
|
345
340
|
if (method === "HEAD" || !upstream.body) {
|
|
346
341
|
cleanup();
|
|
@@ -354,3 +349,33 @@ export async function relayHubManagementRequest(
|
|
|
354
349
|
headers: responseHeaders,
|
|
355
350
|
});
|
|
356
351
|
}
|
|
352
|
+
|
|
353
|
+
function scheduleLeaseRefresh(run: () => Promise<void>): () => void {
|
|
354
|
+
void run();
|
|
355
|
+
const timer = setInterval(() => { void run(); }, HUB_RELAY_REFRESH_INTERVAL_MS);
|
|
356
|
+
timer.unref();
|
|
357
|
+
return () => clearInterval(timer);
|
|
358
|
+
}
|
|
359
|
+
|
|
360
|
+
/** Keep an idle serving client enrolled using the same passive read admission as the CLI. */
|
|
361
|
+
export function startHubRelayLeaseRefresh(
|
|
362
|
+
managementUrl: string, readCredential: HubRelayCredentialSource,
|
|
363
|
+
deps: { fetchImpl?: typeof fetch; schedule?: typeof scheduleLeaseRefresh } = {},
|
|
364
|
+
): { stop(): void } {
|
|
365
|
+
const abort = new AbortController();
|
|
366
|
+
const path = "/api/codex-auth/active";
|
|
367
|
+
let inFlight = false;
|
|
368
|
+
const cancel = (deps.schedule ?? scheduleLeaseRefresh)(async () => {
|
|
369
|
+
if (abort.signal.aborted || inFlight) return;
|
|
370
|
+
inFlight = true;
|
|
371
|
+
try {
|
|
372
|
+
const req = new Request("http://127.0.0.1" + path, { method: "HEAD", signal: abort.signal });
|
|
373
|
+
await relayHubManagementRequest(req, path, { managementUrl, browserOrigin: "" }, { fetchImpl: deps.fetchImpl, readCredential });
|
|
374
|
+
} catch {
|
|
375
|
+
// The next tick retries. The Hub still expires an unrenewed lease.
|
|
376
|
+
} finally {
|
|
377
|
+
inFlight = false;
|
|
378
|
+
}
|
|
379
|
+
});
|
|
380
|
+
return { stop() { cancel(); abort.abort(); } };
|
|
381
|
+
}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { lstatSync, unlinkSync } from "node:fs";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { getConfigDir } from "../config/paths";
|
|
5
|
+
import { atomicWriteFileNoFollow } from "../config/atomic-write";
|
|
6
|
+
import { readBoundedRegularFileSync } from "../lib/bounded-file-read";
|
|
7
|
+
import { sameFileIdentity } from "../lib/file-identity";
|
|
8
|
+
import { verifySecretPathAcl } from "../lib/windows-secret-acl";
|
|
9
|
+
import { readServiceApiTokenState } from "../lib/service-secrets";
|
|
10
|
+
import { hubRelayEnrollmentProof, isHubRelayToken } from "../remote/hub-management-relay";
|
|
11
|
+
import type { OcxClientConnectionConfig } from "../types";
|
|
12
|
+
import { assertNoClientDisconnectPending, isLinkConnection, readClientConnectionState, sameClientConnectionOwner } from "./state";
|
|
13
|
+
|
|
14
|
+
const MAX_HUB_SESSION_BYTES = 4096;
|
|
15
|
+
|
|
16
|
+
export interface HubRelayCredential {
|
|
17
|
+
kind: "relay";
|
|
18
|
+
token: string;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export type HubCredentialOwner = Pick<OcxClientConnectionConfig, "managementUrl" | "apiKeyId" | "connectedAt" | "tokenFingerprint">;
|
|
22
|
+
export type HubCredentialState =
|
|
23
|
+
| { kind: "absent" }
|
|
24
|
+
| { kind: "unsafe" }
|
|
25
|
+
| { kind: "present"; credential: HubRelayCredential };
|
|
26
|
+
|
|
27
|
+
function fingerprint({ managementUrl, apiKeyId, connectedAt, tokenFingerprint }: HubCredentialOwner): string {
|
|
28
|
+
return createHash("sha256").update(JSON.stringify([managementUrl, apiKeyId, connectedAt, tokenFingerprint])).digest("base64url");
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export function parseHubCredential(value: unknown): HubRelayCredential | null {
|
|
32
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return null;
|
|
33
|
+
const record = value as Record<string, unknown>;
|
|
34
|
+
return Object.keys(record).sort().join(",") === "kind,token" && record.kind === "relay" && isHubRelayToken(record.token)
|
|
35
|
+
? { kind: "relay", token: record.token }
|
|
36
|
+
: null;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export function hubSessionFilePath(): string {
|
|
40
|
+
return join(getConfigDir(), "hub-management-session.json");
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/** The listener checks the owner against the same connection snapshot it forwards to. */
|
|
44
|
+
export function readHubCredential(owner: HubCredentialOwner): HubCredentialState {
|
|
45
|
+
const path = hubSessionFilePath();
|
|
46
|
+
let initial;
|
|
47
|
+
try {
|
|
48
|
+
initial = lstatSync(path, { bigint: true });
|
|
49
|
+
} catch (error) {
|
|
50
|
+
return (error as NodeJS.ErrnoException).code === "ENOENT" ? { kind: "absent" } : { kind: "unsafe" };
|
|
51
|
+
}
|
|
52
|
+
try {
|
|
53
|
+
if (!initial.isFile() || initial.isSymbolicLink() || initial.size > BigInt(MAX_HUB_SESSION_BYTES)) return { kind: "unsafe" };
|
|
54
|
+
const privateFile = process.platform === "win32"
|
|
55
|
+
? verifySecretPathAcl(path)
|
|
56
|
+
: (initial.mode & 0o777n) === 0o600n && initial.uid === BigInt(process.getuid!());
|
|
57
|
+
if (!privateFile) return { kind: "unsafe" };
|
|
58
|
+
const raw = readBoundedRegularFileSync(path, MAX_HUB_SESSION_BYTES);
|
|
59
|
+
const current = lstatSync(path, { bigint: true });
|
|
60
|
+
if (!sameFileIdentity(current, initial) || current.ctimeNs !== initial.ctimeNs) return { kind: "unsafe" };
|
|
61
|
+
const record: unknown = JSON.parse(raw.toString("utf8"));
|
|
62
|
+
if (!record || typeof record !== "object" || Object.keys(record).sort().join(",") !== "credential,owner") return { kind: "unsafe" };
|
|
63
|
+
const { owner: ownerFingerprint, credential: stored } = record as Record<string, unknown>;
|
|
64
|
+
const credential = parseHubCredential(stored);
|
|
65
|
+
return credential && ownerFingerprint === fingerprint(owner)
|
|
66
|
+
? { kind: "present", credential }
|
|
67
|
+
: { kind: "unsafe" };
|
|
68
|
+
} catch {
|
|
69
|
+
return { kind: "unsafe" };
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
export function writeHubCredential(credential: HubRelayCredential, owner: HubCredentialOwner): void {
|
|
74
|
+
const parsed = parseHubCredential(credential);
|
|
75
|
+
if (!parsed) throw new Error("refusing to persist an invalid Hub relay credential");
|
|
76
|
+
atomicWriteFileNoFollow(hubSessionFilePath(), `${JSON.stringify({ owner: fingerprint(owner), credential: parsed })}\n`);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
export function readHubRelayAdmission(
|
|
80
|
+
owner: HubCredentialOwner, method: string, target: string,
|
|
81
|
+
): { token: string; keyId: string; proof: string; at: string } | null {
|
|
82
|
+
const stored = readHubCredential(owner);
|
|
83
|
+
if (stored.kind !== "present") return null;
|
|
84
|
+
const key = readServiceApiTokenState();
|
|
85
|
+
if (key.kind !== "present" || key.fingerprint !== owner.tokenFingerprint) return null;
|
|
86
|
+
const { token } = stored.credential;
|
|
87
|
+
const at = String(Date.now());
|
|
88
|
+
const proof = hubRelayEnrollmentProof(key.token, owner.apiKeyId, "read", token, { at, method, target });
|
|
89
|
+
return { token, keyId: owner.apiKeyId, proof, at };
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/** Follow rotation of this enrollment and fence a disconnect or replacement. */
|
|
93
|
+
export function currentHubRelayAdmission(
|
|
94
|
+
connection: OcxClientConnectionConfig, method: string, target: string,
|
|
95
|
+
): ReturnType<typeof readHubRelayAdmission> {
|
|
96
|
+
try { assertNoClientDisconnectPending(); } catch { return null; }
|
|
97
|
+
const live = readClientConnectionState();
|
|
98
|
+
if (live.kind !== "connected" || live.value.pendingOperation || isLinkConnection(live.value)
|
|
99
|
+
|| !sameClientConnectionOwner(live.value, connection) || live.value.managementUrl !== connection.managementUrl) return null;
|
|
100
|
+
return readHubRelayAdmission(live.value, method, target);
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
export function removeHubCredential(): void {
|
|
104
|
+
try { unlinkSync(hubSessionFilePath()); }
|
|
105
|
+
catch (error) { if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error; }
|
|
106
|
+
}
|
|
@@ -67,7 +67,12 @@ function acquire(deps: ClientLifecycleLockDeps, name = "client-desktop-lifecycle
|
|
|
67
67
|
: resolve(deps.lockPath) + suffix;
|
|
68
68
|
preparePath(path);
|
|
69
69
|
database = new Database(path, { create: true });
|
|
70
|
-
database.exec("PRAGMA locking_mode = NORMAL; PRAGMA busy_timeout = 0
|
|
70
|
+
database.exec("PRAGMA locking_mode = NORMAL; PRAGMA busy_timeout = 0");
|
|
71
|
+
// This file carries an OS lock only. Do not create a disk journal for its
|
|
72
|
+
// empty transaction: Windows changes the directory's ACL freshness stamp.
|
|
73
|
+
const journal = database.query<{ journal_mode: string }, []>("PRAGMA journal_mode = MEMORY").get();
|
|
74
|
+
if (journal?.journal_mode !== "memory") throw new Error("Client lifecycle lock requires an in-memory rollback journal");
|
|
75
|
+
database.exec("BEGIN IMMEDIATE");
|
|
71
76
|
return database;
|
|
72
77
|
} catch (error) {
|
|
73
78
|
try { database?.close(); } catch { /* preserve acquisition failure */ }
|
package/src/client/link-relay.ts
CHANGED
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
} from "./hub-relay";
|
|
10
10
|
import type { LinkDiagnosticRecord, LinkDiagnosticSink } from "../link/diagnostics";
|
|
11
11
|
import { linkRouteAllowed } from "../link/routes";
|
|
12
|
+
import { LINK_RELAY_AUTH_FAILED_CODE } from "../link/relay-auth";
|
|
12
13
|
import { isLinkPort } from "../link/ports";
|
|
13
14
|
import { resolveInboundBodyLimitBytes } from "../server/request-decompress";
|
|
14
15
|
import type { LinkTrafficBook } from "../link/traffic";
|
|
@@ -163,7 +164,7 @@ function homeUnreachable(error: string): Response {
|
|
|
163
164
|
* `home_unreachable`, which GOAT's device-local fallback keys on. The status and Retry-After it
|
|
164
165
|
* carried before OCX-11 are kept: a lost bound socket can succeed on a fresh connection.
|
|
165
166
|
*/
|
|
166
|
-
export
|
|
167
|
+
export { LINK_RELAY_AUTH_FAILED_CODE };
|
|
167
168
|
|
|
168
169
|
function relayAuthenticationFailed(error: string): Response {
|
|
169
170
|
return Response.json({ error, code: LINK_RELAY_AUTH_FAILED_CODE }, {
|