@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.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-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- 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 +17 -4
- 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.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 +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- 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/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/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- 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 +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- 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 +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- 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 +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- 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 +58 -64
- 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/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.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- 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-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 +17 -4
- 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-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 +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- 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/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- 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 +257 -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 +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -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 +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -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 +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- 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 +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- 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/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- 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 +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- 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 +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- 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/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- 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-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/shadow-call.ts +55 -1
- 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 +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- 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 +238 -0
- package/src/local-credentials/inventory.ts +281 -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/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/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 +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- 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/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- 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/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -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 +9 -43
- package/src/server/index/websocket-handler.ts +7 -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 +424 -543
- 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 +79 -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/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -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 +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- 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/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- 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/combo-required-tool-contract.ts +2 -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 +14 -7
- 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 +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -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 +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- 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/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/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -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 +179 -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 +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- 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 +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { withConfigMutationLockSync } from "../config";
|
|
2
|
+
import { assertNoClientDisconnectPending, pendingClientConnectMayOwnToken, readClientConnectionState } from "./state";
|
|
3
|
+
|
|
4
|
+
export type RestoreBoundaryOwnership = "restore" | "hub-owned" | "unproven";
|
|
5
|
+
export type RestoreOwnershipRefusal = Exclude<RestoreBoundaryOwnership, "restore">;
|
|
6
|
+
|
|
7
|
+
export class StopRestoreOwnershipError extends Error {
|
|
8
|
+
constructor(readonly boundary: RestoreOwnershipRefusal) {
|
|
9
|
+
super(`stop_restore_${boundary}`);
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
/** Read only; the caller must exclude connection publication with L or C. */
|
|
14
|
+
export function inspectStopRestoreOwnership(read = readClientConnectionState): RestoreBoundaryOwnership {
|
|
15
|
+
try {
|
|
16
|
+
if (pendingClientConnectMayOwnToken()) return "unproven";
|
|
17
|
+
assertNoClientDisconnectPending();
|
|
18
|
+
const state = read();
|
|
19
|
+
if (state.kind === "invalid" || state.kind === "mismatched") return "unproven";
|
|
20
|
+
return state.kind === "connected" && state.value.transport !== "link" ? "hub-owned" : "restore";
|
|
21
|
+
} catch { return "unproven"; }
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/** C is reentrant inside N/C; this never acquires L or N. No lease crosses an await. */
|
|
25
|
+
export function stopRestoreWriteGuard() {
|
|
26
|
+
let boundary: RestoreBoundaryOwnership = "restore";
|
|
27
|
+
return {
|
|
28
|
+
boundary: () => boundary,
|
|
29
|
+
run<T>(write: () => T): T {
|
|
30
|
+
let entered = false;
|
|
31
|
+
try {
|
|
32
|
+
return withConfigMutationLockSync(() => {
|
|
33
|
+
entered = true;
|
|
34
|
+
if (boundary === "restore") boundary = inspectStopRestoreOwnership();
|
|
35
|
+
if (boundary !== "restore") throw new StopRestoreOwnershipError(boundary);
|
|
36
|
+
return write();
|
|
37
|
+
});
|
|
38
|
+
} catch (error) {
|
|
39
|
+
if (!entered) boundary = "unproven";
|
|
40
|
+
else if (error instanceof StopRestoreOwnershipError) boundary = error.boundary;
|
|
41
|
+
throw error;
|
|
42
|
+
}
|
|
43
|
+
},
|
|
44
|
+
};
|
|
45
|
+
}
|
package/src/client/runtime.ts
CHANGED
|
@@ -6,6 +6,8 @@ import { issueSiblingHandoff } from "../codex/sibling-handoff";
|
|
|
6
6
|
import { loadConfig } from "../config";
|
|
7
7
|
import { removePid, removeRuntimePort, writePid, writeRuntimePort, type RuntimePortState } from "../config/process-state";
|
|
8
8
|
import { installCrashGuards } from "../lib/crash-guard";
|
|
9
|
+
import { observeLocalCredentials } from "../local-credentials/runtime-observation";
|
|
10
|
+
import { verifiedHomeConnection } from "./link-connection";
|
|
9
11
|
import { createLocalAttestationSecret } from "../lib/local-management-attestation";
|
|
10
12
|
import { loadServiceTokenFromFile, serviceApiTokenFingerprint } from "../lib/service-secrets";
|
|
11
13
|
import { handledSignalExitCode } from "../lib/handled-signal-exit";
|
|
@@ -230,7 +232,7 @@ export async function bindClientListener(
|
|
|
230
232
|
preferred: number;
|
|
231
233
|
explicitPort: boolean;
|
|
232
234
|
configuredPort: number;
|
|
233
|
-
} & Pick<MachineListenerDeps, "linkStatus" | "linkKeySource" | "linkTunnel" | "linkReadiness" | "restart">,
|
|
235
|
+
} & Pick<MachineListenerDeps, "linkStatus" | "linkKeySource" | "linkTunnel" | "linkReadiness" | "linkConnectionGeneration" | "restart">,
|
|
234
236
|
io: ClientRuntimeIo = {},
|
|
235
237
|
): Promise<{ server: Server<unknown>; port: number }> {
|
|
236
238
|
const { linkMode } = request;
|
|
@@ -271,6 +273,7 @@ export async function bindClientListener(
|
|
|
271
273
|
...(request.linkKeySource ? { linkKeySource: request.linkKeySource } : {}),
|
|
272
274
|
...(request.linkTunnel ? { linkTunnel: request.linkTunnel } : {}),
|
|
273
275
|
...(request.linkReadiness ? { linkReadiness: request.linkReadiness } : {}),
|
|
276
|
+
...(request.linkConnectionGeneration ? { linkConnectionGeneration: request.linkConnectionGeneration } : {}),
|
|
274
277
|
...(request.restart ? { restart: request.restart } : {}),
|
|
275
278
|
});
|
|
276
279
|
return { server, port: server.port ?? port };
|
|
@@ -312,6 +315,8 @@ export async function startClientRuntime(
|
|
|
312
315
|
&& !isChildInitiatedLink(state.value.link.linkId);
|
|
313
316
|
// One secret for the life of this process: a rollback republishes the same identity.
|
|
314
317
|
const attestationSecret = createLocalAttestationSecret();
|
|
318
|
+
// The local-credential observer lives exactly while this process serves (status attestation).
|
|
319
|
+
let credentialObservation: { stop(): void } | null = null;
|
|
315
320
|
|
|
316
321
|
// Bind, start a fresh tunnel supervisor and publish. Runs once at start and again when a failed
|
|
317
322
|
// restart rolls back (OCX-6); the stopped supervisor cannot be started twice, so each call builds one.
|
|
@@ -346,6 +351,8 @@ export async function startClientRuntime(
|
|
|
346
351
|
...(linkMode ? { linkStatus: () => activeSupervisor?.status() ?? { kind: "stopped" as const }, linkKeySource: linkKey } : {}),
|
|
347
352
|
...(supervisor ? { linkTunnel: supervisor } : homeInitiated ? { linkTunnel: HOME_INITIATED_LINK_TUNNEL } : {}),
|
|
348
353
|
...(linkReadiness ? { linkReadiness } : {}),
|
|
354
|
+
...(supervisor ? { linkConnectionGeneration: () => supervisor.connectionGeneration() }
|
|
355
|
+
: homeInitiated && link ? { linkConnectionGeneration: () => verifiedHomeConnection(link.linkId) } : {}),
|
|
349
356
|
}, rollback === undefined ? io : { ...io, portWaitMs: rollback.portWaitMs });
|
|
350
357
|
const publish = (): void => {
|
|
351
358
|
activeServer = server;
|
|
@@ -353,6 +360,7 @@ export async function startClientRuntime(
|
|
|
353
360
|
servedPort = boundPort;
|
|
354
361
|
activeSupervisor = supervisor;
|
|
355
362
|
supervisor?.start();
|
|
363
|
+
credentialObservation ??= observeLocalCredentials();
|
|
356
364
|
writePid(process.pid);
|
|
357
365
|
writeRuntimePort(clientRuntimeRecord(process.pid, boundPort, attestationSecret));
|
|
358
366
|
if (linkMode && state.value.link && linkKey) {
|
|
@@ -385,6 +393,8 @@ export async function startClientRuntime(
|
|
|
385
393
|
|
|
386
394
|
// Stop everything this process serves, giving in-flight requests up to `drainMs`.
|
|
387
395
|
const stopServing = async (drainMs: number): Promise<void> => {
|
|
396
|
+
credentialObservation?.stop();
|
|
397
|
+
credentialObservation = null;
|
|
388
398
|
activeReporter?.stop();
|
|
389
399
|
activeReporter = null;
|
|
390
400
|
try {
|
|
@@ -447,6 +457,8 @@ export async function startClientRuntime(
|
|
|
447
457
|
if (shuttingDown) return;
|
|
448
458
|
shuttingDown = true;
|
|
449
459
|
void (async () => {
|
|
460
|
+
credentialObservation?.stop();
|
|
461
|
+
credentialObservation = null;
|
|
450
462
|
activeReporter?.stop();
|
|
451
463
|
activeReporter = null;
|
|
452
464
|
try {
|
package/src/client/state.ts
CHANGED
|
@@ -84,7 +84,7 @@ function rawTopLevelConfig(): Record<string, unknown> | null {
|
|
|
84
84
|
|
|
85
85
|
export function readClientConnectionState(): ClientConnectionState {
|
|
86
86
|
const raw = rawTopLevelConfig();
|
|
87
|
-
const diagnostics = readConfigDiagnostics();
|
|
87
|
+
const diagnostics = readConfigDiagnostics({ passive: true });
|
|
88
88
|
if (!raw) {
|
|
89
89
|
return diagnostics.source === "default"
|
|
90
90
|
? { kind: "disconnected" }
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/** Shared, dependency-free export client roster for runtime types and CLI discovery. */
|
|
2
|
+
export const EXPORT_CLIENT_IDS = [
|
|
3
|
+
"qoder", "qoder-cn", "workbuddy", "workbuddy-ai", "opencode", "pi", "omp", "hermes",
|
|
4
|
+
"openclaw", "kimi", "gajae", "dsh", "mcode", "zcode", "commandcode", "prime", "aside",
|
|
5
|
+
"raycast", "omo", "cline", "kilo", "droid", "gentle-shell", "t3code",
|
|
6
|
+
] as const;
|
|
7
|
+
export type ExportClientId = (typeof EXPORT_CLIENT_IDS)[number];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { homedir } from "node:os";
|
|
2
|
-
import {
|
|
2
|
+
import { join, posix, win32 } from "node:path";
|
|
3
3
|
import type { OpencodeLaunchEnv } from "./config-export/contracts";
|
|
4
4
|
|
|
5
5
|
// Leaf owner of client path validation, shared by config-export and gentle-shell-path
|
|
@@ -21,14 +21,22 @@ import type { OpencodeLaunchEnv } from "./config-export/contracts";
|
|
|
21
21
|
*/
|
|
22
22
|
export class ClientPathError extends Error {}
|
|
23
23
|
|
|
24
|
-
|
|
24
|
+
/** Windows rooted paths without a drive still depend on the process's current drive. */
|
|
25
|
+
export function isAbsoluteClientPath(raw: string, platform: NodeJS.Platform = process.platform): boolean {
|
|
26
|
+
return platform === "win32"
|
|
27
|
+
? win32.isAbsolute(raw) && win32.parse(raw).root.length > 1
|
|
28
|
+
: posix.isAbsolute(raw);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export function absoluteClientPath(raw: string, home: string, variable: string, platform: NodeJS.Platform = process.platform): string {
|
|
25
32
|
const trimmed = raw.trim();
|
|
26
33
|
if (trimmed === "~") return home;
|
|
27
|
-
if (trimmed.startsWith("~/") || trimmed.startsWith("~\\")) return join(home, trimmed.slice(2));
|
|
28
|
-
if (!
|
|
34
|
+
if (trimmed.startsWith("~/") || trimmed.startsWith("~\\")) return (platform === "win32" ? win32 : posix).join(home, trimmed.slice(2));
|
|
35
|
+
if (!isAbsoluteClientPath(trimmed, platform)) {
|
|
29
36
|
throw new ClientPathError(
|
|
30
37
|
`${variable} must be an absolute path or start with ~; "${trimmed}" depends on the working directory, `
|
|
31
|
-
+ "so opencodex and the client would disagree about which file it names."
|
|
38
|
+
+ "so opencodex and the client would disagree about which file it names."
|
|
39
|
+
+ (platform === "win32" ? " Use a drive letter or UNC share; drive-less rooted paths depend on the current drive." : ""),
|
|
32
40
|
);
|
|
33
41
|
}
|
|
34
42
|
return trimmed;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { homedir } from "node:os";
|
|
2
|
-
import {
|
|
2
|
+
import { join } from "node:path";
|
|
3
3
|
import { isLoopbackHostname, shouldInjectApiAuthHeader } from "../../codex/loopback-target";
|
|
4
|
-
import {
|
|
4
|
+
import { absoluteClientPath } from "../client-path";
|
|
5
5
|
import { parseSegment } from "../../integrations/merge";
|
|
6
6
|
import type { ExportContext, ExportClientId, ManagedContribution, OpencodeLaunchEnv } from "./contracts";
|
|
7
7
|
import { LOOPBACK_API_KEY_PLACEHOLDER } from "./constants";
|
|
@@ -13,10 +13,7 @@ export function agentHomeDir(client: "qoder-cn" | "workbuddy" | "workbuddy-ai",
|
|
|
13
13
|
// Both WorkBuddy editions use the same native override; the default roots stay separate.
|
|
14
14
|
const override = env[key]?.trim() || (client === "qoder-cn" ? undefined : env.CODEBUDDY_CONFIG_DIR?.trim());
|
|
15
15
|
if (!override) return join(home, `.${client}`);
|
|
16
|
-
|
|
17
|
-
if (override.startsWith("~/") || override.startsWith("~\\")) return join(home, override.slice(2));
|
|
18
|
-
if (!isAbsolute(override)) throw new ClientPathError(`${key} must be an absolute path or start with ~.`);
|
|
19
|
-
return override;
|
|
16
|
+
return absoluteClientPath(override, home, key);
|
|
20
17
|
}
|
|
21
18
|
|
|
22
19
|
export function agentConfigPath(client: "qoder-cn" | "workbuddy" | "workbuddy-ai", env: OpencodeLaunchEnv = process.env, home = homedir()): string {
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import type { ExportClientId, ExportContext, ExportModel } from "./contracts";
|
|
2
|
+
import { resolveModelNames, selectExportModelNames } from "./model-names";
|
|
3
|
+
import { effectiveModelAliases, effectiveProviderAlias, MODEL_ALIAS_PATTERN } from "../../providers/default-aliases";
|
|
4
|
+
import { knownModelIdsForProvider, previewRouteModel, type RouteResult } from "../../router";
|
|
5
|
+
import type { OcxConfig } from "../../types";
|
|
6
|
+
import { parseSyntheticRowId } from "../../server/fast-row";
|
|
7
|
+
|
|
8
|
+
function concrete(route: RouteResult): boolean {
|
|
9
|
+
return !route.combo && route.routeKind !== "policy" && route.policyEligibility === undefined;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
function sameIdentity(left: RouteResult, right: RouteResult): boolean {
|
|
13
|
+
return concrete(left) && concrete(right) && left.providerName === right.providerName && left.modelId === right.modelId
|
|
14
|
+
&& left.codexAccountId === right.codexAccountId && left.codexAccountMode === right.codexAccountMode;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/** One context per full roster, before visibility filtering; never a serializer lookup. */
|
|
18
|
+
export function attachExportAliasSelectors(config: OcxConfig, input: readonly ExportModel[]): ExportModel[] {
|
|
19
|
+
// A roster may predate a config/cache change during discovery. Candidate
|
|
20
|
+
// metadata is evidence to refresh, never authority to reuse across that change.
|
|
21
|
+
const models = input.map(({ aliasNamespaced: _priorCandidate, ...model }) => model);
|
|
22
|
+
// A minimal or partially repaired config can omit providers; it then has no aliases.
|
|
23
|
+
const aliases = new Map(Object.entries(config.providers ?? {}).map(([name, provider]) => [name, {
|
|
24
|
+
namespace: effectiveProviderAlias(name, provider, config) ?? name,
|
|
25
|
+
models: effectiveModelAliases(config, provider, knownModelIdsForProvider(name, provider, config)),
|
|
26
|
+
}]));
|
|
27
|
+
const candidates = models.map(model => {
|
|
28
|
+
if (model.native || model.provider === "combo") return undefined;
|
|
29
|
+
const provider = aliases.get(model.provider);
|
|
30
|
+
const alias = provider?.models.get(model.id)?.alias;
|
|
31
|
+
if (!provider || !alias || !MODEL_ALIAS_PATTERN.test(provider.namespace)) return undefined;
|
|
32
|
+
const candidate = `${provider.namespace}/${alias}`;
|
|
33
|
+
try {
|
|
34
|
+
// Ingress parses synthetic suffixes before routing. A successful direct
|
|
35
|
+
// route cannot prove a literal alias that ingress interprets as effort/Fast.
|
|
36
|
+
const parsed = parseSyntheticRowId(candidate, config);
|
|
37
|
+
if (parsed.fastRow || parsed.effortRow) return undefined;
|
|
38
|
+
const baseline = previewRouteModel(config, model.namespaced);
|
|
39
|
+
const proposed = previewRouteModel(config, candidate);
|
|
40
|
+
if (proposed.providerName !== model.provider || proposed.modelId !== model.id || !sameIdentity(baseline, proposed)) return undefined;
|
|
41
|
+
if (model.fastRowAvailable) {
|
|
42
|
+
const baselineFast = parseSyntheticRowId(`${model.namespaced}--fast`, config).fastRow;
|
|
43
|
+
const proposedFast = parseSyntheticRowId(`${candidate}--fast`, config).fastRow;
|
|
44
|
+
if (!baselineFast || !proposedFast || !sameIdentity(
|
|
45
|
+
previewRouteModel(config, baselineFast.baseId), previewRouteModel(config, proposedFast.baseId),
|
|
46
|
+
)) return undefined;
|
|
47
|
+
}
|
|
48
|
+
return candidate;
|
|
49
|
+
} catch {
|
|
50
|
+
// Refused or ambiguous selectors keep the canonical spelling, never a decoded guess.
|
|
51
|
+
return undefined;
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
// Reserve every canonical/native/combo selector, including synthetic Fast rows.
|
|
55
|
+
// A candidate must never displace a different row through first-wins normalization.
|
|
56
|
+
const claims = new Map<string, Set<number>>();
|
|
57
|
+
const claim = (key: string, index: number) => {
|
|
58
|
+
const owners = claims.get(key) ?? new Set<number>();
|
|
59
|
+
owners.add(index);
|
|
60
|
+
claims.set(key, owners);
|
|
61
|
+
};
|
|
62
|
+
models.forEach((model, index) => {
|
|
63
|
+
for (const key of [model.namespaced, candidates[index]]) {
|
|
64
|
+
if (key === undefined) continue;
|
|
65
|
+
claim(key, index);
|
|
66
|
+
if (model.fastRowAvailable) claim(`${key}--fast`, index);
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
return models.map((model, index) => {
|
|
70
|
+
const candidate = candidates[index];
|
|
71
|
+
if (!candidate || claims.get(candidate)!.size !== 1
|
|
72
|
+
|| (model.fastRowAvailable && claims.get(`${candidate}--fast`)!.size !== 1)) return model;
|
|
73
|
+
return { ...model, aliasNamespaced: candidate };
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
export function namedExportContext(client: ExportClientId, ctx: ExportContext): ExportContext {
|
|
78
|
+
const mode = resolveModelNames(client, ctx.modelNames);
|
|
79
|
+
if (mode === "routed") return ctx;
|
|
80
|
+
// Use the caller's exact captured configuration. Discovery may have returned
|
|
81
|
+
// an old projection, or caches may have changed since the retained proof.
|
|
82
|
+
const models = ctx.config ? attachExportAliasSelectors(ctx.config, ctx.models)
|
|
83
|
+
: ctx.models.map(({ aliasNamespaced: _priorCandidate, ...model }) => model);
|
|
84
|
+
return { ...ctx, models: selectExportModelNames(models, mode) };
|
|
85
|
+
}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
// Shared client export contracts.
|
|
2
|
+
import type { ExportClientId } from "../client-ids";
|
|
3
|
+
export type { ExportClientId } from "../client-ids";
|
|
2
4
|
import { canonicalizeReasoningEfforts } from "../../reasoning-effort";
|
|
3
5
|
import type { OcxConfig } from "../../types";
|
|
4
6
|
import type { ConfigFormat } from "../../integrations/serialize";
|
|
7
|
+
import type { ExportModelNames } from "./model-names";
|
|
5
8
|
|
|
6
9
|
export const DROID_DEFAULT_EFFORT_HEADER = "x-opencodex-droid-default-effort";
|
|
7
10
|
|
|
@@ -79,6 +82,8 @@ export interface OpencodeCatalogModel {
|
|
|
79
82
|
export interface ExportModel {
|
|
80
83
|
/** Canonical proxy selector: `provider/id`, or bare slug for native. */
|
|
81
84
|
namespaced: string;
|
|
85
|
+
/** Provider-qualified alias proven equivalent by the shared management row loader. */
|
|
86
|
+
aliasNamespaced?: string;
|
|
82
87
|
/** Hub-resolved Fast availability; exporters never infer it from local config. */
|
|
83
88
|
fastRowAvailable?: boolean;
|
|
84
89
|
provider: string;
|
|
@@ -189,6 +194,7 @@ export function knownReasoningSupport(evidence: ExportCapabilityEvidence): boole
|
|
|
189
194
|
}
|
|
190
195
|
|
|
191
196
|
export interface ExportContext {
|
|
197
|
+
modelNames?: ExportModelNames;
|
|
192
198
|
/** `http://host:port/v1` — the OpenAI-compatible surface the client dials. */
|
|
193
199
|
baseUrl: string;
|
|
194
200
|
models: readonly ExportModel[];
|
|
@@ -214,31 +220,6 @@ export interface ExportContext {
|
|
|
214
220
|
/** Namespaced model selector to one of that model's declared reasoning efforts. */
|
|
215
221
|
export type DroidReasoningDefaults = Record<string, string>;
|
|
216
222
|
|
|
217
|
-
export type ExportClientId =
|
|
218
|
-
| "qoder"
|
|
219
|
-
| "qoder-cn"
|
|
220
|
-
| "workbuddy"
|
|
221
|
-
| "workbuddy-ai"
|
|
222
|
-
| "opencode"
|
|
223
|
-
| "pi"
|
|
224
|
-
| "omp"
|
|
225
|
-
| "hermes"
|
|
226
|
-
| "openclaw"
|
|
227
|
-
| "kimi"
|
|
228
|
-
| "gajae"
|
|
229
|
-
| "dsh"
|
|
230
|
-
| "mcode"
|
|
231
|
-
| "zcode"
|
|
232
|
-
| "prime"
|
|
233
|
-
| "aside"
|
|
234
|
-
| "raycast"
|
|
235
|
-
| "omo"
|
|
236
|
-
| "cline"
|
|
237
|
-
| "commandcode"
|
|
238
|
-
| "kilo"
|
|
239
|
-
| "droid"
|
|
240
|
-
| "gentle-shell";
|
|
241
|
-
|
|
242
223
|
export interface ExportClientSpec {
|
|
243
224
|
id: ExportClientId;
|
|
244
225
|
/** Download filename; matches the destination file's own name (003 §5). */
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import type { ExportModel, ExportContext, ManagedContribution } from "./contracts";
|
|
3
3
|
import type { OcxConfig } from "../../types";
|
|
4
4
|
import { providerCodexAccountMode } from "../../providers/registry";
|
|
5
|
-
import { normalizeExportModels, authoritativeContextWindow, exportModelLabel, singleFragment } from "./model-metadata";
|
|
5
|
+
import { normalizeExportModels, authoritativeContextWindow, exportModelLabel, knownOutputBudget, singleFragment } from "./model-metadata";
|
|
6
6
|
import { OPENCODE_PROVIDER_ID } from "./constants";
|
|
7
7
|
|
|
8
8
|
|
|
@@ -26,6 +26,11 @@ export interface DshModelEntry {
|
|
|
26
26
|
name: string;
|
|
27
27
|
input: string[];
|
|
28
28
|
contextWindow?: number;
|
|
29
|
+
/**
|
|
30
|
+
* Output ceiling DSH should treat as the model's real `max_tokens`. DSH falls back to its
|
|
31
|
+
* own 32768 default when this is absent, so a limit it does not know stays undeclared.
|
|
32
|
+
*/
|
|
33
|
+
maxTokens?: number;
|
|
29
34
|
reasoningEfforts?: Partial<Record<DshReasoningEffort, DshWireReasoningEffort>>;
|
|
30
35
|
}
|
|
31
36
|
|
|
@@ -97,12 +102,14 @@ export function buildDshClientConfig(ctx: ExportContext): DshGeneratedConfig {
|
|
|
97
102
|
const input = dshInputModalities(model.inputModalities);
|
|
98
103
|
if (input === null) continue;
|
|
99
104
|
const contextWindow = authoritativeContextWindow(model.contextWindow);
|
|
105
|
+
const maxTokens = contextWindow === undefined ? undefined : knownOutputBudget(contextWindow, model);
|
|
100
106
|
const reasoningEfforts = dshReasoningEfforts(model);
|
|
101
107
|
models.push({
|
|
102
108
|
id: model.namespaced,
|
|
103
109
|
name: exportModelLabel(model),
|
|
104
110
|
input,
|
|
105
111
|
...(contextWindow !== undefined ? { contextWindow } : {}),
|
|
112
|
+
...(maxTokens !== undefined ? { maxTokens } : {}),
|
|
106
113
|
...(reasoningEfforts ? { reasoningEfforts } : {}),
|
|
107
114
|
});
|
|
108
115
|
}
|
|
@@ -31,6 +31,25 @@ export function outputBudgetFor(context: number, model: OpencodeCatalogModel): n
|
|
|
31
31
|
return Math.min(limit, context);
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
+
/**
|
|
35
|
+
* Known model output limit without the schema stand-in, clamped to context.
|
|
36
|
+
*
|
|
37
|
+
* `outputBudgetFor` always returns a number because the clients that require the field
|
|
38
|
+
* cannot express "unknown". A client that instead treats an absent `maxTokens` as a real
|
|
39
|
+
* default must not be handed the 32000 stand-in: that would claim a limit no model declared
|
|
40
|
+
* (#5828). Use this variant where "no claim" is representable.
|
|
41
|
+
* @param context - the context window this model already exports.
|
|
42
|
+
* @param model - the catalog row, which may carry an authoritative output limit.
|
|
43
|
+
* @returns the known limit clamped to `context`, or undefined when nothing is known.
|
|
44
|
+
*/
|
|
45
|
+
export function knownOutputBudget(context: number, model: OpencodeCatalogModel): number | undefined {
|
|
46
|
+
const provider = model.provider ?? "";
|
|
47
|
+
const metadata = getModelMetadata(resolveMetadataProvider(provider) ?? provider, model.id ?? model.namespaced);
|
|
48
|
+
const limit = authoritativeContextWindow(model.maxTokens)
|
|
49
|
+
?? authoritativeContextWindow(metadata?.maxTokens);
|
|
50
|
+
return limit === undefined ? undefined : Math.min(limit, context);
|
|
51
|
+
}
|
|
52
|
+
|
|
34
53
|
/** Input limits are optional: unlike output, a missing limit needs no schema fallback. */
|
|
35
54
|
export function inputBudgetFor(context: number, model: OpencodeCatalogModel): number | undefined {
|
|
36
55
|
const limit = authoritativeContextWindow(model.maxInputTokens);
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import type { ExportModel } from "./contracts";
|
|
2
|
+
import { UnrepresentableSelectorError } from "../../integrations/merge";
|
|
3
|
+
|
|
4
|
+
export type ExportModelNames = "routed" | "alias";
|
|
5
|
+
|
|
6
|
+
export function isExportModelNames(value: unknown): value is ExportModelNames {
|
|
7
|
+
return value === "routed" || value === "alias";
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export function supportsAliasModelNames(client: string): boolean {
|
|
11
|
+
return client === "hermes" || client === "commandcode";
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
/** Resolve only after the caller binds an ownership record to its target file. */
|
|
15
|
+
export function resolveModelNames(client: string, requested: unknown, stored?: unknown): ExportModelNames {
|
|
16
|
+
if ((requested !== undefined && !isExportModelNames(requested))
|
|
17
|
+
|| (stored !== undefined && !isExportModelNames(stored))) {
|
|
18
|
+
throw new UnrepresentableSelectorError("modelNames must be routed or alias");
|
|
19
|
+
}
|
|
20
|
+
const mode = requested ?? stored ?? "routed";
|
|
21
|
+
if (mode === "alias" && !supportsAliasModelNames(client)) {
|
|
22
|
+
throw new UnrepresentableSelectorError("alias model names require Hermes or Command Code");
|
|
23
|
+
}
|
|
24
|
+
return mode;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/** The retained roster is canonical; candidates are proven by the shared row loader. */
|
|
28
|
+
export function selectExportModelNames(models: readonly ExportModel[], mode: ExportModelNames): readonly ExportModel[] {
|
|
29
|
+
if (mode === "routed") return models;
|
|
30
|
+
return models.map(model => model.aliasNamespaced === undefined ? model : { ...model, namespaced: model.aliasNamespaced });
|
|
31
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { homedir } from "node:os";
|
|
2
|
-
import {
|
|
2
|
+
import { join } from "node:path";
|
|
3
3
|
import { isLoopbackHostname, shouldInjectApiAuthHeader } from "../../codex/loopback-target";
|
|
4
|
-
import {
|
|
4
|
+
import { absoluteClientPath } from "../client-path";
|
|
5
5
|
import type { ExportContext, ManagedContribution, OpencodeLaunchEnv } from "./contracts";
|
|
6
6
|
import { LOOPBACK_API_KEY_PLACEHOLDER, OPENCODE_PROVIDER_ID } from "./constants";
|
|
7
7
|
import { authoritativeContextWindow, normalizeExportModels } from "./model-metadata";
|
|
@@ -14,15 +14,7 @@ import { authoritativeContextWindow, normalizeExportModels } from "./model-metad
|
|
|
14
14
|
export function qoderHomeDir(env: OpencodeLaunchEnv = process.env, home: string = homedir()): string {
|
|
15
15
|
const override = env.QODER_CONFIG_DIR?.trim();
|
|
16
16
|
if (!override) return join(home, ".qoder");
|
|
17
|
-
|
|
18
|
-
if (override.startsWith("~/") || override.startsWith("~\\")) return join(home, override.slice(2));
|
|
19
|
-
if (!isAbsolute(override)) {
|
|
20
|
-
throw new ClientPathError(
|
|
21
|
-
`QODER_CONFIG_DIR must be an absolute path or start with ~; "${override}" depends on the working directory, `
|
|
22
|
-
+ "so opencodex and Qoder would disagree about which file it names.",
|
|
23
|
-
);
|
|
24
|
-
}
|
|
25
|
-
return override;
|
|
17
|
+
return absoluteClientPath(override, home, "QODER_CONFIG_DIR");
|
|
26
18
|
}
|
|
27
19
|
|
|
28
20
|
export function qoderConfigPath(env: OpencodeLaunchEnv = process.env, home: string = homedir()): string {
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
import { homedir } from "node:os";
|
|
2
|
+
import { join, win32 } from "node:path";
|
|
3
|
+
import { PROXY_MARKER } from "../../claude/auth-detect";
|
|
4
|
+
import { isLoopbackHostname, shouldInjectApiAuthHeader } from "../../codex/loopback-target";
|
|
5
|
+
import { resolveApiSurfaceSettings } from "../../protocols/settings";
|
|
6
|
+
import { absoluteClientPath, ClientPathError } from "../client-path";
|
|
7
|
+
import type { ExportContext, ManagedContribution, OpencodeLaunchEnv } from "./contracts";
|
|
8
|
+
import { OPENCODE_PROVIDER_ID } from "./constants";
|
|
9
|
+
import { normalizeExportModels, singleFragment } from "./model-metadata";
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* T3 Code's data directory: `T3CODE_HOME` when set, otherwise `~/.t3`
|
|
13
|
+
* (t3code `apps/server/src/os-jank.ts` `resolveBaseDir`). The desktop app and
|
|
14
|
+
* the `t3` server share it. A relative override is refused because opencodex
|
|
15
|
+
* and T3 Code would anchor it to different working directories or Windows drives.
|
|
16
|
+
*/
|
|
17
|
+
export function t3codeHomeDir(env: OpencodeLaunchEnv = process.env, home: string = homedir(), platform: NodeJS.Platform = process.platform): string {
|
|
18
|
+
const override = env.T3CODE_HOME?.trim();
|
|
19
|
+
if (!override) return join(home, ".t3");
|
|
20
|
+
if (platform !== "win32") return absoluteClientPath(override, home, "T3CODE_HOME", platform);
|
|
21
|
+
const expanded = override === "~" ? home
|
|
22
|
+
: override.startsWith("~/") || override.startsWith("~\\") ? win32.join(home, override.slice(2)) : override;
|
|
23
|
+
// isAbsolute also accepts \rooted paths, which still depend on the current drive.
|
|
24
|
+
if (!/^[A-Za-z]:[\\/]/.test(expanded) && !/^[\\/]{2}[^\\/]+[\\/][^\\/]+(?:[\\/]|$)/.test(expanded)) {
|
|
25
|
+
throw new ClientPathError(
|
|
26
|
+
`T3CODE_HOME must be a fully qualified drive or UNC path, or start with ~; "${override}" depends on the working directory or drive, `
|
|
27
|
+
+ "so opencodex and T3 Code would disagree about which file it names.",
|
|
28
|
+
);
|
|
29
|
+
}
|
|
30
|
+
return expanded;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Server settings live in `<base>/userdata/settings.json`; T3 Code watches the file and
|
|
35
|
+
* reloads it, so a written provider instance appears without a restart.
|
|
36
|
+
*/
|
|
37
|
+
export function t3codeConfigPath(env: OpencodeLaunchEnv = process.env, home: string = homedir()): string {
|
|
38
|
+
return join(t3codeHomeDir(env, home), "userdata", "settings.json");
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** One T3 Code `ProviderInstanceEnvironmentVariable` (t3code `packages/contracts/src/providerInstance.ts`). */
|
|
42
|
+
export interface T3CodeEnvironmentVariable {
|
|
43
|
+
name: string;
|
|
44
|
+
value: string;
|
|
45
|
+
sensitive: false;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/** One T3 Code `CustomModelEntry`: the slug is sent verbatim as the Claude model id. */
|
|
49
|
+
export interface T3CodeCustomModel {
|
|
50
|
+
slug: string;
|
|
51
|
+
name: string;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/** The `providerInstances.opencodex` value opencodex owns in T3 Code's settings.json. */
|
|
55
|
+
export interface T3CodeProviderInstance {
|
|
56
|
+
driver: "claudeAgent";
|
|
57
|
+
displayName: string;
|
|
58
|
+
environment: T3CodeEnvironmentVariable[];
|
|
59
|
+
config: { customModels: T3CodeCustomModel[] };
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
export interface T3CodeGeneratedConfig {
|
|
63
|
+
providerInstances: Record<typeof OPENCODE_PROVIDER_ID, T3CodeProviderInstance>;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* One `claudeAgent` provider instance that runs the user's own `claude` binary against
|
|
68
|
+
* the proxy's Messages surface.
|
|
69
|
+
*
|
|
70
|
+
* The environment matches a proxy-mode `ocx claude` launch on a loopback bind:
|
|
71
|
+
* the root origin (Claude Code appends `/v1/messages`) and the non-secret marker as
|
|
72
|
+
* `ANTHROPIC_AUTH_TOKEN`. `ANTHROPIC_API_KEY` is explicitly empty so a stored Anthropic
|
|
73
|
+
* key cannot outrank the marker, which is T3 Code's documented router recipe.
|
|
74
|
+
* `CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST` stops a `settings.json` env block in the
|
|
75
|
+
* user's Claude config from re-pointing this instance away from the proxy.
|
|
76
|
+
*
|
|
77
|
+
* Every variable is `sensitive: false` on purpose: T3 Code moves sensitive values into
|
|
78
|
+
* its secret store and blanks them in settings.json, which would turn our own block into
|
|
79
|
+
* a foreign edit. None of these values is a credential.
|
|
80
|
+
*
|
|
81
|
+
* Models are `customModels` entries keyed by the proxy selector T3 Code sends verbatim
|
|
82
|
+
* as the Claude model id. The Codex driver needs no block: it lists models through
|
|
83
|
+
* `codex app-server`, which already reads the routed catalog opencodex writes into
|
|
84
|
+
* `CODEX_HOME`.
|
|
85
|
+
*/
|
|
86
|
+
function t3codeDocument(ctx: ExportContext): T3CodeGeneratedConfig {
|
|
87
|
+
const origin = new URL(ctx.baseUrl).origin;
|
|
88
|
+
const models = normalizeExportModels(ctx.models);
|
|
89
|
+
const variable = (name: string, value: string): T3CodeEnvironmentVariable => ({ name, value, sensitive: false });
|
|
90
|
+
return {
|
|
91
|
+
providerInstances: {
|
|
92
|
+
[OPENCODE_PROVIDER_ID]: {
|
|
93
|
+
driver: "claudeAgent",
|
|
94
|
+
displayName: "opencodex",
|
|
95
|
+
environment: [
|
|
96
|
+
variable("ANTHROPIC_BASE_URL", origin),
|
|
97
|
+
variable("ANTHROPIC_AUTH_TOKEN", PROXY_MARKER),
|
|
98
|
+
variable("ANTHROPIC_API_KEY", ""),
|
|
99
|
+
variable("CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST", "1"),
|
|
100
|
+
],
|
|
101
|
+
config: {
|
|
102
|
+
customModels: models.map(model => ({
|
|
103
|
+
slug: model.namespaced,
|
|
104
|
+
name: model.displayName || model.namespaced,
|
|
105
|
+
})),
|
|
106
|
+
},
|
|
107
|
+
},
|
|
108
|
+
},
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
/** Refuses any listener that needs an admission header: T3 Code would send only the marker. */
|
|
113
|
+
export function buildT3CodeClientConfig(ctx: ExportContext): T3CodeGeneratedConfig {
|
|
114
|
+
if (shouldInjectApiAuthHeader(ctx.config) || !isLoopbackHostname(new URL(ctx.baseUrl).hostname)) {
|
|
115
|
+
throw new Error("T3 Code's placeholder credential requires a loopback-only listener.");
|
|
116
|
+
}
|
|
117
|
+
return t3codeDocument(ctx);
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
export function summarizeT3Code(document: unknown): { modelCount: number; modelsWithoutLimits: number } {
|
|
121
|
+
const models = (document as T3CodeGeneratedConfig | undefined)
|
|
122
|
+
?.providerInstances?.[OPENCODE_PROVIDER_ID]?.config?.customModels ?? [];
|
|
123
|
+
return { modelCount: models.length, modelsWithoutLimits: 0 };
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
/**
|
|
127
|
+
* Refuses apply and refresh while the Messages surface is closed, explicitly or through
|
|
128
|
+
* the inherited `claudeCode.enabled`: every turn the instance sends would get a 403.
|
|
129
|
+
* Disable and Undo stay available.
|
|
130
|
+
*/
|
|
131
|
+
export function t3codeApplyRefusal(ctx: ExportContext): string | null {
|
|
132
|
+
if (resolveApiSurfaceSettings(ctx.config ?? {}).messages.enabled) return null;
|
|
133
|
+
return "T3 Code needs the Messages API; turn on Messages on the API page (apiSurfaces.messages.enabled) first.";
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
export function buildT3CodeContribution(ctx: ExportContext): ManagedContribution {
|
|
137
|
+
// The writer gates admission before applying. Classification and disable must
|
|
138
|
+
// still work after the operator changes the proxy to a non-loopback bind.
|
|
139
|
+
const doc = t3codeDocument(ctx);
|
|
140
|
+
return singleFragment("t3code", ["providerInstances", OPENCODE_PROVIDER_ID], doc.providerInstances[OPENCODE_PROVIDER_ID]);
|
|
141
|
+
}
|