@draht/coding-agent 2026.7.30 → 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 +154 -0
- package/README.md +46 -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/cli/args.d.ts +10 -0
- package/dist/cli/args.d.ts.map +1 -1
- package/dist/cli/args.js +69 -2
- 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/credential-print.d.ts +1 -1
- package/dist/cli/credential-print.d.ts.map +1 -1
- package/dist/cli/credential-print.js +5 -4
- package/dist/cli/credential-print.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 +87 -30
- package/dist/core/agent-session-runtime.js.map +1 -1
- package/dist/core/agent-session-services.d.ts +1 -1
- package/dist/core/agent-session-services.d.ts.map +1 -1
- package/dist/core/agent-session-services.js +1 -0
- package/dist/core/agent-session-services.js.map +1 -1
- package/dist/core/agent-session.d.ts +35 -16
- package/dist/core/agent-session.d.ts.map +1 -1
- package/dist/core/agent-session.js +149 -64
- package/dist/core/agent-session.js.map +1 -1
- package/dist/core/auth-storage.d.ts +5 -1
- package/dist/core/auth-storage.d.ts.map +1 -1
- package/dist/core/auth-storage.js +72 -15
- 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/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 +1 -1
- package/dist/core/compaction/branch-summarization.d.ts.map +1 -1
- package/dist/core/compaction/branch-summarization.js +9 -4
- package/dist/core/compaction/branch-summarization.js.map +1 -1
- package/dist/core/compaction/compaction.d.ts +5 -0
- package/dist/core/compaction/compaction.d.ts.map +1 -1
- package/dist/core/compaction/compaction.js +25 -4
- package/dist/core/compaction/compaction.js.map +1 -1
- 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 +83 -20
- package/dist/core/extensions/loader.js.map +1 -1
- package/dist/core/extensions/runner.d.ts +13 -2
- package/dist/core/extensions/runner.d.ts.map +1 -1
- package/dist/core/extensions/runner.js +37 -2
- package/dist/core/extensions/runner.js.map +1 -1
- package/dist/core/extensions/types.d.ts +189 -6
- package/dist/core/extensions/types.d.ts.map +1 -1
- package/dist/core/extensions/types.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 +5 -0
- package/dist/core/keybindings.d.ts.map +1 -1
- package/dist/core/keybindings.js +1 -0
- package/dist/core/keybindings.js.map +1 -1
- package/dist/core/model-registry.d.ts +3 -2
- package/dist/core/model-registry.d.ts.map +1 -1
- package/dist/core/model-registry.js +8 -8
- package/dist/core/model-registry.js.map +1 -1
- package/dist/core/model-resolver.d.ts.map +1 -1
- package/dist/core/model-resolver.js +34 -7
- package/dist/core/model-resolver.js.map +1 -1
- package/dist/core/model-runtime.d.ts +7 -1
- package/dist/core/model-runtime.d.ts.map +1 -1
- package/dist/core/model-runtime.js +30 -10
- package/dist/core/model-runtime.js.map +1 -1
- 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 +21 -44
- 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/resource-loader.d.ts +21 -0
- package/dist/core/resource-loader.d.ts.map +1 -1
- package/dist/core/resource-loader.js +101 -24
- package/dist/core/resource-loader.js.map +1 -1
- 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.map +1 -1
- package/dist/core/sdk.js +3 -1
- package/dist/core/sdk.js.map +1 -1
- package/dist/core/session-manager.d.ts +60 -1
- package/dist/core/session-manager.d.ts.map +1 -1
- package/dist/core/session-manager.js +53 -6
- package/dist/core/session-manager.js.map +1 -1
- package/dist/core/settings-manager.d.ts +21 -0
- 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 +8 -9
- package/dist/core/system-prompt.js.map +1 -1
- package/dist/core/tools/bash.d.ts +1 -1
- package/dist/core/tools/bash.d.ts.map +1 -1
- package/dist/core/tools/bash.js +5 -2
- 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/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/extensions/index.d.ts.map +1 -1
- package/dist/extensions/index.js +5 -1
- package/dist/extensions/index.js.map +1 -1
- package/dist/extensions/llama/provider.d.ts.map +1 -1
- package/dist/extensions/llama/provider.js +5 -1
- package/dist/extensions/llama/provider.js.map +1 -1
- 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 +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +242 -45
- package/dist/main.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/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/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 +20 -2
- package/dist/modes/interactive/components/tree-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/tree-selector.js +21 -5
- package/dist/modes/interactive/components/tree-selector.js.map +1 -1
- package/dist/modes/interactive/interactive-mode.d.ts +97 -3
- package/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-mode.js +394 -24
- package/dist/modes/interactive/interactive-mode.js.map +1 -1
- package/dist/modes/rpc/rpc-mode.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-mode.js +165 -7
- package/dist/modes/rpc/rpc-mode.js.map +1 -1
- package/dist/modes/rpc/rpc-types.d.ts +68 -1
- package/dist/modes/rpc/rpc-types.d.ts.map +1 -1
- package/dist/modes/rpc/rpc-types.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.d.ts +1 -1
- package/dist/utils/clipboard.d.ts.map +1 -1
- package/dist/utils/clipboard.js +22 -2
- 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/docs/attachable-sessions.md +79 -0
- package/docs/compaction.md +21 -21
- package/docs/containerization.md +23 -23
- package/docs/custom-provider.md +16 -16
- package/docs/development.md +9 -9
- package/docs/docs.json +6 -2
- package/docs/duet.md +42 -0
- package/docs/extensions.md +58 -58
- package/docs/index.md +10 -10
- package/docs/json.md +7 -7
- package/docs/keybindings.md +6 -5
- package/docs/llama-cpp.md +6 -6
- package/docs/models.md +6 -6
- package/docs/packages.md +43 -43
- package/docs/prompt-templates.md +4 -4
- package/docs/providers.md +12 -12
- package/docs/quickstart.md +32 -32
- package/docs/rpc.md +83 -12
- package/docs/sdk.md +15 -15
- package/docs/security.md +18 -18
- package/docs/session-format.md +35 -13
- package/docs/sessions.md +17 -14
- package/docs/settings.md +25 -18
- 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 +5 -5
- package/docs/usage.md +50 -50
- package/docs/windows.md +2 -2
- package/examples/extensions/overlay-qa-tests.ts +3 -3
- package/hooks/gsd/draht-quality-gate.js +3 -3
- package/package.json +11 -10
- 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/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
|
@@ -76,7 +76,7 @@ export class WorktreeIsolator {
|
|
|
76
76
|
commitPendingChanges(record.worktreePath, `agent: complete task ${taskId}`);
|
|
77
77
|
try {
|
|
78
78
|
git(record.cwd, ["merge", "--no-ff", "-m", `Merge agent task ${taskId}`, record.branch]);
|
|
79
|
-
return { success: true };
|
|
79
|
+
return { success: true, branch: record.branch };
|
|
80
80
|
}
|
|
81
81
|
catch {
|
|
82
82
|
const conflicts = git(record.cwd, ["diff", "--name-only", "--diff-filter=U"])
|
|
@@ -89,7 +89,7 @@ export class WorktreeIsolator {
|
|
|
89
89
|
catch {
|
|
90
90
|
// nothing to abort, or already clean — leave repo state as-is
|
|
91
91
|
}
|
|
92
|
-
return { success: false, conflicts };
|
|
92
|
+
return { success: false, branch: record.branch, conflicts };
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
/** Remove a task's worktree directory and its git worktree registration, if any. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../../src/core/multi-agent/worktree.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Worktree isolator for multi-agent coordination.\n *\n * Gives each agent task its own `git worktree` so parallel agents can edit\n * files without stepping on the shared working directory or each other.\n * Worktrees live under `<cwd>/.draht-worktrees/<taskId>` on a dedicated\n * `agent/<taskId>` branch, and are merged back into the branch that was\n * checked out in `cwd` at creation time.\n *\n * Falls back to returning `cwd` unchanged (no isolation) when `cwd` is not\n * inside a git repository, so callers can use the isolator unconditionally\n * and degrade gracefully outside of git.\n */\n\nimport { execFileSync } from \"node:child_process\";\nimport { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\n/** Name of the directory (relative to the repo working directory) worktrees are created under. */\nexport const WORKTREE_DIR_NAME = \".draht-worktrees\";\n\n/** Result of attempting to merge a task's worktree branch back into its base branch. */\nexport interface MergeResult {\n\tsuccess: boolean;\n\t/** Paths with unresolved conflicts. Present (possibly empty) only when `success` is false. */\n\tconflicts?: string[];\n}\n\ninterface WorktreeRecord {\n\t/** Directory the isolator was created against (where the base branch is checked out). */\n\tcwd: string;\n\t/** Absolute path to the worktree's working directory. */\n\tworktreePath: string;\n\t/** Branch created for the task inside the worktree. */\n\tbranch: string;\n\t/** Branch the task branch was created from, and merges back into. */\n\tbaseBranch: string;\n}\n\n/**\n * Creates, merges, and tears down per-task git worktrees so agents can work\n * in isolated working directories instead of the shared project checkout.\n */\nexport class WorktreeIsolator {\n\tprivate readonly worktrees = new Map<string, WorktreeRecord>();\n\n\t/** True when `cwd` exists and is inside a git working tree. */\n\tisGitRepo(cwd: string): boolean {\n\t\tif (!existsSync(cwd)) return false;\n\t\ttry {\n\t\t\treturn git(cwd, [\"rev-parse\", \"--is-inside-work-tree\"]).trim() === \"true\";\n\t\t} catch {\n\t\t\treturn false;\n\t\t}\n\t}\n\n\t/**\n\t * Create an isolated worktree for `taskId`, branched off `baseBranch`\n\t * (defaults to whatever branch is currently checked out in `cwd`).\n\t * Returns the worktree's absolute path. When `cwd` is not a git\n\t * repository, isolation is skipped and `cwd` is returned unchanged.\n\t * Calling this again for a `taskId` that already has a worktree returns\n\t * the existing path without recreating it.\n\t */\n\tcreate(cwd: string, taskId: string, baseBranch?: string): string {\n\t\tif (!this.isGitRepo(cwd)) {\n\t\t\treturn cwd;\n\t\t}\n\n\t\tconst existing = this.worktrees.get(taskId);\n\t\tif (existing) {\n\t\t\treturn existing.worktreePath;\n\t\t}\n\n\t\tconst worktreeRoot = join(cwd, WORKTREE_DIR_NAME);\n\t\tmkdirSync(worktreeRoot, { recursive: true });\n\t\texcludeFromStatus(cwd, `${WORKTREE_DIR_NAME}/`);\n\n\t\tconst worktreePath = join(worktreeRoot, taskId);\n\t\tconst branch = `agent/${taskId}`;\n\t\tconst baseline = baseBranch ?? git(cwd, [\"rev-parse\", \"--abbrev-ref\", \"HEAD\"]).trim();\n\n\t\tgit(cwd, [\"worktree\", \"add\", \"-b\", branch, worktreePath, baseline]);\n\n\t\tthis.worktrees.set(taskId, { cwd, worktreePath, branch, baseBranch: baseline });\n\t\treturn worktreePath;\n\t}\n\n\t/**\n\t * Merge a task's branch back into its base branch. Any pending changes\n\t * left uncommitted in the worktree are committed first. On conflict, the\n\t * merge is aborted (the base branch is left exactly as it was before the\n\t * call) and the conflicting paths are reported instead of force-resolving.\n\t * Returns `{ success: false, conflicts: [] }` for an unknown `taskId`.\n\t */\n\tmerge(taskId: string): MergeResult {\n\t\tconst record = this.worktrees.get(taskId);\n\t\tif (!record) {\n\t\t\treturn { success: false, conflicts: [] };\n\t\t}\n\n\t\tcommitPendingChanges(record.worktreePath, `agent: complete task ${taskId}`);\n\n\t\ttry {\n\t\t\tgit(record.cwd, [\"merge\", \"--no-ff\", \"-m\", `Merge agent task ${taskId}`, record.branch]);\n\t\t\treturn { success: true };\n\t\t} catch {\n\t\t\tconst conflicts = git(record.cwd, [\"diff\", \"--name-only\", \"--diff-filter=U\"])\n\t\t\t\t.trim()\n\t\t\t\t.split(\"\\n\")\n\t\t\t\t.filter(Boolean);\n\t\t\ttry {\n\t\t\t\tgit(record.cwd, [\"merge\", \"--abort\"]);\n\t\t\t} catch {\n\t\t\t\t// nothing to abort, or already clean — leave repo state as-is\n\t\t\t}\n\t\t\treturn { success: false, conflicts };\n\t\t}\n\t}\n\n\t/** Remove a task's worktree directory and its git worktree registration, if any. */\n\tcleanup(taskId: string): void {\n\t\tconst record = this.worktrees.get(taskId);\n\t\tif (!record) return;\n\n\t\ttry {\n\t\t\tgit(record.cwd, [\"worktree\", \"remove\", record.worktreePath, \"--force\"]);\n\t\t} catch {\n\t\t\tif (existsSync(record.worktreePath)) {\n\t\t\t\trmSync(record.worktreePath, { recursive: true, force: true });\n\t\t\t}\n\t\t\ttry {\n\t\t\t\tgit(record.cwd, [\"worktree\", \"prune\"]);\n\t\t\t} catch {\n\t\t\t\t// best effort\n\t\t\t}\n\t\t}\n\n\t\tthis.worktrees.delete(taskId);\n\t}\n}\n\nfunction git(cwd: string, args: string[]): string {\n\treturn execFileSync(\"git\", args, { cwd, encoding: \"utf-8\", stdio: [\"ignore\", \"pipe\", \"pipe\"] });\n}\n\n/** Stage and commit any pending changes in `worktreePath`. No-op when the tree is clean. */\nfunction commitPendingChanges(worktreePath: string, message: string): void {\n\tgit(worktreePath, [\"add\", \"-A\"]);\n\tconst status = git(worktreePath, [\"status\", \"--porcelain\"]).trim();\n\tif (status.length === 0) return;\n\tgit(worktreePath, [\"commit\", \"-m\", message]);\n}\n\n/**\n * Add `pattern` to the repository's shared `info/exclude` so the worktree\n * directory doesn't show up as untracked in `git status` for the base branch.\n * Best-effort: failures are swallowed since this is a status-hygiene nicety,\n * not required for isolation or merging to work.\n */\nfunction excludeFromStatus(cwd: string, pattern: string): void {\n\ttry {\n\t\tconst gitDir = git(cwd, [\"rev-parse\", \"--git-common-dir\"]).trim();\n\t\tconst excludePath = join(gitDir.startsWith(\"/\") ? gitDir : join(cwd, gitDir), \"info\", \"exclude\");\n\t\tconst current = existsSync(excludePath) ? readFileSync(excludePath, \"utf-8\") : \"\";\n\t\tif (current.split(\"\\n\").includes(pattern)) return;\n\t\tconst separator = current.length > 0 && !current.endsWith(\"\\n\") ? \"\\n\" : \"\";\n\t\twriteFileSync(excludePath, `${current}${separator}${pattern}\\n`, \"utf-8\");\n\t} catch {\n\t\t// best effort\n\t}\n}\n"]}
|
|
1
|
+
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../../src/core/multi-agent/worktree.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Worktree isolator for multi-agent coordination.\n *\n * Gives each agent task its own `git worktree` so parallel agents can edit\n * files without stepping on the shared working directory or each other.\n * Worktrees live under `<cwd>/.draht-worktrees/<taskId>` on a dedicated\n * `agent/<taskId>` branch, and are merged back into the branch that was\n * checked out in `cwd` at creation time.\n *\n * Falls back to returning `cwd` unchanged (no isolation) when `cwd` is not\n * inside a git repository, so callers can use the isolator unconditionally\n * and degrade gracefully outside of git.\n */\n\nimport { execFileSync } from \"node:child_process\";\nimport { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\n/** Name of the directory (relative to the repo working directory) worktrees are created under. */\nexport const WORKTREE_DIR_NAME = \".draht-worktrees\";\n\n/** Result of attempting to merge a task's worktree branch back into its base branch. */\nexport interface MergeResult {\n\tsuccess: boolean;\n\t/** The `agent/<taskId>` branch the task's work is committed on. Absent for an unknown `taskId`. */\n\tbranch?: string;\n\t/** Paths with unresolved conflicts. Present (possibly empty) only when `success` is false. */\n\tconflicts?: string[];\n}\n\ninterface WorktreeRecord {\n\t/** Directory the isolator was created against (where the base branch is checked out). */\n\tcwd: string;\n\t/** Absolute path to the worktree's working directory. */\n\tworktreePath: string;\n\t/** Branch created for the task inside the worktree. */\n\tbranch: string;\n\t/** Branch the task branch was created from, and merges back into. */\n\tbaseBranch: string;\n}\n\n/**\n * Creates, merges, and tears down per-task git worktrees so agents can work\n * in isolated working directories instead of the shared project checkout.\n */\nexport class WorktreeIsolator {\n\tprivate readonly worktrees = new Map<string, WorktreeRecord>();\n\n\t/** True when `cwd` exists and is inside a git working tree. */\n\tisGitRepo(cwd: string): boolean {\n\t\tif (!existsSync(cwd)) return false;\n\t\ttry {\n\t\t\treturn git(cwd, [\"rev-parse\", \"--is-inside-work-tree\"]).trim() === \"true\";\n\t\t} catch {\n\t\t\treturn false;\n\t\t}\n\t}\n\n\t/**\n\t * Create an isolated worktree for `taskId`, branched off `baseBranch`\n\t * (defaults to whatever branch is currently checked out in `cwd`).\n\t * Returns the worktree's absolute path. When `cwd` is not a git\n\t * repository, isolation is skipped and `cwd` is returned unchanged.\n\t * Calling this again for a `taskId` that already has a worktree returns\n\t * the existing path without recreating it.\n\t */\n\tcreate(cwd: string, taskId: string, baseBranch?: string): string {\n\t\tif (!this.isGitRepo(cwd)) {\n\t\t\treturn cwd;\n\t\t}\n\n\t\tconst existing = this.worktrees.get(taskId);\n\t\tif (existing) {\n\t\t\treturn existing.worktreePath;\n\t\t}\n\n\t\tconst worktreeRoot = join(cwd, WORKTREE_DIR_NAME);\n\t\tmkdirSync(worktreeRoot, { recursive: true });\n\t\texcludeFromStatus(cwd, `${WORKTREE_DIR_NAME}/`);\n\n\t\tconst worktreePath = join(worktreeRoot, taskId);\n\t\tconst branch = `agent/${taskId}`;\n\t\tconst baseline = baseBranch ?? git(cwd, [\"rev-parse\", \"--abbrev-ref\", \"HEAD\"]).trim();\n\n\t\tgit(cwd, [\"worktree\", \"add\", \"-b\", branch, worktreePath, baseline]);\n\n\t\tthis.worktrees.set(taskId, { cwd, worktreePath, branch, baseBranch: baseline });\n\t\treturn worktreePath;\n\t}\n\n\t/**\n\t * Merge a task's branch back into its base branch. Any pending changes\n\t * left uncommitted in the worktree are committed first. On conflict, the\n\t * merge is aborted (the base branch is left exactly as it was before the\n\t * call) and the conflicting paths are reported instead of force-resolving.\n\t * Returns `{ success: false, conflicts: [] }` for an unknown `taskId`.\n\t */\n\tmerge(taskId: string): MergeResult {\n\t\tconst record = this.worktrees.get(taskId);\n\t\tif (!record) {\n\t\t\treturn { success: false, conflicts: [] };\n\t\t}\n\n\t\tcommitPendingChanges(record.worktreePath, `agent: complete task ${taskId}`);\n\n\t\ttry {\n\t\t\tgit(record.cwd, [\"merge\", \"--no-ff\", \"-m\", `Merge agent task ${taskId}`, record.branch]);\n\t\t\treturn { success: true, branch: record.branch };\n\t\t} catch {\n\t\t\tconst conflicts = git(record.cwd, [\"diff\", \"--name-only\", \"--diff-filter=U\"])\n\t\t\t\t.trim()\n\t\t\t\t.split(\"\\n\")\n\t\t\t\t.filter(Boolean);\n\t\t\ttry {\n\t\t\t\tgit(record.cwd, [\"merge\", \"--abort\"]);\n\t\t\t} catch {\n\t\t\t\t// nothing to abort, or already clean — leave repo state as-is\n\t\t\t}\n\t\t\treturn { success: false, branch: record.branch, conflicts };\n\t\t}\n\t}\n\n\t/** Remove a task's worktree directory and its git worktree registration, if any. */\n\tcleanup(taskId: string): void {\n\t\tconst record = this.worktrees.get(taskId);\n\t\tif (!record) return;\n\n\t\ttry {\n\t\t\tgit(record.cwd, [\"worktree\", \"remove\", record.worktreePath, \"--force\"]);\n\t\t} catch {\n\t\t\tif (existsSync(record.worktreePath)) {\n\t\t\t\trmSync(record.worktreePath, { recursive: true, force: true });\n\t\t\t}\n\t\t\ttry {\n\t\t\t\tgit(record.cwd, [\"worktree\", \"prune\"]);\n\t\t\t} catch {\n\t\t\t\t// best effort\n\t\t\t}\n\t\t}\n\n\t\tthis.worktrees.delete(taskId);\n\t}\n}\n\nfunction git(cwd: string, args: string[]): string {\n\treturn execFileSync(\"git\", args, { cwd, encoding: \"utf-8\", stdio: [\"ignore\", \"pipe\", \"pipe\"] });\n}\n\n/** Stage and commit any pending changes in `worktreePath`. No-op when the tree is clean. */\nfunction commitPendingChanges(worktreePath: string, message: string): void {\n\tgit(worktreePath, [\"add\", \"-A\"]);\n\tconst status = git(worktreePath, [\"status\", \"--porcelain\"]).trim();\n\tif (status.length === 0) return;\n\tgit(worktreePath, [\"commit\", \"-m\", message]);\n}\n\n/**\n * Add `pattern` to the repository's shared `info/exclude` so the worktree\n * directory doesn't show up as untracked in `git status` for the base branch.\n * Best-effort: failures are swallowed since this is a status-hygiene nicety,\n * not required for isolation or merging to work.\n */\nfunction excludeFromStatus(cwd: string, pattern: string): void {\n\ttry {\n\t\tconst gitDir = git(cwd, [\"rev-parse\", \"--git-common-dir\"]).trim();\n\t\tconst excludePath = join(gitDir.startsWith(\"/\") ? gitDir : join(cwd, gitDir), \"info\", \"exclude\");\n\t\tconst current = existsSync(excludePath) ? readFileSync(excludePath, \"utf-8\") : \"\";\n\t\tif (current.split(\"\\n\").includes(pattern)) return;\n\t\tconst separator = current.length > 0 && !current.endsWith(\"\\n\") ? \"\\n\" : \"\";\n\t\twriteFileSync(excludePath, `${current}${separator}${pattern}\\n`, \"utf-8\");\n\t} catch {\n\t\t// best effort\n\t}\n}\n"]}
|
|
@@ -66,7 +66,13 @@ export interface PackageManager {
|
|
|
66
66
|
getInstalledPath(source: string, scope: "user" | "project"): string | undefined;
|
|
67
67
|
}
|
|
68
68
|
interface PackageManagerOptions {
|
|
69
|
+
/** Lexically resolved: where the cwd's OWN config resources live. */
|
|
69
70
|
cwd: string;
|
|
71
|
+
/**
|
|
72
|
+
* As the caller spelled it, before `path.resolve` collapsed any `..`. The ancestor
|
|
73
|
+
* skill walk resolves it physically, which is the chain the trust gate walks.
|
|
74
|
+
*/
|
|
75
|
+
cwdSpelling?: string;
|
|
70
76
|
agentDir: string;
|
|
71
77
|
settingsManager: SettingsManager;
|
|
72
78
|
}
|
|
@@ -74,6 +80,7 @@ type SourceScope = "user" | "project" | "temporary";
|
|
|
74
80
|
export declare function getExtensionTempFolder(agentDir: string): string;
|
|
75
81
|
export declare class DefaultPackageManager implements PackageManager {
|
|
76
82
|
private cwd;
|
|
83
|
+
private cwdSpelling;
|
|
77
84
|
private agentDir;
|
|
78
85
|
private settingsManager;
|
|
79
86
|
private globalNpmRoot;
|
|
@@ -190,7 +197,6 @@ export declare class DefaultPackageManager implements PackageManager {
|
|
|
190
197
|
* that pass the manifest's own patterns.
|
|
191
198
|
*/
|
|
192
199
|
private collectManifestFiles;
|
|
193
|
-
private readPiManifest;
|
|
194
200
|
private addManifestEntries;
|
|
195
201
|
private collectFilesFromManifestEntries;
|
|
196
202
|
private resolveLocalEntries;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../src/core/package-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../src/core/package-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,12 +24,14 @@ import { basename, dirname, join, relative, resolve, sep } from "node:path";
|
|
|
24
24
|
import { globSync } from "glob";
|
|
25
25
|
import ignore from "ignore";
|
|
26
26
|
import { minimatch } from "minimatch";
|
|
27
|
-
import { maxSatisfying, rcompare, satisfies, valid, validRange } from "semver";
|
|
27
|
+
import { gt, maxSatisfying, rcompare, satisfies, valid, validRange } from "semver";
|
|
28
28
|
import { CONFIG_DIR_NAME } from "../config.js";
|
|
29
|
+
import { comparablePath, realHomeDir, realPathStrict } from "../utils/canonical-path.js";
|
|
29
30
|
import { spawnProcess, spawnProcessSync } from "../utils/child-process.js";
|
|
30
31
|
import { parseGitUrl } from "../utils/git.js";
|
|
31
|
-
import {
|
|
32
|
+
import { isLocalPath, markPathIgnoredByCloudSync, resolvePath } from "../utils/paths.js";
|
|
32
33
|
import { isStdoutTakenOver } from "./output-guard.js";
|
|
34
|
+
import { readPiManifest } from "./pi-manifest.js";
|
|
33
35
|
const NETWORK_TIMEOUT_MS = 10000;
|
|
34
36
|
const UPDATE_CHECK_CONCURRENCY = 4;
|
|
35
37
|
const GIT_UPDATE_CONCURRENCY = 4;
|
|
@@ -272,9 +274,12 @@ function findGitRepoRoot(startDir) {
|
|
|
272
274
|
}
|
|
273
275
|
function collectAncestorAgentsSkillDirs(startDir) {
|
|
274
276
|
const skillDirs = [];
|
|
275
|
-
|
|
276
|
-
const
|
|
277
|
-
|
|
277
|
+
// The gate's own chain; an unresolvable cwd contributes no skill dirs.
|
|
278
|
+
const canonicalStartDir = realPathStrict(startDir);
|
|
279
|
+
if (canonicalStartDir === undefined)
|
|
280
|
+
return skillDirs;
|
|
281
|
+
const gitRepoRoot = findGitRepoRoot(canonicalStartDir);
|
|
282
|
+
let dir = canonicalStartDir;
|
|
278
283
|
while (true) {
|
|
279
284
|
skillDirs.push(join(dir, ".agents", "skills"));
|
|
280
285
|
if (gitRepoRoot && dir === gitRepoRoot) {
|
|
@@ -360,28 +365,10 @@ function collectAutoThemeEntries(dir) {
|
|
|
360
365
|
}
|
|
361
366
|
return entries;
|
|
362
367
|
}
|
|
363
|
-
/**
|
|
364
|
-
* A package declares its extensions/skills/prompts/themes under a top-level
|
|
365
|
-
* manifest key. draht reads `draht` first and falls back to upstream's `pi`,
|
|
366
|
-
* mirroring CONFIG_DIR_NAME / LEGACY_CONFIG_DIR_NAME: packages authored for
|
|
367
|
-
* upstream (or copied from its docs) keep working unchanged.
|
|
368
|
-
*/
|
|
369
|
-
function readManifest(pkg) {
|
|
370
|
-
return pkg.draht ?? pkg.pi ?? null;
|
|
371
|
-
}
|
|
372
|
-
function readPiManifestFile(packageJsonPath) {
|
|
373
|
-
try {
|
|
374
|
-
const content = readFileSync(packageJsonPath, "utf-8");
|
|
375
|
-
return readManifest(JSON.parse(content));
|
|
376
|
-
}
|
|
377
|
-
catch {
|
|
378
|
-
return null;
|
|
379
|
-
}
|
|
380
|
-
}
|
|
381
368
|
function resolveExtensionEntries(dir) {
|
|
382
369
|
const packageJsonPath = join(dir, "package.json");
|
|
383
370
|
if (existsSync(packageJsonPath)) {
|
|
384
|
-
const manifest =
|
|
371
|
+
const manifest = readPiManifest(packageJsonPath);
|
|
385
372
|
if (manifest?.extensions?.length) {
|
|
386
373
|
const entries = [];
|
|
387
374
|
for (const extPath of manifest.extensions) {
|
|
@@ -607,6 +594,7 @@ function applyAutoloadDisabledPatterns(allPaths, patterns, baseDir) {
|
|
|
607
594
|
export class DefaultPackageManager {
|
|
608
595
|
constructor(options) {
|
|
609
596
|
this.cwd = resolvePath(options.cwd);
|
|
597
|
+
this.cwdSpelling = options.cwdSpelling ?? options.cwd;
|
|
610
598
|
this.agentDir = resolvePath(options.agentDir);
|
|
611
599
|
this.settingsManager = options.settingsManager;
|
|
612
600
|
}
|
|
@@ -897,7 +885,7 @@ export class DefaultPackageManager {
|
|
|
897
885
|
}
|
|
898
886
|
try {
|
|
899
887
|
const targetVersion = await this.getLatestNpmVersion(source.version ? source.spec : source.name, source.range);
|
|
900
|
-
return targetVersion
|
|
888
|
+
return gt(targetVersion, installedVersion);
|
|
901
889
|
}
|
|
902
890
|
catch {
|
|
903
891
|
// Preserve existing update behavior when version lookup fails.
|
|
@@ -1183,7 +1171,7 @@ export class DefaultPackageManager {
|
|
|
1183
1171
|
}
|
|
1184
1172
|
try {
|
|
1185
1173
|
const targetVersion = await this.getLatestNpmVersion(source.version ? source.spec : source.name, source.range);
|
|
1186
|
-
return targetVersion
|
|
1174
|
+
return gt(targetVersion, installedVersion);
|
|
1187
1175
|
}
|
|
1188
1176
|
catch {
|
|
1189
1177
|
return false;
|
|
@@ -1763,7 +1751,7 @@ export class DefaultPackageManager {
|
|
|
1763
1751
|
}
|
|
1764
1752
|
return true;
|
|
1765
1753
|
}
|
|
1766
|
-
const manifest =
|
|
1754
|
+
const manifest = readPiManifest(join(packageRoot, "package.json"));
|
|
1767
1755
|
if (manifest) {
|
|
1768
1756
|
for (const resourceType of RESOURCE_TYPES) {
|
|
1769
1757
|
const entries = manifest[resourceType];
|
|
@@ -1786,7 +1774,7 @@ export class DefaultPackageManager {
|
|
|
1786
1774
|
return hasAnyDir;
|
|
1787
1775
|
}
|
|
1788
1776
|
collectDefaultResources(packageRoot, resourceType, target, metadata) {
|
|
1789
|
-
const manifest =
|
|
1777
|
+
const manifest = readPiManifest(join(packageRoot, "package.json"));
|
|
1790
1778
|
const entries = manifest?.[resourceType];
|
|
1791
1779
|
if (entries) {
|
|
1792
1780
|
this.addManifestEntries(entries, packageRoot, resourceType, target, metadata);
|
|
@@ -1833,7 +1821,7 @@ export class DefaultPackageManager {
|
|
|
1833
1821
|
* that pass the manifest's own patterns.
|
|
1834
1822
|
*/
|
|
1835
1823
|
collectManifestFiles(packageRoot, resourceType) {
|
|
1836
|
-
const manifest =
|
|
1824
|
+
const manifest = readPiManifest(join(packageRoot, "package.json"));
|
|
1837
1825
|
const entries = manifest?.[resourceType];
|
|
1838
1826
|
if (entries && entries.length > 0) {
|
|
1839
1827
|
const allFiles = this.collectFilesFromManifestEntries(entries, packageRoot, resourceType);
|
|
@@ -1848,19 +1836,6 @@ export class DefaultPackageManager {
|
|
|
1848
1836
|
const allFiles = collectResourceFiles(conventionDir, resourceType);
|
|
1849
1837
|
return { allFiles, enabledByManifest: new Set(allFiles) };
|
|
1850
1838
|
}
|
|
1851
|
-
readPiManifest(packageRoot) {
|
|
1852
|
-
const packageJsonPath = join(packageRoot, "package.json");
|
|
1853
|
-
if (!existsSync(packageJsonPath)) {
|
|
1854
|
-
return null;
|
|
1855
|
-
}
|
|
1856
|
-
try {
|
|
1857
|
-
const content = readFileSync(packageJsonPath, "utf-8");
|
|
1858
|
-
return readManifest(JSON.parse(content));
|
|
1859
|
-
}
|
|
1860
|
-
catch {
|
|
1861
|
-
return null;
|
|
1862
|
-
}
|
|
1863
|
-
}
|
|
1864
1839
|
addManifestEntries(entries, root, resourceType, target, metadata) {
|
|
1865
1840
|
if (!entries)
|
|
1866
1841
|
return;
|
|
@@ -1940,9 +1915,11 @@ export class DefaultPackageManager {
|
|
|
1940
1915
|
themes: join(projectBaseDir, "themes"),
|
|
1941
1916
|
};
|
|
1942
1917
|
const userAgentsSkillsDir = join(getHomeDir(), ".agents", "skills");
|
|
1918
|
+
const realHome = realHomeDir();
|
|
1919
|
+
const canonicalUserAgentsSkillsDir = realHome === undefined ? undefined : join(realHome, ".agents", "skills");
|
|
1943
1920
|
const projectTrusted = this.settingsManager.isProjectTrusted();
|
|
1944
1921
|
const projectAgentsSkillDirs = projectTrusted
|
|
1945
|
-
? collectAncestorAgentsSkillDirs(this.
|
|
1922
|
+
? collectAncestorAgentsSkillDirs(this.cwdSpelling).filter((dir) => dir !== canonicalUserAgentsSkillsDir)
|
|
1946
1923
|
: [];
|
|
1947
1924
|
const addResources = (resourceType, paths, metadata, overrides, baseDir) => {
|
|
1948
1925
|
const target = this.getTargetMap(accumulator, resourceType);
|
|
@@ -2043,7 +2020,7 @@ export class DefaultPackageManager {
|
|
|
2043
2020
|
resolved.sort((a, b) => resourcePrecedenceRank(a.metadata) - resourcePrecedenceRank(b.metadata));
|
|
2044
2021
|
const seen = new Set();
|
|
2045
2022
|
return resolved.filter((entry) => {
|
|
2046
|
-
const canonicalPath =
|
|
2023
|
+
const canonicalPath = comparablePath(entry.path);
|
|
2047
2024
|
if (seen.has(canonicalPath))
|
|
2048
2025
|
return false;
|
|
2049
2026
|
seen.add(canonicalPath);
|