skalpel 4.0.26 → 4.0.27

package/install.mjs

@@ -252,46 +252,80 @@ function tomlBlock(event, marker, command) {
   return `\n${tomlMark(event, marker)}\n[[hooks.${event}]]\n[[hooks.${event}.hooks]]\ntype = "command"\ncommand = ${tomlString(command)}\ntimeout = 8\n`;
 }
 
+// Remove ONLY skalpel's own hook blocks from a Codex config.toml, leaving every foreign block
+// (someone else's `[[hooks.UserPromptSubmit]]`, a `[model]` table, comments, blank lines) byte-for-byte
+// intact. Two identifiers mark a block as ours: the managed marker comment we write above every block,
+// and — for legacy pre-marker installs — a `command` whose basename isOurs. The strip must be robust
+// to a foreign hook block appearing BEFORE or AFTER ours: the previous fixed-width `i += 6` walk and
+// the "stop only at the next `[[hooks.<event>]]` header" bound both mis-scanned that layout, so a
+// foreign block sitting ahead of ours swallowed our marker line (defeating the marker fast-path) and
+// our own block — whose `command = "node \"…\""` line can't be parsed by the command regex — was then
+// never recognized, leaving uninstall a no-op and re-install appending DUPLICATES.
 function stripManagedTomlBlocks(txt) {
   const lines = txt.split("\n");
   const out = [];
   let removed = 0;
 
+  const HOOK_HEADER = /^\s*\[\[hooks\.(UserPromptSubmit|SessionStart)\]\]\s*$/;
+  const isMarker = (line) => TOML_MARKERS.some((marker) => line.includes(marker));
+  const isBlank = (line) => line.trim() === "";
+  // Any TOML table header — `[table]` or `[[array-of-tables]]`, dotted keys, optional trailing comment.
+  const isHeader = (line) => /^\s*\[\[?[^\][]*\]\]?\s*(#.*)?$/.test(line);
+
+  // Extent of ONE hook block that begins at `start` (a `[[hooks.<event>]]` header). The block owns its
+  // `[[hooks.<event>.hooks]]` sub-tables and their keys; it ENDS at the first line that opens a NEW
+  // section — a blank line, a skalpel marker, or any table header that is NOT this block's own
+  // sub-table (so a following `[model]`, `[[hooks.SessionStart]]`, etc. is never absorbed). Returns the
+  // index one past the block.
+  const scanBlock = (start, event) => {
+    const ownSub = new RegExp(`^\\s*\\[\\[hooks\\.${event}\\.hooks\\]\\]\\s*$`);
+    let j = start + 1;
+    while (j < lines.length) {
+      const line = lines[j];
+      if (isBlank(line) || isMarker(line)) break;
+      if (isHeader(line) && !ownSub.test(line)) break;
+      j += 1;
+    }
+    return j;
+  };
+
   for (let i = 0; i < lines.length; ) {
-    if (TOML_MARKERS.some((marker) => lines[i].includes(marker))) {
-      i += 6;
+    // 1) A managed marker begins OUR block. Drop the marker and the `[[hooks.<event>]]` block that
+    //    follows it, bounded by scanBlock — never relying on the command line, which is
+    //    quoted-within-quotes and unparseable. A stray marker with no block after it is dropped alone.
+    if (isMarker(lines[i])) {
+      let j = i + 1;
+      const header = j < lines.length ? lines[j].match(HOOK_HEADER) : null;
+      if (header) j = scanBlock(j, header[1]);
       removed += 1;
+      i = j;
       continue;
     }
 
-    const section = lines[i].match(/^\[\[hooks\.(UserPromptSubmit|SessionStart)\]\]\s*$/);
-    if (!section) {
-      out.push(lines[i]);
-      i += 1;
+    // 2) A bare `[[hooks.<event>]]` header with no marker: a legacy pre-marker skalpel block OR a
+    //    foreign hook. Gather the whole block and remove it ONLY if its command isOurs; foreign blocks
+    //    pass through untouched.
+    const section = lines[i].match(HOOK_HEADER);
+    if (section) {
+      const event = section[1];
+      const marker = HOOKS.find(([hookEvent]) => hookEvent === event)?.[1];
+      const end = scanBlock(i, event);
+      const block = lines.slice(i, end);
+      const command = block
+        .map((line) => line.match(/^\s*command\s*=\s*"([^"]*)"\s*$/)?.[1])
+        .find(Boolean);
+      if (marker && isOurs(command, marker)) {
+        removed += 1;
+      } else {
+        out.push(...block);
+      }
+      i = end;
       continue;
     }
 
-    const event = section[1];
-    const marker = HOOKS.find(([hookEvent]) => hookEvent === event)?.[1];
-    const block = [lines[i]];
-    let j = i + 1;
-    while (
-      j < lines.length &&
-      !/^\[\[hooks\.(UserPromptSubmit|SessionStart)\]\]\s*$/.test(lines[j])
-    ) {
-      j += 1;
-      block.push(lines[j - 1]);
-    }
-
-    const command = block
-      .map((line) => line.match(/^\s*command\s*=\s*"([^"]*)"\s*$/)?.[1])
-      .find(Boolean);
-    if (marker && isOurs(command, marker)) {
-      removed += 1;
-    } else {
-      out.push(...block);
-    }
-    i = j;
+    // 3) Everything else — foreign tables, comments, blank lines — kept verbatim.
+    out.push(lines[i]);
+    i += 1;
   }
 
   return { text: out.join("\n"), removed };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skalpel",
-  "version": "4.0.26",
+  "version": "4.0.27",
   "description": "Behavioral graph for AI-assisted coding — learns how you work and steers Claude Code + Codex in real time.",
   "type": "module",
   "bin": {

package/skalpel-statusline.mjs

@@ -116,7 +116,7 @@ function revealNote() {
   }
 }
 
-function main() {
+async function main() {
   const payload = readPayload();
 
   // AHA CATCH REVEAL (opt-in). The single highest-priority line: the agent claimed done but its OWN proof,
@@ -149,4 +149,8 @@ function main() {
   // Clean session → COUNT-OR-NOTHING resolves to nothing. Emit no bytes.
 }
 
-main();
+// Fail-open, matching the other three hooks (skalpel-hook / -session / -session-end): any error →
+// print nothing → exit 0, so a thrown error can never spill a stack trace into the live status bar.
+main()
+  .then(() => process.exit(0))
+  .catch(() => process.exit(0));