@bitkyc08/opencodex 2.93.0 → 2.95.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { hasHumanDashboardSession } from "./consent-session";
|
|
1
2
|
/**
|
|
2
3
|
* Management API for Anthropic OAuth usage-limit reset grants.
|
|
3
4
|
*
|
|
@@ -182,7 +183,7 @@ async function handleRead(ctx: ManagementContext, deps: AnthropicResetGrantRoute
|
|
|
182
183
|
}
|
|
183
184
|
|
|
184
185
|
async function handleConsume(ctx: ManagementContext, injected?: AnthropicResetGrantRouteDeps): Promise<Response> {
|
|
185
|
-
if (ctx
|
|
186
|
+
if (!hasHumanDashboardSession(ctx)) return fail(ctx, 403, "session_required");
|
|
186
187
|
let body: Record<string, unknown>;
|
|
187
188
|
try {
|
|
188
189
|
const parsed = await ctx.req.json() as unknown;
|
|
@@ -0,0 +1,211 @@
|
|
|
1
|
+
import type { OcxConfig, OcxClaudeCodeConfig } from "../../types";
|
|
2
|
+
import { isAnthropicInstanceId, type AnthropicInstanceId } from "../../providers/anthropic-instance-id";
|
|
3
|
+
import { jsonResponse } from "../auth-cors";
|
|
4
|
+
|
|
5
|
+
function isPlainObject(value: unknown): value is Record<string, unknown> {
|
|
6
|
+
return value !== null && typeof value === "object" && !Array.isArray(value)
|
|
7
|
+
&& (Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null);
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
/** Validate request shape and build only a candidate; callers rebuild within admission before publishing. */
|
|
11
|
+
export function prepareClaudeCodePatch(config: OcxConfig, body: Record<string, unknown>) {
|
|
12
|
+
for (const field of ["webSearchSidecar", "visionSidecar"] as const) {
|
|
13
|
+
const section = body[field];
|
|
14
|
+
if (section === undefined || section === null) continue;
|
|
15
|
+
if (!isPlainObject(section)) return jsonResponse({ error: `${field} must be an object or null` }, 400);
|
|
16
|
+
if (section.enabled !== undefined && typeof section.enabled !== "boolean") {
|
|
17
|
+
return jsonResponse({ error: `${field}.enabled must be a boolean` }, 400);
|
|
18
|
+
}
|
|
19
|
+
// Both overrides now speak their full unions (roadmap 060 web, 170
|
|
20
|
+
// vision revised). Vision's third arm is "routed" (loopback through the
|
|
21
|
+
// proxy's own router), never exa: exa is not an LLM, and accepting an
|
|
22
|
+
// unknown literal would persist a backend the vision resolver reads as
|
|
23
|
+
// unset (review F1's failure mode).
|
|
24
|
+
const allowedBackends = field === "webSearchSidecar"
|
|
25
|
+
? ["openai", "anthropic", "xai", "gemini", "exa"]
|
|
26
|
+
: ["openai", "anthropic", "routed"];
|
|
27
|
+
if (section.backend !== undefined && section.backend !== null
|
|
28
|
+
&& !allowedBackends.includes(section.backend as string)) {
|
|
29
|
+
return jsonResponse({ error: `${field}.backend must be ${allowedBackends.join(", ")}, or null` }, 400);
|
|
30
|
+
}
|
|
31
|
+
if (section.model !== undefined && typeof section.model !== "string") {
|
|
32
|
+
return jsonResponse({ error: `${field}.model must be a string` }, 400);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
}
|
|
36
|
+
const next = { ...(config.claudeCode ?? {}) };
|
|
37
|
+
for (const field of ["webSearchSidecar", "visionSidecar"] as const) {
|
|
38
|
+
const section = body[field];
|
|
39
|
+
if (section === undefined) continue;
|
|
40
|
+
if (section === null || Object.keys(section as Record<string, unknown>).length === 0) {
|
|
41
|
+
delete next[field];
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
// The per-field validation above guarantees vision only ever carries the two-member
|
|
45
|
+
// union; the cast is the loop's shared-shape compromise, not a wider write path.
|
|
46
|
+
const requested = section as { enabled?: boolean; backend?: "openai" | "anthropic" | "xai" | "gemini" | "exa" | null; model?: string; anthropicInstance?: AnthropicInstanceId | null };
|
|
47
|
+
const override = { ...next[field] } as NonNullable<OcxClaudeCodeConfig[typeof field]>;
|
|
48
|
+
if (requested.enabled !== undefined) override.enabled = requested.enabled;
|
|
49
|
+
if (requested.anthropicInstance === null) delete override.anthropicInstance;
|
|
50
|
+
else if (isAnthropicInstanceId(requested.anthropicInstance)) override.anthropicInstance = requested.anthropicInstance;
|
|
51
|
+
if (requested.backend === null) delete override.backend;
|
|
52
|
+
else if (requested.backend !== undefined) override.backend = requested.backend as never;
|
|
53
|
+
if (requested.model === "") delete override.model;
|
|
54
|
+
else if (requested.model !== undefined) override.model = requested.model;
|
|
55
|
+
// Indexed write across the field union collapses to an intersection; runtime
|
|
56
|
+
// validation above already guarantees the per-field shape.
|
|
57
|
+
if (Object.keys(override).length > 0) next[field] = override as never;
|
|
58
|
+
else delete next[field];
|
|
59
|
+
}
|
|
60
|
+
if (body.enabled !== undefined) {
|
|
61
|
+
if (typeof body.enabled !== "boolean") return jsonResponse({ error: "enabled must be a boolean" }, 400);
|
|
62
|
+
next.enabled = body.enabled;
|
|
63
|
+
}
|
|
64
|
+
if (body.authMode !== undefined) {
|
|
65
|
+
// Three-state intent: "proxy" and "subscription" are stored literally and stick
|
|
66
|
+
// forever; "auto" DELETES the key so the mode is resolved from detected Claude
|
|
67
|
+
// auth on every launch. The 260720 round-trip contract survives as a superset —
|
|
68
|
+
// storing "subscription" literally is also backward-safe, since older readers
|
|
69
|
+
// only ever recognised "proxy".
|
|
70
|
+
if (body.authMode !== "proxy" && body.authMode !== "subscription" && body.authMode !== "auto") {
|
|
71
|
+
return jsonResponse({ error: "authMode must be \"auto\", \"proxy\", or \"subscription\"" }, 400);
|
|
72
|
+
}
|
|
73
|
+
if (body.authMode === "auto") delete next.authMode;
|
|
74
|
+
else next.authMode = body.authMode;
|
|
75
|
+
}
|
|
76
|
+
if (body.systemEnv !== undefined) {
|
|
77
|
+
if (typeof body.systemEnv !== "boolean") return jsonResponse({ error: "systemEnv must be a boolean" }, 400);
|
|
78
|
+
next.systemEnv = body.systemEnv;
|
|
79
|
+
}
|
|
80
|
+
if (body.alwaysEnableEffort !== undefined) {
|
|
81
|
+
if (typeof body.alwaysEnableEffort !== "boolean") return jsonResponse({ error: "alwaysEnableEffort must be a boolean" }, 400);
|
|
82
|
+
if (body.alwaysEnableEffort) next.alwaysEnableEffort = true;
|
|
83
|
+
else delete next.alwaysEnableEffort;
|
|
84
|
+
}
|
|
85
|
+
if (body.maxContextTokens !== undefined) {
|
|
86
|
+
// CONFIG-ONLY back-compat (GUI control removed — superseded by auto-context):
|
|
87
|
+
// null clears; otherwise a positive integer (devlog 136 B6).
|
|
88
|
+
if (body.maxContextTokens === null) {
|
|
89
|
+
delete next.maxContextTokens;
|
|
90
|
+
} else if (typeof body.maxContextTokens !== "number" || !Number.isInteger(body.maxContextTokens) || body.maxContextTokens <= 0) {
|
|
91
|
+
return jsonResponse({ error: "maxContextTokens must be a positive integer or null" }, 400);
|
|
92
|
+
} else {
|
|
93
|
+
next.maxContextTokens = body.maxContextTokens;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
if (body.autoContext !== undefined) {
|
|
97
|
+
// Default-on boolean (devlog 260712 020): true = drop the key, false = store.
|
|
98
|
+
if (typeof body.autoContext !== "boolean") return jsonResponse({ error: "autoContext must be a boolean" }, 400);
|
|
99
|
+
if (body.autoContext) delete next.autoContext;
|
|
100
|
+
else next.autoContext = false;
|
|
101
|
+
}
|
|
102
|
+
if (body.contextAccounting !== undefined) {
|
|
103
|
+
// Sparse like autoContext (devlog/_plan/261009_claude_1m_default/030): "1m" is the default
|
|
104
|
+
// and drops the key; "200k" is the only stored value.
|
|
105
|
+
if (body.contextAccounting !== "1m" && body.contextAccounting !== "200k") {
|
|
106
|
+
return jsonResponse({ error: "contextAccounting must be \"1m\" or \"200k\"" }, 400);
|
|
107
|
+
}
|
|
108
|
+
if (body.contextAccounting === "200k") next.contextAccounting = "200k";
|
|
109
|
+
else delete next.contextAccounting;
|
|
110
|
+
}
|
|
111
|
+
if (body.injectAgents !== undefined) {
|
|
112
|
+
// Default-on boolean (devlog 260712 070): true = drop the key, false = store.
|
|
113
|
+
if (typeof body.injectAgents !== "boolean") return jsonResponse({ error: "injectAgents must be a boolean" }, 400);
|
|
114
|
+
if (body.injectAgents) delete next.injectAgents;
|
|
115
|
+
else next.injectAgents = false;
|
|
116
|
+
}
|
|
117
|
+
if (body.autoCompactWindow !== undefined) {
|
|
118
|
+
// null resets to the 350k default; otherwise the binary-accepted range
|
|
119
|
+
// 100_000..1_000_000 (2.1.207 pSo/yDs — audit 021 #1).
|
|
120
|
+
if (body.autoCompactWindow === null) {
|
|
121
|
+
delete next.autoCompactWindow;
|
|
122
|
+
} else if (typeof body.autoCompactWindow !== "number" || !Number.isInteger(body.autoCompactWindow) || body.autoCompactWindow < 100_000 || body.autoCompactWindow > 1_000_000) {
|
|
123
|
+
return jsonResponse({ error: "autoCompactWindow must be an integer between 100000 and 1000000, or null" }, 400);
|
|
124
|
+
} else {
|
|
125
|
+
next.autoCompactWindow = body.autoCompactWindow;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
if (body.blockedSkills !== undefined) {
|
|
129
|
+
// null resets to the default (["claude-api"]); an array (possibly empty = off)
|
|
130
|
+
// must contain non-empty strings (devlog 060).
|
|
131
|
+
if (body.blockedSkills === null) {
|
|
132
|
+
delete next.blockedSkills;
|
|
133
|
+
} else if (!Array.isArray(body.blockedSkills) || body.blockedSkills.some(s => typeof s !== "string" || s.trim() === "")) {
|
|
134
|
+
return jsonResponse({ error: "blockedSkills must be an array of non-empty strings, or null" }, 400);
|
|
135
|
+
} else {
|
|
136
|
+
next.blockedSkills = (body.blockedSkills as string[]).map(s => s.trim());
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
if (body.tierModels !== undefined) {
|
|
140
|
+
// Family defaults also serve third-party callers that request native tier aliases.
|
|
141
|
+
if (body.tierModels === null) {
|
|
142
|
+
delete next.tierModels;
|
|
143
|
+
} else if (!isPlainObject(body.tierModels)) {
|
|
144
|
+
return jsonResponse({ error: "tierModels must be an object with string values, or null" }, 400);
|
|
145
|
+
} else {
|
|
146
|
+
for (const [tier, value] of Object.entries(body.tierModels)) {
|
|
147
|
+
if (typeof value !== "string") return jsonResponse({ error: `tierModels.${tier} must be a string` }, 400);
|
|
148
|
+
}
|
|
149
|
+
const tierModels = body.tierModels as Record<string, string>;
|
|
150
|
+
const tiers: Record<string, string> = {};
|
|
151
|
+
for (const tier of ["opus", "sonnet", "haiku", "fable"] as const) {
|
|
152
|
+
const value = tierModels[tier];
|
|
153
|
+
if (value !== undefined && value.trim() !== "") tiers[tier] = value.trim();
|
|
154
|
+
}
|
|
155
|
+
if (Object.keys(tiers).length > 0) next.tierModels = tiers;
|
|
156
|
+
else delete next.tierModels;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
let nextFastMode = config.fastMode;
|
|
160
|
+
if (body.fastMode !== undefined) {
|
|
161
|
+
if (body.fastMode !== true && body.fastMode !== false && body.fastMode !== null) {
|
|
162
|
+
return jsonResponse({ error: "fastMode must be true, false, or null" }, 400);
|
|
163
|
+
}
|
|
164
|
+
nextFastMode = body.fastMode === null ? undefined : body.fastMode;
|
|
165
|
+
}
|
|
166
|
+
for (const field of ["model", "smallFastModel", "classifierModel"] as const) {
|
|
167
|
+
const value = body[field];
|
|
168
|
+
if (value === undefined) continue;
|
|
169
|
+
if (typeof value !== "string") return jsonResponse({ error: `${field} must be a string` }, 400);
|
|
170
|
+
if (value.trim() === "") delete next[field];
|
|
171
|
+
else next[field] = value.trim();
|
|
172
|
+
}
|
|
173
|
+
if (body.classifierFallbacks !== undefined) {
|
|
174
|
+
if (body.classifierFallbacks === null) {
|
|
175
|
+
delete next.classifierFallbacks;
|
|
176
|
+
} else {
|
|
177
|
+
if (!Array.isArray(body.classifierFallbacks)) {
|
|
178
|
+
return jsonResponse({ error: "classifierFallbacks must be an array of strings, or null" }, 400);
|
|
179
|
+
}
|
|
180
|
+
const list: string[] = [];
|
|
181
|
+
for (const entry of body.classifierFallbacks) {
|
|
182
|
+
if (typeof entry !== "string" || entry.trim() === "") {
|
|
183
|
+
return jsonResponse({ error: "classifierFallbacks entries must be non-empty strings" }, 400);
|
|
184
|
+
}
|
|
185
|
+
list.push(entry.trim());
|
|
186
|
+
}
|
|
187
|
+
if (list.length > 0) next.classifierFallbacks = list;
|
|
188
|
+
else delete next.classifierFallbacks;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
if (body.modelMap !== undefined) {
|
|
192
|
+
if (body.modelMap === null) {
|
|
193
|
+
delete next.modelMap;
|
|
194
|
+
} else {
|
|
195
|
+
if (!isPlainObject(body.modelMap)) {
|
|
196
|
+
return jsonResponse({ error: "modelMap must be an object of string->string, or null" }, 400);
|
|
197
|
+
}
|
|
198
|
+
const map: Record<string, string> = {};
|
|
199
|
+
for (const [k, v] of Object.entries(body.modelMap)) {
|
|
200
|
+
if (typeof v !== "string" || k.trim() === "" || v.trim() === "") {
|
|
201
|
+
return jsonResponse({ error: "modelMap entries must be non-empty strings" }, 400);
|
|
202
|
+
}
|
|
203
|
+
map[k.trim()] = v.trim();
|
|
204
|
+
}
|
|
205
|
+
if (Object.keys(map).length > 0) next.modelMap = map;
|
|
206
|
+
else delete next.modelMap;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
return { next, nextFastMode };
|
|
211
|
+
}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { adoptPersistedClaudeCode, deleteConfigTopLevelKey, mutatePersistedConfig } from "../../config";
|
|
2
|
+
import { getConfigDir as configRoot, withConfigDirHardeningSettled as settleConfigRoot } from "../../config/paths";
|
|
3
|
+
import type { OcxConfig } from "../../types";
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Mirror a durable desired-state transition onto the long-lived server snapshot.
|
|
7
|
+
*
|
|
8
|
+
* `setIntegrationEnabled` writes DISK only. The server reuses one `config` object
|
|
9
|
+
* for every request, so leaving it stale makes the native GET report the opposite
|
|
10
|
+
* of what was just persisted, and makes any later whole-snapshot save (the Desktop
|
|
11
|
+
* profile PUT does exactly that) write the stale value back over the transition.
|
|
12
|
+
* ON is the ABSENCE of the key, matching `setIntegrationEnabled`'s on-disk shape.
|
|
13
|
+
*/
|
|
14
|
+
export function mirrorDesiredEnabledOntoSnapshot(config: OcxConfig, client: "claude-desktop", enabled: boolean): void {
|
|
15
|
+
const integrations = { ...(config.clientIntegrations ?? {}) };
|
|
16
|
+
if (enabled) delete integrations[client];
|
|
17
|
+
else integrations[client] = false;
|
|
18
|
+
if (Object.keys(integrations).length === 0) deleteConfigTopLevelKey(config, "clientIntegrations");
|
|
19
|
+
else config.clientIntegrations = integrations;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Persist ONLY `claudeCode.desktopProfile`, field-scoped, against the CURRENT
|
|
24
|
+
* on-disk config.
|
|
25
|
+
*
|
|
26
|
+
* `saveConfigPreservingClaudeCode(ctx.config)` writes the whole long-lived server
|
|
27
|
+
* snapshot. On the apply path that snapshot still carries the `clientIntegrations`
|
|
28
|
+
* it was loaded with, so a save right after `setIntegrationEnabled("claude-desktop",
|
|
29
|
+
* true)` carried the stale OFF back over the enable and made the route cancel its
|
|
30
|
+
* own apply. Mutating one field under the config-mutation lock cannot regress an
|
|
31
|
+
* unrelated key another writer just committed.
|
|
32
|
+
*/
|
|
33
|
+
export async function persistDesktopProfileField(
|
|
34
|
+
config: OcxConfig,
|
|
35
|
+
desktopProfile: NonNullable<OcxConfig["claudeCode"]>["desktopProfile"],
|
|
36
|
+
expectedProfile: NonNullable<OcxConfig["claudeCode"]>["desktopProfile"],
|
|
37
|
+
): Promise<{ ok: true } | { ok: false; reason: "missing" | "invalid" | "conflict" | "unavailable" }> {
|
|
38
|
+
const outcome = await settleConfigRoot(configRoot(), () => {
|
|
39
|
+
const outcome = mutatePersistedConfig(persisted => {
|
|
40
|
+
if (JSON.stringify(persisted.claudeCode?.desktopProfile) !== JSON.stringify(expectedProfile)) {
|
|
41
|
+
return { changed: false, value: null };
|
|
42
|
+
}
|
|
43
|
+
persisted.claudeCode = { ...(persisted.claudeCode ?? {}), desktopProfile };
|
|
44
|
+
return { changed: true, value: structuredClone(persisted.claudeCode) };
|
|
45
|
+
});
|
|
46
|
+
if (outcome.status !== "unavailable" && outcome.value !== null) adoptPersistedClaudeCode(config, outcome.value);
|
|
47
|
+
return outcome;
|
|
48
|
+
}).catch(() => {
|
|
49
|
+
return { status: "unavailable", reason: "unavailable" } as const;
|
|
50
|
+
});
|
|
51
|
+
// Only mirror into memory once the durable write actually landed; an
|
|
52
|
+
// `unavailable` outcome must not leave the snapshot claiming a saved profile.
|
|
53
|
+
if (outcome.status === "unavailable") return { ok: false, reason: outcome.reason };
|
|
54
|
+
if (outcome.value === null) return { ok: false, reason: "conflict" };
|
|
55
|
+
return { ok: true };
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export async function persistDesktopModeField(
|
|
59
|
+
config: OcxConfig,
|
|
60
|
+
desktopMode: "first-party" | "gateway",
|
|
61
|
+
): Promise<{ ok: true } | { ok: false; reason: "missing" | "invalid" | "conflict" | "unavailable" }> {
|
|
62
|
+
const { recordClaudeDesktopMode } = await import("../../claude/desktop-first-party");
|
|
63
|
+
const outcome = await settleConfigRoot(configRoot(), () => {
|
|
64
|
+
const outcome = mutatePersistedConfig(persisted => {
|
|
65
|
+
const mutation = recordClaudeDesktopMode(persisted, desktopMode);
|
|
66
|
+
return { changed: mutation.changed, value: structuredClone(persisted.claudeCode) };
|
|
67
|
+
});
|
|
68
|
+
if (outcome.status !== "unavailable") adoptPersistedClaudeCode(config, outcome.value);
|
|
69
|
+
return outcome;
|
|
70
|
+
}).catch(() => {
|
|
71
|
+
return { status: "unavailable", reason: "unavailable" } as const;
|
|
72
|
+
});
|
|
73
|
+
if (outcome.status === "unavailable") return { ok: false, reason: outcome.reason };
|
|
74
|
+
// First-party apply ends here — no profile-marker write follows — so without
|
|
75
|
+
// adopting, live diverges from the armed baseline and a later whole-config
|
|
76
|
+
// save reads that divergence as a pending mutation and stomps hand edits.
|
|
77
|
+
return { ok: true };
|
|
78
|
+
}
|
|
@@ -22,11 +22,12 @@ function lazycodexNotDetected(ctx: ManagementContext): Response {
|
|
|
22
22
|
|
|
23
23
|
export async function handleCodexAgentRoleRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
24
24
|
const { req, url, config, deps } = ctx;
|
|
25
|
-
const [{ getCodexHome }, roles, omo, { detectLazyCodex }] = await Promise.all([
|
|
25
|
+
const [{ getCodexHome }, roles, omo, { detectLazyCodex }, history] = await Promise.all([
|
|
26
26
|
import("../../codex/paths"),
|
|
27
27
|
import("../../codex/agent-role-models"),
|
|
28
28
|
import("../../clients/omo-role-models"),
|
|
29
29
|
import("../../clients/lazycodex"),
|
|
30
|
+
import("../../codex/role-model-history"),
|
|
30
31
|
]);
|
|
31
32
|
|
|
32
33
|
if (url.pathname === "/api/codex-agent-roles" && req.method === "GET") {
|
|
@@ -35,6 +36,15 @@ export async function handleCodexAgentRoleRoutes(ctx: ManagementContext): Promis
|
|
|
35
36
|
if (!lazycodex.detected) return jsonResponse({ lazycodex, omoJsonc: null, roles: [] }, 200, req, config);
|
|
36
37
|
const omoState = omo.readOmoRoleModels(omo.omoJsoncPath());
|
|
37
38
|
const omoModels = omoState.state === "present" ? omoState.models : {};
|
|
39
|
+
// History is optional: a file that cannot be read costs the Restore list, never role editing.
|
|
40
|
+
let changes: import("../../codex/role-model-history").RoleModelChange[] = [];
|
|
41
|
+
let historyUnavailable = false;
|
|
42
|
+
try {
|
|
43
|
+
changes = history.listRoleModelChanges(codexHome);
|
|
44
|
+
} catch (error) {
|
|
45
|
+
console.error(`[codex-agent-roles] could not read the change history: ${String(error)}`);
|
|
46
|
+
historyUnavailable = true;
|
|
47
|
+
}
|
|
38
48
|
return jsonResponse({
|
|
39
49
|
lazycodex,
|
|
40
50
|
omoJsonc: { state: omoState.state },
|
|
@@ -43,6 +53,8 @@ export async function handleCodexAgentRoleRoutes(ctx: ManagementContext): Promis
|
|
|
43
53
|
effort: roles.readCodexAgentRoleEffort(entry.role, codexHome),
|
|
44
54
|
omoJsoncModel: omoModels[entry.role] ?? null,
|
|
45
55
|
})),
|
|
56
|
+
history: changes,
|
|
57
|
+
...(historyUnavailable ? { historyUnavailable } : {}),
|
|
46
58
|
}, 200, req, config);
|
|
47
59
|
}
|
|
48
60
|
|
|
@@ -70,6 +82,7 @@ export async function handleCodexAgentRoleRoutes(ctx: ManagementContext): Promis
|
|
|
70
82
|
...(typeof body?.model === "string" ? { sizingModel: body.model } : {}),
|
|
71
83
|
fetchAllModels: deps.fetchAllModels ?? fetchAllModels,
|
|
72
84
|
...(deps.completeCodexRoleSizing ? { completeRoleSizing: deps.completeCodexRoleSizing } : {}),
|
|
85
|
+
...(deps.loadCodexRoleCapability ? { loadCapability: deps.loadCodexRoleCapability } : {}),
|
|
73
86
|
}), 200, req, config);
|
|
74
87
|
} catch (error) {
|
|
75
88
|
if (error instanceof NoSizingModelError) {
|
|
@@ -88,7 +101,7 @@ export async function handleCodexAgentRoleRoutes(ctx: ManagementContext): Promis
|
|
|
88
101
|
} catch {
|
|
89
102
|
return jsonResponse({ error: "role must be URL-encoded", code: "invalid_role" }, 400, req, config);
|
|
90
103
|
}
|
|
91
|
-
let body: { model?: unknown; effort?: unknown };
|
|
104
|
+
let body: { model?: unknown; effort?: unknown; batch?: unknown; restores?: unknown };
|
|
92
105
|
try {
|
|
93
106
|
body = await readManagementJsonBody(req);
|
|
94
107
|
} catch (error) {
|
|
@@ -102,12 +115,58 @@ export async function handleCodexAgentRoleRoutes(ctx: ManagementContext): Promis
|
|
|
102
115
|
if (body?.model === undefined && body?.effort === undefined) {
|
|
103
116
|
return jsonResponse({ error: "send a model, an effort, or both", code: "empty_update" }, 400, req, config);
|
|
104
117
|
}
|
|
118
|
+
if (body.batch !== undefined && !history.isRoleHistoryBatch(body.batch)) {
|
|
119
|
+
return jsonResponse({ error: "batch must be 1 to 64 letters, digits or dashes", code: "invalid_batch" }, 400, req, config);
|
|
120
|
+
}
|
|
121
|
+
if (body.restores !== undefined && !history.isRoleHistoryBatch(body.restores)) {
|
|
122
|
+
return jsonResponse({ error: "restores must be 1 to 64 letters, digits or dashes", code: "invalid_restores" }, 400, req, config);
|
|
123
|
+
}
|
|
124
|
+
// A write without `batch` starts a batch and the response names it; a later write joins it only
|
|
125
|
+
// while it is this home's newest batch, up to the listing size. History is optional: a file that
|
|
126
|
+
// cannot be read does not block saves, and such a save is simply not recorded.
|
|
127
|
+
let slot: import("../../codex/role-model-history").BatchSlot | null = null;
|
|
128
|
+
try {
|
|
129
|
+
const claimed = history.claimBatchRow(codexHome, body.batch);
|
|
130
|
+
if (claimed === "batch_closed") {
|
|
131
|
+
return jsonResponse({ error: "this batch takes no more changes; leave batch out to start a new one", code: "batch_closed" }, 409, req, config);
|
|
132
|
+
}
|
|
133
|
+
if (claimed === "batch_full") {
|
|
134
|
+
return jsonResponse({ error: `a batch holds at most ${history.ROLE_HISTORY_LIMIT} changes`, code: "batch_full" }, 409, req, config);
|
|
135
|
+
}
|
|
136
|
+
slot = claimed;
|
|
137
|
+
} catch (error) {
|
|
138
|
+
console.error(`[codex-agent-roles] could not read the change history: ${String(error)}`);
|
|
139
|
+
}
|
|
105
140
|
let model: string | undefined;
|
|
106
141
|
let effort: string | null | undefined;
|
|
107
142
|
let toml: { status: "written" | "unchanged" };
|
|
143
|
+
let before: import("../../codex/role-model-history").RoleSetting = { model: null, effort: null };
|
|
108
144
|
try {
|
|
109
145
|
model = body?.model === undefined ? undefined : roles.validateAgentRoleModel(body.model);
|
|
110
146
|
effort = body?.effort === undefined ? undefined : body.effort === null ? null : roles.validateAgentRoleEffort(body.effort);
|
|
147
|
+
} catch (error) {
|
|
148
|
+
if (error instanceof roles.AgentRoleModelError) return jsonResponse({ error: error.message, code: error.code }, 400, req, config);
|
|
149
|
+
throw error;
|
|
150
|
+
}
|
|
151
|
+
// A Restore names the batch it puts back, and only this Codex home's history can vouch for it: the
|
|
152
|
+
// write must be that role's earliest `before` in the batch, so a stale page cannot carry models
|
|
153
|
+
// across homes. A role that had no model pin is restored without a model, since a save keeps a pin.
|
|
154
|
+
if (typeof body.restores === "string") {
|
|
155
|
+
let allowed: import("../../codex/role-model-history").RoleSetting | null;
|
|
156
|
+
try {
|
|
157
|
+
allowed = history.restorableSetting(codexHome, body.restores, role);
|
|
158
|
+
} catch {
|
|
159
|
+
allowed = null;
|
|
160
|
+
}
|
|
161
|
+
if (!allowed || model !== (allowed.model ?? undefined) || effort !== allowed.effort) {
|
|
162
|
+
return jsonResponse({ error: "this Codex home's change history has no such change to restore", code: "restore_not_in_history" }, 409, req, config);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
try {
|
|
166
|
+
before = {
|
|
167
|
+
model: roles.listCodexAgentRoleModels(codexHome).find(entry => entry.role === role)?.model ?? null,
|
|
168
|
+
effort: roles.readCodexAgentRoleEffort(role, codexHome),
|
|
169
|
+
};
|
|
111
170
|
toml = roles.writeCodexAgentRoleModel(role, model, codexHome, effort);
|
|
112
171
|
} catch (error) {
|
|
113
172
|
if (error instanceof roles.AgentRoleModelError) {
|
|
@@ -117,6 +176,24 @@ export async function handleCodexAgentRoleRoutes(ctx: ManagementContext): Promis
|
|
|
117
176
|
// Filesystem and ownership errors carry absolute paths and UIDs; keep them out of the response.
|
|
118
177
|
return jsonResponse({ error: "could not write the role file", code: "write_failed" }, 500, req, config);
|
|
119
178
|
}
|
|
179
|
+
let recorded: string | undefined;
|
|
180
|
+
if (toml.status === "written" && slot) {
|
|
181
|
+
try {
|
|
182
|
+
history.recordRoleModelChange(codexHome, {
|
|
183
|
+
at: new Date().toISOString(),
|
|
184
|
+
batch: slot.batch,
|
|
185
|
+
n: slot.n,
|
|
186
|
+
role,
|
|
187
|
+
before,
|
|
188
|
+
after: { model: model ?? before.model, effort: effort === undefined ? before.effort : effort },
|
|
189
|
+
...(typeof body.restores === "string" ? { restores: body.restores } : {}),
|
|
190
|
+
});
|
|
191
|
+
recorded = slot.batch;
|
|
192
|
+
} catch (error) {
|
|
193
|
+
// The write already stands; a lost history row only costs the Restore button for it.
|
|
194
|
+
console.error(`[codex-agent-roles] could not record the change: ${String(error)}`);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
120
197
|
|
|
121
198
|
// The role TOML is what Codex obeys, so its write stands even when the omo mirror cannot follow.
|
|
122
199
|
let omoStatus: ReturnType<typeof omo.writeOmoRoleModel> | "write_failed";
|
|
@@ -133,5 +210,6 @@ export async function handleCodexAgentRoleRoutes(ctx: ManagementContext): Promis
|
|
|
133
210
|
...(effort !== undefined ? { effort } : {}),
|
|
134
211
|
toml,
|
|
135
212
|
omoJsonc: { status: omoStatus },
|
|
213
|
+
...(recorded ? { batch: recorded } : {}),
|
|
136
214
|
}, 200, req, config);
|
|
137
215
|
}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { admitCodexCliUpdateJob, readCodexCliUpdateJob, runCodexCliUpdateJob } from "../../codex/cli-update-job";
|
|
2
|
+
import { runCodexCliUpdateApplyInWorker, runCodexCliUpdatePlanInWorker } from "../../codex/cli-update-job-worker";
|
|
3
|
+
import { jsonResponse } from "../auth-cors";
|
|
4
|
+
import { trackBackgroundWork } from "../../lib/background-work";
|
|
5
|
+
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
6
|
+
import type { ManagementContext } from "./context";
|
|
7
|
+
import { hasHumanDashboardSession } from "./consent-session";
|
|
8
|
+
|
|
9
|
+
const STATUS = /^\/api\/codex\/cli-update\/jobs\/([0-9a-f-]{36})$/;
|
|
10
|
+
|
|
11
|
+
export async function handleCodexCliUpdateRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
12
|
+
if (ctx.url.pathname === "/api/codex/cli-update/plan") {
|
|
13
|
+
if (ctx.req.method !== "GET") return jsonResponse({ error: "method_not_allowed" }, 405, ctx.req, ctx.config);
|
|
14
|
+
try {
|
|
15
|
+
const plan = await runCodexCliUpdatePlanInWorker();
|
|
16
|
+
return jsonResponse(plan, 200, ctx.req, ctx.config);
|
|
17
|
+
} catch { return jsonResponse({ error: "plan_unavailable" }, 503, ctx.req, ctx.config); }
|
|
18
|
+
}
|
|
19
|
+
const match = STATUS.exec(ctx.url.pathname);
|
|
20
|
+
if (match && ctx.req.method === "GET") {
|
|
21
|
+
try {
|
|
22
|
+
const job = await readCodexCliUpdateJob(match[1]!);
|
|
23
|
+
return job ? jsonResponse(job, 200, ctx.req, ctx.config) : jsonResponse({ error: "job_not_found" }, 404, ctx.req, ctx.config);
|
|
24
|
+
} catch { return jsonResponse({ error: "job_state_unavailable" }, 503, ctx.req, ctx.config); }
|
|
25
|
+
}
|
|
26
|
+
if (ctx.url.pathname !== "/api/codex/cli-update/apply") return null;
|
|
27
|
+
if (ctx.req.method !== "POST") return jsonResponse({ error: "method_not_allowed" }, 405, ctx.req, ctx.config);
|
|
28
|
+
if (!hasHumanDashboardSession(ctx) || !ctx.trustedLoopbackIngress) {
|
|
29
|
+
return jsonResponse({ error: "local_dashboard_confirmation_required" }, 403, ctx.req, ctx.config);
|
|
30
|
+
}
|
|
31
|
+
let body: unknown;
|
|
32
|
+
try { body = await readManagementJsonBody(ctx.req); }
|
|
33
|
+
catch (error) { rethrowManagementBodyTooLarge(error); return jsonResponse({ error: "invalid_json" }, 400, ctx.req, ctx.config); }
|
|
34
|
+
if (!body || typeof body !== "object" || Array.isArray(body)) return jsonResponse({ error: "invalid_request" }, 400, ctx.req, ctx.config);
|
|
35
|
+
const value = body as Record<string, unknown>;
|
|
36
|
+
if (Object.keys(value).some(key => !["requestId", "planId", "confirmed"].includes(key))
|
|
37
|
+
|| value.confirmed !== true || typeof value.requestId !== "string" || typeof value.planId !== "string") {
|
|
38
|
+
return jsonResponse({ error: "invalid_request" }, 400, ctx.req, ctx.config);
|
|
39
|
+
}
|
|
40
|
+
try {
|
|
41
|
+
const admitted = await admitCodexCliUpdateJob({ requestId: value.requestId, planId: value.planId, confirmed: true });
|
|
42
|
+
if (admitted.kind === "accepted") {
|
|
43
|
+
const work = runCodexCliUpdateJob(admitted.job.jobId, admitted.generation,
|
|
44
|
+
() => runCodexCliUpdateApplyInWorker(value.planId as string, { jobId: admitted.job.jobId }));
|
|
45
|
+
trackBackgroundWork(`codex-cli-update:${admitted.job.jobId}`, work).catch(() => undefined);
|
|
46
|
+
}
|
|
47
|
+
return jsonResponse({ job: admitted.job }, 202, ctx.req, ctx.config);
|
|
48
|
+
} catch (error) {
|
|
49
|
+
const code = error instanceof Error ? error.message : "admission_failed";
|
|
50
|
+
const status = code === "idempotency_conflict" ? 409 : code === "invalid_request" ? 400 : 503;
|
|
51
|
+
const response = jsonResponse({ error: ["invalid_request", "idempotency_conflict", "store_full", "job_store_busy", "unsupported_store", "unsafe_store"].includes(code) ? code : "admission_failed" }, status, ctx.req, ctx.config);
|
|
52
|
+
if (code === "job_store_busy") response.headers.set("Retry-After", "1");
|
|
53
|
+
return response;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { hasHumanDashboardSession } from "./consent-session";
|
|
1
2
|
/**
|
|
2
3
|
* /api/codex-prompt — the Codex prompt-layer surface.
|
|
3
4
|
*
|
|
@@ -303,7 +304,7 @@ export async function handleCodexPromptRoutes(ctx: ManagementContext): Promise<R
|
|
|
303
304
|
//
|
|
304
305
|
// Reads stay open to the admin token: describing the prompt stack changes nothing,
|
|
305
306
|
// and the dashboard's own cold load needs it.
|
|
306
|
-
if (req.method !== "GET" && req.method !== "HEAD" && ctx
|
|
307
|
+
if (req.method !== "GET" && req.method !== "HEAD" && !hasHumanDashboardSession(ctx)) {
|
|
307
308
|
return fail(
|
|
308
309
|
ctx,
|
|
309
310
|
"dashboard_session_required",
|
|
@@ -9,6 +9,8 @@ import { join } from "node:path";
|
|
|
9
9
|
import type { OcxConfig } from "../../types";
|
|
10
10
|
import type { CatalogModel } from "../../codex/catalog";
|
|
11
11
|
import type { RoleModelCandidate } from "../../codex/role-auto-assign";
|
|
12
|
+
import type { LoadCapability } from "../../codex/role-capability";
|
|
13
|
+
import type { SizingDomain } from "../../codex/role-sizing";
|
|
12
14
|
|
|
13
15
|
export interface RoleSizingCall {
|
|
14
16
|
readonly model: string;
|
|
@@ -118,11 +120,13 @@ export async function proposeCodexRoleModels(options: {
|
|
|
118
120
|
sizingModel?: string;
|
|
119
121
|
fetchAllModels: (config: OcxConfig) => Promise<CatalogModel[]>;
|
|
120
122
|
completeRoleSizing?: CompleteRoleSizing;
|
|
123
|
+
loadCapability?: LoadCapability;
|
|
121
124
|
}) {
|
|
122
|
-
const [roles, sizing, assign, { readConfiguredDefaultModel }] = await Promise.all([
|
|
125
|
+
const [roles, sizing, assign, capability, { readConfiguredDefaultModel }] = await Promise.all([
|
|
123
126
|
import("../../codex/agent-role-models"),
|
|
124
127
|
import("../../codex/role-sizing"),
|
|
125
128
|
import("../../codex/role-auto-assign"),
|
|
129
|
+
import("../../codex/role-capability"),
|
|
126
130
|
import("../../codex/catalog/parsing"),
|
|
127
131
|
]);
|
|
128
132
|
const sizingModel = resolveSizingModel(options.sizingModel, readConfiguredDefaultModel);
|
|
@@ -159,15 +163,55 @@ export async function proposeCodexRoleModels(options: {
|
|
|
159
163
|
}
|
|
160
164
|
}
|
|
161
165
|
|
|
162
|
-
const
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
+
const candidates = await roleModelCandidates(options.config, await options.fetchAllModels(options.config));
|
|
167
|
+
const classified = assign.classifyRoleModelCandidates(candidates, options.config.codexRoleTiers);
|
|
168
|
+
// Measured capability is a better tier signal than price, and its absence is not an error: a
|
|
169
|
+
// failed read leaves every role on price rank and says so.
|
|
170
|
+
const domains = new Set([...outcomes.values()].flatMap(outcome => "sizing" in outcome ? [outcome.sizing.domain] : []));
|
|
171
|
+
let table: import("../../codex/role-capability").CapabilityTable | null = null;
|
|
172
|
+
let capabilityError: string | null = null;
|
|
173
|
+
if (domains.size > 0) {
|
|
174
|
+
try {
|
|
175
|
+
table = await (options.loadCapability ?? capability.loadCapabilityTable)(options.config);
|
|
176
|
+
} catch {
|
|
177
|
+
capabilityError = "the measured capability source could not be read";
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
const classifiedByDomain = new Map<SizingDomain, ReturnType<typeof assign.classifyRoleModelCandidates>>();
|
|
181
|
+
for (const domain of domains) {
|
|
182
|
+
const scores = table?.domains[domain];
|
|
183
|
+
if (!scores) continue;
|
|
184
|
+
const measured = new Map(candidates.flatMap(candidate => {
|
|
185
|
+
const score = scores.get(capability.candidateModelKey(candidate.model));
|
|
186
|
+
return score === undefined ? [] : [[candidate.model, score] as const];
|
|
187
|
+
}));
|
|
188
|
+
classifiedByDomain.set(domain, assign.classifyRoleModelCandidates(candidates, options.config.codexRoleTiers, measured));
|
|
189
|
+
}
|
|
166
190
|
return {
|
|
167
191
|
sizingModel,
|
|
168
192
|
sizingError,
|
|
169
|
-
proposals: assign.buildRoleProposals(roleRows, outcomes, classified),
|
|
193
|
+
proposals: assign.buildRoleProposals(roleRows, outcomes, classified, classifiedByDomain),
|
|
170
194
|
candidates: classified.map(({ model, tier, tierSource, unitPrice }) => ({ model, tier, tierSource, unitPrice })),
|
|
195
|
+
capability: capabilityReport(table?.source ?? null, table, capabilityError, classifiedByDomain),
|
|
196
|
+
};
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
/** The attribution and per-domain tiers; raw scores only from a source whose terms allow it. */
|
|
200
|
+
function capabilityReport(
|
|
201
|
+
source: import("../../codex/role-capability").CapabilitySource | null,
|
|
202
|
+
table: import("../../codex/role-capability").CapabilityTable | null,
|
|
203
|
+
error: string | null,
|
|
204
|
+
classifiedByDomain: ReadonlyMap<SizingDomain, ReturnType<typeof import("../../codex/role-auto-assign").classifyRoleModelCandidates>>,
|
|
205
|
+
) {
|
|
206
|
+
return {
|
|
207
|
+
name: source?.name ?? null,
|
|
208
|
+
url: source?.url ?? null,
|
|
209
|
+
license: source?.license ?? null,
|
|
210
|
+
publishedAt: table?.publishedAt ?? null,
|
|
211
|
+
error: error ?? table?.fallbackReason ?? null,
|
|
212
|
+
domains: Object.fromEntries([...classifiedByDomain].map(([domain, list]) => [domain,
|
|
213
|
+
list.filter(candidate => candidate.tierSource === "measured")
|
|
214
|
+
.map(({ model, tier, score }) => (source?.redistributable ? { model, tier, score } : { model, tier }))])),
|
|
171
215
|
};
|
|
172
216
|
}
|
|
173
217
|
|