@botiverse/oar 0.71.0 → 0.72.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 +23 -4
- package/assets/brands/NOTICE.md +12 -2
- package/{LICENSE → assets/brands/QWEN-LICENSE.txt} +3 -2
- package/assets/brands/qoder-on-dark.svg +1 -0
- package/assets/brands/qoder-on-light.svg +1 -0
- package/assets/brands/qoder.svg +1 -0
- package/assets/brands/qwen-on-dark.svg +6 -0
- package/assets/brands/qwen-on-light.svg +6 -0
- package/assets/brands/qwen.svg +6 -0
- package/dist/brands.d.ts +16 -0
- package/dist/brands.d.ts.map +1 -1
- package/dist/brands.js +9 -0
- package/dist/brands.js.map +1 -1
- package/dist/community/morph/console.js +1 -1
- package/dist/community/morph/console.js.map +1 -1
- package/dist/community/morph/session.d.ts.map +1 -1
- package/dist/community/morph/session.js +1 -0
- package/dist/community/morph/session.js.map +1 -1
- package/dist/contracts/deliver.d.ts +27 -5
- package/dist/contracts/deliver.d.ts.map +1 -1
- package/dist/contracts/index.d.ts +3 -2
- package/dist/contracts/index.d.ts.map +1 -1
- package/dist/contracts/index.js.map +1 -1
- package/dist/contracts/login.d.ts +12 -4
- package/dist/contracts/login.d.ts.map +1 -1
- package/dist/contracts/orientation.d.ts +67 -0
- package/dist/contracts/orientation.d.ts.map +1 -0
- package/dist/contracts/orientation.js +2 -0
- package/dist/contracts/orientation.js.map +1 -0
- package/dist/contracts/provider-auth.d.ts +15 -5
- package/dist/contracts/provider-auth.d.ts.map +1 -1
- package/dist/contracts/records.d.ts +1 -0
- package/dist/contracts/records.d.ts.map +1 -1
- package/dist/contracts/runtime-failure-error.d.ts +6 -2
- package/dist/contracts/runtime-failure-error.d.ts.map +1 -1
- package/dist/contracts/runtime-failure-error.js +6 -2
- package/dist/contracts/runtime-failure-error.js.map +1 -1
- package/dist/contracts/runtime.d.ts +9 -5
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/contracts/session-options.d.ts +17 -3
- package/dist/contracts/session-options.d.ts.map +1 -1
- package/dist/contracts/session.d.ts +10 -4
- package/dist/contracts/session.d.ts.map +1 -1
- package/dist/index.d.ts +11 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +15 -2
- package/dist/index.js.map +1 -1
- package/dist/observe/conversation.d.ts +2 -0
- package/dist/observe/conversation.d.ts.map +1 -1
- package/dist/observe/conversation.js +56 -5
- package/dist/observe/conversation.js.map +1 -1
- package/dist/observe/index.d.ts +1 -0
- package/dist/observe/index.d.ts.map +1 -1
- package/dist/observe/index.js +1 -0
- package/dist/observe/index.js.map +1 -1
- package/dist/observe/input-carries.d.ts +5 -0
- package/dist/observe/input-carries.d.ts.map +1 -0
- package/dist/observe/input-carries.js +13 -0
- package/dist/observe/input-carries.js.map +1 -0
- package/dist/observe/session-view-inputs.d.ts.map +1 -1
- package/dist/observe/session-view-inputs.js +17 -5
- package/dist/observe/session-view-inputs.js.map +1 -1
- package/dist/observe/usability.d.ts +4 -0
- package/dist/observe/usability.d.ts.map +1 -0
- package/dist/observe/usability.js +102 -0
- package/dist/observe/usability.js.map +1 -0
- package/dist/runtimes/antigravity/options.d.ts.map +1 -1
- package/dist/runtimes/antigravity/options.js +1 -0
- package/dist/runtimes/antigravity/options.js.map +1 -1
- package/dist/runtimes/claude/auth-status.d.ts.map +1 -1
- package/dist/runtimes/claude/auth-status.js +4 -0
- package/dist/runtimes/claude/auth-status.js.map +1 -1
- package/dist/runtimes/claude/launch.d.ts +1 -1
- package/dist/runtimes/claude/launch.d.ts.map +1 -1
- package/dist/runtimes/claude/launch.js +36 -22
- package/dist/runtimes/claude/launch.js.map +1 -1
- package/dist/runtimes/claude/list-models.d.ts.map +1 -1
- package/dist/runtimes/claude/list-models.js +12 -0
- package/dist/runtimes/claude/list-models.js.map +1 -1
- package/dist/runtimes/claude/projection.d.ts +11 -76
- package/dist/runtimes/claude/projection.d.ts.map +1 -1
- package/dist/runtimes/claude/projection.js +36 -148
- package/dist/runtimes/claude/projection.js.map +1 -1
- package/dist/runtimes/claude/prompt-files.d.ts +7 -0
- package/dist/runtimes/claude/prompt-files.d.ts.map +1 -0
- package/dist/runtimes/claude/prompt-files.js +32 -0
- package/dist/runtimes/claude/prompt-files.js.map +1 -0
- package/dist/runtimes/claude/service-tier.d.ts +2 -2
- package/dist/runtimes/claude/service-tier.d.ts.map +1 -1
- package/dist/runtimes/claude/service-tier.js +4 -4
- package/dist/runtimes/claude/service-tier.js.map +1 -1
- package/dist/runtimes/claude/session.d.ts +1 -0
- package/dist/runtimes/claude/session.d.ts.map +1 -1
- package/dist/runtimes/claude/session.js +17 -249
- package/dist/runtimes/claude/session.js.map +1 -1
- package/dist/runtimes/claude/user-configuration.d.ts +9 -0
- package/dist/runtimes/claude/user-configuration.d.ts.map +1 -0
- package/dist/runtimes/claude/user-configuration.js +83 -0
- package/dist/runtimes/claude/user-configuration.js.map +1 -0
- package/dist/runtimes/codex/index.d.ts +3 -2
- package/dist/runtimes/codex/index.d.ts.map +1 -1
- package/dist/runtimes/codex/index.js +2 -0
- package/dist/runtimes/codex/index.js.map +1 -1
- package/dist/runtimes/codex/login.d.ts +3 -2
- package/dist/runtimes/codex/login.d.ts.map +1 -1
- package/dist/runtimes/codex/login.js +13 -3
- package/dist/runtimes/codex/login.js.map +1 -1
- package/dist/runtimes/codex/open.d.ts.map +1 -1
- package/dist/runtimes/codex/open.js +7 -1
- package/dist/runtimes/codex/open.js.map +1 -1
- package/dist/runtimes/codex/options.d.ts +3 -0
- package/dist/runtimes/codex/options.d.ts.map +1 -0
- package/dist/runtimes/codex/options.js +4 -0
- package/dist/runtimes/codex/options.js.map +1 -0
- package/dist/runtimes/cursor/auth-status.d.ts +1 -1
- package/dist/runtimes/cursor/auth-status.d.ts.map +1 -1
- package/dist/runtimes/cursor/auth-status.js +10 -2
- package/dist/runtimes/cursor/auth-status.js.map +1 -1
- package/dist/runtimes/cursor/index.d.ts +1 -0
- package/dist/runtimes/cursor/index.d.ts.map +1 -1
- package/dist/runtimes/cursor/index.js +1 -0
- package/dist/runtimes/cursor/index.js.map +1 -1
- package/dist/runtimes/cursor/model.d.ts.map +1 -1
- package/dist/runtimes/cursor/model.js +6 -1
- package/dist/runtimes/cursor/model.js.map +1 -1
- package/dist/runtimes/cursor/native-environment.d.ts +12 -0
- package/dist/runtimes/cursor/native-environment.d.ts.map +1 -0
- package/dist/runtimes/cursor/native-environment.js +24 -0
- package/dist/runtimes/cursor/native-environment.js.map +1 -0
- package/dist/runtimes/cursor/sdk.d.ts +1 -0
- package/dist/runtimes/cursor/sdk.d.ts.map +1 -1
- package/dist/runtimes/cursor/sdk.js +14 -32
- package/dist/runtimes/cursor/sdk.js.map +1 -1
- package/dist/runtimes/grok/options.d.ts.map +1 -1
- package/dist/runtimes/grok/options.js +1 -0
- package/dist/runtimes/grok/options.js.map +1 -1
- package/dist/runtimes/kimi/options.d.ts.map +1 -1
- package/dist/runtimes/kimi/options.js +1 -0
- package/dist/runtimes/kimi/options.js.map +1 -1
- package/dist/runtimes/opencode/options.d.ts.map +1 -1
- package/dist/runtimes/opencode/options.js +1 -0
- package/dist/runtimes/opencode/options.js.map +1 -1
- package/dist/runtimes/pi/auth.d.ts.map +1 -1
- package/dist/runtimes/pi/auth.js +9 -1
- package/dist/runtimes/pi/auth.js.map +1 -1
- package/dist/runtimes/pi/index.d.ts +12 -20
- package/dist/runtimes/pi/index.d.ts.map +1 -1
- package/dist/runtimes/pi/index.js +33 -15
- package/dist/runtimes/pi/index.js.map +1 -1
- package/dist/runtimes/pi/inventory.d.ts +3 -1
- package/dist/runtimes/pi/inventory.d.ts.map +1 -1
- package/dist/runtimes/pi/inventory.js +14 -5
- package/dist/runtimes/pi/inventory.js.map +1 -1
- package/dist/runtimes/pi/lifecycle.d.ts +2 -2
- package/dist/runtimes/pi/lifecycle.d.ts.map +1 -1
- package/dist/runtimes/pi/lifecycle.js +19 -8
- package/dist/runtimes/pi/lifecycle.js.map +1 -1
- package/dist/runtimes/pi/list-models.d.ts +2 -0
- package/dist/runtimes/pi/list-models.d.ts.map +1 -1
- package/dist/runtimes/pi/list-models.js +6 -2
- package/dist/runtimes/pi/list-models.js.map +1 -1
- package/dist/runtimes/pi/open.d.ts +4 -1
- package/dist/runtimes/pi/open.d.ts.map +1 -1
- package/dist/runtimes/pi/open.js +13 -7
- package/dist/runtimes/pi/open.js.map +1 -1
- package/dist/runtimes/pi/options.d.ts +21 -0
- package/dist/runtimes/pi/options.d.ts.map +1 -0
- package/dist/runtimes/pi/options.js +2 -0
- package/dist/runtimes/pi/options.js.map +1 -0
- package/dist/runtimes/pi/project.d.ts +7 -0
- package/dist/runtimes/pi/project.d.ts.map +1 -0
- package/dist/runtimes/pi/project.js +40 -0
- package/dist/runtimes/pi/project.js.map +1 -0
- package/dist/runtimes/pi/resolve.d.ts.map +1 -1
- package/dist/runtimes/pi/resolve.js +19 -2
- package/dist/runtimes/pi/resolve.js.map +1 -1
- package/dist/runtimes/pi/rpc/control.d.ts +7 -0
- package/dist/runtimes/pi/rpc/control.d.ts.map +1 -0
- package/dist/runtimes/pi/rpc/control.js +53 -0
- package/dist/runtimes/pi/rpc/control.js.map +1 -0
- package/dist/runtimes/pi/rpc/credentials.d.ts +4 -0
- package/dist/runtimes/pi/rpc/credentials.d.ts.map +1 -0
- package/dist/runtimes/pi/rpc/credentials.js +24 -0
- package/dist/runtimes/pi/rpc/credentials.js.map +1 -0
- package/dist/runtimes/pi/rpc/extension.d.ts +6 -0
- package/dist/runtimes/pi/rpc/extension.d.ts.map +1 -0
- package/dist/runtimes/pi/rpc/extension.js +68 -0
- package/dist/runtimes/pi/rpc/extension.js.map +1 -0
- package/dist/runtimes/pi/rpc/launch.d.ts +7 -0
- package/dist/runtimes/pi/rpc/launch.d.ts.map +1 -0
- package/dist/runtimes/pi/rpc/launch.js +26 -0
- package/dist/runtimes/pi/rpc/launch.js.map +1 -0
- package/dist/runtimes/pi/rpc/open.d.ts +19 -0
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -0
- package/dist/runtimes/pi/rpc/open.js +132 -0
- package/dist/runtimes/pi/rpc/open.js.map +1 -0
- package/dist/runtimes/pi/rpc/prompt-files.d.ts +4 -0
- package/dist/runtimes/pi/rpc/prompt-files.d.ts.map +1 -0
- package/dist/runtimes/pi/rpc/prompt-files.js +27 -0
- package/dist/runtimes/pi/rpc/prompt-files.js.map +1 -0
- package/dist/runtimes/pi/rpc/session.d.ts +5 -0
- package/dist/runtimes/pi/rpc/session.d.ts.map +1 -0
- package/dist/runtimes/pi/rpc/session.js +217 -0
- package/dist/runtimes/pi/rpc/session.js.map +1 -0
- package/dist/runtimes/pi/rpc/version.d.ts +3 -0
- package/dist/runtimes/pi/rpc/version.d.ts.map +1 -0
- package/dist/runtimes/pi/rpc/version.js +23 -0
- package/dist/runtimes/pi/rpc/version.js.map +1 -0
- package/dist/runtimes/pi/session.d.ts +2 -0
- package/dist/runtimes/pi/session.d.ts.map +1 -1
- package/dist/runtimes/pi/session.js +6 -8
- package/dist/runtimes/pi/session.js.map +1 -1
- package/dist/runtimes/pi-durable/options.d.ts.map +1 -1
- package/dist/runtimes/pi-durable/options.js +7 -2
- package/dist/runtimes/pi-durable/options.js.map +1 -1
- package/dist/runtimes/qoder/auth-status.d.ts +6 -0
- package/dist/runtimes/qoder/auth-status.d.ts.map +1 -0
- package/dist/runtimes/qoder/auth-status.js +22 -0
- package/dist/runtimes/qoder/auth-status.js.map +1 -0
- package/dist/runtimes/qoder/control.d.ts +14 -0
- package/dist/runtimes/qoder/control.d.ts.map +1 -0
- package/dist/runtimes/qoder/control.js +79 -0
- package/dist/runtimes/qoder/control.js.map +1 -0
- package/dist/runtimes/qoder/index.d.ts +22 -0
- package/dist/runtimes/qoder/index.d.ts.map +1 -0
- package/dist/runtimes/qoder/index.js +16 -0
- package/dist/runtimes/qoder/index.js.map +1 -0
- package/dist/runtimes/qoder/install.d.ts +6 -0
- package/dist/runtimes/qoder/install.d.ts.map +1 -0
- package/dist/runtimes/qoder/install.js +15 -0
- package/dist/runtimes/qoder/install.js.map +1 -0
- package/dist/runtimes/qoder/installation.d.ts +2 -0
- package/dist/runtimes/qoder/installation.d.ts.map +1 -0
- package/dist/runtimes/qoder/installation.js +5 -0
- package/dist/runtimes/qoder/installation.js.map +1 -0
- package/dist/runtimes/qoder/launch.d.ts +7 -0
- package/dist/runtimes/qoder/launch.d.ts.map +1 -0
- package/dist/runtimes/qoder/launch.js +76 -0
- package/dist/runtimes/qoder/launch.js.map +1 -0
- package/dist/runtimes/qoder/list-models.d.ts +6 -0
- package/dist/runtimes/qoder/list-models.d.ts.map +1 -0
- package/dist/runtimes/qoder/list-models.js +49 -0
- package/dist/runtimes/qoder/list-models.js.map +1 -0
- package/dist/runtimes/qoder/login.d.ts +6 -0
- package/dist/runtimes/qoder/login.d.ts.map +1 -0
- package/dist/runtimes/qoder/login.js +83 -0
- package/dist/runtimes/qoder/login.js.map +1 -0
- package/dist/runtimes/qoder/options.d.ts +4 -0
- package/dist/runtimes/qoder/options.d.ts.map +1 -0
- package/dist/runtimes/qoder/options.js +19 -0
- package/dist/runtimes/qoder/options.js.map +1 -0
- package/dist/runtimes/qoder/projection.d.ts +13 -0
- package/dist/runtimes/qoder/projection.d.ts.map +1 -0
- package/dist/runtimes/qoder/projection.js +42 -0
- package/dist/runtimes/qoder/projection.js.map +1 -0
- package/dist/runtimes/qoder/session.d.ts +3 -0
- package/dist/runtimes/qoder/session.d.ts.map +1 -0
- package/dist/runtimes/qoder/session.js +68 -0
- package/dist/runtimes/qoder/session.js.map +1 -0
- package/dist/runtimes/qwen/close.d.ts +4 -0
- package/dist/runtimes/qwen/close.d.ts.map +1 -0
- package/dist/runtimes/qwen/close.js +12 -0
- package/dist/runtimes/qwen/close.js.map +1 -0
- package/dist/runtimes/qwen/control.d.ts +15 -0
- package/dist/runtimes/qwen/control.d.ts.map +1 -0
- package/dist/runtimes/qwen/control.js +66 -0
- package/dist/runtimes/qwen/control.js.map +1 -0
- package/dist/runtimes/qwen/index.d.ts +20 -0
- package/dist/runtimes/qwen/index.d.ts.map +1 -0
- package/dist/runtimes/qwen/index.js +22 -0
- package/dist/runtimes/qwen/index.js.map +1 -0
- package/dist/runtimes/qwen/install-paths.d.ts +6 -0
- package/dist/runtimes/qwen/install-paths.d.ts.map +1 -0
- package/dist/runtimes/qwen/install-paths.js +13 -0
- package/dist/runtimes/qwen/install-paths.js.map +1 -0
- package/dist/runtimes/qwen/install.d.ts +6 -0
- package/dist/runtimes/qwen/install.d.ts.map +1 -0
- package/dist/runtimes/qwen/install.js +18 -0
- package/dist/runtimes/qwen/install.js.map +1 -0
- package/dist/runtimes/qwen/installation.d.ts +2 -0
- package/dist/runtimes/qwen/installation.d.ts.map +1 -0
- package/dist/runtimes/qwen/installation.js +5 -0
- package/dist/runtimes/qwen/installation.js.map +1 -0
- package/dist/runtimes/qwen/launch.d.ts +5 -0
- package/dist/runtimes/qwen/launch.d.ts.map +1 -0
- package/dist/runtimes/qwen/launch.js +25 -0
- package/dist/runtimes/qwen/launch.js.map +1 -0
- package/dist/runtimes/qwen/list-models.d.ts +6 -0
- package/dist/runtimes/qwen/list-models.d.ts.map +1 -0
- package/dist/runtimes/qwen/list-models.js +46 -0
- package/dist/runtimes/qwen/list-models.js.map +1 -0
- package/dist/runtimes/qwen/options.d.ts +5 -0
- package/dist/runtimes/qwen/options.d.ts.map +1 -0
- package/dist/runtimes/qwen/options.js +27 -0
- package/dist/runtimes/qwen/options.js.map +1 -0
- package/dist/runtimes/qwen/projection.d.ts +14 -0
- package/dist/runtimes/qwen/projection.d.ts.map +1 -0
- package/dist/runtimes/qwen/projection.js +41 -0
- package/dist/runtimes/qwen/projection.js.map +1 -0
- package/dist/runtimes/qwen/session.d.ts +8 -0
- package/dist/runtimes/qwen/session.d.ts.map +1 -0
- package/dist/runtimes/qwen/session.js +73 -0
- package/dist/runtimes/qwen/session.js.map +1 -0
- package/dist/shared/acp/terminal.d.ts.map +1 -1
- package/dist/shared/acp/terminal.js +13 -3
- package/dist/shared/acp/terminal.js.map +1 -1
- package/dist/shared/control-input.d.ts +3 -1
- package/dist/shared/control-input.d.ts.map +1 -1
- package/dist/shared/control-input.js +11 -0
- package/dist/shared/control-input.js.map +1 -1
- package/dist/shared/deliver-interrupt.d.ts +49 -0
- package/dist/shared/deliver-interrupt.d.ts.map +1 -0
- package/dist/shared/deliver-interrupt.js +195 -0
- package/dist/shared/deliver-interrupt.js.map +1 -0
- package/dist/shared/deliver.d.ts.map +1 -1
- package/dist/shared/deliver.js +17 -2
- package/dist/shared/deliver.js.map +1 -1
- package/dist/shared/executable/process-tree.d.ts +1 -1
- package/dist/shared/executable/process-tree.d.ts.map +1 -1
- package/dist/shared/executable/process-tree.js +25 -2
- package/dist/shared/executable/process-tree.js.map +1 -1
- package/dist/shared/executable/process.d.ts +10 -5
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +25 -12
- package/dist/shared/executable/process.js.map +1 -1
- package/dist/shared/executable/run.d.ts.map +1 -1
- package/dist/shared/executable/run.js +7 -2
- package/dist/shared/executable/run.js.map +1 -1
- package/dist/shared/orientation/budget.d.ts +12 -0
- package/dist/shared/orientation/budget.d.ts.map +1 -0
- package/dist/shared/orientation/budget.js +61 -0
- package/dist/shared/orientation/budget.js.map +1 -0
- package/dist/shared/orientation/customization.d.ts +8 -0
- package/dist/shared/orientation/customization.d.ts.map +1 -0
- package/dist/shared/orientation/customization.js +57 -0
- package/dist/shared/orientation/customization.js.map +1 -0
- package/dist/shared/orientation/index.d.ts +5 -0
- package/dist/shared/orientation/index.d.ts.map +1 -0
- package/dist/shared/orientation/index.js +88 -0
- package/dist/shared/orientation/index.js.map +1 -0
- package/dist/shared/orientation/slots.d.ts +6 -0
- package/dist/shared/orientation/slots.d.ts.map +1 -0
- package/dist/shared/orientation/slots.js +26 -0
- package/dist/shared/orientation/slots.js.map +1 -0
- package/dist/shared/seal-session.d.ts.map +1 -1
- package/dist/shared/seal-session.js.map +1 -1
- package/dist/shared/session-kernel.d.ts.map +1 -1
- package/dist/shared/session-kernel.js +36 -8
- package/dist/shared/session-kernel.js.map +1 -1
- package/dist/shared/session-options.d.ts +1 -1
- package/dist/shared/session-options.d.ts.map +1 -1
- package/dist/shared/session-options.js +5 -2
- package/dist/shared/session-options.js.map +1 -1
- package/dist/{runtimes/claude → shared/stream-json}/content.d.ts +5 -5
- package/dist/shared/stream-json/content.d.ts.map +1 -0
- package/dist/{runtimes/claude → shared/stream-json}/content.js +16 -10
- package/dist/shared/stream-json/content.js.map +1 -0
- package/dist/shared/stream-json/input-lifecycle.d.ts +24 -0
- package/dist/shared/stream-json/input-lifecycle.d.ts.map +1 -0
- package/dist/{runtimes/claude → shared/stream-json}/input-lifecycle.js +15 -11
- package/dist/shared/stream-json/input-lifecycle.js.map +1 -0
- package/dist/shared/stream-json/profile.d.ts +55 -0
- package/dist/shared/stream-json/profile.d.ts.map +1 -0
- package/dist/shared/stream-json/profile.js +2 -0
- package/dist/shared/stream-json/profile.js.map +1 -0
- package/dist/shared/stream-json/projection.d.ts +28 -0
- package/dist/shared/stream-json/projection.d.ts.map +1 -0
- package/dist/shared/stream-json/projection.js +122 -0
- package/dist/shared/stream-json/projection.js.map +1 -0
- package/dist/shared/stream-json/session.d.ts +8 -0
- package/dist/shared/stream-json/session.d.ts.map +1 -0
- package/dist/shared/stream-json/session.js +270 -0
- package/dist/shared/stream-json/session.js.map +1 -0
- package/dist/shared/stream-json/state.d.ts +25 -0
- package/dist/shared/stream-json/state.d.ts.map +1 -0
- package/dist/shared/stream-json/state.js +17 -0
- package/dist/shared/stream-json/state.js.map +1 -0
- package/package.json +1 -1
- package/dist/runtimes/claude/content.d.ts.map +0 -1
- package/dist/runtimes/claude/content.js.map +0 -1
- package/dist/runtimes/claude/input-lifecycle.d.ts +0 -24
- package/dist/runtimes/claude/input-lifecycle.d.ts.map +0 -1
- package/dist/runtimes/claude/input-lifecycle.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../src/shared/acp/terminal.ts"],"names":[],"mappings":"AAAA,sHAAsH;AACtH,OAAO,EACL,YAAY,GAWb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../src/shared/acp/terminal.ts"],"names":[],"mappings":"AAAA,sHAAsH;AACtH,OAAO,EACL,YAAY,GAWb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEnH,MAAM,oBAAoB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAC7C,MAAM,gBAAgB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;AAiC1C,SAAS,OAAO,CAAC,OAAe;IAC9B,MAAM,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC;AAED,SAAS,WAAW,CAAC,KAAgC;IACnD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC1C,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACzC,OAAO,CAAC,6DAA6D,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC;AACvD,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAa,EAAE,KAAa;IAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnC,IAAI,OAAO,CAAC,UAAU,IAAI,KAAK,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,GAAG,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC;IACvC,OAAO,KAAK,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YACjD,MAAM;QACR,CAAC;QACD,KAAK,IAAI,CAAC,CAAC;IACb,CAAC;IACD,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,YAAY,CAAC,KAAoB,EAAE,IAAY;IACtD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,KAAK,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;IAC1C,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QACpD,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;QACvB,KAAK,CAAC,MAAM,GAAG,uBAAuB,CAAC,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IACtE,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAClB,SAA6C,EAC7C,MAA6B;IAE7B,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAClD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,EAAE,CAAC;QACtE,OAAO,CAAC,yBAAyB,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,KAAoB;IAC9C,2EAA2E;IAC3E,uEAAuE;IACvE,wDAAwD;IACxD,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;QAC9B,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACjC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,kBAAkB,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IACD,MAAM,KAAK,CAAC,MAAM,CAAC;AACrB,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,qBAAqB,CACnC,GAAW,EACX,WAA8B,EAC9B,UAAkC,EAAE;IAEpC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAyB,CAAC;IAEnD,MAAM,MAAM,GAAG,KAAK,EAAE,MAA6B,EAAmC,EAAE;QACtF,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,uCAAuC,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YACpF,OAAO,CAAC,2CAA2C,CAAC,CAAC;QACvD,CAAC;QACD,MAAM,UAAU,GAAG,UAAU,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE;YACrD,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG;YACtB,GAAG,EAAE;gBACH,GAAG,WAAW;gBACd,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;aAClF;YACD,KAAK,EAAE,OAAO,CAAC,YAAY,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;YACjE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;YACjC,wEAAwE;YACxE,8DAA8D;YAC9D,QAAQ,EAAE,iBAAiB;SAC5B,CAAC,CAAC;QACH,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACzB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QACjC,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACvC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtB,MAAM,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE,4CAA4C,CAAC,CAAC;QAC5F,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,GACxE,OAAO,CAAC,aAAa,EAAQ,CAAC;QAChC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,aAAa,EAAc,CAAC;QACxF,MAAM,KAAK,GAAkB;YAC3B,KAAK;YACL,MAAM;YACN,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,aAAa,EAAE,IAAI,aAAa,CAAC,MAAM,CAAC;YACxC,aAAa,EAAE,IAAI,aAAa,CAAC,MAAM,CAAC;YACxC,UAAU;YACV,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC;YAChD,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,EAAE;YACV,SAAS,EAAE,KAAK;SACjB,CAAC;QACF,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACjC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAsB,EAAE,EAAE;YAC3C,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAsB,EAAE,EAAE;YAC3C,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,MAAkB,EAAQ,EAAE;YAC1C,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;gBAC9B,OAAO;YACT,CAAC;YACD,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC;YAC/C,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC;YAC/C,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC;YAC1B,aAAa,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACpC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;YACvC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC5B,aAAa,CAAC,KAAK,CAAC,CAAC;YACrB,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,IAAI,CAAC;YACH,MAAM,OAAO,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC7B,MAAM,YAAY,CAAC,aAAa,CAC9B,SAAS,EACT,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,+BAA+B,CACzE,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,CAAC;IACxB,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,MAA6B,EAA0B,EAAE;QACvE,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC7C,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;SACvE,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,KAAK,EACvB,MAAkC,EACI,EAAE,CAAC,CAAC;QAC1C,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,MAAM;KAC/C,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,CAAC,MAA2B,EAAwB,EAAE;QACjE,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC7C,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YAC9B,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACjC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,kBAAkB,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,KAAK,EAAE,MAA8B,EAAoC,EAAE;QACzF,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC7C,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACnC,MAAM,YAAY,CAAC,KAAK,CAAC,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,OAAO;QACL,MAAM;QACN,MAAM;QACN,WAAW;QACX,IAAI;QACJ,OAAO;QACP,KAAK,CAAC,OAAO;YACX,MAAM,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;YACvC,SAAS,CAAC,KAAK,EAAE,CAAC;YAClB,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC3C,MAAM,YAAY,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC,CAAC;QACN,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import type { RequestBody, ResponseBody } from "../contracts/session.js";
|
|
1
|
+
import type { RawEvent, RequestBody, ResponseBody } from "../contracts/session.js";
|
|
2
2
|
/** Refuse an input with neither text nor images before contacting the runtime. Whitespace is left intact. */
|
|
3
3
|
export declare function emptyInputRefusal(body: RequestBody): ResponseBody | null;
|
|
4
|
+
/** Validate before publishing the attempt, while the original ownership is still visible. */
|
|
5
|
+
export declare function carriesRefusal(body: RequestBody, records: readonly RawEvent[], sessionId: string, agentPath: readonly string[]): ResponseBody | null;
|
|
4
6
|
//# sourceMappingURL=control-input.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"control-input.d.ts","sourceRoot":"","sources":["../../src/shared/control-input.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"control-input.d.ts","sourceRoot":"","sources":["../../src/shared/control-input.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEnF,6GAA6G;AAC7G,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,WAAW,GAAG,YAAY,GAAG,IAAI,CAMxE;AAED,6FAA6F;AAC7F,wBAAgB,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,YAAY,GAAG,IAAI,CAKpJ"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { conversationOf } from "../observe/conversation.js";
|
|
2
|
+
import { invalidCarriedInput } from "../observe/input-carries.js";
|
|
1
3
|
/** Refuse an input with neither text nor images before contacting the runtime. Whitespace is left intact. */
|
|
2
4
|
export function emptyInputRefusal(body) {
|
|
3
5
|
if ((body.kind === "prompt" || body.kind === "steer" || body.kind === "queue")
|
|
@@ -6,4 +8,13 @@ export function emptyInputRefusal(body) {
|
|
|
6
8
|
}
|
|
7
9
|
return null;
|
|
8
10
|
}
|
|
11
|
+
/** Validate before publishing the attempt, while the original ownership is still visible. */
|
|
12
|
+
export function carriesRefusal(body, records, sessionId, agentPath) {
|
|
13
|
+
if (body.kind !== "prompt" || (body.carries?.length ?? 0) === 0) {
|
|
14
|
+
return null;
|
|
15
|
+
}
|
|
16
|
+
const inputs = conversationOf(records).inputs;
|
|
17
|
+
const invalid = invalidCarriedInput(body, (id) => inputs.get(JSON.stringify([sessionId, agentPath, id])));
|
|
18
|
+
return invalid === undefined ? null : { kind: "rejected", code: "unsupported", reason: `carries input ${invalid} is not a withdrawn input owned by this session and agent` };
|
|
19
|
+
}
|
|
9
20
|
//# sourceMappingURL=control-input.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"control-input.js","sourceRoot":"","sources":["../../src/shared/control-input.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"control-input.js","sourceRoot":"","sources":["../../src/shared/control-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAGlE,6GAA6G;AAC7G,MAAM,UAAU,iBAAiB,CAAC,IAAiB;IACjD,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC;WACzE,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3D,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,kCAAkC,EAAE,CAAC;IAC/F,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,6FAA6F;AAC7F,MAAM,UAAU,cAAc,CAAC,IAAiB,EAAE,OAA4B,EAAE,SAAiB,EAAE,SAA4B;IAC7H,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IACjF,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;IAC9C,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1G,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,OAAO,2DAA2D,EAAE,CAAC;AAC/K,CAAC"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import type { ControlOutcome, DeliverOptions, DeliverResult, Session } from "../contracts/session.js";
|
|
2
|
+
type InterruptOptions = Extract<DeliverOptions, {
|
|
3
|
+
when: "interrupt";
|
|
4
|
+
}> & {
|
|
5
|
+
readonly inputId: string;
|
|
6
|
+
};
|
|
7
|
+
type BatchResult = Omit<Extract<DeliverResult, {
|
|
8
|
+
landed: "rejected";
|
|
9
|
+
}>, "inputId"> | {
|
|
10
|
+
readonly landed: "prompted";
|
|
11
|
+
readonly result: ControlOutcome;
|
|
12
|
+
readonly mergedInputIds: readonly string[];
|
|
13
|
+
};
|
|
14
|
+
export declare function pendingInterrupt(session: Session): InterruptBatch | undefined;
|
|
15
|
+
export declare function interruptInto(session: Session, input: string, options: InterruptOptions): Promise<DeliverResult>;
|
|
16
|
+
/** An ephemeral control operation. Inputs, ownership and tool boundaries remain facts of the record stream. */
|
|
17
|
+
declare class InterruptBatch {
|
|
18
|
+
private readonly session;
|
|
19
|
+
private readonly options;
|
|
20
|
+
private readonly completion;
|
|
21
|
+
readonly done: Promise<BatchResult>;
|
|
22
|
+
private readonly ended;
|
|
23
|
+
private readonly tools;
|
|
24
|
+
private readonly queued;
|
|
25
|
+
private readonly withdrawals;
|
|
26
|
+
private readonly stop;
|
|
27
|
+
private timer;
|
|
28
|
+
private deadline;
|
|
29
|
+
private collecting;
|
|
30
|
+
private nativeEnd;
|
|
31
|
+
private exited;
|
|
32
|
+
private disposed;
|
|
33
|
+
private ready;
|
|
34
|
+
private settled;
|
|
35
|
+
private readonly since;
|
|
36
|
+
constructor(session: Session, options: InterruptOptions);
|
|
37
|
+
accepting(): boolean;
|
|
38
|
+
join(input: string, options: InterruptOptions): Promise<DeliverResult>;
|
|
39
|
+
private track;
|
|
40
|
+
private takeHeld;
|
|
41
|
+
private collect;
|
|
42
|
+
private send;
|
|
43
|
+
private afterWithdrawal;
|
|
44
|
+
private hasEnded;
|
|
45
|
+
private failure;
|
|
46
|
+
private finish;
|
|
47
|
+
}
|
|
48
|
+
export {};
|
|
49
|
+
//# sourceMappingURL=deliver-interrupt.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deliver-interrupt.d.ts","sourceRoot":"","sources":["../../src/shared/deliver-interrupt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAyC,cAAc,EAAE,aAAa,EAA2B,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGtK,KAAK,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AACtG,KAAK,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC,EAAE,SAAS,CAAC,GAAG;IACnF,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1G,CAAC;AAGF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS,CAAiC;AAE/G,wBAAsB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAQtH;AAOD,+GAA+G;AAC/G,cAAM,cAAc;IAkBN,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAW,OAAO,CAAC,QAAQ,CAAC,OAAO;IAjBvE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAwC;IACnE,QAAQ,CAAC,IAAI,uBAA2B;IACxC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IACxD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsG;IAClI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,KAAK,CAA4C;IACzD,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;gBAEF,OAAO,EAAE,OAAO,EAAmB,OAAO,EAAE,gBAAgB;IAWzF,SAAS,IAAI,OAAO;IAEd,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IA2B5E,OAAO,CAAC,KAAK;IAYb,OAAO,CAAC,QAAQ;IAehB,OAAO,CAAC,OAAO;YAQD,IAAI;YAuBJ,eAAe;IAiB7B,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,MAAM;CAMf"}
|
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
import { conversationOf } from "../observe/conversation.js";
|
|
2
|
+
const batches = new WeakMap();
|
|
3
|
+
export function pendingInterrupt(session) { return batches.get(session); }
|
|
4
|
+
export async function interruptInto(session, input, options) {
|
|
5
|
+
if (session.withdraw === undefined) {
|
|
6
|
+
return { landed: "rejected", inputId: options.inputId, code: "unsupported", reason: "interrupt requires withdrawal of held inputs", undeliveredInputIds: [options.inputId] };
|
|
7
|
+
}
|
|
8
|
+
const batch = new InterruptBatch(session, options);
|
|
9
|
+
batches.set(session, batch);
|
|
10
|
+
const result = await batch.join(input, options);
|
|
11
|
+
return result;
|
|
12
|
+
}
|
|
13
|
+
function mergeInputs(inputs) {
|
|
14
|
+
const images = inputs.flatMap((input) => input.images ?? []);
|
|
15
|
+
return { input: inputs.map((input) => input.input).join("\n\n"), ...(images.length === 0 ? {} : { images }) };
|
|
16
|
+
}
|
|
17
|
+
/** An ephemeral control operation. Inputs, ownership and tool boundaries remain facts of the record stream. */
|
|
18
|
+
class InterruptBatch {
|
|
19
|
+
session;
|
|
20
|
+
options;
|
|
21
|
+
completion = Promise.withResolvers();
|
|
22
|
+
done = this.completion.promise;
|
|
23
|
+
ended = Promise.withResolvers();
|
|
24
|
+
tools = new Set();
|
|
25
|
+
queued = [];
|
|
26
|
+
withdrawals = new Map();
|
|
27
|
+
stop;
|
|
28
|
+
timer;
|
|
29
|
+
deadline = Infinity;
|
|
30
|
+
collecting = false;
|
|
31
|
+
nativeEnd = false;
|
|
32
|
+
exited = false;
|
|
33
|
+
disposed = false;
|
|
34
|
+
ready = false;
|
|
35
|
+
settled = 0;
|
|
36
|
+
since;
|
|
37
|
+
constructor(session, options) {
|
|
38
|
+
this.session = session;
|
|
39
|
+
this.options = options;
|
|
40
|
+
const status = session.status().value;
|
|
41
|
+
this.since = status.kind === "running" ? status.sinceSeq : -1;
|
|
42
|
+
for (const record of session.records()) {
|
|
43
|
+
this.track(record);
|
|
44
|
+
}
|
|
45
|
+
this.stop = session.rawEvents((record) => {
|
|
46
|
+
this.track(record);
|
|
47
|
+
// Withdraw synchronously before the adapter can drain on natural end.
|
|
48
|
+
if (this.nativeEnd || this.exited || this.disposed || (this.ready && this.tools.size === 0)) {
|
|
49
|
+
this.collect();
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
accepting() { return !this.collecting; }
|
|
54
|
+
async join(input, options) {
|
|
55
|
+
const { when: _when, maxWaitMs, merge: _merge, ...inputOptions } = options;
|
|
56
|
+
this.deadline = Math.min(this.deadline, Date.now() + maxWaitMs);
|
|
57
|
+
const pending = this.session.queue(input, inputOptions);
|
|
58
|
+
this.queued.push(pending);
|
|
59
|
+
const queued = await pending;
|
|
60
|
+
this.settled += 1;
|
|
61
|
+
if (queued.kind === "rejected") {
|
|
62
|
+
if (!this.ready && this.settled === this.queued.length && !this.collecting) {
|
|
63
|
+
this.finish(this.failure(queued.code, queued.reason, [options.inputId], queued));
|
|
64
|
+
}
|
|
65
|
+
return { ...this.failure(queued.code, queued.reason, [options.inputId], queued), inputId: options.inputId };
|
|
66
|
+
}
|
|
67
|
+
this.ready = true;
|
|
68
|
+
if (!this.collecting) {
|
|
69
|
+
clearTimeout(this.timer);
|
|
70
|
+
if (this.tools.size === 0 || Date.now() >= this.deadline) {
|
|
71
|
+
this.collect();
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
this.timer = setTimeout(() => { this.collect(); }, this.deadline - Date.now());
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
const outcome = await this.done;
|
|
78
|
+
const included = outcome.landed === "prompted" ? outcome.mergedInputIds : outcome.undeliveredInputIds ?? [];
|
|
79
|
+
// A queue already dispatched at the natural boundary remains runtime-owned.
|
|
80
|
+
// Never tell a caller to resend an accepted input we could not withdraw.
|
|
81
|
+
return included.includes(options.inputId)
|
|
82
|
+
? { ...outcome, inputId: options.inputId }
|
|
83
|
+
: { landed: "queued", inputId: options.inputId, result: queued,
|
|
84
|
+
...(outcome.landed === "prompted" ? { mergedInputIds: outcome.mergedInputIds } : { undeliveredInputIds: outcome.undeliveredInputIds ?? [] }) };
|
|
85
|
+
}
|
|
86
|
+
track(record) {
|
|
87
|
+
if (record.sessionId !== this.session.id || record.agentPath.length > 0 || record.seq < this.since) {
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
if (record.kind === "response" && record.body.kind === "exited") {
|
|
91
|
+
this.exited = true;
|
|
92
|
+
this.ended.resolve();
|
|
93
|
+
}
|
|
94
|
+
if (record.kind === "request" && record.direction === "toRuntime" && record.body.kind === "dispose") {
|
|
95
|
+
this.disposed = true;
|
|
96
|
+
this.ended.resolve();
|
|
97
|
+
}
|
|
98
|
+
if (record.kind !== "frame") {
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
for (const event of record.body.events) {
|
|
102
|
+
if (event.kind === "tool_call_started") {
|
|
103
|
+
this.tools.add(event.callId);
|
|
104
|
+
}
|
|
105
|
+
if (event.kind === "tool_call_ended") {
|
|
106
|
+
this.tools.delete(event.callId);
|
|
107
|
+
}
|
|
108
|
+
if (event.kind === "turn_ended") {
|
|
109
|
+
this.nativeEnd = true;
|
|
110
|
+
this.ended.resolve();
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
takeHeld() {
|
|
115
|
+
const withdraw = this.session.withdraw?.bind(this.session);
|
|
116
|
+
if (withdraw === undefined) {
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
const inputs = [...conversationOf(this.session.records()).inputs.values()].toSorted((a, b) => (a.attempts.at(-1)?.request.seq ?? 0) - (b.attempts.at(-1)?.request.seq ?? 0));
|
|
120
|
+
for (const input of inputs) {
|
|
121
|
+
const last = input.attempts.at(-1);
|
|
122
|
+
if (input.inputId === undefined || this.withdrawals.has(input.inputId) || last?.request.body.kind !== "queue"
|
|
123
|
+
|| last.state === "rejected" || last.request.sessionId !== this.session.id || last.request.agentPath.length > 0
|
|
124
|
+
|| input.state === "dropped") {
|
|
125
|
+
continue;
|
|
126
|
+
}
|
|
127
|
+
const value = { inputId: input.inputId, input: input.input, ...(input.images === undefined ? {} : { images: input.images }), ...(input.origin === undefined ? {} : { origin: input.origin }) };
|
|
128
|
+
// Each call removes its entry synchronously; never await between entries.
|
|
129
|
+
this.withdrawals.set(input.inputId, { input: value, result: withdraw(input.inputId) });
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
collect() {
|
|
133
|
+
if (this.collecting) {
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
this.collecting = true;
|
|
137
|
+
clearTimeout(this.timer);
|
|
138
|
+
this.takeHeld();
|
|
139
|
+
void this.send();
|
|
140
|
+
}
|
|
141
|
+
async send() {
|
|
142
|
+
let inputs = [];
|
|
143
|
+
try {
|
|
144
|
+
await Promise.all(this.queued);
|
|
145
|
+
this.takeHeld();
|
|
146
|
+
const taken = await Promise.all([...this.withdrawals.values()].map(async (entry) => ({ input: entry.input, result: await entry.result })));
|
|
147
|
+
inputs = taken.filter((entry) => entry.result.kind === "accepted" || (entry.result.code === "runtime_exited" || entry.result.code === "disposed")).map((entry) => entry.input);
|
|
148
|
+
const failure = taken.find((entry) => entry.result.kind === "rejected" && entry.result.code !== "not_queued");
|
|
149
|
+
if (failure?.result.kind === "rejected") {
|
|
150
|
+
this.finish(this.failure(failure.result.code, failure.result.reason, inputs.map((value) => value.inputId), failure.result));
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
if (inputs.length === 0) {
|
|
154
|
+
this.finish(this.failure("not_queued", "no held inputs remain to interrupt for", []));
|
|
155
|
+
return;
|
|
156
|
+
}
|
|
157
|
+
const result = await this.afterWithdrawal(inputs);
|
|
158
|
+
this.finish(result);
|
|
159
|
+
}
|
|
160
|
+
catch (error) {
|
|
161
|
+
this.finish(this.failure("error", error instanceof Error ? error.message : String(error), inputs.map((value) => value.inputId)));
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
async afterWithdrawal(inputs) {
|
|
165
|
+
const ids = inputs.map((input) => input.inputId);
|
|
166
|
+
if (!this.nativeEnd && !this.exited && !this.disposed) {
|
|
167
|
+
const aborted = await this.session.abort();
|
|
168
|
+
if (aborted.kind === "rejected" && !this.hasEnded()) {
|
|
169
|
+
return this.failure(aborted.code, aborted.reason, ids, aborted);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
if (!this.nativeEnd && !this.exited && !this.disposed) {
|
|
173
|
+
await this.ended.promise;
|
|
174
|
+
}
|
|
175
|
+
if (this.exited || this.disposed || !this.nativeEnd) {
|
|
176
|
+
return this.failure(this.disposed ? "disposed" : "runtime_exited", "runtime did not remain available after its own turn end; inputs were not redelivered", ids);
|
|
177
|
+
}
|
|
178
|
+
const merged = (this.options.merge ?? mergeInputs)(inputs);
|
|
179
|
+
const result = await this.session.prompt(merged.input, { ...(merged.images === undefined ? {} : { images: merged.images }), carries: ids });
|
|
180
|
+
return result.kind === "accepted"
|
|
181
|
+
? { landed: "prompted", result, mergedInputIds: ids }
|
|
182
|
+
: this.failure(result.code, result.reason, ids, result);
|
|
183
|
+
}
|
|
184
|
+
hasEnded() { return this.nativeEnd; }
|
|
185
|
+
failure(code, reason, ids, result) {
|
|
186
|
+
return { landed: "rejected", code, reason, undeliveredInputIds: ids, ...(result === undefined ? {} : { result }) };
|
|
187
|
+
}
|
|
188
|
+
finish(result) {
|
|
189
|
+
clearTimeout(this.timer);
|
|
190
|
+
this.stop();
|
|
191
|
+
batches.delete(this.session);
|
|
192
|
+
this.completion.resolve(result);
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
//# sourceMappingURL=deliver-interrupt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deliver-interrupt.js","sourceRoot":"","sources":["../../src/shared/deliver-interrupt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliver.d.ts","sourceRoot":"","sources":["../../src/shared/deliver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,cAAc,EAAE,aAAa,EAAgB,OAAO,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"deliver.d.ts","sourceRoot":"","sources":["../../src/shared/deliver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,cAAc,EAAE,aAAa,EAAgB,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAgDpH,6EAA6E;AAC7E,wBAAsB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAuCjJ"}
|
package/dist/shared/deliver.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { interruptInto, pendingInterrupt } from "./deliver-interrupt.js";
|
|
1
2
|
import { awaitIdle } from "../observe/turns.js";
|
|
2
3
|
/** Attempts across prompt / steer / queue races before reporting the last refusal. */
|
|
3
4
|
const MAX_ATTEMPTS = 4;
|
|
@@ -39,7 +40,18 @@ async function intoRunning(session, input, options, when) {
|
|
|
39
40
|
}
|
|
40
41
|
/** `Session.deliver`, derived from the session's own controls and status. */
|
|
41
42
|
export async function deliverInto(session, input, options) {
|
|
42
|
-
|
|
43
|
+
if (options.when === "interrupt" && (!Number.isFinite(options.maxWaitMs) || options.maxWaitMs < 0)) {
|
|
44
|
+
throw new RangeError("interrupt maxWaitMs must be finite and nonnegative");
|
|
45
|
+
}
|
|
46
|
+
const pending = pendingInterrupt(session);
|
|
47
|
+
if (pending !== undefined) {
|
|
48
|
+
if (options.when === "interrupt" && pending.accepting()) {
|
|
49
|
+
return pending.join(input, options);
|
|
50
|
+
}
|
|
51
|
+
await pending.done;
|
|
52
|
+
return deliverInto(session, input, options);
|
|
53
|
+
}
|
|
54
|
+
const { when = "now", maxWaitMs: _wait, merge: _merge, ...inputOptions } = options;
|
|
43
55
|
let last = null;
|
|
44
56
|
for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt += 1) {
|
|
45
57
|
if (when === "when_idle") {
|
|
@@ -56,7 +68,10 @@ export async function deliverInto(session, input, options) {
|
|
|
56
68
|
// A turn opened between the status read and the prompt: deliver into it.
|
|
57
69
|
}
|
|
58
70
|
if (when !== "when_idle") {
|
|
59
|
-
|
|
71
|
+
if (options.when === "interrupt" && session.steer === undefined) {
|
|
72
|
+
return interruptInto(session, input, options);
|
|
73
|
+
}
|
|
74
|
+
const result = await intoRunning(session, input, inputOptions, when === "interrupt" ? "now" : when);
|
|
60
75
|
if (result !== null) {
|
|
61
76
|
return result;
|
|
62
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliver.js","sourceRoot":"","sources":["../../src/shared/deliver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,sFAAsF;AACtF,MAAM,YAAY,GAAG,CAAC,CAAC;AAGvB,SAAS,MAAM,CAAC,IAAuC,EAAE,OAAe,EAAE,MAAsB;IAC9F,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC3C,CAAC;AAED,SAAS,OAAO,CAAC,OAAe,EAAE,MAAsB;IACtD,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU;QAC/B,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE;QACnF,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;AACvF,CAAC;AAED,kEAAkE;AAClE,SAAS,YAAY,CAAC,OAAgB;IACpC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;IACtC,OAAO,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;AAC5D,CAAC;AAED,uFAAuF;AACvF,KAAK,UAAU,WAAW,CAAC,OAAgB,EAAE,KAAa,EAAE,OAAoD,EAAE,IAA0B;IAC1I,iFAAiF;IACjF,IAAI,IAAI,KAAK,KAAK,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAClD,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAChC,OAAO,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,CAAC;QACD,wEAAwE;QACxE,uEAAuE;QACvE,sEAAsE;QACtE,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAgB,IAAI,YAAY,CAAC,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC;YAC1E,OAAO,IAAI,CAAC;QACd,CAAC;QACD,iFAAiF;QACjF,IAAI,OAAO,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACnC,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACnD,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACnH,CAAC;AAED,6EAA6E;AAC7E,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAAgB,EAAE,KAAa,EAAE,OAAsD;IACvH,MAAM,EAAE,IAAI,GAAG,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"deliver.js","sourceRoot":"","sources":["../../src/shared/deliver.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export type ProcessTable = ReadonlyMap<number, ProcessEntry>;
|
|
|
11
11
|
* The process table now (synchronous: the host's `exit` hook reads it too).
|
|
12
12
|
* Empty when it cannot be read; the caller then reaches the process group only.
|
|
13
13
|
*/
|
|
14
|
-
export declare function readProcessTable(source?: "procfs" | "ps"): ProcessTable;
|
|
14
|
+
export declare function readProcessTable(source?: "procfs" | "ps" | "windows"): ProcessTable;
|
|
15
15
|
/** Every process below `pid` in `table`: its children, theirs, and so on. */
|
|
16
16
|
export declare function descendantsOf(table: ProcessTable, pid: number): ProcessEntry[];
|
|
17
17
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-tree.d.ts","sourceRoot":"","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process-tree.d.ts","sourceRoot":"","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"AAeA,0FAA0F;AAC1F,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,+CAA+C;AAC/C,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAoE7D;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,GAAE,QAAQ,GAAG,IAAI,GAAG,SAAuG,GAAG,YAAY,CAMhL;AAED,6EAA6E;AAC7E,wBAAgB,aAAa,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,YAAY,EAAE,CAuB9E;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CA4BtF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { execFileSync } from "node:child_process";
|
|
2
2
|
import { readdirSync, readFileSync } from "node:fs";
|
|
3
|
+
import { asRecord } from "../json.js";
|
|
3
4
|
/** `/proc/<pid>/stat`'s ppid, pgrp and starttime (clock ticks since boot); null once the process is gone. */
|
|
4
5
|
function readStat(pid) {
|
|
5
6
|
let stat = "";
|
|
@@ -45,13 +46,35 @@ function readPs() {
|
|
|
45
46
|
}
|
|
46
47
|
return table;
|
|
47
48
|
}
|
|
49
|
+
/** Windows has no process groups; creation time distinguishes reused PIDs. */
|
|
50
|
+
function readWindows() {
|
|
51
|
+
const output = execFileSync("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command",
|
|
52
|
+
"Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,@{Name='Started';Expression={$_.CreationDate.ToUniversalTime().ToString('o')}} | ConvertTo-Json -Compress"], {
|
|
53
|
+
encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5000, maxBuffer: 16 * 1024 * 1024,
|
|
54
|
+
});
|
|
55
|
+
const values = JSON.parse(output);
|
|
56
|
+
const table = new Map();
|
|
57
|
+
for (const value of Array.isArray(values) ? values : [values]) {
|
|
58
|
+
if (typeof value !== "object" || value === null) {
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
const entry = asRecord(value);
|
|
62
|
+
if (entry === null) {
|
|
63
|
+
continue;
|
|
64
|
+
}
|
|
65
|
+
if (typeof entry.ProcessId === "number" && typeof entry.ParentProcessId === "number" && typeof entry.Started === "string" && entry.Started.length > 0) {
|
|
66
|
+
table.set(entry.ProcessId, { pid: entry.ProcessId, ppid: entry.ParentProcessId, pgid: 0, start: entry.Started });
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return table;
|
|
70
|
+
}
|
|
48
71
|
/**
|
|
49
72
|
* The process table now (synchronous: the host's `exit` hook reads it too).
|
|
50
73
|
* Empty when it cannot be read; the caller then reaches the process group only.
|
|
51
74
|
*/
|
|
52
|
-
export function readProcessTable(source = process.platform === "linux" ? "procfs" : "ps") {
|
|
75
|
+
export function readProcessTable(source = process.platform === "linux" ? "procfs" : (process.platform === "win32" ? "windows" : "ps")) {
|
|
53
76
|
try {
|
|
54
|
-
return source === "procfs" ? readProcfs() : readPs();
|
|
77
|
+
return source === "procfs" ? readProcfs() : (source === "windows" ? readWindows() : readPs());
|
|
55
78
|
}
|
|
56
79
|
catch {
|
|
57
80
|
return new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-tree.js","sourceRoot":"","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"process-tree.js","sourceRoot":"","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type ChildProcess } from "node:child_process";
|
|
2
|
-
import type
|
|
2
|
+
import { Duplex, type Readable, type Writable } from "node:stream";
|
|
3
3
|
import { type ProcessDiagnostics } from "./diagnostics.js";
|
|
4
4
|
import { treeResourcesReader } from "./process-resources.js";
|
|
5
5
|
export { trackOwnedProcess } from "./ownership.js";
|
|
@@ -23,6 +23,10 @@ export interface LineProcessOptions {
|
|
|
23
23
|
* again just before the SIGKILL) and the groups they belong to.
|
|
24
24
|
*/
|
|
25
25
|
readonly killTree?: boolean;
|
|
26
|
+
/** Let EOF run native shutdown hooks before the bounded force-kill. */
|
|
27
|
+
readonly shutdown?: "stdin";
|
|
28
|
+
/** Open a private bidirectional pipe at child fd 3, separate from stdout. */
|
|
29
|
+
readonly extraPipe?: boolean;
|
|
26
30
|
}
|
|
27
31
|
/**
|
|
28
32
|
* How long a process asked to stop (SIGTERM) gets before it is killed outright
|
|
@@ -71,6 +75,8 @@ export interface LineProcess {
|
|
|
71
75
|
readonly exited: Promise<number | null>;
|
|
72
76
|
readonly stdin: Writable;
|
|
73
77
|
readonly stdout: Readable;
|
|
78
|
+
/** Present only when extraPipe was requested; the caller owns its protocol. */
|
|
79
|
+
readonly extraPipe?: Duplex;
|
|
74
80
|
/** Native status and the last 8 KiB of stderr observed so far. */
|
|
75
81
|
diagnostics(): ProcessDiagnostics;
|
|
76
82
|
write(text: string): void;
|
|
@@ -80,7 +86,7 @@ export interface LineProcess {
|
|
|
80
86
|
onExit(handler: (code: number | null) => void): void;
|
|
81
87
|
/**
|
|
82
88
|
* Stop the process and everything it started: close stdin, SIGTERM its
|
|
83
|
-
* process group, and SIGKILL the group if the child is still running once
|
|
89
|
+
* process group (unless shutdown is stdin), and SIGKILL the group if the child is still running once
|
|
84
90
|
* the grace period is over; with `killTree`, its descendants outside the
|
|
85
91
|
* group too. On Windows it ends the child alone, or its whole tree with
|
|
86
92
|
* `killTree`. Idempotent; a no-op after the exit, since a reaped pid may
|
|
@@ -91,9 +97,8 @@ export interface LineProcess {
|
|
|
91
97
|
readonly resources: ReturnType<typeof treeResourcesReader>;
|
|
92
98
|
}
|
|
93
99
|
/**
|
|
94
|
-
* Windows
|
|
95
|
-
*
|
|
96
|
-
* alone when the walk fails.
|
|
100
|
+
* Windows taskkill /T /F ends the child and its descendants, falling back to
|
|
101
|
+
* the child alone when the walk fails. An exited child's pid may already be reused.
|
|
97
102
|
*/
|
|
98
103
|
export declare function killProcessTree(child: ChildProcess): void;
|
|
99
104
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,
|
|
1
|
+
{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAuD,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEhH,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC;;;;OAIG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC;;;;;;;;;OASG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,uEAAuE;IACvE,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,6EAA6E;IAC7E,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC9B;AACD;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,QAAS,CAAC;AACpC;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAIxE;AACD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,SAA+B,CAAC;AAC9D;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAWpF;AACD,8EAA8E;AAC9E,MAAM,WAAW,WAAW;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,kEAAkE;IAClE,WAAW,IAAI,kBAAkB,CAAC;IAClC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,yEAAyE;IACzE,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9C,+DAA+D;IAC/D,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI,CAAC;IACrD;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,CAAC;IACb,yGAAyG;IACzG,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CAC5D;AACD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAYzD;AACD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,GAAE,kBAAuB,GAC/B,WAAW,CA0Jb"}
|