@nomad-e/bluma-cli 0.6.9 → 0.7.0

package/dist/config/skills/pdf/SKILL.md

@@ -18,6 +18,13 @@ license: Proprietary. LICENSE.txt has complete terms
 > design agency, not a script. Typography, spacing, color, and hierarchy are
 > not optional — they are the foundation of a credible document.
 
+## Prerequisites
+
+- **Python 3.10+** installed and available in PATH
+- Install dependencies: `pip install reportlab pypdf`
+- If any script fails with `command not found` or `ModuleNotFoundError`, Python or its
+  packages are missing — install them before proceeding
+
 ## MANDATORY workflow — new multi-page reports (read first)
 
 Ad-hoc 30-line ReportLab scripts are the #1 cause of “cheap PDF” output (no

package/dist/config/skills/pdf/scripts/create_report.py

@@ -46,8 +46,24 @@ from pathlib import Path
 from typing import Any
 from xml.sax.saxutils import escape
 
-from reportlab.lib.pagesizes import A4
-from reportlab.lib.units import cm
+MIN_PYTHON = (3, 10)
+if sys.version_info < MIN_PYTHON:
+    print(
+        f"Error: Python {'.'.join(map(str, MIN_PYTHON))}+ is required "
+        f"(found {'.'.join(map(str, sys.version_info[:3]))})",
+        file=sys.stderr,
+    )
+    sys.exit(1)
+
+try:
+    from reportlab.lib.pagesizes import A4
+    from reportlab.lib.units import cm
+except ImportError:
+    print(
+        "Error: reportlab is required. Install with: pip install reportlab",
+        file=sys.stderr,
+    )
+    sys.exit(1)
 from reportlab.lib.colors import HexColor
 from reportlab.lib.styles import ParagraphStyle
 from reportlab.lib.enums import TA_CENTER, TA_JUSTIFY

package/dist/config/skills/pdf/scripts/merge_pdfs.py

@@ -8,6 +8,15 @@ Usage:
 import argparse
 import sys
 
+MIN_PYTHON = (3, 10)
+if sys.version_info < MIN_PYTHON:
+    print(
+        f"Error: Python {'.'.join(map(str, MIN_PYTHON))}+ is required "
+        f"(found {'.'.join(map(str, sys.version_info[:3]))})",
+        file=sys.stderr,
+    )
+    sys.exit(1)
+
 def merge_pdfs(input_files: list[str], output_path: str) -> None:
     try:
         from pypdf import PdfWriter, PdfReader

package/dist/config/skills/xlsx/SKILL.md

@@ -16,6 +16,14 @@ license: Proprietary. LICENSE.txt has complete terms
 
 # XLSX — Spreadsheet Creation, Editing & Analysis
 
+## Prerequisites
+
+- **Python 3.10+** installed and available in PATH
+- Install dependencies: `pip install openpyxl pandas`
+- **LibreOffice** installed (required by `recalc.py` for formula recalculation)
+- If any script fails with `command not found` or `ModuleNotFoundError`, Python or its
+  packages are missing — install them before proceeding
+
 ## Core Principle
 
 > **Formulas, not hardcodes.** Every calculated value MUST be an Excel

package/dist/config/skills/xlsx/scripts/recalc.py

@@ -19,6 +19,15 @@ import os
 import sys
 import time
 
+MIN_PYTHON = (3, 10)
+if sys.version_info < MIN_PYTHON:
+    print(
+        f"Error: Python {'.'.join(map(str, MIN_PYTHON))}+ is required "
+        f"(found {'.'.join(map(str, sys.version_info[:3]))})",
+        file=sys.stderr,
+    )
+    sys.exit(1)
+
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(0, SCRIPT_DIR)
 

package/dist/main.js

