@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-D5qUBOoF.js +60 -0
- package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
- package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
- package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
- package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
- package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
package/src/cli/account-auth.ts
CHANGED
|
@@ -88,6 +88,8 @@ interface LoginStart {
|
|
|
88
88
|
deviceCode?: string;
|
|
89
89
|
/** Whether the host actually opened a browser. Absent from older proxies. */
|
|
90
90
|
browserLaunch?: "started" | "failed" | "skipped";
|
|
91
|
+
/** Set when the proxy's `codexAuthMethod: "device-only"` imposed the device grant (#8082). */
|
|
92
|
+
authMethod?: "device-only";
|
|
91
93
|
method?: "builder-id" | "google" | "github";
|
|
92
94
|
userCode?: string;
|
|
93
95
|
verificationUri?: string;
|
|
@@ -113,6 +115,7 @@ function publicLoginStart(value: unknown, kiro = false): LoginStart {
|
|
|
113
115
|
if (typeof data[key] === "string") out[key] = data[key];
|
|
114
116
|
}
|
|
115
117
|
if (typeof data.browserLaunch === "string" && ["started", "failed", "skipped"].includes(data.browserLaunch)) out.browserLaunch = data.browserLaunch as LoginStart["browserLaunch"];
|
|
118
|
+
if (data.authMethod === "device-only") out.authMethod = "device-only";
|
|
116
119
|
if (typeof data.method === "string" && ["builder-id", "google", "github"].includes(data.method)) out.method = data.method as LoginStart["method"];
|
|
117
120
|
if (typeof data.state === "string" && ["pending", "done", "failed", "expired", "cancelled"].includes(data.state)) out.state = data.state as string;
|
|
118
121
|
if (typeof data.warning === "string" && ["duplicate_profile_arn", "manual_review_required"].includes(data.warning)) out.warning = data.warning as string;
|
|
@@ -136,6 +139,7 @@ function publicLoginStatus(value: unknown): Record<string, unknown> {
|
|
|
136
139
|
for (const key of ["id", "alias", "email"]) if (typeof row[key] === "string") account[key] = row[key];
|
|
137
140
|
for (const key of ["active", "needsReauth"]) if (typeof row[key] === "boolean") account[key] = row[key];
|
|
138
141
|
if (row.needsReauthReason === "verify_account") account.needsReauthReason = "verify_account";
|
|
142
|
+
if (row.needsReauthReason === "verify_account" && row.needsReauthCause === "tos_violation") account.needsReauthCause = "tos_violation";
|
|
139
143
|
if (typeof row.expiresAt === "number" && Number.isFinite(row.expiresAt)) account.expiresAt = row.expiresAt;
|
|
140
144
|
if (row.plan === null) account.plan = null;
|
|
141
145
|
return account;
|
|
@@ -219,6 +223,25 @@ async function resolveCode(
|
|
|
219
223
|
return await readSecretLine(deps, "authorization code");
|
|
220
224
|
}
|
|
221
225
|
|
|
226
|
+
const CODEX_LOGIN_CANCEL_TIMEOUT_MS = 2_000;
|
|
227
|
+
|
|
228
|
+
async function cancelStartedCodexLogin(flowId: string | undefined, deps: RuntimeApiDeps): Promise<boolean> {
|
|
229
|
+
if (!flowId) return false;
|
|
230
|
+
try {
|
|
231
|
+
await runtimeRequest("/api/codex-auth/login/cancel", {
|
|
232
|
+
method: "POST", redirect: "error", body: JSON.stringify({ flowId }),
|
|
233
|
+
signal: AbortSignal.timeout(CODEX_LOGIN_CANCEL_TIMEOUT_MS),
|
|
234
|
+
}, deps);
|
|
235
|
+
return true;
|
|
236
|
+
} catch {
|
|
237
|
+
return false;
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
function codexLoginCancelFailure(flowId: string | undefined): string {
|
|
242
|
+
return `Could not cancel the started login flow.${flowId ? ` Flow: ${terminalSafeText(flowId)}` : ""}`;
|
|
243
|
+
}
|
|
244
|
+
|
|
222
245
|
async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | void> {
|
|
223
246
|
const args = [...argv];
|
|
224
247
|
const provider = args.shift()?.trim().toLowerCase();
|
|
@@ -280,7 +303,9 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
280
303
|
}
|
|
281
304
|
// Only resolve when --code was actually given: a plain `ocx account login`
|
|
282
305
|
// opens the browser flow and polls, and must not block on stdin.
|
|
283
|
-
|
|
306
|
+
// Codex resolves a stdin code only after the start answer: under `codexAuthMethod: "device-only"`
|
|
307
|
+
// a pasted code is refused, and an open stdin with no data must not hold that refusal back (#8082).
|
|
308
|
+
let code = CODEX_NAMES.has(provider) ? undefined : await resolveCode(suppliedCode, deps, false);
|
|
284
309
|
const pinned = { ...deps, baseUrl: await runtimeBaseUrl(deps) };
|
|
285
310
|
|
|
286
311
|
if (method) {
|
|
@@ -317,12 +342,32 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
317
342
|
...(openBrowser === undefined ? {} : { openBrowser }),
|
|
318
343
|
}),
|
|
319
344
|
}, pinned));
|
|
345
|
+
// `codexAuthMethod: "device-only"` (#8082) imposes the device grant after the request is sent.
|
|
346
|
+
// A JSON wait prints nothing until the end and a pasted code has no flow to complete, so either
|
|
347
|
+
// would leave the person without the URL and code: cancel the flow and say what works instead.
|
|
348
|
+
if (start.authMethod === "device-only" && (suppliedCode !== undefined || (wantsJson && !noWait))) {
|
|
349
|
+
const cancelled = await cancelStartedCodexLogin(start.flowId, pinned);
|
|
350
|
+
const advice = suppliedCode !== undefined
|
|
351
|
+
? "--code cannot be used; run the login without --code and enter the device code at the returned URL"
|
|
352
|
+
: "with --json, add --no-wait and complete the login with the returned url and deviceCode";
|
|
353
|
+
const cleanup = cancelled ? "" : ` ${codexLoginCancelFailure(start.flowId)}`;
|
|
354
|
+
throw new CliUsageError(`This proxy requires device code login (codexAuthMethod: device-only), so ${advice}.${cleanup}`, USAGE);
|
|
355
|
+
}
|
|
356
|
+
try {
|
|
357
|
+
code = await resolveCode(suppliedCode, deps, false);
|
|
358
|
+
} catch (error) {
|
|
359
|
+
if (!await cancelStartedCodexLogin(start.flowId, pinned)) {
|
|
360
|
+
console.error(codexLoginCancelFailure(start.flowId));
|
|
361
|
+
}
|
|
362
|
+
throw error;
|
|
363
|
+
}
|
|
320
364
|
if (!wantsJson) {
|
|
321
365
|
// One atomic pre-poll block, flushed synchronously so a piped parent
|
|
322
366
|
// reads the URL before the polling window starts (#1007).
|
|
323
367
|
writeLoginInstructions([
|
|
324
368
|
start.url ? `Open this URL to sign in:\n${terminalSafeText(start.url)}` : "",
|
|
325
369
|
start.deviceCode ? `Device code: ${terminalSafeText(start.deviceCode)}` : "",
|
|
370
|
+
start.authMethod === "device-only" ? "Device code login is required by this proxy (codexAuthMethod: device-only)." : "",
|
|
326
371
|
start.instructions ?? "",
|
|
327
372
|
start.browserLaunch === "failed" ? BROWSER_LAUNCH_FAILED_HINT : "",
|
|
328
373
|
start.flowId ? `Flow: ${terminalSafeText(start.flowId)}` : "",
|
|
@@ -345,7 +390,9 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
345
390
|
// enter the code elsewhere. Match the 15-minute grant instead of giving up
|
|
346
391
|
// at minute five while it is still valid, plus settlement margin for the
|
|
347
392
|
// token exchange and credential write after the final poll.
|
|
348
|
-
|
|
393
|
+
// The proxy may impose the device grant on a request that did not ask for it
|
|
394
|
+
// (`codexAuthMethod: "device-only"`, #8082), so the returned code counts too.
|
|
395
|
+
const maxAttempts = device || start.deviceCode ? 480 : 150;
|
|
349
396
|
for (let attempt = 0; attempt < maxAttempts; attempt++) {
|
|
350
397
|
await Bun.sleep(2_000);
|
|
351
398
|
const state = publicLoginStatus(await runtimeRequest<unknown>(
|
|
@@ -377,6 +424,9 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
377
424
|
body: JSON.stringify({ provider, addAccount: addAccount ?? !reauth, ...(device && DEVICE_OPT_IN_PROVIDERS.has(provider) ? { device: true } : {}), ...(openBrowser === undefined ? {} : { openBrowser }), ...(reauth && id ? { accountId: id, reauth: true } : {}), ...(antigravityRisk ? { [ANTIGRAVITY_RISK_ACK_FIELD]: true } : {}) }),
|
|
378
425
|
}, pinned));
|
|
379
426
|
const xaiDevice = provider === "xai" && device;
|
|
427
|
+
const managedM365 = provider === "m365-copilot";
|
|
428
|
+
if (managedM365 && !start.flowId?.trim()) throw new CliUsageError("Running proxy did not return a Microsoft 365 Copilot login flow ID.");
|
|
429
|
+
const scopedFlow = xaiDevice || managedM365;
|
|
380
430
|
if (xaiDevice && (!start.flowId?.trim() || !start.url?.trim() || !start.deviceCode?.trim())) {
|
|
381
431
|
let cleanupFailed = false;
|
|
382
432
|
try {
|
|
@@ -392,6 +442,7 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
392
442
|
start.url ? `Open this URL to sign in:\n${terminalSafeText(start.url)}` : "",
|
|
393
443
|
provider === "xai" && device ? terminalSafeText(start.instructions ?? "") : start.instructions ?? "",
|
|
394
444
|
start.deviceCode ? `Device code: ${terminalSafeText(start.deviceCode)}` : "",
|
|
445
|
+
managedM365 && start.flowId ? `Flow ID: ${terminalSafeText(start.flowId)}` : "",
|
|
395
446
|
]);
|
|
396
447
|
}
|
|
397
448
|
if (code) {
|
|
@@ -405,20 +456,23 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
405
456
|
printData({ ...start, modelSelection: modelSelectionNextSteps(provider, true) }, wantsJson, modelSelectionGuidance(provider, true));
|
|
406
457
|
return;
|
|
407
458
|
}
|
|
408
|
-
//
|
|
409
|
-
for (let attempt = 0; attempt < (device ? 930 : 100); attempt++) {
|
|
459
|
+
// Outlast the xAI device grant and the proxy-owned M365 browser session.
|
|
460
|
+
for (let attempt = 0; attempt < (device ? 930 : managedM365 ? 375 : 100); attempt++) {
|
|
410
461
|
await Bun.sleep(2_000);
|
|
411
|
-
const raw = await runtimeRequest<Record<string, unknown>>(`/api/oauth/status?provider=${encodeURIComponent(provider)}${
|
|
462
|
+
const raw = await runtimeRequest<Record<string, unknown>>(`/api/oauth/status?provider=${encodeURIComponent(provider)}${scopedFlow ? `&flowId=${encodeURIComponent(start.flowId!)}` : ""}`, { redirect: "error" }, pinned);
|
|
412
463
|
if (loginObject(raw).error) throw new Error("Provider login failed");
|
|
413
|
-
if (
|
|
464
|
+
if (scopedFlow && (raw.flowId !== start.flowId || raw.status === "idle")) throw new Error(managedM365 ? "Microsoft 365 Copilot login flow is unavailable" : "Device login flow is unavailable");
|
|
414
465
|
const state = publicLoginStatus(raw);
|
|
415
|
-
if (state.done === true && state.loggedIn !== true && !(
|
|
466
|
+
if (state.done === true && state.loggedIn !== true && !(scopedFlow && raw.status === "complete")) throw new Error("Provider login ended without authentication");
|
|
416
467
|
// A device login adds an account, so an already signed-in provider is not done until its flow is.
|
|
417
|
-
if (
|
|
468
|
+
if (scopedFlow ? raw.status === "complete" : state.loggedIn === true && (!device || state.done === true)) {
|
|
418
469
|
printData({ ...state, modelSelection: modelSelectionNextSteps(provider) }, wantsJson, [`Logged in to ${provider}.`, ...modelSelectionGuidance(provider)]);
|
|
419
470
|
return;
|
|
420
471
|
}
|
|
421
472
|
}
|
|
473
|
+
if (managedM365) await runtimeRequest("/api/oauth/login/cancel", {
|
|
474
|
+
method: "POST", redirect: "error", body: JSON.stringify({ provider, flowId: start.flowId }),
|
|
475
|
+
}, pinned);
|
|
422
476
|
throw new CliUsageError("login timed out");
|
|
423
477
|
}
|
|
424
478
|
|
|
@@ -463,12 +517,12 @@ async function cancel(argv: string[], deps: RuntimeApiDeps): Promise<void> {
|
|
|
463
517
|
if (!provider) throw new CliUsageError("provider is required", USAGE);
|
|
464
518
|
rejectArgs(args, USAGE);
|
|
465
519
|
const codex = CODEX_NAMES.has(provider);
|
|
466
|
-
if (
|
|
467
|
-
throw new CliUsageError("Codex login cancel requires --flow <flow-id> (printed by 'ocx account login')
|
|
520
|
+
if (!flowId && (codex || provider === "m365-copilot")) {
|
|
521
|
+
throw new CliUsageError(`${codex ? "Codex" : "Microsoft 365 Copilot"} login cancel requires --flow <flow-id> (printed by 'ocx account login').`, USAGE);
|
|
468
522
|
}
|
|
469
523
|
const result = await runtimeRequest(codex ? "/api/codex-auth/login/cancel" : "/api/oauth/login/cancel", {
|
|
470
524
|
method: "POST",
|
|
471
|
-
body: JSON.stringify(codex ? { flowId } : { provider, ...((provider === "kiro" || provider === "xai") && flowId ? { flowId } : {}) }),
|
|
525
|
+
body: JSON.stringify(codex ? { flowId } : { provider, ...((provider === "kiro" || provider === "xai" || provider === "m365-copilot") && flowId ? { flowId } : {}) }),
|
|
472
526
|
}, deps);
|
|
473
527
|
printData(result, wantsJson, [`Cancelled ${provider} login.`]);
|
|
474
528
|
}
|
|
@@ -58,7 +58,7 @@ const EXTENDED_USAGE = `Usage:
|
|
|
58
58
|
ocx account pause <provider> <id|alias|main> [--json]
|
|
59
59
|
ocx account resume <provider> <id|alias|main> [--if-healthy] [--json]
|
|
60
60
|
ocx account pause-exhausted <provider> [--json]
|
|
61
|
-
ocx account strategy <provider> [<quota|round-robin|fill-first|least-loaded|reset-first>] [--json]
|
|
61
|
+
ocx account strategy <provider> [<quota|round-robin|fill-first|reset-near-weighted|least-loaded|reset-first>] [--json]
|
|
62
62
|
ocx account sticky <provider> [<1-100>] [--json]
|
|
63
63
|
ocx account routes <anthropic|anthropic2> [--file <json-file>|--clear] [--json]
|
|
64
64
|
ocx account remove <provider> <id|alias|main> --yes [--json]
|
|
@@ -3,7 +3,7 @@ import type { OAuthHealthLabel } from "../oauth/health";
|
|
|
3
3
|
|
|
4
4
|
const HEALTH_LABELS: readonly OAuthHealthLabel[] = [
|
|
5
5
|
"Healthy", "Rate limited", "Quota limited", "Reauthentication required",
|
|
6
|
-
"Verification required", "Refresh failed", "Metadata mismatch", "Credential conflict", "Validation pending",
|
|
6
|
+
"Verification required", "Account suspended", "Refresh failed", "Metadata mismatch", "Credential conflict", "Validation pending",
|
|
7
7
|
];
|
|
8
8
|
|
|
9
9
|
// Commands are hints, never executed. Admit only bounded, shell-safe selectors;
|
|
@@ -46,6 +46,9 @@ export function projectAccountHealth(
|
|
|
46
46
|
case "Verification required":
|
|
47
47
|
healthAction = `Verify the account with the provider in a browser, then run: ${reauth}`;
|
|
48
48
|
break;
|
|
49
|
+
case "Account suspended":
|
|
50
|
+
healthAction = `The provider suspended this account for a Terms of Service violation; appeal with the provider before running: ${reauth}`;
|
|
51
|
+
break;
|
|
49
52
|
case "Credential conflict":
|
|
50
53
|
healthAction = "Ensure only one proxy process writes the credential store, then run: ocx doctor";
|
|
51
54
|
break;
|
|
@@ -19,7 +19,7 @@ const fields = z.enum(["enabled", "strategy", "stickyLimit", "autoSwitchThreshol
|
|
|
19
19
|
export const poolSchema = z.object({
|
|
20
20
|
provider: z.string(), kind: z.enum(["codex", "anthropic", "generic"]), supported: z.array(fields),
|
|
21
21
|
enabled: z.boolean().nullable(), enabledEffective: z.boolean(),
|
|
22
|
-
strategy: z.enum(["quota", "round-robin", "fill-first", "reset-first", "least-loaded"]).nullable(),
|
|
22
|
+
strategy: z.enum(["quota", "round-robin", "fill-first", "reset-near-weighted", "reset-first", "least-loaded"]).nullable(),
|
|
23
23
|
stickyLimit: z.number().int().min(1).max(100).nullable(), autoSwitchThreshold: nullableThreshold,
|
|
24
24
|
quotaWindow: z.enum(["five-hour", "weekly", "max-utilization"]).nullable(),
|
|
25
25
|
maxConcurrentPerAccount: z.number().int().min(1).max(100).nullable(),
|
|
@@ -90,9 +90,12 @@ async function pool(args: string[], json: boolean, deps: RuntimeApiDeps): Promis
|
|
|
90
90
|
if (limit !== undefined) patch.autoSwitchThreshold = integer(limit, 0);
|
|
91
91
|
if (sticky !== undefined) patch.stickyLimit = integer(sticky, 1);
|
|
92
92
|
if (strategy !== undefined) {
|
|
93
|
-
// reset-first is a Codex and generic-pool strategy;
|
|
94
|
-
|
|
95
|
-
|
|
93
|
+
// reset-first is a Codex and generic-pool strategy; reset-near-weighted is Codex and Anthropic.
|
|
94
|
+
const strategies = ["quota", "round-robin", "fill-first"];
|
|
95
|
+
if (!isAnthropicInstanceId(provider)) strategies.push("reset-first");
|
|
96
|
+
if (provider === "openai" || isAnthropicInstanceId(provider)) strategies.push("reset-near-weighted");
|
|
97
|
+
if (provider === "kiro") strategies.push("least-loaded");
|
|
98
|
+
if (!strategies.includes(strategy)) usage();
|
|
96
99
|
patch.strategy = strategy;
|
|
97
100
|
}
|
|
98
101
|
if (window !== undefined) {
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { apiError, apiJson, proxyUnreachable, resolveBaseUrl, type AccountDeps } from "./account-api";
|
|
2
|
+
|
|
3
|
+
const PROBE_USAGE = "Usage: ocx account probe google-antigravity [<account-id|alias>] [--json]";
|
|
4
|
+
|
|
5
|
+
interface ProbeRow {
|
|
6
|
+
accountId: string;
|
|
7
|
+
maskedLabel?: string;
|
|
8
|
+
active?: boolean;
|
|
9
|
+
paused?: boolean;
|
|
10
|
+
status: string;
|
|
11
|
+
httpStatus: number | null;
|
|
12
|
+
reason: string | null;
|
|
13
|
+
message: string | null;
|
|
14
|
+
quota?: { customWindows?: Array<{ label: string; percent: number }> } | null;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
function resolveTarget(accounts: unknown, requested: string): { id: string } | { error: string } {
|
|
18
|
+
const rows = (Array.isArray(accounts) ? accounts : []).filter((row): row is { id: string; alias?: unknown } =>
|
|
19
|
+
typeof row === "object" && row !== null && typeof (row as { id?: unknown }).id === "string");
|
|
20
|
+
if (rows.some(row => row.id === requested)) return { id: requested };
|
|
21
|
+
const matches = rows.filter(row => typeof row.alias === "string" && row.alias.toLowerCase() === requested.toLowerCase());
|
|
22
|
+
if (matches.length === 1) return { id: matches[0]!.id };
|
|
23
|
+
if (matches.length > 1) return { error: `alias "${requested}" names ${matches.length} accounts; use the account id` };
|
|
24
|
+
return { error: `Account not found: no OAuth account has the id or alias "${requested}"` };
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function rowLine(row: ProbeRow): string {
|
|
28
|
+
const flags = [row.active ? "active" : "", row.paused ? "paused" : ""].filter(Boolean).map(flag => `[${flag}]`).join("");
|
|
29
|
+
const evidence = [row.httpStatus !== null ? `HTTP ${row.httpStatus}` : "", row.reason ?? "", row.message ?? ""].filter(Boolean).join(" · ");
|
|
30
|
+
const windows = (row.quota?.customWindows ?? []).map(window => `${window.label} ${Math.round(100 - window.percent)}% left`).join(", ");
|
|
31
|
+
return [`${row.accountId} ${row.maskedLabel ?? ""}${flags ? ` ${flags}` : ""}`.trim(), row.status, evidence, windows].filter(Boolean).join(" | ");
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** Read-only per-account probe through `POST /api/oauth/accounts/probe`. */
|
|
35
|
+
export async function cmdAccountProbe(args: string[], deps: AccountDeps): Promise<number> {
|
|
36
|
+
const wantsJson = args.includes("--json");
|
|
37
|
+
const positional = args.filter(arg => arg !== "--json");
|
|
38
|
+
const provider = positional[0]?.trim().toLowerCase() ?? "";
|
|
39
|
+
const requested = positional[1];
|
|
40
|
+
if (provider !== "google-antigravity" || positional.length > 2 || requested?.startsWith("-")) {
|
|
41
|
+
console.error(PROBE_USAGE);
|
|
42
|
+
return 1;
|
|
43
|
+
}
|
|
44
|
+
const baseUrl = await resolveBaseUrl(deps);
|
|
45
|
+
if (!baseUrl) return proxyUnreachable();
|
|
46
|
+
let accountId: string | undefined;
|
|
47
|
+
if (requested !== undefined) {
|
|
48
|
+
const list = await apiJson(deps, baseUrl, "GET", `/api/oauth/accounts?provider=${encodeURIComponent(provider)}`);
|
|
49
|
+
if (list.status === 0) return proxyUnreachable(list.transportError);
|
|
50
|
+
if (list.status !== 200) return apiError(list.json, `failed to list ${provider} OAuth accounts`, list.status);
|
|
51
|
+
const target = resolveTarget(list.json?.accounts, requested);
|
|
52
|
+
if ("error" in target) {
|
|
53
|
+
console.error(`Error: ${target.error}`);
|
|
54
|
+
return 1;
|
|
55
|
+
}
|
|
56
|
+
accountId = target.id;
|
|
57
|
+
}
|
|
58
|
+
const response = await apiJson(deps, baseUrl, "POST", "/api/oauth/accounts/probe", { provider, ...(accountId ? { accountId } : {}) });
|
|
59
|
+
if (response.status === 0) return proxyUnreachable(response.transportError);
|
|
60
|
+
if (response.status !== 200) return apiError(response.json, `failed to probe ${provider} accounts`, response.status);
|
|
61
|
+
const results = Array.isArray(response.json?.results) ? response.json.results as ProbeRow[] : [];
|
|
62
|
+
if (wantsJson) console.log(JSON.stringify(response.json, null, 2));
|
|
63
|
+
else if (results.length === 0) console.log(`${provider}: no stored accounts`);
|
|
64
|
+
else for (const row of results) console.log(rowLine(row));
|
|
65
|
+
return 0;
|
|
66
|
+
}
|
package/src/cli/account.ts
CHANGED
|
@@ -60,11 +60,12 @@ const ACCOUNT_USAGE = `Usage:
|
|
|
60
60
|
ocx account resume <provider> <account-id|alias|main> [--if-healthy] [--json]
|
|
61
61
|
ocx account reset-affinity <anthropic|anthropic2> [--json]
|
|
62
62
|
ocx account pause-exhausted <provider> [--json]
|
|
63
|
-
ocx account strategy <provider> [<quota|round-robin|fill-first|least-loaded|reset-first>] [--json]
|
|
63
|
+
ocx account strategy <provider> [<quota|round-robin|fill-first|reset-near-weighted|least-loaded|reset-first>] [--json]
|
|
64
64
|
ocx account sticky <provider> [<1-100>] [--json]
|
|
65
65
|
ocx account routes <anthropic|anthropic2> [--file <json-file>|--clear] [--json]
|
|
66
66
|
ocx account remove <provider> <account-or-key-id|alias|main> --yes [--json]
|
|
67
67
|
ocx account clear-cooldown <provider> <account-id|alias|main> [--json]
|
|
68
|
+
ocx account probe google-antigravity [<account-id|alias>] [--json]
|
|
68
69
|
ocx account add-key <provider> [--label <label>] [--json]
|
|
69
70
|
ocx account import <provider> --format <format> (--file <path>|--stdin) [--json]
|
|
70
71
|
ocx account import-orca --source <orca-data-directory> --registry <orca-data.json> [--apply] [--json]
|
|
@@ -123,7 +124,8 @@ function statusText(row: AccountRow): string {
|
|
|
123
124
|
if (row.paused) parts.push(row.pauseDetails ? `paused(${row.pauseDetails.reason})` : "paused");
|
|
124
125
|
if (row.active) parts.push(row.type === "codex" ? "selected" : "active");
|
|
125
126
|
if (row.needsReauth && !(row.provider === "kiro" && row.skipReason === "needs_reauth")) {
|
|
126
|
-
parts.push(row.
|
|
127
|
+
parts.push(row.needsReauthCause === "tos_violation" ? "needs-reauth(tos)"
|
|
128
|
+
: row.needsReauthReason === "verify_account" ? "needs-reauth(verify)" : "needs-reauth");
|
|
127
129
|
}
|
|
128
130
|
// A paused Kiro row already says "paused"; repeating it as a skip reason adds nothing.
|
|
129
131
|
if (row.provider === "kiro" && row.autoSelectable === false && !(row.paused && row.skipReason === "paused"))
|
|
@@ -500,6 +502,10 @@ export async function cmdAccount(args: string[], deps: AccountDeps = {}): Promis
|
|
|
500
502
|
if (sub === "routes") return await cmdRoutes(rest, deps);
|
|
501
503
|
if (sub === "remove") return await cmdRemove(rest, deps);
|
|
502
504
|
if (sub === "clear-cooldown") return await cmdClearCooldown(rest, deps);
|
|
505
|
+
if (sub === "probe") {
|
|
506
|
+
const { cmdAccountProbe } = await import("./account-probe");
|
|
507
|
+
return await cmdAccountProbe(rest, deps);
|
|
508
|
+
}
|
|
503
509
|
if (sub === "add-key") return await cmdAddKey(rest, deps);
|
|
504
510
|
if (sub === "import") return await cmdImport(rest, deps);
|
|
505
511
|
if (sub === "import-orca") {
|
|
@@ -84,6 +84,13 @@ export const ACCOUNT_CAPABILITIES: readonly Capability[] = [
|
|
|
84
84
|
flags: [{ name: "--label", value: "string", summary: "Optional label for the imported key." }, { name: "--json", value: "boolean", summary: "Emit a redacted receipt containing the key ID, never the key." }], mutates: true, json: "envelope",
|
|
85
85
|
details: ["API-key providers only. Requires non-TTY stdin and reads one secret line; never put plaintext keys in command arguments or agent transcripts. This imports an upstream credential, not an OpenCodex access-key creation workflow."],
|
|
86
86
|
},
|
|
87
|
+
{
|
|
88
|
+
command: ["account", "probe"], summary: "Test stored accounts one by one with their own tokens, read-only.",
|
|
89
|
+
usage: "ocx account probe google-antigravity [<account-id|alias>] [--json]",
|
|
90
|
+
routes: [{ method: "GET", path: "/api/oauth/accounts" }, { method: "POST", path: "/api/oauth/accounts/probe" }],
|
|
91
|
+
flags: [{ name: "--json", value: "boolean", summary: "Emit per-account status, HTTP code, reason and quota windows." }], mutates: false, json: "payload",
|
|
92
|
+
details: ["Statuses: ok, paused, token_expired, suspended, verification_required, rate_limited, permission_denied, error. Sends one retrieveUserQuotaSummary request per account with its stored token; paused accounts are skipped without a request, and expired tokens are reported, never refreshed. Only google-antigravity is supported."],
|
|
93
|
+
},
|
|
87
94
|
{
|
|
88
95
|
command: ["account", "import"], summary: "Import Google Antigravity accounts from a bounded Cockpit Tools document.",
|
|
89
96
|
usage: "ocx account import google-antigravity --format cockpit-tools (--file <path>|--stdin) [--accept-antigravity-risk] [--json]",
|
|
@@ -173,7 +180,7 @@ export const ACCOUNT_CAPABILITIES: readonly Capability[] = [
|
|
|
173
180
|
usage: "ocx account pool <provider> [--enabled <on|off>] [--threshold <0-100>] [--strategy <name>] [--sticky <1-100>] [--quota-window <five-hour|weekly|max-utilization>] [--json]",
|
|
174
181
|
summary: "Read or edit the selected runtime's supported pool policy fields.",
|
|
175
182
|
routes: [{"method":"GET","path":"/api/pool/settings"},{"method":"PUT","path":"/api/pool/settings"}],
|
|
176
|
-
flags: [{"name":"--enabled","value":"string","summary":"Stored pool preference; unsupported for Codex. Not equivalent to threshold0."},{"name":"--threshold","value":"number","summary":"Auto-switch threshold0–100."},{"name":"--strategy","value":"string","summary":"Use a strategy supported by this provider kind; reset-first is Codex or generic OAuth, least-loaded is Kiro."},{"name":"--sticky","value":"number","summary":"Sticky limit1–100."},{"name":"--quota-window","value":"string","summary":"Anthropic only: five-hour, weekly or max-utilization."},{"name":"--json","value":"boolean","summary":"Emit the validated task result as one JSON document."}],
|
|
183
|
+
flags: [{"name":"--enabled","value":"string","summary":"Stored pool preference; unsupported for Codex. Not equivalent to threshold0."},{"name":"--threshold","value":"number","summary":"Auto-switch threshold0–100."},{"name":"--strategy","value":"string","summary":"Use a strategy supported by this provider kind; reset-first is Codex or generic OAuth, reset-near-weighted is Codex or Anthropic, and least-loaded is Kiro."},{"name":"--sticky","value":"number","summary":"Sticky limit1–100."},{"name":"--quota-window","value":"string","summary":"Anthropic only: five-hour, weekly or max-utilization."},{"name":"--json","value":"boolean","summary":"Emit the validated task result as one JSON document."}],
|
|
177
184
|
mutates: true,
|
|
178
185
|
json: "envelope",
|
|
179
186
|
details: ["Reads the target supported-field list before a narrow PUT. Null/unsupported, stored/effective and generic inert policy stay distinct; disabling does not promise that reactive429 rotation stops.","No local classification/defaults are round-tripped into the live target; supported-field reads are not CAS."],
|
|
@@ -402,10 +402,10 @@ export const AGENT_ROUTING_CAPABILITIES: readonly Capability[] = [
|
|
|
402
402
|
},
|
|
403
403
|
{
|
|
404
404
|
command: ["combo","set"],
|
|
405
|
-
usage: "ocx combo set <id> [--targets <provider/model[:weight],...> | --targets-file <FILE|->] [--strategy <failover|round-robin|random|least-used|reset-window|jev>] [--sticky <1-100|->] [--cooldown-reprobe <on|off>] [--cooldown-reprobe-interval <ms>] [--effort <low|medium|high|xhigh|max|ultra|->] [--effort-mode <fallback|force|->] [--alias <name|->] [--native-alias [on|off]] [--allow-metered-targets <on|off>] [--display-name <label|->] [--description <text|->] [--decision-provider <provider|-> | --decision-model <route|->] [--decision-timeout <ms|->] [--decision-quota-signals <on|off|->] [--decision-quota-tiers <JSON|->] [--session-pin <duration|->] [--rename-from <id>] [--image-input <auto|disabled>] [--reasoning-effort-mode <strict|adaptive>] [--jev-effort-mode <decide|client>] [--json]",
|
|
405
|
+
usage: "ocx combo set <id> [--targets <provider/model[:weight],...> | --targets-file <FILE|->] [--strategy <failover|round-robin|random|least-used|reset-window|jev>] [--sticky <1-100|->] [--cooldown-reprobe <on|off>] [--cooldown-reprobe-interval <ms>] [--effort <low|medium|high|xhigh|max|ultra|->] [--effort-mode <fallback|force|->] [--alias <name|->] [--native-alias [on|off]] [--allow-metered-targets <on|off>] [--display-name <label|->] [--description <text|->] [--decision-provider <provider|-> | --decision-model <route|->] [--decision-timeout <ms|->] [--decision-quota-signals <on|off|->] [--decision-quota-tiers <JSON|->] [--session-pin <duration|->] [--session-pin-effort <pinned|per-turn>] [--rename-from <id>] [--image-input <auto|disabled>] [--reasoning-effort-mode <strict|adaptive>] [--jev-effort-mode <decide|client>] [--json]",
|
|
406
406
|
summary: "Create, update or rename a combo.",
|
|
407
407
|
routes: [{"method":"GET","path":"/api/combos"},{"method":"PUT","path":"/api/combos"}],
|
|
408
|
-
flags: [{"name":"--allow-metered-targets","value":"string","summary":"on grants operator consent to metered targets only on a loopback-only proxy; off clears it."},{"name":"--targets","value":"string","summary":"Ordered provider/model[:weight] list; required for creation."},{"name":"--strategy","value":"string","summary":"Routing strategy."},{"name":"--sticky","value":"string","summary":"Round-robin limit 1-100; - resets."},{"name":"--cooldown-reprobe","value":"string","summary":"Opt into one recovery pass when all eligible targets cool; off by default."},{"name":"--cooldown-reprobe-interval","value":"string","summary":"Minimum interval between recovery passes in ms (1000..86400000); default 300000."},{"name":"--effort","value":"string","summary":"Default effort; - clears."},{"name":"--effort-mode","value":"string","summary":"fallback or force; - resets to fallback."},{"name":"--alias","value":"string","summary":"Alias; - clears."},{"name":"--display-name","value":"string","summary":"Label; - clears."},{"name":"--description","value":"string","summary":"Catalog row description; - clears."},{"name":"--decision-provider","value":"string","summary":"JEV provider; - clears."},{"name":"--decision-model","value":"string","summary":"JEV route; - clears; exclusive with provider."},{"name":"--decision-timeout","value":"string","summary":"JEV deadline 1000-120000 ms; - clears."},{"name":"--decision-quota-signals","value":"string","summary":"JEV advisory quota on/off; - clears."},{"name":"--decision-quota-tiers","value":"string","summary":"Partial JSON thresholds; - clears."},{"name":"--session-pin","value":"string","summary":"JEV session pin idle window 1m-24h (90s, 20m, 1h); - clears."},{"name":"--rename-from","value":"string","summary":"Existing combo ID to rename."},{"name":"--json","value":"boolean","summary":"Emit structured JSON."},{"name":"--native-alias","value":"string","summary":"Bare legacy flag means on; explicit on/off preserves presence, including false."},{"name":"--targets-file","value":"string","summary":"Bounded ordered target JSON array, exclusive with --targets; preserves effort/profile/last-resort metadata."},{"name":"--image-input","value":"string","summary":"auto or disabled; explicit auto clears the previous disabled choice."},{"name":"--reasoning-effort-mode","value":"string","summary":"strict or adaptive, distinct from --effort-mode fallback/force."},{"name":"--jev-effort-mode","value":"string","summary":"JEV wire-effort owner: decide (default) applies the decision effort; client keeps its target and leaves effort to combo policy."}],
|
|
408
|
+
flags: [{"name":"--allow-metered-targets","value":"string","summary":"on grants operator consent to metered targets only on a loopback-only proxy; off clears it."},{"name":"--targets","value":"string","summary":"Ordered provider/model[:weight] list; required for creation."},{"name":"--strategy","value":"string","summary":"Routing strategy."},{"name":"--sticky","value":"string","summary":"Round-robin limit 1-100; - resets."},{"name":"--cooldown-reprobe","value":"string","summary":"Opt into one recovery pass when all eligible targets cool; off by default."},{"name":"--cooldown-reprobe-interval","value":"string","summary":"Minimum interval between recovery passes in ms (1000..86400000); default 300000."},{"name":"--effort","value":"string","summary":"Default effort; - clears."},{"name":"--effort-mode","value":"string","summary":"fallback or force; - resets to fallback."},{"name":"--alias","value":"string","summary":"Alias; - clears."},{"name":"--display-name","value":"string","summary":"Label; - clears."},{"name":"--description","value":"string","summary":"Catalog row description; - clears."},{"name":"--decision-provider","value":"string","summary":"JEV provider; - clears."},{"name":"--decision-model","value":"string","summary":"JEV route; - clears; exclusive with provider."},{"name":"--decision-timeout","value":"string","summary":"JEV deadline 1000-120000 ms; - clears."},{"name":"--decision-quota-signals","value":"string","summary":"JEV advisory quota on/off; - clears."},{"name":"--decision-quota-tiers","value":"string","summary":"Partial JSON thresholds; - clears."},{"name":"--session-pin","value":"string","summary":"JEV session pin idle window 1m-24h (90s, 20m, 1h); - clears."},{"name":"--session-pin-effort","value":"string","summary":"pinned reuses the pinned effort; per-turn asks JEV for the pinned target's effort each turn."},{"name":"--rename-from","value":"string","summary":"Existing combo ID to rename."},{"name":"--json","value":"boolean","summary":"Emit structured JSON."},{"name":"--native-alias","value":"string","summary":"Bare legacy flag means on; explicit on/off preserves presence, including false."},{"name":"--targets-file","value":"string","summary":"Bounded ordered target JSON array, exclusive with --targets; preserves effort/profile/last-resort metadata."},{"name":"--image-input","value":"string","summary":"auto or disabled; explicit auto clears the previous disabled choice."},{"name":"--reasoning-effort-mode","value":"string","summary":"strict or adaptive, distinct from --effort-mode fallback/force."},{"name":"--jev-effort-mode","value":"string","summary":"JEV wire-effort owner: decide (default) applies the decision effort; client keeps its target and leaves effort to combo policy."}],
|
|
409
409
|
mutates: true,
|
|
410
410
|
json: "payload",
|
|
411
411
|
details: ["create and update are aliases of set. Existing fields are read before writing; --targets replaces targets. Without --strategy an existing combo keeps its stored strategy and JEV policy; a new combo defaults to failover.","force overrides valid client effort and may increase cost and latency.","Only the implemented target grammar is supported; full GUI target metadata and routing-profile writes are separate tasks.","New file/flag conflicts refuse before transport. Partial edits preserve target metadata; explicit false/default values override server carry. Turning a native alias off may also require clearing its incompatible alias.","Read/merge/write uses one target and remains an upsert without revision CAS. Saved-but-incomplete catalog outcomes return nonzero with their receipt."],
|
|
@@ -64,7 +64,7 @@ export const CAPABILITIES: readonly Capability[] = [
|
|
|
64
64
|
mutates: false,
|
|
65
65
|
json: "payload",
|
|
66
66
|
usage: "ocx link status [--json]",
|
|
67
|
-
details: ["Reads live listener/tunnel metadata; when no proxy is found, falls back to the local link store. Always emits JSON."],
|
|
67
|
+
details: ["Reads live listener/tunnel metadata; when no proxy is found, falls back to the local link store. Always emits JSON.","Home-initiated links report recent authenticated HTTP delivery in relayHealth, with inference readiness reported as unknown."],
|
|
68
68
|
},
|
|
69
69
|
{
|
|
70
70
|
command: ["link","diagnostics"],
|
|
@@ -432,7 +432,7 @@ export const CAPABILITIES: readonly Capability[] = [
|
|
|
432
432
|
mutates: true,
|
|
433
433
|
json: "envelope",
|
|
434
434
|
details: ["A bare invocation reads and never writes.","The APPLIED value is echoed, not the requested one, so a server-side normalization stays visible.","Values are not re-validated in the CLI: the server owns the strategy names and the 1-100 sticky bound.","One route answers for every pool kind and declares which fields that kind honours in `supported`, so an unsupported field is a stated null rather than an absence. `anthropic` alone carries `quotaWindow`. Generic-provider settings steer selection only while `pool.kernel` is on. The legacy per-pool paths still work and are unchanged."],
|
|
435
|
-
usage: "ocx account strategy <provider> [quota|round-robin|fill-first|least-loaded|reset-first] [--json]",
|
|
435
|
+
usage: "ocx account strategy <provider> [quota|round-robin|fill-first|reset-near-weighted|least-loaded|reset-first] [--json]",
|
|
436
436
|
},
|
|
437
437
|
{
|
|
438
438
|
command: ["account","sticky"],
|
|
@@ -684,11 +684,11 @@ export const CAPABILITIES: readonly Capability[] = [
|
|
|
684
684
|
command: ["claude","config"],
|
|
685
685
|
summary: "Read or update Claude Code settings, including independent CLI first-party routing.",
|
|
686
686
|
routes: [{"method":"GET","path":"/api/claude-code"},{"method":"PUT","path":"/api/claude-code"}],
|
|
687
|
-
flags: [{"name":"--enabled","value":"string","summary":"on or off."},{"name":"--auth-mode","value":"string","summary":"auto, proxy or subscription."},{"name":"--system-env","value":"string","summary":"on or off."},{"name":"--fast-mode","value":"string","summary":"on or off."},{"name":"--auto-context","value":"string","summary":"on or off."},{"name":"--compact-window","value":"string","summary":"Positive token count or default to clear."},{"name":"--context-accounting","value":"string","summary":"1m (default) or 200k."},{"name":"--inject-agents","value":"string","summary":"on or off."},{"name":"--small-fast-model","value":"string","summary":"Model ID; - clears."},{"name":"--model-map","value":"string","summary":"Comma-separated from=to mappings; - clears."},{"name":"--blocked-skills","value":"string","summary":"Comma-separated names; - clears."},{"name":"--web-model","value":"string","summary":"Model ID; - clears."},{"name":"--web-backend","value":"string","summary":"openai, anthropic, xai, gemini, exa or -."},{"name":"--vision-model","value":"string","summary":"Model ID; - clears."},{"name":"--vision-backend","value":"string","summary":"openai, anthropic or -."},{"name":"--first-party","value":"string","summary":"on or off; must be the only setting."},{"name":"--json","value":"boolean","summary":"Emit the result as JSON."}],
|
|
687
|
+
flags: [{"name":"--enabled","value":"string","summary":"on or off."},{"name":"--auth-mode","value":"string","summary":"auto, proxy or subscription."},{"name":"--system-env","value":"string","summary":"on or off."},{"name":"--fast-mode","value":"string","summary":"on or off."},{"name":"--auto-context","value":"string","summary":"on or off."},{"name":"--compact-window","value":"string","summary":"Positive token count or default to clear."},{"name":"--context-accounting","value":"string","summary":"1m (default) or 200k."},{"name":"--inject-agents","value":"string","summary":"on or off."},{"name":"--native-passthrough","value":"string","summary":"on or off; off routes bare Claude models through opencodex instead of Claude Code's own login."},{"name":"--small-fast-model","value":"string","summary":"Model ID; - clears."},{"name":"--model-map","value":"string","summary":"Comma-separated from=to mappings; - clears."},{"name":"--blocked-skills","value":"string","summary":"Comma-separated names; - clears."},{"name":"--web-model","value":"string","summary":"Model ID; - clears."},{"name":"--web-backend","value":"string","summary":"openai, anthropic, xai, gemini, exa or -."},{"name":"--vision-model","value":"string","summary":"Model ID; - clears."},{"name":"--vision-backend","value":"string","summary":"openai, anthropic or -."},{"name":"--first-party","value":"string","summary":"on or off; must be the only setting."},{"name":"--json","value":"boolean","summary":"Emit the result as JSON."}],
|
|
688
688
|
mutates: true,
|
|
689
689
|
json: "payload",
|
|
690
690
|
details: ["At least one setting is required. --first-party must be set alone and writes Claude settings immediately.","Clear both helper model and backend with - to restore inheritance. Preserve shared_proxy_retained warnings."],
|
|
691
|
-
usage: "ocx claude config status [--json]; ocx claude config set [--enabled <on|off>] [--auth-mode <auto|proxy|subscription>] [--system-env <on|off>] [--fast-mode <on|off>] [--auto-context <on|off>] [--compact-window <tokens|default>] [--context-accounting <1m|200k>] [--inject-agents <on|off>] [--small-fast-model <id|->] [--model-map <from=to,...|->] [--blocked-skills <name,name|->] [--web-model <id|->] [--web-backend <openai|anthropic|xai|gemini|exa|->] [--vision-model <id|->] [--vision-backend <openai|anthropic|->] [--json]; or ocx claude config set --first-party <on|off> [--json]",
|
|
691
|
+
usage: "ocx claude config status [--json]; ocx claude config set [--enabled <on|off>] [--auth-mode <auto|proxy|subscription>] [--system-env <on|off>] [--fast-mode <on|off>] [--auto-context <on|off>] [--compact-window <tokens|default>] [--context-accounting <1m|200k>] [--inject-agents <on|off>] [--native-passthrough <on|off>] [--small-fast-model <id|->] [--model-map <from=to,...|->] [--blocked-skills <name,name|->] [--web-model <id|->] [--web-backend <openai|anthropic|xai|gemini|exa|->] [--vision-model <id|->] [--vision-backend <openai|anthropic|->] [--json]; or ocx claude config set --first-party <on|off> [--json]",
|
|
692
692
|
},
|
|
693
693
|
{
|
|
694
694
|
command: ["claude","intercept","start"],
|
|
@@ -139,13 +139,13 @@ export const INTEGRATION_CAPABILITIES: readonly Capability[] = [
|
|
|
139
139
|
},
|
|
140
140
|
{
|
|
141
141
|
command: ["claude", "config", "set"],
|
|
142
|
-
usage: "ocx claude config set [--enabled <on|off>] [--auth-mode <auto|proxy|subscription>] [--system-env <on|off>] [--fast-mode <on|off>] [--auto-context <on|off>] [--compact-window <tokens|default>] [--context-accounting <1m|200k>] [--inject-agents <on|off>] [--small-fast-model <id|->] [--model-map <from=to,...|->] [--blocked-skills <name,name|->] [--web-model <id|->] [--web-backend <openai|anthropic|xai|gemini|exa|->] [--vision-model <id|->] [--vision-backend <openai|anthropic|->] [--json]; or ocx claude config set --first-party <on|off> [--json]",
|
|
142
|
+
usage: "ocx claude config set [--enabled <on|off>] [--auth-mode <auto|proxy|subscription>] [--system-env <on|off>] [--fast-mode <on|off>] [--auto-context <on|off>] [--compact-window <tokens|default>] [--context-accounting <1m|200k>] [--inject-agents <on|off>] [--native-passthrough <on|off>] [--small-fast-model <id|->] [--model-map <from=to,...|->] [--blocked-skills <name,name|->] [--web-model <id|->] [--web-backend <openai|anthropic|xai|gemini|exa|->] [--vision-model <id|->] [--vision-backend <openai|anthropic|->] [--json]; or ocx claude config set --first-party <on|off> [--json]",
|
|
143
143
|
summary: "Change Claude Code settings through the runtime owner.",
|
|
144
|
-
routes: [{"method": "PUT", "path": "/api/claude-code"}],
|
|
145
|
-
flags: [{"name": "--enabled", "value": "string", "summary": "on or off."}, {"name": "--auth-mode", "value": "string", "summary": "auto, proxy or subscription."}, {"name": "--system-env", "value": "string", "summary": "on or off."}, {"name": "--fast-mode", "value": "string", "summary": "on or off."}, {"name": "--auto-context", "value": "string", "summary": "on or off."}, {"name": "--compact-window", "value": "string", "summary": "Positive token count or default to clear."}, {"name": "--context-accounting", "value": "string", "summary": "1m (default) or 200k."}, {"name": "--inject-agents", "value": "string", "summary": "on or off."}, {"name": "--small-fast-model", "value": "string", "summary": "Model ID; - clears."}, {"name": "--model-map", "value": "string", "summary": "Comma-separated from=to mappings; - clears."}, {"name": "--blocked-skills", "value": "string", "summary": "Comma-separated names; - clears."}, {"name": "--web-model", "value": "string", "summary": "Model ID; - clears."}, {"name": "--web-backend", "value": "string", "summary": "openai, anthropic, xai, gemini, exa or -."}, {"name": "--vision-model", "value": "string", "summary": "Model ID; - clears."}, {"name": "--vision-backend", "value": "string", "summary": "openai, anthropic or -."}, {"name": "--first-party", "value": "string", "summary": "on or off; must be the only setting."}, {"name": "--json", "value": "boolean", "summary": "Emit the result as JSON."}],
|
|
144
|
+
routes: [{"method": "GET", "path": "/api/claude-code"}, {"method": "PUT", "path": "/api/claude-code"}],
|
|
145
|
+
flags: [{"name": "--enabled", "value": "string", "summary": "on or off."}, {"name": "--auth-mode", "value": "string", "summary": "auto, proxy or subscription."}, {"name": "--system-env", "value": "string", "summary": "on or off."}, {"name": "--fast-mode", "value": "string", "summary": "on or off."}, {"name": "--auto-context", "value": "string", "summary": "on or off."}, {"name": "--compact-window", "value": "string", "summary": "Positive token count or default to clear."}, {"name": "--context-accounting", "value": "string", "summary": "1m (default) or 200k."}, {"name": "--inject-agents", "value": "string", "summary": "on or off."}, {"name": "--native-passthrough", "value": "string", "summary": "on or off; off routes bare Claude models through opencodex instead of Claude Code's own login."},{"name": "--small-fast-model", "value": "string", "summary": "Model ID; - clears."}, {"name": "--model-map", "value": "string", "summary": "Comma-separated from=to mappings; - clears."}, {"name": "--blocked-skills", "value": "string", "summary": "Comma-separated names; - clears."}, {"name": "--web-model", "value": "string", "summary": "Model ID; - clears."}, {"name": "--web-backend", "value": "string", "summary": "openai, anthropic, xai, gemini, exa or -."}, {"name": "--vision-model", "value": "string", "summary": "Model ID; - clears."}, {"name": "--vision-backend", "value": "string", "summary": "openai, anthropic or -."}, {"name": "--first-party", "value": "string", "summary": "on or off; must be the only setting."}, {"name": "--json", "value": "boolean", "summary": "Emit the result as JSON."}],
|
|
146
146
|
mutates: true,
|
|
147
147
|
json: "payload",
|
|
148
|
-
details: ["At least one setting is required. --first-party must be set alone and writes Claude settings immediately.", "Clear both helper model and backend with - to restore inheritance. Preserve shared_proxy_retained warnings."],
|
|
148
|
+
details: ["At least one setting is required. --first-party must be set alone and writes Claude settings immediately.", "--native-passthrough checks support on the running proxy before sending the settings update.", "Clear both helper model and backend with - to restore inheritance. Preserve shared_proxy_retained warnings."],
|
|
149
149
|
},
|
|
150
150
|
{
|
|
151
151
|
command: ["claude", "desktop", "show"],
|
|
@@ -277,4 +277,44 @@ export const INTEGRATION_CAPABILITIES: readonly Capability[] = [
|
|
|
277
277
|
json: "payload",
|
|
278
278
|
details: ["May fetch the public update manifest. available:false and nullable reason are valid observations; no installation or trust change is performed."],
|
|
279
279
|
},
|
|
280
|
+
{
|
|
281
|
+
command: ["connect","antigravity"],
|
|
282
|
+
usage: "ocx connect antigravity [--model <id>] [--json]",
|
|
283
|
+
summary: "Point Google's Antigravity desktop app at this proxy, keeping a restore record.",
|
|
284
|
+
routes: [{"method":"POST","path":"/api/gateway-clients/{id}/connect"}],
|
|
285
|
+
flags: [{"name":"--model","value":"string","summary":"Default model selector written to the Antigravity settings."},{"name":"--json","value":"boolean","summary":"Emit the result as JSON."}],
|
|
286
|
+
mutates: true,
|
|
287
|
+
json: "payload",
|
|
288
|
+
details: ["Updates the Antigravity user settings on this machine. With no running proxy the same change is made locally, provided the configured port is fixed. The proxy bind must permit local requests without a data-plane credential."],
|
|
289
|
+
},
|
|
290
|
+
{
|
|
291
|
+
command: ["connect","agy"],
|
|
292
|
+
usage: "ocx connect agy [--json]",
|
|
293
|
+
summary: "Point Google's agy CLI at this proxy, keeping a restore record.",
|
|
294
|
+
routes: [{"method":"POST","path":"/api/gateway-clients/{id}/connect"}],
|
|
295
|
+
flags: [{"name":"--json","value":"boolean","summary":"Emit the result as JSON."}],
|
|
296
|
+
mutates: true,
|
|
297
|
+
json: "payload",
|
|
298
|
+
details: ["Updates shell profiles on this machine. With no running proxy the same change is made locally, provided the configured port is fixed. The proxy bind must permit local requests without a data-plane credential."],
|
|
299
|
+
},
|
|
300
|
+
{
|
|
301
|
+
command: ["connect","antigravity","status"],
|
|
302
|
+
usage: "ocx connect antigravity|agy status [--json]",
|
|
303
|
+
summary: "Show whether Antigravity or agy is connected, which files carry it, and any admin_settings or environment override that wins.",
|
|
304
|
+
routes: [{"method":"GET","path":"/api/gateway-clients"}],
|
|
305
|
+
flags: [{"name":"--json","value":"boolean","summary":"Emit the client status as JSON."}],
|
|
306
|
+
mutates: false,
|
|
307
|
+
json: "payload",
|
|
308
|
+
details: ["agy is an alias of antigravity. Works on this machine only; the files are the Antigravity user settings (antigravity) or shell profiles (agy).", "With no running proxy the files are inspected locally; nothing is changed. Works whatever the proxy bind requires."],
|
|
309
|
+
},
|
|
310
|
+
{
|
|
311
|
+
command: ["disconnect","antigravity"],
|
|
312
|
+
usage: "ocx disconnect antigravity|agy [--json]",
|
|
313
|
+
summary: "Undo the Antigravity or agy connection: restore byte for byte, or path by path when the files changed since.",
|
|
314
|
+
routes: [{"method":"POST","path":"/api/gateway-clients/{id}/disconnect"}],
|
|
315
|
+
flags: [{"name":"--json","value":"boolean","summary":"Emit the result as JSON."}],
|
|
316
|
+
mutates: true,
|
|
317
|
+
json: "payload",
|
|
318
|
+
details: ["agy is an alias of antigravity. Works on this machine only; the files are the Antigravity user settings (antigravity) or shell profiles (agy).", "With no running proxy the files are restored locally. Works even when the proxy bind needs a data-plane credential, so a connection can always be undone."],
|
|
319
|
+
},
|
|
280
320
|
];
|
|
@@ -182,6 +182,12 @@ export const PROVIDER_MODEL_CAPABILITIES: readonly Capability[] = [
|
|
|
182
182
|
usage: "ocx models new-arrivals [--json]", routes: [{ method: "GET", path: "/api/model-discovery" }], mutates: false, json: "payload",
|
|
183
183
|
flags: [{ name: "--json", value: "boolean", summary: "Emit recentArrivals grouped by provider." }],
|
|
184
184
|
},
|
|
185
|
+
{
|
|
186
|
+
command: ["models", "discover"], summary: "Re-fetch one provider's live model list now and report new arrivals.",
|
|
187
|
+
usage: "ocx models discover <provider> [--json]", routes: [{ method: "POST", path: "/api/model-discovery/refresh" }], mutates: true, json: "payload",
|
|
188
|
+
flags: [{ name: "--json", value: "boolean", summary: "Emit discovery status, newArrivals and recentArrivals." }],
|
|
189
|
+
details: ["Refreshes one provider's model list. New models follow the configured new-model policy. If discovery is already running for that provider, the route returns HTTP 409 (`discovery_in_progress`). During cooldown it returns the recorded failure. Providers with liveModels off report applicable:false."],
|
|
190
|
+
},
|
|
185
191
|
{
|
|
186
192
|
command: ["models", "context", "status"], summary: "Read routed-provider context caps.",
|
|
187
193
|
usage: "ocx models context status [--json]", routes: [{ method: "GET", path: "/api/provider-context-caps" }], mutates: false, json: "payload",
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { resolveAutoContext, AUTO_COMPACT_WINDOW_MIN } from "../claude/context-windows";
|
|
2
|
+
import { escapeCmdArg } from "../lib/win-exec";
|
|
3
|
+
import type { OcxConfig } from "../types";
|
|
4
|
+
import type { ClaudeLaunchEnv } from "./claude";
|
|
5
|
+
|
|
6
|
+
// cmd.exe allows 8,191 characters. Reserve room for the shim path and shell wrapper.
|
|
7
|
+
const WINDOWS_CLAUDE_ARGV_BUDGET = 7_000;
|
|
8
|
+
const REMOTE_CONTROL_VERBS = new Set(["remote-control", "rc", "bridge", "remote", "sync"]);
|
|
9
|
+
|
|
10
|
+
/** Session-only compact windows: the current model selects its setting after /model switches. */
|
|
11
|
+
export function withClaudeContextSettings(
|
|
12
|
+
args: string[],
|
|
13
|
+
env: ClaudeLaunchEnv,
|
|
14
|
+
config: OcxConfig,
|
|
15
|
+
contextWindows: Record<string, number>,
|
|
16
|
+
base: ClaudeLaunchEnv,
|
|
17
|
+
options: { selectors?: readonly string[]; platform?: NodeJS.Platform } = {},
|
|
18
|
+
): { args: string[]; env: ClaudeLaunchEnv } {
|
|
19
|
+
const unchanged = { args, env };
|
|
20
|
+
// Remote Control expects its own --settings after the verb. Keep the env-based path
|
|
21
|
+
// for any exact verb token, even an option value or a token after --.
|
|
22
|
+
if (args.some(arg => REMOTE_CONTROL_VERBS.has(arg))) return unchanged;
|
|
23
|
+
// An operator's env/CLI policy remains authoritative. Native launches never call this helper.
|
|
24
|
+
if (base.CLAUDE_CODE_AUTO_COMPACT_WINDOW) return unchanged;
|
|
25
|
+
const auto = resolveAutoContext(config.claudeCode);
|
|
26
|
+
if (!auto.enabled) return unchanged;
|
|
27
|
+
const separator = args.indexOf("--");
|
|
28
|
+
const cliOptions = separator < 0 ? args : args.slice(0, separator);
|
|
29
|
+
// Do not reinterpret the client's settings grammar, files, or repeated-option precedence.
|
|
30
|
+
if (cliOptions.some(arg => arg === "--settings" || arg.startsWith("--settings=")
|
|
31
|
+
|| arg === "--autocompact" || arg.startsWith("--autocompact="))) return unchanged;
|
|
32
|
+
|
|
33
|
+
const modelSettings: Record<string, { autoCompactWindow: number }> = Object.create(null);
|
|
34
|
+
const selectors = new Set(options.selectors ?? []);
|
|
35
|
+
for (const key of ["ANTHROPIC_MODEL", "ANTHROPIC_DEFAULT_OPUS_MODEL", "ANTHROPIC_DEFAULT_SONNET_MODEL",
|
|
36
|
+
"ANTHROPIC_DEFAULT_FABLE_MODEL", "ANTHROPIC_DEFAULT_HAIKU_MODEL", "ANTHROPIC_SMALL_FAST_MODEL"]) {
|
|
37
|
+
if (env[key]) selectors.add(env[key]!);
|
|
38
|
+
}
|
|
39
|
+
for (const selector of selectors) {
|
|
40
|
+
const window = contextWindows[selector] ?? contextWindows[selector.replace(/\[1m\]$/i, "")];
|
|
41
|
+
if (window === undefined) continue;
|
|
42
|
+
if (!Number.isSafeInteger(window) || window >= auto.compactWindow || window < AUTO_COMPACT_WINDOW_MIN) continue;
|
|
43
|
+
// Reserve space for summarization, without exceeding the client's supported compact range.
|
|
44
|
+
const compactWindow = Math.floor(window * 0.95);
|
|
45
|
+
if (compactWindow >= AUTO_COMPACT_WINDOW_MIN) modelSettings[selector] = { autoCompactWindow: compactWindow };
|
|
46
|
+
}
|
|
47
|
+
if (Object.keys(modelSettings).length === 0) return unchanged;
|
|
48
|
+
|
|
49
|
+
const serialized = JSON.stringify({ autoCompactWindow: auto.compactWindow, modelSettings });
|
|
50
|
+
const isWindows = (options.platform ?? process.platform) === "win32";
|
|
51
|
+
if (serialized.length > (isWindows ? 4_000 : 32_000)) return unchanged;
|
|
52
|
+
const launchArgs = ["--settings", serialized, ...args];
|
|
53
|
+
// Use the worst-case escaping from win-exec: npm's local .cmd shims escape twice.
|
|
54
|
+
if (isWindows && launchArgs.map(arg => escapeCmdArg(arg, true)).join(" ").length > WINDOWS_CLAUDE_ARGV_BUDGET) {
|
|
55
|
+
return unchanged;
|
|
56
|
+
}
|
|
57
|
+
const childEnv = { ...env };
|
|
58
|
+
delete childEnv.CLAUDE_CODE_AUTO_COMPACT_WINDOW;
|
|
59
|
+
return { args: launchArgs, env: childEnv };
|
|
60
|
+
}
|
|
@@ -174,7 +174,7 @@ async function trustPickerLocally(
|
|
|
174
174
|
const inspect = deps.inspectPickerTrustImpl ?? inspectPickerTrust;
|
|
175
175
|
const before = await inspect(paths.leafPath, paths.sha1, deps.security, deps.platform);
|
|
176
176
|
if (before === "trusted") return { ok: true, callerAddedTrust: false, caPath: paths.caPath, sha1: paths.sha1 };
|
|
177
|
-
const trust = await (deps.trustPickerCaImpl ?? trustPickerCa)(paths.caPath, deps.security, deps.platform, { pem: paths.certPem });
|
|
177
|
+
const trust = await (deps.trustPickerCaImpl ?? trustPickerCa)(paths.caPath, deps.security, deps.platform, { pem: paths.certPem, configDir });
|
|
178
178
|
if (!trust.ok) return { ok: false, reason: trust.reason ?? "trust_declined" };
|
|
179
179
|
return { ok: true, callerAddedTrust: true, caPath: paths.caPath, sha1: paths.sha1 };
|
|
180
180
|
} catch (error) {
|
|
@@ -187,7 +187,7 @@ async function compensateLocalPickerTrust(
|
|
|
187
187
|
deps: ApplyProfileDeps,
|
|
188
188
|
): Promise<void> {
|
|
189
189
|
if (!trust.callerAddedTrust) return;
|
|
190
|
-
await (deps.untrustPickerCaImpl ?? untrustPickerCa)(trust.caPath, trust.sha1, deps.security, deps.platform);
|
|
190
|
+
await (deps.untrustPickerCaImpl ?? untrustPickerCa)(trust.caPath, trust.sha1, deps.security, deps.platform, undefined, { configDir: getConfigDir() });
|
|
191
191
|
}
|
|
192
192
|
|
|
193
193
|
function printPickerStatus(status: DesktopPickerStatus | undefined, json = false): void {
|