cordisx 0.1.0-beta.46 → 0.1.0-beta.48
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/dist/assets/launcher/native-app-server-protocol.mjs +38 -47
- package/dist/assets/launcher/native-configured-overrides.mjs +48 -0
- package/dist/assets/launcher/native-managed-resume.mjs +8 -1
- package/dist/assets/launcher/native-provider-continuation.mjs +109 -0
- package/dist/assets/launcher/native-provider-transport.mjs +2 -2
- package/dist/codex-adapter/adapter.mjs +141 -28
- package/dist/codex-adapter/index.js +1 -1
- package/dist/codex-adapter/native-provider-continuation-structure.d.ts +16 -0
- package/dist/codex-adapter/native-provider-continuation-structure.js +100 -0
- package/dist/codex-adapter/native-submission-structure.js +32 -6
- package/dist/native/native-helper-artifact.json +1 -1
- package/dist/src/cli/help.d.ts +1 -1
- package/dist/src/cli/help.d.ts.map +1 -1
- package/dist/src/cli/help.js +2 -1
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/cli/native-submission-catalog-options.d.ts +1 -1
- package/dist/src/cli/native-submission-catalog-options.d.ts.map +1 -1
- package/dist/src/cli/native-submission-catalog-options.js +4 -3
- package/dist/src/cli/native-submission-catalog-options.js.map +1 -1
- package/dist/src/cli/parse.d.ts +1 -0
- package/dist/src/cli/parse.d.ts.map +1 -1
- package/dist/src/cli/parse.js +9 -1
- package/dist/src/cli/parse.js.map +1 -1
- package/dist/src/cli/production-host-bootstrap.d.ts.map +1 -1
- package/dist/src/cli/production-host-bootstrap.js +1 -1
- package/dist/src/cli/production-host-bootstrap.js.map +1 -1
- package/dist/src/cli/production-managed-services.d.ts +1 -0
- package/dist/src/cli/production-managed-services.d.ts.map +1 -1
- package/dist/src/cli/production-managed-services.js +1 -0
- package/dist/src/cli/production-managed-services.js.map +1 -1
- package/dist/src/cli/production-plugin-management.d.ts +1 -0
- package/dist/src/cli/production-plugin-management.d.ts.map +1 -1
- package/dist/src/cli/production-plugin-management.js +5 -1
- package/dist/src/cli/production-plugin-management.js.map +1 -1
- package/dist/src/cli/run-command-dispatch.d.ts.map +1 -1
- package/dist/src/cli/run-command-dispatch.js +10 -1
- package/dist/src/cli/run-command-dispatch.js.map +1 -1
- package/dist/src/cli/run-command.d.ts +0 -1
- package/dist/src/cli/run-command.d.ts.map +1 -1
- package/dist/src/cli/run-command.js +30 -20
- package/dist/src/cli/run-command.js.map +1 -1
- package/dist/src/cli/run-support.d.ts.map +1 -1
- package/dist/src/cli/run-support.js +1 -1
- package/dist/src/cli/run-support.js.map +1 -1
- package/dist/src/cli/service-owner.d.ts +4 -0
- package/dist/src/cli/service-owner.d.ts.map +1 -0
- package/dist/src/cli/service-owner.js +154 -0
- package/dist/src/cli/service-owner.js.map +1 -0
- package/dist/src/cli/start-mode.d.ts +4 -1
- package/dist/src/cli/start-mode.d.ts.map +1 -1
- package/dist/src/cli/start-mode.js +9 -6
- package/dist/src/cli/start-mode.js.map +1 -1
- package/dist/src/cli/supervisor-command.d.ts +1 -0
- package/dist/src/cli/supervisor-command.d.ts.map +1 -1
- package/dist/src/cli/supervisor-command.js +42 -11
- package/dist/src/cli/supervisor-command.js.map +1 -1
- package/dist/src/cli/supervisor-runtime.d.ts +1 -0
- package/dist/src/cli/supervisor-runtime.d.ts.map +1 -1
- package/dist/src/cli/supervisor-runtime.js +15 -1
- package/dist/src/cli/supervisor-runtime.js.map +1 -1
- package/dist/src/cli/supervisor-state.d.ts +2 -0
- package/dist/src/cli/supervisor-state.d.ts.map +1 -1
- package/dist/src/cli/supervisor-state.js +2 -0
- package/dist/src/cli/supervisor-state.js.map +1 -1
- package/dist/src/cli/terminal-codex-provider-layer.d.ts +11 -0
- package/dist/src/cli/terminal-codex-provider-layer.d.ts.map +1 -0
- package/dist/src/cli/terminal-codex-provider-layer.js +102 -0
- package/dist/src/cli/terminal-codex-provider-layer.js.map +1 -0
- package/dist/src/cli/terminal-command.d.ts +1 -1
- package/dist/src/cli/terminal-command.d.ts.map +1 -1
- package/dist/src/cli/terminal-command.js +15 -3
- package/dist/src/cli/terminal-command.js.map +1 -1
- package/dist/src/cli/terminal-shared-service.d.ts +11 -4
- package/dist/src/cli/terminal-shared-service.d.ts.map +1 -1
- package/dist/src/cli/terminal-shared-service.js +7 -8
- package/dist/src/cli/terminal-shared-service.js.map +1 -1
- package/dist/src/config/home-config-model-service.d.ts +2 -0
- package/dist/src/config/home-config-model-service.d.ts.map +1 -1
- package/dist/src/config/home-config-model-service.js +8 -2
- package/dist/src/config/home-config-model-service.js.map +1 -1
- package/dist/src/config/home-config-profile-private.d.ts +1 -1
- package/dist/src/config/home-config-profile-private.d.ts.map +1 -1
- package/dist/src/config/home-config-profile-private.js +12 -1
- package/dist/src/config/home-config-profile-private.js.map +1 -1
- package/dist/src/config/model-service-runtime-options.d.ts +9 -0
- package/dist/src/config/model-service-runtime-options.d.ts.map +1 -0
- package/dist/src/config/model-service-runtime-options.js +89 -0
- package/dist/src/config/model-service-runtime-options.js.map +1 -0
- package/dist/src/diagnostics/journal.d.ts.map +1 -1
- package/dist/src/diagnostics/journal.js +1 -0
- package/dist/src/diagnostics/journal.js.map +1 -1
- package/dist/src/launcher/agent-bridge.d.ts.map +1 -1
- package/dist/src/launcher/agent-bridge.js +7 -1
- package/dist/src/launcher/agent-bridge.js.map +1 -1
- package/dist/src/launcher/configured-encrypted-replay.d.ts +3 -1
- package/dist/src/launcher/configured-encrypted-replay.d.ts.map +1 -1
- package/dist/src/launcher/configured-encrypted-replay.js +41 -17
- package/dist/src/launcher/configured-encrypted-replay.js.map +1 -1
- package/dist/src/launcher/existing-model-provider-display.d.ts +5 -0
- package/dist/src/launcher/existing-model-provider-display.d.ts.map +1 -0
- package/dist/src/launcher/existing-model-provider-display.js +54 -0
- package/dist/src/launcher/existing-model-provider-display.js.map +1 -0
- package/dist/src/launcher/existing-terminal-provider-rpc.d.ts.map +1 -1
- package/dist/src/launcher/existing-terminal-provider-rpc.js +20 -1
- package/dist/src/launcher/existing-terminal-provider-rpc.js.map +1 -1
- package/dist/src/launcher/managed-service-candidate.d.ts +1 -0
- package/dist/src/launcher/managed-service-candidate.d.ts.map +1 -1
- package/dist/src/launcher/managed-service-candidate.js.map +1 -1
- package/dist/src/launcher/managed-service-node-host.js +1 -1
- package/dist/src/launcher/managed-service-node-host.js.map +1 -1
- package/dist/src/launcher/managed-service-process.d.ts +1 -1
- package/dist/src/launcher/managed-service-process.d.ts.map +1 -1
- package/dist/src/launcher/managed-service-process.js +12 -2
- package/dist/src/launcher/managed-service-process.js.map +1 -1
- package/dist/src/launcher/managed-service-runtime-process.d.ts.map +1 -1
- package/dist/src/launcher/managed-service-runtime-process.js +21 -2
- package/dist/src/launcher/managed-service-runtime-process.js.map +1 -1
- package/dist/src/launcher/managed-service-runtime.d.ts +2 -0
- package/dist/src/launcher/managed-service-runtime.d.ts.map +1 -1
- package/dist/src/launcher/managed-service-runtime.js +8 -2
- package/dist/src/launcher/managed-service-runtime.js.map +1 -1
- package/dist/src/launcher/managed-service-startup-diagnostic.d.ts +2 -1
- package/dist/src/launcher/managed-service-startup-diagnostic.d.ts.map +1 -1
- package/dist/src/launcher/managed-service-startup-diagnostic.js.map +1 -1
- package/dist/src/launcher/management-rpc.d.ts.map +1 -1
- package/dist/src/launcher/management-rpc.js +6 -0
- package/dist/src/launcher/management-rpc.js.map +1 -1
- package/dist/src/launcher/model-api-server.d.ts +34 -0
- package/dist/src/launcher/model-api-server.d.ts.map +1 -0
- package/dist/src/launcher/model-api-server.js +444 -0
- package/dist/src/launcher/model-api-server.js.map +1 -0
- package/dist/src/launcher/model-service-codex-options-projection.d.ts +8 -0
- package/dist/src/launcher/model-service-codex-options-projection.d.ts.map +1 -0
- package/dist/src/launcher/model-service-codex-options-projection.js +92 -0
- package/dist/src/launcher/model-service-codex-options-projection.js.map +1 -0
- package/dist/src/launcher/model-service-projection.d.ts.map +1 -1
- package/dist/src/launcher/model-service-projection.js +9 -8
- package/dist/src/launcher/model-service-projection.js.map +1 -1
- package/dist/src/launcher/model-service-runtime.d.ts +22 -0
- package/dist/src/launcher/model-service-runtime.d.ts.map +1 -0
- package/dist/src/launcher/model-service-runtime.js +58 -0
- package/dist/src/launcher/model-service-runtime.js.map +1 -0
- package/dist/src/launcher/model-service-store.d.ts.map +1 -1
- package/dist/src/launcher/model-service-store.js +62 -3
- package/dist/src/launcher/model-service-store.js.map +1 -1
- package/dist/src/launcher/native-model-provider-catalog.d.ts +4 -0
- package/dist/src/launcher/native-model-provider-catalog.d.ts.map +1 -1
- package/dist/src/launcher/native-model-provider-catalog.js.map +1 -1
- package/dist/src/launcher/native-remote-provider-source.d.ts +3 -3
- package/dist/src/launcher/native-remote-provider-source.d.ts.map +1 -1
- package/dist/src/launcher/native-remote-provider-source.js +18 -4
- package/dist/src/launcher/native-remote-provider-source.js.map +1 -1
- package/dist/src/launcher/native-submission-cdp-channel.d.ts +2 -0
- package/dist/src/launcher/native-submission-cdp-channel.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-cdp-channel.js +43 -4
- package/dist/src/launcher/native-submission-cdp-channel.js.map +1 -1
- package/dist/src/launcher/native-submission-composition.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-composition.js +125 -2
- package/dist/src/launcher/native-submission-composition.js.map +1 -1
- package/dist/src/launcher/native-submission-continuation.d.ts +17 -0
- package/dist/src/launcher/native-submission-continuation.d.ts.map +1 -0
- package/dist/src/launcher/native-submission-continuation.js +56 -0
- package/dist/src/launcher/native-submission-continuation.js.map +1 -0
- package/dist/src/launcher/native-submission-control-server.d.ts +1 -1
- package/dist/src/launcher/native-submission-control-server.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-control-server.js +23 -4
- package/dist/src/launcher/native-submission-control-server.js.map +1 -1
- package/dist/src/launcher/native-submission-controller-contracts.d.ts +34 -0
- package/dist/src/launcher/native-submission-controller-contracts.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-controller.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-controller.js +59 -40
- package/dist/src/launcher/native-submission-controller.js.map +1 -1
- package/dist/src/launcher/native-submission-records.d.ts +50 -0
- package/dist/src/launcher/native-submission-records.d.ts.map +1 -0
- package/dist/src/launcher/native-submission-records.js +30 -0
- package/dist/src/launcher/native-submission-records.js.map +1 -0
- package/dist/src/launcher/plugin-lifecycle-model.d.ts +2 -0
- package/dist/src/launcher/plugin-lifecycle-model.d.ts.map +1 -1
- package/dist/src/launcher/plugin-lifecycle-model.js.map +1 -1
- package/dist/src/launcher/plugin-lifecycle-transaction.js +2 -2
- package/dist/src/launcher/plugin-lifecycle-transaction.js.map +1 -1
- package/dist/src/launcher/profile-runtime-owner.d.ts +3 -0
- package/dist/src/launcher/profile-runtime-owner.d.ts.map +1 -0
- package/dist/src/launcher/profile-runtime-owner.js +17 -0
- package/dist/src/launcher/profile-runtime-owner.js.map +1 -0
- package/dist/src/launcher/remote-terminal-provider-client.d.ts.map +1 -1
- package/dist/src/launcher/remote-terminal-provider-client.js +4 -0
- package/dist/src/launcher/remote-terminal-provider-client.js.map +1 -1
- package/dist/src/launcher/responses-encrypted-replay.d.ts +6 -1
- package/dist/src/launcher/responses-encrypted-replay.d.ts.map +1 -1
- package/dist/src/launcher/responses-encrypted-replay.js +26 -9
- package/dist/src/launcher/responses-encrypted-replay.js.map +1 -1
- package/dist/src/launcher/responses-websocket-tunnel.d.ts +5 -0
- package/dist/src/launcher/responses-websocket-tunnel.d.ts.map +1 -0
- package/dist/src/launcher/responses-websocket-tunnel.js +53 -0
- package/dist/src/launcher/responses-websocket-tunnel.js.map +1 -0
- package/dist/src/launcher/service-model-api.d.ts +25 -0
- package/dist/src/launcher/service-model-api.d.ts.map +1 -0
- package/dist/src/launcher/service-model-api.js +84 -0
- package/dist/src/launcher/service-model-api.js.map +1 -0
- package/dist/src/launcher/service-plugin-runtime.d.ts +5 -0
- package/dist/src/launcher/service-plugin-runtime.d.ts.map +1 -0
- package/dist/src/launcher/service-plugin-runtime.js +90 -0
- package/dist/src/launcher/service-plugin-runtime.js.map +1 -0
- package/dist/src/launcher/terminal-provider.d.ts +3 -0
- package/dist/src/launcher/terminal-provider.d.ts.map +1 -1
- package/dist/src/launcher/terminal-provider.js +17 -6
- package/dist/src/launcher/terminal-provider.js.map +1 -1
- package/dist/src/management/contracts.d.ts +2 -1
- package/dist/src/management/contracts.d.ts.map +1 -1
- package/dist/src/management/service.d.ts +1 -0
- package/dist/src/management/service.d.ts.map +1 -1
- package/dist/src/management/service.js +9 -4
- package/dist/src/management/service.js.map +1 -1
- package/dist/src/model-provider-display.d.ts +13 -0
- package/dist/src/model-provider-display.d.ts.map +1 -0
- package/dist/src/model-provider-display.js +36 -0
- package/dist/src/model-provider-display.js.map +1 -0
- package/dist/src/model-service-contracts.d.ts +22 -0
- package/dist/src/model-service-contracts.d.ts.map +1 -1
- package/dist/src/model-service-contracts.js.map +1 -1
- package/dist/src/renderer/adapter/model-provider-display.d.ts +8 -0
- package/dist/src/renderer/adapter/model-provider-display.d.ts.map +1 -0
- package/dist/src/renderer/adapter/model-provider-display.js +46 -0
- package/dist/src/renderer/adapter/model-provider-display.js.map +1 -0
- package/dist/src/renderer/adapter/native-composer-creation.d.ts +23 -0
- package/dist/src/renderer/adapter/native-composer-creation.d.ts.map +1 -0
- package/dist/src/renderer/adapter/native-composer-creation.js +129 -0
- package/dist/src/renderer/adapter/native-composer-creation.js.map +1 -0
- package/dist/src/renderer/adapter/native-submission-action-normalizer.d.ts +1 -0
- package/dist/src/renderer/adapter/native-submission-action-normalizer.d.ts.map +1 -1
- package/dist/src/renderer/adapter/native-submission-action-normalizer.js +3 -0
- package/dist/src/renderer/adapter/native-submission-action-normalizer.js.map +1 -1
- package/dist/src/renderer/codex-router-history.d.ts +13 -15
- package/dist/src/renderer/codex-router-history.d.ts.map +1 -1
- package/dist/src/renderer/codex-router-history.js +56 -78
- package/dist/src/renderer/codex-router-history.js.map +1 -1
- package/dist/src/renderer/codex-router-navigator.d.ts +22 -0
- package/dist/src/renderer/codex-router-navigator.d.ts.map +1 -0
- package/dist/src/renderer/codex-router-navigator.js +82 -0
- package/dist/src/renderer/codex-router-navigator.js.map +1 -0
- package/dist/src/renderer/host-ui/AgentTaskDetailsNavigator.js +2 -2
- package/dist/src/renderer/host-ui/AgentTaskDetailsNavigator.js.map +1 -1
- package/dist/src/renderer/install-model-provider-selector.d.ts +1 -1
- package/dist/src/renderer/install-model-provider-selector.d.ts.map +1 -1
- package/dist/src/renderer/install-model-provider-selector.js +12 -4
- package/dist/src/renderer/install-model-provider-selector.js.map +1 -1
- package/dist/src/renderer/manager/pages/model-catalog/SharedModelServices.d.ts.map +1 -1
- package/dist/src/renderer/manager/pages/model-catalog/SharedModelServices.js +9 -4
- package/dist/src/renderer/manager/pages/model-catalog/SharedModelServices.js.map +1 -1
- package/dist/src/renderer/manager/pages/model-catalog/SharedServiceAdvanced.d.ts +32 -0
- package/dist/src/renderer/manager/pages/model-catalog/SharedServiceAdvanced.d.ts.map +1 -0
- package/dist/src/renderer/manager/pages/model-catalog/SharedServiceAdvanced.js +144 -0
- package/dist/src/renderer/manager/pages/model-catalog/SharedServiceAdvanced.js.map +1 -0
- package/dist/src/renderer/model-provider-preferences.d.ts +1 -0
- package/dist/src/renderer/model-provider-preferences.d.ts.map +1 -1
- package/dist/src/renderer/model-provider-preferences.js +4 -0
- package/dist/src/renderer/model-provider-preferences.js.map +1 -1
- package/dist/src/renderer/model-provider-selection.d.ts +41 -0
- package/dist/src/renderer/model-provider-selection.d.ts.map +1 -0
- package/dist/src/renderer/model-provider-selection.js +141 -0
- package/dist/src/renderer/model-provider-selection.js.map +1 -0
- package/dist/src/renderer/model-provider-selector.d.ts +5 -4
- package/dist/src/renderer/model-provider-selector.d.ts.map +1 -1
- package/dist/src/renderer/model-provider-selector.js +18 -97
- package/dist/src/renderer/model-provider-selector.js.map +1 -1
- package/dist/src/renderer/model-providers.d.ts +3 -0
- package/dist/src/renderer/model-providers.d.ts.map +1 -1
- package/dist/src/renderer/model-providers.js +10 -3
- package/dist/src/renderer/model-providers.js.map +1 -1
- package/dist/src/renderer/native-composer-creation-handoff.d.ts +25 -0
- package/dist/src/renderer/native-composer-creation-handoff.d.ts.map +1 -0
- package/dist/src/renderer/native-composer-creation-handoff.js +147 -0
- package/dist/src/renderer/native-composer-creation-handoff.js.map +1 -0
- package/dist/src/renderer/native-composer-refresh.d.ts +33 -0
- package/dist/src/renderer/native-composer-refresh.d.ts.map +1 -0
- package/dist/src/renderer/native-composer-refresh.js +105 -0
- package/dist/src/renderer/native-composer-refresh.js.map +1 -0
- package/dist/src/renderer/native-composer-request-observer.d.ts +34 -0
- package/dist/src/renderer/native-composer-request-observer.d.ts.map +1 -0
- package/dist/src/renderer/native-composer-request-observer.js +169 -0
- package/dist/src/renderer/native-composer-request-observer.js.map +1 -0
- package/dist/src/renderer/native-composer-submission-router.d.ts +7 -7
- package/dist/src/renderer/native-composer-submission-router.d.ts.map +1 -1
- package/dist/src/renderer/native-composer-submission-router.js +21 -1
- package/dist/src/renderer/native-composer-submission-router.js.map +1 -1
- package/dist/src/renderer/native-model-provider-transport.d.ts +4 -7
- package/dist/src/renderer/native-model-provider-transport.d.ts.map +1 -1
- package/dist/src/renderer/native-model-provider-transport.js +107 -234
- package/dist/src/renderer/native-model-provider-transport.js.map +1 -1
- package/dist/src/renderer/native-provider-continuation.d.ts +29 -0
- package/dist/src/renderer/native-provider-continuation.d.ts.map +1 -0
- package/dist/src/renderer/native-provider-continuation.js +64 -0
- package/dist/src/renderer/native-provider-continuation.js.map +1 -0
- package/dist/src/renderer/native-provider-selection-client.d.ts +9 -1
- package/dist/src/renderer/native-provider-selection-client.d.ts.map +1 -1
- package/dist/src/renderer/native-provider-selection-client.js +22 -2
- package/dist/src/renderer/native-provider-selection-client.js.map +1 -1
- package/dist/src/renderer/native-provider-submission-policy.d.ts +1 -0
- package/dist/src/renderer/native-provider-submission-policy.d.ts.map +1 -1
- package/dist/src/renderer/native-provider-submission-policy.js.map +1 -1
- package/dist/src/renderer/navigation-registry-base.js +7 -7
- package/dist/src/renderer/navigation-registry-base.js.map +1 -1
- package/dist/src/renderer/runtime-agent-composition.d.ts.map +1 -1
- package/dist/src/renderer/runtime-agent-composition.js +6 -1
- package/dist/src/renderer/runtime-agent-composition.js.map +1 -1
- package/dist/src/renderer/ui-copy/model-catalog.d.ts +80 -0
- package/dist/src/renderer/ui-copy/model-catalog.d.ts.map +1 -1
- package/dist/src/renderer/ui-copy/model-catalog.js +38 -0
- package/dist/src/renderer/ui-copy/model-catalog.js.map +1 -1
- package/dist/src/renderer/ui-copy.d.ts +81 -1
- package/dist/src/renderer/ui-copy.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -5,32 +5,18 @@ import { fileURLToPath } from 'node:url'
|
|
|
5
5
|
import { NativeTurnDiagnostics } from './native-turn-diagnostics.mjs'
|
|
6
6
|
import { NativeRequestTracker } from './native-request-tracker.mjs'
|
|
7
7
|
import { prepareManagedResume } from './native-managed-resume.mjs'
|
|
8
|
+
import { configuredOverrides, optionsAuthority } from './native-configured-overrides.mjs'
|
|
8
9
|
import { nativeInput } from './native-app-server-input.mjs'
|
|
9
10
|
import { createNativeProviderTransport } from './native-provider-transport.mjs'
|
|
10
11
|
import { nativeProviderFailure } from './native-provider-errors.mjs'
|
|
11
12
|
import { switchNativeThread } from './native-thread-switch.mjs'
|
|
13
|
+
import { createNativeProviderContinuation, dispatchNativeSelectionMutation } from './native-provider-continuation.mjs'
|
|
12
14
|
|
|
13
15
|
const socketPath = process.env.CORDISX_NATIVE_CONTROL_SOCKET
|
|
14
16
|
const nonce = process.env.CORDISX_NATIVE_CONTROL_NONCE
|
|
15
17
|
const executable = process.env.CORDISX_NATIVE_REAL_CODEX_PATH
|
|
16
18
|
const agentModelsBinding = process.env.CORDISX_NATIVE_AGENT_MODELS_BINDING
|
|
17
19
|
const marker = 'cordisx.operation_token'
|
|
18
|
-
function configuredOverrides(existing, overrides) {
|
|
19
|
-
const merged = { ...existing, ...overrides }
|
|
20
|
-
for (const [name, definition] of Object.entries(overrides)) {
|
|
21
|
-
if (!name.startsWith('model_providers.') || !object(definition)) continue
|
|
22
|
-
const id = name.slice('model_providers.'.length)
|
|
23
|
-
merged[name] = {
|
|
24
|
-
...definition,
|
|
25
|
-
...object(object(existing?.model_providers)?.[id]),
|
|
26
|
-
...object(existing?.[name]),
|
|
27
|
-
base_url: definition.base_url,
|
|
28
|
-
wire_api: definition.wire_api,
|
|
29
|
-
}
|
|
30
|
-
if (Object.hasOwn(merged, `${name}.base_url`)) merged[`${name}.base_url`] = definition.base_url
|
|
31
|
-
}
|
|
32
|
-
return merged
|
|
33
|
-
}
|
|
34
20
|
// Native history and plugin catalogs can exceed the small private control-message budget.
|
|
35
21
|
const maxNativeLineBytes = 64 * 1024 * 1024
|
|
36
22
|
const maxControlLineBytes = 8 * 1024 * 1024
|
|
@@ -246,6 +232,9 @@ function controlCall(type, input = {}) {
|
|
|
246
232
|
return call(control, controlCalls, { type, ...input })
|
|
247
233
|
}
|
|
248
234
|
function nativeCall(method, params) {
|
|
235
|
+
if (object(params?.config)?.[optionsAuthority] !== undefined) {
|
|
236
|
+
params = { ...params, config: configuredOverrides(undefined, params.config) }
|
|
237
|
+
}
|
|
249
238
|
return call(nativeTransport.stdin, privateCalls, { method, params })
|
|
250
239
|
}
|
|
251
240
|
function acknowledgedSwitchResume(message, expected) {
|
|
@@ -618,6 +607,7 @@ async function forward(line) {
|
|
|
618
607
|
firstTurns.delete(params.threadId)
|
|
619
608
|
agentFirstTurns.delete(params.threadId)
|
|
620
609
|
}
|
|
610
|
+
if (message.method === 'turn/start') continuation.dispatched(token, params.threadId)
|
|
621
611
|
await write(nativeTransport.stdin, JSON.stringify(message))
|
|
622
612
|
} catch {
|
|
623
613
|
desktopCalls.delete(message?.id)
|
|
@@ -658,7 +648,12 @@ async function recoverResume(id, params, providerId, failureLine) {
|
|
|
658
648
|
}
|
|
659
649
|
let result
|
|
660
650
|
try {
|
|
661
|
-
result = await nativeCall('thread/resume', {
|
|
651
|
+
result = await nativeCall('thread/resume', {
|
|
652
|
+
...params,
|
|
653
|
+
config: overrides[optionsAuthority] === undefined
|
|
654
|
+
? { ...object(params.config), ...overrides }
|
|
655
|
+
: configuredOverrides(object(params.config), overrides),
|
|
656
|
+
})
|
|
662
657
|
if (result?.thread?.id !== params.threadId) throw new Error('Managed resume returned another thread')
|
|
663
658
|
} catch (error) {
|
|
664
659
|
await controlCall('resume-complete', {
|
|
@@ -872,6 +867,11 @@ readLines(nativeTransport.stdout, line => {
|
|
|
872
867
|
|
|
873
868
|
const switching = new Set()
|
|
874
869
|
const switchRequests = new Map()
|
|
870
|
+
const continuation = createNativeProviderContinuation({
|
|
871
|
+
nativeCall,
|
|
872
|
+
lifecyclePending,
|
|
873
|
+
current: threadId => !closed && !cancelledRecovery.has(threadId) && !lifecyclePending(threadId),
|
|
874
|
+
})
|
|
875
875
|
const BRIDGE_NATIVE_METHODS = new Set([
|
|
876
876
|
'thread/list',
|
|
877
877
|
'thread/read',
|
|
@@ -928,7 +928,11 @@ readLines(control, line => {
|
|
|
928
928
|
if (
|
|
929
929
|
uncertainSwitches.has(params.threadId) && ['thread/resume', 'turn/interrupt'].includes(message.method)
|
|
930
930
|
) uncertainSwitches.set(params.threadId, undefined)
|
|
931
|
-
|
|
931
|
+
const overrides = object(message.configuredProviderOverrides)
|
|
932
|
+
const request = overrides
|
|
933
|
+
? { ...params, config: configuredOverrides(object(params.config), overrides) }
|
|
934
|
+
: params
|
|
935
|
+
void nativeCall(message.method, request)
|
|
932
936
|
.then(value => write(control, { id: message.id, ok: true, value }))
|
|
933
937
|
.catch(() => write(control, { id: message.id, ok: false }).catch(stop))
|
|
934
938
|
return
|
|
@@ -944,33 +948,20 @@ readLines(control, line => {
|
|
|
944
948
|
}).catch(() => write(control, { id: message.id, ok: false }).catch(stop))
|
|
945
949
|
return
|
|
946
950
|
}
|
|
947
|
-
|
|
948
|
-
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
|
|
955
|
-
|
|
956
|
-
|
|
957
|
-
|
|
958
|
-
|
|
959
|
-
|
|
960
|
-
|
|
961
|
-
|
|
962
|
-
|
|
963
|
-
})
|
|
964
|
-
if (result.reason === 'provider-switch-reconciliation-required') {
|
|
965
|
-
uncertainSwitches.set(message.threadId, undefined)
|
|
966
|
-
}
|
|
967
|
-
await write(control, { id: message.id, ...result })
|
|
968
|
-
} catch {
|
|
969
|
-
await write(control, { id: message.id, ok: false })
|
|
970
|
-
} finally {
|
|
971
|
-
switching.delete(message.threadId)
|
|
972
|
-
switchRequests.delete(message.id)
|
|
973
|
-
cancelledRecovery.delete(message.threadId)
|
|
974
|
-
}
|
|
975
|
-
})().catch(stop)
|
|
951
|
+
dispatchNativeSelectionMutation(message, {
|
|
952
|
+
switching,
|
|
953
|
+
switchRequests,
|
|
954
|
+
recoveringTurns,
|
|
955
|
+
lifecyclePending,
|
|
956
|
+
cancelledRecovery,
|
|
957
|
+
uncertainSwitches,
|
|
958
|
+
nativeCall,
|
|
959
|
+
controlCall,
|
|
960
|
+
switchNativeThread,
|
|
961
|
+
continuation,
|
|
962
|
+
write,
|
|
963
|
+
control,
|
|
964
|
+
closed: () => closed,
|
|
965
|
+
stop,
|
|
966
|
+
})
|
|
976
967
|
}, maxControlLineBytes)
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
const object = value => value !== null && typeof value === 'object' && !Array.isArray(value) ? value : undefined
|
|
2
|
+
|
|
3
|
+
export const optionsAuthority = 'cordisx.model_service_options'
|
|
4
|
+
const runtimeOptionKeys = [
|
|
5
|
+
'http_headers',
|
|
6
|
+
'env_http_headers',
|
|
7
|
+
'supports_websockets',
|
|
8
|
+
'request_max_retries',
|
|
9
|
+
'stream_max_retries',
|
|
10
|
+
'stream_idle_timeout_ms',
|
|
11
|
+
]
|
|
12
|
+
export function configuredOverrides(existing, overrides) {
|
|
13
|
+
const merged = { ...existing, ...overrides }
|
|
14
|
+
const authority = new Set(Array.isArray(overrides[optionsAuthority]) ? overrides[optionsAuthority] : [])
|
|
15
|
+
delete merged[optionsAuthority]
|
|
16
|
+
const names = new Set([
|
|
17
|
+
...Object.keys(overrides).filter(name => name.startsWith('model_providers.') && object(overrides[name])),
|
|
18
|
+
...Array.from(authority, id => `model_providers.${id}`),
|
|
19
|
+
])
|
|
20
|
+
for (const name of names) {
|
|
21
|
+
const id = name.slice('model_providers.'.length)
|
|
22
|
+
const definition = object(overrides[name])
|
|
23
|
+
const nested = object(object(existing?.model_providers)?.[id])
|
|
24
|
+
const provider = { ...definition, ...nested, ...object(existing?.[name]) }
|
|
25
|
+
if (definition) {
|
|
26
|
+
provider.base_url = definition.base_url
|
|
27
|
+
provider.wire_api = definition.wire_api
|
|
28
|
+
if (Object.hasOwn(merged, `${name}.base_url`)) merged[`${name}.base_url`] = definition.base_url
|
|
29
|
+
}
|
|
30
|
+
if (authority.has(id)) {
|
|
31
|
+
for (const key of runtimeOptionKeys) {
|
|
32
|
+
delete provider[key]
|
|
33
|
+
if (definition && Object.hasOwn(definition, key)) provider[key] = definition[key]
|
|
34
|
+
for (const candidate of Object.keys(merged)) {
|
|
35
|
+
if (candidate === `${name}.${key}` || candidate.startsWith(`${name}.${key}.`)) delete merged[candidate]
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
if (nested) {
|
|
39
|
+
merged.model_providers = { ...merged.model_providers }
|
|
40
|
+
delete merged.model_providers[id]
|
|
41
|
+
if (Object.keys(merged.model_providers).length === 0) delete merged.model_providers
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
if (Object.keys(provider).length > 0) merged[name] = provider
|
|
45
|
+
else delete merged[name]
|
|
46
|
+
}
|
|
47
|
+
return merged
|
|
48
|
+
}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { configuredOverrides, optionsAuthority } from './native-configured-overrides.mjs'
|
|
2
|
+
|
|
1
3
|
const object = value => value !== null && typeof value === 'object' && !Array.isArray(value) ? value : undefined
|
|
2
4
|
const validToken = value => typeof value === 'string' && /^[^\0\r\n]{16,256}$/u.test(value)
|
|
3
5
|
|
|
@@ -24,9 +26,14 @@ export async function prepareManagedResume(message, { nativeCall, controlCall, a
|
|
|
24
26
|
if (prepared?.kind !== 'resume' || !validToken(prepared.resumeToken) || !object(prepared.configOverrides)) {
|
|
25
27
|
return undefined
|
|
26
28
|
}
|
|
29
|
+
const overrides = prepared.configOverrides
|
|
30
|
+
const existing = object(params.config)
|
|
31
|
+
const config = overrides[optionsAuthority] === undefined
|
|
32
|
+
? { ...existing, ...overrides }
|
|
33
|
+
: configuredOverrides(existing, overrides)
|
|
27
34
|
return {
|
|
28
35
|
threadId: params.threadId,
|
|
29
36
|
resumeToken: prepared.resumeToken,
|
|
30
|
-
message: { ...message, params: { ...params, config
|
|
37
|
+
message: { ...message, params: { ...params, config } },
|
|
31
38
|
}
|
|
32
39
|
}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
const valid = (value, max = 512) =>
|
|
2
|
+
typeof value === 'string' && value.length > 0 && value.length <= max && !/[\0\r\n]/u.test(value)
|
|
3
|
+
|
|
4
|
+
/** Owns only normal forks created for a Host-admitted Composer Send. */
|
|
5
|
+
export function createNativeProviderContinuation({ nativeCall, lifecyclePending, current }) {
|
|
6
|
+
const forks = new Map()
|
|
7
|
+
const discard = async (operationToken, threadId) => {
|
|
8
|
+
const fork = forks.get(operationToken)
|
|
9
|
+
if (!fork || fork.threadId !== threadId || fork.dispatched) return false
|
|
10
|
+
const read = await nativeCall('thread/read', { threadId, includeTurns: false })
|
|
11
|
+
if (
|
|
12
|
+
read?.thread?.id !== threadId || read.thread.modelProvider !== fork.providerId
|
|
13
|
+
|| !['idle', 'notLoaded'].includes(read.thread.status?.type) || lifecyclePending(threadId)
|
|
14
|
+
) return false
|
|
15
|
+
await nativeCall('thread/archive', { threadId })
|
|
16
|
+
forks.delete(operationToken)
|
|
17
|
+
return true
|
|
18
|
+
}
|
|
19
|
+
return {
|
|
20
|
+
dispatched(operationToken, threadId) {
|
|
21
|
+
const fork = forks.get(operationToken)
|
|
22
|
+
if (fork?.threadId === threadId) {
|
|
23
|
+
fork.dispatched = true
|
|
24
|
+
forks.delete(operationToken)
|
|
25
|
+
}
|
|
26
|
+
},
|
|
27
|
+
async handle(message) {
|
|
28
|
+
if (!valid(message.operationToken, 256)) return { ok: false }
|
|
29
|
+
if (message.type === 'continuation-discard') {
|
|
30
|
+
return { ok: true, value: await discard(message.operationToken, message.threadId) }
|
|
31
|
+
}
|
|
32
|
+
if (!valid(message.threadId) || !valid(message.providerId, 128) || !valid(message.model)) {
|
|
33
|
+
return { ok: false }
|
|
34
|
+
}
|
|
35
|
+
if (forks.has(message.operationToken) || forks.size >= 32) return { ok: false }
|
|
36
|
+
const source = await nativeCall('thread/read', { threadId: message.threadId, includeTurns: false })
|
|
37
|
+
if (
|
|
38
|
+
!current(message.threadId) || source?.thread?.id !== message.threadId
|
|
39
|
+
|| !['idle', 'notLoaded', 'systemError'].includes(source.thread.status?.type)
|
|
40
|
+
) return { ok: false }
|
|
41
|
+
if (source.thread.ephemeral === true) return { ok: false, reason: 'provider-switch-unsupported' }
|
|
42
|
+
try {
|
|
43
|
+
const result = await nativeCall('thread/fork', {
|
|
44
|
+
threadId: message.threadId,
|
|
45
|
+
modelProvider: message.providerId,
|
|
46
|
+
model: message.model,
|
|
47
|
+
config: message.config,
|
|
48
|
+
ephemeral: false,
|
|
49
|
+
excludeTurns: true,
|
|
50
|
+
deferGoalContinuation: true,
|
|
51
|
+
})
|
|
52
|
+
const thread = result?.thread
|
|
53
|
+
if (
|
|
54
|
+
!valid(thread?.id) || thread.id === message.threadId || thread.ephemeral === true
|
|
55
|
+
|| result.modelProvider !== message.providerId || result.model !== message.model
|
|
56
|
+
|| thread.status?.type !== 'idle'
|
|
57
|
+
) return { ok: false, reason: 'provider-switch-reconciliation-required' }
|
|
58
|
+
forks.set(message.operationToken, { threadId: thread.id, providerId: message.providerId, dispatched: false })
|
|
59
|
+
if (!current(message.threadId)) {
|
|
60
|
+
await discard(message.operationToken, thread.id)
|
|
61
|
+
return { ok: false, reason: 'provider-switch-reconciliation-required' }
|
|
62
|
+
}
|
|
63
|
+
return { ok: true, value: { threadId: thread.id } }
|
|
64
|
+
} catch (error) {
|
|
65
|
+
return error.nativeError === undefined
|
|
66
|
+
? { ok: false, reason: 'provider-switch-reconciliation-required' }
|
|
67
|
+
: { ok: false }
|
|
68
|
+
}
|
|
69
|
+
},
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/** Shared switch/fork scheduling preserves the existing lifecycle fence. */
|
|
74
|
+
export function dispatchNativeSelectionMutation(message, ports) {
|
|
75
|
+
const { switching, switchRequests, recoveringTurns, lifecyclePending, cancelledRecovery, uncertainSwitches } = ports
|
|
76
|
+
const { nativeCall, controlCall, switchNativeThread, continuation, write, control, closed, stop } = ports
|
|
77
|
+
if (!['switch', 'continuation-fork', 'continuation-discard'].includes(message.type)) return false
|
|
78
|
+
if (
|
|
79
|
+
typeof message.id !== 'string' || switching.has(message.threadId) || recoveringTurns.has(message.threadId)
|
|
80
|
+
|| lifecyclePending(message.threadId)
|
|
81
|
+
) {
|
|
82
|
+
void write(control, { id: message.id, ok: false }).catch(stop)
|
|
83
|
+
return true
|
|
84
|
+
}
|
|
85
|
+
switching.add(message.threadId)
|
|
86
|
+
switchRequests.set(message.id, message.threadId)
|
|
87
|
+
void (async () => {
|
|
88
|
+
try {
|
|
89
|
+
const result = message.type === 'switch'
|
|
90
|
+
? await switchNativeThread(message, {
|
|
91
|
+
nativeCall,
|
|
92
|
+
controlCall,
|
|
93
|
+
current: () => !closed() && !cancelledRecovery.has(message.threadId) && !lifecyclePending(message.threadId),
|
|
94
|
+
})
|
|
95
|
+
: await continuation.handle(message)
|
|
96
|
+
if (result.reason === 'provider-switch-reconciliation-required') {
|
|
97
|
+
uncertainSwitches.set(message.threadId, undefined)
|
|
98
|
+
}
|
|
99
|
+
await write(control, { id: message.id, ...result })
|
|
100
|
+
} catch {
|
|
101
|
+
await write(control, { id: message.id, ok: false })
|
|
102
|
+
} finally {
|
|
103
|
+
switching.delete(message.threadId)
|
|
104
|
+
switchRequests.delete(message.id)
|
|
105
|
+
cancelledRecovery.delete(message.threadId)
|
|
106
|
+
}
|
|
107
|
+
})().catch(stop)
|
|
108
|
+
return true
|
|
109
|
+
}
|
|
@@ -40,7 +40,7 @@ export function createNativeProviderTransport(primary, { executable, args, env,
|
|
|
40
40
|
if (pending) {
|
|
41
41
|
connection.pending.delete(key(message.id))
|
|
42
42
|
const thread = message.result?.thread
|
|
43
|
-
if (!message.error && thread?.id && ['thread/start', 'thread/resume'].includes(pending.method)) {
|
|
43
|
+
if (!message.error && thread?.id && ['thread/start', 'thread/resume', 'thread/fork'].includes(pending.method)) {
|
|
44
44
|
owners.set(thread.id, {
|
|
45
45
|
connection,
|
|
46
46
|
status: thread.status,
|
|
@@ -225,7 +225,7 @@ export function createNativeProviderTransport(primary, { executable, args, env,
|
|
|
225
225
|
) return
|
|
226
226
|
const params = object(message.params)
|
|
227
227
|
let connection = owners.get(params?.threadId)?.connection ?? primary
|
|
228
|
-
if (initializeParams && ['thread/start', 'thread/resume'].includes(message.method)) {
|
|
228
|
+
if (initializeParams && ['thread/start', 'thread/resume', 'thread/fork'].includes(message.method)) {
|
|
229
229
|
const config = object(params?.config)
|
|
230
230
|
const tables = config ? Object.keys(config).filter(name => name.startsWith('model_providers.')) : []
|
|
231
231
|
const id = provider(params?.modelProvider) ?? provider(config?.model_provider)
|