@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
package/src/grok/inject.ts
CHANGED
|
@@ -1119,6 +1119,7 @@ export function injectGrokConfig(
|
|
|
1119
1119
|
opts: {
|
|
1120
1120
|
grokHome?: string;
|
|
1121
1121
|
hostname?: string;
|
|
1122
|
+
probeHostname?: string;
|
|
1122
1123
|
refreshOnly?: { admit: () => boolean };
|
|
1123
1124
|
excluded?: ReadonlySet<string>;
|
|
1124
1125
|
/** Unfiltered known ids used only to distinguish hidden current models from retired ones. */
|
|
@@ -1215,7 +1216,7 @@ export function injectGrokConfig(
|
|
|
1215
1216
|
const region = orphans.length > 0 ? findManagedRegion(content) : originalRegion;
|
|
1216
1217
|
|
|
1217
1218
|
const buildCandidate = (reservedAliases: ReadonlySet<string>): string => {
|
|
1218
|
-
const block = buildGrokManagedBlock(port, models, opts.hostname, reservedAliases, opts.excluded);
|
|
1219
|
+
const block = buildGrokManagedBlock(port, models, opts.probeHostname ?? opts.hostname, reservedAliases, opts.excluded);
|
|
1219
1220
|
let candidate: string;
|
|
1220
1221
|
if (region) {
|
|
1221
1222
|
candidate = content.slice(0, region.start) + block + content.slice(region.end);
|
package/src/grok/sync.ts
CHANGED
|
@@ -26,12 +26,13 @@ async function defaultFetchAllModels(config: OcxConfig): Promise<CatalogModel[]>
|
|
|
26
26
|
* Build the model list and inject the fenced block. `hostname` should be the hostname the
|
|
27
27
|
* RUNNING proxy actually bound (live.hostname from proxy-liveness for ensure's live branch;
|
|
28
28
|
* config.hostname for a freshly spawned start) — a stale config.hostname could otherwise
|
|
29
|
-
* name a host the process never bound.
|
|
29
|
+
* name a host the process never bound. `probeHostname` is only the reachable destination;
|
|
30
|
+
* it never replaces bind scope for admission policy or an explicit secondary listener.
|
|
30
31
|
*/
|
|
31
32
|
export async function syncGrokConfig(
|
|
32
33
|
port: number,
|
|
33
34
|
config: OcxConfig,
|
|
34
|
-
opts: { hostname?: string; grokHome?: string; refreshOnly?: { admit: () => boolean } } = {},
|
|
35
|
+
opts: { hostname?: string; probeHostname?: string; grokHome?: string; refreshOnly?: { admit: () => boolean } } = {},
|
|
35
36
|
deps: GrokSyncDeps = { fetchAllModels: defaultFetchAllModels, injectGrokConfig },
|
|
36
37
|
): Promise<GrokInjectResult> {
|
|
37
38
|
let projection: ReturnType<typeof projectGrokCatalog>;
|
|
@@ -57,6 +58,8 @@ export async function syncGrokConfig(
|
|
|
57
58
|
hostname: target.requiresAdmissionToken
|
|
58
59
|
? (opts.hostname ?? config.hostname)
|
|
59
60
|
: targetUrl.hostname,
|
|
61
|
+
...(opts.probeHostname !== undefined && !config.unauthenticatedLoopbackListener?.enabled
|
|
62
|
+
? { probeHostname: opts.probeHostname } : {}),
|
|
60
63
|
...(opts.grokHome !== undefined ? { grokHome: opts.grokHome } : {}),
|
|
61
64
|
...opts.refreshOnly ? { refreshOnly: opts.refreshOnly } : {},
|
|
62
65
|
excluded: new Set(config.grokExcludedModels ?? []),
|
package/src/images/loop.ts
CHANGED
|
@@ -24,7 +24,7 @@ import { isAnthropicInstanceId } from "../providers/anthropic-instance-id";
|
|
|
24
24
|
import { cloneProviderOpaqueToolCallMetadata } from "../responses/provider-opaque-metadata";
|
|
25
25
|
import type { AttemptRecoveryKind } from "../usage/log";
|
|
26
26
|
import { bridgeToResponsesSSE } from "../bridge";
|
|
27
|
-
import {
|
|
27
|
+
import { isTruncatedStopReason } from "../responses/truncated-stop-reason";
|
|
28
28
|
import { clearableDeadline, idleDeadline } from "../lib/abort";
|
|
29
29
|
import { readBoundedResponseBody } from "../lib/bounded-body";
|
|
30
30
|
import { applyUpstreamRecoveryInit, fetchWithResetRetry, prepareSameTarget429Wait, isNonReplayableResponse, isSameTargetRetryHold, SendBudgetExhaustedError } from "../lib/upstream-retry";
|
|
@@ -172,10 +172,12 @@ function scanEventsForImageCall(events: AdapterEvent[], toolNames: Set<string>):
|
|
|
172
172
|
calls: ImageCall[];
|
|
173
173
|
passthrough: AdapterEvent[];
|
|
174
174
|
hasRealToolCall: boolean;
|
|
175
|
+
hasIncompleteToolCall: boolean;
|
|
175
176
|
} {
|
|
176
177
|
const calls: ImageCall[] = [];
|
|
177
178
|
const passthrough: AdapterEvent[] = [];
|
|
178
179
|
let hasRealToolCall = false;
|
|
180
|
+
let hasIncompleteToolCall = false;
|
|
179
181
|
let pending: { name: string; id: string; argsBuf: string; events: AdapterEvent[]; providerMetadata?: OcxProviderOpaqueToolCallMetadata } | null = null;
|
|
180
182
|
const flushPending = (): void => {
|
|
181
183
|
if (!pending) return;
|
|
@@ -198,7 +200,10 @@ function scanEventsForImageCall(events: AdapterEvent[], toolNames: Set<string>):
|
|
|
198
200
|
pending.events.push(e);
|
|
199
201
|
} else if (e.type === "tool_call_end" && pending) {
|
|
200
202
|
pending.events.push(e);
|
|
201
|
-
if (
|
|
203
|
+
if (e.incomplete) {
|
|
204
|
+
hasIncompleteToolCall = true;
|
|
205
|
+
passthrough.push(...pending.events);
|
|
206
|
+
} else if (toolNames.has(pending.name)) {
|
|
202
207
|
calls.push({ id: pending.id, name: pending.name, args: pending.argsBuf, providerMetadata: pending.providerMetadata });
|
|
203
208
|
} else {
|
|
204
209
|
passthrough.push(...pending.events);
|
|
@@ -211,7 +216,7 @@ function scanEventsForImageCall(events: AdapterEvent[], toolNames: Set<string>):
|
|
|
211
216
|
}
|
|
212
217
|
}
|
|
213
218
|
flushPending();
|
|
214
|
-
return { calls, passthrough, hasRealToolCall };
|
|
219
|
+
return { calls, passthrough, hasRealToolCall, hasIncompleteToolCall };
|
|
215
220
|
}
|
|
216
221
|
|
|
217
222
|
async function* replay(events: AdapterEvent[]): AsyncGenerator<AdapterEvent> {
|
|
@@ -307,6 +312,8 @@ function loopFailure(e: LoopError): SidecarLoopFailure {
|
|
|
307
312
|
export interface ImageBridgeDeps {
|
|
308
313
|
thinkingRecovery?: ReturnType<typeof createAnthropicThinkingRecovery>;
|
|
309
314
|
parsed: OcxParsedRequest;
|
|
315
|
+
/** Chat delivery only; never copied into parsed generation options. */
|
|
316
|
+
chatRawReasoningVisible?: boolean;
|
|
310
317
|
clientToolCatalogRestriction?: ClientToolCatalogRestriction;
|
|
311
318
|
adapter: ProviderAdapter;
|
|
312
319
|
incomingMeta: IncomingMeta;
|
|
@@ -974,8 +981,9 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
|
|
|
974
981
|
// Codex. forceFinal also finalizes.
|
|
975
982
|
// A refused iteration also finalizes: fulfilling its media call would re-ask the model
|
|
976
983
|
// with the refused context (#7148).
|
|
977
|
-
const shouldLoop = split.calls.length > 0 && !split.hasRealToolCall && !forceFinal
|
|
978
|
-
&& !split.passthrough.some(
|
|
984
|
+
const shouldLoop = split.calls.length > 0 && !split.hasRealToolCall && !split.hasIncompleteToolCall && !forceFinal
|
|
985
|
+
&& !split.passthrough.some(event => event.type === "incomplete" || event.type === "error"
|
|
986
|
+
|| (event.type === "done" && isTruncatedStopReason(event.stopReason)));
|
|
979
987
|
if (!shouldLoop) {
|
|
980
988
|
if (hiddenUsage || rotatedUsage) {
|
|
981
989
|
for (let i = split.passthrough.length - 1; i >= 0; i--) {
|
|
@@ -1213,6 +1221,7 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
|
|
|
1213
1221
|
...(deps.forceEmptyResponseId ? { responseId: "" } : {}),
|
|
1214
1222
|
...(deps.terminalRefusalAsFailed ? { terminalRefusalAsFailed: true } : {}),
|
|
1215
1223
|
hideThinkingSummary: parsed.options.hideThinkingSummary,
|
|
1224
|
+
chatRawReasoningVisible: deps.chatRawReasoningVisible,
|
|
1216
1225
|
hideRawReasoning: parsed.options.hideRawReasoning,
|
|
1217
1226
|
stallTimeoutSec: deps.stallTimeoutSec,
|
|
1218
1227
|
...(deps.onFirstOutput ? { onFirstOutput: deps.onFirstOutput } : {}),
|
|
@@ -74,7 +74,7 @@ function storeGuard(anchor: string, target: string): () => void {
|
|
|
74
74
|
const identities = new Map<string, string>();
|
|
75
75
|
const inspect = (path: string, directory: boolean): boolean => {
|
|
76
76
|
try {
|
|
77
|
-
const stat = lstatSync(path);
|
|
77
|
+
const stat = lstatSync(path, { bigint: true });
|
|
78
78
|
if (stat.isSymbolicLink() || (directory ? !stat.isDirectory() : !stat.isFile()) || (!directory && stat.nlink > 1)) storeUnsafe();
|
|
79
79
|
if (directory) {
|
|
80
80
|
const identity = `${realpathSync(path)}:${stat.dev}:${stat.ino}`;
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
/** Refresh only previously connected clients; a refused file never blocks its peers. */
|
|
13
13
|
export async function refreshOwnedCatalogIntegrations(
|
|
14
14
|
input: Omit<OwnedIntegrationRefreshInput, "clientId">,
|
|
15
|
-
clientIds: readonly IntegrationClientId[] = ["pi", "aside", "raycast", "omo", "commandcode", "droid", "opencode", "kilo", "qoder", "qoder-cn", "workbuddy", "workbuddy-ai", "gentle-shell"],
|
|
15
|
+
clientIds: readonly IntegrationClientId[] = ["pi", "aside", "raycast", "omo", "commandcode", "droid", "opencode", "kilo", "qoder", "qoder-cn", "workbuddy", "workbuddy-ai", "gentle-shell", "hermes", "t3code"],
|
|
16
16
|
options: { refreshOnly?: boolean; admit?: () => boolean } = {},
|
|
17
17
|
): Promise<OwnedIntegrationRefreshOutcome[]> {
|
|
18
18
|
// Client files are shared with the live proxy a sibling instance runs beside; their entries
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** Read-only guard for competing Factory settings before a managed write. */
|
|
2
|
-
import { closeSync, constants, fstatSync, lstatSync, openSync, readFileSync } from "node:fs";
|
|
2
|
+
import { closeSync, constants, fstatSync, lstatSync, openSync, readFileSync, type BigIntStats } from "node:fs";
|
|
3
3
|
import { join, win32 } from "node:path";
|
|
4
4
|
|
|
5
5
|
const isWindowsRoot = (path: string) => /^[A-Za-z]:[\\/]|^\\\\/.test(path);
|
|
@@ -26,8 +26,8 @@ export function assertDroidSettingsUnambiguous(root: string, baseUrl?: string, m
|
|
|
26
26
|
}
|
|
27
27
|
for (const name of ["config.json", "settings.local.json"]) {
|
|
28
28
|
const path = isWindowsRoot(root) ? win32.join(root, name) : join(root, name);
|
|
29
|
-
let stat:
|
|
30
|
-
try { stat = lstatSync(path); }
|
|
29
|
+
let stat: BigIntStats;
|
|
30
|
+
try { stat = lstatSync(path, { bigint: true }); }
|
|
31
31
|
catch (error) {
|
|
32
32
|
if ((error as NodeJS.ErrnoException).code === "ENOENT") continue;
|
|
33
33
|
throw new Error(`Cannot inspect Factory ${name}`);
|
|
@@ -37,7 +37,7 @@ export function assertDroidSettingsUnambiguous(root: string, baseUrl?: string, m
|
|
|
37
37
|
let fd: number | undefined;
|
|
38
38
|
try {
|
|
39
39
|
fd = openSync(path, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0));
|
|
40
|
-
const opened = fstatSync(fd);
|
|
40
|
+
const opened = fstatSync(fd, { bigint: true });
|
|
41
41
|
if (!opened.isFile() || opened.size > 1024 * 1024 || opened.ino !== stat.ino || opened.dev !== stat.dev) {
|
|
42
42
|
throw new Error("file changed during inspection");
|
|
43
43
|
}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* `<integrations>/hermes-profiles/<name>/`, so its records, journal and snapshots
|
|
17
17
|
* can never be confused with the default profile's.
|
|
18
18
|
*/
|
|
19
|
-
import { lstatSync, readdirSync, type
|
|
19
|
+
import { lstatSync, readdirSync, type BigIntStats } from "node:fs";
|
|
20
20
|
import { homedir } from "node:os";
|
|
21
21
|
import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
|
|
22
22
|
import { hermesHomeDir } from "../clients/config-export";
|
|
@@ -46,8 +46,8 @@ export class HermesProfileError extends Error {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
function lstatOrNull(path: string):
|
|
50
|
-
try { return lstatSync(path); }
|
|
49
|
+
function lstatOrNull(path: string): BigIntStats | null {
|
|
50
|
+
try { return lstatSync(path, { bigint: true }); }
|
|
51
51
|
catch (error) {
|
|
52
52
|
if ((error as NodeJS.ErrnoException).code === "ENOENT" || (error as NodeJS.ErrnoException).code === "ENOTDIR") return null;
|
|
53
53
|
throw new HermesProfileError("hermes_profiles_unavailable", 409, "Hermes profiles cannot be read");
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import type { ManagedContribution } from "../clients/config-export";
|
|
2
|
+
import { fingerprint, type OwnershipRecord } from "./ownership";
|
|
3
|
+
import { isHermesAffinityUpgrade } from "./ownership-policy";
|
|
4
|
+
import type { IntegrationClientId } from "./registry";
|
|
5
|
+
import type { WriteOutcome } from "./writer";
|
|
6
|
+
|
|
7
|
+
/** Evaluate the actual transaction bytes, rather than a separate pre-coordinator read. */
|
|
8
|
+
export function hermesRefreshRefusal(input: {
|
|
9
|
+
clientId: IntegrationClientId;
|
|
10
|
+
before: string | null;
|
|
11
|
+
configPath: string;
|
|
12
|
+
record: OwnershipRecord | null;
|
|
13
|
+
parsed: unknown;
|
|
14
|
+
contribution: ManagedContribution;
|
|
15
|
+
}, allowAbsent: boolean): WriteOutcome | null {
|
|
16
|
+
const { clientId, before, configPath, record, parsed, contribution } = input;
|
|
17
|
+
if (allowAbsent || clientId !== "hermes" || !record) return null;
|
|
18
|
+
// Opting into affinity still requires explicit Apply, including the supported workaround.
|
|
19
|
+
if (isHermesAffinityUpgrade(parsed, record, contribution)) {
|
|
20
|
+
return { ok: true, changed: false, state: "stale", clientId,
|
|
21
|
+
message: "Hermes session affinity requires Apply in Integrations; refresh left the configuration unchanged" };
|
|
22
|
+
}
|
|
23
|
+
if (before !== null && fingerprint(before) !== record.fileFingerprint) {
|
|
24
|
+
return { ok: false, reason: "conflict", state: "conflict", clientId,
|
|
25
|
+
message: `${configPath} changed after the last Apply; review and Apply the pending catalog change in Connect → Hermes before automatic refresh resumes` };
|
|
26
|
+
}
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { namedExportContext } from "../clients/config-export/alias-selectors";
|
|
2
|
+
import { supportsAliasModelNames } from "../clients/config-export/model-names";
|
|
3
|
+
import type { OcxConfig } from "../types";
|
|
4
|
+
import { observeIntegration, type IntegrationPlanOperation, type IntegrationWriteInput } from "./mutation-plan";
|
|
5
|
+
import { exportContextOf } from "./state";
|
|
6
|
+
import type { WriteRefused } from "./writer";
|
|
7
|
+
|
|
8
|
+
/** Final synchronous admission after all coordinator awaits, before maintenance or writes. */
|
|
9
|
+
export function staleModelNameRefusal(
|
|
10
|
+
input: IntegrationWriteInput,
|
|
11
|
+
liveConfig: OcxConfig,
|
|
12
|
+
operation: IntegrationPlanOperation,
|
|
13
|
+
): WriteRefused | null {
|
|
14
|
+
if ((operation !== "apply" && operation !== "overwrite") || !supportsAliasModelNames(input.clientId)
|
|
15
|
+
|| (input.modelNames !== undefined && input.modelNames !== "alias")) return null;
|
|
16
|
+
const context = { ...exportContextOf(input), modelNames: "alias" as const };
|
|
17
|
+
const captured = namedExportContext(input.clientId, context);
|
|
18
|
+
// No alias can be emitted, so routed-only operations keep their original IO path.
|
|
19
|
+
if (!captured.models.some(model => model.aliasNamespaced !== undefined)) return null;
|
|
20
|
+
// Policy inheritance is authoritative only after the ordinary client/path binding.
|
|
21
|
+
// Observation here is read-only, and the transaction follows without another await.
|
|
22
|
+
const observed = observeIntegration(input, { maintenance: false, recover: false }, operation);
|
|
23
|
+
if (observed.failed || observed.modelNames !== "alias") return null;
|
|
24
|
+
const current = namedExportContext(input.clientId, { ...context, config: liveConfig });
|
|
25
|
+
const stale = captured.models.some((model, index) => model.aliasNamespaced !== undefined
|
|
26
|
+
&& model.aliasNamespaced !== current.models[index]?.aliasNamespaced);
|
|
27
|
+
return stale ? {
|
|
28
|
+
ok: false, clientId: input.clientId, state: "conflict", reason: "conflict",
|
|
29
|
+
message: "model aliases changed while applying; retry with the current catalog",
|
|
30
|
+
} : null;
|
|
31
|
+
}
|
|
@@ -16,8 +16,10 @@
|
|
|
16
16
|
import { createHash } from "node:crypto";
|
|
17
17
|
import { dirname } from "node:path";
|
|
18
18
|
import { canonicalContribution, fingerprint, type OwnershipRecord } from "./ownership";
|
|
19
|
-
import { ClientPathError
|
|
19
|
+
import { ClientPathError } from "../clients/client-path";
|
|
20
|
+
import { EXPORT_CLIENTS, type ExportModel, type ManagedContribution } from "../clients/config-export";
|
|
20
21
|
import { OPENCODE_PROVIDER_ID } from "../clients/config-export/constants";
|
|
22
|
+
import { resolveModelNames, type ExportModelNames } from "../clients/config-export/model-names";
|
|
21
23
|
import {
|
|
22
24
|
ZCODE_STORE_MODEL_RULES_PATH,
|
|
23
25
|
ZCODE_STORE_PROVIDER_RULES_PATH,
|
|
@@ -172,6 +174,7 @@ const CLIENT_MANAGED_PATHS = {
|
|
|
172
174
|
],
|
|
173
175
|
kilo: [["provider", OPENCODE_PROVIDER_ID]],
|
|
174
176
|
droid: [["customModels", DYNAMIC_SEGMENT]],
|
|
177
|
+
t3code: [["providerInstances", OPENCODE_PROVIDER_ID]],
|
|
175
178
|
} satisfies Record<IntegrationClientId, readonly (readonly string[])[]>;
|
|
176
179
|
|
|
177
180
|
/** Not a configuration surface. Exported so a parity case can compare it against the shipped clients. */
|
|
@@ -234,6 +237,8 @@ export function orderPlanChanges(changes: readonly IntegrationPlanChange[]): rea
|
|
|
234
237
|
* names the row and the bytes are what lands in the user's file.
|
|
235
238
|
*/
|
|
236
239
|
export interface PlanFingerprintInput {
|
|
240
|
+
readonly requestedModelNames?: ExportModelNames;
|
|
241
|
+
readonly modelNames?: ExportModelNames;
|
|
237
242
|
readonly operation: IntegrationPlanOperation;
|
|
238
243
|
readonly clientId: IntegrationClientId;
|
|
239
244
|
readonly profileId?: number;
|
|
@@ -292,7 +297,7 @@ export interface PlanFingerprintInput {
|
|
|
292
297
|
};
|
|
293
298
|
}
|
|
294
299
|
|
|
295
|
-
const PLAN_FINGERPRINT_VERSION = "
|
|
300
|
+
const PLAN_FINGERPRINT_VERSION = "p3";
|
|
296
301
|
|
|
297
302
|
function digest(value: string): string {
|
|
298
303
|
return createHash("sha256").update(value).digest("hex").slice(0, 32);
|
|
@@ -312,6 +317,8 @@ export function planFingerprint(input: PlanFingerprintInput): string {
|
|
|
312
317
|
PLAN_FINGERPRINT_VERSION,
|
|
313
318
|
input.operation,
|
|
314
319
|
input.clientId,
|
|
320
|
+
input.requestedModelNames ?? null,
|
|
321
|
+
input.modelNames ?? null,
|
|
315
322
|
input.profileId === undefined ? null : input.profileId,
|
|
316
323
|
input.configPath,
|
|
317
324
|
input.detectDir,
|
|
@@ -385,7 +392,8 @@ function applyOutcome(input: PlanInput): PlanOutcome {
|
|
|
385
392
|
if (input.classified.state === "conflict" && (input.operation !== "overwrite"
|
|
386
393
|
|| qoderLegacyCatalogConflict(input.parsed, input.record, input.contribution))) return deny("conflict");
|
|
387
394
|
if (input.classified.state === "unsafe") return deny("unsafe");
|
|
388
|
-
if (input.classified.state === "current"
|
|
395
|
+
if (input.classified.state === "current"
|
|
396
|
+
&& (input.modelNames ?? "routed") === (input.record?.modelNames ?? "routed")) return NOOP;
|
|
389
397
|
return CHANGE;
|
|
390
398
|
}
|
|
391
399
|
|
|
@@ -740,6 +748,8 @@ export function previewIntegration(input: IntegrationWriteInput, request: Previe
|
|
|
740
748
|
before: observed.before,
|
|
741
749
|
contribution: observed.contribution,
|
|
742
750
|
record: observed.record,
|
|
751
|
+
requestedModelNames: input.modelNames,
|
|
752
|
+
modelNames: observed.modelNames,
|
|
743
753
|
models: input.models,
|
|
744
754
|
classified: observed.classified,
|
|
745
755
|
parsed: observed.parsed,
|
|
@@ -846,6 +856,7 @@ function previewRestore(input: IntegrationWriteInput, request: PreviewRequest):
|
|
|
846
856
|
* planner must not depend on the writer; the writer re-exports it, so callers are unaffected.
|
|
847
857
|
*/
|
|
848
858
|
export interface IntegrationWriteInput {
|
|
859
|
+
modelNames?: ExportModelNames;
|
|
849
860
|
clientId: IntegrationClientId;
|
|
850
861
|
models: readonly ExportModel[];
|
|
851
862
|
config: OcxConfig;
|
|
@@ -1012,7 +1023,9 @@ export function observeIntegration(
|
|
|
1012
1023
|
if (refusal) return { failed: observationFailure("unsafe", "unsafe", refusal) } as const;
|
|
1013
1024
|
}
|
|
1014
1025
|
let contribution: ManagedContribution;
|
|
1026
|
+
let modelNames: ExportModelNames;
|
|
1015
1027
|
try {
|
|
1028
|
+
modelNames = resolveModelNames(clientId, input.modelNames, record?.modelNames);
|
|
1016
1029
|
contribution = buildIntegrationContribution(input, effective, parsed, record);
|
|
1017
1030
|
} catch (error) {
|
|
1018
1031
|
if (!(error instanceof UnrepresentableSelectorError)) throw error;
|
|
@@ -1046,6 +1059,6 @@ export function observeIntegration(
|
|
|
1046
1059
|
ineffectiveWrite: effective.ineffective === null
|
|
1047
1060
|
? null
|
|
1048
1061
|
: `${effective.ineffective.why}\u0000${effective.ineffective.store}`,
|
|
1049
|
-
before, parsed, contribution, record, classified,
|
|
1062
|
+
before, parsed, contribution, record, classified, modelNames,
|
|
1050
1063
|
} as const;
|
|
1051
1064
|
}
|
|
@@ -65,6 +65,8 @@ export function canonicalContribution(contribution: ManagedContribution): string
|
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
export interface OwnershipRecord {
|
|
68
|
+
/** Per-connection export policy; absent legacy records mean routed. */
|
|
69
|
+
modelNames?: import("../clients/config-export/model-names").ExportModelNames;
|
|
68
70
|
clientId: IntegrationClientId;
|
|
69
71
|
configPath: string;
|
|
70
72
|
/** Hash of the WHOLE file as we left it — protects whole-file restore. */
|
|
@@ -113,6 +115,7 @@ export function isOwnershipRecord(value: unknown): value is OwnershipRecord {
|
|
|
113
115
|
&& typeof record.opId === "string" && record.opId.length > 0
|
|
114
116
|
&& typeof record.appliedAt === "string" && Number.isFinite(Date.parse(record.appliedAt))
|
|
115
117
|
&& hash(record.fileFingerprint) && hash(record.blockFingerprint)
|
|
118
|
+
&& (record.modelNames === undefined || record.modelNames === "routed" || record.modelNames === "alias")
|
|
116
119
|
&& paths(record.fragmentPaths) && (record.fragmentPaths as unknown[]).length > 0
|
|
117
120
|
&& ["semanticBlockFingerprint", "protectedBlockFingerprint", "semanticProtectedBlockFingerprint"]
|
|
118
121
|
.every(key => record[key] === undefined || hash(record[key]))
|
|
@@ -16,11 +16,13 @@ import { readPath } from "./merge";
|
|
|
16
16
|
import type { OwnershipRecord } from "./ownership";
|
|
17
17
|
import type { IntegrationIO } from "./config-io";
|
|
18
18
|
import { dirname, join } from "node:path";
|
|
19
|
+
import { ClientPathError } from "../clients/client-path";
|
|
19
20
|
import {
|
|
20
|
-
ClientPathError,
|
|
21
21
|
buildDroidContribution,
|
|
22
22
|
qoderConfigPath,
|
|
23
23
|
qoderHomeDir,
|
|
24
|
+
t3codeConfigPath,
|
|
25
|
+
t3codeHomeDir,
|
|
24
26
|
clineConfigPath,
|
|
25
27
|
clineSettingsDir,
|
|
26
28
|
droidConfigPath,
|
|
@@ -518,6 +520,13 @@ export const INTEGRATION_CLIENTS: Record<IntegrationClientId, IntegrationClientS
|
|
|
518
520
|
resolvePaths: (env, home, _context, io) => gentleShellPaths(env, home, io),
|
|
519
521
|
unresolvedPathHint: (_env, home = homedir()) => join(home, ".gentle-shell", "agent", "models.json"),
|
|
520
522
|
},
|
|
523
|
+
t3code: {
|
|
524
|
+
id: "t3code",
|
|
525
|
+
configPath: (env = process.env, home = homedir()) => t3codeConfigPath(env, home),
|
|
526
|
+
// The state directory, not `~/.t3`: the server creates `userdata` on its first start,
|
|
527
|
+
// while `~/.t3` alone can be left behind by the installer's `bin`.
|
|
528
|
+
detectDir: (env = process.env, home = homedir()) => join(t3codeHomeDir(env, home), "userdata"),
|
|
529
|
+
},
|
|
521
530
|
};
|
|
522
531
|
|
|
523
532
|
export const INTEGRATION_CLIENT_IDS: readonly IntegrationClientId[] =
|
|
@@ -12,6 +12,8 @@ import { createClineIO } from "./cline-io";
|
|
|
12
12
|
import { parseClineDocument } from "./cline-document";
|
|
13
13
|
import { ClientPathError, EXPORT_CLIENTS, opencodeProxyBaseUrl, droidDefaultsFromOwnedRows, type ExportModel, type ManagedContribution } from "../clients/config-export";
|
|
14
14
|
import { qoderLegacyCatalogCollision } from "../clients/config-export/qoder";
|
|
15
|
+
import { resolveModelNames, type ExportModelNames } from "../clients/config-export/model-names";
|
|
16
|
+
import { namedExportContext } from "../clients/config-export/alias-selectors";
|
|
15
17
|
import type { ConfigFormat } from "../clients/config-export";
|
|
16
18
|
import type { OcxConfig } from "../types";
|
|
17
19
|
import { PARSE_FAILED, loadTarget, parseConfig, type IntegrationIO } from "./config-io";
|
|
@@ -496,6 +498,7 @@ export function classifyIntegration(input: {
|
|
|
496
498
|
}
|
|
497
499
|
|
|
498
500
|
export interface IntegrationStateInput {
|
|
501
|
+
modelNames?: ExportModelNames;
|
|
499
502
|
clientId: IntegrationClientId;
|
|
500
503
|
models: readonly ExportModel[];
|
|
501
504
|
config: OcxConfig;
|
|
@@ -547,6 +550,9 @@ export function buildIntegrationContribution(
|
|
|
547
550
|
// between two document roots (Command Code) must see the bytes on disk, and
|
|
548
551
|
// routing it through this one builder keeps classify, plan and write agreeing.
|
|
549
552
|
const context = exportContextOf({ ...input, document: parsed });
|
|
553
|
+
const mode = resolveModelNames(input.clientId, input.modelNames,
|
|
554
|
+
record?.configPath === effective.configPath ? record.modelNames : undefined);
|
|
555
|
+
context.models = namedExportContext(input.clientId, { ...context, modelNames: mode }).models;
|
|
550
556
|
if (input.clientId === "droid" && input.droidReasoningDefaults === undefined && record?.configPath === effective.configPath) {
|
|
551
557
|
const inherited = recordedDroidContributionMatches(parsed, record)
|
|
552
558
|
? droidDefaultsFromOwnedRows(context, parsed, record.fragmentPaths)
|
|
@@ -28,7 +28,6 @@ import {
|
|
|
28
28
|
type OwnershipRecord,
|
|
29
29
|
} from "./ownership";
|
|
30
30
|
import {
|
|
31
|
-
isHermesAffinityUpgrade,
|
|
32
31
|
protectedContributionFingerprint,
|
|
33
32
|
refreshablePathsOf,
|
|
34
33
|
semanticProtectedContributionFingerprint,
|
|
@@ -48,6 +47,9 @@ import { buildIntegrationContribution, exportContextOf, qoderLegacyCatalogConfli
|
|
|
48
47
|
import type { IntegrationState } from "./state";
|
|
49
48
|
import { serializeDocument, UnserializableValueError } from "./serialize";
|
|
50
49
|
import { ClientPathError } from "../clients/config-export";
|
|
50
|
+
import { hermesRefreshRefusal } from "./hermes-refresh";
|
|
51
|
+
import { supportsAliasModelNames } from "../clients/config-export/model-names";
|
|
52
|
+
import { staleModelNameRefusal } from "./model-name-guard";
|
|
51
53
|
import { matchesOperationResult, newOpId, type JournalEntry } from "./journal";
|
|
52
54
|
import { observeIntegration, restoreStoreDirectoryRefusal, type IntegrationWriteInput, type RefusalReason } from "./mutation-plan";
|
|
53
55
|
import { createIntegrationStateStore, type IntegrationStateStore } from "./store";
|
|
@@ -366,17 +368,11 @@ function applyOrRefreshIntegration(
|
|
|
366
368
|
message: "managed block is absent; refresh did not reconnect it",
|
|
367
369
|
};
|
|
368
370
|
}
|
|
369
|
-
if (classified.state === "current") {
|
|
371
|
+
if (classified.state === "current" && pre.modelNames === (record?.modelNames ?? "routed")) {
|
|
370
372
|
return { ok: true, changed: false, state: "current", clientId, message: "already applied" };
|
|
371
373
|
}
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
if (!allowAbsent && record && isHermesAffinityUpgrade(parsed, record, contribution)) {
|
|
375
|
-
return {
|
|
376
|
-
ok: true, changed: false, state: "stale", clientId,
|
|
377
|
-
message: "Hermes session affinity requires Apply in Integrations; refresh left the configuration unchanged",
|
|
378
|
-
};
|
|
379
|
-
}
|
|
374
|
+
const hermesRefusal = hermesRefreshRefusal(pre, allowAbsent);
|
|
375
|
+
if (hermesRefusal) return hermesRefusal;
|
|
380
376
|
|
|
381
377
|
// A stale refresh drops what the PREVIOUS record owned before merging: a
|
|
382
378
|
// model that left the catalog would otherwise stay behind as an orphan the
|
|
@@ -399,54 +395,60 @@ function applyOrRefreshIntegration(
|
|
|
399
395
|
let created: string[];
|
|
400
396
|
let text: string;
|
|
401
397
|
try {
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
* record covers the paths we are about to write, so a path the old record
|
|
416
|
-
* owned and the new one does not would be stranded forever, unremovable by
|
|
417
|
-
* any later disable.
|
|
418
|
-
*
|
|
419
|
-
* With NO record -- an `unowned-key` conflict -- there is nothing to drop and
|
|
420
|
-
* the merge runs against the user's document directly. That is correct:
|
|
421
|
-
* createdContainerPaths then attributes every container they already had to
|
|
422
|
-
* them, so a later disable removes our leaves and leaves their structure
|
|
423
|
-
* standing.
|
|
424
|
-
*/
|
|
398
|
+
if (classified.state === "current") {
|
|
399
|
+
// A policy-only transaction retains exact bytes and container provenance.
|
|
400
|
+
text = before!;
|
|
401
|
+
created = [...(record?.createdContainers ?? [])];
|
|
402
|
+
} else {
|
|
403
|
+
// The source patcher updates this selected row in place. Keep it in the
|
|
404
|
+
// semantic merge too, even when we originally created it, and retain that
|
|
405
|
+
// provenance so disable can still remove the row when it becomes empty.
|
|
406
|
+
const sourceRoot = target.sourcePreservingYaml?.path[0];
|
|
407
|
+
const retainedRow = sourceRoot && parseSegment(sourceRoot).kind === "select" ? sourceRoot : null;
|
|
408
|
+
const priorCreated = record?.createdContainers ?? [];
|
|
409
|
+
const prunable = new Set(priorCreated.filter(path => path !== retainedRow));
|
|
410
|
+
const base = classified.state === "stale" && record
|
|
425
411
|
? removeFragments(parsed, record.fragmentPaths, prunable).doc
|
|
426
|
-
:
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
412
|
+
: classified.state === "conflict" && record
|
|
413
|
+
/*
|
|
414
|
+
* A forced overwrite of a `foreign-edit` conflict drops what the previous
|
|
415
|
+
* record owned for the same reason a stale refresh does: the replacement
|
|
416
|
+
* record covers the paths we are about to write, so a path the old record
|
|
417
|
+
* owned and the new one does not would be stranded forever, unremovable by
|
|
418
|
+
* any later disable.
|
|
419
|
+
*
|
|
420
|
+
* With NO record -- an `unowned-key` conflict -- there is nothing to drop and
|
|
421
|
+
* the merge runs against the user's document directly. That is correct:
|
|
422
|
+
* createdContainerPaths then attributes every container they already had to
|
|
423
|
+
* them, so a later disable removes our leaves and leaves their structure
|
|
424
|
+
* standing.
|
|
425
|
+
*/
|
|
426
|
+
? removeFragments(parsed, record.fragmentPaths, prunable).doc
|
|
427
|
+
: parsed;
|
|
428
|
+
// Computed against the document as it stands BEFORE the merge: afterwards
|
|
429
|
+
// every container exists and "did we create this?" is unanswerable.
|
|
430
|
+
created = createdContainerPaths(base, contribution);
|
|
431
|
+
if (retainedRow && priorCreated.includes(retainedRow)) created = [...new Set([retainedRow, ...created])];
|
|
432
|
+
const nextDocument = mergeContribution(base, contribution);
|
|
433
|
+
if (clientId === "cline") preserveClineSelection(parsed, nextDocument);
|
|
434
|
+
if (target.sourcePreservingYaml && before !== null) {
|
|
435
|
+
const value = sourcePreservingFragmentValue(contribution, target.sourcePreservingYaml.path);
|
|
436
|
+
const patched = value === undefined
|
|
437
|
+
? null
|
|
438
|
+
: patchYamlFragmentSource(
|
|
439
|
+
before,
|
|
440
|
+
target.sourcePreservingYaml.path,
|
|
441
|
+
{ kind: "upsert", value },
|
|
442
|
+
nextDocument,
|
|
443
|
+
);
|
|
444
|
+
if (patched === null) {
|
|
445
|
+
return refuse(clientId, "unsafe", "unsafe",
|
|
446
|
+
yamlRefusalReason(before, target.sourcePreservingYaml.path, configPath, "it was left alone"));
|
|
447
|
+
}
|
|
448
|
+
text = patched;
|
|
449
|
+
} else {
|
|
450
|
+
text = clientId === "cline" ? serializeClineDocument(nextDocument) : serializeDocument(nextDocument, target.format);
|
|
446
451
|
}
|
|
447
|
-
text = patched;
|
|
448
|
-
} else {
|
|
449
|
-
text = clientId === "cline" ? serializeClineDocument(nextDocument) : serializeDocument(nextDocument, target.format);
|
|
450
452
|
}
|
|
451
453
|
} catch (error) {
|
|
452
454
|
if (error instanceof AmbiguousSelectorError) {
|
|
@@ -501,6 +503,7 @@ function applyOrRefreshIntegration(
|
|
|
501
503
|
io, store, clientId, configPath, before, nextText: text, state: "current",
|
|
502
504
|
priorRecord: record,
|
|
503
505
|
record: {
|
|
506
|
+
...(supportsAliasModelNames(clientId) ? { modelNames: pre.modelNames } : {}),
|
|
504
507
|
clientId, configPath, fileFingerprint: fingerprint(text),
|
|
505
508
|
blockFingerprint: fingerprint(canonicalContribution(contribution)),
|
|
506
509
|
semanticBlockFingerprint: fingerprint(semanticContribution(contribution)),
|
|
@@ -971,12 +974,14 @@ async function coordinatedWrite(
|
|
|
971
974
|
input: IntegrationWriteInput,
|
|
972
975
|
operation: (frozen: IntegrationWriteInput) => WriteOutcome,
|
|
973
976
|
options?: CoordinatedIntegrationOptions,
|
|
977
|
+
operationKind: "apply" | "overwrite" | "disable" = "apply",
|
|
974
978
|
): Promise<WriteOutcome> {
|
|
975
979
|
const prepared = tryFreezeIntegrationInput(input);
|
|
976
980
|
if (!prepared.ok) return prepared.refusal;
|
|
977
981
|
const frozen = prepared.value;
|
|
978
982
|
const spec = INTEGRATION_CLIENTS[frozen.clientId];
|
|
979
|
-
const guarded = (bound: IntegrationWriteInput) => options?.guard?.(bound)
|
|
983
|
+
const guarded = (bound: IntegrationWriteInput) => options?.guard?.(bound)
|
|
984
|
+
?? staleModelNameRefusal(bound, input.config, operationKind) ?? operation(bound);
|
|
980
985
|
if (!spec.writerLock) {
|
|
981
986
|
const refused = await options?.revalidate?.(frozen);
|
|
982
987
|
return refused ?? guarded(frozen);
|
|
@@ -1014,14 +1019,14 @@ export function overwriteIntegrationCoordinated(
|
|
|
1014
1019
|
input: IntegrationWriteInput,
|
|
1015
1020
|
options?: CoordinatedIntegrationOptions,
|
|
1016
1021
|
): Promise<WriteOutcome> {
|
|
1017
|
-
return coordinatedWrite(input, overwriteIntegration, options);
|
|
1022
|
+
return coordinatedWrite(input, overwriteIntegration, options, "overwrite");
|
|
1018
1023
|
}
|
|
1019
1024
|
|
|
1020
1025
|
export function disableIntegrationCoordinated(
|
|
1021
1026
|
input: IntegrationWriteInput,
|
|
1022
1027
|
options?: CoordinatedIntegrationOptions,
|
|
1023
1028
|
): Promise<WriteOutcome> {
|
|
1024
|
-
return coordinatedWrite(input, disableIntegration, options);
|
|
1029
|
+
return coordinatedWrite(input, disableIntegration, options, "disable");
|
|
1025
1030
|
}
|
|
1026
1031
|
|
|
1027
1032
|
export async function restoreIntegrationCoordinated(
|
package/src/lib/abort.ts
CHANGED
|
@@ -81,10 +81,14 @@ export function idleDeadline(idleMs: number, onIdle: () => void): IdleDeadline {
|
|
|
81
81
|
export function clearableDeadline(timeoutMs: number, parent?: AbortSignal): ClearableDeadline {
|
|
82
82
|
const deadline = new AbortController();
|
|
83
83
|
const timeoutReason = new DOMException("Timeout elapsed", "TimeoutError");
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
84
|
+
// A non-positive budget disables the deadline: the caller asked for no header clock (e.g. a
|
|
85
|
+
// local upstream whose prefill can stay silent for minutes). Only `parent` can then abort.
|
|
86
|
+
let timer: ReturnType<typeof setTimeout> | undefined = timeoutMs > 0
|
|
87
|
+
? setTimeout(() => {
|
|
88
|
+
timer = undefined;
|
|
89
|
+
if (!deadline.signal.aborted) deadline.abort(timeoutReason);
|
|
90
|
+
}, timeoutMs)
|
|
91
|
+
: undefined;
|
|
88
92
|
const signal = parent ? AbortSignal.any([parent, deadline.signal]) : deadline.signal;
|
|
89
93
|
|
|
90
94
|
return {
|
package/src/lib/bounded-body.ts
CHANGED
|
@@ -89,7 +89,13 @@ export function boundedBodyBufferGrowthsForTests(): number {
|
|
|
89
89
|
}
|
|
90
90
|
|
|
91
91
|
function bodyDeadline(ms: number, onTimeout: () => void): { clear: () => void } {
|
|
92
|
-
|
|
92
|
+
// A non-positive budget is the "disabled" sentinel (same rule as fetchWithHeaderTimeout and
|
|
93
|
+
// clearableDeadline): arm no timer so a slow-but-alive body — e.g. a local model streaming a
|
|
94
|
+
// buffered JSON response over many seconds — is bounded only by the caller's abort signal.
|
|
95
|
+
if (!(ms > 0)) {
|
|
96
|
+
return { clear: () => {} };
|
|
97
|
+
}
|
|
98
|
+
const timer = setTimeout(onTimeout, ms);
|
|
93
99
|
return {
|
|
94
100
|
clear: () => clearTimeout(timer),
|
|
95
101
|
};
|