@bitkyc08/opencodex 2.100.1 → 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-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.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-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- 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 +6 -4
- 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/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- 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/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- 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 +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- 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/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- 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 +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- 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 +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- 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 +314 -0
- 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 +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -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 +29 -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 -13
- package/src/cli/sync-fanout.ts +81 -99
- 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-readiness.ts +16 -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-status.ts +76 -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 +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- 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-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- 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-types.ts +2 -0
- 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 +134 -7
- 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 +228 -0
- package/src/combos/failover.ts +760 -35
- 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/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- 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/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- 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 +83 -0
- 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-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- 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 +174 -0
- 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/paths.ts +5 -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 +88 -12
- 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 +285 -43
- 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 +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -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/tunnel-state.ts +10 -4
- 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 +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- 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/account-resume-health.ts +60 -0
- 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 +25 -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 +51 -1
- 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-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- 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-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- 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-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -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/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- 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 +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -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/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- 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/hosted-tool-policy.ts +56 -12
- 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 +4 -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 +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- 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/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -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 +115 -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/config-routes.ts +7 -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 +218 -0
- 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 +92 -6
- package/src/server/management/link-routes.ts +563 -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 +69 -17
- 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 +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -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 +22 -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-failure-detail.ts +59 -1
- 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 +40 -51
- 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 +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -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 +99 -106
- 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 +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- 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/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -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/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
package/src/lib/redact.ts
CHANGED
|
@@ -108,11 +108,13 @@ const OTHER_FRAMED_CREDENTIALS: Array<[RegExp, string]> = [
|
|
|
108
108
|
// attacker-controlled text, so a body line starting `--not-the-boundary`
|
|
109
109
|
// ended the mask and exposed everything after it. Consuming the remainder
|
|
110
110
|
// costs trailing context in one framing and closes the bypass.
|
|
111
|
+
//
|
|
112
|
+
// Only the part-header name is a regex; the rest of the grammar
|
|
113
|
+
// (`[^\r\n]*\r?\n(?:\r?\n)?` then a non-empty body) is applied by
|
|
114
|
+
// maskMultipartOnce in one pass. As a single regex every candidate on a line
|
|
115
|
+
// without a terminator rescanned that line, quadratic in the input.
|
|
111
116
|
[
|
|
112
|
-
new RegExp(
|
|
113
|
-
`(name=["']?(?:${CREDENTIAL_HEADER_LABEL})["']?[^\\r\\n]*\\r?\\n(?:\\r?\\n)?)([\\s\\S]+)`,
|
|
114
|
-
"gi",
|
|
115
|
-
),
|
|
117
|
+
new RegExp(`name=["']?(?:${CREDENTIAL_HEADER_LABEL})["']?`, "gi"),
|
|
116
118
|
"multipart",
|
|
117
119
|
],
|
|
118
120
|
];
|
|
@@ -188,6 +190,10 @@ function maskXmlIdentifyingAttribute(value: string, decodeEscapes: boolean): str
|
|
|
188
190
|
function maskOtherFramingsOnce(value: string, decodeEscapes: boolean): string {
|
|
189
191
|
let current = value;
|
|
190
192
|
for (const [pattern, kind] of OTHER_FRAMED_CREDENTIALS) {
|
|
193
|
+
if (kind === "multipart") {
|
|
194
|
+
current = maskMultipartOnce(current, decodeEscapes, pattern);
|
|
195
|
+
continue;
|
|
196
|
+
}
|
|
191
197
|
const { folded, map } = foldForMatching(current, decodeEscapes);
|
|
192
198
|
pattern.lastIndex = 0;
|
|
193
199
|
let out = "";
|
|
@@ -218,6 +224,40 @@ function maskOtherFramingsOnce(value: string, decodeEscapes: boolean): string {
|
|
|
218
224
|
return current;
|
|
219
225
|
}
|
|
220
226
|
|
|
227
|
+
/**
|
|
228
|
+
* The multipart rule: a credential-named part header, the rest of its line, its line break, an
|
|
229
|
+
* optional blank line, then a non-empty body masked to the end of the input. Equivalent to the
|
|
230
|
+
* regex `(name=["']?(?:LABEL)["']?[^\r\n]*\r?\n(?:\r?\n)?)([\s\S]+)`, but linear: when one
|
|
231
|
+
* candidate's line has no usable terminator, every later candidate on that line fails the same way,
|
|
232
|
+
* so the search resumes past the line instead of rescanning it from each candidate.
|
|
233
|
+
*/
|
|
234
|
+
function maskMultipartOnce(current: string, decodeEscapes: boolean, partHeader: RegExp): string {
|
|
235
|
+
const { folded, map } = foldForMatching(current, decodeEscapes);
|
|
236
|
+
partHeader.lastIndex = 0;
|
|
237
|
+
let lineEnd = -1;
|
|
238
|
+
for (let match = partHeader.exec(folded); match !== null; match = partHeader.exec(folded)) {
|
|
239
|
+
const nameEnd = match.index + match[0].length;
|
|
240
|
+
if (nameEnd > lineEnd) {
|
|
241
|
+
lineEnd = nameEnd;
|
|
242
|
+
while (lineEnd < folded.length && folded[lineEnd] !== "\r" && folded[lineEnd] !== "\n") lineEnd++;
|
|
243
|
+
}
|
|
244
|
+
let headEnd = folded[lineEnd] === "\n" ? lineEnd + 1
|
|
245
|
+
: folded[lineEnd] === "\r" && folded[lineEnd + 1] === "\n" ? lineEnd + 2 : -1;
|
|
246
|
+
if (headEnd < 0 || headEnd >= folded.length) {
|
|
247
|
+
partHeader.lastIndex = lineEnd + 1;
|
|
248
|
+
continue;
|
|
249
|
+
}
|
|
250
|
+
const blank = folded[headEnd] === "\n" ? 1 : folded[headEnd] === "\r" && folded[headEnd + 1] === "\n" ? 2 : 0;
|
|
251
|
+
if (headEnd + blank < folded.length) headEnd += blank;
|
|
252
|
+
const start = map[match.index] ?? current.length;
|
|
253
|
+
const end = map[folded.length] ?? current.length;
|
|
254
|
+
const head = current.slice(start, map[headEnd] ?? end);
|
|
255
|
+
if (!current.slice(start + head.length, end).trim()) return current;
|
|
256
|
+
return current.slice(0, start) + head + REDACTED_SECRET;
|
|
257
|
+
}
|
|
258
|
+
return current;
|
|
259
|
+
}
|
|
260
|
+
|
|
221
261
|
|
|
222
262
|
/**
|
|
223
263
|
* Run the header rule over BOTH matching views and take the union.
|
|
@@ -282,7 +322,7 @@ function maskCredentialHeadersOnce(value: string, decodeEscapes: boolean): strin
|
|
|
282
322
|
return out + value.slice(cursor);
|
|
283
323
|
}
|
|
284
324
|
|
|
285
|
-
const SECRET_VALUE_PATTERNS: Array<[RegExp, string]> = [
|
|
325
|
+
const SECRET_VALUE_PATTERNS: Array<[RegExp, string] | ((value: string) => string)> = [
|
|
286
326
|
// A Bearer token outside a labelled header (prose, JSON fragments, logs).
|
|
287
327
|
// Horizontal whitespace only: `\s+` crossed line boundaries and masked the
|
|
288
328
|
// first word of the NEXT line when a header was quoted with a trailing break.
|
|
@@ -304,10 +344,46 @@ const SECRET_VALUE_PATTERNS: Array<[RegExp, string]> = [
|
|
|
304
344
|
// a quoted proto field does not have. `eyJ` is the base64url of `{"`, so the
|
|
305
345
|
// JWT rule needs a real three-segment shape and does not match ordinary prose.
|
|
306
346
|
[/\bdevin-session-token\$[A-Za-z0-9._~+/=-]{8,}/g, REDACTED_SECRET],
|
|
307
|
-
|
|
347
|
+
maskJwts,
|
|
308
348
|
[/\b(arn:aws:[A-Za-z0-9_-]+:[A-Za-z0-9-]*:\d{12}:[A-Za-z0-9_/:+=,.@-]+)\b/g, REDACTED_SECRET],
|
|
309
349
|
];
|
|
310
350
|
|
|
351
|
+
/**
|
|
352
|
+
* The JWT rule `\beyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]*` applied in one pass. Each
|
|
353
|
+
* segment class excludes the dot, so a segment always runs to the end of its run of token
|
|
354
|
+
* characters and the dot must follow that run. As a regex, every `eyJ` inside one long run without a
|
|
355
|
+
* dot after it rescanned the rest of the run: quadratic. Here a candidate that fails skips past the
|
|
356
|
+
* run, because every later candidate in it ends the same run and fails the same way.
|
|
357
|
+
*/
|
|
358
|
+
function maskJwts(value: string): string {
|
|
359
|
+
if (!value.includes("eyJ")) return value;
|
|
360
|
+
const start = /\beyJ/g;
|
|
361
|
+
const runEnd = (from: number): number => {
|
|
362
|
+
let at = from;
|
|
363
|
+
while (at < value.length && JWT_SEGMENT_CHAR.test(value[at]!)) at++;
|
|
364
|
+
return at;
|
|
365
|
+
};
|
|
366
|
+
let out = "";
|
|
367
|
+
let cursor = 0;
|
|
368
|
+
for (let match = start.exec(value); match !== null; match = start.exec(value)) {
|
|
369
|
+
const first = match.index + 3;
|
|
370
|
+
const firstEnd = runEnd(first);
|
|
371
|
+
const second = firstEnd + 1;
|
|
372
|
+
const secondEnd = value[firstEnd] === "." && firstEnd - first >= 8 ? runEnd(second) : -1;
|
|
373
|
+
if (secondEnd < 0 || secondEnd - second < 8 || value[secondEnd] !== ".") {
|
|
374
|
+
start.lastIndex = Math.max(firstEnd, secondEnd);
|
|
375
|
+
continue;
|
|
376
|
+
}
|
|
377
|
+
const end = runEnd(secondEnd + 1);
|
|
378
|
+
out += value.slice(cursor, match.index) + REDACTED_SECRET;
|
|
379
|
+
cursor = end;
|
|
380
|
+
start.lastIndex = end;
|
|
381
|
+
}
|
|
382
|
+
return cursor === 0 ? value : out + value.slice(cursor);
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
const JWT_SEGMENT_CHAR = /[A-Za-z0-9_-]/;
|
|
386
|
+
|
|
311
387
|
type HeaderRecord = Record<string, string | string[] | undefined>;
|
|
312
388
|
|
|
313
389
|
function isPlainObject(value: unknown): value is Record<string, unknown> {
|
|
@@ -322,8 +398,8 @@ function isSensitiveKey(key: string): boolean {
|
|
|
322
398
|
|
|
323
399
|
export function redactSecretString(value: string): string {
|
|
324
400
|
let redacted = maskOtherFramings(maskCredentialHeaders(value));
|
|
325
|
-
for (const
|
|
326
|
-
redacted = redacted.replace(
|
|
401
|
+
for (const rule of SECRET_VALUE_PATTERNS) {
|
|
402
|
+
redacted = typeof rule === "function" ? rule(redacted) : redacted.replace(rule[0], rule[1]);
|
|
327
403
|
}
|
|
328
404
|
return redacted;
|
|
329
405
|
}
|
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
import { reconcileComboWarningMemos } from "../combos/request";
|
|
25
25
|
import { reconcileComboRotationState } from "../combos/resolve";
|
|
26
26
|
import { reconcileComboRecall, sweepExpiredComboRecall } from "../server/responses/combo-session-recall";
|
|
27
|
+
import { reconcileProviderCacheAffinity, sweepExpiredProviderCacheAffinity } from "../providers/cache-affinity";
|
|
27
28
|
import { listLiveComboTargetKeys } from "../combos/types";
|
|
28
29
|
import {
|
|
29
30
|
listLiveConfigOwnershipRoots,
|
|
@@ -107,6 +108,11 @@ export function buildGenerationContext(): GenerationContext {
|
|
|
107
108
|
return {
|
|
108
109
|
generation: 0,
|
|
109
110
|
providerNames,
|
|
111
|
+
disabledProviderNames: new Set(Object.entries(liveServerConfig.providers)
|
|
112
|
+
.filter(([, provider]) => provider.disabled === true)
|
|
113
|
+
.map(([name]) => name)),
|
|
114
|
+
providerKeyEntryIds: new Map(Object.entries(liveServerConfig.providers)
|
|
115
|
+
.map(([name, provider]) => [name, new Set((provider.apiKeyPool ?? []).map(entry => entry.id))] as const)),
|
|
110
116
|
comboIds: new Set(Object.keys(liveServerConfig.combos ?? {})),
|
|
111
117
|
comboTargets: listLiveComboTargetKeys(liveServerConfig),
|
|
112
118
|
codexAccountIds: listLiveCodexAccountIds(liveServerConfig),
|
|
@@ -161,6 +167,11 @@ export const STATE_STORE_REGISTRATIONS = [
|
|
|
161
167
|
sweepExpired: sweepExpiredComboRecall,
|
|
162
168
|
reconcileGeneration: reconcileComboRecall,
|
|
163
169
|
},
|
|
170
|
+
{
|
|
171
|
+
name: "provider-cache-affinity",
|
|
172
|
+
sweepExpired: sweepExpiredProviderCacheAffinity,
|
|
173
|
+
reconcileGeneration: context => reconcileProviderCacheAffinity(context, liveServerConfig?.providers),
|
|
174
|
+
},
|
|
164
175
|
{ name: "guardian-backoff", reconcileGeneration: reconcileGuardianBackoff },
|
|
165
176
|
{ name: "codex-reauth", reconcileGeneration: reconcileCodexReauthState },
|
|
166
177
|
{ name: "oauth-reauth", reconcileGeneration: reconcileOAuthReauthState },
|
|
@@ -3,6 +3,10 @@ export const STATE_SWEEP_INTERVAL_MS = 60_000;
|
|
|
3
3
|
export interface GenerationContext {
|
|
4
4
|
generation: number;
|
|
5
5
|
providerNames: ReadonlySet<string>;
|
|
6
|
+
/** Providers disabled in the live configuration; stores keyed by provider may drop their rows. */
|
|
7
|
+
disabledProviderNames?: ReadonlySet<string>;
|
|
8
|
+
/** Live key-pool entry ids per provider, for stores that bind to one entry. */
|
|
9
|
+
providerKeyEntryIds?: ReadonlyMap<string, ReadonlySet<string>>;
|
|
6
10
|
comboIds: ReadonlySet<string>;
|
|
7
11
|
comboTargets: ReadonlySet<string>;
|
|
8
12
|
codexAccountIds: ReadonlySet<string>;
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The environment markers a supervisor writes for the one process it launches: the desktop app
|
|
3
|
+
* (OCX_DESKTOP_SUPERVISED), a service manager (OCX_SERVICE_MANAGED: launchd, systemd, WinSW) and the
|
|
4
|
+
* Windows Task Scheduler wrapper (OCX_WINDOWS_WRAPPER_PROTOCOL). A marker proves only that the
|
|
5
|
+
* process was started with it, so it must never reach a process that supervisor did not launch: a
|
|
6
|
+
* detached proxy, a replacement, or a shell handed to a tool. Every such launch removes them with
|
|
7
|
+
* {@link withoutSupervisorMarkers}. The values match DESKTOP_SUPERVISED_ENV
|
|
8
|
+
* (src/lib/system-restart-contract.ts), SERVICE_MANAGED_ENV (src/service/state.ts) and
|
|
9
|
+
* WINDOWS_WRAPPER_PROTOCOL_ENV (src/service/windows-wrapper-exit.ts); a test pins that.
|
|
10
|
+
*/
|
|
11
|
+
export const SUPERVISOR_MARKER_ENVS = ["OCX_DESKTOP_SUPERVISED", "OCX_SERVICE_MANAGED", "OCX_WINDOWS_WRAPPER_PROTOCOL"] as const;
|
|
12
|
+
|
|
13
|
+
/** A copy of `env` without any supervisor marker; `env` itself is not changed. */
|
|
14
|
+
export function withoutSupervisorMarkers<T extends Record<string, string | undefined>>(env: T): T {
|
|
15
|
+
const copy = { ...env };
|
|
16
|
+
for (const name of SUPERVISOR_MARKER_ENVS) delete copy[name];
|
|
17
|
+
return copy;
|
|
18
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Render untrusted provider- or hub-supplied text without letting it control the operator's
|
|
3
|
+
* terminal.
|
|
4
|
+
*
|
|
5
|
+
* The value is data. Escaping is a rendering decision at the moment a human reads it, so it
|
|
6
|
+
* happens here rather than at the point the value is stored or validated: structured output keeps
|
|
7
|
+
* the exact bytes, and only the printed line is neutralized.
|
|
8
|
+
*
|
|
9
|
+
* It lives in `src/lib/` because more than one surface prints an untrusted value: the CLI's
|
|
10
|
+
* diagnostic boundaries (`src/cli/runtime-api.ts`, which re-exports this) and the OAuth device
|
|
11
|
+
* login (`src/oauth/xai.ts`), whose provider-supplied user code and instructions reach the same
|
|
12
|
+
* tty. Importing the CLI module from the OAuth module would close an import cycle, so the
|
|
13
|
+
* primitive is shared from the leaf instead.
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Code points that can drive a terminal or hide what it shows, written as escapes so none of them
|
|
18
|
+
* sits literally in this source.
|
|
19
|
+
*
|
|
20
|
+
* The block is the terminal-safety set `src/link/ssh-runner.ts` and `src/link/ssh-capture-redact.ts`
|
|
21
|
+
* already strip from hint text — C0, DEL, C1, the zero-width/bidi formatting area, the BOM — plus
|
|
22
|
+
* the two line separators that end a printed line. C0/C1 alone leaves the rest of it reachable: a
|
|
23
|
+
* bidi override (`U+202E`), its terminator (`U+202C`), an isolate (`U+2066`–`U+2069`), a directional
|
|
24
|
+
* mark (`U+061C`, `U+200E`, `U+200F`) or a zero-width/BOM character can reorder or conceal the
|
|
25
|
+
* line around it while reading as nothing at all. Provider-supplied instructions and user codes
|
|
26
|
+
* are exactly that class of value, so the whole block is escaped rather than only the C0/C1 part.
|
|
27
|
+
*
|
|
28
|
+
* Two members of that area are deliberately left alone because they are text shaping, not
|
|
29
|
+
* disguise: ZWNJ (`U+200C`) and ZWJ (`U+200D`) join the glyphs of Indic and Persian words and the
|
|
30
|
+
* members of an emoji sequence, so escaping them would corrupt legitimate script and display the
|
|
31
|
+
* escape in its place. Variation selectors are legitimate emoji presentation for the same reason.
|
|
32
|
+
*
|
|
33
|
+
* The tag block (`U+E0000`–`U+E007F`) is included for a different reason: those characters render
|
|
34
|
+
* as nothing anywhere, so they carry text the operator cannot see. It is also how a subdivision
|
|
35
|
+
* flag is drawn, and escaping a flag's tags loses that flag's shape — accepted, because an
|
|
36
|
+
* unreadable channel through a security boundary costs more than one glyph. The range is outside
|
|
37
|
+
* the BMP, which is why the expression needs the `u` flag: without it `\u{e0000}` is a syntax
|
|
38
|
+
* error and a surrogate-pair spelling would match half a character at a time.
|
|
39
|
+
*/
|
|
40
|
+
const UNSAFE = /[\u0000-\u001f\u007f-\u009f\u061c\u200b\u200e\u200f\u202a-\u202e\u2028\u2029\u2060-\u206f\ufeff\u{e0000}-\u{e007f}]/gu;
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Escape one character as the `\xNN` / `\uNNNN` / `\u{...}` literal a reader can see.
|
|
44
|
+
*
|
|
45
|
+
* `codePointAt` rather than `charCodeAt`: the tag block has no BMP spelling, so its characters are
|
|
46
|
+
* a surrogate pair in a JavaScript string, and reading one unit would print half of it as a lone
|
|
47
|
+
* surrogate. Escaping the code point keeps the pair whole and the escape recognizable.
|
|
48
|
+
*/
|
|
49
|
+
function escapeCharacter(character: string): string {
|
|
50
|
+
const code = character.codePointAt(0)!;
|
|
51
|
+
if (code <= 0x7f) return `\\x${code.toString(16).padStart(2, "0")}`;
|
|
52
|
+
if (code <= 0xffff) return `\\u${code.toString(16).padStart(4, "0")}`;
|
|
53
|
+
return `\\u{${code.toString(16)}}`;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
export function terminalSafeText(value: string): string {
|
|
57
|
+
return value.replace(UNSAFE, escapeCharacter);
|
|
58
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { carryReplayRefusal, isNonReplayableResponse, markResponseNonReplayable } from "./upstream-retry";
|
|
2
|
+
import { carryPacedStream, pacedQueuingStrategy } from "./paced-stream";
|
|
2
3
|
|
|
3
4
|
export const TRANSLATOR_MAX_CALL_ARGUMENT_BYTES = 2 * 1024 * 1024;
|
|
4
5
|
export const TRANSLATOR_MAX_TURN_BYTES = 32 * 1024 * 1024;
|
|
@@ -392,7 +393,7 @@ export function finalizeTranslatorBudgetResponse(response: Response, budget: Tra
|
|
|
392
393
|
};
|
|
393
394
|
// The transport owns cancellation and terminal precedence. Abort releases only
|
|
394
395
|
// accounting here, including when no consumer ever pulls or cancels this body.
|
|
395
|
-
const body = new ReadableStream<Uint8Array>({
|
|
396
|
+
const body = carryPacedStream(response.body, new ReadableStream<Uint8Array>({
|
|
396
397
|
async pull(controller) {
|
|
397
398
|
try {
|
|
398
399
|
const result = await reader.read();
|
|
@@ -409,7 +410,7 @@ export function finalizeTranslatorBudgetResponse(response: Response, budget: Tra
|
|
|
409
410
|
finalize();
|
|
410
411
|
await reader.cancel(reason);
|
|
411
412
|
},
|
|
412
|
-
});
|
|
413
|
+
}, pacedQueuingStrategy(response.body)));
|
|
413
414
|
if (signal?.aborted) finalize();
|
|
414
415
|
else signal?.addEventListener("abort", finalize, { once: true });
|
|
415
416
|
const finalizedResponse = new Response(body, { status: response.status, statusText: response.statusText, headers: response.headers });
|
|
@@ -913,6 +913,14 @@ export async function fetchWithTransientRetry(
|
|
|
913
913
|
|
|
914
914
|
export type ProtocolSafeRefetch = (signal?: AbortSignal) => Promise<Response>;
|
|
915
915
|
|
|
916
|
+
/** A Responses SSE stream ended after only uncommitted protocol control frames. */
|
|
917
|
+
export class ProtocolPreOutputEof extends Error {
|
|
918
|
+
constructor() {
|
|
919
|
+
super("upstream Responses stream ended before output or a terminal event");
|
|
920
|
+
this.name = "ProtocolPreOutputEof";
|
|
921
|
+
}
|
|
922
|
+
}
|
|
923
|
+
|
|
916
924
|
export interface ProtocolSafeRefetchOptions extends ResetRetryOptions {
|
|
917
925
|
/** The replacement must match the response contract already selected for the client. */
|
|
918
926
|
acceptResponse?: (response: Response) => boolean;
|
|
@@ -927,7 +935,7 @@ export interface ProtocolSafeRefetchOptions extends ResetRetryOptions {
|
|
|
927
935
|
}
|
|
928
936
|
|
|
929
937
|
/**
|
|
930
|
-
* Attempt ONE caller-authorized replacement of a
|
|
938
|
+
* Attempt ONE caller-authorized replacement of a reset or pre-output EOF after the response head.
|
|
931
939
|
*
|
|
932
940
|
* The caller owns the proof that nothing was observed -- it comes from protocol inspection,
|
|
933
941
|
* not from this module -- and owns the physical-send budget. What lives here is the part that
|
|
@@ -940,12 +948,14 @@ export async function refetchAfterProtocolSafeReset(
|
|
|
940
948
|
err: unknown,
|
|
941
949
|
opts: ProtocolSafeRefetchOptions = {},
|
|
942
950
|
): Promise<Response | null> {
|
|
943
|
-
if (!isConnectionResetError(err)
|
|
951
|
+
if ((!isConnectionResetError(err) && !(err instanceof ProtocolPreOutputEof))
|
|
952
|
+
|| opts.abortSignal?.aborted || opts.attempts === 0) return null;
|
|
944
953
|
const label = opts.label
|
|
945
954
|
? " (" + redactSecretString(opts.label).replace(/[\r\n\u0000-\u001f\u007f]/g, "").slice(0, 128) + ")"
|
|
946
955
|
: "";
|
|
956
|
+
const failure = err instanceof ProtocolPreOutputEof ? "pre-output stream EOF" : "pre-output stream reset";
|
|
947
957
|
if (opts.authorize && !opts.authorize()) {
|
|
948
|
-
console.warn("[upstream-retry]
|
|
958
|
+
console.warn("[upstream-retry] " + failure + " replacement refused" + label + "; preserving original stream");
|
|
949
959
|
return null;
|
|
950
960
|
}
|
|
951
961
|
let replacement: Response;
|
|
@@ -965,7 +975,7 @@ export async function refetchAfterProtocolSafeReset(
|
|
|
965
975
|
console.warn("[upstream-retry] protocol-safe refetch rejected" + label + "; preserving original stream error");
|
|
966
976
|
return null;
|
|
967
977
|
}
|
|
968
|
-
console.warn("[upstream-retry]
|
|
978
|
+
console.warn("[upstream-retry] " + failure + label + "; using one replacement stream");
|
|
969
979
|
return replacement;
|
|
970
980
|
}
|
|
971
981
|
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The per-alias lock that enrollment and revoke of a Home-initiated link take (structure/remote-link.md,
|
|
3
|
+
* "Operation journal"). One private SQLite file per alias (lowercased, hashed) under <configDir>/link/locks, held
|
|
4
|
+
* with BEGIN IMMEDIATE for the whole operation, so a second holder anywhere, this process included, waits. The OS
|
|
5
|
+
* releases it when the holding process dies, which is what lets a repeat recover an open journal entry.
|
|
6
|
+
*
|
|
7
|
+
* Waiting polls with an injected sleep and clock up to a bound; past it the caller answers 409.
|
|
8
|
+
*/
|
|
9
|
+
import { Database } from "bun:sqlite";
|
|
10
|
+
import { createHash } from "node:crypto";
|
|
11
|
+
import { chmodSync, closeSync, lstatSync, mkdirSync, openSync } from "node:fs";
|
|
12
|
+
import { dirname, join } from "node:path";
|
|
13
|
+
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
14
|
+
import { hardenSecretDir, hardenSecretPath } from "../lib/windows-secret-acl";
|
|
15
|
+
import { linkDir } from "./paths";
|
|
16
|
+
|
|
17
|
+
export interface AliasLockDeps {
|
|
18
|
+
/** Defaults to <configDir>/link/locks. */
|
|
19
|
+
lockDir?: string;
|
|
20
|
+
sleep?: (ms: number) => Promise<void>;
|
|
21
|
+
now?: () => number;
|
|
22
|
+
/** How long a second holder waits; defaults to ALIAS_LOCK_WAIT_MS. */
|
|
23
|
+
waitMs?: number;
|
|
24
|
+
pollMs?: number;
|
|
25
|
+
/** The caller's request: once it aborts (the client went away), the wait ends at the next poll. */
|
|
26
|
+
signal?: AbortSignal;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export interface AliasLock { release(): void }
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Two minutes: a third of the CLI's 360 s enrollment deadline (ENROLLMENT_DEADLINE_MS in src/cli/link-enrollment.ts),
|
|
33
|
+
* which bounds the wait itself. It does not promise the waiter time to finish: an apply's own worst case can outrun the
|
|
34
|
+
* deadline, and then the CLI reports the outcome uncertain and a repeat with the same operation id replays it. A waiting
|
|
35
|
+
* revoke holds its link's Child-operation reservation no longer than this.
|
|
36
|
+
*/
|
|
37
|
+
export const ALIAS_LOCK_WAIT_MS = 120_000;
|
|
38
|
+
const ALIAS_LOCK_POLL_MS = 250;
|
|
39
|
+
|
|
40
|
+
export class AliasLockError extends Error {
|
|
41
|
+
constructor(readonly code: "link_alias_lock_busy" | "link_alias_lock_failed" | "link_alias_lock_aborted", options?: ErrorOptions) {
|
|
42
|
+
super(code, options);
|
|
43
|
+
this.name = "AliasLockError";
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export function aliasLockPath(alias: string, lockDir: string = join(linkDir(), "locks")): string {
|
|
48
|
+
return join(lockDir, createHash("sha256").update(alias.toLowerCase()).digest("hex").slice(0, 32) + ".lock");
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
function errorCode(error: unknown): unknown {
|
|
52
|
+
return error !== null && typeof error === "object" && "code" in error ? (error as { code: unknown }).code : undefined;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
function assertPrivate(path: string, directory: boolean): void {
|
|
56
|
+
const stat = lstatSync(path);
|
|
57
|
+
if (stat.isSymbolicLink() || (directory ? !stat.isDirectory() : !stat.isFile() || stat.nlink !== 1)) throw new AliasLockError("link_alias_lock_failed");
|
|
58
|
+
if (process.platform !== "win32" && stat.uid !== process.getuid!()) throw new AliasLockError("link_alias_lock_failed");
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
function prepare(path: string, directory: string): void {
|
|
62
|
+
// <configDir>/link/locks: refuse before any mkdir when a test points it at the real OpenCodex home.
|
|
63
|
+
assertNotRealHomeUnderTest(dirname(dirname(directory)));
|
|
64
|
+
mkdirSync(directory, { recursive: true, mode: 0o700 });
|
|
65
|
+
assertPrivate(directory, true);
|
|
66
|
+
if (process.platform !== "win32") chmodSync(directory, 0o700);
|
|
67
|
+
hardenSecretDir(directory, { required: true });
|
|
68
|
+
// Created privately before SQLite opens it; an existing symlink or hard link is refused, never followed.
|
|
69
|
+
try { closeSync(openSync(path, "wx", 0o600)); } catch (error) { if (errorCode(error) !== "EEXIST") throw error; }
|
|
70
|
+
assertPrivate(path, false);
|
|
71
|
+
if (process.platform !== "win32") chmodSync(path, 0o600);
|
|
72
|
+
hardenSecretPath(path, { required: true });
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
function tryAcquire(path: string): Database | null {
|
|
76
|
+
let database: Database | undefined;
|
|
77
|
+
try {
|
|
78
|
+
database = new Database(path, { create: true });
|
|
79
|
+
database.exec("PRAGMA busy_timeout = 0; BEGIN IMMEDIATE");
|
|
80
|
+
return database;
|
|
81
|
+
} catch (error) {
|
|
82
|
+
try { database?.close(); } catch { /* the acquisition failure is what matters */ }
|
|
83
|
+
const code = errorCode(error);
|
|
84
|
+
if (code === "SQLITE_BUSY" || code === "SQLITE_LOCKED" || (error instanceof Error && /database (?:is|table is) locked/i.test(error.message))) return null;
|
|
85
|
+
throw new AliasLockError("link_alias_lock_failed", { cause: error });
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/** Take the alias lock, waiting while another holder has it; AliasLockError link_alias_lock_busy past the bound. */
|
|
90
|
+
export async function acquireAliasLock(alias: string, deps: AliasLockDeps = {}): Promise<AliasLock> {
|
|
91
|
+
const directory = deps.lockDir ?? join(linkDir(), "locks");
|
|
92
|
+
const path = aliasLockPath(alias, directory);
|
|
93
|
+
try { prepare(path, directory); } catch (error) {
|
|
94
|
+
throw error instanceof AliasLockError ? error : new AliasLockError("link_alias_lock_failed", { cause: error });
|
|
95
|
+
}
|
|
96
|
+
const now = deps.now ?? Date.now, sleep = deps.sleep ?? ((ms: number) => Bun.sleep(ms));
|
|
97
|
+
const deadline = now() + (deps.waitMs ?? ALIAS_LOCK_WAIT_MS);
|
|
98
|
+
for (;;) {
|
|
99
|
+
if (deps.signal?.aborted) throw new AliasLockError("link_alias_lock_aborted");
|
|
100
|
+
const database = tryAcquire(path);
|
|
101
|
+
if (database) {
|
|
102
|
+
let held = true;
|
|
103
|
+
return { release() {
|
|
104
|
+
if (!held) return;
|
|
105
|
+
held = false;
|
|
106
|
+
try { database.exec("ROLLBACK"); } catch { /* close releases the OS lock regardless */ }
|
|
107
|
+
database.close();
|
|
108
|
+
} };
|
|
109
|
+
}
|
|
110
|
+
if (now() >= deadline) throw new AliasLockError("link_alias_lock_busy");
|
|
111
|
+
await sleep(deps.pollMs ?? ALIAS_LOCK_POLL_MS);
|
|
112
|
+
if (deps.signal?.aborted) throw new AliasLockError("link_alias_lock_aborted");
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
export async function withAliasLock<T>(alias: string, deps: AliasLockDeps, action: () => Promise<T>): Promise<T> {
|
|
117
|
+
const lock = await acquireAliasLock(alias, deps);
|
|
118
|
+
try { return await action(); } finally { lock.release(); }
|
|
119
|
+
}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { linkRouteAllowed } from "./routes";
|
|
2
|
+
|
|
3
|
+
/** A link with no relayed model turn for this long reads as idle (D5). */
|
|
4
|
+
export const DEFAULT_IDLE_AFTER_MS = 600_000;
|
|
5
|
+
|
|
6
|
+
export interface LinkActivitySnapshot { inFlight: number; lastDataEndAt: number | null; observedSince: number }
|
|
7
|
+
|
|
8
|
+
/** One Remote Link WebSocket in the book: it counts in flight while busy (design T4 section 5). */
|
|
9
|
+
export interface LinkSocketActivity {
|
|
10
|
+
busy(value: boolean): void;
|
|
11
|
+
end(): void;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export interface LinkActivity {
|
|
15
|
+
/**
|
|
16
|
+
* Start one relayed model request. null = a legacy key admission without a relay session; it counts against every
|
|
17
|
+
* link. The returned end is idempotent and stamps lastDataEndAt.
|
|
18
|
+
*/
|
|
19
|
+
begin(linkId: string | null): () => void;
|
|
20
|
+
/** A link WebSocket; busy while a turn runs or client work is pending. Idempotent end. */
|
|
21
|
+
beginSocket(linkId: string): LinkSocketActivity;
|
|
22
|
+
snapshot(linkId: string, now: number): LinkActivitySnapshot;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/** Model traffic only: a POST the data-plane table admits, except token counting. */
|
|
26
|
+
export function linkActivityCounts(url: URL, req: Request): boolean {
|
|
27
|
+
return req.method === "POST" && url.pathname !== "/v1/messages/count_tokens" && linkRouteAllowed(url, req);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
export function isLinkIdle(snapshot: LinkActivitySnapshot, now: number, idleAfterMs = DEFAULT_IDLE_AFTER_MS): boolean {
|
|
31
|
+
return snapshot.inFlight === 0 && now - (snapshot.lastDataEndAt ?? snapshot.observedSince) >= idleAfterMs;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
interface ActivityEntry { inFlight: number; lastDataEndAt: number | null }
|
|
35
|
+
|
|
36
|
+
/** In memory, no timers. One small entry per link id that ever relayed; links are bounded by links.json. */
|
|
37
|
+
/** held: durable link WebSocket holds (src/link/ws-activity-holds.ts), counted as in flight. */
|
|
38
|
+
export function createLinkActivity(deps: { now?: () => number; held?: (linkId: string) => number } = {}): LinkActivity {
|
|
39
|
+
const now = deps.now ?? Date.now;
|
|
40
|
+
const observedSince = now();
|
|
41
|
+
const perLink = new Map<string, ActivityEntry>();
|
|
42
|
+
const legacy: ActivityEntry = { inFlight: 0, lastDataEndAt: null };
|
|
43
|
+
const entryFor = (linkId: string): ActivityEntry => {
|
|
44
|
+
let entry = perLink.get(linkId);
|
|
45
|
+
if (!entry) { entry = { inFlight: 0, lastDataEndAt: null }; perLink.set(linkId, entry); }
|
|
46
|
+
return entry;
|
|
47
|
+
};
|
|
48
|
+
return {
|
|
49
|
+
begin(linkId) {
|
|
50
|
+
const entry = linkId === null ? legacy : entryFor(linkId);
|
|
51
|
+
entry.inFlight += 1;
|
|
52
|
+
let ended = false;
|
|
53
|
+
return () => {
|
|
54
|
+
if (ended) return;
|
|
55
|
+
ended = true;
|
|
56
|
+
entry.inFlight -= 1;
|
|
57
|
+
entry.lastDataEndAt = now();
|
|
58
|
+
};
|
|
59
|
+
},
|
|
60
|
+
beginSocket(linkId) {
|
|
61
|
+
const entry = entryFor(linkId);
|
|
62
|
+
let counted = false;
|
|
63
|
+
let ended = false;
|
|
64
|
+
const set = (value: boolean): void => {
|
|
65
|
+
if (ended || value === counted) return;
|
|
66
|
+
counted = value;
|
|
67
|
+
entry.inFlight += value ? 1 : -1;
|
|
68
|
+
if (!value) entry.lastDataEndAt = now();
|
|
69
|
+
};
|
|
70
|
+
return {
|
|
71
|
+
busy: set,
|
|
72
|
+
end() { set(false); ended = true; },
|
|
73
|
+
};
|
|
74
|
+
},
|
|
75
|
+
snapshot(linkId) {
|
|
76
|
+
const entry = perLink.get(linkId);
|
|
77
|
+
const ends = [entry?.lastDataEndAt ?? null, legacy.lastDataEndAt].filter((value): value is number => value !== null);
|
|
78
|
+
let held = 0;
|
|
79
|
+
try { held = deps.held?.(linkId) ?? 0; } catch { held = 1; }
|
|
80
|
+
return { inFlight: (entry?.inFlight ?? 0) + legacy.inFlight + held, lastDataEndAt: ends.length ? Math.max(...ends) : null, observedSince };
|
|
81
|
+
},
|
|
82
|
+
};
|
|
83
|
+
}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
export declare const CHILD_RELEASE_DIGESTS_PATH: string;
|
|
2
|
+
export declare const CHILD_RELEASE_REPOSITORY: string;
|
|
3
|
+
export declare const CHILD_CACHE_ARTIFACT_FILES: readonly string[];
|
|
4
|
+
export declare function childReleaseAssetUrl(version: string, file: string): string;
|
|
5
|
+
/** "ocx-child-builds": the fill's own directory under OPENCODEX_HOME. */
|
|
6
|
+
export declare const CHILD_FILL_DIR: string;
|
|
7
|
+
export declare function childBinaryCacheDir(opencodexHome: string, version: string): string;
|
|
8
|
+
export declare function compareReleaseVersions(left: string, right: string): -1 | 0 | 1 | null;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Why the startup step's ownership claim stopped a fill before any write: an ocx-child-builds directory
|
|
12
|
+
* the ownership manifest does not list that already holds files (OpenCodex did not create it), an
|
|
13
|
+
* uninstall in progress, or a manifest that is full or locked by another process (the next start tries again).
|
|
14
|
+
*/
|
|
15
|
+
export type ChildCacheClaimRefusal = "foreign_directory" | "uninstall_in_progress" | "ownership_unavailable";
|
|
16
|
+
|
|
17
|
+
export type ChildCacheFillOutcome =
|
|
18
|
+
/** first_start: no record of an earlier version (a fresh install), so the version is recorded and nothing fetched. */
|
|
19
|
+
/** invalid_digests: the package's digest file is there but unreadable or unusable (the record is left alone); busy: another process is filling. */
|
|
20
|
+
| { readonly kind: "skipped"; readonly reason: "invalid_version" | "no_digests" | "invalid_digests" | "downgrade" | "first_start" | "not_an_upgrade" | "busy" | "source_checkout" | "unsupported_platform" | "disabled" | "version_mismatch" | ChildCacheClaimRefusal }
|
|
21
|
+
/** cached: every verified build now in the cache; fetched: those downloaded now; failed: listed builds withdrawn from the manifest. */
|
|
22
|
+
| { readonly kind: "filled"; readonly cached: readonly string[]; readonly fetched: readonly string[]; readonly failed: readonly string[] };
|
|
23
|
+
|
|
24
|
+
export interface ChildCacheFillOptions {
|
|
25
|
+
/** Root of the running package tree, which its installer verified. */
|
|
26
|
+
readonly packageRoot: string;
|
|
27
|
+
readonly version: string;
|
|
28
|
+
/** Required: the Home the reader resolves (getConfigDir() in the startup step); there is no environment fallback. */
|
|
29
|
+
readonly opencodexHome: string;
|
|
30
|
+
readonly fetchImpl?: typeof fetch;
|
|
31
|
+
/** Per download. */
|
|
32
|
+
readonly timeoutMs?: number;
|
|
33
|
+
/** Defaults to process.platform; on win32 the fill does nothing (no mode bits to prove the cache private). */
|
|
34
|
+
readonly platform?: NodeJS.Platform;
|
|
35
|
+
/** Clock for the fill lock's age; defaults to Date.now. */
|
|
36
|
+
readonly now?: () => number;
|
|
37
|
+
/** The running code's own version (startup); a package.json that differs records nothing (version_mismatch). */
|
|
38
|
+
readonly bundledVersion?: string;
|
|
39
|
+
/** Called once after the gates and before the first write; a refusal ends the fill with that reason. */
|
|
40
|
+
readonly claimCache?: () => ChildCacheClaimRefusal | null;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export declare function runningPackageRoot(): string;
|
|
44
|
+
export declare function fillChildBinaryCacheForVersion(options: ChildCacheFillOptions): Promise<ChildCacheFillOutcome>;
|
|
45
|
+
export declare function runningPackageVersion(packageRoot?: string): string | null;
|
|
46
|
+
/** Defaults: the running package root and its package.json version. */
|
|
47
|
+
export declare function fillChildBinaryCacheOnStart(
|
|
48
|
+
options: Partial<ChildCacheFillOptions> & { readonly opencodexHome: string },
|
|
49
|
+
out?: { log: (line: string) => void; warn: (line: string) => void },
|
|
50
|
+
): Promise<ChildCacheFillOutcome | null>;
|