@@ -15366,7 +15366,7 @@ function createDiff(filename, oldContent, newContent) {
       const prefix = part.added ? "+" : part.removed ? "-" : " ";
       const lines = part.value.split("\n").slice(0, -1);
       for (const line of lines) {
-        if (line === "\") continue;
+        if (line === "") continue;
         diffString += `${prefix}${line}
 `;
         lineCount++;
@@ -29086,10 +29086,7 @@ var HighlightedCodeComponent = ({ code, filePath, maxLines }) => {
     visible.map((line, idx) => {
       const tokens = tokenizeLine(line, language);
       const lineNum = String(idx + 1).padStart(gutterWidth, " ");
-      return /* @__PURE__ */ jsxs5(Box_default, { width: "100%", flexDirection: "row", children: [
-        /* @__PURE__ */ jsx12(Box_default, { marginRight: 2, children: /* @__PURE__ */ jsx12(Text, { color: THEME.lineNumber, children: lineNum }) }),
-        /* @__PURE__ */ jsx12(Text, { children: tokens.map((t, ti) => /* @__PURE__ */ jsx12(Text, { color: t.color, children: t.text }, ti)) })
-      ] }, idx);
+      return /* @__PURE__ */ jsx12(Box_default, { width: "100%", flexDirection: "row", children: /* @__PURE__ */ jsx12(Text, { children: tokens.map((t, ti) => /* @__PURE__ */ jsx12(Text, { color: t.color, children: t.text }, ti)) }) }, idx);
     }),
     hidden > 0 && /* @__PURE__ */ jsxs5(Text, { color: THEME.lineNumber, dimColor: true, children: [
       "\u2026 +",
@@ -32563,14 +32560,64 @@ function diffSummary(additions, removals, hidden) {
   if (hidden > 0) bits.push(`\u22EF ${hidden} hidden`);
   return bits.join(" \xB7 ");
 }
+var THEME2 = {
+  keyword: "#569CD6",
+  string: "#CE9178",
+  number: "#B5CEA8",
+  comment: "#6A9955",
+  //#22c55e
+  function: "#DCDCAA",
+  variable: "#9CDCFE",
+  operator: "#D4D4D4",
+  punctuation: "#D4D4D4",
+  default: "#D4D4D4",
+  lineNumber: "#858585",
+  gutter: "#404040"
+};
+var KEYWORDS2 = /* @__PURE__ */ new Set([
+  "const",
+  "let",
+  "var",
+  "function",
+  "return",
+  "if",
+  "else",
+  "for",
+  "while",
+  "switch",
+  "case",
+  "break",
+  "continue",
+  "class",
+  "extends",
+  "import",
+  "from",
+  "export",
+  "default",
+  "async",
+  "await",
+  "try",
+  "catch",
+  "finally",
+  "new",
+  "typeof",
+  "instanceof",
+  "null",
+  "undefined",
+  "true",
+  "false",
+  "type",
+  "interface",
+  "enum",
+  "implements",
+  "abstract",
+  "readonly",
+  "override"
+]);
 function hunkToRows(hunk) {
   const rows = [];
   let oldLine = hunk.oldStart;
   let newLine = hunk.newStart;
-  rows.push({
-    kind: "meta",
-    text: `@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`
-  });
   for (const raw of hunk.lines) {
     if (!raw.length) continue;
     const prefix = raw[0];
@@ -32611,22 +32658,22 @@ function pairWordDiffs(rows) {
   }
   return out;
 }
-function maxLineNums(rows) {
-  let maxO = 0;
+function calcGutterW(rows) {
   let maxN = 0;
   for (const r of rows) {
-    if (r.kind === "ctx") {
-      maxO = Math.max(maxO, r.old);
-      maxN = Math.max(maxN, r.new);
-    } else if (r.kind === "rem") {
-      maxO = Math.max(maxO, r.old);
-    } else if (r.kind === "add") {
-      maxN = Math.max(maxN, r.new);
-    }
+    if (r.kind === "ctx") maxN = Math.max(maxN, r.old, r.new);
+    else if (r.kind === "rem") maxN = Math.max(maxN, r.old);
+    else if (r.kind === "add") maxN = Math.max(maxN, r.new);
   }
-  const wOld = Math.max(2, String(maxO || 0).length);
-  const wNew = Math.max(2, String(maxN || 0).length);
-  return { wOld, wNew };
+  return Math.max(2, String(maxN || 0).length);
+}
+function calcLegacyGutterW(segs) {
+  let maxN = 0;
+  for (const s of segs) {
+    if (s.kind === "rem") maxN = Math.max(maxN, s.oldLine);
+    if (s.kind === "add") maxN = Math.max(maxN, s.newLine);
+  }
+  return Math.max(2, String(maxN || 0).length);
 }
 function rowLineCounts(rows) {
   let additions = 0;
@@ -32637,21 +32684,11 @@ function rowLineCounts(rows) {
   }
   return { additions, removals };
 }
-function gutterCtx(wOld, wNew, oldN, newN, showSeparator) {
-  return `${String(oldN).padStart(wOld)} ${String(newN).padStart(wNew)}${showSeparator ? " \u2502 " : "  "}`;
-}
-function gutterRem(wOld, wNew, oldN, showSeparator) {
-  return `${String(oldN).padStart(wOld)} ${" ".repeat(wNew)}${showSeparator ? " \u2502 " : "  "}`;
-}
-function gutterAdd(wOld, wNew, newN, showSeparator) {
-  return `${" ".repeat(wOld)} ${String(newN).padStart(wNew)}${showSeparator ? " \u2502 " : "  "}`;
+function gutterLine(w, n) {
+  return ` ${String(n).padEnd(w)} `;
 }
-function gutterOmit(wOld, wNew, showSeparator) {
-  const cols = wOld + 1 + wNew;
-  const dot = "\u22EE";
-  const padL = Math.max(0, Math.floor((cols - dot.length) / 2));
-  const padR = Math.max(0, cols - dot.length - padL);
-  return `${" ".repeat(padL)}${dot}${" ".repeat(padR)}${showSeparator ? " \u2502 " : "  "}`;
+function gutterOmit(w) {
+  return ` ${"\u22EE".padEnd(w)} `;
 }
 function WordDiffChunks({
   parts,
@@ -32671,9 +32708,82 @@ function WordDiffChunks({
   }
   return /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", width: "100%", flexGrow: 1, children: chunks });
 }
-function renderStructuredRows(rows, maxHeight, showGutterSeparator) {
+function collapseContextRows(rows) {
+  const out = [];
+  let ctx = [];
+  const flush = () => {
+    if (ctx.length <= 3) {
+      out.push(...ctx);
+    } else {
+      out.push({ kind: "omit", count: ctx.length });
+    }
+    ctx = [];
+  };
+  for (const r of rows) {
+    if (r.kind === "ctx") {
+      ctx.push(r);
+      continue;
+    }
+    flush();
+    out.push(r);
+  }
+  flush();
+  return out;
+}
+function tokenizeLine2(line, _language) {
+  if (!line.trim()) return [{ text: line || " ", color: THEME2.default }];
+  const tokens = [];
+  let i = 0;
+  while (i < line.length) {
+    if (/\s/.test(line[i])) {
+      let spaces = "";
+      while (i < line.length && /\s/.test(line[i])) spaces += line[i++];
+      tokens.push({ text: spaces, color: THEME2.default });
+      continue;
+    }
+    if (line[i] === "/" && line[i + 1] === "/") {
+      tokens.push({ text: line.slice(i), color: THEME2.comment });
+      break;
+    }
+    if (line[i] === "#") {
+      tokens.push({ text: line.slice(i), color: THEME2.comment });
+      break;
+    }
+    if (line[i] === '"' || line[i] === "'" || line[i] === "`") {
+      const quote = line[i];
+      let j = i + 1;
+      while (j < line.length && line[j] !== quote) {
+        if (line[j] === "\\") j++;
+        j++;
+      }
+      tokens.push({ text: line.slice(i, j + 1), color: THEME2.string });
+      i = j + 1;
+      continue;
+    }
+    if (/\d/.test(line[i])) {
+      let num = "";
+      while (i < line.length && /[\d.]/.test(line[i])) num += line[i++];
+      tokens.push({ text: num, color: THEME2.number });
+      continue;
+    }
+    if (/[a-zA-Z_$]/.test(line[i])) {
+      let word = "";
+      while (i < line.length && /[\w$]/.test(line[i])) word += line[i++];
+      const isCall = line[i] === "(";
+      let color = THEME2.variable;
+      if (KEYWORDS2.has(word)) color = THEME2.keyword;
+      else if (isCall) color = THEME2.function;
+      tokens.push({ text: word, color });
+      continue;
+    }
+    tokens.push({ text: line[i], color: THEME2.punctuation });
+    i++;
+  }
+  return tokens;
+}
+function renderStructuredRows(rows, maxHeight) {
   const paired = collapseContextRows(pairWordDiffs(rows));
-  const { wOld, wNew } = maxLineNums(paired);
+  const w = calcGutterW(paired);
   const { additions, removals } = rowLineCounts(paired);
   const nodes = [];
   let lineBudget = maxHeight > 0 ? maxHeight : Number.POSITIVE_INFINITY;
@@ -32690,11 +32800,13 @@ function renderStructuredRows(rows, maxHeight, showGutterSeparator) {
   for (const r of paired) {
     if (r.kind === "omit") {
       push(
-        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterOmit(wOld, wNew, showGutterSeparator) }),
-          r.count > 1 ? /* @__PURE__ */ jsxs26(Text, { dimColor: true, wrap: "wrap", children: [
+        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, paddingLeft: 5, children: [
+          /* @__PURE__ */ jsxs26(Text, { dimColor: true, children: [
             " ",
-            "\xB7 ",
+            gutterOmit(w)
+          ] }),
+          r.count > 1 ? /* @__PURE__ */ jsxs26(Text, { dimColor: true, wrap: "wrap", children: [
+            " \xB7 ",
             r.count
           ] }) : null
         ] }, `o-${idx++}`)
@@ -32703,35 +32815,32 @@ function renderStructuredRows(rows, maxHeight, showGutterSeparator) {
     }
     if (r.kind === "meta") {
       push(
-        /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, children: /* @__PURE__ */ jsx41(Text, { dimColor: true, wrap: "wrap", children: r.text }) }, `m-${idx++}`)
+        /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, children: tokenizeLine2(r.text || " ", "ts").map((t, i) => /* @__PURE__ */ jsx41(Text, { color: t.color, children: t.text }, i)) }, `m-${idx++}`)
       );
       continue;
     }
     if (r.kind === "ctx") {
       push(
-        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", flexWrap: "wrap", width: "100%", flexGrow: 1, children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterCtx(wOld, wNew, r.old, r.new, showGutterSeparator) }),
-          /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.muted, wrap: "wrap", children: r.text || " " })
-        ] }, `c-${idx++}`)
+        /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", width: "100%", flexGrow: 1, children: tokenizeLine2(r.text || " ", "ts").map((t, i) => /* @__PURE__ */ jsx41(Text, { color: t.color, children: t.text }, i)) }, `c-${idx++}`)
       );
       continue;
     }
     if (r.kind === "rem") {
       push(
-        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, flexWrap: "wrap", backgroundColor: BLUMA_TERMINAL.diffRemoved, children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterRem(wOld, wNew, r.old, showGutterSeparator) }),
+        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, flexWrap: "wrap", backgroundColor: BLUMA_TERMINAL.diffRemoved, paddingLeft: 3, children: [
+          /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.dim, children: gutterLine(w, r.old) }),
           /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.diffRemovedWord, children: "-" }),
-          r.wordParts && r.wordParts.length > 0 ? /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1, marginLeft: 1, children: /* @__PURE__ */ jsx41(WordDiffChunks, { parts: r.wordParts, mode: "rem" }) }) : /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1, marginLeft: 1, children: /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.m3OnSurface, wrap: "wrap", children: r.text || " " }) })
+          r.wordParts && r.wordParts.length > 0 ? /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1, marginLeft: 1, children: /* @__PURE__ */ jsx41(WordDiffChunks, { parts: r.wordParts, mode: "rem" }) }) : /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", children: tokenizeLine2(r.text || " ", "ts").map((t, i) => /* @__PURE__ */ jsx41(Text, { color: t.color, children: t.text }, i)) })
         ] }, `r-${idx++}`)
       );
       continue;
     }
     if (r.kind === "add") {
       push(
-        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, flexWrap: "wrap", backgroundColor: BLUMA_TERMINAL.diffAdded, children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterAdd(wOld, wNew, r.new, showGutterSeparator) }),
+        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, flexWrap: "wrap", backgroundColor: BLUMA_TERMINAL.diffAdded, paddingLeft: 3, children: [
+          /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.dim, children: gutterLine(w, r.new) }),
           /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.diffAddedWord, children: "+" }),
