glassbox 0.4.3 → 0.4.4

package/dist/cli.js

@@ -4332,6 +4332,9 @@ function jsx(tag, props) {
   const childStr = children != null ? renderChildren(children) : "";
   return new SafeHtml(`<${tag}${attrStr}>${childStr}</${tag}>`);
 }
+function Fragment({ children }) {
+  return new SafeHtml(children != null ? renderChildren(children) : "");
+}
 
 // src/icons.tsx
 var S14 = { xmlns: "http://www.w3.org/2000/svg", width: "14", height: "14", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" };
@@ -4392,6 +4395,64 @@ function IconActualSize() {
   ] });
 }
 
+// src/utils/charDiff.ts
+function charDiff(oldStr, newStr) {
+  if (!oldStr && !newStr) return null;
+  if (oldStr === newStr) return null;
+  const lcs = lcsTable(oldStr, newStr);
+  const lcsLen = lcs[oldStr.length][newStr.length];
+  const maxLen = Math.max(oldStr.length, newStr.length);
+  if (maxLen === 0) return null;
+  if (lcsLen / maxLen < 0.2) return null;
+  const oldCommon = /* @__PURE__ */ new Set();
+  const newCommon = /* @__PURE__ */ new Set();
+  let i = oldStr.length, j = newStr.length;
+  while (i > 0 && j > 0) {
+    if (oldStr[i - 1] === newStr[j - 1]) {
+      oldCommon.add(i - 1);
+      newCommon.add(j - 1);
+      i--;
+      j--;
+    } else if (lcs[i - 1][j] > lcs[i][j - 1]) {
+      i--;
+    } else {
+      j--;
+    }
+  }
+  return {
+    oldSegments: buildSegments(oldStr, oldCommon),
+    newSegments: buildSegments(newStr, newCommon)
+  };
+}
+function lcsTable(a, b) {
+  const m = a.length, n = b.length;
+  const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
+  for (let i = 1; i <= m; i++) {
+    for (let j = 1; j <= n; j++) {
+      dp[i][j] = a[i - 1] === b[j - 1] ? dp[i - 1][j - 1] + 1 : Math.max(dp[i - 1][j], dp[i][j - 1]);
+    }
+  }
+  return dp;
+}
+function buildSegments(str, commonPositions) {
+  const segments = [];
+  let current = "";
+  let currentChanged = false;
+  for (let i = 0; i < str.length; i++) {
+    const changed = !commonPositions.has(i);
+    if (changed !== currentChanged && current.length > 0) {
+      segments.push({ text: current, changed: currentChanged });
+      current = "";
+    }
+    currentChanged = changed;
+    current += str[i];
+  }
+  if (current.length > 0) {
+    segments.push({ text: current, changed: currentChanged });
+  }
+  return segments;
+}
+
 // src/components/imageDiff.tsx
 function ImageDiff({ file, diff, fontWarning, baseWidth, baseHeight }) {
   const fileId = file.id;
@@ -4519,7 +4580,7 @@ function SplitDiff({ hunks, annotationsByLine }) {
               "data-new-line": group.pair.left?.newNum ?? group.pair.right?.newNum ?? "",
               children: [
                 /* @__PURE__ */ jsx("span", { className: "gutter", "data-line-number": group.pair.left?.oldNum ?? "" }),
-                /* @__PURE__ */ jsx("span", { className: "code", children: group.pair.left?.content ?? "" })
+                /* @__PURE__ */ jsx("span", { className: "code", children: renderPairContent(group.pair, "left") })
               ]
             }
           ),
@@ -4531,7 +4592,7 @@ function SplitDiff({ hunks, annotationsByLine }) {
               "data-side": "new",
               children: [
                 /* @__PURE__ */ jsx("span", { className: "gutter", "data-line-number": group.pair.right?.newNum ?? "" }),
-                /* @__PURE__ */ jsx("span", { className: "code", children: group.pair.right?.content ?? "" })
+                /* @__PURE__ */ jsx("span", { className: "code", children: renderPairContent(group.pair, "right") })
               ]
             }
           )
