@diff-review-system/drs 3.2.0 → 3.2.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/README.md
CHANGED
|
@@ -500,18 +500,21 @@ contextCompression:
|
|
|
500
500
|
|
|
501
501
|
### Pi-Native Skill Discovery
|
|
502
502
|
|
|
503
|
-
DRS
|
|
503
|
+
DRS auto-discovers review skills from these directories when `review.paths.skills` is not set:
|
|
504
504
|
|
|
505
505
|
1. `.drs/skills` (project-level overrides)
|
|
506
|
-
2. `.
|
|
506
|
+
2. `.agents/skills` (legacy/shared project skills)
|
|
507
|
+
3. `.pi/skills` (Pi-native skills)
|
|
507
508
|
|
|
508
|
-
If the same skill name exists in
|
|
509
|
+
If the same skill name exists in multiple locations, earlier paths win (`.drs` > `.agents` > `.pi`).
|
|
509
510
|
|
|
510
511
|
Example layout:
|
|
511
512
|
|
|
512
513
|
```text
|
|
513
514
|
.drs/skills/
|
|
514
515
|
secure-fetch/SKILL.md # Project override (preferred)
|
|
516
|
+
.agents/skills/
|
|
517
|
+
secure-fetch/SKILL.md # Legacy/shared fallback
|
|
515
518
|
.pi/skills/
|
|
516
519
|
secure-fetch/SKILL.md # Pi-native fallback
|
|
517
520
|
db-indexing/SKILL.md # Additional Pi-native skill
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-config.d.ts","sourceRoot":"","sources":["../../src/runtime/path-config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"path-config.d.ts","sourceRoot":"","sources":["../../src/runtime/path-config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AASlD,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAqFD,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,mBAAmB,CAc/F"}
|
|
@@ -2,6 +2,7 @@ import { existsSync, statSync } from 'fs';
|
|
|
2
2
|
import { isAbsolute, relative, resolve } from 'path';
|
|
3
3
|
const DEFAULT_AGENT_PATH = '.drs/agents';
|
|
4
4
|
const DEFAULT_SKILL_PATH = '.drs/skills';
|
|
5
|
+
const AGENTS_DEFAULT_SKILL_PATH = '.agents/skills';
|
|
5
6
|
const PI_DEFAULT_SKILL_PATH = '.pi/skills';
|
|
6
7
|
function isOutsideProjectRoot(projectRoot, targetPath) {
|
|
7
8
|
const relativePath = relative(projectRoot, targetPath);
|
|
@@ -34,6 +35,7 @@ function resolveConfiguredPath(projectRoot, configuredPath, fallbackPath, pathTy
|
|
|
34
35
|
function resolveDefaultSkillSearchPaths(projectRoot) {
|
|
35
36
|
const candidates = [
|
|
36
37
|
resolve(projectRoot, DEFAULT_SKILL_PATH),
|
|
38
|
+
resolve(projectRoot, AGENTS_DEFAULT_SKILL_PATH),
|
|
37
39
|
resolve(projectRoot, PI_DEFAULT_SKILL_PATH),
|
|
38
40
|
];
|
|
39
41
|
const existing = candidates.filter((candidate) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-config.js","sourceRoot":"","sources":["../../src/runtime/path-config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"path-config.js","sourceRoot":"","sources":["../../src/runtime/path-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,18 +34,27 @@ describe('resolveReviewPaths', () => {
|
|
|
34
34
|
expect(canonical.skillSearchPaths).toEqual([resolve(projectRoot, '.drs/skills')]);
|
|
35
35
|
expect(nonCanonical).toEqual(canonical);
|
|
36
36
|
});
|
|
37
|
-
it('auto-discovers
|
|
37
|
+
it('auto-discovers .drs/skills, .agents/skills, and .pi/skills in precedence order', () => {
|
|
38
38
|
const projectRoot = createTempDir('drs-path-skill-discovery-');
|
|
39
39
|
mkdirSync(join(projectRoot, '.drs', 'skills'), { recursive: true });
|
|
40
|
+
mkdirSync(join(projectRoot, '.agents', 'skills'), { recursive: true });
|
|
40
41
|
mkdirSync(join(projectRoot, '.pi', 'skills'), { recursive: true });
|
|
41
42
|
const result = resolveReviewPaths(projectRoot);
|
|
42
43
|
expect(result.skillSearchPaths).toEqual([
|
|
43
44
|
resolve(projectRoot, '.drs/skills'),
|
|
45
|
+
resolve(projectRoot, '.agents/skills'),
|
|
44
46
|
resolve(projectRoot, '.pi/skills'),
|
|
45
47
|
]);
|
|
46
48
|
expect(result.skillsPath).toBe(resolve(projectRoot, '.drs/skills'));
|
|
47
49
|
});
|
|
48
|
-
it('uses .
|
|
50
|
+
it('uses .agents/skills when .drs/skills is missing', () => {
|
|
51
|
+
const projectRoot = createTempDir('drs-path-agents-skills-');
|
|
52
|
+
mkdirSync(join(projectRoot, '.agents', 'skills'), { recursive: true });
|
|
53
|
+
const result = resolveReviewPaths(projectRoot);
|
|
54
|
+
expect(result.skillSearchPaths).toEqual([resolve(projectRoot, '.agents/skills')]);
|
|
55
|
+
expect(result.skillsPath).toBe(resolve(projectRoot, '.agents/skills'));
|
|
56
|
+
});
|
|
57
|
+
it('uses .pi/skills when .drs/skills and .agents/skills are missing', () => {
|
|
49
58
|
const projectRoot = createTempDir('drs-path-pi-skills-');
|
|
50
59
|
mkdirSync(join(projectRoot, '.pi', 'skills'), { recursive: true });
|
|
51
60
|
const result = resolveReviewPaths(projectRoot);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-config.test.js","sourceRoot":"","sources":["../../src/runtime/path-config.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,SAAS,YAAY,CAAC,KAA6C;IACjE,OAAO;QACL,MAAM,EAAE;YACN,KAAK,EAAE;gBACL,MAAM,EAAE,KAAK,CAAC,MAA4B;gBAC1C,MAAM,EAAE,KAAK,CAAC,MAA4B;aAC3C;SACF;KACsB,CAAC;AAC5B,CAAC;AAED,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,SAAS,aAAa,CAAC,MAAc;QACnC,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;QAChD,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACtD,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,WAAW,GAAG,aAAa,CAAC,mBAAmB,CAAC,CAAC;QAEvD,MAAM,SAAS,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QAE3E,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;QACvE,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;QACvE,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QAClF,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"path-config.test.js","sourceRoot":"","sources":["../../src/runtime/path-config.test.ts"],"names":[],"mappings":"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"}
|