-          r.wordParts && r.wordParts.length > 0 ? /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1, marginLeft: 1, children: /* @__PURE__ */ jsx41(WordDiffChunks, { parts: r.wordParts, mode: "add" }) }) : /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1, marginLeft: 1, children: /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.m3OnSurface, wrap: "wrap", children: r.text || " " }) })
+          r.wordParts && r.wordParts.length > 0 ? /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1, children: /* @__PURE__ */ jsx41(WordDiffChunks, { parts: r.wordParts, mode: "add" }) }) : /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", children: tokenizeLine2(r.text || " ", "ts").map((t, i) => /* @__PURE__ */ jsx41(Text, { color: t.color, children: t.text }, i)) })
         ] }, `a-${idx++}`)
       );
     }
@@ -32756,15 +32865,18 @@ function legacyDiffToSegs(lines) {
     const isNewHeader = line.startsWith("+++");
     if (isOldHeader || isNewHeader) {
       flushCtx();
-      out.push({ kind: "header", line });
       if (isNewHeader) {
         oldLine = 1;
         newLine = 1;
       }
       continue;
     }
-    const isRem = line.startsWith("-") && !isOldHeader;
-    const isAdd = line.startsWith("+") && !isNewHeader;
+    if (line.startsWith("\\")) {
+      flushCtx();
+      continue;
+    }
+    const isRem = line.startsWith("-");
+    const isAdd = line.startsWith("+");
     if (isRem) {
       flushCtx();
       out.push({ kind: "rem", body: line.slice(1), oldLine });
@@ -32782,11 +32894,6 @@ function legacyDiffToSegs(lines) {
       ctx += 1;
       continue;
     }
-    if (line.startsWith("\\")) {
-      flushCtx();
-      out.push({ kind: "raw", line });
-      continue;
-    }
     if (line.startsWith("[")) {
       flushCtx();
       out.push({ kind: "raw", line });
@@ -32802,18 +32909,6 @@ function legacyDiffToSegs(lines) {
   flushCtx();
   return out;
 }
-function legacySegWidths(segs) {
-  let maxO = 0;
-  let maxN = 0;
-  for (const s of segs) {
-    if (s.kind === "rem") maxO = Math.max(maxO, s.oldLine);
-    if (s.kind === "add") maxN = Math.max(maxN, s.newLine);
-  }
-  return {
-    wOld: Math.max(2, String(maxO || 0).length),
-    wNew: Math.max(2, String(maxN || 0).length)
-  };
-}
 function legacySegLineCounts(lines) {
   let additions = 0;
   let removals = 0;
@@ -32823,86 +32918,106 @@ function legacySegLineCounts(lines) {
   }
   return { additions, removals };
 }
-function collapseContextRows(rows) {
-  const out = [];
-  let ctxCount = 0;
-  const flush = () => {
-    if (ctxCount > 0) {
-      out.push({ kind: "omit", count: ctxCount });
-      ctxCount = 0;
-    }
-  };
-  for (const r of rows) {
-    if (r.kind === "ctx") {
-      ctxCount += 1;
-      continue;
-    }
-    if (r.kind === "meta" && r.text.startsWith("@@")) {
-      ctxCount += 1;
-      continue;
-    }
-    flush();
-    out.push(r);
-  }
-  flush();
-  return out;
-}
 function LegacyDiffBody({
   lines,
-  maxHeight,
-  showGutterSeparator
+  maxHeight
 }) {
   const segs = legacyDiffToSegs(lines);
-  const { wOld, wNew } = legacySegWidths(segs);
+  const w = calcLegacyGutterW(segs);
   const truncated = maxHeight > 0 && segs.length > maxHeight;
   const toRender = truncated ? segs.slice(0, maxHeight) : segs;
   const hiddenBelow = truncated ? segs.length - toRender.length : 0;
   const { additions, removals } = legacySegLineCounts(lines);
-  const summary = diffSummary(additions, removals, hiddenBelow);
-  return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "column", width: "100%", alignItems: "stretch", children: [
-    toRender.map((seg, index) => {
-      if (seg.kind === "header") {
-        return /* @__PURE__ */ jsx41(Text, { dimColor: true, wrap: "wrap", children: seg.line }, index);
-      }
-      if (seg.kind === "omit") {
-        return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterOmit(wOld, wNew, showGutterSeparator) }),
-          seg.count > 1 ? /* @__PURE__ */ jsxs26(Text, { dimColor: true, wrap: "wrap", children: [
-            " ",
-            "\xB7 ",
-            seg.count
-          ] }) : null
-        ] }, index);
-      }
-      if (seg.kind === "raw") {
-        return /* @__PURE__ */ jsx41(Text, { dimColor: true, wrap: "wrap", children: seg.line }, index);
-      }
-      if (seg.kind === "rem") {
-        return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, flexWrap: "wrap", backgroundColor: BLUMA_TERMINAL.diffRemoved, children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterRem(wOld, wNew, seg.oldLine, showGutterSeparator) }),
-          /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.diffRemovedWord, children: "-" }),
-          /* @__PURE__ */ jsxs26(Text, { color: BLUMA_TERMINAL.m3OnSurface, wrap: "wrap", children: [
-            " ",
-            seg.body || " "
-          ] })
-        ] }, index);
-      }
-      if (seg.kind === "add") {
-        return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, flexWrap: "wrap", backgroundColor: BLUMA_TERMINAL.diffAdded, children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterAdd(wOld, wNew, seg.newLine, showGutterSeparator) }),
-          /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.diffAddedWord, children: "+" }),
-          /* @__PURE__ */ jsxs26(Text, { color: BLUMA_TERMINAL.m3OnSurface, wrap: "wrap", children: [
-            " ",
-            seg.body || " "
-          ] })
-        ] }, index);
-      }
-      return null;
-    }),
-    summary ? /* @__PURE__ */ jsx41(Text, { dimColor: true, children: summary }) : null
-  ] });
+  const summary = diffSummary(
+    additions,
+    removals,
+    hiddenBelow
+  );
+  const renderTokenizedLine = (text, backgroundColor) => tokenizeLine2(text || " ", "ts").map((t, i) => /* @__PURE__ */ jsx41(Text, { color: t.color, backgroundColor, children: t.text }, i));
+  return /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", width: "100%", children: toRender.map((seg, index) => {
+    if (seg.kind === "omit") {
+      return /* @__PURE__ */ jsx41(
+        Box_default,
+        {
+          flexDirection: "row",
+          width: "100%",
+          flexGrow: 1,
+          paddingLeft: 6,
+          children: /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.dim, children: gutterOmit(w) })
+        },
+        index
+      );
+    }
+    if (seg.kind === "raw") {
+      return /* @__PURE__ */ jsx41(
+        Box_default,
+        {
+          flexDirection: "row",
+          width: "100%",
+          flexWrap: "wrap",
+          children: renderTokenizedLine(seg.line)
+        },
+        index
+      );
+    }
+    if (seg.kind === "rem") {
+      return /* @__PURE__ */ jsxs26(
+        Box_default,
+        {
+          flexDirection: "row",
+          width: "100%",
+          flexGrow: 1,
+          flexWrap: "wrap",
+          backgroundColor: BLUMA_TERMINAL.diffRemoved,
+          paddingLeft: 3,
+          children: [
+            /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.dim, children: gutterLine(w, seg.oldLine) }),
+            /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.diffRemovedWord, children: "-" }),
+            /* @__PURE__ */ jsx41(
+              Box_default,
+              {
+                flexDirection: "row",
+                flexWrap: "wrap",
+                backgroundColor: BLUMA_TERMINAL.diffRemoved,
+                children: renderTokenizedLine(seg.body, BLUMA_TERMINAL.diffRemoved)
+              }
+            )
+          ]
+        },
+        index
+      );
+    }
+    if (seg.kind === "add") {
+      return /* @__PURE__ */ jsxs26(
+        Box_default,
+        {
+          flexDirection: "row",
+          width: "100%",
+          flexGrow: 1,
+          flexWrap: "wrap",
+          backgroundColor: BLUMA_TERMINAL.diffAdded,
+          paddingLeft: 3,
+          children: [
+            /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.dim, children: gutterLine(w, seg.newLine) }),
+            /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.diffAddedWord, children: "+" }),
+            /* @__PURE__ */ jsx41(
+              Box_default,
+              {
+                flexDirection: "row",
+                flexWrap: "wrap",
+                backgroundColor: BLUMA_TERMINAL.diffAdded,
+                children: renderTokenizedLine(seg.body, BLUMA_TERMINAL.diffAdded)
+              }
+            )
+          ]
+        },
+        index
+      );
+    }
+    return null;
+  }) });
 }
