@bitkyc08/opencodex 2.100.5 → 2.100.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
const IMF_FIXDATE_RE = /^(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun), (\d{2}) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (\d{4}) (\d{2}):(\d{2}):(\d{2}) GMT(?![\s\S])/;
|
|
2
|
+
const RFC850_DATE_RE = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (\d{2})-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\d{2}) (\d{2}):(\d{2}):(\d{2}) GMT(?![\s\S])/;
|
|
3
|
+
const ASCTIME_DATE_RE = /^(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ( \d|\d{2}) (\d{2}):(\d{2}):(\d{2}) (\d{4})(?![\s\S])/;
|
|
4
|
+
const WEEKDAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
|
|
5
|
+
const HTTP_MONTH_INDEX: Record<string, number> = {
|
|
6
|
+
jan: 0, feb: 1, mar: 2, apr: 3, may: 4, jun: 5,
|
|
7
|
+
jul: 6, aug: 7, sep: 8, oct: 9, nov: 10, dec: 11,
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
const LEGACY_IMF_FIXDATE_RE = new RegExp(IMF_FIXDATE_RE.source, "i");
|
|
11
|
+
const LEGACY_RFC850_DATE_RE = new RegExp(RFC850_DATE_RE.source, "i");
|
|
12
|
+
const LEGACY_ASCTIME_DATE_RE = new RegExp(ASCTIME_DATE_RE.source, "i");
|
|
13
|
+
|
|
14
|
+
function parseUtcDateParts(
|
|
15
|
+
year: number,
|
|
16
|
+
monthName: string,
|
|
17
|
+
day: number,
|
|
18
|
+
hour: number,
|
|
19
|
+
minute: number,
|
|
20
|
+
second: number,
|
|
21
|
+
weekday: string | undefined,
|
|
22
|
+
): number | undefined {
|
|
23
|
+
const month = HTTP_MONTH_INDEX[monthName.toLowerCase()];
|
|
24
|
+
if (month === undefined) return undefined;
|
|
25
|
+
// Date has no leap-second representation. Normalize the final UTC second of the day.
|
|
26
|
+
const leapSecond = weekday !== undefined && hour === 23 && minute === 59 && second === 60;
|
|
27
|
+
const clockSecond = leapSecond ? 59 : second;
|
|
28
|
+
const timestamp = Date.UTC(year, month, day, hour, minute, clockSecond);
|
|
29
|
+
const parsed = new Date(timestamp);
|
|
30
|
+
return parsed.getUTCFullYear() === year
|
|
31
|
+
&& parsed.getUTCMonth() === month
|
|
32
|
+
&& parsed.getUTCDate() === day
|
|
33
|
+
&& parsed.getUTCHours() === hour
|
|
34
|
+
&& parsed.getUTCMinutes() === minute
|
|
35
|
+
&& parsed.getUTCSeconds() === clockSecond
|
|
36
|
+
&& (weekday === undefined || (year >= 1900 && WEEKDAYS[parsed.getUTCDay()] === weekday))
|
|
37
|
+
? timestamp + (leapSecond ? 1000 : 0)
|
|
38
|
+
: undefined;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** Parse the three HTTP-date forms from RFC 9110 §5.6.7.
|
|
42
|
+
* Legacy mode preserves the combo cooldown parser's case-insensitive syntax and calendar rules.
|
|
43
|
+
*/
|
|
44
|
+
export function parseHttpDate(
|
|
45
|
+
value: string,
|
|
46
|
+
now: number,
|
|
47
|
+
options?: { legacy?: boolean },
|
|
48
|
+
): number | undefined {
|
|
49
|
+
const legacy = options?.legacy === true;
|
|
50
|
+
const weekday = legacy ? undefined : value.slice(0, 3);
|
|
51
|
+
const imf = (legacy ? LEGACY_IMF_FIXDATE_RE : IMF_FIXDATE_RE).exec(value);
|
|
52
|
+
if (imf) {
|
|
53
|
+
return parseUtcDateParts(
|
|
54
|
+
Number(imf[3]), imf[2]!, Number(imf[1]),
|
|
55
|
+
Number(imf[4]), Number(imf[5]), Number(imf[6]), weekday,
|
|
56
|
+
);
|
|
57
|
+
}
|
|
58
|
+
const rfc850 = (legacy ? LEGACY_RFC850_DATE_RE : RFC850_DATE_RE).exec(value);
|
|
59
|
+
if (rfc850) {
|
|
60
|
+
const current = new Date(now);
|
|
61
|
+
const currentYear = current.getUTCFullYear();
|
|
62
|
+
const month = HTTP_MONTH_INDEX[rfc850[2]!.toLowerCase()];
|
|
63
|
+
if (month === undefined) return undefined;
|
|
64
|
+
let year = Math.floor(currentYear / 100) * 100 + Number(rfc850[3]);
|
|
65
|
+
const yearDelta = year - currentYear;
|
|
66
|
+
const candidateTimeOfYear = Date.UTC(
|
|
67
|
+
2000, month, Number(rfc850[1]),
|
|
68
|
+
Number(rfc850[4]), Number(rfc850[5]), Number(rfc850[6]),
|
|
69
|
+
);
|
|
70
|
+
const currentTimeOfYear = Date.UTC(
|
|
71
|
+
2000, current.getUTCMonth(), current.getUTCDate(),
|
|
72
|
+
current.getUTCHours(), current.getUTCMinutes(), current.getUTCSeconds(),
|
|
73
|
+
current.getUTCMilliseconds(),
|
|
74
|
+
);
|
|
75
|
+
if (yearDelta < -50 || (yearDelta === -50 && candidateTimeOfYear < currentTimeOfYear)) {
|
|
76
|
+
year += 100;
|
|
77
|
+
} else if (yearDelta > 50 || (yearDelta === 50 && candidateTimeOfYear > currentTimeOfYear)) {
|
|
78
|
+
year -= 100;
|
|
79
|
+
}
|
|
80
|
+
return parseUtcDateParts(
|
|
81
|
+
year, rfc850[2]!, Number(rfc850[1]),
|
|
82
|
+
Number(rfc850[4]), Number(rfc850[5]), Number(rfc850[6]), weekday,
|
|
83
|
+
);
|
|
84
|
+
}
|
|
85
|
+
const asctime = (legacy ? LEGACY_ASCTIME_DATE_RE : ASCTIME_DATE_RE).exec(value);
|
|
86
|
+
if (!asctime) return undefined;
|
|
87
|
+
return parseUtcDateParts(
|
|
88
|
+
Number(asctime[6]), asctime[1]!, Number(asctime[2]),
|
|
89
|
+
Number(asctime[3]), Number(asctime[4]), Number(asctime[5]), weekday,
|
|
90
|
+
);
|
|
91
|
+
}
|
|
@@ -12,7 +12,7 @@ import { resolveProductionRouteSubject } from "../routing/compatibility/subject"
|
|
|
12
12
|
|
|
13
13
|
/** Install the Lab linker. Returns a detach function. */
|
|
14
14
|
export function registerLabPassiveRouteLinker(configDir?: string): () => void {
|
|
15
|
-
return setPassiveRouteLinker((config, providerName, modelId, routed, inboundWire) => {
|
|
15
|
+
return setPassiveRouteLinker((config, providerName, modelId, routed, inboundWire, effectiveAdapter) => {
|
|
16
16
|
const subject = resolveProductionRouteSubject(
|
|
17
17
|
config,
|
|
18
18
|
providerName,
|
|
@@ -20,6 +20,7 @@ export function registerLabPassiveRouteLinker(configDir?: string): () => void {
|
|
|
20
20
|
routed,
|
|
21
21
|
inboundWire,
|
|
22
22
|
configDir,
|
|
23
|
+
effectiveAdapter,
|
|
23
24
|
);
|
|
24
25
|
return subject ? subject.subjectId : null;
|
|
25
26
|
});
|
|
@@ -18,7 +18,10 @@ import { signalWithTimeout, cancelBodyOnAbort } from "./abort";
|
|
|
18
18
|
import { readBoundedResponseBytes } from "./bounded-body";
|
|
19
19
|
import { redactSecretString } from "./redact";
|
|
20
20
|
import { sidecarEnter } from "./sidecar-tracker";
|
|
21
|
+
import { internalCallCapability } from "./local-internal-call-capability";
|
|
22
|
+
import { registerAdvisorAdmissionPolicy, SIDECAR_ADMISSION_POLICY_HEADER, SIDECAR_INTERNAL_CAPABILITY_HEADER } from "../server/advisor-admission-scope";
|
|
21
23
|
import { configuredPort } from "../server/auth-cors";
|
|
24
|
+
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
22
25
|
|
|
23
26
|
export type LocalChatConfig = Pick<OcxConfig, "port" | "hostname" | "apiKeys" | "unauthenticatedLoopbackListener">;
|
|
24
27
|
|
|
@@ -37,6 +40,7 @@ export interface LocalChatCompletionRequest {
|
|
|
37
40
|
*/
|
|
38
41
|
readonly boundWhileStreaming?: boolean;
|
|
39
42
|
readonly headers?: Record<string, string>;
|
|
43
|
+
readonly admissionPolicy?: CapturedAdmissionPolicy;
|
|
40
44
|
readonly abortSignal?: AbortSignal;
|
|
41
45
|
/** Test seam; production always self-fetches the resolved local destination. */
|
|
42
46
|
readonly baseUrlOverride?: string;
|
|
@@ -44,7 +48,7 @@ export interface LocalChatCompletionRequest {
|
|
|
44
48
|
|
|
45
49
|
export type LocalChatCompletionOutcome = { text: string; error?: string };
|
|
46
50
|
|
|
47
|
-
function
|
|
51
|
+
export function localChatCompletionDestination(config: Pick<OcxConfig, "port" | "hostname" | "unauthenticatedLoopbackListener">) {
|
|
48
52
|
// config.port can be 0 (ephemeral bind, tests) or stale after a live port override; the
|
|
49
53
|
// server records its ACTUAL bound port via setCorsOrigin at startup, so prefer that when
|
|
50
54
|
// config carries no positive port. configuredPort() is itself 0 when _corsOrigin has no
|
|
@@ -59,13 +63,13 @@ function destination(config: Pick<OcxConfig, "port" | "hostname" | "unauthentica
|
|
|
59
63
|
export function localChatCompletionBaseUrl(
|
|
60
64
|
config: Pick<OcxConfig, "port" | "hostname" | "unauthenticatedLoopbackListener">,
|
|
61
65
|
): string {
|
|
62
|
-
return
|
|
66
|
+
return localChatCompletionDestination(config).origin;
|
|
63
67
|
}
|
|
64
68
|
|
|
65
69
|
export async function postLocalChatCompletion(request: LocalChatCompletionRequest): Promise<LocalChatCompletionOutcome> {
|
|
66
70
|
const { config, label, logTag } = request;
|
|
67
71
|
const headers: Record<string, string> = { "Content-Type": "application/json", ...request.headers };
|
|
68
|
-
const target =
|
|
72
|
+
const target = localChatCompletionDestination(config);
|
|
69
73
|
const admission = selfFetchAdmissionToken(config, target);
|
|
70
74
|
if (admission) headers["x-opencodex-api-key"] = admission;
|
|
71
75
|
// A bind that demands admission with no resolvable credential would return 401 with a body
|
|
@@ -81,13 +85,18 @@ export async function postLocalChatCompletion(request: LocalChatCompletionReques
|
|
|
81
85
|
const linkedSignal = signalWithTimeout(request.timeoutMs, request.abortSignal);
|
|
82
86
|
const sidecarExit = sidecarEnter(logTag);
|
|
83
87
|
const t0 = Date.now();
|
|
88
|
+
let registration: ReturnType<typeof registerAdvisorAdmissionPolicy> | undefined;
|
|
84
89
|
try {
|
|
90
|
+
registration = registerAdvisorAdmissionPolicy(request.admissionPolicy, linkedSignal.signal);
|
|
91
|
+
headers[SIDECAR_ADMISSION_POLICY_HEADER] = registration.token;
|
|
92
|
+
headers[SIDECAR_INTERNAL_CAPABILITY_HEADER] = internalCallCapability();
|
|
85
93
|
const res = await fetch(`${request.baseUrlOverride ?? localChatCompletionBaseUrl(config)}/v1/chat/completions`, {
|
|
86
94
|
method: "POST",
|
|
87
95
|
headers,
|
|
88
96
|
body: JSON.stringify({ ...request.body, stream: false }),
|
|
89
97
|
signal: linkedSignal.signal,
|
|
90
98
|
redirect: "manual",
|
|
99
|
+
proxy: false,
|
|
91
100
|
});
|
|
92
101
|
const detachBodyGuard = cancelBodyOnAbort(res.body, linkedSignal.signal);
|
|
93
102
|
try {
|
|
@@ -120,6 +129,7 @@ export async function postLocalChatCompletion(request: LocalChatCompletionReques
|
|
|
120
129
|
console.warn(`[${logTag}] ${label} ${kind} (${Date.now() - t0}ms)`);
|
|
121
130
|
return { text: "", error: redactSecretString(e instanceof Error ? e.message : String(e)) };
|
|
122
131
|
} finally {
|
|
132
|
+
registration?.release();
|
|
123
133
|
sidecarExit();
|
|
124
134
|
linkedSignal.cleanup();
|
|
125
135
|
}
|
|
@@ -15,9 +15,7 @@
|
|
|
15
15
|
* is timing-safe and shape-checked, reusing the same secret shape as the local attestation
|
|
16
16
|
* module.
|
|
17
17
|
*
|
|
18
|
-
*
|
|
19
|
-
* that surface is deliberately left out of this change (recorded as a pre-existing analogous
|
|
20
|
-
* issue) so the change stays scoped.
|
|
18
|
+
* Local Chat helpers also pair this capability with a request-lifetime registration.
|
|
21
19
|
*/
|
|
22
20
|
import { randomBytes, timingSafeEqual } from "node:crypto";
|
|
23
21
|
import { isLocalAttestationSecret } from "./local-management-attestation";
|
|
@@ -78,7 +78,8 @@ export interface OwnedAnthropicErrorOptions {
|
|
|
78
78
|
export function ownedAnthropicErrorPayload(options: OwnedAnthropicErrorOptions): Rec {
|
|
79
79
|
const type = ANTHROPIC_ERROR_TYPES.get(options.type ?? "")
|
|
80
80
|
?? STATUS_TYPES.get(options.status) ?? (options.status >= 500 ? "api_error" : "invalid_request_error");
|
|
81
|
-
const code = options.code === "
|
|
81
|
+
const code = options.code === "combo_unavailable" && options.localError && isProxyError(options.localError)
|
|
82
|
+
? options.code : ANTHROPIC_ERROR_CODES.get(options.code === "thread_unsupported_request" ? "" : options.code ?? "");
|
|
82
83
|
const message = options.overflow ? CLAUDE_CONTEXT_OVERFLOW_MESSAGE
|
|
83
84
|
: options.localError && isProxyError(options.localError) ? fixedLocalMessage(options.localError, options.evidence.code ?? code, options.evidence.type) ?? options.localError.message
|
|
84
85
|
: actionableRefusalMessage(options.evidence, code ?? null, options.contract)
|
|
@@ -89,6 +89,7 @@ export function containsExcerptWindow(text: string, windows: ReadonlySet<string>
|
|
|
89
89
|
interface SentValueIndex {
|
|
90
90
|
wholeCredential: Set<string>;
|
|
91
91
|
credentialWindows: Set<string>;
|
|
92
|
+
credentialStarts: Uint8Array;
|
|
92
93
|
contained: string[];
|
|
93
94
|
overflow: boolean;
|
|
94
95
|
}
|
|
@@ -117,7 +118,27 @@ function indexSentValues(headers: Record<string, string>, credentialOnly = false
|
|
|
117
118
|
}
|
|
118
119
|
}
|
|
119
120
|
}
|
|
120
|
-
return { wholeCredential, credentialWindows, contained, overflow };
|
|
121
|
+
return { wholeCredential, credentialWindows, credentialStarts: prefixStartBytes(credentialWindows), contained, overflow };
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
/** An 8 KiB rejection filter for two UTF-16 low bytes; collisions still need an exact lookup. */
|
|
125
|
+
function prefixStartBytes(values: Iterable<string>): Uint8Array {
|
|
126
|
+
let starts: Uint8Array | undefined;
|
|
127
|
+
for (const value of values) {
|
|
128
|
+
const pair = prefixPair(value, 0);
|
|
129
|
+
starts ??= new Uint8Array(8_192);
|
|
130
|
+
starts[pair >>> 3]! |= 1 << (pair & 7);
|
|
131
|
+
}
|
|
132
|
+
return starts ?? new Uint8Array(0);
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
function prefixPair(text: string, at: number): number {
|
|
136
|
+
return ((text.charCodeAt(at) & 255) << 8) | (text.charCodeAt(at + 1) & 255);
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
function mayStartPrefix(text: string, at: number, starts: Uint8Array): boolean {
|
|
140
|
+
const pair = prefixPair(text, at);
|
|
141
|
+
return (starts[pair >>> 3]! & (1 << (pair & 7))) !== 0;
|
|
121
142
|
}
|
|
122
143
|
|
|
123
144
|
function scanHead(text: string): string {
|
|
@@ -125,13 +146,14 @@ function scanHead(text: string): string {
|
|
|
125
146
|
}
|
|
126
147
|
|
|
127
148
|
export function createSentValueGuard(headers: Record<string, string>): (text: string) => boolean {
|
|
128
|
-
const { wholeCredential, credentialWindows, contained, overflow } = indexSentValues(headers);
|
|
149
|
+
const { wholeCredential, credentialWindows, credentialStarts, contained, overflow } = indexSentValues(headers);
|
|
129
150
|
const containedIndex = new SecretIndex(contained);
|
|
130
151
|
return (text) => {
|
|
131
152
|
if (overflow) return true;
|
|
132
153
|
const head = scanHead(text);
|
|
133
154
|
if (wholeCredential.has(head)) return true;
|
|
134
155
|
for (let at = 0; at + CREDENTIAL_SUBSTRING_MIN_LENGTH <= head.length; at++) {
|
|
156
|
+
if (!mayStartPrefix(head, at, credentialStarts)) continue;
|
|
135
157
|
if (credentialWindows.has(head.slice(at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH))) return true;
|
|
136
158
|
}
|
|
137
159
|
return markSubstringSpans(head, containedIndex, undefined) !== undefined;
|
|
@@ -154,7 +176,7 @@ export function createSentValueMask(
|
|
|
154
176
|
// header values (a content type, a user agent) are ordinary text that must stay readable.
|
|
155
177
|
// `wholeText`: read and return all of the text (linear work), for genuine Responses terminals whose
|
|
156
178
|
// output must not be cut; the default reads and returns only the guard's scan window.
|
|
157
|
-
const { wholeCredential, credentialWindows, contained, overflow } = indexSentValues(headers, options.credentialOnly);
|
|
179
|
+
const { wholeCredential, credentialWindows, credentialStarts, contained, overflow } = indexSentValues(headers, options.credentialOnly);
|
|
158
180
|
const containedIndex = new SecretIndex(contained);
|
|
159
181
|
return (text) => {
|
|
160
182
|
if (overflow) return replacement;
|
|
@@ -164,6 +186,7 @@ export function createSentValueMask(
|
|
|
164
186
|
// text length however many distinct windows match (a rescan per window would be quadratic).
|
|
165
187
|
let covered: Uint8Array | undefined;
|
|
166
188
|
for (let at = 0; at + CREDENTIAL_SUBSTRING_MIN_LENGTH <= head.length; at++) {
|
|
189
|
+
if (!mayStartPrefix(head, at, credentialStarts)) continue;
|
|
167
190
|
if (!credentialWindows.has(head.slice(at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH))) continue;
|
|
168
191
|
covered ??= new Uint8Array(head.length);
|
|
169
192
|
covered.fill(1, at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH);
|
|
@@ -194,6 +217,8 @@ export function maskSecretSpans(text: string, replacement: string, substrings: I
|
|
|
194
217
|
*/
|
|
195
218
|
export class SecretIndex {
|
|
196
219
|
readonly byPrefix = new Map<string, string[]>();
|
|
220
|
+
readonly prefixStarts: Uint8Array;
|
|
221
|
+
readonly longSecretCount: number;
|
|
197
222
|
readonly shortByLength = new Map<number, Set<string>>();
|
|
198
223
|
readonly bordered = new Map<string, boolean>();
|
|
199
224
|
|
|
@@ -211,7 +236,13 @@ export class SecretIndex {
|
|
|
211
236
|
this.shortByLength.set(secret.length, group);
|
|
212
237
|
}
|
|
213
238
|
}
|
|
214
|
-
|
|
239
|
+
let longSecretCount = 0;
|
|
240
|
+
for (const group of this.byPrefix.values()) {
|
|
241
|
+
group.sort((a, b) => a.length - b.length);
|
|
242
|
+
longSecretCount += group.length;
|
|
243
|
+
}
|
|
244
|
+
this.longSecretCount = longSecretCount;
|
|
245
|
+
this.prefixStarts = prefixStartBytes(this.byPrefix.keys());
|
|
215
246
|
}
|
|
216
247
|
}
|
|
217
248
|
|
|
@@ -236,6 +267,7 @@ function markSubstringSpans(text: string, index: SecretIndex, initial: Uint8Arra
|
|
|
236
267
|
const budget = { steps: MATCH_WORK_PER_CHAR * n + MATCH_WORK_FLOOR };
|
|
237
268
|
const scanned = new Set<string>();
|
|
238
269
|
for (let at = 0; at + CREDENTIAL_SUBSTRING_MIN_LENGTH <= n; at++) {
|
|
270
|
+
if (!mayStartPrefix(text, at, index.prefixStarts)) continue;
|
|
239
271
|
const group = index.byPrefix.get(text.slice(at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH));
|
|
240
272
|
if (group === undefined) continue;
|
|
241
273
|
for (const secret of group) {
|
|
@@ -262,6 +294,9 @@ function markSubstringSpans(text: string, index: SecretIndex, initial: Uint8Arra
|
|
|
262
294
|
budget.steps -= n - at;
|
|
263
295
|
if (budget.steps < 0) return covered.fill(1);
|
|
264
296
|
markOverlappingOccurrences(text, secret, at, covered);
|
|
297
|
+
// KMP already marked every later occurrence. Once every long secret has had that scan,
|
|
298
|
+
// walking the remaining prefixes can only rediscover secrets in `scanned`.
|
|
299
|
+
if (scanned.size === index.longSecretCount) return covered;
|
|
265
300
|
continue;
|
|
266
301
|
}
|
|
267
302
|
covered.fill(1, at, at + secret.length);
|
|
@@ -287,6 +322,7 @@ export function containsIndexedSecret(text: string, index: SecretIndex): boolean
|
|
|
287
322
|
if (index.byPrefix.size === 0) return false;
|
|
288
323
|
let budget = MATCH_WORK_PER_CHAR * n + MATCH_WORK_FLOOR;
|
|
289
324
|
for (let at = 0; at + CREDENTIAL_SUBSTRING_MIN_LENGTH <= n; at++) {
|
|
325
|
+
if (!mayStartPrefix(text, at, index.prefixStarts)) continue;
|
|
290
326
|
const group = index.byPrefix.get(text.slice(at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH));
|
|
291
327
|
if (group === undefined) continue;
|
|
292
328
|
for (const secret of group) {
|
package/src/lib/pinned-http.ts
CHANGED
|
@@ -20,6 +20,8 @@ export class PinnedHttpError extends Error {
|
|
|
20
20
|
export interface PinnedHttpRequestOptions {
|
|
21
21
|
headers?: HeadersInit;
|
|
22
22
|
maxBytes?: number;
|
|
23
|
+
/** Opt in to streaming 4xx/5xx bodies, bounded on the wire and after decoding. */
|
|
24
|
+
maxErrorBytes?: number;
|
|
23
25
|
/** Optional deadline for establishing the TCP connection and, for HTTPS, completing TLS. */
|
|
24
26
|
connectTimeoutMs?: number;
|
|
25
27
|
/** Optional deadline from connection establishment until response headers arrive. */
|
|
@@ -153,7 +155,6 @@ function pinnedHttpRequest(
|
|
|
153
155
|
const firstByteTimeoutMs = options?.firstByteTimeoutMs ?? legacyIdleTimeoutMs;
|
|
154
156
|
const inactivityTimeoutMs = options?.inactivityTimeoutMs ?? legacyIdleTimeoutMs;
|
|
155
157
|
const legacyFirstByteDisabled = usesLegacyIdleTimeout && legacyIdleTimeoutMs === 0;
|
|
156
|
-
const maxBytes = options?.maxBytes;
|
|
157
158
|
const headers = new Headers(options?.headers);
|
|
158
159
|
headers.set("host", parsed.host);
|
|
159
160
|
// This transport assembles the response itself, so a coding it did not ask for becomes its own
|
|
@@ -246,7 +247,11 @@ function pinnedHttpRequest(
|
|
|
246
247
|
}
|
|
247
248
|
}
|
|
248
249
|
|
|
249
|
-
|
|
250
|
+
const errorBodyLimit = status >= 400 && status < 600 ? options?.maxErrorBytes : undefined;
|
|
251
|
+
const maxBytes = errorBodyLimit === undefined
|
|
252
|
+
? options?.maxBytes : Math.min(options?.maxBytes ?? errorBodyLimit, errorBodyLimit);
|
|
253
|
+
|
|
254
|
+
if ((status < 200 || status >= 300) && errorBodyLimit === undefined) {
|
|
250
255
|
try { response.destroy(); } catch { /* ignore */ }
|
|
251
256
|
try { req?.destroy(); } catch { /* ignore */ }
|
|
252
257
|
if (settled) return;
|
|
@@ -421,6 +421,7 @@ async function waitForStoppedPort(
|
|
|
421
421
|
// Only the process we just stopped — never kill a newly started twin proxy.
|
|
422
422
|
killOcxHolders: mayKill && !!(stoppedPid && stoppedPid > 0),
|
|
423
423
|
onlyKillPids: mayKill && stoppedPid && stoppedPid > 0 ? [stoppedPid] : [],
|
|
424
|
+
...(io.forceKill ? { killFn: io.forceKill } : io.mayTerminate ? { killFn: (pid: number) => killProxy(pid, io.mayTerminate) } : {}),
|
|
424
425
|
});
|
|
425
426
|
} catch {
|
|
426
427
|
/* best-effort — callers that need a hard guarantee reclaim again before bind */
|
|
@@ -233,6 +233,22 @@ export function isEgressTransparentExecutor(executor: unknown): boolean {
|
|
|
233
233
|
&& (executor as unknown as Record<symbol, unknown>)[EGRESS_TRANSPARENT_EXECUTOR] === true;
|
|
234
234
|
}
|
|
235
235
|
|
|
236
|
+
type SocketRoute = Readonly<Pick<OcxProviderConfig, "proxy" | "noProxy">>;
|
|
237
|
+
interface SocketBinding { providerName: string; baseUrl: string; route: SocketRoute }
|
|
238
|
+
const socketBindings = new WeakMap<typeof globalThis.fetch, SocketBinding>();
|
|
239
|
+
|
|
240
|
+
/** Explicit native-socket authority; HTTP egress transparency alone does not grant it. */
|
|
241
|
+
export function bindProviderSocketRoute(executor: typeof globalThis.fetch, providerName: string, provider: OcxProviderConfig): void {
|
|
242
|
+
socketBindings.set(executor, { providerName, baseUrl: provider.baseUrl, route: Object.freeze({
|
|
243
|
+
proxy: provider.proxy, noProxy: Array.isArray(provider.noProxy) ? [...provider.noProxy] : provider.noProxy,
|
|
244
|
+
}) });
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
export function providerSocketRoute(executor: typeof globalThis.fetch, providerName: string, baseUrl: string): SocketRoute | undefined {
|
|
248
|
+
const binding = socketBindings.get(executor);
|
|
249
|
+
return binding?.providerName === providerName && binding.baseUrl.replace(/\/$/, "") === baseUrl ? binding.route : undefined;
|
|
250
|
+
}
|
|
251
|
+
|
|
236
252
|
/** The destination of a fetch input, or null when it cannot be read as a URL. */
|
|
237
253
|
export function egressTargetUrl(input: string | URL | Request): string | null {
|
|
238
254
|
if (typeof input === "string") return input;
|
|
@@ -21,6 +21,8 @@ export interface ProviderOutboundDependencies {
|
|
|
21
21
|
resolveAddresses?: typeof resolvePublicAddresses;
|
|
22
22
|
pinnedGet?: typeof pinnedHttpGet;
|
|
23
23
|
pinnedPost?: typeof pinnedHttpPost;
|
|
24
|
+
/** Opt in to a bounded 4xx/5xx body on the pinned route. */
|
|
25
|
+
maxPinnedErrorBytes?: number;
|
|
24
26
|
/**
|
|
25
27
|
* Canonical-URL proof for the transparent fake-IP exception (Clash TUN mode
|
|
26
28
|
* without proxy env). Injected so this transport core stays decoupled from
|
|
@@ -407,6 +409,7 @@ async function providerOutboundRequest(
|
|
|
407
409
|
headers: init.headers,
|
|
408
410
|
rejectUnauthorized: true,
|
|
409
411
|
context: "provider response",
|
|
412
|
+
...(dependencies.maxPinnedErrorBytes === undefined ? {} : { maxErrorBytes: dependencies.maxPinnedErrorBytes }),
|
|
410
413
|
};
|
|
411
414
|
const pinned = pickPinnedAddress(resolved.addresses);
|
|
412
415
|
assertSendAllowed();
|
|
@@ -80,9 +80,18 @@ export function foldForMatching(value: string, decodeEscapes = true): { folded:
|
|
|
80
80
|
// through this fold repeatedly on ledger reads; keep its identity map without
|
|
81
81
|
// repeating Unicode normalization and escape matching for every character.
|
|
82
82
|
if (!/[^\x00-\x7f]/.test(value) && (!decodeEscapes || !/[\\%&]/.test(value))) {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
83
|
+
let map: number[] | undefined;
|
|
84
|
+
return {
|
|
85
|
+
folded: value,
|
|
86
|
+
// Most diagnostics contain no credential label. Build offsets only if a matcher needs them.
|
|
87
|
+
get map() {
|
|
88
|
+
if (map === undefined) {
|
|
89
|
+
map = new Array<number>(value.length + 1);
|
|
90
|
+
for (let index = 0; index <= value.length; index += 1) map[index] = index;
|
|
91
|
+
}
|
|
92
|
+
return map;
|
|
93
|
+
},
|
|
94
|
+
};
|
|
86
95
|
}
|
|
87
96
|
let folded = "";
|
|
88
97
|
const map: number[] = [];
|
package/src/lib/redact.ts
CHANGED
|
@@ -1,13 +1,22 @@
|
|
|
1
1
|
import { foldForMatching } from "./redact-folding";
|
|
2
2
|
|
|
3
3
|
export const REDACTED_SECRET = "[REDACTED]";
|
|
4
|
+
const HUB_RELAY_TOKEN_PATTERN = /ocx_hub_relay_[A-Za-z0-9_-]{43}/g;
|
|
5
|
+
|
|
6
|
+
// Minted management, dashboard, catalog-read, device/pairing, data-plane and Remote Workspace credential values.
|
|
7
|
+
// Match inside quoted strings and identifiers as well as standalone tokens.
|
|
8
|
+
export const OPEN_CODEX_CREDENTIAL_PATTERN = /ocx_(?:(?:admin|session|device|proof|pair|catalog)_[A-Za-z0-9_-]{43}|data_[0-9a-f]{40})|ocxrw_[A-Za-z0-9_-]{43}/g;
|
|
9
|
+
|
|
10
|
+
export function redactOpenCodexCredentials(value: string): string {
|
|
11
|
+
return value.replace(OPEN_CODEX_CREDENTIAL_PATTERN, REDACTED_SECRET);
|
|
12
|
+
}
|
|
4
13
|
|
|
5
14
|
/**
|
|
6
15
|
* Credential-bearing header/field names. Exported for transports that must refuse to send
|
|
7
16
|
* credentials over an unsafe channel (e.g. plaintext non-loopback HTTP) rather than
|
|
8
17
|
* re-deriving a narrower local list.
|
|
9
18
|
*/
|
|
10
|
-
export const SENSITIVE_KEY_PATTERN = /^(?:authorization|proxy-authorization|cookie|set-cookie|set-cookie2|api[-_]?key|x-api-key|x-goog-api-key|x-amz-security-token|x-dsh-auth-token|x-openai-agent-assertion|copilot[-_]?session[-_]?token|session[-_]?token|access[-_]?token|refresh[-_]?token|id[-_]?token|token|secret|client[-_]?secret|password|profile[-_]?arn|exa[-_]?api[-_]?key)$/i;
|
|
19
|
+
export const SENSITIVE_KEY_PATTERN = /^(?:authorization|proxy-authorization|cookie|set-cookie|set-cookie2|api[-_]?key|x-api-key|x-opencodex-api-key|x-goog-api-key|x-amz-security-token|x-dsh-auth-token|x-openai-agent-assertion|copilot[-_]?session[-_]?token|session[-_]?token|access[-_]?token|refresh[-_]?token|id[-_]?token|token|secret|client[-_]?secret|password|profile[-_]?arn|exa[-_]?api[-_]?key)$/i;
|
|
11
20
|
|
|
12
21
|
/**
|
|
13
22
|
* Colon-labelled credential headers echoed back inside an error body
|
|
@@ -40,7 +49,7 @@ export const SENSITIVE_KEY_PATTERN = /^(?:authorization|proxy-authorization|cook
|
|
|
40
49
|
// Every letter position also accepts \u0001, the placeholder the fold emits for
|
|
41
50
|
// an unresolved HTML named reference: `authorⅈzation` is the label with one
|
|
42
51
|
// character we cannot name, and that is still the label.
|
|
43
|
-
const CREDENTIAL_HEADER_LABEL_RAW = "copilot[_-]?session[_-]?token|session[_-]?token|sessionToken|x-openai-agent-assertion|x-api-key|x-goog-api-key|x-amz-security-token|x-dsh-auth-token|api[_-]?key|apiKey|exa[_-]?api[_-]?key|exaApiKey|access[_-]?token|accessToken|refresh[_-]?token|refreshToken|id[_-]?token|client[_-]?secret|clientSecret|authorization|proxy-authorization|cookie|set-cookie|password|secret|token";
|
|
52
|
+
const CREDENTIAL_HEADER_LABEL_RAW = "copilot[_-]?session[_-]?token|session[_-]?token|sessionToken|x-openai-agent-assertion|x-api-key|x-opencodex-api-key|x-goog-api-key|x-amz-security-token|x-dsh-auth-token|api[_-]?key|apiKey|exa[_-]?api[_-]?key|exaApiKey|access[_-]?token|accessToken|refresh[_-]?token|refreshToken|id[_-]?token|client[_-]?secret|clientSecret|authorization|proxy-authorization|cookie|set-cookie|password|secret|token";
|
|
44
53
|
|
|
45
54
|
const CREDENTIAL_HEADER_LABEL = CREDENTIAL_HEADER_LABEL_RAW
|
|
46
55
|
.replace(/(?<![\[\\])([A-Za-z])(?![\]\-])/g, "[$1\u0001]");
|
|
@@ -161,7 +170,8 @@ function findXmlTagClose(text: string, from: number): number {
|
|
|
161
170
|
|
|
162
171
|
/** Scan each tag once; a suffix-searching lookahead here makes unterminated tags quadratic. */
|
|
163
172
|
function maskXmlIdentifyingAttribute(value: string, decodeEscapes: boolean): string {
|
|
164
|
-
const
|
|
173
|
+
const view = foldForMatching(value, decodeEscapes);
|
|
174
|
+
const { folded } = view;
|
|
165
175
|
let searchFrom = 0;
|
|
166
176
|
while (searchFrom < folded.length) {
|
|
167
177
|
const relativeStart = folded.indexOf("<", searchFrom);
|
|
@@ -177,8 +187,8 @@ function maskXmlIdentifyingAttribute(value: string, decodeEscapes: boolean): str
|
|
|
177
187
|
const tagEnd = close === -1 ? folded.length : close + 1;
|
|
178
188
|
const attributes = folded.slice(tagStart + tagName[0].length, tagEnd);
|
|
179
189
|
if (XML_CREDENTIAL_ATTRIBUTE.test(attributes)) {
|
|
180
|
-
const start = map[tagStart] ?? value.length;
|
|
181
|
-
const headEnd = map[tagStart + tagName[0].length] ?? value.length;
|
|
190
|
+
const start = view.map[tagStart] ?? value.length;
|
|
191
|
+
const headEnd = view.map[tagStart + tagName[0].length] ?? value.length;
|
|
182
192
|
return value.slice(0, start) + value.slice(start, headEnd) + REDACTED_SECRET;
|
|
183
193
|
}
|
|
184
194
|
if (close === -1) return value;
|
|
@@ -194,23 +204,24 @@ function maskOtherFramingsOnce(value: string, decodeEscapes: boolean): string {
|
|
|
194
204
|
current = maskMultipartOnce(current, decodeEscapes, pattern);
|
|
195
205
|
continue;
|
|
196
206
|
}
|
|
197
|
-
const
|
|
207
|
+
const view = foldForMatching(current, decodeEscapes);
|
|
208
|
+
const { folded } = view;
|
|
198
209
|
pattern.lastIndex = 0;
|
|
199
210
|
let out = "";
|
|
200
211
|
let cursor = 0;
|
|
201
212
|
let match: RegExpExecArray | null;
|
|
202
213
|
while ((match = pattern.exec(folded)) !== null) {
|
|
203
|
-
const start = map[match.index] ?? current.length;
|
|
204
|
-
const end = map[match.index + match[0].length] ?? current.length;
|
|
214
|
+
const start = view.map[match.index] ?? current.length;
|
|
215
|
+
const end = view.map[match.index + match[0].length] ?? current.length;
|
|
205
216
|
if (start < cursor) continue;
|
|
206
217
|
const head = (() => {
|
|
207
218
|
if (kind === "=") {
|
|
208
219
|
const eq = match[0].indexOf("=");
|
|
209
|
-
const headEnd = map[match.index + eq + 1] ?? end;
|
|
220
|
+
const headEnd = view.map[match.index + eq + 1] ?? end;
|
|
210
221
|
return current.slice(start, headEnd);
|
|
211
222
|
}
|
|
212
223
|
const captured = match[1] ?? "";
|
|
213
|
-
const headEnd = map[match.index + captured.length] ?? end;
|
|
224
|
+
const headEnd = view.map[match.index + captured.length] ?? end;
|
|
214
225
|
return current.slice(start, headEnd);
|
|
215
226
|
})();
|
|
216
227
|
const body = current.slice(start + head.length, end);
|
|
@@ -232,7 +243,8 @@ function maskOtherFramingsOnce(value: string, decodeEscapes: boolean): string {
|
|
|
232
243
|
* so the search resumes past the line instead of rescanning it from each candidate.
|
|
233
244
|
*/
|
|
234
245
|
function maskMultipartOnce(current: string, decodeEscapes: boolean, partHeader: RegExp): string {
|
|
235
|
-
const
|
|
246
|
+
const view = foldForMatching(current, decodeEscapes);
|
|
247
|
+
const { folded } = view;
|
|
236
248
|
partHeader.lastIndex = 0;
|
|
237
249
|
let lineEnd = -1;
|
|
238
250
|
for (let match = partHeader.exec(folded); match !== null; match = partHeader.exec(folded)) {
|
|
@@ -249,9 +261,9 @@ function maskMultipartOnce(current: string, decodeEscapes: boolean, partHeader:
|
|
|
249
261
|
}
|
|
250
262
|
const blank = folded[headEnd] === "\n" ? 1 : folded[headEnd] === "\r" && folded[headEnd + 1] === "\n" ? 2 : 0;
|
|
251
263
|
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);
|
|
264
|
+
const start = view.map[match.index] ?? current.length;
|
|
265
|
+
const end = view.map[folded.length] ?? current.length;
|
|
266
|
+
const head = current.slice(start, view.map[headEnd] ?? end);
|
|
255
267
|
if (!current.slice(start + head.length, end).trim()) return current;
|
|
256
268
|
return current.slice(0, start) + head + REDACTED_SECRET;
|
|
257
269
|
}
|
|
@@ -274,14 +286,15 @@ function maskCredentialHeaders(value: string): string {
|
|
|
274
286
|
}
|
|
275
287
|
|
|
276
288
|
function maskCredentialHeadersOnce(value: string, decodeEscapes: boolean): string {
|
|
277
|
-
const
|
|
289
|
+
const view = foldForMatching(value, decodeEscapes);
|
|
290
|
+
const { folded } = view;
|
|
278
291
|
COLON_LABELLED_CREDENTIAL.lastIndex = 0;
|
|
279
292
|
let out = "";
|
|
280
293
|
let cursor = 0;
|
|
281
294
|
let match: RegExpExecArray | null;
|
|
282
295
|
while ((match = COLON_LABELLED_CREDENTIAL.exec(folded)) !== null) {
|
|
283
|
-
const start = map[match.index] ?? value.length;
|
|
284
|
-
const afterLabel = map[match.index + match[0].length] ?? value.length;
|
|
296
|
+
const start = view.map[match.index] ?? value.length;
|
|
297
|
+
const afterLabel = view.map[match.index + match[0].length] ?? value.length;
|
|
285
298
|
if (start < cursor) continue;
|
|
286
299
|
const lineEnd = (() => {
|
|
287
300
|
const nl = value.slice(afterLabel).search(/[\r\n]/);
|
|
@@ -323,6 +336,7 @@ function maskCredentialHeadersOnce(value: string, decodeEscapes: boolean): strin
|
|
|
323
336
|
}
|
|
324
337
|
|
|
325
338
|
const SECRET_VALUE_PATTERNS: Array<[RegExp, string] | ((value: string) => string)> = [
|
|
339
|
+
[HUB_RELAY_TOKEN_PATTERN, REDACTED_SECRET],
|
|
326
340
|
// A Bearer token outside a labelled header (prose, JSON fragments, logs).
|
|
327
341
|
// Horizontal whitespace only: `\s+` crossed line boundaries and masked the
|
|
328
342
|
// first word of the NEXT line when a header was quoted with a trailing break.
|
|
@@ -397,7 +411,11 @@ function isSensitiveKey(key: string): boolean {
|
|
|
397
411
|
}
|
|
398
412
|
|
|
399
413
|
export function redactSecretString(value: string): string {
|
|
400
|
-
|
|
414
|
+
// Every labelled grammar needs ':', '=' or '<'. Only literal ASCII without escape introducers
|
|
415
|
+
// can rule those out before folding; encoded or Unicode aliases must keep both matching views.
|
|
416
|
+
// Minted OpenCodex credentials need no label, so their mask runs on both paths.
|
|
417
|
+
let redacted = redactOpenCodexCredentials(/[<:=\\%&]|[^\x00-\x7f]/.test(value)
|
|
418
|
+
? maskOtherFramings(maskCredentialHeaders(value)) : value);
|
|
401
419
|
for (const rule of SECRET_VALUE_PATTERNS) {
|
|
402
420
|
redacted = typeof rule === "function" ? rule(redacted) : redacted.replace(rule[0], rule[1]);
|
|
403
421
|
}
|
|
@@ -449,7 +467,7 @@ export function redactUrlForLog(url: string): string {
|
|
|
449
467
|
parsed.password = "";
|
|
450
468
|
parsed.search = "";
|
|
451
469
|
parsed.hash = "";
|
|
452
|
-
return parsed.toString();
|
|
470
|
+
return parsed.toString().replace(HUB_RELAY_TOKEN_PATTERN, REDACTED_SECRET);
|
|
453
471
|
} catch {
|
|
454
472
|
return redactSecretString(url.split("?")[0] ?? url);
|
|
455
473
|
}
|