@botiverse/oar 0.121.0 → 0.123.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 +13 -8
- package/dist/capabilities.d.ts +10 -0
- package/dist/capabilities.d.ts.map +1 -0
- package/dist/capabilities.js +7 -0
- package/dist/capabilities.js.map +1 -0
- 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/projection.d.ts.map +1 -1
- package/dist/community/morph/projection.js +14 -2
- package/dist/community/morph/projection.js.map +1 -1
- package/dist/community/morph/tracker.d.ts.map +1 -1
- package/dist/community/morph/tracker.js +18 -6
- package/dist/community/morph/tracker.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/context-usage.d.ts +10 -0
- package/dist/contracts/context-usage.d.ts.map +1 -1
- package/dist/contracts/failure.d.ts +4 -1
- package/dist/contracts/failure.d.ts.map +1 -1
- package/dist/contracts/graph.d.ts +1 -1
- package/dist/contracts/graph.d.ts.map +1 -1
- package/dist/contracts/index.d.ts +5 -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/records.d.ts +12 -11
- package/dist/contracts/records.d.ts.map +1 -1
- package/dist/contracts/runtime.d.ts +77 -6
- 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 +22 -22
- package/dist/contracts/session-options.d.ts.map +1 -1
- package/dist/contracts/session.d.ts +2 -2
- package/dist/contracts/session.d.ts.map +1 -1
- package/dist/forms/fields.d.ts +6 -3
- package/dist/forms/fields.d.ts.map +1 -1
- package/dist/forms/fields.js +44 -5
- package/dist/forms/fields.js.map +1 -1
- package/dist/forms/map.d.ts.map +1 -1
- package/dist/forms/map.js +18 -14
- package/dist/forms/map.js.map +1 -1
- package/dist/forms/types.d.ts +1 -1
- package/dist/forms/types.d.ts.map +1 -1
- package/dist/forms/validate.d.ts.map +1 -1
- package/dist/forms/validate.js +8 -15
- package/dist/forms/validate.js.map +1 -1
- package/dist/observe/conversation.d.ts.map +1 -1
- package/dist/observe/conversation.js +2 -8
- package/dist/observe/conversation.js.map +1 -1
- package/dist/observe/cursor.d.ts +6 -0
- package/dist/observe/cursor.d.ts.map +1 -0
- package/dist/observe/cursor.js +19 -0
- package/dist/observe/cursor.js.map +1 -0
- package/dist/observe/display-text.d.ts.map +1 -1
- package/dist/observe/display-text.js +1 -0
- package/dist/observe/display-text.js.map +1 -1
- package/dist/observe/events.d.ts +1 -1
- package/dist/observe/events.d.ts.map +1 -1
- package/dist/observe/events.js +5 -3
- package/dist/observe/events.js.map +1 -1
- package/dist/observe/failure-advice.d.ts.map +1 -1
- package/dist/observe/failure-advice.js +1 -0
- package/dist/observe/failure-advice.js.map +1 -1
- package/dist/observe/graph.d.ts +2 -0
- package/dist/observe/graph.d.ts.map +1 -1
- package/dist/observe/graph.js +17 -1
- package/dist/observe/graph.js.map +1 -1
- package/dist/observe/session-view-events.d.ts.map +1 -1
- package/dist/observe/session-view-events.js +6 -7
- package/dist/observe/session-view-events.js.map +1 -1
- package/dist/observe/session-view-fold.d.ts +1 -0
- package/dist/observe/session-view-fold.d.ts.map +1 -1
- package/dist/observe/session-view-fold.js +2 -0
- package/dist/observe/session-view-fold.js.map +1 -1
- package/dist/observe/session-view-root.d.ts +8 -0
- package/dist/observe/session-view-root.d.ts.map +1 -0
- package/dist/observe/session-view-root.js +69 -0
- package/dist/observe/session-view-root.js.map +1 -0
- package/dist/observe/session-view.d.ts +6 -7
- package/dist/observe/session-view.d.ts.map +1 -1
- package/dist/observe/session-view.js +19 -27
- package/dist/observe/session-view.js.map +1 -1
- package/dist/observe/usage-totals.d.ts +0 -2
- package/dist/observe/usage-totals.d.ts.map +1 -1
- package/dist/observe/usage-totals.js +1 -15
- package/dist/observe/usage-totals.js.map +1 -1
- package/dist/observe/usage.js +2 -2
- package/dist/observe/usage.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/index.d.ts +8 -1
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/antigravity/index.js +3 -2
- package/dist/runtimes/antigravity/index.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/context-usage.d.ts +8 -4
- package/dist/runtimes/claude/context-usage.d.ts.map +1 -1
- package/dist/runtimes/claude/context-usage.js +24 -4
- package/dist/runtimes/claude/context-usage.js.map +1 -1
- package/dist/runtimes/claude/credentials.d.ts +4 -0
- package/dist/runtimes/claude/credentials.d.ts.map +1 -0
- package/dist/runtimes/claude/credentials.js +62 -0
- package/dist/runtimes/claude/credentials.js.map +1 -0
- package/dist/runtimes/claude/failure.d.ts +4 -0
- package/dist/runtimes/claude/failure.d.ts.map +1 -1
- package/dist/runtimes/claude/failure.js +14 -2
- package/dist/runtimes/claude/failure.js.map +1 -1
- package/dist/runtimes/claude/fork-identity.d.ts +2 -2
- package/dist/runtimes/claude/fork-identity.d.ts.map +1 -1
- package/dist/runtimes/claude/fork-identity.js +21 -16
- package/dist/runtimes/claude/fork-identity.js.map +1 -1
- 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 +9 -1
- package/dist/runtimes/claude/index.d.ts.map +1 -1
- package/dist/runtimes/claude/index.js +5 -2
- package/dist/runtimes/claude/index.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.map +1 -1
- package/dist/runtimes/claude/launch-args.js +16 -8
- package/dist/runtimes/claude/launch-args.js.map +1 -1
- package/dist/runtimes/claude/launch.js +3 -3
- 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/open-settings.d.ts +2 -2
- package/dist/runtimes/claude/open-settings.d.ts.map +1 -1
- package/dist/runtimes/claude/open-settings.js +13 -6
- package/dist/runtimes/claude/open-settings.js.map +1 -1
- package/dist/runtimes/claude/projection.d.ts +2 -1
- package/dist/runtimes/claude/projection.d.ts.map +1 -1
- package/dist/runtimes/claude/projection.js +45 -14
- 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 +4 -3
- package/dist/runtimes/claude/session.js.map +1 -1
- package/dist/runtimes/claude/update.d.ts.map +1 -1
- package/dist/runtimes/claude/update.js +8 -0
- package/dist/runtimes/claude/update.js.map +1 -1
- package/dist/runtimes/claude/user-configuration.d.ts.map +1 -1
- package/dist/runtimes/claude/user-configuration.js +13 -6
- package/dist/runtimes/claude/user-configuration.js.map +1 -1
- package/dist/runtimes/codebuddy/failure.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/failure.js +4 -0
- package/dist/runtimes/codebuddy/failure.js.map +1 -1
- package/dist/runtimes/codebuddy/index.d.ts +8 -1
- package/dist/runtimes/codebuddy/index.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/index.js +3 -2
- package/dist/runtimes/codebuddy/index.js.map +1 -1
- package/dist/runtimes/codebuddy/options.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/options.js +8 -9
- package/dist/runtimes/codebuddy/options.js.map +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts.map +1 -1
- package/dist/runtimes/codex/app-server-client.js +2 -1
- package/dist/runtimes/codex/app-server-client.js.map +1 -1
- package/dist/runtimes/codex/index.d.ts +9 -2
- package/dist/runtimes/codex/index.d.ts.map +1 -1
- package/dist/runtimes/codex/index.js +7 -2
- package/dist/runtimes/codex/index.js.map +1 -1
- package/dist/runtimes/cursor/access.d.ts +4 -3
- package/dist/runtimes/cursor/access.d.ts.map +1 -1
- package/dist/runtimes/cursor/access.js +12 -8
- package/dist/runtimes/cursor/access.js.map +1 -1
- package/dist/runtimes/cursor/auth-status.js +1 -1
- 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 +1 -2
- package/dist/runtimes/cursor/index.js.map +1 -1
- package/dist/runtimes/cursor/list-models.js +1 -1
- package/dist/runtimes/cursor/list-models.js.map +1 -1
- package/dist/runtimes/cursor/login.js +1 -1
- package/dist/runtimes/cursor/login.js.map +1 -1
- package/dist/runtimes/cursor/logout.js +1 -1
- package/dist/runtimes/cursor/logout.js.map +1 -1
- package/dist/runtimes/cursor/model.d.ts.map +1 -1
- package/dist/runtimes/cursor/model.js +3 -1
- package/dist/runtimes/cursor/model.js.map +1 -1
- package/dist/runtimes/cursor/session.d.ts.map +1 -1
- package/dist/runtimes/cursor/session.js +5 -4
- package/dist/runtimes/cursor/session.js.map +1 -1
- package/dist/runtimes/cursor/subprocess/channel.d.ts +1 -1
- package/dist/runtimes/cursor/subprocess/channel.d.ts.map +1 -1
- package/dist/runtimes/cursor/subprocess/channel.js +7 -7
- 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/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-goal.d.ts.map +1 -1
- package/dist/runtimes/dsh/bridge-goal.js +9 -5
- package/dist/runtimes/dsh/bridge-goal.js.map +1 -1
- 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 +77 -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 +30 -55
- 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 +2 -2
- package/dist/runtimes/dsh/control.d.ts.map +1 -1
- package/dist/runtimes/dsh/control.js +7 -5
- package/dist/runtimes/dsh/control.js.map +1 -1
- package/dist/runtimes/dsh/index.d.ts +43 -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/options.d.ts +2 -0
- package/dist/runtimes/dsh/options.d.ts.map +1 -1
- package/dist/runtimes/dsh/options.js +11 -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 +7 -2
- 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 +38 -12
- package/dist/runtimes/dsh/session.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-credential.d.ts +2 -1
- package/dist/runtimes/factory/account-credential.d.ts.map +1 -1
- package/dist/runtimes/factory/account-credential.js +5 -2
- package/dist/runtimes/factory/account-credential.js.map +1 -1
- package/dist/runtimes/factory/account-usage.d.ts.map +1 -1
- package/dist/runtimes/factory/account-usage.js +4 -2
- package/dist/runtimes/factory/account-usage.js.map +1 -1
- package/dist/runtimes/factory/client.d.ts.map +1 -1
- package/dist/runtimes/factory/client.js +2 -1
- package/dist/runtimes/factory/client.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/context-usage.d.ts +15 -0
- package/dist/runtimes/factory/context-usage.d.ts.map +1 -0
- package/dist/runtimes/factory/context-usage.js +75 -0
- package/dist/runtimes/factory/context-usage.js.map +1 -0
- package/dist/runtimes/factory/index.d.ts +8 -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/options.d.ts.map +1 -1
- package/dist/runtimes/factory/options.js +3 -8
- package/dist/runtimes/factory/options.js.map +1 -1
- package/dist/runtimes/factory/session-state.d.ts +2 -0
- package/dist/runtimes/factory/session-state.d.ts.map +1 -1
- package/dist/runtimes/factory/session-state.js.map +1 -1
- package/dist/runtimes/factory/session.d.ts.map +1 -1
- package/dist/runtimes/factory/session.js +76 -45
- package/dist/runtimes/factory/session.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/failure.d.ts.map +1 -1
- package/dist/runtimes/grok/failure.js +4 -2
- package/dist/runtimes/grok/failure.js.map +1 -1
- package/dist/runtimes/grok/index.d.ts +8 -1
- package/dist/runtimes/grok/index.d.ts.map +1 -1
- package/dist/runtimes/grok/index.js +3 -2
- package/dist/runtimes/grok/index.js.map +1 -1
- package/dist/runtimes/kimi/index.d.ts +8 -1
- package/dist/runtimes/kimi/index.d.ts.map +1 -1
- package/dist/runtimes/kimi/index.js +3 -2
- package/dist/runtimes/kimi/index.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/options.d.ts +5 -1
- package/dist/runtimes/opencode/options.d.ts.map +1 -1
- package/dist/runtimes/opencode/options.js +24 -1
- 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/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/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 +5 -0
- package/dist/runtimes/opencode/version.d.ts.map +1 -1
- package/dist/runtimes/opencode/version.js +14 -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 +3 -2
- package/dist/runtimes/pi/index.js.map +1 -1
- package/dist/runtimes/pi/input-disposition.d.ts +1 -1
- package/dist/runtimes/pi/input-disposition.d.ts.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/projection.d.ts.map +1 -1
- package/dist/runtimes/pi/projection.js +5 -1
- package/dist/runtimes/pi/projection.js.map +1 -1
- package/dist/runtimes/pi/rpc/control.d.ts +1 -1
- package/dist/runtimes/pi/rpc/control.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/control.js +5 -3
- package/dist/runtimes/pi/rpc/control.js.map +1 -1
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.js +4 -2
- package/dist/runtimes/pi/rpc/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/session.js +4 -4
- package/dist/runtimes/pi/rpc/session.js.map +1 -1
- package/dist/runtimes/pi/session.js +4 -4
- 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 +3 -2
- package/dist/runtimes/pi-durable/index.js.map +1 -1
- package/dist/runtimes/pi-durable/session.d.ts.map +1 -1
- package/dist/runtimes/pi-durable/session.js +53 -12
- package/dist/runtimes/pi-durable/session.js.map +1 -1
- package/dist/runtimes/qoder/daemon.d.ts +2 -1
- package/dist/runtimes/qoder/daemon.d.ts.map +1 -1
- package/dist/runtimes/qoder/daemon.js +12 -6
- package/dist/runtimes/qoder/daemon.js.map +1 -1
- package/dist/runtimes/qoder/index.d.ts +8 -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 +2 -1
- package/dist/runtimes/qoder/launch.d.ts.map +1 -1
- package/dist/runtimes/qoder/launch.js +8 -4
- 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 +20 -13
- 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 +13 -10
- 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/qoder/protocol.d.ts +3 -1
- package/dist/runtimes/qoder/protocol.d.ts.map +1 -1
- package/dist/runtimes/qoder/protocol.js +6 -4
- package/dist/runtimes/qoder/protocol.js.map +1 -1
- package/dist/runtimes/qoder/session.js +1 -1
- package/dist/runtimes/qoder/session.js.map +1 -1
- package/dist/runtimes/qwen/index.d.ts +9 -2
- package/dist/runtimes/qwen/index.d.ts.map +1 -1
- package/dist/runtimes/qwen/index.js +7 -2
- 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/options.d.ts.map +1 -1
- package/dist/runtimes/qwen/options.js +11 -17
- package/dist/runtimes/qwen/options.js.map +1 -1
- package/dist/shared/acp/errors.d.ts.map +1 -1
- package/dist/shared/acp/errors.js +2 -1
- package/dist/shared/acp/errors.js.map +1 -1
- package/dist/shared/acp/profile.d.ts +5 -3
- 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/projection.js +7 -3
- package/dist/shared/acp/projection.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 +95 -52
- 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 +1 -1
- package/dist/shared/acp/token-usage.d.ts.map +1 -1
- package/dist/shared/acp/token-usage.js +2 -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 +1 -1
- package/dist/shared/acp/turns.d.ts.map +1 -1
- package/dist/shared/acp/turns.js +11 -7
- package/dist/shared/acp/turns.js.map +1 -1
- package/dist/shared/credential-redactor.d.ts +8 -0
- package/dist/shared/credential-redactor.d.ts.map +1 -1
- package/dist/shared/credential-redactor.js +22 -0
- package/dist/shared/credential-redactor.js.map +1 -1
- package/dist/shared/executable/diagnostics.d.ts +6 -0
- package/dist/shared/executable/diagnostics.d.ts.map +1 -1
- package/dist/shared/executable/diagnostics.js +9 -0
- package/dist/shared/executable/diagnostics.js.map +1 -1
- package/dist/shared/executable/node-script.d.ts +1 -0
- package/dist/shared/executable/node-script.d.ts.map +1 -1
- package/dist/shared/executable/node-script.js +1 -1
- package/dist/shared/executable/node-script.js.map +1 -1
- package/dist/shared/executable/process.js +1 -1
- package/dist/shared/executable/process.js.map +1 -1
- package/dist/shared/executable/reported-stderr.d.ts +10 -0
- package/dist/shared/executable/reported-stderr.d.ts.map +1 -0
- package/dist/shared/executable/reported-stderr.js +28 -0
- package/dist/shared/executable/reported-stderr.js.map +1 -0
- package/dist/shared/held-input.d.ts +9 -0
- package/dist/shared/held-input.d.ts.map +1 -1
- package/dist/shared/held-input.js +8 -0
- package/dist/shared/held-input.js.map +1 -1
- package/dist/shared/launch-args.d.ts +7 -0
- package/dist/shared/launch-args.d.ts.map +1 -0
- package/dist/shared/launch-args.js +25 -0
- package/dist/shared/launch-args.js.map +1 -0
- 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 +3 -2
- package/dist/shared/process-session.d.ts.map +1 -1
- package/dist/shared/process-session.js +13 -11
- package/dist/shared/process-session.js.map +1 -1
- package/dist/shared/seal-session.d.ts.map +1 -1
- package/dist/shared/seal-session.js +2 -1
- package/dist/shared/seal-session.js.map +1 -1
- package/dist/shared/semver.d.ts +12 -0
- package/dist/shared/semver.d.ts.map +1 -0
- package/dist/shared/semver.js +52 -0
- package/dist/shared/semver.js.map +1 -0
- package/dist/shared/session-options.d.ts +6 -0
- package/dist/shared/session-options.d.ts.map +1 -1
- package/dist/shared/session-options.js +22 -4
- package/dist/shared/session-options.js.map +1 -1
- package/dist/shared/stream-json/profile.d.ts +5 -1
- 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 +34 -3
- 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 +12 -5
- package/dist/shared/stream-json/session.js.map +1 -1
- package/dist/shared/stream-json/state.d.ts +2 -0
- 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/shared/user-configuration.d.ts +5 -0
- package/dist/shared/user-configuration.d.ts.map +1 -0
- package/dist/shared/user-configuration.js +19 -0
- package/dist/shared/user-configuration.js.map +1 -0
- package/dist/testing/scripted-runtime.d.ts.map +1 -1
- package/dist/testing/scripted-runtime.js +3 -2
- package/dist/testing/scripted-runtime.js.map +1 -1
- package/package.json +5 -1
|
@@ -44,6 +44,9 @@ function processHome(options) {
|
|
|
44
44
|
}
|
|
45
45
|
/** Relative process inputs depend on the session cwd and lack the neutral-home launch evidence. */
|
|
46
46
|
function launchRefusal(command, options) {
|
|
47
|
+
if (options.fork !== undefined) {
|
|
48
|
+
return "OpenCode shared placement has no verified ownership of a forked session";
|
|
49
|
+
}
|
|
47
50
|
if ((options.launchArgs?.length ?? 0) > 0) {
|
|
48
51
|
return "OpenCode shared placement has no startup-directory evidence for custom launchArgs";
|
|
49
52
|
}
|
|
@@ -84,13 +87,15 @@ export function createOpenCodeSharedSession(diagnostic = openCodeDiagnosticSumma
|
|
|
84
87
|
if (installation.via !== "executable") {
|
|
85
88
|
throw new Error("opencode requires an executable installation");
|
|
86
89
|
}
|
|
87
|
-
|
|
90
|
+
// Session prompts travel in the process's own OPENCODE_CONFIG_CONTENT, which a shared process cannot carry per session.
|
|
91
|
+
const prompt = options.systemPrompt !== undefined ? "systemPrompt" : (options.appendSystemPrompt !== undefined ? "appendSystemPrompt" : null);
|
|
92
|
+
const refusal = prompt === null ? launchRefusal(installation.command, options) : "OpenCode shared placement serves several sessions from one process, which cannot carry one session's prompt configuration";
|
|
88
93
|
if (refusal !== null) {
|
|
89
94
|
if (context.requested === "auto") {
|
|
90
95
|
const session = await opencodeSession(installation, options, { requested: "auto", placement: "isolated" });
|
|
91
96
|
return session;
|
|
92
97
|
}
|
|
93
|
-
throw new UnsupportedOptionError("placement", refusal);
|
|
98
|
+
throw new UnsupportedOptionError(prompt ?? "placement", refusal);
|
|
94
99
|
}
|
|
95
100
|
// Reject unreadable directories before acquiring or spawning a pooled process.
|
|
96
101
|
// Reservation re-reads the identity after acquisition, then checks and claims atomically.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared-session.js","sources":["../../../src/runtimes/opencode/shared-session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shared-session.js","sources":["../../../src/runtimes/opencode/shared-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { TokenTotals } from "../../contracts/session.js";
|
|
2
|
+
import { type JsonRecord } from "../../shared/json.js";
|
|
3
|
+
/** From 2.0.22, the native ACP response sums root steps across one prompt. */
|
|
4
|
+
export declare function opencodePromptTokenUsage(response: JsonRecord, initialized: JsonRecord): TokenTotals | null;
|
|
5
|
+
//# sourceMappingURL=token-usage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-usage.d.ts","sources":["../../../src/runtimes/opencode/token-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAK3E,8EAA8E;AAC9E,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,CAgB1G"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { asNumber, asRecord } from "../../shared/json.js";
|
|
2
|
+
import { compareSemver } from "../../shared/semver.js";
|
|
3
|
+
import { cacheParts, reasoningPart } from "../../shared/token-totals.js";
|
|
4
|
+
import { parseOpencodeRelease } from "./version.js";
|
|
5
|
+
/** From 2.0.22, the native ACP response sums root steps across one prompt. */
|
|
6
|
+
export function opencodePromptTokenUsage(response, initialized) {
|
|
7
|
+
const version = asRecord(initialized.agentInfo)?.version;
|
|
8
|
+
const release = typeof version === "string" ? parseOpencodeRelease(version) : undefined;
|
|
9
|
+
if (release?.major !== 2 || (compareSemver(release.version, "2.0.22") ?? -1) < 0) {
|
|
10
|
+
return null;
|
|
11
|
+
}
|
|
12
|
+
const usage = asRecord(response.usage);
|
|
13
|
+
if (usage === null) {
|
|
14
|
+
return null;
|
|
15
|
+
}
|
|
16
|
+
const rawInput = asNumber(usage.inputTokens);
|
|
17
|
+
const rawOutput = asNumber(usage.outputTokens);
|
|
18
|
+
if (rawInput === null || rawOutput === null || rawInput < 0 || rawOutput < 0) {
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
const parts = [usage.cachedReadTokens, usage.cachedWriteTokens, usage.thoughtTokens];
|
|
22
|
+
if (parts.some(part => part !== undefined && (asNumber(part) ?? -1) < 0)) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
const cache = cacheParts(usage, { read: "cachedReadTokens", write: "cachedWriteTokens" });
|
|
26
|
+
const thought = reasoningPart(usage, "thoughtTokens");
|
|
27
|
+
const input = rawInput + (cache.cacheRead ?? 0) + (cache.cacheWrite ?? 0);
|
|
28
|
+
const output = rawOutput + (thought.reasoning ?? 0);
|
|
29
|
+
return input + output === usage.totalTokens ? { input, output, ...cache, ...thought } : null;
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=token-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-usage.js","sources":["../../../src/runtimes/opencode/token-usage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,8EAA8E;AAC9E,MAAM,UAAU,wBAAwB,CAAC,QAAoB,EAAE,WAAuB;IACpF,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IACzD,MAAM,OAAO,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACxF,IAAI,OAAO,EAAE,KAAK,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAClG,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC/C,IAAI,QAAQ,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI,IAAI,QAAQ,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC9F,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;IACrF,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC1F,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAC1F,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,QAAQ,GAAG,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAG,SAAS,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC;IACpD,OAAO,KAAK,GAAG,MAAM,KAAK,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC/F,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgrade.d.ts","sources":["../../../src/runtimes/opencode/upgrade.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAI1D,yFAAyF;AACzF,eAAO,MAAM,eAAe,EAAE,QAe7B,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { runNativeUpgrade } from "../../shared/update.js";
|
|
2
|
+
import { opencodeRelease } from "./version.js";
|
|
3
|
+
/** Pin the release line to what the selected executable reports just before mutation. */
|
|
4
|
+
export const opencodeUpgrade = async (installation, options) => {
|
|
5
|
+
if (installation.via !== "executable") {
|
|
6
|
+
return { kind: "unsupported", reason: "unsupported_installation", detail: "OpenCode upgrade requires an executable" };
|
|
7
|
+
}
|
|
8
|
+
const { command } = installation;
|
|
9
|
+
try {
|
|
10
|
+
const release = await opencodeRelease({ kind: "available", via: "executable", command });
|
|
11
|
+
if (release.major !== 2) {
|
|
12
|
+
return { kind: "unsupported", reason: "unsupported_installation", detail: "OAR drives the native upgrade only on the OpenCode v2 release line" };
|
|
13
|
+
}
|
|
14
|
+
const result = await runNativeUpgrade(command, release.version, { args: ["upgrade"] }, options);
|
|
15
|
+
return result;
|
|
16
|
+
}
|
|
17
|
+
catch (error) {
|
|
18
|
+
return { kind: "failed", exitCode: null, output: String(error) };
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
//# sourceMappingURL=upgrade.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgrade.js","sources":["../../../src/runtimes/opencode/upgrade.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,yFAAyF;AACzF,MAAM,CAAC,MAAM,eAAe,GAAa,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE;IACvE,IAAI,YAAY,CAAC,GAAG,KAAK,YAAY,EAAE,CAAC;QACtC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,0BAA0B,EAAE,MAAM,EAAE,yCAAyC,EAAE,CAAC;IACxH,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC;QACzF,IAAI,OAAO,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,0BAA0B,EAAE,MAAM,EAAE,oEAAoE,EAAE,CAAC;QACnJ,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAChG,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IACnE,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -15,6 +15,11 @@ export declare function opencodeRelease(installation: ExecutableInstallation, op
|
|
|
15
15
|
/** Synchronous read of a `--version` line; undefined when it names neither line. */
|
|
16
16
|
export declare function parseOpencodeRelease(version: string): OpencodeRelease | undefined;
|
|
17
17
|
export declare function opencodeMajor(installation: ExecutableInstallation, options?: Pick<SessionOptions, "cwd" | "env">): Promise<1 | 2>;
|
|
18
|
+
/** A pre-release of the floor itself (`2.2.0-beta`) is below it: it may predate the measured behavior. */
|
|
19
|
+
export declare function atLeastV2(release: OpencodeRelease, floor: {
|
|
20
|
+
readonly minor: number;
|
|
21
|
+
readonly patch: number;
|
|
22
|
+
}): boolean;
|
|
18
23
|
/** 2.3.0 runs subagents in the background and reports them through `opencode/session/child_update`. */
|
|
19
24
|
export declare function hasBackgroundChildUpdates(release: OpencodeRelease): boolean;
|
|
20
25
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sources":["../../../src/runtimes/opencode/version.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAKjE,wFAAwF;AACxF,MAAM,WAAW,eAAe;IAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE;AAEpI,4EAA4E;AAC5E,wBAAsB,eAAe,CAAC,YAAY,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,KAAK,CAAC,GAAG;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAepN;AAED,oFAAoF;AACpF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAOjF;AAED,wBAAsB,aAAa,CAAC,YAAY,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAGvI;AAED,uGAAuG;AACvG,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAE3E"}
|
|
1
|
+
{"version":3,"file":"version.d.ts","sources":["../../../src/runtimes/opencode/version.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAKjE,wFAAwF;AACxF,MAAM,WAAW,eAAe;IAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE;AAEpI,4EAA4E;AAC5E,wBAAsB,eAAe,CAAC,YAAY,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,KAAK,CAAC,GAAG;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAepN;AAED,oFAAoF;AACpF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAOjF;AAED,wBAAsB,aAAa,CAAC,YAAY,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAGvI;AAED,0GAA0G;AAC1G,wBAAgB,SAAS,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAKtH;AAED,uGAAuG;AACvG,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAE3E"}
|
|
@@ -33,8 +33,21 @@ export async function opencodeMajor(installation, options) {
|
|
|
33
33
|
const release = await opencodeRelease(installation, options);
|
|
34
34
|
return release.major;
|
|
35
35
|
}
|
|
36
|
+
/** A pre-release of the floor itself (`2.2.0-beta`) is below it: it may predate the measured behavior. */
|
|
37
|
+
export function atLeastV2(release, floor) {
|
|
38
|
+
if (release.major !== 2) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
if (release.minor !== floor.minor) {
|
|
42
|
+
return release.minor > floor.minor;
|
|
43
|
+
}
|
|
44
|
+
if (release.patch !== floor.patch) {
|
|
45
|
+
return release.patch > floor.patch;
|
|
46
|
+
}
|
|
47
|
+
return !/^\d+\.\d+\.\d+-/u.test(release.version);
|
|
48
|
+
}
|
|
36
49
|
/** 2.3.0 runs subagents in the background and reports them through `opencode/session/child_update`. */
|
|
37
50
|
export function hasBackgroundChildUpdates(release) {
|
|
38
|
-
return release
|
|
51
|
+
return atLeastV2(release, { minor: 3, patch: 0 });
|
|
39
52
|
}
|
|
40
53
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sources":["../../../src/runtimes/opencode/version.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAKjE,4EAA4E;AAC5E,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,YAAoC,EAAE,OAA8G;IACxL,IAAI,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IACnC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE;YACtE,SAAS,EAAE,OAAO,EAAE,SAAS,IAAI,MAAM;YACvC,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;SAClK,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,MAAM,cAAc,CAAC,8CAA8C,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACjK,CAAC;QACD,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,OAAO,CAAC;IAAC,CAAC;IAC9C,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AACpF,CAAC;AAED,oFAAoF;AACpF,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,MAAM,KAAK,GAAG,gDAAgD,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACpF,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;IACpD,IAAI,CAAC,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,GAAG,CAAC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACnF,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,KAAK,IAAI,KAAK,IAAI,KAAK,GAAG,MAAM,IAAI,EAAE,EAAE,EAAE,CAAC;IAC5I,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,YAAoC,EAAE,OAA6C;IACrH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC7D,OAAO,OAAO,CAAC,KAAK,CAAC;AACvB,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"version.js","sources":["../../../src/runtimes/opencode/version.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/pi/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/pi/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,kBAAkB,CAAC;AAQpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,YAAY,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAQrD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,GAAG;IAAE,QAAQ,CAAC,YAAY,EAAE,OAAO,cAAc,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,YAAY,CAAA;CAAE,CAuCpK;AAED,eAAO,MAAM,SAAS;2BAzC8E,OAAO,cAAc;yBAAuB,OAAO,YAAY;CAyCzH,CAAC;AAE3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,YAAY,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/* oxlint-disable import/max-dependencies -- The runtime declaration imports one module per capability. */
|
|
2
2
|
import { runtimeBrands } from "../../brands.js";
|
|
3
|
+
import { verifiedPlatforms } from "../../platforms.js";
|
|
3
4
|
import { createPiInventories } from "./inventory.js";
|
|
4
5
|
import { defineRuntime } from "../../contracts/runtime.js";
|
|
5
6
|
import { piInstallation } from "./installation.js";
|
|
@@ -39,10 +40,10 @@ export function createPiRuntime(options = {}) {
|
|
|
39
40
|
};
|
|
40
41
|
const runtime = defineRuntime({
|
|
41
42
|
id: "pi",
|
|
42
|
-
sessionCapabilities: () => ({ steer: true, images: true }),
|
|
43
|
+
sessionCapabilities: () => ({ steer: true, images: true, contextUsage: { tokens: true, contextWindow: true } }),
|
|
43
44
|
...(subprocess ? { minVersion: PI_RPC_MINIMUM_VERSION } : {}),
|
|
44
45
|
manualCompaction: { kind: "supported", activeTurn: "reject" },
|
|
45
|
-
brand: runtimeBrands.pi,
|
|
46
|
+
brand: runtimeBrands.pi, verifiedPlatforms: verifiedPlatforms.pi,
|
|
46
47
|
refusedSessionOptions: subprocess ? piRpcRefusedSessionOptions : piRefusedSessionOptions,
|
|
47
48
|
resumedSessionOptions: {
|
|
48
49
|
systemPrompt: { provided: "immediate", omitted: "default" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../src/runtimes/pi/index.ts"],"names":[],"mappings":"AAAA,0GAA0G;AAC1G,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../src/runtimes/pi/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input-disposition.d.ts","sources":["../../../src/runtimes/pi/input-disposition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAChG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEhE,0EAA0E;AAC1E,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACjF,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"input-disposition.d.ts","sources":["../../../src/runtimes/pi/input-disposition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAChG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEhE,0EAA0E;AAC1E,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACjF,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;IACxC,QAAQ,CAAC,EAAE,IAAI,CAAC;CACjB;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,CAAC,CAGzG;AAED,6FAA6F;AAC7F,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,CAKvG;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,CAAC,CAE1H"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventory.d.ts","sources":["../../../src/runtimes/pi/inventory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAmC,UAAU,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAM9J,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"inventory.d.ts","sources":["../../../src/runtimes/pi/inventory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAmC,UAAU,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAM9J,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAgFrD,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,gBAAqB,GAAG,IAAI,CAAC,kBAAkB,EAAE,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC,CAI7H;AAED,eAAO,MAAM,QAAQ,6BAAkB,CAAC;AACxC,eAAO,MAAM,UAAU,+BAAoB,CAAC;AAC5C,eAAO,MAAM,OAAO,4BAAiB,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { piSkillProvenance } from "./skill-provenance.js";
|
|
|
4
4
|
import { piAgentDir } from "./resolve.js";
|
|
5
5
|
import { checkPiProjectPackages, reportMissingPiPackages } from "./project.js";
|
|
6
6
|
import { initPiTheme } from "./theme.js";
|
|
7
|
-
import {
|
|
7
|
+
import { environmentValue, sessionEnvironment } from "../../shared/environment.js";
|
|
8
8
|
function piInventories(session, scope) {
|
|
9
9
|
return {
|
|
10
10
|
skills: () => {
|
|
@@ -49,6 +49,10 @@ function reader(select, project) {
|
|
|
49
49
|
if (installation.via !== "bundled") {
|
|
50
50
|
return unsupportedInventory("installation_unsupported", "Pi inventory requires the bundled SDK");
|
|
51
51
|
}
|
|
52
|
+
const env = sessionEnvironment(options.env);
|
|
53
|
+
if (Object.keys(options.env ?? {}).some(key => environmentValue(env, key) !== environmentValue(process.env, key))) {
|
|
54
|
+
return unsupportedInventory("scope_unavailable", "Pi discovers inventories in the host process and cannot apply a different environment");
|
|
55
|
+
}
|
|
52
56
|
const scope = workspaceScope(options);
|
|
53
57
|
// Cleanup stays inside the task: if the caller times out during SDK startup,
|
|
54
58
|
// the eventual session is still disposed. No trust-store write or model prompt.
|
|
@@ -62,7 +66,6 @@ function reader(select, project) {
|
|
|
62
66
|
const services = await sdk.createAgentSessionServices({ cwd: scope.cwd, agentDir, settingsManager });
|
|
63
67
|
const { session } = await sdk.createAgentSessionFromServices({
|
|
64
68
|
services, sessionManager: sdk.SessionManager.inMemory(scope.cwd),
|
|
65
|
-
...(options.env === undefined ? {} : { customTools: [await piEnvBashTool(scope.cwd, options.env)] }),
|
|
66
69
|
});
|
|
67
70
|
try {
|
|
68
71
|
return select(piInventories(session, scope))();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventory.js","sources":["../../../src/runtimes/pi/inventory.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC7G,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"inventory.js","sources":["../../../src/runtimes/pi/inventory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projection.d.ts","sources":["../../../src/runtimes/pi/projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EAET,WAAW,EACX,WAAW,EACZ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAa,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAK/D;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,aAAa,EAAE,eAAe,GAAG,SAAS,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAC9B;AAED,eAAO,MAAM,mBAAmB,EAAE,iBAKjC,CAAC;AAEF,yFAAyF;AACzF,wBAAgB,UAAU,CAAC,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,CAEtE;AAED,4FAA4F;AAC5F,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,GAAG,WAAW,CAQpF;AAED;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;
|
|
1
|
+
{"version":3,"file":"projection.d.ts","sources":["../../../src/runtimes/pi/projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EAET,WAAW,EACX,WAAW,EACZ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAa,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAK/D;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,aAAa,EAAE,eAAe,GAAG,SAAS,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAC9B;AAED,eAAO,MAAM,mBAAmB,EAAE,iBAKjC,CAAC;AAEF,yFAAyF;AACzF,wBAAgB,UAAU,CAAC,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,CAEtE;AAED,4FAA4F;AAC5F,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,GAAG,WAAW,CAQpF;AAED;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AA+KD,wFAAwF;AACxF,wBAAgB,WAAW,CACzB,KAAK,EAAE,iBAAiB,EACxB,KAAK,EAAE,iBAAiB,EACxB,KAAK,GAAE,WAAgB,GACtB;IAAE,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,CAAA;CAAE,CAiBxF"}
|
|
@@ -73,13 +73,17 @@ function accumulate(state, message) {
|
|
|
73
73
|
// back in; each also stands as its own part (`cacheWrite1h` is a subset of
|
|
74
74
|
// `cacheWrite`, pi-ai types.d.ts, so it adds nothing).
|
|
75
75
|
const cache = cacheParts(usage, { read: "cacheRead", write: "cacheWrite" });
|
|
76
|
+
const cacheWrite1h = asNumber(usage.cacheWrite1h);
|
|
76
77
|
const tokens = addTokens(state.tokens, {
|
|
77
78
|
input: (asNumber(usage.input) ?? 0) + (cache.cacheRead ?? 0) + (cache.cacheWrite ?? 0),
|
|
78
79
|
output: asNumber(usage.output) ?? 0,
|
|
79
80
|
...reasoningPart(usage, "reasoning"),
|
|
80
81
|
...cache,
|
|
81
82
|
});
|
|
82
|
-
return {
|
|
83
|
+
return {
|
|
84
|
+
state: { ...state, tokens },
|
|
85
|
+
events: [{ kind: "usage", usage: { tokens, ...(cacheWrite1h === null ? {} : { cacheWriteByTtl: { "1h": cacheWrite1h } }) } }],
|
|
86
|
+
};
|
|
83
87
|
}
|
|
84
88
|
function step(state, event, extra) {
|
|
85
89
|
switch (event.type) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projection.js","sources":["../../../src/runtimes/pi/projection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"projection.js","sources":["../../../src/runtimes/pi/projection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { RpcCommand, RpcResponse } from "@earendil-works/pi-coding-agent";
|
|
2
2
|
import type { LineProcess } from "../../../shared/executable/index.js";
|
|
3
3
|
/** Native Pi JSONL correlation. Event observers never wait for a command response. */
|
|
4
|
-
export declare function piRpcControl(child: LineProcess, receive: (message: Record<string, unknown>) => void): {
|
|
4
|
+
export declare function piRpcControl(child: LineProcess, receive: (message: Record<string, unknown>) => void, redact?: (text: string) => string): {
|
|
5
5
|
request(command: RpcCommand, issued?: (id: string) => void): Promise<RpcResponse>;
|
|
6
6
|
};
|
|
7
7
|
//# sourceMappingURL=control.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"control.d.ts","sources":["../../../../src/runtimes/pi/rpc/control.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"control.d.ts","sources":["../../../../src/runtimes/pi/rpc/control.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAGvE,sFAAsF;AACtF,wBAAgB,YAAY,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG;IACxI,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnF,CA8CA"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { reportedStderr } from "../../../shared/executable/reported-stderr.js";
|
|
1
2
|
import { asRecord, parseJson } from "../../../shared/json.js";
|
|
2
3
|
/** Native Pi JSONL correlation. Event observers never wait for a command response. */
|
|
3
|
-
export function piRpcControl(child, receive) {
|
|
4
|
+
export function piRpcControl(child, receive, redact) {
|
|
5
|
+
const stderr = () => reportedStderr(child.diagnostics(), redact);
|
|
4
6
|
let sequence = 0;
|
|
5
7
|
let ended = false;
|
|
6
8
|
const pending = new Map();
|
|
@@ -27,7 +29,7 @@ export function piRpcControl(child, receive) {
|
|
|
27
29
|
ended = true;
|
|
28
30
|
for (const waiter of pending.values()) {
|
|
29
31
|
clearTimeout(waiter.timer);
|
|
30
|
-
waiter.reject(new Error(`Pi RPC exited (${String(code)}): ${
|
|
32
|
+
waiter.reject(new Error(`Pi RPC exited (${String(code)}): ${stderr()}`));
|
|
31
33
|
}
|
|
32
34
|
pending.clear();
|
|
33
35
|
});
|
|
@@ -41,7 +43,7 @@ export function piRpcControl(child, receive) {
|
|
|
41
43
|
// Compact is a native operation, not a short query. Caller wait limits must not kill it.
|
|
42
44
|
const timer = command.type === "compact" ? undefined : setTimeout(() => {
|
|
43
45
|
pending.delete(id);
|
|
44
|
-
reject(new Error(`Pi RPC ${command.type} did not reply within 30 seconds: ${
|
|
46
|
+
reject(new Error(`Pi RPC ${command.type} did not reply within 30 seconds: ${stderr()}`));
|
|
45
47
|
child.kill();
|
|
46
48
|
}, 30_000);
|
|
47
49
|
pending.set(id, { resolve, reject, timer });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"control.js","sources":["../../../../src/runtimes/pi/rpc/control.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"control.js","sources":["../../../../src/runtimes/pi/rpc/control.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open.d.ts","sources":["../../../../src/runtimes/pi/rpc/open.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAO3E,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAEzF,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"open.d.ts","sources":["../../../../src/runtimes/pi/rpc/open.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAO3E,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAEzF,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAGtF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAIjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAS5C,eAAO,MAAM,0BAA0B,EAAE,qBAGxC,CAAC;AAEF,wBAAgB,UAAU,CAAC,QAAQ,EAAE,WAAW,GAAG,eAAe,CAIjE;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IAClD,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;CACpC;AAED,UAAU,iBAAiB;IACzB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,GAAG,EAAE,eAAe,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;CAC1B;AAED,wFAAwF;AACxF,wBAAsB,SAAS,CAAC,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,kBAAkB,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,CAqF1N"}
|
|
@@ -8,6 +8,7 @@ import { environmentValue, sessionEnvironment } from "../../../shared/environmen
|
|
|
8
8
|
import { spawnLineProcess } from "../../../shared/executable/index.js";
|
|
9
9
|
import { privateTempDir } from "../../../shared/private-temp.js";
|
|
10
10
|
import { checkSessionName, refuseSessionOptions } from "../../../shared/session-options.js";
|
|
11
|
+
import { reportedStderr } from "../../../shared/executable/reported-stderr.js";
|
|
11
12
|
import { piMcpServerConfig, validatePiMcpEnvironment } from "../mcp.js";
|
|
12
13
|
import { piThinkingLevel, piRefusedSessionOptions, piEffortRefusal, checkPiSystemPrompt } from "../open.js";
|
|
13
14
|
import { piFindSessionFile, piSessionDir, splitPiModelId } from "../resolve.js";
|
|
@@ -80,6 +81,7 @@ export async function openPiRpc(options, credentials, receive, runtime, lifetime
|
|
|
80
81
|
// The shared preflight refuses missing packages first. Native offline
|
|
81
82
|
// mode also prevents installation if the store changes after that check.
|
|
82
83
|
...(runtime.allowProjectPackageInstall === true ? [] : ["--offline"]),
|
|
84
|
+
// Pi's CLI parser does not split --flag=value; both paths are resolved absolute paths, never raw session ids.
|
|
83
85
|
"--no-mcp", "--session-dir", sessionDir, "-e", extension,
|
|
84
86
|
...(lifetime?.noSession === true ? ["--no-session"] : []),
|
|
85
87
|
...(sessionFile === undefined ? [] : ["--session", sessionFile]),
|
|
@@ -97,13 +99,13 @@ export async function openPiRpc(options, credentials, receive, runtime, lifetime
|
|
|
97
99
|
throw new Error("Pi RPC requires a private credential pipe");
|
|
98
100
|
}
|
|
99
101
|
readPiRpcCredentials(keyPipe, credentials.add, () => { child.kill(); });
|
|
100
|
-
const control = piRpcControl(child, receive);
|
|
102
|
+
const control = piRpcControl(child, receive, credentials.redact);
|
|
101
103
|
try {
|
|
102
104
|
await child.spawned;
|
|
103
105
|
const response = await control.request({ type: "get_state" });
|
|
104
106
|
const state = piRpcState(response);
|
|
105
107
|
if (!existsSync(path.join(directory.path, "ready"))) {
|
|
106
|
-
throw new Error(`Pi did not load the OAR RPC extension: ${child.diagnostics().
|
|
108
|
+
throw new Error(`Pi did not load the OAR RPC extension: ${reportedStderr(child.diagnostics(), credentials.redact)}`);
|
|
107
109
|
}
|
|
108
110
|
// oxlint-disable-next-line typescript/no-unsafe-assignment -- Written only by the bundled extension into this private directory.
|
|
109
111
|
const ready = JSON.parse(readFileSync(path.join(directory.path, "ready"), "utf8"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open.js","sources":["../../../../src/runtimes/pi/rpc/open.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AAC3G,gIAAgI;AAChI,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAoB,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAE,cAAc,EAAuB,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"open.js","sources":["../../../../src/runtimes/pi/rpc/open.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { piManualCompaction } from "../compaction.js";
|
|
3
3
|
import { handledInput, refusedInput, startedInput } from "../input-disposition.js";
|
|
4
4
|
import { createAbortFallback } from "../../../shared/abort-fallback.js";
|
|
5
|
-
import { withdrawControl } from "../../../shared/held-input.js";
|
|
5
|
+
import { enqueueHeld, withdrawControl } from "../../../shared/held-input.js";
|
|
6
6
|
import { withInputImages } from "../../../shared/input-images.js";
|
|
7
7
|
import { withSessionCredentials } from "../../../shared/session-credentials.js";
|
|
8
8
|
import { foldPiEvent, initialPiProjection, piPrompted } from "../projection.js";
|
|
@@ -70,7 +70,7 @@ export const createPiRpcSession = (runtime) => withSessionCredentials(async (ins
|
|
|
70
70
|
}
|
|
71
71
|
void (async () => {
|
|
72
72
|
const { inputId: _inputId, ...body } = next.body;
|
|
73
|
-
await kernel.control({ ...body, kind: "prompt", admission: "native", carries: [next.inputId ?? next.
|
|
73
|
+
await kernel.control({ ...body, kind: "prompt", admission: "native", carries: [next.inputId ?? next.request.id] }, async (request) => { const response = kernel.unreachable() ?? await start(request, next.body.input, next.images, true); return response; });
|
|
74
74
|
drain();
|
|
75
75
|
})();
|
|
76
76
|
}
|
|
@@ -230,10 +230,10 @@ export const createPiRpcSession = (runtime) => withSessionCredentials(async (ins
|
|
|
230
230
|
queue: async (input, inputOptions) => {
|
|
231
231
|
const body = { kind: "queue", input, ...inputOptions };
|
|
232
232
|
const result = await kernel.control(body, request => withInputImages(capabilities, inputOptions?.images, images => {
|
|
233
|
-
held
|
|
233
|
+
enqueueHeld(held, { body, request, inputId: inputOptions?.inputId, images });
|
|
234
234
|
return { kind: "accepted", queued: "adapter" };
|
|
235
235
|
}));
|
|
236
|
-
const queued = held.find(entry => entry.
|
|
236
|
+
const queued = held.find(entry => entry.request.id === result.request.id);
|
|
237
237
|
if (queued !== undefined) {
|
|
238
238
|
queued.accepted = true;
|
|
239
239
|
}
|