-var SimpleDiff = ({ text, maxHeight, frame = false, showGutterSeparator = true }) => {
+var SimpleDiff = ({ text, maxHeight, frame = false }) => {
   const raw = stripOptionalMarkdownFence(String(text ?? ""));
   let patches = [];
   try {
@@ -32914,31 +33029,18 @@ var SimpleDiff = ({ text, maxHeight, frame = false, showGutterSeparator = true }
   const rule = "\u2500".repeat(diffRuleWidth());
   if (hunks.length === 0) {
     const allLines = raw.split("\n");
-    const body2 = /* @__PURE__ */ jsx41(LegacyDiffBody, { lines: allLines, maxHeight, showGutterSeparator });
+    const body2 = /* @__PURE__ */ jsx41(LegacyDiffBody, { lines: allLines, maxHeight });
     if (!frame) return body2;
-    return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx41(Text, { dimColor: true, children: rule }),
-      /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", paddingX: 1, children: body2 }),
-      /* @__PURE__ */ jsx41(Text, { dimColor: true, children: rule })
-    ] });
+    return /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", children: /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", paddingX: 1, children: body2 }) });
   }
   const rows = [];
   for (const h of hunks) {
     rows.push(...hunkToRows(h));
   }
-  const { nodes, hidden, additions, removals } = renderStructuredRows(
-    rows,
-    maxHeight,
-    showGutterSeparator
-  );
-  const body = /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "column", width: "100%", alignItems: "stretch", children: [
-    (hidden > 0 || additions > 0 || removals > 0) && /* @__PURE__ */ jsx41(Text, { dimColor: true, children: diffSummary(additions, removals, hidden) }),
-    nodes
-  ] });
-  if (!frame) {
-    return body;
-  }
-  return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "column", width: "100%", alignItems: "stretch", children: [
+  const { nodes, hidden, additions, removals } = renderStructuredRows(rows, maxHeight);
+  const body = /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", width: "100%", children: nodes });
+  if (!frame) return body;
+  return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "column", width: "100%", children: [
     /* @__PURE__ */ jsx41(Text, { dimColor: true, children: rule }),
     /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", paddingX: 1, children: body }),
     /* @__PURE__ */ jsx41(Text, { dimColor: true, children: rule })
@@ -33040,7 +33142,6 @@ function EditToolDiffPanel({
   description,
   diffText,
   maxHeight = EDIT_DIFF_PREVIEW_MAX_LINES,
-  showGutterSeparator = true,
   oldString,
   newString,
   replaceAll = false
@@ -33057,7 +33158,7 @@ function EditToolDiffPanel({
       replaceAll,
       maxHeight
     }
-  ) }) : hasDiffText ? /* @__PURE__ */ jsx43(Box_default, { marginTop: 0, children: /* @__PURE__ */ jsx43(SimpleDiff, { text: diffText, maxHeight, showGutterSeparator }) }) : /* @__PURE__ */ jsx43(Box_default, { marginTop: 0, children: /* @__PURE__ */ jsx43(Text, { dimColor: true, wrap: "wrap", children: "Diff preview unavailable" }) }) });
+  ) }) : hasDiffText ? /* @__PURE__ */ jsx43(Box_default, { marginTop: 0, children: /* @__PURE__ */ jsx43(SimpleDiff, { text: diffText, maxHeight }) }) : /* @__PURE__ */ jsx43(Box_default, { marginTop: 0, children: /* @__PURE__ */ jsx43(Text, { dimColor: true, wrap: "wrap", children: "Diff preview unavailable" }) }) });
 }
 
 // src/app/agent/tools/EditTool/UI.tsx
