@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-D5qUBOoF.js +60 -0
- package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
- package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
- package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
- package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
- package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -15,6 +15,7 @@ import { sep } from "node:path";
|
|
|
15
15
|
export interface DesktopAppExecOptions {
|
|
16
16
|
timeout?: number;
|
|
17
17
|
windowsHide?: boolean;
|
|
18
|
+
env?: NodeJS.ProcessEnv;
|
|
18
19
|
}
|
|
19
20
|
|
|
20
21
|
/** Returns stdout. Options are part of the seam so the timeout is testable. */
|
|
@@ -24,6 +25,11 @@ export type DesktopExec = (
|
|
|
24
25
|
options?: DesktopAppExecOptions,
|
|
25
26
|
) => string;
|
|
26
27
|
|
|
28
|
+
/** Runtime-owned probes keep serving their listeners while the exact child drains. */
|
|
29
|
+
export type DesktopAsyncExec = (
|
|
30
|
+
file: string, args: readonly string[], options?: DesktopAppExecOptions & { signal?: AbortSignal },
|
|
31
|
+
) => Promise<string>;
|
|
32
|
+
|
|
27
33
|
/** One discovered installation of the Codex desktop app. */
|
|
28
34
|
export interface DesktopAppInstall {
|
|
29
35
|
/** Stable platform-specific identity, used in messages and for relaunch. */
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
const PAYLOAD_ENV = "OPENCODEX_DESKTOP_COMMAND_PAYLOAD";
|
|
2
|
+
|
|
3
|
+
// Keep package paths and other dynamic inputs out of the PowerShell parser.
|
|
4
|
+
export const READ_WINDOWS_DESKTOP_PAYLOAD =
|
|
5
|
+
`$payload=[Text.Encoding]::UTF8.GetString([Convert]::FromBase64String($env:${PAYLOAD_ENV})) | ConvertFrom-Json`;
|
|
6
|
+
|
|
7
|
+
export function windowsDesktopPayloadEnv(payload: Record<string, string>): NodeJS.ProcessEnv {
|
|
8
|
+
return { ...process.env, [PAYLOAD_ENV]: Buffer.from(JSON.stringify(payload), "utf8").toString("base64") };
|
|
9
|
+
}
|
|
@@ -14,6 +14,7 @@ import { execFileSync } from "node:child_process";
|
|
|
14
14
|
import { sep, win32 } from "node:path";
|
|
15
15
|
import { resolveTrustedWindowsPowerShellExe, resolveTrustedWindowsTaskkillExe } from "../../lib/windows-elevation";
|
|
16
16
|
import { activateWindowsCodexCompatibility, assertWindowsCompatibilityContext, captureWindowsCompatibilityContext } from "../desktop-compatibility/windows-package-command";
|
|
17
|
+
import { READ_WINDOWS_DESKTOP_PAYLOAD, windowsDesktopPayloadEnv } from "./windows-command-payload";
|
|
17
18
|
import {
|
|
18
19
|
isUnderRoot,
|
|
19
20
|
type DesktopAppAdapter,
|
|
@@ -93,11 +94,11 @@ function discoverPackage(exec: DesktopExec): DesktopAppInstall | null {
|
|
|
93
94
|
* rather than by PowerShell's `StartsWith`, which is a prefix test and would
|
|
94
95
|
* admit a sibling `OpenAI.Codex-evil` directory.
|
|
95
96
|
*/
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
97
|
+
export const WINDOWS_PACKAGE_PROCESS_SCRIPT = [
|
|
98
|
+
"$ErrorActionPreference='Stop'",
|
|
99
|
+
READ_WINDOWS_DESKTOP_PAYLOAD,
|
|
100
|
+
"$root = $payload.root.Replace('/', '\\')",
|
|
99
101
|
"$ErrorActionPreference='SilentlyContinue'",
|
|
100
|
-
`$root = '${literal}'.Replace('/', '\\')`,
|
|
101
102
|
"$me = ([Security.Principal.WindowsIdentity]::GetCurrent()).Name",
|
|
102
103
|
"Get-CimInstance Win32_Process -Filter \"Name='ChatGPT.exe'\" |",
|
|
103
104
|
" Where-Object { $_.ExecutablePath -and $_.ExecutablePath.Replace('/', '\\').StartsWith($root, 'OrdinalIgnoreCase') } |",
|
|
@@ -111,19 +112,24 @@ function listPackageProcesses(exec: DesktopExec, install: DesktopAppInstall): De
|
|
|
111
112
|
" }",
|
|
112
113
|
" }",
|
|
113
114
|
" }",
|
|
114
|
-
//
|
|
115
|
-
// `$ErrorActionPreference='SilentlyContinue' $root = '...'` into one malformed statement,
|
|
116
|
-
// which PowerShell rejects — so the probe threw and every caller read "not running" (#2557).
|
|
115
|
+
// Newlines separate PowerShell statements (#2557).
|
|
117
116
|
].join("\n");
|
|
117
|
+
|
|
118
|
+
function listPackageProcesses(exec: DesktopExec, install: DesktopAppInstall): DesktopProcess[] | null {
|
|
118
119
|
let stdout: string;
|
|
119
120
|
try {
|
|
120
|
-
stdout = exec(resolveTrustedWindowsPowerShellExe(), ["-NoProfile", "-NonInteractive", "-Command",
|
|
121
|
+
stdout = exec(resolveTrustedWindowsPowerShellExe(), ["-NoProfile", "-NonInteractive", "-Command", WINDOWS_PACKAGE_PROCESS_SCRIPT],
|
|
122
|
+
{ ...POWERSHELL_PROBE_OPTIONS, env: windowsDesktopPayloadEnv({ root: install.root }) });
|
|
121
123
|
} catch {
|
|
122
124
|
// A probe that could not run is NOT proof the app is absent. Returning [] here made a
|
|
123
125
|
// failed enumeration indistinguishable from "no targets", so the CLI reported the app as
|
|
124
126
|
// not running and skipped a restart the user had explicitly asked for.
|
|
125
127
|
return null;
|
|
126
128
|
}
|
|
129
|
+
return parseWindowsPackageProcesses(stdout, install);
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
export function parseWindowsPackageProcesses(stdout: string, install: DesktopAppInstall): DesktopProcess[] {
|
|
127
133
|
const processes: DesktopProcess[] = [];
|
|
128
134
|
for (const line of stdout.split(/\r?\n/)) {
|
|
129
135
|
const parsed = parseProcessLine(line, install.root);
|
|
@@ -225,14 +231,15 @@ export const windowsDesktopAppAdapter: DesktopAppAdapter = {
|
|
|
225
231
|
exec(resolveTrustedWindowsTaskkillExe(), ["/PID", String(root.pid), "/T", "/F"], POWERSHELL_PROBE_OPTIONS);
|
|
226
232
|
},
|
|
227
233
|
|
|
228
|
-
captureRelaunchContext(_exec,
|
|
229
|
-
return captureWindowsCompatibilityContext(processes);
|
|
234
|
+
captureRelaunchContext(_exec, install, processes): Record<string, string> {
|
|
235
|
+
return captureWindowsCompatibilityContext(processes, install);
|
|
230
236
|
},
|
|
231
237
|
|
|
232
238
|
relaunch(exec, install, context): void {
|
|
233
239
|
if (context.codexCompatibilityPacUrl) {
|
|
234
|
-
assertWindowsCompatibilityContext(context);
|
|
235
|
-
activateWindowsCodexCompatibility(exec,
|
|
240
|
+
const launch = assertWindowsCompatibilityContext(context, install);
|
|
241
|
+
try { activateWindowsCodexCompatibility(exec, launch.build, launch.pacUrl); }
|
|
242
|
+
catch (error) { launch.fence(); throw error; }
|
|
236
243
|
return;
|
|
237
244
|
}
|
|
238
245
|
// Throws on failure so the ladder reports relaunch_failed. The old code
|
|
@@ -249,4 +256,5 @@ export const windowsDefaultExec: DesktopExec = (file, args, options) => execFile
|
|
|
249
256
|
encoding: "utf-8",
|
|
250
257
|
timeout: options?.timeout ?? PROBE_TIMEOUT_MS,
|
|
251
258
|
windowsHide: options?.windowsHide ?? true,
|
|
259
|
+
env: options?.env,
|
|
252
260
|
});
|
|
@@ -4,59 +4,51 @@ import { createHash } from "node:crypto";
|
|
|
4
4
|
import { isTestHomeGuardArmed } from "../../lib/test-home-guard";
|
|
5
5
|
import { resolveTrustedWindowsPowerShellExe } from "../../lib/windows-elevation";
|
|
6
6
|
import type { DesktopAppInstall } from "../desktop-app/types";
|
|
7
|
+
import { CLOSE_WINDOWS_PACKAGE_FILES, CODEX_EXECUTABLE_SIGNER, CODEX_PACKAGE_FAMILY, CODEX_STORE_PUBLISHER,
|
|
8
|
+
MEASURE_WINDOWS_PACKAGE_FILES, OPEN_WINDOWS_PACKAGE_FILES, WINDOWS_PACKAGE_PROOF_FUNCTIONS } from "./windows-package-proof";
|
|
9
|
+
export { DESKTOP_PACKAGE_PATH_GUARD_SCRIPT } from "./windows-package-proof";
|
|
7
10
|
|
|
11
|
+
// Baseline with completed native acceptance evidence; admission is proof-based below,
|
|
12
|
+
// so this version never allows or denies an installed build by itself.
|
|
8
13
|
export const DESKTOP_COMPATIBILITY_ASSESSED_VERSION = "26.924.2738.0";
|
|
9
|
-
export const DESKTOP_COMPATIBILITY_ASSESSED_FAMILY =
|
|
14
|
+
export const DESKTOP_COMPATIBILITY_ASSESSED_FAMILY = CODEX_PACKAGE_FAMILY;
|
|
10
15
|
|
|
11
16
|
/** Internal observation only; never returned by management status. */
|
|
12
17
|
export interface DesktopPackageObservation extends DesktopAppInstall {
|
|
13
18
|
proof?: { packageFullName: string; publisherId: string; publisher: string; manifestName: string;
|
|
14
19
|
manifestPublisher: string; manifestVersion: string; appId: string; executable: string;
|
|
15
|
-
canonicalExecutable: string; manifestDigest: string;
|
|
20
|
+
canonicalExecutable: string; manifestDigest: string; ancestryIdentity: string; executableIdentity: string;
|
|
21
|
+
executableHash?: string; signatureKind?: string; signerSubject?: string; signerThumbprint?: string;
|
|
22
|
+
contentIntegrity?: boolean };
|
|
16
23
|
}
|
|
17
24
|
|
|
18
|
-
/**
|
|
19
|
-
export
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
"$seen.Add($item.FullName.ToLowerInvariant()+':'+$item.CreationTimeUtc.Ticks)",
|
|
28
|
-
"}; return ($seen -join '|')",
|
|
29
|
-
"}",
|
|
30
|
-
].join("; ");
|
|
25
|
+
/** The immutable native activation target, shared only inside the compatibility runtime. */
|
|
26
|
+
export interface VerifiedDesktopPackage extends DesktopAppInstall {
|
|
27
|
+
readonly packageFullName: string;
|
|
28
|
+
readonly executableHash: string;
|
|
29
|
+
readonly executableIdentity: string;
|
|
30
|
+
readonly manifestDigest: string;
|
|
31
|
+
readonly ancestryIdentity: string;
|
|
32
|
+
readonly signerThumbprint: string;
|
|
33
|
+
}
|
|
31
34
|
|
|
32
|
-
// Compatibility-only read
|
|
35
|
+
// Compatibility-only read. The verified image and manifest stay read-locked through publication;
|
|
36
|
+
// the observation is built before any file is opened, so a failed proof still reports its version.
|
|
33
37
|
export const DESKTOP_PACKAGE_PROOF_SCRIPT = [
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
"$
|
|
37
|
-
"
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
"$
|
|
41
|
-
"
|
|
42
|
-
"$
|
|
43
|
-
|
|
44
|
-
"if(-not $root.PSIsContainer -or -not $app.PSIsContainer -or $exe.PSIsContainer){throw 'Wrong file kind'}",
|
|
45
|
-
"$manifest=Get-AppxPackageManifest -Package $p.PackageFullName",
|
|
46
|
-
"$entry=@($manifest.Package.Applications.Application|Where-Object {$_.Id -eq 'App'})",
|
|
47
|
-
"if($entry.Count -ne 1){throw 'App not unique'}; $entry=$entry[0]",
|
|
48
|
-
"$xml=[Text.Encoding]::UTF8.GetBytes($manifest.OuterXml); if($xml.Length -gt 1048576){throw 'Manifest too large'}",
|
|
49
|
-
"$sha=[Security.Cryptography.SHA256]::Create(); try{$digest=([BitConverter]::ToString($sha.ComputeHash($xml))).Replace('-','').ToLowerInvariant()}finally{$sha.Dispose()}",
|
|
50
|
-
// Revalidate the whole chain before further file reads and immediately before publication.
|
|
51
|
-
"if((Assert-DesktopPackagePath $exePath) -cne $exeChain -or (Assert-DesktopPackagePath $manifestPath) -cne $manifestChain){throw 'Package ancestry changed'}",
|
|
52
|
-
"$again=@(Get-AppxPackage -Name OpenAI.Codex); $exeAgain=Get-Item -LiteralPath $exe.FullName",
|
|
53
|
-
"if($again.Count -ne 1 -or $again[0].PackageFullName -cne $p.PackageFullName -or $again[0].Publisher -cne $p.Publisher -or $again[0].InstallLocation -ine $p.InstallLocation -or ($exeAgain.Attributes -band [IO.FileAttributes]::ReparsePoint) -or $exeAgain.Length -ne $exe.Length -or $exeAgain.CreationTimeUtc.Ticks -ne $exe.CreationTimeUtc.Ticks -or $exeAgain.LastWriteTimeUtc.Ticks -ne $exe.LastWriteTimeUtc.Ticks){throw 'Package changed during proof'}",
|
|
54
|
-
"if((Assert-DesktopPackagePath $exePath) -cne $exeChain -or (Assert-DesktopPackagePath $manifestPath) -cne $manifestChain){throw 'Package ancestry changed'}",
|
|
55
|
-
"$sha=[Security.Cryptography.SHA256]::Create(); try{$ancestry=([BitConverter]::ToString($sha.ComputeHash([Text.Encoding]::UTF8.GetBytes($exeChain+'|'+$manifestChain)))).Replace('-','').ToLowerInvariant()}finally{$sha.Dispose()}",
|
|
56
|
-
"[pscustomobject]@{id=$p.PackageFamilyName;root=$root.FullName;relaunch=$p.PackageFamilyName+'!App';proof=@{packageFullName=$p.PackageFullName;publisherId=$p.PublisherId;publisher=$p.Publisher;manifestName=[string]$manifest.Package.Identity.Name;manifestPublisher=[string]$manifest.Package.Identity.Publisher;manifestVersion=[string]$manifest.Package.Identity.Version;appId=[string]$entry.Id;executable=[string]$entry.Executable;canonicalExecutable=$exe.FullName;manifestDigest=$digest;executableIdentity=([string]$exe.Length+':'+$exe.CreationTimeUtc.Ticks+':'+$exe.LastWriteTimeUtc.Ticks);ancestryIdentity=$ancestry}}|ConvertTo-Json -Depth 3 -Compress",
|
|
57
|
-
].join("; ");
|
|
38
|
+
WINDOWS_PACKAGE_PROOF_FUNCTIONS,
|
|
39
|
+
"$p=Get-DesktopPackage",
|
|
40
|
+
"$observation=@{id=$p.PackageFamilyName;root=$p.InstallLocation;relaunch=$p.PackageFamilyName+'!App'}",
|
|
41
|
+
"try {",
|
|
42
|
+
OPEN_WINDOWS_PACKAGE_FILES,
|
|
43
|
+
MEASURE_WINDOWS_PACKAGE_FILES,
|
|
44
|
+
"$observation.proof=@{packageFullName=$p.PackageFullName;publisherId=$p.PublisherId;publisher=$p.Publisher;manifestName=[string]$manifest.Package.Identity.Name;manifestPublisher=[string]$manifest.Package.Identity.Publisher;manifestVersion=[string]$manifest.Package.Identity.Version;appId=[string]$entry.Id;executable=[string]$entry.Executable;canonicalExecutable=$exePath;manifestDigest=$digest;ancestryIdentity=$ancestry;executableIdentity=$executableIdentity;executableHash=$executableHash;signatureKind=[string]$p.SignatureKind;signerSubject=$signature.SignerCertificate.Subject;signerThumbprint=$signature.SignerCertificate.Thumbprint;contentIntegrity=$true}",
|
|
45
|
+
"} catch { $observation.Remove('proof') } finally {", CLOSE_WINDOWS_PACKAGE_FILES, "}",
|
|
46
|
+
"[pscustomobject]$observation|ConvertTo-Json -Depth 3 -Compress",
|
|
47
|
+
].join("\n");
|
|
58
48
|
|
|
59
|
-
/** Last completed probe outcome. Only public package facts: never paths, keys or account data.
|
|
49
|
+
/** Last completed probe outcome. Only public package facts: never paths, keys or account data.
|
|
50
|
+
* `verified` is the official-package proof verdict at `completedAt`; `assessedVersion` stays the
|
|
51
|
+
* baseline that holds native acceptance evidence, reported separately from admission. */
|
|
60
52
|
export interface DesktopBuildAssessment {
|
|
61
53
|
assessedVersion: string;
|
|
62
54
|
observedVersion: string | null;
|
|
@@ -64,28 +56,37 @@ export interface DesktopBuildAssessment {
|
|
|
64
56
|
completedAt: number;
|
|
65
57
|
}
|
|
66
58
|
|
|
67
|
-
|
|
59
|
+
const sha256 = /^[a-f0-9]{64}$/;
|
|
60
|
+
const thumbprint = /^[A-F0-9]{40}$/;
|
|
61
|
+
|
|
62
|
+
function assessInstalledPackage(install: DesktopPackageObservation) {
|
|
68
63
|
const name = win32.basename(install.root);
|
|
69
64
|
const parts = /^OpenAI\.Codex_(\d+\.\d+\.\d+\.\d+)_(x64|arm64|x86|neutral)_([A-Za-z0-9.-]*)_([A-Za-z0-9]+)$/.exec(name);
|
|
70
65
|
const identified = install.id === DESKTOP_COMPATIBILITY_ASSESSED_FAMILY && install.relaunch === `${install.id}!App`
|
|
71
66
|
&& !!parts && `OpenAI.Codex_${parts[4]}` === install.id;
|
|
72
67
|
const observedVersion = identified ? parts![1] : null;
|
|
73
68
|
const proof = install.proof;
|
|
74
|
-
const
|
|
69
|
+
const executableHash = proof?.executableHash, signerThumbprint = proof?.signerThumbprint;
|
|
70
|
+
// Official-package proof admits a build; the observed version stays inside the
|
|
71
|
+
// hashed identity, so an update still revokes a prior trial before correction.
|
|
72
|
+
const verified = identified && !!proof
|
|
75
73
|
&& /^[A-Za-z]:\\/.test(install.root) && win32.normalize(install.root) === install.root
|
|
76
74
|
&& proof.packageFullName === name && proof.publisherId === "2p2nqsd0c76g0"
|
|
77
|
-
&&
|
|
75
|
+
&& proof.publisher === CODEX_STORE_PUBLISHER && proof.signatureKind === "Store"
|
|
76
|
+
&& proof.contentIntegrity === true && proof.signerSubject === CODEX_EXECUTABLE_SIGNER
|
|
78
77
|
&& proof.manifestName === "OpenAI.Codex" && proof.manifestPublisher === proof.publisher
|
|
79
78
|
&& proof.manifestVersion === observedVersion && proof.appId === "App"
|
|
80
79
|
&& typeof proof.executable === "string" && proof.executable.replaceAll("/", "\\").toLowerCase() === "app\\chatgpt.exe"
|
|
81
80
|
&& proof.canonicalExecutable === win32.join(install.root, "app", "ChatGPT.exe")
|
|
82
|
-
&&
|
|
83
|
-
&& /^\d{1,16}:\d{1,20}:\d{1,20}$/.test(proof.executableIdentity)
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
81
|
+
&& sha256.test(proof.manifestDigest) && sha256.test(proof.ancestryIdentity)
|
|
82
|
+
&& /^\d{1,16}:\d{1,20}:\d{1,20}$/.test(proof.executableIdentity)
|
|
83
|
+
&& typeof executableHash === "string" && sha256.test(executableHash)
|
|
84
|
+
&& typeof signerThumbprint === "string" && thumbprint.test(signerThumbprint);
|
|
85
|
+
if (!verified) return { observedVersion, identity: null, build: null };
|
|
86
|
+
const build: VerifiedDesktopPackage = { id: install.id, root: install.root, relaunch: install.relaunch,
|
|
87
|
+
packageFullName: proof.packageFullName, executableHash, executableIdentity: proof.executableIdentity,
|
|
88
|
+
manifestDigest: proof.manifestDigest, ancestryIdentity: proof.ancestryIdentity, signerThumbprint };
|
|
89
|
+
return { observedVersion, build, identity: createHash("sha256").update(JSON.stringify(build)).digest("hex") };
|
|
89
90
|
}
|
|
90
91
|
|
|
91
92
|
/** Resolve only after the exact asynchronous child has closed, including abort/timeout. */
|
|
@@ -101,7 +102,7 @@ function queryInstalledPackage(signal: AbortSignal): Promise<DesktopPackageObser
|
|
|
101
102
|
const value = error ? null : JSON.parse(stdout);
|
|
102
103
|
if (value && typeof value === "object" && !Array.isArray(value) && typeof value.id === "string"
|
|
103
104
|
&& typeof value.root === "string" && typeof value.relaunch === "string"
|
|
104
|
-
&& value.proof && typeof value.proof === "object" && !Array.isArray(value.proof)) result = value;
|
|
105
|
+
&& (value.proof === undefined || (value.proof && typeof value.proof === "object" && !Array.isArray(value.proof)))) result = value;
|
|
105
106
|
} catch { /* An unverifiable package never inherits a completed success. */ }
|
|
106
107
|
completed = true; finish();
|
|
107
108
|
});
|
|
@@ -116,13 +117,14 @@ function queryInstalledPackage(signal: AbortSignal): Promise<DesktopPackageObser
|
|
|
116
117
|
export function createInstalledBuildProbe(query: (signal: AbortSignal) => Promise<DesktopPackageObservation | null> = queryInstalledPackage) {
|
|
117
118
|
let pending: Promise<boolean> | null = null, controller: AbortController | null = null, closed = false;
|
|
118
119
|
let lastResult: DesktopBuildAssessment | null = null;
|
|
119
|
-
let identity: string | null = null, revision = 0;
|
|
120
|
+
let identity: string | null = null, build: VerifiedDesktopPackage | null = null, revision = 0;
|
|
120
121
|
const record = (install: DesktopPackageObservation | null) => {
|
|
121
|
-
const outcome = install ? assessInstalledPackage(install) : { observedVersion: null,
|
|
122
|
+
const outcome = install ? assessInstalledPackage(install) : { observedVersion: null, identity: null, build: null };
|
|
122
123
|
if (outcome.identity !== identity) { identity = outcome.identity; revision++; }
|
|
124
|
+
build = outcome.build;
|
|
123
125
|
lastResult = { assessedVersion: DESKTOP_COMPATIBILITY_ASSESSED_VERSION, observedVersion: outcome.observedVersion,
|
|
124
|
-
verified:
|
|
125
|
-
return
|
|
126
|
+
verified: build !== null, completedAt: Date.now() };
|
|
127
|
+
return build !== null;
|
|
126
128
|
};
|
|
127
129
|
return {
|
|
128
130
|
check(): Promise<boolean> {
|
|
@@ -138,11 +140,12 @@ export function createInstalledBuildProbe(query: (signal: AbortSignal) => Promis
|
|
|
138
140
|
/** Last completed check only: an aborted or in-flight query never rewrites it. */
|
|
139
141
|
lastResult(): DesktopBuildAssessment | null { return lastResult ? { ...lastResult } : null; },
|
|
140
142
|
/** Private consent fence: a completed A->B->A proof is distinct from unchanged A. */
|
|
141
|
-
binding() { return { identity, revision }; },
|
|
142
|
-
async close(): Promise<void> { closed = true; identity = null; revision++; controller?.abort(); await pending; },
|
|
143
|
+
binding() { return { identity, revision, build: build && { ...build } }; },
|
|
144
|
+
async close(): Promise<void> { closed = true; identity = null; build = null; revision++; controller?.abort(); await pending; },
|
|
143
145
|
};
|
|
144
146
|
}
|
|
145
147
|
|
|
148
|
+
// Reports the official-package proof verdict, not equality with the assessed baseline.
|
|
146
149
|
export async function isAssessedDesktopInstalled(): Promise<boolean> {
|
|
147
150
|
const probe = createInstalledBuildProbe();
|
|
148
151
|
try { return await probe.check(); } finally { await probe.close(); }
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
+
import type { VerifiedDesktopPackage } from "./installed-build";
|
|
2
3
|
|
|
3
|
-
interface
|
|
4
|
+
interface BuildBinding { build: VerifiedDesktopPackage | null; revision: number }
|
|
5
|
+
interface LaunchContext { pacUrl: string; generation: string; current(): BuildBinding | null; fence(): void }
|
|
4
6
|
/** Process-local ownership; the management sibling guard owns the cross-instance boundary. */
|
|
5
7
|
let owner: { token: symbol; kind: "runtime" | "certificate"; launch?: LaunchContext } | null = null;
|
|
6
8
|
export function desktopCompatibilityRuntimeActive(): boolean { return owner?.kind === "runtime"; }
|
|
@@ -13,16 +15,20 @@ export const acquireDesktopCompatibilityRuntime = () => acquire("runtime");
|
|
|
13
15
|
export const acquireDesktopCertificateMutation = () => acquire("certificate");
|
|
14
16
|
|
|
15
17
|
/** Published only by a successfully started runtime, never reconstructed from disk or app arguments. */
|
|
16
|
-
export function bindDesktopCompatibilityLaunch(pacUrl: string, current: () =>
|
|
18
|
+
export function bindDesktopCompatibilityLaunch(pacUrl: string, current: () => BuildBinding | null, fence: () => void): () => void {
|
|
17
19
|
if (owner?.kind !== "runtime" || owner.launch) throw new Error("desktop_compatibility_launch_owner_unverified");
|
|
18
|
-
const lease = owner, launch = { pacUrl, generation: randomUUID(), current };
|
|
20
|
+
const lease = owner, launch = { pacUrl, generation: randomUUID(), current, fence };
|
|
19
21
|
lease.launch = launch;
|
|
20
22
|
return () => { if (lease.launch === launch) delete lease.launch; };
|
|
21
23
|
}
|
|
22
24
|
|
|
23
25
|
/** No key loading, socket discovery, or optional-runtime construction on the ordinary restart path. */
|
|
24
|
-
export function readDesktopCompatibilityLaunch()
|
|
26
|
+
export function readDesktopCompatibilityLaunch() {
|
|
25
27
|
const launch = owner?.kind === "runtime" ? owner.launch : undefined;
|
|
26
|
-
|
|
28
|
+
if (!launch) return null;
|
|
29
|
+
try {
|
|
30
|
+
const binding = launch.current();
|
|
31
|
+
return binding?.build ? { pacUrl: launch.pacUrl, generation: launch.generation, build: binding.build, revision: binding.revision, fence: launch.fence } : null;
|
|
32
|
+
}
|
|
27
33
|
catch { return null; }
|
|
28
34
|
}
|
|
@@ -12,7 +12,7 @@ import { createNativeIdentityReader } from "./native-identity";
|
|
|
12
12
|
import { UsageRelayController, type UsageIdentity } from "./usage-controller";
|
|
13
13
|
import { createUsageControlledFetch } from "./usage-controlled-fetch";
|
|
14
14
|
import { startDesktopRelay } from "./relay-listener";
|
|
15
|
-
import {
|
|
15
|
+
import { launchWindowsCodexCompatibilityAsync } from "./windows-package-launch";
|
|
16
16
|
import { acquireDesktopCompatibilityRuntime, bindDesktopCompatibilityLaunch } from "./runtime-ownership";
|
|
17
17
|
import { createDesktopConnectionStore, type DesktopConnectionStore } from "./connection-store";
|
|
18
18
|
import { createNativeRoutingVerifier } from "./routing-preflight";
|
|
@@ -45,35 +45,40 @@ export function createDesktopCompatibilityRuntime(io: DesktopRuntimeIo = {}) {
|
|
|
45
45
|
const buildSupported = io.buildSupported ?? (() => buildProbe?.check() ?? Promise.resolve(false));
|
|
46
46
|
let routingSupported = io.routingSupported ?? (() => false);
|
|
47
47
|
let contextFailure: "build_unverified" | "native_routing_unverified" | null = null;
|
|
48
|
-
const
|
|
48
|
+
const checkContext = async () => {
|
|
49
49
|
const epoch = contextEpoch, probe = buildProbe;
|
|
50
|
+
let binding: ReturnType<NonNullable<typeof probe>["binding"]> | null = null;
|
|
50
51
|
try {
|
|
51
|
-
if (!routingSupported()) { contextFailure = "native_routing_unverified"; invalidateTrial?.(); return
|
|
52
|
+
if (!routingSupported()) { contextFailure = "native_routing_unverified"; invalidateTrial?.(); return null; }
|
|
52
53
|
const supported = await buildSupported();
|
|
53
54
|
// An old probe completion must not invalidate a replacement runtime's consent.
|
|
54
|
-
if (epoch !== contextEpoch || probe !== buildProbe) return
|
|
55
|
+
if (epoch !== contextEpoch || probe !== buildProbe) return null;
|
|
55
56
|
if (!io.buildSupported && probe) {
|
|
56
|
-
|
|
57
|
+
binding = probe.binding();
|
|
57
58
|
const changed = boundBuild?.probe === probe && boundBuild.revision !== binding.revision;
|
|
58
59
|
boundBuild = { probe, revision: binding.revision };
|
|
59
60
|
if (!supported || !binding.identity || changed) {
|
|
60
|
-
contextFailure = "build_unverified"; invalidateTrial?.(); return
|
|
61
|
+
contextFailure = "build_unverified"; invalidateTrial?.(); return null;
|
|
61
62
|
}
|
|
62
63
|
}
|
|
63
64
|
contextFailure = !routingSupported() ? "native_routing_unverified" : !supported ? "build_unverified" : null;
|
|
64
65
|
}
|
|
65
66
|
catch {
|
|
66
|
-
if (epoch !== contextEpoch || probe !== buildProbe) return
|
|
67
|
+
if (epoch !== contextEpoch || probe !== buildProbe) return null;
|
|
67
68
|
contextFailure = "build_unverified";
|
|
68
69
|
}
|
|
69
70
|
if (contextFailure) invalidateTrial?.();
|
|
70
|
-
return contextFailure === null;
|
|
71
|
+
return contextFailure === null ? { binding } : null;
|
|
71
72
|
};
|
|
73
|
+
const contextValid = async () => (await checkContext()) !== null;
|
|
72
74
|
let phase: "off" | "starting" | "running" | "stopping" | "cleanup-required" = "off";
|
|
73
|
-
|
|
75
|
+
type OwnedRuntime = { controller: UsageRelayController; close(): Promise<void>; pacUrl: string; fingerprint: string; deadline: number };
|
|
76
|
+
let owned: OwnedRuntime | null = null;
|
|
74
77
|
let closing: Promise<void> | null = null;
|
|
75
78
|
let pendingCleanup: (() => Promise<void>) | null = null;
|
|
76
79
|
let releaseOwner: (() => void) | null = null;
|
|
80
|
+
let pendingLaunch: { owner: OwnedRuntime; abort: AbortController; revision: number | null;
|
|
81
|
+
result: ReturnType<typeof launchWindowsCodexCompatibilityAsync> } | null = null;
|
|
77
82
|
const status = () => ({ phase, supported: platform === "win32", running: owned !== null, contextFailure,
|
|
78
83
|
...(buildProbe ? { buildAssessment: buildProbe.lastResult() ?? (previousBuildAssessment ? { ...previousBuildAssessment } : null) } : {}),
|
|
79
84
|
...(owned ? { fingerprint: owned.fingerprint, safetyDeadline: owned.deadline, usage: owned.controller.snapshot() } : {}) });
|
|
@@ -101,10 +106,12 @@ export function createDesktopCompatibilityRuntime(io: DesktopRuntimeIo = {}) {
|
|
|
101
106
|
let pac: ReturnType<typeof Bun.serve> | undefined, timer: ReturnType<typeof setInterval> | undefined;
|
|
102
107
|
let detach: (() => void) | undefined, unbindLaunch: (() => void) | undefined, controller: UsageRelayController | undefined;
|
|
103
108
|
const cleanup = async () => {
|
|
109
|
+
const launch = pendingLaunch;
|
|
110
|
+
launch?.abort.abort();
|
|
104
111
|
unbindLaunch?.();
|
|
105
112
|
if (timer) clearInterval(timer); detach?.();
|
|
106
113
|
// Abort transport before awaiting stream refresh so a stuck reader cannot retain sockets.
|
|
107
|
-
const results = await Promise.allSettled([pac?.stop(true), proxy?.close(), relay?.close(), controller?.observeOnly(), buildProbe?.close()]);
|
|
114
|
+
const results = await Promise.allSettled([pac?.stop(true), proxy?.close(), relay?.close(), controller?.observeOnly(), buildProbe?.close(), launch?.result]);
|
|
108
115
|
if (results.some(result => result.status === "rejected")) throw new Error("desktop_compatibility_cleanup_incomplete");
|
|
109
116
|
};
|
|
110
117
|
pendingCleanup = cleanup;
|
|
@@ -168,8 +175,16 @@ export function createDesktopCompatibilityRuntime(io: DesktopRuntimeIo = {}) {
|
|
|
168
175
|
owned = { controller, close: cleanup, fingerprint: authority.fingerprint, deadline, pacUrl: `http://127.0.0.1:${pac.port}/${runId}/proxy.pac` };
|
|
169
176
|
phase = "running";
|
|
170
177
|
const launchedBy = owned;
|
|
171
|
-
unbindLaunch = bindDesktopCompatibilityLaunch(owned.pacUrl,
|
|
172
|
-
(
|
|
178
|
+
unbindLaunch = bindDesktopCompatibilityLaunch(owned.pacUrl, () => {
|
|
179
|
+
if (owned !== launchedBy || phase !== "running" || Date.now() >= deadline || contextFailure) return null;
|
|
180
|
+
const binding = buildProbe?.binding();
|
|
181
|
+
return binding && binding.revision === boundBuild?.revision ? binding : null;
|
|
182
|
+
}, () => {
|
|
183
|
+
if (owned !== launchedBy || phase !== "running") return;
|
|
184
|
+
// The restart adapter is synchronous. stop() revokes the trial and begins closing
|
|
185
|
+
// listeners and sockets before yielding; failed cleanup stays visible on status.
|
|
186
|
+
void stop().catch(() => {});
|
|
187
|
+
});
|
|
173
188
|
detach = registerOptionalShutdownHook("codex-desktop-compatibility", () => { void stop().catch(() => {}); });
|
|
174
189
|
return status();
|
|
175
190
|
} catch (error) {
|
|
@@ -195,9 +210,31 @@ export function createDesktopCompatibilityRuntime(io: DesktopRuntimeIo = {}) {
|
|
|
195
210
|
async launch() {
|
|
196
211
|
if (!owned || phase !== "running") throw new Error("desktop_compatibility_not_running");
|
|
197
212
|
const current = owned;
|
|
198
|
-
|
|
213
|
+
const verified = await checkContext();
|
|
214
|
+
if (!verified) throw new Error(`desktop_compatibility_${contextFailure}`);
|
|
215
|
+
if (owned !== current || phase !== "running") throw new Error("desktop_compatibility_not_running");
|
|
216
|
+
const revision = verified.binding?.revision ?? null;
|
|
217
|
+
if (revision !== null && buildProbe?.binding().revision !== revision) {
|
|
218
|
+
throw new Error("desktop_compatibility_build_unverified");
|
|
219
|
+
}
|
|
220
|
+
if (!pendingLaunch || pendingLaunch.owner !== current) {
|
|
221
|
+
const abort = new AbortController();
|
|
222
|
+
pendingLaunch = { owner: current, abort, revision,
|
|
223
|
+
result: launchWindowsCodexCompatibilityAsync(current.pacUrl, verified.binding?.build ?? null, { signal: abort.signal }) };
|
|
224
|
+
}
|
|
225
|
+
const launch = pendingLaunch;
|
|
226
|
+
let result: Awaited<typeof launch.result>;
|
|
227
|
+
try { result = await launch.result; }
|
|
228
|
+
finally { if (pendingLaunch === launch) pendingLaunch = null; }
|
|
229
|
+
// An old child cannot report success or stop a runtime that replaced its owner.
|
|
199
230
|
if (owned !== current || phase !== "running") throw new Error("desktop_compatibility_not_running");
|
|
200
|
-
|
|
231
|
+
// Success binds to the revision the child launched, which every joined caller must share.
|
|
232
|
+
const stale = launch.revision !== revision || (revision !== null && buildProbe?.binding().revision !== revision);
|
|
233
|
+
// A failed or indeterminate activation may have left a process on the managed connection,
|
|
234
|
+
// so its still-current runtime is fenced even when the build revision moved meanwhile.
|
|
235
|
+
if (result.status === "refused" && result.reason === "activation_failed") await stop();
|
|
236
|
+
if (stale) throw new Error("desktop_compatibility_build_unverified");
|
|
237
|
+
return result;
|
|
201
238
|
},
|
|
202
239
|
/** Internal native launch context; management status never returns the control endpoint. */
|
|
203
240
|
getPacUrl: () => owned?.pacUrl ?? null,
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
export const WINDOWS_ACTIVATION_SOURCE = String.raw`using System;
|
|
3
3
|
using System.Runtime.InteropServices;
|
|
4
4
|
using System.Text;
|
|
5
|
+
using Microsoft.Win32.SafeHandles;
|
|
5
6
|
|
|
6
7
|
// Windows.Launch preserves package identity and forwards explicit application arguments.
|
|
7
8
|
public static class OpenCodexPackageActivation {
|
|
@@ -13,9 +14,12 @@ public static class OpenCodexPackageActivation {
|
|
|
13
14
|
}
|
|
14
15
|
[DllImport("ole32.dll", PreserveSig=true)]
|
|
15
16
|
private static extern int CoCreateInstance(ref Guid clsid, IntPtr outer, uint context, ref Guid iid, [MarshalAs(UnmanagedType.Interface)] out IApplicationActivationManager manager);
|
|
16
|
-
[DllImport("kernel32.dll", SetLastError=true)]
|
|
17
|
-
|
|
18
|
-
[DllImport("kernel32.dll", CharSet=CharSet.Unicode
|
|
17
|
+
[DllImport("kernel32.dll", SetLastError=true)]
|
|
18
|
+
private static extern SafeProcessHandle OpenProcess(uint access, bool inherit, uint pid);
|
|
19
|
+
[DllImport("kernel32.dll", CharSet=CharSet.Unicode, ExactSpelling=true)]
|
|
20
|
+
private static extern int GetPackageFullName(SafeProcessHandle process, ref uint length, StringBuilder name);
|
|
21
|
+
[DllImport("kernel32.dll", CharSet=CharSet.Unicode, ExactSpelling=true, SetLastError=true)]
|
|
22
|
+
private static extern bool QueryFullProcessImageNameW(SafeProcessHandle process, uint flags, StringBuilder name, ref uint length);
|
|
19
23
|
private static IApplicationActivationManager Manager() {
|
|
20
24
|
var clsid=new Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C");
|
|
21
25
|
var iid=new Guid("2E941141-7F97-4756-BA1D-9DECDE894A3D");
|
|
@@ -30,15 +34,26 @@ public static class OpenCodexPackageActivation {
|
|
|
30
34
|
try {uint pid;Marshal.ThrowExceptionForHR(manager.ActivateApplication(appId,arguments,0,out pid));return pid;}
|
|
31
35
|
finally {Marshal.FinalReleaseComObject(manager);}
|
|
32
36
|
}
|
|
33
|
-
public static
|
|
34
|
-
var
|
|
35
|
-
if(
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
37
|
+
public static SafeProcessHandle OpenActivatedProcess(uint pid) {
|
|
38
|
+
var process=OpenProcess(0x1000,false,pid);
|
|
39
|
+
if(!process.IsInvalid)return process;
|
|
40
|
+
int error=Marshal.GetLastWin32Error();
|
|
41
|
+
process.Dispose();
|
|
42
|
+
throw new System.ComponentModel.Win32Exception(error);
|
|
43
|
+
}
|
|
44
|
+
public static string ImageOf(SafeProcessHandle process, string expectedPackage) {
|
|
45
|
+
uint length=0;
|
|
46
|
+
int status=GetPackageFullName(process,ref length,null);
|
|
47
|
+
if(status!=122)throw new System.ComponentModel.Win32Exception(status);
|
|
48
|
+
var package=new StringBuilder((int)length);
|
|
49
|
+
status=GetPackageFullName(process,ref length,package);
|
|
50
|
+
if(status!=0)throw new System.ComponentModel.Win32Exception(status);
|
|
51
|
+
if(!String.Equals(package.ToString(), expectedPackage, StringComparison.Ordinal))
|
|
52
|
+
throw new InvalidOperationException("Activated package identity changed");
|
|
53
|
+
var path=new StringBuilder(32768);
|
|
54
|
+
length=(uint)path.Capacity;
|
|
55
|
+
if(!QueryFullProcessImageNameW(process,0,path,ref length))
|
|
56
|
+
throw new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error());
|
|
57
|
+
return path.ToString();
|
|
43
58
|
}
|
|
44
59
|
}`;
|