@bitkyc08/opencodex 2.100.1 → 2.100.3
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 +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.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 +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -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.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- 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/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- 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/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- 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 +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- 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 +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.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 +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- 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 +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -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 +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- 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 -13
- package/src/cli/sync-fanout.ts +81 -99
- 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-restart-client.ts +3 -2
- 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 +321 -34
- 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-readiness.ts +16 -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-status.ts +76 -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 +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -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 +36 -4
- package/src/codex/account-resume-health.ts +41 -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/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- 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-types.ts +2 -0
- package/src/codex/convergence.ts +2 -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/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- 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 +134 -7
- 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 +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- 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/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- 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/redact.ts +84 -8
- 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 +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- 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-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- 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 +174 -0
- 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/paths.ts +5 -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 +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -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 +285 -43
- 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 +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -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/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- 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 +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- 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/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -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 +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- 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-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-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- 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-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- 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-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- 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/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- 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 +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -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/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- 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/hosted-tool-policy.ts +56 -12
- 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 +4 -2
- 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 +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- 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/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -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 +115 -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 +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- 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 +137 -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 +7 -1
- 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 +218 -0
- 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 +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -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 +69 -17
- 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 +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -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 +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- 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-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- 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/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-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- 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 +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -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/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/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- 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 +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -3,6 +3,8 @@ import { loadConfig } from "../config";
|
|
|
3
3
|
import { anthropicProviderIdentityError, cmdAnthropicAccountThreshold } from "./account-anthropic-threshold";
|
|
4
4
|
import { isReservedCodexAccountWord, reportCodexAccountTargetError, resolveCodexAccountTarget } from "./account-target";
|
|
5
5
|
import { hasPassiveAccountQuota } from "../providers/quota";
|
|
6
|
+
import { isWeeklyAllowancePercent } from "../providers/quota-types";
|
|
7
|
+
import { terminalSafeText } from "./runtime-api";
|
|
6
8
|
import { closeSync, openSync, readSync, readFileSync, statSync } from "node:fs";
|
|
7
9
|
import {
|
|
8
10
|
MAX_ACCOUNT_PRIORITY,
|
|
@@ -46,7 +48,7 @@ const EXTENDED_USAGE = `Usage:
|
|
|
46
48
|
ocx account alias <provider> <id|alias|main> <display-name|-> [--json]
|
|
47
49
|
ocx account priority <provider> <id|alias|main> [<-100..100|first|earlier|normal|later|last|reset>] [--json]
|
|
48
50
|
ocx account pause <provider> <id|alias|main> [--json]
|
|
49
|
-
ocx account resume <provider> <id|alias|main> [--json]
|
|
51
|
+
ocx account resume <provider> <id|alias|main> [--if-healthy] [--json]
|
|
50
52
|
ocx account pause-exhausted <provider> [--json]
|
|
51
53
|
ocx account strategy <provider> [<quota|round-robin|fill-first|least-loaded|reset-first>] [--json]
|
|
52
54
|
ocx account sticky <provider> [<1-100>] [--json]
|
|
@@ -275,16 +277,28 @@ function refreshLine(row: FamilyRows["rows"][number]): string {
|
|
|
275
277
|
|
|
276
278
|
function quotaParts(quota: ProviderQuotaDto): string[] {
|
|
277
279
|
const parts: string[] = [];
|
|
278
|
-
const add = (label: string, percent: number | undefined, resetAt?: number) => {
|
|
280
|
+
const add = (label: string, percent: number | undefined, resetAt?: number, note?: string) => {
|
|
279
281
|
if (percent === undefined) return;
|
|
280
|
-
parts.push(`${label} ${percent}
|
|
282
|
+
parts.push(`${label} ${percent}%${note ? ` (${note})` : ""}`);
|
|
281
283
|
const reset = resetIso(resetAt);
|
|
282
284
|
if (reset) parts.push(`resets ${reset}`);
|
|
283
285
|
};
|
|
284
286
|
add("5h", quota.fiveHourPercent, quota.fiveHourResetAt);
|
|
285
287
|
add("weekly", quota.weeklyPercent, quota.weeklyResetAt);
|
|
286
288
|
add("monthly", quota.monthlyPercent, quota.monthlyResetAt);
|
|
287
|
-
for (const window of quota.customWindows ?? []) add(window.label, window.percent, window.resetAt);
|
|
289
|
+
for (const window of quota.customWindows ?? []) add(terminalSafeText(window.displayLabel ?? window.label), window.percent, window.resetAt);
|
|
290
|
+
// Same rule as the dashboard: a routed row with the same label wins over a display-only one.
|
|
291
|
+
const routed = new Set((quota.customWindows ?? []).map(window => window.label));
|
|
292
|
+
for (const window of quota.displayWindows ?? []) {
|
|
293
|
+
if (routed.has(window.label)) continue;
|
|
294
|
+
const share = isWeeklyAllowancePercent(window.weeklyAllowancePercent) ? `up to ${window.weeklyAllowancePercent}% of weekly; ` : "";
|
|
295
|
+
add(terminalSafeText(window.label), window.percent, window.resetAt, `${share}not in effect`);
|
|
296
|
+
}
|
|
297
|
+
for (const window of quota.unknownBudgetWindows ?? []) {
|
|
298
|
+
parts.push(`${terminalSafeText(window.label)} unknown`);
|
|
299
|
+
const reset = resetIso(window.resetAt);
|
|
300
|
+
if (reset) parts.push(`resets ${reset}`);
|
|
301
|
+
}
|
|
288
302
|
return parts;
|
|
289
303
|
}
|
|
290
304
|
|
|
@@ -803,14 +817,26 @@ function resolveGenericOAuthAccountTarget(accounts: unknown[], requested: string
|
|
|
803
817
|
/** Pause or resume a Codex, OAuth, or API-key pool account. */
|
|
804
818
|
export async function cmdPause(args: string[], deps: AccountDeps, paused: boolean): Promise<number> {
|
|
805
819
|
const wantsJson = flag(args, "--json");
|
|
820
|
+
// #8398: an explicit resume the server performs only after an account-bound health read.
|
|
821
|
+
const ifHealthy = flag(args, "--if-healthy");
|
|
806
822
|
const name = args.shift();
|
|
807
823
|
const requestedId = args.shift();
|
|
808
824
|
const verb = paused ? "pause" : "resume";
|
|
809
825
|
if (!name || !requestedId || args.length) return usage();
|
|
826
|
+
if (ifHealthy && paused) return usage("Error: --if-healthy applies only to resume");
|
|
810
827
|
const classified = configAndType(deps, name);
|
|
811
828
|
if ("error" in classified) return usage(`Error: ${classified.error}`);
|
|
829
|
+
if (ifHealthy && classified.type === "api-key") return usage("Error: --if-healthy applies to the openai Codex account pool or an OAuth provider pool");
|
|
812
830
|
const baseUrl = await resolveBaseUrl(deps);
|
|
813
831
|
if (!baseUrl) return proxyUnreachable();
|
|
832
|
+
const healthGate = ifHealthy ? { ifHealthy: true } : {};
|
|
833
|
+
// A refused health-gated resume is an answer, not a failure: exit 3 lets a supervisor tell it apart.
|
|
834
|
+
const refusedResume = (json: Record<string, unknown>, id: string): number | undefined => {
|
|
835
|
+
if (!ifHealthy || json.code !== "resume_refused" || typeof json.reason !== "string") return undefined;
|
|
836
|
+
if (wantsJson) console.log(JSON.stringify({ ok: false, provider: name, id, resumed: false, reason: json.reason }, null, 2));
|
|
837
|
+
else console.log(`${name}: ${requestedId} not resumed: ${json.reason}`);
|
|
838
|
+
return 3;
|
|
839
|
+
};
|
|
814
840
|
|
|
815
841
|
if (classified.type === "oauth") {
|
|
816
842
|
const list = await apiJson(deps, baseUrl, "GET", `/api/oauth/accounts?provider=${encodeURIComponent(name)}`);
|
|
@@ -823,8 +849,10 @@ export async function cmdPause(args: string[], deps: AccountDeps, paused: boolea
|
|
|
823
849
|
provider: name,
|
|
824
850
|
accountId: target.id,
|
|
825
851
|
paused,
|
|
852
|
+
...healthGate,
|
|
826
853
|
});
|
|
827
854
|
if (response.status === 0) return proxyUnreachable(response.transportError);
|
|
855
|
+
if (response.status === 409) { const refused = refusedResume(response.json, target.id); if (refused !== undefined) return refused; }
|
|
828
856
|
if (response.status !== 200) return apiError(response.json, `failed to ${verb} ${requestedId}`, response.status);
|
|
829
857
|
|
|
830
858
|
if (wantsJson) {
|
|
@@ -848,7 +876,32 @@ export async function cmdPause(args: string[], deps: AccountDeps, paused: boolea
|
|
|
848
876
|
const result = await apiJson(deps, baseUrl, "PUT", "/api/providers/keys/pause", { name, id: target.id, paused });
|
|
849
877
|
if (result.status === 0) return proxyUnreachable(result.transportError);
|
|
850
878
|
if (result.status !== 200) return apiError(result.json, `failed to ${verb} account`, result.status);
|
|
851
|
-
|
|
879
|
+
const idx = rows.rows.findIndex(row => row.id === target.id);
|
|
880
|
+
const ordered = idx >= 0 ? [...rows.rows.slice(idx + 1), ...rows.rows.slice(0, idx)] : rows.rows;
|
|
881
|
+
const beforeActiveId = rows.rows.find(row => row.active && !row.paused)?.id ?? null;
|
|
882
|
+
const inferredActiveId = paused
|
|
883
|
+
? (beforeActiveId === target.id
|
|
884
|
+
? (ordered.find(row => row.id !== target.id && !row.paused)?.id ?? null)
|
|
885
|
+
: beforeActiveId)
|
|
886
|
+
: (beforeActiveId ?? (rows.rows.some(row => row.paused) ? target.id : null));
|
|
887
|
+
const activeAccountId = result.json.activeAccountId !== undefined
|
|
888
|
+
? result.json.activeAccountId
|
|
889
|
+
: result.json.activeId !== undefined
|
|
890
|
+
? result.json.activeId
|
|
891
|
+
: inferredActiveId;
|
|
892
|
+
const activeAccountChanged = typeof result.json.activeAccountChanged === "boolean"
|
|
893
|
+
? result.json.activeAccountChanged
|
|
894
|
+
: beforeActiveId !== activeAccountId;
|
|
895
|
+
if (wantsJson) {
|
|
896
|
+
console.log(JSON.stringify({ ok: true, provider: name, id: target.id, paused,
|
|
897
|
+
activeAccountId: activeAccountId ?? null,
|
|
898
|
+
activeAccountChanged }, null, 2));
|
|
899
|
+
} else {
|
|
900
|
+
console.log(`${name}: account ${paused ? "paused" : "resumed"}`);
|
|
901
|
+
if (activeAccountChanged) {
|
|
902
|
+
console.error(`Active account changed to ${String(activeAccountId ?? "none")}.`);
|
|
903
|
+
}
|
|
904
|
+
}
|
|
852
905
|
return 0;
|
|
853
906
|
}
|
|
854
907
|
if (classified.type !== "codex") {
|
|
@@ -859,10 +912,11 @@ export async function cmdPause(args: string[], deps: AccountDeps, paused: boolea
|
|
|
859
912
|
if ("error" in target) return reportCodexAccountTargetError(target);
|
|
860
913
|
const id = target.id;
|
|
861
914
|
|
|
862
|
-
const response = await apiJson(deps, baseUrl, "PUT", "/api/codex-auth/accounts/pause", { id, paused });
|
|
915
|
+
const response = await apiJson(deps, baseUrl, "PUT", "/api/codex-auth/accounts/pause", { id, paused, ...healthGate });
|
|
863
916
|
// Transport sentinel first: status 0 means the proxy never answered, and comparing it to
|
|
864
917
|
// 200 would report an unreachable proxy as a management error.
|
|
865
918
|
if (response.status === 0) return proxyUnreachable(response.transportError);
|
|
919
|
+
if (response.status === 409) { const refused = refusedResume(response.json, id); if (refused !== undefined) return refused; }
|
|
866
920
|
if (response.status !== 200) return apiError(response.json, `failed to ${verb} ${requestedId}`, response.status);
|
|
867
921
|
|
|
868
922
|
if (wantsJson) {
|
|
@@ -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";
|
|
@@ -27,6 +27,8 @@ function windowProjection(value: unknown): ProviderQuotaWindow {
|
|
|
27
27
|
const label = optionalString(row, "label");
|
|
28
28
|
if (label === undefined) throw new Error("Malformed API-key quota response.");
|
|
29
29
|
const result: ProviderQuotaWindow = { label, percent: finite(row.percent) };
|
|
30
|
+
const displayLabel = optionalString(row, "displayLabel");
|
|
31
|
+
if (displayLabel !== undefined) result.displayLabel = displayLabel;
|
|
30
32
|
if (row.resetAt !== undefined) result.resetAt = finite(row.resetAt);
|
|
31
33
|
if (row.passiveObservedAt !== undefined) result.passiveObservedAt = finite(row.passiveObservedAt);
|
|
32
34
|
if (row.scope !== undefined) {
|
|
@@ -60,6 +62,15 @@ function quotaProjection(value: unknown): ProviderQuota | null {
|
|
|
60
62
|
if (!Array.isArray(row.customWindows)) throw new Error("Malformed API-key quota response.");
|
|
61
63
|
result.customWindows = row.customWindows.map(windowProjection);
|
|
62
64
|
}
|
|
65
|
+
if (row.unknownBudgetWindows !== undefined) {
|
|
66
|
+
if (!Array.isArray(row.unknownBudgetWindows)) throw new Error("Malformed API-key quota response.");
|
|
67
|
+
result.unknownBudgetWindows = row.unknownBudgetWindows.map(value => {
|
|
68
|
+
const item = record(value);
|
|
69
|
+
const label = optionalString(item, "label");
|
|
70
|
+
if (label === undefined) throw new Error("Malformed API-key quota response.");
|
|
71
|
+
return { label, ...(item.resetAt === undefined ? {} : { resetAt: finite(item.resetAt) }) };
|
|
72
|
+
});
|
|
73
|
+
}
|
|
63
74
|
if (row.creditsUsd !== undefined) result.creditsUsd = creditsProjection(row.creditsUsd);
|
|
64
75
|
return result;
|
|
65
76
|
}
|
|
@@ -87,6 +98,11 @@ export function projectApiKeyQuotaRows(value: unknown, provider: string): Family
|
|
|
87
98
|
if (!failure) throw new Error("Malformed API-key quota response.");
|
|
88
99
|
if (unavailable === true) fields.quotaFailure = failure;
|
|
89
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;
|
|
90
106
|
const masked = optionalString(row, "masked");
|
|
91
107
|
return { provider, type: "api-key", id, label: optionalString(row, "label") ?? masked,
|
|
92
108
|
masked, active: optionalBoolean(row, "active") ?? id === activeId,
|
|
@@ -96,26 +112,59 @@ export function projectApiKeyQuotaRows(value: unknown, provider: string): Family
|
|
|
96
112
|
return { rows, activeId, status: 200 };
|
|
97
113
|
}
|
|
98
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
|
+
|
|
99
136
|
export function apiKeyQuotaText(row: AccountRow): string {
|
|
100
137
|
const mode = row.quotaMode;
|
|
101
138
|
if (!mode) return "unverified";
|
|
102
|
-
|
|
103
|
-
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}`;
|
|
104
144
|
const quota = row.quota;
|
|
105
|
-
if (!quota) return `${mode}: not measured`;
|
|
145
|
+
if (!quota) return unknown ? `${mode}: ${unknown.slice(2)}${read}` : `${mode}: not measured${read}`;
|
|
106
146
|
const parts: string[] = [];
|
|
107
147
|
for (const [label, percent] of [["5h", quota.fiveHourPercent], ["wk", quota.weeklyPercent], ["mo", quota.monthlyPercent]] as const) {
|
|
108
148
|
if (percent !== undefined) parts.push(`${label} ${percent}%`);
|
|
109
149
|
}
|
|
110
150
|
for (const window of quota.customWindows ?? []) {
|
|
111
151
|
// Labels are upstream text: keep terminal controls out of the human table.
|
|
112
|
-
const label = terminalSafeText(window.label);
|
|
113
|
-
|
|
152
|
+
const label = terminalSafeText(window.displayLabel ?? window.label);
|
|
153
|
+
// Only a probe that supplied its own display text adds the reset clock; every other
|
|
154
|
+
// provider keeps the dev-era text byte for byte.
|
|
155
|
+
const resetAt = window.displayLabel === undefined || window.resetAt === undefined ? undefined : new Date(window.resetAt);
|
|
156
|
+
const reset = resetAt && Number.isFinite(resetAt.getTime()) ? `; resets ${resetAt.toISOString()}` : "";
|
|
157
|
+
parts.push(`${label} ${window.percent}%${window.rejected ? " (rejected)" : ""}${reset}`);
|
|
158
|
+
}
|
|
159
|
+
for (const window of quota.unknownBudgetWindows ?? []) {
|
|
160
|
+
const resetAt = window.resetAt === undefined ? undefined : new Date(window.resetAt);
|
|
161
|
+
const reset = resetAt && Number.isFinite(resetAt.getTime()) ? `; resets ${resetAt.toISOString()}` : "";
|
|
162
|
+
parts.push(`${terminalSafeText(window.label)} unknown${reset}`);
|
|
114
163
|
}
|
|
115
164
|
if (quota.creditsUsd) {
|
|
116
165
|
const c = quota.creditsUsd;
|
|
117
166
|
parts.push(`USD ${c.used}/${c.unlimited ? "unlimited" : c.limit} used; ${c.remaining} remaining (${c.percent}%)`);
|
|
118
167
|
}
|
|
119
168
|
if (quota.kiroCreditsUsed !== undefined || quota.kiroCreditsLimit !== undefined) parts.push(`credits ${quota.kiroCreditsUsed ?? "?"}/${quota.kiroCreditsLimit ?? "?"}`);
|
|
120
|
-
return `${mode}: ${parts.join("; ") || "not measured"}`;
|
|
169
|
+
return `${mode}: ${parts.join("; ") || "not measured"}${read}`;
|
|
121
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";
|
|
@@ -57,7 +57,7 @@ const ACCOUNT_USAGE = `Usage:
|
|
|
57
57
|
ocx account preserve-signed-in openai [on|off|status] [--apply-to-bound] [--json]
|
|
58
58
|
ocx account priority <provider> <account-id|alias|main> [<-100..100|first|earlier|normal|later|last|reset>] [--json]
|
|
59
59
|
ocx account pause <provider> <account-id|alias|main> [--json]
|
|
60
|
-
ocx account resume <provider> <account-id|alias|main> [--json]
|
|
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
63
|
ocx account strategy <provider> [<quota|round-robin|fill-first|least-loaded|reset-first>] [--json]
|
|
@@ -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
|
+
}
|
|
@@ -4,12 +4,14 @@ import type { Capability } from "./capability-types";
|
|
|
4
4
|
export const ACCESS_REMOTE_CAPABILITIES: readonly Capability[] = [
|
|
5
5
|
{
|
|
6
6
|
command: ["disconnect"], summary: "Disconnect a client or preserve orphaned token files for recovery.",
|
|
7
|
-
usage: "ocx disconnect [--keep-catalog] [--json] | ocx disconnect --orphaned-token --yes [--json]",
|
|
7
|
+
usage: "ocx disconnect [--keep-catalog] [--recover-config --yes] [--json] [--expect-link <linkId>] | ocx disconnect --orphaned-token --yes [--json]",
|
|
8
8
|
routes: [],
|
|
9
9
|
flags: [
|
|
10
10
|
{ name: "--keep-catalog", value: "boolean", summary: "Keep the connected client's catalog during ordinary disconnect." },
|
|
11
|
+
{ name: "--recover-config", value: "boolean", summary: "With --yes, snapshot current Codex artifacts and recover only evidenced owned keys; unknown ownership still refuses." },
|
|
12
|
+
{ name: "--expect-link", value: "string", summary: "Disconnect only when this machine is the connected Child of that link, or finish its unfinished disconnect once the connection is cleared; otherwise exit 5 with child_link_mismatch and change nothing." },
|
|
11
13
|
{ name: "--orphaned-token", value: "boolean", summary: "Preserve unowned service-token files in a private backup when disconnected." },
|
|
12
|
-
{ name: "--yes", value: "boolean", summary: "Explicitly confirm
|
|
14
|
+
{ name: "--yes", value: "boolean", summary: "Explicitly confirm --recover-config or --orphaned-token recovery." },
|
|
13
15
|
{ name: "--json", value: "boolean", summary: "Emit the local result and backup location as JSON." },
|
|
14
16
|
],
|
|
15
17
|
mutates: true, json: "payload",
|
|
@@ -165,4 +167,137 @@ export const ACCESS_REMOTE_CAPABILITIES: readonly Capability[] = [
|
|
|
165
167
|
json: "envelope",
|
|
166
168
|
details: ["Fixed data-plane WebSocket /v1/live with the existing audio key carrier and session.update, then session.close. It contacts upstream and may incur provider usage; no microphone, audio upload, tool execution or voice-roundtrip claim.","Version1 report distinguishes readiness from confirmed normal close. Socket-open alone is not ready.15s readiness,2s close deadline; stuck/abnormal closure remains unverified/nonzero, with local socket termination.","No raw frames/session IDs/encoded credentials are printed. NativeWebSocket redirect refusal is verified separately from HTTP upload behavior."],
|
|
167
169
|
},
|
|
170
|
+
{
|
|
171
|
+
command: ["link","check"],
|
|
172
|
+
usage: "ocx link check (--link-id <id> | --all) [--no-wait] [--json]",
|
|
173
|
+
summary: "Read each Home-initiated Child's installed version, install kind and update route.",
|
|
174
|
+
routes: [{"method":"POST","path":"/api/link/children/operations"},{"method":"GET","path":"/api/link/children/jobs/{jobId}"}],
|
|
175
|
+
flags: [{"name":"--link-id","value":"string","summary":"Link id to check; repeatable, up to 64."},{"name":"--all","value":"boolean","summary":"Check every link in the Home's store."},{"name":"--no-wait","value":"boolean","summary":"Print the queued job and return without polling it."},{"name":"--json","value":"boolean","summary":"Emit the ocx.link.child-job/1 document as JSON (always JSON)."}],
|
|
176
|
+
mutates: true,
|
|
177
|
+
json: "payload",
|
|
178
|
+
details: ["Requires loopback admin authority on the Home. Starts one observe job; the CLI polls it every 2 s and prints the final ocx.link.child-job/1 document. Exit 0 when every item succeeded, 6 when an item is busy, offline, refused, owner-action or unsupported, 1 on a failure, 4 when the link is unknown or the Home predates Child operations, 5 on a conflict: the link already has an operation running, the Home has no links, or the command ran on a Child.","Changes no install on the Child: it runs the gated update --plan, which only computes. An npm Child without a census pair runs it through its ocx shim, so the launcher's ordinary bootstrap (sync-guard bookkeeping, Bun resolution) runs first, as for any pinned sync; the gated script disables the Desktop handoff. On an npm or pnpm Child served through its census pair it also runs node --version (bounded to 10 s, read-only) to report whether the package launcher can apply an update. Writes the Home's Child observation cache.","One SSH call per Child, up to 60 s, three at a time; a POSIX Child older than 2.97.0 costs one more read-only call for its version. Home-initiated links only: client-initiated and ocx-child links are reported without SSH. One operation per link per running Home."],
|
|
179
|
+
},
|
|
180
|
+
{
|
|
181
|
+
command: ["link", "update"], summary: "Update a Home-initiated Child's OpenCodex to this Home's version.",
|
|
182
|
+
usage: "ocx link update (--link-id <id> | --all) --yes [--no-wait] [--json]",
|
|
183
|
+
routes: [{ method: "POST", path: "/api/link/children/operations" }, { method: "GET", path: "/api/link/children/jobs/{jobId}" }],
|
|
184
|
+
flags: [{ name: "--link-id", value: "string", summary: "Home-initiated link to update; repeatable, up to 64." }, { name: "--all", value: "boolean", summary: "Every link in the Home's store, one Child at a time; Child-initiated links report unsupported." },
|
|
185
|
+
{ name: "--yes", value: "boolean", required: true, summary: "Confirms that each updated Child's OpenCodex restarts and its relayed turns end." },
|
|
186
|
+
{ name: "--no-wait", value: "boolean", summary: "Print the queued job and return." }, { name: "--json", value: "boolean", summary: "Emit the ocx.link.child-job/1 document (always JSON)." }],
|
|
187
|
+
mutates: true, json: "payload",
|
|
188
|
+
details: ["Runs a pinned sync --expect-link first to confirm the Child still belongs to this link, then the Child's own ocx update --plan through the served entry, then --yes with --expect-plan and a --not-after 120 s after the plan on the Child's own clock, through the link's pinned SSH trust. npm and pnpm installs apply through their Node launcher; Bun installs plan and apply on their served Bun entry. The target is always this Home's version; the Child refuses a downgrade.", "Children below 2.97.0 receive no update command: from 2.93.0 they still get the identity sync, then report owner-action legacy-ocx; ocx-child and GOAT-managed Children report unsupported or owner-action; Windows Children are refused orchestrated apply (unsupported windows-apply). An update restarts the Child's OpenCodex and ends any turn currently relayed for it, so --yes is required. A pinned sync follows a successful, failed or rolled-back apply; an apply whose result is unknown is recorded and neither retried nor resynced, so re-check it with ocx link check.", "Exit 0 all succeeded or up-to-date (with --no-wait: the job was accepted and may still be running), 6 partial (including a kept update whose follow-up sync failed), 1 failed, uncertain or an unknown state, 5 another operation holds the link, the only link named was started from the Child, the Home has no links or the command ran on a Child, 4 the link is unknown or the Home lacks Child operations. On a Home not bound to loopback it exits 1: these operations are not available there, and the dashboard has no controls for them."],
|
|
189
|
+
},
|
|
190
|
+
{
|
|
191
|
+
command: ["link", "sync"], summary: "Run the pinned catalog and settings sync on Home-initiated Children.",
|
|
192
|
+
usage: "ocx link sync (--link-id <id> | --all) [--no-wait] [--json] | ocx link sync --link-id <id> (--restart-app-server-only | --restart-codex --yes) [--ignore-activity] [--no-wait] [--json]",
|
|
193
|
+
routes: [{ method: "POST", path: "/api/link/children/operations" }, { method: "GET", path: "/api/link/children/jobs/{jobId}" }],
|
|
194
|
+
flags: [{ name: "--link-id", value: "string", summary: "Home-initiated link to sync; repeatable, up to 64, exactly one with a restart." }, { name: "--all", value: "boolean", summary: "Every link in the Home's store, three at a time; refused with a restart." },
|
|
195
|
+
{ name: "--restart-app-server-only", value: "boolean", summary: "Also restart the Child's Codex app-servers after the sync writes." }, { name: "--restart-codex", value: "boolean", summary: "Also quit and relaunch the Child's Codex desktop app; ends live turns." },
|
|
196
|
+
{ name: "--yes", value: "boolean", summary: "Confirms --restart-codex." }, { name: "--ignore-activity", value: "boolean", summary: "Restart even while the Child is busy or held; ends its running work (operator override, never automatic)." }, { name: "--no-wait", value: "boolean", summary: "Print the queued job and return." }, { name: "--json", value: "boolean", summary: "Emit the ocx.link.child-job/1 document (always JSON)." }],
|
|
197
|
+
mutates: true, json: "payload",
|
|
198
|
+
details: ["The same sync --expect-link the ocx sync fan-out runs, gated at 2.93.0. Restart flags are refused on Windows and ignored by ocx-child; the item reports restart unsupported.", "A restart needs one --link-id (--all is refused) and --restart-codex needs --yes. The sync runs first; the restart then goes out as a second pinned sync and is withheld (restart skipped, reason restart-skipped:link-active) while a relayed model request for that Child is in flight. A restarting call whose result is unknown ends uncertain (restart-result-unknown).", "--ignore-activity restarts past that check and past held link WebSocket activity (ocx link status, child.holds); the job records ignoreActivity: true and the Home logs the link id and its in-flight count. Platform and Child-kind refusals still apply, and no automatic path sets it.", "Exit codes as for ocx link update; a withheld or unconfirmed restart exits 6 or 1."],
|
|
199
|
+
},
|
|
200
|
+
{
|
|
201
|
+
command: ["link", "restart-codex"], summary: "Restart Codex on one Home-initiated Child so it reloads the catalog.",
|
|
202
|
+
usage: "ocx link restart-codex --link-id <id> [--scope app-server|codex] --yes [--ignore-activity] [--no-wait] [--json]",
|
|
203
|
+
routes: [{ method: "POST", path: "/api/link/children/operations" }, { method: "GET", path: "/api/link/children/jobs/{jobId}" }],
|
|
204
|
+
flags: [{ name: "--link-id", value: "string", required: true, summary: "Home-initiated link." }, { name: "--scope", value: "string", summary: "app-server (default) or codex (also relaunches the desktop app)." },
|
|
205
|
+
{ name: "--yes", value: "boolean", required: true, summary: "Confirms that running Codex turns on the Child end." }, { name: "--ignore-activity", value: "boolean", summary: "Restart even while the Child is busy or held; ends its running work (operator override, never automatic)." },
|
|
206
|
+
{ name: "--no-wait", value: "boolean", summary: "Print the queued job and return." }, { name: "--json", value: "boolean", summary: "Emit the ocx.link.child-job/1 document (always JSON)." }],
|
|
207
|
+
mutates: true, json: "payload",
|
|
208
|
+
details: ["A pinned sync, then a second pinned sync with the restart flag; works on full Children from 2.93.0. app-server scope leaves the Codex desktop app's own app-server running. While a relayed model request for that Child is in flight nothing is sent and the item is busy (restart-skipped:link-active), unless --ignore-activity overrides that check.", "Refused on Windows Children (unsupported windows-restart) and reported unsupported for ocx-child. The codex scope needs a logged-in GUI session on the Child; its outcome is requested, not confirmed. Exit codes as for ocx link update."],
|
|
209
|
+
},
|
|
210
|
+
{
|
|
211
|
+
command: ["link", "capture", "start"], summary: "Open a short window in which this machine's link tunnels log sanitized SSH diagnostics.",
|
|
212
|
+
usage: "ocx link capture start [--minutes <1-60>] [--json]",
|
|
213
|
+
routes: [],
|
|
214
|
+
flags: [{ name: "--minutes", value: "number", summary: "Window length, 15 by default and 60 at most; starting again while open moves the expiry." },
|
|
215
|
+
{ name: "--json", value: "boolean", summary: "Emit the capture status as JSON." }],
|
|
216
|
+
mutates: true, json: "envelope",
|
|
217
|
+
details: ["A local file operation under <OPENCODEX_HOME>/link/ssh-capture/ on a Home or a Child; it needs no running proxy and no admin token, and no sync, management route or remote input can start it. While the window is open, the next ssh attempt of each Home (-R) or Child (-L) tunnel runs with LogLevel=DEBUG1; an already connected tunnel keeps its level until it reconnects.", "Every stderr line passes an allowlist of OpenSSH line shapes before it is stored: host names, addresses, users, ports, paths, keys, fingerprints, commands and server messages become fixed placeholders and an unknown line is stored only as the category unrecognized. One file per window, at most 1 MiB, deleted 72 h after its last write; at most four files are kept, the oldest deleted first. Admission is unchanged and lines ssh prints only above LogLevel=ERROR are kept out of the failure classification; an unrecognized line such as a server banner still counts and can change the reported cause."],
|
|
218
|
+
},
|
|
219
|
+
{
|
|
220
|
+
command: ["link", "capture", "stop"], summary: "Close the SSH capture window; capture files stay until their retention passes.",
|
|
221
|
+
usage: "ocx link capture stop [--json]",
|
|
222
|
+
routes: [],
|
|
223
|
+
flags: [{ name: "--json", value: "boolean", summary: "Emit the capture status as JSON." }],
|
|
224
|
+
mutates: true, json: "envelope",
|
|
225
|
+
details: ["Removes only the control file, so nothing more is stored and the next tunnel attempt runs ssh with LogLevel=ERROR again. Capture files are kept for sharing and deleted 72 h after their last write; status and later starts apply that retention."],
|
|
226
|
+
},
|
|
227
|
+
{
|
|
228
|
+
command: ["link", "capture", "status"], summary: "Show whether SSH capture is on, its expiry and the retained capture files.",
|
|
229
|
+
usage: "ocx link capture status [--json]",
|
|
230
|
+
routes: [],
|
|
231
|
+
flags: [{ name: "--json", value: "boolean", summary: "Emit the capture status as JSON." }],
|
|
232
|
+
mutates: true, json: "envelope",
|
|
233
|
+
details: ["Reads the local capture directory. It also applies retention: capture files 72 h past their last write and an expired control file are deleted, and the count is reported as removed."],
|
|
234
|
+
},
|
|
235
|
+
{
|
|
236
|
+
command: ["link", "policy"], summary: "Read or change how this Home keeps its Children current.",
|
|
237
|
+
usage: "ocx link policy [--updates off|notify|auto-when-idle] [--catalog-fanout auto|manual] [--child-codex-restart never|app-server-when-idle] [--idle-after-minutes <1-60>] [--json]",
|
|
238
|
+
routes: [{ method: "GET", path: "/api/link/children/policy" }, { method: "PUT", path: "/api/link/children/policy" }],
|
|
239
|
+
flags: [{ name: "--updates", value: "string", summary: "off, notify, or auto-when-idle (default)." }, { name: "--catalog-fanout", value: "string", summary: "auto (default) or manual." },
|
|
240
|
+
{ name: "--child-codex-restart", value: "string", summary: "never (default) or app-server-when-idle." }, { name: "--idle-after-minutes", value: "number", summary: "Minutes without a relayed model request before a Child counts as idle; default 10." },
|
|
241
|
+
{ name: "--json", value: "boolean", summary: "Emit {policy, warning} as JSON." }],
|
|
242
|
+
mutates: true, json: "payload",
|
|
243
|
+
details: ["Without flags it reads the policy; with flags it changes only those knobs. Stored in <configDir>/link/child-policy.json on the Home, never in config.json. An invalid file turns automatic catalog fan-out and updates off; saving merges onto that, so pass --catalog-fanout auto and an --updates mode to turn them back on.", "--updates stores the update mode only; this release starts no automatic update (notify and auto-when-idle take effect when the automatic update sweep ships). Catalog fan-out syncs Home-initiated Children 60 s after a Home catalog change; it restarts Codex on a Child only with app-server-when-idle, and only while that Child is idle. A Home without links runs none of it."],
|
|
244
|
+
},
|
|
245
|
+
{
|
|
246
|
+
command: ["link", "routes"], summary: "List the SSH routes a Home-initiated link may use, in the order the Home tries them.",
|
|
247
|
+
usage: "ocx link routes --link-id <id> [--json]",
|
|
248
|
+
routes: [{ method: "GET", path: "/api/link/{id}/routes" }],
|
|
249
|
+
flags: [{ name: "--link-id", value: "string", required: true, summary: "Home-initiated link id." }, { name: "--json", value: "boolean", summary: "Emit {linkId, pin, routes} as JSON." }],
|
|
250
|
+
mutates: false, json: "payload",
|
|
251
|
+
details: ["Requires loopback admin authority on the Home, like ocx link reconnect; the local control socket does not serve it. The pin is the link's own alias: its host key is the one every route must present, and it is always in the list. A link with one route lists its alias only. Read ocx link status for the route in use and since when."],
|
|
252
|
+
},
|
|
253
|
+
{
|
|
254
|
+
command: ["link", "routes", "add"], summary: "Add an SSH route to a Home-initiated link after proving the link's pinned host key over it.",
|
|
255
|
+
usage: "ocx link routes add --link-id <id> --route <alias> [--position <n>] [--json]",
|
|
256
|
+
routes: [{ method: "POST", path: "/api/link/{id}/routes" }],
|
|
257
|
+
flags: [{ name: "--link-id", value: "string", required: true, summary: "Home-initiated link id." }, { name: "--route", value: "string", required: true, summary: "SSH host alias or destination of the new route." },
|
|
258
|
+
{ name: "--position", value: "number", summary: "Index in the list; by default just before the alias, so direct routes come first and the alias stays last." }, { name: "--json", value: "boolean", summary: "Emit {linkId, pin, routes} as JSON." }],
|
|
259
|
+
mutates: true, json: "payload",
|
|
260
|
+
details: ["The Home first checks that its link known_hosts file trusts only the link's recorded key for the alias (every entry for it, in any case or hashed by an older release, carries that key), then connects over the new route with strict checking against that one key and stores the route only if the same machine answers. Refusals: route_unproven with a cause (hostkey, auth, forward, transient), pin_mismatch, trust_file_unexpected, link_changed, pin_changed, route_exists, route_limit (8 routes), link_operation_in_progress (removal or a Child job holds the link). Exit 5 on a refusal, 4 for an unknown link, 1 when the routes were stored but the running proxy did not apply them (routes_stored_reload_failed; ocx link routes --link-id <id> reads what was stored).", "Adding a route does not move a running tunnel; the Home tries the list in order from the next connection on (ocx link reconnect starts one now). Requires loopback admin authority on the Home."],
|
|
261
|
+
},
|
|
262
|
+
{
|
|
263
|
+
command: ["link", "routes", "remove"], summary: "Remove an SSH route from a Home-initiated link.",
|
|
264
|
+
usage: "ocx link routes remove --link-id <id> --route <alias> [--json]",
|
|
265
|
+
routes: [{ method: "POST", path: "/api/link/{id}/routes" }],
|
|
266
|
+
flags: [{ name: "--link-id", value: "string", required: true, summary: "Home-initiated link id." }, { name: "--route", value: "string", required: true, summary: "Route to remove." }, { name: "--json", value: "boolean", summary: "Emit {linkId, pin, routes} as JSON." }],
|
|
267
|
+
mutates: true, json: "payload",
|
|
268
|
+
details: ["The alias is the link's pin and cannot be removed (route_is_pin). Removing the route the tunnel uses restarts the tunnel on the remaining list; removing the last extra route returns the link to one route. Exit 4 for an unknown link or route (link_not_found, route_not_found), 5 on a refusal (route_is_pin, link_operation_in_progress), 1 when the routes were stored but the running proxy did not apply them (routes_stored_reload_failed). Requires loopback admin authority on the Home."],
|
|
269
|
+
},
|
|
270
|
+
{
|
|
271
|
+
command: ["link", "routes", "order"], summary: "Reorder a Home-initiated link's SSH routes.",
|
|
272
|
+
usage: "ocx link routes order --link-id <id> --routes <alias,alias,...> [--json]",
|
|
273
|
+
routes: [{ method: "POST", path: "/api/link/{id}/routes" }],
|
|
274
|
+
flags: [{ name: "--link-id", value: "string", required: true, summary: "Home-initiated link id." }, { name: "--routes", value: "string", required: true, summary: "The current routes, comma separated, in the new order." }, { name: "--json", value: "boolean", summary: "Emit {linkId, pin, routes} as JSON." }],
|
|
275
|
+
mutates: true, json: "payload",
|
|
276
|
+
details: ["The list must name exactly the current routes (route_order_mismatch otherwise), so no route enters unproven. A reorder does not move a running tunnel. Requires loopback admin authority on the Home."],
|
|
277
|
+
},
|
|
278
|
+
{
|
|
279
|
+
command: ["link", "operations"], summary: "List or read the enrollments and revokes journalled under an operation id.",
|
|
280
|
+
usage: "ocx link operations [--operation-id <id>] [--json]",
|
|
281
|
+
routes: [{ method: "GET", path: "/api/link/operations" }, { method: "GET", path: "/api/link/operations/{id}" }],
|
|
282
|
+
flags: [{ name: "--operation-id", value: "string", summary: "Read one operation." }, { name: "--json", value: "boolean", summary: "Emit {operations} or the one entry as JSON." }],
|
|
283
|
+
mutates: false, json: "payload",
|
|
284
|
+
details: ["Each entry names its reserved link and key ids, the intent and completion of every effect and its outcome: open, committed, failed_clean, residual (the Child may still hold an enrollment or a plant) or unknown. Committed and failed_clean entries stay 30 days; residual and unknown entries stay until resolved, then 30 days. Past 256 settled entries the oldest go early, never before 2 hours plus the alias-lock wait: a repeat with the same operation id and parameters (another set answers operation_mismatch) that reaches the journal within 2 hours of the answer gets the recorded outcome, except that a revoke whose own removal was interrupted resumes it first and answers that attempt (retry a transient refusal such as link_operation_in_progress), and later the id may be treated as a new operation, which enrolls a machine again if its link was removed meanwhile; at 256 open or unresolved residual or unknown entries a new journalled operation is refused (operation_journal_full) until some are resolved, and so is one after 1024 operations settled within 2 hours and three minutes, a limit of about 500 journalled operations per hour sustained. Requires loopback admin authority on the Home."],
|
|
285
|
+
},
|
|
286
|
+
{
|
|
287
|
+
command: ["link", "operations", "resolve"], summary: "Mark a residual or unknown link operation resolved.",
|
|
288
|
+
usage: "ocx link operations resolve --operation-id <id> --yes [--json]",
|
|
289
|
+
routes: [{ method: "POST", path: "/api/link/operations/{id}/resolve" }],
|
|
290
|
+
flags: [{ name: "--operation-id", value: "string", required: true, summary: "The residual or unknown operation." }, { name: "--yes", value: "boolean", required: true, summary: "Confirms that the Child is clean or the loss is accepted." }, { name: "--json", value: "boolean", summary: "Emit the resolved entry as JSON." }],
|
|
291
|
+
mutates: true, json: "payload",
|
|
292
|
+
details: ["Changes nothing on the Child or in links.json: it records the resolution, and the entry's 30 days of retention start then. operation_not_resolvable (exit 5) for any other state, operation_not_found (exit 4). Requires loopback admin authority on the Home.", "A journalled revoke past its remote_cleanup intent (the Child's cleanup may have started) that then ended unknown, or that stayed open with no revoke running it (the Home stopped or the revoke failed before writing its outcome), keeps that link's tunnel down across restarts (ocx link status: reason revoke_unsettled; ocx link reconnect: link_suspended). Resolving the revoke reloads the tunnels, so the link reconnects. An open revoke cannot be resolved: repeat it with the same --operation-id and the flags of its first attempt (the journal keeps only a digest of them, so a different --purge answers operation_mismatch), then resolve it if it ends unknown."],
|
|
293
|
+
},
|
|
294
|
+
{
|
|
295
|
+
command: ["link", "activity", "clear"], summary: "Clear one link's held activity so automatic and activity-gated Child restarts may run again.",
|
|
296
|
+
usage: "ocx link activity clear --link-id <id> [--json]",
|
|
297
|
+
routes: [{ method: "POST", path: "/api/link/children/activity/clear" }],
|
|
298
|
+
flags: [{ name: "--link-id", value: "string", required: true, summary: "The link whose holds to clear." },
|
|
299
|
+
{ name: "--json", value: "boolean", summary: "Emit {linkId, cleared} as JSON." }],
|
|
300
|
+
mutates: true, json: "payload",
|
|
301
|
+
details: ["A link Responses WebSocket that closes while Codex was busy leaves a hold, and so does a Home that stopped without a clean shutdown; a hold keeps the Child in flight so automatic and activity-gated restarts wait. ocx link status lists each held link's holds and their reasons under child.holds. Holds that only the operator can release (an unknown running turn, untracked results, no thread id, or an unknown state after a crash) end here.", "Clears every hold of that one link and nothing else; nothing clears holds automatically. The holds file is saved before anything is forgotten, so a failed save clears nothing (503). It does not touch live sockets or relayed requests."],
|
|
302
|
+
},
|
|
168
303
|
];
|
|
@@ -96,7 +96,7 @@ export const ACCOUNT_CAPABILITIES: readonly Capability[] = [
|
|
|
96
96
|
summary: "Reauthenticate a provider account through the existing login flow.",
|
|
97
97
|
usage: "ocx account reauth <provider> [--id <account-id>] [--device] [--code -] [--no-wait] [--open-browser <on|off>] [--json]",
|
|
98
98
|
routes: [{"method":"POST","path":"/api/codex-auth/login"},{"method":"GET","path":"/api/codex-auth/login-status"},{"method":"POST","path":"/api/codex-auth/login/code"},{"method":"POST","path":"/api/oauth/login"},{"method":"GET","path":"/api/oauth/status"},{"method":"POST","path":"/api/oauth/login/code"}],
|
|
99
|
-
flags: [{"name":"--id","value":"string","summary":"Account identity to reauthenticate."},{"name":"--device","value":"boolean","summary":"Codex device login;
|
|
99
|
+
flags: [{"name":"--id","value":"string","summary":"Account identity to reauthenticate."},{"name":"--device","value":"boolean","summary":"Codex device login or xAI device authorization; a no-op for already-device-native kimi, nous and github-copilot."},{"name":"--code","value":"string","summary":"Use - to read the short-lived authorization code from stdin."},{"name":"--no-wait","value":"boolean","summary":"Return after starting the flow."},{"name":"--json","value":"boolean","summary":"Emit login instructions or completion state; xAI --device requires --no-wait."},{"name":"--open-browser","value":"string","summary":"on or off for browser-capable login; rejected for explicit/native device flows."}],
|
|
100
100
|
mutates: true,
|
|
101
101
|
json: "payload",
|
|
102
102
|
details: ["Alias of account login with --reauth. openai, codex and chatgpt address the pool; native main uses account main reauth. Human completes authorization; keep returned login material out of transcripts. Kiro --method cannot be combined with reauth.","Explicit add-account is incompatible with reauth. Browser preference is accepted only by browser-capable flows; device verification remains manual."],
|
|
@@ -112,8 +112,8 @@ export const ACCOUNT_CAPABILITIES: readonly Capability[] = [
|
|
|
112
112
|
command: ["account", "cancel"], summary: "Cancel a pending account login flow.",
|
|
113
113
|
usage: "ocx account cancel <provider> [--flow <flow-id>] [--json]",
|
|
114
114
|
routes: [{ method: "POST", path: "/api/codex-auth/login/cancel" }, { method: "POST", path: "/api/oauth/login/cancel" }],
|
|
115
|
-
flags: [{ name: "--flow", value: "string", summary: "Required for Codex; selects a native Kiro flow when supplied." }, { name: "--json", value: "boolean", summary: "Emit cancellation receipt." }], mutates: true, json: "payload",
|
|
116
|
-
details: ["Codex cancellation sends flowId. Other providers send provider; Kiro additionally
|
|
115
|
+
flags: [{ name: "--flow", value: "string", summary: "Required for Codex; selects a native Kiro or xAI flow when supplied." }, { name: "--json", value: "boolean", summary: "Emit cancellation receipt." }], mutates: true, json: "payload",
|
|
116
|
+
details: ["Codex cancellation sends flowId. Other providers send provider; Kiro and xAI additionally forward a supplied flowId."],
|
|
117
117
|
},
|
|
118
118
|
{
|
|
119
119
|
command: ["account", "reset-credits"], summary: "Read Codex reset-credit state, or explicitly consume one with operator authorization.",
|