@botiverse/oar 0.125.0 → 0.126.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/dist/community/cybion/refused-options.d.ts.map +1 -1
- package/dist/community/cybion/refused-options.js +1 -0
- package/dist/community/cybion/refused-options.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/account-usage.d.ts +1 -1
- package/dist/contracts/account-usage.d.ts.map +1 -1
- package/dist/contracts/credentials.d.ts +61 -0
- package/dist/contracts/credentials.d.ts.map +1 -0
- package/dist/contracts/credentials.js +2 -0
- package/dist/contracts/credentials.js.map +1 -0
- package/dist/contracts/index.d.ts +6 -3
- package/dist/contracts/index.d.ts.map +1 -1
- package/dist/contracts/index.js.map +1 -1
- package/dist/contracts/installation.d.ts +27 -4
- package/dist/contracts/installation.d.ts.map +1 -1
- package/dist/contracts/login.d.ts +3 -1
- package/dist/contracts/login.d.ts.map +1 -1
- package/dist/contracts/model-request.d.ts +14 -0
- package/dist/contracts/model-request.d.ts.map +1 -0
- package/dist/contracts/model-request.js +2 -0
- package/dist/contracts/model-request.js.map +1 -0
- package/dist/contracts/orientation.d.ts +2 -1
- package/dist/contracts/orientation.d.ts.map +1 -1
- package/dist/contracts/records.d.ts +3 -1
- package/dist/contracts/records.d.ts.map +1 -1
- package/dist/contracts/runtime.d.ts +12 -41
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/contracts/session-options.d.ts +2 -0
- package/dist/contracts/session-options.d.ts.map +1 -1
- package/dist/contracts/session.d.ts +5 -1
- package/dist/contracts/session.d.ts.map +1 -1
- package/dist/contracts/side-question.d.ts +14 -0
- package/dist/contracts/side-question.d.ts.map +1 -0
- package/dist/contracts/side-question.js +2 -0
- package/dist/contracts/side-question.js.map +1 -0
- package/dist/contracts/tool-output.d.ts +6 -0
- package/dist/contracts/tool-output.d.ts.map +1 -1
- package/dist/observe/session-view-tools.d.ts +1 -1
- package/dist/observe/session-view-tools.d.ts.map +1 -1
- package/dist/observe/session-view-tools.js +1 -0
- package/dist/observe/session-view-tools.js.map +1 -1
- package/dist/observe/session-view.d.ts +2 -1
- package/dist/observe/session-view.d.ts.map +1 -1
- package/dist/observe/session-view.js.map +1 -1
- package/dist/runtimes/antigravity/account-usage.d.ts +4 -2
- package/dist/runtimes/antigravity/account-usage.d.ts.map +1 -1
- package/dist/runtimes/antigravity/account-usage.js +3 -3
- package/dist/runtimes/antigravity/account-usage.js.map +1 -1
- package/dist/runtimes/antigravity/index.d.ts +31 -0
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/antigravity/index.js +15 -0
- package/dist/runtimes/antigravity/index.js.map +1 -1
- package/dist/runtimes/antigravity/installation.d.ts +6 -3
- package/dist/runtimes/antigravity/installation.d.ts.map +1 -1
- package/dist/runtimes/antigravity/installation.js +25 -30
- package/dist/runtimes/antigravity/installation.js.map +1 -1
- 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/antigravity/quota.d.ts +6 -1
- package/dist/runtimes/antigravity/quota.d.ts.map +1 -1
- package/dist/runtimes/antigravity/quota.js +46 -13
- package/dist/runtimes/antigravity/quota.js.map +1 -1
- package/dist/runtimes/claude/account-usage.d.ts.map +1 -1
- package/dist/runtimes/claude/account-usage.js +30 -8
- package/dist/runtimes/claude/account-usage.js.map +1 -1
- package/dist/runtimes/claude/auth-status.d.ts.map +1 -1
- package/dist/runtimes/claude/auth-status.js +25 -4
- package/dist/runtimes/claude/auth-status.js.map +1 -1
- package/dist/runtimes/claude/credentials.d.ts +1 -1
- package/dist/runtimes/claude/credentials.d.ts.map +1 -1
- package/dist/runtimes/claude/credentials.js +51 -34
- package/dist/runtimes/claude/credentials.js.map +1 -1
- package/dist/runtimes/claude/index.d.ts +6 -2
- package/dist/runtimes/claude/index.d.ts.map +1 -1
- package/dist/runtimes/claude/index.js +4 -2
- package/dist/runtimes/claude/index.js.map +1 -1
- package/dist/runtimes/claude/installation.d.ts +1 -0
- package/dist/runtimes/claude/installation.d.ts.map +1 -1
- package/dist/runtimes/claude/installation.js +2 -1
- package/dist/runtimes/claude/installation.js.map +1 -1
- package/dist/runtimes/claude/inventory.js +1 -1
- package/dist/runtimes/claude/inventory.js.map +1 -1
- package/dist/runtimes/claude/last-account.d.ts +21 -0
- package/dist/runtimes/claude/last-account.d.ts.map +1 -1
- package/dist/runtimes/claude/last-account.js +58 -6
- package/dist/runtimes/claude/last-account.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 +7 -3
- package/dist/runtimes/claude/launch.js.map +1 -1
- package/dist/runtimes/claude/list-models.js +1 -1
- package/dist/runtimes/claude/list-models.js.map +1 -1
- package/dist/runtimes/claude/model-request-files.d.ts +19 -0
- package/dist/runtimes/claude/model-request-files.d.ts.map +1 -0
- package/dist/runtimes/claude/model-request-files.js +104 -0
- package/dist/runtimes/claude/model-request-files.js.map +1 -0
- package/dist/runtimes/claude/model-requests.d.ts +16 -0
- package/dist/runtimes/claude/model-requests.d.ts.map +1 -0
- package/dist/runtimes/claude/model-requests.js +190 -0
- package/dist/runtimes/claude/model-requests.js.map +1 -0
- package/dist/runtimes/claude/open-settings.d.ts +2 -1
- package/dist/runtimes/claude/open-settings.d.ts.map +1 -1
- package/dist/runtimes/claude/open-settings.js +33 -9
- package/dist/runtimes/claude/open-settings.js.map +1 -1
- package/dist/runtimes/claude/options.d.ts +4 -0
- package/dist/runtimes/claude/options.d.ts.map +1 -1
- package/dist/runtimes/claude/options.js +21 -0
- package/dist/runtimes/claude/options.js.map +1 -1
- package/dist/runtimes/claude/session.d.ts.map +1 -1
- package/dist/runtimes/claude/session.js +29 -7
- package/dist/runtimes/claude/session.js.map +1 -1
- package/dist/runtimes/claude/side-question.d.ts +4 -0
- package/dist/runtimes/claude/side-question.d.ts.map +1 -0
- package/dist/runtimes/claude/side-question.js +50 -0
- package/dist/runtimes/claude/side-question.js.map +1 -0
- package/dist/runtimes/codebuddy/index.d.ts +52 -0
- package/dist/runtimes/codebuddy/index.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/index.js +19 -0
- package/dist/runtimes/codebuddy/index.js.map +1 -1
- package/dist/runtimes/codebuddy/installation.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/installation.js +5 -4
- package/dist/runtimes/codebuddy/installation.js.map +1 -1
- package/dist/runtimes/codebuddy/options.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/options.js +1 -0
- package/dist/runtimes/codebuddy/options.js.map +1 -1
- package/dist/runtimes/codex/account-id.d.ts +14 -0
- package/dist/runtimes/codex/account-id.d.ts.map +1 -0
- package/dist/runtimes/codex/account-id.js +173 -0
- package/dist/runtimes/codex/account-id.js.map +1 -0
- package/dist/runtimes/codex/account-request.d.ts +1 -0
- package/dist/runtimes/codex/account-request.d.ts.map +1 -1
- package/dist/runtimes/codex/account-request.js +45 -16
- package/dist/runtimes/codex/account-request.js.map +1 -1
- package/dist/runtimes/codex/account-usage.d.ts.map +1 -1
- package/dist/runtimes/codex/account-usage.js +15 -13
- package/dist/runtimes/codex/account-usage.js.map +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts +3 -1
- package/dist/runtimes/codex/app-server-client.d.ts.map +1 -1
- package/dist/runtimes/codex/app-server-client.js +2 -0
- package/dist/runtimes/codex/app-server-client.js.map +1 -1
- package/dist/runtimes/codex/home-initialization.d.ts +1 -0
- package/dist/runtimes/codex/home-initialization.d.ts.map +1 -1
- package/dist/runtimes/codex/home-initialization.js +46 -58
- package/dist/runtimes/codex/home-initialization.js.map +1 -1
- package/dist/runtimes/codex/index.d.ts +49 -0
- package/dist/runtimes/codex/index.d.ts.map +1 -1
- package/dist/runtimes/codex/index.js +20 -0
- package/dist/runtimes/codex/index.js.map +1 -1
- package/dist/runtimes/codex/installation.d.ts.map +1 -1
- package/dist/runtimes/codex/installation.js +8 -2
- package/dist/runtimes/codex/installation.js.map +1 -1
- package/dist/runtimes/codex/inventory.js +1 -1
- package/dist/runtimes/codex/inventory.js.map +1 -1
- package/dist/runtimes/codex/item-detail.d.ts +4 -0
- package/dist/runtimes/codex/item-detail.d.ts.map +1 -1
- package/dist/runtimes/codex/item-detail.js +39 -0
- package/dist/runtimes/codex/item-detail.js.map +1 -1
- package/dist/runtimes/codex/limit-reset.d.ts.map +1 -1
- package/dist/runtimes/codex/limit-reset.js +3 -2
- package/dist/runtimes/codex/limit-reset.js.map +1 -1
- package/dist/runtimes/codex/list-models.js +1 -1
- package/dist/runtimes/codex/list-models.js.map +1 -1
- package/dist/runtimes/codex/login.d.ts.map +1 -1
- package/dist/runtimes/codex/login.js +24 -10
- package/dist/runtimes/codex/login.js.map +1 -1
- package/dist/runtimes/codex/options.d.ts.map +1 -1
- package/dist/runtimes/codex/options.js +1 -0
- package/dist/runtimes/codex/options.js.map +1 -1
- package/dist/runtimes/codex/projection.d.ts.map +1 -1
- package/dist/runtimes/codex/projection.js +7 -23
- package/dist/runtimes/codex/projection.js.map +1 -1
- package/dist/runtimes/codex/refusal.d.ts +3 -3
- package/dist/runtimes/codex/refusal.js +3 -3
- package/dist/runtimes/codex/session.d.ts.map +1 -1
- package/dist/runtimes/codex/session.js +15 -6
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/cursor/index.d.ts.map +1 -1
- package/dist/runtimes/cursor/index.js +17 -3
- package/dist/runtimes/cursor/index.js.map +1 -1
- package/dist/runtimes/cursor/installation.d.ts +13 -9
- package/dist/runtimes/cursor/installation.d.ts.map +1 -1
- package/dist/runtimes/cursor/installation.js +29 -14
- package/dist/runtimes/cursor/installation.js.map +1 -1
- package/dist/runtimes/cursor/model.d.ts.map +1 -1
- package/dist/runtimes/cursor/model.js +1 -0
- package/dist/runtimes/cursor/model.js.map +1 -1
- package/dist/runtimes/cursor/run.d.ts +2 -0
- package/dist/runtimes/cursor/run.d.ts.map +1 -1
- package/dist/runtimes/cursor/run.js +31 -0
- package/dist/runtimes/cursor/run.js.map +1 -1
- package/dist/runtimes/cursor/session.d.ts +3 -1
- package/dist/runtimes/cursor/session.d.ts.map +1 -1
- package/dist/runtimes/cursor/session.js +24 -14
- package/dist/runtimes/cursor/session.js.map +1 -1
- package/dist/runtimes/devin/index.d.ts +17 -0
- package/dist/runtimes/devin/index.d.ts.map +1 -1
- package/dist/runtimes/devin/index.js +9 -0
- package/dist/runtimes/devin/index.js.map +1 -1
- package/dist/runtimes/devin/installation.d.ts.map +1 -1
- package/dist/runtimes/devin/installation.js +7 -2
- package/dist/runtimes/devin/installation.js.map +1 -1
- package/dist/runtimes/devin/options.d.ts.map +1 -1
- package/dist/runtimes/devin/options.js +1 -0
- package/dist/runtimes/devin/options.js.map +1 -1
- package/dist/runtimes/dsh/control.d.ts +5 -1
- package/dist/runtimes/dsh/control.d.ts.map +1 -1
- package/dist/runtimes/dsh/control.js +7 -2
- package/dist/runtimes/dsh/control.js.map +1 -1
- package/dist/runtimes/dsh/index.d.ts +4 -0
- package/dist/runtimes/dsh/index.d.ts.map +1 -1
- package/dist/runtimes/dsh/index.js +3 -1
- package/dist/runtimes/dsh/index.js.map +1 -1
- package/dist/runtimes/dsh/installation.d.ts +2 -3
- package/dist/runtimes/dsh/installation.d.ts.map +1 -1
- package/dist/runtimes/dsh/installation.js +11 -11
- package/dist/runtimes/dsh/installation.js.map +1 -1
- package/dist/runtimes/dsh/launch.d.ts +4 -2
- package/dist/runtimes/dsh/launch.d.ts.map +1 -1
- package/dist/runtimes/dsh/launch.js +9 -3
- package/dist/runtimes/dsh/launch.js.map +1 -1
- package/dist/runtimes/dsh/list-models.js +3 -3
- package/dist/runtimes/dsh/list-models.js.map +1 -1
- package/dist/runtimes/dsh/options.d.ts.map +1 -1
- package/dist/runtimes/dsh/options.js +1 -0
- package/dist/runtimes/dsh/options.js.map +1 -1
- package/dist/runtimes/dsh/profile-startup.d.ts +4 -0
- package/dist/runtimes/dsh/profile-startup.d.ts.map +1 -0
- package/dist/runtimes/dsh/profile-startup.js +21 -0
- package/dist/runtimes/dsh/profile-startup.js.map +1 -0
- package/dist/runtimes/dsh/session.d.ts.map +1 -1
- package/dist/runtimes/dsh/session.js +27 -7
- package/dist/runtimes/dsh/session.js.map +1 -1
- package/dist/runtimes/dsh/skills.d.ts.map +1 -1
- package/dist/runtimes/dsh/skills.js +3 -4
- package/dist/runtimes/dsh/skills.js.map +1 -1
- package/dist/runtimes/factory/account-usage.d.ts.map +1 -1
- package/dist/runtimes/factory/account-usage.js +2 -1
- package/dist/runtimes/factory/account-usage.js.map +1 -1
- package/dist/runtimes/factory/account.js +1 -1
- package/dist/runtimes/factory/account.js.map +1 -1
- package/dist/runtimes/factory/index.d.ts +54 -0
- package/dist/runtimes/factory/index.d.ts.map +1 -1
- package/dist/runtimes/factory/index.js +19 -0
- package/dist/runtimes/factory/index.js.map +1 -1
- package/dist/runtimes/factory/installation.d.ts +1 -1
- package/dist/runtimes/factory/installation.d.ts.map +1 -1
- package/dist/runtimes/factory/installation.js +2 -2
- package/dist/runtimes/factory/installation.js.map +1 -1
- package/dist/runtimes/factory/options.d.ts.map +1 -1
- package/dist/runtimes/factory/options.js +1 -0
- package/dist/runtimes/factory/options.js.map +1 -1
- package/dist/runtimes/factory/session.d.ts.map +1 -1
- package/dist/runtimes/factory/session.js +1 -0
- package/dist/runtimes/factory/session.js.map +1 -1
- package/dist/runtimes/grok/account-usage.d.ts.map +1 -1
- package/dist/runtimes/grok/account-usage.js +8 -6
- package/dist/runtimes/grok/account-usage.js.map +1 -1
- package/dist/runtimes/grok/index.d.ts +30 -0
- package/dist/runtimes/grok/index.d.ts.map +1 -1
- package/dist/runtimes/grok/index.js +13 -0
- package/dist/runtimes/grok/index.js.map +1 -1
- package/dist/runtimes/grok/installation.d.ts +1 -0
- package/dist/runtimes/grok/installation.d.ts.map +1 -1
- package/dist/runtimes/grok/installation.js +8 -1
- package/dist/runtimes/grok/installation.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/account-usage.d.ts.map +1 -1
- package/dist/runtimes/kimi/account-usage.js +5 -3
- package/dist/runtimes/kimi/account-usage.js.map +1 -1
- package/dist/runtimes/kimi/index.d.ts +54 -0
- package/dist/runtimes/kimi/index.d.ts.map +1 -1
- package/dist/runtimes/kimi/index.js +19 -0
- package/dist/runtimes/kimi/index.js.map +1 -1
- package/dist/runtimes/kimi/installation.d.ts.map +1 -1
- package/dist/runtimes/kimi/installation.js +5 -1
- package/dist/runtimes/kimi/installation.js.map +1 -1
- package/dist/runtimes/kimi/native-usage.d.ts.map +1 -1
- package/dist/runtimes/kimi/native-usage.js +4 -3
- package/dist/runtimes/kimi/native-usage.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/kimi/web-startup.d.ts.map +1 -1
- package/dist/runtimes/kimi/web-startup.js +4 -18
- package/dist/runtimes/kimi/web-startup.js.map +1 -1
- package/dist/runtimes/opencode/index.d.ts +117 -0
- package/dist/runtimes/opencode/index.d.ts.map +1 -1
- package/dist/runtimes/opencode/index.js +30 -0
- package/dist/runtimes/opencode/index.js.map +1 -1
- package/dist/runtimes/opencode/installation.d.ts +8 -0
- package/dist/runtimes/opencode/installation.d.ts.map +1 -1
- package/dist/runtimes/opencode/installation.js +26 -1
- package/dist/runtimes/opencode/installation.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/credential-shape.d.ts +9 -0
- package/dist/runtimes/pi/credential-shape.d.ts.map +1 -0
- package/dist/runtimes/pi/credential-shape.js +81 -0
- package/dist/runtimes/pi/credential-shape.js.map +1 -0
- package/dist/runtimes/pi/index.d.ts +1 -1
- package/dist/runtimes/pi/index.d.ts.map +1 -1
- package/dist/runtimes/pi/index.js +5 -3
- package/dist/runtimes/pi/index.js.map +1 -1
- package/dist/runtimes/pi/installation.d.ts +9 -5
- package/dist/runtimes/pi/installation.d.ts.map +1 -1
- package/dist/runtimes/pi/installation.js +62 -18
- package/dist/runtimes/pi/installation.js.map +1 -1
- package/dist/runtimes/pi/model-requests.d.ts +9 -0
- package/dist/runtimes/pi/model-requests.d.ts.map +1 -0
- package/dist/runtimes/pi/model-requests.js +76 -0
- package/dist/runtimes/pi/model-requests.js.map +1 -0
- package/dist/runtimes/pi/rpc/extension.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/extension.js +1 -0
- package/dist/runtimes/pi/rpc/extension.js.map +1 -1
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.js +1 -0
- package/dist/runtimes/pi/rpc/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/session.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/session.js +11 -6
- package/dist/runtimes/pi/rpc/session.js.map +1 -1
- package/dist/runtimes/pi/session.d.ts.map +1 -1
- package/dist/runtimes/pi/session.js +10 -8
- package/dist/runtimes/pi/session.js.map +1 -1
- package/dist/runtimes/pi-durable/index.d.ts.map +1 -1
- package/dist/runtimes/pi-durable/index.js +7 -0
- package/dist/runtimes/pi-durable/index.js.map +1 -1
- package/dist/runtimes/pi-durable/options.d.ts.map +1 -1
- package/dist/runtimes/pi-durable/options.js +1 -0
- package/dist/runtimes/pi-durable/options.js.map +1 -1
- package/dist/runtimes/pi-durable/projection.d.ts +4 -2
- package/dist/runtimes/pi-durable/projection.d.ts.map +1 -1
- package/dist/runtimes/pi-durable/projection.js +18 -3
- package/dist/runtimes/pi-durable/projection.js.map +1 -1
- package/dist/runtimes/pi-durable/session.d.ts.map +1 -1
- package/dist/runtimes/pi-durable/session.js +119 -19
- package/dist/runtimes/pi-durable/session.js.map +1 -1
- package/dist/runtimes/qoder/index.d.ts +17 -0
- package/dist/runtimes/qoder/index.d.ts.map +1 -1
- package/dist/runtimes/qoder/index.js +8 -0
- package/dist/runtimes/qoder/index.js.map +1 -1
- package/dist/runtimes/qoder/installation.d.ts +2 -2
- package/dist/runtimes/qoder/installation.d.ts.map +1 -1
- package/dist/runtimes/qoder/installation.js +10 -17
- package/dist/runtimes/qoder/installation.js.map +1 -1
- package/dist/runtimes/qoder/launch.d.ts +0 -2
- package/dist/runtimes/qoder/launch.d.ts.map +1 -1
- package/dist/runtimes/qoder/launch.js +0 -12
- package/dist/runtimes/qoder/launch.js.map +1 -1
- package/dist/runtimes/qoder/list-models.d.ts.map +1 -1
- package/dist/runtimes/qoder/list-models.js +3 -2
- package/dist/runtimes/qoder/list-models.js.map +1 -1
- package/dist/runtimes/qoder/options.d.ts.map +1 -1
- package/dist/runtimes/qoder/options.js +1 -0
- package/dist/runtimes/qoder/options.js.map +1 -1
- package/dist/runtimes/qoder/session.d.ts.map +1 -1
- package/dist/runtimes/qoder/session.js +4 -3
- package/dist/runtimes/qoder/session.js.map +1 -1
- package/dist/runtimes/qwen/credentials.d.ts +7 -0
- package/dist/runtimes/qwen/credentials.d.ts.map +1 -0
- package/dist/runtimes/qwen/credentials.js +47 -0
- package/dist/runtimes/qwen/credentials.js.map +1 -0
- package/dist/runtimes/qwen/index.d.ts +1 -0
- package/dist/runtimes/qwen/index.d.ts.map +1 -1
- package/dist/runtimes/qwen/index.js +2 -0
- package/dist/runtimes/qwen/index.js.map +1 -1
- package/dist/runtimes/qwen/installation.d.ts +1 -0
- package/dist/runtimes/qwen/installation.d.ts.map +1 -1
- package/dist/runtimes/qwen/installation.js +2 -1
- package/dist/runtimes/qwen/installation.js.map +1 -1
- package/dist/runtimes/qwen/list-models.js +2 -2
- package/dist/runtimes/qwen/list-models.js.map +1 -1
- package/dist/runtimes/qwen/options.d.ts.map +1 -1
- package/dist/runtimes/qwen/options.js +1 -0
- package/dist/runtimes/qwen/options.js.map +1 -1
- package/dist/runtimes/qwen/session.js +3 -3
- package/dist/runtimes/qwen/session.js.map +1 -1
- package/dist/shared/executable/close.d.ts +7 -0
- package/dist/shared/executable/close.d.ts.map +1 -0
- package/dist/shared/executable/close.js +26 -0
- package/dist/shared/executable/close.js.map +1 -0
- package/dist/shared/executable/index.d.ts +1 -0
- package/dist/shared/executable/index.d.ts.map +1 -1
- package/dist/shared/executable/index.js +1 -0
- package/dist/shared/executable/index.js.map +1 -1
- package/dist/shared/executable/run.d.ts +2 -0
- package/dist/shared/executable/run.d.ts.map +1 -1
- package/dist/shared/executable/run.js +4 -0
- package/dist/shared/executable/run.js.map +1 -1
- package/dist/shared/host-environment.d.ts +40 -0
- package/dist/shared/host-environment.d.ts.map +1 -0
- package/dist/shared/host-environment.js +74 -0
- package/dist/shared/host-environment.js.map +1 -0
- package/dist/shared/installation.d.ts +14 -3
- package/dist/shared/installation.d.ts.map +1 -1
- package/dist/shared/installation.js +78 -62
- package/dist/shared/installation.js.map +1 -1
- package/dist/shared/native-home-initialization.d.ts +20 -0
- package/dist/shared/native-home-initialization.d.ts.map +1 -0
- package/dist/shared/native-home-initialization.js +87 -0
- package/dist/shared/native-home-initialization.js.map +1 -0
- package/dist/shared/native-session-file.d.ts +3 -0
- package/dist/shared/native-session-file.d.ts.map +1 -0
- package/dist/shared/native-session-file.js +22 -0
- package/dist/shared/native-session-file.js.map +1 -0
- package/dist/shared/session-credentials.d.ts.map +1 -1
- package/dist/shared/session-credentials.js +2 -0
- package/dist/shared/session-credentials.js.map +1 -1
- package/dist/shared/session-options.js +1 -1
- package/dist/shared/session-options.js.map +1 -1
- package/dist/shared/stream-json/profile.d.ts +1 -0
- package/dist/shared/stream-json/profile.d.ts.map +1 -1
- package/dist/shared/stream-json/session.js +2 -2
- package/dist/shared/stream-json/session.js.map +1 -1
- package/dist/shared/usage-ratio.d.ts +16 -0
- package/dist/shared/usage-ratio.d.ts.map +1 -0
- package/dist/shared/usage-ratio.js +52 -0
- package/dist/shared/usage-ratio.js.map +1 -0
- package/dist/shared/version-range.d.ts +30 -0
- package/dist/shared/version-range.d.ts.map +1 -0
- package/dist/shared/version-range.js +50 -0
- package/dist/shared/version-range.js.map +1 -0
- package/dist/testing/scripted-runtime.d.ts.map +1 -1
- package/dist/testing/scripted-runtime.js +5 -1
- package/dist/testing/scripted-runtime.js.map +1 -1
- package/package.json +1 -1
- package/dist/runtimes/qwen/close.d.ts +0 -4
- package/dist/runtimes/qwen/close.d.ts.map +0 -1
- package/dist/runtimes/qwen/close.js +0 -13
- package/dist/runtimes/qwen/close.js.map +0 -1
|
@@ -28,10 +28,14 @@ export declare const dshRuntime: Omit<{
|
|
|
28
28
|
readonly verifiedPlatforms: readonly ["linux", "darwin", "win32"];
|
|
29
29
|
readonly minVersion: "0.2.1-rc.5";
|
|
30
30
|
readonly credentials: {
|
|
31
|
+
readonly scope: "single_account";
|
|
32
|
+
readonly management: "external";
|
|
31
33
|
readonly env: readonly [{
|
|
32
34
|
readonly name: "DEEPSEEK_API_KEY";
|
|
33
35
|
readonly purpose: "api_key";
|
|
34
36
|
readonly secret: true;
|
|
37
|
+
readonly provider: "deepseek";
|
|
38
|
+
readonly field: "apiKey";
|
|
35
39
|
}];
|
|
36
40
|
readonly stores: readonly [{
|
|
37
41
|
readonly kind: "file";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/dsh/index.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,UAAU
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/dsh/index.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyBK,CAAC"}
|
|
@@ -13,7 +13,9 @@ export const dshRuntime = defineRuntime({
|
|
|
13
13
|
minVersion: DSH_MINIMUM_VERSION,
|
|
14
14
|
// The default route reads DEEPSEEK_API_KEY; a key saved through DSH's own settings wins (docs/runtimes/dsh.md#credentials).
|
|
15
15
|
credentials: {
|
|
16
|
-
|
|
16
|
+
scope: "single_account",
|
|
17
|
+
management: "external",
|
|
18
|
+
env: [{ name: "DEEPSEEK_API_KEY", purpose: "api_key", secret: true, provider: "deepseek", field: "apiKey" }],
|
|
17
19
|
stores: [
|
|
18
20
|
{ kind: "file", directoryEnv: "DSH_HOME", defaultDirectory: ".dsh", path: ".credentials.yaml", overridesEnv: true },
|
|
19
21
|
{ kind: "file", relativeTo: "cwd", path: ".env", overridesEnv: false },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../src/runtimes/dsh/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,CAAC,MAAM,UAAU,GAAG,aAAa,CAAC;IACtC,EAAE,EAAE,KAAK;IACT,gBAAgB,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE;IAC7D,mBAAmB,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,qBAAqB,EAAE,mBAAmB,CAAC,YAAY,CAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,GAAG,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,GAAG;IAClX,UAAU,EAAE,mBAAmB;IAC/B,4HAA4H;IAC5H,WAAW,EAAE;QACX,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../src/runtimes/dsh/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
export declare const dshInstallation: InstallationProbe;
|
|
1
|
+
/** `dsh` on PATH or `OAR_DSH_BIN`, verified against DeepSeek Harness `--help` and its prerelease-aware version floor. */
|
|
2
|
+
export declare const dshInstallation: import("../../browser.js").InstallationProbe;
|
|
4
3
|
//# sourceMappingURL=installation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation.d.ts","sources":["../../../src/runtimes/dsh/installation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"installation.d.ts","sources":["../../../src/runtimes/dsh/installation.ts"],"names":[],"mappings":"AAGA,yHAAyH;AACzH,eAAO,MAAM,eAAe,8CAc3B,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { executableInstallation } from "../../shared/installation.js";
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
};
|
|
2
|
+
import { DSH_MINIMUM_VERSION, dshVersionRefusal } from "./version.js";
|
|
3
|
+
/** `dsh` on PATH or `OAR_DSH_BIN`, verified against DeepSeek Harness `--help` and its prerelease-aware version floor. */
|
|
4
|
+
export const dshInstallation = executableInstallation("OAR_DSH_BIN", "dsh", [], ["--help"], {
|
|
5
|
+
identity: { vendor: "DeepSeek Harness (dsh)", help: /\bUsage:\s+dsh(?:\.exe)?\b|\bDeepSeek Harness\b/iu },
|
|
6
|
+
versionPolicy: {
|
|
7
|
+
label: "DSH",
|
|
8
|
+
lines: [{ min: DSH_MINIMUM_VERSION }],
|
|
9
|
+
required: DSH_MINIMUM_VERSION,
|
|
10
|
+
formatReason: (_command, _installed, raw) => dshVersionRefusal(raw) ?? `DSH requires ${DSH_MINIMUM_VERSION} or later`,
|
|
11
|
+
},
|
|
12
|
+
});
|
|
13
13
|
//# sourceMappingURL=installation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation.js","sources":["../../../src/runtimes/dsh/installation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"installation.js","sources":["../../../src/runtimes/dsh/installation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtE,yHAAyH;AACzH,MAAM,CAAC,MAAM,eAAe,GAAG,sBAAsB,CACnD,aAAa,EACb,KAAK,EACL,EAAE,EACF,CAAC,QAAQ,CAAC,EACV;IACE,QAAQ,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE,IAAI,EAAE,mDAAmD,EAAE;IACzG,aAAa,EAAE;QACb,KAAK,EAAE,KAAK;QACZ,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,CAAC;QACrC,QAAQ,EAAE,mBAAmB;QAC7B,YAAY,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,gBAAgB,mBAAmB,WAAW;KACtH;CACF,CACF,CAAC"}
|
|
@@ -3,7 +3,9 @@ import { type LineProcess } from "../../shared/executable/index.js";
|
|
|
3
3
|
import type { JsonRecord } from "../../shared/json.js";
|
|
4
4
|
import { type PrivateTempDir } from "../../shared/private-temp.js";
|
|
5
5
|
export interface LaunchedDsh {
|
|
6
|
-
readonly child: LineProcess
|
|
6
|
+
readonly child: LineProcess & {
|
|
7
|
+
profileReady(): void;
|
|
8
|
+
};
|
|
7
9
|
readonly directory: PrivateTempDir;
|
|
8
10
|
}
|
|
9
11
|
/**
|
|
@@ -17,5 +19,5 @@ export declare function dshEnvironment(env: SessionOptions["env"]): NodeJS.Proce
|
|
|
17
19
|
* bridge on. The profile supplies the native core and its stdin shutdown; no ACP
|
|
18
20
|
* message is exchanged. The overlay is an invocation layer: it edits no user file.
|
|
19
21
|
*/
|
|
20
|
-
export declare function launchDsh(command: string, cwd: string, env: NodeJS.ProcessEnv, mcpRows?: readonly JsonRecord[]): Promise<LaunchedDsh>;
|
|
22
|
+
export declare function launchDsh(command: string, cwd: string, env: NodeJS.ProcessEnv, mcpRows?: readonly JsonRecord[], signal?: AbortSignal): Promise<LaunchedDsh>;
|
|
21
23
|
//# sourceMappingURL=launch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.d.ts","sources":["../../../src/runtimes/dsh/launch.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"launch.d.ts","sources":["../../../src/runtimes/dsh/launch.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAInF,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,YAAY,IAAI,IAAI,CAAA;KAAE,CAAC;IACvD,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;CACpC;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,UAAU,CAG5E;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,OAAO,GAAE,SAAS,UAAU,EAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAgBrK"}
|
|
@@ -5,6 +5,7 @@ import { sessionEnvironment } from "../../shared/environment.js";
|
|
|
5
5
|
import { spawnLineProcess } from "../../shared/executable/index.js";
|
|
6
6
|
import { privateTempDir } from "../../shared/private-temp.js";
|
|
7
7
|
import { dshBridgeSource } from "./bridge.js";
|
|
8
|
+
import { acquireDshProfile } from "./profile-startup.js";
|
|
8
9
|
/**
|
|
9
10
|
* Sessions run without approval gates like every OAR runtime (`Session` scope
|
|
10
11
|
* notes): nobody sits at a prompt, and DSH rejects an action needing approval. A
|
|
@@ -19,19 +20,24 @@ export function dshEnvironment(env) {
|
|
|
19
20
|
* bridge on. The profile supplies the native core and its stdin shutdown; no ACP
|
|
20
21
|
* message is exchanged. The overlay is an invocation layer: it edits no user file.
|
|
21
22
|
*/
|
|
22
|
-
export async function launchDsh(command, cwd, env, mcpRows = []) {
|
|
23
|
+
export async function launchDsh(command, cwd, env, mcpRows = [], signal) {
|
|
23
24
|
const directory = await privateTempDir("oar-dsh-");
|
|
25
|
+
let release = undefined;
|
|
24
26
|
try {
|
|
25
27
|
const bridge = path.join(directory.path, "bridge.mjs");
|
|
26
28
|
const patch = path.join(directory.path, "patch.json");
|
|
27
29
|
await writeFile(bridge, dshBridgeSource, { mode: 0o600, flag: "wx" });
|
|
28
30
|
await writeFile(patch, JSON.stringify([{ id: "acp", disabled: true }, { insert: [...mcpRows, { id: "oar-dsh-bridge", name: pathToFileURL(bridge).href, config: { mcpEntries: mcpRows.map((row) => row.id) } }] }]), { mode: 0o600, flag: "wx" });
|
|
31
|
+
const finish = await acquireDshProfile(env, cwd, signal);
|
|
32
|
+
release = finish;
|
|
33
|
+
signal?.throwIfAborted();
|
|
29
34
|
const child = spawnLineProcess(command, ["--profile", "acp", "--patch", patch], { cwd, env, killTree: true, shutdown: "stdin" });
|
|
30
|
-
child.onExit(() => { directory.remove(); });
|
|
35
|
+
child.onExit(() => { finish(false); directory.remove(); });
|
|
31
36
|
await child.spawned;
|
|
32
|
-
return { child, directory };
|
|
37
|
+
return { child: { ...child, profileReady: () => { finish(true); } }, directory };
|
|
33
38
|
}
|
|
34
39
|
catch (error) {
|
|
40
|
+
release?.(false);
|
|
35
41
|
directory.remove();
|
|
36
42
|
throw error;
|
|
37
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.js","sources":["../../../src/runtimes/dsh/launch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAoB,MAAM,kCAAkC,CAAC;AAEtF,OAAO,EAAE,cAAc,EAAuB,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"launch.js","sources":["../../../src/runtimes/dsh/launch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAoB,MAAM,kCAAkC,CAAC;AAEtF,OAAO,EAAE,cAAc,EAAuB,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAOzD;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,GAA0B;IACvD,MAAM,QAAQ,GAAG,GAAG,EAAE,mBAAmB,CAAC;IAC1C,OAAO,EAAE,GAAG,kBAAkB,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,CAAC,EAAE,CAAC;AAChI,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,OAAe,EAAE,GAAW,EAAE,GAAsB,EAAE,OAAO,GAA0B,EAAE,EAAE,MAAoB;IAC7I,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,UAAU,CAAC,CAAC;IACnD,IAAI,OAAO,GAA2C,SAAS,CAAC;IAChE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACvD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACtD,MAAM,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACtE,MAAM,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACjP,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QACzD,OAAO,GAAG,MAAM,CAAC;QACjB,MAAM,EAAE,cAAc,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACjI,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,KAAK,CAAC,OAAO,CAAC;QACpB,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC;IACnF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;QAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QAAC,MAAM,KAAK,CAAC;IAAC,CAAC;AACxE,CAAC"}
|
|
@@ -45,9 +45,9 @@ export const dshListModels = async (installation, options = {}) => {
|
|
|
45
45
|
if (refusal !== null) {
|
|
46
46
|
return refusal;
|
|
47
47
|
}
|
|
48
|
-
const
|
|
49
|
-
own(child);
|
|
50
|
-
const control = dshControl(child, () => { });
|
|
48
|
+
const launched = await launchDsh(installation.command, listingCwd(options), env, [], signal);
|
|
49
|
+
own(launched.child);
|
|
50
|
+
const control = dshControl(launched.child, () => { });
|
|
51
51
|
try {
|
|
52
52
|
await control.ready;
|
|
53
53
|
const catalog = await control.request("models", {}, options.timeoutMs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-models.js","sources":["../../../src/runtimes/dsh/list-models.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"list-models.js","sources":["../../../src/runtimes/dsh/list-models.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/dsh/options.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,wHAAwH;AACxH,eAAO,MAAM,wBAAwB,EAAE,
|
|
1
|
+
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/dsh/options.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,wHAAwH;AACxH,eAAO,MAAM,wBAAwB,EAAE,qBAUtC,CAAC;AAEF,oGAAoG;AACpG,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,qBAAqB,CAQpI;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,+HAA+H;AAC/H,wBAAgB,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,QAAQ,CAAC,GAAG,eAAe,CASlG"}
|
|
@@ -2,6 +2,7 @@ import { UnsupportedOptionError } from "../../contracts/errors.js";
|
|
|
2
2
|
import { compareSemver } from "../../shared/semver.js";
|
|
3
3
|
/** Each stays refused until its own native probe. DSH may well have the concept; OAR has not verified its semantics. */
|
|
4
4
|
export const dshRefusedSessionOptions = {
|
|
5
|
+
modelRequests: "This adapter has no verified capture of the root agent's provider request",
|
|
5
6
|
fork: "OAR has not verified a native DSH fork that opens a copy of a saved session under a new id, cut after a chosen turn",
|
|
6
7
|
mcpServerCredentials: "DSH MCP env and header persistence has not been audited; only stdio command and args are supported",
|
|
7
8
|
launchArgs: "DSH overlays can disable the OAR bridge; arbitrary launch overlays have no verified final-composition check",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sources":["../../../src/runtimes/dsh/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAIvD,wHAAwH;AACxH,MAAM,CAAC,MAAM,wBAAwB,GAA0B;IAC7D,IAAI,EAAE,qHAAqH;IAC3H,oBAAoB,EAAE,oGAAoG;IAC1H,UAAU,EAAE,6GAA6G;IACzH,WAAW,EAAE,mEAAmE;IAChF,YAAY,EAAE,iDAAiD;IAC/D,iBAAiB,EAAE,oIAAoI;IACvJ,uBAAuB,EAAE,kJAAkJ;IAC3K,mBAAmB,EAAE,6EAA6E;CACnG,CAAC;AAEF,oGAAoG;AACpG,MAAM,UAAU,mBAAmB,CAAC,OAA2B,EAAE,QAAQ,GAAoB,OAAO,CAAC,QAAQ;IAC3G,IAAI,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClD,OAAO,EAAE,qBAAqB,EAAE,sGAAsG,EAAE,CAAC;IAC3I,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAClF,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,GAAG,CAAC;QAChC,CAAC,CAAC,EAAE,qBAAqB,EAAE,sHAAsH,EAAE;QACnJ,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAQD,+HAA+H;AAC/H,MAAM,UAAU,eAAe,CAAC,OAAiD;IAC/E,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,YAAY,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;IAC7E,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,YAAY,CAAC;IAAC,CAAC;IACjD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,SAAS,IAAI,CAAC,IAAI,SAAS,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,sBAAsB,CAAC,OAAO,EAAE,8CAA8C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACnH,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,GAAG,YAAY,EAAE,CAAC;AACrG,CAAC"}
|
|
1
|
+
{"version":3,"file":"options.js","sources":["../../../src/runtimes/dsh/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAIvD,wHAAwH;AACxH,MAAM,CAAC,MAAM,wBAAwB,GAA0B;IAC7D,aAAa,EAAE,2EAA2E;IAC1F,IAAI,EAAE,qHAAqH;IAC3H,oBAAoB,EAAE,oGAAoG;IAC1H,UAAU,EAAE,6GAA6G;IACzH,WAAW,EAAE,mEAAmE;IAChF,YAAY,EAAE,iDAAiD;IAC/D,iBAAiB,EAAE,oIAAoI;IACvJ,uBAAuB,EAAE,kJAAkJ;IAC3K,mBAAmB,EAAE,6EAA6E;CACnG,CAAC;AAEF,oGAAoG;AACpG,MAAM,UAAU,mBAAmB,CAAC,OAA2B,EAAE,QAAQ,GAAoB,OAAO,CAAC,QAAQ;IAC3G,IAAI,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClD,OAAO,EAAE,qBAAqB,EAAE,sGAAsG,EAAE,CAAC;IAC3I,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAClF,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,GAAG,CAAC;QAChC,CAAC,CAAC,EAAE,qBAAqB,EAAE,sHAAsH,EAAE;QACnJ,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAQD,+HAA+H;AAC/H,MAAM,UAAU,eAAe,CAAC,OAAiD;IAC/E,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,YAAY,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;IAC7E,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,YAAY,CAAC;IAAC,CAAC;IACjD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,SAAS,IAAI,CAAC,IAAI,SAAS,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,sBAAsB,CAAC,OAAO,EAAE,8CAA8C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACnH,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,GAAG,YAAY,EAAE,CAAC;AACrG,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { type FinishInitialization } from "../../shared/native-home-initialization.js";
|
|
2
|
+
/** DSH expands tilde against the child home and resolves relative overrides against its cwd. */
|
|
3
|
+
export declare function acquireDshProfile(env: NodeJS.ProcessEnv, cwd: string, signal?: AbortSignal): Promise<FinishInitialization>;
|
|
4
|
+
//# sourceMappingURL=profile-startup.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"profile-startup.d.ts","sources":["../../../src/runtimes/dsh/profile-startup.ts"],"names":[],"mappings":"AAGA,OAAO,EAA4B,KAAK,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAMjH,gGAAgG;AAChG,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAA4C,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAQ9J"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import { environmentHome } from "../../shared/environment-home.js";
|
|
3
|
+
import { environmentValue } from "../../shared/environment.js";
|
|
4
|
+
import { NativeHomeInitialization } from "../../shared/native-home-initialization.js";
|
|
5
|
+
import { DSH_READY_TIMEOUT_MS } from "./control.js";
|
|
6
|
+
const profiles = new NativeHomeInitialization("package.json");
|
|
7
|
+
/** DSH expands tilde against the child home and resolves relative overrides against its cwd. */
|
|
8
|
+
export async function acquireDshProfile(env, cwd, signal = AbortSignal.timeout(DSH_READY_TIMEOUT_MS)) {
|
|
9
|
+
const userHome = environmentHome(env);
|
|
10
|
+
const configured = environmentValue(env, "DSH_HOME");
|
|
11
|
+
let home = configured === undefined || configured.trim() === "" ? path.join(userHome, ".dsh") : configured;
|
|
12
|
+
if (home === "~") {
|
|
13
|
+
home = userHome;
|
|
14
|
+
}
|
|
15
|
+
else if (home.startsWith("~/") || home.startsWith("~\\")) {
|
|
16
|
+
home = path.join(userHome, home.slice(2));
|
|
17
|
+
}
|
|
18
|
+
const release = await profiles.acquire(path.resolve(cwd, home, "profiles", "acp"), signal);
|
|
19
|
+
return release;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=profile-startup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"profile-startup.js","sources":["../../../src/runtimes/dsh/profile-startup.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAA6B,MAAM,4CAA4C,CAAC;AAEjH,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,MAAM,QAAQ,GAAG,IAAI,wBAAwB,CAAC,cAAc,CAAC,CAAC;AAE9D,gGAAgG;AAChG,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAsB,EAAE,GAAW,EAAE,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,oBAAoB,CAAC;IAC7H,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,UAAU,GAAG,gBAAgB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IACrD,IAAI,IAAI,GAAG,UAAU,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAC3G,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;QAAC,IAAI,GAAG,QAAQ,CAAC;IAAC,CAAC;SACjC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAAC,CAAC;IACxG,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3F,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/dsh/session.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAyC,YAAY,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/dsh/session.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAyC,YAAY,EAAE,MAAM,4BAA4B,CAAC;AA2MtG,kFAAkF;AAClF,eAAO,MAAM,UAAU,EAAE,YAevB,CAAC"}
|
|
@@ -18,7 +18,7 @@ import { sameDirectory } from "../../shared/same-directory.js";
|
|
|
18
18
|
import { checkSessionName, refuseSessionOptions } from "../../shared/session-options.js";
|
|
19
19
|
import { withSessionCredentials } from "../../shared/session-credentials.js";
|
|
20
20
|
import { dshCompaction } from "./compaction.js";
|
|
21
|
-
import { DshCommandError, dshControl } from "./control.js";
|
|
21
|
+
import { DshCommandError, dshControl, isDshExitedError } from "./control.js";
|
|
22
22
|
import { dshEnvironment, launchDsh } from "./launch.js";
|
|
23
23
|
import { isBackgroundShellJob } from "./jobs.js";
|
|
24
24
|
import { dshGoalControl } from "./goal.js";
|
|
@@ -98,6 +98,9 @@ async function savedRoute(control, sessionId, cwd) {
|
|
|
98
98
|
return asRecord(saved.route) ?? undefined;
|
|
99
99
|
}
|
|
100
100
|
function refusalOf(error) {
|
|
101
|
+
if (isDshExitedError(error)) {
|
|
102
|
+
return { kind: "rejected", code: "runtime_exited", reason: error.message };
|
|
103
|
+
}
|
|
101
104
|
if (!(error instanceof DshCommandError)) {
|
|
102
105
|
return { kind: "rejected", code: "error", reason: error instanceof Error ? error.message : String(error) };
|
|
103
106
|
}
|
|
@@ -126,10 +129,10 @@ async function open(command, options, env, credentials, mcpRows) {
|
|
|
126
129
|
const control = dshControl(child, (message) => {
|
|
127
130
|
const { state, frame } = foldDsh(projection, message);
|
|
128
131
|
projection = state;
|
|
129
|
-
kernel.frame(frame.body, frame.sessionId === undefined ? undefined : { sessionId: frame.sessionId });
|
|
130
132
|
if (frame.sessionId === undefined && frame.body.events.some((event) => event.kind === "turn_ended")) {
|
|
131
133
|
fallback.clear();
|
|
132
134
|
}
|
|
135
|
+
kernel.frame(frame.body, frame.sessionId === undefined ? undefined : { sessionId: frame.sessionId });
|
|
133
136
|
}, credentials.redact);
|
|
134
137
|
child.onExit((code, reason) => {
|
|
135
138
|
fallback.clear();
|
|
@@ -177,11 +180,12 @@ async function open(command, options, env, credentials, mcpRows) {
|
|
|
177
180
|
return { kind: "accepted", native: await control.request(method, { sessionId, ...payload }) };
|
|
178
181
|
}
|
|
179
182
|
catch (error) {
|
|
180
|
-
return refusalOf(error);
|
|
183
|
+
return kernel.unreachable() ?? refusalOf(error);
|
|
181
184
|
}
|
|
182
185
|
};
|
|
186
|
+
let prompting = false;
|
|
183
187
|
const active = () => projection.sessions[sessionId]?.turnOpen === true;
|
|
184
|
-
const compaction = opened.compact === true ? dshCompaction(kernel, control, () => active() || (projection.sessions[sessionId]?.nextTurn.length ?? 0) > 0) : undefined;
|
|
188
|
+
const compaction = opened.compact === true ? dshCompaction(kernel, control, () => active() || prompting || (projection.sessions[sessionId]?.nextTurn.length ?? 0) > 0) : undefined;
|
|
185
189
|
const compactBusy = { kind: "rejected", code: "busy", reason: "DSH is compacting this session" };
|
|
186
190
|
return credentials.seal({
|
|
187
191
|
id: sessionId, capabilities, resources: child.resources,
|
|
@@ -191,14 +195,30 @@ async function open(command, options, env, credentials, mcpRows) {
|
|
|
191
195
|
if (compaction?.busy() === true) {
|
|
192
196
|
return compactBusy;
|
|
193
197
|
}
|
|
194
|
-
if (active()) {
|
|
198
|
+
if (active() || prompting) {
|
|
195
199
|
return { kind: "rejected", code: "busy", reason: "busy" };
|
|
196
200
|
}
|
|
197
|
-
return withInputImages(capabilities, inputOptions?.images, async (images) =>
|
|
201
|
+
return withInputImages(capabilities, inputOptions?.images, async (images) => {
|
|
202
|
+
prompting = true;
|
|
203
|
+
try {
|
|
204
|
+
return await send("prompt", inputFields(text, inputOptions?.inputId, images));
|
|
205
|
+
}
|
|
206
|
+
finally {
|
|
207
|
+
prompting = false;
|
|
208
|
+
}
|
|
209
|
+
});
|
|
198
210
|
}),
|
|
199
211
|
// A control the runtime cannot do is an absent member; `dsh/opened` keeps the inventory that says why.
|
|
200
212
|
...(methods.steer === true ? {
|
|
201
|
-
steer: async (text, inputOptions) => kernel.control({ kind: "steer", input: text, ...inputOptions }, async () =>
|
|
213
|
+
steer: async (text, inputOptions) => kernel.control({ kind: "steer", input: text, ...inputOptions }, async () => {
|
|
214
|
+
if (compaction?.busy() === true) {
|
|
215
|
+
return compactBusy;
|
|
216
|
+
}
|
|
217
|
+
if (!active() && !prompting) {
|
|
218
|
+
return { kind: "rejected", code: "no_active_turn", reason: "no active turn" };
|
|
219
|
+
}
|
|
220
|
+
return withInputImages(capabilities, inputOptions?.images, async (images) => send("steer", inputFields(text, inputOptions?.inputId, images)));
|
|
221
|
+
}),
|
|
202
222
|
} : {}),
|
|
203
223
|
queue: async (text, inputOptions) => kernel.control({ kind: "queue", input: text, ...inputOptions }, async () => compaction?.busy() === true ? compactBusy : withInputImages(capabilities, inputOptions?.images, async (images) => send("queue", inputFields(text, inputOptions?.inputId, images)))),
|
|
204
224
|
...(inboxMethods.remove === true ? {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/runtimes/dsh/session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/runtimes/dsh/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skills.d.ts","sources":["../../../src/runtimes/dsh/skills.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAoBhF,qGAAqG;AACrG,eAAO,MAAM,SAAS,EAAE,eAAe,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"skills.d.ts","sources":["../../../src/runtimes/dsh/skills.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAoBhF,qGAAqG;AACrG,eAAO,MAAM,SAAS,EAAE,eAAe,CAAC,UAAU,CA2BjD,CAAC"}
|
|
@@ -30,13 +30,12 @@ export const dshSkills = async (installation, options = {}) => {
|
|
|
30
30
|
return refusal;
|
|
31
31
|
}
|
|
32
32
|
const scope = workspaceScope(options);
|
|
33
|
-
const launched = await launchDsh(installation.command, scope.cwd, env).catch(() => null);
|
|
33
|
+
const launched = await launchDsh(installation.command, scope.cwd, env, [], signal).catch(() => null);
|
|
34
34
|
if (launched === null) {
|
|
35
35
|
return unavailableInventory("query_failed", "Native inventory query failed");
|
|
36
36
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
const control = dshControl(child, () => { });
|
|
37
|
+
own(launched.child);
|
|
38
|
+
const control = dshControl(launched.child, () => { });
|
|
40
39
|
await control.ready;
|
|
41
40
|
let snapshot = {};
|
|
42
41
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skills.js","sources":["../../../src/runtimes/dsh/skills.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACxL,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,SAAS,OAAO,CAAC,GAAe;IAC9B,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC5C,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,WAAW,CAAC,EAAE,GAAG,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;QAC9F,GAAG,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE;YAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS;SACxJ,CAAC;QACF,GAAG,SAAS,CAAC,eAAe,EAAE,UAAU,EAAE,aAAa,CAAC;QACxD,GAAG,CAAC,OAAO,UAAU,EAAE,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,sBAAsB,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnH,CAAC;AACJ,CAAC;AAED,qGAAqG;AACrG,MAAM,CAAC,MAAM,SAAS,GAAgC,KAAK,EAAE,YAAY,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE;IACzF,IAAI,YAAY,CAAC,GAAG,KAAK,YAAY,EAAE,CAAC;QAAC,OAAO,oBAAoB,CAAC,0BAA0B,EAAE,4CAA4C,CAAC,CAAC;IAAC,CAAC;IACjJ,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC;IAC9C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QACvD,MAAM,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,IAAI,MAAM,qBAAqB,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC7H,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YAAC,OAAO,OAAO,CAAC;QAAC,CAAC;QACzC,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"skills.js","sources":["../../../src/runtimes/dsh/skills.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-usage.d.ts","sources":["../../../src/runtimes/factory/account-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAA+C,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"account-usage.d.ts","sources":["../../../src/runtimes/factory/account-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAA+C,MAAM,kCAAkC,CAAC;AAsE9I,sEAAsE;AACtE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,GAAE,MAAmB,GAAG,oBAAoB,CAsBpG;AAWD,eAAO,MAAM,mBAAmB,EAAE,kBAiCjC,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { sessionCredentialRedactor } from "../../shared/credential-redactor.js";
|
|
|
4
4
|
import { environmentValue } from "../../shared/environment.js";
|
|
5
5
|
import { utcInstantFromDate } from "../../shared/instant.js";
|
|
6
6
|
import { asNumber, asRecord, parseJson } from "../../shared/json.js";
|
|
7
|
+
import { usedRatioFromPercent } from "../../shared/usage-ratio.js";
|
|
7
8
|
import { factoryCredential } from "./account-credential.js";
|
|
8
9
|
import { accountUsageEnvironment } from "../../shared/usage-environment.js";
|
|
9
10
|
/*
|
|
@@ -69,7 +70,7 @@ function bucketWindow(value, tier, prefix, labelPrefix, scope, now) {
|
|
|
69
70
|
const running = resetsAt !== null && Date.parse(resetsAt) > now;
|
|
70
71
|
return {
|
|
71
72
|
id: `${prefix}.${tier.key}`, label: `${labelPrefix}${tier.label}`,
|
|
72
|
-
usedRatio: running ?
|
|
73
|
+
usedRatio: running ? usedRatioFromPercent(used) : 0,
|
|
73
74
|
...(running && resetsAt !== null ? { resetsAt } : {}),
|
|
74
75
|
...(tier.durationMs === undefined ? {} : { durationMs: tier.durationMs }),
|
|
75
76
|
scope,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-usage.js","sources":["../../../src/runtimes/factory/account-usage.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"account-usage.js","sources":["../../../src/runtimes/factory/account-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ function safeDetail(text) {
|
|
|
33
33
|
}
|
|
34
34
|
/** One droid ACP process for one account operation, killed afterwards. Requests from droid go to `onRequest`; anything else is refused. */
|
|
35
35
|
async function withDroidAcp(command, env, onRequest, run, own) {
|
|
36
|
-
const child = spawnLineProcess(command, [...ACP_ARGS], { env, inheritStderr: false, killTree: true });
|
|
36
|
+
const child = spawnLineProcess(command, [...ACP_ARGS], { env, inheritStderr: false, killTree: true, shutdown: "stdin" });
|
|
37
37
|
own?.(child);
|
|
38
38
|
// oxlint-disable-next-line promise/prefer-await-to-then -- spawn failure is observed through the pending requests.
|
|
39
39
|
void child.spawned.catch(() => { });
|