@draht/coding-agent 2026.4.26 → 2026.6.11
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/CHANGELOG.md +43 -0
- package/bin/draht-tools.cjs +3809 -1
- package/dist/bun/cli.d.ts.map +1 -1
- package/dist/bun/cli.js +4 -2
- package/dist/bun/cli.js.map +1 -1
- package/dist/bun/restore-sandbox-env.d.ts +13 -0
- package/dist/bun/restore-sandbox-env.d.ts.map +1 -0
- package/dist/bun/restore-sandbox-env.js +32 -0
- package/dist/bun/restore-sandbox-env.js.map +1 -0
- package/dist/cli/args.d.ts +9 -4
- package/dist/cli/args.d.ts.map +1 -1
- package/dist/cli/args.js +88 -35
- package/dist/cli/args.js.map +1 -1
- package/dist/cli/config-selector.d.ts +2 -2
- package/dist/cli/config-selector.d.ts.map +1 -1
- package/dist/cli/config-selector.js +1 -1
- package/dist/cli/config-selector.js.map +1 -1
- package/dist/cli/file-processor.d.ts.map +1 -1
- package/dist/cli/file-processor.js +2 -3
- package/dist/cli/file-processor.js.map +1 -1
- package/dist/cli/initial-message.d.ts +1 -1
- package/dist/cli/initial-message.d.ts.map +1 -1
- package/dist/cli/initial-message.js.map +1 -1
- package/dist/cli/list-models.d.ts +1 -1
- package/dist/cli/list-models.d.ts.map +1 -1
- package/dist/cli/list-models.js +7 -1
- package/dist/cli/list-models.js.map +1 -1
- package/dist/cli/project-trust.d.ts +10 -0
- package/dist/cli/project-trust.d.ts.map +1 -0
- package/dist/cli/project-trust.js +48 -0
- package/dist/cli/project-trust.js.map +1 -0
- package/dist/cli/session-picker.d.ts +1 -1
- package/dist/cli/session-picker.d.ts.map +1 -1
- package/dist/cli/session-picker.js.map +1 -1
- package/dist/cli/startup-ui.d.ts +16 -0
- package/dist/cli/startup-ui.d.ts.map +1 -0
- package/dist/cli/startup-ui.js +112 -0
- package/dist/cli/startup-ui.js.map +1 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +7 -4
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts +23 -13
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +264 -62
- package/dist/config.js.map +1 -1
- package/dist/core/agent-session-runtime.d.ts +45 -9
- package/dist/core/agent-session-runtime.d.ts.map +1 -1
- package/dist/core/agent-session-runtime.js +100 -33
- package/dist/core/agent-session-runtime.js.map +1 -1
- package/dist/core/agent-session-services.d.ts +6 -4
- package/dist/core/agent-session-services.d.ts.map +1 -1
- package/dist/core/agent-session-services.js +7 -4
- package/dist/core/agent-session-services.js.map +1 -1
- package/dist/core/agent-session.d.ts +47 -31
- package/dist/core/agent-session.d.ts.map +1 -1
- package/dist/core/agent-session.js +470 -443
- package/dist/core/agent-session.js.map +1 -1
- package/dist/core/auth-guidance.d.ts +5 -0
- package/dist/core/auth-guidance.d.ts.map +1 -0
- package/dist/core/auth-guidance.js +21 -0
- package/dist/core/auth-guidance.js.map +1 -0
- package/dist/core/auth-storage.d.ts +10 -1
- package/dist/core/auth-storage.d.ts.map +1 -1
- package/dist/core/auth-storage.js +27 -6
- package/dist/core/auth-storage.js.map +1 -1
- package/dist/core/bash-executor.d.ts +1 -15
- package/dist/core/bash-executor.d.ts.map +1 -1
- package/dist/core/bash-executor.js +10 -24
- package/dist/core/bash-executor.js.map +1 -1
- package/dist/core/builtins/subagent.d.ts.map +1 -1
- package/dist/core/builtins/subagent.js +1 -2
- package/dist/core/builtins/subagent.js.map +1 -1
- package/dist/core/compaction/branch-summarization.d.ts +6 -4
- package/dist/core/compaction/branch-summarization.d.ts.map +1 -1
- package/dist/core/compaction/branch-summarization.js +9 -3
- package/dist/core/compaction/branch-summarization.js.map +1 -1
- package/dist/core/compaction/compaction.d.ts +5 -5
- package/dist/core/compaction/compaction.d.ts.map +1 -1
- package/dist/core/compaction/compaction.js +43 -37
- package/dist/core/compaction/compaction.js.map +1 -1
- package/dist/core/compaction/index.d.ts +3 -3
- package/dist/core/compaction/index.d.ts.map +1 -1
- package/dist/core/compaction/index.js.map +1 -1
- package/dist/core/compaction/utils.d.ts +1 -1
- package/dist/core/compaction/utils.d.ts.map +1 -1
- package/dist/core/compaction/utils.js +1 -1
- package/dist/core/compaction/utils.js.map +1 -1
- package/dist/core/exec.d.ts.map +1 -1
- package/dist/core/exec.js.map +1 -1
- package/dist/core/experimental.d.ts +2 -0
- package/dist/core/experimental.d.ts.map +1 -0
- package/dist/core/experimental.js +4 -0
- package/dist/core/experimental.js.map +1 -0
- package/dist/core/export-html/ansi-to-html.d.ts.map +1 -1
- package/dist/core/export-html/ansi-to-html.js +1 -1
- package/dist/core/export-html/ansi-to-html.js.map +1 -1
- package/dist/core/export-html/index.d.ts +1 -1
- package/dist/core/export-html/index.d.ts.map +1 -1
- package/dist/core/export-html/index.js +13 -11
- package/dist/core/export-html/index.js.map +1 -1
- package/dist/core/export-html/template.css +69 -4
- package/dist/core/export-html/template.js +231 -57
- package/dist/core/export-html/tool-renderer.d.ts +0 -6
- package/dist/core/export-html/tool-renderer.d.ts.map +1 -1
- package/dist/core/export-html/tool-renderer.js +15 -2
- package/dist/core/export-html/tool-renderer.js.map +1 -1
- package/dist/core/extensions/index.d.ts +8 -8
- package/dist/core/extensions/index.d.ts.map +1 -1
- package/dist/core/extensions/index.js.map +1 -1
- package/dist/core/extensions/loader.d.ts +3 -3
- package/dist/core/extensions/loader.d.ts.map +1 -1
- package/dist/core/extensions/loader.js +27 -35
- package/dist/core/extensions/loader.js.map +1 -1
- package/dist/core/extensions/runner.d.ts +30 -12
- package/dist/core/extensions/runner.d.ts.map +1 -1
- package/dist/core/extensions/runner.js +215 -32
- package/dist/core/extensions/runner.js.map +1 -1
- package/dist/core/extensions/types.d.ts +163 -35
- package/dist/core/extensions/types.d.ts.map +1 -1
- package/dist/core/extensions/types.js.map +1 -1
- package/dist/core/extensions/wrapper.d.ts.map +1 -1
- package/dist/core/extensions/wrapper.js +2 -2
- package/dist/core/extensions/wrapper.js.map +1 -1
- package/dist/core/footer-data-provider.d.ts +7 -1
- package/dist/core/footer-data-provider.d.ts.map +1 -1
- package/dist/core/footer-data-provider.js +78 -54
- package/dist/core/footer-data-provider.js.map +1 -1
- package/dist/core/http-dispatcher.d.ts +21 -0
- package/dist/core/http-dispatcher.d.ts.map +1 -0
- package/dist/core/http-dispatcher.js +48 -0
- package/dist/core/http-dispatcher.js.map +1 -0
- package/dist/core/index.d.ts +9 -8
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js +2 -1
- package/dist/core/index.js.map +1 -1
- package/dist/core/keybindings.d.ts +66 -1
- package/dist/core/keybindings.d.ts.map +1 -1
- package/dist/core/keybindings.js +56 -1
- package/dist/core/keybindings.js.map +1 -1
- package/dist/core/model-registry.d.ts +22 -4
- package/dist/core/model-registry.d.ts.map +1 -1
- package/dist/core/model-registry.js +216 -44
- package/dist/core/model-registry.js.map +1 -1
- package/dist/core/model-resolver.d.ts +2 -1
- package/dist/core/model-resolver.d.ts.map +1 -1
- package/dist/core/model-resolver.js +48 -21
- package/dist/core/model-resolver.js.map +1 -1
- package/dist/core/output-guard.d.ts +1 -0
- package/dist/core/output-guard.d.ts.map +1 -1
- package/dist/core/output-guard.js +52 -22
- package/dist/core/output-guard.js.map +1 -1
- package/dist/core/package-manager.d.ts +17 -2
- package/dist/core/package-manager.d.ts.map +1 -1
- package/dist/core/package-manager.js +363 -121
- package/dist/core/package-manager.js.map +1 -1
- package/dist/core/project-trust.d.ts +15 -0
- package/dist/core/project-trust.d.ts.map +1 -0
- package/dist/core/project-trust.js +58 -0
- package/dist/core/project-trust.js.map +1 -0
- package/dist/core/prompt-templates.d.ts +13 -11
- package/dist/core/prompt-templates.d.ts.map +1 -1
- package/dist/core/prompt-templates.js +67 -76
- package/dist/core/prompt-templates.js.map +1 -1
- package/dist/core/provider-attribution.d.ts +4 -0
- package/dist/core/provider-attribution.d.ts.map +1 -0
- package/dist/core/provider-attribution.js +72 -0
- package/dist/core/provider-attribution.js.map +1 -0
- package/dist/core/provider-display-names.d.ts +2 -0
- package/dist/core/provider-display-names.d.ts.map +1 -0
- package/dist/core/provider-display-names.js +36 -0
- package/dist/core/provider-display-names.js.map +1 -0
- package/dist/core/resolve-config-value.d.ts +9 -1
- package/dist/core/resolve-config-value.d.ts.map +1 -1
- package/dist/core/resolve-config-value.js +134 -11
- package/dist/core/resolve-config-value.js.map +1 -1
- package/dist/core/resource-loader.d.ts +34 -14
- package/dist/core/resource-loader.d.ts.map +1 -1
- package/dist/core/resource-loader.js +165 -76
- package/dist/core/resource-loader.js.map +1 -1
- package/dist/core/sdk.d.ts +26 -10
- package/dist/core/sdk.d.ts.map +1 -1
- package/dist/core/sdk.js +45 -16
- package/dist/core/sdk.js.map +1 -1
- package/dist/core/session-manager.d.ts +11 -12
- package/dist/core/session-manager.d.ts.map +1 -1
- package/dist/core/session-manager.js +245 -132
- package/dist/core/session-manager.js.map +1 -1
- package/dist/core/settings-manager.d.ts +52 -5
- package/dist/core/settings-manager.d.ts.map +1 -1
- package/dist/core/settings-manager.js +202 -38
- package/dist/core/settings-manager.js.map +1 -1
- package/dist/core/skills.d.ts +10 -10
- package/dist/core/skills.d.ts.map +1 -1
- package/dist/core/skills.js +13 -35
- package/dist/core/skills.js.map +1 -1
- package/dist/core/slash-commands.d.ts +1 -1
- package/dist/core/slash-commands.d.ts.map +1 -1
- package/dist/core/slash-commands.js +7 -4
- package/dist/core/slash-commands.js.map +1 -1
- package/dist/core/source-info.d.ts +1 -1
- package/dist/core/source-info.d.ts.map +1 -1
- package/dist/core/source-info.js.map +1 -1
- package/dist/core/system-prompt.d.ts +4 -4
- package/dist/core/system-prompt.d.ts.map +1 -1
- package/dist/core/system-prompt.js +14 -10
- package/dist/core/system-prompt.js.map +1 -1
- package/dist/core/telemetry.d.ts +3 -0
- package/dist/core/telemetry.d.ts.map +1 -0
- package/dist/core/telemetry.js +9 -0
- package/dist/core/telemetry.js.map +1 -0
- package/dist/core/tools/bash.d.ts +11 -16
- package/dist/core/tools/bash.d.ts.map +1 -1
- package/dist/core/tools/bash.js +162 -177
- package/dist/core/tools/bash.js.map +1 -1
- package/dist/core/tools/edit-diff.d.ts +3 -1
- package/dist/core/tools/edit-diff.d.ts.map +1 -1
- package/dist/core/tools/edit-diff.js +11 -3
- package/dist/core/tools/edit-diff.js.map +1 -1
- package/dist/core/tools/edit.d.ts +22 -24
- package/dist/core/tools/edit.d.ts.map +1 -1
- package/dist/core/tools/edit.js +199 -111
- package/dist/core/tools/edit.js.map +1 -1
- package/dist/core/tools/file-mutation-queue.d.ts.map +1 -1
- package/dist/core/tools/file-mutation-queue.js +27 -12
- package/dist/core/tools/file-mutation-queue.js.map +1 -1
- package/dist/core/tools/find.d.ts +7 -18
- package/dist/core/tools/find.d.ts.map +1 -1
- package/dist/core/tools/find.js +134 -95
- package/dist/core/tools/find.js.map +1 -1
- package/dist/core/tools/grep.d.ts +11 -30
- package/dist/core/tools/grep.d.ts.map +1 -1
- package/dist/core/tools/grep.js +23 -12
- package/dist/core/tools/grep.js.map +1 -1
- package/dist/core/tools/index.d.ts +26 -101
- package/dist/core/tools/index.d.ts.map +1 -1
- package/dist/core/tools/index.js +78 -52
- package/dist/core/tools/index.js.map +1 -1
- package/dist/core/tools/ls.d.ts +6 -15
- package/dist/core/tools/ls.d.ts.map +1 -1
- package/dist/core/tools/ls.js +12 -17
- package/dist/core/tools/ls.js.map +1 -1
- package/dist/core/tools/output-accumulator.d.ts +52 -0
- package/dist/core/tools/output-accumulator.d.ts.map +1 -0
- package/dist/core/tools/output-accumulator.js +184 -0
- package/dist/core/tools/output-accumulator.js.map +1 -0
- package/dist/core/tools/path-utils.d.ts +2 -0
- package/dist/core/tools/path-utils.d.ts.map +1 -1
- package/dist/core/tools/path-utils.js +40 -22
- package/dist/core/tools/path-utils.js.map +1 -1
- package/dist/core/tools/read.d.ts +7 -18
- package/dist/core/tools/read.d.ts.map +1 -1
- package/dist/core/tools/read.js +100 -36
- package/dist/core/tools/read.js.map +1 -1
- package/dist/core/tools/render-utils.d.ts +5 -2
- package/dist/core/tools/render-utils.d.ts.map +1 -1
- package/dist/core/tools/render-utils.js +18 -2
- package/dist/core/tools/render-utils.js.map +1 -1
- package/dist/core/tools/tool-definition-wrapper.d.ts.map +1 -1
- package/dist/core/tools/tool-definition-wrapper.js +2 -0
- package/dist/core/tools/tool-definition-wrapper.js.map +1 -1
- package/dist/core/tools/truncate.d.ts.map +1 -1
- package/dist/core/tools/truncate.js +12 -2
- package/dist/core/tools/truncate.js.map +1 -1
- package/dist/core/tools/write.d.ts +5 -14
- package/dist/core/tools/write.d.ts.map +1 -1
- package/dist/core/tools/write.js +27 -46
- package/dist/core/tools/write.js.map +1 -1
- package/dist/core/trust-manager.d.ts +31 -0
- package/dist/core/trust-manager.d.ts.map +1 -0
- package/dist/core/trust-manager.js +187 -0
- package/dist/core/trust-manager.js.map +1 -0
- package/dist/index.d.ts +31 -29
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -8
- package/dist/index.js.map +1 -1
- package/dist/main.d.ts +5 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +170 -87
- package/dist/main.js.map +1 -1
- package/dist/migrations.d.ts +2 -2
- package/dist/migrations.d.ts.map +1 -1
- package/dist/migrations.js +127 -5
- package/dist/migrations.js.map +1 -1
- package/dist/modes/index.d.ts +5 -5
- package/dist/modes/index.d.ts.map +1 -1
- package/dist/modes/index.js.map +1 -1
- package/dist/modes/interactive/components/assistant-message.d.ts +2 -0
- package/dist/modes/interactive/components/assistant-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/assistant-message.js +14 -0
- package/dist/modes/interactive/components/assistant-message.js.map +1 -1
- package/dist/modes/interactive/components/bash-execution.d.ts +1 -1
- package/dist/modes/interactive/components/bash-execution.d.ts.map +1 -1
- package/dist/modes/interactive/components/bash-execution.js +3 -3
- package/dist/modes/interactive/components/bash-execution.js.map +1 -1
- package/dist/modes/interactive/components/bordered-loader.d.ts.map +1 -1
- package/dist/modes/interactive/components/bordered-loader.js +3 -0
- package/dist/modes/interactive/components/bordered-loader.js.map +1 -1
- package/dist/modes/interactive/components/config-selector.d.ts +4 -4
- package/dist/modes/interactive/components/config-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/config-selector.js +38 -11
- package/dist/modes/interactive/components/config-selector.js.map +1 -1
- package/dist/modes/interactive/components/countdown-timer.d.ts +2 -2
- package/dist/modes/interactive/components/countdown-timer.d.ts.map +1 -1
- package/dist/modes/interactive/components/countdown-timer.js +2 -2
- package/dist/modes/interactive/components/countdown-timer.js.map +1 -1
- package/dist/modes/interactive/components/custom-editor.d.ts +1 -1
- package/dist/modes/interactive/components/custom-editor.d.ts.map +1 -1
- package/dist/modes/interactive/components/custom-editor.js.map +1 -1
- package/dist/modes/interactive/components/custom-message.d.ts +2 -2
- package/dist/modes/interactive/components/custom-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/custom-message.js.map +1 -1
- package/dist/modes/interactive/components/diff.d.ts.map +1 -1
- package/dist/modes/interactive/components/diff.js.map +1 -1
- package/dist/modes/interactive/components/earendil-announcement.d.ts.map +1 -1
- package/dist/modes/interactive/components/earendil-announcement.js.map +1 -1
- package/dist/modes/interactive/components/extension-editor.d.ts.map +1 -1
- package/dist/modes/interactive/components/extension-editor.js +14 -6
- package/dist/modes/interactive/components/extension-editor.js.map +1 -1
- package/dist/modes/interactive/components/extension-input.d.ts.map +1 -1
- package/dist/modes/interactive/components/extension-input.js.map +1 -1
- package/dist/modes/interactive/components/extension-selector.d.ts +2 -0
- package/dist/modes/interactive/components/extension-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/extension-selector.js +8 -3
- package/dist/modes/interactive/components/extension-selector.js.map +1 -1
- package/dist/modes/interactive/components/first-time-setup.d.ts +25 -0
- package/dist/modes/interactive/components/first-time-setup.d.ts.map +1 -0
- package/dist/modes/interactive/components/first-time-setup.js +103 -0
- package/dist/modes/interactive/components/first-time-setup.js.map +1 -0
- package/dist/modes/interactive/components/footer.d.ts +2 -1
- package/dist/modes/interactive/components/footer.d.ts.map +1 -1
- package/dist/modes/interactive/components/footer.js +23 -7
- package/dist/modes/interactive/components/footer.js.map +1 -1
- package/dist/modes/interactive/components/index.d.ts +33 -31
- package/dist/modes/interactive/components/index.d.ts.map +1 -1
- package/dist/modes/interactive/components/index.js +2 -0
- package/dist/modes/interactive/components/index.js.map +1 -1
- package/dist/modes/interactive/components/keybinding-hints.d.ts +5 -0
- package/dist/modes/interactive/components/keybinding-hints.d.ts.map +1 -1
- package/dist/modes/interactive/components/keybinding-hints.js +19 -5
- package/dist/modes/interactive/components/keybinding-hints.js.map +1 -1
- package/dist/modes/interactive/components/login-dialog.d.ts +12 -2
- package/dist/modes/interactive/components/login-dialog.d.ts.map +1 -1
- package/dist/modes/interactive/components/login-dialog.js +46 -11
- package/dist/modes/interactive/components/login-dialog.js.map +1 -1
- package/dist/modes/interactive/components/model-selector.d.ts +2 -2
- package/dist/modes/interactive/components/model-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/model-selector.js +8 -5
- package/dist/modes/interactive/components/model-selector.js.map +1 -1
- package/dist/modes/interactive/components/oauth-selector.d.ts +18 -6
- package/dist/modes/interactive/components/oauth-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/oauth-selector.js +93 -25
- package/dist/modes/interactive/components/oauth-selector.js.map +1 -1
- package/dist/modes/interactive/components/scoped-models-selector.d.ts +5 -12
- package/dist/modes/interactive/components/scoped-models-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/scoped-models-selector.js +45 -30
- package/dist/modes/interactive/components/scoped-models-selector.js.map +1 -1
- package/dist/modes/interactive/components/session-selector.d.ts +2 -1
- package/dist/modes/interactive/components/session-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/session-selector.js +20 -7
- package/dist/modes/interactive/components/session-selector.js.map +1 -1
- package/dist/modes/interactive/components/settings-selector.d.ts +13 -0
- package/dist/modes/interactive/components/settings-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/settings-selector.js +113 -4
- package/dist/modes/interactive/components/settings-selector.js.map +1 -1
- package/dist/modes/interactive/components/skill-invocation-message.d.ts +1 -1
- package/dist/modes/interactive/components/skill-invocation-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/skill-invocation-message.js.map +1 -1
- package/dist/modes/interactive/components/thinking-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/thinking-selector.js +1 -1
- package/dist/modes/interactive/components/thinking-selector.js.map +1 -1
- package/dist/modes/interactive/components/tool-execution.d.ts +6 -1
- package/dist/modes/interactive/components/tool-execution.d.ts.map +1 -1
- package/dist/modes/interactive/components/tool-execution.js +57 -14
- package/dist/modes/interactive/components/tool-execution.js.map +1 -1
- package/dist/modes/interactive/components/tree-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/tree-selector.js +18 -9
- package/dist/modes/interactive/components/tree-selector.js.map +1 -1
- package/dist/modes/interactive/components/trust-selector.d.ts +23 -0
- package/dist/modes/interactive/components/trust-selector.d.ts.map +1 -0
- package/dist/modes/interactive/components/trust-selector.js +91 -0
- package/dist/modes/interactive/components/trust-selector.js.map +1 -0
- package/dist/modes/interactive/components/user-message-selector.d.ts +2 -2
- package/dist/modes/interactive/components/user-message-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/user-message-selector.js +8 -7
- package/dist/modes/interactive/components/user-message-selector.js.map +1 -1
- package/dist/modes/interactive/components/user-message.d.ts +1 -0
- package/dist/modes/interactive/components/user-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/user-message.js +8 -7
- package/dist/modes/interactive/components/user-message.js.map +1 -1
- package/dist/modes/interactive/interactive-mode.d.ts +68 -13
- package/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-mode.js +1100 -319
- package/dist/modes/interactive/interactive-mode.js.map +1 -1
- package/dist/modes/interactive/theme/dark.json +5 -4
- package/dist/modes/interactive/theme/light.json +5 -4
- package/dist/modes/interactive/theme/theme.d.ts +22 -3
- package/dist/modes/interactive/theme/theme.d.ts.map +1 -1
- package/dist/modes/interactive/theme/theme.js +160 -105
- package/dist/modes/interactive/theme/theme.js.map +1 -1
- package/dist/modes/print-mode.d.ts.map +1 -1
- package/dist/modes/print-mode.js +40 -20
- package/dist/modes/print-mode.js.map +1 -1
- package/dist/modes/rpc/rpc-client.d.ts +11 -1
- package/dist/modes/rpc/rpc-client.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-client.js +73 -8
- package/dist/modes/rpc/rpc-client.js.map +1 -1
- package/dist/modes/rpc/rpc-mode.d.ts +2 -2
- package/dist/modes/rpc/rpc-mode.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-mode.js +96 -30
- package/dist/modes/rpc/rpc-mode.js.map +1 -1
- package/dist/modes/rpc/rpc-types.d.ts +16 -4
- package/dist/modes/rpc/rpc-types.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-types.js.map +1 -1
- package/dist/package-manager-cli.d.ts +6 -2
- package/dist/package-manager-cli.d.ts.map +1 -1
- package/dist/package-manager-cli.js +396 -21
- package/dist/package-manager-cli.js.map +1 -1
- package/dist/prompts/commands/atomic-commit.md +12 -0
- package/dist/prompts/commands/execute-phase.md +48 -17
- package/dist/prompts/commands/fix.md +86 -23
- package/dist/prompts/commands/map-codebase.md +17 -3
- package/dist/prompts/commands/orchestrate.md +31 -6
- package/dist/prompts/commands/plan-phase.md +39 -6
- package/dist/prompts/commands/quick.md +36 -6
- package/dist/prompts/commands/review.md +28 -11
- package/dist/prompts/commands/verify-work.md +34 -17
- package/dist/utils/ansi.d.ts +2 -0
- package/dist/utils/ansi.d.ts.map +1 -0
- package/dist/utils/ansi.js +52 -0
- package/dist/utils/ansi.js.map +1 -0
- package/dist/utils/changelog.d.ts +2 -1
- package/dist/utils/changelog.d.ts.map +1 -1
- package/dist/utils/changelog.js +78 -0
- package/dist/utils/changelog.js.map +1 -1
- package/dist/utils/child-process.d.ts +5 -1
- package/dist/utils/child-process.d.ts.map +1 -1
- package/dist/utils/child-process.js +10 -0
- package/dist/utils/child-process.js.map +1 -1
- package/dist/utils/clipboard-image.d.ts.map +1 -1
- package/dist/utils/clipboard-image.js +2 -2
- package/dist/utils/clipboard-image.js.map +1 -1
- package/dist/utils/clipboard-native.d.ts +3 -1
- package/dist/utils/clipboard-native.d.ts.map +1 -1
- package/dist/utils/clipboard-native.js +14 -8
- package/dist/utils/clipboard-native.js.map +1 -1
- package/dist/utils/clipboard.d.ts.map +1 -1
- package/dist/utils/clipboard.js +84 -45
- package/dist/utils/clipboard.js.map +1 -1
- package/dist/utils/deprecation.d.ts +4 -0
- package/dist/utils/deprecation.d.ts.map +1 -0
- package/dist/utils/deprecation.js +13 -0
- package/dist/utils/deprecation.js.map +1 -0
- package/dist/utils/exif-orientation.d.ts +1 -1
- package/dist/utils/exif-orientation.d.ts.map +1 -1
- package/dist/utils/exif-orientation.js.map +1 -1
- package/dist/utils/fs-watch.d.ts +5 -0
- package/dist/utils/fs-watch.d.ts.map +1 -0
- package/dist/utils/fs-watch.js +25 -0
- package/dist/utils/fs-watch.js.map +1 -0
- package/dist/utils/git.d.ts.map +1 -1
- package/dist/utils/git.js +54 -22
- package/dist/utils/git.js.map +1 -1
- package/dist/utils/html.d.ts +7 -0
- package/dist/utils/html.d.ts.map +1 -0
- package/dist/utils/html.js +40 -0
- package/dist/utils/html.js.map +1 -0
- package/dist/utils/image-convert.d.ts.map +1 -1
- package/dist/utils/image-convert.js.map +1 -1
- package/dist/utils/image-resize-core.d.ts +30 -0
- package/dist/utils/image-resize-core.d.ts.map +1 -0
- package/dist/utils/image-resize-core.js +124 -0
- package/dist/utils/image-resize-core.js.map +1 -0
- package/dist/utils/image-resize-worker.d.ts +2 -0
- package/dist/utils/image-resize-worker.d.ts.map +1 -0
- package/dist/utils/image-resize-worker.js +31 -0
- package/dist/utils/image-resize-worker.js.map +1 -0
- package/dist/utils/image-resize.d.ts +7 -27
- package/dist/utils/image-resize.d.ts.map +1 -1
- package/dist/utils/image-resize.js +75 -115
- package/dist/utils/image-resize.js.map +1 -1
- package/dist/utils/json.d.ts +3 -0
- package/dist/utils/json.d.ts.map +1 -0
- package/dist/utils/json.js +7 -0
- package/dist/utils/json.js.map +1 -0
- package/dist/utils/mime.d.ts +1 -0
- package/dist/utils/mime.d.ts.map +1 -1
- package/dist/utils/mime.js +59 -16
- package/dist/utils/mime.js.map +1 -1
- package/dist/utils/open-browser.d.ts +9 -0
- package/dist/utils/open-browser.d.ts.map +1 -0
- package/dist/utils/open-browser.js +22 -0
- package/dist/utils/open-browser.js.map +1 -0
- package/dist/utils/paths.d.ts +25 -1
- package/dist/utils/paths.d.ts.map +1 -1
- package/dist/utils/paths.js +75 -2
- package/dist/utils/paths.js.map +1 -1
- package/dist/utils/pi-user-agent.d.ts +2 -0
- package/dist/utils/pi-user-agent.d.ts.map +1 -0
- package/dist/utils/pi-user-agent.js +5 -0
- package/dist/utils/pi-user-agent.js.map +1 -0
- package/dist/utils/shell.d.ts +10 -6
- package/dist/utils/shell.d.ts.map +1 -1
- package/dist/utils/shell.js +35 -26
- package/dist/utils/shell.js.map +1 -1
- package/dist/utils/syntax-highlight.d.ts +12 -0
- package/dist/utils/syntax-highlight.d.ts.map +1 -0
- package/dist/utils/syntax-highlight.js +118 -0
- package/dist/utils/syntax-highlight.js.map +1 -0
- package/dist/utils/tools-manager.d.ts.map +1 -1
- package/dist/utils/tools-manager.js +86 -10
- package/dist/utils/tools-manager.js.map +1 -1
- package/dist/utils/version-check.d.ts +15 -0
- package/dist/utils/version-check.d.ts.map +1 -0
- package/dist/utils/version-check.js +82 -0
- package/dist/utils/version-check.js.map +1 -0
- package/dist/utils/windows-self-update.d.ts +3 -0
- package/dist/utils/windows-self-update.d.ts.map +1 -0
- package/dist/utils/windows-self-update.js +77 -0
- package/dist/utils/windows-self-update.js.map +1 -0
- package/docs/compaction.md +12 -12
- package/docs/containerization.md +111 -0
- package/docs/custom-provider.md +187 -47
- package/docs/development.md +5 -5
- package/docs/docs.json +156 -0
- package/docs/extensions.md +465 -71
- package/docs/index.md +82 -0
- package/docs/json.md +4 -4
- package/docs/keybindings.md +23 -1
- package/docs/models.md +119 -17
- package/docs/packages.md +17 -9
- package/docs/prompt-templates.md +30 -2
- package/docs/providers.md +83 -22
- package/docs/quickstart.md +165 -0
- package/docs/rpc.md +41 -10
- package/docs/sdk.md +68 -50
- package/docs/security.md +55 -0
- package/docs/{session.md → session-format.md} +11 -11
- package/docs/sessions.md +145 -0
- package/docs/settings.md +61 -11
- package/docs/skills.md +16 -17
- package/docs/terminal-setup.md +44 -2
- package/docs/termux.md +4 -4
- package/docs/themes.md +3 -3
- package/docs/tmux.md +4 -2
- package/docs/tui.md +44 -4
- package/docs/usage.md +305 -0
- package/examples/extensions/border-status-editor.ts +145 -0
- package/examples/extensions/built-in-tool-renderer.ts +3 -0
- package/examples/extensions/custom-header.ts +1 -1
- package/examples/extensions/custom-provider-anthropic/index.ts +1 -1
- package/examples/extensions/custom-provider-anthropic/package-lock.json +2 -2
- package/examples/extensions/custom-provider-anthropic/package.json +2 -2
- package/examples/extensions/custom-provider-gitlab-duo/index.ts +55 -4
- package/examples/extensions/custom-provider-gitlab-duo/package.json +1 -1
- package/examples/extensions/custom-provider-gitlab-duo/test.ts +1 -1
- package/examples/extensions/doom-overlay/doom-component.ts +2 -2
- package/examples/extensions/doom-overlay/index.ts +1 -1
- package/examples/extensions/dynamic-resources/dynamic.json +1 -1
- package/examples/extensions/dynamic-tools.ts +2 -2
- package/examples/extensions/git-merge-and-resolve.ts +115 -0
- package/examples/extensions/github-issue-autocomplete.ts +185 -0
- package/examples/extensions/gondolin/index.ts +531 -0
- package/examples/extensions/gondolin/package-lock.json +185 -0
- package/examples/extensions/gondolin/package.json +19 -0
- package/examples/extensions/handoff.ts +50 -12
- package/examples/extensions/input-transform-streaming.ts +39 -0
- package/examples/extensions/interactive-shell.ts +1 -1
- package/examples/extensions/notify.ts +2 -9
- package/examples/extensions/overlay-qa-tests.ts +240 -138
- package/examples/extensions/overlay-test.ts +7 -4
- package/examples/extensions/plan-mode/utils.ts +1 -1
- package/examples/extensions/preset.ts +36 -3
- package/examples/extensions/project-trust.ts +64 -0
- package/examples/extensions/prompt-customizer.ts +97 -0
- package/examples/extensions/provider-payload.ts +4 -0
- package/examples/extensions/qna.ts +1 -1
- package/examples/extensions/question.ts +2 -2
- package/examples/extensions/questionnaire.ts +2 -2
- package/examples/extensions/reload-runtime.ts +1 -1
- package/examples/extensions/sandbox/index.ts +4 -4
- package/examples/extensions/sandbox/package-lock.json +5 -5
- package/examples/extensions/sandbox/package.json +2 -2
- package/examples/extensions/shutdown-command.ts +1 -1
- package/examples/extensions/snake.ts +1 -1
- package/examples/extensions/space-invaders.ts +1 -1
- package/examples/extensions/structured-output.ts +65 -0
- package/examples/extensions/subagent/index.ts +51 -28
- package/examples/extensions/summarize.ts +1 -1
- package/examples/extensions/tic-tac-toe.ts +1008 -0
- package/examples/extensions/titlebar-spinner.ts +2 -2
- package/examples/extensions/todo.ts +2 -2
- package/examples/extensions/tool-override.ts +1 -1
- package/examples/extensions/tools.ts +5 -0
- package/examples/extensions/truncated-tool.ts +1 -1
- package/examples/extensions/with-deps/index.ts +1 -1
- package/examples/extensions/with-deps/package-lock.json +2 -2
- package/examples/extensions/with-deps/package.json +3 -3
- package/examples/extensions/working-indicator.ts +123 -0
- package/examples/extensions/working-message-test.ts +25 -0
- package/examples/sdk/01-minimal.ts +14 -10
- package/examples/sdk/02-custom-model.ts +12 -8
- package/examples/sdk/03-custom-prompt.ts +32 -17
- package/examples/sdk/04-skills.ts +5 -2
- package/examples/sdk/05-tools.ts +23 -31
- package/examples/sdk/06-extensions.ts +14 -8
- package/examples/sdk/07-context-files.ts +5 -3
- package/examples/sdk/08-prompt-templates.ts +5 -2
- package/examples/sdk/09-api-keys-and-oauth.ts +8 -4
- package/examples/sdk/10-settings.ts +8 -6
- package/examples/sdk/11-sessions.ts +4 -0
- package/examples/sdk/12-full-control.ts +13 -17
- package/package.json +15 -7
- package/prompts/commands/atomic-commit.md +12 -0
- package/prompts/commands/execute-phase.md +48 -17
- package/prompts/commands/fix.md +86 -23
- package/prompts/commands/map-codebase.md +17 -3
- package/prompts/commands/orchestrate.md +31 -6
- package/prompts/commands/plan-phase.md +39 -6
- package/prompts/commands/quick.md +36 -6
- package/prompts/commands/review.md +28 -11
- package/prompts/commands/verify-work.md +34 -17
|
@@ -1,18 +1,39 @@
|
|
|
1
|
-
import { spawn, spawnSync } from "node:child_process";
|
|
2
1
|
import { createHash } from "node:crypto";
|
|
3
|
-
import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
|
|
4
|
-
import { homedir
|
|
2
|
+
import { chmodSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { homedir } from "node:os";
|
|
4
|
+
function getEnv() {
|
|
5
|
+
if (process.platform !== "linux" || Object.keys(process.env).length > 0) {
|
|
6
|
+
return process.env;
|
|
7
|
+
}
|
|
8
|
+
try {
|
|
9
|
+
const data = readFileSync("/proc/self/environ", "utf-8");
|
|
10
|
+
const env = {};
|
|
11
|
+
for (const entry of data.split("\0")) {
|
|
12
|
+
const idx = entry.indexOf("=");
|
|
13
|
+
if (idx > 0) {
|
|
14
|
+
env[entry.slice(0, idx)] = entry.slice(idx + 1);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
return env;
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
return process.env;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
5
23
|
import { basename, dirname, join, relative, resolve, sep } from "node:path";
|
|
24
|
+
import { globSync } from "glob";
|
|
6
25
|
import ignore from "ignore";
|
|
7
26
|
import { minimatch } from "minimatch";
|
|
8
27
|
import { CONFIG_DIR_NAME } from "../config.js";
|
|
28
|
+
import { spawnProcess, spawnProcessSync } from "../utils/child-process.js";
|
|
9
29
|
import { parseGitUrl } from "../utils/git.js";
|
|
10
|
-
import { isLocalPath } from "../utils/paths.js";
|
|
30
|
+
import { canonicalizePath, isLocalPath, markPathIgnoredByCloudSync, resolvePath } from "../utils/paths.js";
|
|
11
31
|
import { isStdoutTakenOver } from "./output-guard.js";
|
|
12
32
|
const NETWORK_TIMEOUT_MS = 10000;
|
|
13
33
|
const UPDATE_CHECK_CONCURRENCY = 4;
|
|
34
|
+
const GIT_UPDATE_CONCURRENCY = 4;
|
|
14
35
|
function isOfflineModeEnabled() {
|
|
15
|
-
const value = process.env.
|
|
36
|
+
const value = process.env.DRAHT_OFFLINE;
|
|
16
37
|
if (!value)
|
|
17
38
|
return false;
|
|
18
39
|
return value === "1" || value.toLowerCase() === "true" || value.toLowerCase() === "yes";
|
|
@@ -49,6 +70,12 @@ function toPosixPath(p) {
|
|
|
49
70
|
function getHomeDir() {
|
|
50
71
|
return process.env.HOME || homedir();
|
|
51
72
|
}
|
|
73
|
+
export function getExtensionTempFolder(agentDir) {
|
|
74
|
+
const tempFolder = join(agentDir, "tmp", "extensions");
|
|
75
|
+
mkdirSync(tempFolder, { recursive: true, mode: 0o700 });
|
|
76
|
+
chmodSync(tempFolder, 0o700);
|
|
77
|
+
return tempFolder;
|
|
78
|
+
}
|
|
52
79
|
function prefixIgnorePattern(line, prefix) {
|
|
53
80
|
const trimmed = line.trim();
|
|
54
81
|
if (!trimmed)
|
|
@@ -93,6 +120,12 @@ function addIgnoreRules(ig, dir, rootDir) {
|
|
|
93
120
|
function isPattern(s) {
|
|
94
121
|
return s.startsWith("!") || s.startsWith("+") || s.startsWith("-") || s.includes("*") || s.includes("?");
|
|
95
122
|
}
|
|
123
|
+
function isOverridePattern(s) {
|
|
124
|
+
return s.startsWith("!") || s.startsWith("+") || s.startsWith("-");
|
|
125
|
+
}
|
|
126
|
+
function hasGlobPattern(s) {
|
|
127
|
+
return s.includes("*") || s.includes("?");
|
|
128
|
+
}
|
|
96
129
|
function splitPatterns(entries) {
|
|
97
130
|
const plain = [];
|
|
98
131
|
const patterns = [];
|
|
@@ -198,7 +231,7 @@ function collectSkillEntries(dir, mode, ignoreMatcher, rootDir) {
|
|
|
198
231
|
}
|
|
199
232
|
}
|
|
200
233
|
const relPath = toPosixPath(relative(root, fullPath));
|
|
201
|
-
if (mode === "
|
|
234
|
+
if (mode === "pi" && dir === root && isFile && entry.name.endsWith(".md") && !ig.ignores(relPath)) {
|
|
202
235
|
entries.push(fullPath);
|
|
203
236
|
continue;
|
|
204
237
|
}
|
|
@@ -415,7 +448,7 @@ function collectAutoExtensionEntries(dir) {
|
|
|
415
448
|
*/
|
|
416
449
|
function collectResourceFiles(dir, resourceType) {
|
|
417
450
|
if (resourceType === "skills") {
|
|
418
|
-
return collectSkillEntries(dir, "
|
|
451
|
+
return collectSkillEntries(dir, "pi");
|
|
419
452
|
}
|
|
420
453
|
if (resourceType === "extensions") {
|
|
421
454
|
return collectAutoExtensionEntries(dir);
|
|
@@ -550,8 +583,8 @@ export class DefaultPackageManager {
|
|
|
550
583
|
globalNpmRootCommandKey;
|
|
551
584
|
progressCallback;
|
|
552
585
|
constructor(options) {
|
|
553
|
-
this.cwd = options.cwd;
|
|
554
|
-
this.agentDir = options.agentDir;
|
|
586
|
+
this.cwd = resolvePath(options.cwd);
|
|
587
|
+
this.agentDir = resolvePath(options.agentDir);
|
|
555
588
|
this.settingsManager = options.settingsManager;
|
|
556
589
|
}
|
|
557
590
|
setProgressCallback(callback) {
|
|
@@ -562,9 +595,22 @@ export class DefaultPackageManager {
|
|
|
562
595
|
const currentSettings = scope === "project" ? this.settingsManager.getProjectSettings() : this.settingsManager.getGlobalSettings();
|
|
563
596
|
const currentPackages = currentSettings.packages ?? [];
|
|
564
597
|
const normalizedSource = this.normalizePackageSourceForSettings(source, scope);
|
|
565
|
-
const
|
|
566
|
-
if (
|
|
567
|
-
|
|
598
|
+
const matchIndex = currentPackages.findIndex((existing) => this.packageSourcesMatch(existing, source, scope));
|
|
599
|
+
if (matchIndex !== -1) {
|
|
600
|
+
const existing = currentPackages[matchIndex];
|
|
601
|
+
if (this.getPackageSourceString(existing) === normalizedSource) {
|
|
602
|
+
return false;
|
|
603
|
+
}
|
|
604
|
+
const nextPackages = [...currentPackages];
|
|
605
|
+
nextPackages[matchIndex] =
|
|
606
|
+
typeof existing === "string" ? normalizedSource : { ...existing, source: normalizedSource };
|
|
607
|
+
if (scope === "project") {
|
|
608
|
+
this.settingsManager.setProjectPackages(nextPackages);
|
|
609
|
+
}
|
|
610
|
+
else {
|
|
611
|
+
this.settingsManager.setPackages(nextPackages);
|
|
612
|
+
}
|
|
613
|
+
return true;
|
|
568
614
|
}
|
|
569
615
|
const nextPackages = [...currentPackages, normalizedSource];
|
|
570
616
|
if (scope === "project") {
|
|
@@ -693,6 +739,7 @@ export class DefaultPackageManager {
|
|
|
693
739
|
async install(source, options) {
|
|
694
740
|
const parsed = this.parseSource(source);
|
|
695
741
|
const scope = options?.local ? "project" : "user";
|
|
742
|
+
this.assertProjectTrustedForScope(scope);
|
|
696
743
|
await this.withProgress("install", source, `Installing ${source}...`, async () => {
|
|
697
744
|
if (parsed.type === "npm") {
|
|
698
745
|
await this.installNpm(parsed, scope, false);
|
|
@@ -719,6 +766,7 @@ export class DefaultPackageManager {
|
|
|
719
766
|
async remove(source, options) {
|
|
720
767
|
const parsed = this.parseSource(source);
|
|
721
768
|
const scope = options?.local ? "project" : "user";
|
|
769
|
+
this.assertProjectTrustedForScope(scope);
|
|
722
770
|
await this.withProgress("remove", source, `Removing ${source}...`, async () => {
|
|
723
771
|
if (parsed.type === "npm") {
|
|
724
772
|
await this.uninstallNpm(parsed, scope);
|
|
@@ -743,19 +791,20 @@ export class DefaultPackageManager {
|
|
|
743
791
|
const projectSettings = this.settingsManager.getProjectSettings();
|
|
744
792
|
const identity = source ? this.getPackageIdentity(source) : undefined;
|
|
745
793
|
let matched = false;
|
|
794
|
+
const updateSources = [];
|
|
746
795
|
for (const pkg of globalSettings.packages ?? []) {
|
|
747
796
|
const sourceStr = typeof pkg === "string" ? pkg : pkg.source;
|
|
748
797
|
if (identity && this.getPackageIdentity(sourceStr, "user") !== identity)
|
|
749
798
|
continue;
|
|
750
799
|
matched = true;
|
|
751
|
-
|
|
800
|
+
updateSources.push({ source: sourceStr, scope: "user" });
|
|
752
801
|
}
|
|
753
802
|
for (const pkg of projectSettings.packages ?? []) {
|
|
754
803
|
const sourceStr = typeof pkg === "string" ? pkg : pkg.source;
|
|
755
804
|
if (identity && this.getPackageIdentity(sourceStr, "project") !== identity)
|
|
756
805
|
continue;
|
|
757
806
|
matched = true;
|
|
758
|
-
|
|
807
|
+
updateSources.push({ source: sourceStr, scope: "project" });
|
|
759
808
|
}
|
|
760
809
|
if (source && !matched) {
|
|
761
810
|
throw new Error(this.buildNoMatchingPackageMessage(source, [
|
|
@@ -763,31 +812,90 @@ export class DefaultPackageManager {
|
|
|
763
812
|
...(projectSettings.packages ?? []),
|
|
764
813
|
]));
|
|
765
814
|
}
|
|
815
|
+
await this.updateConfiguredSources(updateSources);
|
|
766
816
|
}
|
|
767
|
-
async
|
|
768
|
-
if (isOfflineModeEnabled()) {
|
|
817
|
+
async updateConfiguredSources(sources) {
|
|
818
|
+
if (isOfflineModeEnabled() || sources.length === 0) {
|
|
769
819
|
return;
|
|
770
820
|
}
|
|
771
|
-
const
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
776
|
-
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
|
|
821
|
+
const npmCandidates = [];
|
|
822
|
+
const gitCandidates = [];
|
|
823
|
+
for (const entry of sources) {
|
|
824
|
+
const parsed = this.parseSource(entry.source);
|
|
825
|
+
// Pinned npm versions are fixed. Pinned git refs are configured checkout targets,
|
|
826
|
+
// so include them to reconcile an existing clone when the configured ref changes.
|
|
827
|
+
if (parsed.type === "npm") {
|
|
828
|
+
if (!parsed.pinned) {
|
|
829
|
+
npmCandidates.push({ ...entry, parsed });
|
|
830
|
+
}
|
|
831
|
+
}
|
|
832
|
+
else if (parsed.type === "git") {
|
|
833
|
+
gitCandidates.push({ ...entry, parsed });
|
|
834
|
+
}
|
|
782
835
|
}
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
|
|
836
|
+
const npmCheckTasks = npmCandidates.map((entry) => async () => ({
|
|
837
|
+
entry,
|
|
838
|
+
shouldUpdate: await this.shouldUpdateNpmSource(entry.parsed, entry.scope),
|
|
839
|
+
}));
|
|
840
|
+
const npmCheckResults = await this.runWithConcurrency(npmCheckTasks, UPDATE_CHECK_CONCURRENCY);
|
|
841
|
+
const userNpmUpdates = [];
|
|
842
|
+
const projectNpmUpdates = [];
|
|
843
|
+
for (const result of npmCheckResults) {
|
|
844
|
+
if (!result.shouldUpdate) {
|
|
845
|
+
continue;
|
|
846
|
+
}
|
|
847
|
+
if (result.entry.scope === "user") {
|
|
848
|
+
userNpmUpdates.push(result.entry);
|
|
849
|
+
}
|
|
850
|
+
else {
|
|
851
|
+
projectNpmUpdates.push(result.entry);
|
|
852
|
+
}
|
|
853
|
+
}
|
|
854
|
+
const tasks = [];
|
|
855
|
+
if (userNpmUpdates.length > 0) {
|
|
856
|
+
tasks.push(this.updateNpmBatch(userNpmUpdates, "user"));
|
|
857
|
+
}
|
|
858
|
+
if (projectNpmUpdates.length > 0) {
|
|
859
|
+
tasks.push(this.updateNpmBatch(projectNpmUpdates, "project"));
|
|
860
|
+
}
|
|
861
|
+
if (gitCandidates.length > 0) {
|
|
862
|
+
const gitTasks = gitCandidates.map((entry) => async () => this.withProgress("update", entry.source, `Updating ${entry.source}...`, async () => {
|
|
863
|
+
await this.updateGit(entry.parsed, entry.scope);
|
|
864
|
+
}));
|
|
865
|
+
tasks.push(this.runWithConcurrency(gitTasks, GIT_UPDATE_CONCURRENCY).then(() => { }));
|
|
866
|
+
}
|
|
867
|
+
await Promise.all(tasks);
|
|
868
|
+
}
|
|
869
|
+
async shouldUpdateNpmSource(source, scope) {
|
|
870
|
+
const installedPath = this.getManagedNpmInstallPath(source, scope);
|
|
871
|
+
const installedVersion = existsSync(installedPath) ? this.getInstalledNpmVersion(installedPath) : undefined;
|
|
872
|
+
if (!installedVersion) {
|
|
873
|
+
return true;
|
|
874
|
+
}
|
|
875
|
+
try {
|
|
876
|
+
const latestVersion = await this.getLatestNpmVersion(source.name);
|
|
877
|
+
return latestVersion !== installedVersion;
|
|
878
|
+
}
|
|
879
|
+
catch {
|
|
880
|
+
// Preserve existing update behavior when version lookup fails.
|
|
881
|
+
return true;
|
|
882
|
+
}
|
|
883
|
+
}
|
|
884
|
+
async updateNpmBatch(sources, scope) {
|
|
885
|
+
if (sources.length === 0) {
|
|
789
886
|
return;
|
|
790
887
|
}
|
|
888
|
+
const sourceLabel = sources.length === 1 ? sources[0].source : `${scope} npm packages`;
|
|
889
|
+
const message = sources.length === 1 ? `Updating ${sources[0].source}...` : `Updating ${scope} npm packages...`;
|
|
890
|
+
const specs = sources.map((entry) => `${entry.parsed.name}@latest`);
|
|
891
|
+
await this.withProgress("update", sourceLabel, message, async () => {
|
|
892
|
+
await this.installNpmBatch(specs, scope);
|
|
893
|
+
});
|
|
894
|
+
}
|
|
895
|
+
async installNpmBatch(specs, scope) {
|
|
896
|
+
const installRoot = this.getNpmInstallRoot(scope, false);
|
|
897
|
+
this.ensureNpmProject(installRoot);
|
|
898
|
+
await this.runNpmCommand(this.getNpmInstallArgs(specs, installRoot));
|
|
791
899
|
}
|
|
792
900
|
async checkForAvailableUpdates() {
|
|
793
901
|
if (isOfflineModeEnabled()) {
|
|
@@ -873,13 +981,14 @@ export class DefaultPackageManager {
|
|
|
873
981
|
return true;
|
|
874
982
|
};
|
|
875
983
|
if (parsed.type === "npm") {
|
|
876
|
-
|
|
984
|
+
let installedPath = this.getNpmInstallPath(parsed, scope);
|
|
877
985
|
const needsInstall = !existsSync(installedPath) ||
|
|
878
986
|
(parsed.pinned && !(await this.installedNpmMatchesPinnedVersion(parsed, installedPath)));
|
|
879
987
|
if (needsInstall) {
|
|
880
988
|
const installed = await installMissing();
|
|
881
989
|
if (!installed)
|
|
882
990
|
continue;
|
|
991
|
+
installedPath = this.getNpmInstallPath(parsed, scope);
|
|
883
992
|
}
|
|
884
993
|
metadata.baseDir = installedPath;
|
|
885
994
|
this.collectPackageResources(installedPath, accumulator, filter, metadata);
|
|
@@ -1064,13 +1173,12 @@ export class DefaultPackageManager {
|
|
|
1064
1173
|
}
|
|
1065
1174
|
}
|
|
1066
1175
|
async getLatestNpmVersion(packageName) {
|
|
1067
|
-
const
|
|
1068
|
-
|
|
1069
|
-
|
|
1070
|
-
if (!
|
|
1071
|
-
throw new Error(
|
|
1072
|
-
|
|
1073
|
-
return data.version;
|
|
1176
|
+
const npmCommand = this.getNpmCommand();
|
|
1177
|
+
const stdout = await this.runCommandCapture(npmCommand.command, [...npmCommand.args, "view", packageName, "version", "--json"], { cwd: this.cwd, timeoutMs: NETWORK_TIMEOUT_MS });
|
|
1178
|
+
const raw = stdout.trim();
|
|
1179
|
+
if (!raw)
|
|
1180
|
+
throw new Error("Empty response from npm view");
|
|
1181
|
+
return JSON.parse(raw);
|
|
1074
1182
|
}
|
|
1075
1183
|
async gitHasAvailableUpdate(installedPath) {
|
|
1076
1184
|
if (isOfflineModeEnabled()) {
|
|
@@ -1263,6 +1371,11 @@ export class DefaultPackageManager {
|
|
|
1263
1371
|
const version = match[2];
|
|
1264
1372
|
return { name, version };
|
|
1265
1373
|
}
|
|
1374
|
+
assertProjectTrustedForScope(scope) {
|
|
1375
|
+
if (scope === "project" && !this.settingsManager.isProjectTrusted()) {
|
|
1376
|
+
throw new Error("Project is not trusted; refusing to access project package storage");
|
|
1377
|
+
}
|
|
1378
|
+
}
|
|
1266
1379
|
getNpmCommand() {
|
|
1267
1380
|
const configuredCommand = this.settingsManager.getNpmCommand();
|
|
1268
1381
|
if (!configuredCommand || configuredCommand.length === 0) {
|
|
@@ -1274,37 +1387,75 @@ export class DefaultPackageManager {
|
|
|
1274
1387
|
}
|
|
1275
1388
|
return { command, args };
|
|
1276
1389
|
}
|
|
1390
|
+
getPackageManagerName() {
|
|
1391
|
+
const npmCommand = this.getNpmCommand();
|
|
1392
|
+
const commandParts = [npmCommand.command, ...npmCommand.args];
|
|
1393
|
+
const separatorIndex = commandParts.lastIndexOf("--");
|
|
1394
|
+
const packageManagerCommand = separatorIndex >= 0 ? commandParts[separatorIndex + 1] : npmCommand.command;
|
|
1395
|
+
return packageManagerCommand ? basename(packageManagerCommand).replace(/\.(cmd|exe)$/i, "") : "";
|
|
1396
|
+
}
|
|
1277
1397
|
async runNpmCommand(args, options) {
|
|
1278
1398
|
const npmCommand = this.getNpmCommand();
|
|
1279
1399
|
await this.runCommand(npmCommand.command, [...npmCommand.args, ...args], options);
|
|
1280
1400
|
}
|
|
1401
|
+
getGitDependencyInstallArgs() {
|
|
1402
|
+
const configuredCommand = this.settingsManager.getNpmCommand();
|
|
1403
|
+
if (configuredCommand && configuredCommand.length > 0) {
|
|
1404
|
+
return ["install"];
|
|
1405
|
+
}
|
|
1406
|
+
return ["install", "--omit=dev"];
|
|
1407
|
+
}
|
|
1281
1408
|
runNpmCommandSync(args) {
|
|
1282
1409
|
const npmCommand = this.getNpmCommand();
|
|
1283
1410
|
return this.runCommandSync(npmCommand.command, [...npmCommand.args, ...args]);
|
|
1284
1411
|
}
|
|
1412
|
+
getNpmInstallArgs(specs, installRoot) {
|
|
1413
|
+
const packageManagerName = this.getPackageManagerName();
|
|
1414
|
+
// Extension packages run inside pi and resolve pi APIs through loader aliases/virtual modules.
|
|
1415
|
+
// Disable peer dependency resolution for managed installs (npm's --legacy-peer-deps, and
|
|
1416
|
+
// equivalent bun/pnpm settings) so package managers do not install or solve host-provided
|
|
1417
|
+
// @draht/* peers. Stale auto-installed pi peers can otherwise block updates.
|
|
1418
|
+
if (packageManagerName === "bun") {
|
|
1419
|
+
return ["install", ...specs, "--cwd", installRoot, "--omit=peer"];
|
|
1420
|
+
}
|
|
1421
|
+
if (packageManagerName === "pnpm") {
|
|
1422
|
+
return [
|
|
1423
|
+
"install",
|
|
1424
|
+
...specs,
|
|
1425
|
+
"--prefix",
|
|
1426
|
+
installRoot,
|
|
1427
|
+
"--config.auto-install-peers=false",
|
|
1428
|
+
"--config.strict-peer-dependencies=false",
|
|
1429
|
+
"--config.strict-dep-builds=false",
|
|
1430
|
+
];
|
|
1431
|
+
}
|
|
1432
|
+
return ["install", ...specs, "--prefix", installRoot, "--legacy-peer-deps"];
|
|
1433
|
+
}
|
|
1285
1434
|
async installNpm(source, scope, temporary) {
|
|
1286
|
-
if (scope === "user" && !temporary) {
|
|
1287
|
-
await this.runNpmCommand(["install", "-g", source.spec]);
|
|
1288
|
-
return;
|
|
1289
|
-
}
|
|
1290
1435
|
const installRoot = this.getNpmInstallRoot(scope, temporary);
|
|
1291
1436
|
this.ensureNpmProject(installRoot);
|
|
1292
|
-
await this.runNpmCommand([
|
|
1437
|
+
await this.runNpmCommand(this.getNpmInstallArgs([source.spec], installRoot));
|
|
1293
1438
|
}
|
|
1294
1439
|
async uninstallNpm(source, scope) {
|
|
1295
|
-
if (scope === "user") {
|
|
1296
|
-
await this.runNpmCommand(["uninstall", "-g", source.name]);
|
|
1297
|
-
return;
|
|
1298
|
-
}
|
|
1299
1440
|
const installRoot = this.getNpmInstallRoot(scope, false);
|
|
1300
1441
|
if (!existsSync(installRoot)) {
|
|
1301
1442
|
return;
|
|
1302
1443
|
}
|
|
1444
|
+
if (this.getPackageManagerName() === "bun") {
|
|
1445
|
+
await this.runNpmCommand(["uninstall", source.name, "--cwd", installRoot]);
|
|
1446
|
+
return;
|
|
1447
|
+
}
|
|
1303
1448
|
await this.runNpmCommand(["uninstall", source.name, "--prefix", installRoot]);
|
|
1304
1449
|
}
|
|
1305
1450
|
async installGit(source, scope) {
|
|
1306
1451
|
const targetDir = this.getGitInstallPath(source, scope);
|
|
1307
1452
|
if (existsSync(targetDir)) {
|
|
1453
|
+
if (source.ref) {
|
|
1454
|
+
await this.ensureGitRef(targetDir, ["fetch", "origin", source.ref], "FETCH_HEAD");
|
|
1455
|
+
return;
|
|
1456
|
+
}
|
|
1457
|
+
const target = await this.getLocalGitUpdateTarget(targetDir);
|
|
1458
|
+
await this.ensureGitRef(targetDir, target.fetchArgs, target.ref);
|
|
1308
1459
|
return;
|
|
1309
1460
|
}
|
|
1310
1461
|
const gitRoot = this.getGitInstallRoot(scope);
|
|
@@ -1318,7 +1469,7 @@ export class DefaultPackageManager {
|
|
|
1318
1469
|
}
|
|
1319
1470
|
const packageJsonPath = join(targetDir, "package.json");
|
|
1320
1471
|
if (existsSync(packageJsonPath)) {
|
|
1321
|
-
await this.runNpmCommand(
|
|
1472
|
+
await this.runNpmCommand(this.getGitDependencyInstallArgs(), { cwd: targetDir });
|
|
1322
1473
|
}
|
|
1323
1474
|
}
|
|
1324
1475
|
async updateGit(source, scope) {
|
|
@@ -1327,26 +1478,34 @@ export class DefaultPackageManager {
|
|
|
1327
1478
|
await this.installGit(source, scope);
|
|
1328
1479
|
return;
|
|
1329
1480
|
}
|
|
1481
|
+
if (source.ref) {
|
|
1482
|
+
await this.ensureGitRef(targetDir, ["fetch", "origin", source.ref], "FETCH_HEAD");
|
|
1483
|
+
return;
|
|
1484
|
+
}
|
|
1330
1485
|
const target = await this.getLocalGitUpdateTarget(targetDir);
|
|
1486
|
+
await this.ensureGitRef(targetDir, target.fetchArgs, target.ref);
|
|
1487
|
+
}
|
|
1488
|
+
async ensureGitRef(targetDir, fetchArgs, ref) {
|
|
1331
1489
|
// Fetch only the ref we will reset to, avoiding unrelated branch/tag noise.
|
|
1332
|
-
await this.runCommand("git",
|
|
1490
|
+
await this.runCommand("git", fetchArgs, { cwd: targetDir });
|
|
1333
1491
|
const localHead = await this.runCommandCapture("git", ["rev-parse", "HEAD"], {
|
|
1334
1492
|
cwd: targetDir,
|
|
1335
1493
|
timeoutMs: NETWORK_TIMEOUT_MS,
|
|
1336
1494
|
});
|
|
1337
|
-
const
|
|
1495
|
+
const commitRef = `${ref}^{commit}`;
|
|
1496
|
+
const targetHead = await this.runCommandCapture("git", ["rev-parse", commitRef], {
|
|
1338
1497
|
cwd: targetDir,
|
|
1339
1498
|
timeoutMs: NETWORK_TIMEOUT_MS,
|
|
1340
1499
|
});
|
|
1341
|
-
if (localHead.trim() ===
|
|
1500
|
+
if (localHead.trim() === targetHead.trim()) {
|
|
1342
1501
|
return;
|
|
1343
1502
|
}
|
|
1344
|
-
await this.runCommand("git", ["reset", "--hard",
|
|
1503
|
+
await this.runCommand("git", ["reset", "--hard", commitRef], { cwd: targetDir });
|
|
1345
1504
|
// Clean untracked files (extensions should be pristine)
|
|
1346
1505
|
await this.runCommand("git", ["clean", "-fdx"], { cwd: targetDir });
|
|
1347
1506
|
const packageJsonPath = join(targetDir, "package.json");
|
|
1348
1507
|
if (existsSync(packageJsonPath)) {
|
|
1349
|
-
await this.runNpmCommand(
|
|
1508
|
+
await this.runNpmCommand(this.getGitDependencyInstallArgs(), { cwd: targetDir });
|
|
1350
1509
|
}
|
|
1351
1510
|
}
|
|
1352
1511
|
async refreshTemporaryGitSource(source, sourceStr) {
|
|
@@ -1396,6 +1555,7 @@ export class DefaultPackageManager {
|
|
|
1396
1555
|
if (!existsSync(installRoot)) {
|
|
1397
1556
|
mkdirSync(installRoot, { recursive: true });
|
|
1398
1557
|
}
|
|
1558
|
+
markPathIgnoredByCloudSync(installRoot);
|
|
1399
1559
|
this.ensureGitIgnore(installRoot);
|
|
1400
1560
|
const packageJsonPath = join(installRoot, "package.json");
|
|
1401
1561
|
if (!existsSync(packageJsonPath)) {
|
|
@@ -1417,9 +1577,10 @@ export class DefaultPackageManager {
|
|
|
1417
1577
|
return this.getTemporaryDir("npm");
|
|
1418
1578
|
}
|
|
1419
1579
|
if (scope === "project") {
|
|
1580
|
+
this.assertProjectTrustedForScope(scope);
|
|
1420
1581
|
return join(this.cwd, CONFIG_DIR_NAME, "npm");
|
|
1421
1582
|
}
|
|
1422
|
-
return join(this.
|
|
1583
|
+
return join(this.agentDir, "npm");
|
|
1423
1584
|
}
|
|
1424
1585
|
getGlobalNpmRoot() {
|
|
1425
1586
|
const npmCommand = this.getNpmCommand();
|
|
@@ -1427,47 +1588,94 @@ export class DefaultPackageManager {
|
|
|
1427
1588
|
if (this.globalNpmRoot && this.globalNpmRootCommandKey === commandKey) {
|
|
1428
1589
|
return this.globalNpmRoot;
|
|
1429
1590
|
}
|
|
1430
|
-
|
|
1431
|
-
|
|
1591
|
+
if (this.getPackageManagerName() === "bun") {
|
|
1592
|
+
const binDir = this.runNpmCommandSync(["pm", "bin", "-g"]).trim();
|
|
1593
|
+
this.globalNpmRoot = join(dirname(binDir), "install", "global", "node_modules");
|
|
1594
|
+
}
|
|
1595
|
+
else {
|
|
1596
|
+
this.globalNpmRoot = this.runNpmCommandSync(["root", "-g"]).trim();
|
|
1597
|
+
}
|
|
1432
1598
|
this.globalNpmRootCommandKey = commandKey;
|
|
1433
1599
|
return this.globalNpmRoot;
|
|
1434
1600
|
}
|
|
1435
|
-
|
|
1601
|
+
getPnpmGlobalPackagePath(packageName) {
|
|
1602
|
+
if (this.getPackageManagerName() !== "pnpm") {
|
|
1603
|
+
return undefined;
|
|
1604
|
+
}
|
|
1605
|
+
const output = this.runNpmCommandSync(["list", "-g", "--depth", "0", "--json"]);
|
|
1606
|
+
const entries = JSON.parse(output);
|
|
1607
|
+
for (const entry of entries) {
|
|
1608
|
+
const path = entry.dependencies?.[packageName]?.path;
|
|
1609
|
+
if (path)
|
|
1610
|
+
return path;
|
|
1611
|
+
}
|
|
1612
|
+
return undefined;
|
|
1613
|
+
}
|
|
1614
|
+
getManagedNpmInstallPath(source, scope) {
|
|
1436
1615
|
if (scope === "temporary") {
|
|
1437
1616
|
return join(this.getTemporaryDir("npm"), "node_modules", source.name);
|
|
1438
1617
|
}
|
|
1439
1618
|
if (scope === "project") {
|
|
1619
|
+
this.assertProjectTrustedForScope(scope);
|
|
1440
1620
|
return join(this.cwd, CONFIG_DIR_NAME, "npm", "node_modules", source.name);
|
|
1441
1621
|
}
|
|
1442
|
-
return join(this.
|
|
1622
|
+
return join(this.agentDir, "npm", "node_modules", source.name);
|
|
1623
|
+
}
|
|
1624
|
+
getLegacyGlobalNpmInstallPath(source) {
|
|
1625
|
+
try {
|
|
1626
|
+
return this.getPnpmGlobalPackagePath(source.name) ?? join(this.getGlobalNpmRoot(), source.name);
|
|
1627
|
+
}
|
|
1628
|
+
catch {
|
|
1629
|
+
return undefined;
|
|
1630
|
+
}
|
|
1631
|
+
}
|
|
1632
|
+
getNpmInstallPath(source, scope) {
|
|
1633
|
+
const managedPath = this.getManagedNpmInstallPath(source, scope);
|
|
1634
|
+
if (scope !== "user" || existsSync(managedPath)) {
|
|
1635
|
+
return managedPath;
|
|
1636
|
+
}
|
|
1637
|
+
const legacyPath = this.getLegacyGlobalNpmInstallPath(source);
|
|
1638
|
+
return legacyPath && existsSync(legacyPath) ? legacyPath : managedPath;
|
|
1443
1639
|
}
|
|
1444
1640
|
getGitInstallPath(source, scope) {
|
|
1445
1641
|
if (scope === "temporary") {
|
|
1446
1642
|
return this.getTemporaryDir(`git-${source.host}`, source.path);
|
|
1447
1643
|
}
|
|
1448
|
-
|
|
1449
|
-
|
|
1644
|
+
const installRoot = this.getGitInstallRoot(scope);
|
|
1645
|
+
if (!installRoot) {
|
|
1646
|
+
throw new Error("Missing git install root");
|
|
1450
1647
|
}
|
|
1451
|
-
return
|
|
1648
|
+
return this.resolveManagedPath(installRoot, source.host, source.path);
|
|
1452
1649
|
}
|
|
1453
1650
|
getGitInstallRoot(scope) {
|
|
1454
1651
|
if (scope === "temporary") {
|
|
1455
1652
|
return undefined;
|
|
1456
1653
|
}
|
|
1457
1654
|
if (scope === "project") {
|
|
1655
|
+
this.assertProjectTrustedForScope(scope);
|
|
1458
1656
|
return join(this.cwd, CONFIG_DIR_NAME, "git");
|
|
1459
1657
|
}
|
|
1460
1658
|
return join(this.agentDir, "git");
|
|
1461
1659
|
}
|
|
1462
1660
|
getTemporaryDir(prefix, suffix) {
|
|
1661
|
+
const root = this.resolveManagedPath(getExtensionTempFolder(this.agentDir), prefix);
|
|
1463
1662
|
const hash = createHash("sha256")
|
|
1464
1663
|
.update(`${prefix}-${suffix ?? ""}`)
|
|
1465
1664
|
.digest("hex")
|
|
1466
1665
|
.slice(0, 8);
|
|
1467
|
-
return
|
|
1666
|
+
return this.resolveManagedPath(root, hash, suffix ?? "");
|
|
1667
|
+
}
|
|
1668
|
+
resolveManagedPath(root, ...parts) {
|
|
1669
|
+
const resolvedRoot = resolve(root);
|
|
1670
|
+
const resolvedPath = resolve(resolvedRoot, ...parts);
|
|
1671
|
+
if (resolvedPath !== resolvedRoot && !resolvedPath.startsWith(`${resolvedRoot}${sep}`)) {
|
|
1672
|
+
throw new Error(`Refusing to use path outside package install root: ${resolvedPath}`);
|
|
1673
|
+
}
|
|
1674
|
+
return resolvedPath;
|
|
1468
1675
|
}
|
|
1469
1676
|
getBaseDirForScope(scope) {
|
|
1470
1677
|
if (scope === "project") {
|
|
1678
|
+
this.assertProjectTrustedForScope(scope);
|
|
1471
1679
|
return join(this.cwd, CONFIG_DIR_NAME);
|
|
1472
1680
|
}
|
|
1473
1681
|
if (scope === "user") {
|
|
@@ -1476,24 +1684,10 @@ export class DefaultPackageManager {
|
|
|
1476
1684
|
return this.cwd;
|
|
1477
1685
|
}
|
|
1478
1686
|
resolvePath(input) {
|
|
1479
|
-
|
|
1480
|
-
if (trimmed === "~")
|
|
1481
|
-
return getHomeDir();
|
|
1482
|
-
if (trimmed.startsWith("~/"))
|
|
1483
|
-
return join(getHomeDir(), trimmed.slice(2));
|
|
1484
|
-
if (trimmed.startsWith("~"))
|
|
1485
|
-
return join(getHomeDir(), trimmed.slice(1));
|
|
1486
|
-
return resolve(this.cwd, trimmed);
|
|
1687
|
+
return resolvePath(input, this.cwd, { homeDir: getHomeDir(), trim: true });
|
|
1487
1688
|
}
|
|
1488
1689
|
resolvePathFromBase(input, baseDir) {
|
|
1489
|
-
|
|
1490
|
-
if (trimmed === "~")
|
|
1491
|
-
return getHomeDir();
|
|
1492
|
-
if (trimmed.startsWith("~/"))
|
|
1493
|
-
return join(getHomeDir(), trimmed.slice(2));
|
|
1494
|
-
if (trimmed.startsWith("~"))
|
|
1495
|
-
return join(getHomeDir(), trimmed.slice(1));
|
|
1496
|
-
return resolve(baseDir, trimmed);
|
|
1690
|
+
return resolvePath(input, baseDir, { homeDir: getHomeDir(), trim: true });
|
|
1497
1691
|
}
|
|
1498
1692
|
collectPackageResources(packageRoot, accumulator, filter, metadata) {
|
|
1499
1693
|
if (filter) {
|
|
@@ -1573,7 +1767,7 @@ export class DefaultPackageManager {
|
|
|
1573
1767
|
const entries = manifest?.[resourceType];
|
|
1574
1768
|
if (entries && entries.length > 0) {
|
|
1575
1769
|
const allFiles = this.collectFilesFromManifestEntries(entries, packageRoot, resourceType);
|
|
1576
|
-
const manifestPatterns = entries.filter(
|
|
1770
|
+
const manifestPatterns = entries.filter(isOverridePattern);
|
|
1577
1771
|
const enabledByManifest = manifestPatterns.length > 0 ? applyPatterns(allFiles, manifestPatterns, packageRoot) : new Set(allFiles);
|
|
1578
1772
|
return { allFiles: Array.from(enabledByManifest), enabledByManifest };
|
|
1579
1773
|
}
|
|
@@ -1602,7 +1796,7 @@ export class DefaultPackageManager {
|
|
|
1602
1796
|
if (!entries)
|
|
1603
1797
|
return;
|
|
1604
1798
|
const allFiles = this.collectFilesFromManifestEntries(entries, root, resourceType);
|
|
1605
|
-
const patterns = entries.filter(
|
|
1799
|
+
const patterns = entries.filter(isOverridePattern);
|
|
1606
1800
|
const enabledPaths = applyPatterns(allFiles, patterns, root);
|
|
1607
1801
|
for (const f of allFiles) {
|
|
1608
1802
|
if (enabledPaths.has(f)) {
|
|
@@ -1611,8 +1805,18 @@ export class DefaultPackageManager {
|
|
|
1611
1805
|
}
|
|
1612
1806
|
}
|
|
1613
1807
|
collectFilesFromManifestEntries(entries, root, resourceType) {
|
|
1614
|
-
const
|
|
1615
|
-
const resolved =
|
|
1808
|
+
const sourceEntries = entries.filter((entry) => !isOverridePattern(entry));
|
|
1809
|
+
const resolved = sourceEntries.flatMap((entry) => {
|
|
1810
|
+
if (!hasGlobPattern(entry)) {
|
|
1811
|
+
return [resolve(root, entry)];
|
|
1812
|
+
}
|
|
1813
|
+
return globSync(entry, {
|
|
1814
|
+
cwd: root,
|
|
1815
|
+
absolute: true,
|
|
1816
|
+
dot: false,
|
|
1817
|
+
nodir: false,
|
|
1818
|
+
}).map((match) => resolve(match));
|
|
1819
|
+
});
|
|
1616
1820
|
return this.collectFilesFromPaths(resolved, resourceType);
|
|
1617
1821
|
}
|
|
1618
1822
|
resolveLocalEntries(entries, resourceType, target, metadata, baseDir) {
|
|
@@ -1667,7 +1871,10 @@ export class DefaultPackageManager {
|
|
|
1667
1871
|
themes: join(projectBaseDir, "themes"),
|
|
1668
1872
|
};
|
|
1669
1873
|
const userAgentsSkillsDir = join(getHomeDir(), ".agents", "skills");
|
|
1670
|
-
const
|
|
1874
|
+
const projectTrusted = this.settingsManager.isProjectTrusted();
|
|
1875
|
+
const projectAgentsSkillDirs = projectTrusted
|
|
1876
|
+
? collectAncestorAgentsSkillDirs(this.cwd).filter((dir) => resolve(dir) !== resolve(userAgentsSkillsDir))
|
|
1877
|
+
: [];
|
|
1671
1878
|
const addResources = (resourceType, paths, metadata, overrides, baseDir) => {
|
|
1672
1879
|
const target = this.getTargetMap(accumulator, resourceType);
|
|
1673
1880
|
for (const path of paths) {
|
|
@@ -1675,18 +1882,36 @@ export class DefaultPackageManager {
|
|
|
1675
1882
|
this.addResource(target, path, metadata, enabled);
|
|
1676
1883
|
}
|
|
1677
1884
|
};
|
|
1678
|
-
|
|
1679
|
-
|
|
1680
|
-
|
|
1681
|
-
|
|
1682
|
-
|
|
1683
|
-
|
|
1684
|
-
|
|
1885
|
+
if (projectTrusted) {
|
|
1886
|
+
// Project extensions from .pi/
|
|
1887
|
+
addResources("extensions", collectAutoExtensionEntries(projectDirs.extensions), projectMetadata, projectOverrides.extensions, projectBaseDir);
|
|
1888
|
+
// Project skills from .pi/
|
|
1889
|
+
addResources("skills", collectAutoSkillEntries(projectDirs.skills, "pi"), projectMetadata, projectOverrides.skills, projectBaseDir);
|
|
1890
|
+
}
|
|
1891
|
+
// Project skills from .agents/ (each with its own baseDir)
|
|
1892
|
+
for (const agentsSkillsDir of projectAgentsSkillDirs) {
|
|
1893
|
+
const agentsBaseDir = dirname(agentsSkillsDir); // the .agents directory
|
|
1894
|
+
const agentsMetadata = {
|
|
1895
|
+
...projectMetadata,
|
|
1896
|
+
baseDir: agentsBaseDir,
|
|
1897
|
+
};
|
|
1898
|
+
addResources("skills", collectAutoSkillEntries(agentsSkillsDir, "agents"), agentsMetadata, projectOverrides.skills, agentsBaseDir);
|
|
1899
|
+
}
|
|
1900
|
+
if (projectTrusted) {
|
|
1901
|
+
addResources("prompts", collectAutoPromptEntries(projectDirs.prompts), projectMetadata, projectOverrides.prompts, projectBaseDir);
|
|
1902
|
+
addResources("themes", collectAutoThemeEntries(projectDirs.themes), projectMetadata, projectOverrides.themes, projectBaseDir);
|
|
1903
|
+
}
|
|
1904
|
+
// User extensions from ~/.pi/agent/
|
|
1685
1905
|
addResources("extensions", collectAutoExtensionEntries(userDirs.extensions), userMetadata, userOverrides.extensions, globalBaseDir);
|
|
1686
|
-
|
|
1687
|
-
|
|
1688
|
-
|
|
1689
|
-
|
|
1906
|
+
// User skills from ~/.pi/agent/
|
|
1907
|
+
addResources("skills", collectAutoSkillEntries(userDirs.skills, "pi"), userMetadata, userOverrides.skills, globalBaseDir);
|
|
1908
|
+
// User skills from ~/.agents/ (with its own baseDir)
|
|
1909
|
+
const userAgentsBaseDir = dirname(userAgentsSkillsDir);
|
|
1910
|
+
const userAgentsMetadata = {
|
|
1911
|
+
...userMetadata,
|
|
1912
|
+
baseDir: userAgentsBaseDir,
|
|
1913
|
+
};
|
|
1914
|
+
addResources("skills", collectAutoSkillEntries(userAgentsSkillsDir, "agents"), userAgentsMetadata, userOverrides.skills, userAgentsBaseDir);
|
|
1690
1915
|
addResources("prompts", collectAutoPromptEntries(userDirs.prompts), userMetadata, userOverrides.prompts, globalBaseDir);
|
|
1691
1916
|
addResources("themes", collectAutoThemeEntries(userDirs.themes), userMetadata, userOverrides.themes, globalBaseDir);
|
|
1692
1917
|
}
|
|
@@ -1740,30 +1965,49 @@ export class DefaultPackageManager {
|
|
|
1740
1965
|
};
|
|
1741
1966
|
}
|
|
1742
1967
|
toResolvedPaths(accumulator) {
|
|
1743
|
-
const
|
|
1968
|
+
const mapToResolved = (entries) => {
|
|
1744
1969
|
const resolved = Array.from(entries.entries()).map(([path, { metadata, enabled }]) => ({
|
|
1745
1970
|
path,
|
|
1746
1971
|
enabled,
|
|
1747
1972
|
metadata,
|
|
1748
1973
|
}));
|
|
1749
1974
|
resolved.sort((a, b) => resourcePrecedenceRank(a.metadata) - resourcePrecedenceRank(b.metadata));
|
|
1750
|
-
|
|
1975
|
+
const seen = new Set();
|
|
1976
|
+
return resolved.filter((entry) => {
|
|
1977
|
+
const canonicalPath = canonicalizePath(entry.path);
|
|
1978
|
+
if (seen.has(canonicalPath))
|
|
1979
|
+
return false;
|
|
1980
|
+
seen.add(canonicalPath);
|
|
1981
|
+
return true;
|
|
1982
|
+
});
|
|
1751
1983
|
};
|
|
1752
1984
|
return {
|
|
1753
|
-
extensions:
|
|
1754
|
-
skills:
|
|
1755
|
-
prompts:
|
|
1756
|
-
themes:
|
|
1985
|
+
extensions: mapToResolved(accumulator.extensions),
|
|
1986
|
+
skills: mapToResolved(accumulator.skills),
|
|
1987
|
+
prompts: mapToResolved(accumulator.prompts),
|
|
1988
|
+
themes: mapToResolved(accumulator.themes),
|
|
1757
1989
|
};
|
|
1758
1990
|
}
|
|
1991
|
+
spawnCommand(command, args, options) {
|
|
1992
|
+
const env = getEnv();
|
|
1993
|
+
return spawnProcess(command, args, {
|
|
1994
|
+
cwd: options?.cwd,
|
|
1995
|
+
stdio: isStdoutTakenOver() ? ["ignore", 2, 2] : "inherit",
|
|
1996
|
+
env,
|
|
1997
|
+
});
|
|
1998
|
+
}
|
|
1999
|
+
spawnCaptureCommand(command, args, options) {
|
|
2000
|
+
const baseEnv = getEnv();
|
|
2001
|
+
const env = options?.env ? { ...baseEnv, ...options.env } : baseEnv;
|
|
2002
|
+
return spawnProcess(command, args, {
|
|
2003
|
+
cwd: options?.cwd,
|
|
2004
|
+
stdio: ["ignore", "pipe", "pipe"],
|
|
2005
|
+
env,
|
|
2006
|
+
});
|
|
2007
|
+
}
|
|
1759
2008
|
runCommandCapture(command, args, options) {
|
|
1760
2009
|
return new Promise((resolvePromise, reject) => {
|
|
1761
|
-
const child =
|
|
1762
|
-
cwd: options?.cwd,
|
|
1763
|
-
stdio: ["ignore", "pipe", "pipe"],
|
|
1764
|
-
shell: process.platform === "win32",
|
|
1765
|
-
env: options?.env ? { ...process.env, ...options.env } : process.env,
|
|
1766
|
-
});
|
|
2010
|
+
const child = this.spawnCaptureCommand(command, args, options);
|
|
1767
2011
|
let stdout = "";
|
|
1768
2012
|
let stderr = "";
|
|
1769
2013
|
let timedOut = false;
|
|
@@ -1779,12 +2023,12 @@ export class DefaultPackageManager {
|
|
|
1779
2023
|
child.stderr?.on("data", (data) => {
|
|
1780
2024
|
stderr += data.toString();
|
|
1781
2025
|
});
|
|
1782
|
-
child.
|
|
2026
|
+
child.once("error", (error) => {
|
|
1783
2027
|
if (timeout)
|
|
1784
2028
|
clearTimeout(timeout);
|
|
1785
2029
|
reject(error);
|
|
1786
2030
|
});
|
|
1787
|
-
child.
|
|
2031
|
+
child.once("close", (code, signal) => {
|
|
1788
2032
|
if (timeout)
|
|
1789
2033
|
clearTimeout(timeout);
|
|
1790
2034
|
if (timedOut) {
|
|
@@ -1795,17 +2039,14 @@ export class DefaultPackageManager {
|
|
|
1795
2039
|
resolvePromise(stdout.trim());
|
|
1796
2040
|
return;
|
|
1797
2041
|
}
|
|
1798
|
-
|
|
2042
|
+
const exitStatus = code === null ? `signal ${signal ?? "unknown"}` : `code ${code}`;
|
|
2043
|
+
reject(new Error(`${command} ${args.join(" ")} failed with ${exitStatus}: ${stderr || stdout}`));
|
|
1799
2044
|
});
|
|
1800
2045
|
});
|
|
1801
2046
|
}
|
|
1802
2047
|
runCommand(command, args, options) {
|
|
1803
2048
|
return new Promise((resolvePromise, reject) => {
|
|
1804
|
-
const child =
|
|
1805
|
-
cwd: options?.cwd,
|
|
1806
|
-
stdio: isStdoutTakenOver() ? ["ignore", 2, 2] : "inherit",
|
|
1807
|
-
shell: process.platform === "win32",
|
|
1808
|
-
});
|
|
2049
|
+
const child = this.spawnCommand(command, args, options);
|
|
1809
2050
|
child.on("error", reject);
|
|
1810
2051
|
child.on("exit", (code) => {
|
|
1811
2052
|
if (code === 0) {
|
|
@@ -1818,13 +2059,14 @@ export class DefaultPackageManager {
|
|
|
1818
2059
|
});
|
|
1819
2060
|
}
|
|
1820
2061
|
runCommandSync(command, args) {
|
|
1821
|
-
const
|
|
2062
|
+
const env = getEnv();
|
|
2063
|
+
const result = spawnProcessSync(command, args, {
|
|
1822
2064
|
stdio: ["ignore", "pipe", "pipe"],
|
|
1823
2065
|
encoding: "utf-8",
|
|
1824
|
-
|
|
2066
|
+
env,
|
|
1825
2067
|
});
|
|
1826
|
-
if (result.status !== 0) {
|
|
1827
|
-
throw new Error(`Failed to run ${command} ${args.join(" ")}: ${result.stderr || result.stdout}`);
|
|
2068
|
+
if (result.error || result.status !== 0) {
|
|
2069
|
+
throw new Error(`Failed to run ${command} ${args.join(" ")}: ${result.error?.message || result.stderr || result.stdout}`);
|
|
1828
2070
|
}
|
|
1829
2071
|
return (result.stdout || result.stderr || "").trim();
|
|
1830
2072
|
}
|