@cortexkit/aft-opencode 0.15.4 → 0.15.5

package/dist/index.js

@@ -24048,44 +24048,156 @@ function buildUnifiedDiff(fp, before, after) {
 `);
   const afterLines = after.split(`
 `);
-  let diff = `Index: ${fp}
+  const ops = diffLines(beforeLines, afterLines);
+  if (ops.every((op) => op.tag === "eq")) {
+    return `Index: ${fp}
 ===================================================================
 --- ${fp}
 +++ ${fp}
 `;
-  let firstChange = -1;
-  let lastChange = -1;
-  const maxLen = Math.max(beforeLines.length, afterLines.length);
-  for (let i = 0;i < maxLen; i++) {
-    if ((beforeLines[i] ?? "") !== (afterLines[i] ?? "")) {
-      if (firstChange === -1)
-        firstChange = i;
-      lastChange = i;
-    }
-  }
-  if (firstChange === -1)
-    return diff;
-  const ctxStart = Math.max(0, firstChange - 2);
-  const ctxEnd = Math.min(maxLen - 1, lastChange + 2);
-  diff += `@@ -${ctxStart + 1},${Math.min(beforeLines.length, ctxEnd + 1) - ctxStart} +${ctxStart + 1},${Math.min(afterLines.length, ctxEnd + 1) - ctxStart} @@
-`;
-  for (let i = ctxStart;i <= ctxEnd; i++) {
-    const bl = i < beforeLines.length ? beforeLines[i] : undefined;
-    const al = i < afterLines.length ? afterLines[i] : undefined;
-    if (bl === al) {
-      diff += ` ${bl}
+  }
+  const CONTEXT = 3;
+  const HUNK_GAP = CONTEXT * 2;
+  const hunks = groupIntoHunks(ops, CONTEXT, HUNK_GAP, beforeLines.length, afterLines.length);
+  let diff = `Index: ${fp}
+===================================================================
+--- ${fp}
++++ ${fp}
 `;
-    } else {
-      if (bl !== undefined)
-        diff += `-${bl}
+  for (const hunk of hunks) {
+    diff += `@@ -${hunk.beforeStart},${hunk.beforeCount} +${hunk.afterStart},${hunk.afterCount} @@
 `;
-      if (al !== undefined)
-        diff += `+${al}
+    for (const line of hunk.lines) {
+      diff += `${line}
 `;
     }
   }
   return diff;
 }
+function diffLines(a, b) {
+  const n = a.length;
+  const m = b.length;
+  const dp = new Uint32Array((n + 1) * (m + 1));
+  const w = m + 1;
+  for (let i2 = 1;i2 <= n; i2++) {
+    for (let j2 = 1;j2 <= m; j2++) {
+      if (a[i2 - 1] === b[j2 - 1]) {
+        dp[i2 * w + j2] = dp[(i2 - 1) * w + (j2 - 1)] + 1;
+      } else {
+        const up = dp[(i2 - 1) * w + j2];
+        const left = dp[i2 * w + (j2 - 1)];
+        dp[i2 * w + j2] = up >= left ? up : left;
+      }
+    }
+  }
+  const ops = [];
+  let i = n;
+  let j = m;
+  while (i > 0 && j > 0) {
+    if (a[i - 1] === b[j - 1]) {
+      ops.push({ tag: "eq", beforeIdx: i - 1, afterIdx: j - 1, line: a[i - 1] });
+      i--;
+      j--;
+    } else if (dp[(i - 1) * w + j] >= dp[i * w + (j - 1)]) {
+      ops.push({ tag: "del", beforeIdx: i - 1, line: a[i - 1] });
+      i--;
+    } else {
+      ops.push({ tag: "ins", afterIdx: j - 1, line: b[j - 1] });
+      j--;
+    }
+  }
+  while (i > 0) {
+    ops.push({ tag: "del", beforeIdx: i - 1, line: a[i - 1] });
+    i--;
+  }
+  while (j > 0) {
+    ops.push({ tag: "ins", afterIdx: j - 1, line: b[j - 1] });
+    j--;
+  }
+  ops.reverse();
+  return ops;
+}
+function groupIntoHunks(ops, context, gap, beforeLen, afterLen) {
+  const changeIdx = [];
+  for (let k = 0;k < ops.length; k++) {
+    if (ops[k].tag !== "eq")
+      changeIdx.push(k);
+  }
+  if (changeIdx.length === 0)
+    return [];
+  const ranges = [];
+  for (const idx of changeIdx) {
+    const start = Math.max(0, idx - context);
+    const end = Math.min(ops.length - 1, idx + context);
+    if (ranges.length > 0 && start <= ranges[ranges.length - 1][1] + gap) {
+      ranges[ranges.length - 1][1] = Math.max(ranges[ranges.length - 1][1], end);
+    } else {
+      ranges.push([start, end]);
+    }
+  }
+  const hunks = [];
+  for (const [start, end] of ranges) {
+    let beforeStart = -1;
+    let afterStart = -1;
+    let beforeCount = 0;
+    let afterCount = 0;
+    const lines = [];
+    for (let k = start;k <= end; k++) {
+      const op = ops[k];
+      if (op.tag === "eq") {
+        if (beforeStart === -1)
+          beforeStart = op.beforeIdx + 1;
+        if (afterStart === -1)
+          afterStart = op.afterIdx + 1;
+        beforeCount++;
+        afterCount++;
+        lines.push(` ${op.line}`);
+      } else if (op.tag === "del") {
+        if (beforeStart === -1)
+          beforeStart = op.beforeIdx + 1;
+        if (afterStart === -1) {
+          afterStart = inferAfterStart(ops, k, afterLen);
+        }
+        beforeCount++;
+        lines.push(`-${op.line}`);
+      } else {
+        if (afterStart === -1)
+          afterStart = op.afterIdx + 1;
+        if (beforeStart === -1) {
+          beforeStart = inferBeforeStart(ops, k, beforeLen);
+        }
+        afterCount++;
+        lines.push(`+${op.line}`);
+      }
+    }
+    if (beforeCount === 0)
+      beforeStart = 0;
+    if (afterCount === 0)
+      afterStart = 0;
+    hunks.push({ beforeStart, beforeCount, afterStart, afterCount, lines });
+  }
+  return hunks;
+}
+function inferAfterStart(ops, from, afterLen) {
+  for (let k = from;k < ops.length; k++) {
+    const op = ops[k];
+    if (op.tag === "eq")
+      return op.afterIdx + 1;
+    if (op.tag === "ins")
+      return op.afterIdx + 1;
+  }
+  return afterLen;
+}
+function inferBeforeStart(ops, from, beforeLen) {
+  for (let k = from;k < ops.length; k++) {
+    const op = ops[k];
+    if (op.tag === "eq")
+      return op.beforeIdx + 1;
+    if (op.tag === "del")
+      return op.beforeIdx + 1;
+  }
+  return beforeLen;
+}
 var z3 = tool3.schema;
 var READ_DESCRIPTION = `Read file contents or list directory entries.
 

package/dist/tools/hoisted-internals.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Test-only re-exports of internal helpers from hoisted.ts.
+ *
+ * Kept in a separate file so the production import surface of hoisted.ts
+ * stays focused. Bun's test runner imports this directly; the bundled
+ * plugin output never references this module.
+ */
+export { _buildUnifiedDiffForTest } from "./hoisted.js";
+//# sourceMappingURL=hoisted-internals.d.ts.map

package/dist/tools/hoisted-internals.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hoisted-internals.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted-internals.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC"}

package/dist/tools/hoisted.d.ts

@@ -10,6 +10,8 @@
  */
 import type { ToolDefinition } from "@opencode-ai/plugin";
 import type { PluginContext } from "../types.js";
+/** Test-only export. Production code uses buildUnifiedDiff directly. */
+export declare const _buildUnifiedDiffForTest: (fp: string, before: string, after: string) => string;
 /**
  * Creates the simple read tool. Registers as "read" when hoisted, "aft_read" when not.
  */

package/dist/tools/hoisted.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA6EjD;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CA4IjE;AAkxBD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAS/E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAuBnF"}
+{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAcjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA2OtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CA4IjE;AAkxBD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAS/E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAuBnF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.15.4",
+  "version": "0.15.5",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -32,11 +32,11 @@
     "zod": "^4.1.8"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.15.4",
-    "@cortexkit/aft-darwin-x64": "0.15.4",
-    "@cortexkit/aft-linux-arm64": "0.15.4",
-    "@cortexkit/aft-linux-x64": "0.15.4",
-    "@cortexkit/aft-win32-x64": "0.15.4"
+    "@cortexkit/aft-darwin-arm64": "0.15.5",
+    "@cortexkit/aft-darwin-x64": "0.15.5",
+    "@cortexkit/aft-linux-arm64": "0.15.5",
+    "@cortexkit/aft-linux-x64": "0.15.5",
+    "@cortexkit/aft-win32-x64": "0.15.5"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",