create-byan-agent 2.18.0 → 2.19.1

package/install/src/webui/api.js

@@ -21,6 +21,7 @@ try { GistClient = require('../../lib/exchange/gist-client'); } catch { GistClie
 
 const fs = require('fs');
 const path = require('path');
+const layoutResolver = require('../../../src/byan-v2/lib/layout-resolver');
 
 const { createBridge } = require('./chat/bridge');
 const { detectCLIs, detectAgents } = require('./chat/cli-detector');
@@ -63,8 +64,19 @@ function readPackageVersion() {
   }
 }
 
+// The current platform install lives under _byan/. _bmad/ is the dead Gen1
+// marker, tolerated only so a legacy checkout is still recognized as installed.
+function installRoot(projectRoot) {
+  const byan = path.join(projectRoot, '_byan');
+  if (fs.existsSync(byan)) return byan;
+  const bmad = path.join(projectRoot, '_bmad');
+  if (fs.existsSync(bmad)) return bmad;
+  return byan;
+}
+
 function isByanInstalled(projectRoot) {
-  return fs.existsSync(path.join(projectRoot, '_bmad'));
+  return fs.existsSync(path.join(projectRoot, '_byan')) ||
+         fs.existsSync(path.join(projectRoot, '_bmad'));
 }
 
 function detectPlatforms(projectRoot) {
@@ -227,7 +239,7 @@ const routes = {
     }
 
     try {
-      const targetPath = path.join(server.projectRoot, '_bmad');
+      const targetPath = installRoot(server.projectRoot);
       await backuper.restore(backupPath, targetPath);
       json(res, 200, { success: true, message: 'Rollback complete' });
     } catch (err) {
@@ -687,18 +699,22 @@ function sleep(ms) {
   return new Promise(r => setTimeout(r, ms));
 }
 
+// Safety-net skeleton created after yanstaller runs. It mirrors yanstaller's
+// Gen2 output (_byan/), so it must stay Gen2 here — emitting Gen3 would create
+// a mixed install the FS migrator does not expect. When the platform cuts over
+// to Gen3 (templates + yanstaller), this skeleton follows.
 function ensureDirectoryStructure(projectRoot) {
   const dirs = [
-    '_bmad',
-    '_bmad/_config',
-    '_bmad/_memory',
-    '_bmad/core',
-    '_bmad/core/agents',
-    '_bmad/core/workflows',
-    '_bmad/core/tasks',
-    '_bmad-output',
-    '_bmad-output/planning-artifacts',
-    '_bmad-output/implementation-artifacts'
+    '_byan',
+    '_byan/_config',
+    '_byan/_memory',
+    '_byan/core',
+    '_byan/core/agents',
+    '_byan/core/workflows',
+    '_byan/core/tasks',
+    '_byan-output',
+    '_byan-output/planning-artifacts',
+    '_byan-output/implementation-artifacts'
   ];
 
   for (const dir of dirs) {
@@ -710,16 +726,21 @@ function ensureDirectoryStructure(projectRoot) {
 }
 
 function writeBaseConfig(projectRoot, config) {
-  const configPath = path.join(projectRoot, '_bmad', 'core', 'config.yaml');
-  if (fs.existsSync(configPath)) return;
+  // Only scaffold a minimal config when the platform has NONE. resolveConfig
+  // also matches _byan/bmb/config.yaml (the authoritative installed config
+  // carrying byan_version + installed_agents); writing a root _byan/config.yaml
+  // over it would shadow it in the resolver chain and break version detection.
+  if (layoutResolver.resolveConfig({ projectRoot })) return;
 
+  const configPath = path.join(projectRoot, '_byan', 'config.yaml');
   const content = [
     `user_name: ${config.userName || 'User'}`,
     `communication_language: ${config.language || 'English'}`,
     `document_output_language: ${config.language || 'English'}`,
-    `output_folder: "{project-root}/_bmad-output"`
+    `output_folder: "{project-root}/_byan-output"`
   ].join('\n') + '\n';
 
+  fs.mkdirSync(path.dirname(configPath), { recursive: true });
   fs.writeFileSync(configPath, content, 'utf8');
 }
 
@@ -831,4 +852,12 @@ function sanitizeUploadFilename(name) {
   return String(name).replace(/[^a-zA-Z0-9_.\-]/g, '').substring(0, 200);
 }
 
-module.exports = { resolve, routes };
+module.exports = {
+  resolve,
+  routes,
+  // Exposed for unit tests (layout-aware install helpers).
+  isByanInstalled,
+  installRoot,
+  ensureDirectoryStructure,
+  writeBaseConfig
+};

package/install/src/webui/chat/bridge.js

@@ -5,6 +5,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const layoutResolver = require('../../../../src/byan-v2/lib/layout-resolver');
 
 class Bridge {
   constructor(options = {}) {
@@ -26,27 +27,16 @@ class Bridge {
   resolveAgent(agentName) {
     if (!agentName) return null;
 
-    const candidates = [
-      path.join(this.projectRoot, '.github', 'agents', `bmad-agent-${agentName}.md`),
-      path.join(this.projectRoot, '_byan', 'agents', `${agentName}.md`),
-    ];
+    // Copilot stub takes priority (it is the explicit entry point when present).
+    const githubStub = path.join(this.projectRoot, '.github', 'agents', `bmad-agent-${agentName}.md`);
+    try {
+      if (fs.existsSync(githubStub)) return githubStub;
+    } catch { /* ignore */ }
 
-    const bmadModules = ['core', 'bmm', 'bmb', 'tea', 'cis'];
-    for (const mod of bmadModules) {
-      candidates.push(
-        path.join(this.projectRoot, '_bmad', mod, 'agents', `${agentName}.md`)
-      );
-    }
-
-    for (const candidate of candidates) {
-      try {
-        if (fs.existsSync(candidate)) return candidate;
-      } catch {
-        continue;
-      }
-    }
-
-    return null;
+    // Then the layout resolver: Gen3 _byan/agent/<name>/ first, Gen2 flat +
+    // per-module, Gen1 _bmad/ fallback.
+    const hit = layoutResolver.resolveAgent(agentName, { projectRoot: this.projectRoot });
+    return hit ? hit.path : null;
   }
 
   _killProcess(proc, timeoutMs = 5000) {

package/install/src/webui/chat/cli-detector.js

@@ -5,6 +5,7 @@
 const { execFile } = require('child_process');
 const fs = require('fs');
 const path = require('path');
+const layoutResolver = require('../../../../src/byan-v2/lib/layout-resolver');
 
 const CLI_DEFINITIONS = [
   { name: 'claude', command: 'claude', versionArg: '--version' },
@@ -103,52 +104,55 @@ function scanDir(dirPath) {
   }
 }
 
+// Map a resolver layout (+ rel) to the legacy source label, so API responses
+// stay stable: Gen2 flat / Gen3 -> 'byan', Gen2 per-module -> 'bmad-<mod>'.
+function sourceForLayout(layout, rel) {
+  if (layout === 'gen2-module' || layout === 'gen1') {
+    const mod = String(rel).split('/')[1];
+    return `bmad-${mod}`;
+  }
+  return 'byan';
+}
+
 async function detectAgents(projectRoot) {
   const agents = [];
   const seen = new Set();
 
-  const locations = [
-    { dir: path.join(projectRoot, '.github', 'agents'), source: 'copilot' },
-    { dir: path.join(projectRoot, '_byan', 'agents'), source: 'byan' },
-  ];
-
-  const bmadModules = ['core', 'bmm', 'bmb', 'tea', 'cis'];
-  for (const mod of bmadModules) {
-    locations.push({
-      dir: path.join(projectRoot, '_bmad', mod, 'agents'),
-      source: `bmad-${mod}`,
+  const pushAgent = (id, source, filePath) => {
+    if (seen.has(id)) return;
+    seen.add(id);
+    let fm = {};
+    try {
+      const content = fs.readFileSync(filePath, 'utf8').slice(0, 2000);
+      fm = parseFrontmatter(content);
+    } catch { /* skip unparseable */ }
+    agents.push({
+      id,
+      name: fm.name || id,
+      description: fm.description || '',
+      icon: fm.icon || null,
+      source,
+      path: filePath,
     });
+  };
+
+  // Copilot stubs (.github/agents) — flat scan, with the bmad-agent- prefix.
+  // Listed first so a copilot stub wins the dedup, preserving prior priority.
+  const githubDir = path.join(projectRoot, '.github', 'agents');
+  for (const file of scanDir(githubDir)) {
+    const id = file
+      .replace(/\.md$/, '')
+      .replace(/^bmad-agent-/, '')
+      .replace(/\.backup\.\d+.*$/, '')
+      .replace(/\.optimized.*$/, '');
+    pushAgent(id, 'copilot', path.join(githubDir, file));
   }
 
-  for (const loc of locations) {
-    const files = scanDir(loc.dir);
-    for (const file of files) {
-      const filePath = path.join(loc.dir, file);
-      const baseName = file.replace(/\.md$/, '');
-
-      const id = baseName
-        .replace(/^bmad-agent-/, '')
-        .replace(/\.backup\.\d+.*$/, '')
-        .replace(/\.optimized.*$/, '');
-
-      if (seen.has(id)) continue;
-      seen.add(id);
-
-      let fm = {};
-      try {
-        const content = fs.readFileSync(filePath, 'utf8').slice(0, 2000);
-        fm = parseFrontmatter(content);
-      } catch { /* skip unparseable */ }
-
-      agents.push({
-        id,
-        name: fm.name || id,
-        description: fm.description || '',
-        icon: fm.icon || null,
-        source: loc.source,
-        path: filePath,
-      });
-    }
+  // _byan agents via the layout resolver: Gen3 _byan/agent/<name>/ first, then
+  // Gen2 flat _byan/agents/ and per-module _byan/<module>/agents/ (deduped).
+  for (const a of layoutResolver.listAgents({ projectRoot })) {
+    if (/\.backup\.\d+|\.optimized/.test(a.name)) continue;
+    pushAgent(a.name, sourceForLayout(a.layout, a.rel), a.path);
   }
 
   agents.sort((a, b) => a.name.localeCompare(b.name));

package/install/src/webui/chat/session-manager.js

@@ -1,16 +1,19 @@
 /**
  * Chat session persistence -- save, load, list, export conversations.
- * Stores under {projectRoot}/_byan/_memory/chat-sessions/
+ * Stores under the memory dir: Gen3 {projectRoot}/_byan/memoire/chat-sessions/
+ * first, Gen2 {projectRoot}/_byan/_memory/chat-sessions/ fallback (resolved via
+ * the layout resolver so reads/writes survive the Gen2->Gen3 FS migration).
  */
 
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
+const layoutResolver = require('../../../../src/byan-v2/lib/layout-resolver');
 
 class SessionManager {
   constructor(projectRoot) {
     this.projectRoot = projectRoot;
-    this.sessionsDir = path.join(projectRoot, '_byan', '_memory', 'chat-sessions');
+    this.sessionsDir = layoutResolver.memoryPath('chat-sessions', { projectRoot }).path;
     this.sessions = new Map();
     this._ensureDir();
   }

package/install/templates/.claude/hooks/inject-soul.js

@@ -11,10 +11,19 @@ const path = require('path');
 
 const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
 
+// Gen3 puts BYAN's soul files under _byan/agent/byan/; Gen2 keeps them at the
+// _byan/ root. Prefer Gen3 when present, fall back to Gen2 (self-contained so
+// the hook never depends on a require that could fail).
+function soulFile(label) {
+  const g3 = path.join(projectDir, '_byan', 'agent', 'byan', `${label}.md`);
+  const g2 = path.join(projectDir, '_byan', `${label}.md`);
+  return fs.existsSync(g3) ? g3 : g2;
+}
+
 const files = [
-  { label: 'soul', path: path.join(projectDir, '_byan', 'soul.md') },
-  { label: 'tao', path: path.join(projectDir, '_byan', 'tao.md') },
-  { label: 'soul-memory', path: path.join(projectDir, '_byan', 'soul-memory.md') },
+  { label: 'soul', path: soulFile('soul') },
+  { label: 'tao', path: soulFile('tao') },
+  { label: 'soul-memory', path: soulFile('soul-memory') },
 ];
 
 const chunks = [];

package/install/templates/.claude/hooks/inject-tao.js

@@ -12,7 +12,9 @@ const fs = require('fs');
 const path = require('path');
 
 const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
-const taoPath = path.join(projectDir, '_byan', 'tao.md');
+// Gen3 _byan/agent/byan/tao.md first, Gen2 _byan/tao.md fallback.
+const taoGen3 = path.join(projectDir, '_byan', 'agent', 'byan', 'tao.md');
+const taoPath = fs.existsSync(taoGen3) ? taoGen3 : path.join(projectDir, '_byan', 'tao.md');
 
 let additionalContext = '';
 try {

package/install/templates/.claude/hooks/mantra-validate.js

@@ -33,12 +33,19 @@ function changedFiles() {
 
 function looksLikeAgentFile(rel) {
   if (!rel.endsWith('.md')) return false;
-  return (
-    rel.includes('_byan/bmb/agents/') ||
-    rel.includes('_byan/agents/') ||
-    rel.includes('.github/agents/') ||
-    rel.includes('.claude/skills/')
-  );
+  if (rel.includes('.github/agents/') || rel.includes('.claude/skills/')) return true;
+  // Layout-aware agent-path detection (Gen3 _byan/agent/, Gen2 flat + every
+  // module — the old check only matched _byan/bmb/agents/, missing the rest).
+  try {
+    const { isAgentPath } = require(path.join(projectDir, 'src/byan-v2/lib/layout-resolver.js'));
+    return isAgentPath(rel);
+  } catch {
+    return (
+      /(^|\/)_byan\/agent\//.test(rel) ||
+      /(^|\/)_byan\/agents\//.test(rel) ||
+      /(^|\/)_byan\/(core|bmm|bmb|tea|cis)\/agents\//.test(rel)
+    );
+  }
 }
 
 function runValidator(absPath) {

package/install/templates/.claude/hooks/pre-compact-save.js

@@ -113,7 +113,10 @@ function renderSnapshot() {
   }
   lines.push('');
 
-  const soul = readTextSafe(path.join(projectDir, '_byan', 'soul.md'), 2000);
+  // Gen3 _byan/agent/byan/soul.md first, Gen2 _byan/soul.md fallback.
+  const soulGen3 = path.join(projectDir, '_byan', 'agent', 'byan', 'soul.md');
+  const soulPath = fs.existsSync(soulGen3) ? soulGen3 : path.join(projectDir, '_byan', 'soul.md');
+  const soul = readTextSafe(soulPath, 2000);
   if (soul) {
     lines.push('## Soul (head)');
     lines.push('');

package/install/templates/.claude/hooks/soul-memory-check.js

@@ -14,7 +14,9 @@ const path = require('path');
 const STALE_DAYS = 14;
 
 const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
-const memoryPath = path.join(projectDir, '_byan', 'soul-memory.md');
+// Gen3 _byan/agent/byan/soul-memory.md first, Gen2 _byan/soul-memory.md fallback.
+const memoryGen3 = path.join(projectDir, '_byan', 'agent', 'byan', 'soul-memory.md');
+const memoryPath = fs.existsSync(memoryGen3) ? memoryGen3 : path.join(projectDir, '_byan', 'soul-memory.md');
 
 function findLastRevision(content) {
   const m = content.match(/last[-_ ]revision\s*[:=]\s*(\d{4}-\d{2}-\d{2})/i);

package/install/templates/.claude/hooks/soul-memory-triggers.js

@@ -12,7 +12,11 @@ const fs = require('fs');
 const path = require('path');
 
 const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
-const markerPath = path.join(projectDir, '_byan', '_memory', '.soul-memory-nudge-sent');
+// State marker lives under the memory dir: Gen3 _byan/memoire/ first, Gen2
+// _byan/_memory/ fallback (whichever dir exists; default Gen2).
+const memoireDir = path.join(projectDir, '_byan', 'memoire');
+const memoryDir = fs.existsSync(memoireDir) ? memoireDir : path.join(projectDir, '_byan', '_memory');
+const markerPath = path.join(memoryDir, '.soul-memory-nudge-sent');
 
 const TRIGGERS = {
   resonance: ['resonne', 'ca me parle', 'exactement', 'c\'est ca', 'that resonates'],

package/install/templates/.claude/hooks/stage-to-byan.js

@@ -43,6 +43,8 @@ function readSettingsEnv() {
 function readMemorySyncConfig() {
   const paths = [
     path.join(projectDir, 'loadbalancer.yaml'),
+    // Gen3 split config first, then Gen2 root config.
+    path.join(projectDir, '_byan', 'context', 'config.yaml'),
     path.join(projectDir, '_byan', 'config.yaml'),
   ];
   for (const p of paths) {

package/install/templates/.claude/hooks/strict-scope-guard.js

@@ -26,7 +26,16 @@ function toRelative(filePath, root) {
 }
 
 function matchesPrefix(rel, prefix) {
-  const p = String(prefix).replace(/\/+$/, '');
+  let p = String(prefix).trim();
+  // Glob-tolerant: reduce a glob to the literal directory part before the first
+  // wildcard, then prefix-match. So "_byan/**" and "src/**/*.test.js" match
+  // their subtree instead of being compared as a literal string (which never
+  // matched, wrongly denying every write under a globbed allowed path). A prefix
+  // with no wildcard keeps the exact + dir-prefix behavior unchanged.
+  const star = p.indexOf('*');
+  if (star !== -1) p = p.slice(0, star);
+  p = p.replace(/\/+$/, '');
+  if (p === '') return true; // bare "**" / "*" -> matches everything
   return rel === p || rel.startsWith(p + '/');
 }
 

package/install/templates/.claude/skills/byan-byan-test/SKILL.md

@@ -8,5 +8,5 @@ description: BYAN Test - Token Optimized Version (-46%)
 ## Rules
 
 - This is a TEST version of BYAN optimized for token reduction (-46%)
-- Full agent: _byan/bmb/agents/byan-test.md (116 lines vs 215 original)
+- Full agent: _byan/agent/byan-test/byan-test.md (new layout); if absent, _byan/*/agents/byan-test.md (legacy layout). 116 lines vs 215 original
 - Original BYAN still available via bmad-agent-byan

package/install/templates/.github/agents/bmad-agent-bmad-master.md

@@ -6,7 +6,7 @@ description: 'bmad-master agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/core/agents/bmad-master.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/bmad-master/bmad-master.md (new layout); if absent, {project-root}/_byan/*/agents/bmad-master.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmb-agent-builder.md

@@ -6,7 +6,7 @@ description: 'agent-builder agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmb/agents/agent-builder.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/agent-builder/agent-builder.md (new layout); if absent, {project-root}/_byan/*/agents/agent-builder.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmb-module-builder.md

@@ -6,7 +6,7 @@ description: 'module-builder agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmb/agents/module-builder.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/module-builder/module-builder.md (new layout); if absent, {project-root}/_byan/*/agents/module-builder.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmb-workflow-builder.md

@@ -6,7 +6,7 @@ description: 'workflow-builder agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmb/agents/workflow-builder.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/workflow-builder/workflow-builder.md (new layout); if absent, {project-root}/_byan/*/agents/workflow-builder.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmm-analyst.md

@@ -6,7 +6,7 @@ description: 'analyst agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmm/agents/analyst.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/analyst/analyst.md (new layout); if absent, {project-root}/_byan/*/agents/analyst.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmm-architect.md

@@ -6,7 +6,7 @@ description: 'architect agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmm/agents/architect.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/architect/architect.md (new layout); if absent, {project-root}/_byan/*/agents/architect.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmm-dev.md

@@ -6,7 +6,7 @@ description: 'dev agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmm/agents/dev.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/dev/dev.md (new layout); if absent, {project-root}/_byan/*/agents/dev.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmm-pm.md

@@ -6,7 +6,7 @@ description: 'pm agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmm/agents/pm.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/pm/pm.md (new layout); if absent, {project-root}/_byan/*/agents/pm.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmm-quick-flow-solo-dev.md

@@ -6,7 +6,7 @@ description: 'quick-flow-solo-dev agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmm/agents/quick-flow-solo-dev.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/quick-flow-solo-dev/quick-flow-solo-dev.md (new layout); if absent, {project-root}/_byan/*/agents/quick-flow-solo-dev.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmm-quinn.md

@@ -6,7 +6,7 @@ description: 'quinn agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmm/agents/quinn.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/quinn/quinn.md (new layout); if absent, {project-root}/_byan/*/agents/quinn.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmm-sm.md

@@ -6,7 +6,7 @@ description: 'sm agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmm/agents/sm.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/sm/sm.md (new layout); if absent, {project-root}/_byan/*/agents/sm.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmm-tech-writer.md

@@ -6,7 +6,7 @@ description: 'tech-writer agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmm/agents/tech-writer/tech-writer.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/tech-writer/tech-writer.md (new layout); if absent, {project-root}/_byan/*/agents/tech-writer.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-bmm-ux-designer.md

@@ -6,7 +6,7 @@ description: 'ux-designer agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmm/agents/ux-designer.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/ux-designer/ux-designer.md (new layout); if absent, {project-root}/_byan/*/agents/ux-designer.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-byan-test.md

@@ -6,7 +6,7 @@ description: "BYAN Test - Token Optimized Version (-46%)"
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/bmb/agents/byan-test.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/byan-test/byan-test.md (new layout); if absent, {project-root}/_byan/*/agents/byan-test.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely
@@ -18,14 +18,14 @@ You must fully embody this agent's persona and follow all activation instruction
 ```xml
 <agent id="byan-test.agent.yaml" name="BYAN-TEST" title="Builder of YAN - Test Version (Optimized)" icon="🏗️">
 <activation critical="MANDATORY">
-  <step n="1">Load persona from {project-root}/_byan/bmb/agents/byan-test.md</step>
+  <step n="1">Load persona from {project-root}/_byan/agent/byan-test/byan-test.md (new layout); if absent, {project-root}/_byan/*/agents/byan-test.md (legacy layout)</step>
   <step n="2">Load config from {project-root}/_byan/bmb/config.yaml - store {user_name}, {communication_language}, {output_folder}</step>
   <step n="3">Show greeting using {user_name} in {communication_language}, display menu</step>
   <step n="4">Inform about `/bmad-help` command</step>
   <step n="5">WAIT for input - accept number, cmd, or fuzzy match</step>
   <rules>
     <r>This is a TEST version of BYAN optimized for token reduction (-46%)</r>
-    <r>Full agent: _byan/bmb/agents/byan-test.md (116 lines vs 215 original)</r>
+    <r>Full agent: _byan/agent/byan-test/byan-test.md (new layout); if absent, _byan/*/agents/byan-test.md (legacy layout) (116 lines vs 215 original)</r>
     <r>Original BYAN still available via bmad-agent-byan</r>
   </rules>
 </activation>

package/install/templates/.github/agents/bmad-agent-byan.md

@@ -6,7 +6,7 @@ description: 'byan agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/agents/byan.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/byan/byan.md (new layout); if absent, {project-root}/_byan/*/agents/byan.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-carmack.md

@@ -3,10 +3,10 @@ name: "carmack"
 description: "Token Optimizer for BMAD/BYAN Agents"
 ---
 
-For the full agent definition and capabilities, see: `_byan/core/agents/carmack.md`
+For the full agent definition and capabilities, see: `_byan/agent/carmack/carmack.md (new layout); if absent, _byan/*/agents/carmack.md (legacy layout)`
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/core/agents/carmack.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/carmack/carmack.md (new layout); if absent, {project-root}/_byan/*/agents/carmack.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely

package/install/templates/.github/agents/bmad-agent-cis-brainstorming-coach.md

@@ -6,7 +6,7 @@ description: 'brainstorming-coach agent'
 You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
 <agent-activation CRITICAL="TRUE">
-1. LOAD the FULL agent file from {project-root}/_byan/cis/agents/brainstorming-coach.md
+1. LOAD the FULL agent file from {project-root}/_byan/agent/brainstorming-coach/brainstorming-coach.md (new layout); if absent, {project-root}/_byan/*/agents/brainstorming-coach.md (legacy layout)
 2. READ its entire contents - this contains the complete agent persona, menu, and instructions
 3. LOAD the soul activation protocol from {project-root}/_byan/core/activation/soul-activation.md and EXECUTE it silently
 4. FOLLOW every step in the <activation> section precisely