@draht/coding-agent 2026.4.5 → 2026.4.25

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.
Files changed (234) hide show
  1. package/CHANGELOG.md +792 -625
  2. package/README.md +24 -15
  3. package/dist/cli/args.d.ts +7 -10
  4. package/dist/cli/args.d.ts.map +1 -1
  5. package/dist/cli/args.js +44 -46
  6. package/dist/cli/args.js.map +1 -1
  7. package/dist/cli.d.ts.map +1 -1
  8. package/dist/cli.js +1 -0
  9. package/dist/cli.js.map +1 -1
  10. package/dist/config.d.ts +9 -0
  11. package/dist/config.d.ts.map +1 -1
  12. package/dist/config.js +18 -0
  13. package/dist/config.js.map +1 -1
  14. package/dist/core/agent-session-runtime.d.ts +53 -106
  15. package/dist/core/agent-session-runtime.d.ts.map +1 -1
  16. package/dist/core/agent-session-runtime.js +116 -147
  17. package/dist/core/agent-session-runtime.js.map +1 -1
  18. package/dist/core/agent-session-services.d.ts +86 -0
  19. package/dist/core/agent-session-services.d.ts.map +1 -0
  20. package/dist/core/agent-session-services.js +116 -0
  21. package/dist/core/agent-session-services.js.map +1 -0
  22. package/dist/core/agent-session.d.ts +8 -12
  23. package/dist/core/agent-session.d.ts.map +1 -1
  24. package/dist/core/agent-session.js +134 -45
  25. package/dist/core/agent-session.js.map +1 -1
  26. package/dist/core/bash-executor.d.ts.map +1 -1
  27. package/dist/core/bash-executor.js +19 -7
  28. package/dist/core/bash-executor.js.map +1 -1
  29. package/dist/core/compaction/compaction.d.ts +1 -1
  30. package/dist/core/compaction/compaction.d.ts.map +1 -1
  31. package/dist/core/compaction/compaction.js +18 -17
  32. package/dist/core/compaction/compaction.js.map +1 -1
  33. package/dist/core/extensions/index.d.ts +1 -1
  34. package/dist/core/extensions/index.d.ts.map +1 -1
  35. package/dist/core/extensions/index.js.map +1 -1
  36. package/dist/core/extensions/loader.d.ts.map +1 -1
  37. package/dist/core/extensions/loader.js +7 -7
  38. package/dist/core/extensions/loader.js.map +1 -1
  39. package/dist/core/extensions/runner.d.ts +1 -0
  40. package/dist/core/extensions/runner.d.ts.map +1 -1
  41. package/dist/core/extensions/runner.js +4 -0
  42. package/dist/core/extensions/runner.js.map +1 -1
  43. package/dist/core/extensions/types.d.ts +15 -14
  44. package/dist/core/extensions/types.d.ts.map +1 -1
  45. package/dist/core/extensions/types.js.map +1 -1
  46. package/dist/core/index.d.ts +2 -1
  47. package/dist/core/index.d.ts.map +1 -1
  48. package/dist/core/index.js +2 -1
  49. package/dist/core/index.js.map +1 -1
  50. package/dist/core/keybindings.d.ts +14 -1
  51. package/dist/core/keybindings.d.ts.map +1 -1
  52. package/dist/core/keybindings.js +13 -14
  53. package/dist/core/keybindings.js.map +1 -1
  54. package/dist/core/model-registry.d.ts.map +1 -1
  55. package/dist/core/model-registry.js +31 -1
  56. package/dist/core/model-registry.js.map +1 -1
  57. package/dist/core/package-manager.d.ts +21 -1
  58. package/dist/core/package-manager.d.ts.map +1 -1
  59. package/dist/core/package-manager.js +108 -43
  60. package/dist/core/package-manager.js.map +1 -1
  61. package/dist/core/prompt-templates.d.ts.map +1 -1
  62. package/dist/core/prompt-templates.js +22 -21
  63. package/dist/core/prompt-templates.js.map +1 -1
  64. package/dist/core/resource-loader.d.ts +0 -2
  65. package/dist/core/resource-loader.d.ts.map +1 -1
  66. package/dist/core/resource-loader.js +26 -8
  67. package/dist/core/resource-loader.js.map +1 -1
  68. package/dist/core/sdk.d.ts +2 -2
  69. package/dist/core/sdk.d.ts.map +1 -1
  70. package/dist/core/sdk.js +2 -2
  71. package/dist/core/sdk.js.map +1 -1
  72. package/dist/core/session-cwd.d.ts +19 -0
  73. package/dist/core/session-cwd.d.ts.map +1 -0
  74. package/dist/core/session-cwd.js +38 -0
  75. package/dist/core/session-cwd.js.map +1 -0
  76. package/dist/core/session-manager.d.ts +5 -1
  77. package/dist/core/session-manager.d.ts.map +1 -1
  78. package/dist/core/session-manager.js +16 -8
  79. package/dist/core/session-manager.js.map +1 -1
  80. package/dist/core/settings-manager.d.ts +6 -4
  81. package/dist/core/settings-manager.d.ts.map +1 -1
  82. package/dist/core/settings-manager.js +5 -1
  83. package/dist/core/settings-manager.js.map +1 -1
  84. package/dist/core/skills.d.ts +1 -1
  85. package/dist/core/skills.d.ts.map +1 -1
  86. package/dist/core/skills.js +3 -3
  87. package/dist/core/skills.js.map +1 -1
  88. package/dist/core/system-prompt.d.ts.map +1 -1
  89. package/dist/core/system-prompt.js +6 -6
  90. package/dist/core/system-prompt.js.map +1 -1
  91. package/dist/core/timings.d.ts +1 -0
  92. package/dist/core/timings.d.ts.map +1 -1
  93. package/dist/core/timings.js +6 -0
  94. package/dist/core/timings.js.map +1 -1
  95. package/dist/core/tools/bash.d.ts.map +1 -1
  96. package/dist/core/tools/bash.js +19 -9
  97. package/dist/core/tools/bash.js.map +1 -1
  98. package/dist/core/tools/edit-diff.d.ts +23 -1
  99. package/dist/core/tools/edit-diff.d.ts.map +1 -1
  100. package/dist/core/tools/edit-diff.js +150 -57
  101. package/dist/core/tools/edit-diff.js.map +1 -1
  102. package/dist/core/tools/edit.d.ts +13 -11
  103. package/dist/core/tools/edit.d.ts.map +1 -1
  104. package/dist/core/tools/edit.js +55 -77
  105. package/dist/core/tools/edit.js.map +1 -1
  106. package/dist/core/tools/file-mutation-queue.d.ts.map +1 -1
  107. package/dist/core/tools/file-mutation-queue.js +4 -4
  108. package/dist/core/tools/file-mutation-queue.js.map +1 -1
  109. package/dist/core/tools/index.d.ts +9 -6
  110. package/dist/core/tools/index.d.ts.map +1 -1
  111. package/dist/core/tools/tool-definition-wrapper.d.ts.map +1 -1
  112. package/dist/core/tools/tool-definition-wrapper.js +2 -0
  113. package/dist/core/tools/tool-definition-wrapper.js.map +1 -1
  114. package/dist/index.d.ts +4 -4
  115. package/dist/index.d.ts.map +1 -1
  116. package/dist/index.js +4 -5
  117. package/dist/index.js.map +1 -1
  118. package/dist/main.d.ts.map +1 -1
  119. package/dist/main.js +252 -451
  120. package/dist/main.js.map +1 -1
  121. package/dist/migrations.d.ts +3 -3
  122. package/dist/migrations.d.ts.map +1 -1
  123. package/dist/migrations.js +25 -5
  124. package/dist/migrations.js.map +1 -1
  125. package/dist/modes/interactive/components/assistant-message.d.ts +3 -1
  126. package/dist/modes/interactive/components/assistant-message.d.ts.map +1 -1
  127. package/dist/modes/interactive/components/assistant-message.js +14 -3
  128. package/dist/modes/interactive/components/assistant-message.js.map +1 -1
  129. package/dist/modes/interactive/components/earendil-announcement.d.ts +5 -0
  130. package/dist/modes/interactive/components/earendil-announcement.d.ts.map +1 -0
  131. package/dist/modes/interactive/components/earendil-announcement.js +40 -0
  132. package/dist/modes/interactive/components/earendil-announcement.js.map +1 -0
  133. package/dist/modes/interactive/components/settings-selector.d.ts.map +1 -1
  134. package/dist/modes/interactive/components/settings-selector.js +1 -0
  135. package/dist/modes/interactive/components/settings-selector.js.map +1 -1
  136. package/dist/modes/interactive/components/thinking-selector.d.ts.map +1 -1
  137. package/dist/modes/interactive/components/thinking-selector.js +1 -0
  138. package/dist/modes/interactive/components/thinking-selector.js.map +1 -1
  139. package/dist/modes/interactive/components/tool-execution.d.ts +0 -1
  140. package/dist/modes/interactive/components/tool-execution.d.ts.map +1 -1
  141. package/dist/modes/interactive/components/tool-execution.js +2 -7
  142. package/dist/modes/interactive/components/tool-execution.js.map +1 -1
  143. package/dist/modes/interactive/components/tree-selector.d.ts +4 -2
  144. package/dist/modes/interactive/components/tree-selector.d.ts.map +1 -1
  145. package/dist/modes/interactive/components/tree-selector.js +48 -15
  146. package/dist/modes/interactive/components/tree-selector.js.map +1 -1
  147. package/dist/modes/interactive/interactive-mode.d.ts +12 -3
  148. package/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
  149. package/dist/modes/interactive/interactive-mode.js +237 -125
  150. package/dist/modes/interactive/interactive-mode.js.map +1 -1
  151. package/dist/modes/interactive/theme/dark.json +8 -5
  152. package/dist/modes/interactive/theme/light.json +8 -5
  153. package/dist/modes/interactive/theme/theme-schema.json +6 -1
  154. package/dist/modes/interactive/theme/theme.d.ts +2 -2
  155. package/dist/modes/interactive/theme/theme.d.ts.map +1 -1
  156. package/dist/modes/interactive/theme/theme.js +13 -1
  157. package/dist/modes/interactive/theme/theme.js.map +1 -1
  158. package/dist/modes/print-mode.d.ts +4 -4
  159. package/dist/modes/print-mode.d.ts.map +1 -1
  160. package/dist/modes/print-mode.js +6 -2
  161. package/dist/modes/print-mode.js.map +1 -1
  162. package/dist/modes/rpc/rpc-client.d.ts.map +1 -1
  163. package/dist/modes/rpc/rpc-client.js +1 -0
  164. package/dist/modes/rpc/rpc-client.js.map +1 -1
  165. package/dist/modes/rpc/rpc-mode.d.ts +2 -2
  166. package/dist/modes/rpc/rpc-mode.d.ts.map +1 -1
  167. package/dist/modes/rpc/rpc-mode.js +26 -15
  168. package/dist/modes/rpc/rpc-mode.js.map +1 -1
  169. package/dist/package-manager-cli.d.ts +4 -0
  170. package/dist/package-manager-cli.d.ts.map +1 -0
  171. package/dist/package-manager-cli.js +234 -0
  172. package/dist/package-manager-cli.js.map +1 -0
  173. package/dist/prompts/commands/atomic-commit.md +17 -0
  174. package/dist/prompts/commands/discuss-phase.md +15 -0
  175. package/dist/prompts/commands/execute-phase.md +14 -0
  176. package/dist/prompts/commands/fix.md +14 -0
  177. package/dist/prompts/commands/init-project.md +16 -0
  178. package/dist/prompts/commands/map-codebase.md +16 -0
  179. package/dist/prompts/commands/new-project.md +16 -0
  180. package/dist/prompts/commands/next-milestone.md +16 -0
  181. package/dist/prompts/commands/orchestrate.md +57 -0
  182. package/dist/prompts/commands/pause-work.md +13 -0
  183. package/dist/prompts/commands/plan-phase.md +15 -0
  184. package/dist/prompts/commands/progress.md +13 -0
  185. package/dist/prompts/commands/quick.md +14 -0
  186. package/dist/prompts/commands/resume-work.md +13 -0
  187. package/dist/prompts/commands/review.md +15 -0
  188. package/dist/prompts/commands/verify-work.md +15 -0
  189. package/dist/utils/paths.d.ts +7 -0
  190. package/dist/utils/paths.d.ts.map +1 -0
  191. package/dist/utils/paths.js +19 -0
  192. package/dist/utils/paths.js.map +1 -0
  193. package/docs/compaction.md +5 -3
  194. package/docs/custom-provider.md +1 -1
  195. package/docs/development.md +3 -1
  196. package/docs/extensions.md +150 -54
  197. package/docs/json.md +5 -2
  198. package/docs/keybindings.md +2 -0
  199. package/docs/models.md +55 -4
  200. package/docs/rpc.md +21 -7
  201. package/docs/sdk.md +116 -48
  202. package/docs/session.md +3 -3
  203. package/docs/settings.md +12 -0
  204. package/docs/skills.md +3 -2
  205. package/docs/tree.md +5 -2
  206. package/examples/README.md +1 -1
  207. package/examples/extensions/README.md +1 -0
  208. package/examples/extensions/antigravity-image-gen.ts +1 -1
  209. package/examples/extensions/custom-provider-gitlab-duo/index.ts +1 -1
  210. package/examples/extensions/doom-overlay/doom/build.sh +2 -2
  211. package/examples/extensions/hidden-thinking-label.ts +53 -0
  212. package/examples/extensions/overlay-qa-tests.ts +2 -2
  213. package/examples/extensions/sandbox/index.ts +8 -4
  214. package/examples/extensions/subagent/index.ts +5 -5
  215. package/examples/extensions/trigger-compact.ts +11 -1
  216. package/examples/sdk/13-session-runtime.ts +30 -12
  217. package/examples/sdk/README.md +4 -2
  218. package/package.json +7 -8
  219. package/prompts/commands/atomic-commit.md +17 -0
  220. package/prompts/commands/discuss-phase.md +15 -0
  221. package/prompts/commands/execute-phase.md +14 -0
  222. package/prompts/commands/fix.md +14 -0
  223. package/prompts/commands/init-project.md +16 -0
  224. package/prompts/commands/map-codebase.md +16 -0
  225. package/prompts/commands/new-project.md +16 -0
  226. package/prompts/commands/next-milestone.md +16 -0
  227. package/prompts/commands/orchestrate.md +57 -0
  228. package/prompts/commands/pause-work.md +13 -0
  229. package/prompts/commands/plan-phase.md +15 -0
  230. package/prompts/commands/progress.md +13 -0
  231. package/prompts/commands/quick.md +14 -0
  232. package/prompts/commands/resume-work.md +13 -0
  233. package/prompts/commands/review.md +15 -0
  234. package/prompts/commands/verify-work.md +15 -0
