@botiverse/oar 0.123.0 → 0.125.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 +6 -6
- package/dist/capabilities.d.ts +2 -0
- package/dist/capabilities.d.ts.map +1 -1
- package/dist/contracts/context-usage.d.ts +3 -1
- package/dist/contracts/context-usage.d.ts.map +1 -1
- package/dist/contracts/index.d.ts +1 -0
- package/dist/contracts/index.d.ts.map +1 -1
- package/dist/contracts/index.js.map +1 -1
- package/dist/contracts/runtime.d.ts +16 -17
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/contracts/session-options.d.ts +20 -35
- package/dist/contracts/session-options.d.ts.map +1 -1
- package/dist/contracts/session.d.ts +2 -0
- package/dist/contracts/session.d.ts.map +1 -1
- package/dist/platforms.d.ts +6 -6
- package/dist/platforms.js +6 -6
- package/dist/platforms.js.map +1 -1
- package/dist/runtimes/antigravity/account-usage.d.ts +3 -2
- package/dist/runtimes/antigravity/account-usage.d.ts.map +1 -1
- package/dist/runtimes/antigravity/account-usage.js +10 -6
- package/dist/runtimes/antigravity/account-usage.js.map +1 -1
- package/dist/runtimes/antigravity/account.d.ts +37 -0
- package/dist/runtimes/antigravity/account.d.ts.map +1 -0
- package/dist/runtimes/antigravity/account.js +119 -0
- package/dist/runtimes/antigravity/account.js.map +1 -0
- package/dist/runtimes/antigravity/auth-status.d.ts +9 -0
- package/dist/runtimes/antigravity/auth-status.d.ts.map +1 -0
- package/dist/runtimes/antigravity/auth-status.js +54 -0
- package/dist/runtimes/antigravity/auth-status.js.map +1 -0
- package/dist/runtimes/antigravity/auth.d.ts +2 -6
- package/dist/runtimes/antigravity/auth.d.ts.map +1 -1
- package/dist/runtimes/antigravity/auth.js +10 -50
- package/dist/runtimes/antigravity/auth.js.map +1 -1
- package/dist/runtimes/antigravity/index.d.ts +4 -3
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/antigravity/index.js +4 -4
- package/dist/runtimes/antigravity/index.js.map +1 -1
- package/dist/runtimes/antigravity/logout.d.ts.map +1 -1
- package/dist/runtimes/antigravity/logout.js +2 -0
- 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.map +1 -1
- package/dist/runtimes/antigravity/quota.js +2 -1
- package/dist/runtimes/antigravity/quota.js.map +1 -1
- package/dist/runtimes/antigravity/token-email.d.ts +37 -0
- package/dist/runtimes/antigravity/token-email.d.ts.map +1 -0
- package/dist/runtimes/antigravity/token-email.js +155 -0
- package/dist/runtimes/antigravity/token-email.js.map +1 -0
- package/dist/runtimes/claude/failure.js +18 -18
- package/dist/runtimes/claude/failure.js.map +1 -1
- package/dist/runtimes/claude/index.d.ts +3 -2
- package/dist/runtimes/claude/index.d.ts.map +1 -1
- package/dist/runtimes/claude/index.js +1 -1
- package/dist/runtimes/claude/index.js.map +1 -1
- package/dist/runtimes/claude/launch-args.d.ts +3 -0
- package/dist/runtimes/claude/launch-args.d.ts.map +1 -1
- package/dist/runtimes/claude/launch-args.js +11 -1
- package/dist/runtimes/claude/launch-args.js.map +1 -1
- package/dist/runtimes/claude/launch.d.ts.map +1 -1
- package/dist/runtimes/claude/launch.js +2 -3
- package/dist/runtimes/claude/launch.js.map +1 -1
- package/dist/runtimes/claude/mcp-config.d.ts +2 -6
- package/dist/runtimes/claude/mcp-config.d.ts.map +1 -1
- package/dist/runtimes/claude/mcp-config.js +7 -117
- package/dist/runtimes/claude/mcp-config.js.map +1 -1
- package/dist/runtimes/claude/options.d.ts +1 -0
- package/dist/runtimes/claude/options.d.ts.map +1 -1
- package/dist/runtimes/claude/options.js +3 -0
- package/dist/runtimes/claude/options.js.map +1 -1
- package/dist/runtimes/claude/projection.d.ts.map +1 -1
- package/dist/runtimes/claude/projection.js +1 -0
- package/dist/runtimes/claude/projection.js.map +1 -1
- package/dist/runtimes/claude/update.d.ts +17 -9
- package/dist/runtimes/claude/update.d.ts.map +1 -1
- package/dist/runtimes/claude/update.js +151 -34
- package/dist/runtimes/claude/update.js.map +1 -1
- package/dist/runtimes/claude/user-configuration.js +1 -1
- 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 +15 -3
- package/dist/runtimes/codebuddy/failure.js.map +1 -1
- package/dist/runtimes/codebuddy/index.d.ts +3 -1
- package/dist/runtimes/codebuddy/index.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/index.js +6 -1
- 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 +1 -0
- 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 +3 -9
- package/dist/runtimes/codex/app-server-client.js.map +1 -1
- package/dist/runtimes/codex/failure.d.ts.map +1 -1
- package/dist/runtimes/codex/failure.js +14 -16
- package/dist/runtimes/codex/failure.js.map +1 -1
- package/dist/runtimes/codex/index.d.ts +2 -0
- package/dist/runtimes/codex/index.d.ts.map +1 -1
- package/dist/runtimes/codex/index.js +1 -1
- package/dist/runtimes/codex/index.js.map +1 -1
- package/dist/runtimes/codex/open-config.d.ts +6 -0
- package/dist/runtimes/codex/open-config.d.ts.map +1 -0
- package/dist/runtimes/codex/open-config.js +28 -0
- package/dist/runtimes/codex/open-config.js.map +1 -0
- package/dist/runtimes/codex/options.d.ts.map +1 -1
- package/dist/runtimes/codex/options.js +1 -0
- package/dist/runtimes/codex/options.js.map +1 -1
- package/dist/runtimes/codex/session.js +3 -3
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/codex/tool-denials.d.ts +0 -3
- package/dist/runtimes/codex/tool-denials.d.ts.map +1 -1
- package/dist/runtimes/codex/tool-denials.js +0 -8
- package/dist/runtimes/codex/tool-denials.js.map +1 -1
- package/dist/runtimes/cursor/failure.d.ts.map +1 -1
- package/dist/runtimes/cursor/failure.js +4 -6
- package/dist/runtimes/cursor/failure.js.map +1 -1
- package/dist/runtimes/cursor/index.js +1 -1
- package/dist/runtimes/cursor/index.js.map +1 -1
- package/dist/runtimes/cursor/model.d.ts.map +1 -1
- package/dist/runtimes/cursor/model.js +2 -0
- package/dist/runtimes/cursor/model.js.map +1 -1
- package/dist/runtimes/devin/index.d.ts +1 -0
- package/dist/runtimes/devin/index.d.ts.map +1 -1
- package/dist/runtimes/devin/index.js +1 -1
- package/dist/runtimes/devin/index.js.map +1 -1
- package/dist/runtimes/devin/options.d.ts.map +1 -1
- package/dist/runtimes/devin/options.js +2 -0
- package/dist/runtimes/devin/options.js.map +1 -1
- package/dist/runtimes/devin/session.d.ts.map +1 -1
- package/dist/runtimes/devin/session.js +2 -0
- package/dist/runtimes/devin/session.js.map +1 -1
- package/dist/runtimes/dsh/control.js +3 -3
- package/dist/runtimes/dsh/control.js.map +1 -1
- package/dist/runtimes/dsh/index.d.ts +2 -0
- package/dist/runtimes/dsh/index.d.ts.map +1 -1
- package/dist/runtimes/dsh/index.js +1 -1
- package/dist/runtimes/dsh/index.js.map +1 -1
- package/dist/runtimes/dsh/options.d.ts.map +1 -1
- package/dist/runtimes/dsh/options.js +1 -0
- package/dist/runtimes/dsh/options.js.map +1 -1
- package/dist/runtimes/dsh/projection.d.ts.map +1 -1
- package/dist/runtimes/dsh/projection.js +13 -16
- 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 +2 -1
- package/dist/runtimes/dsh/session.js.map +1 -1
- package/dist/runtimes/factory/client.d.ts.map +1 -1
- package/dist/runtimes/factory/client.js +3 -9
- package/dist/runtimes/factory/client.js.map +1 -1
- package/dist/runtimes/factory/index.d.ts +1 -0
- 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 +1 -0
- package/dist/runtimes/factory/options.js.map +1 -1
- package/dist/runtimes/factory/projection.d.ts.map +1 -1
- package/dist/runtimes/factory/projection.js +12 -11
- package/dist/runtimes/factory/projection.js.map +1 -1
- package/dist/runtimes/grok/failure.d.ts.map +1 -1
- package/dist/runtimes/grok/failure.js +8 -6
- package/dist/runtimes/grok/failure.js.map +1 -1
- package/dist/runtimes/grok/index.d.ts +2 -8
- package/dist/runtimes/grok/index.d.ts.map +1 -1
- package/dist/runtimes/grok/index.js +2 -2
- package/dist/runtimes/grok/index.js.map +1 -1
- package/dist/runtimes/grok/options.d.ts +3 -1
- package/dist/runtimes/grok/options.d.ts.map +1 -1
- package/dist/runtimes/grok/options.js +9 -0
- package/dist/runtimes/grok/options.js.map +1 -1
- package/dist/runtimes/kimi/index.d.ts +3 -1
- package/dist/runtimes/kimi/index.d.ts.map +1 -1
- package/dist/runtimes/kimi/index.js +6 -1
- package/dist/runtimes/kimi/index.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/failure.js +6 -6
- package/dist/runtimes/opencode/failure.js.map +1 -1
- package/dist/runtimes/opencode/index.d.ts +1 -1
- package/dist/runtimes/opencode/inline-prompt-config.d.ts +5 -0
- package/dist/runtimes/opencode/inline-prompt-config.d.ts.map +1 -0
- package/dist/runtimes/opencode/inline-prompt-config.js +82 -0
- package/dist/runtimes/opencode/inline-prompt-config.js.map +1 -0
- package/dist/runtimes/opencode/options.d.ts.map +1 -1
- package/dist/runtimes/opencode/options.js +15 -3
- package/dist/runtimes/opencode/options.js.map +1 -1
- package/dist/runtimes/opencode/prompt-config-v2.d.ts.map +1 -1
- package/dist/runtimes/opencode/prompt-config-v2.js +13 -9
- package/dist/runtimes/opencode/prompt-config-v2.js.map +1 -1
- package/dist/runtimes/opencode/prompt-config.d.ts +3 -4
- package/dist/runtimes/opencode/prompt-config.d.ts.map +1 -1
- package/dist/runtimes/opencode/prompt-config.js +27 -25
- package/dist/runtimes/opencode/prompt-config.js.map +1 -1
- package/dist/runtimes/pi/failure.d.ts.map +1 -1
- package/dist/runtimes/pi/failure.js.map +1 -1
- package/dist/runtimes/pi/index.js +1 -1
- package/dist/runtimes/pi/index.js.map +1 -1
- package/dist/runtimes/pi/open.d.ts.map +1 -1
- package/dist/runtimes/pi/open.js +4 -1
- package/dist/runtimes/pi/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/control.js +3 -3
- package/dist/runtimes/pi/rpc/control.js.map +1 -1
- package/dist/runtimes/pi/rpc/extension.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/extension.js +14 -2
- package/dist/runtimes/pi/rpc/extension.js.map +1 -1
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.js +5 -2
- package/dist/runtimes/pi/rpc/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/prompt-files.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/prompt-files.js +9 -4
- package/dist/runtimes/pi/rpc/prompt-files.js.map +1 -1
- package/dist/runtimes/pi/rpc/session.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/session.js +2 -1
- package/dist/runtimes/pi/rpc/session.js.map +1 -1
- package/dist/runtimes/pi-durable/index.js +1 -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/qoder/index.d.ts +2 -0
- package/dist/runtimes/qoder/index.d.ts.map +1 -1
- package/dist/runtimes/qoder/index.js +1 -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 +17 -16
- package/dist/runtimes/qoder/launch.js.map +1 -1
- package/dist/runtimes/qoder/mcp-config.d.ts +13 -0
- package/dist/runtimes/qoder/mcp-config.d.ts.map +1 -0
- package/dist/runtimes/qoder/mcp-config.js +22 -0
- package/dist/runtimes/qoder/mcp-config.js.map +1 -0
- 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 +4 -2
- package/dist/runtimes/qoder/projection.js.map +1 -1
- package/dist/runtimes/qoder/session.d.ts.map +1 -1
- package/dist/runtimes/qoder/session.js +3 -0
- package/dist/runtimes/qoder/session.js.map +1 -1
- package/dist/runtimes/qwen/control.d.ts +1 -1
- package/dist/runtimes/qwen/control.d.ts.map +1 -1
- package/dist/runtimes/qwen/control.js +3 -5
- package/dist/runtimes/qwen/control.js.map +1 -1
- package/dist/runtimes/qwen/index.d.ts +9 -13
- package/dist/runtimes/qwen/index.d.ts.map +1 -1
- package/dist/runtimes/qwen/index.js +15 -6
- package/dist/runtimes/qwen/index.js.map +1 -1
- package/dist/runtimes/qwen/launch.d.ts +3 -1
- package/dist/runtimes/qwen/launch.d.ts.map +1 -1
- package/dist/runtimes/qwen/launch.js +27 -16
- package/dist/runtimes/qwen/launch.js.map +1 -1
- package/dist/runtimes/qwen/native-memory.d.ts +17 -0
- package/dist/runtimes/qwen/native-memory.d.ts.map +1 -0
- package/dist/runtimes/qwen/native-memory.js +252 -0
- package/dist/runtimes/qwen/native-memory.js.map +1 -0
- package/dist/runtimes/qwen/options.d.ts +2 -0
- package/dist/runtimes/qwen/options.d.ts.map +1 -1
- package/dist/runtimes/qwen/options.js +7 -0
- package/dist/runtimes/qwen/options.js.map +1 -1
- package/dist/runtimes/qwen/projection.d.ts.map +1 -1
- package/dist/runtimes/qwen/projection.js +1 -0
- package/dist/runtimes/qwen/projection.js.map +1 -1
- package/dist/runtimes/qwen/session.d.ts.map +1 -1
- package/dist/runtimes/qwen/session.js +13 -4
- package/dist/runtimes/qwen/session.js.map +1 -1
- package/dist/shared/acp/effort.d.ts.map +1 -1
- package/dist/shared/acp/effort.js +5 -0
- package/dist/shared/acp/effort.js.map +1 -1
- package/dist/shared/acp/errors.d.ts +1 -1
- package/dist/shared/acp/errors.d.ts.map +1 -1
- package/dist/shared/acp/errors.js +3 -11
- package/dist/shared/acp/errors.js.map +1 -1
- package/dist/shared/acp/failure.js +5 -5
- package/dist/shared/acp/process.d.ts +5 -1
- package/dist/shared/acp/process.d.ts.map +1 -1
- package/dist/shared/acp/process.js +18 -5
- package/dist/shared/acp/process.js.map +1 -1
- package/dist/shared/acp/projection.d.ts.map +1 -1
- package/dist/shared/acp/projection.js +1 -0
- package/dist/shared/acp/projection.js.map +1 -1
- package/dist/shared/acp/routing-types.d.ts +3 -1
- package/dist/shared/acp/routing-types.d.ts.map +1 -1
- package/dist/shared/acp/routing.d.ts.map +1 -1
- package/dist/shared/acp/routing.js +5 -3
- package/dist/shared/acp/routing.js.map +1 -1
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +5 -2
- 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 +17 -5
- package/dist/shared/acp/shared-session.js.map +1 -1
- package/dist/shared/executable/index.d.ts +1 -0
- package/dist/shared/executable/index.d.ts.map +1 -1
- package/dist/shared/executable/index.js.map +1 -1
- package/dist/shared/executable/process-cleanup-diagnostics.d.ts +3 -1
- package/dist/shared/executable/process-cleanup-diagnostics.d.ts.map +1 -1
- package/dist/shared/executable/process-cleanup-diagnostics.js.map +1 -1
- package/dist/shared/executable/process-cleanup.d.ts.map +1 -1
- package/dist/shared/executable/process-cleanup.js +39 -10
- package/dist/shared/executable/process-cleanup.js.map +1 -1
- package/dist/shared/executable/process-table-async.js +4 -4
- package/dist/shared/executable/process-table-async.js.map +1 -1
- package/dist/shared/executable/process-tree.d.ts +8 -4
- package/dist/shared/executable/process-tree.d.ts.map +1 -1
- package/dist/shared/executable/process-tree.js +21 -14
- package/dist/shared/executable/process-tree.js.map +1 -1
- package/dist/shared/executable/process.d.ts +2 -1
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js.map +1 -1
- package/dist/shared/executable/reported-stderr.d.ts +8 -0
- package/dist/shared/executable/reported-stderr.d.ts.map +1 -1
- package/dist/shared/executable/reported-stderr.js +21 -0
- package/dist/shared/executable/reported-stderr.js.map +1 -1
- package/dist/shared/executable/verify-descendant-exit.d.ts +4 -0
- package/dist/shared/executable/verify-descendant-exit.d.ts.map +1 -0
- package/dist/shared/executable/verify-descendant-exit.js +34 -0
- package/dist/shared/executable/verify-descendant-exit.js.map +1 -0
- package/dist/shared/login.d.ts +3 -0
- package/dist/shared/login.d.ts.map +1 -1
- package/dist/shared/login.js +2 -1
- package/dist/shared/login.js.map +1 -1
- package/dist/shared/mcp-config-handoff.d.ts +12 -0
- package/dist/shared/mcp-config-handoff.d.ts.map +1 -0
- package/dist/shared/mcp-config-handoff.js +131 -0
- package/dist/shared/mcp-config-handoff.js.map +1 -0
- package/dist/shared/semver.d.ts +4 -0
- package/dist/shared/semver.d.ts.map +1 -1
- package/dist/shared/semver.js +11 -1
- package/dist/shared/semver.js.map +1 -1
- package/dist/shared/session-options.js +1 -1
- package/dist/shared/session-options.js.map +1 -1
- package/dist/shared/stream-json/compaction.d.ts +0 -1
- package/dist/shared/stream-json/compaction.d.ts.map +1 -1
- package/dist/shared/stream-json/compaction.js +1 -1
- package/dist/shared/stream-json/compaction.js.map +1 -1
- package/dist/shared/stream-json/held-input.d.ts.map +1 -1
- package/dist/shared/stream-json/held-input.js +0 -4
- package/dist/shared/stream-json/held-input.js.map +1 -1
- package/dist/shared/stream-json/input-lifecycle.d.ts.map +1 -1
- package/dist/shared/stream-json/input-lifecycle.js +8 -0
- package/dist/shared/stream-json/input-lifecycle.js.map +1 -1
- package/dist/shared/stream-json/profile.d.ts +0 -2
- package/dist/shared/stream-json/profile.d.ts.map +1 -1
- package/dist/shared/stream-json/projection.js +1 -1
- 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 +11 -20
- package/dist/shared/stream-json/session.js.map +1 -1
- package/dist/shared/stream-json/state.d.ts +2 -2
- package/dist/shared/stream-json/state.d.ts.map +1 -1
- package/dist/shared/stream-json/state.js.map +1 -1
- package/package.json +2 -1
|
@@ -2,24 +2,35 @@ import { resolvedAdditionalDirectories } from "../../shared/additional-directori
|
|
|
2
2
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
3
3
|
import { spawnLineProcess } from "../../shared/executable/index.js";
|
|
4
4
|
import { refuseSessionOptions } from "../../shared/session-options.js";
|
|
5
|
-
import {
|
|
5
|
+
import { prepareQwenNativeMemory } from "./native-memory.js";
|
|
6
|
+
import { checkQwenLaunchArgs, qwenNativeMemoryRefusal, qwenRefusedSessionOptions } from "./options.js";
|
|
6
7
|
/** Qwen 0.26.0's own SDK channel; credentials and MCP configuration never enter argv. */
|
|
7
|
-
export async function launchQwen(command, sessionId, options) {
|
|
8
|
-
refuseSessionOptions(qwenRefusedSessionOptions, options);
|
|
8
|
+
export async function launchQwen(command, sessionId, options, version) {
|
|
9
|
+
refuseSessionOptions({ ...qwenRefusedSessionOptions, ...qwenNativeMemoryRefusal(version) }, options);
|
|
9
10
|
checkQwenLaunchArgs(options.launchArgs);
|
|
10
11
|
const directories = resolvedAdditionalDirectories(options);
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
12
|
+
const memory = await prepareQwenNativeMemory(options, sessionEnvironment(options.env), version);
|
|
13
|
+
let child = undefined;
|
|
14
|
+
try {
|
|
15
|
+
child = spawnLineProcess(command, [
|
|
16
|
+
"--input-format", "stream-json", "--output-format", "stream-json", "--channel=SDK",
|
|
17
|
+
"--include-partial-messages", "--approval-mode", "yolo",
|
|
18
|
+
options.resume === undefined ? `--session-id=${sessionId}` : `--resume=${sessionId}`,
|
|
19
|
+
...(options.model === undefined ? [] : ["--model", options.model]),
|
|
20
|
+
...(options.systemPrompt === undefined ? [] : ["--system-prompt", options.systemPrompt]),
|
|
21
|
+
...(options.appendSystemPrompt === undefined ? [] : ["--append-system-prompt", options.appendSystemPrompt]),
|
|
22
|
+
...options.launchArgs ?? [],
|
|
23
|
+
...(directories.length === 0 ? [] : ["--include-directories", ...directories]),
|
|
24
|
+
...((options.disallowedTools?.length ?? 0) === 0 ? [] : ["--exclude-tools", ...options.disallowedTools ?? []]),
|
|
25
|
+
], { cwd: options.cwd, env: memory.env, killTree: true });
|
|
26
|
+
child.onExit(() => { memory.cleanup(); });
|
|
27
|
+
await child.spawned;
|
|
28
|
+
return memory.nativeMemory === undefined ? child : Object.assign(child, { nativeMemory: memory.nativeMemory });
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
child?.kill();
|
|
32
|
+
memory.cleanup();
|
|
33
|
+
throw error;
|
|
34
|
+
}
|
|
24
35
|
}
|
|
25
36
|
//# sourceMappingURL=launch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.js","sources":["../../../src/runtimes/qwen/launch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAoB,MAAM,kCAAkC,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"launch.js","sources":["../../../src/runtimes/qwen/launch.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { SessionOptions } from "../../contracts/session.js";
|
|
2
|
+
export declare const QWEN_DEFAULTS_PREFIX = "oar-qwen-defaults-";
|
|
3
|
+
export interface QwenNativeMemorySetup {
|
|
4
|
+
readonly env: NodeJS.ProcessEnv;
|
|
5
|
+
readonly nativeMemory?: "on" | "off";
|
|
6
|
+
cleanup(): void;
|
|
7
|
+
}
|
|
8
|
+
/** Sweep abandoned system-defaults temp dirs left by dead host processes. */
|
|
9
|
+
export declare function sweepAbandonedQwenDefaults(): Promise<void>;
|
|
10
|
+
/**
|
|
11
|
+
* Prepare Qwen's child environment for `nativeMemoryDefault: "off"` (merging
|
|
12
|
+
* over any existing system-defaults file into a private 0700/0600 temp file
|
|
13
|
+
* without mutating the original) and read back the effective native memory
|
|
14
|
+
* state across Qwen's settings layers (`systemDefaults < user < workspace < system`).
|
|
15
|
+
*/
|
|
16
|
+
export declare function prepareQwenNativeMemory(options: SessionOptions, env: NodeJS.ProcessEnv, version: string | undefined): Promise<QwenNativeMemorySetup>;
|
|
17
|
+
//# sourceMappingURL=native-memory.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-memory.d.ts","sources":["../../../src/runtimes/qwen/native-memory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAOjE,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AAgGzD,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAChC,QAAQ,CAAC,YAAY,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC;IACrC,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,6EAA6E;AAC7E,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC,CAEhE;AAgGD;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,OAAO,CAAC,qBAAqB,CAAC,CAsChC"}
|
|
@@ -0,0 +1,252 @@
|
|
|
1
|
+
import { readFile, realpath, stat, writeFile } from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import stripJsonComments from "strip-json-comments";
|
|
4
|
+
import { parse } from "dotenv";
|
|
5
|
+
import { environmentValue, sessionEnvironment } from "../../shared/environment.js";
|
|
6
|
+
import { environmentHome } from "../../shared/environment-home.js";
|
|
7
|
+
import { asRecord } from "../../shared/json.js";
|
|
8
|
+
import { privateTempDir, sweepPrivateTempDirs } from "../../shared/private-temp.js";
|
|
9
|
+
import { semverAtLeast } from "../../shared/semver.js";
|
|
10
|
+
export const QWEN_DEFAULTS_PREFIX = "oar-qwen-defaults-";
|
|
11
|
+
// Qwen 0.26.0 settings schema & Config constructor (chunk-LBEBKAXU.js, chunk-BRVCK4XV.js, chunk-YGSOH3UK.js):
|
|
12
|
+
// defaults are enableManagedAutoMemory=true, enableManagedAutoDream=true, enableAutoSkill=false.
|
|
13
|
+
const MEMORY_KEYS = ["enableManagedAutoMemory", "enableManagedAutoDream", "enableAutoSkill"];
|
|
14
|
+
// Qwen 0.26.0 runtime env gates that alter memory/auto-memory outside settings files:
|
|
15
|
+
// - QWEN_CODE_SIMPLE (bareMode: chunk-D7XCQWP2.js isBareMode, chunk-BRVCK4XV.js)
|
|
16
|
+
// - QWEN_CODE_SAFE_MODE (safeMode: chunk-YGSOH3UK.js isSafeModeEnv, chunk-BRVCK4XV.js)
|
|
17
|
+
// - QWEN_SANDBOX / SANDBOX (shellExecutionSandbox: chunk-DOLUT3XC.js validateExecutionSandboxSelection, chunk-YGSOH3UK.js)
|
|
18
|
+
// - QWEN_CODE_MEMORY_TEAM / QWEN_CODE_MEMORY_TEAM_SYNC / QWEN_CODE_MEMORY_STRUCTURED_RECALL (chunk-YGSOH3UK.js)
|
|
19
|
+
const UNMODELED_MEMORY_ENV_VARS = [
|
|
20
|
+
"QWEN_CODE_SIMPLE",
|
|
21
|
+
"QWEN_CODE_SAFE_MODE",
|
|
22
|
+
"QWEN_SANDBOX",
|
|
23
|
+
"SANDBOX",
|
|
24
|
+
"QWEN_CODE_MEMORY_TEAM",
|
|
25
|
+
"QWEN_CODE_MEMORY_TEAM_SYNC",
|
|
26
|
+
"QWEN_CODE_MEMORY_STRUCTURED_RECALL",
|
|
27
|
+
];
|
|
28
|
+
// Qwen 0.26.0 CLI flags that toggle bareMode, safeMode, or sandbox (chunk-BRVCK4XV.js).
|
|
29
|
+
const UNMODELED_MEMORY_FLAGS = new Set([
|
|
30
|
+
"--bare", "--no-bare",
|
|
31
|
+
"--safe-mode", "--no-safe-mode", "--safeMode", "--no-safeMode",
|
|
32
|
+
"--sandbox", "--no-sandbox", "-s",
|
|
33
|
+
]);
|
|
34
|
+
function configDirectory(value, home) {
|
|
35
|
+
if (value === undefined || value === "") {
|
|
36
|
+
return path.join(home, ".qwen");
|
|
37
|
+
}
|
|
38
|
+
return value === "~" || value.startsWith("~/") || value.startsWith("~\\")
|
|
39
|
+
? path.join(home, ...value.slice(2).split(/[/\\]+/u).filter(Boolean))
|
|
40
|
+
: path.resolve(value);
|
|
41
|
+
}
|
|
42
|
+
// Qwen 0.26.0 getSystemSettingsPath (chunk-PTHIQ7ZN.js).
|
|
43
|
+
function defaultSystemSettingsPath() {
|
|
44
|
+
if (process.platform === "darwin") {
|
|
45
|
+
return "/Library/Application Support/QwenCode/settings.json";
|
|
46
|
+
}
|
|
47
|
+
if (process.platform === "win32") {
|
|
48
|
+
return String.raw `C:\ProgramData\qwen-code\settings.json`;
|
|
49
|
+
}
|
|
50
|
+
return "/etc/qwen-code/settings.json";
|
|
51
|
+
}
|
|
52
|
+
async function readTextIfPresent(file) {
|
|
53
|
+
try {
|
|
54
|
+
const info = await stat(file);
|
|
55
|
+
if (!info.isFile() || info.size > 4 * 1024 * 1024) {
|
|
56
|
+
throw new Error(`Unsupported Qwen settings file: ${file}`);
|
|
57
|
+
}
|
|
58
|
+
return await readFile(file, "utf8");
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
if (error instanceof Error && "code" in error && error.code === "ENOENT") {
|
|
62
|
+
return undefined;
|
|
63
|
+
}
|
|
64
|
+
throw error;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
// Qwen 0.26.0 readSettingsLayers strips UTF-8 BOM and JSONC comments (chunk-QSD5IW52.js).
|
|
68
|
+
async function readJsonObjectIfPresent(file) {
|
|
69
|
+
const text = await readTextIfPresent(file);
|
|
70
|
+
if (text === undefined) {
|
|
71
|
+
return undefined;
|
|
72
|
+
}
|
|
73
|
+
const parsed = JSON.parse(stripJsonComments(text.replace(/^\uFEFF/u, "")));
|
|
74
|
+
const record = asRecord(parsed);
|
|
75
|
+
if (record === null) {
|
|
76
|
+
throw new Error(`Qwen settings file is not a JSON object: ${file}`);
|
|
77
|
+
}
|
|
78
|
+
return record;
|
|
79
|
+
}
|
|
80
|
+
/** Resolve Qwen's home, system settings and system-defaults paths matching Qwen 0.26.0+. */
|
|
81
|
+
async function resolveQwenPaths(env) {
|
|
82
|
+
const home = environmentHome(env);
|
|
83
|
+
const initial = environmentValue(env, "QWEN_HOME");
|
|
84
|
+
let qwenHome = configDirectory(initial, home);
|
|
85
|
+
// Qwen 0.26.0 preResolveHomeEnvOverrides (chunk-LUL25ENJ.js) + HOME_ENV_BOOTSTRAP_KEYS (chunk-CVMMNPLX.js):
|
|
86
|
+
// bootstraps QWEN_HOME from ~/.qwen/.env then ~/.env when unset in env (does not bootstrap system-settings/defaults paths).
|
|
87
|
+
if (initial === undefined) {
|
|
88
|
+
for (const file of [path.join(qwenHome, ".env"), path.join(home, ".env")]) {
|
|
89
|
+
// oxlint-disable-next-line no-await-in-loop -- ordered bootstrap lookup.
|
|
90
|
+
const text = await readTextIfPresent(file).catch(() => undefined);
|
|
91
|
+
const value = text === undefined ? undefined : environmentValue(parse(text), "QWEN_HOME");
|
|
92
|
+
if (value !== undefined && value !== "") {
|
|
93
|
+
qwenHome = configDirectory(value, home);
|
|
94
|
+
break;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
// Qwen 0.26.0 getSystemSettingsPath & getSystemDefaultsPath (chunk-PTHIQ7ZN.js):
|
|
99
|
+
// system-defaults.json defaults to sibling of system settings path.
|
|
100
|
+
const systemOverride = environmentValue(env, "QWEN_CODE_SYSTEM_SETTINGS_PATH");
|
|
101
|
+
const systemSettingsPath = systemOverride === undefined || systemOverride === "" ? defaultSystemSettingsPath() : systemOverride;
|
|
102
|
+
const defaultsOverride = environmentValue(env, "QWEN_CODE_SYSTEM_DEFAULTS_PATH");
|
|
103
|
+
const systemDefaultsPath = defaultsOverride === undefined || defaultsOverride === ""
|
|
104
|
+
? path.join(path.dirname(systemSettingsPath), "system-defaults.json")
|
|
105
|
+
: defaultsOverride;
|
|
106
|
+
return { home, qwenHome, systemSettingsPath, systemDefaultsPath };
|
|
107
|
+
}
|
|
108
|
+
/** Sweep abandoned system-defaults temp dirs left by dead host processes. */
|
|
109
|
+
export async function sweepAbandonedQwenDefaults() {
|
|
110
|
+
await sweepPrivateTempDirs(QWEN_DEFAULTS_PREFIX);
|
|
111
|
+
}
|
|
112
|
+
function hasUnmodeledLaunchFlag(args) {
|
|
113
|
+
for (const arg of args ?? []) {
|
|
114
|
+
if (arg === "--") {
|
|
115
|
+
return false;
|
|
116
|
+
}
|
|
117
|
+
const name = arg.startsWith("--") ? arg.slice(0, arg.includes("=") ? arg.indexOf("=") : arg.length) : arg;
|
|
118
|
+
if (UNMODELED_MEMORY_FLAGS.has(name) || (arg.startsWith("-s") && arg.length > 2 && !arg.startsWith("--"))) {
|
|
119
|
+
return true;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
return false;
|
|
123
|
+
}
|
|
124
|
+
function hasUnmodeledEnvOrArgs(options, env) {
|
|
125
|
+
if (hasUnmodeledLaunchFlag(options.launchArgs)) {
|
|
126
|
+
return true;
|
|
127
|
+
}
|
|
128
|
+
return UNMODELED_MEMORY_ENV_VARS.some((name) => {
|
|
129
|
+
const value = environmentValue(env, name);
|
|
130
|
+
return value !== undefined && value.trim() !== "";
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
// Qwen 0.26.0 validateExecutionSandboxSelection (chunk-DOLUT3XC.js) & Config getters (chunk-YGSOH3UK.js):
|
|
134
|
+
// tools.executionSandbox or tools.sandbox can disable managed auto-memory, dream and auto-skill at runtime.
|
|
135
|
+
function hasSandboxSetting(layers) {
|
|
136
|
+
return layers.some((layer) => {
|
|
137
|
+
const tools = asRecord(layer.tools);
|
|
138
|
+
return tools !== null && ((tools.executionSandbox !== undefined && tools.executionSandbox !== false)
|
|
139
|
+
|| (tools.sandbox !== undefined && tools.sandbox !== false));
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
function effectiveBoolean(layers, key, fallback) {
|
|
143
|
+
let value = fallback;
|
|
144
|
+
for (const layer of layers) {
|
|
145
|
+
const memory = asRecord(layer.memory);
|
|
146
|
+
if (memory !== null && typeof memory[key] === "boolean") {
|
|
147
|
+
value = memory[key];
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
return value;
|
|
151
|
+
}
|
|
152
|
+
// Qwen 0.26.0 isFolderTrustEnabled (chunk-TAW26O7I.js): defaults to false.
|
|
153
|
+
function folderTrustEnabled(layers) {
|
|
154
|
+
let enabled = false;
|
|
155
|
+
for (const layer of layers) {
|
|
156
|
+
const security = asRecord(layer.security);
|
|
157
|
+
const folderTrust = asRecord(security?.folderTrust);
|
|
158
|
+
if (typeof folderTrust?.enabled === "boolean") {
|
|
159
|
+
enabled = folderTrust.enabled;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
return enabled;
|
|
163
|
+
}
|
|
164
|
+
function touchesMemoryKeys(layer) {
|
|
165
|
+
const memory = asRecord(layer?.memory);
|
|
166
|
+
return memory !== null && MEMORY_KEYS.some((key) => typeof memory[key] === "boolean");
|
|
167
|
+
}
|
|
168
|
+
async function canonicalPath(target) {
|
|
169
|
+
try {
|
|
170
|
+
return await realpath(path.resolve(target));
|
|
171
|
+
}
|
|
172
|
+
catch {
|
|
173
|
+
return path.resolve(target);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
async function readEffectiveNativeMemory(options, env, paths, effectiveDefaultsPath, effectiveDefaultsRecord) {
|
|
177
|
+
if (hasUnmodeledEnvOrArgs(options, env)) {
|
|
178
|
+
return undefined;
|
|
179
|
+
}
|
|
180
|
+
try {
|
|
181
|
+
const defaultsLayer = effectiveDefaultsRecord ?? await readJsonObjectIfPresent(effectiveDefaultsPath);
|
|
182
|
+
const userLayer = await readJsonObjectIfPresent(path.join(paths.qwenHome, "settings.json"));
|
|
183
|
+
const systemLayer = await readJsonObjectIfPresent(paths.systemSettingsPath);
|
|
184
|
+
// Qwen 0.26.0 Storage.getWorkspaceSettingsPath (chunk-EPODBRBP.js) reads only <cwd>/.qwen/settings.json (no parent search);
|
|
185
|
+
// readSettingsLayers (chunk-QSD5IW52.js) skips workspace settings when realWorkspaceDir === realHomeDir.
|
|
186
|
+
const [realCwd, realHome] = await Promise.all([canonicalPath(options.cwd), canonicalPath(paths.home)]);
|
|
187
|
+
const workspaceLayer = realCwd === realHome ? undefined : await readJsonObjectIfPresent(path.join(options.cwd, ".qwen", "settings.json"));
|
|
188
|
+
const trustInputs = [defaultsLayer, userLayer, systemLayer].filter((layer) => layer !== undefined);
|
|
189
|
+
if (folderTrustEnabled(trustInputs) && touchesMemoryKeys(workspaceLayer)) {
|
|
190
|
+
return undefined;
|
|
191
|
+
}
|
|
192
|
+
// Qwen 0.26.0 mergeSettings (chunk-QSD5IW52.js): systemDefaults < user < workspace < system;
|
|
193
|
+
// WORKSPACE_RESTRICTED_SETTINGS / WORKSPACE_NON_OVERRIDING_SETTINGS do not strip the three memory enable keys.
|
|
194
|
+
const layers = [defaultsLayer, userLayer, workspaceLayer, systemLayer].filter((layer) => layer !== undefined);
|
|
195
|
+
if (hasSandboxSetting(layers)) {
|
|
196
|
+
return undefined;
|
|
197
|
+
}
|
|
198
|
+
const active = effectiveBoolean(layers, "enableManagedAutoMemory", true)
|
|
199
|
+
|| effectiveBoolean(layers, "enableManagedAutoDream", true)
|
|
200
|
+
|| effectiveBoolean(layers, "enableAutoSkill", false);
|
|
201
|
+
return active ? "on" : "off";
|
|
202
|
+
}
|
|
203
|
+
catch {
|
|
204
|
+
return undefined;
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
/**
|
|
208
|
+
* Prepare Qwen's child environment for `nativeMemoryDefault: "off"` (merging
|
|
209
|
+
* over any existing system-defaults file into a private 0700/0600 temp file
|
|
210
|
+
* without mutating the original) and read back the effective native memory
|
|
211
|
+
* state across Qwen's settings layers (`systemDefaults < user < workspace < system`).
|
|
212
|
+
*/
|
|
213
|
+
export async function prepareQwenNativeMemory(options, env, version) {
|
|
214
|
+
const paths = await resolveQwenPaths(env);
|
|
215
|
+
let temporary = null;
|
|
216
|
+
let childEnv = env;
|
|
217
|
+
let effectiveDefaultsPath = paths.systemDefaultsPath;
|
|
218
|
+
let effectiveDefaultsRecord = undefined;
|
|
219
|
+
if (options.nativeMemoryDefault === "off") {
|
|
220
|
+
const existing = await readJsonObjectIfPresent(paths.systemDefaultsPath) ?? {};
|
|
221
|
+
const existingMemory = asRecord(existing.memory) ?? {};
|
|
222
|
+
effectiveDefaultsRecord = {
|
|
223
|
+
...existing,
|
|
224
|
+
memory: {
|
|
225
|
+
...existingMemory,
|
|
226
|
+
enableManagedAutoMemory: false,
|
|
227
|
+
enableManagedAutoDream: false,
|
|
228
|
+
enableAutoSkill: false,
|
|
229
|
+
},
|
|
230
|
+
};
|
|
231
|
+
temporary = await privateTempDir(QWEN_DEFAULTS_PREFIX);
|
|
232
|
+
try {
|
|
233
|
+
effectiveDefaultsPath = path.join(temporary.path, "system-defaults.json");
|
|
234
|
+
await writeFile(effectiveDefaultsPath, `${JSON.stringify(effectiveDefaultsRecord, null, 2)}\n`, { mode: 0o600, flag: "wx" });
|
|
235
|
+
childEnv = sessionEnvironment({ QWEN_CODE_SYSTEM_DEFAULTS_PATH: effectiveDefaultsPath }, env);
|
|
236
|
+
}
|
|
237
|
+
catch (error) {
|
|
238
|
+
temporary.remove();
|
|
239
|
+
throw error;
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
else {
|
|
243
|
+
await sweepAbandonedQwenDefaults();
|
|
244
|
+
}
|
|
245
|
+
const cleanup = () => { temporary?.remove(); };
|
|
246
|
+
if (!semverAtLeast(version, "0.26.0")) {
|
|
247
|
+
return { env: childEnv, cleanup };
|
|
248
|
+
}
|
|
249
|
+
const nativeMemory = await readEffectiveNativeMemory(options, childEnv, paths, effectiveDefaultsPath, effectiveDefaultsRecord);
|
|
250
|
+
return nativeMemory === undefined ? { env: childEnv, cleanup } : { env: childEnv, nativeMemory, cleanup };
|
|
251
|
+
}
|
|
252
|
+
//# sourceMappingURL=native-memory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-memory.js","sources":["../../../src/runtimes/qwen/native-memory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { RefusedSessionOptions } from "../../contracts/runtime.js";
|
|
2
2
|
export declare const qwenRefusedSessionOptions: RefusedSessionOptions;
|
|
3
|
+
/** Qwen 0.26.0+ supports lowering native auto-memory defaults via QWEN_CODE_SYSTEM_DEFAULTS_PATH. */
|
|
4
|
+
export declare function qwenNativeMemoryRefusal(version: string | undefined): Pick<RefusedSessionOptions, "nativeMemoryDefault">;
|
|
3
5
|
/** A second protocol, identity, or approval selector would invalidate the session OAR opens. */
|
|
4
6
|
export declare function checkQwenLaunchArgs(args: readonly string[] | undefined): void;
|
|
5
7
|
//# sourceMappingURL=options.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/qwen/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/qwen/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAIxE,eAAO,MAAM,yBAAyB,EAAE,qBAQvC,CAAC;AAEF,qGAAqG;AACrG,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,CAIvH;AAYD,gGAAgG;AAChG,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI,CAE7E"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { checkManagedLaunchArgs } from "../../shared/launch-args.js";
|
|
2
|
+
import { semverAtLeast } from "../../shared/semver.js";
|
|
2
3
|
export const qwenRefusedSessionOptions = {
|
|
3
4
|
fork: "OAR has not verified a native Qwen fork that opens a copy of a saved session under a new id, cut after a chosen turn",
|
|
4
5
|
goals: "This runtime interface exposes no structured native goal controls",
|
|
@@ -8,6 +9,12 @@ export const qwenRefusedSessionOptions = {
|
|
|
8
9
|
outputSchema: "Qwen rejects --json-schema with its long-lived stream-json input protocol",
|
|
9
10
|
name: "Qwen's stream-json interface does not expose a session-name readback",
|
|
10
11
|
};
|
|
12
|
+
/** Qwen 0.26.0+ supports lowering native auto-memory defaults via QWEN_CODE_SYSTEM_DEFAULTS_PATH. */
|
|
13
|
+
export function qwenNativeMemoryRefusal(version) {
|
|
14
|
+
return semverAtLeast(version, "0.26.0")
|
|
15
|
+
? {}
|
|
16
|
+
: { nativeMemoryDefault: "Qwen below 0.26.0 has no verified system-defaults memory toggle; 0.26.0 or later is required" };
|
|
17
|
+
}
|
|
11
18
|
const QWEN_MANAGED_LAUNCH_ARGS = new Set([
|
|
12
19
|
"--input-format", "--output-format", "--channel", "--approval-mode", "--yolo", "-y",
|
|
13
20
|
"--include-partial-messages", "--no-include-partial-messages",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sources":["../../../src/runtimes/qwen/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"options.js","sources":["../../../src/runtimes/qwen/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,MAAM,CAAC,MAAM,yBAAyB,GAA0B;IAC9D,IAAI,EAAE,sHAAsH;IAC5H,KAAK,EAAE,mEAAmE;IAC1E,uBAAuB,EAAE,0GAA0G;IACnI,iBAAiB,EAAE,6EAA6E;IAChG,WAAW,EAAE,qEAAqE;IAClF,YAAY,EAAE,2EAA2E;IACzF,IAAI,EAAE,sEAAsE;CAC7E,CAAC;AAEF,qGAAqG;AACrG,MAAM,UAAU,uBAAuB,CAAC,OAA2B;IACjE,OAAO,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC;QACrC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,EAAE,mBAAmB,EAAE,8FAA8F,EAAE,CAAC;AAC9H,CAAC;AAED,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAC;IACvC,gBAAgB,EAAE,iBAAiB,EAAE,WAAW,EAAE,iBAAiB,EAAE,QAAQ,EAAE,IAAI;IACnF,4BAA4B,EAAE,+BAA+B;IAC7D,cAAc,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO;IAC/E,UAAU,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI;IACrE,SAAS,EAAE,IAAI,EAAE,iBAAiB,EAAE,wBAAwB;IAC5D,oBAAoB,EAAE,WAAW,EAAE,aAAa,EAAE,cAAc;IAChE,sBAAsB,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI;CACxD,CAAC,CAAC;AAEH,gGAAgG;AAChG,MAAM,UAAU,mBAAmB,CAAC,IAAmC;IACrE,sBAAsB,CAAC,IAAI,EAAE,wBAAwB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,mCAAmC,IAAI,+GAA+G,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAChP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projection.d.ts","sources":["../../../src/runtimes/qwen/projection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,WAAW,EAAe,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAA+B,KAAK,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAChH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAGvF,MAAM,WAAW,cAAe,SAAQ,yBAAyB;IAC/D,sGAAsG;IACtG,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;CAC7B;AACD,wBAAgB,qBAAqB,CAAC,MAAM,UAAQ,GAAG,cAAc,CAEpE;AAED,oGAAoG;AACpG,wBAAgB,SAAS,CAAC,OAAO,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,CAKjE;
|
|
1
|
+
{"version":3,"file":"projection.d.ts","sources":["../../../src/runtimes/qwen/projection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,WAAW,EAAe,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAA+B,KAAK,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAChH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAGvF,MAAM,WAAW,cAAe,SAAQ,yBAAyB;IAC/D,sGAAsG;IACtG,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;CAC7B;AACD,wBAAgB,qBAAqB,CAAC,MAAM,UAAQ,GAAG,cAAc,CAEpE;AAED,oGAAoG;AACpG,wBAAgB,SAAS,CAAC,OAAO,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,CAKjE;AAaD,eAAO,MAAM,qBAAqB,EAAE,2BAA2B,CAAC,cAAc,CAiB7E,CAAC"}
|
|
@@ -23,6 +23,7 @@ function outcome(state, message) {
|
|
|
23
23
|
return { kind: "completed", ...("structured_result" in message ? { structuredOutput: message.structured_result } : {}) };
|
|
24
24
|
}
|
|
25
25
|
const error = asRecord(message.error);
|
|
26
|
+
// [src] Qwen 0.26.0 packages/cli/src/nonInteractive/session.ts stream-json result subtype.
|
|
26
27
|
return { kind: "failed", failure: message.subtype === "error_max_turns" ? "limit_reached" : "unknown",
|
|
27
28
|
reason: typeof error?.message === "string" ? error.message : `Qwen result: ${String(message.subtype)}` };
|
|
28
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projection.js","sources":["../../../src/runtimes/qwen/projection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"projection.js","sources":["../../../src/runtimes/qwen/projection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/qwen/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/qwen/session.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI5F,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAQjE,wGAAwG;AACxG,wBAAgB,aAAa,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,GAAG,UAAU,CAKvE;AAED,wGAAwG;AACxG,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,gBAAgB,EAAE,CAO9F;AAED,eAAO,MAAM,WAAW,EAAE,YAyCxB,CAAC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
/* oxlint-disable import/max-dependencies -- Session assembly wires protocol, process lifetime and private readbacks. */
|
|
2
2
|
import { appendCleanupFailure, cleanupFailureReason } from "../../shared/executable/process-cleanup.js";
|
|
3
3
|
import { randomUUID } from "node:crypto";
|
|
4
|
+
import { UnsupportedOptionError } from "../../contracts/errors.js";
|
|
4
5
|
import { withSessionCredentials } from "../../shared/session-credentials.js";
|
|
5
6
|
import { checkMcpServerNames, isHttpMcpServer } from "../../shared/mcp-servers.js";
|
|
7
|
+
import { semverBelow } from "../../shared/semver.js";
|
|
6
8
|
import { asRecord } from "../../shared/json.js";
|
|
7
9
|
import { streamJsonSession } from "../../shared/stream-json/session.js";
|
|
8
10
|
import { qwenContextReadback } from "./context-usage.js";
|
|
@@ -31,15 +33,22 @@ export const qwenSession = withSessionCredentials(async (installation, options,
|
|
|
31
33
|
throw new Error("The Qwen session adapter needs an executable installation");
|
|
32
34
|
}
|
|
33
35
|
const sessionId = options.resume ?? randomUUID();
|
|
34
|
-
const
|
|
35
|
-
const
|
|
36
|
-
|
|
36
|
+
const servers = options.mcpServers ?? [];
|
|
37
|
+
const mcpServers = qwenMcpConfig(servers);
|
|
38
|
+
if (semverBelow(installation.version, "0.26.0") && servers.some((server) => isHttpMcpServer(server))) {
|
|
39
|
+
throw new UnsupportedOptionError("mcpServers", `Qwen ${installation.version ?? "below 0.26.0"} does not support HTTP MCP servers; 0.26.0 or later is required`);
|
|
40
|
+
}
|
|
41
|
+
const child = await launchQwen(installation.command, sessionId, options, installation.version);
|
|
42
|
+
const control = qwenControl(child, undefined, credentials.redact);
|
|
37
43
|
const context = qwenContextReadback(child);
|
|
38
44
|
let canReadContext = false;
|
|
39
45
|
try {
|
|
40
46
|
return await streamJsonSession(child, sessionId, credentials, {
|
|
41
47
|
projection: qwenProjectionProfile, initial: initialQwenProjection(options.resume !== undefined),
|
|
42
|
-
capabilities: {
|
|
48
|
+
capabilities: {
|
|
49
|
+
queue: { durable: false }, attribution: "attributed", images: false,
|
|
50
|
+
...(child.nativeMemory === undefined ? {} : { nativeMemory: child.nativeMemory }),
|
|
51
|
+
},
|
|
43
52
|
steer: false,
|
|
44
53
|
userMessage: (text, inputId) => `${JSON.stringify({ type: "user", uuid: inputId ?? randomUUID(), session_id: sessionId, parent_tool_use_id: null,
|
|
45
54
|
message: { role: "user", content: [{ type: "text", text }] } })}\n`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/runtimes/qwen/session.ts"],"names":[],"mappings":"AAAA,wHAAwH;AACxH,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACxG,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/runtimes/qwen/session.ts"],"names":[],"mappings":"AAAA,wHAAwH;AACxH,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACxG,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE/E,wGAAwG;AACxG,MAAM,UAAU,aAAa,CAAC,OAA6B;IACzD,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC;YACrF,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE;YAC/F,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACxH,CAAC;AAED,wGAAwG;AACxG,MAAM,UAAU,UAAU,CAAC,MAAkB,EAAE,SAAkB;IAC/D,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACjD,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,MAAM,EAAE,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC;QACrH,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzG,CAAC;IACD,OAAO,MAAM,EAAE,OAAO,KAAK,IAAI,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACtJ,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAiB,sBAAsB,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;IAC3G,IAAI,YAAY,CAAC,GAAG,KAAK,YAAY,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;IAAC,CAAC;IACxH,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;IACjD,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IACzC,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QACrG,MAAM,IAAI,sBAAsB,CAAC,YAAY,EAAE,QAAQ,YAAY,CAAC,OAAO,IAAI,cAAc,iEAAiE,CAAC,CAAC;IAClK,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/F,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC3C,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,CAAC;QACH,OAAO,MAAM,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;YAC5D,UAAU,EAAE,qBAAqB,EAAE,OAAO,EAAE,qBAAqB,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC;YAC/F,YAAY,EAAE;gBACZ,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK;gBACnE,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC;aAClF;YACD,KAAK,EAAE,KAAK;YACZ,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,IAAI,UAAU,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,kBAAkB,EAAE,IAAI;gBAC9I,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI;YACrE,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;YAC1E,gBAAgB,EAAE,CAAC,MAAM,EAAE,KAAK,EAAwB,EAAE,CAAC,cAAc,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;YACtI,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;gBACzB,4FAA4F;gBAC5F,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,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,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;oBACxK,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBAAC,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;oBAAC,CAAC;oBAC7J,MAAM,KAAK,CAAC;gBACd,CAAC,CAAC,CAAC;gBACH,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;gBAC7D,IAAI,MAAM,EAAE,UAAU,KAAK,SAAS,EAAE,CAAC;oBAAC,MAAM,IAAI,KAAK,CAAC,yCAAyC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;gBAAC,CAAC;gBACjI,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,qBAAqB,KAAK,IAAI,CAAC;gBAC/E,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBAClD,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YAC1E,CAAC;YACD,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAC7G,kBAAkB,EAAE,sBAAsB;YAC1C,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC;gBAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAAC,MAAM,KAAK,CAAC,MAAM,CAAC;YAAC,CAAC;iBAAM,CAAC;gBAAC,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC;YAAC,CAAC,CAAC,CAAC;SAChH,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAAC,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC;QAAC,MAAM,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAAC,CAAC;AACnI,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effort.d.ts","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"effort.d.ts","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"AAGA,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AA+B5D;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;CAAE,EAClG,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACP,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9F,GACA,OAAO,CAAC,UAAU,CAAC,CAuBrB;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;IACP,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9F,GACA,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAYjC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/* oxlint-disable typescript/promise-function-async -- Deadline callbacks deliberately return the SDK's native promises. */
|
|
2
|
+
import { AcpError } from "./errors.js";
|
|
2
3
|
import { UnsupportedOptionError } from "../../contracts/errors.js";
|
|
3
4
|
import { asRecord } from "../json.js";
|
|
4
5
|
import { acpReportedEffort, acpThoughtLevelOption } from "./model.js";
|
|
@@ -49,6 +50,10 @@ export async function applyAcpEffort(process, opened, effort, context) {
|
|
|
49
50
|
answer = await setConfigOption(process, opened.sessionId, configId, effort, context);
|
|
50
51
|
}
|
|
51
52
|
catch (error) {
|
|
53
|
+
// The opener adds the owned child's exit diagnostics to transport failures.
|
|
54
|
+
if (error instanceof AcpError) {
|
|
55
|
+
throw error;
|
|
56
|
+
}
|
|
52
57
|
throw new Error(`${method} ${configId}=${effort} was refused: ${rpcErrorText(error)}`, { cause: error });
|
|
53
58
|
}
|
|
54
59
|
const response = asRecord(answer) ?? {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effort.js","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"AAAA,2HAA2H;AAC3H,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,EAAmB,eAAe,EAAE,MAAM,cAAc,CAAC;AAGhE,SAAS,eAAe,CACtB,OAAmB,EAAE,SAAiB,EAAE,QAAgB,EAAE,KAAa,EACvE,OAA4E;IAE5E,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,eAAe,CAAC,OAAO,EAAE,2BAA2B,EAAE,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,CAC/F,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IACnH,CAAC;IACD,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,CAChE,eAAe,CAAC,OAAO,EAAE,2BAA2B,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAC,cAAc,EAAC,EAAE;QAC9F,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,cAAc,CAAC,CAAC;QACrI,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,cAAc,EAAE,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAC9I,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QACrC,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAED,6GAA6G;AAC7G,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC;IACnC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IACD,OAAO,GAAG,KAAK,CAAC,OAAO,KAAK,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;AACxF,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAmB,EACnB,MAAkG,EAClG,MAAc,EACd,OAIC;IAED,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;IAC5D,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1D,oEAAoE;QACpE,sDAAsD;QACtD,MAAM,IAAI,sBAAsB,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,UAAU,yDAAyD,MAAM,oBAAoB,CAAC,CAAC;IACtJ,CAAC;IACD,MAAM,MAAM,GAAG,2BAA2B,CAAC;IAC3C,IAAI,MAAM,GAAY,SAAS,CAAC;IAChC,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACvF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,IAAI,QAAQ,IAAI,MAAM,iBAAiB,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3G,CAAC;IACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACxC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,SAAS,QAAQ,OAAO,OAAO,IAAI,qBAAqB,oBAAoB,MAAM,gBAAgB,CAAC,CAAC;IAC/H,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAmB,EACnB,SAAiB,EACjB,KAAa,EACb,OAKC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAC3F,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe;QACtD,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC;QAC9D,CAAC,CAAC,eAAe,CACjB,OAAO,EACP,MAAM,EACN,OAAO,CAAC,SAAS,EACjB,CAAC,cAAc,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,cAAc,CAAC,CAC5G,CAAC,CAAC,IAAI,SAAS,CAAC;IACjB,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,IAAI,EAAE,EAAE,CAAC,CAAC;IACtD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
1
|
+
{"version":3,"file":"effort.js","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { ProcessDiagnostics } from "../executable/diagnostics.js";
|
|
2
2
|
export type AcpErrorKind = "timeout" | "process_exited";
|
|
3
3
|
/** One transport error class with a discriminant instead of four nominal wrappers. */
|
|
4
4
|
export declare class AcpError extends Error {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sources":["../../../src/shared/acp/errors.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sources":["../../../src/shared/acp/errors.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,gBAAgB,CAAC;AAExD,sFAAsF;AACtF,qBAAa,QAAS,SAAQ,KAAK;IACjC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAElC,YACE,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE;QACN,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAClC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;KACrB,EAQP;CACF;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,QAAQ,CAKlF;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,WAAW,CAAC,EAAE,kBAAkB,EAChC,MAAM,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAuB,GAChD,QAAQ,CAQV"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { processFailure } from "../executable/diagnostics.js";
|
|
3
|
-
import { redactTokenShapes } from "../token-redaction.js";
|
|
1
|
+
import { reportedProcessFailure } from "../executable/reported-stderr.js";
|
|
4
2
|
/** One transport error class with a discriminant instead of four nominal wrappers. */
|
|
5
3
|
export class AcpError extends Error {
|
|
6
4
|
kind;
|
|
@@ -23,14 +21,8 @@ export function acpRequestTimeoutError(method, timeoutMs) {
|
|
|
23
21
|
});
|
|
24
22
|
}
|
|
25
23
|
export function acpProcessExitedError(exitCode, diagnostics, redact = (text) => text) {
|
|
26
|
-
//
|
|
27
|
-
|
|
28
|
-
const safe = (text) => redactTokenShapes(redact(text));
|
|
29
|
-
const failure = diagnostics === undefined ? undefined : processFailure("ACP process exited", {
|
|
30
|
-
...diagnostics,
|
|
31
|
-
stderr: reportedStderr(diagnostics, redact),
|
|
32
|
-
...(diagnostics.error === undefined ? {} : { error: { ...diagnostics.error, message: safe(diagnostics.error.message) } }),
|
|
33
|
-
});
|
|
24
|
+
// Authentication queries omit diagnostics. A shared session supplies only process-wide facts.
|
|
25
|
+
const failure = diagnostics === undefined ? undefined : reportedProcessFailure("ACP process exited", diagnostics, redact);
|
|
34
26
|
return new AcpError("process_exited", failure?.message ?? (exitCode === null ? "ACP process exited" : `ACP process exited with code ${exitCode}`), { exitCode, ...(failure === undefined ? {} : { cause: failure.cause }) });
|
|
35
27
|
}
|
|
36
28
|
//# sourceMappingURL=errors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sources":["../../../src/shared/acp/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"errors.js","sources":["../../../src/shared/acp/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAK1E,sFAAsF;AACtF,MAAM,OAAO,QAAS,SAAQ,KAAK;IACxB,IAAI,CAAe;IACnB,QAAQ,CAAgB;IACxB,MAAM,CAAgB;IACtB,SAAS,CAAgB;IAElC,YACE,IAAkB,EAClB,OAAe,EACf,MAAM,GAKF,EAAE;QAEN,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC;IAC5C,CAAC;CACF;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAc,EAAE,SAAiB;IACtE,OAAO,IAAI,QAAQ,CAAC,SAAS,EAAE,eAAe,MAAM,oBAAoB,SAAS,IAAI,EAAE;QACrF,MAAM;QACN,SAAS;KACV,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,QAAuB,EACvB,WAAgC,EAChC,MAAM,GAA6B,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI;IAEjD,8FAA8F;IAC9F,MAAM,OAAO,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAsB,CAAC,oBAAoB,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC1H,OAAO,IAAI,QAAQ,CACjB,gBAAgB,EAChB,OAAO,EAAE,OAAO,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,gCAAgC,QAAQ,EAAE,CAAC,EAC3G,EAAE,QAAQ,EAAE,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,EAAE,CACzE,CAAC;AACJ,CAAC"}
|