@bitkyc08/opencodex 2.93.0 → 2.95.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { guardedRenameSync, ownedArtifactRm } from "./mutation-guard.mjs";
|
|
1
2
|
/**
|
|
2
3
|
* Transactional npm self-update: stage -> verify -> swap -> rollback (#1942 / #1849).
|
|
3
4
|
*
|
|
@@ -21,9 +22,9 @@
|
|
|
21
22
|
* proves provenance only while this process owns the fresh path, not after another local
|
|
22
23
|
* process could have replaced it. Other neighbouring entries are likewise left alone (#5624).
|
|
23
24
|
*/
|
|
24
|
-
import {
|
|
25
|
+
import { probeSpawnSync } from "./mutation-guard.mjs";
|
|
25
26
|
import { randomBytes } from "node:crypto";
|
|
26
|
-
import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync,
|
|
27
|
+
import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync, writeFileSync } from "node:fs";
|
|
27
28
|
import { basename, dirname, join } from "node:path";
|
|
28
29
|
|
|
29
30
|
/**
|
|
@@ -195,7 +196,7 @@ function createOwnedStage(scopeDir, pkgName, deps = {}) {
|
|
|
195
196
|
if (process.platform !== "win32") mkdir(join(stageRoot, "lib"));
|
|
196
197
|
} catch (error) {
|
|
197
198
|
// Created by this call and not yet handed to npm: remove it rather than leave a partial stage.
|
|
198
|
-
try {
|
|
199
|
+
try { ownedArtifactRm(stageRoot, { recursive: true, force: true }); } catch { /* reported by the caller */ }
|
|
199
200
|
throw error;
|
|
200
201
|
}
|
|
201
202
|
return stageRoot;
|
|
@@ -221,7 +222,7 @@ function readOwnedStageMarker(dir, pkgName) {
|
|
|
221
222
|
function removeWithRetry(rm, target, attempts = 3) {
|
|
222
223
|
for (let attempt = 0; ; attempt += 1) {
|
|
223
224
|
try {
|
|
224
|
-
|
|
225
|
+
ownedArtifactRm(target, { recursive: true, force: true }, rm);
|
|
225
226
|
return null;
|
|
226
227
|
} catch (error) {
|
|
227
228
|
const code = typeof error?.code === "string" ? error.code : "EUNKNOWN";
|
|
@@ -238,7 +239,7 @@ function removeWithRetry(rm, target, attempts = 3) {
|
|
|
238
239
|
* provably ours and the next update can finish the job.
|
|
239
240
|
*/
|
|
240
241
|
export function removeOwnedStage(stageRoot, deps = {}) {
|
|
241
|
-
const rm = deps.rm
|
|
242
|
+
const rm = deps.rm;
|
|
242
243
|
let names;
|
|
243
244
|
try {
|
|
244
245
|
names = readdirSync(stageRoot);
|
|
@@ -305,7 +306,7 @@ export function sweepUpdateLeftovers({ packageDir, pkgName, log = () => {}, deps
|
|
|
305
306
|
|
|
306
307
|
/** Whether the launcher that ran this npm update can still drive service/tray recovery. */
|
|
307
308
|
export function launcherUsableAfterNpmUpdate(tx) {
|
|
308
|
-
return Boolean(tx?.ok || tx?.rolledBack === true || ["stage", "verify", "swap-backup"].includes(tx?.phase));
|
|
309
|
+
return Boolean(tx?.ok || tx?.rolledBack === true || ["stage", "verify", "authorize", "swap-backup"].includes(tx?.phase));
|
|
309
310
|
}
|
|
310
311
|
|
|
311
312
|
/** Largest regular file under a directory tree (bounded depth) — locates the Bun binary. */
|
|
@@ -328,10 +329,10 @@ function findLargestFile(root, depth = 3) {
|
|
|
328
329
|
}
|
|
329
330
|
|
|
330
331
|
/** Bounded Windows-class rename retry: EPERM/EBUSY/EACCES from AV/indexers clears in ms. */
|
|
331
|
-
function renameWithRetry(rename, from, to, attempts = 5) {
|
|
332
|
+
function renameWithRetry(rename, from, to, authorize = () => true, attempts = 5) {
|
|
332
333
|
for (let attempt = 0; ; attempt += 1) {
|
|
333
334
|
try {
|
|
334
|
-
|
|
335
|
+
guardedRenameSync(authorize, from, to, rename);
|
|
335
336
|
return;
|
|
336
337
|
} catch (error) {
|
|
337
338
|
const code = error?.code;
|
|
@@ -350,7 +351,7 @@ function recoveryMarkerPath(scopeDir) {
|
|
|
350
351
|
|
|
351
352
|
/** Startup probe: restore a backup when the live tree is broken (D4 power-loss rows). */
|
|
352
353
|
export function bootRestoreProbe(packageDir, deps = {}) {
|
|
353
|
-
const rename = deps.rename
|
|
354
|
+
const rename = deps.rename;
|
|
354
355
|
const scopeDir = dirname(packageDir);
|
|
355
356
|
let backups = [];
|
|
356
357
|
try {
|
|
@@ -365,15 +366,15 @@ export function bootRestoreProbe(packageDir, deps = {}) {
|
|
|
365
366
|
if (liveOk) {
|
|
366
367
|
// Live is healthy: the backups are leftovers from a completed swap. Reap them.
|
|
367
368
|
for (const name of backups) {
|
|
368
|
-
try {
|
|
369
|
+
try { ownedArtifactRm(join(scopeDir, name), { recursive: true, force: true }); } catch { /* keep */ }
|
|
369
370
|
}
|
|
370
|
-
try {
|
|
371
|
+
try { ownedArtifactRm(recoveryMarkerPath(scopeDir), { force: true }); } catch { /* keep */ }
|
|
371
372
|
return { action: "reaped", count: backups.length };
|
|
372
373
|
}
|
|
373
374
|
if (!existsSync(join(newestBackup, "package.json"))) return { action: "none" };
|
|
374
375
|
try {
|
|
375
|
-
try {
|
|
376
|
-
|
|
376
|
+
try { ownedArtifactRm(packageDir, { recursive: true, force: true }); } catch { /* may not exist */ }
|
|
377
|
+
guardedRenameSync(() => true, newestBackup, packageDir, rename);
|
|
377
378
|
return { action: "restored", from: newestBackup };
|
|
378
379
|
} catch (error) {
|
|
379
380
|
return { action: "failed", error: error?.message ?? String(error) };
|
|
@@ -390,10 +391,11 @@ function* npmUpdateTransaction({
|
|
|
390
391
|
targetVersion,
|
|
391
392
|
tag,
|
|
392
393
|
cachePath,
|
|
394
|
+
mayReplacePackage = () => true,
|
|
393
395
|
log = () => {},
|
|
394
396
|
deps = {},
|
|
395
397
|
}) {
|
|
396
|
-
const rename = deps.rename
|
|
398
|
+
const rename = deps.rename;
|
|
397
399
|
const scopeDir = dirname(packageDir);
|
|
398
400
|
// Leftovers from earlier attempts are only reported; fresh unique stages step around them. This never fails.
|
|
399
401
|
try { sweepUpdateLeftovers({ packageDir, pkgName, log, deps }); } catch { /* report-only */ }
|
|
@@ -462,6 +464,14 @@ function* npmUpdateTransaction({
|
|
|
462
464
|
return { ok: false, phase: "verify", error: "staged tree failed verification: " + staged.failures.join("; ") };
|
|
463
465
|
}
|
|
464
466
|
|
|
467
|
+
// The installer may have awaited a supervisor. Only a synchronous true authorizes
|
|
468
|
+
// the live swap; errors, promises and refusals leave live untouched.
|
|
469
|
+
let authorized = false;
|
|
470
|
+
try { authorized = mayReplacePackage() === true; } catch { /* fail closed */ }
|
|
471
|
+
if (!authorized) {
|
|
472
|
+
discardStage();
|
|
473
|
+
return { ok: false, phase: "authorize", error: "package replacement authority changed; rerun from the beginning" };
|
|
474
|
+
}
|
|
465
475
|
// D3: swap. live -> backup, stage -> live, re-verify live, rollback on failure.
|
|
466
476
|
const backupRoot = join(scopeDir, stampedName(".ocx-backup"));
|
|
467
477
|
const backupPackage = join(backupRoot, "opencodex");
|
|
@@ -472,11 +482,11 @@ function* npmUpdateTransaction({
|
|
|
472
482
|
return { ok: false, phase: "swap-backup", error: "could not create backup directory: " + (error?.message ?? String(error)) };
|
|
473
483
|
}
|
|
474
484
|
try {
|
|
475
|
-
renameWithRetry(rename, packageDir, backupPackage);
|
|
485
|
+
renameWithRetry(rename, packageDir, backupPackage, () => mayReplacePackage() === true);
|
|
476
486
|
} catch (error) {
|
|
477
487
|
discardStage();
|
|
478
|
-
try {
|
|
479
|
-
return { ok: false, phase: "swap-backup", error: "could not move live tree aside: " + (error?.message ?? String(error)) };
|
|
488
|
+
try { ownedArtifactRm(backupRoot, { recursive: true, force: true }); } catch { /* best effort */ }
|
|
489
|
+
return { ok: false, phase: error?.code === "EUPDATEAUTHORITY" ? "authorize" : "swap-backup", error: "could not move live tree aside: " + (error?.message ?? String(error)) };
|
|
480
490
|
}
|
|
481
491
|
try {
|
|
482
492
|
renameWithRetry(rename, stagedPackage, packageDir);
|
|
@@ -485,7 +495,7 @@ function* npmUpdateTransaction({
|
|
|
485
495
|
try {
|
|
486
496
|
renameWithRetry(rename, backupPackage, packageDir);
|
|
487
497
|
discardStage();
|
|
488
|
-
try {
|
|
498
|
+
try { ownedArtifactRm(backupRoot, { recursive: true, force: true }); } catch { /* best effort */ }
|
|
489
499
|
return { ok: false, phase: "swap-live", rolledBack: true, error: "could not place staged tree: " + (error?.message ?? String(error)) };
|
|
490
500
|
} catch (rollbackError) {
|
|
491
501
|
writeFileSync(recoveryMarkerPath(scopeDir), JSON.stringify({
|
|
@@ -508,7 +518,7 @@ function* npmUpdateTransaction({
|
|
|
508
518
|
renameWithRetry(rename, packageDir, join(stageRoot, "rejected"));
|
|
509
519
|
renameWithRetry(rename, backupPackage, packageDir);
|
|
510
520
|
discardStage();
|
|
511
|
-
try {
|
|
521
|
+
try { ownedArtifactRm(backupRoot, { recursive: true, force: true }); } catch { /* best effort */ }
|
|
512
522
|
return { ok: false, phase: "post-verify", rolledBack: true, error: "live tree failed post-swap verification: " + liveCheck.failures.join("; ") };
|
|
513
523
|
} catch (rollbackError) {
|
|
514
524
|
writeFileSync(recoveryMarkerPath(scopeDir), JSON.stringify({
|
|
@@ -33,7 +33,7 @@ export function manualUpdateFailureGuidance({ bin, args, owner, platform = proce
|
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
/** Phases in which the live package was never touched. */
|
|
36
|
-
const UNTOUCHED_PHASES = new Set(["stage", "verify", "swap-backup"]);
|
|
36
|
+
const UNTOUCHED_PHASES = new Set(["stage", "verify", "authorize", "swap-backup"]);
|
|
37
37
|
|
|
38
38
|
/**
|
|
39
39
|
* @param {{ phase?: string; rolledBack?: boolean; pkgName: string; version?: string; tag?: string }} failure
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { accessSync, constants, realpathSync, statSync } from "node:fs";
|
|
1
|
+
import { probeSpawn, probeSpawnSync } from "./mutation-guard.mjs";
|
|
2
|
+
import { accessSync, constants, readFileSync, realpathSync, statSync } from "node:fs";
|
|
3
3
|
import { dirname, isAbsolute } from "node:path";
|
|
4
4
|
|
|
5
5
|
/**
|
|
@@ -106,11 +106,11 @@ const systemdRunHooks: SystemdRunHooks = {
|
|
|
106
106
|
// Run a real scope with the same absolute binary as its harmless version payload.
|
|
107
107
|
// Probing only the outer --version would not verify the user bus.
|
|
108
108
|
probeScope: path => {
|
|
109
|
-
const probe =
|
|
109
|
+
const probe = probeSpawnSync(path, [...SYSTEMD_SCOPE_ARGS, path, "--version"], { stdio: "ignore", timeout: 5_000, env: scopeProbeEnvironment() });
|
|
110
110
|
return !probe.error && probe.status === 0;
|
|
111
111
|
},
|
|
112
112
|
probeScopeAsync: path => new Promise<boolean>(resolve => {
|
|
113
|
-
const probe =
|
|
113
|
+
const probe = probeSpawn(path, [...SYSTEMD_SCOPE_ARGS, path, "--version"], { stdio: "ignore", env: scopeProbeEnvironment() });
|
|
114
114
|
probe.unref();
|
|
115
115
|
const timer = setTimeout(() => {
|
|
116
116
|
try { probe.kill("SIGKILL"); } catch { /* failed termination is not a successful probe */ }
|
|
@@ -171,6 +171,76 @@ export function resetSystemdRunProbeForTests(): void {
|
|
|
171
171
|
systemdRunProbePending = undefined;
|
|
172
172
|
}
|
|
173
173
|
|
|
174
|
+
export interface DashboardRestartContext {
|
|
175
|
+
platform?: NodeJS.Platform;
|
|
176
|
+
env?: NodeJS.ProcessEnv;
|
|
177
|
+
/** The resolved scope launcher, or undefined when none is usable. */
|
|
178
|
+
systemdRun: string | undefined;
|
|
179
|
+
/** The OpenCodex-managed user unit (`TASK` in src/service/state.ts) without `.service`. */
|
|
180
|
+
unitName: string;
|
|
181
|
+
readCgroup?: () => string;
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
function cgroupPaths(cgroup: string): string[] {
|
|
185
|
+
const rows = cgroup.split("\n").map(line => line.split(":")).filter(parts => parts.length >= 3);
|
|
186
|
+
// cgroup v2 ("0::") or the v1 systemd hierarchy name the unit; controller lines are noise.
|
|
187
|
+
const unified = rows.filter(parts => parts[1] === "" || parts[1] === "name=systemd");
|
|
188
|
+
return (unified.length > 0 ? unified : rows).map(parts => parts.slice(2).join(":").trim()).filter(Boolean);
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
/** The innermost systemd unit named by a cgroup path: its last `.service` or `.scope` component. */
|
|
192
|
+
function innermostUnit(path: string): { unit: string; index: number; parts: string[] } | null {
|
|
193
|
+
const parts = path.split("/");
|
|
194
|
+
for (let index = parts.length - 1; index >= 0; index--) {
|
|
195
|
+
const part = parts[index]!;
|
|
196
|
+
if (part.endsWith(".service") || part.endsWith(".scope")) return { unit: part, index, parts };
|
|
197
|
+
}
|
|
198
|
+
return null;
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
/**
|
|
202
|
+
* Why a dashboard update must not run against this proxy, or null when it may (#7967).
|
|
203
|
+
*
|
|
204
|
+
* A dashboard update stops the proxy before it replaces the package, with or without a requested
|
|
205
|
+
* restart, and the worker survives that stop only from its own transient scope. Only OpenCodex's
|
|
206
|
+
* own user unit is restarted by the updater. A proxy inside any systemd service -- detected from
|
|
207
|
+
* `INVOCATION_ID` or from a `.service` cgroup, so a unit that unsets the variable is still seen
|
|
208
|
+
* -- is therefore refused unless the scope launcher works and the cgroup places it in
|
|
209
|
+
* `<unitName>.service` under a per-user manager (a delegated child cgroup below it is fine). A
|
|
210
|
+
* custom system unit with `User=` would lose the worker with its cgroup, and the restart would aim
|
|
211
|
+
* at an unrelated, possibly inactive user unit. Outside systemd nothing changes.
|
|
212
|
+
*/
|
|
213
|
+
export function dashboardRestartRefusal(context: DashboardRestartContext): string | null {
|
|
214
|
+
const platform = context.platform ?? process.platform;
|
|
215
|
+
const env = context.env ?? process.env;
|
|
216
|
+
if (platform !== "linux") return null;
|
|
217
|
+
let cgroup: string | null;
|
|
218
|
+
try { cgroup = (context.readCgroup ?? (() => readFileSync("/proc/self/cgroup", "utf8")))(); }
|
|
219
|
+
catch { cgroup = null; }
|
|
220
|
+
const paths = cgroup === null ? [] : cgroupPaths(cgroup);
|
|
221
|
+
// The innermost unit decides: a terminal or app scope below the per-user manager
|
|
222
|
+
// (user@<uid>.service/app.slice/vte-spawn-1.scope) is not a service; a system or user service is.
|
|
223
|
+
const units: ReturnType<typeof innermostUnit>[] = paths.map(innermostUnit);
|
|
224
|
+
const observed = units.filter((found): found is NonNullable<typeof found> => found !== null);
|
|
225
|
+
// The observed cgroup wins over an inherited INVOCATION_ID (a shell moved into its own scope
|
|
226
|
+
// keeps the variable); without an observation the variable alone fails closed.
|
|
227
|
+
const inService = observed.length > 0
|
|
228
|
+
? observed.some(found => found.unit.endsWith(".service") && !found.unit.startsWith("user@"))
|
|
229
|
+
: Boolean(env.INVOCATION_ID);
|
|
230
|
+
if (!inService) return null;
|
|
231
|
+
const manual = "Stop the service with its own manager, update the package from a shell (for example `ocx update`), then start the service again.";
|
|
232
|
+
if (!context.systemdRun || !env.INVOCATION_ID) {
|
|
233
|
+
return `Dashboard update is unavailable: this proxy runs inside a systemd service, and the update worker cannot leave the service's cgroup (no usable \`systemd-run --user --scope\`), so stopping the proxy for the update would stop the update too. ${manual}`;
|
|
234
|
+
}
|
|
235
|
+
const ownUnit = `${context.unitName}.service`;
|
|
236
|
+
const managedByOwnUnit = units.some((found): boolean => found !== null && found.unit === ownUnit
|
|
237
|
+
&& found.parts.slice(0, found.index).some((part: string) => part.startsWith("user@") && part.endsWith(".service")));
|
|
238
|
+
if (!managedByOwnUnit) {
|
|
239
|
+
return `Dashboard update is unavailable: this proxy runs under a systemd unit that is not OpenCodex's own \`${context.unitName}.service\` user unit, so the updater can neither keep its worker alive nor restart that unit safely. ${manual}`;
|
|
240
|
+
}
|
|
241
|
+
return null;
|
|
242
|
+
}
|
|
243
|
+
|
|
174
244
|
export function guiUpdateWorkerCommand(
|
|
175
245
|
execPath: string,
|
|
176
246
|
args: readonly string[],
|
package/src/usage/log.ts
CHANGED
|
@@ -354,6 +354,8 @@ export interface PersistedUsageEntry {
|
|
|
354
354
|
usage?: OcxUsage;
|
|
355
355
|
totalTokens?: number;
|
|
356
356
|
attempts?: PersistedUsageAttempt[];
|
|
357
|
+
/** A persisted attempt roster lost at least one malformed entry during normalization. */
|
|
358
|
+
attemptNormalizationDropped?: boolean;
|
|
357
359
|
/** Aggregated upstream spend for this logical request; additive, older rows omit it. */
|
|
358
360
|
spend?: PersistedRequestSpend;
|
|
359
361
|
/** Provenance of this row's cache detail; absent rows are reconstructed, never assumed observed. */
|
|
@@ -536,6 +538,10 @@ export function usageTotalTokens(usage: OcxUsage | undefined): number | undefine
|
|
|
536
538
|
* Providers whose adapters can only estimate usage (no authoritative per-turn frame).
|
|
537
539
|
* Callers should pass the route ADAPTER when available; the name-prefix match is a
|
|
538
540
|
* fallback for paths that only know the configured provider name (e.g. "cursor-mykey").
|
|
541
|
+
*
|
|
542
|
+
* Kiro is on the list because most of what reaches the log is a guess: a figure taken off the
|
|
543
|
+
* bridged Responses wire derives its input from the context checkpoint. The adapter opts a
|
|
544
|
+
* measured figure out with `upstreamReported`, set where it reads Kiro's own tokenUsage frame.
|
|
539
545
|
*/
|
|
540
546
|
function isEstimatedUsageProvider(providerOrAdapter: string): boolean {
|
|
541
547
|
return providerOrAdapter === "kiro" || providerOrAdapter.startsWith("kiro-")
|
|
@@ -556,7 +562,9 @@ export function usageForFinalLog(
|
|
|
556
562
|
): OcxUsage | undefined {
|
|
557
563
|
if (!usage) return undefined;
|
|
558
564
|
if (locallyAnswered) return usage;
|
|
559
|
-
if (usage.estimated || isEstimatedUsageProvider(provider)
|
|
565
|
+
if (usage.estimated || (isEstimatedUsageProvider(provider) && !usage.upstreamReported)) {
|
|
566
|
+
return { ...usage, estimated: true };
|
|
567
|
+
}
|
|
560
568
|
return usage;
|
|
561
569
|
}
|
|
562
570
|
|
|
@@ -877,7 +885,7 @@ export function isValidReasoningWireValue(
|
|
|
877
885
|
|| (wireField === "reasoning.enabled" && typeof wireValue === "boolean");
|
|
878
886
|
}
|
|
879
887
|
|
|
880
|
-
function normalizedAttempts(raw: unknown): PersistedUsageAttempt[] {
|
|
888
|
+
export function normalizedAttempts(raw: unknown): PersistedUsageAttempt[] {
|
|
881
889
|
if (!Array.isArray(raw)) return [];
|
|
882
890
|
return raw.map(normalizeUsageAttempt)
|
|
883
891
|
.filter((attempt): attempt is PersistedUsageAttempt => attempt !== null);
|
|
@@ -992,7 +1000,7 @@ function normalizeUsageEntry(entry: PersistedUsageEntry): PersistedUsageEntry {
|
|
|
992
1000
|
const jevDecision = normalizePersistedJevDecision(entry.jevDecision);
|
|
993
1001
|
const spend = normalizeRequestSpend(entry.spend);
|
|
994
1002
|
const protocolTrace = parseProtocolTraceV1(entry.protocolTrace);
|
|
995
|
-
|
|
1003
|
+
const normalized: PersistedUsageEntry = {
|
|
996
1004
|
requestId: entry.requestId,
|
|
997
1005
|
...(isLogicalRequestId(entry.logicalRequestId) ? { logicalRequestId: entry.logicalRequestId } : {}),
|
|
998
1006
|
timestamp: entry.timestamp,
|
|
@@ -1066,6 +1074,9 @@ function normalizeUsageEntry(entry: PersistedUsageEntry): PersistedUsageEntry {
|
|
|
1066
1074
|
...(entry.usage ? { usage: normalizeUsageValue(entry.usage) } : {}),
|
|
1067
1075
|
...(typeof entry.totalTokens === "number" ? { totalTokens: entry.totalTokens } : {}),
|
|
1068
1076
|
...(Array.isArray(entry.attempts) ? { attempts } : {}),
|
|
1077
|
+
...(entry.attemptNormalizationDropped === true
|
|
1078
|
+
&& Object.prototype.propertyIsEnumerable.call(entry, "attemptNormalizationDropped")
|
|
1079
|
+
? { attemptNormalizationDropped: true } : {}),
|
|
1069
1080
|
...(spend ? { spend } : {}),
|
|
1070
1081
|
...(isKnownCacheTelemetryProvenance(entry.cacheProvenance)
|
|
1071
1082
|
? { cacheProvenance: entry.cacheProvenance }
|
|
@@ -1088,6 +1099,12 @@ function normalizeUsageEntry(entry: PersistedUsageEntry): PersistedUsageEntry {
|
|
|
1088
1099
|
...(protocolTrace ? { protocolTrace } : {}),
|
|
1089
1100
|
...normalizeRequestFailureAttribution(entry),
|
|
1090
1101
|
};
|
|
1102
|
+
if (normalized.attemptNormalizationDropped !== true && (entry.attemptNormalizationDropped === true
|
|
1103
|
+
|| (Array.isArray(entry.attempts) && attempts.length < entry.attempts.length))) {
|
|
1104
|
+
// Preserve the read-time loss signal without changing legacy ledger serialization.
|
|
1105
|
+
Object.defineProperty(normalized, "attemptNormalizationDropped", { value: true, enumerable: false });
|
|
1106
|
+
}
|
|
1107
|
+
return normalized;
|
|
1091
1108
|
}
|
|
1092
1109
|
|
|
1093
1110
|
// Bound hot-path filesystem hardening to once per second while ensuring an external mode
|
|
@@ -1136,7 +1153,11 @@ export function setUsageLedgerAppendHook(hook: (() => void) | null): void {
|
|
|
1136
1153
|
}
|
|
1137
1154
|
|
|
1138
1155
|
export function appendUsageEntry(entry: PersistedUsageEntry): void {
|
|
1139
|
-
const
|
|
1156
|
+
const normalized = normalizeUsageEntry(entry);
|
|
1157
|
+
// Once invalid attempts are removed, persist their loss so future reads can still report it.
|
|
1158
|
+
const line = `${JSON.stringify(normalized.attemptNormalizationDropped === true
|
|
1159
|
+
? { ...normalized, attemptNormalizationDropped: true }
|
|
1160
|
+
: normalized)}\n`;
|
|
1140
1161
|
const path = usageLogPath();
|
|
1141
1162
|
const now = Date.now();
|
|
1142
1163
|
const doAppend = (): void => {
|
|
@@ -10,6 +10,7 @@ import { applyUpstreamRecoveryInit, fetchWithResetRetry } from "../lib/upstream-
|
|
|
10
10
|
import { publicOAuthAuthenticationErrorMessage } from "../oauth";
|
|
11
11
|
import { getAnthropicSidecarAccessToken } from "../oauth/anthropic-routing";
|
|
12
12
|
import { ANTHROPIC_OAUTH_BETA, CLAUDE_CODE_SYSTEM_INSTRUCTION } from "../oauth/anthropic";
|
|
13
|
+
import { CLAUDE_CLI_USER_AGENT } from "../providers/claude-cli-identity";
|
|
13
14
|
import type { DescribeOutcome, VisionSettings } from "./describe";
|
|
14
15
|
|
|
15
16
|
const ANTHROPIC_VISION_MAX_TOKENS = 1024;
|
|
@@ -179,7 +180,7 @@ export async function describeImageAnthropic(
|
|
|
179
180
|
"Content-Type": "application/json",
|
|
180
181
|
"anthropic-version": "2023-06-01",
|
|
181
182
|
"Accept": "text/event-stream",
|
|
182
|
-
"User-Agent":
|
|
183
|
+
"User-Agent": CLAUDE_CLI_USER_AGENT,
|
|
183
184
|
"Authorization": `Bearer ${token}`,
|
|
184
185
|
"anthropic-beta": ANTHROPIC_OAUTH_BETA,
|
|
185
186
|
...CLAUDE_CODE_HEADERS,
|
package/src/vision/index.ts
CHANGED
package/src/vision/plan.ts
CHANGED
|
@@ -5,6 +5,7 @@ import type { ResolvedOpenAiForwardSidecar } from "../providers/openai-sidecar";
|
|
|
5
5
|
import type { CodexAuthPolicyConfig } from "../codex/auth-context";
|
|
6
6
|
import { isCodexReserveRequestEligible } from "../codex/loopback-target";
|
|
7
7
|
import type { DataPlaneAdmission } from "../server/auth-cors";
|
|
8
|
+
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
8
9
|
import {
|
|
9
10
|
customRowInputModalities,
|
|
10
11
|
isModelVisionSidecarConsumer as isModelTextOnly,
|
|
@@ -192,6 +193,7 @@ export interface VisionPlan {
|
|
|
192
193
|
routedModel?: string;
|
|
193
194
|
/** Loopback dispatch inputs for the routed backend (the listener decides WHICH local port). */
|
|
194
195
|
routedConfig?: Pick<OcxConfig, "port" | "hostname" | "apiKeys" | "unauthenticatedLoopbackListener">;
|
|
196
|
+
advisorAdmissionPolicy?: CapturedAdmissionPolicy;
|
|
195
197
|
settings: VisionSettings;
|
|
196
198
|
maxDescriptionsPerTurn: number;
|
|
197
199
|
}
|
|
@@ -214,6 +216,7 @@ export function planVisionSidecar(
|
|
|
214
216
|
admission?: Pick<DataPlaneAdmission, "source">;
|
|
215
217
|
codexAuthPolicy?: CodexAuthPolicyConfig;
|
|
216
218
|
providerName?: string;
|
|
219
|
+
advisorAdmissionPolicy?: CapturedAdmissionPolicy;
|
|
217
220
|
} = {},
|
|
218
221
|
): VisionPlan | undefined {
|
|
219
222
|
if (!requiresVisionPreprocessing(config, provider, modelId, options.providerName)) return undefined;
|
|
@@ -231,6 +234,7 @@ export function planVisionSidecar(
|
|
|
231
234
|
return {
|
|
232
235
|
backend: "routed",
|
|
233
236
|
routedModel,
|
|
237
|
+
advisorAdmissionPolicy: options.advisorAdmissionPolicy,
|
|
234
238
|
routedConfig: {
|
|
235
239
|
port: config.port,
|
|
236
240
|
...(config.apiKeys ? { apiKeys: config.apiKeys } : {}),
|
|
@@ -27,6 +27,9 @@ import type { OcxConfig } from "../types";
|
|
|
27
27
|
import { localAdmissionToken } from "../lib/local-destinations";
|
|
28
28
|
import { localChatCompletionBaseUrl, postLocalChatCompletion } from "../lib/local-chat-completion";
|
|
29
29
|
import type { DescribeOutcome, VisionSettings } from "./describe";
|
|
30
|
+
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
31
|
+
import { registerAdvisorAdmissionPolicy, SIDECAR_ADMISSION_POLICY_HEADER, SIDECAR_INTERNAL_CAPABILITY_HEADER } from "../server/advisor-admission-scope";
|
|
32
|
+
import { internalCallCapability } from "../lib/local-internal-call-capability";
|
|
30
33
|
|
|
31
34
|
export const VISION_DESCRIBE_TERMINAL_HEADER = "x-opencodex-vision-describe";
|
|
32
35
|
|
|
@@ -84,31 +87,43 @@ export async function describeImageRouted(
|
|
|
84
87
|
settings: VisionSettings,
|
|
85
88
|
abortSignal?: AbortSignal,
|
|
86
89
|
baseUrlOverride?: string,
|
|
90
|
+
advisorAdmissionPolicy?: CapturedAdmissionPolicy,
|
|
87
91
|
): Promise<DescribeOutcome> {
|
|
88
92
|
const invalid = validateImageUrl(imageUrl);
|
|
89
93
|
if (invalid) return { text: "", error: invalid };
|
|
90
94
|
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
{
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
95
|
+
const registration = advisorAdmissionPolicy ? registerAdvisorAdmissionPolicy(advisorAdmissionPolicy, abortSignal) : undefined;
|
|
96
|
+
try {
|
|
97
|
+
return await postLocalChatCompletion({
|
|
98
|
+
config,
|
|
99
|
+
label: "routed describe",
|
|
100
|
+
logTag: "vision",
|
|
101
|
+
timeoutMs: settings.timeoutMs,
|
|
102
|
+
maxResponseBytes: MAX_ROUTED_RESPONSE_BYTES,
|
|
103
|
+
headers: {
|
|
104
|
+
[VISION_DESCRIBE_TERMINAL_HEADER]: "1",
|
|
105
|
+
...(registration ? {
|
|
106
|
+
[SIDECAR_ADMISSION_POLICY_HEADER]: registration.token,
|
|
107
|
+
[SIDECAR_INTERNAL_CAPABILITY_HEADER]: internalCallCapability(),
|
|
108
|
+
} : {}),
|
|
109
|
+
},
|
|
110
|
+
abortSignal,
|
|
111
|
+
baseUrlOverride,
|
|
112
|
+
body: {
|
|
113
|
+
model: routedModel,
|
|
114
|
+
messages: [
|
|
115
|
+
{ role: "system", content: DESCRIBE_INSTRUCTION },
|
|
116
|
+
{
|
|
117
|
+
role: "user",
|
|
118
|
+
content: [
|
|
119
|
+
...(contextText ? [{ type: "text", text: `User's request context: ${contextText}` }] : []),
|
|
120
|
+
{ type: "image_url", image_url: { url: imageUrl } },
|
|
121
|
+
],
|
|
122
|
+
},
|
|
123
|
+
],
|
|
124
|
+
},
|
|
125
|
+
});
|
|
126
|
+
} finally {
|
|
127
|
+
registration?.release();
|
|
128
|
+
}
|
|
114
129
|
}
|
|
@@ -5,6 +5,7 @@ import type { OcxConfig, OcxProviderConfig } from "../types";
|
|
|
5
5
|
import { publicOAuthAuthenticationErrorMessage } from "../oauth";
|
|
6
6
|
import { getAnthropicSidecarAccessToken } from "../oauth/anthropic-routing";
|
|
7
7
|
import { ANTHROPIC_OAUTH_BETA, CLAUDE_CODE_SYSTEM_INSTRUCTION } from "../oauth/anthropic";
|
|
8
|
+
import { CLAUDE_CLI_USER_AGENT } from "../providers/claude-cli-identity";
|
|
8
9
|
import { sidecarThinkingOff } from "../adapters/anthropic-model-contract";
|
|
9
10
|
import { CLAUDE_CODE_HEADERS, claudeCodeSessionId } from "../adapters/client-fingerprint";
|
|
10
11
|
import { signalWithTimeout, cancelBodyOnAbort } from "../lib/abort";
|
|
@@ -188,7 +189,7 @@ export async function runAnthropicWebSearch(
|
|
|
188
189
|
"Content-Type": "application/json",
|
|
189
190
|
"anthropic-version": "2023-06-01",
|
|
190
191
|
"Accept": "text/event-stream",
|
|
191
|
-
"User-Agent":
|
|
192
|
+
"User-Agent": CLAUDE_CLI_USER_AGENT,
|
|
192
193
|
"Authorization": `Bearer ${token}`,
|
|
193
194
|
"anthropic-beta": ANTHROPIC_OAUTH_BETA,
|
|
194
195
|
...CLAUDE_CODE_HEADERS,
|
|
@@ -46,6 +46,7 @@ export function anthropicSearchAssistantContent(events: readonly AdapterEvent[])
|
|
|
46
46
|
argumentsText += event.arguments;
|
|
47
47
|
break;
|
|
48
48
|
case "tool_call_end": {
|
|
49
|
+
if (event.incomplete) throw new Error("unfinished tool call cannot enter search continuation history");
|
|
49
50
|
if (!call) throw new Error("search history has an unpaired tool call");
|
|
50
51
|
const args: unknown = JSON.parse(argumentsText || "{}");
|
|
51
52
|
if (!args || typeof args !== "object" || Array.isArray(args)) throw new Error("search history tool input is not an object");
|
|
@@ -10,8 +10,9 @@ const MAX_TOTAL_CHARS = 8000;
|
|
|
10
10
|
/** Bound for a batched error status so every query's status line stays small. */
|
|
11
11
|
const MAX_BATCH_ERROR_CHARS = 300;
|
|
12
12
|
|
|
13
|
+
/** Truncate to at most `max` UTF-16 units without splitting a surrogate pair, then mark the cut. */
|
|
13
14
|
function clamp(s: string, max: number): string {
|
|
14
|
-
return s.length <= max ? s : `${s
|
|
15
|
+
return s.length <= max ? s : `${safePrefix(s, max)}\n…[truncated]`;
|
|
15
16
|
}
|
|
16
17
|
|
|
17
18
|
/** A prefix of at most `max` UTF-16 units that never ends on half of a surrogate pair. */
|
|
@@ -25,7 +26,7 @@ function safePrefix(s: string, max: number): string {
|
|
|
25
26
|
|
|
26
27
|
/** Clamp and sanitize a query string for display in the tool result boundary. */
|
|
27
28
|
function safeQuery(q: string): string {
|
|
28
|
-
const clamped = q.length <= 200 ? q : `${q
|
|
29
|
+
const clamped = q.length <= 200 ? q : `${safePrefix(q, 200)}…`;
|
|
29
30
|
// Strip angle brackets so the query can't close/open XML-ish boundary tags.
|
|
30
31
|
return clamped.replace(/[<>]/g, "");
|
|
31
32
|
}
|
|
@@ -4,6 +4,7 @@ import type { ProviderFetch } from "../server/responses/fetch-helpers";
|
|
|
4
4
|
|
|
5
5
|
/** One iteration's cumulative header budget; only local pacing admission pauses its clock. */
|
|
6
6
|
export function pacingHeaderDeadline(timeoutMs: number, parent: AbortSignal) {
|
|
7
|
+
const disabled = timeoutMs <= 0;
|
|
7
8
|
const controller = new AbortController();
|
|
8
9
|
const signal = AbortSignal.any([parent, controller.signal]);
|
|
9
10
|
let remainingMs = timeoutMs;
|
|
@@ -18,7 +19,7 @@ export function pacingHeaderDeadline(timeoutMs: number, parent: AbortSignal) {
|
|
|
18
19
|
current.signal.addEventListener("abort", relayExpiry, { once: true });
|
|
19
20
|
|
|
20
21
|
const pause = () => {
|
|
21
|
-
if (cleared || pacingWaits++ > 0) return;
|
|
22
|
+
if (disabled || cleared || pacingWaits++ > 0) return;
|
|
22
23
|
remainingMs = Math.max(0, remainingMs - (performance.now() - armedAt));
|
|
23
24
|
current.clear();
|
|
24
25
|
current.signal.removeEventListener("abort", relayExpiry);
|
|
@@ -26,7 +27,7 @@ export function pacingHeaderDeadline(timeoutMs: number, parent: AbortSignal) {
|
|
|
26
27
|
if (remainingMs === 0 && !signal.aborted) controller.abort(timeoutReason);
|
|
27
28
|
};
|
|
28
29
|
const resume = () => {
|
|
29
|
-
if (cleared || --pacingWaits > 0 || signal.aborted) return;
|
|
30
|
+
if (disabled || cleared || --pacingWaits > 0 || signal.aborted) return;
|
|
30
31
|
armedAt = performance.now();
|
|
31
32
|
current = clearableDeadline(remainingMs, parent);
|
|
32
33
|
current.signal.addEventListener("abort", relayExpiry, { once: true });
|