@@ -4581,7 +4642,7 @@ function SplitDiff({ hunks, annotationsByLine }) {
             "data-new-line": pair.left?.newNum ?? pair.right?.newNum ?? "",
             children: [
               /* @__PURE__ */ jsx("span", { className: "gutter", "data-line-number": pair.left?.oldNum ?? "" }),
-              /* @__PURE__ */ jsx("span", { className: "code", children: pair.left?.content ?? "" })
+              /* @__PURE__ */ jsx("span", { className: "code", children: renderPairContent(pair, "left") })
             ]
           }
         );
@@ -4626,7 +4687,7 @@ function SplitDiff({ hunks, annotationsByLine }) {
             "data-side": "new",
             children: [
               /* @__PURE__ */ jsx("span", { className: "gutter", "data-line-number": pair.right?.newNum ?? "" }),
-              /* @__PURE__ */ jsx("span", { className: "code", children: pair.right?.content ?? "" })
+              /* @__PURE__ */ jsx("span", { className: "code", children: renderPairContent(pair, "right") })
             ]
           }
         );
@@ -4634,6 +4695,20 @@ function SplitDiff({ hunks, annotationsByLine }) {
     ] });
   }) });
 }
+function renderSegments(segments) {
+  return /* @__PURE__ */ jsx(Fragment, { children: segments.map((s) => s.changed ? /* @__PURE__ */ jsx("span", { className: "char-change", children: s.text }) : /* @__PURE__ */ jsx(Fragment, { children: s.text })) });
+}
+function renderPairContent(pair, side) {
+  const line = side === "left" ? pair.left : pair.right;
+  if (!line) return "";
+  if (pair.left && pair.right && pair.left.type === "remove" && pair.right.type === "add") {
+    const diff = charDiff(pair.left.content, pair.right.content);
+    if (diff) {
+      return renderSegments(side === "left" ? diff.oldSegments : diff.newSegments);
+    }
+  }
+  return line.content;
+}
 function pairLines(lines) {
   const pairs = [];
   let i = 0;
@@ -4667,55 +4742,88 @@ function pairLines(lines) {
   }
   return pairs;
 }
