@delorenj/pjangler 1.2.19 → 1.2.25

package/dist/mcp-server.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 // src/mcp-server.ts
-import { existsSync as existsSync10, statSync as statSync2 } from "node:fs";
-import { basename as basename4, dirname as dirname8, join as join13, resolve as resolve3 } from "node:path";
+import { existsSync as existsSync11, statSync as statSync2 } from "node:fs";
+import { basename as basename5, dirname as dirname8, join as join16, resolve as resolve4 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
@@ -285,97 +285,284 @@ var AddMiseCodegraphScript = class extends Command {
       };
     }
     const content = `#!/usr/bin/env bash
-# Mise enter hook: ensure the CodeGraph CLI is available and initialize the
-# project index. If \`codegraph\` is not installed, this script installs it
-# non-interactively into the project-local .mise/bin directory and retries.
-#
-# This is intended to run from a mise enter hook so onboarding a new host is
-# fully automatic.
+# Auto-generated by pjangler
+
+REPO_ROOT="$(pwd)"
+PROJECT_NAME="$(basename "$REPO_ROOT")"
+CONTAINER_NAME="codegraph-mcp-$PROJECT_NAME"
+CACHE_DIR="$REPO_ROOT/.codegraph"
+
+# Deterministically generate a port based on the repository path
+PORT=$(echo -n "$REPO_ROOT" | md5sum | awk '{print $1}' | tr -d 'a-f' | cut -c1-4)
+# Ensure port is > 1024
+PORT=$(( (PORT % 60000) + 1025 ))
+
+if ! docker ps --format '{{.Names}}' | grep -q "^$CONTAINER_NAME$"; then
+  echo "\u{1F680} Starting CodeGraph MCP Server on port $PORT..."
+  
+  # Ensure the container isn't lingering in a stopped state
+  docker rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true
+
+  # Run the true Colby McHenry CodeGraph Docker image
+  # which we built locally as colbymchenry-codegraph-mcp:latest
+  docker run -d \\
+    --name "$CONTAINER_NAME" \\
+    --restart unless-stopped \\
+    -p "$PORT:8045" \\
+    -v "$REPO_ROOT:/repo" \\
+    colbymchenry-codegraph-mcp:latest >/dev/null
+
+  echo "\u2705 CodeGraph MCP running in background. SSE URL: http://localhost:$PORT/sse"
+fi
+
+# Run init inside the container to ensure the index is bootstrapped.
+# We run this using the standard codegraph CLI inside the container
+docker exec "$CONTAINER_NAME" codegraph init -i /repo >/dev/null 2>&1 || true
+
+# Wire up the MCP server to local agents
+WIRE_SCRIPT="$(dirname "$0")/codegraph-wire.sh"
+if [ -x "$WIRE_SCRIPT" ]; then
+  "$WIRE_SCRIPT"
+fi
+`;
+    this.writeFile(filePath, content);
+    if (!this.context.dryRun) {
+      chmodSync(join2(this.context.targetDir, filePath), 493);
+    }
+    return {
+      success: true,
+      message: this.formatMessage(this.context.dryRun ? "Would create .mise/scripts/codegraph.sh" : "\u2705 Created .mise/scripts/codegraph.sh"),
+      filePath
+    };
+  }
+};
+
+// src/commands/AddMiseCodegraphWireScript.ts
+import { chmodSync as chmodSync2 } from "fs";
+import { join as join3 } from "path";
+var AddMiseCodegraphWireScript = class extends Command {
+  async invoke() {
+    const filePath = ".mise/scripts/codegraph-wire.sh";
+    if (this.fileExists(filePath) && !this.context.force) {
+      return {
+        success: false,
+        message: this.formatMessage("\u26A0\uFE0F  .mise/scripts/codegraph-wire.sh already exists"),
+        filePath
+      };
+    }
+    const content = `#!/usr/bin/env bash
+# Mise enter hook: Auto-wire CodeGraph MCP Server to local agents.
+# Detects Claude Code, Codex, Gemini, Kimi, and OpenCode and configures
+# them to use the local SSE endpoint for the current project.
 
 set -euo pipefail
 
 REPO_ROOT="\${MISE_PROJECT_ROOT:-$(cd "$(dirname "$0")/../.." && pwd)}"
-PROJECT_BIN_DIR="$REPO_ROOT/.mise/bin"
-mkdir -p "$PROJECT_BIN_DIR"
-
-# Install the CodeGraph CLI into the project-local bin directory.
-install_codegraph() {
-  echo "[mise] codegraph not found. Installing non-interactively..."
-  export CODEGRAPH_BIN_DIR="$PROJECT_BIN_DIR"
-  curl -fsSL https://raw.githubusercontent.com/colbymchenry/codegraph/main/install.sh | sh
-
-  if [ -x "$PROJECT_BIN_DIR/codegraph" ]; then
-    export PATH="$PROJECT_BIN_DIR:$PATH"
-  else
-    echo "[mise] codegraph install did not place a binary at $PROJECT_BIN_DIR/codegraph" >&2
-    return 1
+
+# Compute the same port as the container script
+PORT_HASH=$(echo -n "$REPO_ROOT" | md5sum | awk '{print $1}')
+PORT_DEC=$(printf "%d" "0x\${PORT_HASH:0:4}")
+PORT=$(( 8045 + (PORT_DEC % 955) ))
+
+SSE_URL="http://localhost:$PORT/sse"
+
+inject_sse() {
+  local target="$1"
+  local agent="$2"
+  
+  if [ ! -f "$target" ]; then
+    mkdir -p "$(dirname "$target")"
+    echo '{"mcpServers": {}}' > "$target"
   fi
+  
+  # Ensure the file is valid JSON (fail gracefully if it's garbled)
+  if ! jq . "$target" >/dev/null 2>&1; then
+    echo "[mise] WARNING: $target is not valid JSON, skipping $agent wiring" >&2
+    return
+  fi
+
+  # Inject or update the codegraph server
+  jq --arg url "$SSE_URL" '.mcpServers.codegraph = {"type": "sse", "url": $url}' "$target" > "$target.tmp" && mv "$target.tmp" "$target"
+  echo "[mise] Wired CodeGraph SSE for $agent -> $target"
 }
 
-# Ensure a codegraph binary is available on PATH.
-ensure_codegraph() {
-  if command -v codegraph >/dev/null 2>&1; then
-    return 0
-  fi
+# 1. Claude Code (Project-scoped)
+inject_sse "$REPO_ROOT/.claude.json" "Claude Code"
 
-  # Check the project-local bin dir first (previous install from this hook).
-  if [ -x "$PROJECT_BIN_DIR/codegraph" ]; then
-    export PATH="$PROJECT_BIN_DIR:$PATH"
-    return 0
-  fi
+# 2. Codex (Global)
+inject_sse "$HOME/.codex/mcp.json" "Codex"
 
-  # Check typical user-level install locations before fetching anything.
-  for d in "$HOME/.local/bin" "$HOME/.codegraph/current/bin"; do
-    if [ -x "$d/codegraph" ]; then
-      export PATH="$d:$PATH"
-      return 0
-    fi
-  done
+# 3. Gemini (Global)
+inject_sse "$HOME/.gemini/config/mcp.json" "Gemini"
 
-  install_codegraph
-}
+# 4. Kimi (Global)
+inject_sse "$HOME/.kimi-code/mcp.json" "Kimi"
 
-# Attempt to initialize the project graph. If the command is missing, install
-# it and retry once.
-init_project() {
-  local err_file
-  err_file="$(mktemp)"
-  trap 'rm -f "$err_file"' RETURN
+# 5. OpenCode (Global)
+inject_sse "$HOME/.opencode/mcp.json" "OpenCode"
 
-  if codegraph init -i "$REPO_ROOT" 2>"$err_file"; then
-    return 0
-  fi
+# 6. Cursor (Global)
+inject_sse "$HOME/.cursor/mcp.json" "Cursor"
 
-  # If the failure looks like a missing binary, install and retry.
-  if grep -qiE 'command not found|not installed|No such file|executable file not found' "$err_file" 2>/dev/null; then
-    ensure_codegraph
-    codegraph init -i "$REPO_ROOT"
-    return 0
-  fi
+# 7. VSCode native MCP (Global)
+inject_sse "$HOME/.vscode/mcp.json" "VSCode"
 
-  cat "$err_file" >&2
-  return 1
-}
+# 8. Cline (VSCode extension)
+inject_sse "$HOME/.config/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json" "Cline"
 
-init_project
+# 9. Roo (VSCode extension)
+inject_sse "$HOME/.config/Code/User/globalStorage/rooveterinaryinc.roo-cline/settings/mcp_settings.json" "Roo Code"
 `;
     this.writeFile(filePath, content);
     if (!this.context.dryRun) {
-      chmodSync(join2(this.context.targetDir, filePath), 493);
+      chmodSync2(join3(this.context.targetDir, filePath), 493);
     }
     return {
       success: true,
-      message: this.formatMessage(this.context.dryRun ? "Would create .mise/scripts/codegraph.sh" : "\u2705 Created .mise/scripts/codegraph.sh"),
+      message: this.formatMessage(this.context.dryRun ? "Would create .mise/scripts/codegraph-wire.sh" : "\u2705 Created .mise/scripts/codegraph-wire.sh"),
       filePath
     };
   }
 };
 
