@bitkyc08/opencodex 2.93.0 → 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-BXu4zE8H.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-CizjBqyk.js +0 -58
- 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/src/cli/link.ts
CHANGED
|
@@ -41,7 +41,7 @@ export const LINK_USAGE = `Usage:
|
|
|
41
41
|
ocx link cleanup [--link-id <id>] [--json]
|
|
42
42
|
|
|
43
43
|
Forced revoke skips remote cleanup. Run ocx disconnect on the remote client.
|
|
44
|
-
Cleanup
|
|
44
|
+
Cleanup reports each Child's platform with disconnect guidance; it changes nothing.`;
|
|
45
45
|
|
|
46
46
|
/**
|
|
47
47
|
* What `ocx link status` prints: the runtime's status DTO itself, so a field the server adds (like
|
|
@@ -1,31 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export type LoopbackFamilyAvailability
|
|
3
|
-
|
|
4
|
-
function bindLoopback(hostname: string): { stop(): void } {
|
|
5
|
-
return Bun.listen({ hostname, port: 0, socket: { data(socket) { socket.end(); } } });
|
|
6
|
-
}
|
|
7
|
-
|
|
8
|
-
/**
|
|
9
|
-
* Ask the kernel whether the concrete local address can be bound, independently of
|
|
10
|
-
* routing/connect timeouts. Only address/family absence permits skipping discovery;
|
|
11
|
-
* permissions, resource exhaustion and other failures leave owner evidence unknown.
|
|
12
|
-
* The ephemeral listener is closed synchronously and never accepts client traffic.
|
|
13
|
-
*/
|
|
14
|
-
export function loopbackFamilyAvailability(
|
|
15
|
-
hostname: string,
|
|
16
|
-
bindFn: (hostname: string) => { stop(): void } = bindLoopback,
|
|
17
|
-
): LoopbackFamilyAvailability {
|
|
18
|
-
const address = hostname === "[::1]" ? "::1" : hostname;
|
|
19
|
-
if (address !== "::1" && address !== "127.0.0.1") return "unknown";
|
|
20
|
-
let listener: { stop(): void };
|
|
21
|
-
try {
|
|
22
|
-
listener = bindFn(address);
|
|
23
|
-
} catch (error) {
|
|
24
|
-
const code = (error as { code?: unknown } | null)?.code;
|
|
25
|
-
return code === "EADDRNOTAVAIL" || code === "EAFNOSUPPORT"
|
|
26
|
-
|| code === "EPROTONOSUPPORT"
|
|
27
|
-
? "unavailable" : "unknown";
|
|
28
|
-
}
|
|
29
|
-
listener.stop();
|
|
30
|
-
return "available";
|
|
31
|
-
}
|
|
1
|
+
// Keep the CLI discovery surface while sharing kernel family admission with recovery.
|
|
2
|
+
export { loopbackFamilyAvailability, type LoopbackFamilyAvailability } from "../lib/loopback-family";
|
package/src/cli/models.ts
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* `ocx models` subcommand — list configured models and manage custom models.
|
|
3
3
|
*/
|
|
4
|
+
import { getConfigDir, withConfigDirHardeningSettled } from "../config/paths";
|
|
4
5
|
import { resolveMatchedPrice, type MatchedPrice } from "../usage/cost";
|
|
5
6
|
import { randomUUID } from "node:crypto";
|
|
6
7
|
import { createInterface } from "node:readline/promises";
|
|
7
8
|
import { syncModelsToCodex } from "../codex/sync";
|
|
8
9
|
import { configuredContextWindow } from "../codex/catalog/provider-fetch";
|
|
9
10
|
import { hasOwnProvider, isValidProviderName, loadConfig, saveConfig } from "../config";
|
|
11
|
+
import { readCliConfigForMutation } from "./config-mutation";
|
|
10
12
|
import {
|
|
11
13
|
configuredReasoningEfforts,
|
|
12
14
|
modelRecordValue,
|
|
@@ -174,58 +176,61 @@ async function handleCustomAdd(args: string[], deps: ModelsCommandDeps): Promise
|
|
|
174
176
|
if (!provider || !modelId) fail("provider and modelId are required", ADD_USAGE);
|
|
175
177
|
if (!isValidProviderName(provider)) fail(`invalid provider name "${provider}"`);
|
|
176
178
|
|
|
177
|
-
const config =
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
179
|
+
const { config, entry } = await withConfigDirHardeningSettled(getConfigDir(), () => {
|
|
180
|
+
const config = readCliConfigForMutation();
|
|
181
|
+
if (!hasOwnProvider(config.providers, provider)) {
|
|
182
|
+
fail(`provider "${provider}" is not configured. See: ocx provider list`);
|
|
183
|
+
}
|
|
181
184
|
|
|
182
|
-
|
|
183
|
-
|
|
185
|
+
const displayName = displayNameValue?.trim() || undefined;
|
|
186
|
+
if (displayName?.includes("/")) fail("displayName must not contain /");
|
|
184
187
|
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
188
|
+
let contextWindow: number | undefined;
|
|
189
|
+
if (contextWindowValue !== undefined) {
|
|
190
|
+
contextWindow = Number(contextWindowValue);
|
|
191
|
+
if (!Number.isInteger(contextWindow) || contextWindow <= 0) {
|
|
192
|
+
fail("context window must be a positive integer");
|
|
193
|
+
}
|
|
190
194
|
}
|
|
191
|
-
}
|
|
192
195
|
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
196
|
+
let inputModalities: string[] | undefined;
|
|
197
|
+
if (modalitiesValue !== undefined) {
|
|
198
|
+
inputModalities = modalitiesValue.split(",").map(value => value.trim());
|
|
199
|
+
const invalid = inputModalities.filter(value => !ALLOWED_MODALITIES.has(value));
|
|
200
|
+
if (inputModalities.length === 0 || invalid.length > 0) {
|
|
201
|
+
fail("modalities must be comma-separated values from text|image|audio");
|
|
202
|
+
}
|
|
203
|
+
inputModalities = [...new Set(inputModalities)];
|
|
199
204
|
}
|
|
200
|
-
inputModalities = [...new Set(inputModalities)];
|
|
201
|
-
}
|
|
202
205
|
|
|
203
|
-
|
|
204
|
-
|
|
206
|
+
const parsed = parseReasoningArgs(reasoningEffortsValue, defaultEffortValue);
|
|
207
|
+
if (parsed.error) fail(parsed.error);
|
|
205
208
|
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
209
|
+
const existing = config.customModels ?? [];
|
|
210
|
+
const slug = routedSlug(provider, modelId);
|
|
211
|
+
if (existing.some(model => routedSlug(model.provider, model.modelId) === slug)) {
|
|
212
|
+
fail(`custom model "${slug}" already exists`);
|
|
213
|
+
}
|
|
214
|
+
const known = knownModelIdsForProvider(provider, config.providers[provider], config);
|
|
215
|
+
if (encodedModelIdCollides(modelId, known)) {
|
|
216
|
+
fail(`custom model "${slug}" is ambiguous; it encodes to an existing model id`);
|
|
217
|
+
}
|
|
215
218
|
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
219
|
+
const entry: OcxCustomModel = {
|
|
220
|
+
id: randomUUID(),
|
|
221
|
+
provider,
|
|
222
|
+
modelId,
|
|
223
|
+
...(displayName ? { displayName } : {}),
|
|
224
|
+
...(contextWindow ? { contextWindow } : {}),
|
|
225
|
+
...(inputModalities ? { inputModalities } : {}),
|
|
226
|
+
...(parsed.reasoningEfforts ? { reasoningEfforts: parsed.reasoningEfforts } : {}),
|
|
227
|
+
...(parsed.defaultReasoningEffort ? { defaultReasoningEffort: parsed.defaultReasoningEffort } : {}),
|
|
228
|
+
addedAt: new Date().toISOString(),
|
|
229
|
+
};
|
|
230
|
+
config.customModels = [...existing, entry];
|
|
231
|
+
saveConfig(config);
|
|
232
|
+
return { config, entry };
|
|
233
|
+
});
|
|
229
234
|
const sync = await syncCustomModelsIfLive(config, deps);
|
|
230
235
|
printCustomMutation("added", entry, sync, wantsJson);
|
|
231
236
|
}
|
|
@@ -256,7 +261,7 @@ async function handleCustomRemove(args: string[], deps: ModelsCommandDeps): Prom
|
|
|
256
261
|
return;
|
|
257
262
|
}
|
|
258
263
|
|
|
259
|
-
const config =
|
|
264
|
+
const config = readCliConfigForMutation({ passive: true });
|
|
260
265
|
const existing = config.customModels ?? [];
|
|
261
266
|
// Slug matching goes through the shared resolver so this command sees the same collision
|
|
262
267
|
// class catalog filtering and persisted sync see (#2491). `slugEquals` compares the raw and
|
|
@@ -298,10 +303,18 @@ async function handleCustomRemove(args: string[], deps: ModelsCommandDeps): Prom
|
|
|
298
303
|
return;
|
|
299
304
|
}
|
|
300
305
|
|
|
301
|
-
const
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
306
|
+
const savedConfig = await withConfigDirHardeningSettled(getConfigDir(), () => {
|
|
307
|
+
const fresh = readCliConfigForMutation();
|
|
308
|
+
const current = fresh.customModels ?? [];
|
|
309
|
+
if (JSON.stringify(current.find(row => row.id === model.id)) !== JSON.stringify(model)) {
|
|
310
|
+
fail("custom model changed before removal; inspect it before retrying");
|
|
311
|
+
}
|
|
312
|
+
const next = current.filter(row => row.id !== model.id);
|
|
313
|
+
fresh.customModels = next.length > 0 ? next : undefined;
|
|
314
|
+
saveConfig(fresh);
|
|
315
|
+
return fresh;
|
|
316
|
+
});
|
|
317
|
+
const sync = await syncCustomModelsIfLive(savedConfig, deps);
|
|
305
318
|
printCustomMutation("removed", model, sync, wantsJson);
|
|
306
319
|
}
|
|
307
320
|
|
package/src/cli/provider.ts
CHANGED
|
@@ -9,6 +9,8 @@
|
|
|
9
9
|
* set-default <name> Change the default provider
|
|
10
10
|
*/
|
|
11
11
|
import { hasOwnProvider, isValidProviderName, loadConfig, readConfigAdmissionSnapshot, sanitizeModelCostsForDisplay, saveConfig, validateConfigCandidate, withConfigMutationLockSync } from "../config";
|
|
12
|
+
import { readCliConfigForMutation } from "./config-mutation";
|
|
13
|
+
import { getConfigDir, withConfigDirHardeningSettled } from "../config/paths";
|
|
12
14
|
import { apiKeyTransportConfigError, modelCapabilitiesConfigError, mergeModelCapabilities } from "../config/provider-validation";
|
|
13
15
|
import { hasHelpFlag, printSubcommandUsage } from "./help";
|
|
14
16
|
import { getProviderRegistryEntry, PROVIDER_REGISTRY } from "../providers/registry";
|
|
@@ -248,165 +250,170 @@ async function handleAdd(args: string[], deps: ProviderCommandDeps): Promise<voi
|
|
|
248
250
|
process.exit(1);
|
|
249
251
|
}
|
|
250
252
|
|
|
251
|
-
const
|
|
253
|
+
const { initializeProviderModelSelection } = await import("../providers/initial-model-selection");
|
|
254
|
+
const admitted = await withConfigDirHardeningSettled(getConfigDir(), () => {
|
|
255
|
+
const config = readCliConfigForMutation();
|
|
252
256
|
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
257
|
+
const namespaceCollision = codexAccountNamespaceProviderCollisionError(config.codexAccountNamespaces, name);
|
|
258
|
+
if (namespaceCollision) {
|
|
259
|
+
console.error(`Error: ${namespaceCollision}.`);
|
|
260
|
+
process.exit(1);
|
|
261
|
+
}
|
|
258
262
|
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
+
if (hasOwnProvider(config.providers, name) && !force) {
|
|
264
|
+
console.error(`Provider "${name}" already exists. Use --force to overwrite.`);
|
|
265
|
+
process.exit(1);
|
|
266
|
+
}
|
|
263
267
|
|
|
264
|
-
|
|
265
|
-
|
|
268
|
+
let provConfig: OcxProviderConfig;
|
|
269
|
+
const registryEntry = getProviderRegistryEntry(name);
|
|
266
270
|
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
271
|
+
if (registryEntry) {
|
|
272
|
+
if (registryEntry.deprecated) console.warn(`Warning: provider "${name}" is deprecated: ${registryEntry.deprecated}`);
|
|
273
|
+
provConfig = providerConfigSeed(registryEntry);
|
|
274
|
+
if (apiKey) {
|
|
275
|
+
const candidateError = providerCredentialInputError({ apiKey });
|
|
276
|
+
if (candidateError) {
|
|
277
|
+
console.error(`Error: ${candidateError}`);
|
|
278
|
+
process.exitCode = 2;
|
|
279
|
+
return;
|
|
280
|
+
}
|
|
281
|
+
if ((authMode ?? registryEntry.authKind) === "forward") {
|
|
282
|
+
console.warn(`Warning: provider "${name}" uses ChatGPT login (forward auth); --api-key is ignored.`);
|
|
283
|
+
} else if ((authMode ?? registryEntry.authKind) === "oauth") {
|
|
284
|
+
console.warn(`Warning: provider "${name}" uses OAuth auth; --api-key is ignored. Run: ocx login ${name}`);
|
|
285
|
+
} else {
|
|
286
|
+
provConfig.apiKey = apiKey;
|
|
287
|
+
}
|
|
276
288
|
}
|
|
277
|
-
if (
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
289
|
+
if (defaultModel) provConfig.defaultModel = defaultModel;
|
|
290
|
+
if (adapter) provConfig.adapter = adapter;
|
|
291
|
+
if (baseUrl) provConfig.baseUrl = baseUrl;
|
|
292
|
+
} else {
|
|
293
|
+
if (!adapter || !baseUrl) {
|
|
294
|
+
console.error(`Provider "${name}" is not in the registry. --adapter and --base-url are required.`);
|
|
295
|
+
console.error("Usage: ocx provider add <name> --adapter <adapter> --base-url <url> [--api-key <key>]");
|
|
296
|
+
process.exit(1);
|
|
283
297
|
}
|
|
298
|
+
provConfig = {
|
|
299
|
+
adapter,
|
|
300
|
+
baseUrl,
|
|
301
|
+
...(apiKey ? { apiKey } : {}),
|
|
302
|
+
...(defaultModel ? { defaultModel } : {}),
|
|
303
|
+
};
|
|
284
304
|
}
|
|
285
|
-
if (defaultModel) provConfig.defaultModel = defaultModel;
|
|
286
|
-
if (adapter) provConfig.adapter = adapter;
|
|
287
|
-
if (baseUrl) provConfig.baseUrl = baseUrl;
|
|
288
|
-
} else {
|
|
289
|
-
if (!adapter || !baseUrl) {
|
|
290
|
-
console.error(`Provider "${name}" is not in the registry. --adapter and --base-url are required.`);
|
|
291
|
-
console.error("Usage: ocx provider add <name> --adapter <adapter> --base-url <url> [--api-key <key>]");
|
|
292
|
-
process.exit(1);
|
|
293
|
-
}
|
|
294
|
-
provConfig = {
|
|
295
|
-
adapter,
|
|
296
|
-
baseUrl,
|
|
297
|
-
...(apiKey ? { apiKey } : {}),
|
|
298
|
-
...(defaultModel ? { defaultModel } : {}),
|
|
299
|
-
};
|
|
300
|
-
}
|
|
301
305
|
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
306
|
+
if (responsesPath !== undefined) provConfig.responsesPath = responsesPath;
|
|
307
|
+
const credentialError = providerCredentialInputError(provConfig);
|
|
308
|
+
if (credentialError) {
|
|
309
|
+
console.error(`Error: ${credentialError}`);
|
|
310
|
+
process.exitCode = 2;
|
|
311
|
+
return;
|
|
312
|
+
}
|
|
313
|
+
if (authMode !== undefined) provConfig.authMode = authMode as OcxProviderConfig["authMode"];
|
|
314
|
+
if (name === "anthropic2") {
|
|
315
|
+
if (provConfig.adapter !== "anthropic" || provConfig.authMode !== "oauth") delete provConfig.anthropicOAuthInstance;
|
|
316
|
+
if (provConfig.anthropicOAuthInstance) {
|
|
317
|
+
try { assertAnthropicInstanceLoginConfig(config, name); }
|
|
318
|
+
catch {
|
|
319
|
+
console.error("Error: cannot add Pool 2 over an existing custom or unreadable provider configuration; resolve it first.");
|
|
320
|
+
process.exitCode = 2;
|
|
321
|
+
return;
|
|
322
|
+
}
|
|
318
323
|
}
|
|
319
324
|
}
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
}
|
|
325
|
+
if (name === "openai" && (authMode !== undefined || responsesPath !== undefined)
|
|
326
|
+
&& !isCanonicalOpenAiForwardProvider(provConfig)) {
|
|
327
|
+
console.error("Error: Canonical OpenAI must keep its built-in forward destination and authentication. Use a separate provider name for a custom endpoint.");
|
|
328
|
+
process.exitCode = 2;
|
|
329
|
+
return;
|
|
330
|
+
}
|
|
327
331
|
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
+
if (apiKeyTransport !== undefined) {
|
|
333
|
+
if (apiKeyTransport !== "x-api-key" && apiKeyTransport !== "bearer") {
|
|
334
|
+
console.error('Error: --api-key-transport must be "x-api-key" or "bearer".');
|
|
335
|
+
process.exit(1);
|
|
336
|
+
}
|
|
337
|
+
const transportError = apiKeyTransportConfigError({ ...provConfig, apiKeyTransport });
|
|
338
|
+
if (transportError) {
|
|
339
|
+
console.error(`Error: ${transportError}.`);
|
|
340
|
+
process.exit(1);
|
|
341
|
+
}
|
|
342
|
+
provConfig.apiKeyTransport = apiKeyTransport;
|
|
332
343
|
}
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
344
|
+
if (googleToolSchemaPolicy !== undefined) {
|
|
345
|
+
if (googleToolSchemaPolicy !== "compatible" && googleToolSchemaPolicy !== "reject-lossy") {
|
|
346
|
+
console.error('Error: --google-tool-schema-policy must be "compatible" or "reject-lossy".');
|
|
347
|
+
process.exit(1);
|
|
348
|
+
}
|
|
349
|
+
if (provConfig.adapter !== "google") {
|
|
350
|
+
console.error("Error: --google-tool-schema-policy requires the google adapter.");
|
|
351
|
+
process.exit(1);
|
|
352
|
+
}
|
|
353
|
+
provConfig.googleToolSchemaPolicy = googleToolSchemaPolicy;
|
|
337
354
|
}
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
console.error('Error: --google-tool-schema-policy must be "compatible" or "reject-lossy".');
|
|
343
|
-
process.exit(1);
|
|
355
|
+
|
|
356
|
+
const existingProvider = config.providers[name];
|
|
357
|
+
if (existingProvider?.modelCapabilities !== undefined && provConfig.modelCapabilities === undefined) {
|
|
358
|
+
provConfig.modelCapabilities = structuredClone(existingProvider.modelCapabilities);
|
|
344
359
|
}
|
|
345
|
-
if (provConfig.
|
|
346
|
-
|
|
347
|
-
process.exit(1);
|
|
360
|
+
if (existingProvider?.modelContextTiers !== undefined && provConfig.modelContextTiers === undefined) {
|
|
361
|
+
provConfig.modelContextTiers = structuredClone(existingProvider.modelContextTiers);
|
|
348
362
|
}
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
if (textOnly) {
|
|
360
|
-
const modelId = capabilityModel ?? defaultModel ?? provConfig.defaultModel;
|
|
361
|
-
if (!modelId) {
|
|
362
|
-
console.error("Error: --text-only requires --model or a default model.");
|
|
363
|
-
process.exit(1);
|
|
363
|
+
if (textOnly) {
|
|
364
|
+
const modelId = capabilityModel ?? defaultModel ?? provConfig.defaultModel;
|
|
365
|
+
if (!modelId) {
|
|
366
|
+
console.error("Error: --text-only requires --model or a default model.");
|
|
367
|
+
process.exit(1);
|
|
368
|
+
}
|
|
369
|
+
const declaration = { [modelId]: { inputModalities: ["text"] } };
|
|
370
|
+
const error = modelCapabilitiesConfigError(declaration);
|
|
371
|
+
if (error) { console.error(`Error: ${error}.`); process.exit(1); }
|
|
372
|
+
provConfig.modelCapabilities = mergeModelCapabilities(provConfig.modelCapabilities, declaration);
|
|
364
373
|
}
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
// A --force overwrite rotates the key/endpoint but must not drop a
|
|
371
|
-
// user-configured price overlay (same rule as the /api/providers path and
|
|
372
|
-
// the login paths); there is no explicit clear/replace flag yet.
|
|
373
|
-
if (existingProvider?.modelCosts !== undefined && provConfig.modelCosts === undefined) {
|
|
374
|
-
provConfig.modelCosts = existingProvider.modelCosts;
|
|
375
|
-
}
|
|
376
|
-
if (allowPrivateNetwork) provConfig.allowPrivateNetwork = true;
|
|
377
|
-
// New auth/path overrides use the management owner's completed-row contract.
|
|
378
|
-
// Validate overrides before registration state changes; the full candidate is
|
|
379
|
-
// validated again by validateAndSave for every local save.
|
|
380
|
-
if ((authMode !== undefined || responsesPath !== undefined)
|
|
381
|
-
&& providerManagementConfigError(name, provConfig)) {
|
|
382
|
-
console.error("Error: Invalid provider configuration. Authentication, destination and provider options must satisfy the provider's management rules.");
|
|
383
|
-
process.exitCode = 2;
|
|
384
|
-
return;
|
|
385
|
-
}
|
|
386
|
-
const { initializeProviderModelSelection } = await import("../providers/initial-model-selection");
|
|
387
|
-
let markerCollision = false;
|
|
388
|
-
let removedCredentials: string[] = [];
|
|
389
|
-
withConfigMutationLockSync(() => {
|
|
390
|
-
if (provConfig.anthropicOAuthInstance) {
|
|
391
|
-
try { assertAnthropicInstanceLoginConfig(config, name); }
|
|
392
|
-
catch { markerCollision = true; return; }
|
|
374
|
+
// A --force overwrite rotates the key/endpoint but must not drop a
|
|
375
|
+
// user-configured price overlay (same rule as the /api/providers path and
|
|
376
|
+
// the login paths); there is no explicit clear/replace flag yet.
|
|
377
|
+
if (existingProvider?.modelCosts !== undefined && provConfig.modelCosts === undefined) {
|
|
378
|
+
provConfig.modelCosts = existingProvider.modelCosts;
|
|
393
379
|
}
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
380
|
+
if (allowPrivateNetwork) provConfig.allowPrivateNetwork = true;
|
|
381
|
+
// New auth/path overrides use the management owner's completed-row contract.
|
|
382
|
+
// Validate overrides before registration state changes; the full candidate is
|
|
383
|
+
// validated again by validateAndSave for every local save.
|
|
384
|
+
if ((authMode !== undefined || responsesPath !== undefined)
|
|
385
|
+
&& providerManagementConfigError(name, provConfig)) {
|
|
386
|
+
console.error("Error: Invalid provider configuration. Authentication, destination and provider options must satisfy the provider's management rules.");
|
|
387
|
+
process.exitCode = 2;
|
|
388
|
+
return;
|
|
389
|
+
}
|
|
390
|
+
let markerCollision = false;
|
|
391
|
+
let removedCredentials: string[] = [];
|
|
392
|
+
withConfigMutationLockSync(() => {
|
|
393
|
+
if (provConfig.anthropicOAuthInstance) {
|
|
394
|
+
try { assertAnthropicInstanceLoginConfig(config, name); }
|
|
395
|
+
catch { markerCollision = true; return; }
|
|
396
|
+
}
|
|
397
|
+
initializeProviderModelSelection(name, provConfig, existingProvider, config);
|
|
398
|
+
const durable = readConfigAdmissionSnapshot();
|
|
399
|
+
const durableProvider = durable.kind === "read" && durable.diagnostics.source === "file"
|
|
400
|
+
&& durable.diagnostics.error === null ? durable.diagnostics.config.providers[name] : undefined;
|
|
401
|
+
removedCredentials = [config.providers[name], durableProvider].flatMap(provider => provider ? providerGcpCredentialMarkers(provider) : []);
|
|
402
|
+
config.providers[name] = provConfig;
|
|
403
|
+
if (setDefault) config.defaultProvider = name;
|
|
404
|
+
validateAndSave(config);
|
|
405
|
+
});
|
|
406
|
+
if (!markerCollision) cleanupRemovedGcpCredentials(removedCredentials);
|
|
407
|
+
return { config, provConfig, registryEntry, markerCollision };
|
|
402
408
|
});
|
|
409
|
+
if (!admitted) return;
|
|
410
|
+
const { config, provConfig, registryEntry, markerCollision } = admitted;
|
|
403
411
|
if (markerCollision) {
|
|
404
412
|
console.error("Error: provider configuration changed while adding Pool 2; resolve the ownership collision first.");
|
|
405
413
|
process.exitCode = 2;
|
|
406
414
|
return;
|
|
407
415
|
}
|
|
408
416
|
|
|
409
|
-
cleanupRemovedGcpCredentials(removedCredentials);
|
|
410
417
|
let sync: LocalSyncResult | undefined;
|
|
411
418
|
if (wantsSync) {
|
|
412
419
|
try {
|
|
@@ -478,7 +485,7 @@ function handleRemove(args: string[]): void {
|
|
|
478
485
|
}
|
|
479
486
|
rejectUnknownArgs(restArgs.slice(1), "Usage: ocx provider remove <name> [--json]");
|
|
480
487
|
|
|
481
|
-
const config =
|
|
488
|
+
const config = readCliConfigForMutation();
|
|
482
489
|
if (!hasOwnProvider(config.providers, name)) {
|
|
483
490
|
console.error(`Provider "${name}" is not configured.`);
|
|
484
491
|
process.exit(1);
|
|
@@ -585,7 +592,7 @@ function handleSetDefault(args: string[]): void {
|
|
|
585
592
|
}
|
|
586
593
|
rejectUnknownArgs(restArgs.slice(1), "Usage: ocx provider set-default <name> [--json]");
|
|
587
594
|
|
|
588
|
-
const config =
|
|
595
|
+
const config = readCliConfigForMutation();
|
|
589
596
|
if (!hasOwnProvider(config.providers, name)) {
|
|
590
597
|
console.error(`Provider "${name}" is not configured. Add it first: ocx provider add ${name}`);
|
|
591
598
|
process.exit(1);
|
|
@@ -668,14 +675,14 @@ export async function handleProviderCommand(args: string[], deps: ProviderComman
|
|
|
668
675
|
await handleAdd(subArgs, deps);
|
|
669
676
|
break;
|
|
670
677
|
case "remove":
|
|
671
|
-
handleRemove(subArgs);
|
|
678
|
+
await withConfigDirHardeningSettled(getConfigDir(), () => handleRemove(subArgs));
|
|
672
679
|
break;
|
|
673
680
|
case "show":
|
|
674
681
|
await (await import("./link-child")).printLinkChildLocalNotice("The provider settings");
|
|
675
682
|
handleShow(subArgs);
|
|
676
683
|
break;
|
|
677
684
|
case "set-default":
|
|
678
|
-
handleSetDefault(subArgs);
|
|
685
|
+
await withConfigDirHardeningSettled(getConfigDir(), () => handleSetDefault(subArgs));
|
|
679
686
|
break;
|
|
680
687
|
default: {
|
|
681
688
|
const { handleProviderRuntimeCommand } = await import("./provider-runtime");
|
package/src/cli/registry.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { EXPORT_CLIENT_IDS } from "../clients/client-ids";
|
|
2
|
+
|
|
1
3
|
export interface CliCommandEntry {
|
|
2
4
|
name: string;
|
|
3
5
|
aliases?: string[];
|
|
@@ -518,16 +520,18 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
518
520
|
},
|
|
519
521
|
{
|
|
520
522
|
name: "export",
|
|
521
|
-
usage:
|
|
522
|
-
summary: "Print a client config (OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, gjc, DeepSeek Harness, MiniMax Code, ZCode, Command Code, Prime Agent, Aside, Raycast, omo, Cline, Kilo, Factory Droid, Qoder, Qoder CN, WorkBuddy, WorkBuddy AI, Gentle Shell) wired to the running proxy.",
|
|
523
|
+
usage: `ocx export --client <${EXPORT_CLIENT_IDS.join("|")}> [--model-names <alias|routed>] [--json] [--out <path>] [--force]`,
|
|
524
|
+
summary: "Print a client config (OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, gjc, DeepSeek Harness, MiniMax Code, ZCode, Command Code, Prime Agent, Aside, Raycast, omo, Cline, Kilo, Factory Droid, Qoder, Qoder CN, WorkBuddy, WorkBuddy AI, Gentle Shell, T3 Code) wired to the running proxy.",
|
|
523
525
|
details: [
|
|
524
526
|
"--json prints the generated document as JSON on stdout; use --out for the client's native format.",
|
|
525
527
|
"--out <path> writes the native config there and refuses to replace an existing file without --force.",
|
|
526
528
|
"Cline exports a two-document bundle: settings for providers.json and catalog for sibling models.json. Use integration client enable --client cline for a journaled write.",
|
|
527
529
|
"Droid exports documented customModels for settings.json; use integration client enable --client droid for a journaled write.",
|
|
528
530
|
"Gentle Shell uses its persistent selected home; use integration client enable --client gentle-shell for a journaled write, or Pi for link/shared homes.",
|
|
531
|
+
"T3 Code exports providerInstances.opencodex for settings.json, a Claude provider instance routed through the proxy; use integration client enable --client t3code for a journaled write.",
|
|
529
532
|
"The config never contains a real key; it carries a documented env reference or a non-secret loopback placeholder.",
|
|
530
533
|
"The destination path is printed for merging by hand — ocx never writes your real client config.",
|
|
534
|
+
"Hermes and Command Code accept --model-names alias|routed; explicit naming uses a passive cached roster and can refuse while cold or stale. Omission keeps the existing routed export flow without changing managed policy.",
|
|
531
535
|
],
|
|
532
536
|
},
|
|
533
537
|
{
|
|
@@ -549,7 +553,7 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
549
553
|
{
|
|
550
554
|
name: "system",
|
|
551
555
|
usage: "ocx system <status|health|settings|startup|diagnostics|sync|codex-app-server|codex-restart|update|codex-cli-update> ...",
|
|
552
|
-
summary: "Manage headless runtime settings, health, startup, sync, diagnostics, OpenCodex updates, and
|
|
556
|
+
summary: "Manage headless runtime settings, health, startup, sync, diagnostics, OpenCodex updates, and Codex CLI update plans and jobs.",
|
|
553
557
|
details: [
|
|
554
558
|
"system update manages OpenCodex itself.",
|
|
555
559
|
"system health reads authenticated service and spend-ledger diagnostics; root health remains liveness.",
|
|
@@ -557,6 +561,8 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
557
561
|
"ocx system codex-cli-update attest [--json]",
|
|
558
562
|
"ocx system codex-cli-update attest --candidate <absolute-path> --npm-prefix <absolute-path> --npm-cli <absolute-path> --node <absolute-path> [--json]",
|
|
559
563
|
"ocx system codex-cli-update plan [--channel latest] [--json]",
|
|
564
|
+
"ocx system codex-cli-update apply --plan-id <32-hex> --yes [--request-id <key>] [--json]",
|
|
565
|
+
"ocx system codex-cli-update status <job-id> [--json]",
|
|
560
566
|
"check and attest make no package-registry request, do not execute Codex or npm, and write nothing. plan adds a registry query and a process-table read and mutates no application state (temporary isolated npm files only, removed best-effort).",
|
|
561
567
|
],
|
|
562
568
|
},
|
|
@@ -603,6 +609,31 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
603
609
|
"Claude Code settings: ocx claude config <status|set> ...",
|
|
604
610
|
],
|
|
605
611
|
},
|
|
612
|
+
{
|
|
613
|
+
name: "codex",
|
|
614
|
+
usage: "ocx codex [codex args...]",
|
|
615
|
+
summary: "Launch Codex through the local proxy's routing, passing through when Codex routing is disabled.",
|
|
616
|
+
details: [
|
|
617
|
+
"Mirrors `ocx claude` on Codex's config-owned wiring channel: ensures the proxy is running,",
|
|
618
|
+
"then execs `codex` unchanged. Routing itself stays config-owned (the injected `openai_base_url`",
|
|
619
|
+
"in ~/.codex/config.toml); a launch never rewrites a config file.",
|
|
620
|
+
"For verified local routing, a missing OPENCODEX_API_AUTH_TOKEN is filled from ~/.opencodex/service-api-token, the same",
|
|
621
|
+
"injection the `codex` autostart shim performs.",
|
|
622
|
+
"--help/-h, --version/-V, and Codex-internal subcommands (login, doctor, help, ...) skip the",
|
|
623
|
+
"proxy ensure and pass the environment through unchanged, keeping the shim's argv grammar.",
|
|
624
|
+
"No injected routing: informational notice, native exec, no ensure.",
|
|
625
|
+
"Foreign gateway routing (custom-local/custom-remote): warning, native exec, that route untouched.",
|
|
626
|
+
"Unverifiable routing: warning, and the proxy ensure is still attempted.",
|
|
627
|
+
"Unknown routing never adds a service token; token-file overrides and management credentials are not used for client injection.",
|
|
628
|
+
"A fresh token is loaded only for allowlisted argv, no HTTP(S)/ALL proxy or CODEX_*/OPENAI_*/AZURE_OPENAI_* env overrides",
|
|
629
|
+
"(canonical CODEX_HOME is allowed), and verified home/config/system ownership and managed transport.",
|
|
630
|
+
"Other inputs (including -c/--config, -p/--profile and resume/fork) withhold it with a value-free diagnostic.",
|
|
631
|
+
"If the ensure fails, one stderr line is printed and launch continues subject to executable verification.",
|
|
632
|
+
"Only a matched autostart wrapper launches its backing Codex directly; unknown state requires a verified bypass.",
|
|
633
|
+
"Unverifiable or obsolete wrappers refuse with exit 1 and start no Codex; run `ocx codex-shim install`.",
|
|
634
|
+
"Stop using `ocx codex` and plain `codex` behaves exactly as before.",
|
|
635
|
+
],
|
|
636
|
+
},
|
|
606
637
|
{
|
|
607
638
|
name: "opencode",
|
|
608
639
|
usage: "ocx opencode [opencode args...]",
|
package/src/cli/root.ts
CHANGED
|
@@ -38,6 +38,8 @@ export interface CliHead {
|
|
|
38
38
|
export function parseCliHead(argv: string[]): CliHead {
|
|
39
39
|
const command = argv[0];
|
|
40
40
|
const args = argv;
|
|
41
|
+
// Codex owns its forwarded grammar; wrapper documentation is `ocx help codex`.
|
|
42
|
+
if (command === "codex") return { kind: "command", command, args };
|
|
41
43
|
if (command === "--version" || command === "-v" || command === "version") {
|
|
42
44
|
return { kind: "version", command, args };
|
|
43
45
|
}
|