@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
package/src/link/relay-auth.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createHmac, randomBytes, timingSafeEqual } from "node:crypto";
|
|
1
|
+
import { createHmac, randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
|
|
2
2
|
|
|
3
3
|
export const LINK_RELAY_AUTH_PATH = "/.well-known/opencodex/link-relay-auth";
|
|
4
4
|
export const LINK_RELAY_SESSION_HEADER = "x-opencodex-link-session";
|
|
@@ -10,6 +10,43 @@ export const LINK_RELAY_SESSION_HEADER = "x-opencodex-link-session";
|
|
|
10
10
|
export const LINK_RELAY_PROBE_HEADER = "x-opencodex-link-probe";
|
|
11
11
|
export const LINK_RELAY_AUTH_VERSION = "2";
|
|
12
12
|
export const LINK_RELAY_AUTH_TIMEOUT_MS = 5_000;
|
|
13
|
+
/**
|
|
14
|
+
* An additive part of a Home's relay-auth answer: which tunnel connection the proof crossed, as
|
|
15
|
+
* `<Home runtime instance>:<tunnel generation>`, bound to the same nonce and link key by its own
|
|
16
|
+
* proof. A Child that cannot verify it, or an older Home that never sends it, leaves it unknown.
|
|
17
|
+
*/
|
|
18
|
+
export const LINK_RELAY_CONNECTION_HEADER = "x-opencodex-link-connection";
|
|
19
|
+
export const LINK_RELAY_CONNECTION_PROOF_HEADER = "x-opencodex-link-connection-proof";
|
|
20
|
+
/** Chosen once per process, so a runtime restart always changes every connection generation. */
|
|
21
|
+
export const LINK_RUNTIME_INSTANCE = randomUUID();
|
|
22
|
+
const CONNECTION_GENERATION = /^[\x21-\x7e]{1,256}$/;
|
|
23
|
+
|
|
24
|
+
export function isLinkConnectionGeneration(value: unknown): value is string {
|
|
25
|
+
return typeof value === "string" && CONNECTION_GENERATION.test(value);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/** This process's name for a tunnel connection; the counter advances on every connect. */
|
|
29
|
+
export function linkConnectionGeneration(counter: number): string {
|
|
30
|
+
return `${LINK_RUNTIME_INSTANCE}:${counter}`;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
let connectionSequence = 0;
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* A fresh connection name from one process-wide sequence, shared by the Home and Child
|
|
37
|
+
* supervisors. A supervisor rebuilt in the same process (a restart rollback, a listener restart)
|
|
38
|
+
* therefore never repeats a name an earlier one handed out.
|
|
39
|
+
*/
|
|
40
|
+
export function nextLinkConnectionGeneration(): string {
|
|
41
|
+
connectionSequence += 1;
|
|
42
|
+
return linkConnectionGeneration(connectionSequence);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
export function linkConnectionProof(fingerprint: string, keyId: string, linkId: string, nonce: string, generation: string): string | null {
|
|
46
|
+
if (!isLinkConnectionGeneration(generation) || !linkRelayProof(fingerprint, "listener", keyId, linkId, nonce)) return null;
|
|
47
|
+
return createHmac("sha256", Buffer.from(fingerprint, "hex"))
|
|
48
|
+
.update(`opencodex-link-connection-v1\0${keyId}\0${linkId}\0${nonce}\0${generation}`).digest("hex");
|
|
49
|
+
}
|
|
13
50
|
|
|
14
51
|
/** The direction and both identities are covered; a caller proof is never a listener proof. */
|
|
15
52
|
export function linkRelayProof(
|
|
@@ -1,19 +1,5 @@
|
|
|
1
|
-
/**
|
|
2
|
-
|
|
3
|
-
*
|
|
4
|
-
* Remote Link drives its Child through a POSIX `sh` prelude, so a Windows Child is refused
|
|
5
|
-
* before any link key is issued or tunnel started. A Windows OpenSSH server shows up in one of
|
|
6
|
-
* three ways, depending on its default shell:
|
|
7
|
-
* - Git Bash, MSYS2 or Cygwin: `uname -s` reports MINGW*, MSYS*, CYGWIN* (or Windows*), and the
|
|
8
|
-
* ocx prelude exits with REMOTE_PLATFORM_UNSUPPORTED.
|
|
9
|
-
* - cmd.exe: a POSIX command such as `true` or `sh` is "not recognized as an internal or
|
|
10
|
-
* external command".
|
|
11
|
-
* - PowerShell: the same command "is not recognized as the name of a cmdlet".
|
|
12
|
-
*
|
|
13
|
-
* Hub mode (`ocx hub invite` on a Hub, `ocx connect` on the client) supports Windows clients, so
|
|
14
|
-
* every refusal points there.
|
|
15
|
-
*/
|
|
16
|
-
import { buildWindowsProbeArgv, REMOTE_COMMAND_NOT_FOUND, REMOTE_PLATFORM_UNSUPPORTED } from "./ssh-argv";
|
|
1
|
+
/** Remote platform is discovered only through the link's pinned SSH host key. */
|
|
2
|
+
import { buildExecArgv, buildWindowsProbeArgv, REMOTE_COMMAND_NOT_FOUND, REMOTE_PLATFORM_UNSUPPORTED } from "./ssh-argv";
|
|
17
3
|
import type { SshRunner, SshRunResult } from "./ssh-runner";
|
|
18
4
|
|
|
19
5
|
export type RemotePlatform = "windows" | "posix" | "unknown";
|
|
@@ -29,9 +15,6 @@ const SSH_TRANSPORT_FAILURE = 255;
|
|
|
29
15
|
/** Remote argv that prints the kernel name; under cmd or PowerShell, `sh` itself is refused. */
|
|
30
16
|
export const REMOTE_UNAME_ARGV: readonly string[] = ["sh", "-c", "uname -s 2>/dev/null", "ocx-platform"];
|
|
31
17
|
|
|
32
|
-
/** Server-side refusal text, shared by the dashboard and the CLI's JSON consumers. */
|
|
33
|
-
export const WINDOWS_CHILD_REFUSAL = "Remote Link Children require macOS or Linux; Windows is unsupported. Connect a Windows computer in Hub mode: run ocx hub invite on a Hub, then the printed ocx connect command on the Windows computer.";
|
|
34
|
-
|
|
35
18
|
/** Does this output come from cmd.exe or PowerShell refusing a POSIX command? */
|
|
36
19
|
export function isWindowsShellRefusal(output: string): boolean {
|
|
37
20
|
return WINDOWS_SHELL_REFUSAL.test(output);
|
|
@@ -71,8 +54,13 @@ export async function detectRemotePlatform(runner: SshRunner, alias: string, kno
|
|
|
71
54
|
return await confirmWindowsShell(runner, alias, knownHostsFile) ? "windows" : "unknown";
|
|
72
55
|
}
|
|
73
56
|
|
|
74
|
-
/**
|
|
75
|
-
export function
|
|
76
|
-
|
|
77
|
-
|
|
57
|
+
/** Windows when the fixed %OS% probe answers Windows_NT, otherwise POSIX from uname; never a guess. */
|
|
58
|
+
export async function requireRemotePlatform(runner: Pick<SshRunner, "run">, alias: string, knownHostsFile: string): Promise<"posix" | "windows"> {
|
|
59
|
+
const windows = await runner.run(buildWindowsProbeArgv({ alias, knownHostsFile }), { timeoutMs: 10_000 });
|
|
60
|
+
if (windows.code === 255) throw new Error("SSH platform discovery failed");
|
|
61
|
+
if (windows.code === 0 && windows.stdout.trim() === "Windows_NT") return "windows";
|
|
62
|
+
const result = await runner.run(buildExecArgv({ alias, knownHostsFile, argv: REMOTE_UNAME_ARGV }), { timeoutMs: 10_000 });
|
|
63
|
+
const platform = classifyRemotePlatform(result);
|
|
64
|
+
if (platform === "unknown") throw new Error("Remote platform could not be determined");
|
|
65
|
+
return platform;
|
|
78
66
|
}
|
package/src/link/remote-probe.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { windowsChildHttpArgv } from "./remote-windows";
|
|
1
2
|
import { MEMORY_DRAIN_RESTART_MS, REPLACEMENT_READY_TIMEOUT_MS } from "../lib/system-restart-contract";
|
|
2
3
|
|
|
3
4
|
export const LINK_COMMAND_WORK_MS = 15_000;
|
|
@@ -16,7 +17,8 @@ export function linkRestartBudget(latencyMs = 0): number {
|
|
|
16
17
|
}
|
|
17
18
|
|
|
18
19
|
/** Credential-free Child HTTP probe. Ignore curlrc/proxies; never follow a redirect. */
|
|
19
|
-
export function remoteChildHttpArgv(port: number, path: "healthz" | "v1/catalog", timeoutMs = LINK_RELAY_VERIFY_MS): string[] {
|
|
20
|
+
export function remoteChildHttpArgv(port: number, path: "healthz" | "v1/catalog", timeoutMs = LINK_RELAY_VERIFY_MS, platform: "posix" | "windows" = "posix"): string[] {
|
|
21
|
+
if (platform === "windows") return windowsChildHttpArgv(port, path, timeoutMs);
|
|
20
22
|
if (!Number.isInteger(port) || port < 1 || port > 65535) throw new Error("invalid Child port");
|
|
21
23
|
const seconds = Math.max(1, Math.ceil(Math.min(LINK_RELAY_VERIFY_MS, timeoutMs) / 1000));
|
|
22
24
|
return ["sh", "-c", 'curl -q --noproxy "*" --silent --show-error --fail --connect-timeout 3 --max-time "$3" --write-out "\\n%{http_code}" "http://127.0.0.1:$1/$2"', "ocx-child-http", String(port), path, String(seconds)];
|
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
import { Buffer } from "node:buffer";
|
|
2
|
+
import { deflateRawSync, inflateRawSync } from "node:zlib";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* cmd.exe, Windows OpenSSH's default shell, caps its command line at 8191 characters. The encoded
|
|
6
|
+
* script leaves room for the fixed powershell.exe prefix and cmd.exe's own wrapper.
|
|
7
|
+
*/
|
|
8
|
+
export const POWERSHELL_ENCODED_MAX = 8_000;
|
|
9
|
+
|
|
10
|
+
export function powershellArgv(script: string): string[] {
|
|
11
|
+
// Module preparation otherwise writes a CLIXML progress record to stderr, which Home would see.
|
|
12
|
+
const encoded = Buffer.from("$ProgressPreference='SilentlyContinue'\n" + script, "utf16le").toString("base64");
|
|
13
|
+
if (encoded.length > POWERSHELL_ENCODED_MAX) throw new Error("Remote PowerShell command exceeds the cmd.exe-compatible command-line budget");
|
|
14
|
+
return ["powershell.exe", "-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand", encoded];
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/** Exit status when the remote ocx cannot be contained; nothing ran. */
|
|
18
|
+
export const WINDOWS_CONTAINMENT_EXIT = 126;
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* OcxJob, compiled on the Child with Add-Type, contains the remote ocx. Run creates the process
|
|
22
|
+
* with PROC_THREAD_ATTRIBUTE_JOB_LIST (STARTUPINFOEX, EXTENDED_STARTUPINFO_PRESENT), so it is a
|
|
23
|
+
* member of a kill-on-close, silent-breakaway Job from the moment it exists: when the SSH server
|
|
24
|
+
* ends a dropped channel by terminating this PowerShell host, the Job's last handle closes and
|
|
25
|
+
* ocx.exe dies with it, while a runtime ocx starts on its own breaks away and survives. Standard
|
|
26
|
+
* handles are inherited, so stdin bytes reach ocx untouched, and its exit status becomes the
|
|
27
|
+
* host's. One finally block releases the attribute list, its value buffer and the thread, process
|
|
28
|
+
* and Job handles on every path, and terminates the child through its own handle if anything
|
|
29
|
+
* fails after creation. If Add-Type or any step fails, the host exits 126; there is no
|
|
30
|
+
* uncontained fallback. Ok is the bounded --version probe for discovery. Layouts are x64:
|
|
31
|
+
* STARTUPINFOEXW is 112 bytes with the attribute list at byte 104, and LimitFlags sits at byte 16
|
|
32
|
+
* of the 144-byte JOBOBJECT_EXTENDED_LIMIT_INFORMATION. Warnings fail Add-Type in Windows
|
|
33
|
+
* PowerShell, so this source must compile without any.
|
|
34
|
+
*/
|
|
35
|
+
export const OCX_JOB_SOURCE = [
|
|
36
|
+
"using System;using System.Text;using System.Diagnostics;using System.Runtime.InteropServices;",
|
|
37
|
+
"public static class OcxJob{",
|
|
38
|
+
"[DllImport(\"kernel32\")]static extern IntPtr CreateJobObjectW(IntPtr a,IntPtr n);",
|
|
39
|
+
"[DllImport(\"kernel32\")]static extern bool SetInformationJobObject(IntPtr j,int c,byte[] i,int l);",
|
|
40
|
+
"[DllImport(\"kernel32\")]static extern bool InitializeProcThreadAttributeList(IntPtr l,int c,int f,ref IntPtr n);",
|
|
41
|
+
"[DllImport(\"kernel32\")]static extern bool UpdateProcThreadAttribute(IntPtr l,int f,IntPtr a,IntPtr v,IntPtr n,IntPtr p,IntPtr r);",
|
|
42
|
+
"[DllImport(\"kernel32\")]static extern void DeleteProcThreadAttributeList(IntPtr l);",
|
|
43
|
+
"[DllImport(\"kernel32\",CharSet=CharSet.Unicode)]static extern bool CreateProcessW(string a,StringBuilder c,IntPtr p,IntPtr t,bool h,int f,IntPtr e,string d,long[] s,long[] i);",
|
|
44
|
+
"[DllImport(\"kernel32\")]static extern int WaitForSingleObject(IntPtr h,int m);",
|
|
45
|
+
"[DllImport(\"kernel32\")]static extern bool GetExitCodeProcess(IntPtr p,out int c);",
|
|
46
|
+
"[DllImport(\"kernel32\")]static extern bool TerminateProcess(IntPtr p,int c);",
|
|
47
|
+
"[DllImport(\"kernel32\")]static extern bool CloseHandle(IntPtr h);",
|
|
48
|
+
"static void F(bool k){if(!k)throw new Exception();}",
|
|
49
|
+
"public static bool Ok(string x){try{",
|
|
50
|
+
"var q=Process.Start(new ProcessStartInfo(x,\"--version\"){UseShellExecute=false,RedirectStandardInput=true,RedirectStandardOutput=true,RedirectStandardError=true});",
|
|
51
|
+
"q.StandardInput.Close();q.StandardOutput.ReadToEndAsync();q.StandardError.ReadToEndAsync();",
|
|
52
|
+
"if(q.WaitForExit(10000))return q.ExitCode==0;q.Kill();}catch{return false;}return false;}",
|
|
53
|
+
"public static int Run(string x,string c){",
|
|
54
|
+
"IntPtr z=IntPtr.Zero,j=z,l=z,v=z,h=z,t=z;bool listed=false,done=false;",
|
|
55
|
+
"try{",
|
|
56
|
+
// JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK = 0x3000 at LimitFlags.
|
|
57
|
+
"j=CreateJobObjectW(z,z);var limits=new byte[144];limits[17]=0x30;F(j!=z&&SetInformationJobObject(j,9,limits,144));",
|
|
58
|
+
"var n=z;InitializeProcThreadAttributeList(z,1,0,ref n);l=Marshal.AllocHGlobal(n);F(listed=InitializeProcThreadAttributeList(l,1,0,ref n));",
|
|
59
|
+
// PROC_THREAD_ATTRIBUTE_JOB_LIST = 0x2000D; the value is an array holding this one Job handle.
|
|
60
|
+
"v=Marshal.AllocHGlobal(IntPtr.Size);Marshal.WriteIntPtr(v,j);F(UpdateProcThreadAttribute(l,0,(IntPtr)0x2000D,v,(IntPtr)IntPtr.Size,z,z));",
|
|
61
|
+
"var s=new long[14];s[0]=112;s[13]=(long)l;var i=new long[3];",
|
|
62
|
+
// EXTENDED_STARTUPINFO_PRESENT; inherit handles so stdin reaches the child untouched.
|
|
63
|
+
"F(CreateProcessW(x,new StringBuilder(c),z,z,true,0x80000,z,null,s,i));h=(IntPtr)i[0];t=(IntPtr)i[1];",
|
|
64
|
+
"F(WaitForSingleObject(h,-1)==0);int e;F(GetExitCodeProcess(h,out e));done=true;return e;",
|
|
65
|
+
"}finally{",
|
|
66
|
+
"if(!done&&h!=z)TerminateProcess(h,1);if(t!=z)CloseHandle(t);if(h!=z)CloseHandle(h);",
|
|
67
|
+
"if(listed)DeleteProcThreadAttributeList(l);if(l!=z)Marshal.FreeHGlobal(l);if(v!=z)Marshal.FreeHGlobal(v);if(j!=z)CloseHandle(j);",
|
|
68
|
+
"}}}",
|
|
69
|
+
].join("\n");
|
|
70
|
+
|
|
71
|
+
/**
|
|
72
|
+
* The helper travels deflated so the whole command fits cmd.exe's line; PowerShell inflates it and
|
|
73
|
+
* hands the text to Add-Type. It is never evaluated as PowerShell.
|
|
74
|
+
*/
|
|
75
|
+
const OCX_JOB_PACKED = deflateRawSync(Buffer.from(OCX_JOB_SOURCE, "utf8"), { level: 9 }).toString("base64");
|
|
76
|
+
|
|
77
|
+
const NATIVE_PROCESS = String.raw`$ErrorActionPreference='Stop'
|
|
78
|
+
function Fail{try{[Console]::Error.WriteLine('Refusing to run ocx.exe outside a kill-on-close job.')}catch{$null=$_};exit 126}
|
|
79
|
+
try{Add-Type ([IO.StreamReader]::new([IO.Compression.DeflateStream]::new([IO.MemoryStream]::new([Convert]::FromBase64String('` + OCX_JOB_PACKED + String.raw`')),[IO.Compression.CompressionMode]::Decompress)).ReadToEnd())}catch{Fail}
|
|
80
|
+
function Quote-Native([string]$v){'"'+[regex]::Replace([regex]::Replace($v,'(\\*)"','$1$1\"'),'(\\+)$','$1$1')+'"'}
|
|
81
|
+
function Invoke-Native([string]$e,[string[]]$a){try{$c=[OcxJob]::Run($e,((@($e)+$a|%{Quote-Native $_}) -join ' '))}catch{Fail};exit $c}
|
|
82
|
+
`;
|
|
83
|
+
|
|
84
|
+
/** The packed helper a script carries, inflated; for tests that check the transport. */
|
|
85
|
+
export function windowsScriptHelperSource(script: string): string | undefined {
|
|
86
|
+
const match = /FromBase64String\('([A-Za-z0-9+/=]+)'\)\),\[IO\.Compression\.CompressionMode\]::Decompress\)\)\.ReadToEnd\(\)/.exec(script);
|
|
87
|
+
if (!match) return undefined;
|
|
88
|
+
return inflateRawSync(Buffer.from(match[1]!, "base64")).toString("utf8");
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/** The one line that carries the argument object; builder and decoder share these constants. */
|
|
92
|
+
const DATA_OPEN = "$d=[Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('";
|
|
93
|
+
const DATA_CLOSE = "'))|ConvertFrom-Json\n";
|
|
94
|
+
|
|
95
|
+
function dataLine(value: { executable?: string; args: readonly string[] }): string {
|
|
96
|
+
if ([value.executable ?? "", ...value.args].some(item => item.includes("\0"))) throw new Error("Remote argument contains NUL");
|
|
97
|
+
// An object wrapper: Windows PowerShell 5.1 emits a top-level JSON array unenumerated.
|
|
98
|
+
return DATA_OPEN + Buffer.from(JSON.stringify(value), "utf8").toString("base64") + DATA_CLOSE;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/**
|
|
102
|
+
* The argument object a script from this module carries, read back from its decoded script text;
|
|
103
|
+
* undefined for any other script. Test fixtures decode with this, never with their own pattern.
|
|
104
|
+
*/
|
|
105
|
+
export function windowsScriptData(script: string): { executable?: string; args: string[] } | undefined {
|
|
106
|
+
const start = script.indexOf(DATA_OPEN);
|
|
107
|
+
const end = start < 0 ? -1 : script.indexOf(DATA_CLOSE, start + DATA_OPEN.length);
|
|
108
|
+
if (end < 0) return undefined;
|
|
109
|
+
const value: unknown = JSON.parse(Buffer.from(script.slice(start + DATA_OPEN.length, end), "base64").toString("utf8"));
|
|
110
|
+
if (!value || typeof value !== "object" || !Array.isArray((value as { args?: unknown }).args)) return undefined;
|
|
111
|
+
return value as { executable?: string; args: string[] };
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
export function windowsNativeArgv(executable: string, args: readonly string[]): string[] {
|
|
115
|
+
return powershellArgv(NATIVE_PROCESS + dataLine({ executable, args }) + "Invoke-Native $d.executable @($d.args)\n");
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/**
|
|
119
|
+
* Desktop first, then the GOAT-managed current junction, then legacy and PATH candidates. Each
|
|
120
|
+
* must answer --version within ten seconds; only the selected one runs the real command.
|
|
121
|
+
*/
|
|
122
|
+
export function windowsOcxArgv(args: readonly string[]): string[] {
|
|
123
|
+
return powershellArgv(NATIVE_PROCESS + dataLine({ args }) + String.raw`$u=$env:USERPROFILE;$c=@("$u\.opencodex-desktop\bin\ocx.exe","$u\.local\share\goat\opencodex\current\ocx.exe","$u\.local\bin\ocx.exe")
|
|
124
|
+
if($env:LOCALAPPDATA){$c+="$env:LOCALAPPDATA\Programs\OpenCodex\ocx.exe"}
|
|
125
|
+
if($env:ProgramFiles){$c+="$env:ProgramFiles\OpenCodex\ocx.exe"}
|
|
126
|
+
$c+=@((Get-Command ocx.exe -Type Application -EA 0).Source)
|
|
127
|
+
foreach($x in ($c|select -Unique)){if([IO.File]::Exists($x)-and[OcxJob]::Ok($x)){Invoke-Native $x @($d.args)}}
|
|
128
|
+
[Console]::Error.WriteLine('No runnable ocx.exe found; install the Windows standalone archive.');exit 127
|
|
129
|
+
`);
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
/** Credential-free loopback probe of the Child; no proxy, no redirect, bounded body and deadline. */
|
|
133
|
+
export function windowsChildHttpArgv(port: number, path: "healthz" | "v1/catalog", timeoutMs: number): string[] {
|
|
134
|
+
if (!Number.isInteger(port) || port < 1 || port > 65535) throw new Error("invalid Child port");
|
|
135
|
+
if (path !== "healthz" && path !== "v1/catalog") throw new Error("invalid Child HTTP path");
|
|
136
|
+
if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) throw new Error("invalid Child HTTP deadline");
|
|
137
|
+
const budget = Math.max(1, Math.min(15_000, Math.ceil(timeoutMs)));
|
|
138
|
+
return powershellArgv(`$ErrorActionPreference='Stop';$r=$null
|
|
139
|
+
try{$w=[Diagnostics.Stopwatch]::StartNew()
|
|
140
|
+
$q=[Net.HttpWebRequest]::Create('http://127.0.0.1:${port}/${path}');$q.Proxy=$null;$q.AllowAutoRedirect=$false;$q.Timeout=${budget};$q.ReadWriteTimeout=${budget}
|
|
141
|
+
$r=$q.GetResponse();if([int]$r.StatusCode -ne 200){throw 'status'}
|
|
142
|
+
$t=$r.GetResponseStream();$o=New-Object IO.MemoryStream;$b=New-Object byte[] 8192
|
|
143
|
+
while($true){$left=${budget}-[int]$w.ElapsedMilliseconds;if($left -le 0){throw 'deadline'}
|
|
144
|
+
$t.ReadTimeout=$left;$n=$t.Read($b,0,$b.Length);if($n -eq 0){break}
|
|
145
|
+
if($o.Length+$n -gt 4194304){throw 'size'};$o.Write($b,0,$n)}
|
|
146
|
+
$e=New-Object Text.UTF8Encoding($false,$true);[Console]::OutputEncoding=$e
|
|
147
|
+
[Console]::Write($e.GetString($o.ToArray())+[char]10+'200');exit 0
|
|
148
|
+
}catch{[Console]::Error.WriteLine('Child loopback HTTP probe failed.');exit 1}finally{if($r){$r.Dispose()}}
|
|
149
|
+
`);
|
|
150
|
+
}
|
package/src/link/ssh-argv.ts
CHANGED
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
*/
|
|
20
20
|
|
|
21
21
|
import { isAbsolute } from "node:path";
|
|
22
|
+
import { POWERSHELL_ENCODED_MAX, windowsOcxArgv } from "./remote-windows";
|
|
22
23
|
|
|
23
24
|
export type TunnelDirection = "R" | "L";
|
|
24
25
|
|
|
@@ -165,8 +166,8 @@ while :; do
|
|
|
165
166
|
done
|
|
166
167
|
exit ${REMOTE_COMMAND_NOT_FOUND}`;
|
|
167
168
|
|
|
168
|
-
export function remoteOcxArgv(args: readonly string[]): string[] {
|
|
169
|
-
return ["sh", "-c", REMOTE_OCX_SCRIPT, "ocx", ...args];
|
|
169
|
+
export function remoteOcxArgv(args: readonly string[], platform: "posix" | "windows" = "posix"): string[] {
|
|
170
|
+
return platform === "windows" ? windowsOcxArgv(args) : ["sh", "-c", REMOTE_OCX_SCRIPT, "ocx", ...args];
|
|
170
171
|
}
|
|
171
172
|
|
|
172
173
|
export interface ProbeArgvOptions {
|
|
@@ -178,7 +179,7 @@ export interface ProbeArgvOptions {
|
|
|
178
179
|
/**
|
|
179
180
|
* First contact with a host that has no confirmed key. accept-new writes the offered key to the
|
|
180
181
|
* temporary file; the caller reads it with `ssh-keygen -lf` and shows the fingerprint before
|
|
181
|
-
* anything is trusted. The remote command is
|
|
182
|
+
* anything is trusted. The remote command is a fixed cross-shell echo; it conveys no authorization.
|
|
182
183
|
*/
|
|
183
184
|
export function buildProbeArgv(options: ProbeArgvOptions): string[] {
|
|
184
185
|
const alias = assertSshAlias(options.alias);
|
|
@@ -187,7 +188,7 @@ export function buildProbeArgv(options: ProbeArgvOptions): string[] {
|
|
|
187
188
|
...commonOptions(alias, options.tempKnownHostsFile, "accept-new"),
|
|
188
189
|
"-o", "ClearAllForwardings=yes",
|
|
189
190
|
"--", alias,
|
|
190
|
-
"
|
|
191
|
+
"echo ocx-link-probe",
|
|
191
192
|
];
|
|
192
193
|
}
|
|
193
194
|
|
|
@@ -222,7 +223,14 @@ export function buildResolveArgv(alias: string): string[] {
|
|
|
222
223
|
|
|
223
224
|
/** Emit only sh in command position; single-quote every argument for the remote shell. */
|
|
224
225
|
export function quoteRemote(argv: readonly string[]): string {
|
|
225
|
-
if (argv[0]
|
|
226
|
+
if (argv[0] === "powershell.exe") {
|
|
227
|
+
if (argv.length !== 6 || argv.slice(1, 5).join(" ") !== "-NoLogo -NoProfile -NonInteractive -EncodedCommand"
|
|
228
|
+
|| !/^[A-Za-z0-9+/]+={0,2}$/.test(argv[5] ?? "") || (argv[5]?.length ?? 0) > POWERSHELL_ENCODED_MAX) {
|
|
229
|
+
throw new LinkSshArgumentError("invalid encoded PowerShell command");
|
|
230
|
+
}
|
|
231
|
+
return argv.join(" ");
|
|
232
|
+
}
|
|
233
|
+
if (argv[0] !== "sh") throw new LinkSshArgumentError("remote command must be sh or encoded PowerShell");
|
|
226
234
|
return argv.map((arg, index) => {
|
|
227
235
|
if (arg.includes("\0")) throw new LinkSshArgumentError("remote argument contains NUL");
|
|
228
236
|
// PowerShell treats a leading quoted word as an expression, not a command invocation.
|
package/src/link/store.ts
CHANGED
|
@@ -27,6 +27,7 @@ export interface LinkRecord {
|
|
|
27
27
|
/** Id of the data key issued for this link. */
|
|
28
28
|
apiKeyId: string;
|
|
29
29
|
createdAt: string;
|
|
30
|
+
remotePlatform?: "posix" | "windows";
|
|
30
31
|
}
|
|
31
32
|
|
|
32
33
|
export interface LinkStore {
|
|
@@ -51,7 +52,7 @@ export function newLinkId(): string {
|
|
|
51
52
|
return `lnk_${randomBytes(8).toString("hex")}`;
|
|
52
53
|
}
|
|
53
54
|
|
|
54
|
-
const RECORD_KEYS = new Set(["id", "alias", "direction", "hostKeyFingerprint", "tunnelPort", "apiKeyId", "createdAt"]);
|
|
55
|
+
const RECORD_KEYS = new Set(["id", "alias", "direction", "hostKeyFingerprint", "tunnelPort", "apiKeyId", "createdAt", "remotePlatform"]);
|
|
55
56
|
const STORE_KEYS = new Set(["version", "listenerPort", "links"]);
|
|
56
57
|
const API_KEY_ID = /^[A-Za-z0-9][A-Za-z0-9_.:-]{0,255}$/;
|
|
57
58
|
const FINGERPRINT = /^[A-Z0-9]+:[A-Za-z0-9+/=]{16,128}$/;
|
|
@@ -75,6 +76,7 @@ function parseRecord(value: unknown, index: number): LinkRecord {
|
|
|
75
76
|
if (typeof raw.alias !== "string") fail("alias");
|
|
76
77
|
try { assertSshAlias(raw.alias as string); } catch { fail("alias"); }
|
|
77
78
|
if (raw.direction !== "hub-initiated" && raw.direction !== "client-initiated") fail("direction");
|
|
79
|
+
if (raw.remotePlatform !== undefined && raw.remotePlatform !== "posix" && raw.remotePlatform !== "windows") fail("remotePlatform");
|
|
78
80
|
const fingerprint = raw.hostKeyFingerprint;
|
|
79
81
|
if (fingerprint === null ? raw.direction !== "client-initiated"
|
|
80
82
|
: typeof fingerprint !== "string" || !FINGERPRINT.test(fingerprint)) fail("hostKeyFingerprint");
|
|
@@ -89,6 +91,7 @@ function parseRecord(value: unknown, index: number): LinkRecord {
|
|
|
89
91
|
tunnelPort: raw.tunnelPort as number,
|
|
90
92
|
apiKeyId: raw.apiKeyId as string,
|
|
91
93
|
createdAt: raw.createdAt as string,
|
|
94
|
+
...(raw.remotePlatform === undefined ? {} : { remotePlatform: raw.remotePlatform as "posix" | "windows" }),
|
|
92
95
|
};
|
|
93
96
|
}
|
|
94
97
|
|
package/src/link/supervisor.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { join } from "node:path";
|
|
|
3
3
|
import { atomicWriteFile } from "../config/atomic-write";
|
|
4
4
|
import { linkDir, linkKnownHostsPath, linkStorePath } from "./paths";
|
|
5
5
|
import { buildTunnelArgv } from "./ssh-argv";
|
|
6
|
+
import { nextLinkConnectionGeneration } from "./relay-auth";
|
|
6
7
|
import { createSshRunner, type SshChild, type SshRunner } from "./ssh-runner";
|
|
7
8
|
import type { LinkDiagnosticSink } from "./diagnostics";
|
|
8
9
|
import { createTunnelHistoryBook, exitCause, type TunnelCause, type TunnelHistory } from "./tunnel-history";
|
|
@@ -48,6 +49,8 @@ export interface LinkSupervisor {
|
|
|
48
49
|
*/
|
|
49
50
|
reconnect(linkId: string): Promise<boolean>;
|
|
50
51
|
status(): readonly LinkTunnelStatus[];
|
|
52
|
+
/** `<runtime instance>:<generation>` of a Home-initiated link's current tunnel; every spawn changes it. */
|
|
53
|
+
connectionGeneration?(linkId: string): string | undefined;
|
|
51
54
|
notifyAuthenticatedRequest?(apiKeyId: string): void;
|
|
52
55
|
stop(): Promise<void>;
|
|
53
56
|
}
|
|
@@ -167,6 +170,8 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
167
170
|
const children = new Map<string, { child: SshChild; argv: readonly string[]; spawnedAt: number }>();
|
|
168
171
|
/** Per-link generation, advanced by spawns and explicit stop/removal reservations. */
|
|
169
172
|
const generations = new Map<string, number>();
|
|
173
|
+
/** The process-unique connection name of each link's current ssh child, minted at spawn. */
|
|
174
|
+
const connectionNames = new Map<string, string>();
|
|
170
175
|
const linkRevisions = new Map<string, number>();
|
|
171
176
|
/** Reconnects in flight, so overlapping requests for one link restart it once. */
|
|
172
177
|
const reconnects = new Map<string, Promise<boolean>>();
|
|
@@ -270,6 +275,7 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
270
275
|
const child = runner.spawnTunnel(argv);
|
|
271
276
|
const generation = (generations.get(record.id) ?? 0) + 1;
|
|
272
277
|
generations.set(record.id, generation);
|
|
278
|
+
connectionNames.set(record.id, nextLinkConnectionGeneration());
|
|
273
279
|
// An older child's exit still being classified no longer speaks for this link.
|
|
274
280
|
exiting.delete(record.id);
|
|
275
281
|
children.set(record.id, { child, argv, spawnedAt: now() });
|
|
@@ -408,6 +414,9 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
408
414
|
if (lifecycleFlight) return;
|
|
409
415
|
begin();
|
|
410
416
|
},
|
|
417
|
+
connectionGeneration(linkId) {
|
|
418
|
+
return children.has(linkId) ? connectionNames.get(linkId) : undefined;
|
|
419
|
+
},
|
|
411
420
|
ensureStarted() {
|
|
412
421
|
return runLifecycle(begin);
|
|
413
422
|
},
|
|
@@ -0,0 +1,242 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { lstatSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { getConfigDir } from "../config/paths";
|
|
5
|
+
import { atomicWriteFileStreamed } from "../config/atomic-write";
|
|
6
|
+
import { withCredentialPublicationFence, withCredentialPublicationFenceAsync } from "./publication-fence";
|
|
7
|
+
import { configuredOsStoreAccounts } from "./references";
|
|
8
|
+
import { readBoundedRegularFileSync } from "../lib/bounded-file-read";
|
|
9
|
+
import { acquireCredentialObservationLease, credentialObservationLeaseAlive, sweepDeadCredentialObservationLeases } from "./observation-lease";
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Durable coordination for the local-credential attestation in `ocx status --json`.
|
|
13
|
+
*
|
|
14
|
+
* `local-credentials.json` holds a random epoch, a sequence, pending publication tickets,
|
|
15
|
+
* the private OS keychain accounts an instrumented writer touched, and the runtime observer's
|
|
16
|
+
* coverage vector of file identities. It never holds a credential value or a hash of one. Every
|
|
17
|
+
* instrumented credential write advances the sequence, so `lc1:<epoch>:<sequence>` changes even
|
|
18
|
+
* when the final count is unchanged.
|
|
19
|
+
*/
|
|
20
|
+
type Ticket = { id: string; pid: number };
|
|
21
|
+
type Coverage = { owner: string; pid: number; vector: string };
|
|
22
|
+
export type CredentialGeneration = {
|
|
23
|
+
version: 1;
|
|
24
|
+
epoch: string;
|
|
25
|
+
sequence: number;
|
|
26
|
+
pending: Ticket[];
|
|
27
|
+
keyAccounts: string[];
|
|
28
|
+
/**
|
|
29
|
+
* Accounts a read proved absent after a deletion. A config reference to one of them is not
|
|
30
|
+
* registered again; only a new keychain write or deletion attempt for that account clears it.
|
|
31
|
+
*/
|
|
32
|
+
absentAccounts: string[];
|
|
33
|
+
coverage: Coverage | null;
|
|
34
|
+
};
|
|
35
|
+
const MAX_ACCOUNTS = 8192;
|
|
36
|
+
function accountList(value: unknown): value is string[] {
|
|
37
|
+
return Array.isArray(value) && value.length <= MAX_ACCOUNTS && new Set(value).size === value.length
|
|
38
|
+
&& value.every(k => typeof k === "string" && k.length > 0 && k.length <= 1024);
|
|
39
|
+
}
|
|
40
|
+
const observers = new Map<string, () => void>();
|
|
41
|
+
const decoder = new TextDecoder("utf-8", { fatal: true });
|
|
42
|
+
const uuid = /^[0-9a-f-]{36}$/;
|
|
43
|
+
const pathFor = (home: string) => join(home, "local-credentials.json");
|
|
44
|
+
|
|
45
|
+
export function observationAlive(state: CredentialGeneration, home = getConfigDir()): boolean {
|
|
46
|
+
return !!state.coverage && credentialObservationLeaseAlive(home, state.coverage.owner);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
function missing(error: unknown): boolean {
|
|
50
|
+
return (error as NodeJS.ErrnoException)?.code === "ENOENT";
|
|
51
|
+
}
|
|
52
|
+
function exists(path: string): boolean {
|
|
53
|
+
try { lstatSync(path); return true; } catch (error) { if (missing(error)) return false; throw error; }
|
|
54
|
+
}
|
|
55
|
+
export function processAlive(pid: number): boolean {
|
|
56
|
+
try { process.kill(pid, 0); return true; }
|
|
57
|
+
catch (error) { return (error as NodeJS.ErrnoException)?.code !== "ESRCH"; }
|
|
58
|
+
}
|
|
59
|
+
export function readCredentialGeneration(home = getConfigDir()): CredentialGeneration | undefined {
|
|
60
|
+
try {
|
|
61
|
+
const path = pathFor(home);
|
|
62
|
+
if (!lstatSync(path).isFile()) return undefined;
|
|
63
|
+
const value: unknown = JSON.parse(decoder.decode(readBoundedRegularFileSync(path, 1024 * 1024)));
|
|
64
|
+
if (!value || typeof value !== "object") return undefined;
|
|
65
|
+
const s = value as CredentialGeneration;
|
|
66
|
+
if (s.version !== 1 || typeof s.epoch !== "string" || !uuid.test(s.epoch)
|
|
67
|
+
|| !Number.isSafeInteger(s.sequence) || s.sequence < 0
|
|
68
|
+
|| !Array.isArray(s.pending) || s.pending.length > 1024
|
|
69
|
+
|| !s.pending.every(t => t && typeof t.id === "string" && uuid.test(t.id)
|
|
70
|
+
&& Number.isSafeInteger(t.pid) && t.pid > 0)
|
|
71
|
+
|| new Set(s.pending.map(t => t.id)).size !== s.pending.length
|
|
72
|
+
|| !accountList(s.keyAccounts)) return undefined;
|
|
73
|
+
if (s.absentAccounts === undefined) s.absentAccounts = [];
|
|
74
|
+
else if (!accountList(s.absentAccounts)) return undefined;
|
|
75
|
+
if (s.coverage !== null && (!s.coverage || typeof s.coverage.owner !== "string"
|
|
76
|
+
|| !uuid.test(s.coverage.owner) || !Number.isSafeInteger(s.coverage.pid)
|
|
77
|
+
|| s.coverage.pid <= 0 || typeof s.coverage.vector !== "string"
|
|
78
|
+
|| s.coverage.vector.length > 512 * 1024)) return undefined;
|
|
79
|
+
return s;
|
|
80
|
+
} catch { return undefined; }
|
|
81
|
+
}
|
|
82
|
+
function empty(): CredentialGeneration {
|
|
83
|
+
return { version: 1, epoch: randomUUID(), sequence: 0, pending: [], keyAccounts: [], absentAccounts: [], coverage: null };
|
|
84
|
+
}
|
|
85
|
+
/** Missing metadata starts a fresh epoch; unreadable metadata is never guessed over. */
|
|
86
|
+
function loadForWrite(home: string): CredentialGeneration {
|
|
87
|
+
const state = readCredentialGeneration(home);
|
|
88
|
+
if (state) return state;
|
|
89
|
+
if (!exists(pathFor(home))) return empty();
|
|
90
|
+
throw new Error("Local credential coordination metadata is unreadable; explicit recovery required");
|
|
91
|
+
}
|
|
92
|
+
function save(home: string, state: CredentialGeneration): void {
|
|
93
|
+
atomicWriteFileStreamed(pathFor(home), fd => writeFileSync(fd, JSON.stringify(state) + "\n"));
|
|
94
|
+
}
|
|
95
|
+
function advance(state: CredentialGeneration): void {
|
|
96
|
+
if (state.sequence >= Number.MAX_SAFE_INTEGER) { state.epoch = randomUUID(); state.sequence = 0; }
|
|
97
|
+
else state.sequence += 1;
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* Registration. Accounts a write may hold (a keychain write or deletion attempt) always register
|
|
101
|
+
* and lose any absent marker; accounts a config merely references register unless a read already
|
|
102
|
+
* proved them absent, so a stale reference cannot bring a deleted secret back into the count.
|
|
103
|
+
*/
|
|
104
|
+
function register(state: CredentialGeneration, held: readonly string[], references: readonly string[]): void {
|
|
105
|
+
if ([...held, ...references].some(a => !a || a.length > 1024)) throw new Error("Invalid private key account");
|
|
106
|
+
const absent = new Set(state.absentAccounts.filter(a => !held.includes(a)));
|
|
107
|
+
state.absentAccounts = [...absent];
|
|
108
|
+
state.keyAccounts = [...new Set([...state.keyAccounts, ...held, ...references.filter(a => !absent.has(a))])];
|
|
109
|
+
if (state.keyAccounts.length > MAX_ACCOUNTS) throw new Error("Too many private key accounts");
|
|
110
|
+
}
|
|
111
|
+
/** Retain every OS-store account config.json references now; only a verified absence drops one. */
|
|
112
|
+
function seedConfiguredAccounts(home: string, state: CredentialGeneration): void {
|
|
113
|
+
register(state, [], configuredOsStoreAccounts(home));
|
|
114
|
+
}
|
|
115
|
+
export function generationToken(state: CredentialGeneration): string {
|
|
116
|
+
return `lc1:${state.epoch}:${state.sequence}`;
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* Inside the publication fence, before any credential bytes change: persist a ticket that advances
|
|
120
|
+
* the generation. Once coordination metadata exists every publication needs one, because a write
|
|
121
|
+
* whose ticket was lost could end where it began (add then remove) and leave an earlier token
|
|
122
|
+
* attestable; so any failure here, including unreadable or unwritable metadata, aborts the
|
|
123
|
+
* publication before it writes. Without metadata no observer has ever attested, so a file write
|
|
124
|
+
* needs no ticket; a keychain write still creates the metadata to record its account first.
|
|
125
|
+
*/
|
|
126
|
+
function begin(home: string, accounts: readonly string[], references: readonly string[]): Ticket | null {
|
|
127
|
+
if (accounts.length === 0 && references.length === 0 && !exists(pathFor(home))) return null;
|
|
128
|
+
const state = loadForWrite(home);
|
|
129
|
+
if (state.pending.length >= 1024) throw new Error("Too many pending credential publications");
|
|
130
|
+
const ticket = { id: randomUUID(), pid: process.pid };
|
|
131
|
+
state.pending.push(ticket);
|
|
132
|
+
register(state, accounts, references);
|
|
133
|
+
advance(state);
|
|
134
|
+
save(home, state);
|
|
135
|
+
return ticket;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
/** Inside the fence. Never throws: a ticket that cannot be closed keeps withholding attestation. */
|
|
139
|
+
function finish(home: string, ticket: Ticket | null, removed: readonly string[]): void {
|
|
140
|
+
if (ticket) {
|
|
141
|
+
try {
|
|
142
|
+
const state = loadForWrite(home);
|
|
143
|
+
if (state.pending.some(t => t.id === ticket.id && t.pid === ticket.pid)) {
|
|
144
|
+
state.pending = state.pending.filter(t => t.id !== ticket.id);
|
|
145
|
+
state.keyAccounts = state.keyAccounts.filter(k => !removed.includes(k));
|
|
146
|
+
state.absentAccounts = [...new Set([...state.absentAccounts, ...removed])].slice(-MAX_ACCOUNTS);
|
|
147
|
+
advance(state);
|
|
148
|
+
save(home, state);
|
|
149
|
+
}
|
|
150
|
+
} catch { /* the pending ticket keeps the field omitted until a runtime restart clears it */ }
|
|
151
|
+
}
|
|
152
|
+
observers.get(home)?.();
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
export interface CredentialPublication {
|
|
156
|
+
/** Keychain accounts this write may create or hold; they count until verified absent. */
|
|
157
|
+
accounts?: readonly string[];
|
|
158
|
+
/** Accounts the config references around this write; registered unless verified absent. */
|
|
159
|
+
references?: readonly string[];
|
|
160
|
+
/** After the write settles: accounts now verified absent, dropped from the registry. */
|
|
161
|
+
absent?: (completed: boolean) => readonly string[];
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
/** Every instrumented credential write runs here, inside the publication fence (fails if it cannot be taken). */
|
|
165
|
+
export function publishCredentialSync<T>(write: () => T, publication: CredentialPublication = {}): T {
|
|
166
|
+
const home = getConfigDir();
|
|
167
|
+
return withCredentialPublicationFence(home, () => {
|
|
168
|
+
const ticket = begin(home, publication.accounts ?? [], publication.references ?? []);
|
|
169
|
+
let completed = false;
|
|
170
|
+
try {
|
|
171
|
+
const result = write();
|
|
172
|
+
if (result instanceof Promise) throw new Error("Synchronous credential publication returned a Promise");
|
|
173
|
+
completed = true;
|
|
174
|
+
return result;
|
|
175
|
+
} finally {
|
|
176
|
+
let removed: readonly string[] = [];
|
|
177
|
+
try { removed = publication.absent?.(completed) ?? []; } catch { /* unverified stays counted */ }
|
|
178
|
+
finish(home, ticket, removed);
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
export async function publishCredentialAsync<T>(write: () => Promise<T>): Promise<T> {
|
|
183
|
+
const home = getConfigDir();
|
|
184
|
+
return await withCredentialPublicationFenceAsync(home, async () => {
|
|
185
|
+
const ticket = begin(home, [], []);
|
|
186
|
+
try { return await write(); }
|
|
187
|
+
finally { finish(home, ticket, []); }
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
/**
|
|
192
|
+
* Runtime start: refuse while another observer lives or a live writer holds a ticket, clear the
|
|
193
|
+
* tickets of dead writers, start a new epoch and take the observer's OS lease.
|
|
194
|
+
*/
|
|
195
|
+
export function claimCredentialObservation(home: string, scan: (accounts: readonly string[]) => string): { owner: string; close(): void } {
|
|
196
|
+
return withCredentialPublicationFence(home, () => {
|
|
197
|
+
const state = loadForWrite(home);
|
|
198
|
+
if (observationAlive(state, home)) throw new Error("Credential observer already running");
|
|
199
|
+
if (state.pending.some(t => processAlive(t.pid))) throw new Error("Credential publication still running");
|
|
200
|
+
state.pending = [];
|
|
201
|
+
state.epoch = randomUUID();
|
|
202
|
+
state.sequence = 0;
|
|
203
|
+
seedConfiguredAccounts(home, state);
|
|
204
|
+
const owner = randomUUID();
|
|
205
|
+
const lease = acquireCredentialObservationLease(home, owner);
|
|
206
|
+
sweepDeadCredentialObservationLeases(home, owner);
|
|
207
|
+
try {
|
|
208
|
+
state.coverage = { owner, pid: process.pid, vector: scan(state.keyAccounts) };
|
|
209
|
+
save(home, state);
|
|
210
|
+
return { owner, close: () => lease.close() };
|
|
211
|
+
} catch (error) { lease.close(); throw error; }
|
|
212
|
+
});
|
|
213
|
+
}
|
|
214
|
+
/**
|
|
215
|
+
* Advance on every observed coverage-relevant event and rescan; a failed scan leaves an empty
|
|
216
|
+
* vector, which never attests. It never waits for the fence: the runtime observer retries
|
|
217
|
+
* asynchronously instead. "Coverage-relevant" is the watcher's classification in inventory.ts:
|
|
218
|
+
* every event on a target name, credential-write residue, or ancestor structural change --
|
|
219
|
+
* but not an ancestor directory's last-write tick from ordinary child churn, which reports no
|
|
220
|
+
* credential change and would re-arm the observer's own save forever.
|
|
221
|
+
*/
|
|
222
|
+
export function updateCredentialObservation(home: string, owner: string, scan: ((accounts: readonly string[]) => string) | null): void {
|
|
223
|
+
withCredentialPublicationFence(home, () => {
|
|
224
|
+
const state = loadForWrite(home);
|
|
225
|
+
if (state.coverage?.owner !== owner) return;
|
|
226
|
+
advance(state);
|
|
227
|
+
if (scan === null) state.coverage = null;
|
|
228
|
+
else {
|
|
229
|
+
try {
|
|
230
|
+
seedConfiguredAccounts(home, state);
|
|
231
|
+
state.coverage.vector = scan(state.keyAccounts);
|
|
232
|
+
}
|
|
233
|
+
catch { state.coverage.vector = ""; }
|
|
234
|
+
}
|
|
235
|
+
save(home, state);
|
|
236
|
+
}, 0);
|
|
237
|
+
}
|
|
238
|
+
export function registerCredentialObserver(home: string, reconcile: () => void): () => void {
|
|
239
|
+
if (observers.has(home)) throw new Error("Credential observer already registered");
|
|
240
|
+
observers.set(home, reconcile);
|
|
241
|
+
return () => { if (observers.get(home) === reconcile) observers.delete(home); };
|
|
242
|
+
}
|