@botiverse/oar 0.120.0 → 0.122.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 +16 -5
- package/dist/community/cybion/client.d.ts +24 -0
- package/dist/community/cybion/client.d.ts.map +1 -0
- package/dist/community/cybion/client.js +42 -0
- package/dist/community/cybion/client.js.map +1 -0
- package/dist/community/cybion/index.d.ts +14 -0
- package/dist/community/cybion/index.d.ts.map +1 -0
- package/dist/community/cybion/index.js +30 -0
- package/dist/community/cybion/index.js.map +1 -0
- package/dist/community/cybion/projection.d.ts +7 -0
- package/dist/community/cybion/projection.d.ts.map +1 -0
- package/dist/community/cybion/projection.js +100 -0
- package/dist/community/cybion/projection.js.map +1 -0
- package/dist/community/cybion/refusal.d.ts +19 -0
- package/dist/community/cybion/refusal.d.ts.map +1 -0
- package/dist/community/cybion/refusal.js +23 -0
- package/dist/community/cybion/refusal.js.map +1 -0
- package/dist/community/cybion/refused-options.d.ts +4 -0
- package/dist/community/cybion/refused-options.d.ts.map +1 -0
- package/dist/community/cybion/refused-options.js +17 -0
- package/dist/community/cybion/refused-options.js.map +1 -0
- package/dist/community/cybion/session.d.ts +8 -0
- package/dist/community/cybion/session.d.ts.map +1 -0
- package/dist/community/cybion/session.js +283 -0
- package/dist/community/cybion/session.js.map +1 -0
- package/dist/community/cybion/thread.d.ts +75 -0
- package/dist/community/cybion/thread.d.ts.map +1 -0
- package/dist/community/cybion/thread.js +192 -0
- package/dist/community/cybion/thread.js.map +1 -0
- package/dist/community/cybion/tracker-facts.d.ts +38 -0
- package/dist/community/cybion/tracker-facts.d.ts.map +1 -0
- package/dist/community/cybion/tracker-facts.js +44 -0
- package/dist/community/cybion/tracker-facts.js.map +1 -0
- package/dist/community/cybion/tracker.d.ts +76 -0
- package/dist/community/cybion/tracker.d.ts.map +1 -0
- package/dist/community/cybion/tracker.js +244 -0
- package/dist/community/cybion/tracker.js.map +1 -0
- package/dist/community/index.d.ts +1 -0
- package/dist/community/index.d.ts.map +1 -1
- package/dist/community/index.js +1 -0
- package/dist/community/index.js.map +1 -1
- package/dist/community/morph/session.d.ts.map +1 -1
- package/dist/community/morph/session.js +10 -16
- package/dist/community/morph/session.js.map +1 -1
- package/dist/contracts/account-usage.d.ts +3 -1
- package/dist/contracts/account-usage.d.ts.map +1 -1
- package/dist/contracts/failure.d.ts +6 -4
- package/dist/contracts/failure.d.ts.map +1 -1
- package/dist/contracts/index.d.ts +4 -4
- package/dist/contracts/index.d.ts.map +1 -1
- package/dist/contracts/index.js +1 -1
- package/dist/contracts/index.js.map +1 -1
- package/dist/contracts/login.d.ts +6 -0
- package/dist/contracts/login.d.ts.map +1 -1
- package/dist/contracts/orientation.d.ts +5 -0
- package/dist/contracts/orientation.d.ts.map +1 -1
- package/dist/contracts/placement.d.ts +5 -0
- package/dist/contracts/placement.d.ts.map +1 -1
- package/dist/contracts/placement.js.map +1 -1
- package/dist/contracts/records.d.ts +3 -2
- package/dist/contracts/records.d.ts.map +1 -1
- package/dist/contracts/runtime.d.ts +73 -5
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js +25 -0
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/contracts/session-options.d.ts +40 -8
- package/dist/contracts/session-options.d.ts.map +1 -1
- package/dist/contracts/session.d.ts +1 -1
- package/dist/contracts/session.d.ts.map +1 -1
- package/dist/contracts/status.d.ts +5 -0
- package/dist/contracts/status.d.ts.map +1 -1
- package/dist/observe/agent-status.d.ts.map +1 -1
- package/dist/observe/agent-status.js +28 -27
- package/dist/observe/agent-status.js.map +1 -1
- package/dist/observe/index.d.ts +1 -1
- package/dist/observe/index.d.ts.map +1 -1
- package/dist/observe/session-view-events.js +4 -4
- package/dist/observe/session-view-events.js.map +1 -1
- package/dist/observe/session-view-fold.d.ts +10 -2
- package/dist/observe/session-view-fold.d.ts.map +1 -1
- package/dist/observe/session-view-fold.js +39 -5
- package/dist/observe/session-view-fold.js.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 +5 -5
- package/dist/observe/session-view-tools.js.map +1 -1
- package/dist/observe/session-view.d.ts +24 -18
- package/dist/observe/session-view.d.ts.map +1 -1
- package/dist/observe/session-view.js +1 -3
- package/dist/observe/session-view.js.map +1 -1
- package/dist/platforms.d.ts +25 -0
- package/dist/platforms.d.ts.map +1 -0
- package/dist/platforms.js +16 -0
- package/dist/platforms.js.map +1 -0
- package/dist/runtimes/antigravity/account-usage.d.ts.map +1 -1
- package/dist/runtimes/antigravity/account-usage.js +4 -1
- package/dist/runtimes/antigravity/account-usage.js.map +1 -1
- package/dist/runtimes/antigravity/index.d.ts +4 -1
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/antigravity/index.js +2 -1
- package/dist/runtimes/antigravity/index.js.map +1 -1
- package/dist/runtimes/antigravity/list-models.d.ts.map +1 -1
- package/dist/runtimes/antigravity/list-models.js +38 -40
- package/dist/runtimes/antigravity/list-models.js.map +1 -1
- package/dist/runtimes/antigravity/logout.d.ts.map +1 -1
- package/dist/runtimes/antigravity/logout.js +3 -1
- package/dist/runtimes/antigravity/logout.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 -0
- package/dist/runtimes/antigravity/quota.d.ts.map +1 -0
- package/dist/runtimes/antigravity/quota.js +50 -0
- package/dist/runtimes/antigravity/quota.js.map +1 -0
- package/dist/runtimes/antigravity/session.d.ts.map +1 -1
- package/dist/runtimes/antigravity/session.js +6 -0
- package/dist/runtimes/antigravity/session.js.map +1 -1
- package/dist/runtimes/antigravity/skill-files.d.ts.map +1 -1
- package/dist/runtimes/antigravity/skill-files.js +44 -18
- package/dist/runtimes/antigravity/skill-files.js.map +1 -1
- package/dist/runtimes/antigravity/skill-manifests.d.ts +2 -0
- package/dist/runtimes/antigravity/skill-manifests.d.ts.map +1 -1
- package/dist/runtimes/antigravity/skill-manifests.js +11 -16
- package/dist/runtimes/antigravity/skill-manifests.js.map +1 -1
- package/dist/runtimes/claude/account-usage.d.ts.map +1 -1
- package/dist/runtimes/claude/account-usage.js +9 -7
- 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 +6 -1
- package/dist/runtimes/claude/auth-status.js.map +1 -1
- package/dist/runtimes/claude/fork-identity.d.ts +8 -0
- package/dist/runtimes/claude/fork-identity.d.ts.map +1 -0
- package/dist/runtimes/claude/fork-identity.js +56 -0
- package/dist/runtimes/claude/fork-identity.js.map +1 -0
- package/dist/runtimes/claude/global-config.d.ts +3 -0
- package/dist/runtimes/claude/global-config.d.ts.map +1 -0
- package/dist/runtimes/claude/global-config.js +36 -0
- package/dist/runtimes/claude/global-config.js.map +1 -0
- package/dist/runtimes/claude/index.d.ts +4 -1
- package/dist/runtimes/claude/index.d.ts.map +1 -1
- package/dist/runtimes/claude/index.js +2 -1
- package/dist/runtimes/claude/index.js.map +1 -1
- package/dist/runtimes/claude/inventory.d.ts +5 -3
- package/dist/runtimes/claude/inventory.d.ts.map +1 -1
- package/dist/runtimes/claude/inventory.js +127 -62
- package/dist/runtimes/claude/inventory.js.map +1 -1
- package/dist/runtimes/claude/last-account.d.ts +4 -0
- package/dist/runtimes/claude/last-account.d.ts.map +1 -0
- package/dist/runtimes/claude/last-account.js +15 -0
- package/dist/runtimes/claude/last-account.js.map +1 -0
- package/dist/runtimes/claude/launch-args.d.ts +7 -0
- package/dist/runtimes/claude/launch-args.d.ts.map +1 -1
- package/dist/runtimes/claude/launch-args.js +16 -3
- package/dist/runtimes/claude/launch-args.js.map +1 -1
- package/dist/runtimes/claude/launch.d.ts +15 -1
- package/dist/runtimes/claude/launch.d.ts.map +1 -1
- package/dist/runtimes/claude/launch.js +29 -5
- package/dist/runtimes/claude/launch.js.map +1 -1
- package/dist/runtimes/claude/limit-reset/driver.d.ts.map +1 -1
- package/dist/runtimes/claude/limit-reset/driver.js +6 -34
- package/dist/runtimes/claude/limit-reset/driver.js.map +1 -1
- package/dist/runtimes/claude/list-models.d.ts.map +1 -1
- package/dist/runtimes/claude/list-models.js +29 -35
- package/dist/runtimes/claude/list-models.js.map +1 -1
- package/dist/runtimes/claude/open-settings.d.ts +2 -0
- package/dist/runtimes/claude/open-settings.d.ts.map +1 -1
- package/dist/runtimes/claude/open-settings.js +42 -3
- package/dist/runtimes/claude/open-settings.js.map +1 -1
- package/dist/runtimes/claude/projection.d.ts +15 -0
- package/dist/runtimes/claude/projection.d.ts.map +1 -1
- package/dist/runtimes/claude/projection.js +24 -4
- package/dist/runtimes/claude/projection.js.map +1 -1
- package/dist/runtimes/claude/session.d.ts.map +1 -1
- package/dist/runtimes/claude/session.js +7 -1
- package/dist/runtimes/claude/session.js.map +1 -1
- package/dist/runtimes/claude/skill-file.d.ts +13 -0
- package/dist/runtimes/claude/skill-file.d.ts.map +1 -0
- package/dist/runtimes/claude/skill-file.js +25 -0
- package/dist/runtimes/claude/skill-file.js.map +1 -0
- package/dist/runtimes/codebuddy/index.d.ts +4 -1
- package/dist/runtimes/codebuddy/index.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/index.js +2 -1
- package/dist/runtimes/codebuddy/index.js.map +1 -1
- package/dist/runtimes/codebuddy/list-models.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/list-models.js +26 -28
- package/dist/runtimes/codebuddy/list-models.js.map +1 -1
- package/dist/runtimes/codebuddy/login.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/login.js +2 -1
- package/dist/runtimes/codebuddy/login.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-request.d.ts.map +1 -1
- package/dist/runtimes/codex/account-request.js +23 -31
- package/dist/runtimes/codex/account-request.js.map +1 -1
- package/dist/runtimes/codex/failure.d.ts.map +1 -1
- package/dist/runtimes/codex/failure.js +16 -2
- package/dist/runtimes/codex/failure.js.map +1 -1
- package/dist/runtimes/codex/index.d.ts +4 -1
- package/dist/runtimes/codex/index.d.ts.map +1 -1
- package/dist/runtimes/codex/index.js +2 -1
- package/dist/runtimes/codex/index.js.map +1 -1
- package/dist/runtimes/codex/inventory.d.ts.map +1 -1
- package/dist/runtimes/codex/inventory.js +12 -17
- package/dist/runtimes/codex/inventory.js.map +1 -1
- package/dist/runtimes/codex/list-models.d.ts.map +1 -1
- package/dist/runtimes/codex/list-models.js +28 -32
- package/dist/runtimes/codex/list-models.js.map +1 -1
- package/dist/runtimes/codex/open.d.ts +8 -7
- package/dist/runtimes/codex/open.d.ts.map +1 -1
- package/dist/runtimes/codex/open.js +43 -7
- package/dist/runtimes/codex/open.js.map +1 -1
- package/dist/runtimes/codex/projection.d.ts +6 -1
- package/dist/runtimes/codex/projection.d.ts.map +1 -1
- package/dist/runtimes/codex/projection.js +20 -11
- package/dist/runtimes/codex/projection.js.map +1 -1
- package/dist/runtimes/codex/quota-reset.d.ts +15 -0
- package/dist/runtimes/codex/quota-reset.d.ts.map +1 -0
- package/dist/runtimes/codex/quota-reset.js +55 -0
- package/dist/runtimes/codex/quota-reset.js.map +1 -0
- package/dist/runtimes/codex/refusal.d.ts +11 -0
- package/dist/runtimes/codex/refusal.d.ts.map +1 -1
- package/dist/runtimes/codex/refusal.js +17 -0
- package/dist/runtimes/codex/refusal.js.map +1 -1
- package/dist/runtimes/codex/rpc-control.d.ts +5 -2
- package/dist/runtimes/codex/rpc-control.d.ts.map +1 -1
- package/dist/runtimes/codex/rpc-control.js +8 -3
- package/dist/runtimes/codex/rpc-control.js.map +1 -1
- package/dist/runtimes/codex/session.d.ts.map +1 -1
- package/dist/runtimes/codex/session.js +10 -19
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/codex/turn-processes.d.ts.map +1 -1
- package/dist/runtimes/codex/turn-processes.js +4 -2
- package/dist/runtimes/codex/turn-processes.js.map +1 -1
- package/dist/runtimes/cursor/access.d.ts +3 -2
- package/dist/runtimes/cursor/access.d.ts.map +1 -1
- package/dist/runtimes/cursor/access.js +4 -4
- package/dist/runtimes/cursor/access.js.map +1 -1
- package/dist/runtimes/cursor/auth-status.js +2 -2
- package/dist/runtimes/cursor/auth-status.js.map +1 -1
- package/dist/runtimes/cursor/index.d.ts.map +1 -1
- package/dist/runtimes/cursor/index.js +0 -1
- package/dist/runtimes/cursor/index.js.map +1 -1
- package/dist/runtimes/cursor/list-models.d.ts.map +1 -1
- package/dist/runtimes/cursor/list-models.js +11 -21
- package/dist/runtimes/cursor/list-models.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/session-process.d.ts +1 -3
- package/dist/runtimes/cursor/session-process.d.ts.map +1 -1
- package/dist/runtimes/cursor/session-process.js +6 -26
- package/dist/runtimes/cursor/session-process.js.map +1 -1
- package/dist/runtimes/cursor/session.d.ts.map +1 -1
- package/dist/runtimes/cursor/session.js +21 -26
- package/dist/runtimes/cursor/session.js.map +1 -1
- package/dist/runtimes/cursor/skills.js +5 -8
- package/dist/runtimes/cursor/skills.js.map +1 -1
- package/dist/runtimes/cursor/subprocess/channel.d.ts +2 -1
- package/dist/runtimes/cursor/subprocess/channel.d.ts.map +1 -1
- package/dist/runtimes/cursor/subprocess/channel.js +3 -2
- package/dist/runtimes/cursor/subprocess/channel.js.map +1 -1
- package/dist/runtimes/devin/index.d.ts +3 -1
- package/dist/runtimes/devin/index.d.ts.map +1 -1
- package/dist/runtimes/devin/list-models.d.ts.map +1 -1
- package/dist/runtimes/devin/list-models.js +25 -39
- package/dist/runtimes/devin/list-models.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/devin/skills.d.ts.map +1 -1
- package/dist/runtimes/devin/skills.js +16 -24
- package/dist/runtimes/devin/skills.js.map +1 -1
- package/dist/runtimes/dsh/bridge-controls.d.ts +3 -0
- package/dist/runtimes/dsh/bridge-controls.d.ts.map +1 -0
- package/dist/runtimes/dsh/bridge-controls.js +67 -0
- package/dist/runtimes/dsh/bridge-controls.js.map +1 -0
- package/dist/runtimes/dsh/bridge-input.d.ts +3 -0
- package/dist/runtimes/dsh/bridge-input.d.ts.map +1 -0
- package/dist/runtimes/dsh/bridge-input.js +51 -0
- package/dist/runtimes/dsh/bridge-input.js.map +1 -0
- package/dist/runtimes/dsh/bridge.d.ts.map +1 -1
- package/dist/runtimes/dsh/bridge.js +24 -52
- package/dist/runtimes/dsh/bridge.js.map +1 -1
- package/dist/runtimes/dsh/compaction.d.ts +5 -0
- package/dist/runtimes/dsh/compaction.d.ts.map +1 -0
- package/dist/runtimes/dsh/compaction.js +73 -0
- package/dist/runtimes/dsh/compaction.js.map +1 -0
- package/dist/runtimes/dsh/control.d.ts +1 -1
- package/dist/runtimes/dsh/control.d.ts.map +1 -1
- package/dist/runtimes/dsh/control.js +1 -1
- package/dist/runtimes/dsh/control.js.map +1 -1
- package/dist/runtimes/dsh/index.d.ts +39 -3
- package/dist/runtimes/dsh/index.d.ts.map +1 -1
- package/dist/runtimes/dsh/index.js +13 -2
- package/dist/runtimes/dsh/index.js.map +1 -1
- package/dist/runtimes/dsh/jobs.d.ts +3 -1
- package/dist/runtimes/dsh/jobs.d.ts.map +1 -1
- package/dist/runtimes/dsh/jobs.js +20 -1
- package/dist/runtimes/dsh/jobs.js.map +1 -1
- package/dist/runtimes/dsh/launch.d.ts +0 -2
- package/dist/runtimes/dsh/launch.d.ts.map +1 -1
- package/dist/runtimes/dsh/launch.js +1 -6
- package/dist/runtimes/dsh/launch.js.map +1 -1
- package/dist/runtimes/dsh/list-models.d.ts.map +1 -1
- package/dist/runtimes/dsh/list-models.js +31 -28
- package/dist/runtimes/dsh/list-models.js.map +1 -1
- package/dist/runtimes/dsh/options.d.ts +2 -0
- package/dist/runtimes/dsh/options.d.ts.map +1 -1
- package/dist/runtimes/dsh/options.js +12 -1
- package/dist/runtimes/dsh/options.js.map +1 -1
- package/dist/runtimes/dsh/projection.d.ts.map +1 -1
- package/dist/runtimes/dsh/projection.js +6 -1
- package/dist/runtimes/dsh/projection.js.map +1 -1
- package/dist/runtimes/dsh/session.d.ts.map +1 -1
- package/dist/runtimes/dsh/session.js +40 -24
- package/dist/runtimes/dsh/session.js.map +1 -1
- package/dist/runtimes/dsh/skills.js +32 -38
- package/dist/runtimes/dsh/skills.js.map +1 -1
- package/dist/runtimes/dsh/version.d.ts +1 -2
- package/dist/runtimes/dsh/version.d.ts.map +1 -1
- package/dist/runtimes/dsh/version.js +3 -46
- package/dist/runtimes/dsh/version.js.map +1 -1
- package/dist/runtimes/factory/account.d.ts.map +1 -1
- package/dist/runtimes/factory/account.js +16 -14
- package/dist/runtimes/factory/account.js.map +1 -1
- package/dist/runtimes/factory/compaction.d.ts +1 -1
- package/dist/runtimes/factory/compaction.d.ts.map +1 -1
- package/dist/runtimes/factory/compaction.js +35 -51
- package/dist/runtimes/factory/compaction.js.map +1 -1
- package/dist/runtimes/factory/index.d.ts +4 -1
- package/dist/runtimes/factory/index.d.ts.map +1 -1
- package/dist/runtimes/factory/index.js +2 -1
- package/dist/runtimes/factory/index.js.map +1 -1
- package/dist/runtimes/factory/list-models.d.ts.map +1 -1
- package/dist/runtimes/factory/list-models.js +7 -12
- package/dist/runtimes/factory/list-models.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 +33 -34
- package/dist/runtimes/factory/session.js.map +1 -1
- package/dist/runtimes/factory/skills.d.ts.map +1 -1
- package/dist/runtimes/factory/skills.js +20 -28
- package/dist/runtimes/factory/skills.js.map +1 -1
- package/dist/runtimes/grok/account-info.d.ts +11 -0
- package/dist/runtimes/grok/account-info.d.ts.map +1 -0
- package/dist/runtimes/grok/account-info.js +60 -0
- package/dist/runtimes/grok/account-info.js.map +1 -0
- package/dist/runtimes/grok/account-usage.d.ts +0 -2
- package/dist/runtimes/grok/account-usage.d.ts.map +1 -1
- package/dist/runtimes/grok/account-usage.js +30 -48
- package/dist/runtimes/grok/account-usage.js.map +1 -1
- package/dist/runtimes/grok/auth.d.ts.map +1 -1
- package/dist/runtimes/grok/auth.js +9 -2
- package/dist/runtimes/grok/auth.js.map +1 -1
- package/dist/runtimes/grok/index.d.ts +4 -1
- package/dist/runtimes/grok/index.d.ts.map +1 -1
- package/dist/runtimes/grok/index.js +2 -1
- package/dist/runtimes/grok/index.js.map +1 -1
- package/dist/runtimes/grok/inventory.d.ts.map +1 -1
- package/dist/runtimes/grok/inventory.js +16 -21
- package/dist/runtimes/grok/inventory.js.map +1 -1
- package/dist/runtimes/grok/list-models.d.ts.map +1 -1
- package/dist/runtimes/grok/list-models.js +24 -26
- package/dist/runtimes/grok/list-models.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/auth-status.d.ts +5 -9
- package/dist/runtimes/kimi/auth-status.d.ts.map +1 -1
- package/dist/runtimes/kimi/auth-status.js +4 -9
- package/dist/runtimes/kimi/auth-status.js.map +1 -1
- package/dist/runtimes/kimi/index.d.ts +5 -2
- package/dist/runtimes/kimi/index.d.ts.map +1 -1
- package/dist/runtimes/kimi/index.js +2 -1
- package/dist/runtimes/kimi/index.js.map +1 -1
- package/dist/runtimes/kimi/list-models.d.ts.map +1 -1
- package/dist/runtimes/kimi/list-models.js +34 -35
- package/dist/runtimes/kimi/list-models.js.map +1 -1
- package/dist/runtimes/kimi/login.js +1 -1
- package/dist/runtimes/kimi/login.js.map +1 -1
- package/dist/runtimes/kimi/logout.js +1 -1
- package/dist/runtimes/kimi/logout.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/index.d.ts +7 -6
- package/dist/runtimes/opencode/index.d.ts.map +1 -1
- package/dist/runtimes/opencode/index.js +6 -5
- package/dist/runtimes/opencode/index.js.map +1 -1
- package/dist/runtimes/opencode/list-models.d.ts.map +1 -1
- package/dist/runtimes/opencode/list-models.js +26 -20
- package/dist/runtimes/opencode/list-models.js.map +1 -1
- package/dist/runtimes/opencode/options.d.ts +5 -1
- package/dist/runtimes/opencode/options.d.ts.map +1 -1
- package/dist/runtimes/opencode/options.js +34 -0
- package/dist/runtimes/opencode/options.js.map +1 -1
- package/dist/runtimes/opencode/prompt-config-v2.d.ts +15 -0
- package/dist/runtimes/opencode/prompt-config-v2.d.ts.map +1 -0
- package/dist/runtimes/opencode/prompt-config-v2.js +75 -0
- package/dist/runtimes/opencode/prompt-config-v2.js.map +1 -0
- package/dist/runtimes/opencode/prompt-config.d.ts +12 -0
- package/dist/runtimes/opencode/prompt-config.d.ts.map +1 -1
- package/dist/runtimes/opencode/prompt-config.js +32 -19
- package/dist/runtimes/opencode/prompt-config.js.map +1 -1
- package/dist/runtimes/opencode/provider-auth-facade.js +1 -1
- package/dist/runtimes/opencode/provider-auth-facade.js.map +1 -1
- package/dist/runtimes/opencode/provider-auth-server.d.ts +2 -0
- package/dist/runtimes/opencode/provider-auth-server.d.ts.map +1 -1
- package/dist/runtimes/opencode/provider-auth-server.js +64 -87
- package/dist/runtimes/opencode/provider-auth-server.js.map +1 -1
- package/dist/runtimes/opencode/retry.d.ts +5 -0
- package/dist/runtimes/opencode/retry.d.ts.map +1 -0
- package/dist/runtimes/opencode/retry.js +20 -0
- package/dist/runtimes/opencode/retry.js.map +1 -0
- package/dist/runtimes/opencode/session.d.ts +1 -0
- package/dist/runtimes/opencode/session.d.ts.map +1 -1
- package/dist/runtimes/opencode/session.js +31 -8
- package/dist/runtimes/opencode/session.js.map +1 -1
- package/dist/runtimes/opencode/shared-session.d.ts.map +1 -1
- package/dist/runtimes/opencode/shared-session.js +7 -2
- package/dist/runtimes/opencode/shared-session.js.map +1 -1
- package/dist/runtimes/opencode/skills.d.ts.map +1 -1
- package/dist/runtimes/opencode/skills.js +28 -47
- package/dist/runtimes/opencode/skills.js.map +1 -1
- package/dist/runtimes/opencode/token-usage.d.ts +5 -0
- package/dist/runtimes/opencode/token-usage.d.ts.map +1 -0
- package/dist/runtimes/opencode/token-usage.js +31 -0
- package/dist/runtimes/opencode/token-usage.js.map +1 -0
- package/dist/runtimes/opencode/upgrade.d.ts +4 -0
- package/dist/runtimes/opencode/upgrade.d.ts.map +1 -0
- package/dist/runtimes/opencode/upgrade.js +21 -0
- package/dist/runtimes/opencode/upgrade.js.map +1 -0
- package/dist/runtimes/opencode/version.d.ts +1 -0
- package/dist/runtimes/opencode/version.d.ts.map +1 -1
- package/dist/runtimes/opencode/version.js +1 -1
- package/dist/runtimes/opencode/version.js.map +1 -1
- package/dist/runtimes/pi/index.d.ts.map +1 -1
- package/dist/runtimes/pi/index.js +2 -1
- package/dist/runtimes/pi/index.js.map +1 -1
- package/dist/runtimes/pi/inventory.d.ts.map +1 -1
- package/dist/runtimes/pi/inventory.js +5 -2
- package/dist/runtimes/pi/inventory.js.map +1 -1
- package/dist/runtimes/pi/open.d.ts.map +1 -1
- package/dist/runtimes/pi/open.js +1 -0
- package/dist/runtimes/pi/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/open.d.ts +2 -0
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.js +2 -6
- package/dist/runtimes/pi/rpc/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/read.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/read.js +8 -21
- package/dist/runtimes/pi/rpc/read.js.map +1 -1
- package/dist/runtimes/pi/rpc/session.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/session.js +3 -7
- 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 +11 -14
- 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 +2 -1
- 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/session.d.ts.map +1 -1
- package/dist/runtimes/pi-durable/session.js +5 -8
- package/dist/runtimes/pi-durable/session.js.map +1 -1
- package/dist/runtimes/qoder/index.d.ts +4 -1
- package/dist/runtimes/qoder/index.d.ts.map +1 -1
- package/dist/runtimes/qoder/index.js +2 -1
- package/dist/runtimes/qoder/index.js.map +1 -1
- package/dist/runtimes/qoder/launch.d.ts +5 -1
- package/dist/runtimes/qoder/launch.d.ts.map +1 -1
- package/dist/runtimes/qoder/launch.js +5 -3
- 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 +21 -7
- 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/projection.d.ts.map +1 -1
- package/dist/runtimes/qoder/projection.js +2 -1
- package/dist/runtimes/qoder/projection.js.map +1 -1
- package/dist/runtimes/qwen/index.d.ts +4 -1
- package/dist/runtimes/qwen/index.d.ts.map +1 -1
- package/dist/runtimes/qwen/index.js +2 -1
- package/dist/runtimes/qwen/index.js.map +1 -1
- package/dist/runtimes/qwen/launch.js +1 -1
- package/dist/runtimes/qwen/launch.js.map +1 -1
- package/dist/runtimes/qwen/list-models.d.ts.map +1 -1
- package/dist/runtimes/qwen/list-models.js +37 -33
- 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/skills.d.ts.map +1 -1
- package/dist/runtimes/qwen/skills.js +28 -36
- package/dist/runtimes/qwen/skills.js.map +1 -1
- package/dist/shared/acp/auth-query.d.ts +14 -9
- package/dist/shared/acp/auth-query.d.ts.map +1 -1
- package/dist/shared/acp/auth-query.js +43 -43
- package/dist/shared/acp/auth-query.js.map +1 -1
- package/dist/shared/acp/failure.d.ts +2 -2
- package/dist/shared/acp/failure.d.ts.map +1 -1
- package/dist/shared/acp/failure.js +2 -2
- package/dist/shared/acp/failure.js.map +1 -1
- package/dist/shared/acp/profile.d.ts +7 -5
- package/dist/shared/acp/profile.d.ts.map +1 -1
- package/dist/shared/acp/profile.js +34 -17
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/acp/records.js +9 -9
- package/dist/shared/acp/records.js.map +1 -1
- package/dist/shared/acp/session.d.ts +3 -2
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +20 -35
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/shared-session.d.ts.map +1 -1
- package/dist/shared/acp/shared-session.js +8 -2
- package/dist/shared/acp/shared-session.js.map +1 -1
- package/dist/shared/acp/token-usage.d.ts +8 -3
- package/dist/shared/acp/token-usage.d.ts.map +1 -1
- package/dist/shared/acp/token-usage.js +28 -2
- package/dist/shared/acp/token-usage.js.map +1 -1
- package/dist/shared/acp/turn-terminals.d.ts.map +1 -1
- package/dist/shared/acp/turn-terminals.js +59 -48
- package/dist/shared/acp/turn-terminals.js.map +1 -1
- package/dist/shared/acp/turns.d.ts.map +1 -1
- package/dist/shared/acp/turns.js +6 -4
- package/dist/shared/acp/turns.js.map +1 -1
- package/dist/shared/executable/ownership.d.ts +11 -1
- package/dist/shared/executable/ownership.d.ts.map +1 -1
- package/dist/shared/executable/ownership.js +70 -31
- package/dist/shared/executable/ownership.js.map +1 -1
- package/dist/shared/executable/pipe-close.d.ts +40 -0
- package/dist/shared/executable/pipe-close.d.ts.map +1 -0
- package/dist/shared/executable/pipe-close.js +171 -0
- package/dist/shared/executable/pipe-close.js.map +1 -0
- package/dist/shared/executable/probe-cleanup.d.ts +6 -2
- package/dist/shared/executable/probe-cleanup.d.ts.map +1 -1
- package/dist/shared/executable/probe-cleanup.js +22 -11
- package/dist/shared/executable/probe-cleanup.js.map +1 -1
- package/dist/shared/executable/process-cleanup-diagnostics.d.ts +30 -1
- package/dist/shared/executable/process-cleanup-diagnostics.d.ts.map +1 -1
- package/dist/shared/executable/process-cleanup-diagnostics.js +16 -2
- package/dist/shared/executable/process-cleanup-diagnostics.js.map +1 -1
- package/dist/shared/executable/process-cleanup.d.ts +1 -1
- package/dist/shared/executable/process-cleanup.d.ts.map +1 -1
- package/dist/shared/executable/process-cleanup.js +1 -1
- package/dist/shared/executable/process-cleanup.js.map +1 -1
- package/dist/shared/executable/process-tree.d.ts +3 -1
- package/dist/shared/executable/process-tree.d.ts.map +1 -1
- package/dist/shared/executable/process-tree.js +7 -3
- package/dist/shared/executable/process-tree.js.map +1 -1
- package/dist/shared/executable/process.d.ts +6 -0
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +18 -3
- package/dist/shared/executable/process.js.map +1 -1
- package/dist/shared/executable/query.d.ts +14 -8
- package/dist/shared/executable/query.d.ts.map +1 -1
- package/dist/shared/executable/query.js +62 -14
- package/dist/shared/executable/query.js.map +1 -1
- package/dist/shared/executable/run.d.ts +5 -0
- package/dist/shared/executable/run.d.ts.map +1 -1
- package/dist/shared/executable/run.js +62 -1
- package/dist/shared/executable/run.js.map +1 -1
- package/dist/shared/executable/version.d.ts +1 -1
- package/dist/shared/executable/version.d.ts.map +1 -1
- package/dist/shared/executable/version.js +2 -2
- package/dist/shared/executable/version.js.map +1 -1
- package/dist/shared/inventory.d.ts +3 -2
- package/dist/shared/inventory.d.ts.map +1 -1
- package/dist/shared/inventory.js +4 -12
- package/dist/shared/inventory.js.map +1 -1
- package/dist/shared/login.d.ts +1 -1
- package/dist/shared/login.d.ts.map +1 -1
- package/dist/shared/login.js +13 -26
- package/dist/shared/login.js.map +1 -1
- package/dist/shared/manual-compaction.js +2 -2
- package/dist/shared/manual-compaction.js.map +1 -1
- package/dist/shared/orientation/index.d.ts.map +1 -1
- package/dist/shared/orientation/index.js +7 -2
- package/dist/shared/orientation/index.js.map +1 -1
- package/dist/shared/process-session.d.ts +2 -1
- package/dist/shared/process-session.d.ts.map +1 -1
- package/dist/shared/process-session.js +23 -48
- package/dist/shared/process-session.js.map +1 -1
- package/dist/shared/semver.d.ts +10 -0
- package/dist/shared/semver.d.ts.map +1 -0
- package/dist/shared/semver.js +46 -0
- package/dist/shared/semver.js.map +1 -0
- package/dist/shared/session-kernel.d.ts +4 -0
- package/dist/shared/session-kernel.d.ts.map +1 -1
- package/dist/shared/session-kernel.js +39 -0
- package/dist/shared/session-kernel.js.map +1 -1
- package/dist/shared/session-options.d.ts +7 -1
- package/dist/shared/session-options.d.ts.map +1 -1
- package/dist/shared/session-options.js +36 -2
- package/dist/shared/session-options.js.map +1 -1
- package/dist/shared/stream-json/profile.d.ts +6 -0
- package/dist/shared/stream-json/profile.d.ts.map +1 -1
- package/dist/shared/stream-json/projection.d.ts.map +1 -1
- package/dist/shared/stream-json/projection.js +32 -4
- package/dist/shared/stream-json/projection.js.map +1 -1
- package/dist/shared/stream-json/session.d.ts.map +1 -1
- package/dist/shared/stream-json/session.js +17 -27
- package/dist/shared/stream-json/session.js.map +1 -1
- package/dist/shared/stream-json/state.d.ts +2 -1
- package/dist/shared/stream-json/state.d.ts.map +1 -1
- package/dist/shared/stream-json/state.js +1 -0
- package/dist/shared/stream-json/state.js.map +1 -1
- package/dist/shared/update.d.ts +2 -0
- package/dist/shared/update.d.ts.map +1 -1
- package/dist/shared/update.js +6 -2
- package/dist/shared/update.js.map +1 -1
- package/dist/testing/scripted-runtime.d.ts.map +1 -1
- package/dist/testing/scripted-runtime.js +12 -15
- package/dist/testing/scripted-runtime.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/* oxlint-disable import/max-dependencies -- Session assembly wires the environment, process, terminal host, recorder and control machinery. */
|
|
2
1
|
import { appendCleanupFailure, cleanupFailureReason } from "../executable/process-cleanup.js";
|
|
3
2
|
import { sessionEnvironment } from "../environment.js";
|
|
4
3
|
import { manualCompaction } from "../manual-compaction.js";
|
|
@@ -76,11 +75,11 @@ export function acpSession(profile) {
|
|
|
76
75
|
export function finishAcpSession(profile, options, credentials, runtime, opened, sessionState, shared) {
|
|
77
76
|
const { terminalHost, recorder, usageGate, tokenUsage, nativeTurns } = sessionState;
|
|
78
77
|
const kernel = credentials.kernel(opened.sessionId, shared?.redact);
|
|
79
|
-
let disposeRequest = null;
|
|
80
78
|
const capabilities = { ...profile.capabilities, images: profile.capabilities.images ?? acpTakesImages(opened.initialized) };
|
|
81
79
|
const ownership = shared;
|
|
82
80
|
let compaction = null;
|
|
83
|
-
const
|
|
81
|
+
const promptUsage = (response) => tokenUsage.prompt(response, opened.initialized);
|
|
82
|
+
const turns = createAcpTurns({ operationBusy: () => compaction?.busy() === true, kernel, runtime, profile, usageGate, capabilities, promptMeta: profile.promptMeta?.(options), promptUsage,
|
|
84
83
|
...(nativeTurns === undefined ? {} : { native: { promptParams: (inputId) => ({ _meta: nativeTurns.name(inputId) }), afterClose: nativeTurns.afterOarTurn } }),
|
|
85
84
|
...(ownership === undefined ? {} : { fallback: async (request) => { ownership.stopRequests(); await lifecycle?.abortFallback(request); } }),
|
|
86
85
|
});
|
|
@@ -102,7 +101,7 @@ export function finishAcpSession(profile, options, credentials, runtime, opened,
|
|
|
102
101
|
settledBy: "native_response",
|
|
103
102
|
released: () => { queueMicrotask(() => { turns.drain(); }); },
|
|
104
103
|
create: () => {
|
|
105
|
-
const operation = createCompaction(kernel, runtime,
|
|
104
|
+
const operation = createCompaction(kernel, runtime, promptUsage);
|
|
106
105
|
let state = null;
|
|
107
106
|
const finish = () => { if (state !== null) {
|
|
108
107
|
turns.finishOperation(state);
|
|
@@ -150,7 +149,7 @@ export function finishAcpSession(profile, options, credentials, runtime, opened,
|
|
|
150
149
|
// An outcome only oar observes: answers our dispose when we caused the
|
|
151
150
|
// exit, stands alone (requestId "") when the runtime died on its own.
|
|
152
151
|
const reason = cleanupFailureReason(runtime.diagnostics().cleanup);
|
|
153
|
-
kernel.
|
|
152
|
+
kernel.processExited(code, reason);
|
|
154
153
|
turns.onExit();
|
|
155
154
|
});
|
|
156
155
|
}
|
|
@@ -248,38 +247,24 @@ export function finishAcpSession(profile, options, credentials, runtime, opened,
|
|
|
248
247
|
ownership.detach();
|
|
249
248
|
return;
|
|
250
249
|
}
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
// 2026-09-11: the dispose request stood unanswered before this).
|
|
263
|
-
kernel.respond(disposeRequest.id, { kind: "accepted" });
|
|
264
|
-
await terminalHost.dispose();
|
|
265
|
-
return;
|
|
266
|
-
}
|
|
267
|
-
// Native cancel can orphan tools before exit, including detached POSIX tools.
|
|
268
|
-
await runtime.prepareShutdown();
|
|
269
|
-
const state = turns.active();
|
|
270
|
-
if (state !== null && !runtime.closed) {
|
|
271
|
-
if (!state.abortRequested) {
|
|
250
|
+
await kernel.dispose(async () => {
|
|
251
|
+
// Native cancel can orphan tools before exit, including detached POSIX tools.
|
|
252
|
+
await runtime.prepareShutdown();
|
|
253
|
+
const state = turns.active();
|
|
254
|
+
if (state !== null && !runtime.closed) {
|
|
255
|
+
if (!state.abortRequested) {
|
|
256
|
+
runtime.markNativeStop();
|
|
257
|
+
}
|
|
258
|
+
await turns.abort(state);
|
|
259
|
+
}
|
|
260
|
+
if (opened.supportsClose && !runtime.closed) {
|
|
272
261
|
runtime.markNativeStop();
|
|
262
|
+
await closeAcpSession(runtime, kernel.sessionId).catch(() => { });
|
|
273
263
|
}
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
await closeAcpSession(runtime, kernel.sessionId).catch(() => { });
|
|
279
|
-
}
|
|
280
|
-
runtime.kill();
|
|
281
|
-
await runtime.exited;
|
|
282
|
-
await terminalHost.dispose();
|
|
264
|
+
runtime.kill();
|
|
265
|
+
await runtime.exited;
|
|
266
|
+
await terminalHost.dispose();
|
|
267
|
+
}, () => terminalHost.dispose());
|
|
283
268
|
}),
|
|
284
269
|
}, shared?.redact);
|
|
285
270
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/shared/acp/session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/shared/acp/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared-session.d.ts","sources":["../../../src/shared/acp/shared-session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shared-session.d.ts","sources":["../../../src/shared/acp/shared-session.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,cAAc,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK9F,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAMvD,OAAO,EAA8C,KAAK,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAIlG,OAAO,EAA4B,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAAoB,KAAK,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAG3F,8FAA8F;AAC9F,MAAM,WAAW,gBAAgB;IAC/B,wGAAwG;IACxG,QAAQ,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,MAAM,CAAC;IACzD,2GAA2G;IAC3G,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACnG,oGAAoG;IACpG,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,KAAK,MAAM,GAAG,IAAI,CAAC;IACzE,4EAA4E;IAC5E,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,SAAS,cAAc,EAAE,CAAC;IACzF,sFAAsF;IACtF,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,SAAS,cAAc,EAAE,CAAC;IAC/F,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,MAAM,GAAG,IAAI,CAAC;IAC3E,sGAAsG;IACtG,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,qGAAqG;IACrG,QAAQ,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IACtD,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3I;AAED,iGAAiG;AACjG,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,SAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAUlI;AAED,2GAA2G;AAC3G,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,gBAAgB,GAAG,YAAY,CAqJnG"}
|
|
@@ -176,17 +176,23 @@ export function sharedAcpSession(profile, shared) {
|
|
|
176
176
|
const owner = routing.attach({ terminal: state.terminalHost, hooks: state.hooks }, credentials);
|
|
177
177
|
let nativeId = null;
|
|
178
178
|
let initializationRefusal = null;
|
|
179
|
-
const cleanup = async () => {
|
|
179
|
+
const cleanup = async (request) => {
|
|
180
|
+
const preserveTerminals = options.endTurnProcessesOnAbort === true && request?.body.kind === "abort";
|
|
180
181
|
try {
|
|
181
182
|
await cleanupAcpOwner(async () => {
|
|
182
183
|
if (nativeId !== null && !runtime.closed) {
|
|
183
184
|
await shared.cleanup(runtime, nativeId);
|
|
184
185
|
}
|
|
185
|
-
}, async () => {
|
|
186
|
+
}, async () => { if (!preserveTerminals) {
|
|
187
|
+
await state.terminalHost.dispose();
|
|
188
|
+
} });
|
|
186
189
|
}
|
|
187
190
|
catch (error) {
|
|
188
191
|
throw routing.redactValue(error);
|
|
189
192
|
}
|
|
193
|
+
if (preserveTerminals) {
|
|
194
|
+
return { kind: "failed", reason: "Native abort was unconfirmed; hosted terminals remain owned until dispose" };
|
|
195
|
+
}
|
|
190
196
|
};
|
|
191
197
|
try {
|
|
192
198
|
if (options.resume !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared-session.js","sources":["../../../src/shared/acp/shared-session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"shared-session.js","sources":["../../../src/shared/acp/shared-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,15 @@
|
|
|
1
|
-
import type { RuntimeEventBody } from "../../contracts/session.js";
|
|
2
|
-
import type
|
|
1
|
+
import type { RuntimeEventBody, TokenTotals } from "../../contracts/session.js";
|
|
2
|
+
import { type JsonRecord } from "../json.js";
|
|
3
3
|
import type { AcpSessionProfile } from "./profile.js";
|
|
4
4
|
/** One root accumulator shared by prompt replies and proven independent vendor reports. */
|
|
5
5
|
export interface AcpTokenUsage {
|
|
6
|
-
prompt(response: JsonRecord): RuntimeEventBody | null;
|
|
6
|
+
prompt(response: JsonRecord, initialized?: JsonRecord): RuntimeEventBody | null;
|
|
7
7
|
extension(method: string, params: JsonRecord, opened: boolean): RuntimeEventBody | null;
|
|
8
8
|
}
|
|
9
9
|
export declare function createAcpTokenUsage(profile: AcpSessionProfile, sentByOar?: (promptId: string) => boolean): AcpTokenUsage;
|
|
10
|
+
/** Opt in only for runtimes whose standard ACP reply accounts for the whole prompt.
|
|
11
|
+
* Total less output includes cached input regardless of how the vendor splits it.
|
|
12
|
+
* agy 1.5.12 has only reported zero cache writes on the verified Gemini paths.
|
|
13
|
+
*/
|
|
14
|
+
export declare function wholePromptTokenUsage(response: JsonRecord): TokenTotals | null;
|
|
10
15
|
//# sourceMappingURL=token-usage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-usage.d.ts","sources":["../../../src/shared/acp/token-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"token-usage.d.ts","sources":["../../../src/shared/acp/token-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAEjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,2FAA2F;AAC3F,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,UAAU,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAChF,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,gBAAgB,GAAG,IAAI,CAAC;CACzF;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,iBAAiB,EAAE,SAAS,GAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAqB,GAAG,aAAa,CAqBrI;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,CAgB9E"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import { asNumber, asRecord } from "../json.js";
|
|
1
2
|
import { acpPromptUsage } from "./projection.js";
|
|
2
3
|
export function createAcpTokenUsage(profile, sentByOar = () => false) {
|
|
3
4
|
let billed = { input: 0, output: 0 };
|
|
4
5
|
const seen = new Set();
|
|
5
6
|
return {
|
|
6
|
-
prompt(response) {
|
|
7
|
-
const reading = acpPromptUsage(profile.promptContextUsage?.(response) ?? null, profile.promptTokenUsage?.(response) ?? null, billed);
|
|
7
|
+
prompt(response, initialized = {}) {
|
|
8
|
+
const reading = acpPromptUsage(profile.promptContextUsage?.(response) ?? null, profile.promptTokenUsage?.(response, initialized) ?? null, billed);
|
|
8
9
|
({ billed } = reading);
|
|
9
10
|
return reading.event;
|
|
10
11
|
},
|
|
@@ -25,4 +26,29 @@ export function createAcpTokenUsage(profile, sentByOar = () => false) {
|
|
|
25
26
|
},
|
|
26
27
|
};
|
|
27
28
|
}
|
|
29
|
+
/** Opt in only for runtimes whose standard ACP reply accounts for the whole prompt.
|
|
30
|
+
* Total less output includes cached input regardless of how the vendor splits it.
|
|
31
|
+
* agy 1.5.12 has only reported zero cache writes on the verified Gemini paths.
|
|
32
|
+
*/
|
|
33
|
+
export function wholePromptTokenUsage(response) {
|
|
34
|
+
const usage = asRecord(response.usage);
|
|
35
|
+
if (usage === null) {
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
38
|
+
const total = asNumber(usage.totalTokens);
|
|
39
|
+
const output = asNumber(usage.outputTokens);
|
|
40
|
+
const inputTokens = asNumber(usage.inputTokens);
|
|
41
|
+
if (total === null || output === null || inputTokens === null || output < 0 || inputTokens < 0 || total - output < inputTokens) {
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
44
|
+
const input = total - output;
|
|
45
|
+
const read = asNumber(usage.cachedReadTokens);
|
|
46
|
+
const thought = asNumber(usage.thoughtTokens);
|
|
47
|
+
return {
|
|
48
|
+
input, output,
|
|
49
|
+
...(read !== null && read >= 0 && read <= input ? { cacheRead: read } : {}),
|
|
50
|
+
...(usage.cachedWriteTokens === 0 ? { cacheWrite: 0 } : {}),
|
|
51
|
+
...(thought !== null && thought >= 0 && thought <= output ? { reasoning: thought } : {}),
|
|
52
|
+
};
|
|
53
|
+
}
|
|
28
54
|
//# sourceMappingURL=token-usage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-usage.js","sources":["../../../src/shared/acp/token-usage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"token-usage.js","sources":["../../../src/shared/acp/token-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-terminals.d.ts","sources":["../../../src/shared/acp/turn-terminals.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAe7C,MAAM,WAAW,gBAAgB;IAC/B,sFAAsF;IACtF,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,GAAG;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;CACtH;
|
|
1
|
+
{"version":3,"file":"turn-terminals.d.ts","sources":["../../../src/shared/acp/turn-terminals.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAe7C,MAAM,WAAW,gBAAgB;IAC/B,sFAAsF;IACtF,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,GAAG;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;CACtH;AAWD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,UAAU,GAAG,IAAI,GAAG,gBAAgB,CA8EpK"}
|
|
@@ -1,100 +1,111 @@
|
|
|
1
1
|
import { asRecord } from "../json.js";
|
|
2
|
-
/** The abort requests the runtime accepted. */
|
|
3
2
|
const accepted = (abort) => [...abort.requests].flatMap(([id, answer]) => answer === "accepted" ? [id] : []);
|
|
4
3
|
const passive = { aborting: () => ({ accepted() { }, refused() { } }) };
|
|
5
4
|
export function acpTurnTerminals(enabled, kernel, host, active) {
|
|
6
5
|
if (!enabled) {
|
|
7
6
|
return passive;
|
|
8
7
|
}
|
|
9
|
-
/** terminal/create requests awaiting their answer, by request id: the request's seq. */
|
|
10
8
|
const creating = new Map();
|
|
11
|
-
const
|
|
9
|
+
const terminals = new WeakMap();
|
|
12
10
|
const pending = new Map();
|
|
13
|
-
const record = (
|
|
14
|
-
for (const
|
|
15
|
-
kernel.respond(
|
|
11
|
+
const record = (ids, result) => {
|
|
12
|
+
for (const id of ids) {
|
|
13
|
+
kernel.respond(id, { kind: "cleanup", result });
|
|
16
14
|
}
|
|
17
15
|
};
|
|
18
|
-
|
|
19
|
-
let lastClose = 0;
|
|
20
|
-
const end = async (requestIds, since, closedAt) => {
|
|
21
|
-
const ids = created.filter((entry) => entry.seq > since && entry.seq < closedAt).map((entry) => entry.terminalId);
|
|
16
|
+
const end = async (turn, requests) => {
|
|
22
17
|
try {
|
|
23
|
-
const { signalled } = await host.end(
|
|
24
|
-
record(
|
|
18
|
+
const { signalled } = await host.end(terminals.get(turn) ?? []);
|
|
19
|
+
record(requests, { kind: "completed", signalled });
|
|
25
20
|
}
|
|
26
21
|
catch (error) {
|
|
27
|
-
record(
|
|
22
|
+
record(requests, { kind: "failed", reason: `stopping the aborted turn's terminals failed: ${error instanceof Error ? error.message : String(error)}` });
|
|
28
23
|
}
|
|
29
24
|
};
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
if (abort.
|
|
25
|
+
const settle = (turn) => {
|
|
26
|
+
const abort = pending.get(turn);
|
|
27
|
+
if (abort === undefined || abort.outcome === undefined || [...abort.requests.values()].includes("sent")) {
|
|
33
28
|
return;
|
|
34
29
|
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
30
|
+
if (abort.outcome === "aborted" && [...creating.values()].includes(turn)) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
pending.delete(turn);
|
|
34
|
+
const requests = accepted(abort);
|
|
35
|
+
if (requests.length === 0) {
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
if (abort.outcome === "aborted") {
|
|
39
|
+
void end(turn, requests);
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
record(requests, { kind: "completed", signalled: 0 });
|
|
39
43
|
}
|
|
40
44
|
};
|
|
41
45
|
kernel.rawEvents((event) => {
|
|
46
|
+
if (event.sessionId !== kernel.sessionId) {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
42
49
|
if (event.kind === "request") {
|
|
43
50
|
if (event.direction === "toApp" && event.body.kind === "native" && event.body.type === "terminal/create") {
|
|
44
|
-
|
|
51
|
+
const turn = active();
|
|
52
|
+
if (turn !== null && turn.request?.body.kind !== "compact") {
|
|
53
|
+
creating.set(event.id, turn);
|
|
54
|
+
}
|
|
45
55
|
}
|
|
46
56
|
return;
|
|
47
57
|
}
|
|
48
58
|
if (event.kind === "response") {
|
|
49
|
-
const
|
|
50
|
-
if (
|
|
59
|
+
const turn = creating.get(event.requestId);
|
|
60
|
+
if (turn !== undefined && event.body.kind === "answered") {
|
|
51
61
|
creating.delete(event.requestId);
|
|
52
|
-
const
|
|
53
|
-
if (typeof
|
|
54
|
-
|
|
62
|
+
const id = asRecord(event.body.native)?.terminalId;
|
|
63
|
+
if (typeof id === "string") {
|
|
64
|
+
const ids = terminals.get(turn) ?? [];
|
|
65
|
+
ids.push(id);
|
|
66
|
+
terminals.set(turn, ids);
|
|
55
67
|
}
|
|
68
|
+
settle(turn);
|
|
56
69
|
}
|
|
57
|
-
if (event.body.kind === "
|
|
58
|
-
const
|
|
70
|
+
if (event.body.kind === "released" || event.body.kind === "exited") {
|
|
71
|
+
const fallback = event.body.kind === "released" && event.body.reason === "abort_fallback" ? event.requestId : null;
|
|
59
72
|
for (const abort of pending.values()) {
|
|
60
|
-
record(accepted(abort), { kind: "failed", reason });
|
|
73
|
+
record(accepted(abort).filter(id => id !== fallback), { kind: "failed", reason: "Session became unavailable before turn cleanup was confirmed" });
|
|
61
74
|
}
|
|
62
75
|
pending.clear();
|
|
76
|
+
creating.clear();
|
|
63
77
|
}
|
|
64
78
|
return;
|
|
65
79
|
}
|
|
66
|
-
|
|
80
|
+
const ended = event.body.events.find(body => body.kind === "turn_ended");
|
|
81
|
+
if (ended === undefined) {
|
|
67
82
|
return;
|
|
68
83
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
settle(abort);
|
|
84
|
+
for (const [turn, abort] of pending) {
|
|
85
|
+
if (abort.outcome === undefined && active() !== turn) {
|
|
86
|
+
abort.outcome = ended.outcome.kind === "aborted" ? "aborted" : "other";
|
|
87
|
+
settle(turn);
|
|
74
88
|
}
|
|
75
89
|
}
|
|
76
|
-
// With no abort waiting, nothing needs terminals from turns that have ended:
|
|
77
|
-
// a later abort only looks at terminals its own turn requested.
|
|
78
|
-
if (pending.size === 0) {
|
|
79
|
-
created.length = 0;
|
|
80
|
-
creating.clear();
|
|
81
|
-
}
|
|
82
90
|
});
|
|
83
91
|
return {
|
|
84
|
-
aborting(
|
|
85
|
-
|
|
92
|
+
aborting(turn, request) {
|
|
93
|
+
if (turn.request?.body.kind === "compact") {
|
|
94
|
+
return passive.aborting(turn, request);
|
|
95
|
+
}
|
|
96
|
+
const abort = pending.get(turn) ?? { requests: new Map() };
|
|
86
97
|
abort.requests.set(request.id, "sent");
|
|
87
|
-
pending.set(
|
|
98
|
+
pending.set(turn, abort);
|
|
88
99
|
return {
|
|
89
|
-
accepted() { if (
|
|
100
|
+
accepted() { if (pending.get(turn) === abort) {
|
|
90
101
|
abort.requests.set(request.id, "accepted");
|
|
91
|
-
settle(
|
|
102
|
+
settle(turn);
|
|
92
103
|
} },
|
|
93
104
|
refused() { abort.requests.delete(request.id); if (abort.requests.size === 0) {
|
|
94
|
-
pending.delete(
|
|
105
|
+
pending.delete(turn);
|
|
95
106
|
}
|
|
96
107
|
else {
|
|
97
|
-
settle(
|
|
108
|
+
settle(turn);
|
|
98
109
|
} },
|
|
99
110
|
};
|
|
100
111
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-terminals.js","sources":["../../../src/shared/acp/turn-terminals.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"turn-terminals.js","sources":["../../../src/shared/acp/turn-terminals.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turns.d.ts","sources":["../../../src/shared/acp/turns.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"turns.d.ts","sources":["../../../src/shared/acp/turns.ts"],"names":[],"mappings":"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"}
|
package/dist/shared/acp/turns.js
CHANGED
|
@@ -62,7 +62,7 @@ export function createAcpTurns(deps) {
|
|
|
62
62
|
if (closes) {
|
|
63
63
|
events.push(...closeTurn(state));
|
|
64
64
|
}
|
|
65
|
-
kernel.frame({ type: frame.type, native: frame.native, events });
|
|
65
|
+
kernel.frame({ type: frame.type, native: frame.native, events }, frame.receivedAt === undefined ? undefined : { receivedAt: frame.receivedAt });
|
|
66
66
|
};
|
|
67
67
|
const staleSteer = new Error("not_steerable: no active turn");
|
|
68
68
|
const startVendorPrompt = (state, prompt, extraParams = {}, steered) => {
|
|
@@ -94,12 +94,13 @@ export function createAcpTurns(deps) {
|
|
|
94
94
|
// at that end includes this turn's usage.
|
|
95
95
|
await usageGate.settleAfterPrompt(profile, state.abortRequested);
|
|
96
96
|
const usage = promptUsage(result);
|
|
97
|
+
const rootTurnRecords = () => kernel.records().filter(record => record.seq > state.since && record.sessionId === rootId && record.agentPath.length === 0);
|
|
97
98
|
finishRequest(state, requestNumber, {
|
|
98
99
|
type: methods.agent.session.prompt,
|
|
99
100
|
native: result,
|
|
100
101
|
context: usage,
|
|
101
102
|
steered: steered !== undefined,
|
|
102
|
-
}, profile.promptOutcome?.(result) ?? defaultAcpPromptOutcome(result));
|
|
103
|
+
}, profile.promptOutcome?.(result, rootTurnRecords) ?? defaultAcpPromptOutcome(result));
|
|
103
104
|
}
|
|
104
105
|
catch (error) {
|
|
105
106
|
if (steered !== undefined && !dispatch.sent) {
|
|
@@ -114,13 +115,14 @@ export function createAcpTurns(deps) {
|
|
|
114
115
|
closeTurn(state);
|
|
115
116
|
return;
|
|
116
117
|
}
|
|
118
|
+
const receivedAt = Date.now();
|
|
117
119
|
const turnFrames = kernel.records().flatMap((record) => (record.kind === "frame" && record.seq > state.since ? [record.body] : []));
|
|
118
|
-
const outcome = state.abortRequested ? { kind: "aborted" } : acpFailureOutcome(error, turnFrames, profile.failureOutcome);
|
|
120
|
+
const outcome = state.abortRequested ? { kind: "aborted" } : acpFailureOutcome(error, turnFrames, profile.failureOutcome, receivedAt);
|
|
119
121
|
const refused = steered !== undefined && (profile.isSteerRefusal?.(error) === true || profile.steerOutcomeIsLatest !== true
|
|
120
122
|
|| [...state.pending].some(number => number < requestNumber && !state.answered.has(number)));
|
|
121
123
|
finishRequest(state, requestNumber, {
|
|
122
124
|
type: `${methods.agent.session.prompt}/error`,
|
|
123
|
-
native: acpErrorNative(error),
|
|
125
|
+
native: acpErrorNative(error), receivedAt,
|
|
124
126
|
context: null,
|
|
125
127
|
steered: steered !== undefined,
|
|
126
128
|
...(refused ? { dropped: steered.inputId } : {}),
|