@delorenj/pjangler 1.2.14 → 1.2.17

package/dist/index.js

@@ -2122,72 +2122,48 @@ import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { homedir as homedir5 } from "node:os";
 import { spawnSync as spawnSync6 } from "node:child_process";
 import YAML2 from "yaml";
-var LINK_AGENTFILES_BLOCK = `# This block will handle the linking of
+var LINK_AGENTFILES_SCRIPT = "'{{config_root}}/.mise/scripts/link-agentfiles.sh'";
+var OP_INJECT_SCRIPT = "op inject -i .env.op > .env";
+var CODEGRAPH_SCRIPT = "[ -f '{{config_root}}/.mise/scripts/codegraph.sh' ] && '{{config_root}}/.mise/scripts/codegraph.sh' || true";
+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.
-[hooks]
-enter = [
-  "{{config_root}}/.mise/scripts/link-agentfiles.sh",
-  "op inject -i .env.op > .env",
-]
-
-[[watch_files]]
-patterns = ["AGENTS.md"]
-task = "link-agentfiles"
-
-[tasks.link-agentfiles]
-description = "Symlink all agent files to AGENTS.md"
-run = "{{config_root}}/.mise/scripts/link-agentfiles.sh"`;
-var LINK_AGENTFILES_HOOK_ENTRIES = [
-  "{{config_root}}/.mise/scripts/link-agentfiles.sh",
-  "op inject -i .env.op > .env"
-];
-var LINK_AGENTFILES_HOOKS_BLOCK = `# 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.
-[hooks]
-enter = [
-  "{{config_root}}/.mise/scripts/link-agentfiles.sh",
-  "op inject -i .env.op > .env",
-]`;
+# any given level of nesting.`;
+var LINK_AGENTFILES_HOOK_ENTRIES = [LINK_AGENTFILES_SCRIPT, OP_INJECT_SCRIPT];
 var LINK_AGENTFILES_WATCH_TASK_BLOCK = `[[watch_files]]
 patterns = ["AGENTS.md"]
 task = "link-agentfiles"
 
 [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'"`;
 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)"
-run = "{{config_root}}/.mise/scripts/versioning.sh current"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' current"
 
 [tasks."version:bump"]
 description = "Bump patch version: vX.Y.Z -> vX.Y.(Z+1)"
 alias = "version:bump-patch"
-run = "{{config_root}}/.mise/scripts/versioning.sh bump patch"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' bump patch"
 
 [tasks."version:bump-minor"]
 description = "Bump minor version: vX.Y.Z -> vX.(Y+1).0"
-run = "{{config_root}}/.mise/scripts/versioning.sh bump minor"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' bump minor"
 
 [tasks."version:bump-major"]
 description = "Bump major version: vX.Y.Z -> v(X+1).0.0"
-run = "{{config_root}}/.mise/scripts/versioning.sh bump major"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' bump major"
 
 [tasks."version:check"]
 description = "Verify every versioned file is in parity"
-run = "{{config_root}}/.mise/scripts/versioning.sh check"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' check"
 
 [tasks."version:sync"]
 description = "Force every versioned file up to the highest version"
