@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +4 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +86 -15
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +50 -6
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-billing-refusal.ts +27 -3
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/effort-history.ts +732 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/history/integrity.ts +41 -4
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +149 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +39 -3
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +58 -18
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
package/src/cli/account-api.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { configuredAnthropicInstance, isAnthropicOAuthInstance } from "../providers/anthropic-instance";
|
|
2
|
-
import { parseQuotaFailureCode, type QuotaFailureCode, type ProviderQuota, type AccountQuotaMode } from "../providers/quota-types";
|
|
2
|
+
import { parseQuotaFailureCode, parseQuotaUnknownReason, type QuotaFailureCode, type QuotaUnknownReason, type ProviderQuota, type AccountQuotaMode } from "../providers/quota-types";
|
|
3
|
+
import { parseWeeklyWindowConflicts, type WeeklyWindowConflict } from "../codex/quota-window-conflict";
|
|
3
4
|
/**
|
|
4
5
|
* Data-access layer for `ocx account` (issue #180) — live-proxy HTTP client and
|
|
5
6
|
* per-family account readers. Kept separate from account.ts (command handlers)
|
|
@@ -57,6 +58,12 @@ export interface AccountRow {
|
|
|
57
58
|
quotaRefresh?: CodexQuotaRefreshOutcome;
|
|
58
59
|
quotaUnavailable?: boolean;
|
|
59
60
|
quotaFailure?: QuotaFailureCode;
|
|
61
|
+
/** Live weekly windows a Codex pool account reported in contradiction (#8574). */
|
|
62
|
+
weeklyQuotaConflicts?: WeeklyWindowConflict[];
|
|
63
|
+
/** Why the balance is unknown (#8397); reasons this CLI does not know are dropped. */
|
|
64
|
+
quotaUnknownReason?: QuotaUnknownReason;
|
|
65
|
+
/** When the server last read this balance, success or failure (epoch ms). */
|
|
66
|
+
quotaReadAt?: number;
|
|
60
67
|
/**
|
|
61
68
|
* Whether the pool is holding this account out of rotation.
|
|
62
69
|
*
|
|
@@ -83,7 +90,11 @@ export interface StageLeaseClock {
|
|
|
83
90
|
clearTimeout(timer: ReturnType<typeof setTimeout>): void;
|
|
84
91
|
}
|
|
85
92
|
|
|
93
|
+
import type { AntigravityRiskSeams } from "../oauth/antigravity-risk";
|
|
94
|
+
|
|
86
95
|
export interface AccountDeps {
|
|
96
|
+
/** Test seams for the Google Antigravity acknowledgement (agent detection, prompt visibility). */
|
|
97
|
+
antigravityRisk?: AntigravityRiskSeams;
|
|
87
98
|
/** Test injection: skip findLiveProxy and call the API at this base URL. */
|
|
88
99
|
baseUrl?: string;
|
|
89
100
|
fetchImpl?: typeof fetch;
|
|
@@ -348,6 +359,7 @@ interface CodexAccountDto {
|
|
|
348
359
|
needsReauth?: boolean;
|
|
349
360
|
selectionExcludedReason?: "plan_excluded";
|
|
350
361
|
selectionExcludedPlan?: string;
|
|
362
|
+
weeklyQuotaConflicts?: unknown;
|
|
351
363
|
health?: { reason?: string };
|
|
352
364
|
healthLabel?: unknown;
|
|
353
365
|
creditsAfterLimit?: unknown;
|
|
@@ -440,11 +452,17 @@ export async function fetchCodexRows(
|
|
|
440
452
|
...(includeQuota ? {
|
|
441
453
|
quota: projectQuota(a.quota),
|
|
442
454
|
quotaRefresh: projectCodexQuotaRefreshOutcome(a.quotaRefresh),
|
|
455
|
+
...weeklyQuotaConflictsField(a.weeklyQuotaConflicts),
|
|
443
456
|
} : {}),
|
|
444
457
|
}));
|
|
445
458
|
return { rows, activeId, autoSwitchThreshold, status: 200 };
|
|
446
459
|
}
|
|
447
460
|
|
|
461
|
+
function weeklyQuotaConflictsField(value: unknown): { weeklyQuotaConflicts?: WeeklyWindowConflict[] } {
|
|
462
|
+
const weeklyQuotaConflicts = parseWeeklyWindowConflicts(value);
|
|
463
|
+
return weeklyQuotaConflicts ? { weeklyQuotaConflicts } : {};
|
|
464
|
+
}
|
|
465
|
+
|
|
448
466
|
interface OAuthAccountDto {
|
|
449
467
|
id: string;
|
|
450
468
|
alias?: string;
|
|
@@ -464,6 +482,7 @@ interface OAuthAccountDto {
|
|
|
464
482
|
quota?: CodexQuotaDto | null;
|
|
465
483
|
quotaUnavailable?: boolean;
|
|
466
484
|
quotaFailure?: unknown;
|
|
485
|
+
quotaUnknownReason?: unknown;
|
|
467
486
|
}
|
|
468
487
|
|
|
469
488
|
function isKiroSkipReason(value: unknown): value is NonNullable<AccountRow["skipReason"]> {
|
|
@@ -514,6 +533,7 @@ async function fetchOAuthRows(
|
|
|
514
533
|
...(a.quotaUnavailable !== undefined ? { quotaUnavailable: a.quotaUnavailable } : {}),
|
|
515
534
|
...(a.quotaUnavailable === true && parseQuotaFailureCode(a.quotaFailure)
|
|
516
535
|
? { quotaFailure: parseQuotaFailureCode(a.quotaFailure) } : {}),
|
|
536
|
+
...(parseQuotaUnknownReason(a.quotaUnknownReason) ? { quotaUnknownReason: parseQuotaUnknownReason(a.quotaUnknownReason) } : {}),
|
|
517
537
|
}));
|
|
518
538
|
return { rows, activeId, status: 200 };
|
|
519
539
|
}
|
package/src/cli/account-auth.ts
CHANGED
|
@@ -5,6 +5,14 @@ import { modelSelectionGuidance, modelSelectionNextSteps } from "./model-selecti
|
|
|
5
5
|
import { warnIfCodexCatalogRefreshPending } from "./account-catalog-refresh";
|
|
6
6
|
import { isCodexResetCreditOperationId } from "../codex/reset-credit-recovery";
|
|
7
7
|
import { BROWSER_LAUNCH_FAILED_NOTICE } from "../lib/browser-launch-notice";
|
|
8
|
+
import {
|
|
9
|
+
ANTIGRAVITY_RISK_ACK_FIELD,
|
|
10
|
+
ANTIGRAVITY_RISK_CLI_FLAG,
|
|
11
|
+
antigravityRiskDecisionMessage,
|
|
12
|
+
requiresAntigravityRiskAcknowledgement,
|
|
13
|
+
resolveAntigravityRiskAcknowledgement,
|
|
14
|
+
} from "../oauth/antigravity-risk";
|
|
15
|
+
import { isAgentDriven } from "./agent-driven";
|
|
8
16
|
import {
|
|
9
17
|
RuntimeApiError,
|
|
10
18
|
CliUsageError,
|
|
@@ -39,16 +47,19 @@ function writeStdoutFully(text: string): void {
|
|
|
39
47
|
}
|
|
40
48
|
|
|
41
49
|
const USAGE = `Usage:
|
|
42
|
-
ocx account login <provider> [--id <account-id>] [--reauth] [--device] [--method builder-id|google|github] [--open-browser on|off] [--add-account on|off] [--code -] [--no-wait] [--json]
|
|
50
|
+
ocx account login <provider> [--id <account-id>] [--reauth] [--device] [--method builder-id|google|github] [--open-browser on|off] [--add-account on|off] [--code -] [--no-wait] [--json] [--accept-antigravity-risk]
|
|
43
51
|
ocx account code <provider> [--flow <flow-id>] [--json] (reads the code from stdin)
|
|
44
52
|
ocx account cancel <provider> [--flow <flow-id>] [--json] (--flow required for codex)
|
|
45
53
|
ocx account reset-credits <account-id|main> [--consume --yes [--operation-id <uuid>]] [--json]
|
|
46
54
|
ocx account grok-reset-coupons [<account-id>] [--consume --yes [--token-id <token-id>] [--operation-id <uuid>]] [--json]
|
|
47
55
|
|
|
48
|
-
--device runs the
|
|
49
|
-
it when the proxy has no browser or nothing can reach localhost
|
|
50
|
-
headless or remote hub.
|
|
51
|
-
|
|
56
|
+
--device runs the device-code login instead of the browser callback (codex and
|
|
57
|
+
xai): use it when the proxy has no browser or nothing can reach its localhost
|
|
58
|
+
callback, such as a headless or remote hub. Both print a URL and a short code;
|
|
59
|
+
confirm that code in any browser and the login finishes here, so nothing is
|
|
60
|
+
pasted back and no local port is used. Each flow polls until its own deadline:
|
|
61
|
+
Codex's 15-minute device grant, and xAI's provider-issued expires_in bounded to
|
|
62
|
+
30 minutes and to one poll a second.
|
|
52
63
|
|
|
53
64
|
The redirect URL or authorization code is a short-lived credential. Pipe it in
|
|
54
65
|
rather than passing it as an argument, where it lands in shell history and is
|
|
@@ -162,12 +173,23 @@ const STDIN_SENTINEL = "-";
|
|
|
162
173
|
|
|
163
174
|
/** Providers whose ONLY login is already a device flow; --device is redundant, not wrong. */
|
|
164
175
|
const DEVICE_NATIVE_PROVIDERS = new Set(["kimi", "nous", "github-copilot"]);
|
|
165
|
-
|
|
176
|
+
/** Providers with a device grant besides their browser login; --device selects it. */
|
|
177
|
+
const DEVICE_OPT_IN_PROVIDERS = new Set(["xai"]);
|
|
178
|
+
/**
|
|
179
|
+
* The native Kiro handoff, rendered for a terminal.
|
|
180
|
+
*
|
|
181
|
+
* Every field here is provider- or proxy-supplied, so they go through the same sanitizer as the
|
|
182
|
+
* OAuth CLI's instructions rather than a local strip regex: a narrower strip both left characters
|
|
183
|
+
* reachable (the Arabic letter mark, the line separators, the deprecated `U+206A`–`U+206F` bidi
|
|
184
|
+
* controls) and deleted ones that must survive (ZWNJ/ZWJ, which shape Persian and emoji). Escaping
|
|
185
|
+
* keeps the value readable in a pasted report and leaves the layout below intact, because a
|
|
186
|
+
* newline inside a field is escaped rather than allowed to add a line.
|
|
187
|
+
*/
|
|
166
188
|
export function formatKiroDeviceInstructions(start: { verificationUriComplete?: string; verificationUri?: string; userCode?: string; flowId?: string }): string {
|
|
167
189
|
return [
|
|
168
|
-
|
|
169
|
-
start.userCode ? `User code: ${
|
|
170
|
-
start.flowId ? `Flow: ${
|
|
190
|
+
terminalSafeText(start.verificationUriComplete ?? start.verificationUri ?? ""),
|
|
191
|
+
start.userCode ? `User code: ${terminalSafeText(start.userCode)}` : "",
|
|
192
|
+
start.flowId ? `Flow: ${terminalSafeText(start.flowId)}` : "",
|
|
171
193
|
].filter(Boolean).join("\n");
|
|
172
194
|
}
|
|
173
195
|
|
|
@@ -209,8 +231,11 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
209
231
|
const suppliedCode = takeOptionWithSyntax(args, "--code");
|
|
210
232
|
const openBrowser = loginBoolean(args, "--open-browser");
|
|
211
233
|
const addAccount = loginBoolean(args, "--add-account");
|
|
234
|
+
const acceptAntigravityRisk = takeFlag(args, ANTIGRAVITY_RISK_CLI_FLAG);
|
|
212
235
|
if (provider && !isValidProviderName(provider)) throw new CliUsageError("invalid provider name", USAGE);
|
|
213
236
|
if (!provider) throw new CliUsageError("provider is required", USAGE);
|
|
237
|
+
const antigravityRisk = requiresAntigravityRiskAcknowledgement(provider);
|
|
238
|
+
if (acceptAntigravityRisk && !antigravityRisk) throw new CliUsageError(`${ANTIGRAVITY_RISK_CLI_FLAG} only applies to google-antigravity`, USAGE);
|
|
214
239
|
if (method !== undefined) {
|
|
215
240
|
if (provider !== "kiro" || !["builder-id", "google", "github"].includes(method)) {
|
|
216
241
|
throw new CliUsageError("--method requires kiro and builder-id, google, or github", USAGE);
|
|
@@ -225,12 +250,34 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
225
250
|
// kimi, nous, and github-copilot are already device flows, so --device is a
|
|
226
251
|
// true statement about them and is accepted as a no-op rather than an error.
|
|
227
252
|
// Anything else has no device grant at all and must fail loudly.
|
|
228
|
-
if (device && !CODEX_NAMES.has(provider) && !DEVICE_NATIVE_PROVIDERS.has(provider)) {
|
|
253
|
+
if (device && !CODEX_NAMES.has(provider) && !DEVICE_NATIVE_PROVIDERS.has(provider) && !DEVICE_OPT_IN_PROVIDERS.has(provider)) {
|
|
229
254
|
throw new CliUsageError("--device is not supported for this provider", USAGE);
|
|
230
255
|
}
|
|
256
|
+
// A device grant never asks for a pasted code: the CLI would have spent the caller's stdin, and
|
|
257
|
+
// the proxy would have accepted the paste into a flow with nothing to do with it (the device flow
|
|
258
|
+
// is not a code flow, so `submitLoginCode` stashes it and the login still waits for approval).
|
|
259
|
+
if (device && suppliedCode) throw new CliUsageError("--code cannot be combined with --device", USAGE);
|
|
260
|
+
if (provider === "xai" && device && wantsJson && !noWait) throw new CliUsageError("xAI device login with --json requires --no-wait; use the returned handoff to complete authorization", USAGE);
|
|
231
261
|
if (addAccount !== undefined && (reauth || CODEX_NAMES.has(provider))) throw new CliUsageError("--add-account is only valid for fresh provider OAuth login", USAGE);
|
|
232
262
|
if (openBrowser !== undefined && (device || DEVICE_NATIVE_PROVIDERS.has(provider))) throw new CliUsageError("--open-browser is not supported for device login", USAGE);
|
|
233
263
|
if (!CODEX_NAMES.has(provider) && id && !reauth) throw new CliUsageError("--id is only valid with --reauth for provider OAuth accounts", USAGE);
|
|
264
|
+
// Antigravity can get the Google account disabled: warn and get an answer before anything
|
|
265
|
+
// else touches stdin or the proxy. A refusal here sends no request at all.
|
|
266
|
+
if (antigravityRisk) {
|
|
267
|
+
const decision = await resolveAntigravityRiskAcknowledgement({
|
|
268
|
+
flag: acceptAntigravityRisk,
|
|
269
|
+
// The question goes to stderr, so a redirected stderr is not a terminal a person can answer.
|
|
270
|
+
interactive: (deps.stdinImpl ?? process.stdin).isTTY === true
|
|
271
|
+
&& (deps.antigravityRisk?.promptVisible ?? (() => process.stderr.isTTY === true))(),
|
|
272
|
+
agentDriven: (deps.antigravityRisk?.agentDriven ?? isAgentDriven)(),
|
|
273
|
+
warn: text => console.error(text),
|
|
274
|
+
ask: async question => {
|
|
275
|
+
process.stderr.write(question);
|
|
276
|
+
return await readSecretLine(deps, "confirmation");
|
|
277
|
+
},
|
|
278
|
+
});
|
|
279
|
+
if (decision !== "accepted") throw new CliUsageError(antigravityRiskDecisionMessage(decision));
|
|
280
|
+
}
|
|
234
281
|
// Only resolve when --code was actually given: a plain `ocx account login`
|
|
235
282
|
// opens the browser flow and polls, and must not block on stdin.
|
|
236
283
|
const code = await resolveCode(suppliedCode, deps, false);
|
|
@@ -274,11 +321,11 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
274
321
|
// One atomic pre-poll block, flushed synchronously so a piped parent
|
|
275
322
|
// reads the URL before the polling window starts (#1007).
|
|
276
323
|
writeLoginInstructions([
|
|
277
|
-
start.url ? `Open this URL to sign in:\n${start.url}` : "",
|
|
278
|
-
start.deviceCode ? `Device code: ${start.deviceCode}` : "",
|
|
324
|
+
start.url ? `Open this URL to sign in:\n${terminalSafeText(start.url)}` : "",
|
|
325
|
+
start.deviceCode ? `Device code: ${terminalSafeText(start.deviceCode)}` : "",
|
|
279
326
|
start.instructions ?? "",
|
|
280
327
|
start.browserLaunch === "failed" ? BROWSER_LAUNCH_FAILED_HINT : "",
|
|
281
|
-
start.flowId ? `Flow: ${start.flowId}` : "",
|
|
328
|
+
start.flowId ? `Flow: ${terminalSafeText(start.flowId)}` : "",
|
|
282
329
|
]);
|
|
283
330
|
}
|
|
284
331
|
if (code && !start.flowId) throw new Error("Code submission requires a returned flow id");
|
|
@@ -327,13 +374,24 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
327
374
|
|
|
328
375
|
const start = publicLoginStart(await runtimeRequest<unknown>("/api/oauth/login", {
|
|
329
376
|
method: "POST", redirect: "error",
|
|
330
|
-
body: JSON.stringify({ provider, addAccount: addAccount ?? !reauth, ...(openBrowser === undefined ? {} : { openBrowser }), ...(reauth && id ? { accountId: id, reauth: true } : {}) }),
|
|
377
|
+
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 } : {}) }),
|
|
331
378
|
}, pinned));
|
|
379
|
+
const xaiDevice = provider === "xai" && device;
|
|
380
|
+
if (xaiDevice && (!start.flowId?.trim() || !start.url?.trim() || !start.deviceCode?.trim())) {
|
|
381
|
+
let cleanupFailed = false;
|
|
382
|
+
try {
|
|
383
|
+
await runtimeRequest("/api/oauth/login/cancel", {
|
|
384
|
+
method: "POST", redirect: "error",
|
|
385
|
+
body: JSON.stringify({ provider, ...(start.flowId?.trim() ? { flowId: start.flowId } : {}) }),
|
|
386
|
+
}, pinned);
|
|
387
|
+
} catch { cleanupFailed = true; }
|
|
388
|
+
throw new CliUsageError(`Running proxy does not support xAI device login; restart or upgrade it.${cleanupFailed ? " Could not cancel the unintended login flow." : ""}`);
|
|
389
|
+
}
|
|
332
390
|
if (!wantsJson) {
|
|
333
391
|
writeLoginInstructions([
|
|
334
|
-
start.url ? `Open this URL to sign in:\n${start.url}` : "",
|
|
335
|
-
start.instructions ?? "",
|
|
336
|
-
start.deviceCode ? `Device code: ${start.deviceCode}` : "",
|
|
392
|
+
start.url ? `Open this URL to sign in:\n${terminalSafeText(start.url)}` : "",
|
|
393
|
+
provider === "xai" && device ? terminalSafeText(start.instructions ?? "") : start.instructions ?? "",
|
|
394
|
+
start.deviceCode ? `Device code: ${terminalSafeText(start.deviceCode)}` : "",
|
|
337
395
|
]);
|
|
338
396
|
}
|
|
339
397
|
if (code) {
|
|
@@ -347,13 +405,16 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
347
405
|
printData({ ...start, modelSelection: modelSelectionNextSteps(provider, true) }, wantsJson, modelSelectionGuidance(provider, true));
|
|
348
406
|
return;
|
|
349
407
|
}
|
|
350
|
-
|
|
408
|
+
// A device grant waits on a person at another machine: outlast xAI's 30-minute code.
|
|
409
|
+
for (let attempt = 0; attempt < (device ? 930 : 100); attempt++) {
|
|
351
410
|
await Bun.sleep(2_000);
|
|
352
|
-
const raw = await runtimeRequest<Record<string, unknown>>(`/api/oauth/status?provider=${encodeURIComponent(provider)}`, { redirect: "error" }, pinned);
|
|
411
|
+
const raw = await runtimeRequest<Record<string, unknown>>(`/api/oauth/status?provider=${encodeURIComponent(provider)}${xaiDevice ? `&flowId=${encodeURIComponent(start.flowId!)}` : ""}`, { redirect: "error" }, pinned);
|
|
353
412
|
if (loginObject(raw).error) throw new Error("Provider login failed");
|
|
413
|
+
if (xaiDevice && (raw.flowId !== start.flowId || raw.status === "idle")) throw new Error("Device login flow is unavailable");
|
|
354
414
|
const state = publicLoginStatus(raw);
|
|
355
|
-
if (state.done === true && state.loggedIn !== true) throw new Error("Provider login ended without authentication");
|
|
356
|
-
|
|
415
|
+
if (state.done === true && state.loggedIn !== true && !(xaiDevice && raw.status === "complete")) throw new Error("Provider login ended without authentication");
|
|
416
|
+
// A device login adds an account, so an already signed-in provider is not done until its flow is.
|
|
417
|
+
if ((xaiDevice && raw.status === "complete") || (state.loggedIn === true && (!device || (state.done === true && !xaiDevice)))) {
|
|
357
418
|
printData({ ...state, modelSelection: modelSelectionNextSteps(provider) }, wantsJson, [`Logged in to ${provider}.`, ...modelSelectionGuidance(provider)]);
|
|
358
419
|
return;
|
|
359
420
|
}
|
|
@@ -407,7 +468,7 @@ async function cancel(argv: string[], deps: RuntimeApiDeps): Promise<void> {
|
|
|
407
468
|
}
|
|
408
469
|
const result = await runtimeRequest(codex ? "/api/codex-auth/login/cancel" : "/api/oauth/login/cancel", {
|
|
409
470
|
method: "POST",
|
|
410
|
-
body: JSON.stringify(codex ? { flowId } : { provider, ...(provider === "kiro" && flowId ? { flowId } : {}) }),
|
|
471
|
+
body: JSON.stringify(codex ? { flowId } : { provider, ...((provider === "kiro" || provider === "xai") && flowId ? { flowId } : {}) }),
|
|
411
472
|
}, deps);
|
|
412
473
|
printData(result, wantsJson, [`Cancelled ${provider} login.`]);
|
|
413
474
|
}
|
|
@@ -4,7 +4,15 @@ import { anthropicProviderIdentityError, cmdAnthropicAccountThreshold } from "./
|
|
|
4
4
|
import { isReservedCodexAccountWord, reportCodexAccountTargetError, resolveCodexAccountTarget } from "./account-target";
|
|
5
5
|
import { hasPassiveAccountQuota } from "../providers/quota";
|
|
6
6
|
import { isWeeklyAllowancePercent } from "../providers/quota-types";
|
|
7
|
-
import { terminalSafeText } from "./runtime-api";
|
|
7
|
+
import { readSecretLine, terminalSafeText } from "./runtime-api";
|
|
8
|
+
import {
|
|
9
|
+
ANTIGRAVITY_RISK_ACK_FIELD,
|
|
10
|
+
ANTIGRAVITY_RISK_CLI_FLAG,
|
|
11
|
+
ANTIGRAVITY_RISK_REFUSAL_CODE,
|
|
12
|
+
antigravityRiskDecisionMessage,
|
|
13
|
+
resolveAntigravityRiskAcknowledgement,
|
|
14
|
+
} from "../oauth/antigravity-risk";
|
|
15
|
+
import { isAgentDriven } from "./agent-driven";
|
|
8
16
|
import { closeSync, openSync, readSync, readFileSync, statSync } from "node:fs";
|
|
9
17
|
import {
|
|
10
18
|
MAX_ACCOUNT_PRIORITY,
|
|
@@ -558,6 +566,7 @@ export async function cmdImport(args: string[], deps: AccountDeps): Promise<numb
|
|
|
558
566
|
const formatArg = flagValue(args, "--format");
|
|
559
567
|
const fileArg = flagValue(args, "--file");
|
|
560
568
|
const fromStdin = flag(args, "--stdin");
|
|
569
|
+
const acceptRisk = flag(args, ANTIGRAVITY_RISK_CLI_FLAG);
|
|
561
570
|
const provider = args.shift();
|
|
562
571
|
|
|
563
572
|
// Admission happens before source I/O. In particular, an inline JSON positional argument is
|
|
@@ -576,6 +585,25 @@ export async function cmdImport(args: string[], deps: AccountDeps): Promise<numb
|
|
|
576
585
|
return usage("Error: choose exactly one bounded source: --file <path> or --stdin");
|
|
577
586
|
}
|
|
578
587
|
|
|
588
|
+
// Before reading the document: an imported Antigravity credential carries the same account
|
|
589
|
+
// risk as a fresh login. With --stdin the document owns stdin, so only the flag can accept.
|
|
590
|
+
const stdinInput: AccountStdin = deps.stdinImpl ?? process.stdin;
|
|
591
|
+
const decision = await resolveAntigravityRiskAcknowledgement({
|
|
592
|
+
flag: acceptRisk,
|
|
593
|
+
interactive: !fromStdin && stdinInput.isTTY === true
|
|
594
|
+
&& (deps.antigravityRisk?.promptVisible ?? (() => process.stderr.isTTY === true))(),
|
|
595
|
+
agentDriven: (deps.antigravityRisk?.agentDriven ?? isAgentDriven)(),
|
|
596
|
+
warn: text => console.error(text),
|
|
597
|
+
ask: async question => {
|
|
598
|
+
process.stderr.write(question);
|
|
599
|
+
return await readSecretLine(deps, "confirmation");
|
|
600
|
+
},
|
|
601
|
+
});
|
|
602
|
+
if (decision !== "accepted") {
|
|
603
|
+
console.error(antigravityRiskDecisionMessage(decision));
|
|
604
|
+
return 1;
|
|
605
|
+
}
|
|
606
|
+
|
|
579
607
|
let source: string;
|
|
580
608
|
try {
|
|
581
609
|
source = hasFile ? readBoundedImportFile(fileArg.value!) : await readBoundedImportStdin(deps);
|
|
@@ -611,6 +639,7 @@ export async function cmdImport(args: string[], deps: AccountDeps): Promise<numb
|
|
|
611
639
|
provider,
|
|
612
640
|
format: formatArg.value,
|
|
613
641
|
document,
|
|
642
|
+
[ANTIGRAVITY_RISK_ACK_FIELD]: true,
|
|
614
643
|
}, { signal: controller.signal });
|
|
615
644
|
} finally {
|
|
616
645
|
clearTimeout(timer);
|
|
@@ -621,7 +650,9 @@ export async function cmdImport(args: string[], deps: AccountDeps): Promise<numb
|
|
|
621
650
|
return 1;
|
|
622
651
|
}
|
|
623
652
|
if (response.status !== 200) {
|
|
624
|
-
if (
|
|
653
|
+
if (response.json.code === ANTIGRAVITY_RISK_REFUSAL_CODE) {
|
|
654
|
+
console.error(`Error: ${ANTIGRAVITY_RISK_REFUSAL_CODE}`);
|
|
655
|
+
} else if (IMPORT_CODES.has(response.json.code as AccountImportCode)) {
|
|
625
656
|
console.error(`Error: ${response.json.code as AccountImportCode}`);
|
|
626
657
|
} else {
|
|
627
658
|
console.error(`Error: import_request_failed (status ${response.status})`);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** Public API-key quota projection; private probe identity stays on the server. */
|
|
2
|
-
import { parseQuotaFailureCode, type AccountQuotaFields, type ProviderQuota, type ProviderQuotaWindow, type ProviderQuotaCreditsUsd } from "../providers/quota-types";
|
|
2
|
+
import { parseQuotaFailureCode, parseQuotaUnknownReason, type AccountQuotaFields, type ProviderQuota, type ProviderQuotaWindow, type ProviderQuotaCreditsUsd, type QuotaUnknownReason } from "../providers/quota-types";
|
|
3
3
|
import { terminalSafeText } from "./runtime-api";
|
|
4
4
|
import type { AccountRow, FamilyRows } from "./account-api";
|
|
5
5
|
import { accountPauseDetailsSchema } from "../config/schema/account-auto-pause";
|
|
@@ -98,6 +98,11 @@ export function projectApiKeyQuotaRows(value: unknown, provider: string): Family
|
|
|
98
98
|
if (!failure) throw new Error("Malformed API-key quota response.");
|
|
99
99
|
if (unavailable === true) fields.quotaFailure = failure;
|
|
100
100
|
}
|
|
101
|
+
// #8397: a reason a newer proxy adds is dropped, not fatal; a non-string is malformed.
|
|
102
|
+
const unknownReason = parseQuotaUnknownReason(optionalString(row, "quotaUnknownReason"));
|
|
103
|
+
if (unknownReason) fields.quotaUnknownReason = unknownReason;
|
|
104
|
+
// Display-only: a malformed read time is dropped like an unknown reason, not fatal to the listing.
|
|
105
|
+
if (typeof row.quotaReadAt === "number" && Number.isFinite(row.quotaReadAt) && row.quotaReadAt >= 0) fields.quotaReadAt = row.quotaReadAt;
|
|
101
106
|
const masked = optionalString(row, "masked");
|
|
102
107
|
return { provider, type: "api-key", id, label: optionalString(row, "label") ?? masked,
|
|
103
108
|
masked, active: optionalBoolean(row, "active") ?? id === activeId,
|
|
@@ -107,13 +112,37 @@ export function projectApiKeyQuotaRows(value: unknown, provider: string): Family
|
|
|
107
112
|
return { rows, activeId, status: 200 };
|
|
108
113
|
}
|
|
109
114
|
|
|
115
|
+
const UNKNOWN_REASON_TEXT: Record<QuotaUnknownReason, string> = {
|
|
116
|
+
no_balance_source: "no balance source",
|
|
117
|
+
passive_not_observed: "not observed yet",
|
|
118
|
+
read_failed: "read failed",
|
|
119
|
+
not_read: "not read",
|
|
120
|
+
not_reported: "provider reported none",
|
|
121
|
+
};
|
|
122
|
+
export function quotaUnknownReasonText(reason: QuotaUnknownReason): string {
|
|
123
|
+
return UNKNOWN_REASON_TEXT[reason];
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
/** "read 3 min ago"; a clock skewed into the future reads as just now. */
|
|
127
|
+
function readAgeText(readAt: number | undefined, now = Date.now()): string {
|
|
128
|
+
if (readAt === undefined) return "";
|
|
129
|
+
const minutes = Math.floor(Math.max(0, now - readAt) / 60_000);
|
|
130
|
+
if (minutes < 1) return "; read just now";
|
|
131
|
+
if (minutes < 60) return `; read ${minutes} min ago`;
|
|
132
|
+
const hours = Math.floor(minutes / 60);
|
|
133
|
+
return hours < 48 ? `; read ${hours} h ago` : `; read ${Math.floor(hours / 24)} d ago`;
|
|
134
|
+
}
|
|
135
|
+
|
|
110
136
|
export function apiKeyQuotaText(row: AccountRow): string {
|
|
111
137
|
const mode = row.quotaMode;
|
|
112
138
|
if (!mode) return "unverified";
|
|
113
|
-
|
|
114
|
-
if (
|
|
139
|
+
// Without a reader there is no balance source, whichever proxy version answered.
|
|
140
|
+
if (mode === "unsupported") return `unsupported: balance UNKNOWN (${quotaUnknownReasonText("no_balance_source")})`;
|
|
141
|
+
const read = readAgeText(row.quotaReadAt);
|
|
142
|
+
const unknown = row.quotaUnknownReason ? `; balance UNKNOWN (${quotaUnknownReasonText(row.quotaUnknownReason)})` : "";
|
|
143
|
+
if (row.quotaUnavailable) return `${mode}: unavailable${row.quotaFailure ? ` (${row.quotaFailure})` : ""}${unknown}${read}`;
|
|
115
144
|
const quota = row.quota;
|
|
116
|
-
if (!quota) return `${mode}: not measured`;
|
|
145
|
+
if (!quota) return unknown ? `${mode}: ${unknown.slice(2)}${read}` : `${mode}: not measured${read}`;
|
|
117
146
|
const parts: string[] = [];
|
|
118
147
|
for (const [label, percent] of [["5h", quota.fiveHourPercent], ["wk", quota.weeklyPercent], ["mo", quota.monthlyPercent]] as const) {
|
|
119
148
|
if (percent !== undefined) parts.push(`${label} ${percent}%`);
|
|
@@ -137,5 +166,5 @@ export function apiKeyQuotaText(row: AccountRow): string {
|
|
|
137
166
|
parts.push(`USD ${c.used}/${c.unlimited ? "unlimited" : c.limit} used; ${c.remaining} remaining (${c.percent}%)`);
|
|
138
167
|
}
|
|
139
168
|
if (quota.kiroCreditsUsed !== undefined || quota.kiroCreditsLimit !== undefined) parts.push(`credits ${quota.kiroCreditsUsed ?? "?"}/${quota.kiroCreditsLimit ?? "?"}`);
|
|
140
|
-
return `${mode}: ${parts.join("; ") || "not measured"}`;
|
|
169
|
+
return `${mode}: ${parts.join("; ") || "not measured"}${read}`;
|
|
141
170
|
}
|
package/src/cli/account.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** `ocx account` — list and switch provider credentials (issue #180). */
|
|
2
|
-
import { apiKeyQuotaText } from "./account-key-quota";
|
|
2
|
+
import { apiKeyQuotaText, quotaUnknownReasonText } from "./account-key-quota";
|
|
3
3
|
import { redactSecretArgs } from "./secret-args";
|
|
4
4
|
import { emptyAccountNextAction, recoveryAccountLabel } from "./account-next-actions";
|
|
5
5
|
import { loadConfig } from "../config";
|
|
@@ -151,7 +151,7 @@ function quotaText(row: AccountRow): string {
|
|
|
151
151
|
if (row.type === "api-key") return apiKeyQuotaText(row);
|
|
152
152
|
if (row.quotaUnavailable) return row.quotaFailure ? `unavailable (${row.quotaFailure})` : "unavailable";
|
|
153
153
|
const quota = row.quota;
|
|
154
|
-
if (!quota) return "-";
|
|
154
|
+
if (!quota) return row.quotaUnknownReason ? `UNKNOWN (${quotaUnknownReasonText(row.quotaUnknownReason)})` : "-";
|
|
155
155
|
const parts: string[] = [];
|
|
156
156
|
// Two spellings reach this DTO: the per-account provider probe reports `fiveHourPercent`,
|
|
157
157
|
// while the Codex pool reports the same idea as `shortPercent`.
|
|
@@ -161,6 +161,8 @@ function quotaText(row: AccountRow): string {
|
|
|
161
161
|
// Kiro bills a monthly allowance and reports no shorter window, so without this arm a
|
|
162
162
|
// perfectly healthy Kiro account prints "-" and reads as broken.
|
|
163
163
|
if (typeof quota.monthlyPercent === "number") parts.push(`mo ${Math.round(quota.monthlyPercent)}%`);
|
|
164
|
+
// #8574: the stored weekly reading follows whichever of two live windows came last; say so.
|
|
165
|
+
if (row.weeklyQuotaConflicts?.length) parts.push("(weekly windows conflict)");
|
|
164
166
|
return parts.length > 0 ? parts.join(" ") : "-";
|
|
165
167
|
}
|
|
166
168
|
|
package/src/cli/advisor.ts
CHANGED
|
@@ -7,14 +7,15 @@ const USAGE = `Usage:
|
|
|
7
7
|
ocx advisor on [--ack-context-sharing] [--json]
|
|
8
8
|
ocx advisor off [--json]
|
|
9
9
|
ocx advisor consent [--revoke] [--json]
|
|
10
|
-
ocx advisor set [--model <model>] [--effort <effort>] [--policy <manual|preflight|adaptive>] [--max-consultations <1-3>] [--timeout-ms <ms>] [--json]`;
|
|
10
|
+
ocx advisor set [--model <model>] [--effort <effort>] [--policy <manual|preflight|adaptive>] [--context-mode <context|question-only>] [--max-consultations <1-3>] [--timeout-ms <ms>] [--json]`;
|
|
11
11
|
|
|
12
|
-
const VALUED_FLAGS = new Set(["--model", "--effort", "--policy", "--timeout-ms", "--max-consultations"]);
|
|
12
|
+
const VALUED_FLAGS = new Set(["--model", "--effort", "--policy", "--context-mode", "--timeout-ms", "--max-consultations"]);
|
|
13
13
|
|
|
14
14
|
interface SetOptions {
|
|
15
15
|
model?: string;
|
|
16
16
|
effort?: string;
|
|
17
17
|
policy?: string;
|
|
18
|
+
contextMode?: string;
|
|
18
19
|
timeoutMs?: string;
|
|
19
20
|
maxConsultations?: string;
|
|
20
21
|
}
|
|
@@ -32,11 +33,12 @@ function parseSetArgs(args: string[]): SetOptions {
|
|
|
32
33
|
if (arg === "--model") options.model = value;
|
|
33
34
|
else if (arg === "--effort") options.effort = value;
|
|
34
35
|
else if (arg === "--policy") options.policy = value;
|
|
36
|
+
else if (arg === "--context-mode") options.contextMode = value;
|
|
35
37
|
else if (arg === "--max-consultations") options.maxConsultations = value;
|
|
36
38
|
else options.timeoutMs = value;
|
|
37
39
|
}
|
|
38
40
|
if (Object.keys(options).length === 0) {
|
|
39
|
-
throw new CliUsageError("advisor set requires a model, effort, policy, task limit, or timeout option", USAGE);
|
|
41
|
+
throw new CliUsageError("advisor set requires a model, effort, policy, context mode, task limit, or timeout option", USAGE);
|
|
40
42
|
}
|
|
41
43
|
return options;
|
|
42
44
|
}
|
|
@@ -115,7 +117,7 @@ async function consent(argv: string[], deps: RuntimeApiDeps): Promise<void> {
|
|
|
115
117
|
contextSharingConsent: revoke ? null : ADVISOR_CONTEXT_SHARING_CONSENT_VERSION,
|
|
116
118
|
}),
|
|
117
119
|
}, deps), wantsJson, [revoke
|
|
118
|
-
? "Advisor context-sharing consent removed. Consultations will not send task content."
|
|
120
|
+
? "Advisor context-sharing consent removed. Consultations not yet dispatched will not send task content; a dispatched consultation cannot be cancelled and task content already sent cannot be retracted."
|
|
119
121
|
: "Advisor context-sharing consent v1 recorded.",
|
|
120
122
|
]);
|
|
121
123
|
}
|
|
@@ -128,6 +130,7 @@ async function set(argv: string[], deps: RuntimeApiDeps): Promise<void> {
|
|
|
128
130
|
if (options.model !== undefined) patch.model = options.model;
|
|
129
131
|
if (options.effort !== undefined) patch.effort = options.effort;
|
|
130
132
|
if (options.policy !== undefined) patch.policy = options.policy;
|
|
133
|
+
if (options.contextMode !== undefined) patch.contextMode = options.contextMode;
|
|
131
134
|
if (options.maxConsultations !== undefined) {
|
|
132
135
|
const limit = Number(options.maxConsultations);
|
|
133
136
|
if (!Number.isInteger(limit) || limit < 1 || limit > 3) throw new CliUsageError("--max-consultations must be an integer between 1 and 3", USAGE);
|
package/src/cli/alias.ts
CHANGED
|
@@ -5,7 +5,10 @@ const USAGE = `Usage:
|
|
|
5
5
|
ocx alias set <provider> <alias>
|
|
6
6
|
ocx alias set <provider>/<native-model-id> <alias>
|
|
7
7
|
ocx alias rm <provider>[/<native-model-id>]
|
|
8
|
-
ocx alias defaults <on|off> [--provider <name>]
|
|
8
|
+
ocx alias defaults <on|off> [--provider <name>]
|
|
9
|
+
ocx alias template set <provider> <template>
|
|
10
|
+
ocx alias template rm <provider>
|
|
11
|
+
ocx alias template show [<provider>]`;
|
|
9
12
|
|
|
10
13
|
function selector(value: string): { provider: string; model?: string } {
|
|
11
14
|
const slash = value.indexOf("/");
|
|
@@ -32,6 +35,7 @@ async function runAliasAction(argv: string[], deps: RuntimeApiDeps): Promise<num
|
|
|
32
35
|
printData(result, wantsJson, lines.length ? lines : ["No aliases configured."]);
|
|
33
36
|
return 0;
|
|
34
37
|
}
|
|
38
|
+
if (action === "template") return runTemplateAction(args, wantsJson, deps);
|
|
35
39
|
if (action === "defaults") {
|
|
36
40
|
const state = args.shift()?.toLowerCase();
|
|
37
41
|
const provider = takeOption(args, "--provider");
|
|
@@ -70,3 +74,36 @@ async function runAliasAction(argv: string[], deps: RuntimeApiDeps): Promise<num
|
|
|
70
74
|
}
|
|
71
75
|
return 0;
|
|
72
76
|
}
|
|
77
|
+
|
|
78
|
+
/**
|
|
79
|
+
* #7705: opt-in per-provider alias templates. The template is stored as text and the aliases are
|
|
80
|
+
* derived when models resolve; `set` prints how many aliases it produces and how many it skipped.
|
|
81
|
+
*/
|
|
82
|
+
async function runTemplateAction(args: string[], wantsJson: boolean, deps: RuntimeApiDeps): Promise<number> {
|
|
83
|
+
const sub = args.shift()?.toLowerCase();
|
|
84
|
+
if (sub === "show") {
|
|
85
|
+
const provider = args.shift()?.trim();
|
|
86
|
+
rejectArgs(args, USAGE);
|
|
87
|
+
const result = await runtimeRequest<{ templates?: Record<string, string> }>("/api/aliases", {}, deps);
|
|
88
|
+
const templates = Object.entries(result.templates ?? {}).filter(([name]) => !provider || name === provider);
|
|
89
|
+
printData(provider ? { provider, template: Object.fromEntries(templates)[provider] ?? null } : (result.templates ?? {}), wantsJson,
|
|
90
|
+
templates.length ? templates.map(([name, template]) => `${name}: ${template}`) : ["No alias templates configured."]);
|
|
91
|
+
return 0;
|
|
92
|
+
}
|
|
93
|
+
if (sub !== "set" && sub !== "rm") throw new CliUsageError("alias template requires set, rm or show", USAGE);
|
|
94
|
+
const provider = args.shift()?.trim();
|
|
95
|
+
if (!provider) throw new CliUsageError("alias template requires a provider", USAGE);
|
|
96
|
+
const template = sub === "set" ? args.shift() : null;
|
|
97
|
+
if (sub === "set" && !template?.trim()) throw new CliUsageError("alias template set requires a template", USAGE);
|
|
98
|
+
rejectArgs(args, USAGE);
|
|
99
|
+
const result = await runtimeRequest<{ preview?: { generated: number; skippedTotal?: number; skipped?: unknown[] } }>(
|
|
100
|
+
`/api/providers/${encodeURIComponent(provider)}/alias-template`,
|
|
101
|
+
{ method: "PUT", body: JSON.stringify({ template }) },
|
|
102
|
+
deps,
|
|
103
|
+
);
|
|
104
|
+
const skipped = result.preview?.skippedTotal ?? result.preview?.skipped?.length ?? 0;
|
|
105
|
+
printData(result, wantsJson, sub === "set"
|
|
106
|
+
? [`${provider}: ${template} (${result.preview?.generated ?? 0} aliases, ${skipped} skipped)`]
|
|
107
|
+
: [`Removed the alias template for ${provider}.`]);
|
|
108
|
+
return 0;
|
|
109
|
+
}
|