@bitkyc08/opencodex 2.100.5 → 2.100.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
2
|
import { captureInitialSelectionBaseline, finalizeInitialModelSelection } from "../../providers/initial-model-selection-runtime";
|
|
3
|
-
import { captureModelDiscoveryBaseline, finalizeModelDiscovery } from "../../providers/new-model-policy-runtime";
|
|
3
|
+
import { captureModelDiscoveryBaseline, finalizeModelDiscovery, projectSupersededModelDiscovery } from "../../providers/new-model-policy-runtime";
|
|
4
4
|
import { CatalogGatherBusyError } from "../../codex/catalog/routed-gather";
|
|
5
|
+
import { observeModelCacheRevision, readableSupersededModelDiscovery } from "../../codex/model-cache";
|
|
5
6
|
import { initialModelSelectionPending } from "../../providers/initial-model-selection";
|
|
6
7
|
import { isPassiveRead } from "../../lib/passive-read";
|
|
7
8
|
import { readFileSync } from "node:fs";
|
|
@@ -40,7 +41,8 @@ import { DEFAULT_PROVIDER_CONTEXT_CAP, globalContextCapValue, providerContextCap
|
|
|
40
41
|
import { resolveCodexHomeDir } from "../../codex/home";
|
|
41
42
|
import { isKnownRequestFailureCause, isKnownRequestFailureStage, readUsageEntries } from "../../usage/log";
|
|
42
43
|
import { getUsageDebugLogEntries } from "../../usage/debug";
|
|
43
|
-
import { cacheObservationFromUsage
|
|
44
|
+
import { cacheObservationFromUsage } from "../../usage/cache-provenance";
|
|
45
|
+
import { parseRange, parseUsageSurface, summarizeUsage } from "../../usage/summary";
|
|
44
46
|
import { stripCodexRuntimeProviderFields } from "../../codex/auth-context";
|
|
45
47
|
import { getProviderRegistryEntry, providerMatchesRegistryTransport } from "../../providers/registry";
|
|
46
48
|
import { getDebugLogEntries } from "../../lib/debug-log-buffer";
|
|
@@ -53,11 +55,12 @@ import {
|
|
|
53
55
|
setDebugSettings,
|
|
54
56
|
type DebugFlag,
|
|
55
57
|
} from "../../lib/debug-settings";
|
|
56
|
-
import type { OcxClaudeCodeConfig, OcxClaudeDesktopProfile, OcxConfig, OcxCustomModel, OcxProviderConfig } from "../../types";
|
|
58
|
+
import type { OcxClaudeCodeConfig, OcxClaudeDesktopProfile, OcxConfig, OcxCustomModel, OcxProviderConfig, OcxUsage } from "../../types";
|
|
57
59
|
import type { DesktopProfileModel } from "../../claude/desktop-profile";
|
|
58
60
|
import { drainAndShutdown } from "../lifecycle";
|
|
59
61
|
import { filterRequestLogs, getRequestLogEntries, type RequestLogEntry } from "../request-log";
|
|
60
|
-
import { estimateComboCost, estimateRequestCost, serviceTierContext, normalizeCostTokens, tokensPerSecond } from "../../usage/cost";
|
|
62
|
+
import { creditChargeUnrepresentable, estimateComboCost, estimateRequestCost, serviceTierContext, normalizeCostTokens, tokensPerSecond } from "../../usage/cost";
|
|
63
|
+
import { costTokensWithinBound, isRepresentableCreditCount } from "../../usage/credit-billing";
|
|
61
64
|
import type { PersistedUsageAttempt } from "../../usage/log";
|
|
62
65
|
import { usageModelPriceOptions } from "../../usage/model-identity";
|
|
63
66
|
import { isAllowedRequestOrigin, jsonResponse, providerManagementConfigError, publicProviderBaseUrl, safeConfigDTO } from "../auth-cors";
|
|
@@ -84,7 +87,12 @@ export type MetricUnavailableReason =
|
|
|
84
87
|
| "usage_missing" | "usage_unsupported" | "output_missing" | "invalid_duration"
|
|
85
88
|
| "price_unmatched" | "invalid_cache_breakdown"
|
|
86
89
|
| "invalid_usage" | "combo_attempt_unavailable"
|
|
87
|
-
| "ttft_missing" | "decode_window_too_short"
|
|
90
|
+
| "ttft_missing" | "decode_window_too_short"
|
|
91
|
+
// The row is credit-priced, but `providerCredits x creditPriceUsd` cannot be represented (an
|
|
92
|
+
// out-of-bound price or credit count, or an overflowing product). It is deliberately not
|
|
93
|
+
// `price_unmatched`-with-a-token-estimate: falling back would report a different amount than
|
|
94
|
+
// the credit basis the operator configured.
|
|
95
|
+
| "credit_cost_unrepresentable";
|
|
88
96
|
|
|
89
97
|
export type TokPerSecondResult =
|
|
90
98
|
| { kind: "value"; value: number; estimated: boolean }
|
|
@@ -183,43 +191,96 @@ export function decodeTokPerSecondResult(
|
|
|
183
191
|
return { kind: "value", value, estimated: true, timingBasis: "legacy-post-visible-output" };
|
|
184
192
|
}
|
|
185
193
|
|
|
194
|
+
/**
|
|
195
|
+
* True when the row would otherwise be priced but its credit charge cannot be represented. A row
|
|
196
|
+
* with no resolved token price is unpriced for the ordinary reason, so the price lookup has to
|
|
197
|
+
* succeed before the credit failure is the explanation.
|
|
198
|
+
*/
|
|
199
|
+
function isCreditCostUnrepresentable(entry: MetricSource): boolean {
|
|
200
|
+
if (entry.attempts?.length) {
|
|
201
|
+
return entry.attempts.some(attempt => creditChargeUnrepresentable({
|
|
202
|
+
...attempt, ...usageModelPriceOptions(entry, attempt),
|
|
203
|
+
}));
|
|
204
|
+
}
|
|
205
|
+
return creditChargeUnrepresentable({ ...entry, ...usageModelPriceOptions(entry, entry) });
|
|
206
|
+
}
|
|
207
|
+
|
|
186
208
|
export function unavailableCostReason(entry: MetricSource): MetricUnavailableReason {
|
|
187
209
|
// Normalizer-first classification: the landed normalizer recovers legacy
|
|
188
210
|
// cachedInputTokens=read+write rows via retry, so a raw read+write>input
|
|
189
211
|
// pre-check would misclassify recoverable rows (020 audit blocker #2).
|
|
190
212
|
if (!entry.usage && !entry.attempts?.length) return "usage_missing";
|
|
191
213
|
if (entry.usageStatus === "unsupported") return "usage_unsupported";
|
|
192
|
-
|
|
214
|
+
// A Combo is unpriced when ANY attempt is, and the generic reason covers every other cause.
|
|
215
|
+
// An attempt whose credit charge cannot be represented is a different fact: the operator set a
|
|
216
|
+
// credit price and the row cannot honor it, so the parent names that instead of implying an
|
|
217
|
+
// ordinary missing price somewhere in the attempt list.
|
|
218
|
+
if (entry.attempts?.length) {
|
|
219
|
+
return isCreditCostUnrepresentable(entry) ? "credit_cost_unrepresentable" : "combo_attempt_unavailable";
|
|
220
|
+
}
|
|
193
221
|
if (!entry.usage) return "usage_missing";
|
|
194
|
-
if (
|
|
222
|
+
if (isCreditCostUnrepresentable(entry)) return "credit_cost_unrepresentable";
|
|
223
|
+
const tokens = normalizeCostTokens(entry.usage);
|
|
224
|
+
if (!tokens) {
|
|
195
225
|
const effectiveRead = entry.usage.cacheReadInputTokens ?? entry.usage.cachedInputTokens ?? 0;
|
|
196
226
|
const effectiveWrite = entry.usage.cacheCreationInputTokens ?? 0;
|
|
197
227
|
const finite = [entry.usage.inputTokens, entry.usage.outputTokens, effectiveRead, effectiveWrite]
|
|
198
228
|
.every(v => Number.isFinite(v) && v >= 0);
|
|
199
229
|
return finite ? "invalid_cache_breakdown" : "invalid_usage";
|
|
200
230
|
}
|
|
231
|
+
// A finite but absurd token count normalizes fine and then overflows the estimate. Calling that
|
|
232
|
+
// "price unmatched" would send an operator to the price table for a number no price can fix.
|
|
233
|
+
if (!costTokensWithinBound(tokens)) return "invalid_usage";
|
|
201
234
|
return "price_unmatched";
|
|
202
235
|
}
|
|
203
236
|
|
|
204
237
|
/** Display-time cost estimate for one log entry (or its attempt list), including the reasons that qualify the estimate. */
|
|
205
238
|
export function costResult(entry: MetricSource): CostResult {
|
|
206
239
|
const tier = serviceTierContext(entry);
|
|
207
|
-
const
|
|
208
|
-
|
|
240
|
+
const attempts = entry.attempts?.map(attempt => ({
|
|
241
|
+
...attempt,
|
|
242
|
+
...usageModelPriceOptions(entry, attempt),
|
|
243
|
+
cacheProvenance: attempt.cacheProvenance ?? entry.cacheProvenance,
|
|
244
|
+
}));
|
|
245
|
+
const estimate = attempts?.length
|
|
246
|
+
? estimateComboCost(attempts, undefined, tier)
|
|
209
247
|
: estimateRequestCost({ provider: entry.provider, model: entry.model, usage: entry.usage, usageStatus: entry.usageStatus, serviceTier: tier, ...usageModelPriceOptions(entry, entry) });
|
|
210
248
|
if (!estimate) return { kind: "unavailable", reason: unavailableCostReason(entry) };
|
|
249
|
+
// Provenance follows the basis that produced the amount. A credit charge is
|
|
250
|
+
// `providerCredits x creditPriceUsd`; the token rates were resolved only to decide whether the
|
|
251
|
+
// row falls back to them, so anything derived from those rates — a cache-detail caveat, a price
|
|
252
|
+
// overlay, a Priority floor — describes a price nobody was charged. A `mixed` combo asks the
|
|
253
|
+
// same question per attempt: only its token-priced legs may contribute token provenance, and
|
|
254
|
+
// the parent's usage is a synthesized sum that priced nothing.
|
|
255
|
+
const creditOnly = estimate.billing?.source === "provider-credits";
|
|
256
|
+
// `estimateComboCost` walks the attempts in order and fails closed on any unpriced leg, so the
|
|
257
|
+
// estimate roster lines up with the stored one and the persisted cache provenance stays reachable.
|
|
258
|
+
const tokenPricedLegs = estimate.billing?.source === "mixed"
|
|
259
|
+
? (estimate.attempts ?? [])
|
|
260
|
+
.map((attempt, index) => ({ attempt, source: attempts?.[index] }))
|
|
261
|
+
.filter(leg => leg.attempt.billing === undefined)
|
|
262
|
+
: undefined;
|
|
263
|
+
// A cost estimate is qualified by cache detail it can TRUST. A detail object that exists only
|
|
264
|
+
// because a strict client requires the field carries no cache reading, so it qualifies the
|
|
265
|
+
// estimate exactly as a missing one does — reading it as a measured zero prices the request
|
|
266
|
+
// as an uncached send that nothing observed.
|
|
267
|
+
const cacheDetailMissing = creditOnly
|
|
268
|
+
? false
|
|
269
|
+
: tokenPricedLegs
|
|
270
|
+
? tokenPricedLegs.some(leg =>
|
|
271
|
+
cacheObservationFromUsage(leg.source?.usage, leg.source?.cacheProvenance).provenance !== "observed")
|
|
272
|
+
: !!entry.usage && cacheObservationFromUsage(entry.usage, entry.cacheProvenance).provenance !== "observed";
|
|
273
|
+
const priceSources = creditOnly
|
|
274
|
+
? []
|
|
275
|
+
: tokenPricedLegs
|
|
276
|
+
? tokenPricedLegs.map(leg => leg.attempt.price.source)
|
|
277
|
+
: [estimate.price?.source, ...(estimate.attempts?.map(attempt => attempt.price.source) ?? [])];
|
|
211
278
|
const estimateReasons = [
|
|
279
|
+
// The row's own usage reading still qualifies a credit charge: the credits came from it.
|
|
212
280
|
entry.usageStatus === "estimated" || entry.usage?.estimated ? "usage_estimated" as const : undefined,
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
// as an uncached send that nothing observed.
|
|
217
|
-
entry.usage && cacheObservationFromUsage(entry.usage, entry.cacheProvenance).provenance !== "observed"
|
|
218
|
-
? "cache_detail_missing" as const : undefined,
|
|
219
|
-
estimate.price?.source === "expected" || estimate.attempts?.some(a => a.price.source === "expected")
|
|
220
|
-
? "expected_price_overlay" as const : undefined,
|
|
221
|
-
estimate.price?.source === "user" || estimate.attempts?.some(a => a.price.source === "user")
|
|
222
|
-
? "provider_cost_overlay" as const : undefined,
|
|
281
|
+
cacheDetailMissing ? "cache_detail_missing" as const : undefined,
|
|
282
|
+
priceSources.includes("expected") ? "expected_price_overlay" as const : undefined,
|
|
283
|
+
priceSources.includes("user") ? "provider_cost_overlay" as const : undefined,
|
|
223
284
|
estimate.priorityLowerBound ? "priority_lower_bound" as const : undefined,
|
|
224
285
|
].filter((reason): reason is CostEstimateReason => reason !== undefined);
|
|
225
286
|
return { kind: "value", estimate, estimateReasons };
|
|
@@ -248,12 +309,21 @@ function resendVerdict(row: { failureStage?: string; failureCause?: string }): {
|
|
|
248
309
|
if (!isKnownRequestFailureStage(row.failureStage) || !isKnownRequestFailureCause(row.failureCause)) return {};
|
|
249
310
|
return { resendPermission: resendPermission(row.failureStage, row.failureCause) };
|
|
250
311
|
}
|
|
312
|
+
|
|
313
|
+
/** Keep invalid credit evidence available to cost estimation and omit it from API usage. */
|
|
314
|
+
export function publicLogUsage(usage: OcxUsage | undefined): { usage?: OcxUsage } {
|
|
315
|
+
if (usage === undefined) return {};
|
|
316
|
+
const { providerCredits, ...rest } = usage;
|
|
317
|
+
return { usage: isRepresentableCreditCount(providerCredits) ? usage : rest };
|
|
318
|
+
}
|
|
319
|
+
|
|
251
320
|
export function requestLogDto(
|
|
252
321
|
entry: RequestLogEntry,
|
|
253
322
|
{ includeDecodeRate = true }: { includeDecodeRate?: boolean } = {},
|
|
254
323
|
): Record<string, unknown> {
|
|
255
324
|
return {
|
|
256
325
|
...entry,
|
|
326
|
+
...publicLogUsage(entry.usage),
|
|
257
327
|
...(entry.attemptNormalizationDropped === true ? { attemptNormalizationDropped: true } : {}),
|
|
258
328
|
...resendVerdict(entry),
|
|
259
329
|
displayMetrics: {
|
|
@@ -267,6 +337,7 @@ export function requestLogDto(
|
|
|
267
337
|
? {
|
|
268
338
|
attempts: entry.attempts.map(attempt => ({
|
|
269
339
|
...attempt,
|
|
340
|
+
...publicLogUsage(attempt.usage),
|
|
270
341
|
...resendVerdict(attempt),
|
|
271
342
|
displayMetrics: {
|
|
272
343
|
tokPerSecond: tokPerSecondResult(attempt),
|
|
@@ -288,31 +359,48 @@ export function requestLogDto(
|
|
|
288
359
|
*/
|
|
289
360
|
export async function fetchAllModels(
|
|
290
361
|
config: OcxConfig,
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
362
|
+
options: {
|
|
363
|
+
/** Filled with each provider's content revision as of the moment its rows were chosen. */
|
|
364
|
+
providerContentRevisions?: Map<string, string>;
|
|
365
|
+
/** The response renders visibility from this detached state. */
|
|
366
|
+
publishProjection?: (projection: OcxConfig) => void;
|
|
367
|
+
allowSuperseded?: boolean;
|
|
368
|
+
} = {},
|
|
295
369
|
): Promise<CatalogModel[]> {
|
|
296
370
|
// A Remote Link read: no upstream, no initial selection, no write (#6959).
|
|
297
371
|
if (isPassiveRead()) return [];
|
|
298
372
|
const { gatherRoutedModels } = await import("../../codex/catalog");
|
|
299
373
|
const baseline = captureInitialSelectionBaseline(config);
|
|
300
374
|
const discoveryBaseline = captureModelDiscoveryBaseline(config);
|
|
301
|
-
const revisions = providerContentRevisions ?? new Map<string, string>();
|
|
375
|
+
const revisions = options.providerContentRevisions ?? new Map<string, string>();
|
|
302
376
|
const outcomes: Array<{ provider: string; state: "authoritative" | "degraded" }> = [];
|
|
303
377
|
const models = await gatherRoutedModels(config, {
|
|
304
378
|
providerModelOutcomes: outcomes,
|
|
305
379
|
providerContentRevisions: revisions,
|
|
306
380
|
});
|
|
307
|
-
|
|
308
|
-
|
|
381
|
+
const authoritative = new Set(outcomes.filter(outcome => outcome.state === "authoritative").map(outcome => outcome.provider));
|
|
382
|
+
const superseded = [...revisions].filter(([provider, revision]) => observeModelCacheRevision(provider) !== revision);
|
|
383
|
+
if (superseded.length > 0) {
|
|
384
|
+
const { allowSuperseded, publishProjection } = options;
|
|
385
|
+
if (!allowSuperseded || !publishProjection) throw new CatalogGatherBusyError();
|
|
386
|
+
for (const [provider, revision] of superseded) {
|
|
387
|
+
const readable = readableSupersededModelDiscovery(provider, revision);
|
|
388
|
+
if (readable === null) throw new CatalogGatherBusyError();
|
|
389
|
+
if (readable === "caller-local") authoritative.add(provider);
|
|
390
|
+
}
|
|
391
|
+
const projection = projectSupersededModelDiscovery(config, discoveryBaseline, models,
|
|
392
|
+
[...authoritative]);
|
|
393
|
+
if (!projection) throw new CatalogGatherBusyError();
|
|
394
|
+
publishProjection(projection);
|
|
395
|
+
return models;
|
|
396
|
+
}
|
|
397
|
+
finalizeInitialModelSelection(config, baseline, uniqueCatalogModelsForPublicList(models), [...authoritative]);
|
|
309
398
|
let publicationConfig = config;
|
|
310
|
-
if (!finalizeModelDiscovery(config, discoveryBaseline, models,
|
|
311
|
-
|
|
312
|
-
projection => { publicationConfig = projection; publishProjection?.(projection); })) {
|
|
399
|
+
if (!finalizeModelDiscovery(config, discoveryBaseline, models, [...authoritative], revisions,
|
|
400
|
+
projection => { publicationConfig = projection; options.publishProjection?.(projection); })) {
|
|
313
401
|
throw new CatalogGatherBusyError();
|
|
314
402
|
}
|
|
315
|
-
if (publicationConfig !== config && !publishProjection) {
|
|
403
|
+
if (publicationConfig !== config && !options.publishProjection) {
|
|
316
404
|
// Other consumers keep their live config, so only return rows visible under the projection.
|
|
317
405
|
const { filterCatalogVisibleModels } = await import("../../codex/catalog");
|
|
318
406
|
return filterCatalogVisibleModels(models, publicationConfig);
|
|
@@ -8,7 +8,7 @@ import { CODEX_RESTART_PATH } from "../../lib/codex-restart-contract";
|
|
|
8
8
|
* convergence, owned-catalog refresh, the Claude roster, system env and the stop teardown. These
|
|
9
9
|
* routes reach shared client state through paths those gates do not cover, so the sibling's own
|
|
10
10
|
* management API refuses them outright: toggling or stripping the live owner's Codex, Grok or Claude
|
|
11
|
-
* integrations, rewriting client files at this port, the Codex prompt layers and `[features]`
|
|
11
|
+
* integrations, rewriting client files at this port (including the Antigravity gateway connectors), the Codex prompt layers and `[features]`
|
|
12
12
|
* written into the shared `config.toml`, killing the user's Codex app-servers, joining a link (which
|
|
13
13
|
* writes the shared catalog and restarts as a client), staging or switching the physical native-main
|
|
14
14
|
* login, baking the machine service, PATH shim or tray from this home, replacing the global package
|
|
@@ -29,6 +29,7 @@ export const SIBLING_REFUSED_MANAGEMENT_PATHS: readonly { readonly path: string;
|
|
|
29
29
|
{ path: "/api/sync", children: false },
|
|
30
30
|
{ path: "/api/client-integrations", children: true },
|
|
31
31
|
{ path: "/api/native-integrations", children: true },
|
|
32
|
+
{ path: "/api/gateway-clients", children: true },
|
|
32
33
|
{ path: "/api/claude-desktop", children: true },
|
|
33
34
|
{ path: "/api/codex/desktop-compatibility", children: true },
|
|
34
35
|
{ path: "/api/claude-code", children: false },
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { currentUpstreamHistorySlim } from "../responses/history-slim";
|
|
2
|
+
import { codexWsIncrementalStats } from "../responses/codex-ws-incremental";
|
|
3
|
+
import { responseSpillCodecInfo } from "../../responses/state/spill-codec";
|
|
1
4
|
/**
|
|
2
5
|
* /api/system/* — service-process runtime/memory introspection (#314 WP3)
|
|
3
6
|
* and the memory-card drain-and-restart action (#563).
|
|
@@ -147,6 +150,9 @@ export async function handleSystemRoutes(ctx: ManagementContext): Promise<Respon
|
|
|
147
150
|
watchdog,
|
|
148
151
|
activeTurnCount: getActiveTurnCount(),
|
|
149
152
|
isDraining: isDraining(),
|
|
153
|
+
upstreamHistorySlim: currentUpstreamHistorySlim(),
|
|
154
|
+
codexWsIncremental: codexWsIncrementalStats(),
|
|
155
|
+
responseSpillCodec: responseSpillCodecInfo(),
|
|
150
156
|
});
|
|
151
157
|
}
|
|
152
158
|
|
|
@@ -77,6 +77,9 @@ import { forgetGuiDevice, rememberGuiDevice, rememberedGuiSessionIsCurrent, resu
|
|
|
77
77
|
import { hasLocalAccountSwitchCapability } from "./local-account-switch-auth";
|
|
78
78
|
import { authorizationCredential } from "../lib/authorization-scheme";
|
|
79
79
|
import { authorizeDesktopSession, desktopSessionAuthorized } from "./gui-desktop-authorization";
|
|
80
|
+
import { HUB_RELAY_TOKEN_PREFIX } from "../remote/hub-management-relay";
|
|
81
|
+
import { admitHubRelayRead } from "./hub-relay-auth";
|
|
82
|
+
|
|
80
83
|
export type { GuiSessionBootstrap, GuiSessionRequestContext } from "./gui-session";
|
|
81
84
|
|
|
82
85
|
const LOCAL_READ_REPLAY_LIMIT = 256;
|
|
@@ -357,6 +360,7 @@ export function createManagementSessionControl(state: ManagementAuthState): Mana
|
|
|
357
360
|
*/
|
|
358
361
|
export type ManagementPrincipal =
|
|
359
362
|
| "admin-token"
|
|
363
|
+
| "hub-relay-read"
|
|
360
364
|
| "opencode-catalog-token"
|
|
361
365
|
| "gui-session"
|
|
362
366
|
| "gui-pair-capability"
|
|
@@ -583,6 +587,10 @@ function resolveManagementAdmission(
|
|
|
583
587
|
config?: OcxConfig,
|
|
584
588
|
local?: LocalManagementAuthContext,
|
|
585
589
|
): ManagementPrincipal | null {
|
|
590
|
+
const actual = requestManagementCredential(req);
|
|
591
|
+
if (actual?.startsWith(HUB_RELAY_TOKEN_PREFIX)) {
|
|
592
|
+
return state.available && config && admitHubRelayRead(state, req, config, actual) ? "hub-relay-read" : null;
|
|
593
|
+
}
|
|
586
594
|
const cached = admittedManagementRequests.get(req);
|
|
587
595
|
if (cached) return cached;
|
|
588
596
|
let principal: ManagementPrincipal | null = null;
|
|
@@ -594,7 +602,6 @@ function resolveManagementAdmission(
|
|
|
594
602
|
else if (hasLocalReadCapability(req, local)) principal = "local-read-capability";
|
|
595
603
|
else if (hasGuiPairCapability(req, local)) principal = "gui-pair-capability";
|
|
596
604
|
else if (state.available) {
|
|
597
|
-
const actual = requestManagementCredential(req);
|
|
598
605
|
if (actual && equalSecret(actual, state.token)) principal = "admin-token";
|
|
599
606
|
else if (actual && isOpencodeCatalogRequest(req) && equalSecret(actual, opencodeCatalogToken(state.token))) {
|
|
600
607
|
principal = "opencode-catalog-token";
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { ADVISOR_SERVER_TOOL_NAME, planAnthropicServerTools } from "../adapters/anthropic/advisor-tool";
|
|
2
|
+
import type { OcxProviderConfig } from "../types";
|
|
1
3
|
import { clientFacingModelLabel } from "../lib/error-destination";
|
|
2
4
|
import {
|
|
3
5
|
AdmissionModelDeniedError, routeAllowedByScope, UNNAMED_DESTINATION_MODEL, type AdmissionModelScope,
|
|
@@ -64,3 +66,20 @@ export function nativeMessagesToolScopeDenial(
|
|
|
64
66
|
}
|
|
65
67
|
return undefined;
|
|
66
68
|
}
|
|
69
|
+
|
|
70
|
+
export function scopedAnthropicServerTools(
|
|
71
|
+
scope: AdmissionModelScope | undefined,
|
|
72
|
+
route: { providerName: string; modelId: string },
|
|
73
|
+
tools: readonly Rec[] | undefined,
|
|
74
|
+
): readonly Rec[] | undefined {
|
|
75
|
+
return tools?.filter(tool => !nativeMessagesToolScopeDenial(scope, route.providerName, route.modelId, { tools: [tool] }));
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
export function admitsHostedAdvisor(
|
|
79
|
+
provider: OcxProviderConfig,
|
|
80
|
+
scopedTools: readonly Rec[] | undefined,
|
|
81
|
+
functionTools: readonly { name: string }[] | undefined,
|
|
82
|
+
): boolean {
|
|
83
|
+
return planAnthropicServerTools(provider, scopedTools, undefined, new Set(functionTools?.map(tool => tool.name)), false)
|
|
84
|
+
.declared.some(tool => tool.name === ADVISOR_SERVER_TOOL_NAME);
|
|
85
|
+
}
|