@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
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
import { readFile, stat } from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { environmentHome } from "../../shared/environment-home.js";
|
|
4
|
+
import { environmentValue } from "../../shared/environment.js";
|
|
5
|
+
import { runExecutable } from "../../shared/executable/index.js";
|
|
6
|
+
import { asRecord, parseJson } from "../../shared/json.js";
|
|
7
|
+
const DBUS_TIMEOUT_MS = 1000;
|
|
8
|
+
const OAUTH_METHODS = new Set(["oauth-personal", "oauth-business"]);
|
|
9
|
+
/**
|
|
10
|
+
* Read agy's non-credential persisted ACP auth method (`cache/acp-auth-state.json`,
|
|
11
|
+
* `[env]` agy 1.5.13: `{"methodId":"oauth-personal"}`). Returns undefined unless
|
|
12
|
+
* it names a known OAuth method so OAR never probes an unconfigured login path.
|
|
13
|
+
*/
|
|
14
|
+
export async function readPersistedAcpOAuthMethod(env) {
|
|
15
|
+
const stateFile = path.join(environmentHome(env), ".gemini", "antigravity-cli", "cache", "acp-auth-state.json");
|
|
16
|
+
try {
|
|
17
|
+
const parsed = asRecord(parseJson(await readFile(stateFile, "utf8")));
|
|
18
|
+
const methodId = parsed?.methodId;
|
|
19
|
+
return typeof methodId === "string" && OAUTH_METHODS.has(methodId) ? methodId : undefined;
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function validEmail(value) {
|
|
26
|
+
if (typeof value !== "string") {
|
|
27
|
+
return undefined;
|
|
28
|
+
}
|
|
29
|
+
const trimmed = value.trim();
|
|
30
|
+
return trimmed.includes("@") ? trimmed : undefined;
|
|
31
|
+
}
|
|
32
|
+
/** Decode ONLY the unverified payload segment of a JWT for display email (no crypto, no network). */
|
|
33
|
+
function jwtPayloadEmail(token) {
|
|
34
|
+
if (typeof token !== "string") {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
const parts = token.split(".");
|
|
38
|
+
if (parts.length !== 3 || parts[1] === undefined || parts[1] === "") {
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
try {
|
|
42
|
+
const decoded = Buffer.from(parts[1], "base64url").toString("utf8");
|
|
43
|
+
return validEmail(asRecord(parseJson(decoded))?.email);
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Extract the account email from agy's plain-file OAuth token JSON without
|
|
51
|
+
* ever returning or logging credential values:
|
|
52
|
+
* - `[env]` + `[sym]` agy 1.5.13 (`StoredToken.IDTokenEmail`, `json:"id_token_email,omitempty"`):
|
|
53
|
+
* agy extracts `email` from the OIDC `id_token` in `RememberIDToken` and stores `id_token_email`.
|
|
54
|
+
* - Fallback: unverified JWT payload `email` if a raw `id_token` string is present.
|
|
55
|
+
*/
|
|
56
|
+
export function projectAntigravityTokenEmail(payload) {
|
|
57
|
+
const root = asRecord(payload);
|
|
58
|
+
if (root === null) {
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
return validEmail(root.id_token_email)
|
|
62
|
+
?? jwtPayloadEmail(root.id_token)
|
|
63
|
+
?? jwtPayloadEmail(asRecord(root.token)?.id_token);
|
|
64
|
+
}
|
|
65
|
+
async function hasLinuxSessionBus(env) {
|
|
66
|
+
const address = environmentValue(env, "DBUS_SESSION_BUS_ADDRESS");
|
|
67
|
+
if (address !== undefined && address !== "") {
|
|
68
|
+
return true;
|
|
69
|
+
}
|
|
70
|
+
const runtimeDir = environmentValue(env, "XDG_RUNTIME_DIR")
|
|
71
|
+
?? (typeof process.getuid === "function" ? `/run/user/${String(process.getuid())}` : undefined);
|
|
72
|
+
if (runtimeDir === undefined || runtimeDir === "") {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
try {
|
|
76
|
+
await stat(path.join(runtimeDir, "bus"));
|
|
77
|
+
return true;
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
return false;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
function dbusProbeEnv(env) {
|
|
84
|
+
const minimal = { LC_ALL: "C" };
|
|
85
|
+
for (const key of ["PATH", "DBUS_SESSION_BUS_ADDRESS", "XDG_RUNTIME_DIR"]) {
|
|
86
|
+
const value = environmentValue(env, key);
|
|
87
|
+
if (value !== undefined) {
|
|
88
|
+
minimal[key] = value;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
return minimal;
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Check whether `org.freedesktop.secrets` is owned or activatable on the Linux
|
|
95
|
+
* D-Bus session bus (pure bus daemon introspection, never touches the keyring).
|
|
96
|
+
* Fails closed (`true`) when a bus exists and introspection cannot prove absence.
|
|
97
|
+
*/
|
|
98
|
+
async function linuxSecretServiceReachable(env) {
|
|
99
|
+
if (!(await hasLinuxSessionBus(env))) {
|
|
100
|
+
return false;
|
|
101
|
+
}
|
|
102
|
+
const probeEnv = dbusProbeEnv(env);
|
|
103
|
+
const baseArgs = ["--session", "--print-reply=literal", "--dest=org.freedesktop.DBus", "/org/freedesktop/DBus"];
|
|
104
|
+
try {
|
|
105
|
+
const [owner, activatable] = await Promise.all([
|
|
106
|
+
runExecutable("dbus-send", [...baseArgs, "org.freedesktop.DBus.NameHasOwner", "string:org.freedesktop.secrets"], { env: probeEnv, timeoutMs: DBUS_TIMEOUT_MS }),
|
|
107
|
+
runExecutable("dbus-send", [...baseArgs, "org.freedesktop.DBus.ListActivatableNames"], { env: probeEnv, timeoutMs: DBUS_TIMEOUT_MS }),
|
|
108
|
+
]);
|
|
109
|
+
if (!owner.ok || !activatable.ok) {
|
|
110
|
+
return true;
|
|
111
|
+
}
|
|
112
|
+
return owner.stdout.trim() !== "boolean false" || activatable.stdout.includes("org.freedesktop.secrets");
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
return true;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* `[sym]` agy 1.5.13 (`compositeTokenStorage.LoadToken` / `LoadStoredToken`):
|
|
120
|
+
* agy reads `KeyringTokenStorage` (`go_keyring`: macOS Keychain, Windows
|
|
121
|
+
* Credential Manager, Linux `org.freedesktop.secrets`) FIRST and falls back to
|
|
122
|
+
* the plain JSON file only when the keyring fails or is empty; `SaveToken`
|
|
123
|
+
* purges the file best-effort after a keyring write. Because a stale plain file
|
|
124
|
+
* could hold an earlier account whenever a keyring backend is reachable, OAR
|
|
125
|
+
* treats the plain file as authoritative ONLY on Linux when Secret Service is
|
|
126
|
+
* proved unreachable (no session bus, or D-Bus confirms `org.freedesktop.secrets`
|
|
127
|
+
* is neither owned nor activatable). On macOS, Windows, and Linux desktops with
|
|
128
|
+
* Secret Service, `email` is omitted so OAR never displays a stale account.
|
|
129
|
+
*/
|
|
130
|
+
export async function isPlainTokenFileAuthoritative(env, probe = {}) {
|
|
131
|
+
const platform = probe.platform ?? process.platform;
|
|
132
|
+
if (platform !== "linux") {
|
|
133
|
+
return false;
|
|
134
|
+
}
|
|
135
|
+
return !(await (probe.secretServiceReachable ?? linuxSecretServiceReachable)(env));
|
|
136
|
+
}
|
|
137
|
+
/** Read-only email lookup from agy's plain token file when no OS keyring can shadow it. */
|
|
138
|
+
export async function readAntigravityTokenEmail(env, probe = {}) {
|
|
139
|
+
if (!(await isPlainTokenFileAuthoritative(env, probe))) {
|
|
140
|
+
return undefined;
|
|
141
|
+
}
|
|
142
|
+
const tokenFile = path.join(environmentHome(env), ".gemini", "antigravity-cli", "antigravity-oauth-token");
|
|
143
|
+
try {
|
|
144
|
+
return projectAntigravityTokenEmail(parseJson(await readFile(tokenFile, "utf8")));
|
|
145
|
+
}
|
|
146
|
+
catch {
|
|
147
|
+
return undefined;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
/** Remembered account from a remaining authoritative plain token file when signed out. */
|
|
151
|
+
export async function rememberedAntigravityAccount(env, probe = {}) {
|
|
152
|
+
const email = await readAntigravityTokenEmail(env, probe);
|
|
153
|
+
return email === undefined ? undefined : { email };
|
|
154
|
+
}
|
|
155
|
+
//# sourceMappingURL=token-email.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-email.js","sources":["../../../src/runtimes/antigravity/token-email.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,27 +3,27 @@ import { utcInstantFromDate } from "../../shared/instant.js";
|
|
|
3
3
|
import { asNumber, asRecord } from "../../shared/json.js";
|
|
4
4
|
/*
|
|
5
5
|
* A failed claude turn, classified from what claude says
|
|
6
|
-
* (docs/spec/runtime-matrix.md#claude):
|
|
7
|
-
* `assistant` frame (`error`), then the
|
|
8
|
-
* `api_error_status`.
|
|
9
|
-
*
|
|
10
|
-
* `account_on_hold`,
|
|
11
|
-
* `
|
|
12
|
-
* A `rate_limit` while claude's latest `rate_limit_event` says a
|
|
13
|
-
*
|
|
14
|
-
*
|
|
6
|
+
* (docs/spec/runtime-matrix.md#failure-evidence, docs/runtimes/claude.md#failures):
|
|
7
|
+
* the category on the turn's error `assistant` frame (`error`), then the
|
|
8
|
+
* result's `terminal_reason` and `api_error_status`. `server_error` is decided
|
|
9
|
+
* by status (529 -> overloaded). Declared categories no run has produced
|
|
10
|
+
* (`oauth_org_not_allowed`, `account_on_hold`, `max_output_tokens`,
|
|
11
|
+
* `cloud_credential_error`) stay unmapped and fall through to status.
|
|
12
|
+
* A `rate_limit` while claude's latest `rate_limit_event` says a subscription
|
|
13
|
+
* limit refuses requests until a named reset is `quota` with that `resetsAt`
|
|
14
|
+
* (`claudeLimitReset`); without one it stays `rate_limited`.
|
|
15
15
|
*/
|
|
16
|
-
/**
|
|
16
|
+
/** Categories mapped by evidence tier; `server_error` falls through to status. */
|
|
17
17
|
const CATEGORIES = {
|
|
18
|
-
authentication_failed: "auth",
|
|
19
|
-
verification_required: "auth",
|
|
20
|
-
overloaded: "overloaded",
|
|
21
|
-
model_not_found: "model_unavailable",
|
|
22
|
-
rate_limit: "rate_limited",
|
|
23
|
-
billing_error: "billing",
|
|
24
|
-
invalid_request: "invalid_request",
|
|
18
|
+
authentication_failed: "auth", // [env] 2.1.292 (failure-classes.vendor.test.ts)
|
|
19
|
+
verification_required: "auth", // [rec] sanitized recorded Claude 2.1 frames (tests/fixtures/claude-synthetic-failures.json)
|
|
20
|
+
overloaded: "overloaded", // [rec] sanitized recorded Claude 2.1 frames (tests/fixtures/claude-synthetic-failures.json)
|
|
21
|
+
model_not_found: "model_unavailable", // [env] 2.1.292 (failure-classes.vendor.test.ts)
|
|
22
|
+
rate_limit: "rate_limited", // [env] 2.1.292 (failure-classes.vendor.test.ts)
|
|
23
|
+
billing_error: "billing", // [env] 2.1.292 (failure-classes.vendor.test.ts)
|
|
24
|
+
invalid_request: "invalid_request", // [env] 2.1.292 (failure-classes.vendor.test.ts)
|
|
25
25
|
};
|
|
26
|
-
/**
|
|
26
|
+
/** [env] 2.1.292 result subtypes for a limit or schema the host set (#339). */
|
|
27
27
|
const SUBTYPES = {
|
|
28
28
|
error_max_turns: "limit_reached",
|
|
29
29
|
error_max_budget_usd: "limit_reached",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failure.js","sources":["../../../src/runtimes/claude/failure.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAE3E;;;;;;;;;;;GAWG;AAEH
|
|
1
|
+
{"version":3,"file":"failure.js","sources":["../../../src/runtimes/claude/failure.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { claudeAuthStatus, claudeLogin } from "./login.js";
|
|
2
2
|
import { claudeLogout } from "./logout.js";
|
|
3
|
-
import { claudeUpgrade } from "./update.js";
|
|
4
3
|
export declare const claudeRuntime: Omit<{
|
|
5
4
|
readonly id: "claude";
|
|
6
5
|
readonly sessionCapabilities: () => {
|
|
@@ -10,6 +9,8 @@ export declare const claudeRuntime: Omit<{
|
|
|
10
9
|
tokens: true;
|
|
11
10
|
contextWindow: true;
|
|
12
11
|
};
|
|
12
|
+
mcpTransports: ("http" | "stdio")[];
|
|
13
|
+
stopTask: true;
|
|
13
14
|
};
|
|
14
15
|
readonly manualCompaction: {
|
|
15
16
|
readonly kind: "supported";
|
|
@@ -45,7 +46,7 @@ export declare const claudeRuntime: Omit<{
|
|
|
45
46
|
readonly redeemLimitReset: import("../../browser.js").LimitResetRedeemer;
|
|
46
47
|
readonly listModels: import("../../browser.js").ModelLister;
|
|
47
48
|
readonly checkUpdate: import("../../browser.js").UpdateChecker;
|
|
48
|
-
readonly upgrade:
|
|
49
|
+
readonly upgrade: import("../../browser.js").Upgrader;
|
|
49
50
|
readonly login: typeof claudeLogin;
|
|
50
51
|
readonly logout: typeof claudeLogout;
|
|
51
52
|
readonly authStatus: typeof claudeAuthStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/claude/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/claude/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAU3C,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BE,CAAC"}
|
|
@@ -16,7 +16,7 @@ import { claudeCheckUpdate, claudeUpgrade } from "./update.js";
|
|
|
16
16
|
import { claudeSession } from "./session.js";
|
|
17
17
|
export const claudeRuntime = defineRuntime({
|
|
18
18
|
id: "claude",
|
|
19
|
-
sessionCapabilities: () => ({ steer: true, images: true, contextUsage: { tokens: true, contextWindow: true } }),
|
|
19
|
+
sessionCapabilities: () => ({ steer: true, images: true, contextUsage: { tokens: true, contextWindow: true }, mcpTransports: ["stdio", "http"], stopTask: true }),
|
|
20
20
|
manualCompaction: { kind: "supported", activeTurn: "reject" },
|
|
21
21
|
refusedSessionOptions: claudeRefusedSessionOptions,
|
|
22
22
|
resumedSessionOptions: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../src/runtimes/claude/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC3D,0GAA0G;AAC1G,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,aAAa,GAAG,aAAa,CAAC;IACzC,EAAE,EAAE,QAAQ;IACZ,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../src/runtimes/claude/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC3D,0GAA0G;AAC1G,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,aAAa,GAAG,aAAa,CAAC;IACzC,EAAE,EAAE,QAAQ;IACZ,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjK,gBAAgB,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE;IAC7D,qBAAqB,EAAE,2BAA2B;IAClD,qBAAqB,EAAE;QACrB,YAAY,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,wBAAwB,EAAE;QAChF,kBAAkB,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,wBAAwB,EAAE;KACvF;IACD,WAAW,EAAE,iBAAiB;IAC9B,KAAK,EAAE,aAAa,CAAC,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,MAAM;IACxE,MAAM,EAAE,YAAY;IACpB,QAAQ,EAAE,cAAc;IACxB,UAAU,EAAE,gBAAgB;IAC5B,KAAK,EAAE,WAAW;IAClB,mBAAmB,EAAE,WAAW;IAEhC,YAAY,EAAE,kBAAkB;IAChC,WAAW,EAAE,iBAAiB;IAC9B,OAAO,EAAE,aAAa;IACtB,YAAY,EAAE,kBAAkB;IAChC,kBAAkB,EAAE,wBAAwB;IAC5C,gBAAgB,EAAE,sBAAsB;IACxC,UAAU,EAAE,gBAAgB;IAC5B,WAAW,EAAE,iBAAiB;IAC9B,OAAO,EAAE,aAAa;IACtB,KAAK,EAAE,WAAW;IAClB,MAAM,EAAE,YAAY;IACpB,UAAU,EAAE,gBAAgB;IAC5B,OAAO,EAAE,aAAa;CACvB,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { SessionFork } from "../../contracts/session-options.js";
|
|
2
|
+
import type { JsonRecord } from "../../shared/json.js";
|
|
2
3
|
/** Refuse, before claude starts, a `launchArgs` entry that collides with a flag OAR manages. */
|
|
3
4
|
export declare function refuseManagedLaunchArgs(launchArgs: readonly string[] | undefined): void;
|
|
4
5
|
/**
|
|
@@ -7,6 +8,8 @@ export declare function refuseManagedLaunchArgs(launchArgs: readonly string[] |
|
|
|
7
8
|
* fork the flag stays the host's, as before.
|
|
8
9
|
*/
|
|
9
10
|
export declare function refuseForkLaunchArgs(launchArgs: readonly string[] | undefined, fork: SessionFork | undefined): void;
|
|
11
|
+
/** Claude replaces the entire --settings value on repetition, including when it names a file. */
|
|
12
|
+
export declare function claudeSettingsArgs(settings: JsonRecord, launchArgs: readonly string[] | undefined): readonly string[];
|
|
10
13
|
/** Keep explicit native modes noninteractive; omission preserves OAR's default bypass. */
|
|
11
14
|
export declare function claudePermissionArgs(launchArgs: readonly string[] | undefined): readonly string[];
|
|
12
15
|
//# sourceMappingURL=launch-args.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-args.d.ts","sources":["../../../src/runtimes/claude/launch-args.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"launch-args.d.ts","sources":["../../../src/runtimes/claude/launch-args.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAuCvD,gGAAgG;AAChG,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI,CAEvF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAAE,IAAI,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAKnH;AAED,iGAAiG;AACjG,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,SAAS,MAAM,EAAE,CAMrH;AAED,0FAA0F;AAC1F,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,SAAS,MAAM,EAAE,CAoBjG"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { UnsupportedOptionError } from "../../contracts/errors.js";
|
|
2
|
-
import { checkManagedLaunchArgs } from "../../shared/launch-args.js";
|
|
2
|
+
import { checkManagedLaunchArgs, normalizeLaunchFlag } from "../../shared/launch-args.js";
|
|
3
3
|
/**
|
|
4
4
|
* claude flags OAR sets itself, which a host's `launchArgs` would contradict
|
|
5
5
|
* (#336): with `--continue` claude exits next to OAR's `--session-id`; after
|
|
@@ -52,6 +52,16 @@ export function refuseForkLaunchArgs(launchArgs, fork) {
|
|
|
52
52
|
throw new UnsupportedOptionError("launchArgs", "claude launchArgs cannot include --resume-session-at with SessionOptions.fork: use fork.through");
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
+
/** Claude replaces the entire --settings value on repetition, including when it names a file. */
|
|
56
|
+
export function claudeSettingsArgs(settings, launchArgs) {
|
|
57
|
+
if (Object.keys(settings).length === 0) {
|
|
58
|
+
return [];
|
|
59
|
+
}
|
|
60
|
+
if ((launchArgs ?? []).some((arg) => normalizeLaunchFlag(arg) === "--settings")) {
|
|
61
|
+
throw new UnsupportedOptionError("launchArgs", "claude launchArgs cannot include --settings when OAR supplies session settings");
|
|
62
|
+
}
|
|
63
|
+
return ["--settings", JSON.stringify(settings)];
|
|
64
|
+
}
|
|
55
65
|
/** Keep explicit native modes noninteractive; omission preserves OAR's default bypass. */
|
|
56
66
|
export function claudePermissionArgs(launchArgs) {
|
|
57
67
|
const args = launchArgs ?? [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-args.js","sources":["../../../src/runtimes/claude/launch-args.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"launch-args.js","sources":["../../../src/runtimes/claude/launch-args.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.d.ts","sources":["../../../src/runtimes/claude/launch.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAkBtF,2CAA2C;AAC3C,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC;AAExC;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,MAAM,CAAC,GAAG,SAAS,MAAM,EAAE,CAKxH;
|
|
1
|
+
{"version":3,"file":"launch.d.ts","sources":["../../../src/runtimes/claude/launch.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAkBtF,2CAA2C;AAC3C,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC;AAExC;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,MAAM,CAAC,GAAG,SAAS,MAAM,EAAE,CAKxH;AAwCD;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAgCtH"}
|
|
@@ -2,7 +2,7 @@ import { claudeRefusedSessionOptions } from "./options.js";
|
|
|
2
2
|
/* oxlint-disable import/max-dependencies -- Launch validates native options and owns MCP and prompt-file handoffs. */
|
|
3
3
|
import { claudeUserConfiguration } from "./user-configuration.js";
|
|
4
4
|
import { claudeServiceTierSettings } from "./service-tier.js";
|
|
5
|
-
import { claudePermissionArgs, refuseForkLaunchArgs, refuseManagedLaunchArgs } from "./launch-args.js";
|
|
5
|
+
import { claudePermissionArgs, claudeSettingsArgs, refuseForkLaunchArgs, refuseManagedLaunchArgs } from "./launch-args.js";
|
|
6
6
|
import { resolvedAdditionalDirectories } from "../../shared/additional-directories.js";
|
|
7
7
|
import { spawnLineProcess } from "../../shared/executable/index.js";
|
|
8
8
|
import { givenMcpServers } from "../../shared/mcp-servers.js";
|
|
@@ -34,7 +34,6 @@ export function claudeSessionArgs(sessionId, options) {
|
|
|
34
34
|
function spawnClaude(command, sessionId, options, mcpConfig, tierSettings, nativeArgs) {
|
|
35
35
|
const directories = resolvedAdditionalDirectories(options);
|
|
36
36
|
const configuration = claudeUserConfiguration(options);
|
|
37
|
-
// Claude replaces, rather than merges, repeated --settings arguments.
|
|
38
37
|
const settings = { ...tierSettings, ...configuration.settings };
|
|
39
38
|
return spawnLineProcess(command, [
|
|
40
39
|
"-p",
|
|
@@ -49,7 +48,7 @@ function spawnClaude(command, sessionId, options, mcpConfig, tierSettings, nativ
|
|
|
49
48
|
...((options.resume !== undefined && options.fork === undefined) || options.name === undefined ? [] : ["--name", options.name]),
|
|
50
49
|
...(options.model === undefined ? [] : ["--model", options.model]),
|
|
51
50
|
...(options.effort === undefined ? [] : ["--effort", options.effort]),
|
|
52
|
-
...(
|
|
51
|
+
...claudeSettingsArgs(settings, options.launchArgs),
|
|
53
52
|
...nativeArgs,
|
|
54
53
|
...configuration.args,
|
|
55
54
|
...(options.outputSchema === undefined ? [] : ["--json-schema", JSON.stringify(options.outputSchema)]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.js","sources":["../../../src/runtimes/claude/launch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC3D,sHAAsH;AACtH,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAG9D,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"launch.js","sources":["../../../src/runtimes/claude/launch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
import type { McpServer } from "../../contracts/session.js";
|
|
2
|
-
|
|
3
|
-
export
|
|
4
|
-
readonly path: string;
|
|
5
|
-
start(): void;
|
|
6
|
-
end(): void;
|
|
7
|
-
}
|
|
2
|
+
import { type McpConfigHandoff } from "../../shared/mcp-config-handoff.js";
|
|
3
|
+
export type { McpConfigHandoff } from "../../shared/mcp-config-handoff.js";
|
|
8
4
|
/** claude's `--mcp-config` document for the entries: stdio `{type, command, args, env}`, http `{type, url, headers}`. */
|
|
9
5
|
export declare function claudeMcpConfig(servers: readonly McpServer[]): {
|
|
10
6
|
readonly mcpServers: Record<string, unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config.d.ts","sources":["../../../src/runtimes/claude/mcp-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp-config.d.ts","sources":["../../../src/runtimes/claude/mcp-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAsD,KAAK,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAkB/H,YAAY,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAE3E,yHAAyH;AACzH,wBAAgB,eAAe,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,GAAG;IAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAM/G;AAID;;;GAGG;AACH,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE9D;AAED,gIAAgI;AAChI,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAKhG"}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
4
|
-
import { setTimeout as delay } from "node:timers/promises";
|
|
5
|
-
import { runExecutable } from "../../shared/executable/run.js";
|
|
6
|
-
import { checkMcpServerNames, isHttpMcpServer } from "../../shared/mcp-servers.js";
|
|
7
|
-
import { privateTempDir, sweepPrivateTempDirs } from "../../shared/private-temp.js";
|
|
1
|
+
import { claudeMcpCredentialRefusal } from "./options.js";
|
|
2
|
+
import { handOverMcpConfigFile, sweepAbandonedMcpConfigDirs } from "../../shared/mcp-config-handoff.js";
|
|
3
|
+
import { checkMcpServerNames, hasMcpCredentials, isHttpMcpServer } from "../../shared/mcp-servers.js";
|
|
8
4
|
/** claude's `--mcp-config` document for the entries: stdio `{type, command, args, env}`, http `{type, url, headers}`. */
|
|
9
5
|
export function claudeMcpConfig(servers) {
|
|
10
6
|
return {
|
|
@@ -13,125 +9,19 @@ export function claudeMcpConfig(servers) {
|
|
|
13
9
|
: { type: "stdio", command: server.command, args: server.args ?? [], ...(server.env === undefined ? {} : { env: server.env }) }])),
|
|
14
10
|
};
|
|
15
11
|
}
|
|
16
|
-
function errorCode(error) {
|
|
17
|
-
return error instanceof Error && "code" in error ? error.code : undefined;
|
|
18
|
-
}
|
|
19
|
-
/** A 0600 FIFO at `file`; false where none can be made. */
|
|
20
|
-
async function makeFifo(file) {
|
|
21
|
-
if (process.platform === "win32") {
|
|
22
|
-
return false;
|
|
23
|
-
}
|
|
24
|
-
const made = await runExecutable("mkfifo", ["-m", "600", file]);
|
|
25
|
-
return made.ok;
|
|
26
|
-
}
|
|
27
|
-
/** The write end once a reader has the FIFO open; undefined when `stopped()` first. */
|
|
28
|
-
async function openWhenRead(file, stopped) {
|
|
29
|
-
let wait = 5;
|
|
30
|
-
while (!stopped()) {
|
|
31
|
-
try {
|
|
32
|
-
// oxlint-disable-next-line no-await-in-loop -- polling: each attempt waits for the previous one.
|
|
33
|
-
return await open(file, constants.O_WRONLY | constants.O_NONBLOCK);
|
|
34
|
-
}
|
|
35
|
-
catch (error) {
|
|
36
|
-
if (errorCode(error) !== "ENXIO") {
|
|
37
|
-
throw error;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
// oxlint-disable-next-line no-await-in-loop -- as above; unref'd, so polling alone keeps no host alive.
|
|
41
|
-
await delay(wait, undefined, { ref: false });
|
|
42
|
-
wait = Math.min(wait * 2, 100);
|
|
43
|
-
}
|
|
44
|
-
return undefined;
|
|
45
|
-
}
|
|
46
|
-
/** Write all of `content` to a non-blocking pipe: a full pipe answers EAGAIN until the reader drains it. */
|
|
47
|
-
async function writeAll(handle, content, stopped) {
|
|
48
|
-
let rest = content;
|
|
49
|
-
while (rest.length > 0 && !stopped()) {
|
|
50
|
-
try {
|
|
51
|
-
// oxlint-disable-next-line no-await-in-loop -- sequential writes to one pipe.
|
|
52
|
-
const { bytesWritten } = await handle.write(rest);
|
|
53
|
-
rest = rest.subarray(bytesWritten);
|
|
54
|
-
}
|
|
55
|
-
catch (error) {
|
|
56
|
-
if (errorCode(error) !== "EAGAIN") {
|
|
57
|
-
throw error;
|
|
58
|
-
}
|
|
59
|
-
// oxlint-disable-next-line no-await-in-loop -- as above.
|
|
60
|
-
await delay(5, undefined, { ref: false });
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
function fifoHandoff(file, content, directory) {
|
|
65
|
-
let ended = false;
|
|
66
|
-
const stopped = () => ended;
|
|
67
|
-
const end = () => {
|
|
68
|
-
ended = true;
|
|
69
|
-
directory.remove();
|
|
70
|
-
};
|
|
71
|
-
const feed = async () => {
|
|
72
|
-
const handle = await openWhenRead(file, stopped);
|
|
73
|
-
if (handle === undefined) {
|
|
74
|
-
return;
|
|
75
|
-
}
|
|
76
|
-
try {
|
|
77
|
-
await writeAll(handle, Buffer.from(content), stopped);
|
|
78
|
-
}
|
|
79
|
-
finally {
|
|
80
|
-
await handle.close();
|
|
81
|
-
}
|
|
82
|
-
};
|
|
83
|
-
return {
|
|
84
|
-
path: file,
|
|
85
|
-
start: () => {
|
|
86
|
-
// A failed feed (claude closed its end early) leaves claude to report
|
|
87
|
-
// the config it could not read; the directory goes either way.
|
|
88
|
-
void (async () => {
|
|
89
|
-
try {
|
|
90
|
-
await feed();
|
|
91
|
-
}
|
|
92
|
-
catch {
|
|
93
|
-
// claude's own error is the report.
|
|
94
|
-
}
|
|
95
|
-
finally {
|
|
96
|
-
end();
|
|
97
|
-
}
|
|
98
|
-
})();
|
|
99
|
-
},
|
|
100
|
-
end,
|
|
101
|
-
};
|
|
102
|
-
}
|
|
103
12
|
const PREFIX = "oar-claude-mcp-";
|
|
104
13
|
/**
|
|
105
14
|
* Before any claude starts, with servers or without: remove what hosts that
|
|
106
15
|
* died left behind, letting a claude still waiting on such a FIFO go.
|
|
107
16
|
*/
|
|
108
17
|
export async function sweepAbandonedMcpConfigs() {
|
|
109
|
-
await
|
|
18
|
+
await sweepAbandonedMcpConfigDirs(PREFIX);
|
|
110
19
|
}
|
|
111
20
|
/** The handoff for these entries (sweeping as above first). Rejects on an empty or repeated name before anything is created. */
|
|
112
21
|
export async function handOverMcpConfig(servers) {
|
|
113
22
|
checkMcpServerNames(servers);
|
|
114
|
-
const
|
|
115
|
-
const
|
|
116
|
-
|
|
117
|
-
try {
|
|
118
|
-
if (await makeFifo(file)) {
|
|
119
|
-
return fifoHandoff(file, content, directory);
|
|
120
|
-
}
|
|
121
|
-
await writeFile(file, content, { mode: 0o600, flag: "wx" });
|
|
122
|
-
}
|
|
123
|
-
catch (error) {
|
|
124
|
-
directory.remove();
|
|
125
|
-
throw error;
|
|
126
|
-
}
|
|
127
|
-
return {
|
|
128
|
-
path: file,
|
|
129
|
-
start: () => {
|
|
130
|
-
// claude reads the file at startup; it goes when claude exits (end).
|
|
131
|
-
},
|
|
132
|
-
end: () => {
|
|
133
|
-
directory.remove();
|
|
134
|
-
},
|
|
135
|
-
};
|
|
23
|
+
const fileRefusal = servers.some((server) => hasMcpCredentials(server)) ? claudeMcpCredentialRefusal : undefined;
|
|
24
|
+
const handoff = await handOverMcpConfigFile(PREFIX, JSON.stringify(claudeMcpConfig(servers)), fileRefusal);
|
|
25
|
+
return handoff;
|
|
136
26
|
}
|
|
137
27
|
//# sourceMappingURL=mcp-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config.js","sources":["../../../src/runtimes/claude/mcp-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"mcp-config.js","sources":["../../../src/runtimes/claude/mcp-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAE,qBAAqB,EAAE,2BAA2B,EAAyB,MAAM,oCAAoC,CAAC;AAC/H,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAmBtG,yHAAyH;AACzH,MAAM,UAAU,eAAe,CAAC,OAA6B;IAC3D,OAAO;QACL,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC;gBAC1F,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,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;gBACzG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,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;KACrI,CAAC;AACJ,CAAC;AAED,MAAM,MAAM,GAAG,iBAAiB,CAAC;AAEjC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB;IAC5C,MAAM,2BAA2B,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,gIAAgI;AAChI,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAA6B;IACnE,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAAC;IACjH,MAAM,OAAO,GAAG,MAAM,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAC3G,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { RefusedSessionOptions } from "../../contracts/runtime.js";
|
|
2
|
+
export declare const claudeMcpCredentialRefusal = "OAR has not verified that Claude reads a regular-file MCP configuration only at startup";
|
|
2
3
|
export declare const claudeRefusedSessionOptions: RefusedSessionOptions;
|
|
3
4
|
//# sourceMappingURL=options.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/claude/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,eAAO,MAAM,2BAA2B,EAAE,
|
|
1
|
+
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/claude/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,eAAO,MAAM,0BAA0B,4FAA4F,CAAC;AAEpI,eAAO,MAAM,2BAA2B,EAAE,qBAKzC,CAAC"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
+
export const claudeMcpCredentialRefusal = "OAR has not verified that Claude reads a regular-file MCP configuration only at startup";
|
|
1
2
|
export const claudeRefusedSessionOptions = {
|
|
3
|
+
...(process.platform === "win32" ? { mcpServerCredentials: claudeMcpCredentialRefusal } : {}),
|
|
2
4
|
goals: "Claude /goal is a prompt command, not a structured native goal control",
|
|
3
5
|
endTurnProcessesOnAbort: "OAR has not verified reading and ending one aborted Claude turn's processes while its session stays usable",
|
|
6
|
+
nativeMemoryDefault: "Claude Code has no configuration layer below user settings for a soft native-memory default",
|
|
4
7
|
};
|
|
5
8
|
//# sourceMappingURL=options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sources":["../../../src/runtimes/claude/options.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,2BAA2B,GAA0B;IAChE,KAAK,EAAE,wEAAwE;IAC/E,uBAAuB,EAAE,4GAA4G;
|
|
1
|
+
{"version":3,"file":"options.js","sources":["../../../src/runtimes/claude/options.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,0BAA0B,GAAG,yFAAyF,CAAC;AAEpI,MAAM,CAAC,MAAM,2BAA2B,GAA0B;IAChE,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7F,KAAK,EAAE,wEAAwE;IAC/E,uBAAuB,EAAE,4GAA4G;IACrI,mBAAmB,EAAE,6FAA6F;CACnH,CAAC"}
|