@draht/coding-agent 2026.7.13 → 2026.9.5-1
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 +241 -0
- package/README.md +47 -2
- package/agents/debugger.md +12 -1
- package/agents/git-committer.md +1 -0
- package/agents/implementer.md +20 -0
- package/agents/investigator.md +75 -0
- package/agents/reviewer.md +7 -0
- package/agents/spec-reviewer.md +66 -0
- package/agents/verifier.md +4 -3
- package/bin/draht-tools.cjs +472 -41
- package/dist/agents/debugger.md +12 -1
- package/dist/agents/git-committer.md +1 -0
- package/dist/agents/implementer.md +20 -0
- package/dist/agents/investigator.md +75 -0
- package/dist/agents/reviewer.md +7 -0
- package/dist/agents/spec-reviewer.md +66 -0
- package/dist/agents/verifier.md +4 -3
- package/dist/bun/cli.js +2 -0
- package/dist/bun/cli.js.map +1 -1
- package/dist/cli/args.d.ts +10 -0
- package/dist/cli/args.d.ts.map +1 -1
- package/dist/cli/args.js +80 -3
- package/dist/cli/args.js.map +1 -1
- package/dist/cli/attach-mode.d.ts +61 -0
- package/dist/cli/attach-mode.d.ts.map +1 -1
- package/dist/cli/attach-mode.js +243 -5
- package/dist/cli/attach-mode.js.map +1 -1
- package/dist/cli/config-selector.js +1 -1
- package/dist/cli/config-selector.js.map +1 -1
- package/dist/cli/credential-print.d.ts +23 -0
- package/dist/cli/credential-print.d.ts.map +1 -0
- package/dist/cli/credential-print.js +117 -0
- package/dist/cli/credential-print.js.map +1 -0
- package/dist/cli/list-models.d.ts +2 -2
- package/dist/cli/list-models.d.ts.map +1 -1
- package/dist/cli/list-models.js +3 -3
- package/dist/cli/list-models.js.map +1 -1
- package/dist/cli/startup-ui.js +1 -1
- package/dist/cli/startup-ui.js.map +1 -1
- package/dist/config.d.ts +9 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +31 -4
- package/dist/config.js.map +1 -1
- package/dist/core/agent-session-runtime.d.ts +17 -1
- package/dist/core/agent-session-runtime.d.ts.map +1 -1
- package/dist/core/agent-session-runtime.js +90 -30
- package/dist/core/agent-session-runtime.js.map +1 -1
- package/dist/core/agent-session-services.d.ts +4 -7
- package/dist/core/agent-session-services.d.ts.map +1 -1
- package/dist/core/agent-session-services.js +24 -9
- package/dist/core/agent-session-services.js.map +1 -1
- package/dist/core/agent-session.d.ts +87 -27
- package/dist/core/agent-session.d.ts.map +1 -1
- package/dist/core/agent-session.js +337 -154
- package/dist/core/agent-session.js.map +1 -1
- package/dist/core/auth-storage.d.ts +20 -104
- package/dist/core/auth-storage.d.ts.map +1 -1
- package/dist/core/auth-storage.js +104 -260
- package/dist/core/auth-storage.js.map +1 -1
- package/dist/core/builtins/checkpoints.d.ts +20 -0
- package/dist/core/builtins/checkpoints.d.ts.map +1 -0
- package/dist/core/builtins/checkpoints.js +161 -0
- package/dist/core/builtins/checkpoints.js.map +1 -0
- package/dist/core/builtins/duet.d.ts +26 -0
- package/dist/core/builtins/duet.d.ts.map +1 -0
- package/dist/core/builtins/duet.js +660 -0
- package/dist/core/builtins/duet.js.map +1 -0
- package/dist/core/builtins/index.d.ts.map +1 -1
- package/dist/core/builtins/index.js +7 -1
- package/dist/core/builtins/index.js.map +1 -1
- package/dist/core/builtins/subagent.d.ts +24 -4
- package/dist/core/builtins/subagent.d.ts.map +1 -1
- package/dist/core/builtins/subagent.js +278 -35
- package/dist/core/builtins/subagent.js.map +1 -1
- package/dist/core/cache-stats.d.ts +2 -2
- package/dist/core/cache-stats.d.ts.map +1 -1
- package/dist/core/cache-stats.js +1 -1
- package/dist/core/cache-stats.js.map +1 -1
- package/dist/core/checkpoints/checkpoint-cli.d.ts +17 -0
- package/dist/core/checkpoints/checkpoint-cli.d.ts.map +1 -0
- package/dist/core/checkpoints/checkpoint-cli.js +78 -0
- package/dist/core/checkpoints/checkpoint-cli.js.map +1 -0
- package/dist/core/checkpoints/checkpoint-manager.d.ts +294 -0
- package/dist/core/checkpoints/checkpoint-manager.d.ts.map +1 -0
- package/dist/core/checkpoints/checkpoint-manager.js +865 -0
- package/dist/core/checkpoints/checkpoint-manager.js.map +1 -0
- package/dist/core/checkpoints/rewind.d.ts +141 -0
- package/dist/core/checkpoints/rewind.d.ts.map +1 -0
- package/dist/core/checkpoints/rewind.js +246 -0
- package/dist/core/checkpoints/rewind.js.map +1 -0
- package/dist/core/compaction/branch-summarization.d.ts +9 -3
- package/dist/core/compaction/branch-summarization.d.ts.map +1 -1
- package/dist/core/compaction/branch-summarization.js +16 -14
- package/dist/core/compaction/branch-summarization.js.map +1 -1
- package/dist/core/compaction/compaction.d.ts +24 -3
- package/dist/core/compaction/compaction.d.ts.map +1 -1
- package/dist/core/compaction/compaction.js +96 -30
- package/dist/core/compaction/compaction.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 +6 -17
- package/dist/core/compaction/utils.js.map +1 -1
- package/dist/core/context-windows.d.ts +7 -0
- package/dist/core/context-windows.d.ts.map +1 -0
- package/dist/core/context-windows.js +35 -0
- package/dist/core/context-windows.js.map +1 -0
- package/dist/core/extensions/index.d.ts +1 -1
- 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.map +1 -1
- package/dist/core/extensions/loader.js +101 -23
- package/dist/core/extensions/loader.js.map +1 -1
- package/dist/core/extensions/runner.d.ts +19 -3
- package/dist/core/extensions/runner.d.ts.map +1 -1
- package/dist/core/extensions/runner.js +117 -2
- package/dist/core/extensions/runner.js.map +1 -1
- package/dist/core/extensions/types.d.ts +236 -9
- 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 +22 -3
- package/dist/core/extensions/wrapper.js.map +1 -1
- package/dist/core/footer-data-provider.d.ts +10 -0
- package/dist/core/footer-data-provider.d.ts.map +1 -1
- package/dist/core/footer-data-provider.js +1 -1
- package/dist/core/footer-data-provider.js.map +1 -1
- package/dist/core/http-dispatcher.d.ts.map +1 -1
- package/dist/core/http-dispatcher.js +7 -0
- package/dist/core/http-dispatcher.js.map +1 -1
- package/dist/core/index.d.ts +1 -1
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js.map +1 -1
- package/dist/core/keybindings.d.ts +18 -3
- package/dist/core/keybindings.d.ts.map +1 -1
- package/dist/core/keybindings.js +12 -3
- package/dist/core/keybindings.js.map +1 -1
- package/dist/core/model-config.d.ts +542 -0
- package/dist/core/model-config.d.ts.map +1 -0
- package/dist/core/model-config.js +247 -0
- package/dist/core/model-config.js.map +1 -0
- package/dist/core/model-registry.d.ts +19 -124
- package/dist/core/model-registry.d.ts.map +1 -1
- package/dist/core/model-registry.js +56 -727
- package/dist/core/model-registry.js.map +1 -1
- package/dist/core/model-resolver.d.ts +7 -6
- package/dist/core/model-resolver.d.ts.map +1 -1
- package/dist/core/model-resolver.js +74 -27
- package/dist/core/model-resolver.js.map +1 -1
- package/dist/core/model-runtime.d.ts +89 -0
- package/dist/core/model-runtime.d.ts.map +1 -0
- package/dist/core/model-runtime.js +451 -0
- package/dist/core/model-runtime.js.map +1 -0
- package/dist/core/models-store.d.ts +17 -0
- package/dist/core/models-store.d.ts.map +1 -0
- package/dist/core/models-store.js +46 -0
- package/dist/core/models-store.js.map +1 -0
- package/dist/core/multi-agent/permission-gate.d.ts.map +1 -1
- package/dist/core/multi-agent/permission-gate.js +4 -3
- package/dist/core/multi-agent/permission-gate.js.map +1 -1
- package/dist/core/multi-agent/worktree.d.ts +2 -0
- package/dist/core/multi-agent/worktree.d.ts.map +1 -1
- package/dist/core/multi-agent/worktree.js +2 -2
- package/dist/core/multi-agent/worktree.js.map +1 -1
- package/dist/core/package-manager.d.ts +7 -1
- package/dist/core/package-manager.d.ts.map +1 -1
- package/dist/core/package-manager.js +41 -45
- package/dist/core/package-manager.js.map +1 -1
- package/dist/core/permission-relay/index.d.ts +19 -0
- package/dist/core/permission-relay/index.d.ts.map +1 -0
- package/dist/core/permission-relay/index.js +49 -0
- package/dist/core/permission-relay/index.js.map +1 -0
- package/dist/core/permission-relay/relay-ui-context.d.ts +39 -0
- package/dist/core/permission-relay/relay-ui-context.d.ts.map +1 -0
- package/dist/core/permission-relay/relay-ui-context.js +788 -0
- package/dist/core/permission-relay/relay-ui-context.js.map +1 -0
- package/dist/core/permission-relay/types.d.ts +222 -0
- package/dist/core/permission-relay/types.d.ts.map +1 -0
- package/dist/core/permission-relay/types.js +15 -0
- package/dist/core/permission-relay/types.js.map +1 -0
- package/dist/core/pi-manifest.d.ts +14 -0
- package/dist/core/pi-manifest.d.ts.map +1 -0
- package/dist/core/pi-manifest.js +35 -0
- package/dist/core/pi-manifest.js.map +1 -0
- package/dist/core/project-trust.js +2 -2
- package/dist/core/project-trust.js.map +1 -1
- package/dist/core/prompt-templates.d.ts +1 -0
- package/dist/core/prompt-templates.d.ts.map +1 -1
- package/dist/core/prompt-templates.js +4 -4
- package/dist/core/prompt-templates.js.map +1 -1
- package/dist/core/provider-composer.d.ts +55 -0
- package/dist/core/provider-composer.d.ts.map +1 -0
- package/dist/core/provider-composer.js +375 -0
- package/dist/core/provider-composer.js.map +1 -0
- package/dist/core/radius.d.ts +2 -0
- package/dist/core/radius.d.ts.map +1 -0
- package/dist/core/radius.js +2 -0
- package/dist/core/radius.js.map +1 -0
- package/dist/core/remote-catalog-provider.d.ts +5 -0
- package/dist/core/remote-catalog-provider.d.ts.map +1 -0
- package/dist/core/remote-catalog-provider.js +115 -0
- package/dist/core/remote-catalog-provider.js.map +1 -0
- package/dist/core/resource-loader.d.ts +36 -0
- package/dist/core/resource-loader.d.ts.map +1 -1
- package/dist/core/resource-loader.js +159 -27
- package/dist/core/resource-loader.js.map +1 -1
- package/dist/core/runtime-credentials.d.ts +15 -0
- package/dist/core/runtime-credentials.d.ts.map +1 -0
- package/dist/core/runtime-credentials.js +35 -0
- package/dist/core/runtime-credentials.js.map +1 -0
- package/dist/core/sandbox/bash-operations.d.ts +149 -0
- package/dist/core/sandbox/bash-operations.d.ts.map +1 -0
- package/dist/core/sandbox/bash-operations.js +163 -0
- package/dist/core/sandbox/bash-operations.js.map +1 -0
- package/dist/core/sandbox/env.d.ts +83 -0
- package/dist/core/sandbox/env.d.ts.map +1 -0
- package/dist/core/sandbox/env.js +123 -0
- package/dist/core/sandbox/env.js.map +1 -0
- package/dist/core/sandbox/executor.d.ts +104 -0
- package/dist/core/sandbox/executor.d.ts.map +1 -0
- package/dist/core/sandbox/executor.js +92 -0
- package/dist/core/sandbox/executor.js.map +1 -0
- package/dist/core/sandbox/index.d.ts +36 -0
- package/dist/core/sandbox/index.d.ts.map +1 -0
- package/dist/core/sandbox/index.js +36 -0
- package/dist/core/sandbox/index.js.map +1 -0
- package/dist/core/sandbox/linux.d.ts +121 -0
- package/dist/core/sandbox/linux.d.ts.map +1 -0
- package/dist/core/sandbox/linux.js +260 -0
- package/dist/core/sandbox/linux.js.map +1 -0
- package/dist/core/sandbox/policy.d.ts +142 -0
- package/dist/core/sandbox/policy.d.ts.map +1 -0
- package/dist/core/sandbox/policy.js +297 -0
- package/dist/core/sandbox/policy.js.map +1 -0
- package/dist/core/sandbox/real-path.d.ts +112 -0
- package/dist/core/sandbox/real-path.d.ts.map +1 -0
- package/dist/core/sandbox/real-path.js +158 -0
- package/dist/core/sandbox/real-path.js.map +1 -0
- package/dist/core/sandbox/seatbelt-profile.d.ts +95 -0
- package/dist/core/sandbox/seatbelt-profile.d.ts.map +1 -0
- package/dist/core/sandbox/seatbelt-profile.js +239 -0
- package/dist/core/sandbox/seatbelt-profile.js.map +1 -0
- package/dist/core/sandbox/seatbelt.d.ts +95 -0
- package/dist/core/sandbox/seatbelt.d.ts.map +1 -0
- package/dist/core/sandbox/seatbelt.js +154 -0
- package/dist/core/sandbox/seatbelt.js.map +1 -0
- package/dist/core/sandbox/self-test.d.ts +109 -0
- package/dist/core/sandbox/self-test.d.ts.map +1 -0
- package/dist/core/sandbox/self-test.js +369 -0
- package/dist/core/sandbox/self-test.js.map +1 -0
- package/dist/core/sandbox/spawn.d.ts +33 -0
- package/dist/core/sandbox/spawn.d.ts.map +1 -0
- package/dist/core/sandbox/spawn.js +87 -0
- package/dist/core/sandbox/spawn.js.map +1 -0
- package/dist/core/sdk.d.ts +3 -6
- package/dist/core/sdk.d.ts.map +1 -1
- package/dist/core/sdk.js +25 -22
- package/dist/core/sdk.js.map +1 -1
- package/dist/core/session-manager.d.ts +74 -7
- package/dist/core/session-manager.d.ts.map +1 -1
- package/dist/core/session-manager.js +169 -34
- package/dist/core/session-manager.js.map +1 -1
- package/dist/core/settings-manager.d.ts +22 -1
- package/dist/core/settings-manager.d.ts.map +1 -1
- package/dist/core/settings-manager.js +36 -16
- package/dist/core/settings-manager.js.map +1 -1
- package/dist/core/skills.d.ts +3 -1
- package/dist/core/skills.d.ts.map +1 -1
- package/dist/core/skills.js +19 -6
- package/dist/core/skills.js.map +1 -1
- package/dist/core/slash-commands.d.ts.map +1 -1
- package/dist/core/slash-commands.js +1 -0
- package/dist/core/slash-commands.js.map +1 -1
- package/dist/core/soak/soak-log.d.ts +298 -0
- package/dist/core/soak/soak-log.d.ts.map +1 -0
- package/dist/core/soak/soak-log.js +660 -0
- package/dist/core/soak/soak-log.js.map +1 -0
- package/dist/core/soak/soak-reader.d.ts +60 -0
- package/dist/core/soak/soak-reader.d.ts.map +1 -0
- package/dist/core/soak/soak-reader.js +106 -0
- package/dist/core/soak/soak-reader.js.map +1 -0
- package/dist/core/socket-server/discovery.d.ts +78 -1
- package/dist/core/socket-server/discovery.d.ts.map +1 -1
- package/dist/core/socket-server/discovery.js +356 -37
- package/dist/core/socket-server/discovery.js.map +1 -1
- package/dist/core/socket-server/index.d.ts +10 -4
- package/dist/core/socket-server/index.d.ts.map +1 -1
- package/dist/core/socket-server/index.js +6 -3
- package/dist/core/socket-server/index.js.map +1 -1
- package/dist/core/socket-server/permission-delivery.d.ts +125 -0
- package/dist/core/socket-server/permission-delivery.d.ts.map +1 -0
- package/dist/core/socket-server/permission-delivery.js +152 -0
- package/dist/core/socket-server/permission-delivery.js.map +1 -0
- package/dist/core/socket-server/permission-registry.d.ts +301 -0
- package/dist/core/socket-server/permission-registry.d.ts.map +1 -0
- package/dist/core/socket-server/permission-registry.js +410 -0
- package/dist/core/socket-server/permission-registry.js.map +1 -0
- package/dist/core/socket-server/permission-relay.d.ts +81 -0
- package/dist/core/socket-server/permission-relay.d.ts.map +1 -0
- package/dist/core/socket-server/permission-relay.js +528 -0
- package/dist/core/socket-server/permission-relay.js.map +1 -0
- package/dist/core/socket-server/safe-text.d.ts +83 -0
- package/dist/core/socket-server/safe-text.d.ts.map +1 -0
- package/dist/core/socket-server/safe-text.js +277 -0
- package/dist/core/socket-server/safe-text.js.map +1 -0
- package/dist/core/socket-server/session-integration.d.ts +65 -2
- package/dist/core/socket-server/session-integration.d.ts.map +1 -1
- package/dist/core/socket-server/session-integration.js +434 -32
- package/dist/core/socket-server/session-integration.js.map +1 -1
- package/dist/core/socket-server/socket-client.d.ts +21 -2
- package/dist/core/socket-server/socket-client.d.ts.map +1 -1
- package/dist/core/socket-server/socket-client.js +52 -1
- package/dist/core/socket-server/socket-client.js.map +1 -1
- package/dist/core/socket-server/socket-server.d.ts +152 -1
- package/dist/core/socket-server/socket-server.d.ts.map +1 -1
- package/dist/core/socket-server/socket-server.js +775 -26
- package/dist/core/socket-server/socket-server.js.map +1 -1
- package/dist/core/socket-server/types.d.ts +106 -2
- package/dist/core/socket-server/types.d.ts.map +1 -1
- package/dist/core/socket-server/types.js +13 -1
- package/dist/core/socket-server/types.js.map +1 -1
- package/dist/core/system-prompt.d.ts.map +1 -1
- package/dist/core/system-prompt.js +10 -21
- package/dist/core/system-prompt.js.map +1 -1
- package/dist/core/tools/bash.d.ts +3 -1
- package/dist/core/tools/bash.d.ts.map +1 -1
- package/dist/core/tools/bash.js +39 -7
- package/dist/core/tools/bash.js.map +1 -1
- package/dist/core/tools/edit.d.ts.map +1 -1
- package/dist/core/tools/edit.js +17 -2
- package/dist/core/tools/edit.js.map +1 -1
- package/dist/core/tools/find.d.ts +3 -0
- package/dist/core/tools/find.d.ts.map +1 -1
- package/dist/core/tools/find.js +11 -18
- package/dist/core/tools/find.js.map +1 -1
- package/dist/core/tools/read.js +1 -1
- package/dist/core/tools/read.js.map +1 -1
- package/dist/core/tools/tool-definition-wrapper.d.ts.map +1 -1
- package/dist/core/tools/tool-definition-wrapper.js +3 -1
- package/dist/core/tools/tool-definition-wrapper.js.map +1 -1
- package/dist/core/trust-manager.d.ts +6 -4
- package/dist/core/trust-manager.d.ts.map +1 -1
- package/dist/core/trust-manager.js +55 -21
- package/dist/core/trust-manager.js.map +1 -1
- package/dist/core/usage-totals.d.ts +19 -0
- package/dist/core/usage-totals.d.ts.map +1 -0
- package/dist/core/usage-totals.js +52 -0
- package/dist/core/usage-totals.js.map +1 -0
- package/dist/extensions/index.d.ts +3 -0
- package/dist/extensions/index.d.ts.map +1 -0
- package/dist/extensions/index.js +7 -0
- package/dist/extensions/index.js.map +1 -0
- package/dist/extensions/llama/client.d.ts +61 -0
- package/dist/extensions/llama/client.d.ts.map +1 -0
- package/dist/extensions/llama/client.js +300 -0
- package/dist/extensions/llama/client.js.map +1 -0
- package/dist/extensions/llama/huggingface.d.ts +23 -0
- package/dist/extensions/llama/huggingface.d.ts.map +1 -0
- package/dist/extensions/llama/huggingface.js +139 -0
- package/dist/extensions/llama/huggingface.js.map +1 -0
- package/dist/extensions/llama/index.d.ts +3 -0
- package/dist/extensions/llama/index.d.ts.map +1 -0
- package/dist/extensions/llama/index.js +208 -0
- package/dist/extensions/llama/index.js.map +1 -0
- package/dist/extensions/llama/provider.d.ts +10 -0
- package/dist/extensions/llama/provider.d.ts.map +1 -0
- package/dist/extensions/llama/provider.js +111 -0
- package/dist/extensions/llama/provider.js.map +1 -0
- package/dist/extensions/llama/ui.d.ts +42 -0
- package/dist/extensions/llama/ui.d.ts.map +1 -0
- package/dist/extensions/llama/ui.js +400 -0
- package/dist/extensions/llama/ui.js.map +1 -0
- package/dist/extensions/stub-provider/index.d.ts +9 -0
- package/dist/extensions/stub-provider/index.d.ts.map +1 -0
- package/dist/extensions/stub-provider/index.js +13 -0
- package/dist/extensions/stub-provider/index.js.map +1 -0
- package/dist/extensions/stub-provider/provider.d.ts +77 -0
- package/dist/extensions/stub-provider/provider.d.ts.map +1 -0
- package/dist/extensions/stub-provider/provider.js +193 -0
- package/dist/extensions/stub-provider/provider.js.map +1 -0
- package/dist/hooks/gsd/draht-quality-gate.js +3 -3
- package/dist/index.d.ts +4 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +305 -61
- package/dist/main.js.map +1 -1
- package/dist/modes/interactive/components/assistant-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/assistant-message.js +22 -10
- package/dist/modes/interactive/components/assistant-message.js.map +1 -1
- package/dist/modes/interactive/components/config-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/config-selector.js +3 -2
- package/dist/modes/interactive/components/config-selector.js.map +1 -1
- package/dist/modes/interactive/components/custom-editor.js +1 -1
- package/dist/modes/interactive/components/custom-editor.js.map +1 -1
- package/dist/modes/interactive/components/custom-message.d.ts +3 -1
- package/dist/modes/interactive/components/custom-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/custom-message.js +9 -2
- package/dist/modes/interactive/components/custom-message.js.map +1 -1
- package/dist/modes/interactive/components/extension-editor.d.ts +1 -2
- package/dist/modes/interactive/components/extension-editor.d.ts.map +1 -1
- package/dist/modes/interactive/components/extension-editor.js +16 -46
- package/dist/modes/interactive/components/extension-editor.js.map +1 -1
- package/dist/modes/interactive/components/extension-selector.d.ts +49 -0
- package/dist/modes/interactive/components/extension-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/extension-selector.js +202 -5
- package/dist/modes/interactive/components/extension-selector.js.map +1 -1
- package/dist/modes/interactive/components/footer.d.ts.map +1 -1
- package/dist/modes/interactive/components/footer.js +24 -23
- package/dist/modes/interactive/components/footer.js.map +1 -1
- package/dist/modes/interactive/components/login-dialog.d.ts +5 -5
- package/dist/modes/interactive/components/login-dialog.d.ts.map +1 -1
- package/dist/modes/interactive/components/login-dialog.js +17 -8
- package/dist/modes/interactive/components/login-dialog.js.map +1 -1
- package/dist/modes/interactive/components/model-selector.d.ts +11 -4
- package/dist/modes/interactive/components/model-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/model-selector.js +74 -41
- package/dist/modes/interactive/components/model-selector.js.map +1 -1
- package/dist/modes/interactive/components/oauth-selector.d.ts +4 -4
- package/dist/modes/interactive/components/oauth-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/oauth-selector.js +14 -25
- package/dist/modes/interactive/components/oauth-selector.js.map +1 -1
- package/dist/modes/interactive/components/scoped-models-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/scoped-models-selector.js +22 -13
- package/dist/modes/interactive/components/scoped-models-selector.js.map +1 -1
- package/dist/modes/interactive/components/session-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/session-selector.js +10 -2
- package/dist/modes/interactive/components/session-selector.js.map +1 -1
- package/dist/modes/interactive/components/settings-selector.d.ts +2 -0
- package/dist/modes/interactive/components/settings-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/settings-selector.js +10 -0
- package/dist/modes/interactive/components/settings-selector.js.map +1 -1
- package/dist/modes/interactive/components/tool-execution.d.ts.map +1 -1
- package/dist/modes/interactive/components/tool-execution.js +10 -1
- package/dist/modes/interactive/components/tool-execution.js.map +1 -1
- package/dist/modes/interactive/components/tree-selector.d.ts +25 -2
- package/dist/modes/interactive/components/tree-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/tree-selector.js +68 -17
- package/dist/modes/interactive/components/tree-selector.js.map +1 -1
- package/dist/modes/interactive/external-editor.d.ts +12 -0
- package/dist/modes/interactive/external-editor.d.ts.map +1 -0
- package/dist/modes/interactive/external-editor.js +37 -0
- package/dist/modes/interactive/external-editor.js.map +1 -0
- package/dist/modes/interactive/interactive-mode.d.ts +107 -10
- package/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-mode.js +763 -285
- package/dist/modes/interactive/interactive-mode.js.map +1 -1
- package/dist/modes/rpc/rpc-client.d.ts +4 -0
- package/dist/modes/rpc/rpc-client.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-client.js +7 -0
- package/dist/modes/rpc/rpc-client.js.map +1 -1
- package/dist/modes/rpc/rpc-mode.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-mode.js +185 -9
- package/dist/modes/rpc/rpc-mode.js.map +1 -1
- package/dist/modes/rpc/rpc-types.d.ts +79 -1
- 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.map +1 -1
- package/dist/package-manager-cli.js +67 -5
- package/dist/package-manager-cli.js.map +1 -1
- package/dist/prompts/commands/atomic-commit.md +1 -12
- package/dist/prompts/commands/brainstorm.md +12 -15
- package/dist/prompts/commands/create-verification-skill.md +108 -0
- package/dist/prompts/commands/discuss-phase.md +3 -14
- package/dist/prompts/commands/execute-phase.md +3 -11
- package/dist/prompts/commands/fix.md +41 -18
- package/dist/prompts/commands/grill.md +66 -0
- package/dist/prompts/commands/init-project.md +5 -15
- package/dist/prompts/commands/map-codebase.md +1 -13
- package/dist/prompts/commands/new-project.md +5 -15
- package/dist/prompts/commands/next-milestone.md +1 -13
- package/dist/prompts/commands/orchestrate.md +1 -1
- package/dist/prompts/commands/pause-work.md +1 -13
- package/dist/prompts/commands/plan-phase.md +2 -11
- package/dist/prompts/commands/progress.md +0 -13
- package/dist/prompts/commands/quick.md +3 -11
- package/dist/prompts/commands/resolve-conflicts.md +71 -0
- package/dist/prompts/commands/resume-work.md +0 -13
- package/dist/prompts/commands/review.md +4 -13
- package/dist/prompts/commands/triage.md +159 -0
- package/dist/prompts/commands/verify-work.md +4 -14
- package/dist/prompts/commands/why.md +135 -0
- package/dist/skills/atomic-reasoning/SKILL.md +115 -0
- package/dist/skills/blast-radius/SKILL.md +55 -0
- package/dist/skills/epistemics/SKILL.md +99 -0
- package/dist/skills/hexagon-animation/SKILL.md +49 -0
- package/dist/skills/hexagon-animation/generate.mjs +81 -0
- package/dist/skills/hexagon-animation/template.html +361 -0
- package/dist/skills/typescript-discipline/SKILL.md +50 -0
- package/dist/skills/typescript-discipline/references/patterns.md +294 -0
- package/dist/skills/unslop/SKILL.md +101 -0
- package/dist/utils/canonical-path.d.ts +28 -0
- package/dist/utils/canonical-path.d.ts.map +1 -0
- package/dist/utils/canonical-path.js +90 -0
- package/dist/utils/canonical-path.js.map +1 -0
- package/dist/utils/child-process.d.ts +12 -1
- package/dist/utils/child-process.d.ts.map +1 -1
- package/dist/utils/child-process.js +25 -8
- package/dist/utils/child-process.js.map +1 -1
- package/dist/utils/clipboard-native.d.ts +1 -0
- package/dist/utils/clipboard-native.d.ts.map +1 -1
- package/dist/utils/clipboard-native.js.map +1 -1
- package/dist/utils/clipboard.d.ts +2 -0
- package/dist/utils/clipboard.d.ts.map +1 -1
- package/dist/utils/clipboard.js +53 -9
- package/dist/utils/clipboard.js.map +1 -1
- package/dist/utils/exif-orientation.d.ts.map +1 -1
- package/dist/utils/exif-orientation.js +2 -3
- package/dist/utils/exif-orientation.js.map +1 -1
- package/dist/utils/paths.d.ts +2 -7
- package/dist/utils/paths.d.ts.map +1 -1
- package/dist/utils/paths.js +13 -15
- package/dist/utils/paths.js.map +1 -1
- package/dist/utils/shell.d.ts.map +1 -1
- package/dist/utils/shell.js +6 -4
- package/dist/utils/shell.js.map +1 -1
- package/dist/utils/tools-manager.d.ts.map +1 -1
- package/dist/utils/tools-manager.js +3 -5
- package/dist/utils/tools-manager.js.map +1 -1
- package/dist/utils/version-check.d.ts.map +1 -1
- package/dist/utils/version-check.js +3 -1
- package/dist/utils/version-check.js.map +1 -1
- package/docs/attachable-sessions.md +79 -0
- package/docs/compaction.md +29 -24
- package/docs/containerization.md +23 -23
- package/docs/custom-provider.md +66 -32
- package/docs/development.md +9 -9
- package/docs/docs.json +6 -2
- package/docs/duet.md +42 -0
- package/docs/environment-variables.md +88 -0
- package/docs/extensions.md +278 -65
- package/docs/index.md +12 -10
- package/docs/json.md +12 -8
- package/docs/keybindings.md +8 -5
- package/docs/llama-cpp.md +99 -0
- package/docs/models.md +19 -8
- package/docs/packages.md +43 -42
- package/docs/prompt-templates.md +5 -4
- package/docs/providers.md +45 -11
- package/docs/quickstart.md +33 -33
- package/docs/rpc.md +190 -19
- package/docs/sdk.md +18 -15
- package/docs/security.md +18 -18
- package/docs/session-format.md +53 -15
- package/docs/sessions.md +17 -14
- package/docs/settings.md +26 -19
- package/docs/shell-aliases.md +2 -2
- package/docs/skills.md +12 -11
- package/docs/terminal-setup.md +12 -12
- package/docs/termux.md +6 -6
- package/docs/themes.md +11 -11
- package/docs/tmux.md +4 -4
- package/docs/tui.md +46 -31
- package/docs/usage.md +53 -63
- package/docs/windows.md +2 -2
- package/examples/extensions/custom-compaction.ts +4 -0
- package/examples/extensions/custom-provider-anthropic/index.ts +9 -3
- package/examples/extensions/custom-provider-anthropic/package.json +1 -1
- package/examples/extensions/custom-provider-gitlab-duo/package.json +1 -1
- package/examples/extensions/custom-provider-qwen-cli/package.json +1 -1
- package/examples/extensions/gondolin/package.json +2 -2
- package/examples/extensions/handoff.ts +9 -1
- package/examples/extensions/kimi-deferred-tools.ts +61 -0
- package/examples/extensions/message-renderer.ts +2 -2
- package/examples/extensions/overlay-qa-tests.ts +3 -3
- package/examples/extensions/sandbox/package.json +1 -1
- package/examples/extensions/summarize.ts +3 -0
- package/examples/extensions/with-deps/package.json +1 -1
- package/examples/sdk/02-custom-model.ts +5 -8
- package/examples/sdk/09-api-keys-and-oauth.ts +15 -31
- package/examples/sdk/12-full-control.ts +9 -12
- package/hooks/gsd/draht-quality-gate.js +3 -3
- package/package.json +14 -11
- package/prompts/commands/atomic-commit.md +1 -12
- package/prompts/commands/brainstorm.md +12 -15
- package/prompts/commands/create-verification-skill.md +108 -0
- package/prompts/commands/discuss-phase.md +3 -14
- package/prompts/commands/execute-phase.md +3 -11
- package/prompts/commands/fix.md +41 -18
- package/prompts/commands/grill.md +66 -0
- package/prompts/commands/init-project.md +5 -15
- package/prompts/commands/map-codebase.md +1 -13
- package/prompts/commands/new-project.md +5 -15
- package/prompts/commands/next-milestone.md +1 -13
- package/prompts/commands/orchestrate.md +1 -1
- package/prompts/commands/pause-work.md +1 -13
- package/prompts/commands/plan-phase.md +2 -11
- package/prompts/commands/progress.md +0 -13
- package/prompts/commands/quick.md +3 -11
- package/prompts/commands/resolve-conflicts.md +71 -0
- package/prompts/commands/resume-work.md +0 -13
- package/prompts/commands/review.md +4 -13
- package/prompts/commands/triage.md +159 -0
- package/prompts/commands/verify-work.md +4 -14
- package/prompts/commands/why.md +135 -0
- package/skills/atomic-reasoning/SKILL.md +115 -0
- package/skills/blast-radius/SKILL.md +55 -0
- package/skills/epistemics/SKILL.md +99 -0
- package/skills/hexagon-animation/SKILL.md +49 -0
- package/skills/hexagon-animation/generate.mjs +81 -0
- package/skills/hexagon-animation/template.html +361 -0
- package/skills/typescript-discipline/SKILL.md +50 -0
- package/skills/typescript-discipline/references/patterns.md +294 -0
- package/skills/unslop/SKILL.md +101 -0
- package/dist/core/provider-display-names.d.ts +0 -2
- package/dist/core/provider-display-names.d.ts.map +0 -1
- package/dist/core/provider-display-names.js +0 -36
- package/dist/core/provider-display-names.js.map +0 -1
- package/dist/prompts/agents/build.md +0 -86
- package/dist/prompts/agents/plan.md +0 -79
- package/dist/prompts/agents/verify.md +0 -69
- package/prompts/agents/build.md +0 -86
- package/prompts/agents/plan.md +0 -79
- package/prompts/agents/verify.md +0 -69
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { Provider } from "@draht/ai";
|
|
2
|
+
export declare const REMOTE_CATALOG_REFRESH_INTERVAL_MS: number;
|
|
3
|
+
/** Add a persisted pi.dev catalog overlay to a static built-in provider. */
|
|
4
|
+
export declare function withRemoteCatalog(provider: Provider, catalogBaseUrl?: string, localGeneratedAt?: number): Provider;
|
|
5
|
+
//# sourceMappingURL=remote-catalog-provider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote-catalog-provider.d.ts","sourceRoot":"","sources":["../../src/core/remote-catalog-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgC,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKxE,eAAO,MAAM,kCAAkC,QAAqB,CAAC;AAqCrE,4EAA4E;AAC5E,wBAAgB,iBAAiB,CAChC,QAAQ,EAAE,QAAQ,EAClB,cAAc,GAAE,MAAiC,EACjD,gBAAgB,CAAC,EAAE,MAAM,GACvB,QAAQ,CA2EV"}
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import { VERSION } from "../config.js";
|
|
2
|
+
import { getPiUserAgent } from "../utils/pi-user-agent.js";
|
|
3
|
+
const DEFAULT_CATALOG_BASE_URL = "https://pi.dev";
|
|
4
|
+
export const REMOTE_CATALOG_REFRESH_INTERVAL_MS = 4 * 60 * 60 * 1000;
|
|
5
|
+
function mergeModels(baseline, dynamic) {
|
|
6
|
+
const merged = [...baseline];
|
|
7
|
+
for (const model of dynamic) {
|
|
8
|
+
const index = merged.findIndex((entry) => entry.id === model.id);
|
|
9
|
+
if (index >= 0)
|
|
10
|
+
merged[index] = model;
|
|
11
|
+
else
|
|
12
|
+
merged.push(model);
|
|
13
|
+
}
|
|
14
|
+
return merged;
|
|
15
|
+
}
|
|
16
|
+
function parseCatalog(providerId, value) {
|
|
17
|
+
const entries = Array.isArray(value)
|
|
18
|
+
? value
|
|
19
|
+
: typeof value === "object" && value !== null && "models" in value && Array.isArray(value.models)
|
|
20
|
+
? value.models
|
|
21
|
+
: typeof value === "object" && value !== null
|
|
22
|
+
? Object.values(value)
|
|
23
|
+
: undefined;
|
|
24
|
+
if (!entries)
|
|
25
|
+
throw new Error(`Invalid model catalog for provider "${providerId}"`);
|
|
26
|
+
return entries
|
|
27
|
+
.filter((entry) => typeof entry === "object" && entry !== null && "id" in entry)
|
|
28
|
+
.map((model) => ({ ...model, provider: providerId }));
|
|
29
|
+
}
|
|
30
|
+
function remoteModels(entry, localGeneratedAt) {
|
|
31
|
+
if (!entry)
|
|
32
|
+
return [];
|
|
33
|
+
if (localGeneratedAt !== undefined && (entry.lastModified === undefined || entry.lastModified <= localGeneratedAt)) {
|
|
34
|
+
return [];
|
|
35
|
+
}
|
|
36
|
+
return entry.models;
|
|
37
|
+
}
|
|
38
|
+
/** Add a persisted pi.dev catalog overlay to a static built-in provider. */
|
|
39
|
+
export function withRemoteCatalog(provider, catalogBaseUrl = DEFAULT_CATALOG_BASE_URL, localGeneratedAt) {
|
|
40
|
+
let dynamicModels = [];
|
|
41
|
+
let inflightRefresh;
|
|
42
|
+
return {
|
|
43
|
+
...provider,
|
|
44
|
+
getModels: () => mergeModels(provider.getModels(), dynamicModels),
|
|
45
|
+
refreshModels: (context) => {
|
|
46
|
+
inflightRefresh ??= (async () => {
|
|
47
|
+
try {
|
|
48
|
+
const stored = await context.store.read();
|
|
49
|
+
dynamicModels = remoteModels(stored, localGeneratedAt).filter((model) => model.provider === provider.id);
|
|
50
|
+
if (!context.allowNetwork || context.signal?.aborted)
|
|
51
|
+
return;
|
|
52
|
+
if (!context.force &&
|
|
53
|
+
stored?.checkedAt !== undefined &&
|
|
54
|
+
stored.lastModified !== undefined &&
|
|
55
|
+
Date.now() - stored.checkedAt < REMOTE_CATALOG_REFRESH_INTERVAL_MS) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
// Only revalidate when a cached body backs the validator, so a 304 can never
|
|
59
|
+
// leave the overlay empty.
|
|
60
|
+
const validator = stored?.models.length ? stored.etag : undefined;
|
|
61
|
+
const url = new URL(`/api/models/providers/${encodeURIComponent(provider.id)}`, catalogBaseUrl);
|
|
62
|
+
const response = await fetch(url, {
|
|
63
|
+
headers: {
|
|
64
|
+
accept: "application/json",
|
|
65
|
+
"User-Agent": getPiUserAgent(VERSION),
|
|
66
|
+
...(validator ? { "if-none-match": validator } : {}),
|
|
67
|
+
},
|
|
68
|
+
signal: context.signal,
|
|
69
|
+
});
|
|
70
|
+
if (context.signal?.aborted)
|
|
71
|
+
return;
|
|
72
|
+
const checkedAt = Date.now();
|
|
73
|
+
// Unchanged: dynamicModels already holds the stored overlay, so only the
|
|
74
|
+
// freshness window moves.
|
|
75
|
+
if (response.status === 304 && stored) {
|
|
76
|
+
await context.store.write({ ...stored, checkedAt });
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
if (response.status === 404 || response.status === 501) {
|
|
80
|
+
await context.store.write({
|
|
81
|
+
...(stored ?? { models: [] }),
|
|
82
|
+
checkedAt,
|
|
83
|
+
lastModified: 0,
|
|
84
|
+
etag: undefined,
|
|
85
|
+
});
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
if (!response.ok) {
|
|
89
|
+
// Transient failure: the cached body and its validator stay valid, so keep the
|
|
90
|
+
// etag and let the next refresh revalidate instead of downloading the catalog.
|
|
91
|
+
await context.store.write({ ...(stored ?? { models: [] }), checkedAt });
|
|
92
|
+
throw new Error(`Model catalog request failed for ${provider.id}: ${response.status}`);
|
|
93
|
+
}
|
|
94
|
+
const refreshed = parseCatalog(provider.id, await response.json());
|
|
95
|
+
const lastModified = Date.parse(response.headers.get("last-modified") ?? "");
|
|
96
|
+
if (context.signal?.aborted)
|
|
97
|
+
return;
|
|
98
|
+
const entry = {
|
|
99
|
+
models: refreshed,
|
|
100
|
+
checkedAt,
|
|
101
|
+
lastModified: Number.isNaN(lastModified) ? 0 : lastModified,
|
|
102
|
+
etag: response.headers.get("etag") ?? undefined,
|
|
103
|
+
};
|
|
104
|
+
dynamicModels = remoteModels(entry, localGeneratedAt);
|
|
105
|
+
await context.store.write(entry);
|
|
106
|
+
}
|
|
107
|
+
finally {
|
|
108
|
+
inflightRefresh = undefined;
|
|
109
|
+
}
|
|
110
|
+
})();
|
|
111
|
+
return inflightRefresh;
|
|
112
|
+
},
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
//# sourceMappingURL=remote-catalog-provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote-catalog-provider.js","sourceRoot":"","sources":["../../src/core/remote-catalog-provider.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Api, Model, ModelsStoreEntry, Provider } from \"@draht/ai\";\nimport { VERSION } from \"../config.ts\";\nimport { getPiUserAgent } from \"../utils/pi-user-agent.ts\";\n\nconst DEFAULT_CATALOG_BASE_URL = \"https://pi.dev\";\nexport const REMOTE_CATALOG_REFRESH_INTERVAL_MS = 4 * 60 * 60 * 1000;\n\nfunction mergeModels(baseline: readonly Model<Api>[], dynamic: readonly Model<Api>[]): Model<Api>[] {\n\tconst merged = [...baseline];\n\tfor (const model of dynamic) {\n\t\tconst index = merged.findIndex((entry) => entry.id === model.id);\n\t\tif (index >= 0) merged[index] = model;\n\t\telse merged.push(model);\n\t}\n\treturn merged;\n}\n\nfunction parseCatalog(providerId: string, value: unknown): Model<Api>[] {\n\tconst entries = Array.isArray(value)\n\t\t? value\n\t\t: typeof value === \"object\" && value !== null && \"models\" in value && Array.isArray(value.models)\n\t\t\t? value.models\n\t\t\t: typeof value === \"object\" && value !== null\n\t\t\t\t? Object.values(value)\n\t\t\t\t: undefined;\n\tif (!entries) throw new Error(`Invalid model catalog for provider \"${providerId}\"`);\n\treturn entries\n\t\t.filter((entry): entry is Model<Api> => typeof entry === \"object\" && entry !== null && \"id\" in entry)\n\t\t.map((model) => ({ ...model, provider: providerId }));\n}\n\nfunction remoteModels(\n\tentry: ModelsStoreEntry | undefined,\n\tlocalGeneratedAt: number | undefined,\n): readonly Model<Api>[] {\n\tif (!entry) return [];\n\tif (localGeneratedAt !== undefined && (entry.lastModified === undefined || entry.lastModified <= localGeneratedAt)) {\n\t\treturn [];\n\t}\n\treturn entry.models;\n}\n\n/** Add a persisted pi.dev catalog overlay to a static built-in provider. */\nexport function withRemoteCatalog(\n\tprovider: Provider,\n\tcatalogBaseUrl: string = DEFAULT_CATALOG_BASE_URL,\n\tlocalGeneratedAt?: number,\n): Provider {\n\tlet dynamicModels: readonly Model<Api>[] = [];\n\tlet inflightRefresh: Promise<void> | undefined;\n\n\treturn {\n\t\t...provider,\n\t\tgetModels: () => mergeModels(provider.getModels(), dynamicModels),\n\t\trefreshModels: (context) => {\n\t\t\tinflightRefresh ??= (async () => {\n\t\t\t\ttry {\n\t\t\t\t\tconst stored = await context.store.read();\n\t\t\t\t\tdynamicModels = remoteModels(stored, localGeneratedAt).filter((model) => model.provider === provider.id);\n\t\t\t\t\tif (!context.allowNetwork || context.signal?.aborted) return;\n\t\t\t\t\tif (\n\t\t\t\t\t\t!context.force &&\n\t\t\t\t\t\tstored?.checkedAt !== undefined &&\n\t\t\t\t\t\tstored.lastModified !== undefined &&\n\t\t\t\t\t\tDate.now() - stored.checkedAt < REMOTE_CATALOG_REFRESH_INTERVAL_MS\n\t\t\t\t\t) {\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\n\t\t\t\t\t// Only revalidate when a cached body backs the validator, so a 304 can never\n\t\t\t\t\t// leave the overlay empty.\n\t\t\t\t\tconst validator = stored?.models.length ? stored.etag : undefined;\n\t\t\t\t\tconst url = new URL(`/api/models/providers/${encodeURIComponent(provider.id)}`, catalogBaseUrl);\n\t\t\t\t\tconst response = await fetch(url, {\n\t\t\t\t\t\theaders: {\n\t\t\t\t\t\t\taccept: \"application/json\",\n\t\t\t\t\t\t\t\"User-Agent\": getPiUserAgent(VERSION),\n\t\t\t\t\t\t\t...(validator ? { \"if-none-match\": validator } : {}),\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsignal: context.signal,\n\t\t\t\t\t});\n\t\t\t\t\tif (context.signal?.aborted) return;\n\t\t\t\t\tconst checkedAt = Date.now();\n\t\t\t\t\t// Unchanged: dynamicModels already holds the stored overlay, so only the\n\t\t\t\t\t// freshness window moves.\n\t\t\t\t\tif (response.status === 304 && stored) {\n\t\t\t\t\t\tawait context.store.write({ ...stored, checkedAt });\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t\tif (response.status === 404 || response.status === 501) {\n\t\t\t\t\t\tawait context.store.write({\n\t\t\t\t\t\t\t...(stored ?? { models: [] }),\n\t\t\t\t\t\t\tcheckedAt,\n\t\t\t\t\t\t\tlastModified: 0,\n\t\t\t\t\t\t\tetag: undefined,\n\t\t\t\t\t\t});\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t\tif (!response.ok) {\n\t\t\t\t\t\t// Transient failure: the cached body and its validator stay valid, so keep the\n\t\t\t\t\t\t// etag and let the next refresh revalidate instead of downloading the catalog.\n\t\t\t\t\t\tawait context.store.write({ ...(stored ?? { models: [] }), checkedAt });\n\t\t\t\t\t\tthrow new Error(`Model catalog request failed for ${provider.id}: ${response.status}`);\n\t\t\t\t\t}\n\t\t\t\t\tconst refreshed = parseCatalog(provider.id, await response.json());\n\t\t\t\t\tconst lastModified = Date.parse(response.headers.get(\"last-modified\") ?? \"\");\n\t\t\t\t\tif (context.signal?.aborted) return;\n\t\t\t\t\tconst entry = {\n\t\t\t\t\t\tmodels: refreshed,\n\t\t\t\t\t\tcheckedAt,\n\t\t\t\t\t\tlastModified: Number.isNaN(lastModified) ? 0 : lastModified,\n\t\t\t\t\t\tetag: response.headers.get(\"etag\") ?? undefined,\n\t\t\t\t\t};\n\t\t\t\t\tdynamicModels = remoteModels(entry, localGeneratedAt);\n\t\t\t\t\tawait context.store.write(entry);\n\t\t\t\t} finally {\n\t\t\t\t\tinflightRefresh = undefined;\n\t\t\t\t}\n\t\t\t})();\n\t\t\treturn inflightRefresh;\n\t\t},\n\t};\n}\n"]}
|
|
@@ -47,19 +47,42 @@ export interface ResourceLoader {
|
|
|
47
47
|
}>;
|
|
48
48
|
};
|
|
49
49
|
getSystemPrompt(): string | undefined;
|
|
50
|
+
getSystemPromptSource(): {
|
|
51
|
+
path: string;
|
|
52
|
+
} | undefined;
|
|
50
53
|
getAppendSystemPrompt(): string[];
|
|
54
|
+
getAppendSystemPromptSources(): Array<{
|
|
55
|
+
path: string;
|
|
56
|
+
}>;
|
|
51
57
|
extendResources(paths: ResourceExtensionPaths): void;
|
|
52
58
|
reload(options?: ResourceLoaderReloadOptions): Promise<void>;
|
|
53
59
|
}
|
|
54
60
|
export declare function loadProjectContextFiles(options: {
|
|
55
61
|
cwd: string;
|
|
56
62
|
agentDir: string;
|
|
63
|
+
/**
|
|
64
|
+
* Absolute path the ancestor walk stops at, and the root every discovered project
|
|
65
|
+
* context file must be canonically contained under (R36-SPAWN.6).
|
|
66
|
+
*
|
|
67
|
+
* This is the PROJECT ROOT, not the session cwd: draht-mono itself keeps an AGENTS.md
|
|
68
|
+
* at the repo root that subdirectory sessions are meant to inherit, so rooting at cwd
|
|
69
|
+
* would silently drop it.
|
|
70
|
+
*
|
|
71
|
+
* Left unset the walk runs to `/` and nothing is refused on containment grounds, which
|
|
72
|
+
* is byte-identical to the behaviour every discovered session has today.
|
|
73
|
+
*/
|
|
74
|
+
contextRoot?: string;
|
|
57
75
|
}): Array<{
|
|
58
76
|
path: string;
|
|
59
77
|
content: string;
|
|
60
78
|
}>;
|
|
61
79
|
export interface DefaultResourceLoaderOptions {
|
|
62
80
|
cwd: string;
|
|
81
|
+
/**
|
|
82
|
+
* `cwd` before `path.resolve` collapsed any `..`, for callers that resolve first.
|
|
83
|
+
* The ancestor skill walk needs the uncollapsed spelling to resolve it physically.
|
|
84
|
+
*/
|
|
85
|
+
cwdSpelling?: string;
|
|
63
86
|
agentDir: string;
|
|
64
87
|
settingsManager?: SettingsManager;
|
|
65
88
|
eventBus?: EventBus;
|
|
@@ -73,6 +96,8 @@ export interface DefaultResourceLoaderOptions {
|
|
|
73
96
|
noPromptTemplates?: boolean;
|
|
74
97
|
noThemes?: boolean;
|
|
75
98
|
noContextFiles?: boolean;
|
|
99
|
+
/** Absolute project root that automatically-read context files must stay inside (R36-SPAWN.6). */
|
|
100
|
+
contextRoot?: string;
|
|
76
101
|
systemPrompt?: string;
|
|
77
102
|
appendSystemPrompt?: string[];
|
|
78
103
|
extensionsOverride?: (base: LoadExtensionsResult) => LoadExtensionsResult;
|
|
@@ -113,6 +138,7 @@ export interface DefaultResourceLoaderOptions {
|
|
|
113
138
|
}
|
|
114
139
|
export declare class DefaultResourceLoader implements ResourceLoader {
|
|
115
140
|
private cwd;
|
|
141
|
+
private cwdSpelling;
|
|
116
142
|
private agentDir;
|
|
117
143
|
private settingsManager;
|
|
118
144
|
private eventBus;
|
|
@@ -127,6 +153,7 @@ export declare class DefaultResourceLoader implements ResourceLoader {
|
|
|
127
153
|
private noPromptTemplates;
|
|
128
154
|
private noThemes;
|
|
129
155
|
private noContextFiles;
|
|
156
|
+
private contextRoot?;
|
|
130
157
|
private systemPromptSource?;
|
|
131
158
|
private appendSystemPromptSource?;
|
|
132
159
|
private extensionsOverride?;
|
|
@@ -145,11 +172,14 @@ export declare class DefaultResourceLoader implements ResourceLoader {
|
|
|
145
172
|
private themeDiagnostics;
|
|
146
173
|
private agentsFiles;
|
|
147
174
|
private systemPrompt?;
|
|
175
|
+
private systemPromptSourcePath?;
|
|
148
176
|
private appendSystemPrompt;
|
|
177
|
+
private appendSystemPromptSourcePaths;
|
|
149
178
|
private lastSkillPaths;
|
|
150
179
|
private extensionSkillSourceInfos;
|
|
151
180
|
private extensionPromptSourceInfos;
|
|
152
181
|
private extensionThemeSourceInfos;
|
|
182
|
+
private resourceMetadataByPath;
|
|
153
183
|
private lastPromptPaths;
|
|
154
184
|
private lastThemePaths;
|
|
155
185
|
private loaded;
|
|
@@ -174,7 +204,13 @@ export declare class DefaultResourceLoader implements ResourceLoader {
|
|
|
174
204
|
}>;
|
|
175
205
|
};
|
|
176
206
|
getSystemPrompt(): string | undefined;
|
|
207
|
+
getSystemPromptSource(): {
|
|
208
|
+
path: string;
|
|
209
|
+
} | undefined;
|
|
177
210
|
getAppendSystemPrompt(): string[];
|
|
211
|
+
getAppendSystemPromptSources(): Array<{
|
|
212
|
+
path: string;
|
|
213
|
+
}>;
|
|
178
214
|
extendResources(paths: ResourceExtensionPaths): void;
|
|
179
215
|
loadProjectTrustExtensions(): Promise<LoadExtensionsResult>;
|
|
180
216
|
reload(options?: ResourceLoaderReloadOptions): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-loader.d.ts","sourceRoot":"","sources":["../../src/core/resource-loader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAqB,KAAK,KAAK,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,YAAY,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"resource-loader.d.ts","sourceRoot":"","sources":["../../src/core/resource-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
|
|
2
|
-
import { dirname, join, resolve, sep } from "node:path";
|
|
1
|
+
import { existsSync, lstatSync, readdirSync, readFileSync, realpathSync, statSync } from "node:fs";
|
|
2
|
+
import { basename, dirname, join, resolve, sep } from "node:path";
|
|
3
3
|
import chalk from "chalk";
|
|
4
4
|
import { CONFIG_DIR_NAME } from "../config.js";
|
|
5
5
|
import { loadThemeFromPath } from "../modes/interactive/theme/theme.js";
|
|
6
|
-
import {
|
|
6
|
+
import { comparablePath, realPathStrict } from "../utils/canonical-path.js";
|
|
7
|
+
import { isLocalPath, resolvePath } from "../utils/paths.js";
|
|
7
8
|
import { createEventBus } from "./event-bus.js";
|
|
8
9
|
import { clearExtensionCache, createExtensionRuntime, loadExtensionFromFactory, loadExtensionsCached, } from "./extensions/loader.js";
|
|
10
|
+
import { findGitPaths } from "./footer-data-provider.js";
|
|
9
11
|
import { DefaultPackageManager } from "./package-manager.js";
|
|
10
12
|
import { loadPromptTemplates } from "./prompt-templates.js";
|
|
11
13
|
import { SettingsManager } from "./settings-manager.js";
|
|
@@ -27,27 +29,120 @@ function resolvePromptInput(input, description) {
|
|
|
27
29
|
}
|
|
28
30
|
return input;
|
|
29
31
|
}
|
|
30
|
-
|
|
32
|
+
/**
|
|
33
|
+
* Canonical-path containment with a separator boundary (GSEC-13).
|
|
34
|
+
*
|
|
35
|
+
* `child.startsWith(root)` alone counts `/x/projects-evil` as inside `/x/projects`,
|
|
36
|
+
* which is the defect this helper exists to avoid. Both arguments must already be
|
|
37
|
+
* canonical (realpath'd) — a containment test over uncanonicalized paths can be
|
|
38
|
+
* walked out of with `..` or a symlinked component.
|
|
39
|
+
*/
|
|
40
|
+
function isCanonicallyContained(child, root) {
|
|
41
|
+
if (child === root)
|
|
42
|
+
return true;
|
|
43
|
+
const prefix = root.endsWith(sep) ? root : `${root}${sep}`;
|
|
44
|
+
return child.startsWith(prefix);
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Load the context file (AGENTS.md / CLAUDE.md) sitting directly in `dir`, if any.
|
|
48
|
+
*
|
|
49
|
+
* SECURITY (GSEC-13, R36-SPAWN.6): project context is read automatically and its bytes
|
|
50
|
+
* land verbatim in the system prompt (see `buildSystemPrompt`), so it is attacker-reachable
|
|
51
|
+
* input on any repository a session is pointed at. Three properties, in this order:
|
|
52
|
+
*
|
|
53
|
+
* 1. NO-FOLLOW. `lstatSync` first, and a symbolic link is refused outright rather than
|
|
54
|
+
* resolved. `statSync` follows, so the previous version read an `AGENTS.md` that was a
|
|
55
|
+
* symlink to `~/.ssh/id_rsa` and handed it to the provider. Do not "simplify" this back
|
|
56
|
+
* to `statSync` — the check and the read must both be about the same inode we lstat'd.
|
|
57
|
+
* 2. REGULAR FILE ONLY. A fifo, device, socket or directory named `AGENTS.md` is skipped
|
|
58
|
+
* (a fifo would otherwise block `readFileSync` forever).
|
|
59
|
+
* 3. CONTAINMENT. When `canonicalRoot` is set, the realpath of the file must be inside it,
|
|
60
|
+
* with a separator boundary. Not redundant with the walk break in `loadProjectContextFiles`:
|
|
61
|
+
* that one resolves the *directory* and stops the walk; this one resolves the file
|
|
62
|
+
* itself and fails CLOSED on any realpath error. Do not "simplify" it away.
|
|
63
|
+
*
|
|
64
|
+
* `canonicalRoot` undefined means "no constraint", which is exactly today's behaviour for
|
|
65
|
+
* every discovered session, and for the agent-dir global context file, which is a USER
|
|
66
|
+
* resource rather than a project one and stays exempt.
|
|
67
|
+
*/
|
|
68
|
+
function loadContextFileFromDir(dir, canonicalRoot) {
|
|
31
69
|
const candidates = ["AGENTS.md", "AGENTS.MD", "CLAUDE.md", "CLAUDE.MD"];
|
|
32
70
|
for (const filename of candidates) {
|
|
33
71
|
const filePath = join(dir, filename);
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
72
|
+
// lstat, never stat: a symlink must be refused, not resolved. Its failure is the
|
|
73
|
+
// old `existsSync` guard and stays silent — the ancestor walk crosses directories
|
|
74
|
+
// this process cannot read (EACCES) on the way to `/`, and warning about each of
|
|
75
|
+
// four candidates in each of them would be noise, not a finding.
|
|
76
|
+
let stats;
|
|
77
|
+
try {
|
|
78
|
+
stats = lstatSync(filePath);
|
|
79
|
+
}
|
|
80
|
+
catch {
|
|
81
|
+
continue;
|
|
82
|
+
}
|
|
83
|
+
if (stats.isSymbolicLink()) {
|
|
84
|
+
console.error(chalk.yellow(`Warning: Ignoring context file ${filePath}: symbolic links are not followed`));
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
if (!stats.isFile()) {
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
try {
|
|
91
|
+
if (canonicalRoot !== undefined) {
|
|
92
|
+
const canonical = realpathSync(filePath);
|
|
93
|
+
if (!isCanonicallyContained(canonical, canonicalRoot)) {
|
|
94
|
+
console.error(chalk.yellow(`Warning: Ignoring context file ${filePath}: outside context root ${canonicalRoot}`));
|
|
95
|
+
continue;
|
|
96
|
+
}
|
|
43
97
|
}
|
|
98
|
+
return {
|
|
99
|
+
path: filePath,
|
|
100
|
+
content: readFileSync(filePath, "utf-8"),
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
catch (error) {
|
|
104
|
+
console.error(chalk.yellow(`Warning: Could not read ${filePath}: ${error}`));
|
|
44
105
|
}
|
|
45
106
|
}
|
|
46
107
|
return null;
|
|
47
108
|
}
|
|
109
|
+
/**
|
|
110
|
+
* The main repo's context file that a nested linked worktree's own copy shadows: both
|
|
111
|
+
* are the same tracked AGENTS.md/CLAUDE.md, so loading both loads it twice. Returns
|
|
112
|
+
* undefined when nothing is shadowed, leaving normal ancestor inheritance alone.
|
|
113
|
+
*
|
|
114
|
+
* Returned canonicalized (realpath), because `git worktree add` writes the `.git`
|
|
115
|
+
* file's `gitdir:` target in realpath form while cwd may still be symlinked
|
|
116
|
+
* (macOS `/tmp` -> `/private/tmp`).
|
|
117
|
+
*/
|
|
118
|
+
function findShadowedContextFile(cwd) {
|
|
119
|
+
const gitPaths = findGitPaths(cwd);
|
|
120
|
+
if (!gitPaths)
|
|
121
|
+
return undefined;
|
|
122
|
+
const commonGitDir = comparablePath(gitPaths.commonGitDir);
|
|
123
|
+
const worktreeRoot = comparablePath(gitPaths.repoDir);
|
|
124
|
+
const mainRepoRoot = dirname(commonGitDir);
|
|
125
|
+
// False for an ordinary repo, where the two are the same dir, and for a sibling
|
|
126
|
+
// worktree (`git worktree add ../feat`), whose main repo is not an ancestor.
|
|
127
|
+
if (!worktreeRoot.startsWith(`${mainRepoRoot}${sep}`))
|
|
128
|
+
return undefined;
|
|
129
|
+
// dirname of the common git dir is the main worktree root only when that dir is
|
|
130
|
+
// itself checked out from the same repo. In a bare layout (`proj/.bare` +
|
|
131
|
+
// `proj/main`) it is just the directory holding `.bare`, which tracks nothing; a
|
|
132
|
+
// submodule's gitdir has no `commondir`, so it lands under `.git/modules`.
|
|
133
|
+
if (comparablePath(join(mainRepoRoot, ".git")) !== commonGitDir)
|
|
134
|
+
return undefined;
|
|
135
|
+
const worktreeContextFile = loadContextFileFromDir(worktreeRoot);
|
|
136
|
+
return worktreeContextFile ? join(mainRepoRoot, basename(worktreeContextFile.path)) : undefined;
|
|
137
|
+
}
|
|
48
138
|
export function loadProjectContextFiles(options) {
|
|
49
|
-
|
|
139
|
+
// The gate's own chain, from the spelling itself: `resolvePath` would collapse `..` before
|
|
140
|
+
// any link is followed and walk ancestors the gate never saw. Unresolvable contributes none.
|
|
141
|
+
const realCwd = realPathStrict(options.cwd);
|
|
50
142
|
const resolvedAgentDir = resolvePath(options.agentDir);
|
|
143
|
+
const canonicalRoot = options.contextRoot === undefined ? undefined : realPathStrict(resolvePath(options.contextRoot));
|
|
144
|
+
// A root that will not resolve contains nothing; `undefined` would mean "no constraint".
|
|
145
|
+
const contextRootUnresolvable = options.contextRoot !== undefined && canonicalRoot === undefined;
|
|
51
146
|
const contextFiles = [];
|
|
52
147
|
const seenPaths = new Set();
|
|
53
148
|
const globalContext = loadContextFileFromDir(resolvedAgentDir);
|
|
@@ -56,10 +151,22 @@ export function loadProjectContextFiles(options) {
|
|
|
56
151
|
seenPaths.add(globalContext.path);
|
|
57
152
|
}
|
|
58
153
|
const ancestorContextFiles = [];
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
154
|
+
const shadowedContextFile = realCwd === undefined ? undefined : findShadowedContextFile(realCwd);
|
|
155
|
+
let currentDir = realCwd;
|
|
156
|
+
while (currentDir !== undefined && !contextRootUnresolvable) {
|
|
157
|
+
// Stops the walk at the context root, and refuses a cwd outside it entirely. A
|
|
158
|
+
// directory whose real path is unknown is not known to be contained either.
|
|
159
|
+
if (canonicalRoot !== undefined) {
|
|
160
|
+
const realCurrentDir = realPathStrict(currentDir);
|
|
161
|
+
if (realCurrentDir === undefined || !isCanonicallyContained(realCurrentDir, canonicalRoot)) {
|
|
162
|
+
break;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
const contextFile = loadContextFileFromDir(currentDir, canonicalRoot);
|
|
166
|
+
const isShadowed = shadowedContextFile !== undefined &&
|
|
167
|
+
contextFile !== null &&
|
|
168
|
+
comparablePath(contextFile.path) === shadowedContextFile;
|
|
169
|
+
if (contextFile && !isShadowed && !seenPaths.has(contextFile.path)) {
|
|
63
170
|
ancestorContextFiles.unshift(contextFile);
|
|
64
171
|
seenPaths.add(contextFile.path);
|
|
65
172
|
}
|
|
@@ -74,11 +181,13 @@ export function loadProjectContextFiles(options) {
|
|
|
74
181
|
export class DefaultResourceLoader {
|
|
75
182
|
constructor(options) {
|
|
76
183
|
this.cwd = resolvePath(options.cwd);
|
|
184
|
+
this.cwdSpelling = options.cwdSpelling ?? options.cwd;
|
|
77
185
|
this.agentDir = resolvePath(options.agentDir);
|
|
78
186
|
this.settingsManager = options.settingsManager ?? SettingsManager.create(this.cwd, this.agentDir);
|
|
79
187
|
this.eventBus = options.eventBus ?? createEventBus();
|
|
80
188
|
this.packageManager = new DefaultPackageManager({
|
|
81
189
|
cwd: this.cwd,
|
|
190
|
+
cwdSpelling: this.cwdSpelling,
|
|
82
191
|
agentDir: this.agentDir,
|
|
83
192
|
settingsManager: this.settingsManager,
|
|
84
193
|
});
|
|
@@ -92,6 +201,7 @@ export class DefaultResourceLoader {
|
|
|
92
201
|
this.noPromptTemplates = options.noPromptTemplates ?? false;
|
|
93
202
|
this.noThemes = options.noThemes ?? false;
|
|
94
203
|
this.noContextFiles = options.noContextFiles ?? false;
|
|
204
|
+
this.contextRoot = options.contextRoot;
|
|
95
205
|
this.systemPromptSource = options.systemPrompt;
|
|
96
206
|
this.appendSystemPromptSource = options.appendSystemPrompt;
|
|
97
207
|
this.extensionsOverride = options.extensionsOverride;
|
|
@@ -110,10 +220,12 @@ export class DefaultResourceLoader {
|
|
|
110
220
|
this.themeDiagnostics = [];
|
|
111
221
|
this.agentsFiles = [];
|
|
112
222
|
this.appendSystemPrompt = [];
|
|
223
|
+
this.appendSystemPromptSourcePaths = [];
|
|
113
224
|
this.lastSkillPaths = [];
|
|
114
225
|
this.extensionSkillSourceInfos = new Map();
|
|
115
226
|
this.extensionPromptSourceInfos = new Map();
|
|
116
227
|
this.extensionThemeSourceInfos = new Map();
|
|
228
|
+
this.resourceMetadataByPath = new Map();
|
|
117
229
|
this.lastPromptPaths = [];
|
|
118
230
|
this.lastThemePaths = [];
|
|
119
231
|
this.loaded = false;
|
|
@@ -136,9 +248,15 @@ export class DefaultResourceLoader {
|
|
|
136
248
|
getSystemPrompt() {
|
|
137
249
|
return this.systemPrompt;
|
|
138
250
|
}
|
|
251
|
+
getSystemPromptSource() {
|
|
252
|
+
return this.systemPromptSourcePath ? { path: this.systemPromptSourcePath } : undefined;
|
|
253
|
+
}
|
|
139
254
|
getAppendSystemPrompt() {
|
|
140
255
|
return this.appendSystemPrompt;
|
|
141
256
|
}
|
|
257
|
+
getAppendSystemPromptSources() {
|
|
258
|
+
return this.appendSystemPromptSourcePaths.map((path) => ({ path }));
|
|
259
|
+
}
|
|
142
260
|
extendResources(paths) {
|
|
143
261
|
const skillPaths = this.normalizeExtensionPaths(paths.skillPaths ?? []);
|
|
144
262
|
const promptPaths = this.normalizeExtensionPaths(paths.promptPaths ?? []);
|
|
@@ -154,15 +272,15 @@ export class DefaultResourceLoader {
|
|
|
154
272
|
}
|
|
155
273
|
if (skillPaths.length > 0) {
|
|
156
274
|
this.lastSkillPaths = this.mergePaths(this.lastSkillPaths, skillPaths.map((entry) => entry.path));
|
|
157
|
-
this.updateSkillsFromPaths(this.lastSkillPaths);
|
|
275
|
+
this.updateSkillsFromPaths(this.lastSkillPaths, this.resourceMetadataByPath);
|
|
158
276
|
}
|
|
159
277
|
if (promptPaths.length > 0) {
|
|
160
278
|
this.lastPromptPaths = this.mergePaths(this.lastPromptPaths, promptPaths.map((entry) => entry.path));
|
|
161
|
-
this.updatePromptsFromPaths(this.lastPromptPaths);
|
|
279
|
+
this.updatePromptsFromPaths(this.lastPromptPaths, this.resourceMetadataByPath);
|
|
162
280
|
}
|
|
163
281
|
if (themePaths.length > 0) {
|
|
164
282
|
this.lastThemePaths = this.mergePaths(this.lastThemePaths, themePaths.map((entry) => entry.path));
|
|
165
|
-
this.updateThemesFromPaths(this.lastThemePaths);
|
|
283
|
+
this.updateThemesFromPaths(this.lastThemePaths, this.resourceMetadataByPath);
|
|
166
284
|
}
|
|
167
285
|
}
|
|
168
286
|
async loadProjectTrustExtensions() {
|
|
@@ -189,7 +307,9 @@ export class DefaultResourceLoader {
|
|
|
189
307
|
const cliExtensionPaths = await this.packageManager.resolveExtensionSources(this.additionalExtensionPaths, {
|
|
190
308
|
temporary: true,
|
|
191
309
|
});
|
|
192
|
-
|
|
310
|
+
// Kept on the instance so post-reload passes (extendResources) can still resolve package metadata.
|
|
311
|
+
this.resourceMetadataByPath = new Map();
|
|
312
|
+
const metadataByPath = this.resourceMetadataByPath;
|
|
193
313
|
this.extensionSkillSourceInfos = new Map();
|
|
194
314
|
this.extensionPromptSourceInfos = new Map();
|
|
195
315
|
this.extensionThemeSourceInfos = new Map();
|
|
@@ -282,22 +402,32 @@ export class DefaultResourceLoader {
|
|
|
282
402
|
agentsFiles: this.noContextFiles
|
|
283
403
|
? []
|
|
284
404
|
: loadProjectContextFiles({
|
|
285
|
-
cwd: this.
|
|
405
|
+
cwd: this.cwdSpelling,
|
|
286
406
|
agentDir: this.agentDir,
|
|
407
|
+
contextRoot: this.contextRoot,
|
|
287
408
|
}),
|
|
288
409
|
};
|
|
289
410
|
const resolvedAgentsFiles = this.agentsFilesOverride ? this.agentsFilesOverride(agentsFiles) : agentsFiles;
|
|
290
411
|
this.agentsFiles = resolvedAgentsFiles.agentsFiles;
|
|
291
|
-
const
|
|
412
|
+
const systemPromptSource = this.systemPromptSource ?? this.discoverSystemPromptFile();
|
|
413
|
+
const baseSystemPrompt = resolvePromptInput(systemPromptSource, "system prompt");
|
|
292
414
|
this.systemPrompt = this.systemPromptOverride ? this.systemPromptOverride(baseSystemPrompt) : baseSystemPrompt;
|
|
293
|
-
|
|
294
|
-
(
|
|
415
|
+
this.systemPromptSourcePath =
|
|
416
|
+
systemPromptSource && existsSync(systemPromptSource) ? resolvePath(systemPromptSource) : undefined;
|
|
417
|
+
let appendSources = this.appendSystemPromptSource;
|
|
418
|
+
if (!appendSources) {
|
|
419
|
+
const discoveredAppendSystemPromptFile = this.discoverAppendSystemPromptFile();
|
|
420
|
+
appendSources = discoveredAppendSystemPromptFile ? [discoveredAppendSystemPromptFile] : [];
|
|
421
|
+
}
|
|
295
422
|
const baseAppend = appendSources
|
|
296
423
|
.map((s) => resolvePromptInput(s, "append system prompt"))
|
|
297
424
|
.filter((s) => s !== undefined);
|
|
298
425
|
this.appendSystemPrompt = this.appendSystemPromptOverride
|
|
299
426
|
? this.appendSystemPromptOverride(baseAppend)
|
|
300
427
|
: baseAppend;
|
|
428
|
+
this.appendSystemPromptSourcePaths = appendSources
|
|
429
|
+
.filter((source) => existsSync(source))
|
|
430
|
+
.map((source) => resolvePath(source));
|
|
301
431
|
this.loaded = true;
|
|
302
432
|
}
|
|
303
433
|
async loadCurrentExtensionSet(options) {
|
|
@@ -409,6 +539,7 @@ export class DefaultResourceLoader {
|
|
|
409
539
|
agentDir: this.agentDir,
|
|
410
540
|
skillPaths,
|
|
411
541
|
includeDefaults: false,
|
|
542
|
+
includeShipped: !this.noSkills,
|
|
412
543
|
});
|
|
413
544
|
}
|
|
414
545
|
const resolvedSkills = this.skillsOverride ? this.skillsOverride(skillsResult) : skillsResult;
|
|
@@ -555,7 +686,7 @@ export class DefaultResourceLoader {
|
|
|
555
686
|
const seen = new Set();
|
|
556
687
|
for (const p of [...primary, ...additional]) {
|
|
557
688
|
const resolved = this.resolveResourcePath(p);
|
|
558
|
-
const canonicalPath =
|
|
689
|
+
const canonicalPath = comparablePath(resolved);
|
|
559
690
|
if (seen.has(canonicalPath))
|
|
560
691
|
continue;
|
|
561
692
|
seen.add(canonicalPath);
|
|
@@ -648,6 +779,7 @@ export class DefaultResourceLoader {
|
|
|
648
779
|
const extensionPath = `<inline:${isNamed ? input.name : index + 1}>`;
|
|
649
780
|
try {
|
|
650
781
|
const extension = await loadExtensionFromFactory(factory, this.cwd, this.eventBus, runtime, extensionPath);
|
|
782
|
+
extension.hidden = isNamed && input.hidden;
|
|
651
783
|
extensions.push(extension);
|
|
652
784
|
}
|
|
653
785
|
catch (error) {
|