+function buildUnifiedCharDiffs(lines) {
+  const result = /* @__PURE__ */ new Map();
+  let i = 0;
+  while (i < lines.length) {
+    if (lines[i].type === "remove") {
+      const removes = [];
+      while (i < lines.length && lines[i].type === "remove") {
+        removes.push(lines[i]);
+        i++;
+      }
+      const adds = [];
+      while (i < lines.length && lines[i].type === "add") {
+        adds.push(lines[i]);
+        i++;
+      }
+      const pairCount = Math.min(removes.length, adds.length);
+      for (let j = 0; j < pairCount; j++) {
+        const diff = charDiff(removes[j].content, adds[j].content);
+        if (diff) {
+          result.set(removes[j], diff.oldSegments);
+          result.set(adds[j], diff.newSegments);
+        }
+      }
+    } else {
+      i++;
+    }
+  }
+  return result;
+}
 function UnifiedDiff({ hunks, annotationsByLine }) {
   const lastHunk = hunks[hunks.length - 1];
   const tailStart = lastHunk ? lastHunk.newStart + lastHunk.newCount : 1;
   return /* @__PURE__ */ jsx("div", { className: "diff-table-unified", children: [
-    hunks.map((hunk, hunkIdx) => /* @__PURE__ */ jsx("div", { className: "hunk-block", children: [
-      /* @__PURE__ */ jsx(
-        "div",
-        {
-          className: "hunk-separator",
-          "data-hunk-idx": hunkIdx,
-          "data-old-start": hunk.oldStart,
-          "data-old-count": hunk.oldCount,
-          "data-new-start": hunk.newStart,
-          "data-new-count": hunk.newCount,
-          children: [
-            "@@ -",
-            hunk.oldStart,
-            ",",
-            hunk.oldCount,
-            " +",
-            hunk.newStart,
-            ",",
-            hunk.newCount,
-            " @@"
-          ]
-        }
-      ),
-      hunk.lines.map((line) => {
-        const lineNum = line.type === "remove" ? line.oldNum : line.newNum;
-        const side = line.type === "remove" ? "old" : "new";
-        const anns = annotationsByLine[`${lineNum}:${side}`] ?? [];
-        return /* @__PURE__ */ jsx("div", { children: [
-          /* @__PURE__ */ jsx(
-            "div",
-            {
-              className: `diff-line ${line.type}${anns.length ? " has-annotation" : ""}`,
-              "data-line": lineNum,
-              "data-side": side,
-              children: [
-                /* @__PURE__ */ jsx("span", { className: "gutter-old", "data-line-number": line.oldNum ?? "" }),
-                /* @__PURE__ */ jsx("span", { className: "gutter-new", "data-line-number": line.newNum ?? "" }),
-                /* @__PURE__ */ jsx("span", { className: "code", children: line.content })
-              ]
-            }
-          ),
-          anns.length > 0 ? /* @__PURE__ */ jsx(AnnotationRows, { annotations: anns }) : null
-        ] });
-      })
-    ] })),
+    hunks.map((hunk, hunkIdx) => {
+      const charDiffs = buildUnifiedCharDiffs(hunk.lines);
+      return /* @__PURE__ */ jsx("div", { className: "hunk-block", children: [
+        /* @__PURE__ */ jsx(
+          "div",
+          {
+            className: "hunk-separator",
+            "data-hunk-idx": hunkIdx,
+            "data-old-start": hunk.oldStart,
+            "data-old-count": hunk.oldCount,
+            "data-new-start": hunk.newStart,
+            "data-new-count": hunk.newCount,
+            children: [
+              "@@ -",
+              hunk.oldStart,
+              ",",
+              hunk.oldCount,
+              " +",
+              hunk.newStart,
+              ",",
+              hunk.newCount,
+              " @@"
+            ]
+          }
+        ),
+        hunk.lines.map((line) => {
+          const lineNum = line.type === "remove" ? line.oldNum : line.newNum;
+          const side = line.type === "remove" ? "old" : "new";
+          const anns = annotationsByLine[`${lineNum}:${side}`] ?? [];
+          const segments = charDiffs.get(line);
+          return /* @__PURE__ */ jsx("div", { children: [
+            /* @__PURE__ */ jsx(
+              "div",
+              {
+                className: `diff-line ${line.type}${anns.length ? " has-annotation" : ""}`,
+                "data-line": lineNum,
+                "data-side": side,
+                children: [
+                  /* @__PURE__ */ jsx("span", { className: "gutter-old", "data-line-number": line.oldNum ?? "" }),
+                  /* @__PURE__ */ jsx("span", { className: "gutter-new", "data-line-number": line.newNum ?? "" }),
+                  /* @__PURE__ */ jsx("span", { className: "code", children: segments ? renderSegments(segments) : line.content })
+                ]
+              }
+            ),
+            anns.length > 0 ? /* @__PURE__ */ jsx(AnnotationRows, { annotations: anns }) : null
+          ] });
+        })
+      ] });
+    }),
     /* @__PURE__ */ jsx("div", { className: "hunk-separator hunk-expander-tail", "data-start": tailStart, children: "\u2195 Show remaining lines" })
   ] });
 }
@@ -5589,7 +5697,7 @@ async function main() {
     console.log("AI service test mode enabled \u2014 using mock AI responses");
   }
   if (debug) {
-    console.log(`[debug] Build timestamp: ${"2026-03-21T03:42:45.606Z"}`);
+    console.log(`[debug] Build timestamp: ${"2026-03-21T23:17:12.455Z"}`);
   }
   if (projectDir) {
     process.chdir(projectDir);