-run = "{{config_root}}/.mise/scripts/versioning.sh sync"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' sync"
 # <<< mise-versioning <<<`;
 function resolvePjanglerRoot2() {
   let dir = dirname6(fileURLToPath3(import.meta.url));
@@ -2488,6 +2464,9 @@ function removeTomlSection(text3, headerPattern, marker, options) {
     break;
   }
   if (start === -1) return text3;
+  while (end > start + 1 && (lines[end - 1].trim() === "" || lines[end - 1].trim().startsWith("#"))) {
+    end--;
+  }
   if (options?.includePrecedingComments) {
     while (start > 0 && lines[start - 1].trim().startsWith("#")) {
       start--;
@@ -2524,57 +2503,113 @@ function extractTomlStrings(text3) {
   }
   return values;
 }
+function stripTomlStringsAndComments(line) {
+  return line.replace(/"(?:\\.|[^"\\])*"/g, '""').replace(/'[^']*'/g, "''").replace(/#.*$/, "");
+}
 function isManagedHookEntry(value) {
   const trimmed = value.trim();
-  return trimmed === "op inject -i .env.op > .env" || /(^|\/)link-agentfiles\.sh$/.test(trimmed);
+  if (trimmed === OP_INJECT_SCRIPT) return true;
+  return /link-agentfiles\.sh'?\s*$/.test(trimmed);
 }
-function renderHookEntries(entries, indent = "") {
-  return [
-    `${indent}enter = [`,
-    ...entries.map((entry) => `${indent}  ${JSON.stringify(entry)},`),
-    `${indent}]`
-  ];
+function normalizeHookScript(script) {
+  const trimmed = script.trim();
+  if (/codegraph\.sh/.test(trimmed)) return CODEGRAPH_SCRIPT;
+  return trimmed;
 }
-function upsertLinkAgentfilesHooks(text3) {
-  const lines = text3.split("\n");
-  const hooksStart = lines.findIndex((line) => /^\[hooks\]$/.test(line.trim()));
-  if (hooksStart === -1) return insertTomlBlockBeforeVersioning(text3, LINK_AGENTFILES_HOOKS_BLOCK);
-  let hooksEnd = lines.length;
-  for (let i = hooksStart + 1; i < lines.length; i++) {
-    if (/^\[[^\]]+\]/.test(lines[i].trim())) {
-      hooksEnd = i;
-      break;
+function tomlValueSpanEnd(lines, start, limit) {
+  let depth = 0;
+  let j = start;
+  for (; j < limit; j++) {
+    for (const ch of stripTomlStringsAndComments(lines[j])) {
+      if (ch === "[") depth++;
+      else if (ch === "]") depth--;
     }
+    if (depth <= 0) break;
   }
-  let enterStart = -1;
-  let enterEnd = -1;
-  for (let i = hooksStart + 1; i < hooksEnd; i++) {
-    if (!/^\s*enter\s*=/.test(lines[i])) continue;
-    enterStart = i;
-    enterEnd = i + 1;
-    const afterEquals = lines[i].slice(lines[i].indexOf("=") + 1);
-    if (afterEquals.includes("[") && !afterEquals.includes("]")) {
-      while (enterEnd < hooksEnd && !lines[enterEnd].includes("]")) enterEnd++;
-      if (enterEnd < hooksEnd) enterEnd++;
+  return Math.min(j, limit - 1) + 1;
+}
+function stripHookBlocks(text3) {
+  const lines = text3.split("\n");
+  const enter = [];
+  const leave = [];
+  const drop = new Array(lines.length).fill(false);
+  const isHeader = (line) => /^\[/.test(line.trim());
+  const dropPrecedingComments = (idx) => {
+    for (let k = idx - 1; k >= 0 && !drop[k] && lines[k].trim().startsWith("#"); k--) drop[k] = true;
+  };
+  for (let i = 0; i < lines.length; i++) {
+    const trimmed = lines[i].trim();
+    const tableMatch = /^\[\[\s*hooks\.(enter|leave)\s*\]\]$/.exec(trimmed);
+    if (tableMatch) {
+      const bucket = tableMatch[1] === "enter" ? enter : leave;
+      dropPrecedingComments(i);
+      drop[i] = true;
+      let j = i + 1;
+      for (; j < lines.length; j++) {
+        const body = lines[j].trim();
+        if (body === "" || body.startsWith("#") || isHeader(lines[j])) break;
+        drop[j] = true;
+        const scriptMatch = /^\s*script\s*=\s*(.+)$/.exec(lines[j]);
+        if (scriptMatch) {
+          const value = extractTomlStrings(scriptMatch[1])[0];
+          if (value !== void 0) bucket.push(value);
+        }
+      }
+      i = j - 1;
+      continue;
+    }
+    if (trimmed === "[hooks]") {
+      dropPrecedingComments(i);
+      let j = i + 1;
+      let lastDrop = i;
+      while (j < lines.length && !isHeader(lines[j])) {
+        const keyMatch = /^\s*(enter|leave)\s*=/.exec(lines[j]);
+        if (keyMatch) {
+          const bucket = keyMatch[1] === "enter" ? enter : leave;
+          const end = tomlValueSpanEnd(lines, j, lines.length);
+          for (const value of extractTomlStrings(lines.slice(j, end).join("\n"))) bucket.push(value);
+          lastDrop = end - 1;
+          j = end;
+        } else if (/^\s*\]\s*$/.test(lines[j])) {
+          lastDrop = j;
+          j++;
+        } else {
+          j++;
+        }
+      }
+      for (let k = i; k <= lastDrop; k++) drop[k] = true;
+      i = j - 1;
+      continue;
     }
-    break;
-  }
-  const existingBlock = enterStart >= 0 ? lines.slice(enterStart, enterEnd).join("\n") : "";
-  const preserved = extractTomlStrings(existingBlock).filter((entry) => !isManagedHookEntry(entry));
-  const merged = [...LINK_AGENTFILES_HOOK_ENTRIES];
-  for (const entry of preserved) {
-    if (!merged.includes(entry)) merged.push(entry);
   }
-  const indent = enterStart >= 0 ? lines[enterStart].match(/^\s*/)?.[0] ?? "" : "";
-  const rendered = renderHookEntries(merged, indent);
-  if (enterStart >= 0) {
-    return lines.slice(0, enterStart).concat(rendered, lines.slice(enterEnd)).join("\n").replace(/\n{3,}/g, "\n\n").replace(/\n+$/, "\n");
+  const kept = lines.filter((_, idx) => !drop[idx]).join("\n").replace(/\n{3,}/g, "\n\n").replace(/\n+$/, "\n");
+  return { text: kept, enter, leave };
+}
+function renderHookTables(scripts, kind) {
+  return scripts.map((script) => `[[hooks.${kind}]]
+script = ${JSON.stringify(script)}`);
+}
+function dedupePreserve(scripts) {
+  const out = [];
+  for (const script of scripts) {
+    if (script && !out.includes(script)) out.push(script);
   }
-  return lines.slice(0, hooksStart + 1).concat(rendered, lines.slice(hooksStart + 1)).join("\n").replace(/\n{3,}/g, "\n\n").replace(/\n+$/, "\n");
+  return out;
+}
+function upsertLinkAgentfilesHooks(text3) {
+  const { text: stripped, enter, leave } = stripHookBlocks(text3);
+  const preservedEnter = enter.map(normalizeHookScript).filter((script) => !isManagedHookEntry(script));
+  const enterScripts = dedupePreserve([...LINK_AGENTFILES_HOOK_ENTRIES, ...preservedEnter]);
+  const leaveScripts = dedupePreserve(leave.map(normalizeHookScript));
+  const block = [
+    HOOKS_COMMENT_HEADER,
+    ...renderHookTables(enterScripts, "enter"),
+    ...renderHookTables(leaveScripts, "leave")
+  ].join("\n");
+  return insertTomlBlockBeforeVersioning(stripped, block);
 }
 function upsertLinkAgentfilesBlock(text3, ctx) {
   const withPath = upsertMisePath(text3, requiredMisePathEntries(ctx));
-  if (withPath.includes(LINK_AGENTFILES_BLOCK)) return withPath;
   let cleaned = removeTomlSection(withPath, /^\[tasks\.link-agentfiles\]$/, /link-agentfiles/, { includePrecedingComments: false });
   cleaned = removeTomlSection(cleaned, /^\[\[watch_files\]\]$/, /AGENTS\.md/, { includePrecedingComments: false });
   cleaned = upsertLinkAgentfilesHooks(cleaned);
@@ -3074,8 +3109,8 @@ var RULES = [
       const pathValues = [...(text3.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(", ")}`);
-      if (!text3.includes('"{{config_root}}/.mise/scripts/link-agentfiles.sh"')) details.push("link-agentfiles must use raw {{config_root}} guard");
-      if (!text3.includes("op inject -i .env.op > .env")) details.push("[hooks].enter must materialize .env from .env.op");
+      if (!text3.includes("'{{config_root}}/.mise/scripts/link-agentfiles.sh'")) details.push("link-agentfiles hook must use single-quoted {{config_root}} guard");
+      if (!text3.includes("op inject -i .env.op > .env")) details.push("hooks.enter must materialize .env from .env.op");
       if (!text3.includes('patterns = ["AGENTS.md"]')) details.push("watch_files must monitor AGENTS.md");
       if (!text3.includes('task = "link-agentfiles"')) details.push("watch_files must dispatch link-agentfiles task");
       return {

package/dist/mcp-server.js

@@ -2049,72 +2049,48 @@ import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { homedir as homedir5 } from "node:os";
 import { spawnSync as spawnSync6 } from "node:child_process";
 import YAML2 from "yaml";
-var LINK_AGENTFILES_BLOCK = `# This block will handle the linking of
+var LINK_AGENTFILES_SCRIPT = "'{{config_root}}/.mise/scripts/link-agentfiles.sh'";
+var OP_INJECT_SCRIPT = "op inject -i .env.op > .env";
+var CODEGRAPH_SCRIPT = "[ -f '{{config_root}}/.mise/scripts/codegraph.sh' ] && '{{config_root}}/.mise/scripts/codegraph.sh' || true";
+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.
-[hooks]
-enter = [
-  "{{config_root}}/.mise/scripts/link-agentfiles.sh",
-  "op inject -i .env.op > .env",
-]
-
-[[watch_files]]
-patterns = ["AGENTS.md"]
-task = "link-agentfiles"
-
-[tasks.link-agentfiles]
-description = "Symlink all agent files to AGENTS.md"
-run = "{{config_root}}/.mise/scripts/link-agentfiles.sh"`;
-var LINK_AGENTFILES_HOOK_ENTRIES = [
-  "{{config_root}}/.mise/scripts/link-agentfiles.sh",
-  "op inject -i .env.op > .env"
-];
-var LINK_AGENTFILES_HOOKS_BLOCK = `# 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.
-[hooks]
-enter = [
-  "{{config_root}}/.mise/scripts/link-agentfiles.sh",
-  "op inject -i .env.op > .env",
-]`;
+# any given level of nesting.`;
+var LINK_AGENTFILES_HOOK_ENTRIES = [LINK_AGENTFILES_SCRIPT, OP_INJECT_SCRIPT];
 var LINK_AGENTFILES_WATCH_TASK_BLOCK = `[[watch_files]]
 patterns = ["AGENTS.md"]
 task = "link-agentfiles"
 
 [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'"`;
 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)"
-run = "{{config_root}}/.mise/scripts/versioning.sh current"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' current"
 
 [tasks."version:bump"]
 description = "Bump patch version: vX.Y.Z -> vX.Y.(Z+1)"
 alias = "version:bump-patch"
-run = "{{config_root}}/.mise/scripts/versioning.sh bump patch"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' bump patch"
 
 [tasks."version:bump-minor"]
 description = "Bump minor version: vX.Y.Z -> vX.(Y+1).0"
-run = "{{config_root}}/.mise/scripts/versioning.sh bump minor"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' bump minor"
 
 [tasks."version:bump-major"]
 description = "Bump major version: vX.Y.Z -> v(X+1).0.0"
-run = "{{config_root}}/.mise/scripts/versioning.sh bump major"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' bump major"
 
 [tasks."version:check"]
 description = "Verify every versioned file is in parity"
-run = "{{config_root}}/.mise/scripts/versioning.sh check"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' check"
 
 [tasks."version:sync"]
 description = "Force every versioned file up to the highest version"
-run = "{{config_root}}/.mise/scripts/versioning.sh sync"
+run = "'{{config_root}}/.mise/scripts/versioning.sh' sync"
 # <<< mise-versioning <<<`;
 function resolvePjanglerRoot2() {
   let dir = dirname7(fileURLToPath4(import.meta.url));
@@ -2415,6 +2391,9 @@ function removeTomlSection(text2, headerPattern, marker, options) {
     break;
   }
   if (start === -1) return text2;
+  while (end > start + 1 && (lines[end - 1].trim() === "" || lines[end - 1].trim().startsWith("#"))) {
+    end--;
+  }
   if (options?.includePrecedingComments) {
     while (start > 0 && lines[start - 1].trim().startsWith("#")) {
       start--;
@@ -2451,57 +2430,113 @@ function extractTomlStrings(text2) {
   }
   return values;
 }
+function stripTomlStringsAndComments(line) {
+  return line.replace(/"(?:\\.|[^"\\])*"/g, '""').replace(/'[^']*'/g, "''").replace(/#.*$/, "");
+}
 function isManagedHookEntry(value) {
   const trimmed = value.trim();
-  return trimmed === "op inject -i .env.op > .env" || /(^|\/)link-agentfiles\.sh$/.test(trimmed);
+  if (trimmed === OP_INJECT_SCRIPT) return true;
+  return /link-agentfiles\.sh'?\s*$/.test(trimmed);
 }
-function renderHookEntries(entries, indent = "") {
-  return [
-    `${indent}enter = [`,
-    ...entries.map((entry) => `${indent}  ${JSON.stringify(entry)},`),
-    `${indent}]`
-  ];
+function normalizeHookScript(script) {
+  const trimmed = script.trim();
+  if (/codegraph\.sh/.test(trimmed)) return CODEGRAPH_SCRIPT;
+  return trimmed;
 }
-function upsertLinkAgentfilesHooks(text2) {
-  const lines = text2.split("\n");
-  const hooksStart = lines.findIndex((line) => /^\[hooks\]$/.test(line.trim()));
-  if (hooksStart === -1) return insertTomlBlockBeforeVersioning(text2, LINK_AGENTFILES_HOOKS_BLOCK);
-  let hooksEnd = lines.length;
-  for (let i = hooksStart + 1; i < lines.length; i++) {
-    if (/^\[[^\]]+\]/.test(lines[i].trim())) {
-      hooksEnd = i;
-      break;
+function tomlValueSpanEnd(lines, start, limit) {
+  let depth = 0;
+  let j = start;
+  for (; j < limit; j++) {
+    for (const ch of stripTomlStringsAndComments(lines[j])) {
+      if (ch === "[") depth++;
+      else if (ch === "]") depth--;
     }
+    if (depth <= 0) break;
   }
-  let enterStart = -1;
-  let enterEnd = -1;
-  for (let i = hooksStart + 1; i < hooksEnd; i++) {
-    if (!/^\s*enter\s*=/.test(lines[i])) continue;
-    enterStart = i;
-    enterEnd = i + 1;
-    const afterEquals = lines[i].slice(lines[i].indexOf("=") + 1);
-    if (afterEquals.includes("[") && !afterEquals.includes("]")) {
-      while (enterEnd < hooksEnd && !lines[enterEnd].includes("]")) enterEnd++;
-      if (enterEnd < hooksEnd) enterEnd++;
+  return Math.min(j, limit - 1) + 1;
+}
+function stripHookBlocks(text2) {
+  const lines = text2.split("\n");
+  const enter = [];
+  const leave = [];
+  const drop = new Array(lines.length).fill(false);
+  const isHeader = (line) => /^\[/.test(line.trim());
+  const dropPrecedingComments = (idx) => {
+    for (let k = idx - 1; k >= 0 && !drop[k] && lines[k].trim().startsWith("#"); k--) drop[k] = true;
+  };
+  for (let i = 0; i < lines.length; i++) {
+    const trimmed = lines[i].trim();
+    const tableMatch = /^\[\[\s*hooks\.(enter|leave)\s*\]\]$/.exec(trimmed);
+    if (tableMatch) {
+      const bucket = tableMatch[1] === "enter" ? enter : leave;
+      dropPrecedingComments(i);
+      drop[i] = true;
+      let j = i + 1;
+      for (; j < lines.length; j++) {
+        const body = lines[j].trim();
+        if (body === "" || body.startsWith("#") || isHeader(lines[j])) break;
+        drop[j] = true;
+        const scriptMatch = /^\s*script\s*=\s*(.+)$/.exec(lines[j]);
+        if (scriptMatch) {
+          const value = extractTomlStrings(scriptMatch[1])[0];
+          if (value !== void 0) bucket.push(value);
+        }
+      }
+      i = j - 1;
+      continue;
+    }
+    if (trimmed === "[hooks]") {
+      dropPrecedingComments(i);
+      let j = i + 1;
+      let lastDrop = i;
+      while (j < lines.length && !isHeader(lines[j])) {
+        const keyMatch = /^\s*(enter|leave)\s*=/.exec(lines[j]);
+        if (keyMatch) {
+          const bucket = keyMatch[1] === "enter" ? enter : leave;
+          const end = tomlValueSpanEnd(lines, j, lines.length);
+          for (const value of extractTomlStrings(lines.slice(j, end).join("\n"))) bucket.push(value);
+          lastDrop = end - 1;
+          j = end;
+        } else if (/^\s*\]\s*$/.test(lines[j])) {
+          lastDrop = j;
+          j++;
+        } else {
+          j++;
+        }
+      }
+      for (let k = i; k <= lastDrop; k++) drop[k] = true;
+      i = j - 1;
+      continue;
     }
-    break;
-  }
-  const existingBlock = enterStart >= 0 ? lines.slice(enterStart, enterEnd).join("\n") : "";
-  const preserved = extractTomlStrings(existingBlock).filter((entry) => !isManagedHookEntry(entry));
-  const merged = [...LINK_AGENTFILES_HOOK_ENTRIES];
-  for (const entry of preserved) {
-    if (!merged.includes(entry)) merged.push(entry);
   }
-  const indent = enterStart >= 0 ? lines[enterStart].match(/^\s*/)?.[0] ?? "" : "";
-  const rendered = renderHookEntries(merged, indent);
-  if (enterStart >= 0) {
-    return lines.slice(0, enterStart).concat(rendered, lines.slice(enterEnd)).join("\n").replace(/\n{3,}/g, "\n\n").replace(/\n+$/, "\n");
+  const kept = lines.filter((_, idx) => !drop[idx]).join("\n").replace(/\n{3,}/g, "\n\n").replace(/\n+$/, "\n");
+  return { text: kept, enter, leave };
+}
+function renderHookTables(scripts, kind) {
+  return scripts.map((script) => `[[hooks.${kind}]]
+script = ${JSON.stringify(script)}`);
+}
+function dedupePreserve(scripts) {
+  const out = [];
+  for (const script of scripts) {
+    if (script && !out.includes(script)) out.push(script);
   }
-  return lines.slice(0, hooksStart + 1).concat(rendered, lines.slice(hooksStart + 1)).join("\n").replace(/\n{3,}/g, "\n\n").replace(/\n+$/, "\n");
+  return out;
+}
+function upsertLinkAgentfilesHooks(text2) {
+  const { text: stripped, enter, leave } = stripHookBlocks(text2);
+  const preservedEnter = enter.map(normalizeHookScript).filter((script) => !isManagedHookEntry(script));
+  const enterScripts = dedupePreserve([...LINK_AGENTFILES_HOOK_ENTRIES, ...preservedEnter]);
+  const leaveScripts = dedupePreserve(leave.map(normalizeHookScript));
+  const block = [
+    HOOKS_COMMENT_HEADER,
+    ...renderHookTables(enterScripts, "enter"),
+    ...renderHookTables(leaveScripts, "leave")
+  ].join("\n");
+  return insertTomlBlockBeforeVersioning(stripped, block);
 }
 function upsertLinkAgentfilesBlock(text2, ctx) {
   const withPath = upsertMisePath(text2, requiredMisePathEntries(ctx));
-  if (withPath.includes(LINK_AGENTFILES_BLOCK)) return withPath;
   let cleaned = removeTomlSection(withPath, /^\[tasks\.link-agentfiles\]$/, /link-agentfiles/, { includePrecedingComments: false });
   cleaned = removeTomlSection(cleaned, /^\[\[watch_files\]\]$/, /AGENTS\.md/, { includePrecedingComments: false });
   cleaned = upsertLinkAgentfilesHooks(cleaned);
@@ -3001,8 +3036,8 @@ var RULES = [
       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(", ")}`);
-      if (!text2.includes('"{{config_root}}/.mise/scripts/link-agentfiles.sh"')) details.push("link-agentfiles must use raw {{config_root}} guard");
-      if (!text2.includes("op inject -i .env.op > .env")) details.push("[hooks].enter must materialize .env from .env.op");
+      if (!text2.includes("'{{config_root}}/.mise/scripts/link-agentfiles.sh'")) details.push("link-agentfiles hook must use single-quoted {{config_root}} guard");
+      if (!text2.includes("op inject -i .env.op > .env")) details.push("hooks.enter must materialize .env from .env.op");
       if (!text2.includes('patterns = ["AGENTS.md"]')) details.push("watch_files must monitor AGENTS.md");
       if (!text2.includes('task = "link-agentfiles"')) details.push("watch_files must dispatch link-agentfiles task");
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delorenj/pjangler",
-  "version": "1.2.14",
+  "version": "1.2.17",
   "description": "Project subsystem bootstrapper CLI",
   "type": "module",
   "main": "dist/index.js",

package/templates/commonproject/mise.toml

@@ -10,7 +10,7 @@ CODEX_HOME = { value = ".codex", path = true }
 # i.e. All linked agent files MUST be siblings at 
 # any given level of nesting.
 [hooks]
-enter = '{{config_root}}/.mise/scripts/link-agentfiles.sh'
+enter = "'{{config_root}}/.mise/scripts/link-agentfiles.sh'"
 
 [[watch_files]]
 patterns = ["AGENTS.md"]

package/templates/commonproject/template/mise.toml.jinja

@@ -11,21 +11,27 @@ _.file = [".env"]
 # TODO: Ensure this works for all levels of nesting.
 # i.e. All linked agent files MUST be siblings at
 # any given level of nesting.
-[hooks]
-enter = [
-  "{% raw %}{{config_root}}{% endraw %}/.mise/scripts/link-agentfiles.sh",
-  "op inject -i .env.op > .env",
-  "[ -f {% raw %}{{config_root}}{% endraw %}/.mise/scripts/codegraph.sh ] && {% raw %}{{config_root}}{% endraw %}/.mise/scripts/codegraph.sh || true",
+#
+# NOTE: hooks are an array of [[hooks.enter]] tables (NOT enter = [ ... ]) and
+# every {{config_root}} path is single-quoted so it survives a space in the
+# project path — mise runs each `script` via `sh -c`.
+[[hooks.enter]]
+script = "'{% raw %}{{config_root}}{% endraw %}/.mise/scripts/link-agentfiles.sh'"
+[[hooks.enter]]
+script = "op inject -i .env.op > .env"
+[[hooks.enter]]
+script = "[ -f '{% raw %}{{config_root}}{% endraw %}/.mise/scripts/codegraph.sh' ] && '{% raw %}{{config_root}}{% endraw %}/.mise/scripts/codegraph.sh' || true"
 {%- if agent_hooks_layer %}
-  "{% raw %}{{config_root}}{% endraw %}/.mise/scripts/link-project-skills-to-clis.sh",
-  "{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py --install --quiet",
+[[hooks.enter]]
+script = "'{% raw %}{{config_root}}{% endraw %}/.mise/scripts/link-project-skills-to-clis.sh'"
+[[hooks.enter]]
+script = "'{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py' --install --quiet"
 {%- endif %}
-]
 {%- if agent_hooks_layer %}
-leave = [
-  "{% raw %}{{config_root}}{% endraw %}/.mise/scripts/unlink-project-skills-from-clis.sh",
-  "{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py --uninstall --quiet",
-]
+[[hooks.leave]]
+script = "'{% raw %}{{config_root}}{% endraw %}/.mise/scripts/unlink-project-skills-from-clis.sh'"
+[[hooks.leave]]
+script = "'{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py' --uninstall --quiet"
 {%- endif %}
 
 [[watch_files]]
@@ -39,34 +45,34 @@ task = "hooks-sync"
 {% endif %}
 [tasks.link-agentfiles]
 description = "Symlink all agent files to AGENTS.md"
-run = "{% raw %}{{config_root}}{% endraw %}/.mise/scripts/link-agentfiles.sh"
+run = "'{% raw %}{{config_root}}{% endraw %}/.mise/scripts/link-agentfiles.sh'"
 {% if agent_hooks_layer %}
 # --- Project-scoped agent hooks + skill fan-out (see .agents/hooks/README.md) ---
 
 [tasks.hooks-sync]
 description = "Fan out .agents/hooks/hooks.master.json to each agent CLI (claude committed; codex/kimi injected; hermes adapter)"
-run = "{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py --install"
+run = "'{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py' --install"
 
 [tasks.hooks-check]
 description = "Drift gate: verify generated hook configs match hooks.master.json (CI-safe, read-only)"
-run = "{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py --check"
+run = "'{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py' --check"
 
 [tasks.hooks-uninstall]
 description = "Remove per-user agent-hook injections (codex/kimi/hermes)"
-run = "{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py --uninstall"
+run = "'{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py' --uninstall"
 
 [tasks.link-project-skills-to-clis]
 description = "Fan .agents/skills out to each agent CLI; honors local.json defer_to_global + disabled"
-run = "{% raw %}{{config_root}}{% endraw %}/.mise/scripts/link-project-skills-to-clis.sh"
+run = "'{% raw %}{{config_root}}{% endraw %}/.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 = "{% raw %}{{config_root}}{% endraw %}/.mise/scripts/unlink-project-skills-from-clis.sh"
+run = "'{% raw %}{{config_root}}{% endraw %}/.mise/scripts/unlink-project-skills-from-clis.sh'"
 
 [tasks.skills-relink]
 description = "Re-fan the project skill set to all CLIs"
-run = "{% raw %}{{config_root}}{% endraw %}/.mise/scripts/link-project-skills-to-clis.sh"
+run = "'{% raw %}{{config_root}}{% endraw %}/.mise/scripts/link-project-skills-to-clis.sh'"
 {% endif %}
 [tasks.hindsight-setup]
 description = "Provision this dev's shared project Hindsight key from 1Password into .env (op inject)"
-run = "{% raw %}{{config_root}}{% endraw %}/.mise/scripts/hindsight-setup.sh"
+run = "'{% raw %}{{config_root}}{% endraw %}/.mise/scripts/hindsight-setup.sh'"