@bitkyc08/opencodex 2.100.2 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +36 -13
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createHash, randomUUID } from "node:crypto";
|
|
2
2
|
import type { OcxProviderConfig } from "../types";
|
|
3
3
|
import { isEgressTransparentExecutor, markEgressTransparentExecutor } from "../lib/provider-egress";
|
|
4
|
+
import { isPassiveKeyTransparent, markPassiveKeyTransparent } from "../lib/passive-key-fetch-proof";
|
|
4
5
|
import { configuredOutboundFetch } from "../lib/proxy-env";
|
|
5
6
|
import { resolveGithubCopilotTransport } from "./github-copilot-transport";
|
|
6
7
|
import { resolveMistralTransport } from "./mistral-transport";
|
|
@@ -165,12 +166,14 @@ export function resolveProviderTransport(
|
|
|
165
166
|
// the configuration named a proxy.
|
|
166
167
|
const baseFetch = provider.fetch
|
|
167
168
|
?? markEgressTransparentExecutor(((input, init) => configuredOutboundFetch(input, init)) as typeof globalThis.fetch);
|
|
169
|
+
if (!provider.fetch) markPassiveKeyTransparent(baseFetch);
|
|
168
170
|
const attemptFetch = ((input, init) =>
|
|
169
171
|
baseFetch(input, withGeneratedRequestId(init, requestId, stableHeaders))) as typeof globalThis.fetch;
|
|
170
172
|
// This wrapper only adds a header and forwards the init, so it carries a request-scoped proxy
|
|
171
173
|
// option through to whatever it wraps — but only if what it wraps carries it too. A
|
|
172
174
|
// configured executor owns its own routing and is not assumed to.
|
|
173
175
|
if (isEgressTransparentExecutor(baseFetch)) markEgressTransparentExecutor(attemptFetch);
|
|
176
|
+
if (isPassiveKeyTransparent(baseFetch) && !Object.keys(stableHeaders).some(name => ["authorization", "x-api-key", "api-key"].includes(name.toLowerCase()))) markPassiveKeyTransparent(attemptFetch);
|
|
174
177
|
|
|
175
178
|
return {
|
|
176
179
|
...provider,
|
package/src/remote/features.ts
CHANGED
|
@@ -14,6 +14,8 @@
|
|
|
14
14
|
* - `relay-auth/<n>` with the connection-bound link relay auth version.
|
|
15
15
|
* - `link-peer-report/<n>` with the version of the report a Child sends on the relay challenge and a
|
|
16
16
|
* Home records for `ocx link status` (`src/link/peer-report.ts`).
|
|
17
|
+
* - `link-request-zstd/<n>` when this build decodes zstd request bodies a Child sends over the link
|
|
18
|
+
* and compresses its own as a Child (`src/link/request-compression.ts`).
|
|
17
19
|
*
|
|
18
20
|
* The ids are static strings. They carry no account, credential or configuration data, which is
|
|
19
21
|
* what keeps the unauthenticated `/readyz` body safe. `parseRemoteReadyMetadata` accepts at most
|
|
@@ -23,6 +25,7 @@
|
|
|
23
25
|
import { LINK_MANAGEMENT_READ_PATHS } from "../link/management-routes";
|
|
24
26
|
import { LINK_PEER_REPORT_VERSION } from "../link/peer-report";
|
|
25
27
|
import { LINK_RELAY_AUTH_VERSION } from "../link/relay-auth";
|
|
28
|
+
import { LINK_REQUEST_ZSTD_FEATURE, LINK_REQUEST_ZSTD_VERSION } from "../link/request-compression";
|
|
26
29
|
import { MANAGEMENT_ROUTES, type ManagementRoute } from "../server/management/route-registry";
|
|
27
30
|
import { SERVED_BY_HEADER_EMITTED } from "./served-by";
|
|
28
31
|
|
|
@@ -36,6 +39,8 @@ export interface PeerFeatureSources {
|
|
|
36
39
|
readonly servedByHeaderEmitted: boolean;
|
|
37
40
|
readonly relayAuthVersion: string;
|
|
38
41
|
readonly linkPeerReportVersion: string;
|
|
42
|
+
/** Empty when the build does not speak per-body zstd over a link. */
|
|
43
|
+
readonly linkRequestZstdVersion: string;
|
|
39
44
|
}
|
|
40
45
|
|
|
41
46
|
/** One feature: its id when the sources say it is served, otherwise null. */
|
|
@@ -49,6 +54,7 @@ export const PEER_FEATURES: readonly PeerFeature[] = [
|
|
|
49
54
|
s => s.servedByHeaderEmitted ? "served-by-header" : null,
|
|
50
55
|
s => `relay-auth/${s.relayAuthVersion}`,
|
|
51
56
|
s => `link-peer-report/${s.linkPeerReportVersion}`,
|
|
57
|
+
s => s.linkRequestZstdVersion ? `link-request-zstd/${s.linkRequestZstdVersion}` : null,
|
|
52
58
|
];
|
|
53
59
|
|
|
54
60
|
export function currentPeerFeatureSources(): PeerFeatureSources {
|
|
@@ -58,6 +64,7 @@ export function currentPeerFeatureSources(): PeerFeatureSources {
|
|
|
58
64
|
servedByHeaderEmitted: SERVED_BY_HEADER_EMITTED,
|
|
59
65
|
relayAuthVersion: LINK_RELAY_AUTH_VERSION,
|
|
60
66
|
linkPeerReportVersion: LINK_PEER_REPORT_VERSION,
|
|
67
|
+
linkRequestZstdVersion: LINK_REQUEST_ZSTD_VERSION,
|
|
61
68
|
};
|
|
62
69
|
}
|
|
63
70
|
|
|
@@ -72,3 +79,13 @@ export function buildPeerFeatures(): string[] {
|
|
|
72
79
|
buildFeatures ??= Object.freeze(servedPeerFeatures());
|
|
73
80
|
return [...buildFeatures];
|
|
74
81
|
}
|
|
82
|
+
|
|
83
|
+
/**
|
|
84
|
+
* The features a Home names to its Children on every relay-auth answer. `linkRequestCompression:
|
|
85
|
+
* false` leaves out per-body zstd, so Children send identity bodies exactly as before it existed;
|
|
86
|
+
* the Home still decodes a zstd body any client sends, and `GET /readyz` still lists what the build can do.
|
|
87
|
+
*/
|
|
88
|
+
export function linkHomeFeatures(config: { linkRequestCompression?: boolean } | undefined): string[] {
|
|
89
|
+
const features = buildPeerFeatures();
|
|
90
|
+
return config?.linkRequestCompression === false ? features.filter(id => id !== LINK_REQUEST_ZSTD_FEATURE) : features;
|
|
91
|
+
}
|
|
@@ -1,14 +1,19 @@
|
|
|
1
|
+
import { escapeMemoryCitationMentions } from "./citation-markers";
|
|
1
2
|
import { encodeReasoningEnvelope, decodeReasoningEnvelope, type ReasoningEnvelope } from "./reasoning-envelope";
|
|
2
3
|
import type { TranslatorBudget } from "../lib/translator-budget";
|
|
3
4
|
|
|
4
|
-
/**
|
|
5
|
-
|
|
5
|
+
/**
|
|
6
|
+
* A visible update is a presentation copy of one original signed thinking block. The copy is
|
|
7
|
+
* escaped for a quoted memory-citation tag; the envelope keeps the raw text so the signed payload
|
|
8
|
+
* is unchanged.
|
|
9
|
+
*/
|
|
10
|
+
export function anthropicProgressItems(text: string, signature: string, budget?: TranslatorBudget, escapeVisible = true) {
|
|
6
11
|
const id = `msg_${crypto.randomUUID().replaceAll("-", "")}`;
|
|
7
12
|
return [
|
|
8
13
|
{ type: "reasoning", id: `rs_${crypto.randomUUID().replaceAll("-", "")}`, summary: [],
|
|
9
14
|
encrypted_content: encodeReasoningEnvelope({ sig: signature, txt: text, upd: id }, budget) },
|
|
10
15
|
{ type: "message", id, role: "assistant", status: "completed", phase: "commentary",
|
|
11
|
-
content: [{ type: "output_text", text, annotations: [] }] },
|
|
16
|
+
content: [{ type: "output_text", text: escapeVisible ? escapeMemoryCitationMentions(text) : text, annotations: [] }] },
|
|
12
17
|
];
|
|
13
18
|
}
|
|
14
19
|
|
|
@@ -22,7 +27,8 @@ export function isAnthropicProgressMirror(item: unknown, envelope: ReasoningEnve
|
|
|
22
27
|
if (msg.role !== "assistant" || msg.phase !== "commentary" || (msg.id !== undefined && msg.id !== envelope.upd)) return false;
|
|
23
28
|
if (!Array.isArray(msg.content) || msg.content.length !== 1) return false;
|
|
24
29
|
const part = msg.content[0] as { type?: unknown; text?: unknown } | undefined;
|
|
25
|
-
return part?.type === "output_text"
|
|
30
|
+
return part?.type === "output_text"
|
|
31
|
+
&& (part.text === envelope.txt || part.text === escapeMemoryCitationMentions(envelope.txt));
|
|
26
32
|
}
|
|
27
33
|
|
|
28
34
|
export function anthropicProgressEnvelope(item: unknown, budget?: TranslatorBudget): ReasoningEnvelope | null {
|
|
@@ -62,6 +62,237 @@ export interface CitationMarkerFilter {
|
|
|
62
62
|
flush(): string;
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
+
/**
|
|
66
|
+
* The memory-citation tags the Codex client parses as hidden markup (openai/codex
|
|
67
|
+
* `codex-rs/utils/stream-parser/src/citation.rs`): matching is literal and non-nested, the text
|
|
68
|
+
* from an opening tag to the FIRST closing tag is hidden, and an opening tag that never closes is
|
|
69
|
+
* auto-closed at the end of the stream, hiding everything after it. A model that quotes the tag
|
|
70
|
+
* ("output the `...` block at the end") therefore appears to truncate at the quote. Backticks do
|
|
71
|
+
* not protect it, because the client parses before any markdown rendering.
|
|
72
|
+
*/
|
|
73
|
+
const MEMORY_CITATION_OPEN = "<oai-mem-citation>";
|
|
74
|
+
const MEMORY_CITATION_CLOSE = "</oai-mem-citation>";
|
|
75
|
+
const MEMORY_CITATION_MENTION = /<(\/?oai-mem-citation>)/g;
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* Body shape of a REAL memory-citation block: it opens with a complete `<citation_entries>` list, or
|
|
79
|
+
* with a complete ids list (`<rollout_ids>` or `<thread_ids>`) when the entries are absent. That matches
|
|
80
|
+
* the client's `parse_memory_citation` (`codex-rs/memories/read/src/citations.rs`), which accepts a block
|
|
81
|
+
* carrying either list and rejects one carrying neither.
|
|
82
|
+
*
|
|
83
|
+
* This is what separates a block the client should render from a mention of the tag name inside
|
|
84
|
+
* ordinary prose. Escaping both would break the real feature: the client would print the tags
|
|
85
|
+
* instead of the citation list, and the turn's memory references would silently disappear.
|
|
86
|
+
*/
|
|
87
|
+
const MEMORY_CITATION_BODY_ELEMENTS: ReadonlyArray<readonly [open: string, close: string]> = [
|
|
88
|
+
["<citation_entries>", "</citation_entries>"],
|
|
89
|
+
["<rollout_ids>", "</rollout_ids>"],
|
|
90
|
+
["<thread_ids>", "</thread_ids>"],
|
|
91
|
+
];
|
|
92
|
+
|
|
93
|
+
/** First index at or after `from` (below `limit`) that is not whitespace. */
|
|
94
|
+
function skipWhitespace(text: string, from: number, limit: number): number {
|
|
95
|
+
let at = from;
|
|
96
|
+
while (at < limit && /\s/.test(text[at]!)) at++;
|
|
97
|
+
return at;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
/**
|
|
101
|
+
* Longest candidate block, in UTF-16 code units (JavaScript string length), that the streaming
|
|
102
|
+
* escaper holds while waiting for its closing tag; the whole-string form applies the same limit.
|
|
103
|
+
* Callers charge the held bytes to their translator budget (`live_transient`) as the hold grows.
|
|
104
|
+
*/
|
|
105
|
+
const MAX_MEMORY_CITATION_HOLD = 16_384;
|
|
106
|
+
|
|
107
|
+
/**
|
|
108
|
+
* Whether the text right after an opening tag still could begin a real block.
|
|
109
|
+
*
|
|
110
|
+
* A real block puts `<citation_entries>` (usually on the next line) immediately after the open
|
|
111
|
+
* tag. Ordinary prose that quotes the tag puts a backtick, punctuation, or words there instead,
|
|
112
|
+
* so one short lookahead separates the two without buffering the whole block.
|
|
113
|
+
*/
|
|
114
|
+
function bodyCouldBeReal(afterOpen: string): boolean {
|
|
115
|
+
const trimmed = afterOpen.replace(/^\s+/, "");
|
|
116
|
+
return MEMORY_CITATION_BODY_ELEMENTS.some(([open]) => open.startsWith(trimmed) || trimmed.startsWith(open));
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
function isMemoryCitationBlock(body: string): boolean {
|
|
120
|
+
const trimmed = body.replace(/^\s+/, "");
|
|
121
|
+
return MEMORY_CITATION_BODY_ELEMENTS.some(([open, close]) => trimmed.startsWith(open) && trimmed.includes(close, open.length));
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
/**
|
|
125
|
+
* Whether an opening tag begins a real block: the entries list has to follow it directly.
|
|
126
|
+
*
|
|
127
|
+
* `isMemoryCitationBlock` over a whole body cannot answer this, because prose before a real block
|
|
128
|
+
* also spans a `<citation_entries>…</citation_entries>…<rollout_ids>` stretch when the search is
|
|
129
|
+
* anchored at the mention rather than at the block. The adjacency check is what makes the mention
|
|
130
|
+
* provably a mention.
|
|
131
|
+
*/
|
|
132
|
+
function opensRealBlock(text: string, openAt: number, closeCache?: { at: number }): number | undefined {
|
|
133
|
+
const afterOpen = openAt + MEMORY_CITATION_OPEN.length;
|
|
134
|
+
const bodyStart = skipWhitespace(text, afterOpen, Math.min(text.length, openAt + MAX_MEMORY_CITATION_HOLD));
|
|
135
|
+
if (!MEMORY_CITATION_BODY_ELEMENTS.some(([open]) => text.startsWith(open, bodyStart))) return undefined;
|
|
136
|
+
// Callers scanning one string for several opening tags share the next closing tag, so prose with
|
|
137
|
+
// many unclosed candidates costs one forward search instead of one per tag (-2: not searched yet).
|
|
138
|
+
let close: number;
|
|
139
|
+
if (closeCache) {
|
|
140
|
+
if (closeCache.at === -2 || (closeCache.at !== -1 && closeCache.at < bodyStart)) {
|
|
141
|
+
closeCache.at = text.indexOf(MEMORY_CITATION_CLOSE, bodyStart);
|
|
142
|
+
}
|
|
143
|
+
close = closeCache.at;
|
|
144
|
+
} else {
|
|
145
|
+
close = text.indexOf(MEMORY_CITATION_CLOSE, bodyStart);
|
|
146
|
+
}
|
|
147
|
+
if (close === -1) return undefined;
|
|
148
|
+
// The streaming escaper holds at most MAX_MEMORY_CITATION_HOLD of a candidate, so a block larger
|
|
149
|
+
// than that is a mention in BOTH forms; one size rule keeps deltas and `output_text.done` equal.
|
|
150
|
+
if (close + MEMORY_CITATION_CLOSE.length - openAt > MAX_MEMORY_CITATION_HOLD) return undefined;
|
|
151
|
+
return isMemoryCitationBlock(text.slice(afterOpen, close)) ? close + MEMORY_CITATION_CLOSE.length : undefined;
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
/**
|
|
155
|
+
* Neutralize a literal memory-citation tag so the client renders it as text.
|
|
156
|
+
*
|
|
157
|
+
* The client parses the tag as markup before markdown, so wrapping it in backticks does not
|
|
158
|
+
* protect it. The leading `<` becomes `<`. In ordinary markdown text that renders as `<` again;
|
|
159
|
+
* inside an inline code span or a fenced block CommonMark does not decode entities, so the reader
|
|
160
|
+
* sees `<oai-mem-citation>` literally. That visible difference is the trade-off for keeping the
|
|
161
|
+
* rest of the answer: the alternative is the client hiding everything after the quote.
|
|
162
|
+
*
|
|
163
|
+
* Only the Responses wire needs this: Chat Completions and Messages clients never parse the tag,
|
|
164
|
+
* so the bridges apply it behind `escapeMemoryCitationTags`.
|
|
165
|
+
*/
|
|
166
|
+
export function escapeMemoryCitationMentions(text: string): string {
|
|
167
|
+
if (!text.includes("oai-mem-citation")) return text;
|
|
168
|
+
// Claim real blocks FIRST, so a mention earlier in the prose cannot pair with a real block's
|
|
169
|
+
// closing tag and leave the block half-escaped. Everything outside a claimed block is a
|
|
170
|
+
// mention and gets escaped, tags included. Matching runs over the ORIGINAL string as one pass
|
|
171
|
+
// (appendReplacement), because `String.replace` would re-scan the text we just escaped.
|
|
172
|
+
const blocks: Array<{ start: number; end: number }> = [];
|
|
173
|
+
const closeCache = { at: -2 };
|
|
174
|
+
let searchFrom = 0;
|
|
175
|
+
for (;;) {
|
|
176
|
+
const open = text.indexOf(MEMORY_CITATION_OPEN, searchFrom);
|
|
177
|
+
if (open === -1) break;
|
|
178
|
+
const end = opensRealBlock(text, open, closeCache);
|
|
179
|
+
if (end !== undefined) {
|
|
180
|
+
blocks.push({ start: open, end });
|
|
181
|
+
searchFrom = end;
|
|
182
|
+
} else {
|
|
183
|
+
searchFrom = open + MEMORY_CITATION_OPEN.length;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
// Outside claimed blocks every tag is a mention; one linear regex pass escapes them all.
|
|
187
|
+
const escapedMentions = (segment: string): string => segment.replace(MEMORY_CITATION_MENTION, "<$1");
|
|
188
|
+
if (blocks.length === 0) return escapedMentions(text);
|
|
189
|
+
let out = "";
|
|
190
|
+
let cursor = 0;
|
|
191
|
+
for (const block of blocks) {
|
|
192
|
+
out += escapedMentions(text.slice(cursor, block.start));
|
|
193
|
+
out += text.slice(block.start, block.end);
|
|
194
|
+
cursor = block.end;
|
|
195
|
+
}
|
|
196
|
+
out += escapedMentions(text.slice(cursor));
|
|
197
|
+
return out;
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
export interface MemoryCitationEscaper {
|
|
201
|
+
/** Feed one streaming delta; returns the portion safe to emit now. */
|
|
202
|
+
push(delta: string): string;
|
|
203
|
+
/** Text still withheld at the end of the stream; resolve it with `escapeMemoryCitationMentions`. */
|
|
204
|
+
pending(): string;
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
/** Escaper for deliveries that must not rewrite text (Chat Completions, Messages). */
|
|
208
|
+
export const passthroughMemoryCitationEscaper: MemoryCitationEscaper = {
|
|
209
|
+
push: (delta: string) => delta,
|
|
210
|
+
pending: () => "",
|
|
211
|
+
};
|
|
212
|
+
|
|
213
|
+
/**
|
|
214
|
+
* Streaming form of `escapeMemoryCitationMentions`.
|
|
215
|
+
*
|
|
216
|
+
* A tag can straddle delta boundaries, so a per-delta regex would miss the mention that matters
|
|
217
|
+
* most: the model writing the tag name one token at a time. The escaper buffers until it can tell
|
|
218
|
+
* a mention from a real block. A real block is emitted verbatim, tags included, as soon as its
|
|
219
|
+
* `<citation_entries>` body starts — the client keeps it, which is the whole point of the block.
|
|
220
|
+
* Everything else is a mention and gets `<`.
|
|
221
|
+
*/
|
|
222
|
+
export function createMemoryCitationEscaper(): MemoryCitationEscaper {
|
|
223
|
+
/**
|
|
224
|
+
* Unresolved tail. It starts at a `<` and is either a partial tag, or an opening tag whose block
|
|
225
|
+
* has not closed yet. A candidate block is held WHOLE until its closing tag arrives, because only
|
|
226
|
+
* the complete body (entries, then rollout ids) proves it is a real block rather than a mention.
|
|
227
|
+
*/
|
|
228
|
+
let held = "";
|
|
229
|
+
const escapeOpen = "<" + MEMORY_CITATION_OPEN.slice(1);
|
|
230
|
+
const escapeClose = "<" + MEMORY_CITATION_CLOSE.slice(1);
|
|
231
|
+
return {
|
|
232
|
+
push(delta: string): string {
|
|
233
|
+
if (!held && !delta.includes("<")) return delta;
|
|
234
|
+
const input = held + delta;
|
|
235
|
+
held = "";
|
|
236
|
+
let out = "";
|
|
237
|
+
let i = 0;
|
|
238
|
+
while (i < input.length) {
|
|
239
|
+
const next = input.indexOf("<", i);
|
|
240
|
+
if (next === -1) {
|
|
241
|
+
out += input.slice(i);
|
|
242
|
+
break;
|
|
243
|
+
}
|
|
244
|
+
out += input.slice(i, next);
|
|
245
|
+
// Look no further than one hold limit ahead: a real block never exceeds it, and slicing the
|
|
246
|
+
// whole remainder for every tag would make one large delta of many tags quadratic.
|
|
247
|
+
const tail = input.slice(next, next + MAX_MEMORY_CITATION_HOLD + 1);
|
|
248
|
+
const remaining = input.length - next;
|
|
249
|
+
if (tail.startsWith(MEMORY_CITATION_CLOSE)) {
|
|
250
|
+
// A close tag outside a claimed block is prose.
|
|
251
|
+
out += escapeClose;
|
|
252
|
+
i = next + MEMORY_CITATION_CLOSE.length;
|
|
253
|
+
continue;
|
|
254
|
+
}
|
|
255
|
+
if (!tail.startsWith(MEMORY_CITATION_OPEN)) {
|
|
256
|
+
if (MEMORY_CITATION_OPEN.startsWith(tail) || MEMORY_CITATION_CLOSE.startsWith(tail)) {
|
|
257
|
+
// A tag is still arriving.
|
|
258
|
+
held = tail;
|
|
259
|
+
return out;
|
|
260
|
+
}
|
|
261
|
+
out += "<";
|
|
262
|
+
i = next + 1;
|
|
263
|
+
continue;
|
|
264
|
+
}
|
|
265
|
+
const afterOpen = tail.slice(MEMORY_CITATION_OPEN.length);
|
|
266
|
+
if (!bodyCouldBeReal(afterOpen)) {
|
|
267
|
+
out += escapeOpen;
|
|
268
|
+
i = next + MEMORY_CITATION_OPEN.length;
|
|
269
|
+
continue;
|
|
270
|
+
}
|
|
271
|
+
const end = opensRealBlock(tail, 0);
|
|
272
|
+
if (end !== undefined) {
|
|
273
|
+
// A complete real block is released verbatim, both tags included, so the delta stream
|
|
274
|
+
// equals what `escapeMemoryCitationMentions` keeps in the final text.
|
|
275
|
+
out += tail.slice(0, end);
|
|
276
|
+
i = next + end;
|
|
277
|
+
continue;
|
|
278
|
+
}
|
|
279
|
+
if (!tail.includes(MEMORY_CITATION_CLOSE, MEMORY_CITATION_OPEN.length) && remaining <= MAX_MEMORY_CITATION_HOLD) {
|
|
280
|
+
// The block may still close; hold it whole.
|
|
281
|
+
held = tail;
|
|
282
|
+
return out;
|
|
283
|
+
}
|
|
284
|
+
// Closed without a valid body, or too large to keep holding: a mention.
|
|
285
|
+
out += escapeOpen;
|
|
286
|
+
i = next + MEMORY_CITATION_OPEN.length;
|
|
287
|
+
}
|
|
288
|
+
return out;
|
|
289
|
+
},
|
|
290
|
+
pending(): string {
|
|
291
|
+
return held;
|
|
292
|
+
},
|
|
293
|
+
};
|
|
294
|
+
}
|
|
295
|
+
|
|
65
296
|
/**
|
|
66
297
|
* Remove every complete citation span from a whole string.
|
|
67
298
|
*
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { validReplayOwnerKey } from "./state/replay-owner";
|
|
1
2
|
import {
|
|
2
3
|
chmodSync,
|
|
3
4
|
closeSync,
|
|
@@ -59,6 +60,7 @@ export interface ResponseSpillPayload {
|
|
|
59
60
|
responseId: string;
|
|
60
61
|
createdAt: number;
|
|
61
62
|
clientThreadId?: string;
|
|
63
|
+
replayOwnerKey?: string;
|
|
62
64
|
items: unknown[];
|
|
63
65
|
/**
|
|
64
66
|
* Index in `items` where the provider output begins, used by replay-overlap detection
|
|
@@ -494,6 +496,7 @@ function serializedSpill(
|
|
|
494
496
|
responseId,
|
|
495
497
|
createdAt: state.createdAt,
|
|
496
498
|
...(state.clientThreadId ? { clientThreadId: state.clientThreadId } : {}),
|
|
499
|
+
...(state.replayOwnerKey ? { replayOwnerKey: state.replayOwnerKey } : {}),
|
|
497
500
|
items: state.items,
|
|
498
501
|
...(state.providerOutputStart !== undefined ? { providerOutputStart: state.providerOutputStart } : {}),
|
|
499
502
|
...(state.providers ? { providers: state.providers } : {}),
|
|
@@ -551,11 +554,12 @@ function validPayload(value: unknown, responseId: string): value is ResponseSpil
|
|
|
551
554
|
if (!value || typeof value !== "object" || Array.isArray(value)) return false;
|
|
552
555
|
const payload = value as Record<string, unknown>;
|
|
553
556
|
const keys = Object.keys(payload);
|
|
554
|
-
if (keys.some(key => !["version", "responseId", "createdAt", "clientThreadId", "items", "providerOutputStart", "providers", "unforcedStoreFalse"].includes(key))) return false;
|
|
557
|
+
if (keys.some(key => !["version", "responseId", "createdAt", "clientThreadId", "replayOwnerKey", "items", "providerOutputStart", "providers", "unforcedStoreFalse"].includes(key))) return false;
|
|
555
558
|
if (payload.version !== 1 || payload.responseId !== responseId) return false;
|
|
556
559
|
if (typeof payload.createdAt !== "number" || !Number.isFinite(payload.createdAt)) return false;
|
|
557
560
|
if (payload.clientThreadId !== undefined
|
|
558
561
|
&& (typeof payload.clientThreadId !== "string" || payload.clientThreadId.trim().length === 0)) return false;
|
|
562
|
+
if (payload.replayOwnerKey !== undefined && !validReplayOwnerKey(payload.replayOwnerKey)) return false;
|
|
559
563
|
if (payload.unforcedStoreFalse !== undefined && typeof payload.unforcedStoreFalse !== "boolean") return false;
|
|
560
564
|
if (!Array.isArray(payload.items)) return false;
|
|
561
565
|
if (payload.unforcedStoreFalse === true && payload.providerOutputStart === undefined) return false;
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import type { ResidentResponseState } from "../state";
|
|
2
|
+
import { clientCarriedPrefixLength, providerIssuedIdentity } from "./replay-fingerprint";
|
|
3
|
+
import { allowsUnforcedStoreFalseReplay } from "./unforced-store-false";
|
|
4
|
+
|
|
5
|
+
export function expandStoredResponseInput(request: Record<string, unknown>, input: unknown[], state: ResidentResponseState): {
|
|
6
|
+
body: Record<string, unknown>; prefixLength: number; overlap: boolean;
|
|
7
|
+
} {
|
|
8
|
+
const clientInput = input;
|
|
9
|
+
const stored = state.items;
|
|
10
|
+
const carried = clientCarriedPrefixLength(stored, clientInput);
|
|
11
|
+
if (
|
|
12
|
+
state.unforcedStoreFalse
|
|
13
|
+
&& !allowsUnforcedStoreFalseReplay(stored, state.providerOutputStart, clientInput, carried)
|
|
14
|
+
) {
|
|
15
|
+
return { body: request, prefixLength: 0, overlap: false };
|
|
16
|
+
}
|
|
17
|
+
// The client already replayed this history verbatim. Prepending the stored copy would
|
|
18
|
+
// double it, and the doubled turn is stored again, so the next turn triples (#1412 saw
|
|
19
|
+
// 127k of real context reach 1.3M tokens this way).
|
|
20
|
+
//
|
|
21
|
+
// Three conditions, all required. The run must cover the whole stored entry; it must reach
|
|
22
|
+
// the provider-output region; and some matched item in that region must carry a
|
|
23
|
+
// provider-issued id. The last one is the load-bearing part: content equality alone proves
|
|
24
|
+
// two items look alike, not that they are the same occurrence, so a client that merely
|
|
25
|
+
// repeats its own message would otherwise authorize a skip that deletes real history.
|
|
26
|
+
// There is no invariant that provider output always carries ids, so an entry whose output
|
|
27
|
+
// has none simply never skips.
|
|
28
|
+
{
|
|
29
|
+
const anchor = state.providerOutputStart;
|
|
30
|
+
if (
|
|
31
|
+
carried === stored.length
|
|
32
|
+
&& anchor !== undefined
|
|
33
|
+
&& carried > anchor
|
|
34
|
+
&& stored.slice(anchor, carried).some(item => providerIssuedIdentity(item) !== null)
|
|
35
|
+
) {
|
|
36
|
+
// Keep previous_response_id: Kiro and Cursor recover their conversation ids from it
|
|
37
|
+
// (kiro-wire.ts, cursor/request-builder.ts). Only the concatenation is skipped.
|
|
38
|
+
const unchanged = { ...request };
|
|
39
|
+
// Same provenance boundary a real expansion would record, so the replayed prefix does
|
|
40
|
+
// not re-acknowledge historical compaction markers (parser.ts) and stays visible to
|
|
41
|
+
// guidance de-duplication (collaboration.ts).
|
|
42
|
+
return { body: unchanged, prefixLength: carried, overlap: true };
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
const expanded = {
|
|
46
|
+
...request,
|
|
47
|
+
input: [...stored, ...clientInput],
|
|
48
|
+
};
|
|
49
|
+
return { body: expanded, prefixLength: stored.length, overlap: false };
|
|
50
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
|
|
3
|
+
/** A content-free binding, derived only from trusted admission and the request's OWN thread. */
|
|
4
|
+
export function responseReplayOwnerKey(principal: string | undefined, ownThread: string | undefined): string | null {
|
|
5
|
+
if (!principal || !ownThread?.trim()) return null;
|
|
6
|
+
return createHash("sha256").update(JSON.stringify(["ocx-response-owner-v1", principal, ownThread.trim()])).digest("hex");
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export function validReplayOwnerKey(value: unknown): value is string {
|
|
10
|
+
return typeof value === "string" && /^[a-f0-9]{64}$/.test(value);
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export function normalizedClientThreadId(value: unknown): string | undefined {
|
|
14
|
+
return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/** Undefined is the legacy internal API; null explicitly means a request without an owner. */
|
|
18
|
+
export function replayScopeMatches(
|
|
19
|
+
entry: { clientThreadId?: string; replayOwnerKey?: string }, thread: string | undefined, key: string | null | undefined,
|
|
20
|
+
): boolean {
|
|
21
|
+
if (key === null || (key !== undefined && !validReplayOwnerKey(key))) return false;
|
|
22
|
+
return key === entry.replayOwnerKey
|
|
23
|
+
&& normalizedClientThreadId(thread) === normalizedClientThreadId(entry.clientThreadId);
|
|
24
|
+
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { validReplayOwnerKey } from "./replay-owner";
|
|
1
2
|
import type {
|
|
2
3
|
ResidentInput,
|
|
3
4
|
ResidentResponseState,
|
|
@@ -20,6 +21,7 @@ export interface SnapshotLoadStore {
|
|
|
20
21
|
interface LegacySnapshotState {
|
|
21
22
|
createdAt?: unknown;
|
|
22
23
|
clientThreadId?: unknown;
|
|
24
|
+
replayOwnerKey?: unknown;
|
|
23
25
|
items?: unknown;
|
|
24
26
|
providers?: OcxProviderContinuationState;
|
|
25
27
|
conversationId?: unknown;
|
|
@@ -41,6 +43,11 @@ export function loadSnapshotEntry(id: string, value: unknown, store: SnapshotLoa
|
|
|
41
43
|
if (!value || typeof value !== "object" || Array.isArray(value)) return;
|
|
42
44
|
const rec = value as LegacySnapshotState & { kind?: unknown; spill?: unknown };
|
|
43
45
|
if (typeof rec.createdAt !== "number" || !Number.isFinite(rec.createdAt)) return;
|
|
46
|
+
if (rec.replayOwnerKey !== undefined && !validReplayOwnerKey(rec.replayOwnerKey)) {
|
|
47
|
+
store.replaceMapEntry(id, store.tombstone(id, rec.createdAt));
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
const replayOwnerKey = rec.replayOwnerKey;
|
|
44
51
|
const clientThreadId = typeof rec.clientThreadId === "string" && rec.clientThreadId.trim().length > 0
|
|
45
52
|
? rec.clientThreadId.trim()
|
|
46
53
|
: undefined;
|
|
@@ -61,6 +68,7 @@ export function loadSnapshotEntry(id: string, value: unknown, store: SnapshotLoa
|
|
|
61
68
|
kind: "spill",
|
|
62
69
|
createdAt: rec.createdAt,
|
|
63
70
|
...(clientThreadId ? { clientThreadId } : {}),
|
|
71
|
+
...(replayOwnerKey ? { replayOwnerKey } : {}),
|
|
64
72
|
// Item count is unknown until materialization, so accept any non-negative integer
|
|
65
73
|
// here; the spill payload validator re-checks it against the real array.
|
|
66
74
|
...(anchorFor(Number.MAX_SAFE_INTEGER) !== undefined ? { providerOutputStart: anchorFor(Number.MAX_SAFE_INTEGER) } : {}),
|
|
@@ -90,6 +98,7 @@ export function loadSnapshotEntry(id: string, value: unknown, store: SnapshotLoa
|
|
|
90
98
|
const resident = store.measureResidentEntry(id, {
|
|
91
99
|
createdAt: rec.createdAt,
|
|
92
100
|
...(clientThreadId ? { clientThreadId } : {}),
|
|
101
|
+
...(replayOwnerKey ? { replayOwnerKey } : {}),
|
|
93
102
|
items: rec.items,
|
|
94
103
|
...(anchorFor(rec.items.length) !== undefined ? { providerOutputStart: anchorFor(rec.items.length) } : {}),
|
|
95
104
|
...(providers ? { providers } : {}),
|
|
@@ -193,6 +193,7 @@ function spillPayloadForResident(candidate: ResidentResponseState): Parameters<t
|
|
|
193
193
|
return {
|
|
194
194
|
createdAt: candidate.createdAt,
|
|
195
195
|
...(candidate.clientThreadId ? { clientThreadId: candidate.clientThreadId } : {}),
|
|
196
|
+
...(candidate.replayOwnerKey ? { replayOwnerKey: candidate.replayOwnerKey } : {}),
|
|
196
197
|
items: candidate.items,
|
|
197
198
|
...(candidate.providerOutputStart !== undefined ? { providerOutputStart: candidate.providerOutputStart } : {}),
|
|
198
199
|
...(candidate.providers ? { providers: candidate.providers } : {}),
|