@bitkyc08/opencodex 2.93.0 → 2.95.0
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 +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -1,15 +1,9 @@
|
|
|
1
1
|
import { closeSync, constants, fstatSync, lstatSync, openSync, readSync } from "node:fs";
|
|
2
|
+
import { sameFileIdentity } from "./file-identity";
|
|
2
3
|
|
|
3
4
|
const MAX_BOUNDED_READ_BYTES = 64 * 1024 * 1024;
|
|
4
5
|
const READ_CHUNK_BYTES = 64 * 1024;
|
|
5
6
|
|
|
6
|
-
function sameIdentity(
|
|
7
|
-
left: { dev: bigint; ino: bigint },
|
|
8
|
-
right: { dev: bigint; ino: bigint },
|
|
9
|
-
): boolean {
|
|
10
|
-
return left.dev === right.dev && left.ino === right.ino;
|
|
11
|
-
}
|
|
12
|
-
|
|
13
7
|
export function readBoundedRegularFileSync(path: string, limit: number): Buffer {
|
|
14
8
|
if (!Number.isSafeInteger(limit) || limit < 1 || limit > MAX_BOUNDED_READ_BYTES) {
|
|
15
9
|
throw new RangeError("invalid bounded file read limit");
|
|
@@ -25,7 +19,7 @@ export function readBoundedRegularFileSync(path: string, limit: number): Buffer
|
|
|
25
19
|
try {
|
|
26
20
|
const opened = fstatSync(fd, { bigint: true });
|
|
27
21
|
if (!opened.isFile() || opened.size > BigInt(limit)) throw new Error("file is not bounded regular data");
|
|
28
|
-
if (entryBefore && (!
|
|
22
|
+
if (entryBefore && (!sameFileIdentity(entryBefore, opened) || opened.ino === 0n)) {
|
|
29
23
|
throw new Error("file entry changed while opening");
|
|
30
24
|
}
|
|
31
25
|
|
|
@@ -47,7 +41,7 @@ export function readBoundedRegularFileSync(path: string, limit: number): Buffer
|
|
|
47
41
|
|
|
48
42
|
if (entryBefore) {
|
|
49
43
|
const entryAfter = lstatSync(path, { bigint: true });
|
|
50
|
-
if (entryAfter.isSymbolicLink() || !entryAfter.isFile() || !
|
|
44
|
+
if (entryAfter.isSymbolicLink() || !entryAfter.isFile() || !sameFileIdentity(opened, entryAfter)) {
|
|
51
45
|
throw new Error("file entry changed while reading");
|
|
52
46
|
}
|
|
53
47
|
}
|
|
@@ -19,9 +19,10 @@ export class RuntimePreflightError extends Error {
|
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
-
|
|
22
|
+
// bigint: NTFS file IDs exceed 2^53, where adjacent IDs are equal as numbers.
|
|
23
|
+
type DirectoryIdentity = { dev: bigint; ino: bigint; isDirectory(): boolean; isSymbolicLink(): boolean };
|
|
23
24
|
export interface RuntimePreflightFs {
|
|
24
|
-
lstatSync: (path: string) => DirectoryIdentity;
|
|
25
|
+
lstatSync: (path: string, options: { bigint: true }) => DirectoryIdentity;
|
|
25
26
|
mkdirSync: (path: string, mode: number) => unknown;
|
|
26
27
|
rmdirSync: (path: string) => void;
|
|
27
28
|
readdirSync: (path: string) => readonly string[];
|
|
@@ -44,7 +45,7 @@ export interface RuntimePreflightDeps {
|
|
|
44
45
|
const probeFs: RuntimePreflightFs = { lstatSync, mkdirSync, rmdirSync, readdirSync };
|
|
45
46
|
|
|
46
47
|
function sameDirectory(fs: RuntimePreflightFs, path: string, owned: DirectoryIdentity): boolean {
|
|
47
|
-
const current = fs.lstatSync(path);
|
|
48
|
+
const current = fs.lstatSync(path, { bigint: true });
|
|
48
49
|
return current.isDirectory() && !current.isSymbolicLink()
|
|
49
50
|
&& current.dev === owned.dev && current.ino === owned.ino;
|
|
50
51
|
}
|
|
@@ -59,7 +60,7 @@ function removeOwnedEmptyDirectory(fs: RuntimePreflightFs, path: string, owned:
|
|
|
59
60
|
function prepareRoot(fs: RuntimePreflightFs, root: string, rootWasAbsent?: boolean): void {
|
|
60
61
|
try {
|
|
61
62
|
if (rootWasAbsent === undefined) {
|
|
62
|
-
try { fs.lstatSync(root); rootWasAbsent = false; }
|
|
63
|
+
try { fs.lstatSync(root, { bigint: true }); rootWasAbsent = false; }
|
|
63
64
|
catch (error) {
|
|
64
65
|
if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
|
|
65
66
|
rootWasAbsent = true;
|
|
@@ -73,7 +74,7 @@ function prepareRoot(fs: RuntimePreflightFs, root: string, rootWasAbsent?: boole
|
|
|
73
74
|
// Use a concurrently created root, subject to the directory check below.
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
|
-
const current = fs.lstatSync(root);
|
|
77
|
+
const current = fs.lstatSync(root, { bigint: true });
|
|
77
78
|
if (!current.isDirectory() || current.isSymbolicLink()) throw new RuntimePreflightError("create");
|
|
78
79
|
} catch {
|
|
79
80
|
throw new RuntimePreflightError("create");
|
|
@@ -83,7 +84,7 @@ function prepareRoot(fs: RuntimePreflightFs, root: string, rootWasAbsent?: boole
|
|
|
83
84
|
function probeInProcess(fs: RuntimePreflightFs, path: string): void {
|
|
84
85
|
let owned: DirectoryIdentity | undefined;
|
|
85
86
|
try {
|
|
86
|
-
try { fs.mkdirSync(path, 0o700); owned = fs.lstatSync(path); }
|
|
87
|
+
try { fs.mkdirSync(path, 0o700); owned = fs.lstatSync(path, { bigint: true }); }
|
|
87
88
|
catch { throw new RuntimePreflightError("create"); }
|
|
88
89
|
try { fs.rmdirSync(path); }
|
|
89
90
|
catch { throw new RuntimePreflightError("remove"); }
|
|
@@ -96,10 +97,10 @@ function probeChild(runtime: DurableBunRuntime, path: string, nonce: string, spa
|
|
|
96
97
|
// The child emits only this invocation's nonce and a fixed result, never paths/errors.
|
|
97
98
|
const script = `const fs = require("node:fs"); const path = ${JSON.stringify(path)};
|
|
98
99
|
let result = "create", owned;
|
|
99
|
-
try { fs.mkdirSync(path, 0o700); owned = fs.lstatSync(path); result = "remove";
|
|
100
|
+
try { fs.mkdirSync(path, 0o700); owned = fs.lstatSync(path, { bigint: true }); result = "remove";
|
|
100
101
|
fs.rmdirSync(path); result = "ok";
|
|
101
102
|
} catch { /* result already names the failed step; details never leave the child */ } finally {
|
|
102
|
-
if (owned) { try { const now = fs.lstatSync(path);
|
|
103
|
+
if (owned) { try { const now = fs.lstatSync(path, { bigint: true });
|
|
103
104
|
if (now.isDirectory() && !now.isSymbolicLink() && now.dev === owned.dev && now.ino === owned.ino
|
|
104
105
|
&& fs.readdirSync(path).length === 0) fs.rmdirSync(path);
|
|
105
106
|
} catch { /* leave any probe entry that cannot be proven ours */ } }
|
|
@@ -53,6 +53,10 @@ const INITIAL_OWNED_PATHS = [
|
|
|
53
53
|
"config-mutation.sqlite-journal",
|
|
54
54
|
"config-mutation.sqlite-shm",
|
|
55
55
|
"config-mutation.sqlite-wal",
|
|
56
|
+
"local-credentials.json",
|
|
57
|
+
"local-credential-observers",
|
|
58
|
+
"local-credential-publication.sqlite",
|
|
59
|
+
"local-credential-publication.sqlite-journal",
|
|
56
60
|
"crash.log",
|
|
57
61
|
"kimi-device-id",
|
|
58
62
|
"mimo-client-id",
|
package/src/lib/errors.ts
CHANGED
|
@@ -500,8 +500,10 @@ export function classifyError(status: number, type: string, message: string): Oc
|
|
|
500
500
|
text.includes("insufficient_quota") ||
|
|
501
501
|
text.includes("exceeded your current quota") ||
|
|
502
502
|
text.includes("quota exhausted") ||
|
|
503
|
+
text.includes("quota has been exhausted") ||
|
|
503
504
|
text.includes("account quota exceeded") ||
|
|
504
505
|
text.includes("monthly quota exceeded") ||
|
|
506
|
+
text.includes("weekly quota exceeded") ||
|
|
505
507
|
text.includes("daily quota exceeded")
|
|
506
508
|
) {
|
|
507
509
|
return { message, type: "insufficient_quota", code: "insufficient_quota" };
|
|
@@ -253,10 +253,11 @@ export async function* decodeEventStream(source: ReadableStream<Uint8Array>): As
|
|
|
253
253
|
// an in-flight `reader.read()` pending when this generator's `finally` runs. Releasing the lock
|
|
254
254
|
// does NOT settle that orphaned read — Bun then surfaces it as an off-path
|
|
255
255
|
// `unhandledRejection: TypeError: null is not an object` that no caller try/catch can intercept.
|
|
256
|
-
//
|
|
256
|
+
// Initiate cancellation before releasing; a hung transport cancellation must not block return.
|
|
257
|
+
// Observe its rejection without waiting for physical cleanup. On a clean `done`
|
|
257
258
|
// finish the read is already settled, so cancel() is a harmless no-op.
|
|
258
259
|
try {
|
|
259
|
-
|
|
260
|
+
void reader.cancel().catch(() => { /* best-effort transport cleanup */ });
|
|
260
261
|
} catch {
|
|
261
262
|
/* body already errored/closed — nothing to cancel */
|
|
262
263
|
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/** Acquire stats with { bigint: true }; never widen a Number to form an identity. */
|
|
2
|
+
export type FileIdentity = Readonly<{ dev: bigint; ino: bigint }>;
|
|
3
|
+
|
|
4
|
+
/** Matches the numeric stat's *Ms value, so a bigint observation can be compared with a numeric or persisted one. */
|
|
5
|
+
export function statTimeMs(ns: bigint): number {
|
|
6
|
+
return Number(ns / 1_000_000_000n) * 1e3 + Number(ns % 1_000_000_000n) / 1e6;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export function sameFileIdentity(a: FileIdentity, b: FileIdentity): boolean {
|
|
10
|
+
return a.dev === b.dev && a.ino === b.ino;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export function fileIdentityKey(id: FileIdentity): string {
|
|
14
|
+
return `${id.dev}:${id.ino}`;
|
|
15
|
+
}
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* Shared response rules for raw outbound transports and internal response consumers.
|
|
3
3
|
*
|
|
4
|
-
* `fetch` applies
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
* the SOCKS helper excluded 204 and the pinned helper excluded nothing, so the same no-content
|
|
8
|
-
* upstream answer behaved differently depending on which transport carried the request.
|
|
4
|
+
* `fetch` applies null-body and content-coding rules below the Response constructor.
|
|
5
|
+
* Raw socket transports apply them explicitly; internal response consumers also need a
|
|
6
|
+
* consistent Content-Type match before choosing their body decoder.
|
|
9
7
|
*/
|
|
10
8
|
|
|
9
|
+
/** Match the exact type/subtype, ignoring case and parameters (RFC 9110 section 8.3.1). */
|
|
10
|
+
export function hasResponseMediaType(headers: Headers, mediaType: string): boolean {
|
|
11
|
+
return headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase() === mediaType.toLowerCase();
|
|
12
|
+
}
|
|
13
|
+
|
|
11
14
|
/**
|
|
12
15
|
* Statuses the Fetch specification defines as null-body.
|
|
13
16
|
*
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/** Admission accounting for raised HTTP bodies; these values do not cap RSS. */
|
|
2
|
+
export const DEFAULT_CONCURRENT_INBOUND_BODY_BYTES = 512 * 1024 * 1024;
|
|
3
|
+
export const MAX_CONCURRENT_INBOUND_BODY_BYTES = 2 * 1024 * 1024 * 1024;
|
|
4
|
+
|
|
5
|
+
/** Keep hand edits bounded; omission, zero and invalid values retain the old default. */
|
|
6
|
+
export function resolveConcurrentInboundBodyLimitBytes(configured?: number): number {
|
|
7
|
+
if (typeof configured !== "number" || !Number.isSafeInteger(configured) || configured <= 0) {
|
|
8
|
+
return DEFAULT_CONCURRENT_INBOUND_BODY_BYTES;
|
|
9
|
+
}
|
|
10
|
+
return Math.min(MAX_CONCURRENT_INBOUND_BODY_BYTES, Math.max(DEFAULT_CONCURRENT_INBOUND_BODY_BYTES, configured));
|
|
11
|
+
}
|
package/src/lib/jsonc.ts
CHANGED
|
@@ -18,7 +18,7 @@ function stripJsonComments(text: string): string {
|
|
|
18
18
|
const ch = text[i]!;
|
|
19
19
|
const next = text[i + 1];
|
|
20
20
|
if (inLine) {
|
|
21
|
-
if (ch === "\n") {
|
|
21
|
+
if (ch === "\n" || ch === "\r") {
|
|
22
22
|
inLine = false;
|
|
23
23
|
out += ch;
|
|
24
24
|
}
|
|
@@ -82,7 +82,12 @@ function stripTrailingCommas(text: string): string {
|
|
|
82
82
|
if (ch === ",") {
|
|
83
83
|
let j = i + 1;
|
|
84
84
|
while (j < text.length && /\s/.test(text[j]!)) j++;
|
|
85
|
-
if (text[j] === "}" || text[j] === "]")
|
|
85
|
+
if (text[j] === "}" || text[j] === "]") {
|
|
86
|
+
let previous = i - 1;
|
|
87
|
+
while (previous >= 0 && /\s/.test(text[previous]!)) previous--;
|
|
88
|
+
// A comma without a preceding member is malformed, not a trailing comma.
|
|
89
|
+
if (text[previous] !== "[" && text[previous] !== "{") continue;
|
|
90
|
+
}
|
|
86
91
|
}
|
|
87
92
|
out += ch;
|
|
88
93
|
}
|
|
@@ -7,12 +7,13 @@
|
|
|
7
7
|
*
|
|
8
8
|
* Destination: the unauthenticated loopback listener when one is enabled, otherwise the bind
|
|
9
9
|
* address (#4236), resolved by localInferenceDestination rather than composing 127.0.0.1 by hand.
|
|
10
|
-
* Admission:
|
|
11
|
-
*
|
|
12
|
-
* forwardable header is a forwarding
|
|
10
|
+
* Admission: selfFetchAdmissionToken (env token, hardened service token file, first apiKeys entry;
|
|
11
|
+
* only a recognized one when the destination requires no admission), sent as x-opencodex-api-key
|
|
12
|
+
* and never Authorization, because an admission secret in a forwardable header is a forwarding
|
|
13
|
+
* hazard. Never the admin token.
|
|
13
14
|
*/
|
|
14
15
|
import type { OcxConfig } from "../types";
|
|
15
|
-
import {
|
|
16
|
+
import { localInferenceDestination, selfFetchAdmissionToken } from "./local-destinations";
|
|
16
17
|
import { signalWithTimeout, cancelBodyOnAbort } from "./abort";
|
|
17
18
|
import { readBoundedResponseBytes } from "./bounded-body";
|
|
18
19
|
import { redactSecretString } from "./redact";
|
|
@@ -64,12 +65,13 @@ export function localChatCompletionBaseUrl(
|
|
|
64
65
|
export async function postLocalChatCompletion(request: LocalChatCompletionRequest): Promise<LocalChatCompletionOutcome> {
|
|
65
66
|
const { config, label, logTag } = request;
|
|
66
67
|
const headers: Record<string, string> = { "Content-Type": "application/json", ...request.headers };
|
|
67
|
-
const
|
|
68
|
+
const target = destination(config);
|
|
69
|
+
const admission = selfFetchAdmissionToken(config, target);
|
|
68
70
|
if (admission) headers["x-opencodex-api-key"] = admission;
|
|
69
71
|
// A bind that demands admission with no resolvable credential would return 401 with a body
|
|
70
72
|
// the caller reports as a failure; naming the cause once is the difference between "it is
|
|
71
73
|
// broken" and a fixable configuration note.
|
|
72
|
-
if (!admission && !request.baseUrlOverride &&
|
|
74
|
+
if (!admission && !request.baseUrlOverride && target.requiresAdmissionToken) {
|
|
73
75
|
console.warn(
|
|
74
76
|
`[${logTag}] ${label} has no opencodex data-plane credential for `
|
|
75
77
|
+ `${localChatCompletionBaseUrl(config)} — the self-fetch will be refused.`,
|
|
@@ -40,6 +40,7 @@
|
|
|
40
40
|
import { isIP } from "node:net";
|
|
41
41
|
import { effectiveLoopbackListenerPort, isLoopbackHostname, isWildcardHostname, shouldInjectApiAuthHeader } from "../codex/loopback-target";
|
|
42
42
|
import { probeHostname } from "../server/proxy-liveness";
|
|
43
|
+
import { resolveDataPlaneAdmissionSecret } from "../server/auth-cors";
|
|
43
44
|
import { loadServiceTokenFromFile, serviceApiTokenFilePath } from "./service-secrets";
|
|
44
45
|
import type { OcxConfig } from "../types";
|
|
45
46
|
|
|
@@ -150,8 +151,16 @@ export function localAdmissionToken(
|
|
|
150
151
|
config: Pick<OcxConfig, "apiKeys"> | undefined,
|
|
151
152
|
env: NodeJS.ProcessEnv = process.env,
|
|
152
153
|
): string | undefined {
|
|
154
|
+
return localAdmissionTokenCandidates(config, env)[0];
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
function localAdmissionTokenCandidates(
|
|
158
|
+
config: Pick<OcxConfig, "apiKeys"> | undefined,
|
|
159
|
+
env: NodeJS.ProcessEnv,
|
|
160
|
+
): string[] {
|
|
161
|
+
const candidates: string[] = [];
|
|
153
162
|
const envToken = env.OPENCODEX_API_AUTH_TOKEN?.trim();
|
|
154
|
-
if (envToken)
|
|
163
|
+
if (envToken) candidates.push(envToken);
|
|
155
164
|
const lookup = env.OCX_API_TOKEN_FILE?.trim()
|
|
156
165
|
? env
|
|
157
166
|
: { ...env, OCX_API_TOKEN_FILE: serviceApiTokenFilePath() };
|
|
@@ -160,9 +169,29 @@ export function localAdmissionToken(
|
|
|
160
169
|
// deliberately and pass through verbatim; a path, by contrast, can be pointed at or replaced
|
|
161
170
|
// by something that is not a credential at all, and sending that as one leaks file contents
|
|
162
171
|
// into a request header. Configured keys are never checked, so no existing key can be broken.
|
|
163
|
-
if (fileToken && ADMISSION_TOKEN_SHAPE.test(fileToken))
|
|
172
|
+
if (fileToken && ADMISSION_TOKEN_SHAPE.test(fileToken)) candidates.push(fileToken);
|
|
164
173
|
const configured = config?.apiKeys?.find(entry => entry.key.trim().length > 0)?.key.trim();
|
|
165
|
-
|
|
174
|
+
if (configured) candidates.push(configured);
|
|
175
|
+
return candidates;
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
/**
|
|
179
|
+
* The credential an in-process self-fetch (Advisor, routed helpers) presents to `destination`.
|
|
180
|
+
*
|
|
181
|
+
* A destination that demands admission gets the `localAdmissionToken` ladder unchanged. One that
|
|
182
|
+
* does not still receives the first ladder credential this data plane recognizes, because Chat
|
|
183
|
+
* applies that key's limits to an internal hop a loopback listener admitted without reading it
|
|
184
|
+
* (#7894). An unrecognized one, such as a hub client key a loopback bind deliberately left out of
|
|
185
|
+
* its admission credentials, is not sent: Chat refuses any credential it cannot resolve.
|
|
186
|
+
*/
|
|
187
|
+
export function selfFetchAdmissionToken(
|
|
188
|
+
config: Pick<OcxConfig, "apiKeys"> | undefined,
|
|
189
|
+
destination: Pick<LocalInferenceDestination, "requiresAdmissionToken">,
|
|
190
|
+
env: NodeJS.ProcessEnv = process.env,
|
|
191
|
+
): string | undefined {
|
|
192
|
+
const candidates = localAdmissionTokenCandidates(config, env);
|
|
193
|
+
if (destination.requiresAdmissionToken) return candidates[0];
|
|
194
|
+
return candidates.find(token => resolveDataPlaneAdmissionSecret(token, config ?? {}) !== null);
|
|
166
195
|
}
|
|
167
196
|
|
|
168
197
|
/** An admission credential is an opaque printable token — never JSON, a path, or multi-line. */
|
|
@@ -19,6 +19,7 @@ export const LOCAL_MANAGEMENT_READ_PATHS = {
|
|
|
19
19
|
startupHealth: "/api/startup-health",
|
|
20
20
|
providerQuotas: "/api/provider-quotas",
|
|
21
21
|
usageTimeline: "/api/usage/timeline",
|
|
22
|
+
stop: "/api/stop",
|
|
22
23
|
} as const;
|
|
23
24
|
|
|
24
25
|
export type LocalManagementReadPath =
|
|
@@ -50,7 +51,8 @@ function isLocalManagementReadPath(path: string): path is LocalManagementReadPat
|
|
|
50
51
|
|| path === LOCAL_MANAGEMENT_READ_PATHS.usage
|
|
51
52
|
|| path === LOCAL_MANAGEMENT_READ_PATHS.startupHealth
|
|
52
53
|
|| path === LOCAL_MANAGEMENT_READ_PATHS.providerQuotas
|
|
53
|
-
|| path === LOCAL_MANAGEMENT_READ_PATHS.usageTimeline
|
|
54
|
+
|| path === LOCAL_MANAGEMENT_READ_PATHS.usageTimeline
|
|
55
|
+
|| path === LOCAL_MANAGEMENT_READ_PATHS.stop;
|
|
54
56
|
}
|
|
55
57
|
|
|
56
58
|
function localReadCapabilityPayload(
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
* `.local`/`.lan` name) earns the disabled budget. Anything else — a public DNS name, an
|
|
17
17
|
* unreachable host, a bare domain — stays public and keeps its stall budget, because being local
|
|
18
18
|
* is what switches OFF a safety clock.
|
|
19
|
+
* This is lexical timeout policy: it never resolves DNS or grants network access.
|
|
19
20
|
*/
|
|
20
21
|
import { isIP } from "node:net";
|
|
21
22
|
|
|
@@ -52,29 +53,20 @@ export function isLocalUpstream(destination: string | null | undefined): boolean
|
|
|
52
53
|
function hostnameOf(destination: string): string | null {
|
|
53
54
|
const trimmed = destination.trim();
|
|
54
55
|
if (!trimmed) return null;
|
|
55
|
-
|
|
56
|
-
//
|
|
57
|
-
//
|
|
58
|
-
if (
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
56
|
+
const absolute = /^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed);
|
|
57
|
+
// A schemeless host may carry a numeric port, but never credentials, a path, an
|
|
58
|
+
// unmatched bracket or a discarded suffix. Do not rescue malformed absolute URLs.
|
|
59
|
+
if (!absolute && !/^(?:\[[0-9a-f:.]+\]|[^:/?#@\s\\]+)(?::\d{1,5})?$/i.test(trimmed)) return null;
|
|
60
|
+
try {
|
|
61
|
+
const parsed = new URL(absolute ? trimmed : `http://${trimmed}`);
|
|
62
|
+
if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return null;
|
|
63
|
+
return parsed.hostname || null;
|
|
64
|
+
} catch {
|
|
65
|
+
return null;
|
|
65
66
|
}
|
|
66
|
-
let host = trimmed;
|
|
67
|
-
if (host.startsWith("[")) {
|
|
68
|
-
const end = host.indexOf("]");
|
|
69
|
-
host = end > 0 ? host.slice(1, end) : host.slice(1);
|
|
70
|
-
} else {
|
|
71
|
-
const colon = host.indexOf(":");
|
|
72
|
-
if (colon >= 0) host = host.slice(0, colon);
|
|
73
|
-
}
|
|
74
|
-
return host || null;
|
|
75
67
|
}
|
|
76
68
|
|
|
77
|
-
/** 0.0.0.0
|
|
69
|
+
/** Unspecified 0.0.0.0, 10/8, 127/8, 169.254/16, 172.16/12, 192.168/16. */
|
|
78
70
|
function isLocalIpv4(host: string): boolean {
|
|
79
71
|
const parts = host.split(".");
|
|
80
72
|
if (parts.length !== 4) return false;
|
|
@@ -86,7 +78,7 @@ function isLocalIpv4(host: string): boolean {
|
|
|
86
78
|
octets.push(value);
|
|
87
79
|
}
|
|
88
80
|
const [a, b] = octets;
|
|
89
|
-
if (a === 0) return
|
|
81
|
+
if (a === 0) return octets.every(value => value === 0);
|
|
90
82
|
if (a === 10) return true;
|
|
91
83
|
if (a === 127) return true;
|
|
92
84
|
if (a === 169 && b === 254) return true;
|
|
@@ -102,8 +94,9 @@ function isLocalIpv6(host: string): boolean {
|
|
|
102
94
|
if (!groups) return false;
|
|
103
95
|
// Loopback in any spelling: every group zero except a trailing one.
|
|
104
96
|
if (groups.every((group, index) => (index < 7 ? group === 0 : group === 1))) return true;
|
|
105
|
-
|
|
106
|
-
|
|
97
|
+
if (groups.slice(0, 5).every(group => group === 0) && groups[5] === 0xffff) {
|
|
98
|
+
return isLocalIpv4(`${groups[6] >>> 8}.${groups[6] & 255}.${groups[7] >>> 8}.${groups[7] & 255}`);
|
|
99
|
+
}
|
|
107
100
|
const first = groups[0];
|
|
108
101
|
if ((first & 0xffc0) === 0xfe80) return true;
|
|
109
102
|
if ((first & 0xfe00) === 0xfc00) return true;
|
|
@@ -116,15 +109,18 @@ function ipv6Groups(host: string): number[] | null {
|
|
|
116
109
|
const compressed = marker >= 0;
|
|
117
110
|
const head = compressed ? host.slice(0, marker) : host;
|
|
118
111
|
const tail = compressed ? host.slice(marker + 2) : "";
|
|
119
|
-
|
|
112
|
+
let headGroups = head === "" ? [] : head.split(":");
|
|
120
113
|
let tailGroups = tail === "" ? [] : tail.split(":");
|
|
121
114
|
// A trailing embedded IPv4 (e.g. `64:ff9b::1.2.3.4`) counts as two groups.
|
|
122
|
-
const
|
|
115
|
+
const ending = compressed ? tailGroups : headGroups;
|
|
116
|
+
const last = ending[ending.length - 1];
|
|
123
117
|
if (last !== undefined && last.includes(".")) {
|
|
124
118
|
const v4 = last.split(".");
|
|
125
119
|
if (v4.length === 4 && v4.every((part) => /^\d{1,3}$/.test(part) && Number(part) <= 255)) {
|
|
126
120
|
const [o0, o1, o2, o3] = v4.map(Number);
|
|
127
|
-
|
|
121
|
+
const expanded = [...ending.slice(0, -1), ((o0 << 8) | o1).toString(16), ((o2 << 8) | o3).toString(16)];
|
|
122
|
+
if (compressed) tailGroups = expanded;
|
|
123
|
+
else headGroups = expanded;
|
|
128
124
|
} else return null;
|
|
129
125
|
}
|
|
130
126
|
let groups: string[];
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/** A failed connect cannot distinguish an absent loopback address from a slow owner. */
|
|
2
|
+
export type LoopbackFamilyAvailability = "available" | "unavailable" | "unknown";
|
|
3
|
+
|
|
4
|
+
function bindLoopback(hostname: string): { stop(): void } {
|
|
5
|
+
return Bun.listen({ hostname, port: 0, socket: { data(socket) { socket.end(); } } });
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Ask the kernel whether the concrete local address can be bound, independently of
|
|
10
|
+
* routing/connect timeouts. Only address/family absence permits skipping discovery;
|
|
11
|
+
* permissions, resource exhaustion and other failures leave owner evidence unknown.
|
|
12
|
+
* The ephemeral listener is closed synchronously and never accepts client traffic.
|
|
13
|
+
*/
|
|
14
|
+
export function loopbackFamilyAvailability(
|
|
15
|
+
hostname: string,
|
|
16
|
+
bindFn: (hostname: string) => { stop(): void } = bindLoopback,
|
|
17
|
+
): LoopbackFamilyAvailability {
|
|
18
|
+
const address = hostname === "[::1]" ? "::1" : hostname;
|
|
19
|
+
if (address !== "::1" && address !== "127.0.0.1") return "unknown";
|
|
20
|
+
let listener: { stop(): void };
|
|
21
|
+
try {
|
|
22
|
+
listener = bindFn(address);
|
|
23
|
+
} catch (error) {
|
|
24
|
+
const code = (error as { code?: unknown } | null)?.code;
|
|
25
|
+
return code === "EADDRNOTAVAIL" || code === "EAFNOSUPPORT"
|
|
26
|
+
|| code === "EPROTONOSUPPORT"
|
|
27
|
+
? "unavailable" : "unknown";
|
|
28
|
+
}
|
|
29
|
+
listener.stop();
|
|
30
|
+
return "available";
|
|
31
|
+
}
|
package/src/lib/plain-data.ts
CHANGED
|
@@ -29,7 +29,7 @@ export function copyPlainData<T>(value: T): PlainDataCopy<T> {
|
|
|
29
29
|
/**
|
|
30
30
|
* A stable string for comparing two plain-data values.
|
|
31
31
|
*
|
|
32
|
-
*
|
|
32
|
+
* Tagged containers and key-sorted entry pairs, because property order is observable through
|
|
33
33
|
* serialization and two values that differ only in it are the same value.
|
|
34
34
|
*/
|
|
35
35
|
export function canonicalPlainData(value: unknown): string {
|
|
@@ -50,6 +50,7 @@ export function isPlainObject(value: unknown): value is Record<string, unknown>
|
|
|
50
50
|
return prototype === Object.prototype || prototype === null;
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
+
/** Copy one JSON-shaped value through property descriptors, or return `REFUSED` for anything else. */
|
|
53
54
|
function copyValue(value: unknown, seen: Set<object>): unknown {
|
|
54
55
|
if (value === null) return null;
|
|
55
56
|
const type = typeof value;
|
|
@@ -69,7 +70,7 @@ function copyValue(value: unknown, seen: Set<object>): unknown {
|
|
|
69
70
|
if (entry === undefined) continue;
|
|
70
71
|
const item = copyValue(entry, seen);
|
|
71
72
|
if (item === REFUSED) return REFUSED;
|
|
72
|
-
copied
|
|
73
|
+
Object.defineProperty(copied, key, { value: item, enumerable: true, writable: true, configurable: true });
|
|
73
74
|
}
|
|
74
75
|
return copied;
|
|
75
76
|
} finally {
|
|
@@ -92,12 +93,13 @@ function copyArray(source: unknown[], seen: Set<object>): unknown {
|
|
|
92
93
|
return copied;
|
|
93
94
|
}
|
|
94
95
|
|
|
96
|
+
/** Rebuild a value with tagged arrays and objects and key-sorted object entries for comparison. */
|
|
95
97
|
function sorted(value: unknown): unknown {
|
|
96
|
-
if (Array.isArray(value)) return value.map(sorted);
|
|
98
|
+
if (Array.isArray(value)) return ["array", value.map(sorted)];
|
|
97
99
|
if (value !== null && typeof value === "object") {
|
|
98
|
-
return Object.keys(value as Record<string, unknown>)
|
|
100
|
+
return ["object", Object.keys(value as Record<string, unknown>)
|
|
99
101
|
.sort()
|
|
100
|
-
.map(key => [key, sorted((value as Record<string, unknown>)[key])]);
|
|
102
|
+
.map(key => [key, sorted((value as Record<string, unknown>)[key])])];
|
|
101
103
|
}
|
|
102
104
|
return value;
|
|
103
105
|
}
|
|
@@ -41,6 +41,18 @@ export interface GracefulStopIo {
|
|
|
41
41
|
* and keep the self-contained behaviour.
|
|
42
42
|
*/
|
|
43
43
|
deferSharedTeardownNonce?: string;
|
|
44
|
+
/**
|
|
45
|
+
* Whether a `sharedTeardown: "not-owned"` answer confirms this stop's teardown.
|
|
46
|
+
*
|
|
47
|
+
* A sibling's `not-owned` is a truthful final answer: it owns no shared teardown, so
|
|
48
|
+
* nothing is left for this caller either. `ocx stop` of a connected Link Child sets this
|
|
49
|
+
* false — only an old build answers `not-owned` for a link connection, and it says so
|
|
50
|
+
* while preserving the loopback route this caller must restore itself. The caller decides
|
|
51
|
+
* from the connection state read at the POST: a connect or disconnect committed mid-stop
|
|
52
|
+
* changes what the answer means for it. Defaults to true; the option only narrows a stop
|
|
53
|
+
* that sent no deferral nonce.
|
|
54
|
+
*/
|
|
55
|
+
acceptNotOwnedTeardown?: boolean;
|
|
44
56
|
/**
|
|
45
57
|
* Endpoint the caller already resolved for this pid.
|
|
46
58
|
*
|
|
@@ -204,7 +216,7 @@ export async function stopProxyGracefully(pid: number, io: GracefulStopIo = {}):
|
|
|
204
216
|
*/
|
|
205
217
|
type StopRefusal = { message: string | null; code: string | null };
|
|
206
218
|
|
|
207
|
-
async function stopRequestFetch(input: string | URL | Request, init?: RequestInit): Promise<Response> {
|
|
219
|
+
export async function stopRequestFetch(input: string | URL | Request, init?: RequestInit): Promise<Response> {
|
|
208
220
|
let status: number | undefined;
|
|
209
221
|
try {
|
|
210
222
|
return await directLocalHttpFetch(input, init, { onResponseStatus: value => { status = value; } });
|
|
@@ -275,12 +287,16 @@ async function stopProxyGracefullyDetailed(
|
|
|
275
287
|
const expectedTeardown = io.deferSharedTeardownNonce ? "deferred" : "performed";
|
|
276
288
|
// A sibling instance answers `not-owned`: it has no shared teardown to perform, so there is
|
|
277
289
|
// nothing left over for this caller either. A deferral it was sent is still not confirmed.
|
|
290
|
+
// A connected Link Child's stop refuses the same answer: only an old build sends it for a
|
|
291
|
+
// link connection, and it preserves the route this caller must restore.
|
|
278
292
|
sharedTeardownConfirmed = body !== null
|
|
279
293
|
&& typeof body === "object"
|
|
280
294
|
&& !Array.isArray(body)
|
|
281
295
|
&& "success" in body && body.success === true
|
|
282
296
|
&& "sharedTeardown" in body && (body.sharedTeardown === expectedTeardown
|
|
283
|
-
|| (!io.deferSharedTeardownNonce
|
|
297
|
+
|| (!io.deferSharedTeardownNonce
|
|
298
|
+
&& (io.acceptNotOwnedTeardown ?? true)
|
|
299
|
+
&& body.sharedTeardown === "not-owned"));
|
|
284
300
|
} catch {
|
|
285
301
|
return done(false);
|
|
286
302
|
}
|
|
@@ -351,22 +367,31 @@ async function waitForStoppedPort(
|
|
|
351
367
|
}
|
|
352
368
|
}
|
|
353
369
|
|
|
354
|
-
export function killProxy(pid: number): void {
|
|
370
|
+
export function killProxy(pid: number, mayTerminate?: () => boolean): void {
|
|
355
371
|
if (!isProcessAlive(pid)) return;
|
|
372
|
+
const authorize = () => {
|
|
373
|
+
if (mayTerminate && mayTerminate() !== true) throw Object.assign(new Error("Process termination refused"), { code: "EUPDATEAUTHORITY" });
|
|
374
|
+
};
|
|
356
375
|
if (process.platform === "win32") {
|
|
357
376
|
// Windows process.kill(SIGTERM/SIGINT) is TerminateProcess — not a graceful signal.
|
|
358
377
|
// Graceful drain happens only via stopProxyGracefully() (POST /api/stop). This path
|
|
359
378
|
// is the hard fallback: taskkill /T /F so the process tree exits (ghost LISTEN /
|
|
360
379
|
// CLOSE_WAIT are then cleared by reclaimListenPort / SetTcpEntry).
|
|
361
380
|
const taskkill = `${process.env.SystemRoot ?? "C:\\Windows"}\\System32\\taskkill.exe`;
|
|
381
|
+
const args = ["/PID", String(pid), "/T", "/F"];
|
|
382
|
+
authorize();
|
|
362
383
|
try {
|
|
363
|
-
execFileSync(taskkill,
|
|
384
|
+
execFileSync(taskkill, args, { stdio: "pipe", windowsHide: true });
|
|
364
385
|
} catch (err) {
|
|
365
386
|
if (isProcessAlive(pid)) throw err;
|
|
366
387
|
}
|
|
367
388
|
} else {
|
|
389
|
+
authorize();
|
|
368
390
|
process.kill(pid, "SIGTERM");
|
|
369
|
-
if (!waitForExit(pid, 5000))
|
|
391
|
+
if (!waitForExit(pid, 5000)) {
|
|
392
|
+
authorize();
|
|
393
|
+
process.kill(pid, "SIGKILL");
|
|
394
|
+
}
|
|
370
395
|
}
|
|
371
396
|
if (!waitForExit(pid, 5000)) throw new Error(`process ${pid} did not exit`);
|
|
372
397
|
}
|
|
@@ -75,6 +75,15 @@ const LETTER_CONFUSABLES = new Map<string, string>([
|
|
|
75
75
|
* not cover.
|
|
76
76
|
*/
|
|
77
77
|
export function foldForMatching(value: string, decodeEscapes = true): { folded: string; map: number[] } {
|
|
78
|
+
// ASCII has no confusables, invisible format characters or NFKD changes. Without
|
|
79
|
+
// an escape introducer, decoding cannot change it either. Usage metadata passes
|
|
80
|
+
// through this fold repeatedly on ledger reads; keep its identity map without
|
|
81
|
+
// repeating Unicode normalization and escape matching for every character.
|
|
82
|
+
if (!/[^\x00-\x7f]/.test(value) && (!decodeEscapes || !/[\\%&]/.test(value))) {
|
|
83
|
+
const map = new Array<number>(value.length + 1);
|
|
84
|
+
for (let index = 0; index <= value.length; index += 1) map[index] = index;
|
|
85
|
+
return { folded: value, map };
|
|
86
|
+
}
|
|
78
87
|
let folded = "";
|
|
79
88
|
const map: number[] = [];
|
|
80
89
|
// Serialization escapes are ALIASES for the label, not decoration: a JSON
|