@@ -5,17 +5,36 @@ import { homedir, tmpdir } from "node:os";
5
5
  import { basename, dirname, join, relative, resolve, sep } from "node:path";
6
6
  import ignore from "ignore";
7
7
  import { minimatch } from "minimatch";
8
- import { getProjectConfigDir } from "../config.js";
8
+ import { CONFIG_DIR_NAME } from "../config.js";
9
9
  import { parseGitUrl } from "../utils/git.js";
10
+ import { isLocalPath } from "../utils/paths.js";
10
11
  import { isStdoutTakenOver } from "./output-guard.js";
11
12
  const NETWORK_TIMEOUT_MS = 10000;
12
13
  const UPDATE_CHECK_CONCURRENCY = 4;
13
14
  function isOfflineModeEnabled() {
14
- const value = process.env.DRAHT_OFFLINE ?? process.env.PI_OFFLINE;
15
+ const value = process.env.PI_OFFLINE;
15
16
  if (!value)
16
17
  return false;
17
18
  return value === "1" || value.toLowerCase() === "true" || value.toLowerCase() === "yes";
18
19
  }
20
+ /**
21
+ * Compute a numeric precedence rank for a resource based on its metadata.
22
+ * Lower rank = higher precedence. Used to sort resolved resources so that
23
+ * name-collision resolution ("first wins") produces the correct outcome.
24
+ *
25
+ * Precedence (highest to lowest):
26
+ * 0 project + settings entry (source: "local", scope: "project")
27
+ * 1 project + auto-discovered (source: "auto", scope: "project")
28
+ * 2 user + settings entry (source: "local", scope: "user")
29
+ * 3 user + auto-discovered (source: "auto", scope: "user")
30
+ * 4 package resource (origin: "package")
31
+ */
32
+ function resourcePrecedenceRank(m) {
33
+ if (m.origin === "package")
34
+ return 4;
35
+ const scopeBase = m.scope === "project" ? 0 : 2;
36
+ return scopeBase + (m.source === "local" ? 0 : 1);
37
+ }
19
38
  const RESOURCE_TYPES = ["extensions", "skills", "prompts", "themes"];