@@ -33075,9 +33176,6 @@ function countLineDiff(oldText, newText) {
   }
   return { added, removed };
 }
-function stripUnifiedDiffFileHeaders(diffText) {
-  return diffText.replace(/^--- .*\n/m, "").replace(/^\+\+\+ .*\n/m, "");
-}
 function userFacingName11(args) {
   if (!args) return "Updated";
   if (args.edits && Array.isArray(args.edits) && args.edits.length > 0) {
@@ -33096,13 +33194,14 @@ function renderToolHeader12({ args }) {
   const oldText = typeof args?.old_string === "string" ? args.old_string : "";
   const newText = typeof args?.new_string === "string" ? args.new_string : "";
   const counts = countLineDiff(oldText, newText);
-  const fileName = String(path50).split("/").pop() || String(path50);
   const action = oldText === "" ? "Created" : "Update";
   return /* @__PURE__ */ jsxs27(Box_default, { flexDirection: "row", gap: 1, alignItems: "flex-end", children: [
     /* @__PURE__ */ jsxs27(Text, { bold: true, color: BLUMA_TERMINAL.m3OnSurface, children: [
       action,
-      " ",
-      /* @__PURE__ */ jsx44(FilePathLink, { filePath: path50, color: BLUMA_TERMINAL.dim })
+      /* @__PURE__ */ jsxs27(Text, { dimColor: true, children: [
+        " ",
+        /* @__PURE__ */ jsx44(FilePathLink, { filePath: path50, color: BLUMA_TERMINAL.dim })
+      ] })
     ] }),
     /* @__PURE__ */ jsxs27(Text, { dimColor: true, children: [
       "(",
@@ -33214,8 +33313,7 @@ function renderToolResultMessage12(result) {
       {
         filePath: edit.file_path,
         isNewFile: edit.is_new_file ?? false,
-        diffText: typeof edit.diff === "string" ? stripUnifiedDiffFileHeaders(edit.diff) : edit.diff,
-        showGutterSeparator: false
+        diffText: typeof edit.diff === "string" ? edit.diff : null
       }
     ) }, `result-edit-${idx}`)) });
   }
@@ -33224,8 +33322,7 @@ function renderToolResultMessage12(result) {
     {
       filePath: result.file_path,
       isNewFile: result.is_new_file ?? false,
-      diffText: stripUnifiedDiffFileHeaders(result.diff),
-      showGutterSeparator: false
+      diffText: result.diff
     }
   ) }) });
 }