+// src/commands/WireMiseOpInject.ts
+import { join as join4 } from "node:path";
+import { existsSync as existsSync2, readFileSync, writeFileSync as writeFileSync2, chmodSync as chmodSync3 } from "node:fs";
+var WireMiseOpInject = class _WireMiseOpInject extends Command {
+  static MARKER = "# pjangler:op-inject";
+  static CR = "{{config_root}}";
+  async invoke() {
+    const scriptPath = ".mise/scripts/inject-op-secrets.sh";
+    const fullScriptPath = join4(this.context.targetDir, scriptPath);
+    const scriptContent = `#!/usr/bin/env bash
+# Resolve 1Password \`op://\` references in .env.op into .env.secrets, which mise
+# loads via \`_.file\`.
+#
+# Runs from the mise enter hook: fail-open and non-interactive.
+# No .env.op means no 1Password, so this exits before spending anything.
+
+set -euo pipefail
+
+REPO_ROOT="\${MISE_PROJECT_ROOT:-$(cd "$(dirname "$0")/../.." && pwd)}"
+SRC="$REPO_ROOT/.env.op"
+OUT="$REPO_ROOT/.env.secrets"
+
+TTL_HOURS="\${OP_INJECT_TTL_HOURS:-12}"
+
+[[ -f "$SRC" ]] || exit 0
+command -v op >/dev/null 2>&1 || exit 0
+
+if [[ -f "$OUT" && "$SRC" -ot "$OUT" ]]; then
+  if [[ "$TTL_HOURS" != "0" ]] && [[ -z "$(find "$OUT" -mmin "+$((TTL_HOURS * 60))" 2>/dev/null)" ]]; then
+    exit 0
+  fi
+fi
+
+op account list >/dev/null 2>&1 || exit 0
+
+tmp="$(mktemp "\${OUT}.XXXXXX")"
+trap 'rm -f "$tmp"' EXIT
+chmod 600 "$tmp"
+
+if op inject -i "$SRC" -o "$tmp" --force >/dev/null 2>&1; then
+  mv "$tmp" "$OUT"
+  trap - EXIT
+else
+  echo "mise: op inject from .env.op failed \u2014 $(basename "$OUT") unchanged." >&2
+  echo "      Check 'op signin', or that .env.op's op:// items are readable." >&2
+  echo "      To disable: rm .env.op" >&2
+fi
+`;
+    this.writeFile(scriptPath, scriptContent);
+    if (!this.context.dryRun) {
+      chmodSync3(fullScriptPath, 493);
+    }
+    const misePath = join4(this.context.targetDir, "mise.toml");
+    if (!existsSync2(misePath)) {
+      return {
+        success: false,
+        message: "\u26A0\uFE0F  No mise.toml found \u2014 run `pj init mise` first, then re-run."
+      };
+    }
+    let content = readFileSync(misePath, "utf8");
+    if (content.includes(_WireMiseOpInject.MARKER)) {
+      return { success: true, message: this.formatMessage("\u2713 mise.toml already wired for op-inject") };
+    }
+    const cr = _WireMiseOpInject.CR;
+    const envRe = /\[env\]\s*\n([\s\S]*?(?=\n\[|$))/;
+    if (envRe.test(content)) {
+      content = content.replace(envRe, (m) => {
+        let block = m;
+        if (!block.includes("_.file")) {
+          block += `
+_.file = ['.env', '.env.secrets']
+`;
+        } else if (!block.includes(".env.secrets")) {
+          block = block.replace(/(_\.file\s*=\s*\[)([^\]]*?)(\])/, (m2, prefix, files, suffix) => {
+            const added = files.trim() ? `${files}, '.env.secrets'` : `'.env.secrets'`;
+            return `${prefix}${added}${suffix}`;
+          });
+        }
+        return block;
+      });
+    } else {
+      const envBlock = `[env]
+_.file = ['.env', '.env.secrets']
+
+`;
+      if (content.includes("[tools]")) {
+        content = content.replace(/(\[tools\][\s\S]*?(?=\n\[|$))/, `$1
+${envBlock}`);
+      } else {
+        content = envBlock + content;
+      }
+    }
+    const enterAdds = `  '${cr}/.mise/scripts/inject-op-secrets.sh',`;
+    const enterRe = /(enter\s*=\s*\[[\s\S]*?)(\n[ \t]*\])/;
+    if (enterRe.test(content)) {
+      content = content.replace(enterRe, (_m, head, close) => {
+        const sep2 = /[,[]\s*$/.test(head) ? "" : ",";
+        return `${head}${sep2}
+${enterAdds}${close}`;
+      });
+    } else {
+      if (content.includes("[hooks]")) {
+        content = content.replace(/\[hooks\]/, `[hooks]
+enter = [
+${enterAdds}
+]`);
+      } else {
+        content += `
+[hooks]
+enter = [
+${enterAdds}
+]
+`;
+      }
+    }
+    const appended = [
+      "",
+      _WireMiseOpInject.MARKER,
+      "[tasks.secrets-inject]",
+      'description = "Re-resolve .env.op secrets from 1Password into .env.secrets"',
+      `run = "OP_INJECT_TTL_HOURS=0 .mise/scripts/inject-op-secrets.sh"`,
+      _WireMiseOpInject.MARKER + ":end",
+      ""
+    ].join("\n");
+    content = content.replace(/\n*$/, "\n") + appended;
+    if (!this.context.dryRun) writeFileSync2(misePath, content);
+    return {
+      success: true,
+      message: this.formatMessage("\u2705 Wired mise.toml for op-inject (_.file, [hooks] enter, tasks.secrets-inject)")
+    };
+  }
+};
+
 // src/recipes/MiseRecipe.ts
 var MiseRecipe = class extends Recipe {
   constructor(context) {
     super(context);
-    this.addIngredient(AddMiseToml).addIngredient(AddDotenv).addIngredient(AddMiseTasksStructure).addIngredient(AddMiseBaseToml).addIngredient(AddMiseBaseScript).addIngredient(AddMiseCodegraphScript);
+    this.addIngredient(AddMiseToml).addIngredient(AddDotenv).addIngredient(AddMiseTasksStructure).addIngredient(AddMiseBaseToml).addIngredient(AddMiseBaseScript).addIngredient(AddMiseCodegraphScript).addIngredient(AddMiseCodegraphWireScript).addIngredient(WireMiseOpInject);
   }
   printNextSteps() {
     console.log("\u{1F389} Mise subsystem initialized successfully!");
@@ -604,34 +791,166 @@ var NodeRecipe = class extends Recipe {
 
 // src/commands/hermes/EnsureTemplateConfig.ts
 import { homedir, platform } from "node:os";
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "node:fs";
-import { join as join3, dirname as dirname2 } from "node:path";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, writeFileSync as writeFileSync3 } from "node:fs";
+import { join as join6, dirname as dirname2 } from "node:path";
+
+// src/parity/bmadPack.ts
+import { closeSync, constants, fstatSync, lstatSync, openSync, readFileSync as readFileSync2, readdirSync } from "node:fs";
+import { createHash } from "node:crypto";
+import { basename, join as join5, relative, resolve, sep } from "node:path";
+var BMAD_PACK_VERSION = "6.10.1-next.31";
+var BMAD_PACK_CHECKSUMS_SHA256 = "a8bc005612ac60e3ec775fff5a11eafe38be6acdae96efa3d770b48322cb3224";
+var BMAD_PACK_SKILL_COUNT = 76;
+var BMAD_PACK_PAYLOAD_FILES = 1072;
+function sha256(content) {
+  return createHash("sha256").update(content).digest("hex");
+}
+function readRegularFile(path) {
+  const fd = openSync(path, constants.O_RDONLY | constants.O_NOFOLLOW);
+  try {
+    if (!fstatSync(fd).isFile()) throw new Error(`BMAD pack entry is not a regular file: ${path}`);
+    return readFileSync2(fd);
+  } finally {
+    closeSync(fd);
+  }
+}
+function safeRelativePath(value) {
+  if (!value || value.includes("\\") || value.startsWith("/") || value.split("/").some((part) => part === "" || part === "." || part === "..")) {
+    throw new Error(`Unsafe BMAD checksum path: ${JSON.stringify(value)}`);
+  }
+  return value;
+}
+function parsePackToml(content) {
+  const required = [
+    /^name = "bmad"$/m,
+    new RegExp(`^version = "${BMAD_PACK_VERSION.replaceAll(".", "\\.")}"$`, "m"),
+    /^upstream = "bmad-method"$/m,
+    new RegExp(`^upstream_version = "${BMAD_PACK_VERSION.replaceAll(".", "\\.")}"$`, "m"),
+    /^rendered_from = "\.agent\/skills"$/m,
+    /^immutable = true$/m,
+    /^project_projection = "symlink"$/m
+  ];
+  if (required.some((pattern) => !pattern.test(content))) {
+    throw new Error(`BMAD pack.toml does not declare the trusted ${BMAD_PACK_VERSION} contract`);
+  }
+  const payloadMatch = content.match(/^payload_files = (\d+)$/m);
+  const skillsMatch = content.match(/^skills = \[\n([\s\S]*?)^\]$/m);
+  if (!payloadMatch || !skillsMatch) throw new Error("BMAD pack.toml is missing payload inventory metadata");
+  const skillNames = [...skillsMatch[1].matchAll(/^\s+"([^"]+)",$/gm)].map((match) => match[1]);
+  const payloadFiles = Number.parseInt(payloadMatch[1], 10);
+  if (skillNames.length !== BMAD_PACK_SKILL_COUNT || new Set(skillNames).size !== skillNames.length) {
+    throw new Error(`BMAD pack.toml must declare exactly ${BMAD_PACK_SKILL_COUNT} unique skills`);
+  }
+  if (payloadFiles !== BMAD_PACK_PAYLOAD_FILES) {
+    throw new Error(`BMAD pack.toml must declare exactly ${BMAD_PACK_PAYLOAD_FILES} payload files`);
+  }
+  for (const name of skillNames) {
+    if (!name.startsWith("bmad-") || basename(name) !== name) throw new Error(`Unsafe BMAD skill identity: ${name}`);
+  }
+  return { skillNames, payloadFiles };
+}
+function walkRegularTree(root) {
+  const files = /* @__PURE__ */ new Map();
+  const directories = /* @__PURE__ */ new Set();
+  const visit = (directory) => {
+    for (const name of readdirSync(directory).sort()) {
+      const path = join5(directory, name);
+      const stat = lstatSync(path);
+      if (stat.isSymbolicLink()) throw new Error(`BMAD pack may not contain symlinks: ${path}`);
+      if (stat.isDirectory()) {
+        directories.add(relative(root, path).split(sep).join("/"));
+        visit(path);
+      } else if (stat.isFile()) files.set(relative(root, path).split(sep).join("/"), readRegularFile(path));
+      else throw new Error(`BMAD pack may contain only regular files/directories: ${path}`);
+    }
+  };
+  visit(root);
+  return { files, directories };
+}
+function validateTrustedBmadPack(packRoot) {
+  const root = resolve(packRoot);
+  const rootStat = lstatSync(root);
+  if (rootStat.isSymbolicLink() || !rootStat.isDirectory()) {
+    throw new Error(`BMAD pack root must be a real directory: ${root}`);
+  }
+  const checksumsContent = readRegularFile(join5(root, "SHA256SUMS"));
+  if (sha256(checksumsContent) !== BMAD_PACK_CHECKSUMS_SHA256) {
+    throw new Error(`BMAD pack checksum manifest is not the trusted ${BMAD_PACK_VERSION} manifest`);
+  }
+  const expected = /* @__PURE__ */ new Map();
+  for (const line of checksumsContent.toString("utf8").split("\n")) {
+    if (!line) continue;
+    const match = line.match(/^([0-9a-f]{64})  (.+)$/);
+    if (!match) throw new Error(`Invalid BMAD SHA256SUMS entry: ${line}`);
+    const path = safeRelativePath(match[2]);
+    if (expected.has(path)) throw new Error(`Duplicate BMAD SHA256SUMS entry: ${path}`);
+    expected.set(path, match[1]);
+  }
+  const walked = walkRegularTree(root);
+  const actual = walked.files;
+  actual.delete("SHA256SUMS");
+  const missing = [...expected.keys()].filter((path) => !actual.has(path));
+  const extra = [...actual.keys()].filter((path) => !expected.has(path));
+  if (missing.length || extra.length) {
+    throw new Error(`BMAD checksum coverage mismatch; missing=${JSON.stringify(missing)} extra=${JSON.stringify(extra)}`);
+  }
+  for (const [path, digest] of expected) {
+    const content = actual.get(path);
+    if (!content || sha256(content) !== digest) throw new Error(`BMAD pack digest mismatch: ${path}`);
+  }
+  for (const directory of walked.directories) {
+    if (![...actual.keys()].some((path) => path.startsWith(`${directory}/`))) {
+      throw new Error(`BMAD pack contains an unauthenticated empty directory: ${directory}`);
+    }
+  }
+  const packToml = actual.get("pack.toml");
+  if (!packToml) throw new Error("BMAD pack.toml is missing");
+  const metadata = parsePackToml(packToml.toString("utf8"));
+  const skillSet = new Set(metadata.skillNames);
+  const topLevelDirectories = readdirSync(root).filter((name) => lstatSync(join5(root, name)).isDirectory()).sort();
+  if (topLevelDirectories.length !== skillSet.size || topLevelDirectories.some((name) => !skillSet.has(name))) {
+    throw new Error("BMAD pack directory inventory differs from authenticated pack.toml skills");
+  }
+  for (const name of metadata.skillNames) {
+    const skillMd = join5(root, name, "SKILL.md");
+    if (!lstatSync(skillMd).isFile() || lstatSync(skillMd).isSymbolicLink()) {
+      throw new Error(`BMAD skill is missing a regular SKILL.md: ${name}`);
+    }
+  }
+  const payloadCount = [...actual.keys()].filter((path) => skillSet.has(path.split("/", 1)[0])).length;
+  if (payloadCount !== metadata.payloadFiles) {
+    throw new Error(`BMAD payload inventory mismatch: ${payloadCount} != ${metadata.payloadFiles}`);
+  }
+  return { root, skillNames: metadata.skillNames, payloadFiles: metadata.payloadFiles };
+}
+
+// src/commands/hermes/EnsureTemplateConfig.ts
 function resolveTemplateConfigPath() {
   const fromEnv = process.env.HERMES_TEMPLATE_CONFIG;
   if (fromEnv && fromEnv.trim()) return fromEnv.trim();
   const xdg = process.env.XDG_CONFIG_HOME?.trim();
-  const base = xdg && xdg.length ? xdg : join3(homedir(), ".config");
-  return join3(base, "hermes-agent-template", "config.toml");
+  const base = xdg && xdg.length ? xdg : join6(homedir(), ".config");
+  return join6(base, "hermes-agent-template", "config.toml");
 }
 function detectHermesBin(home) {
   const candidates = [
-    join3(home, "code", "hermes-agent", "venv", "bin", "hermes"),
-    join3(home, "code", "hermes-agent", ".venv", "bin", "hermes"),
-    join3(home, ".local", "bin", "hermes")
+    join6(home, "code", "hermes-agent", "venv", "bin", "hermes"),
+    join6(home, "code", "hermes-agent", ".venv", "bin", "hermes"),
+    join6(home, ".local", "bin", "hermes")
   ];
   for (const c of candidates) {
-    if (existsSync2(c)) return c;
+    if (existsSync3(c)) return c;
   }
   return candidates[0];
 }
 function renderHostConfig() {
   const home = homedir();
   const hermesBin = detectHermesBin(home);
-  const hermesRepo = join3(home, "code", "hermes-agent");
-  const scaffoldDir = join3(home, "code", "hermes-agent-template", "runtime-scaffold");
-  const skillsDir = join3(home, ".agents", "skills");
-  const pmExternalSkillGlobalDir = join3(home, "code", "skillex", "skill-sets", "global", ".system");
-  const pmExternalSkillBmadDir = join3(home, "code", "skillex", "packs", "bmad", "6.10.2");
+  const hermesRepo = join6(home, "code", "hermes-agent");
+  const scaffoldDir = join6(home, "code", "hermes-agent-template", "runtime-scaffold");
+  const skillsDir = join6(home, ".agents", "skills");
+  const pmExternalSkillGlobalDir = join6(home, "code", "skillex", "skill-sets", "global", ".system");
+  const pmExternalSkillBmadDir = join6(home, "code", "skillex", "packs", "bmad", BMAD_PACK_VERSION);
   return `# hermes-agent-template \u2014 host configuration
 # Bootstrapped by \`pjangler config bootstrap\` for $HOME=${home} (platform=${platform()}).
 #
@@ -680,7 +999,7 @@ var EnsureTemplateConfig = class extends Command {
     const ctx = this.context;
     const force = ctx.forceConfig === true || process.env.PJANGLER_FORCE_CONFIG === "1";
     const path = resolveTemplateConfigPath();
-    const exists = existsSync2(path);
+    const exists = existsSync3(path);
     if (exists && !force) {
       console.log(`\u2713 Config present: ${path}`);
       return { success: true, message: "" };
@@ -691,7 +1010,7 @@ var EnsureTemplateConfig = class extends Command {
     }
     try {
       mkdirSync2(dirname2(path), { recursive: true });
-      writeFileSync2(path, renderHostConfig());
+      writeFileSync3(path, renderHostConfig());
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       return { success: false, message: `\u2717 Failed to write ${path}: ${msg}` };
@@ -703,8 +1022,8 @@ var EnsureTemplateConfig = class extends Command {
 };
 
 // src/commands/hermes/PromptForAgentConfig.ts
-import { basename, join as join4 } from "node:path";
-import { readFileSync } from "node:fs";
+import { basename as basename2, join as join7 } from "node:path";
+import { readFileSync as readFileSync3 } from "node:fs";
 import * as p from "@clack/prompts";
 
 // src/commands/hermes/types.ts
@@ -719,7 +1038,7 @@ function deriveProfileName(repo, role) {
 // src/commands/hermes/PromptForAgentConfig.ts
 function detectTicketProvider(targetDir) {
   try {
-    const t = JSON.parse(readFileSync(join4(targetDir, ".project.json"), "utf8"))?.ticket_provider?.type;
+    const t = JSON.parse(readFileSync3(join7(targetDir, ".project.json"), "utf8"))?.ticket_provider?.type;
     return t === "plane" || t === "trello" ? t : void 0;
   } catch {
     return void 0;
@@ -728,7 +1047,7 @@ function detectTicketProvider(targetDir) {
 var PromptForAgentConfig = class extends Command {
   async invoke() {
     const ctx = this.context;
-    const defaultRepo = basename(ctx.targetDir).toLowerCase();
+    const defaultRepo = basename2(ctx.targetDir).toLowerCase();
     ctx.targetRepo = (ctx.targetRepo ?? defaultRepo).toLowerCase();
     ctx.role ??= "pm";
     ctx.agentPurpose ??= `${ctx.role} agent for ${ctx.targetRepo}`;
@@ -777,8 +1096,8 @@ var PromptForAgentConfig = class extends Command {
 // src/commands/hermes/RunCopierTemplate.ts
 import { spawnSync } from "node:child_process";
 import { homedir as homedir2 } from "node:os";
-import { join as join5, dirname as dirname3 } from "node:path";
-import { existsSync as existsSync3, mkdirSync as mkdirSync3 } from "node:fs";
+import { join as join8, dirname as dirname3 } from "node:path";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3 } from "node:fs";
 import { fileURLToPath } from "node:url";
 import * as p2 from "@clack/prompts";
 function resolveVendoredTemplate(name) {
@@ -789,8 +1108,8 @@ function resolveVendoredTemplate(name) {
     return void 0;
   }
   for (let i = 0; i < 8; i++) {
-    const candidate = join5(dir, "templates", name);
-    if (existsSync3(join5(candidate, "copier.yml"))) return candidate;
+    const candidate = join8(dir, "templates", name);
+    if (existsSync4(join8(candidate, "copier.yml"))) return candidate;
     const parent = dirname3(dir);
     if (parent === dir) break;
     dir = parent;
@@ -809,7 +1128,7 @@ var RunCopierTemplate = class extends Command {
         message: "PromptForAgentConfig must run before RunCopierTemplate (targetRepo/role unset)"
       };
     }
-    const roleDir = join5(ctx.targetDir, "agents", "hermes", role);
+    const roleDir = join8(ctx.targetDir, "agents", "hermes", role);
     ctx.roleDir = roleDir;
     ctx.runtimeRepo = `delorenj/agent-hm-${targetRepo}-${role}`;
     const which = spawnSync("which", ["copier"], { encoding: "utf8" });
@@ -819,7 +1138,7 @@ var RunCopierTemplate = class extends Command {
         message: "\u2717 copier not found on PATH.  Install with: `uv tool install copier` or `pip install copier`"
       };
     }
-    if (existsSync3(join5(roleDir, "role.yaml")) && !ctx.force) {
+    if (existsSync4(join8(roleDir, "role.yaml")) && !ctx.force) {
       if (ctx.yes) {
         ctx.force = true;
       } else {
@@ -840,15 +1159,16 @@ var RunCopierTemplate = class extends Command {
       ...process.env,
       SKIP_TELEGRAM: "1",
       SKIP_EMAIL: "1",
-      // We DO want copier to run runtime-repo + plane + bloodbank + systemd.
+      // Bloodbank is a fleet-shared Hermes gateway. Never provision the legacy
+      // per-profile file consumer, even when an older template still exposes it.
       SKIP_RUNTIME_REPO: ctx.skipRuntimeRepo ? "1" : "0",
       SKIP_PLANE: ctx.skipPlane ? "1" : "0",
-      SKIP_BLOODBANK: ctx.skipBloodbank ? "1" : "0",
+      SKIP_BLOODBANK: "1",
       SKIP_SYSTEMD: ctx.skipSystemd ? "1" : "0"
     };
-    const LOCAL_TEMPLATE = join5(homedir2(), "code", "hermes-agent-template");
+    const LOCAL_TEMPLATE = join8(homedir2(), "code", "hermes-agent-template");
     const vendored = resolveVendoredTemplate("hermes-agent");
-    const templateSrc = process.env.PJANGLER_HERMES_TEMPLATE || vendored || (existsSync3(join5(LOCAL_TEMPLATE, "copier.yml")) ? LOCAL_TEMPLATE : HERMES_AGENT_TEMPLATE);
+    const templateSrc = process.env.PJANGLER_HERMES_TEMPLATE || vendored || (existsSync4(join8(LOCAL_TEMPLATE, "copier.yml")) ? LOCAL_TEMPLATE : HERMES_AGENT_TEMPLATE);
     const args = [
       "copy",
       templateSrc,
@@ -879,7 +1199,7 @@ var RunCopierTemplate = class extends Command {
         message: this.formatMessage(`Would run: copier ${args.join(" ")}`)
       };
     }
-    mkdirSync3(join5(ctx.targetDir, "agents", "hermes"), { recursive: true });
+    mkdirSync3(join8(ctx.targetDir, "agents", "hermes"), { recursive: true });
     const spinner4 = p2.spinner();
     spinner4.start(`Running copier copy  (target: agents/hermes/${role})`);
     const result = spawnSync("copier", args, {
@@ -903,20 +1223,26 @@ var RunCopierTemplate = class extends Command {
 };
 
 // src/commands/hermes/UntrackHermesRuntimes.ts
-import { existsSync as existsSync4, readFileSync as readFileSync2, writeFileSync as writeFileSync3, readdirSync } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync4, readdirSync as readdirSync2 } from "fs";
+import { join as join9 } from "path";
 import { spawnSync as spawnSync2 } from "node:child_process";
+function sectionHasPath(section, targetPath) {
+  return section.split(/\r?\n/).some((line) => /^\s*path\s*=/.test(line) && line.replace(/^\s*path\s*=\s*/, "").trim() === targetPath);
+}
+function removeSubmodulePath(content, targetPath) {
+  return content.replace(/^\[submodule "[^"\n]+"\][\s\S]*?(?=^\[submodule "|(?![\s\S]))/gm, (section) => sectionHasPath(section, targetPath) ? "" : section).replace(/\n{3,}/g, "\n\n").trim();
+}
 var UntrackHermesRuntimes = class extends Command {
   async invoke() {
     const targetDir = this.context.targetDir;
-    const rolesDir = join6(targetDir, "agents", "hermes");
-    if (!existsSync4(rolesDir)) {
+    const rolesDir = join9(targetDir, "agents", "hermes");
+    if (!existsSync5(rolesDir)) {
       return {
         success: true,
         message: "No Hermes agents found (no agents/hermes directory)."
       };
     }
-    const roles = readdirSync(rolesDir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
+    const roles = readdirSync2(rolesDir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
     if (roles.length === 0) {
       return {
         success: true,
@@ -926,53 +1252,85 @@ var UntrackHermesRuntimes = class extends Command {
     let modifiedAny = false;
     const details = [];
     for (const role of roles) {
-      const roleDir = join6("agents", "hermes", role);
-      const runtimePath = join6(roleDir, "runtime");
-      const gitignorePath = join6(roleDir, ".gitignore");
+      const roleDir = join9("agents", "hermes", role);
+      const runtimePath = join9(roleDir, "runtime");
+      const gitignorePath = join9(roleDir, ".gitignore");
+      const gitmodulesPath = join9(targetDir, ".gitmodules");
       let isTracked = false;
-      const lsResult = spawnSync2("git", ["ls-files", "--stage", runtimePath], {
+      const lsResult = spawnSync2("git", ["ls-files", "--stage", "--", runtimePath], {
         cwd: targetDir,
         encoding: "utf8"
       });
+      if (lsResult.status !== 0) {
+        return {
+          success: false,
+          message: `\u2717 Failed to inspect runtime index at ${runtimePath}: ${lsResult.stderr.trim() || `exit ${lsResult.status}`}`
+        };
+      }
       if (lsResult.status === 0 && lsResult.stdout.trim().length > 0) {
         isTracked = true;
       }
+      let hasStaleMapping = false;
+      let gitmodulesContent = "";
+      if (existsSync5(gitmodulesPath)) {
+        gitmodulesContent = readFileSync4(gitmodulesPath, "utf8");
+        const sections = gitmodulesContent.match(/^\[submodule "[^"\n]+"\][\s\S]*?(?=^\[submodule "|(?![\s\S]))/gm) ?? [];
+        hasStaleMapping = sections.some((section) => sectionHasPath(section, runtimePath));
+      }
       let isIgnored = false;
-      const fullGitignorePath = join6(targetDir, gitignorePath);
-      if (existsSync4(fullGitignorePath)) {
-        const content = readFileSync2(fullGitignorePath, "utf8");
+      const fullGitignorePath = join9(targetDir, gitignorePath);
+      if (existsSync5(fullGitignorePath)) {
+        const content = readFileSync4(fullGitignorePath, "utf8");
         const lines = content.split(/\r?\n/).map((line) => line.trim());
         isIgnored = lines.includes("runtime/") || lines.includes("runtime");
       }
-      if (isTracked || !isIgnored) {
+      if (isTracked || hasStaleMapping || !isIgnored) {
         modifiedAny = true;
         if (isTracked) {
           details.push(`untrack agents/hermes/${role}/runtime`);
           if (!this.context.dryRun) {
-            const rmResult = spawnSync2("git", ["rm", "--cached", "-r", runtimePath], {
+            const rmResult = spawnSync2("git", ["rm", "--cached", "-r", "-f", "--", runtimePath], {
               cwd: targetDir,
               encoding: "utf8"
             });
             if (rmResult.status !== 0) {
               return {
                 success: false,
-                message: `Failed to untrack agents/hermes/${role}/runtime: ${rmResult.stderr}`
+                message: `\u2717 Failed to untrack ${runtimePath}: ${rmResult.stderr.trim() || `exit ${rmResult.status}`}`
+              };
+            }
+            const verifyResult = spawnSync2("git", ["ls-files", "--stage", "--", runtimePath], {
+              cwd: targetDir,
+              encoding: "utf8"
+            });
+            if (verifyResult.status !== 0 || verifyResult.stdout.trim()) {
+              return {
+                success: false,
+                message: verifyResult.status !== 0 ? `\u2717 Failed to verify untracked runtime ${runtimePath}: ${verifyResult.stderr.trim() || `exit ${verifyResult.status}`}` : `\u2717 Runtime remains tracked after index-only removal: ${runtimePath}`
               };
             }
           }
         }
+        if (hasStaleMapping) {
+          details.push(`remove stale .gitmodules mapping for ${runtimePath}`);
+          if (!this.context.dryRun) {
+            const next = removeSubmodulePath(gitmodulesContent, runtimePath);
+            writeFileSync4(gitmodulesPath, next ? `${next}
+` : "", "utf8");
+          }
+        }
         if (!isIgnored) {
           details.push(`ignore runtime/ in agents/hermes/${role}/.gitignore`);
           if (!this.context.dryRun) {
             let content = "";
-            if (existsSync4(fullGitignorePath)) {
-              content = readFileSync2(fullGitignorePath, "utf8");
+            if (existsSync5(fullGitignorePath)) {
+              content = readFileSync4(fullGitignorePath, "utf8");
             }
             if (content && !content.endsWith("\n")) {
               content += "\n";
             }
             content += "runtime/\n";
-            writeFileSync3(fullGitignorePath, content, "utf8");
+            writeFileSync4(fullGitignorePath, content, "utf8");
           }
         }
       }
@@ -994,8 +1352,8 @@ ${details.map((d) => `  - ${d}`).join("\n")}`
 
 // src/commands/hermes/WireTelegram.ts
 import { spawnSync as spawnSync3 } from "node:child_process";
-import { join as join7 } from "node:path";
-import { existsSync as existsSync5, unlinkSync } from "node:fs";
+import { join as join10 } from "node:path";
+import { existsSync as existsSync6, unlinkSync } from "node:fs";
 import * as p3 from "@clack/prompts";
 var WireTelegram = class extends Command {
   async invoke() {
@@ -1083,15 +1441,15 @@ var WireTelegram = class extends Command {
     if (p3.isCancel(allowedAnswer)) {
       return { success: false, message: "\u2717 Aborted; Telegram step deferred." };
     }
-    const script = join7(roleDir, ".scripts", "30-telegram.sh");
-    if (!existsSync5(script)) {
+    const script = join10(roleDir, ".scripts", "30-telegram.sh");
+    if (!existsSync6(script)) {
       return {
         success: false,
         message: `\u2717 ${script} not found.  Did copier finish?  Re-run with --skip-runtime-repo=0 if you skipped it.`
       };
     }
-    const marker = join7(roleDir, ".scripts", ".done-30-telegram");
-    if (existsSync5(marker)) unlinkSync(marker);
+    const marker = join10(roleDir, ".scripts", ".done-30-telegram");
+    if (existsSync6(marker)) unlinkSync(marker);
     const spinner4 = p3.spinner();
     spinner4.start("Verifying token + wiring profile");
     const result = spawnSync3("bash", [script], {
@@ -1118,8 +1476,8 @@ function cap(s) {
 
 // src/commands/hermes/WireEmail.ts
 import { spawnSync as spawnSync4 } from "node:child_process";
-import { join as join8 } from "node:path";
-import { existsSync as existsSync6, unlinkSync as unlinkSync2 } from "node:fs";
+import { join as join11 } from "node:path";
+import { existsSync as existsSync7, unlinkSync as unlinkSync2 } from "node:fs";
 import * as p4 from "@clack/prompts";
 var WireEmail = class extends Command {
   async invoke() {
@@ -1134,8 +1492,8 @@ var WireEmail = class extends Command {
     if (!targetRepo || !role || !roleDir) {
       return { success: false, message: "Cannot wire email: missing target_repo/role/roleDir" };
     }
-    const script = join8(roleDir, ".scripts", "50-email.sh");
-    if (!existsSync6(script)) {
+    const script = join11(roleDir, ".scripts", "50-email.sh");
+    if (!existsSync7(script)) {
       return { success: false, message: `\u2717 ${script} not found` };
     }
     let token = process.env.CF_EMAIL_ROUTING_TOKEN;
@@ -1197,8 +1555,8 @@ var WireEmail = class extends Command {
         }
       }
     }
-    const marker = join8(roleDir, ".scripts", ".done-50-email");
-    if (existsSync6(marker)) unlinkSync2(marker);
+    const marker = join11(roleDir, ".scripts", ".done-50-email");
+    if (existsSync7(marker)) unlinkSync2(marker);
     const spinner4 = p4.spinner();
     spinner4.start("Creating Cloudflare Email Routing rule");
     const result = spawnSync4("bash", [script], {
@@ -1226,7 +1584,6 @@ var PrintHermesSummary = class extends Command {
     const botHandle = `${targetRepo?.toLowerCase().replace(/-/g, "_")}_${role?.toLowerCase()}_bot`;
     const email = `${targetRepo}-${role}@delo.sh`;
     const gw = `hermes-${agentId}-gateway.service`;
-    const csm = `hermes-${agentId}-consumer.service`;
     const hb = `hermes-${agentId}-heartbeat.timer`;
     const lines = [];
     lines.push(`agent_id     ${agentId}`);
@@ -1236,13 +1593,13 @@ var PrintHermesSummary = class extends Command {
     if (!skipEmail) lines.push(`email        ${email}`);
     lines.push("");
     lines.push("Start daemons:");
-    lines.push(`  systemctl --user start ${csm}`);
     lines.push(`  systemctl --user start ${hb}`);
     if (!skipTelegram) {
       lines.push(`  systemctl --user start ${gw}`);
     } else {
       lines.push(`  # gateway needs Telegram wired first (re-run with --skip-telegram=0)`);
     }
+    lines.push("  # Bloodbank commands arrive through the fleet-shared Hermes gateway");
     lines.push("");
     lines.push("Talk locally:");
     lines.push(`  ${ctx.roleDir}/hermes chat "status"`);
@@ -1285,15 +1642,15 @@ var HermesAgentRecipe = class extends Recipe {
 
 // src/commands/AgentHooksCommands.ts
 import { homedir as homedir4 } from "node:os";
-import { join as join10, dirname as dirname5 } from "node:path";
-import { existsSync as existsSync8, cpSync, mkdirSync as mkdirSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync5 } from "node:fs";
+import { join as join13, dirname as dirname5 } from "node:path";
+import { existsSync as existsSync9, cpSync, mkdirSync as mkdirSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync6 } from "node:fs";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/project/index.ts
 import { spawnSync as spawnSync5 } from "node:child_process";
-import { existsSync as existsSync7, mkdirSync as mkdirSync4, readFileSync as readFileSync3, renameSync, statSync, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync8, mkdirSync as mkdirSync4, readFileSync as readFileSync5, renameSync, statSync, writeFileSync as writeFileSync5 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { basename as basename2, delimiter, dirname as dirname4, join as join9, resolve } from "node:path";
+import { basename as basename3, delimiter, dirname as dirname4, join as join12, resolve as resolve2 } from "node:path";
 import YAML2 from "yaml";
 
 // src/project/RegistryStore.ts
@@ -1528,18 +1885,18 @@ var PROJECT_SOURCE_SKILL_ROOTS_ENV = "PJ_SOURCE_SKILL_ROOTS";
 var PROJECT_REGISTRY_SCHEMA_VERSION = 1;
 var DEFAULT_SOURCE_SKILL_ROOTS = [
   "/home/delorenj/code/skillex/all-skills",
-  join9(homedir3(), ".agents", "skills"),
-  join9(homedir3(), ".codex", "skills")
+  join12(homedir3(), ".agents", "skills"),
+  join12(homedir3(), ".codex", "skills")
 ];
 function projectRegistryPath(env2 = process.env) {
-  return expandHome(env2[PROJECT_REGISTRY_ENV] || join9(homedir3(), ".config", "pjangler", "projects.yaml"));
+  return expandHome(env2[PROJECT_REGISTRY_ENV] || join12(homedir3(), ".config", "pjangler", "projects.yaml"));
 }
 function emptyProjectRegistry() {
   return { schema_version: PROJECT_REGISTRY_SCHEMA_VERSION, projects: {} };
 }
 function loadProjectRegistry(path = projectRegistryPath()) {
-  if (!existsSync7(path)) return emptyProjectRegistry();
-  const raw = YAML2.parse(readFileSync3(path, "utf8"));
+  if (!existsSync8(path)) return emptyProjectRegistry();
+  const raw = YAML2.parse(readFileSync5(path, "utf8"));
   if (raw == null) return emptyProjectRegistry();
   if (!isRecord(raw)) throw new Error(`Project registry must be a mapping: ${path}`);
   const registry = raw;
@@ -1554,7 +1911,7 @@ function saveProjectRegistry(registry, path = projectRegistryPath()) {
   validateProjectRegistry(registry);
   mkdirSync4(dirname4(path), { recursive: true });
   const temp = `${path}.${process.pid}.${Date.now()}.tmp`;
-  writeFileSync4(temp, YAML2.stringify(registry, { lineWidth: 0 }), "utf8");
+  writeFileSync5(temp, YAML2.stringify(registry, { lineWidth: 0 }), "utf8");
   renameSync(temp, path);
 }
 function validateProjectRegistry(registry) {
@@ -1569,7 +1926,7 @@ function validateProjectRegistry(registry) {
     validateProjectRecord(project, slug);
     if (slugs.has(project.slug)) throw new Error(`Duplicate project slug: ${project.slug}`);
     slugs.add(project.slug);
-    const repoKey = resolve(project.repo_path);
+    const repoKey = resolve2(project.repo_path);
     const existingRepoSlug = repoPaths.get(repoKey);
     if (existingRepoSlug && existingRepoSlug !== slug) {
       throw new Error(`Duplicate project repo_path: ${project.repo_path} used by ${existingRepoSlug} and ${slug}`);
@@ -1636,7 +1993,7 @@ function resolveAgentHooksLayer(input, env2 = process.env) {
   const override = env2.PJ_AGENT_HOOKS_LAYER;
   if (override === "0" || override === "false") return false;
   if (override === "1" || override === "true") return true;
-  return !existsSync7(join9(homedir3(), ".agents", "hooks"));
+  return !existsSync8(join12(homedir3(), ".agents", "hooks"));
 }
 function jsonStable(value) {
   return JSON.stringify(value);
@@ -1649,14 +2006,14 @@ function projectRecordEquivalent(a, b) {
 }
 function defaultProjectTargetDir(name, cwd = process.cwd()) {
   const compactName = name.replace(/[^A-Za-z0-9._-]/g, "") || slugifyProjectName(name);
-  return resolve(dirname4(resolve(cwd)), compactName);
+  return resolve2(dirname4(resolve2(cwd)), compactName);
 }
 function sourceSkillRoots(env2 = process.env) {
   const configuredRoots = (env2[PROJECT_SOURCE_SKILL_ROOTS_ENV] || "").split(delimiter).map((root) => root.trim()).filter(Boolean);
   const seen = /* @__PURE__ */ new Set();
   const roots = [];
   for (const root of [...DEFAULT_SOURCE_SKILL_ROOTS, ...configuredRoots]) {
-    const normalized = resolve(expandHome(root));
+    const normalized = resolve2(expandHome(root));
     if (seen.has(normalized)) continue;
     seen.add(normalized);
     roots.push(normalized);
@@ -1666,13 +2023,13 @@ function sourceSkillRoots(env2 = process.env) {
 function resolveSourceSkillPath(sourceSkill, env2 = process.env) {
   if (!sourceSkill) return void 0;
   const expanded = expandHome(sourceSkill);
-  const direct = resolve(expanded);
-  if (existsSync7(direct)) return direct;
-  const name = basename2(sourceSkill);
+  const direct = resolve2(expanded);
+  if (existsSync8(direct)) return direct;
+  const name = basename3(sourceSkill);
   const roots = sourceSkillRoots(env2);
   for (const root of roots) {
-    const candidate = join9(root, name);
-    if (existsSync7(candidate)) return candidate;
+    const candidate = join12(root, name);
+    if (existsSync8(candidate)) return candidate;
   }
   const searched = roots.length ? ` Searched roots: ${roots.join(", ")}.` : "";
   const hint = `${searched} Add project-specific roots with ${PROJECT_SOURCE_SKILL_ROOTS_ENV}.`;
@@ -1680,11 +2037,11 @@ function resolveSourceSkillPath(sourceSkill, env2 = process.env) {
 }
 function planProjectInit(input) {
   if (!input.name.trim()) throw new Error("Project name is required");
-  const registryPath2 = resolve(projectRegistryPath({ ...process.env, [PROJECT_REGISTRY_ENV]: input.registryPath || process.env[PROJECT_REGISTRY_ENV] }));
+  const registryPath2 = resolve2(projectRegistryPath({ ...process.env, [PROJECT_REGISTRY_ENV]: input.registryPath || process.env[PROJECT_REGISTRY_ENV] }));
   const registry = loadProjectRegistry(registryPath2);
   const now = (input.now ?? /* @__PURE__ */ new Date()).toISOString();
   const slug = input.projectSlug ?? slugifyProjectName(input.name);
-  const targetDir = resolve(input.targetDir ?? defaultProjectTargetDir(input.name, input.cwd));
+  const targetDir = resolve2(input.targetDir ?? defaultProjectTargetDir(input.name, input.cwd));
   const identifier = (input.projectIdentifier ?? deriveProjectIdentifier(input.name)).toUpperCase();
   const existing = registry.projects[slug];
   const sourceSkillPath = resolveSourceSkillPath(input.sourceSkill);
@@ -1727,7 +2084,7 @@ function planProjectInit(input) {
     updated_at: projectRecordEquivalent(existing, candidateProject) ? existing.updated_at : now
   };
   validateNoDuplicateProject(registry, project, overwrite);
-  const pjanglerRoot = resolve(input.pjanglerRoot ?? resolvePjanglerRoot());
+  const pjanglerRoot = resolve2(input.pjanglerRoot ?? resolvePjanglerRoot());
   const manifest = projectManifestFromRegistryProject(project);
   const apply = input.apply ?? false;
   const live = input.live ?? false;
@@ -1753,7 +2110,7 @@ function planProjectInit(input) {
     }));
   }
   actions.push(
-    { kind: "project.write-manifest", path: join9(targetDir, ".project.json"), manifest },
+    { kind: "project.write-manifest", path: join12(targetDir, ".project.json"), manifest },
     {
       kind: "ticket-provider.create-or-link",
       enabled: live,
@@ -1806,7 +2163,7 @@ async function executeProjectInitPlan(plan) {
       }
       if (result.status !== 0) {
         errors.push(`copier exited with status ${result.status ?? "unknown"}`);
-        if (existsSync7(action.targetDir)) changedFiles.push(action.targetDir);
+        if (existsSync8(action.targetDir)) changedFiles.push(action.targetDir);
         break;
       }
       changedFiles.push(action.targetDir);
@@ -1814,9 +2171,9 @@ async function executeProjectInitPlan(plan) {
       mkdirSync4(dirname4(action.path), { recursive: true });
       const next = `${JSON.stringify(action.manifest, null, 2)}
 `;
-      const current = existsSync7(action.path) ? readFileSync3(action.path, "utf8") : void 0;
+      const current = existsSync8(action.path) ? readFileSync5(action.path, "utf8") : void 0;
       if (current !== next) {
-        writeFileSync4(action.path, next, "utf8");
+        writeFileSync5(action.path, next, "utf8");
         changedFiles.push(action.path);
       }
     } else if (action.kind === "registry.upsert") {
@@ -1879,7 +2236,7 @@ function getProject(registry, slug) {
   return project;
 }
 function buildCommonProjectCopierAction(input) {
-  const templateDir = join9(input.pjanglerRoot, "templates", "commonproject");
+  const templateDir = join12(input.pjanglerRoot, "templates", "commonproject");
   const data = {
     project_name: input.projectName,
     project_description: input.projectDescription ?? "",
@@ -1908,19 +2265,19 @@ function buildCommonProjectCopierAction(input) {
 function resolvePjanglerRoot() {
   let dir = dirname4(new URL(import.meta.url).pathname);
   while (dir !== dirname4(dir)) {
-    if (existsSync7(join9(dir, "package.json")) && existsSync7(join9(dir, "templates", "commonproject", "copier.yml"))) return dir;
+    if (existsSync8(join12(dir, "package.json")) && existsSync8(join12(dir, "templates", "commonproject", "copier.yml"))) return dir;
     dir = dirname4(dir);
   }
-  return resolve(process.cwd());
+  return resolve2(process.cwd());
 }
 function validateNoDuplicateProject(registry, project, overwrite) {
   const existingSameSlug = registry.projects[project.slug];
-  if (existingSameSlug && !overwrite && resolve(existingSameSlug.repo_path) !== resolve(project.repo_path)) {
+  if (existingSameSlug && !overwrite && resolve2(existingSameSlug.repo_path) !== resolve2(project.repo_path)) {
     throw new Error(`Project slug already exists in registry: ${project.slug}`);
   }
   for (const [slug, existing] of Object.entries(registry.projects)) {
     if (slug === project.slug) continue;
-    if (resolve(existing.repo_path) === resolve(project.repo_path)) {
+    if (resolve2(existing.repo_path) === resolve2(project.repo_path)) {
       throw new Error(`Project repo_path already registered by ${slug}: ${project.repo_path}`);
     }
     if (existing.ticket_provider.identifier && existing.ticket_provider.identifier.toUpperCase() === project.ticket_provider.identifier?.toUpperCase()) {
@@ -1940,7 +2297,7 @@ function validateProjectRecord(project, key) {
 }
 function expandHome(path) {
   if (path === "~") return homedir3();
-  if (path.startsWith("~/")) return join9(homedir3(), path.slice(2));
+  if (path.startsWith("~/")) return join12(homedir3(), path.slice(2));
   return path;
 }
 function isRecord(value) {
@@ -1957,16 +2314,16 @@ function resolveTemplateRoot() {
   try {
     let dir = dirname5(fileURLToPath2(import.meta.url));
     for (let i = 0; i < 8; i++) {
-      candidates.push(join10(dir, "templates", "commonproject", "template"));
+      candidates.push(join13(dir, "templates", "commonproject", "template"));
       const parent = dirname5(dir);
       if (parent === dir) break;
       dir = parent;
     }
   } catch {
   }
-  candidates.push(join10(homedir4(), "code", "pjangler", "templates", "commonproject", "template"));
+  candidates.push(join13(homedir4(), "code", "pjangler", "templates", "commonproject", "template"));
   for (const c of candidates) {
-    if (existsSync8(join10(c, ".agents", "hooks", "hooks.master.json"))) return c;
+    if (existsSync9(join13(c, ".agents", "hooks", "hooks.master.json"))) return c;
   }
   throw new Error(
     "Could not locate the CommonProject template. Set PJANGLER_COMMONPROJECT_TEMPLATE to <repo>/templates/commonproject/template."
@@ -1985,18 +2342,17 @@ var CopyAgentHooksTree = class extends Command {
     }
     const items = [
       { rel: ".agents/hooks", dir: true },
+      { rel: ".agents/skills.json", dir: false },
       { rel: ".agents/local.example.json", dir: false },
-      { rel: ".mise/scripts/link-project-skills-to-clis.sh", dir: false },
-      { rel: ".mise/scripts/unlink-project-skills-from-clis.sh", dir: false },
       { rel: ".mise/scripts/hindsight-setup.sh", dir: false }
     ];
     const created = [];
     const skipped = [];
     for (const { rel, dir } of items) {
-      const src = join10(templateRoot, rel);
-      const dest = join10(this.context.targetDir, rel);
-      if (!existsSync8(src)) continue;
-      if (existsSync8(dest) && !this.context.force) {
+      const src = join13(templateRoot, rel);
+      const dest = join13(this.context.targetDir, rel);
+      if (!existsSync9(src)) continue;
+      if (existsSync9(dest) && !this.context.force) {
         skipped.push(rel);
         continue;
       }
@@ -2022,25 +2378,21 @@ var WireMiseAgentHooks = class _WireMiseAgentHooks extends Command {
     if (!resolveAgentHooksLayer()) {
       return { success: true, message: this.formatMessage(AGENT_HOOKS_SKIP_MESSAGE) };
     }
-    const misePath = join10(this.context.targetDir, "mise.toml");
-    if (!existsSync8(misePath)) {
+    const misePath = join13(this.context.targetDir, "mise.toml");
+    if (!existsSync9(misePath)) {
       return {
         success: false,
         message: "\u26A0\uFE0F  No mise.toml found \u2014 run `pjangler init mise` first, then re-run."
       };
     }
-    let content = readFileSync4(misePath, "utf8");
+    let content = readFileSync6(misePath, "utf8");
     if (content.includes(_WireMiseAgentHooks.MARKER)) {
       return { success: true, message: this.formatMessage("\u2713 mise.toml already wired for agent-hooks") };
     }
     const cr = _WireMiseAgentHooks.CR;
-    const enterAdds = [
-      `  "${cr}/.mise/scripts/link-project-skills-to-clis.sh",`,
-      `  "${cr}/.agents/hooks/sync.py --install --quiet",`
-    ].join("\n");
+    const enterAdds = [`  "sync-skills.py --scope project",`, `  "${cr}/.agents/hooks/sync.py --install --quiet",`].join("\n");
     const leaveBlock = [
       "leave = [",
-      `  "${cr}/.mise/scripts/unlink-project-skills-from-clis.sh",`,
       `  "${cr}/.agents/hooks/sync.py --uninstall --quiet",`,
       "]"
     ].join("\n");
@@ -2048,16 +2400,15 @@ var WireMiseAgentHooks = class _WireMiseAgentHooks extends Command {
     const enterRe = /(enter\s*=\s*\[[\s\S]*?)(\n[ \t]*\])/;
     if (enterRe.test(content)) {
       content = content.replace(enterRe, (_m, head, close) => {
-        const sep = /[,[]\s*$/.test(head) ? "" : ",";
-        return `${head}${sep}
+        const sep2 = /[,[]\s*$/.test(head) ? "" : ",";
+        return `${head}${sep2}
 ${enterAdds}${close}`;
       });
       const leaveRe = /(leave\s*=\s*\[[\s\S]*?)(\n[ \t]*\])/;
       if (leaveRe.test(content)) {
         content = content.replace(leaveRe, (_m, head, close) => {
-          const sep = /[,[]\s*$/.test(head) ? "" : ",";
-          return `${head}${sep}
-  "${cr}/.mise/scripts/unlink-project-skills-from-clis.sh",
+          const sep2 = /[,[]\s*$/.test(head) ? "" : ",";
+          return `${head}${sep2}
   "${cr}/.agents/hooks/sync.py --uninstall --quiet",${close}`;
         });
       } else {
@@ -2070,6 +2421,14 @@ ${leaveBlock}`);
       "",
       _WireMiseAgentHooks.MARKER + " (generated \u2014 see .agents/hooks/README.md)",
       "[[watch_files]]",
+      'patterns = [".agents/skills.json"]',
+      'task = "skills-sync"',
+      "",
+      "[tasks.skills-sync]",
+      'description = "Sync skills from manifest to local CLI dirs"',
+      'run = "sync-skills.py --scope project"',
+      "",
+      "[[watch_files]]",
       'patterns = [".agents/hooks/hooks.master.json"]',
       'task = "hooks-sync"',
       "",
@@ -2085,18 +2444,6 @@ ${leaveBlock}`);
       'description = "Remove per-user agent-hook injections (codex/kimi/hermes)"',
       `run = "${cr}/.agents/hooks/sync.py --uninstall"`,
       "",
-      "[tasks.link-project-skills-to-clis]",
-      'description = "Fan .agents/skills out to each agent CLI (honors local.json)"',
-      `run = "${cr}/.mise/scripts/link-project-skills-to-clis.sh"`,
-      "",
-      "[tasks.unlink-project-skills-from-clis]",
-      'description = "Remove project skill symlinks from shared per-CLI dirs"',
-      `run = "${cr}/.mise/scripts/unlink-project-skills-from-clis.sh"`,
-      "",
-      "[tasks.skills-relink]",
-      'description = "Re-fan the project skill set to all CLIs"',
-      `run = "${cr}/.mise/scripts/link-project-skills-to-clis.sh"`,
-      "",
       "[tasks.hindsight-setup]",
       `description = "Provision this dev's shared project Hindsight key from 1Password into .env"`,
       `run = "${cr}/.mise/scripts/hindsight-setup.sh"`,
@@ -2105,7 +2452,7 @@ ${leaveBlock}`);
       ""
     ].join("\n");
     content = content.replace(/\n*$/, "\n") + appended;
-    if (!this.context.dryRun) writeFileSync5(misePath, content);
+    if (!this.context.dryRun) writeFileSync6(misePath, content);
     if (wiredHooks) {
       return { success: true, message: this.formatMessage("\u2705 Wired mise.toml ([hooks] enter/leave + tasks)") };
     }
@@ -2114,8 +2461,8 @@ ${leaveBlock}`);
       message: this.formatMessage(
         `\u2705 Added agent-hooks tasks to mise.toml.
    \u26A0\uFE0F  Could not find a [hooks].enter array to extend \u2014 add these to your [hooks] block manually:
-     enter += "${cr}/.mise/scripts/link-project-skills-to-clis.sh", "${cr}/.agents/hooks/sync.py --install --quiet"
-     leave += "${cr}/.mise/scripts/unlink-project-skills-from-clis.sh", "${cr}/.agents/hooks/sync.py --uninstall --quiet"`
+     enter += "sync-skills.py --scope project", "${cr}/.agents/hooks/sync.py --install --quiet"
+     leave += "${cr}/.agents/hooks/sync.py --uninstall --quiet"`
       )
     };
   }
@@ -2130,10 +2477,25 @@ var AgentHooksRecipe = class extends Recipe {
   printNextSteps() {
     console.log("\u{1FA9D} Agent-hooks layer installed!");
     console.log("   Next steps:");
-    console.log("   1. mise run hooks-sync   # generate .claude/settings.json + inject codex/kimi/hermes");
-    console.log("   2. git add .claude/settings.json .agents/hooks && commit (codex/kimi/hermes are per-dev)");
-    console.log("   3. mise run hindsight-setup   # set HINDSIGHT_OP_KEY_REF to your 1Password item first");
-    console.log(`   4. If you run a global agent system: echo '{"skills":{"defer_to_global":true}}' > .agents/local.json`);
+    console.log("   1. mise run skills-sync  # sync .agents/skills.json into local CLI dirs");
+    console.log("   2. mise run hooks-sync   # generate .claude/settings.json + inject codex/kimi/hermes");
+    console.log("   3. git add .claude/settings.json .agents/hooks .agents/skills.json && commit (codex/kimi/hermes are per-dev)");
+    console.log("   4. mise run hindsight-setup   # set HINDSIGHT_OP_KEY_REF to your 1Password item first");
+    console.log("   5. Optional per-dev hook opt-out: copy .agents/local.example.json -> .agents/local.json");
+  }
+};
+
+// src/recipes/MiseOpInjectRecipe.ts
+var MiseOpInjectRecipe = class extends Recipe {
+  constructor(context) {
+    super(context);
+    this.addIngredient(WireMiseOpInject);
+  }
+  printNextSteps() {
+    console.log("\u{1F389} Wired up .env.op 1Password resolution via mise!");
+    console.log("   Next steps:");
+    console.log("   1. Create .env.op with your op:// secret references");
+    console.log("   2. Run `mise run secrets-inject` or simply cd out and back in to trigger the hook");
   }
 };
 
@@ -2176,6 +2538,12 @@ var RECIPE_REGISTRY = {
     description: "Retrofit the project-scoped agent-hooks + skill fan-out layer (Claude/Codex/Kimi/Hermes hooks via mise enter/leave)",
     class: AgentHooksRecipe,
     commands: ["CopyAgentHooksTree", "WireMiseAgentHooks"]
+  },
+  "mise-op-inject": {
+    name: "mise-op-inject",
+    description: "Wire up op-inject script to mise.toml for 1Password secret resolution",
+    class: MiseOpInjectRecipe,
+    commands: ["WireMiseOpInject"]
   }
 };
 var COMMAND_REGISTRY = {
@@ -2244,6 +2612,12 @@ var COMMAND_REGISTRY = {
     description: "Create .env.example file",
     group: "environment",
     class: AddDotenv
+  },
+  WireMiseOpInject: {
+    name: "WireMiseOpInject",
+    description: "Wire up op-inject script to mise.toml for 1Password secret resolution",
+    group: "mise",
+    class: WireMiseOpInject
   }
 };
 function getRecipeNames() {
@@ -2259,15 +2633,15 @@ function createRecipe(name, context) {
 }
 
 // src/utils/version.ts
-import { readFileSync as readFileSync5 } from "node:fs";
-import { dirname as dirname6, join as join11 } from "node:path";
+import { readFileSync as readFileSync7 } from "node:fs";
+import { dirname as dirname6, join as join14 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 var PJANGLER_VERSION = (() => {
   try {
     let dir = dirname6(fileURLToPath3(import.meta.url));
     for (let i = 0; i < 4; i++) {
       try {
-        const raw = readFileSync5(join11(dir, "package.json"), "utf8");
+        const raw = readFileSync7(join14(dir, "package.json"), "utf8");
         return JSON.parse(raw).version ?? "0.0.0";
       } catch {
         const parent = dirname6(dir);
@@ -2281,29 +2655,61 @@ var PJANGLER_VERSION = (() => {
 })();
 
 // src/parity/index.ts
-import { existsSync as existsSync9, lstatSync, mkdirSync as mkdirSync6, readFileSync as readFileSync6, readlinkSync, readdirSync as readdirSync2, renameSync as renameSync2, symlinkSync, unlinkSync as unlinkSync3, writeFileSync as writeFileSync6, chmodSync as chmodSync2, copyFileSync } from "node:fs";
-import { basename as basename3, dirname as dirname7, join as join12, relative, resolve as resolve2 } from "node:path";
-import { fileURLToPath as fileURLToPath4 } from "node:url";
+import { existsSync as existsSync10, lstatSync as lstatSync2, mkdirSync as mkdirSync6, mkdtempSync, readFileSync as readFileSync8, readlinkSync, readdirSync as readdirSync3, realpathSync, renameSync as renameSync2, rmdirSync, symlinkSync, unlinkSync as unlinkSync3, writeFileSync as writeFileSync7, chmodSync as chmodSync4, copyFileSync, rmSync } from "node:fs";
+import { basename as basename4, dirname as dirname7, join as join15, relative as relative2, resolve as resolve3 } from "node:path";
+import { fileURLToPath as fileURLToPath4, pathToFileURL } from "node:url";
 import { homedir as homedir5 } from "node:os";
 import { spawnSync as spawnSync6 } from "node:child_process";
 import YAML3 from "yaml";
 var LINK_AGENTFILES_SCRIPT = "'{{config_root}}/.mise/scripts/link-agentfiles.sh'";
 var OP_INJECT_SCRIPT = "op inject -i .env.op > .env";
+var PROVISION_BMAD_SKILLS_SCRIPT = "python3 '{{config_root}}/.mise/scripts/provision-bmad-skills.py'";
+var SYNC_SKILLS_SCRIPT = "python3 '{{config_root}}/.mise/scripts/sync-skills.py' --scope project";
 var CODEGRAPH_SCRIPT = "[ -f '{{config_root}}/.mise/scripts/codegraph.sh' ] && '{{config_root}}/.mise/scripts/codegraph.sh' || true";
+var SKILLS_REGISTRY_URL = "https://github.com/delorenj/skillex.git";
+var PROJECT_CLI_SKILL_DIRS = [
+  ".gemini/skills",
+  ".codex/skills",
+  ".kimi/skills",
+  ".augment/skills",
+  ".config/opencode/skills",
+  ".hermes/skills",
+  ".claude/skills",
+  ".openclaw/skills"
+];
+var CANONICAL_CLAUDE_SKILLS_ALIAS = "../.agents/skills";
 var HOOKS_COMMENT_HEADER = `# This block will handle the linking of
 # agent files to the main AGENTS.md file.
 #
 # TODO: Ensure this works for all levels of nesting.
 # i.e. All linked agent files MUST be siblings at
 # any given level of nesting.`;
-var LINK_AGENTFILES_HOOK_ENTRIES = [LINK_AGENTFILES_SCRIPT, OP_INJECT_SCRIPT];
+var LINK_AGENTFILES_HOOK_ENTRIES = [
+  LINK_AGENTFILES_SCRIPT,
+  OP_INJECT_SCRIPT,
+  PROVISION_BMAD_SKILLS_SCRIPT,
+  SYNC_SKILLS_SCRIPT
+];
 var LINK_AGENTFILES_WATCH_TASK_BLOCK = `[[watch_files]]
 patterns = ["AGENTS.md"]
 task = "link-agentfiles"
 
+[[watch_files]]
+patterns = [".agents/skills.json"]
+task = "skills-sync"
+
 [tasks.link-agentfiles]
 description = "Symlink all agent files to AGENTS.md"
-run = "'{{config_root}}/.mise/scripts/link-agentfiles.sh'"`;
+run = "'{{config_root}}/.mise/scripts/link-agentfiles.sh'"
+
+[tasks.skills-sync]
+description = "Sync skills from manifest to local CLI dirs"
+depends = ["skills-provision-bmad"]
+run = "python3 '{{config_root}}/.mise/scripts/sync-skills.py' --scope project"
+
+[tasks.skills-provision-bmad]
+description = "Provision pinned BMAD skills from the Skillex pack"
+run = "python3 '{{config_root}}/.mise/scripts/provision-bmad-skills.py'"`;
 var VERSIONING_BLOCK = `# >>> mise-versioning >>>  (managed block \u2014 do not edit by hand; re-run init to update)
 [tasks."version"]
 description = "Print the current version (vX.Y.Z)"
@@ -2333,7 +2739,7 @@ run = "'{{config_root}}/.mise/scripts/versioning.sh' sync"
 function resolvePjanglerRoot2() {
   let dir = dirname7(fileURLToPath4(import.meta.url));
   while (dir !== dirname7(dir)) {
-    if (existsSync9(join12(dir, "package.json")) && existsSync9(join12(dir, "templates", "commonproject", "copier.yml"))) {
+    if (existsSync10(join15(dir, "package.json")) && existsSync10(join15(dir, "templates", "commonproject", "copier.yml"))) {
       return dir;
     }
     dir = dirname7(dir);
@@ -2344,17 +2750,17 @@ function normalizeNewlines(value) {
   return value.replace(/\r\n/g, "\n");
 }
 function readText(path) {
-  return normalizeNewlines(readFileSync6(path, "utf8"));
+  return normalizeNewlines(readFileSync8(path, "utf8"));
 }
 function safeReadText(path) {
-  return existsSync9(path) ? readText(path) : null;
+  return existsSync10(path) ? readText(path) : null;
 }
 function ensureParent(path) {
   mkdirSync6(dirname7(path), { recursive: true });
 }
 function writeText(path, content) {
   ensureParent(path);
-  writeFileSync6(path, content);
+  writeFileSync7(path, content);
 }
 function tryParseJson(text2) {
   if (!text2) return null;
@@ -2371,7 +2777,7 @@ function titleCaseSlug(slug) {
   return slug.split(/[-_]/g).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(" ");
 }
 function readSymlinkTarget(path) {
-  if (!existsSync9(path)) return null;
+  if (!existsSync10(path)) return null;
   try {
     return readlinkSync(path);
   } catch {
@@ -2379,8 +2785,8 @@ function readSymlinkTarget(path) {
   }
 }
 function ensureSymlink(path, target, dryRun) {
-  if (existsSync9(path)) {
-    const stat = lstatSync(path);
+  if (existsSync10(path)) {
+    const stat = lstatSync2(path);
     if (stat.isSymbolicLink()) {
       const current = readSymlinkTarget(path);
       if (current === target) return { changed: false };
@@ -2390,18 +2796,18 @@ function ensureSymlink(path, target, dryRun) {
       }
       return { changed: true };
     }
-    return { changed: false, blocked: `${relative(process.cwd(), path) || path} exists and is not a symlink` };
+    return { changed: false, blocked: `${relative2(process.cwd(), path) || path} exists and is not a symlink` };
   }
   if (!dryRun) symlinkSync(target, path);
   return { changed: true };
 }
 function bootstrapAgentsFile(repoRoot, dryRun) {
-  const agentsPath = join12(repoRoot, "AGENTS.md");
-  if (existsSync9(agentsPath)) return { changedFiles: [], details: [] };
+  const agentsPath = join15(repoRoot, "AGENTS.md");
+  if (existsSync10(agentsPath)) return { changedFiles: [], details: [] };
   for (const file of ["CLAUDE.md", "GEMINI.md"]) {
-    const source = join12(repoRoot, file);
-    if (!existsSync9(source)) continue;
-    const stat = lstatSync(source);
+    const source = join15(repoRoot, file);
+    if (!existsSync10(source)) continue;
+    const stat = lstatSync2(source);
     if (stat.isSymbolicLink()) continue;
     if (stat.isFile()) {
       if (!dryRun) renameSync2(source, agentsPath);
@@ -2409,9 +2815,9 @@ function bootstrapAgentsFile(repoRoot, dryRun) {
     }
     return { changedFiles: [], details: [], blocked: `${file} exists but is not a regular file; cannot promote to AGENTS.md` };
   }
-  const readmePath = join12(repoRoot, "README.md");
-  if (existsSync9(readmePath)) {
-    const stat = lstatSync(readmePath);
+  const readmePath = join15(repoRoot, "README.md");
+  if (existsSync10(readmePath)) {
+    const stat = lstatSync2(readmePath);
     if (!stat.isFile()) return { changedFiles: [], details: [], blocked: "README.md exists but is not a regular file; cannot copy to AGENTS.md" };
     if (!dryRun) copyFileSync(readmePath, agentsPath);
     return { changedFiles: [agentsPath], details: ["Copied README.md to AGENTS.md before wiring agent-file symlinks"] };
@@ -2449,12 +2855,12 @@ function yamlGet(text2, keyPath) {
   return "";
 }
 function discoverRoles(repoRoot) {
-  const rolesDir = join12(repoRoot, "agents", "hermes");
-  if (!existsSync9(rolesDir)) return [];
-  return readdirSync2(rolesDir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => {
-    const roleDir = join12(rolesDir, entry.name);
-    const roleYamlPath = join12(roleDir, "role.yaml");
-    if (!existsSync9(roleYamlPath)) return null;
+  const rolesDir = join15(repoRoot, "agents", "hermes");
+  if (!existsSync10(rolesDir)) return [];
+  return readdirSync3(rolesDir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => {
+    const roleDir = join15(rolesDir, entry.name);
+    const roleYamlPath = join15(roleDir, "role.yaml");
+    if (!existsSync10(roleYamlPath)) return null;
     const text2 = readText(roleYamlPath);
     const runtimeRepoRaw = yamlGet(text2, "runtime.github_repo");
     return {
@@ -2482,7 +2888,7 @@ function discoverRoles(repoRoot) {
   }).filter((value) => Boolean(value));
 }
 function registryPath(homeDir) {
-  return join12(homeDir, ".hermes", "agents-registry.yaml");
+  return join15(homeDir, ".hermes", "agents-registry.yaml");
 }
 function systemctlUser(args) {
   const result = spawnSync6("systemctl", ["--user", ...args], { encoding: "utf8" });
@@ -2493,8 +2899,8 @@ function systemctlUser(args) {
   };
 }
 function templateScript(ctx, name) {
-  const source = join12(ctx.pjanglerRoot, ".mise", "scripts", name);
-  return existsSync9(source) ? readText(source) : void 0;
+  const source = join15(ctx.pjanglerRoot, ".mise", "scripts", name);
+  return existsSync10(source) ? readText(source) : void 0;
 }
 function templateVersioningScript(ctx) {
   return templateScript(ctx, "versioning.sh");
@@ -2506,8 +2912,8 @@ function resolveAgentHooksLayer2(ctx) {
   const override = process.env.PJ_AGENT_HOOKS_LAYER;
   if (override === "0" || override === "false") return false;
   if (override === "1" || override === "true") return true;
-  if (existsSync9(join12(ctx.repoRoot, ".agents", "hooks", "sync.py"))) return true;
-  return !existsSync9(join12(ctx.homeDir, ".agents", "hooks"));
+  if (existsSync10(join15(ctx.repoRoot, ".agents", "hooks", "sync.py"))) return true;
+  return !existsSync10(join15(ctx.homeDir, ".agents", "hooks"));
 }
 function evaluateMiseConditionals(template, agentHooksLayer) {
   const out = [];
@@ -2533,102 +2939,521 @@ function evaluateMiseConditionals(template, agentHooksLayer) {
 }
 function renderGeneratedProjectMiseToml(ctx, template) {
   const project = readProjectJson(ctx);
-  const projectName = String(project?.project_name ?? basename3(ctx.repoRoot) ?? "project");
+  const projectName = String(project?.project_name ?? basename4(ctx.repoRoot) ?? "project");
   return evaluateMiseConditionals(template, resolveAgentHooksLayer2(ctx)).replace(/\{%\s*raw\s*%\}([\s\S]*?)\{%\s*endraw\s*%\}/g, "$1").replace(/\{\{\s*project_name\s*\}\}/g, projectName);
 }
 function ensureMiseTomlFromTemplate(ctx, changedFiles) {
-  const targetPath = join12(ctx.repoRoot, "mise.toml");
-  if (existsSync9(targetPath)) return false;
-  const sourcePath = join12(ctx.pjanglerRoot, "templates", "commonproject", "template", "mise.toml.jinja");
-  if (!existsSync9(sourcePath)) return false;
+  const targetPath = join15(ctx.repoRoot, "mise.toml");
+  if (existsSync10(targetPath)) return false;
+  const sourcePath = join15(ctx.pjanglerRoot, "templates", "commonproject", "template", "mise.toml.jinja");
+  if (!existsSync10(sourcePath)) return false;
   changedFiles.push(targetPath);
   if (!ctx.dryRun) {
     writeText(targetPath, renderGeneratedProjectMiseToml(ctx, readText(sourcePath)));
   }
   return true;
 }
-function templateVersionFilesConf(ctx, repoRoot) {
-  const packageJson = join12(repoRoot, "package.json");
-  return existsSync9(packageJson) ? "# mise-versioning manifest: <type> <path>\n# types: json toml cargo csproj gradle plain gittag\njson package.json\ngittag .\n" : "# mise-versioning manifest: <type> <path>\n# types: json toml cargo csproj gradle plain gittag\ngittag .\n";
+function templateCommonProjectText(ctx, rel) {
+  const path = join15(ctx.pjanglerRoot, "templates", "commonproject", "template", rel);
+  return existsSync10(path) ? readText(path) : void 0;
 }
-function replaceOrAppendManagedBlock(text2, startMarker, block, beforePattern) {
-  if (startMarker.test(text2)) {
-    return text2.replace(/# >>> mise-versioning >>>[\s\S]*?# <<< mise-versioning <<</, block);
-  }
-  if (beforePattern) {
-    const match = text2.match(beforePattern);
-    if (match && typeof match.index === "number") {
-      return `${text2.slice(0, match.index).replace(/\s*$/, "\n\n")}${block}
-
-${text2.slice(match.index)}`;
-    }
+function validateSkillName(name) {
+  if (!name || name === "." || name === ".." || name.includes("/") || name.includes("\\") || basename4(name) !== name) {
+    throw new Error(`Unsafe skill name: ${JSON.stringify(name)}`);
   }
-  return `${text2.replace(/\s*$/, "")}
-
-${block}
-`;
+  return name;
 }
-var BASE_MISE_PATH_ENTRIES = [".mise/scripts", "agents/hermes/pm"];
-var CONDITIONAL_HERMES_PATHS = ["agents/hermes/pm/hermes", "agent/hermes/pm/hermes"];
-function requiredMisePathEntries(ctx) {
-  const required = [...BASE_MISE_PATH_ENTRIES];
-  for (const candidate of CONDITIONAL_HERMES_PATHS) {
-    if (existsSync9(join12(ctx.repoRoot, candidate)) && !required.includes(candidate)) required.push(candidate);
+function lstatIfPresent(path) {
+  try {
+    return lstatSync2(path);
+  } catch (error) {
+    if (error.code === "ENOENT") return void 0;
+    throw error;
   }
-  return required;
 }
-function upsertMisePath(text2, required = BASE_MISE_PATH_ENTRIES) {
-  const render = (values) => `_.path = [${values.map((value) => JSON.stringify(value)).join(", ")}]`;
-  const envMatch = text2.match(/(^|\n)(\[env\][\s\S]*?)(?=\n\[[^\]]+\]|$)/);
-  if (!envMatch || typeof envMatch.index !== "number") {
-    return `[env]
-${render(required)}
-
-${text2.replace(/^\s+/, "")}`;
-  }
-  const prefix = text2.slice(0, envMatch.index + envMatch[1].length);
-  const section = envMatch[2];
-  const suffix = text2.slice(envMatch.index + envMatch[1].length + section.length);
-  const pathLine = section.match(/^_\.path\s*=\s*\[([^\]]*)\]\s*$/m);
-  if (!pathLine) {
-    return `${prefix}${section.replace(/\n?$/, "\n")}${render(required)}${suffix}`;
+function isContainedBy(root, target) {
+  const rel = relative2(root, target);
+  return rel === "" || rel !== ".." && !rel.startsWith("../") && !rel.startsWith("..\\");
+}
+function prepareSafeProjectSkillsDirs(ctx) {
+  const projectRoot = realpathSync(ctx.repoRoot);
+  const agentsDir = join15(projectRoot, ".agents");
+  const skillsDir = join15(agentsDir, "skills");
+  for (const path of [agentsDir, skillsDir]) {
+    if (!isContainedBy(projectRoot, path)) throw new Error(`Project skills path escapes repository: ${path}`);
+    const stat = lstatIfPresent(path);
+    if (stat?.isSymbolicLink()) throw new Error(`Refusing symlinked project skills directory: ${path}`);
+    if (stat && !stat.isDirectory()) throw new Error(`Project skills path is not a directory: ${path}`);
   }
-  const current = [...pathLine[1].matchAll(/"([^"]+)"/g)].map((match) => match[1]);
-  const merged = [...current];
-  for (const value of required) {
-    if (!merged.includes(value)) merged.push(value);
+  if (!ctx.dryRun) {
+    if (!existsSync10(agentsDir)) mkdirSync6(agentsDir, { recursive: false });
+    if (!existsSync10(skillsDir)) mkdirSync6(skillsDir, { recursive: false });
+    for (const path of [agentsDir, skillsDir]) {
+      if (lstatSync2(path).isSymbolicLink() || !lstatSync2(path).isDirectory()) {
+        throw new Error(`Unsafe project skills directory after creation: ${path}`);
+      }
+      if (!isContainedBy(projectRoot, realpathSync(path))) {
+        throw new Error(`Resolved project skills directory escapes repository: ${path}`);
+      }
+    }
   }
-  const nextLine = render(merged);
-  if (pathLine[0] === nextLine) return text2;
-  return `${prefix}${section.replace(pathLine[0], nextLine)}${suffix}`;
+  return { agentsDir, skillsDir };
 }
-function removeTomlSection(text2, headerPattern, marker, options) {
-  const lines = text2.split("\n");
-  let start = -1;
-  let end = -1;
-  for (let i = 0; i < lines.length; i++) {
-    if (!headerPattern.test(lines[i])) continue;
-    if (marker) {
-      let hasMarker = false;
-      for (let j = i + 1; j < lines.length && !/^\[[^\]]+\]/.test(lines[j]); j++) {
-        if (marker.test(lines[j])) {
-          hasMarker = true;
-          break;
+function projectSkillTopologyIssues(repoRoot) {
+  const issues = [];
+  let projectRoot;
+  try {
+    projectRoot = realpathSync(repoRoot);
+  } catch (error) {
+    return [`Project root is not a readable real directory: ${error instanceof Error ? error.message : String(error)}`];
+  }
+  const managedSkills = join15(projectRoot, ".agents", "skills");
+  for (const rel of PROJECT_CLI_SKILL_DIRS) {
+    const cliDir = join15(projectRoot, rel);
+    const parent = dirname7(cliDir);
+    const parentStat = lstatIfPresent(parent);
+    if (!parentStat) continue;
+    if (parentStat.isSymbolicLink() || !parentStat.isDirectory()) {
+      issues.push(`${rel} has an unsafe symlinked/non-directory parent`);
+      continue;
+    }
+    if (!isContainedBy(projectRoot, realOrSelf(parent))) {
+      issues.push(`${rel} parent resolves outside the project`);
+      continue;
+    }
+    const stat = lstatIfPresent(cliDir);
+    if (!stat) continue;
+    if (stat.isSymbolicLink()) {
+      let rawTarget = "";
+      try {
+        rawTarget = readlinkSync(cliDir);
+      } catch {
+        issues.push(`${rel} is an unreadable skills directory symlink`);
+        continue;
+      }
+      if (rel !== ".claude/skills" || rawTarget !== CANONICAL_CLAUDE_SKILLS_ALIAS) {
+        issues.push(`${rel} is an unsupported skills directory symlink`);
+        continue;
+      }
+      const managedStat = lstatIfPresent(managedSkills);
+      if (!managedStat || managedStat.isSymbolicLink() || !managedStat.isDirectory()) {
+        issues.push(`${rel} canonical alias target .agents/skills is missing or unsafe`);
+        continue;
+      }
+      try {
+        if (realpathSync(cliDir) !== realpathSync(managedSkills)) {
+          issues.push(`${rel} canonical alias resolves outside .agents/skills`);
         }
+      } catch {
+        issues.push(`${rel} canonical alias is broken`);
       }
-      if (!hasMarker) continue;
+      continue;
     }
-    start = i;
-    for (let j = i + 1; j < lines.length; j++) {
-      if (/^\[[^\]]+\]/.test(lines[j])) {
-        end = j;
-        break;
-      }
+    if (!stat.isDirectory()) {
+      issues.push(`${rel} is not a directory`);
+      continue;
+    }
+    if (!isContainedBy(projectRoot, realOrSelf(cliDir))) {
+      issues.push(`${rel} resolves outside the project`);
     }
-    if (end === -1) end = lines.length;
-    break;
   }
-  if (start === -1) return text2;
+  return issues;
+}
+function bmadPackRoot(ctx) {
+  return resolve3(
+    process.env.PJ_BMAD_PACK_ROOT?.trim() || join15(ctx.homeDir, "code", "skillex", "packs", "bmad", BMAD_PACK_VERSION)
+  );
+}
+function canonicalBmadSkillEntries(ctx) {
+  const root = bmadPackRoot(ctx);
+  const trusted = validateTrustedBmadPack(root);
+  return trusted.skillNames.map((name) => ({ name: validateSkillName(name), source: pathToFileURL(join15(root, name)).href }));
+}
+function skillManifestEntryName(entry) {
+  if (typeof entry === "string") return entry;
+  if (!entry || typeof entry !== "object") return void 0;
+  const name = entry.name;
+  return typeof name === "string" ? name : void 0;
+}
+function isPackManagedManifestEntry(entry, expectedNames, packRoot) {
+  const name = skillManifestEntryName(entry);
+  if (!name) return false;
+  if (expectedNames.has(name)) return true;
+  if (!entry || typeof entry !== "object") return false;
+  const source = entry.source;
+  if (typeof source !== "string" || !source.startsWith("file:")) return false;
+  try {
+    const sourcePath = resolve3(fileURLToPath4(source));
+    return basename4(sourcePath) === name && isContainedBy(packRoot, sourcePath);
+  } catch {
+    return false;
+  }
+}
+function canonicalSkillsManifest(ctx, current, packSkills = canonicalBmadSkillEntries(ctx)) {
+  const existing = Array.isArray(current?.skills) ? current.skills : [];
+  const expectedNames = new Set(packSkills.map((entry) => entry.name));
+  const packRoot = bmadPackRoot(ctx);
+  return `${JSON.stringify(
+    {
+      ...current ?? {},
+      $schema: "https://raw.githubusercontent.com/skillex/schemas/main/skills.schema.json",
+      inherit_global: true,
+      registry: SKILLS_REGISTRY_URL,
+      skills: [
+        ...existing.filter((entry) => !isPackManagedManifestEntry(entry, expectedNames, packRoot)),
+        ...packSkills
+      ]
+    },
+    null,
+    2
+  )}
+`;
+}
+function removeProjectEntry(path) {
+  const stat = lstatIfPresent(path);
+  if (!stat) return;
+  if (stat.isDirectory() && !stat.isSymbolicLink()) {
+    rmSync(path, { recursive: true, force: true });
+    return;
+  }
+  try {
+    unlinkSync3(path);
+  } catch (error) {
+    if (error.code !== "ENOENT") throw error;
+  }
+}
+function normalizeExecutableTemplate(ctx, target, expected, changedFiles) {
+  const stat = lstatIfPresent(target);
+  if (stat && (!stat.isFile() || stat.isSymbolicLink())) {
+    throw new Error(`Refusing non-regular managed executable target: ${target}`);
+  }
+  const contentChanged = !stat || safeReadText(target) !== expected;
+  const modeChanged = !stat || (Number(stat.mode) & 73) === 0;
+  if (!contentChanged && !modeChanged) return;
+  if (!changedFiles.includes(target)) changedFiles.push(target);
+  if (ctx.dryRun) return;
+  if (contentChanged) {
+    writeText(target, expected);
+  }
+  const beforeChmod = lstatIfPresent(target);
+  if (!beforeChmod?.isFile() || beforeChmod.isSymbolicLink()) {
+    throw new Error(`Refusing changed managed executable target: ${target}`);
+  }
+  chmodSync4(target, 493);
+}
+function atomicWriteBuffer(path, content, mode, temporary) {
+  writeFileSync7(temporary, content, { flag: "wx" });
+  chmodSync4(temporary, mode);
+  renameSync2(temporary, path);
+}
+function provisionBmadSkills(ctx, preservedManifest, hooks = {}) {
+  const packRoot = bmadPackRoot(ctx);
+  let packSkills;
+  try {
+    packSkills = canonicalBmadSkillEntries(ctx);
+  } catch (error) {
+    return {
+      ok: false,
+      changedFiles: [],
+      error: `BMAD Skillex pack ${BMAD_PACK_VERSION} is not trusted at ${packRoot}: ${error instanceof Error ? error.message : String(error)}`
+    };
+  }
+  hooks.afterPreflight?.();
+  const projectRoot = realpathSync(ctx.repoRoot);
+  const agentsPath = join15(projectRoot, ".agents");
+  const skillsPath = join15(agentsPath, "skills");
+  const agentsExisted = Boolean(lstatIfPresent(agentsPath));
+  const skillsExisted = Boolean(lstatIfPresent(skillsPath));
+  let preflightDirs;
+  try {
+    preflightDirs = prepareSafeProjectSkillsDirs({ ...ctx, dryRun: true });
+  } catch (error) {
+    return { ok: false, changedFiles: [], error: error instanceof Error ? error.message : String(error) };
+  }
+  const manifestPath = join15(preflightDirs.agentsDir, "skills.json");
+  const manifestStat = lstatIfPresent(manifestPath);
+  if (manifestStat?.isSymbolicLink() || manifestStat && !manifestStat.isFile()) {
+    return { ok: false, changedFiles: [], error: `Refusing unsafe skills manifest: ${manifestPath}` };
+  }
+  const manifestBytes = manifestStat ? readFileSync8(manifestPath) : null;
+  const manifestMode = manifestStat ? Number(manifestStat.mode) & 511 : 420;
+  let currentManifest = {};
+  if (manifestBytes !== null) {
+    try {
+      const parsed = JSON.parse(manifestBytes.toString("utf8"));
+      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error("must contain a JSON object");
+      currentManifest = parsed;
+      if (currentManifest.skills !== void 0 && !Array.isArray(currentManifest.skills)) throw new Error("skills must be an array");
+    } catch (error) {
+      return { ok: false, changedFiles: [], error: `Invalid existing skills manifest ${manifestPath}: ${error instanceof Error ? error.message : String(error)}` };
+    }
+  }
+  let safeDirs;
+  try {
+    safeDirs = prepareSafeProjectSkillsDirs(ctx);
+  } catch (error) {
+    return { ok: false, changedFiles: [], error: error instanceof Error ? error.message : String(error) };
+  }
+  const nextManifest = canonicalSkillsManifest(ctx, preservedManifest ?? currentManifest, packSkills);
+  const skillsDir = safeDirs.skillsDir;
+  const resolvedSkillsDir = ctx.dryRun && !existsSync10(skillsDir) ? skillsDir : realpathSync(skillsDir);
+  const expected = new Map(packSkills.map((entry) => [entry.name, fileURLToPath4(entry.source)]));
+  const expectedNames = new Set(expected.keys());
+  const ownershipManifest = preservedManifest ?? currentManifest;
+  const managedManifestNames = new Set(
+    (Array.isArray(ownershipManifest.skills) ? ownershipManifest.skills : []).filter((entry) => isPackManagedManifestEntry(entry, expectedNames, packRoot)).map(skillManifestEntryName).filter((name) => Boolean(name))
+  );
+  const affected = /* @__PURE__ */ new Set();
+  const staleManagedNames = /* @__PURE__ */ new Set();
+  const originalCorrectLinks = /* @__PURE__ */ new Map();
+  if (existsSync10(skillsDir)) {
+    for (const name of readdirSync3(skillsDir)) {
+      validateSkillName(name);
+      if (dirname7(join15(resolvedSkillsDir, name)) !== resolvedSkillsDir) {
+        return { ok: false, changedFiles: [], error: `BMAD skill path escapes project skills directory: ${name}` };
+      }
+      const entryPath = join15(skillsDir, name);
+      let linkTargetsPack = false;
+      try {
+        linkTargetsPack = lstatSync2(entryPath).isSymbolicLink() && isContainedBy(packRoot, resolve3(dirname7(entryPath), readlinkSync(entryPath)));
+      } catch {
+        linkTargetsPack = false;
+      }
+      if (!expected.has(name) && !managedManifestNames.has(name) && !linkTargetsPack) continue;
+      const target = expected.get(name);
+      let correct = false;
+      try {
+        correct = Boolean(target) && lstatSync2(entryPath).isSymbolicLink() && resolve3(dirname7(entryPath), readlinkSync(entryPath)) === target;
+      } catch {
+        correct = false;
+      }
+      if (correct) originalCorrectLinks.set(name, readlinkSync(join15(skillsDir, name)));
+      else {
+        affected.add(name);
+        if (!target) staleManagedNames.add(name);
+      }
+    }
+  }
+  for (const [name, target] of expected) {
+    const link = join15(resolvedSkillsDir, validateSkillName(name));
+    if (dirname7(link) !== resolvedSkillsDir) {
+      return { ok: false, changedFiles: [], error: `BMAD skill path escapes project skills directory: ${name}` };
+    }
+    let correct = false;
+    try {
+      correct = lstatSync2(link).isSymbolicLink() && resolve3(dirname7(link), readlinkSync(link)) === target;
+    } catch {
+      correct = false;
+    }
+    if (!correct) affected.add(name);
+  }
+  const manifestChanged = manifestBytes?.toString("utf8") !== nextManifest;
+  const changedFiles = [
+    ...manifestChanged ? [manifestPath] : [],
+    ...affected.size ? [skillsDir] : []
+  ];
+  if (ctx.dryRun || changedFiles.length === 0) {
+    try {
+      const postflight = validateTrustedBmadPack(packRoot);
+      if (JSON.stringify(postflight.skillNames) !== JSON.stringify(packSkills.map((entry) => entry.name))) {
+        throw new Error("BMAD pack inventory changed after preflight");
+      }
+      return { ok: true, changedFiles };
+    } catch (error) {
+      return { ok: false, changedFiles: [], error: error instanceof Error ? error.message : String(error) };
+    }
+  }
+  const transaction = mkdtempSync(join15(safeDirs.agentsDir, ".bmad-transaction-"));
+  const backup = join15(transaction, "entries");
+  mkdirSync6(backup);
+  const moved = [];
+  const rollback = () => {
+    const errors = [];
+    try {
+      for (const name of affected) {
+        removeProjectEntry(join15(skillsDir, validateSkillName(name)));
+      }
+      for (const name of originalCorrectLinks.keys()) {
+        removeProjectEntry(join15(skillsDir, validateSkillName(name)));
+      }
+    } catch (error) {
+      errors.push(`remove applied projection: ${String(error)}`);
+    }
+    for (const name of [...moved].reverse()) {
+      try {
+        renameSync2(join15(backup, name), join15(skillsDir, name));
+      } catch (error) {
+        errors.push(`restore ${name}: ${String(error)}`);
+      }
+    }
+    for (const [name, rawTarget] of originalCorrectLinks) {
+      try {
+        symlinkSync(rawTarget, join15(skillsDir, name), "dir");
+      } catch (error) {
+        errors.push(`restore ${name}: ${String(error)}`);
+      }
+    }
+    try {
+      if (manifestBytes === null) removeProjectEntry(manifestPath);
+      else atomicWriteBuffer(manifestPath, manifestBytes, manifestMode, join15(transaction, "manifest.restore"));
+    } catch (error) {
+      errors.push(`restore manifest: ${String(error)}`);
+    }
+    rmSync(transaction, { recursive: true, force: true });
+    try {
+      if (!skillsExisted && existsSync10(skillsDir) && readdirSync3(skillsDir).length === 0) rmdirSync(skillsDir);
+      if (!agentsExisted && existsSync10(safeDirs.agentsDir) && readdirSync3(safeDirs.agentsDir).length === 0) rmdirSync(safeDirs.agentsDir);
+    } catch (error) {
+      errors.push(`remove created directories: ${String(error)}`);
+    }
+    if (errors.length) throw new Error(`BMAD rollback was incomplete: ${errors.join("; ")}`);
+  };
+  try {
+    for (const name of affected) {
+      const entry = join15(skillsDir, name);
+      if (lstatIfPresent(entry)) {
+        renameSync2(entry, join15(backup, name));
+        moved.push(name);
+      }
+    }
+    let index = 0;
+    for (const [name, target] of expected) {
+      index += 1;
+      const link = join15(skillsDir, name);
+      let correct = false;
+      try {
+        correct = lstatSync2(link).isSymbolicLink() && resolve3(skillsDir, readlinkSync(link)) === target;
+      } catch {
+        correct = false;
+      }
+      if (correct) continue;
+      if (hooks.createLink) hooks.createLink(target, link, index);
+      else symlinkSync(target, link, "dir");
+    }
+    if (manifestChanged) {
+      atomicWriteBuffer(manifestPath, Buffer.from(nextManifest), manifestMode, join15(transaction, "manifest.next"));
+    }
+    const postflight = validateTrustedBmadPack(packRoot);
+    if (JSON.stringify(postflight.skillNames) !== JSON.stringify(packSkills.map((entry) => entry.name))) {
+      throw new Error("BMAD pack inventory changed after preflight");
+    }
+    hooks.afterApply?.(manifestPath, skillsDir);
+    for (const name of staleManagedNames) {
+      if (lstatIfPresent(join15(skillsDir, name))) {
+        throw new Error(`Applied BMAD projection retained stale managed entry: ${name}`);
+      }
+    }
+    for (const [name, target] of expected) {
+      const link = join15(skillsDir, name);
+      let correct = false;
+      try {
+        correct = lstatSync2(link).isSymbolicLink() && resolve3(skillsDir, readlinkSync(link)) === target;
+      } catch {
+        correct = false;
+      }
+      if (!correct) throw new Error(`Applied BMAD projection link differs from plan: ${name}`);
+    }
+    const finalManifestStat = lstatIfPresent(manifestPath);
+    if (!finalManifestStat || finalManifestStat.isSymbolicLink() || !finalManifestStat.isFile() || (Number(finalManifestStat.mode) & 511) !== manifestMode || readFileSync8(manifestPath).toString("utf8") !== nextManifest) {
+      throw new Error("Applied BMAD skills manifest differs from planned bytes or mode");
+    }
+    const finalManifest = JSON.parse(readFileSync8(manifestPath, "utf8"));
+    if (finalManifest.$schema !== "https://raw.githubusercontent.com/skillex/schemas/main/skills.schema.json" || finalManifest.inherit_global !== true || finalManifest.registry !== SKILLS_REGISTRY_URL || !Array.isArray(finalManifest.skills)) {
+      throw new Error("Applied BMAD skills manifest schema differs from plan");
+    }
+  } catch (error) {
+    try {
+      rollback();
+    } catch (rollbackError) {
+      return { ok: false, changedFiles: [], error: `BMAD provisioning failed (${String(error)}); ${String(rollbackError)}` };
+    }
+    return { ok: false, changedFiles: [], error: error instanceof Error ? error.message : String(error) };
+  }
+  rmSync(transaction, { recursive: true });
+  return { ok: true, changedFiles };
+}
+function templateVersionFilesConf(ctx, repoRoot) {
+  const packageJson = join15(repoRoot, "package.json");
+  return existsSync10(packageJson) ? "# mise-versioning manifest: <type> <path>\n# types: json toml cargo csproj gradle plain gittag\njson package.json\ngittag .\n" : "# mise-versioning manifest: <type> <path>\n# types: json toml cargo csproj gradle plain gittag\ngittag .\n";
+}
+function replaceOrAppendManagedBlock(text2, startMarker, block, beforePattern) {
+  if (startMarker.test(text2)) {
+    return text2.replace(/# >>> mise-versioning >>>[\s\S]*?# <<< mise-versioning <<</, block);
+  }
+  if (beforePattern) {
+    const match = text2.match(beforePattern);
+    if (match && typeof match.index === "number") {
+      return `${text2.slice(0, match.index).replace(/\s*$/, "\n\n")}${block}
+
+${text2.slice(match.index)}`;
+    }
+  }
+  return `${text2.replace(/\s*$/, "")}
+
+${block}
+`;
+}
+var BASE_MISE_PATH_ENTRIES = [".mise/scripts", "agents/hermes/pm"];
+var CONDITIONAL_HERMES_PATHS = ["agents/hermes/pm/hermes", "agent/hermes/pm/hermes"];
+function requiredMisePathEntries(ctx) {
+  const required = [...BASE_MISE_PATH_ENTRIES];
+  for (const candidate of CONDITIONAL_HERMES_PATHS) {
+    if (existsSync10(join15(ctx.repoRoot, candidate)) && !required.includes(candidate)) required.push(candidate);
+  }
+  return required;
+}
+function upsertMisePath(text2, required = BASE_MISE_PATH_ENTRIES) {
+  const render = (values) => `_.path = [${values.map((value) => JSON.stringify(value)).join(", ")}]`;
+  const envMatch = text2.match(/(^|\n)(\[env\][\s\S]*?)(?=\n\[[^\]]+\]|$)/);
+  if (!envMatch || typeof envMatch.index !== "number") {
+    return `[env]
+${render(required)}
+
+${text2.replace(/^\s+/, "")}`;
+  }
+  const prefix = text2.slice(0, envMatch.index + envMatch[1].length);
+  const section = envMatch[2];
+  const suffix = text2.slice(envMatch.index + envMatch[1].length + section.length);
+  const pathLine = section.match(/^_\.path\s*=\s*\[([^\]]*)\]\s*$/m);
+  if (!pathLine) {
+    return `${prefix}${section.replace(/\n?$/, "\n")}${render(required)}${suffix}`;
+  }
+  const current = [...pathLine[1].matchAll(/"([^"]+)"/g)].map((match) => match[1]);
+  const merged = [...current];
+  for (const value of required) {
+    if (!merged.includes(value)) merged.push(value);
+  }
+  const nextLine = render(merged);
+  if (pathLine[0] === nextLine) return text2;
+  return `${prefix}${section.replace(pathLine[0], nextLine)}${suffix}`;
+}
+function removeTomlSection(text2, headerPattern, marker, options) {
+  const lines = text2.split("\n");
+  let start = -1;
+  let end = -1;
+  for (let i = 0; i < lines.length; i++) {
+    if (!headerPattern.test(lines[i])) continue;
+    if (marker) {
+      let hasMarker = false;
+      for (let j = i + 1; j < lines.length && !/^\[[^\]]+\]/.test(lines[j]); j++) {
+        if (marker.test(lines[j])) {
+          hasMarker = true;
+          break;
+        }
+      }
+      if (!hasMarker) continue;
+    }
+    start = i;
+    for (let j = i + 1; j < lines.length; j++) {
+      if (/^\[[^\]]+\]/.test(lines[j])) {
+        end = j;
+        break;
+      }
+    }
+    if (end === -1) end = lines.length;
+    break;
+  }
+  if (start === -1) return text2;
   while (end > start + 1 && (lines[end - 1].trim() === "" || lines[end - 1].trim().startsWith("#"))) {
     end--;
   }
@@ -2674,6 +3499,12 @@ function stripTomlStringsAndComments(line) {
 function isManagedHookEntry(value) {
   const trimmed = value.trim();
   if (trimmed === OP_INJECT_SCRIPT) return true;
+  if (trimmed === SYNC_SKILLS_SCRIPT) return true;
+  if (trimmed === PROVISION_BMAD_SKILLS_SCRIPT) return true;
+  if (/sync-skills(?:\.py)?["']?\s+--scope project/.test(trimmed)) return true;
+  if (/provision-bmad-skills\.py/.test(trimmed)) return true;
+  if (/link-project-skills-to-clis\.sh'?\s*$/.test(trimmed)) return true;
+  if (/unlink-project-skills-from-clis\.sh'?\s*$/.test(trimmed)) return true;
   return /link-agentfiles\.sh'?\s*$/.test(trimmed);
 }
 function normalizeHookScript(script) {
@@ -2776,12 +3607,18 @@ function upsertLinkAgentfilesHooks(text2) {
 function upsertLinkAgentfilesBlock(text2, ctx) {
   const withPath = upsertMisePath(text2, requiredMisePathEntries(ctx));
   let cleaned = removeTomlSection(withPath, /^\[tasks\.link-agentfiles\]$/, /link-agentfiles/, { includePrecedingComments: false });
+  cleaned = removeTomlSection(cleaned, /^\[tasks\.skills-sync\]$/, void 0, { includePrecedingComments: false });
+  cleaned = removeTomlSection(cleaned, /^\[tasks\.skills-provision-bmad\]$/, void 0, { includePrecedingComments: false });
+  cleaned = removeTomlSection(cleaned, /^\[tasks\.link-project-skills-to-clis\]$/, void 0, { includePrecedingComments: false });
+  cleaned = removeTomlSection(cleaned, /^\[tasks\.unlink-project-skills-from-clis\]$/, void 0, { includePrecedingComments: false });
+  cleaned = removeTomlSection(cleaned, /^\[tasks\.skills-relink\]$/, void 0, { includePrecedingComments: false });
   cleaned = removeTomlSection(cleaned, /^\[\[watch_files\]\]$/, /AGENTS\.md/, { includePrecedingComments: false });
+  cleaned = removeTomlSection(cleaned, /^\[\[watch_files\]\]$/, /\.agents\/skills\.json/, { includePrecedingComments: false });
   cleaned = upsertLinkAgentfilesHooks(cleaned);
   return insertTomlBlockBeforeVersioning(cleaned, LINK_AGENTFILES_WATCH_TASK_BLOCK);
 }
 function readProjectJson(ctx) {
-  return tryParseJson(safeReadText(join12(ctx.repoRoot, ".project.json")));
+  return tryParseJson(safeReadText(join15(ctx.repoRoot, ".project.json")));
 }
 function boolSetting(value, fallback) {
   if (typeof value === "boolean") return value;
@@ -2819,7 +3656,7 @@ function canonicalProjectJson(ctx) {
       role.agentId || `${slug}-${role.role}`,
       {
         role: role.role,
-        role_dir: relative(ctx.repoRoot, role.roleDir)
+        role_dir: relative2(ctx.repoRoot, role.roleDir)
       }
     ])
   );
@@ -2856,12 +3693,12 @@ function canonicalProjectJson(ctx) {
   };
 }
 function projectJsonFinding(ctx) {
-  const projectPath = join12(ctx.repoRoot, ".project.json");
-  const planeJsonPath = join12(ctx.repoRoot, ".plane.json");
+  const projectPath = join15(ctx.repoRoot, ".project.json");
+  const planeJsonPath = join15(ctx.repoRoot, ".plane.json");
   const details = [];
   const data = readProjectJson(ctx);
   const roles = discoverRoles(ctx.repoRoot);
-  if (!existsSync9(projectPath)) {
+  if (!existsSync10(projectPath)) {
     return { id: "sot.project-json", title: "Canonical .project.json", status: "fail", summary: ".project.json missing", details: [], fixable: true };
   }
   if (!data) {
@@ -2879,8 +3716,8 @@ function projectJsonFinding(ctx) {
       continue;
     }
     if (agent.role !== role.role) details.push(`agents.${role.agentId}.role should be ${role.role}`);
-    if (agent.role_dir !== relative(ctx.repoRoot, role.roleDir)) {
-      details.push(`agents.${role.agentId}.role_dir should be ${relative(ctx.repoRoot, role.roleDir)}`);
+    if (agent.role_dir !== relative2(ctx.repoRoot, role.roleDir)) {
+      details.push(`agents.${role.agentId}.role_dir should be ${relative2(ctx.repoRoot, role.roleDir)}`);
     }
   }
   const ticketProvider = data.ticket_provider ?? {};
@@ -2896,7 +3733,7 @@ function projectJsonFinding(ctx) {
   for (const key of ["enabled", "grace_hours", "auto_review"]) {
     if (!(key in reconcile)) details.push(`automation.reconcile.${key} missing`);
   }
-  if (existsSync9(planeJsonPath)) details.push(".plane.json should not exist once .project.json is canonical");
+  if (existsSync10(planeJsonPath)) details.push(".plane.json should not exist once .project.json is canonical");
   return {
     id: "sot.project-json",
     title: "Canonical .project.json",
@@ -2909,8 +3746,7 @@ function projectJsonFinding(ctx) {
 function renderSoul(role) {
   const telegram = role.botHandle ? `@${role.botHandle}` : "(unwired)";
   const tone = role.role === "pm" ? `Direct and brief. Decision-forward. No throat-clearing, no apologies, no "I'll help you with that" preambles.` : "Direct and brief.";
-  const roleSpecific = role.role === "pm" ? `You are the project manager. You triage incoming work, create or refine tickets, and delegate implementation. You do not ship product code. A systemd heartbeat checkpoints your runtime; when this repo opts into reconciliation (\`automation.reconcile.enabled\` in repo-root \`.project.json\`), the same heartbeat also runs your continuous board-reconciliation pass out-of-band (\`.scripts/sentinel.prompt.md\`, \`--source cron\`), kept separate from your interactive session memory.` : `You operate as the ${role.role} agent for this repo.`;
-  const runtimeOwner = role.runtimeOwner || "delorenj";
+  const roleSpecific = role.role === "pm" ? `You are the project manager. You triage incoming work, create or refine tickets, and delegate implementation. You do not ship product code. A systemd heartbeat checks runtime health; when this repo opts into reconciliation (\`automation.reconcile.enabled\` in repo-root \`.project.json\`), the same heartbeat also runs your continuous board-reconciliation pass out-of-band (\`.scripts/sentinel.prompt.md\`, \`--source cron\`), kept separate from your interactive session memory.` : `You operate as the ${role.role} agent for this repo.`;
   return `# ${role.displayName || role.agentId}
 
 You are **${role.displayName || role.agentId}** \u2014 a Hermes agent provisioned to work inside the
@@ -2929,7 +3765,7 @@ You are **${role.displayName || role.agentId}** \u2014 a Hermes agent provisione
 
 ## Scope
 
-You operate only within the working directory of \`${role.repo}\`. Your HERMES_HOME is the runtime submodule at \`./runtime/\` (repo \`${runtimeOwner}/${role.runtimeRepo}\`), which \`~/.hermes/profiles/${role.profileName || role.agentId}\` symlinks to (so \`--profile\` invocations resolve here too); Hermes loads its \`config.yaml\` directly. Secrets, SOUL, memories, skills, sessions, gateway state, and runtime files all live local to that runtime.
+You operate only within the working directory of \`${role.repo}\`. Your HERMES_HOME is the ignored local directory at \`./runtime/\`, which \`~/.hermes/profiles/${role.profileName || role.agentId}\` projects into (so \`--profile\` invocations resolve here too). Secrets, SOUL, memories, skills, sessions, gateway state, and runtime files stay local to that runtime and are never project gitlinks.
 
 ## Tone
 
@@ -2941,12 +3777,12 @@ ${roleSpecific}
 
 ## Memory hygiene
 
-Your memory is the submodule at \`./runtime/memories/\`. Use durable memory deliberately and keep \`memories/MEMORY.md\` current.
+Your memory is stored locally at \`./runtime/memories/\`. Use durable memory deliberately and keep \`memories/MEMORY.md\` current.
 `;
 }
 function renderHermesWrapper(role) {
   return `#!/usr/bin/env bash
-# Launcher for ${role.agentId}. Resolves HERMES_HOME to the runtime submodule.
+# Launcher for ${role.agentId}. Resolves HERMES_HOME to the local runtime.
 
 set -euo pipefail
 
@@ -2959,35 +3795,49 @@ if [[ -f "$FLEET_ENV" ]]; then
   source "$FLEET_ENV"
 fi
 
-HERMES_BIN="{HERMES_BIN:-{HERMES_FLEET_BIN:-/home/delorenj/code/hermes-agent/.venv/bin/hermes}}"
-HERMES_OAUTH_FILE="{HERMES_OAUTH_FILE:-{HERMES_FLEET_OAUTH_FILE:-$HOME/.hermes/auth.json}}"
+HERMES_BIN="{HERMES_BIN:-{HERMES_FLEET_BIN:-$HOME/.hermes/hermes-agent/.venv/bin/hermes}}"
 CODEX_HOME="{CODEX_HOME:-{HERMES_FLEET_CODEX_HOME:-$HOME/.codex}}"
 
 FLEET_HOME="{HERMES_FLEET_HOME:-$HOME/.hermes}"
 PROFILE_NAME="{HERMES_PROFILE_NAME:-${role.profileName || role.agentId}}"
-HERMES_HOME="$RUNTIME_HOME"
+
+# Singleton-runtime contract: HERMES_HOME MUST be the named profile dir, never
+# the raw runtime path. Hermes treats any HERMES_HOME that is neither under
+# ~/.hermes nor a child of a "profiles" dir as its own standalone root, which
+# makes get_active_profile_name() report "default" and _global_auth_file_path()
+# return None -- silently disabling shared fleet auth and giving every agent a
+# divergent config.yaml. The profile dir is a REAL dir whose shared entries
+# (config.yaml, .env, skills) symlink to the fleet root and whose person-owned
+# entries (memories, sessions, state.db, workspace) symlink into $RUNTIME_HOME.
+HERMES_HOME="$FLEET_HOME/profiles/$PROFILE_NAME"
 
 if [[ ! -d "$RUNTIME_HOME" ]]; then
-  echo "hermes: runtime submodule not initialized at $RUNTIME_HOME" >&2
-  echo "  fix: git submodule update --init --recursive" >&2
+  echo "hermes: local runtime not provisioned at $RUNTIME_HOME" >&2
+  echo "  fix: run the role's .scripts/20-runtime-repo.sh" >&2
   exit 1
 fi
 
-exec env HERMES_HOME="$HERMES_HOME" HERMES_FLEET_ENV="$FLEET_ENV"   HERMES_OAUTH_FILE="$HERMES_OAUTH_FILE" CODEX_HOME="$CODEX_HOME"   "$HERMES_BIN" "$@"
+if [[ ! -d "$HERMES_HOME" ]]; then
+  echo "hermes: profile not provisioned at $HERMES_HOME" >&2
+  echo "  fix: pj migrate hermes.runtime-singleton" >&2
+  exit 1
+fi
+
+exec env HERMES_HOME="$HERMES_HOME" HERMES_FLEET_ENV="$FLEET_ENV"   CODEX_HOME="$CODEX_HOME"   "$HERMES_BIN" "$@"
 `.replace(/\u0010/g, "$");
 }
 function copyMissingRecursive(sourceDir, targetDir, changedFiles, dryRun, skip) {
-  if (!existsSync9(sourceDir)) return;
+  if (!existsSync10(sourceDir)) return;
   mkdirSync6(targetDir, { recursive: true });
-  for (const entry of readdirSync2(sourceDir, { withFileTypes: true })) {
-    const sourcePath = join12(sourceDir, entry.name);
+  for (const entry of readdirSync3(sourceDir, { withFileTypes: true })) {
+    const sourcePath = join15(sourceDir, entry.name);
     if (skip?.(sourcePath)) continue;
-    const targetPath = join12(targetDir, entry.name);
+    const targetPath = join15(targetDir, entry.name);
     if (entry.isDirectory()) {
       copyMissingRecursive(sourcePath, targetPath, changedFiles, dryRun, skip);
       continue;
     }
-    if (existsSync9(targetPath)) continue;
+    if (existsSync10(targetPath)) continue;
     changedFiles.push(targetPath);
     if (!dryRun) {
       ensureParent(targetPath);
@@ -2995,21 +3845,78 @@ function copyMissingRecursive(sourceDir, targetDir, changedFiles, dryRun, skip)
     }
   }
 }
-function upsertSubmodule(repoRoot, role, changedFiles, dryRun) {
-  const gitmodulesPath = join12(repoRoot, ".gitmodules");
-  const repoName = role.runtimeRepo || `agent-hm-${role.repo}-${role.role}`;
-  const owner = role.runtimeOwner || "delorenj";
-  const block = `[submodule "agents/hermes/${role.role}/runtime"]
-	path = agents/hermes/${role.role}/runtime
-	url = git@github.com:${owner}/${repoName}.git
-`;
+function runtimeSubmodulePath(repoRoot, role) {
+  const rolePath = relative2(repoRoot, role.roleDir).replace(/\\/g, "/");
+  if (!/^agents\/hermes\/[^/]+$/.test(rolePath)) return null;
+  return `${rolePath}/runtime`;
+}
+function submoduleSectionHasPath(section, targetPath) {
+  return section.split(/\r?\n/).some((line) => /^\s*path\s*=/.test(line) && line.replace(/^\s*path\s*=\s*/, "").trim() === targetPath);
+}
+function hasRuntimeSubmoduleMapping(repoRoot, role) {
+  const gitmodulesPath = join15(repoRoot, ".gitmodules");
   const current = safeReadText(gitmodulesPath) ?? "";
-  const header = `[submodule "agents/hermes/${role.role}/runtime"]`;
-  if (current.includes(header)) return [];
+  const sections = current.match(/^\[submodule "[^"\n]+"\][\s\S]*?(?=^\[submodule "|(?![\s\S]))/gm) ?? [];
+  const targetPath = runtimeSubmodulePath(repoRoot, role);
+  return Boolean(targetPath && sections.some((section) => submoduleSectionHasPath(section, targetPath)));
+}
+function removeRuntimeSubmoduleMapping(repoRoot, role, changedFiles, dryRun) {
+  const gitmodulesPath = join15(repoRoot, ".gitmodules");
+  const current = safeReadText(gitmodulesPath) ?? "";
+  if (!hasRuntimeSubmoduleMapping(repoRoot, role)) return [];
+  const targetPath = runtimeSubmodulePath(repoRoot, role);
+  if (!targetPath) return [];
+  const next = current.replace(/^\[submodule "[^"\n]+"\][\s\S]*?(?=^\[submodule "|(?![\s\S]))/gm, (section) => submoduleSectionHasPath(section, targetPath) ? "" : section).replace(/\n{3,}/g, "\n\n").trim();
   changedFiles.push(gitmodulesPath);
-  if (!dryRun) writeText(gitmodulesPath, `${current.replace(/\s*$/, "")}${current.trim() ? "\n" : ""}${block}`);
+  if (!dryRun) writeText(gitmodulesPath, next ? `${next}
+` : "");
   return [gitmodulesPath];
 }
+function retireRuntimeSubmodule(repoRoot, role, changedFiles, dryRun) {
+  const runtimePath = runtimeSubmodulePath(repoRoot, role);
+  if (!runtimePath) {
+    return { ok: false, details: [], error: `refusing unsafe runtime path for ${role.roleDir}` };
+  }
+  const probe = spawnSync6("git", ["ls-files", "--stage", "--", runtimePath], {
+    cwd: repoRoot,
+    encoding: "utf8"
+  });
+  if (probe.status !== 0) {
+    return { ok: false, details: [], error: `failed to inspect runtime index at ${runtimePath}: ${probe.stderr.trim() || `exit ${probe.status}`}` };
+  }
+  const details = [];
+  if (probe.stdout.trim()) {
+    details.push(`untrack ${runtimePath}`);
+    if (dryRun) {
+      changedFiles.push(runtimePath);
+    } else {
+      const removal = spawnSync6("git", ["rm", "--cached", "-r", "-f", "--", runtimePath], {
+        cwd: repoRoot,
+        encoding: "utf8"
+      });
+      if (removal.status !== 0) {
+        return { ok: false, details, error: `failed to untrack ${runtimePath}: ${removal.stderr.trim() || `exit ${removal.status}`}` };
+      }
+      const verification = spawnSync6("git", ["ls-files", "--stage", "--", runtimePath], {
+        cwd: repoRoot,
+        encoding: "utf8"
+      });
+      if (verification.status !== 0 || verification.stdout.trim()) {
+        return {
+          ok: false,
+          details,
+          error: verification.status !== 0 ? `failed to verify untracked runtime ${runtimePath}: ${verification.stderr.trim() || `exit ${verification.status}`}` : `runtime remains tracked after index-only removal: ${runtimePath}`
+        };
+      }
+      changedFiles.push(runtimePath);
+    }
+  }
+  if (hasRuntimeSubmoduleMapping(repoRoot, role)) {
+    details.push(`remove stale .gitmodules mapping for ${runtimePath}`);
+    removeRuntimeSubmoduleMapping(repoRoot, role, changedFiles, dryRun);
+  }
+  return { ok: true, details };
+}
 function upsertRegistryEntry(role, homeDir, changedFiles, dryRun) {
   const path = registryPath(homeDir);
   const current = safeReadText(path) ?? "# Hermes agent fleet registry.\n# One entry per provisioned agent. Managed by hermes-agent-template/.scripts/80-registry.sh.\nschema_version: 1\nagents: {}\n";
@@ -3028,9 +3935,11 @@ function upsertRegistryEntry(role, homeDir, changedFiles, dryRun) {
       project_id: ${ctxEscape(role.ticketProviderBoardId)}
       identifier: ${ctxEscape(role.ticketProviderIdentifier)}
     runtime_repo: ${ctxEscape(role.runtimeRepo)}
+    bloodbank:
+      gateway_scope: fleet
+      target_agent_id: ${role.agentId}
     systemd:
       gateway_unit: hermes-${role.agentId}-gateway.service
-      consumer_unit: hermes-${role.agentId}-consumer.service
       heartbeat_timer: hermes-${role.agentId}-heartbeat.timer
 `;
   const next = current.includes("agents: {}") ? current.replace("agents: {}", `agents:
@@ -3094,6 +4003,7 @@ function checkUnit(unit) {
 var BMAD_NPM_PACKAGE = "bmad-method";
 var BMAD_TARGET_CHANNEL = "next";
 var BMAD_DIST_TAGS_TTL_MS = 60 * 60 * 1e3;
+var DEFAULT_BMAD_MODULES = ["bmm", "bmb", "cis"];
 var BMAD_INSTALL_TOOLS = [
   "claude-code",
   "codex",
@@ -3141,7 +4051,53 @@ var BMAD_INSTALL_TOOLS = [
   "windsurf",
   "zencoder"
 ];
-function bmadInstallArgs(repoRoot) {
+function manifestBmadModules(repoRoot) {
+  const manifestPath = join15(repoRoot, "_bmad", "_config", "manifest.yaml");
+  const raw = safeReadText(manifestPath);
+  if (raw === null) return { status: "absent" };
+  try {
+    const parsed = YAML3.parse(raw);
+    if (!Array.isArray(parsed?.modules)) {
+      return { status: "invalid", error: `${manifestPath} must define a modules array` };
+    }
+    const declared = [];
+    for (const entry of parsed.modules) {
+      const name = typeof entry === "string" ? entry : entry && typeof entry === "object" ? entry.name : void 0;
+      if (typeof name !== "string" || !/^[A-Za-z0-9][A-Za-z0-9_-]*$/.test(name)) {
+        return { status: "invalid", error: `${manifestPath} contains an invalid module entry` };
+      }
+      if (name !== "core" && name !== "custom") declared.push(name);
+    }
+    return { status: "valid", modules: Array.from(new Set(declared)) };
+  } catch (error) {
+    return {
+      status: "invalid",
+      error: `Could not parse ${manifestPath}: ${error instanceof Error ? error.message : String(error)}`
+    };
+  }
+}
+function configuredBmadModules(repoRoot) {
+  const raw = safeReadText(join15(repoRoot, "_bmad", "config.toml"));
+  if (raw === null) return void 0;
+  const modules = [...raw.matchAll(/^\[modules\.([A-Za-z0-9][A-Za-z0-9_-]*)\]\s*$/gm)].map((match) => match[1]);
+  return Array.from(new Set(modules));
+}
+function selectedBmadModules(repoRoot) {
+  const manifest = manifestBmadModules(repoRoot);
+  if (manifest.status === "valid") return manifest.modules;
+  if (manifest.status === "invalid") throw new Error(manifest.error);
+  return configuredBmadModules(repoRoot) ?? [...DEFAULT_BMAD_MODULES];
+}
+function requiredBmadSentinels(repoRoot, modules = selectedBmadModules(repoRoot)) {
+  return [
+    join15("core", "config.yaml"),
+    join15("config.toml"),
+    join15("_config", "manifest.yaml"),
+    ...modules.map((module) => join15(module, "config.yaml"))
+  ];
+}
+function bmadInstallArgs(repoRoot, modules = selectedBmadModules(repoRoot)) {
+  const installerModules = modules.length ? modules.join(",") : "core";
   return [
     "-y",
     `${BMAD_NPM_PACKAGE}@${BMAD_TARGET_CHANNEL}`,
@@ -3150,20 +4106,20 @@ function bmadInstallArgs(repoRoot) {
     "--directory",
     repoRoot,
     "--modules",
-    "bmm,bmb,cis",
+    installerModules,
     "--tools",
     BMAD_INSTALL_TOOLS.join(",")
   ];
 }
-function runBmadInstall(repoRoot) {
-  const result = spawnSync6("npx", bmadInstallArgs(repoRoot), { encoding: "utf8" });
+function runBmadInstall(repoRoot, modules = selectedBmadModules(repoRoot)) {
+  const result = spawnSync6("npx", bmadInstallArgs(repoRoot, modules), { encoding: "utf8" });
   if (result.status !== 0) {
     return { ok: false, error: result.stderr || result.error?.message || "Unknown error" };
   }
   return { ok: true };
 }
 function readInstalledBmadVersion(repoRoot) {
-  const raw = safeReadText(join12(repoRoot, "_bmad", "_config", "manifest.yaml"));
+  const raw = safeReadText(join15(repoRoot, "_bmad", "_config", "manifest.yaml"));
   if (!raw) return void 0;
   try {
     const parsed = YAML3.parse(raw);
@@ -3174,8 +4130,8 @@ function readInstalledBmadVersion(repoRoot) {
   }
 }
 function bmadCachePath(homeDir) {
-  const cacheRoot = process.env.XDG_CACHE_HOME?.trim() || join12(homeDir, ".cache");
-  return join12(cacheRoot, "pjangler", "bmad-dist-tags.json");
+  const cacheRoot = process.env.XDG_CACHE_HOME?.trim() || join15(homeDir, ".cache");
+  return join15(cacheRoot, "pjangler", "bmad-dist-tags.json");
 }
 function readBmadDistTagsCache(homeDir) {
   const raw = safeReadText(bmadCachePath(homeDir));
@@ -3218,7 +4174,7 @@ function resolveBmadDistTags(homeDir) {
     try {
       const path = bmadCachePath(homeDir);
       mkdirSync6(dirname7(path), { recursive: true });
-      writeFileSync6(path, JSON.stringify({ fetchedAt: Date.now(), distTags: fetched }, null, 2));
+      writeFileSync7(path, JSON.stringify({ fetchedAt: Date.now(), distTags: fetched }, null, 2));
     } catch {
     }
     return { distTags: fetched, stale: false };
@@ -3258,19 +4214,233 @@ function compareBmadVersions(a, b) {
   }
   return 0;
 }
+var SHARED_PROFILE_ENTRIES = ["config.yaml", ".env", "skills"];
+var OWNED_PROFILE_ENTRIES = [
+  "memories",
+  "sessions",
+  "workspace",
+  "logs",
+  "cron",
+  "plans",
+  "hooks",
+  "pairing",
+  "audio_cache",
+  "image_cache"
+];
+var OWNED_PROFILE_FILES = ["SOUL.md", "state.db", "kanban.db"];
+function fleetHome(ctx) {
+  return process.env.HERMES_FLEET_HOME || join15(ctx.homeDir, ".hermes");
+}
+function fleetBinPath(ctx) {
+  const candidates = [
+    process.env.HERMES_FLEET_BIN,
+    join15(fleetHome(ctx), "hermes-agent", ".venv", "bin", "hermes"),
+    join15(fleetHome(ctx), "hermes-agent", "venv", "bin", "hermes"),
+    join15(ctx.homeDir, ".local", "bin", "hermes")
+  ].filter(Boolean);
+  return candidates.find((candidate) => existsSync10(candidate)) ?? "";
+}
+function singletonPlan(ctx, role) {
+  const fleetRoot = fleetHome(ctx);
+  const profileName = role.profileName || role.agentId;
+  const profileDir = join15(fleetRoot, "profiles", profileName);
+  const runtimeDir = join15(role.roleDir, "runtime");
+  const links = [];
+  for (const entry of SHARED_PROFILE_ENTRIES) {
+    links.push({ path: join15(profileDir, entry), target: join15(fleetRoot, entry), ensureTargetDir: entry === "skills" });
+  }
+  for (const entry of OWNED_PROFILE_ENTRIES) {
+    links.push({ path: join15(profileDir, entry), target: join15(runtimeDir, entry), ensureTargetDir: true });
+  }
+  for (const entry of OWNED_PROFILE_FILES) {
+    links.push({ path: join15(profileDir, entry), target: join15(runtimeDir, entry), ensureTargetDir: false });
+  }
+  const sharedSeeds = ["config.yaml", "auth.json", ".env"].map((entry) => ({
+    rootPath: join15(fleetRoot, entry),
+    runtimePath: join15(runtimeDir, entry)
+  }));
+  return { fleetRoot, profileDir, runtimeDir, links, sharedSeeds };
+}
+function isDanglingLink(path) {
+  try {
+    return lstatSync2(path).isSymbolicLink() && !existsSync10(path);
+  } catch {
+    return false;
+  }
+}
+function linkState(path, target) {
+  let stat;
+  try {
+    stat = lstatSync2(path);
+  } catch {
+    return "missing";
+  }
+  if (!stat.isSymbolicLink()) return "not-a-symlink";
+  try {
+    return readlinkSync(path) === target ? "ok" : "wrong-target";
+  } catch {
+    return "wrong-target";
+  }
+}
+function realOrSelf(path) {
+  try {
+    return realpathSync(path);
+  } catch {
+    return path;
+  }
+}
+function profileUnits(role) {
+  return [
+    `hermes-${role.agentId}-gateway.service`,
+    `hermes-${role.agentId}-heartbeat.service`,
+    `hermes-${role.agentId}-heartbeat.timer`,
+    `hermes-${role.agentId}-checkpoint.service`
+  ];
+}
+function readRegistry(registryPath2) {
+  const raw = safeReadText(registryPath2);
+  if (raw === null) return null;
+  try {
+    const doc = YAML3.parse(raw);
+    return doc?.agents ?? {};
+  } catch {
+    return null;
+  }
+}
+function declaredAgentIds(repoRoot) {
+  return declaredAgentEntries(repoRoot).map(([agentId]) => agentId);
+}
+function declaredAgentEntries(repoRoot) {
+  const raw = safeReadText(join15(repoRoot, ".project.json"));
+  if (raw === null) return [];
+  try {
+    const doc = JSON.parse(raw);
+    return Object.entries(doc.agents ?? {}).map(([agentId, entry]) => [agentId, entry ?? {}]);
+  } catch {
+    return [];
+  }
+}
+function ownedRegistryEntries(registry, repoRoot) {
+  const want = realOrSelf(repoRoot);
+  const owned = [];
+  for (const [agentId, raw] of Object.entries(registry)) {
+    const entry = raw ?? {};
+    const roleDir = String(entry.role_dir ?? "");
+    if (!roleDir) continue;
+    if (realOrSelf(dirname7(dirname7(dirname7(roleDir)))) !== want) continue;
+    owned.push([agentId, entry]);
+  }
+  return owned;
+}
+function unprovisionedRoleAgents(registry, repoRoot, canonical) {
+  const blockers = /* @__PURE__ */ new Map();
+  const record = (agentId, roleDir, source) => {
+    const current = blockers.get(agentId) ?? { roleDir, sources: /* @__PURE__ */ new Set() };
+    if (!current.roleDir && roleDir) current.roleDir = roleDir;
+    current.sources.add(source);
+    blockers.set(agentId, current);
+  };
+  for (const [agentId, entry] of ownedRegistryEntries(registry, repoRoot)) {
+    if (canonical.has(agentId)) continue;
+    const roleDir = String(entry.role_dir ?? "");
+    if (!roleDir || !existsSync10(join15(roleDir, "role.yaml"))) record(agentId, roleDir, "registry");
+  }
+  for (const [agentId, entry] of declaredAgentEntries(repoRoot)) {
+    if (canonical.has(agentId)) continue;
+    const configured = String(entry.role_dir ?? "");
+    const roleDir = configured ? resolve3(repoRoot, configured) : "";
+    if (!roleDir || !existsSync10(join15(roleDir, "role.yaml"))) record(agentId, roleDir, ".project.json");
+  }
+  return [...blockers.entries()].map(([agentId, value]) => ({
+    agentId,
+    roleDir: value.roleDir,
+    sources: [...value.sources]
+  }));
+}
+function dropDeclaredAgent(ctx, agentId, changedFiles, details) {
+  const path = join15(ctx.repoRoot, ".project.json");
+  const raw = safeReadText(path);
+  if (raw === null) return;
+  let doc;
+  try {
+    doc = JSON.parse(raw);
+  } catch {
+    return;
+  }
+  if (!doc.agents || !(agentId in doc.agents)) return;
+  delete doc.agents[agentId];
+  details.push(`drop agent "${agentId}" from .project.json`);
+  changedFiles.push(path);
+  if (!ctx.dryRun) writeText(path, `${JSON.stringify(doc, null, 2)}
+`);
+}
+function rewriteLauncher(text2) {
+  let next = text2.replace(/^HERMES_HOME="\$RUNTIME_HOME"\s*$/m, 'HERMES_HOME="$FLEET_HOME/profiles/$PROFILE_NAME"');
+  next = next.replace(/^HERMES_OAUTH_FILE=.*\n/m, "");
+  next = next.replace(/\s*HERMES_OAUTH_FILE="\$HERMES_OAUTH_FILE"/g, "");
+  next = next.replace(
+    /^.*\/home\/delorenj\/code\/hermes-agent\/\.venv\/bin\/hermes.*$/m,
+    (line) => line.replace("/home/delorenj/code/hermes-agent/.venv/bin/hermes", "$HOME/.hermes/hermes-agent/.venv/bin/hermes")
+  );
+  return next;
+}
+function isValidOpReference(value) {
+  if (!value.startsWith("op://") || /[\[\]{}<>]/.test(value)) return false;
+  const withoutScheme = value.slice("op://".length);
+  const fragmentIndex = withoutScheme.indexOf("#");
+  if (fragmentIndex >= 0) return false;
+  const queryIndex = withoutScheme.indexOf("?");
+  const pathPart = queryIndex >= 0 ? withoutScheme.slice(0, queryIndex) : withoutScheme;
+  const queryPart = queryIndex >= 0 ? withoutScheme.slice(queryIndex + 1) : "";
+  const parts = pathPart.split("/");
+  if (parts.length < 3 || parts.length > 4 || parts.some((part) => !part)) return false;
+  try {
+    for (const part of parts) decodeURIComponent(part);
+  } catch {
+    return false;
+  }
+  if (queryIndex >= 0 && !/^attribute=[A-Za-z0-9._~-]+$/.test(queryPart)) return false;
+  return true;
+}
+function malformedOpReferences(text2) {
+  const occurrences = [];
+  const lines = text2.split("\n");
+  for (let index = 0; index < lines.length; index++) {
+    const line = lines[index];
+    for (const match of line.matchAll(/op:\/\/[^\s"'`]+/g)) {
+      const value = match[0];
+      if (!isValidOpReference(value)) {
+        occurrences.push({ line: index + 1, value, commentOnly: line.trimStart().startsWith("#") });
+      }
+    }
+  }
+  return occurrences;
+}
+function removeMalformedCommentOpReferences(text2) {
+  let changed = false;
+  const lines = text2.split("\n").map((line) => {
+    if (!line.trimStart().startsWith("#")) return line;
+    return line.replace(/op:\/\/[^\s"'`]+/g, (value) => {
+      if (isValidOpReference(value)) return value;
+      changed = true;
+      return "<invalid 1Password reference removed by pjangler>";
+    });
+  });
+  return { text: lines.join("\n"), changed };
+}
 var RULES = [
   {
     id: "mise.config-root",
     title: "mise config_root + AGENTS link hooks",
     audit: (ctx) => {
-      const misePath = join12(ctx.repoRoot, "mise.toml");
-      if (!existsSync9(misePath)) {
+      const misePath = join15(ctx.repoRoot, "mise.toml");
+      if (!existsSync10(misePath)) {
         return { id: "mise.config-root", title: "mise config_root + AGENTS link hooks", status: "fail", summary: "mise.toml missing", details: [], fixable: true };
       }
       const text2 = readText(misePath);
       const details = [];
-      const linkAgentfilesPath = join12(ctx.repoRoot, ".mise", "scripts", "link-agentfiles.sh");
-      if (!existsSync9(linkAgentfilesPath)) details.push(".mise/scripts/link-agentfiles.sh missing");
+      const linkAgentfilesPath = join15(ctx.repoRoot, ".mise", "scripts", "link-agentfiles.sh");
+      if (!existsSync10(linkAgentfilesPath)) details.push(".mise/scripts/link-agentfiles.sh missing");
       const pathValues = [...(text2.match(/^_\.path\s*=\s*\[([^\]]*)\]/m)?.[1] ?? "").matchAll(/"([^"]+)"/g)].map((match) => match[1]);
       const missingPathValues = requiredMisePathEntries(ctx).filter((value) => !pathValues.includes(value));
       if (missingPathValues.length) details.push(`[env]._.path should include ${missingPathValues.join(", ")}`);
@@ -3288,10 +4458,10 @@ var RULES = [
       };
     },
     migrate: (ctx, finding) => {
-      const path = join12(ctx.repoRoot, "mise.toml");
+      const path = join15(ctx.repoRoot, "mise.toml");
       const changedFiles = [];
       const details = [];
-      if (!existsSync9(path)) {
+      if (!existsSync10(path)) {
         if (!ensureMiseTomlFromTemplate(ctx, changedFiles)) {
           return { id: finding.id, title: finding.title, status: "blocked", summary: "mise.toml missing and no generated-project mise template available to initialize from", changedFiles, details: [] };
         }
@@ -3307,7 +4477,7 @@ var RULES = [
         if (!ctx.dryRun) writeText(path, next);
         text2 = next;
       }
-      const linkAgentfilesPath = join12(ctx.repoRoot, ".mise", "scripts", "link-agentfiles.sh");
+      const linkAgentfilesPath = join15(ctx.repoRoot, ".mise", "scripts", "link-agentfiles.sh");
       const expectedScript = templateLinkAgentfilesScript(ctx);
       if (expectedScript === void 0) {
         return { id: finding.id, title: finding.title, status: "blocked", summary: "pjangler install is missing .mise/scripts/link-agentfiles.sh \u2014 update @delorenj/pjangler (broken package)", changedFiles, details: [] };
@@ -3316,7 +4486,7 @@ var RULES = [
         changedFiles.push(linkAgentfilesPath);
         if (!ctx.dryRun) {
           writeText(linkAgentfilesPath, expectedScript);
-          chmodSync2(linkAgentfilesPath, 493);
+          chmodSync4(linkAgentfilesPath, 493);
         }
       }
       return {
@@ -3334,13 +4504,13 @@ var RULES = [
     title: "managed mise versioning block",
     audit: (ctx) => {
       const details = [];
-      const misePath = join12(ctx.repoRoot, "mise.toml");
-      const versioningPath = join12(ctx.repoRoot, ".mise", "scripts", "versioning.sh");
-      const manifestPath = join12(ctx.repoRoot, ".mise", "version-files.conf");
+      const misePath = join15(ctx.repoRoot, "mise.toml");
+      const versioningPath = join15(ctx.repoRoot, ".mise", "scripts", "versioning.sh");
+      const manifestPath = join15(ctx.repoRoot, ".mise", "version-files.conf");
       const text2 = safeReadText(misePath);
       if (!text2?.includes("# >>> mise-versioning >>>")) details.push("mise versioning managed block missing");
-      if (!existsSync9(versioningPath)) details.push(".mise/scripts/versioning.sh missing");
-      if (!existsSync9(manifestPath)) details.push(".mise/version-files.conf missing");
+      if (!existsSync10(versioningPath)) details.push(".mise/scripts/versioning.sh missing");
+      if (!existsSync10(manifestPath)) details.push(".mise/version-files.conf missing");
       return {
         id: "mise.versioning",
         title: "managed mise versioning block",
@@ -3353,8 +4523,8 @@ var RULES = [
     migrate: (ctx, finding) => {
       const changedFiles = [];
       const details = [];
-      const misePath = join12(ctx.repoRoot, "mise.toml");
-      if (!existsSync9(misePath)) {
+      const misePath = join15(ctx.repoRoot, "mise.toml");
+      if (!existsSync10(misePath)) {
         if (!ensureMiseTomlFromTemplate(ctx, changedFiles)) {
           return { id: finding.id, title: finding.title, status: "blocked", summary: "mise.toml missing and no generated-project mise template available to initialize from", changedFiles, details: [] };
         }
@@ -3363,46 +4533,266 @@ var RULES = [
           return { id: finding.id, title: finding.title, status: "applied", summary: "Would initialize mise.toml from generated-project template", changedFiles, details };
         }
       }
-      const currentMise = readText(misePath);
-      let cleanedMise = currentMise;
-      if (!currentMise.includes("# >>> mise-versioning >>>")) {
-        const taskNames = ["version", "version:bump", "version:bump-patch", "version:bump-minor", "version:bump-major", "version:check", "version:sync"];
-        for (const taskName of taskNames) {
-          const escaped = taskName.replace(/:/g, "\\:");
-          const headerPattern = new RegExp(`^\\[tasks\\.(?:"${escaped}"|'${escaped}'|${escaped})\\]$`);
-          cleanedMise = removeTomlSection(cleanedMise, headerPattern);
+      const currentMise = readText(misePath);
+      let cleanedMise = currentMise;
+      if (!currentMise.includes("# >>> mise-versioning >>>")) {
+        const taskNames = ["version", "version:bump", "version:bump-patch", "version:bump-minor", "version:bump-major", "version:check", "version:sync"];
+        for (const taskName of taskNames) {
+          const escaped = taskName.replace(/:/g, "\\:");
+          const headerPattern = new RegExp(`^\\[tasks\\.(?:"${escaped}"|'${escaped}'|${escaped})\\]$`);
+          cleanedMise = removeTomlSection(cleanedMise, headerPattern);
+        }
+      }
+      const nextMise = replaceOrAppendManagedBlock(cleanedMise, /# >>> mise-versioning >>>/, VERSIONING_BLOCK, /^\[tasks\.build\]/m);
+      if (nextMise !== currentMise) {
+        if (!changedFiles.includes(misePath)) changedFiles.push(misePath);
+        if (!ctx.dryRun) writeText(misePath, nextMise);
+      }
+      const versioningPath = join15(ctx.repoRoot, ".mise", "scripts", "versioning.sh");
+      const expectedScript = templateVersioningScript(ctx);
+      if (expectedScript === void 0) {
+        return { id: finding.id, title: finding.title, status: "blocked", summary: "pjangler install is missing .mise/scripts/versioning.sh \u2014 update @delorenj/pjangler (broken package)", changedFiles, details: [] };
+      }
+      if (safeReadText(versioningPath) !== expectedScript) {
+        changedFiles.push(versioningPath);
+        if (!ctx.dryRun) {
+          writeText(versioningPath, expectedScript);
+          chmodSync4(versioningPath, 493);
+        }
+      }
+      const manifestPath = join15(ctx.repoRoot, ".mise", "version-files.conf");
+      const expectedManifest = templateVersionFilesConf(ctx, ctx.repoRoot);
+      if (safeReadText(manifestPath) !== expectedManifest) {
+        changedFiles.push(manifestPath);
+        if (!ctx.dryRun) writeText(manifestPath, expectedManifest);
+      }
+      return {
+        id: finding.id,
+        title: finding.title,
+        status: changedFiles.length ? "applied" : "noop",
+        summary: changedFiles.length ? "Versioning block/script/manifest normalized" : "No changes required",
+        changedFiles,
+        details: []
+      };
+    }
+  },
+  {
+    id: "skills.project-manifest",
+    title: "Skillex project skills manifest",
+    audit: (ctx) => {
+      const details = [];
+      const manifestPath = join15(ctx.repoRoot, ".agents", "skills.json");
+      const legacyDir = join15(ctx.repoRoot, ".agents", "skills");
+      const localExamplePath = join15(ctx.repoRoot, ".agents", "local.example.json");
+      const misePath = join15(ctx.repoRoot, "mise.toml");
+      let fixable = true;
+      let expectedBmad = [];
+      try {
+        expectedBmad = canonicalBmadSkillEntries(ctx);
+      } catch (error) {
+        details.push(
+          `BMAD Skillex pack ${BMAD_PACK_VERSION} is not trusted at ${bmadPackRoot(ctx)}: ${error instanceof Error ? error.message : String(error)}`
+        );
+        fixable = false;
+      }
+      const expectedByName = new Map(expectedBmad.map((entry) => [entry.name, fileURLToPath4(entry.source)]));
+      const expectedNames = new Set(expectedByName.keys());
+      const packRoot = bmadPackRoot(ctx);
+      const manifest = tryParseJson(safeReadText(manifestPath));
+      if (!manifest) {
+        details.push(".agents/skills.json missing or invalid JSON");
+      } else {
+        if (manifest.inherit_global !== true) details.push(".agents/skills.json should set inherit_global: true");
+        if (manifest.registry !== SKILLS_REGISTRY_URL) details.push(`.agents/skills.json should set registry to ${SKILLS_REGISTRY_URL}`);
+        if (!Array.isArray(manifest.skills)) {
+          details.push(".agents/skills.json should define a skills array");
+        } else {
+          const actualBmad = new Map(
+            manifest.skills.filter((entry) => Boolean(entry) && typeof entry === "object" && isPackManagedManifestEntry(entry, expectedNames, packRoot)).map((entry) => [String(entry.name), String(entry.source ?? "")])
+          );
+          const stale = expectedBmad.filter((entry) => actualBmad.get(entry.name) !== entry.source);
+          if (stale.length > 0 || actualBmad.size !== expectedBmad.length) {
+            details.push(`.agents/skills.json should record all ${expectedBmad.length} BMAD ${BMAD_PACK_VERSION} pack entries as file:// sources`);
+          }
+        }
+      }
+      const invalidBmadLinkNames = /* @__PURE__ */ new Set();
+      if (existsSync10(legacyDir)) {
+        for (const name of readdirSync3(legacyDir)) {
+          const expected = expectedByName.get(name);
+          const path = join15(legacyDir, name);
+          let linkTargetsPack = false;
+          try {
+            linkTargetsPack = lstatSync2(path).isSymbolicLink() && isContainedBy(packRoot, resolve3(dirname7(path), readlinkSync(path)));
+          } catch {
+            linkTargetsPack = false;
+          }
+          if (!expected && !linkTargetsPack) continue;
+          try {
+            if (!expected || !lstatSync2(path).isSymbolicLink() || resolve3(dirname7(path), readlinkSync(path)) !== expected) invalidBmadLinkNames.add(name);
+          } catch {
+            invalidBmadLinkNames.add(name);
+          }
+        }
+        for (const [name, expected] of expectedByName) {
+          const path = join15(legacyDir, name);
+          try {
+            if (!lstatSync2(path).isSymbolicLink() || resolve3(dirname7(path), readlinkSync(path)) !== expected) invalidBmadLinkNames.add(name);
+          } catch {
+            invalidBmadLinkNames.add(name);
+          }
+        }
+      } else {
+        for (const name of expectedByName.keys()) invalidBmadLinkNames.add(name);
+      }
+      if (invalidBmadLinkNames.size > 0) {
+        details.push(`${invalidBmadLinkNames.size} managed BMAD skill path(s) should be symlinks into the ${BMAD_PACK_VERSION} pack`);
+      }
+      for (const rel of [".mise/scripts/link-project-skills-to-clis.sh", ".mise/scripts/unlink-project-skills-from-clis.sh"]) {
+        if (existsSync10(join15(ctx.repoRoot, rel))) details.push(`${rel} is a legacy symlink-era script and should be removed`);
+      }
+      const localExample = tryParseJson(safeReadText(localExamplePath));
+      if (localExample && Object.prototype.hasOwnProperty.call(localExample, "skills")) {
+        details.push(".agents/local.example.json still documents legacy skills overrides; drop the skills section");
+      }
+      const mise = safeReadText(misePath);
+      if (!mise?.includes(SYNC_SKILLS_SCRIPT)) details.push("mise.toml should run the shipped project-local sync-skills.py engine via config_root");
+      if (!mise?.includes(PROVISION_BMAD_SKILLS_SCRIPT)) details.push("mise.toml should provision pinned BMAD pack links before syncing skills");
+      if (mise?.includes(SYNC_SKILLS_SCRIPT) && mise.includes(PROVISION_BMAD_SKILLS_SCRIPT) && mise.indexOf(PROVISION_BMAD_SKILLS_SCRIPT) > mise.indexOf(SYNC_SKILLS_SCRIPT)) {
+        details.push("mise.toml should run the BMAD provisioner before project skill sync");
+      }
+      if (mise?.includes('script = "sync-skills.py --scope project"') || mise?.includes('run = "sync-skills.py --scope project"')) {
+        details.push("mise.toml still invokes the missing bare sync-skills.py executable");
+      }
+      if (!mise?.includes('patterns = [".agents/skills.json"]')) details.push("mise.toml should watch .agents/skills.json");
+      if (!mise?.includes("[tasks.skills-sync]")) details.push("mise.toml should define a skills-sync task");
+      if (!mise?.includes('depends = ["skills-provision-bmad"]')) details.push("skills-sync task should depend on skills-provision-bmad");
+      for (const [rel, label] of [
+        [".mise/scripts/provision-bmad-skills.py", "BMAD Skillex provisioning script"],
+        [".mise/scripts/sync-skills.py", "Project-local skills sync engine"]
+      ]) {
+        const target = join15(ctx.repoRoot, rel);
+        const expected = templateCommonProjectText(ctx, rel);
+        const stat = lstatIfPresent(target);
+        if (!stat || !stat.isFile() || stat.isSymbolicLink()) {
+          details.push(`${label} is missing or unsafe`);
+          if (stat) fixable = false;
+        } else {
+          if (expected === void 0 || safeReadText(target) !== expected) details.push(`${label} differs from the shipped template`);
+          if ((Number(stat.mode) & 73) === 0) details.push(`${label} is not executable`);
+        }
+      }
+      const topologyIssues = projectSkillTopologyIssues(ctx.repoRoot);
+      if (topologyIssues.length) {
+        details.push(...topologyIssues.map((issue) => `CLI skill topology: ${issue}`));
+        fixable = false;
+      }
+      if (mise?.includes("link-project-skills-to-clis.sh") || mise?.includes("unlink-project-skills-from-clis.sh") || mise?.includes("[tasks.skills-relink]")) {
+        details.push("mise.toml still contains legacy skill-link wiring");
+      }
+      return {
+        id: "skills.project-manifest",
+        title: "Skillex project skills manifest",
+        status: details.length === 0 ? "pass" : "fail",
+        summary: details.length === 0 ? "Skillex skills manifest parity verified" : `${details.length} Skillex migration issue(s) detected`,
+        details,
+        fixable
+      };
+    },
+    migrate: (ctx, finding) => {
+      const changedFiles = [];
+      const details = [];
+      const manifestPath = join15(ctx.repoRoot, ".agents", "skills.json");
+      const localExamplePath = join15(ctx.repoRoot, ".agents", "local.example.json");
+      const misePath = join15(ctx.repoRoot, "mise.toml");
+      const provisionScriptPath = join15(ctx.repoRoot, ".mise", "scripts", "provision-bmad-skills.py");
+      const syncScriptPath = join15(ctx.repoRoot, ".mise", "scripts", "sync-skills.py");
+      const expectedProvisionScript = templateCommonProjectText(ctx, ".mise/scripts/provision-bmad-skills.py");
+      const expectedSyncScript = templateCommonProjectText(ctx, ".mise/scripts/sync-skills.py");
+      const topologyIssues = projectSkillTopologyIssues(ctx.repoRoot);
+      if (topologyIssues.length) {
+        return {
+          id: finding.id,
+          title: finding.title,
+          status: "blocked",
+          summary: "Unsafe project CLI skill topology must be repaired manually",
+          changedFiles,
+          details: topologyIssues
+        };
+      }
+      if (!expectedProvisionScript || !expectedSyncScript) {
+        return {
+          id: finding.id,
+          title: finding.title,
+          status: "blocked",
+          summary: "pjangler install is missing a shipped skills executable",
+          changedFiles,
+          details: [
+            ...!expectedProvisionScript ? ["Missing BMAD Skillex provisioning script template"] : [],
+            ...!expectedSyncScript ? ["Missing project-local skills sync engine template"] : []
+          ]
+        };
+      }
+      const unsafeScriptTargets = [provisionScriptPath, syncScriptPath].filter((path) => {
+        const stat = lstatIfPresent(path);
+        return Boolean(stat && (!stat.isFile() || stat.isSymbolicLink()));
+      });
+      if (unsafeScriptTargets.length) {
+        return {
+          id: finding.id,
+          title: finding.title,
+          status: "blocked",
+          summary: "Refusing non-regular managed skills executable target",
+          changedFiles,
+          details: unsafeScriptTargets.map((path) => `${path} must be removed or repaired manually`)
+        };
+      }
+      const provisioned = provisionBmadSkills(ctx);
+      if (!provisioned.ok) {
+        return {
+          id: finding.id,
+          title: finding.title,
+          status: "blocked",
+          summary: `BMAD Skillex pack ${BMAD_PACK_VERSION} is unavailable`,
+          changedFiles,
+          details: [provisioned.error ?? "Unknown BMAD pack error"]
+        };
+      }
+      changedFiles.push(...provisioned.changedFiles);
+      if (provisioned.changedFiles.includes(manifestPath)) details.push(`Recorded BMAD pack ${BMAD_PACK_VERSION} in .agents/skills.json`);
+      for (const rel of [".mise/scripts/link-project-skills-to-clis.sh", ".mise/scripts/unlink-project-skills-from-clis.sh"]) {
+        const path = join15(ctx.repoRoot, rel);
+        if (existsSync10(path)) {
+          changedFiles.push(path);
+          if (!ctx.dryRun) unlinkSync3(path);
+        }
+      }
+      const templateLocalExample = templateCommonProjectText(ctx, ".agents/local.example.json");
+      const currentLocalExample = safeReadText(localExamplePath);
+      if (templateLocalExample && currentLocalExample && currentLocalExample !== templateLocalExample) {
+        changedFiles.push(localExamplePath);
+        if (!ctx.dryRun) writeText(localExamplePath, templateLocalExample);
+      }
+      normalizeExecutableTemplate(ctx, provisionScriptPath, expectedProvisionScript, changedFiles);
+      normalizeExecutableTemplate(ctx, syncScriptPath, expectedSyncScript, changedFiles);
+      if (!existsSync10(misePath)) {
+        if (!ensureMiseTomlFromTemplate(ctx, changedFiles)) {
+          return { id: finding.id, title: finding.title, status: "blocked", summary: "mise.toml missing and no generated-project mise template available to initialize from", changedFiles, details };
         }
       }
-      const nextMise = replaceOrAppendManagedBlock(cleanedMise, /# >>> mise-versioning >>>/, VERSIONING_BLOCK, /^\[tasks\.build\]/m);
+      const currentMise = readText(misePath);
+      const nextMise = upsertLinkAgentfilesBlock(currentMise, ctx);
       if (nextMise !== currentMise) {
         if (!changedFiles.includes(misePath)) changedFiles.push(misePath);
         if (!ctx.dryRun) writeText(misePath, nextMise);
       }
-      const versioningPath = join12(ctx.repoRoot, ".mise", "scripts", "versioning.sh");
-      const expectedScript = templateVersioningScript(ctx);
-      if (expectedScript === void 0) {
-        return { id: finding.id, title: finding.title, status: "blocked", summary: "pjangler install is missing .mise/scripts/versioning.sh \u2014 update @delorenj/pjangler (broken package)", changedFiles, details: [] };
-      }
-      if (safeReadText(versioningPath) !== expectedScript) {
-        changedFiles.push(versioningPath);
-        if (!ctx.dryRun) {
-          writeText(versioningPath, expectedScript);
-          chmodSync2(versioningPath, 493);
-        }
-      }
-      const manifestPath = join12(ctx.repoRoot, ".mise", "version-files.conf");
-      const expectedManifest = templateVersionFilesConf(ctx, ctx.repoRoot);
-      if (safeReadText(manifestPath) !== expectedManifest) {
-        changedFiles.push(manifestPath);
-        if (!ctx.dryRun) writeText(manifestPath, expectedManifest);
-      }
       return {
         id: finding.id,
         title: finding.title,
         status: changedFiles.length ? "applied" : "noop",
-        summary: changedFiles.length ? "Versioning block/script/manifest normalized" : "No changes required",
+        summary: changedFiles.length ? "Skillex skills manifest contract normalized" : "No changes required",
         changedFiles,
-        details: []
+        details
       };
     }
   },
@@ -3410,9 +4800,9 @@ var RULES = [
     id: "sot.agent-symlinks",
     title: "AGENTS/CLAUDE/GEMINI symlink contract",
     audit: (ctx) => {
-      const agentsPath = join12(ctx.repoRoot, "AGENTS.md");
-      if (!existsSync9(agentsPath)) {
-        const fallbackSources = ["CLAUDE.md", "GEMINI.md", "README.md"].filter((file) => existsSync9(join12(ctx.repoRoot, file)));
+      const agentsPath = join15(ctx.repoRoot, "AGENTS.md");
+      if (!existsSync10(agentsPath)) {
+        const fallbackSources = ["CLAUDE.md", "GEMINI.md", "README.md"].filter((file) => existsSync10(join15(ctx.repoRoot, file)));
         if (fallbackSources.length === 0) {
           return { id: "sot.agent-symlinks", title: "AGENTS/CLAUDE/GEMINI symlink contract", status: "skip", summary: "AGENTS.md missing; symlink contract not applicable", details: [], fixable: false };
         }
@@ -3427,7 +4817,7 @@ var RULES = [
       }
       const details = [];
       for (const file of ["CLAUDE.md", "GEMINI.md"]) {
-        const full = join12(ctx.repoRoot, file);
+        const full = join15(ctx.repoRoot, file);
         const target = readSymlinkTarget(full);
         if (target !== "AGENTS.md") details.push(`${file} should be a symlink to AGENTS.md`);
       }
@@ -3451,7 +4841,7 @@ var RULES = [
         return { id: finding.id, title: finding.title, status: "blocked", summary: "AGENTS.md missing; cannot derive canonical agent file", changedFiles, details: [bootstrap.blocked] };
       }
       for (const file of ["CLAUDE.md", "GEMINI.md"]) {
-        const full = join12(ctx.repoRoot, file);
+        const full = join15(ctx.repoRoot, file);
         const result = ensureSymlink(full, "AGENTS.md", ctx.dryRun);
         if (result.blocked) blockedDetails.push(result.blocked);
         if (result.changed) changedFiles.push(full);
@@ -3473,7 +4863,7 @@ var RULES = [
     migrate: (ctx, finding) => {
       const changedFiles = [];
       const details = [];
-      const path = join12(ctx.repoRoot, ".project.json");
+      const path = join15(ctx.repoRoot, ".project.json");
       const existing = readProjectJson(ctx) ?? {};
       const canonical = canonicalProjectJson(ctx);
       const merged = { ...existing, ...canonical };
@@ -3483,11 +4873,11 @@ var RULES = [
         changedFiles.push(path);
         if (!ctx.dryRun) writeText(path, expected);
       }
-      const planeJson = join12(ctx.repoRoot, ".plane.json");
-      if (existsSync9(planeJson)) {
+      const planeJson = join15(ctx.repoRoot, ".plane.json");
+      if (existsSync10(planeJson)) {
         const backup = `${planeJson}.migrated-backup`;
-        if (existsSync9(backup)) {
-          details.push(`cannot back up .plane.json because ${relative(ctx.repoRoot, backup)} already exists`);
+        if (existsSync10(backup)) {
+          details.push(`cannot back up .plane.json because ${relative2(ctx.repoRoot, backup)} already exists`);
         } else {
           changedFiles.push(backup);
           if (!ctx.dryRun) renameSync2(planeJson, backup);
@@ -3508,17 +4898,21 @@ var RULES = [
     title: ".env.op + gitignore secrets contract",
     audit: (ctx) => {
       const details = [];
-      const envOp = safeReadText(join12(ctx.repoRoot, ".env.op"));
-      const gitignore = safeReadText(join12(ctx.repoRoot, ".gitignore"));
+      const envOp = safeReadText(join15(ctx.repoRoot, ".env.op"));
+      const gitignore = safeReadText(join15(ctx.repoRoot, ".gitignore"));
       if (!envOp) {
         details.push(".env.op missing");
       } else {
-        const invalidLines = envOp.split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#") && line.includes("=")).filter((line) => {
+        const malformed = malformedOpReferences(envOp);
+        if (malformed.length) {
+          details.push(`.env.op has malformed op:// reference(s) on line(s): ${Array.from(new Set(malformed.map((entry) => entry.line))).join(", ")}`);
+        }
+        const invalidLines = envOp.split("\n").map((line, index) => ({ line: line.trim(), number: index + 1 })).filter(({ line }) => line && !line.startsWith("#") && line.includes("=")).filter(({ line }) => {
           const value = line.slice(line.indexOf("=") + 1).trim();
           const quotedLiteral = /^"[^"\r\n]*"$/.test(value) || /^'[^'\r\n]*'$/.test(value);
           return !value.startsWith("op://") && !/^https?:\/\//.test(value) && !/^[A-Za-z0-9_.:-]+$/.test(value) && !quotedLiteral;
         });
-        if (invalidLines.length) details.push(`.env.op has non-reference values that do not look like safe literals: ${invalidLines.join(", ")}`);
+        if (invalidLines.length) details.push(`.env.op has non-reference values that do not look like safe literals on line(s): ${invalidLines.map((entry) => entry.number).join(", ")}`);
       }
       if (!gitignore?.includes(".env\n") && !gitignore?.includes(".env\r\n")) details.push(".gitignore should ignore .env");
       if (!gitignore?.includes(".env.*")) details.push(".gitignore should ignore .env.*");
@@ -3535,12 +4929,23 @@ var RULES = [
     migrate: (ctx, finding) => {
       const changedFiles = [];
       const details = [];
-      const envOpPath = join12(ctx.repoRoot, ".env.op");
-      if (!existsSync9(envOpPath)) {
+      const envOpPath = join15(ctx.repoRoot, ".env.op");
+      if (!existsSync10(envOpPath)) {
         changedFiles.push(envOpPath);
-        if (!ctx.dryRun) writeText(envOpPath, readText(join12(ctx.pjanglerRoot, "templates", "commonproject", "template", ".env.op")));
+        if (!ctx.dryRun) writeText(envOpPath, readText(join15(ctx.pjanglerRoot, "templates", "commonproject", "template", ".env.op")));
+      } else {
+        const current = readText(envOpPath);
+        const repaired = removeMalformedCommentOpReferences(current);
+        if (repaired.changed) {
+          changedFiles.push(envOpPath);
+          if (!ctx.dryRun) writeText(envOpPath, repaired.text);
+        }
+        const remaining = malformedOpReferences(repaired.text).filter((entry) => !entry.commentOnly);
+        if (remaining.length) {
+          details.push(`Malformed active op:// reference(s) remain on line(s) ${Array.from(new Set(remaining.map((entry) => entry.line))).join(", ")}; repair them manually without replacing valid user references`);
+        }
       }
-      const gitignorePath = join12(ctx.repoRoot, ".gitignore");
+      const gitignorePath = join15(ctx.repoRoot, ".gitignore");
       const gitignore = safeReadText(gitignorePath) ?? "";
       const requiredBlock = `# Secrets \u2014 .env is materialized by \`op inject -i .env.op > .env\` on mise enter.
 # NEVER commit it. .env.op holds only 1Password references or safe literals and IS committed.
@@ -3567,7 +4972,7 @@ var RULES = [
     title: ".copier-answers.yml provenance + drift report",
     audit: (ctx) => {
       const details = [];
-      const path = join12(ctx.repoRoot, ".copier-answers.yml");
+      const path = join15(ctx.repoRoot, ".copier-answers.yml");
       const text2 = safeReadText(path);
       const project = readProjectJson(ctx);
       if (!text2) {
@@ -3598,12 +5003,12 @@ var RULES = [
       const changedFiles = [];
       const project = canonicalProjectJson(ctx);
       const text2 = `# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_src_path: ${join12(ctx.pjanglerRoot, "templates", "commonproject")}
+_src_path: ${join15(ctx.pjanglerRoot, "templates", "commonproject")}
 project_description: ${String(project.project_description)}
 project_name: ${String(project.project_name)}
 ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
 `;
-      const path = join12(ctx.repoRoot, ".copier-answers.yml");
+      const path = join15(ctx.repoRoot, ".copier-answers.yml");
       if (safeReadText(path) !== text2) {
         changedFiles.push(path);
         if (!ctx.dryRun) writeText(path, text2);
@@ -3622,14 +5027,21 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
     id: "bmad.scaffold",
     title: "BMAD modules/docs scaffold",
     audit: (ctx) => {
-      const targetRoot = join12(ctx.repoRoot, "_bmad");
-      const sentinels = [
-        join12("core", "config.yaml"),
-        join12("config.toml"),
-        join12("_config", "manifest.yaml"),
-        join12("bmm", "config.yaml")
-      ];
-      const missing = sentinels.filter((file) => !existsSync9(join12(targetRoot, file)));
+      const manifestSelection = manifestBmadModules(ctx.repoRoot);
+      if (manifestSelection.status === "invalid") {
+        return {
+          id: "bmad.scaffold",
+          title: "BMAD modules/docs scaffold",
+          status: "fail",
+          summary: "BMAD module manifest is invalid; refusing fallback module selection",
+          details: [manifestSelection.error],
+          fixable: false
+        };
+      }
+      const targetRoot = join15(ctx.repoRoot, "_bmad");
+      const selectedModules = manifestSelection.status === "valid" ? manifestSelection.modules : configuredBmadModules(ctx.repoRoot) ?? [...DEFAULT_BMAD_MODULES];
+      const sentinels = requiredBmadSentinels(ctx.repoRoot, selectedModules);
+      const missing = sentinels.filter((file) => !existsSync10(join15(targetRoot, file)));
       return {
         id: "bmad.scaffold",
         title: "BMAD modules/docs scaffold",
@@ -3641,9 +5053,21 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
     },
     migrate: (ctx, finding) => {
       const changedFiles = [];
+      const manifestSelection = manifestBmadModules(ctx.repoRoot);
+      if (manifestSelection.status === "invalid") {
+        return {
+          id: finding.id,
+          title: finding.title,
+          status: "blocked",
+          summary: "BMAD module manifest is invalid; refusing fallback module selection",
+          changedFiles,
+          details: [manifestSelection.error]
+        };
+      }
+      const selectedModules = manifestSelection.status === "valid" ? manifestSelection.modules : configuredBmadModules(ctx.repoRoot) ?? [...DEFAULT_BMAD_MODULES];
       if (ctx.dryRun) {
         for (const detail of finding.details) {
-          changedFiles.push(join12(ctx.repoRoot, detail));
+          changedFiles.push(join15(ctx.repoRoot, detail));
         }
         return {
           id: finding.id,
@@ -3652,11 +5076,14 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
           summary: changedFiles.length ? "Would run non-interactive bmad-method install" : "No changes required",
           changedFiles,
           details: [
-            `Would run: npx ${bmadInstallArgs(ctx.repoRoot).join(" ").replace(BMAD_INSTALL_TOOLS.join(","), "...")}`
+            `Would run: npx ${bmadInstallArgs(ctx.repoRoot, selectedModules).join(" ").replace(BMAD_INSTALL_TOOLS.join(","), "...")}`
           ]
         };
       }
-      const install = runBmadInstall(ctx.repoRoot);
+      const preservedSkillsManifest = tryParseJson(
+        safeReadText(join15(ctx.repoRoot, ".agents", "skills.json"))
+      );
+      const install = runBmadInstall(ctx.repoRoot, selectedModules);
       if (!install.ok) {
         return {
           id: finding.id,
@@ -3667,16 +5094,28 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
           details: [install.error ?? "Unknown error"]
         };
       }
+      const provisioned = provisionBmadSkills(ctx, preservedSkillsManifest);
+      if (!provisioned.ok) {
+        return {
+          id: finding.id,
+          title: finding.title,
+          status: "blocked",
+          summary: `BMAD installed but Skillex pack ${BMAD_PACK_VERSION} provisioning failed`,
+          changedFiles: [],
+          details: [provisioned.error ?? "Unknown BMAD pack error"]
+        };
+      }
       for (const detail of finding.details) {
-        if (existsSync9(join12(ctx.repoRoot, detail))) {
-          changedFiles.push(join12(ctx.repoRoot, detail));
+        if (existsSync10(join15(ctx.repoRoot, detail))) {
+          changedFiles.push(join15(ctx.repoRoot, detail));
         }
       }
+      changedFiles.push(...provisioned.changedFiles);
       return {
         id: finding.id,
         title: finding.title,
         status: changedFiles.length ? "applied" : "noop",
-        summary: changedFiles.length ? "Installed BMAD scaffold via non-interactive installer" : "No changes required",
+        summary: changedFiles.length ? `Installed BMAD scaffold with Skillex pack ${BMAD_PACK_VERSION} skills` : "No changes required",
         changedFiles,
         details: []
       };
@@ -3692,7 +5131,7 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
           id: "bmad.version",
           title: "BMAD version currency",
           status: "skip",
-          summary: existsSync9(join12(ctx.repoRoot, "_bmad")) ? "BMAD installed but version manifest unreadable" : "No BMAD install present",
+          summary: existsSync10(join15(ctx.repoRoot, "_bmad")) ? "BMAD installed but version manifest unreadable" : "No BMAD install present",
           details: [],
           fixable: false
         };
@@ -3747,7 +5186,19 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
       }
       const installed = readInstalledBmadVersion(ctx.repoRoot);
       const available = resolveBmadDistTags(ctx.homeDir)?.distTags?.[BMAD_TARGET_CHANNEL];
-      const manifestPath = join12(ctx.repoRoot, "_bmad", "_config", "manifest.yaml");
+      const manifestPath = join15(ctx.repoRoot, "_bmad", "_config", "manifest.yaml");
+      const manifestSelection = manifestBmadModules(ctx.repoRoot);
+      if (manifestSelection.status === "invalid") {
+        return {
+          id: finding.id,
+          title: finding.title,
+          status: "blocked",
+          summary: "BMAD module manifest is invalid; refusing fallback module selection",
+          changedFiles: [],
+          details: [manifestSelection.error]
+        };
+      }
+      const selectedModules = manifestSelection.status === "valid" ? manifestSelection.modules : configuredBmadModules(ctx.repoRoot) ?? [...DEFAULT_BMAD_MODULES];
       if (ctx.dryRun) {
         return {
           id: finding.id,
@@ -3756,11 +5207,14 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
           summary: `Would upgrade BMAD ${installed ?? "?"} -> ${available ?? BMAD_TARGET_CHANNEL}`,
           changedFiles: [manifestPath],
           details: [
-            `Would run: npx ${bmadInstallArgs(ctx.repoRoot).join(" ").replace(BMAD_INSTALL_TOOLS.join(","), "...")}`
+            `Would run: npx ${bmadInstallArgs(ctx.repoRoot, selectedModules).join(" ").replace(BMAD_INSTALL_TOOLS.join(","), "...")}`
           ]
         };
       }
-      const install = runBmadInstall(ctx.repoRoot);
+      const preservedSkillsManifest = tryParseJson(
+        safeReadText(join15(ctx.repoRoot, ".agents", "skills.json"))
+      );
+      const install = runBmadInstall(ctx.repoRoot, selectedModules);
       if (!install.ok) {
         return {
           id: finding.id,
@@ -3771,6 +5225,17 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
           details: [install.error ?? "Unknown error"]
         };
       }
+      const provisioned = provisionBmadSkills(ctx, preservedSkillsManifest);
+      if (!provisioned.ok) {
+        return {
+          id: finding.id,
+          title: finding.title,
+          status: "blocked",
+          summary: `BMAD upgraded but Skillex pack ${BMAD_PACK_VERSION} provisioning failed`,
+          changedFiles: [],
+          details: [provisioned.error ?? "Unknown BMAD pack error"]
+        };
+      }
       const nowInstalled = readInstalledBmadVersion(ctx.repoRoot);
       const upgraded = Boolean(nowInstalled && installed && compareBmadVersions(nowInstalled, installed) > 0);
       return {
@@ -3778,7 +5243,10 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
         title: finding.title,
         status: upgraded ? "applied" : "noop",
         summary: upgraded ? `Upgraded BMAD ${installed} -> ${nowInstalled}` : `BMAD reinstalled (${nowInstalled ?? "?"})`,
-        changedFiles: upgraded ? [manifestPath] : [],
+        changedFiles: Array.from(/* @__PURE__ */ new Set([
+          ...upgraded ? [manifestPath] : [],
+          ...provisioned.changedFiles
+        ])),
         details: []
       };
     }
@@ -3793,12 +5261,13 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
         return { id: "hermes.pm-scaffold", title: "Hermes PM scaffold parity", status: "skip", summary: "No pm role present", details: [], fixable: false };
       }
       const details = [];
-      for (const rel of ["role.yaml", "SOUL.md", "hermes", ".gitignore", ".scripts/70-systemd.sh", ".scripts/heartbeat.sh", ".scripts/checkpoint.sh", ".runtime-scaffold/README.md", "runtime/memories/MEMORY.md", "runtime/bloodbank-consumer.py"]) {
-        if (!existsSync9(join12(role.roleDir, rel))) details.push(`missing ${relative(ctx.repoRoot, join12(role.roleDir, rel))}`);
+      for (const rel of ["role.yaml", "SOUL.md", "hermes", ".gitignore", ".scripts/70-systemd.sh", ".scripts/heartbeat.sh", ".scripts/checkpoint.sh", ".runtime-scaffold/README.md", "runtime/memories/MEMORY.md"]) {
+        if (!existsSync10(join15(role.roleDir, rel))) details.push(`missing ${relative2(ctx.repoRoot, join15(role.roleDir, rel))}`);
       }
-      const gitmodules = safeReadText(join12(ctx.repoRoot, ".gitmodules")) ?? "";
-      if (!gitmodules.includes(`agents/hermes/${role.role}/runtime`)) details.push(".gitmodules missing pm runtime submodule entry");
-      if (!profileMetaInheritsDefault(join12(role.roleDir, "runtime", "profile.yaml"))) {
+      if (hasRuntimeSubmoduleMapping(ctx.repoRoot, role)) {
+        details.push(".gitmodules contains retired pm runtime submodule mapping");
+      }
+      if (!profileMetaInheritsDefault(join15(role.roleDir, "runtime", "profile.yaml"))) {
         details.push("runtime/profile.yaml missing inherited default config metadata");
       }
       const registry = safeReadText(registryPath(ctx.homeDir));
@@ -3819,21 +5288,32 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
       if (!role) {
         return { id: finding.id, title: finding.title, status: "blocked", summary: "No pm role present", changedFiles, details: [] };
       }
-      const templateRoleDir = join12(ctx.pjanglerRoot, "templates", "hermes-agent", "template");
-      writeIfDifferent(join12(role.roleDir, "SOUL.md"), renderSoul(role), ctx.dryRun, changedFiles);
-      writeIfDifferent(join12(role.roleDir, "hermes"), renderHermesWrapper(role), ctx.dryRun, changedFiles, 493);
-      writeIfDifferent(join12(role.roleDir, ".gitignore"), readText(join12(templateRoleDir, ".gitignore.jinja")).replace(/\{\{ role \}\}/g, role.role), ctx.dryRun, changedFiles);
-      copyMissingRecursive(join12(templateRoleDir, ".runtime-scaffold"), join12(role.roleDir, ".runtime-scaffold"), changedFiles, ctx.dryRun);
-      copyMissingRecursive(join12(templateRoleDir, ".runtime-scaffold"), join12(role.roleDir, "runtime"), changedFiles, ctx.dryRun);
-      copyMissingRecursive(join12(templateRoleDir, ".scripts"), join12(role.roleDir, ".scripts"), changedFiles, ctx.dryRun, (source) => source.endsWith("sentinel.prompt.md.jinja"));
-      const promptSource = join12(templateRoleDir, ".scripts", "sentinel.prompt.md.jinja");
-      const promptTarget = join12(role.roleDir, ".scripts", "sentinel.prompt.md");
-      if (existsSync9(promptSource) && !existsSync9(promptTarget)) {
+      const retirement = retireRuntimeSubmodule(ctx.repoRoot, role, changedFiles, ctx.dryRun);
+      details.push(...retirement.details);
+      if (!retirement.ok) {
+        return {
+          id: finding.id,
+          title: finding.title,
+          status: "blocked",
+          summary: "Failed to retire PM runtime submodule metadata safely",
+          changedFiles,
+          details: [retirement.error ?? "unknown runtime retirement failure"]
+        };
+      }
+      const templateRoleDir = join15(ctx.pjanglerRoot, "templates", "hermes-agent", "template");
+      writeIfDifferent(join15(role.roleDir, "SOUL.md"), renderSoul(role), ctx.dryRun, changedFiles);
+      writeIfDifferent(join15(role.roleDir, "hermes"), renderHermesWrapper(role), ctx.dryRun, changedFiles, 493);
+      writeIfDifferent(join15(role.roleDir, ".gitignore"), readText(join15(templateRoleDir, ".gitignore.jinja")).replace(/\{\{ role \}\}/g, role.role), ctx.dryRun, changedFiles);
+      copyMissingRecursive(join15(templateRoleDir, ".runtime-scaffold"), join15(role.roleDir, ".runtime-scaffold"), changedFiles, ctx.dryRun);
+      copyMissingRecursive(join15(templateRoleDir, ".runtime-scaffold"), join15(role.roleDir, "runtime"), changedFiles, ctx.dryRun);
+      copyMissingRecursive(join15(templateRoleDir, ".scripts"), join15(role.roleDir, ".scripts"), changedFiles, ctx.dryRun, (source) => source.endsWith("sentinel.prompt.md.jinja"));
+      const promptSource = join15(templateRoleDir, ".scripts", "sentinel.prompt.md.jinja");
+      const promptTarget = join15(role.roleDir, ".scripts", "sentinel.prompt.md");
+      if (existsSync10(promptSource) && !existsSync10(promptTarget)) {
         const prompt = readText(promptSource).replace(/\{\{ agent_id \}\}/g, role.agentId).replace(/\{\{ role \}\}/g, role.role).replace(/\{\{ target_repo \}\}/g, role.repo).replace(/\{\{ display_name \}\}/g, role.displayName || role.agentId);
         writeIfDifferent(promptTarget, prompt, ctx.dryRun, changedFiles);
       }
-      upsertSubmodule(ctx.repoRoot, role, changedFiles, ctx.dryRun);
-      const profileMetaUpdated = upsertInheritedProfileMeta(join12(role.roleDir, "runtime", "profile.yaml"), changedFiles, ctx.dryRun);
+      const profileMetaUpdated = upsertInheritedProfileMeta(join15(role.roleDir, "runtime", "profile.yaml"), changedFiles, ctx.dryRun);
       if (profileMetaUpdated) details.push(`updated ${profileMetaUpdated}`);
       const registryUpdated = upsertRegistryEntry(role, ctx.homeDir, changedFiles, ctx.dryRun);
       if (registryUpdated) details.push(`updated ${registryUpdated}`);
@@ -3864,8 +5344,8 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
       }
       const details = [];
       for (const role of roles) {
-        const roleRelDir = relative(ctx.repoRoot, role.roleDir);
-        const runtimeRelPath = join12(roleRelDir, "runtime");
+        const roleRelDir = relative2(ctx.repoRoot, role.roleDir);
+        const runtimeRelPath = join15(roleRelDir, "runtime");
         const lsResult = spawnSync6("git", ["ls-files", "--stage", runtimeRelPath], {
           cwd: ctx.repoRoot,
           encoding: "utf8"
@@ -3873,15 +5353,18 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
         if (lsResult.status === 0 && lsResult.stdout.trim().length > 0) {
           details.push(`submodule runtime is tracked in Git index at ${runtimeRelPath}`);
         }
-        const gitignorePath = join12(role.roleDir, ".gitignore");
-        if (existsSync9(gitignorePath)) {
+        if (hasRuntimeSubmoduleMapping(ctx.repoRoot, role)) {
+          details.push(`stale .gitmodules mapping exists for ${runtimeRelPath}`);
+        }
+        const gitignorePath = join15(role.roleDir, ".gitignore");
+        if (existsSync10(gitignorePath)) {
           const content = safeReadText(gitignorePath) ?? "";
           const lines = content.split(/\r?\n/).map((line) => line.trim());
           if (!lines.includes("runtime/") && !lines.includes("runtime")) {
-            details.push(`.gitignore missing runtime/ ignore entry in ${relative(ctx.repoRoot, gitignorePath)}`);
+            details.push(`.gitignore missing runtime/ ignore entry in ${relative2(ctx.repoRoot, gitignorePath)}`);
           }
         } else {
-          details.push(`.gitignore is missing in ${relative(ctx.repoRoot, gitignorePath)}`);
+          details.push(`.gitignore is missing in ${relative2(ctx.repoRoot, gitignorePath)}`);
         }
       }
       return {
@@ -3898,32 +5381,28 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
       const changedFiles = [];
       const details = [];
       for (const role of roles) {
-        const roleRelDir = relative(ctx.repoRoot, role.roleDir);
-        const runtimeRelPath = join12(roleRelDir, "runtime");
-        const lsResult = spawnSync6("git", ["ls-files", "--stage", runtimeRelPath], {
-          cwd: ctx.repoRoot,
-          encoding: "utf8"
-        });
-        if (lsResult.status === 0 && lsResult.stdout.trim().length > 0) {
-          details.push(`untrack ${runtimeRelPath}`);
-          changedFiles.push(runtimeRelPath);
-          if (!ctx.dryRun) {
-            spawnSync6("git", ["rm", "--cached", "-r", runtimeRelPath], {
-              cwd: ctx.repoRoot,
-              encoding: "utf8"
-            });
-          }
+        const retirement = retireRuntimeSubmodule(ctx.repoRoot, role, changedFiles, ctx.dryRun);
+        details.push(...retirement.details);
+        if (!retirement.ok) {
+          return {
+            id: finding.id,
+            title: finding.title,
+            status: "blocked",
+            summary: "Failed to retire Hermes runtime submodule metadata safely",
+            changedFiles,
+            details: [retirement.error ?? "unknown runtime retirement failure"]
+          };
         }
-        const gitignorePath = join12(role.roleDir, ".gitignore");
+        const gitignorePath = join15(role.roleDir, ".gitignore");
         let content = "";
         let isIgnored = false;
-        if (existsSync9(gitignorePath)) {
+        if (existsSync10(gitignorePath)) {
           content = safeReadText(gitignorePath) ?? "";
           const lines = content.split(/\r?\n/).map((line) => line.trim());
           isIgnored = lines.includes("runtime/") || lines.includes("runtime");
         }
         if (!isIgnored) {
-          details.push(`ignore runtime/ in ${relative(ctx.repoRoot, gitignorePath)}`);
+          details.push(`ignore runtime/ in ${relative2(ctx.repoRoot, gitignorePath)}`);
           changedFiles.push(gitignorePath);
           if (!ctx.dryRun) {
             if (content && !content.endsWith("\n")) {
@@ -3958,7 +5437,7 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
       }
       const details = [];
       for (const role of roles) {
-        for (const unit of [`hermes-${role.agentId}-gateway.service`, `hermes-${role.agentId}-consumer.service`, `hermes-${role.agentId}-heartbeat.timer`]) {
+        for (const unit of [`hermes-${role.agentId}-gateway.service`, `hermes-${role.agentId}-heartbeat.timer`]) {
           const state = checkUnit(unit);
           if (!state.enabled || !state.active) details.push(`${unit} should be enabled+active`);
         }
@@ -3984,9 +5463,9 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
         return { id: finding.id, title: finding.title, status: "blocked", summary: "systemd --user unavailable on this host", changedFiles, details };
       }
       for (const role of roles) {
-        const sysDir = join12(ctx.homeDir, ".config", "systemd", "user");
-        const units = [`hermes-${role.agentId}-gateway.service`, `hermes-${role.agentId}-consumer.service`, `hermes-${role.agentId}-heartbeat.timer`];
-        const allUnitsPresent = units.every((unit) => existsSync9(join12(sysDir, unit)));
+        const sysDir = join15(ctx.homeDir, ".config", "systemd", "user");
+        const units = [`hermes-${role.agentId}-gateway.service`, `hermes-${role.agentId}-heartbeat.timer`];
+        const allUnitsPresent = units.every((unit) => existsSync10(join15(sysDir, unit)));
         if (allUnitsPresent) {
           if (ctx.dryRun) {
             details.push(`would run: systemctl --user enable --now ${units.join(" ")}`);
@@ -3998,8 +5477,8 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
           }
           continue;
         }
-        for (const script of [join12(role.roleDir, ".scripts", "70-systemd.sh")]) {
-          if (!script || !existsSync9(script)) continue;
+        for (const script of [join15(role.roleDir, ".scripts", "70-systemd.sh")]) {
+          if (!script || !existsSync10(script)) continue;
           if (ctx.dryRun) {
             details.push(`would run: bash ${script}`);
           } else {
@@ -4017,6 +5496,349 @@ ticket_provider: ${String(project.ticket_provider?.type ?? "plane")}
         details
       };
     }
+  },
+  {
+    id: "hermes.runtime-singleton",
+    title: "Hermes singleton runtime (shared config/auth, per-agent memory)",
+    audit: (ctx) => {
+      const roles = discoverRoles(ctx.repoRoot);
+      if (!roles.length) {
+        return { id: "hermes.runtime-singleton", title: "Hermes singleton runtime (shared config/auth, per-agent memory)", status: "skip", summary: "No Hermes roles present", details: [], fixable: false };
+      }
+      const details = [];
+      for (const role of roles) {
+        const plan = singletonPlan(ctx, role);
+        if (!existsSync10(plan.fleetRoot)) {
+          details.push(`fleet root missing at ${plan.fleetRoot}`);
+          continue;
+        }
+        if (!existsSync10(plan.profileDir)) {
+          details.push(`profile dir missing: ${plan.profileDir}`);
+        } else if (lstatSync2(plan.profileDir).isSymbolicLink()) {
+          details.push(`profile dir is a symlink (must be a real dir): ${plan.profileDir}`);
+        }
+        for (const link of plan.links) {
+          const state = linkState(link.path, link.target);
+          if (state !== "ok") details.push(`${state}: ${link.path} -> ${link.target}`);
+        }
+      }
+      return {
+        id: "hermes.runtime-singleton",
+        title: "Hermes singleton runtime (shared config/auth, per-agent memory)",
+        status: details.length === 0 ? "pass" : "fail",
+        summary: details.length === 0 ? "Singleton runtime contract satisfied" : `${details.length} singleton-runtime issue(s) detected`,
+        details,
+        fixable: true
+      };
+    },
+    migrate: (ctx, finding) => {
+      const roles = discoverRoles(ctx.repoRoot);
+      const changedFiles = [];
+      const details = [];
+      for (const role of roles) {
+        const plan = singletonPlan(ctx, role);
+        if (!existsSync10(plan.fleetRoot)) {
+          details.push(`blocked: fleet root missing at ${plan.fleetRoot}`);
+          continue;
+        }
+        for (const shared of plan.sharedSeeds) {
+          if (existsSync10(shared.rootPath)) continue;
+          const donor = existsSync10(shared.runtimePath) ? shared.runtimePath : null;
+          if (!donor) continue;
+          details.push(`seed fleet ${basename4(shared.rootPath)} from ${donor}`);
+          changedFiles.push(shared.rootPath);
+          if (!ctx.dryRun) copyFileSync(donor, shared.rootPath);
+        }
+        if (existsSync10(plan.profileDir) && lstatSync2(plan.profileDir).isSymbolicLink()) {
+          details.push(`convert profile symlink to real dir: ${plan.profileDir}`);
+          changedFiles.push(plan.profileDir);
+          if (!ctx.dryRun) unlinkSync3(plan.profileDir);
+        }
+        if (!existsSync10(plan.profileDir)) {
+          details.push(`create profile dir: ${plan.profileDir}`);
+          changedFiles.push(plan.profileDir);
+          if (!ctx.dryRun) mkdirSync6(plan.profileDir, { recursive: true });
+        }
+        for (const link of plan.links) {
+          const state = linkState(link.path, link.target);
+          if (state === "ok") continue;
+          if (link.ensureTargetDir && !existsSync10(link.target) && !ctx.dryRun) {
+            mkdirSync6(link.target, { recursive: true });
+          }
+          details.push(`link ${link.path} -> ${link.target}`);
+          changedFiles.push(link.path);
+          if (ctx.dryRun) continue;
+          if (existsSync10(link.path) || isDanglingLink(link.path)) {
+            const lst = lstatSync2(link.path);
+            if (lst.isSymbolicLink()) {
+              unlinkSync3(link.path);
+            } else {
+              const parked = `${link.path}.pre-singleton`;
+              renameSync2(link.path, parked);
+              details.push(`parked pre-existing ${link.path} at ${parked}`);
+            }
+          }
+          ensureParent(link.path);
+          symlinkSync(link.target, link.path);
+        }
+      }
+      return {
+        id: finding.id,
+        title: finding.title,
+        status: details.some((d) => d.startsWith("blocked:")) ? "blocked" : changedFiles.length ? ctx.dryRun ? "skipped" : "applied" : "noop",
+        summary: changedFiles.length ? ctx.dryRun ? "Planned singleton-runtime wiring" : "Singleton runtime wired" : "No changes required",
+        changedFiles,
+        details
+      };
+    }
+  },
+  {
+    id: "hermes.profile-wiring",
+    title: "Launcher + systemd HERMES_HOME points at the named profile",
+    audit: (ctx) => {
+      const roles = discoverRoles(ctx.repoRoot);
+      if (!roles.length) {
+        return { id: "hermes.profile-wiring", title: "Launcher + systemd HERMES_HOME points at the named profile", status: "skip", summary: "No Hermes roles present", details: [], fixable: false };
+      }
+      const details = [];
+      for (const role of roles) {
+        const plan = singletonPlan(ctx, role);
+        const launcher = join15(role.roleDir, "hermes");
+        const text2 = safeReadText(launcher);
+        if (text2 === null) {
+          details.push(`launcher missing: ${relative2(ctx.repoRoot, launcher)}`);
+        } else {
+          if (/^HERMES_HOME="\$RUNTIME_HOME"\s*$/m.test(text2)) {
+            details.push(`launcher sets HERMES_HOME to the raw runtime path (disables shared auth + profile identity): ${relative2(ctx.repoRoot, launcher)}`);
+          }
+          if (/HERMES_OAUTH_FILE/.test(text2)) {
+            details.push(`launcher exports HERMES_OAUTH_FILE, which Hermes does not implement (dead config): ${relative2(ctx.repoRoot, launcher)}`);
+          }
+        }
+        for (const unit of profileUnits(role)) {
+          const unitPath = join15(ctx.homeDir, ".config", "systemd", "user", unit);
+          const unitText = safeReadText(unitPath);
+          if (unitText === null) continue;
+          const current = /^Environment=HERMES_HOME=(.*)$/m.exec(unitText)?.[1]?.trim();
+          if (current && current !== plan.profileDir) {
+            details.push(`${unit} HERMES_HOME=${current} (expected ${plan.profileDir})`);
+          }
+          if (/^Environment=HERMES_OAUTH_FILE=/m.test(unitText)) {
+            details.push(`${unit} sets HERMES_OAUTH_FILE (dead config)`);
+          }
+        }
+      }
+      return {
+        id: "hermes.profile-wiring",
+        title: "Launcher + systemd HERMES_HOME points at the named profile",
+        status: details.length === 0 ? "pass" : "fail",
+        summary: details.length === 0 ? "HERMES_HOME wiring is in parity" : `${details.length} HERMES_HOME wiring issue(s) detected`,
+        details,
+        fixable: true
+      };
+    },
+    migrate: (ctx, finding) => {
+      const roles = discoverRoles(ctx.repoRoot);
+      const changedFiles = [];
+      const details = [];
+      let unitsTouched = false;
+      for (const role of roles) {
+        const plan = singletonPlan(ctx, role);
+        const launcher = join15(role.roleDir, "hermes");
+        const text2 = safeReadText(launcher);
+        if (text2 !== null) {
+          const rewritten = rewriteLauncher(text2);
+          if (rewritten !== text2) {
+            details.push(`rewrite launcher HERMES_HOME -> profile path: ${relative2(ctx.repoRoot, launcher)}`);
+            writeIfDifferent(launcher, rewritten, ctx.dryRun, changedFiles, 493);
+          }
+        }
+        for (const unit of profileUnits(role)) {
+          const unitPath = join15(ctx.homeDir, ".config", "systemd", "user", unit);
+          const unitText = safeReadText(unitPath);
+          if (unitText === null) continue;
+          let next = unitText.replace(/^Environment=HERMES_HOME=.*$/m, `Environment=HERMES_HOME=${plan.profileDir}`);
+          next = next.replace(/^Environment=HERMES_OAUTH_FILE=.*\n/m, "");
+          if (next !== unitText) {
+            details.push(`repoint ${unit} HERMES_HOME -> ${plan.profileDir}`);
+            writeIfDifferent(unitPath, next, ctx.dryRun, changedFiles);
+            unitsTouched = true;
+          }
+        }
+      }
+      if (unitsTouched && !ctx.dryRun) {
+        systemctlUser(["daemon-reload"]);
+        details.push("systemctl --user daemon-reload (restart units to pick up the new HERMES_HOME)");
+      }
+      return {
+        id: finding.id,
+        title: finding.title,
+        status: changedFiles.length ? ctx.dryRun ? "skipped" : "applied" : "noop",
+        summary: changedFiles.length ? ctx.dryRun ? "Planned HERMES_HOME rewiring" : "HERMES_HOME rewired to named profiles" : "No changes required",
+        changedFiles,
+        details
+      };
+    }
+  },
+  {
+    id: "hermes.registry-parity",
+    title: "Fleet registry matches .project.json (no duplicate or stale agents)",
+    audit: (ctx) => {
+      const roles = discoverRoles(ctx.repoRoot);
+      const details = [];
+      const registryPath2 = join15(ctx.homeDir, ".hermes", "agents-registry.yaml");
+      const registry = readRegistry(registryPath2);
+      if (!registry) {
+        if (!roles.length && declaredAgentIds(ctx.repoRoot).length === 0) {
+          return { id: "hermes.registry-parity", title: "Fleet registry matches .project.json (no duplicate or stale agents)", status: "skip", summary: "No Hermes roles or declared agents present", details: [], fixable: false };
+        }
+        return { id: "hermes.registry-parity", title: "Fleet registry matches .project.json (no duplicate or stale agents)", status: "warn", summary: `registry unreadable at ${registryPath2}`, details: [], fixable: false };
+      }
+      const canonical = new Set(roles.map((role) => role.agentId).filter(Boolean));
+      const owned = ownedRegistryEntries(registry, ctx.repoRoot);
+      const unprovisioned = unprovisionedRoleAgents(registry, ctx.repoRoot, canonical);
+      if (unprovisioned.length) {
+        return {
+          id: "hermes.registry-parity",
+          title: "Fleet registry matches .project.json (no duplicate or stale agents)",
+          status: "fail",
+          summary: `${unprovisioned.length} unprovisioned Hermes role blocker(s) detected`,
+          details: unprovisioned.map(
+            ({ agentId, roleDir, sources }) => `agent "${agentId}" (${sources.join(" + ")}) has no role.yaml${roleDir ? ` at ${roleDir}` : ""}; provision or restore the role, do not delete its registry/declaration`
+          ),
+          fixable: false
+        };
+      }
+      if (canonical.size === 0) {
+        return { id: "hermes.registry-parity", title: "Fleet registry matches .project.json (no duplicate or stale agents)", status: "skip", summary: "No Hermes roles, declarations, or registry entries present", details: [], fixable: false };
+      }
+      for (const [agentId, entry] of owned) {
+        const roleDir = String(entry?.role_dir ?? "");
+        if (!canonical.has(agentId)) {
+          details.push(`stale/duplicate registry agent "${agentId}" for ${roleDir} (role.yaml declares ${[...canonical].join(", ")})`);
+        }
+      }
+      for (const extra of declaredAgentIds(ctx.repoRoot).filter((id) => !canonical.has(id))) {
+        details.push(`.project.json declares agent "${extra}" that no role.yaml claims`);
+      }
+      for (const role of roles) {
+        const entry = registry[role.agentId];
+        if (!entry) {
+          details.push(`registry is missing an entry for ${role.agentId}`);
+          continue;
+        }
+        const entryRoleDir = String(entry.role_dir ?? "");
+        if (entryRoleDir && realOrSelf(entryRoleDir) !== realOrSelf(role.roleDir)) {
+          details.push(`registry role_dir for ${role.agentId} is ${entryRoleDir} (expected ${role.roleDir})`);
+        }
+        const bin = String(entry.hermes?.bin ?? "");
+        if (bin && !existsSync10(bin)) {
+          details.push(`registry hermes.bin for ${role.agentId} does not exist: ${bin}`);
+        }
+      }
+      return {
+        id: "hermes.registry-parity",
+        title: "Fleet registry matches .project.json (no duplicate or stale agents)",
+        status: details.length === 0 ? "pass" : "fail",
+        summary: details.length === 0 ? "Fleet registry is in parity" : `${details.length} registry parity issue(s) detected`,
+        details,
+        fixable: true
+      };
+    },
+    migrate: (ctx, finding) => {
+      const changedFiles = [];
+      const details = [];
+      const registryPath2 = join15(ctx.homeDir, ".hermes", "agents-registry.yaml");
+      const raw = safeReadText(registryPath2);
+      if (raw === null) {
+        return { id: finding.id, title: finding.title, status: "blocked", summary: `registry unreadable at ${registryPath2}`, changedFiles, details };
+      }
+      let doc;
+      try {
+        doc = YAML3.parse(raw);
+      } catch {
+        return { id: finding.id, title: finding.title, status: "blocked", summary: "registry is not valid YAML", changedFiles, details };
+      }
+      const agents = doc?.agents ?? {};
+      const roles = discoverRoles(ctx.repoRoot);
+      const canonical = new Set(roles.map((role) => role.agentId).filter(Boolean));
+      const unprovisioned = unprovisionedRoleAgents(agents, ctx.repoRoot, canonical);
+      if (unprovisioned.length) {
+        return {
+          id: finding.id,
+          title: finding.title,
+          status: "blocked",
+          summary: "Registry parity is blocked by an unprovisioned Hermes role",
+          changedFiles,
+          details: unprovisioned.map(
+            ({ agentId, roleDir, sources }) => `blocked: "${agentId}" (${sources.join(" + ")}) has no role.yaml${roleDir ? ` at ${roleDir}` : ""}; provision or restore the role without pruning registry/declaration state`
+          )
+        };
+      }
+      const fleetBin = fleetBinPath(ctx);
+      let dirty = false;
+      if (canonical.size === 0) {
+        for (const [agentId] of ownedRegistryEntries(agents, ctx.repoRoot)) {
+          details.push(`blocked: "${agentId}" has no role.yaml; provision the role instead of pruning the registry`);
+        }
+        for (const agentId of declaredAgentIds(ctx.repoRoot)) {
+          if (!details.some((detail) => detail.includes(`"${agentId}"`))) {
+            details.push(`blocked: "${agentId}" is declared but has no role.yaml; provision or restore the role`);
+          }
+        }
+        if (details.length) {
+          return {
+            id: finding.id,
+            title: finding.title,
+            status: "blocked",
+            summary: "Registry parity is blocked by an unprovisioned Hermes role",
+            changedFiles,
+            details
+          };
+        }
+      }
+      for (const [agentId, entry] of ownedRegistryEntries(agents, ctx.repoRoot)) {
+        if (canonical.size > 0 && !canonical.has(agentId)) {
+          details.push(`drop stale/duplicate registry agent "${agentId}"`);
+          delete agents[agentId];
+          dropDeclaredAgent(ctx, agentId, changedFiles, details);
+          dirty = true;
+          continue;
+        }
+        const hermes = entry.hermes ?? {};
+        if (fleetBin && String(hermes.bin ?? "") !== fleetBin && !existsSync10(String(hermes.bin ?? ""))) {
+          details.push(`repoint ${agentId} hermes.bin -> ${fleetBin}`);
+          hermes.bin = fleetBin;
+          entry.hermes = hermes;
+          dirty = true;
+        }
+        if (hermes.oauth_file) {
+          details.push(`drop dead hermes.oauth_file from ${agentId}`);
+          delete hermes.oauth_file;
+          dirty = true;
+        }
+      }
+      if (canonical.size > 0) {
+        for (const extra of declaredAgentIds(ctx.repoRoot).filter((id) => !canonical.has(id))) {
+          dropDeclaredAgent(ctx, extra, changedFiles, details);
+        }
+      }
+      if (dirty) {
+        changedFiles.push(registryPath2);
+        if (!ctx.dryRun) {
+          doc.agents = agents;
+          writeText(registryPath2, YAML3.stringify(doc));
+        }
+      }
+      return {
+        id: finding.id,
+        title: finding.title,
+        status: changedFiles.length ? ctx.dryRun ? "skipped" : "applied" : "noop",
+        summary: changedFiles.length ? ctx.dryRun ? "Planned registry repair" : "Fleet registry repaired" : "No changes required",
+        changedFiles,
+        details
+      };
+    }
   }
 ];
 function writeIfDifferent(path, content, dryRun, changedFiles, mode) {
@@ -4026,7 +5848,7 @@ function writeIfDifferent(path, content, dryRun, changedFiles, mode) {
   changedFiles.push(path);
   if (!dryRun) {
     writeText(path, normalized);
-    if (mode) chmodSync2(path, mode);
+    if (mode) chmodSync4(path, mode);
   }
 }
 function getParityRuleIds() {
@@ -4035,7 +5857,7 @@ function getParityRuleIds() {
 function runAudit(repoArg) {
   const pjanglerRoot = resolvePjanglerRoot2();
   const ctx = {
-    repoRoot: resolve2(repoArg ?? process.cwd()),
+    repoRoot: resolve3(repoArg ?? process.cwd()),
     dryRun: true,
     pjanglerRoot,
     homeDir: homedir5()
@@ -4051,7 +5873,7 @@ function runAudit(repoArg) {
 function runMigrationForRules(ruleIds, repoArg, dryRun) {
   const pjanglerRoot = resolvePjanglerRoot2();
   const ctx = {
-    repoRoot: resolve2(repoArg ?? process.cwd()),
+    repoRoot: resolve3(repoArg ?? process.cwd()),
     dryRun,
     pjanglerRoot,
     homeDir: homedir5()
@@ -4085,7 +5907,22 @@ function runMigrationForRules(ruleIds, repoArg, dryRun) {
   };
 }
 function runMigration(selector, repoArg, dryRun, all) {
-  const ruleIds = all ? RULES.map((rule) => rule.id) : selector ? [selector] : [];
+  if (all) {
+    const audit = runAudit(repoArg);
+    const ruleIds2 = audit.rules.filter((finding) => finding.fixable && (finding.status === "fail" || finding.status === "warn")).map((finding) => finding.id);
+    if (ruleIds2.length === 0) {
+      return {
+        repo: audit.repo,
+        dryRun,
+        ok: true,
+        selectedRules: [],
+        results: [],
+        changedFiles: []
+      };
+    }
+    return runMigrationForRules(ruleIds2, repoArg, dryRun);
+  }
+  const ruleIds = selector ? [selector] : [];
   return runMigrationForRules(ruleIds, repoArg, dryRun);
 }
 function prettyTimestamp(iso) {
@@ -4122,8 +5959,8 @@ var server = new McpServer({
 });
 var TICKET_PROVIDER_SCHEMA = z.enum(["plane", "trello"]);
 function resolveTargetDir(targetDir) {
-  const dir = resolve3(targetDir ?? process.cwd());
-  if (!existsSync10(dir)) {
+  const dir = resolve4(targetDir ?? process.cwd());
+  if (!existsSync11(dir)) {
     throw new Error(`Target directory does not exist: ${dir}`);
   }
   if (!statSync2(dir).isDirectory()) {
@@ -4134,7 +5971,7 @@ function resolveTargetDir(targetDir) {
 function resolvePjanglerRoot3() {
   let dir = dirname8(fileURLToPath5(import.meta.url));
   while (dir !== dirname8(dir)) {
-    if (existsSync10(join13(dir, "package.json")) && existsSync10(join13(dir, "templates", "commonproject", "copier.yml"))) {
+    if (existsSync11(join16(dir, "package.json")) && existsSync11(join16(dir, "templates", "commonproject", "copier.yml"))) {
       return dir;
     }
     dir = dirname8(dir);
@@ -4335,9 +6172,9 @@ server.registerTool(
     try {
       const pjanglerRoot = resolvePjanglerRoot3();
       const projectSlug = input.projectSlug ?? slugify(input.projectName);
-      const parentDir = resolve3(input.parentDir ?? process.cwd());
-      if (!existsSync10(parentDir) || !statSync2(parentDir).isDirectory()) throw new Error(`Parent directory does not exist: ${parentDir}`);
-      const targetDir = resolve3(input.targetDir ?? join13(parentDir, projectSlug));
+      const parentDir = resolve4(input.parentDir ?? process.cwd());
+      if (!existsSync11(parentDir) || !statSync2(parentDir).isDirectory()) throw new Error(`Parent directory does not exist: ${parentDir}`);
+      const targetDir = resolve4(input.targetDir ?? join16(parentDir, projectSlug));
       const overwrite = input.overwrite ?? input.force ?? false;
       const dryRun = input.dryRun ?? true;
       const local = input.local ?? true;
@@ -4347,7 +6184,7 @@ server.registerTool(
       if (!skipPlane && ticketProvider === "plane" && !boardId) {
         throw new Error("boardId or planeProjectId is required when skipPlane=false for Plane; keep skipPlane=true for safe local bootstrap");
       }
-      if (!dryRun && existsSync10(targetDir) && !overwrite) throw new Error(`Target already exists: ${targetDir} (set force/overwrite=true to re-render)`);
+      if (!dryRun && existsSync11(targetDir) && !overwrite) throw new Error(`Target already exists: ${targetDir} (set force/overwrite=true to re-render)`);
       const plan = planProjectInit({
         name: input.projectName,
         description: input.projectDescription,
@@ -4580,7 +6417,7 @@ server.registerTool(
         targetDir: resolvedTarget,
         yes: true,
         local,
-        targetRepo: input.targetRepo ?? basename4(resolvedTarget),
+        targetRepo: input.targetRepo ?? basename5(resolvedTarget),
         role: input.role,
         agentPurpose: input.agentPurpose,
         soulTone: input.soulTone,