20
39
  const FILE_PATTERNS = {
21
40
  extensions: /\.(ts|js)$/,
@@ -131,7 +150,7 @@ function collectFiles(dir, filePattern, skipNodeModules = true, ignoreMatcher, r
131
150
  }
132
151
  return files;
133
152
  }
134
- function collectSkillEntries(dir, includeRootFiles = true, ignoreMatcher, rootDir) {
153
+ function collectSkillEntries(dir, mode, ignoreMatcher, rootDir) {
135
154
  const entries = [];
136
155
  if (!existsSync(dir))
137
156
  return entries;
@@ -140,6 +159,26 @@ function collectSkillEntries(dir, includeRootFiles = true, ignoreMatcher, rootDi
140
159
  addIgnoreRules(ig, dir, root);
141
160
  try {
142
161
  const dirEntries = readdirSync(dir, { withFileTypes: true });
162
+ for (const entry of dirEntries) {
163
+ if (entry.name !== "SKILL.md") {
164
+ continue;
165
+ }
166
+ const fullPath = join(dir, entry.name);
167
+ let isFile = entry.isFile();
168
+ if (entry.isSymbolicLink()) {
169
+ try {
170
+ isFile = statSync(fullPath).isFile();
171
+ }
172
+ catch {
173
+ continue;
174
+ }
175
+ }
176
+ const relPath = toPosixPath(relative(root, fullPath));
177
+ if (isFile && !ig.ignores(relPath)) {
178
+ entries.push(fullPath);
179
+ return entries;
180
+ }
181
+ }
143
182
  for (const entry of dirEntries) {
144
183
  if (entry.name.startsWith("."))
145
184
  continue;
@@ -159,19 +198,15 @@ function collectSkillEntries(dir, includeRootFiles = true, ignoreMatcher, rootDi
159
198
  }
160
199
  }
161
200
  const relPath = toPosixPath(relative(root, fullPath));
162
- const ignorePath = isDir ? `${relPath}/` : relPath;
163
- if (ig.ignores(ignorePath))
201
+ if (mode === "draht" && dir === root && isFile && entry.name.endsWith(".md") && !ig.ignores(relPath)) {
202
+ entries.push(fullPath);
164
203
  continue;
165
- if (isDir) {
166
- entries.push(...collectSkillEntries(fullPath, false, ig, root));
167
- }
168
- else if (isFile) {
169
- const isRootMd = includeRootFiles && entry.name.endsWith(".md");
170
- const isSkillMd = !includeRootFiles && entry.name === "SKILL.md";
171
- if (isRootMd || isSkillMd) {
172
- entries.push(fullPath);
173
- }
174
204
  }
205
+ if (!isDir)
206
+ continue;
207
+ if (ig.ignores(`${relPath}/`))
208
+ continue;
209
+ entries.push(...collectSkillEntries(fullPath, mode, ig, root));
175
210
  }
176
211
  }
177
212
  catch {
@@ -179,8 +214,8 @@ function collectSkillEntries(dir, includeRootFiles = true, ignoreMatcher, rootDi
179
214
  }
180
215
  return entries;
181
216
  }
182
- function collectAutoSkillEntries(dir, includeRootFiles = true) {
183
- return collectSkillEntries(dir, includeRootFiles);
217
+ function collectAutoSkillEntries(dir, mode) {
218
+ return collectSkillEntries(dir, mode);
184
219
  }
185
220
  function findGitRepoRoot(startDir) {
186
221
  let dir = resolve(startDir);
@@ -285,11 +320,11 @@ function collectAutoThemeEntries(dir) {
285
320
  }
286
321
  return entries;
287
322
  }
288
- function readDrahtManifestFile(packageJsonPath) {
323
+ function readPiManifestFile(packageJsonPath) {
289
324
  try {
290
325
  const content = readFileSync(packageJsonPath, "utf-8");
291
326
  const pkg = JSON.parse(content);
292
- return pkg.draht ?? null;
327
+ return pkg.pi ?? null;
293
328
  }
294
329
  catch {
295
330
  return null;
@@ -298,7 +333,7 @@ function readDrahtManifestFile(packageJsonPath) {
298
333
  function resolveExtensionEntries(dir) {
299
334
  const packageJsonPath = join(dir, "package.json");
300
335
  if (existsSync(packageJsonPath)) {
301
- const manifest = readDrahtManifestFile(packageJsonPath);
336
+ const manifest = readPiManifestFile(packageJsonPath);
302
337
  if (manifest?.extensions?.length) {
303
338
  const entries = [];
304
339
  for (const extPath of manifest.extensions) {
@@ -380,7 +415,7 @@ function collectAutoExtensionEntries(dir) {
380
415
  */
381
416
  function collectResourceFiles(dir, resourceType) {
382
417
  if (resourceType === "skills") {
383
- return collectSkillEntries(dir);
418
+ return collectSkillEntries(dir, "draht");
384
419
  }
385
420
  if (resourceType === "extensions") {
386
421
  return collectAutoExtensionEntries(dir);
@@ -605,7 +640,7 @@ export class DefaultPackageManager {
605
640
  const packageSources = this.dedupePackages(allPackages);
606
641
  await this.resolvePackageSources(packageSources, accumulator, onMissing);
607
642
  const globalBaseDir = this.agentDir;
608
- const projectBaseDir = getProjectConfigDir(this.cwd);
643
+ const projectBaseDir = join(this.cwd, CONFIG_DIR_NAME);
609
644
  for (const resourceType of RESOURCE_TYPES) {
610
645
  const target = this.getTargetMap(accumulator, resourceType);
611
646
  const globalEntries = (globalSettings[resourceType] ?? []);
@@ -631,6 +666,30 @@ export class DefaultPackageManager {
631
666
  await this.resolvePackageSources(packageSources, accumulator);
632
667
  return this.toResolvedPaths(accumulator);
633
668
  }
669
+ listConfiguredPackages() {
670
+ const globalSettings = this.settingsManager.getGlobalSettings();
671
+ const projectSettings = this.settingsManager.getProjectSettings();
672
+ const configuredPackages = [];
673
+ for (const pkg of globalSettings.packages ?? []) {
674
+ const source = typeof pkg === "string" ? pkg : pkg.source;
675
+ configuredPackages.push({
676
+ source,
677
+ scope: "user",
678
+ filtered: typeof pkg === "object",
679
+ installedPath: this.getInstalledPath(source, "user"),
680
+ });
681
+ }
682
+ for (const pkg of projectSettings.packages ?? []) {
683
+ const source = typeof pkg === "string" ? pkg : pkg.source;
684
+ configuredPackages.push({
685
+ source,
686
+ scope: "project",
687
+ filtered: typeof pkg === "object",
688
+ installedPath: this.getInstalledPath(source, "project"),
689
+ });
690
+ }
691
+ return configuredPackages;
692
+ }
634
693
  async install(source, options) {
635
694
  const parsed = this.parseSource(source);
636
695
  const scope = options?.local ? "project" : "user";
@@ -653,6 +712,10 @@ export class DefaultPackageManager {
653
712
  throw new Error(`Unsupported install source: ${source}`);
654
713
  });
655
714
  }
715
+ async installAndPersist(source, options) {
716
+ await this.install(source, options);
717
+ this.addSourceToSettings(source, options);
718
+ }
656
719
  async remove(source, options) {
657
720
  const parsed = this.parseSource(source);
658
721
  const scope = options?.local ? "project" : "user";
@@ -671,6 +734,10 @@ export class DefaultPackageManager {
671
734
  throw new Error(`Unsupported remove source: ${source}`);
672
735
  });
673
736
  }
737
+ async removeAndPersist(source, options) {
738
+ await this.remove(source, options);
739
+ return this.removeSourceFromSettings(source, options);
740
+ }
674
741
  async update(source) {
675
742
  const globalSettings = this.settingsManager.getGlobalSettings();
676
743
  const projectSettings = this.settingsManager.getProjectSettings();
@@ -946,14 +1013,7 @@ export class DefaultPackageManager {
946
1013
  pinned: Boolean(version),
947
1014
  };
948
1015
  }
949
- const trimmed = source.trim();
950
- const isWindowsAbsolutePath = /^[A-Za-z]:[\\/]|^\\\\/.test(trimmed);
951
- const isLocalPathLike = trimmed.startsWith(".") ||
952
- trimmed.startsWith("/") ||
953
- trimmed === "~" ||
954
- trimmed.startsWith("~/") ||
955
- isWindowsAbsolutePath;
956
- if (isLocalPathLike) {
1016
+ if (isLocalPath(source)) {
957
1017
  return { type: "local", path: source };
958
1018
  }
959
1019
  // Try parsing as git URL
@@ -1357,7 +1417,7 @@ export class DefaultPackageManager {
1357
1417
  return this.getTemporaryDir("npm");
1358
1418
  }
1359
1419
  if (scope === "project") {
1360
- return join(getProjectConfigDir(this.cwd), "npm");
1420
+ return join(this.cwd, CONFIG_DIR_NAME, "npm");
1361
1421
  }
1362
1422
  return join(this.getGlobalNpmRoot(), "..");
1363
1423
  }
@@ -1377,7 +1437,7 @@ export class DefaultPackageManager {
1377
1437
  return join(this.getTemporaryDir("npm"), "node_modules", source.name);
1378
1438
  }
1379
1439
  if (scope === "project") {
1380
- return join(getProjectConfigDir(this.cwd), "npm", "node_modules", source.name);
1440
+ return join(this.cwd, CONFIG_DIR_NAME, "npm", "node_modules", source.name);
1381
1441
  }
1382
1442
  return join(this.getGlobalNpmRoot(), source.name);
1383
1443
  }
@@ -1386,7 +1446,7 @@ export class DefaultPackageManager {
1386
1446
  return this.getTemporaryDir(`git-${source.host}`, source.path);
1387
1447
  }
1388
1448
  if (scope === "project") {
1389
- return join(getProjectConfigDir(this.cwd), "git", source.host, source.path);
1449
+ return join(this.cwd, CONFIG_DIR_NAME, "git", source.host, source.path);
1390
1450
  }
1391
1451
  return join(this.agentDir, "git", source.host, source.path);
1392
1452
  }
@@ -1395,7 +1455,7 @@ export class DefaultPackageManager {
1395
1455
  return undefined;
1396
1456
  }
1397
1457
  if (scope === "project") {
1398
- return join(getProjectConfigDir(this.cwd), "git");
1458
+ return join(this.cwd, CONFIG_DIR_NAME, "git");
1399
1459
  }
1400
1460
  return join(this.agentDir, "git");
1401
1461
  }
@@ -1408,7 +1468,7 @@ export class DefaultPackageManager {
1408
1468
  }
1409
1469
  getBaseDirForScope(scope) {
1410
1470
  if (scope === "project") {
1411
- return getProjectConfigDir(this.cwd);
1471
+ return join(this.cwd, CONFIG_DIR_NAME);
1412
1472
  }
1413
1473
  if (scope === "user") {
1414
1474
  return this.agentDir;
@@ -1449,7 +1509,7 @@ export class DefaultPackageManager {
1449
1509
  }
1450
1510
  return true;
1451
1511
  }
1452
- const manifest = this.readDrahtManifest(packageRoot);
1512
+ const manifest = this.readPiManifest(packageRoot);
1453
1513
  if (manifest) {
1454
1514
  for (const resourceType of RESOURCE_TYPES) {
1455
1515
  const entries = manifest[resourceType];
@@ -1472,7 +1532,7 @@ export class DefaultPackageManager {
1472
1532
  return hasAnyDir;
1473
1533
  }
1474
1534
  collectDefaultResources(packageRoot, resourceType, target, metadata) {
1475
- const manifest = this.readDrahtManifest(packageRoot);
1535
+ const manifest = this.readPiManifest(packageRoot);
1476
1536
  const entries = manifest?.[resourceType];
1477
1537
  if (entries) {
1478
1538
  this.addManifestEntries(entries, packageRoot, resourceType, target, metadata);
@@ -1509,7 +1569,7 @@ export class DefaultPackageManager {
1509
1569
  * that pass the manifest's own patterns.
1510
1570
  */
1511
1571
  collectManifestFiles(packageRoot, resourceType) {
1512
- const manifest = this.readDrahtManifest(packageRoot);
1572
+ const manifest = this.readPiManifest(packageRoot);
1513
1573
  const entries = manifest?.[resourceType];
1514
1574
  if (entries && entries.length > 0) {
1515
1575
  const allFiles = this.collectFilesFromManifestEntries(entries, packageRoot, resourceType);
@@ -1524,7 +1584,7 @@ export class DefaultPackageManager {
1524
1584
  const allFiles = collectResourceFiles(conventionDir, resourceType);
1525
1585
  return { allFiles, enabledByManifest: new Set(allFiles) };
1526
1586
  }
1527
- readDrahtManifest(packageRoot) {
1587
+ readPiManifest(packageRoot) {
1528
1588
  const packageJsonPath = join(packageRoot, "package.json");
1529
1589
  if (!existsSync(packageJsonPath)) {
1530
1590
  return null;
@@ -1532,7 +1592,7 @@ export class DefaultPackageManager {
1532
1592
  try {
1533
1593
  const content = readFileSync(packageJsonPath, "utf-8");
1534
1594
  const pkg = JSON.parse(content);
1535
- return pkg.draht ?? null;
1595
+ return pkg.pi ?? null;
1536
1596
  }
1537
1597
  catch {
1538
1598
  return null;
@@ -1617,13 +1677,16 @@ export class DefaultPackageManager {
1617
1677
  };
1618
1678
  addResources("extensions", collectAutoExtensionEntries(projectDirs.extensions), projectMetadata, projectOverrides.extensions, projectBaseDir);
1619
1679
  addResources("skills", [
1620
- ...collectAutoSkillEntries(projectDirs.skills),
1621
- ...projectAgentsSkillDirs.flatMap((dir) => collectAutoSkillEntries(dir)),
1680
+ ...collectAutoSkillEntries(projectDirs.skills, "draht"),
1681
+ ...projectAgentsSkillDirs.flatMap((dir) => collectAutoSkillEntries(dir, "agents")),
1622
1682
  ], projectMetadata, projectOverrides.skills, projectBaseDir);
1623
1683
  addResources("prompts", collectAutoPromptEntries(projectDirs.prompts), projectMetadata, projectOverrides.prompts, projectBaseDir);
1624
1684
  addResources("themes", collectAutoThemeEntries(projectDirs.themes), projectMetadata, projectOverrides.themes, projectBaseDir);
1625
1685
  addResources("extensions", collectAutoExtensionEntries(userDirs.extensions), userMetadata, userOverrides.extensions, globalBaseDir);
1626
- addResources("skills", [...collectAutoSkillEntries(userDirs.skills), ...collectAutoSkillEntries(userAgentsSkillsDir)], userMetadata, userOverrides.skills, globalBaseDir);
1686
+ addResources("skills", [
1687
+ ...collectAutoSkillEntries(userDirs.skills, "draht"),
1688
+ ...collectAutoSkillEntries(userAgentsSkillsDir, "agents"),
1689
+ ], userMetadata, userOverrides.skills, globalBaseDir);
1627
1690
  addResources("prompts", collectAutoPromptEntries(userDirs.prompts), userMetadata, userOverrides.prompts, globalBaseDir);
1628
1691
  addResources("themes", collectAutoThemeEntries(userDirs.themes), userMetadata, userOverrides.themes, globalBaseDir);
1629
1692
  }
@@ -1678,11 +1741,13 @@ export class DefaultPackageManager {
1678
1741
  }
1679
1742
  toResolvedPaths(accumulator) {
1680
1743
  const toResolved = (entries) => {
1681
- return Array.from(entries.entries()).map(([path, { metadata, enabled }]) => ({
1744
+ const resolved = Array.from(entries.entries()).map(([path, { metadata, enabled }]) => ({
1682
1745
  path,
1683
1746
  enabled,
1684
1747
  metadata,
1685
1748
  }));
1749
+ resolved.sort((a, b) => resourcePrecedenceRank(a.metadata) - resourcePrecedenceRank(b.metadata));
1750
+ return resolved;
1686
1751
  };
1687
1752
  return {
1688
1753
  extensions: toResolved(accumulator.extensions),