@@ -34113,7 +34210,7 @@ function renderToolMessage20({
       /* @__PURE__ */ jsx54(ToolUseLoader, { state: state2 ?? "pending" }),
       renderToolHeader21({ args: p })
     ] }),
-    /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", paddingLeft: 1, children: payload != null ? renderToolResultMessage21(payload, { filePath, content }) : /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", children: /* @__PURE__ */ jsx54(Box_default, { marginTop: 0, width: "100%", children: content ? /* @__PURE__ */ jsx54(Box_default, { width: "100%", flexGrow: 1, flexDirection: "column", alignItems: "stretch", children: /* @__PURE__ */ jsx54(SimpleDiff, { text: diffText, maxHeight: 4 }) }) : /* @__PURE__ */ jsxs37(Text, { dimColor: true, children: [
+    /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", paddingLeft: 1, children: payload != null ? renderToolResultMessage21(payload, { filePath, content }) : /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", children: /* @__PURE__ */ jsx54(Box_default, { marginTop: 0, width: "100%", children: content ? /* @__PURE__ */ jsx54(Box_default, { width: "100%", flexGrow: 1, flexDirection: "column", children: /* @__PURE__ */ jsx54(SimpleDiff, { text: diffText, maxHeight: 2e3 }) }) : /* @__PURE__ */ jsxs37(Text, { dimColor: true, children: [
       "Writing to ",
       filePath ?? "...",
       " (",
@@ -34138,18 +34235,17 @@ function renderToolResultMessage21(result, context) {
   const previousContent = typeof payload.previous_content === "string" ? payload.previous_content : void 0;
   const currentContent = typeof payload.content === "string" ? payload.content : typeof context?.args?.content === "string" ? (context?.args).content : typeof context?.content === "string" ? context.content : void 0;
   const canRenderDiff = typeof currentContent === "string" && currentContent.trim() && typeof previousContent === "string";
-  return /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", children: canRenderDiff ? /* @__PURE__ */ jsx54(Box_default, { marginTop: 0, width: "100%", flexDirection: "column", alignItems: "stretch", flexGrow: 1, children: /* @__PURE__ */ jsx54(
+  return /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", children: canRenderDiff ? /* @__PURE__ */ jsx54(Box_default, { width: "100%", flexGrow: 1, children: /* @__PURE__ */ jsx54(
     SimpleDiff,
     {
       text: buildUnifiedDiffText(resultFilePath, previousContent ?? "", currentContent ?? ""),
-      maxHeight: 200
+      maxHeight: 2e3
     }
   ) }) : typeof currentContent === "string" && currentContent.trim() ? /* @__PURE__ */ jsx54(
     Box_default,
     {
       width: "100%",
       backgroundColor: BLUMA_TERMINAL.diffAdded,
-      marginTop: 1,
       children: /* @__PURE__ */ jsx54(
         HighlightedCode,
         {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nomad-e/bluma-cli",
-	"version": "0.6.9",
+	"version": "0.7.0",
 	"description": "BluMa independent agent for automation and advanced software engineering.",
 	"author": "Alex Fonseca",
 	"license": "Apache-2.0",