@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/bridge/sse.ts
CHANGED
|
@@ -53,6 +53,7 @@ import {
|
|
|
53
53
|
import { adapterFailureFromEvent, emptyChunks, joinChunks, ownedBudgetAbandonedMs, responsesUsage, toolCallArgumentsCouldBeJson, toolCallArgumentsUsable, uuid, webSearchAction, webSearchCellItemId } from "./internal";
|
|
54
54
|
import type { OutputItem, StringChunks } from "./internal";
|
|
55
55
|
import { terminalRefusalFailure } from "./terminal-refusal";
|
|
56
|
+
import { createMaxOutputCompletion, type MaxOutputCompletionOptions } from "./max-output-completion";
|
|
56
57
|
|
|
57
58
|
function sseEvent(name: string, data: Record<string, unknown>): string {
|
|
58
59
|
return `event: ${name}\ndata: ${JSON.stringify(data)}\n\n`;
|
|
@@ -73,8 +74,11 @@ export function bridgeToResponsesSSE(
|
|
|
73
74
|
toolSearchToolNames?: Set<string>,
|
|
74
75
|
onCancel?: () => void,
|
|
75
76
|
heartbeatMs = 2_000,
|
|
76
|
-
options?: {
|
|
77
|
+
options?: MaxOutputCompletionOptions & {
|
|
77
78
|
responseId?: string;
|
|
79
|
+
/** Trusted structural grouping only; never provider state or execution authority. */
|
|
80
|
+
outputItemIds?: { next(kind: "message" | "reasoning" | "function_call" | "custom_tool_call" | "tool_search_call"): string };
|
|
81
|
+
|
|
78
82
|
stallTimeoutSec?: number;
|
|
79
83
|
/**
|
|
80
84
|
* The upstream is local infrastructure (loopback / private / `.local` / `.lan`); an unset
|
|
@@ -83,6 +87,8 @@ export function bridgeToResponsesSSE(
|
|
|
83
87
|
*/
|
|
84
88
|
localUpstream?: boolean;
|
|
85
89
|
hideThinkingSummary?: boolean;
|
|
90
|
+
/** Internal Chat delivery override for raw reasoning only; summaries keep their policy. */
|
|
91
|
+
chatRawReasoningVisible?: boolean;
|
|
86
92
|
/** Provider policy: suppress raw content-channel reasoning, keep provider-authored summaries. */
|
|
87
93
|
hideRawReasoning?: boolean;
|
|
88
94
|
/**
|
|
@@ -160,6 +166,10 @@ export function bridgeToResponsesSSE(
|
|
|
160
166
|
},
|
|
161
167
|
): ReadableStream<Uint8Array> {
|
|
162
168
|
const replayCacheScope = options?.replayCacheScope;
|
|
169
|
+
const maxOutputCompletion = createMaxOutputCompletion(options);
|
|
170
|
+
const outputItemId = (kind: "message" | "reasoning" | "function_call" | "custom_tool_call" | "tool_search_call", prefix: string): string =>
|
|
171
|
+
options?.outputItemIds?.next(kind) ?? `${prefix}_${uuid()}`;
|
|
172
|
+
|
|
163
173
|
const setBeatInterval = options?.timers?.setInterval ?? ((handler: () => void, ms: number) => setInterval(handler, ms));
|
|
164
174
|
const clearBeatInterval = options?.timers?.clearInterval ?? ((id: unknown) => clearInterval(id as ReturnType<typeof setInterval>));
|
|
165
175
|
// Freeform/custom tools (apply_patch, code-mode exec) carry their body in `input`; the
|
|
@@ -361,10 +371,7 @@ export function bridgeToResponsesSSE(
|
|
|
361
371
|
? encoder.encode(': opencodex heartbeat\n\n')
|
|
362
372
|
: encoder.encode('event: response.heartbeat\ndata: {"type":"response.heartbeat"}\n\n');
|
|
363
373
|
let stallTicks = 0;
|
|
364
|
-
|
|
365
|
-
localUpstream: options?.localUpstream,
|
|
366
|
-
});
|
|
367
|
-
const maxStallTicks = Math.ceil((stallSec * 1000) / heartbeatMs);
|
|
374
|
+
let localUpstream = options?.localUpstream;
|
|
368
375
|
|
|
369
376
|
let currentMsg: {
|
|
370
377
|
itemId: string;
|
|
@@ -408,7 +415,7 @@ export function bridgeToResponsesSSE(
|
|
|
408
415
|
const encrypted = takeReasoningEnvelope(hiddenText || undefined);
|
|
409
416
|
hiddenThinking = emptyChunks();
|
|
410
417
|
if (!encrypted) return;
|
|
411
|
-
const itemId =
|
|
418
|
+
const itemId = outputItemId("reasoning", "rs");
|
|
412
419
|
const item = { type: "reasoning", id: itemId, summary: [] as never[], encrypted_content: encrypted };
|
|
413
420
|
emit("response.output_item.added", { output_index: outputIndex, item });
|
|
414
421
|
emit("response.output_item.done", { output_index: outputIndex, item });
|
|
@@ -437,7 +444,7 @@ export function bridgeToResponsesSSE(
|
|
|
437
444
|
hiddenRawReasoning = emptyChunks();
|
|
438
445
|
reservation?.commitRetained();
|
|
439
446
|
budget?.releaseRetained(previousBytes, { kind: "reasoning" });
|
|
440
|
-
const itemId =
|
|
447
|
+
const itemId = outputItemId("reasoning", "rs");
|
|
441
448
|
const item = { type: "reasoning", id: itemId, summary: [] as never[], encrypted_content: encrypted };
|
|
442
449
|
emit("response.output_item.added", { output_index: outputIndex, item });
|
|
443
450
|
emit("response.output_item.done", { output_index: outputIndex, item });
|
|
@@ -460,7 +467,7 @@ export function bridgeToResponsesSSE(
|
|
|
460
467
|
pendingKiroRedactedBytes = 0;
|
|
461
468
|
reservation?.commitRetained();
|
|
462
469
|
budget?.releaseRetained(previousBytes, { kind: "reasoning" });
|
|
463
|
-
const itemId =
|
|
470
|
+
const itemId = outputItemId("reasoning", "rs");
|
|
464
471
|
const item = { type: "reasoning", id: itemId, summary: [] as never[], encrypted_content: encrypted };
|
|
465
472
|
emit("response.output_item.added", { output_index: outputIndex, item });
|
|
466
473
|
emit("response.output_item.done", { output_index: outputIndex, item });
|
|
@@ -847,6 +854,7 @@ export function bridgeToResponsesSSE(
|
|
|
847
854
|
}
|
|
848
855
|
if (next.done) { upstreamDone = true; break; }
|
|
849
856
|
const event = next.value;
|
|
857
|
+
maxOutputCompletion.observe(event);
|
|
850
858
|
let terminalEvent = false;
|
|
851
859
|
// Invisible adapter heartbeats (and buffered web-search progress) count as upstream
|
|
852
860
|
// liveness only — they must not suppress wire keepalives that re-arm Codex idle timers.
|
|
@@ -928,7 +936,7 @@ export function bridgeToResponsesSSE(
|
|
|
928
936
|
closeCurrentMessage("commentary");
|
|
929
937
|
}
|
|
930
938
|
if (!currentMsg) {
|
|
931
|
-
const itemId =
|
|
939
|
+
const itemId = outputItemId("message", "msg");
|
|
932
940
|
const item = {
|
|
933
941
|
type: "message", id: itemId, status: "in_progress", role: "assistant",
|
|
934
942
|
content: [] as { type: string; text: string; annotations: never[] }[],
|
|
@@ -983,7 +991,7 @@ export function bridgeToResponsesSSE(
|
|
|
983
991
|
if (event.thinking.length > 0) rawReasoningForNextToolCall = "";
|
|
984
992
|
if (currentToolCall) closeCurrentToolCall();
|
|
985
993
|
if (!currentReasoning) {
|
|
986
|
-
const itemId =
|
|
994
|
+
const itemId = outputItemId("reasoning", "rs");
|
|
987
995
|
const item = { type: "reasoning", id: itemId, summary: [] as { type: string; text: string }[] };
|
|
988
996
|
emit("response.output_item.added", { output_index: outputIndex, item });
|
|
989
997
|
emit("response.reasoning_summary_part.added", {
|
|
@@ -1030,7 +1038,7 @@ export function bridgeToResponsesSSE(
|
|
|
1030
1038
|
break;
|
|
1031
1039
|
}
|
|
1032
1040
|
case "reasoning_raw_delta": {
|
|
1033
|
-
if (options?.hideThinkingSummary || options?.hideRawReasoning) {
|
|
1041
|
+
if (!(options?.chatRawReasoningVisible ?? !options?.hideThinkingSummary) || options?.hideRawReasoning) {
|
|
1034
1042
|
hiddenRawReasoning = appendString(
|
|
1035
1043
|
hiddenRawReasoning,
|
|
1036
1044
|
event.text,
|
|
@@ -1042,7 +1050,7 @@ export function bridgeToResponsesSSE(
|
|
|
1042
1050
|
if (currentReasoning) closeCurrentReasoning();
|
|
1043
1051
|
if (currentToolCall) closeCurrentToolCall();
|
|
1044
1052
|
if (!currentRawReasoning) {
|
|
1045
|
-
const itemId =
|
|
1053
|
+
const itemId = outputItemId("reasoning", "rs");
|
|
1046
1054
|
const item = { type: "reasoning", id: itemId, summary: [] as { type: string; text: string }[] };
|
|
1047
1055
|
emit("response.output_item.added", { output_index: outputIndex, item });
|
|
1048
1056
|
currentRawReasoning = { itemId, outputIndex, text: emptyChunks() };
|
|
@@ -1102,7 +1110,7 @@ export function bridgeToResponsesSSE(
|
|
|
1102
1110
|
const freeform = !toolSearch && (mapped
|
|
1103
1111
|
? mapped.freeform === true
|
|
1104
1112
|
: (freeformToolNames?.has(realName) ?? false));
|
|
1105
|
-
const itemId =
|
|
1113
|
+
const itemId = toolSearch ? outputItemId("tool_search_call", "tsc") : freeform ? outputItemId("custom_tool_call", "ctc") : outputItemId("function_call", "fc");
|
|
1106
1114
|
const item = toolSearch
|
|
1107
1115
|
? { type: "tool_search_call", id: itemId, call_id: event.id, execution: "client", arguments: {}, status: "in_progress" }
|
|
1108
1116
|
: freeform
|
|
@@ -1178,6 +1186,7 @@ export function bridgeToResponsesSSE(
|
|
|
1178
1186
|
break;
|
|
1179
1187
|
}
|
|
1180
1188
|
case "tool_call_end": {
|
|
1189
|
+
if (event.incomplete) { failCurrentToolCall(); break; }
|
|
1181
1190
|
// Fragments already streamed cannot be repaired. Refuse to complete a function call
|
|
1182
1191
|
// whose assembled arguments do not parse — cancel the item and fail the turn so the
|
|
1183
1192
|
// client never sees status:"completed" for unusable args (#765 stream remainder).
|
|
@@ -1287,7 +1296,7 @@ export function bridgeToResponsesSSE(
|
|
|
1287
1296
|
// Suppression and terminal status must agree: withholding the compaction item while
|
|
1288
1297
|
// still reporting success hands codex-rs a completed response with zero compaction
|
|
1289
1298
|
// items, which it treats as fatal.
|
|
1290
|
-
if (truncationReasonFor(event.stopReason)) {
|
|
1299
|
+
if (truncationReasonFor(event.stopReason) && !maxOutputCompletion.completed) {
|
|
1291
1300
|
// Upstream stopped before a normal completion. Surface as incomplete so the
|
|
1292
1301
|
// client can distinguish a truncated/filtered turn from a finished one.
|
|
1293
1302
|
// #1926 gap 2: bound the window in which a handed-out thought signature is
|
|
@@ -1331,6 +1340,14 @@ export function bridgeToResponsesSSE(
|
|
|
1331
1340
|
flushHiddenReasoningEnvelope();
|
|
1332
1341
|
options?.onUsage?.(event.usage);
|
|
1333
1342
|
await awaitThoughtSignatureDurability();
|
|
1343
|
+
if (maxOutputCompletion.completed) {
|
|
1344
|
+
const response = { ...responseSnapshot("completed", finishedItems, event.endTurn), usage: responsesUsage(event.usage) };
|
|
1345
|
+
options?.onCompletedResponse?.(response, event.providerState);
|
|
1346
|
+
emit("response.completed", { response });
|
|
1347
|
+
reportTerminal("completed");
|
|
1348
|
+
terminalEvent = true;
|
|
1349
|
+
break;
|
|
1350
|
+
}
|
|
1334
1351
|
const refusal = options?.terminalRefusalAsFailed ? terminalRefusalFailure(event) : undefined;
|
|
1335
1352
|
if (refusal) {
|
|
1336
1353
|
emit("response.failed", {
|
|
@@ -1485,6 +1502,9 @@ export function bridgeToResponsesSSE(
|
|
|
1485
1502
|
gated = true;
|
|
1486
1503
|
beat = setBeatInterval(() => {
|
|
1487
1504
|
if (closed || gated) return;
|
|
1505
|
+
if (localUpstream !== options?.localUpstream) { localUpstream = options?.localUpstream; stallTicks = 0; }
|
|
1506
|
+
const stallSec = resolveStallTimeoutSec(options?.stallTimeoutSec, { localUpstream });
|
|
1507
|
+
const maxStallTicks = Math.ceil((stallSec * 1000) / heartbeatMs);
|
|
1488
1508
|
if (upstreamActivity) {
|
|
1489
1509
|
upstreamActivity = false;
|
|
1490
1510
|
stallTicks = 0;
|
package/src/chat/inbound.ts
CHANGED
|
@@ -436,6 +436,18 @@ function resolveReasoningSummary(raw: Rec): string | undefined {
|
|
|
436
436
|
return undefined;
|
|
437
437
|
}
|
|
438
438
|
|
|
439
|
+
function resolveThinkingEnabled(raw: Rec): boolean | undefined {
|
|
440
|
+
return isRec(raw.reasoning) && typeof raw.reasoning.enabled === "boolean" ? raw.reasoning.enabled
|
|
441
|
+
: isRec(raw.thinking) && ["enabled", "disabled"].includes(String(raw.thinking.type)) ? raw.thinking.type === "enabled" : undefined;
|
|
442
|
+
}
|
|
443
|
+
|
|
444
|
+
/** Client delivery only: never put this default in the upstream body or parsed options. */
|
|
445
|
+
export function chatRawReasoningVisible(raw: Rec): boolean {
|
|
446
|
+
if (resolveReasoningSummary(raw) === "none") return false;
|
|
447
|
+
const enabled = resolveThinkingEnabled(raw);
|
|
448
|
+
return enabled ?? resolveReasoningEffort(raw) !== "none";
|
|
449
|
+
}
|
|
450
|
+
|
|
439
451
|
/**
|
|
440
452
|
* Translate an OpenAI Chat Completions request body into a /v1/responses request body.
|
|
441
453
|
* Throws ChatCompletionsRequestError (-> 400) on malformed input.
|
|
@@ -672,8 +684,7 @@ function applyChatSettings(raw: ChatCompletionsRoutingBody, body: Rec): void {
|
|
|
672
684
|
|
|
673
685
|
const effort = resolveReasoningEffort(raw);
|
|
674
686
|
const summary = resolveReasoningSummary(raw);
|
|
675
|
-
const enabled =
|
|
676
|
-
: isRec(raw.thinking) && ["enabled", "disabled"].includes(String(raw.thinking.type)) ? raw.thinking.type === "enabled" : undefined;
|
|
687
|
+
const enabled = resolveThinkingEnabled(raw);
|
|
677
688
|
if (effort || summary !== undefined || enabled !== undefined) {
|
|
678
689
|
body.reasoning = {
|
|
679
690
|
...(effort ? { effort } : {}),
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import { spawn, type ChildProcess } from "node:child_process";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { SUBPROCESS_KILL_GRACE_MS, waitForSubprocessExit } from "../../lib/bounded-subprocess";
|
|
4
|
+
import { bundleSignatureDetailsReason, bundleTrustStat, untrustedBundleFilesystemReason, type AsyncBundleTrustDeps } from "./bundle-trust-policy";
|
|
5
|
+
|
|
6
|
+
export type { AsyncBundleTrustDeps } from "./bundle-trust-policy";
|
|
7
|
+
|
|
8
|
+
type CommandResult = { status: number | null; output: string; stdout: string };
|
|
9
|
+
// Match spawnSync's default per-stream maxBuffer. Overflow never supplies successful trust evidence.
|
|
10
|
+
const MAX_OUTPUT_BYTES = 1024 * 1024;
|
|
11
|
+
|
|
12
|
+
/** Spawn contract used by the trust runner; injectable so cancellation/reaping can be verified anywhere. */
|
|
13
|
+
export type TrustCommandSpawn = (
|
|
14
|
+
file: string,
|
|
15
|
+
args: readonly string[],
|
|
16
|
+
options: { stdio: ["ignore", "pipe", "pipe"]; windowsHide: boolean },
|
|
17
|
+
) => ChildProcess;
|
|
18
|
+
|
|
19
|
+
function runTrustCommand(file: string, args: readonly string[], timeout: number, signal?: AbortSignal, spawnImpl: TrustCommandSpawn = spawn): Promise<CommandResult> {
|
|
20
|
+
signal?.throwIfAborted();
|
|
21
|
+
return new Promise(resolve => {
|
|
22
|
+
const child = spawnImpl(file, [...args], { stdio: ["ignore", "pipe", "pipe"], windowsHide: true });
|
|
23
|
+
const chunks: Buffer[][] = [[], []];
|
|
24
|
+
const sizes = [0, 0];
|
|
25
|
+
let settled = false;
|
|
26
|
+
let stopping = false;
|
|
27
|
+
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
28
|
+
const finish = (status: number | null) => {
|
|
29
|
+
if (settled) return;
|
|
30
|
+
settled = true;
|
|
31
|
+
clearTimeout(timer);
|
|
32
|
+
signal?.removeEventListener("abort", abort);
|
|
33
|
+
const stdout = Buffer.concat(chunks[0]!).toString("utf8");
|
|
34
|
+
resolve({ status, stdout, output: stdout + Buffer.concat(chunks[1]!).toString("utf8") });
|
|
35
|
+
};
|
|
36
|
+
const exited = new Promise<number>(resolveExit => {
|
|
37
|
+
child.once("exit", code => resolveExit(code ?? 1));
|
|
38
|
+
child.once("error", () => { if (!child.pid) resolveExit(1); });
|
|
39
|
+
});
|
|
40
|
+
const stop = () => {
|
|
41
|
+
if (stopping || settled) return;
|
|
42
|
+
stopping = true;
|
|
43
|
+
clearTimeout(timer);
|
|
44
|
+
try { child.kill(); } catch { /* exit observation owns reaping */ }
|
|
45
|
+
child.stdout?.destroy();
|
|
46
|
+
child.stderr?.destroy();
|
|
47
|
+
void waitForSubprocessExit({ exited, kill: () => child.kill("SIGKILL") }, SUBPROCESS_KILL_GRACE_MS)
|
|
48
|
+
.then(() => finish(null));
|
|
49
|
+
};
|
|
50
|
+
const abort = () => stop();
|
|
51
|
+
for (const [index, stream] of [child.stdout, child.stderr].entries()) {
|
|
52
|
+
if (stream === null) continue;
|
|
53
|
+
stream.on("data", (chunk: Buffer) => {
|
|
54
|
+
if (stopping || settled) return;
|
|
55
|
+
sizes[index] = sizes[index]! + chunk.length;
|
|
56
|
+
if (sizes[index]! > MAX_OUTPUT_BYTES) { stop(); return; }
|
|
57
|
+
chunks[index]!.push(chunk);
|
|
58
|
+
});
|
|
59
|
+
stream.on("error", stop);
|
|
60
|
+
}
|
|
61
|
+
child.once("error", () => { if (child.pid) stop(); else finish(null); });
|
|
62
|
+
child.once("close", code => { if (!stopping) finish(code); });
|
|
63
|
+
timer = setTimeout(stop, timeout);
|
|
64
|
+
signal?.addEventListener("abort", abort, { once: true });
|
|
65
|
+
if (signal?.aborted) stop();
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/** Per-call lookup: no directory-service subprocess or signature check blocks the event loop. */
|
|
70
|
+
export async function defaultAsyncBundleTrustDeps(
|
|
71
|
+
signal?: AbortSignal,
|
|
72
|
+
overrides?: { spawn?: TrustCommandSpawn },
|
|
73
|
+
): Promise<AsyncBundleTrustDeps> {
|
|
74
|
+
signal?.throwIfAborted();
|
|
75
|
+
const spawnImpl = overrides?.spawn ?? spawn;
|
|
76
|
+
const admin = await runTrustCommand("/usr/bin/dscl", [".", "-read", "/Groups/admin", "PrimaryGroupID"], 5_000, signal, spawnImpl);
|
|
77
|
+
signal?.throwIfAborted();
|
|
78
|
+
const adminId = admin.status === 0 ? /^PrimaryGroupID: ([0-9]+)\s*$/.exec(admin.stdout)?.[1] : undefined;
|
|
79
|
+
return {
|
|
80
|
+
adminGroupId: adminId === undefined ? undefined : Number(adminId),
|
|
81
|
+
uid: typeof process.getuid === "function" ? process.getuid() : -1,
|
|
82
|
+
stat: bundleTrustStat,
|
|
83
|
+
codesign: (args, codeSignal) => runTrustCommand("/usr/bin/codesign", args, 30_000, codeSignal ?? signal, spawnImpl),
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
/** Same trust policy as the sync API; cancellation rejects only after the owned child is reaped. */
|
|
88
|
+
export async function untrustedChatgptBundleReasonAsync(
|
|
89
|
+
bundleRoot: string,
|
|
90
|
+
binary: string | undefined = undefined,
|
|
91
|
+
deps?: AsyncBundleTrustDeps,
|
|
92
|
+
signal?: AbortSignal,
|
|
93
|
+
): Promise<string | null> {
|
|
94
|
+
signal?.throwIfAborted();
|
|
95
|
+
const checks = deps ?? await defaultAsyncBundleTrustDeps(signal);
|
|
96
|
+
signal?.throwIfAborted();
|
|
97
|
+
const filesystemProblem = untrustedBundleFilesystemReason(bundleRoot, binary, checks);
|
|
98
|
+
if (filesystemProblem) return filesystemProblem;
|
|
99
|
+
binary ??= join(bundleRoot, "Contents", "MacOS", "ChatGPT");
|
|
100
|
+
for (const target of [bundleRoot, binary]) {
|
|
101
|
+
signal?.throwIfAborted();
|
|
102
|
+
const verified = await checks.codesign(["--verify", "--strict", target], signal);
|
|
103
|
+
signal?.throwIfAborted();
|
|
104
|
+
if (verified.status !== 0) return `${target} failed code-signature verification`;
|
|
105
|
+
const details = await checks.codesign(["-dv", "--verbose=2", target], signal);
|
|
106
|
+
signal?.throwIfAborted();
|
|
107
|
+
const detailsProblem = bundleSignatureDetailsReason(target, details);
|
|
108
|
+
if (detailsProblem) return detailsProblem;
|
|
109
|
+
}
|
|
110
|
+
return null;
|
|
111
|
+
}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { lstatSync } from "node:fs";
|
|
2
|
+
import { dirname, join, relative, sep } from "node:path";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Launch and restore execute code from a discovered bundle, so the bundle must be
|
|
6
|
+
* OpenAI-signed and pass ownership/permission checks along its filesystem path. Bundle
|
|
7
|
+
* identifier alone (what discovery checks) is plain text in Info.plist that anyone can copy.
|
|
8
|
+
*/
|
|
9
|
+
export const OPENAI_TEAM_ID = "2DC432GLL2";
|
|
10
|
+
|
|
11
|
+
export interface BundleTrustDeps {
|
|
12
|
+
readonly uid: number;
|
|
13
|
+
readonly adminGroupId?: number;
|
|
14
|
+
stat(path: string): { uid: number; gid?: number; mode: number; isFile: boolean; isDirectory: boolean; isSymbolicLink: boolean } | null;
|
|
15
|
+
codesign(args: readonly string[]): { status: number | null; output: string };
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export interface AsyncBundleTrustDeps extends Omit<BundleTrustDeps, "codesign"> {
|
|
19
|
+
codesign(args: readonly string[], signal?: AbortSignal): Promise<{ status: number | null; output: string }>;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export function bundleTrustStat(path: string): ReturnType<BundleTrustDeps["stat"]> {
|
|
23
|
+
try {
|
|
24
|
+
const s = lstatSync(path);
|
|
25
|
+
return { uid: s.uid, gid: s.gid, mode: s.mode, isFile: s.isFile(), isDirectory: s.isDirectory(), isSymbolicLink: s.isSymbolicLink() };
|
|
26
|
+
} catch { return null; }
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
type FilesystemTrustDeps = Omit<BundleTrustDeps, "codesign">;
|
|
30
|
+
|
|
31
|
+
/** The inline bundle root is code: protect its file and directory entry like the bundle. */
|
|
32
|
+
export function untrustedLauncherFilesystemReason(path: string, deps: FilesystemTrustDeps, existing = true): string | null {
|
|
33
|
+
return (existing ? ownedSafely(deps, path, "file") : null) ?? untrustedAncestorReason(path, deps);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function ownedSafely(deps: FilesystemTrustDeps, path: string, kind: "file" | "directory"): string | null {
|
|
37
|
+
const s = deps.stat(path);
|
|
38
|
+
if (!s) return "is missing";
|
|
39
|
+
if (s.isSymbolicLink) return "is a symbolic link";
|
|
40
|
+
if (kind === "file" ? !s.isFile : !s.isDirectory) return `is not a ${kind}`;
|
|
41
|
+
if (s.uid !== 0 && s.uid !== deps.uid) return "is owned by another user";
|
|
42
|
+
if ((s.mode & 0o022) !== 0) return "is writable by group or others";
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** Protect the bundle's directory entry all the way to the filesystem root. */
|
|
47
|
+
function untrustedAncestorReason(bundleRoot: string, deps: FilesystemTrustDeps): string | null {
|
|
48
|
+
for (let dir = dirname(bundleRoot); ; dir = dirname(dir)) {
|
|
49
|
+
const s = deps.stat(dir);
|
|
50
|
+
if (!s || !s.isDirectory || s.isSymbolicLink) return `${dir} is not a regular ancestor directory`;
|
|
51
|
+
if (s.uid !== 0 && s.uid !== deps.uid) return `${dir} is owned by another user`;
|
|
52
|
+
// A trusted sticky parent protects the already-checked child from replacement.
|
|
53
|
+
// Root-owned admin-group install containers are privileged OS-controlled paths;
|
|
54
|
+
// resolve that group from the local directory service rather than assuming a GID.
|
|
55
|
+
const sticky = (s.mode & 0o1000) !== 0;
|
|
56
|
+
const privileged = s.uid === 0 && (s.mode & 0o002) === 0
|
|
57
|
+
&& deps.adminGroupId !== undefined && s.gid === deps.adminGroupId;
|
|
58
|
+
if ((s.mode & 0o022) !== 0 && !sticky && !privileged) return `${dir} is writable by group or others`;
|
|
59
|
+
if (dirname(dir) === dir) return null;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/** Shared filesystem policy; the callers separately verify both code signatures. */
|
|
64
|
+
export function untrustedBundleFilesystemReason(
|
|
65
|
+
bundleRoot: string,
|
|
66
|
+
binary: string | undefined = undefined,
|
|
67
|
+
deps: FilesystemTrustDeps,
|
|
68
|
+
): string | null {
|
|
69
|
+
const label = binary === undefined ? "app executable" : "app-server binary";
|
|
70
|
+
binary ??= join(bundleRoot, "Contents", "MacOS", "ChatGPT");
|
|
71
|
+
const inside = relative(join(bundleRoot, "Contents"), binary);
|
|
72
|
+
if (!inside || inside.startsWith("..") || inside.startsWith(sep)) return `the ${label} is outside the bundle`;
|
|
73
|
+
const fileProblem = ownedSafely(deps, binary, "file");
|
|
74
|
+
if (fileProblem) return `the ${label} ${fileProblem}`;
|
|
75
|
+
for (let dir = dirname(binary); ; dir = dirname(dir)) {
|
|
76
|
+
const dirProblem = ownedSafely(deps, dir, "directory");
|
|
77
|
+
if (dirProblem) return `${dir} ${dirProblem}`;
|
|
78
|
+
if (dir === bundleRoot || dirname(dir) === dir) break;
|
|
79
|
+
}
|
|
80
|
+
const ancestorProblem = untrustedAncestorReason(bundleRoot, deps);
|
|
81
|
+
if (ancestorProblem) return ancestorProblem;
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
export function bundleSignatureDetailsReason(target: string, details: { status: number | null; output: string }): string | null {
|
|
86
|
+
return details.status !== 0 || !new RegExp(`^TeamIdentifier=${OPENAI_TEAM_ID}$`, "m").test(details.output)
|
|
87
|
+
? `${target} is not signed by OpenAI (team ${OPENAI_TEAM_ID})` : null;
|
|
88
|
+
}
|
|
@@ -1,23 +1,15 @@
|
|
|
1
1
|
import { spawnSync } from "node:child_process";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { bundleSignatureDetailsReason, bundleTrustStat, untrustedBundleFilesystemReason, type BundleTrustDeps } from "./bundle-trust-policy";
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
* OpenAI-signed and pass ownership/permission checks along its filesystem path. Bundle
|
|
8
|
-
* identifier alone (what discovery checks) is plain text in Info.plist that anyone can copy.
|
|
9
|
-
*/
|
|
10
|
-
export const OPENAI_TEAM_ID = "2DC432GLL2";
|
|
5
|
+
export { OPENAI_TEAM_ID, bundleSignatureDetailsReason, bundleTrustStat, untrustedBundleFilesystemReason } from "./bundle-trust-policy";
|
|
6
|
+
export type { BundleTrustDeps } from "./bundle-trust-policy";
|
|
11
7
|
|
|
12
8
|
const CODESIGN = "/usr/bin/codesign";
|
|
13
9
|
const CODESIGN_TIMEOUT_MS = 30_000;
|
|
14
10
|
|
|
15
|
-
export
|
|
16
|
-
|
|
17
|
-
readonly adminGroupId?: number;
|
|
18
|
-
stat(path: string): { uid: number; gid?: number; mode: number; isFile: boolean; isDirectory: boolean; isSymbolicLink: boolean } | null;
|
|
19
|
-
codesign(args: readonly string[]): { status: number | null; output: string };
|
|
20
|
-
}
|
|
11
|
+
export { defaultAsyncBundleTrustDeps, untrustedChatgptBundleReasonAsync } from "./bundle-trust-async";
|
|
12
|
+
export type { AsyncBundleTrustDeps, TrustCommandSpawn } from "./bundle-trust-async";
|
|
21
13
|
|
|
22
14
|
export function defaultBundleTrustDeps(): BundleTrustDeps {
|
|
23
15
|
const admin = spawnSync("/usr/bin/dscl", [".", "-read", "/Groups/admin", "PrimaryGroupID"], {
|
|
@@ -27,14 +19,7 @@ export function defaultBundleTrustDeps(): BundleTrustDeps {
|
|
|
27
19
|
return {
|
|
28
20
|
adminGroupId: adminId === undefined ? undefined : Number(adminId),
|
|
29
21
|
uid: typeof process.getuid === "function" ? process.getuid() : -1,
|
|
30
|
-
stat
|
|
31
|
-
try {
|
|
32
|
-
const s = lstatSync(path);
|
|
33
|
-
return { uid: s.uid, gid: s.gid, mode: s.mode, isFile: s.isFile(), isDirectory: s.isDirectory(), isSymbolicLink: s.isSymbolicLink() };
|
|
34
|
-
} catch {
|
|
35
|
-
return null;
|
|
36
|
-
}
|
|
37
|
-
},
|
|
22
|
+
stat: bundleTrustStat,
|
|
38
23
|
codesign(args) {
|
|
39
24
|
const result = spawnSync(CODESIGN, [...args], { encoding: "utf8", timeout: CODESIGN_TIMEOUT_MS });
|
|
40
25
|
return { status: result.status, output: `${result.stdout ?? ""}${result.stderr ?? ""}` };
|
|
@@ -42,66 +27,24 @@ export function defaultBundleTrustDeps(): BundleTrustDeps {
|
|
|
42
27
|
};
|
|
43
28
|
}
|
|
44
29
|
|
|
45
|
-
function ownedSafely(deps: BundleTrustDeps, path: string, kind: "file" | "directory"): string | null {
|
|
46
|
-
const s = deps.stat(path);
|
|
47
|
-
if (!s) return "is missing";
|
|
48
|
-
if (s.isSymbolicLink) return "is a symbolic link";
|
|
49
|
-
if (kind === "file" ? !s.isFile : !s.isDirectory) return `is not a ${kind}`;
|
|
50
|
-
if (s.uid !== 0 && s.uid !== deps.uid) return "is owned by another user";
|
|
51
|
-
if ((s.mode & 0o022) !== 0) return "is writable by group or others";
|
|
52
|
-
return null;
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
/** Protect the bundle's directory entry all the way to the filesystem root. */
|
|
56
|
-
function untrustedAncestorReason(bundleRoot: string, deps: BundleTrustDeps): string | null {
|
|
57
|
-
for (let dir = dirname(bundleRoot); ; dir = dirname(dir)) {
|
|
58
|
-
const s = deps.stat(dir);
|
|
59
|
-
if (!s || !s.isDirectory || s.isSymbolicLink) return `${dir} is not a regular ancestor directory`;
|
|
60
|
-
if (s.uid !== 0 && s.uid !== deps.uid) return `${dir} is owned by another user`;
|
|
61
|
-
// A trusted sticky parent protects the already-checked child from replacement.
|
|
62
|
-
// Root-owned admin-group install containers are privileged OS-controlled paths;
|
|
63
|
-
// resolve that group from the local directory service rather than assuming a GID.
|
|
64
|
-
const sticky = (s.mode & 0o1000) !== 0;
|
|
65
|
-
const privileged = s.uid === 0 && (s.mode & 0o002) === 0
|
|
66
|
-
&& deps.adminGroupId !== undefined && s.gid === deps.adminGroupId;
|
|
67
|
-
if ((s.mode & 0o022) !== 0 && !sticky && !privileged) return `${dir} is writable by group or others`;
|
|
68
|
-
if (dirname(dir) === dir) return null;
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
|
|
72
30
|
/**
|
|
73
|
-
* Null when the bundle root and
|
|
74
|
-
* Restore omits the app-server binary and validates the app shell instead
|
|
75
|
-
*
|
|
76
|
-
*
|
|
77
|
-
* binary itself, must be owned by root or this user and not group/other-writable, and both the
|
|
78
|
-
* bundle and the binary must pass strict code-signature verification under OpenAI's team ID.
|
|
79
|
-
* Ancestors above the bundle are also checked for POSIX directory-entry replacement rights.
|
|
31
|
+
* Null when the bundle root and selected executable pass filesystem and OpenAI signature checks.
|
|
32
|
+
* Restore omits the app-server binary and validates the app shell instead. Directories and the
|
|
33
|
+
* binary must be owned by root or this user, non-symlink, and not group/other-writable;
|
|
34
|
+
* ancestors also pass POSIX directory-entry replacement checks through the filesystem root.
|
|
80
35
|
*/
|
|
81
36
|
export function untrustedChatgptBundleReason(
|
|
82
37
|
bundleRoot: string,
|
|
83
38
|
binary: string | undefined = undefined,
|
|
84
39
|
deps: BundleTrustDeps = defaultBundleTrustDeps(),
|
|
85
40
|
): string | null {
|
|
86
|
-
const
|
|
41
|
+
const filesystemProblem = untrustedBundleFilesystemReason(bundleRoot, binary, deps);
|
|
42
|
+
if (filesystemProblem) return filesystemProblem;
|
|
87
43
|
binary ??= join(bundleRoot, "Contents", "MacOS", "ChatGPT");
|
|
88
|
-
const inside = relative(bundleRoot, binary);
|
|
89
|
-
if (!inside || inside.startsWith("..") || inside.startsWith(sep)) return `the ${label} is outside the bundle`;
|
|
90
|
-
const fileProblem = ownedSafely(deps, binary, "file");
|
|
91
|
-
if (fileProblem) return `the ${label} ${fileProblem}`;
|
|
92
|
-
for (let dir = dirname(binary); ; dir = dirname(dir)) {
|
|
93
|
-
const dirProblem = ownedSafely(deps, dir, "directory");
|
|
94
|
-
if (dirProblem) return `${dir} ${dirProblem}`;
|
|
95
|
-
if (dir === bundleRoot || dirname(dir) === dir) break;
|
|
96
|
-
}
|
|
97
|
-
const ancestorProblem = untrustedAncestorReason(bundleRoot, deps);
|
|
98
|
-
if (ancestorProblem) return ancestorProblem;
|
|
99
44
|
for (const target of [bundleRoot, binary]) {
|
|
100
45
|
if (deps.codesign(["--verify", "--strict", target]).status !== 0) return `${target} failed code-signature verification`;
|
|
101
|
-
const
|
|
102
|
-
if (
|
|
103
|
-
return `${target} is not signed by OpenAI (team ${OPENAI_TEAM_ID})`;
|
|
104
|
-
}
|
|
46
|
+
const detailsProblem = bundleSignatureDetailsReason(target, deps.codesign(["-dv", "--verbose=2", target]));
|
|
47
|
+
if (detailsProblem) return detailsProblem;
|
|
105
48
|
}
|
|
106
49
|
return null;
|
|
107
50
|
}
|
|
@@ -3,6 +3,8 @@ import { randomBytes } from "node:crypto";
|
|
|
3
3
|
import { join, posix } from "node:path";
|
|
4
4
|
import { getConfigDir } from "../../config/paths";
|
|
5
5
|
import { selfLaunchArgv } from "../../lib/self-launch-argv";
|
|
6
|
+
import { defaultBundleTrustDeps } from "./bundle-trust";
|
|
7
|
+
import { untrustedLauncherFilesystemReason, type BundleTrustDeps } from "./bundle-trust-policy";
|
|
6
8
|
|
|
7
9
|
export const CHATGPT_APP_CODEX_BINARY = "/Applications/ChatGPT.app/Contents/Resources/codex-cli/CodexCLI.app/Contents/MacOS/codex";
|
|
8
10
|
|
|
@@ -47,24 +49,41 @@ function shellQuote(value: string): string {
|
|
|
47
49
|
}
|
|
48
50
|
|
|
49
51
|
/**
|
|
50
|
-
* A failed
|
|
52
|
+
* A failed filter self-test runs the verified binary with untouched stdout.
|
|
53
|
+
* Executable verification is required on every invocation, including passthrough and respawns.
|
|
51
54
|
* A filter that passes the self-test and then dies mid-session closes the pipe.
|
|
52
55
|
* Expected (not yet validated against the bundled app-server): the server gets SIGPIPE or a
|
|
53
56
|
* write error and Desktop respawns it through the same launcher.
|
|
54
57
|
*/
|
|
55
|
-
export function buildChatgptShimLauncher(
|
|
58
|
+
export function buildChatgptShimLauncher(
|
|
59
|
+
argv: readonly string[],
|
|
60
|
+
real = CHATGPT_APP_CODEX_BINARY,
|
|
61
|
+
validator: readonly string[] = [process.execPath, ...selfLaunchArgv(["internal", "codex-exec-target"])],
|
|
62
|
+
bundleRoot = /^(.*?\.app)\/Contents\//i.exec(real)?.[1],
|
|
63
|
+
): string {
|
|
56
64
|
return `#!/bin/bash
|
|
57
65
|
# opencodex (experimental): ChatGPT app-server stdout passes through the quota-gate filter.
|
|
58
66
|
REAL=${shellQuote(real)}
|
|
59
|
-
FILTER=(${argv.map(shellQuote).join(" ")})
|
|
67
|
+
${bundleRoot === undefined ? "" : `BUNDLE_ROOT=${shellQuote(bundleRoot)}\n`}FILTER=(${argv.map(shellQuote).join(" ")})
|
|
68
|
+
VALIDATE=(${validator.map(shellQuote).join(" ")})
|
|
60
69
|
if [ ! -x "$REAL" ]; then
|
|
61
70
|
echo "opencodex (experimental): the bundled app-server is no longer at $REAL; run 'ocx chatgpt launch' again or 'ocx chatgpt restore'." >&2
|
|
62
71
|
exit 127
|
|
63
72
|
fi
|
|
73
|
+
validate_real() {
|
|
74
|
+
local target
|
|
75
|
+
if [ ! -x "\${VALIDATE[0]}" ] || ! target=$("\${VALIDATE[@]}" ${bundleRoot === undefined ? "" : '--bundle-root "$BUNDLE_ROOT" '}-- "$REAL") || [ -z "$target" ]; then
|
|
76
|
+
echo "opencodex: app-server execution verification failed; run 'ocx chatgpt launch' again or 'ocx chatgpt restore'." >&2
|
|
77
|
+
return 126
|
|
78
|
+
fi
|
|
79
|
+
REAL="$target"
|
|
80
|
+
}
|
|
64
81
|
if [ "$(uname -s)" = "Darwin" ] && [ -x "\${FILTER[0]}" ] \\
|
|
65
82
|
&& "\${FILTER[@]}" --self-test >/dev/null 2>&1; then
|
|
83
|
+
validate_real || exit 126
|
|
66
84
|
exec "$REAL" "$@" > >(exec "\${FILTER[@]}")
|
|
67
85
|
fi
|
|
86
|
+
validate_real || exit 126
|
|
68
87
|
exec "$REAL" "$@"
|
|
69
88
|
`;
|
|
70
89
|
}
|
|
@@ -74,17 +93,32 @@ exec "$REAL" "$@"
|
|
|
74
93
|
* launcher, so an existing symbolic link is replaced rather than followed and a respawn during
|
|
75
94
|
* the write never runs a half-written script.
|
|
76
95
|
*/
|
|
77
|
-
export function writeChatgptShimLauncher(
|
|
96
|
+
export function writeChatgptShimLauncher(
|
|
97
|
+
configDir = getConfigDir(), real = CHATGPT_APP_CODEX_BINARY,
|
|
98
|
+
bundleRoot = /^(.*?\.app)\/Contents\//i.exec(real)?.[1],
|
|
99
|
+
filesystem: Pick<BundleTrustDeps, "uid" | "stat" | "adminGroupId"> | undefined = process.platform === "darwin" ? defaultBundleTrustDeps() : undefined,
|
|
100
|
+
): string {
|
|
101
|
+
if (!bundleRoot || !posix.isAbsolute(bundleRoot) || !real.startsWith(bundleRoot + "/Contents/")) {
|
|
102
|
+
throw new Error("the app-server launcher requires its discovered bundle root");
|
|
103
|
+
}
|
|
78
104
|
mkdirSync(configDir, { recursive: true });
|
|
79
105
|
const path = chatgptShimLauncherPath(configDir);
|
|
80
106
|
const argv = [process.execPath, ...selfLaunchArgv(["internal", "chatgpt-app-server-filter"])];
|
|
81
107
|
const temp = `${path}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`;
|
|
108
|
+
let created = false;
|
|
109
|
+
const assertFilesystem = (file: string, existing: boolean) => {
|
|
110
|
+
const reason = filesystem && untrustedLauncherFilesystemReason(file, filesystem, existing);
|
|
111
|
+
if (reason) throw new Error(`unsafe app-server launcher: ${reason}`);
|
|
112
|
+
};
|
|
82
113
|
try {
|
|
83
|
-
|
|
114
|
+
assertFilesystem(temp, false);
|
|
115
|
+
writeFileSync(temp, buildChatgptShimLauncher(argv, real, undefined, bundleRoot), { mode: 0o755, flag: "wx" });
|
|
116
|
+
created = true;
|
|
84
117
|
chmodSync(temp, 0o755);
|
|
118
|
+
assertFilesystem(temp, true);
|
|
85
119
|
renameSync(temp, path);
|
|
86
120
|
} catch (error) {
|
|
87
|
-
try { unlinkSync(temp); } catch { /* the
|
|
121
|
+
if (created) { try { unlinkSync(temp); } catch { /* preserve the publication error */ } }
|
|
88
122
|
throw error;
|
|
89
123
|
}
|
|
90
124
|
return path;
|
|
@@ -100,7 +100,11 @@ function detectFeatures(body: unknown, anthropicBeta?: string): Set<ClaudeFeatur
|
|
|
100
100
|
if (Object.hasOwn(tool, "cache_control")) codes.add("cache_control");
|
|
101
101
|
if (Object.hasOwn(tool, "input_examples")) codes.add("input_examples");
|
|
102
102
|
if (tool.strict === true) codes.add("strict_tools");
|
|
103
|
-
|
|
103
|
+
// Valid function definitions lower to eager tools when the destination lacks deferral.
|
|
104
|
+
// Top-level deferral and declarations without a callable definition remain unsupported.
|
|
105
|
+
const eagerFunction = typeof tool.name === "string" && tool.name.length > 0 && isRec(tool.input_schema)
|
|
106
|
+
&& (tool.type === undefined || tool.type === "function" || tool.type === "custom");
|
|
107
|
+
if (tool.defer === true || (tool.defer_loading === true && !eagerFunction)) codes.add("deferred_tools");
|
|
104
108
|
if (nonDirectCaller(tool.allowed_callers)) codes.add("caller_mode");
|
|
105
109
|
const type = tool.type;
|
|
106
110
|
// Ordinary client function names do not convey hosted execution semantics.
|