@diff-review-system/drs 3.3.0 → 4.0.0-rc.4

package/dist/runtime/agent-loader.d.ts

@@ -1,5 +1,7 @@
 import type { DRSConfig } from '../lib/config.js';
 export interface AgentDefinition {
+    id: string;
+    namespace: string;
     name: string;
     path: string;
     description: string;
@@ -7,24 +9,26 @@ export interface AgentDefinition {
     color?: string;
     model?: string;
     tools?: Record<string, boolean>;
+    /** Skills declared in agent frontmatter and merged with config-level skills at runtime. */
+    skills?: string[];
     hidden?: boolean;
 }
 /**
- * Load review agents from a project directory
+ * Load agents from a project directory.
  *
  * Priority order:
- * 1. Project .drs/agents/<name>/agent.md (DRS-specific overrides/custom)
+ * 1. Project .drs/agents/<namespace>/<name>/agent.md (DRS-specific overrides/custom)
  * 2. Built-in agents shipped with DRS (.pi/agents)
  */
-export declare function loadReviewAgents(projectPath: string, config?: DRSConfig): AgentDefinition[];
+export declare function loadAgents(projectPath: string, config?: DRSConfig): AgentDefinition[];
 /**
  * Get a specific agent by name
  */
-export declare function getAgent(projectPath: string, agentName: string, config?: DRSConfig): AgentDefinition | null;
+export declare function getAgent(projectPath: string, agentId: string, config?: DRSConfig): AgentDefinition | null;
 /**
- * Get all review agents (security, quality, style, performance, documentation)
+ * Get all agents in a namespace.
  */
-export declare function getReviewAgents(projectPath: string, config?: DRSConfig): AgentDefinition[];
+export declare function getAgentsByNamespace(projectPath: string, namespace: string, config?: DRSConfig): AgentDefinition[];
 /**
  * List all available agents
  */

package/dist/runtime/agent-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-loader.d.ts","sourceRoot":"","sources":["../../src/runtime/agent-loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAIlD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,eAAe,EAAE,CAyB3F;AAmGD;;GAEG;AACH,wBAAgB,QAAQ,CACtB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,SAAS,GACjB,eAAe,GAAG,IAAI,CAGxB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,eAAe,EAAE,CAG1F;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,EAAE,CAG5E"}
+{"version":3,"file":"agent-loader.d.ts","sourceRoot":"","sources":["../../src/runtime/agent-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAIlD,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,2FAA2F;IAC3F,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAiBD;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,eAAe,EAAE,CAyBrF;AAoHD;;GAEG;AACH,wBAAgB,QAAQ,CACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,SAAS,GACjB,eAAe,GAAG,IAAI,CAGxB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,SAAS,GACjB,eAAe,EAAE,CAGnB;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,EAAE,CAG5E"}

package/dist/runtime/agent-loader.js

@@ -1,32 +1,45 @@
 import { readFileSync, readdirSync, existsSync, statSync } from 'fs';
 import { join, relative } from 'path';
 import * as yaml from 'yaml';
+import { getAgentIdValidationError, parseAgentId } from '../lib/agent-id.js';
 import { getBuiltInAgentPaths } from './built-in-paths.js';
-import { resolveReviewPaths } from './path-config.js';
+import { resolveAgentPaths } from './path-config.js';
+class InvalidProjectAgentPathError extends Error {
+}
+/** Parse a frontmatter value into a trimmed, non-empty string array. */
+function asStringArray(value) {
+    if (!Array.isArray(value)) {
+        return undefined;
+    }
+    const parsed = value
+        .map((entry) => (typeof entry === 'string' ? entry.trim() : ''))
+        .filter((entry) => entry.length > 0);
+    return parsed.length > 0 ? parsed : undefined;
+}
 /**
- * Load review agents from a project directory
+ * Load agents from a project directory.
  *
  * Priority order:
- * 1. Project .drs/agents/<name>/agent.md (DRS-specific overrides/custom)
+ * 1. Project .drs/agents/<namespace>/<name>/agent.md (DRS-specific overrides/custom)
  * 2. Built-in agents shipped with DRS (.pi/agents)
  */
-export function loadReviewAgents(projectPath, config) {
+export function loadAgents(projectPath, config) {
     const agents = [];
     const discovered = new Set();
-    const { agentsPath } = resolveReviewPaths(projectPath, config);
-    const overrideAgents = discoverOverrideAgents(agentsPath, agentsPath);
+    const { agentsPath } = resolveAgentPaths(projectPath, config);
+    const overrideAgents = discoverProjectAgents(agentsPath, agentsPath);
     for (const agent of overrideAgents) {
-        if (!discovered.has(agent.name)) {
+        if (!discovered.has(agent.id)) {
             agents.push(agent);
-            discovered.add(agent.name);
+            discovered.add(agent.id);
         }
     }
     for (const builtInPath of getBuiltInAgentPaths()) {
         const builtInAgents = discoverAgents(builtInPath, builtInPath);
         for (const agent of builtInAgents) {
-            if (!discovered.has(agent.name)) {
+            if (!discovered.has(agent.id)) {
                 agents.push(agent);
-                discovered.add(agent.name);
+                discovered.add(agent.id);
             }
         }
     }
@@ -62,7 +75,7 @@ function discoverAgents(basePath, currentPath) {
 /**
  * Parse an agent markdown file and extract frontmatter
  */
-function parseAgentFile(filePath, basePath, nameOverride) {
+function parseAgentFile(filePath, basePath, nameOverride, failOnInvalidAgentId = false) {
     try {
         const content = readFileSync(filePath, 'utf-8');
         // Extract YAML frontmatter
@@ -73,57 +86,70 @@ function parseAgentFile(filePath, basePath, nameOverride) {
         }
         const frontmatter = yaml.parse(frontmatterMatch[1]) ?? {};
         // Generate agent name from relative path
-        const agentName = nameOverride ?? relative(basePath, filePath).replace(/\.md$/, '').replace(/\\/g, '/');
+        const agentId = nameOverride ?? relative(basePath, filePath).replace(/\.md$/, '').replace(/\\/g, '/');
+        const parsedAgentId = parseAgentId(agentId);
+        if (!parsedAgentId) {
+            const guidance = !agentId.includes('/')
+                ? ` Move it to .drs/agents/review/${agentId}/agent.md for a review agent.`
+                : '';
+            const error = new InvalidProjectAgentPathError(`${getAgentIdValidationError(agentId)} Project agents must be stored as .drs/agents/<namespace>/<name>/agent.md.${guidance} File: ${filePath}`);
+            throw error;
+        }
         const prompt = content.slice(frontmatterMatch[0].length).trim();
         return {
-            name: agentName,
+            id: agentId,
+            namespace: parsedAgentId.namespace,
+            name: parsedAgentId.name,
             path: filePath,
             description: frontmatter.description || '',
             prompt,
             color: frontmatter.color,
             model: frontmatter.model,
             tools: frontmatter.tools,
+            skills: asStringArray(frontmatter.skills),
             hidden: frontmatter.hidden || false,
         };
     }
     catch (error) {
+        if (failOnInvalidAgentId && error instanceof InvalidProjectAgentPathError) {
+            throw error;
+        }
         console.error(`Error parsing agent file ${filePath}:`, error);
         return null;
     }
 }
 /**
- * Discover override agents from .drs/agents/<name>/agent.md
+ * Discover project agents from .drs/agents/<namespace>/<name>/agent.md
  */
-function discoverOverrideAgents(basePath, currentPath) {
+function discoverProjectAgents(basePath, currentPath) {
     const files = traverseDirectory(basePath, currentPath, (entry) => entry === 'agent.md');
     return files
         .map((fullPath) => {
         const relativePath = relative(basePath, fullPath).replace(/\\/g, '/');
-        const stripped = relativePath.replace(/\/agent\.md$/, '');
-        const agentName = stripped.startsWith('review/') ? stripped : `review/${stripped}`;
-        return parseAgentFile(fullPath, basePath, agentName);
+        const agentId = relativePath.replace(/\/agent\.md$/, '');
+        return parseAgentFile(fullPath, basePath, agentId, true);
     })
         .filter((agent) => Boolean(agent));
 }
 /**
  * Get a specific agent by name
  */
-export function getAgent(projectPath, agentName, config) {
-    const agents = loadReviewAgents(projectPath, config);
-    return agents.find((a) => a.name === agentName) ?? null;
+export function getAgent(projectPath, agentId, config) {
+    const agents = loadAgents(projectPath, config);
+    return agents.find((a) => a.id === agentId) ?? null;
 }
 /**
- * Get all review agents (security, quality, style, performance, documentation)
+ * Get all agents in a namespace.
  */
-export function getReviewAgents(projectPath, config) {
-    const agents = loadReviewAgents(projectPath, config);
-    return agents.filter((a) => a.name.startsWith('review/'));
+export function getAgentsByNamespace(projectPath, namespace, config) {
+    const agents = loadAgents(projectPath, config);
+    return agents.filter((a) => a.namespace === namespace);
 }
 /**
  * List all available agents
  */
 export function listAgents(projectPath, config) {
-    const agents = loadReviewAgents(projectPath, config);
-    return agents.map((a) => a.name);
+    const agents = loadAgents(projectPath, config);
+    return agents.map((a) => a.id);
 }
 //# sourceMappingURL=agent-loader.js.map

package/dist/runtime/agent-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-loader.js","sourceRoot":"","sources":["../../src/runtime/agent-loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-loader.js","sourceRoot":"","sources":["../../src/runtime/agent-loader.ts"],"names":[],"mappings":"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"}

package/dist/runtime/agent-loader.test.js

@@ -2,10 +2,10 @@ import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'fs';
 import { tmpdir } from 'os';
 import { join, resolve } from 'path';
 import { afterEach, describe, expect, it, vi } from 'vitest';
-import { getAgent, getReviewAgents, listAgents, loadReviewAgents } from './agent-loader.js';
+import { getAgent, getAgentsByNamespace, listAgents, loadAgents } from './agent-loader.js';
 function createConfig(agentsPath) {
     return {
-        review: {
+        agents: {
             paths: {
                 agents: agentsPath,
             },
@@ -27,81 +27,72 @@ describe('agent-loader path resolution', () => {
     it('loads override agents from configured repo-relative path', () => {
         const projectRoot = createTempDir('drs-agent-loader-');
         const customAgentsRoot = join(projectRoot, 'config', 'agents');
-        const customAgentPath = join(customAgentsRoot, 'security', 'agent.md');
-        mkdirSync(join(customAgentsRoot, 'security'), { recursive: true });
-        writeFileSync(customAgentPath, `---\ndescription: Custom security override\nmodel: anthropic/custom-security\n---\n\nCustom security instructions\n`);
-        const agents = loadReviewAgents(projectRoot, createConfig('config/agents'));
-        const securityAgent = agents.find((agent) => agent.name === 'review/security');
-        expect(securityAgent).toBeDefined();
-        expect(securityAgent?.description).toBe('Custom security override');
-        expect(securityAgent?.path).toBe(resolve(customAgentPath));
-        expect(agents.some((agent) => agent.name === 'review/quality')).toBe(true);
+        const customAgentPath = join(customAgentsRoot, 'review', 'unified-reviewer', 'agent.md');
+        mkdirSync(join(customAgentsRoot, 'review', 'unified-reviewer'), { recursive: true });
+        writeFileSync(customAgentPath, `---\ndescription: Custom unified override\nmodel: anthropic/custom-unified\n---\n\nCustom unified instructions\n`);
+        const agents = loadAgents(projectRoot, createConfig('config/agents'));
+        const unifiedAgent = agents.find((agent) => agent.id === 'review/unified-reviewer');
+        expect(unifiedAgent).toBeDefined();
+        expect(unifiedAgent?.description).toBe('Custom unified override');
+        expect(unifiedAgent?.path).toBe(resolve(customAgentPath));
+        expect(agents.some((agent) => agent.id === 'review/unified-reviewer')).toBe(true);
     });
     it('custom agent override replaces built-in prompt and model', () => {
         const projectRoot = createTempDir('drs-agent-override-');
         const agentsDir = join(projectRoot, '.drs', 'agents');
-        mkdirSync(join(agentsDir, 'security'), { recursive: true });
-        writeFileSync(join(agentsDir, 'security', 'agent.md'), [
+        mkdirSync(join(agentsDir, 'review', 'unified-reviewer'), { recursive: true });
+        writeFileSync(join(agentsDir, 'review', 'unified-reviewer', 'agent.md'), [
             '---',
-            'description: Project-specific security reviewer',
-            'model: openai/gpt-4o',
+            'description: Project-specific unified reviewer',
+            'model: openai/gpt-4o-mini',
             '---',
             '',
-            'You are a security reviewer for our Rails application.',
-            'Focus on mass assignment and CSRF vulnerabilities.',
+            'You are a unified reviewer for our Rails application.',
+            'Focus on correctness and security issues.',
             '',
         ].join('\n'));
-        const agents = loadReviewAgents(projectRoot);
-        const securityAgent = agents.find((a) => a.name === 'review/security');
-        expect(securityAgent).toBeDefined();
-        expect(securityAgent?.description).toBe('Project-specific security reviewer');
-        expect(securityAgent?.model).toBe('openai/gpt-4o');
-        expect(securityAgent?.prompt).toContain('Rails application');
-        expect(securityAgent?.prompt).toContain('CSRF vulnerabilities');
+        const agents = loadAgents(projectRoot);
+        const unifiedAgent = agents.find((a) => a.id === 'review/unified-reviewer');
+        expect(unifiedAgent).toBeDefined();
+        expect(unifiedAgent?.description).toBe('Project-specific unified reviewer');
+        expect(unifiedAgent?.model).toBe('openai/gpt-4o-mini');
+        expect(unifiedAgent?.prompt).toContain('Rails application');
+        expect(unifiedAgent?.prompt).toContain('correctness and security');
         // Must NOT contain the built-in prompt
-        expect(securityAgent?.prompt).not.toContain('Security Vulnerability Assessment');
-        // Other built-in agents still loaded
-        const qualityAgent = agents.find((a) => a.name === 'review/quality');
-        expect(qualityAgent).toBeDefined();
-        expect(qualityAgent?.path).toMatch(/\.pi[\\/]agents[\\/]review[\\/]quality\.md$/);
+        expect(unifiedAgent?.prompt).not.toContain('Security Vulnerability Assessment');
     });
-    it('multiple custom agents override their respective built-ins', () => {
+    it('supports custom review agents alongside packaged unified reviewer', () => {
         const projectRoot = createTempDir('drs-agent-multi-override-');
         const agentsDir = join(projectRoot, '.drs', 'agents');
-        mkdirSync(join(agentsDir, 'security'), { recursive: true });
-        mkdirSync(join(agentsDir, 'style'), { recursive: true });
-        writeFileSync(join(agentsDir, 'security', 'agent.md'), '---\ndescription: Custom security\n---\n\nCustom security prompt\n');
-        writeFileSync(join(agentsDir, 'style', 'agent.md'), '---\ndescription: Custom style\n---\n\nCustom style prompt\n');
-        const agents = loadReviewAgents(projectRoot);
-        const security = agents.find((a) => a.name === 'review/security');
-        const style = agents.find((a) => a.name === 'review/style');
-        const quality = agents.find((a) => a.name === 'review/quality');
-        expect(security?.prompt).toBe('Custom security prompt');
-        expect(style?.prompt).toBe('Custom style prompt');
-        // quality remains built-in
-        expect(quality?.path).toMatch(/\.pi[\\/]agents[\\/]review[\\/]quality\.md$/);
+        mkdirSync(join(agentsDir, 'review', 'sql-reviewer'), { recursive: true });
+        mkdirSync(join(agentsDir, 'review', 'api-reviewer'), { recursive: true });
+        writeFileSync(join(agentsDir, 'review', 'sql-reviewer', 'agent.md'), '---\ndescription: Custom SQL reviewer\n---\n\nCustom SQL prompt\n');
+        writeFileSync(join(agentsDir, 'review', 'api-reviewer', 'agent.md'), '---\ndescription: Custom API reviewer\n---\n\nCustom API prompt\n');
+        const agents = loadAgents(projectRoot);
+        const sqlReviewer = agents.find((a) => a.id === 'review/sql-reviewer');
+        const apiReviewer = agents.find((a) => a.id === 'review/api-reviewer');
+        const unified = agents.find((a) => a.id === 'review/unified-reviewer');
+        expect(sqlReviewer?.prompt).toBe('Custom SQL prompt');
+        expect(apiReviewer?.prompt).toBe('Custom API prompt');
+        expect(unified?.path).toMatch(/\.pi[\\/]agents[\\/]review[\\/]unified-reviewer\.md$/);
     });
-    it('loads built-in Pi-native review agents and keeps all core categories', () => {
-        const agents = loadReviewAgents(process.cwd());
-        const reviewAgentNames = new Set(agents.filter((agent) => agent.name.startsWith('review/')).map((agent) => agent.name));
-        expect(reviewAgentNames.has('review/security')).toBe(true);
-        expect(reviewAgentNames.has('review/quality')).toBe(true);
-        expect(reviewAgentNames.has('review/style')).toBe(true);
-        expect(reviewAgentNames.has('review/performance')).toBe(true);
-        expect(reviewAgentNames.has('review/documentation')).toBe(true);
-        const securityAgent = agents.find((agent) => agent.name === 'review/security');
-        expect(securityAgent?.prompt).toContain('Security Vulnerability Assessment');
-        expect(securityAgent?.path).toMatch(/\.pi[\\/]agents[\\/]review[\\/]security\.md$/);
+    it('loads packaged unified review agent', () => {
+        const agents = loadAgents(process.cwd());
+        const reviewAgentNames = new Set(agents.filter((agent) => agent.namespace === 'review').map((agent) => agent.id));
+        expect(reviewAgentNames.has('review/unified-reviewer')).toBe(true);
+        const unifiedAgent = agents.find((agent) => agent.id === 'review/unified-reviewer');
+        expect(unifiedAgent?.prompt).toContain('unified code review agent');
+        expect(unifiedAgent?.path).toMatch(/\.pi[\\/]agents[\\/]review[\\/]unified-reviewer\.md$/);
     });
     it('throws actionable error when configured agent path is invalid', () => {
         const projectRoot = createTempDir('drs-agent-loader-invalid-');
-        expect(() => loadReviewAgents(projectRoot, createConfig('missing/agents'))).toThrow('review.paths.agents');
+        expect(() => loadAgents(projectRoot, createConfig('missing/agents'))).toThrow('agents.paths.agents');
     });
     it('override preserves frontmatter fields: color, tools, hidden', () => {
         const projectRoot = createTempDir('drs-agent-frontmatter-');
         const agentsDir = join(projectRoot, '.drs', 'agents');
-        mkdirSync(join(agentsDir, 'security'), { recursive: true });
-        writeFileSync(join(agentsDir, 'security', 'agent.md'), [
+        mkdirSync(join(agentsDir, 'review', 'unified-reviewer'), { recursive: true });
+        writeFileSync(join(agentsDir, 'review', 'unified-reviewer', 'agent.md'), [
             '---',
             'description: Themed agent',
             'color: "#FF5733"',
@@ -109,33 +100,45 @@ describe('agent-loader path resolution', () => {
             'tools:',
             '  Read: true',
             '  Grep: false',
+            'skills:',
+            '  - secure-code-review',
+            '  - dependency-audit',
             '---',
             '',
             'Custom prompt with all frontmatter fields.',
             '',
         ].join('\n'));
-        const agents = loadReviewAgents(projectRoot);
-        const security = agents.find((a) => a.name === 'review/security');
-        expect(security?.color).toBe('#FF5733');
-        expect(security?.hidden).toBe(true);
-        expect(security?.tools).toEqual({ Read: true, Grep: false });
-        expect(security?.prompt).toBe('Custom prompt with all frontmatter fields.');
+        const agents = loadAgents(projectRoot);
+        const unified = agents.find((a) => a.id === 'review/unified-reviewer');
+        expect(unified?.color).toBe('#FF5733');
+        expect(unified?.hidden).toBe(true);
+        expect(unified?.tools).toEqual({ Read: true, Grep: false });
+        expect(unified?.skills).toEqual(['secure-code-review', 'dependency-audit']);
+        expect(unified?.prompt).toBe('Custom prompt with all frontmatter fields.');
     });
     it('agent.md without frontmatter is skipped with warning', () => {
         const projectRoot = createTempDir('drs-agent-no-frontmatter-');
         const agentsDir = join(projectRoot, '.drs', 'agents');
-        mkdirSync(join(agentsDir, 'security'), { recursive: true });
-        writeFileSync(join(agentsDir, 'security', 'agent.md'), 'Just plain text, no frontmatter at all.\n');
+        mkdirSync(join(agentsDir, 'review', 'unified-reviewer'), { recursive: true });
+        writeFileSync(join(agentsDir, 'review', 'unified-reviewer', 'agent.md'), 'Just plain text, no frontmatter at all.\n');
         const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => { });
-        const agents = loadReviewAgents(projectRoot);
-        // Override skipped — built-in security still loaded
-        const security = agents.find((a) => a.name === 'review/security');
-        expect(security?.path).toMatch(/\.pi[\\/]agents[\\/]review[\\/]security\.md$/);
+        const agents = loadAgents(projectRoot);
+        // Override skipped — built-in unified reviewer still loaded
+        const unified = agents.find((a) => a.id === 'review/unified-reviewer');
+        expect(unified?.path).toMatch(/\.pi[\\/]agents[\\/]review[\\/]unified-reviewer\.md$/);
         expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('No frontmatter'));
         warnSpy.mockRestore();
     });
+    it('fails flat project agents with migration guidance', () => {
+        const projectRoot = createTempDir('drs-agent-flat-');
+        const agentsDir = join(projectRoot, '.drs', 'agents');
+        mkdirSync(join(agentsDir, 'unified-reviewer'), { recursive: true });
+        writeFileSync(join(agentsDir, 'unified-reviewer', 'agent.md'), '---\ndescription: Flat security\n---\n\nFlat prompt\n');
+        expect(() => loadAgents(projectRoot)).toThrow('.drs/agents/<namespace>/<name>/agent.md');
+        expect(() => loadAgents(projectRoot)).toThrow('.drs/agents/review/unified-reviewer/agent.md');
+    });
 });
-describe('getAgent / getReviewAgents / listAgents', () => {
+describe('getAgent / getAgentsByNamespace / listAgents', () => {
     const tempDirs = [];
     function createTempDir(prefix) {
         const dir = mkdtempSync(join(tmpdir(), prefix));
@@ -148,10 +151,10 @@ describe('getAgent / getReviewAgents / listAgents', () => {
         }
     });
     it('getAgent returns a specific agent by full name', () => {
-        const agent = getAgent(process.cwd(), 'review/security');
+        const agent = getAgent(process.cwd(), 'review/unified-reviewer');
         expect(agent).not.toBeNull();
-        expect(agent?.name).toBe('review/security');
-        expect(agent?.prompt).toContain('Security Vulnerability Assessment');
+        expect(agent?.id).toBe('review/unified-reviewer');
+        expect(agent?.prompt).toContain('unified code review agent');
     });
     it('getAgent returns null for non-existent agent', () => {
         const agent = getAgent(process.cwd(), 'review/nonexistent');
@@ -160,42 +163,38 @@ describe('getAgent / getReviewAgents / listAgents', () => {
     it('getAgent returns override when present', () => {
         const projectRoot = createTempDir('drs-get-agent-');
         const agentsDir = join(projectRoot, '.drs', 'agents');
-        mkdirSync(join(agentsDir, 'security'), { recursive: true });
-        writeFileSync(join(agentsDir, 'security', 'agent.md'), '---\ndescription: Override via getAgent\n---\n\nOverride prompt\n');
-        const agent = getAgent(projectRoot, 'review/security');
+        mkdirSync(join(agentsDir, 'review', 'unified-reviewer'), { recursive: true });
+        writeFileSync(join(agentsDir, 'review', 'unified-reviewer', 'agent.md'), '---\ndescription: Override via getAgent\n---\n\nOverride prompt\n');
+        const agent = getAgent(projectRoot, 'review/unified-reviewer');
         expect(agent?.description).toBe('Override via getAgent');
         expect(agent?.prompt).toBe('Override prompt');
     });
-    it('getReviewAgents returns only review/ prefixed agents', () => {
-        const agents = getReviewAgents(process.cwd());
-        expect(agents.length).toBeGreaterThanOrEqual(5);
-        expect(agents.every((a) => a.name.startsWith('review/'))).toBe(true);
+    it('getAgentsByNamespace returns only review agents', () => {
+        const agents = getAgentsByNamespace(process.cwd(), 'review');
+        expect(agents.length).toBeGreaterThanOrEqual(1);
+        expect(agents.every((a) => a.namespace === 'review')).toBe(true);
     });
-    it('getReviewAgents includes overrides', () => {
+    it('getAgentsByNamespace includes overrides', () => {
         const projectRoot = createTempDir('drs-get-review-agents-');
         const agentsDir = join(projectRoot, '.drs', 'agents');
-        mkdirSync(join(agentsDir, 'quality'), { recursive: true });
-        writeFileSync(join(agentsDir, 'quality', 'agent.md'), '---\ndescription: Custom quality\n---\n\nCustom quality prompt\n');
-        const agents = getReviewAgents(projectRoot);
-        const quality = agents.find((a) => a.name === 'review/quality');
-        expect(quality?.description).toBe('Custom quality');
+        mkdirSync(join(agentsDir, 'review', 'unified-reviewer'), { recursive: true });
+        writeFileSync(join(agentsDir, 'review', 'unified-reviewer', 'agent.md'), '---\ndescription: Custom unified\n---\n\nCustom unified prompt\n');
+        const agents = getAgentsByNamespace(projectRoot, 'review');
+        const unified = agents.find((a) => a.id === 'review/unified-reviewer');
+        expect(unified?.description).toBe('Custom unified');
     });
     it('listAgents returns all agent names as strings', () => {
         const names = listAgents(process.cwd());
-        expect(names).toContain('review/security');
-        expect(names).toContain('review/quality');
-        expect(names).toContain('review/style');
-        expect(names).toContain('review/performance');
-        expect(names).toContain('review/documentation');
+        expect(names).toContain('review/unified-reviewer');
     });
     it('listAgents reflects overrides without duplication', () => {
         const projectRoot = createTempDir('drs-list-agents-');
         const agentsDir = join(projectRoot, '.drs', 'agents');
-        mkdirSync(join(agentsDir, 'security'), { recursive: true });
-        writeFileSync(join(agentsDir, 'security', 'agent.md'), '---\ndescription: Override\n---\n\nOverride prompt\n');
+        mkdirSync(join(agentsDir, 'review', 'unified-reviewer'), { recursive: true });
+        writeFileSync(join(agentsDir, 'review', 'unified-reviewer', 'agent.md'), '---\ndescription: Override\n---\n\nOverride prompt\n');
         const names = listAgents(projectRoot);
-        const securityCount = names.filter((n) => n === 'review/security').length;
-        expect(securityCount).toBe(1);
+        const unifiedCount = names.filter((n) => n === 'review/unified-reviewer').length;
+        expect(unifiedCount).toBe(1);
     });
 });
 describe('new custom agent (not overriding built-in)', () => {
@@ -213,8 +212,8 @@ describe('new custom agent (not overriding built-in)', () => {
     it('discovers a brand new agent alongside built-ins', () => {
         const projectRoot = createTempDir('drs-new-agent-');
         const agentsDir = join(projectRoot, '.drs', 'agents');
-        mkdirSync(join(agentsDir, 'rails-reviewer'), { recursive: true });
-        writeFileSync(join(agentsDir, 'rails-reviewer', 'agent.md'), [
+        mkdirSync(join(agentsDir, 'review', 'rails-reviewer'), { recursive: true });
+        writeFileSync(join(agentsDir, 'review', 'rails-reviewer', 'agent.md'), [
             '---',
             'description: Rails-specific code reviewer',
             'model: anthropic/claude-sonnet-4-5-20250929',
@@ -225,56 +224,54 @@ describe('new custom agent (not overriding built-in)', () => {
             'Focus on mass assignment, strong params, and N+1 queries.',
             '',
         ].join('\n'));
-        const agents = loadReviewAgents(projectRoot);
+        const agents = loadAgents(projectRoot);
         // New agent discovered
-        const rails = agents.find((a) => a.name === 'review/rails-reviewer');
+        const rails = agents.find((a) => a.id === 'review/rails-reviewer');
         expect(rails).toBeDefined();
         expect(rails?.description).toBe('Rails-specific code reviewer');
         expect(rails?.model).toBe('anthropic/claude-sonnet-4-5-20250929');
         expect(rails?.color).toBe('#CC0000');
         expect(rails?.prompt).toContain('mass assignment');
         expect(rails?.prompt).toContain('N+1 queries');
-        // Built-ins still present
-        expect(agents.some((a) => a.name === 'review/security')).toBe(true);
-        expect(agents.some((a) => a.name === 'review/quality')).toBe(true);
+        // Packaged unified reviewer still present
+        expect(agents.some((a) => a.id === 'review/unified-reviewer')).toBe(true);
     });
     it('new agent is accessible via getAgent', () => {
         const projectRoot = createTempDir('drs-new-get-agent-');
         const agentsDir = join(projectRoot, '.drs', 'agents');
-        mkdirSync(join(agentsDir, 'api-reviewer'), { recursive: true });
-        writeFileSync(join(agentsDir, 'api-reviewer', 'agent.md'), '---\ndescription: API contract reviewer\n---\n\nReview REST API contracts.\n');
+        mkdirSync(join(agentsDir, 'review', 'api-reviewer'), { recursive: true });
+        writeFileSync(join(agentsDir, 'review', 'api-reviewer', 'agent.md'), '---\ndescription: API contract reviewer\n---\n\nReview REST API contracts.\n');
         const agent = getAgent(projectRoot, 'review/api-reviewer');
         expect(agent).not.toBeNull();
         expect(agent?.description).toBe('API contract reviewer');
         expect(agent?.prompt).toBe('Review REST API contracts.');
     });
-    it('new agent appears in getReviewAgents and listAgents', () => {
+    it('new agent appears in getAgentsByNamespace and listAgents', () => {
         const projectRoot = createTempDir('drs-new-list-');
         const agentsDir = join(projectRoot, '.drs', 'agents');
-        mkdirSync(join(agentsDir, 'accessibility'), { recursive: true });
-        writeFileSync(join(agentsDir, 'accessibility', 'agent.md'), '---\ndescription: Accessibility reviewer\n---\n\nCheck WCAG compliance.\n');
-        const reviewAgents = getReviewAgents(projectRoot);
-        expect(reviewAgents.some((a) => a.name === 'review/accessibility')).toBe(true);
+        mkdirSync(join(agentsDir, 'review', 'accessibility'), { recursive: true });
+        writeFileSync(join(agentsDir, 'review', 'accessibility', 'agent.md'), '---\ndescription: Accessibility reviewer\n---\n\nCheck WCAG compliance.\n');
+        const reviewAgents = getAgentsByNamespace(projectRoot, 'review');
+        expect(reviewAgents.some((a) => a.id === 'review/accessibility')).toBe(true);
         const names = listAgents(projectRoot);
         expect(names).toContain('review/accessibility');
     });
     it('new agent coexists with overrides of built-ins', () => {
         const projectRoot = createTempDir('drs-new-plus-override-');
         const agentsDir = join(projectRoot, '.drs', 'agents');
-        mkdirSync(join(agentsDir, 'security'), { recursive: true });
-        mkdirSync(join(agentsDir, 'rails-reviewer'), { recursive: true });
-        writeFileSync(join(agentsDir, 'security', 'agent.md'), '---\ndescription: Custom security\n---\n\nCustom security prompt\n');
-        writeFileSync(join(agentsDir, 'rails-reviewer', 'agent.md'), '---\ndescription: Rails reviewer\n---\n\nRails review prompt\n');
-        const agents = loadReviewAgents(projectRoot);
+        mkdirSync(join(agentsDir, 'review', 'unified-reviewer'), { recursive: true });
+        mkdirSync(join(agentsDir, 'review', 'rails-reviewer'), { recursive: true });
+        writeFileSync(join(agentsDir, 'review', 'unified-reviewer', 'agent.md'), '---\ndescription: Custom unified\n---\n\nCustom unified prompt\n');
+        writeFileSync(join(agentsDir, 'review', 'rails-reviewer', 'agent.md'), '---\ndescription: Rails reviewer\n---\n\nRails review prompt\n');
+        const agents = loadAgents(projectRoot);
         // Override replaces built-in
-        const security = agents.find((a) => a.name === 'review/security');
-        expect(security?.prompt).toBe('Custom security prompt');
+        const unified = agents.find((a) => a.id === 'review/unified-reviewer');
+        expect(unified?.prompt).toBe('Custom unified prompt');
         // New agent added
-        const rails = agents.find((a) => a.name === 'review/rails-reviewer');
+        const rails = agents.find((a) => a.id === 'review/rails-reviewer');
         expect(rails?.prompt).toBe('Rails review prompt');
-        // Other built-ins still present
-        expect(agents.some((a) => a.name === 'review/quality')).toBe(true);
-        expect(agents.some((a) => a.name === 'review/style')).toBe(true);
+        // Packaged unified reviewer can be overridden while custom agents coexist
+        expect(agents.some((a) => a.id === 'review/unified-reviewer')).toBe(true);
     });
 });
 //# sourceMappingURL=agent-loader.test.js.map