@theokit/sdk-tools 0.12.0 → 0.13.0

package/dist/index.cjs

@@ -265,6 +265,90 @@ function createSessionArtifactStore(options) {
   }
   return { write, read, has, list, path };
 }
+
+// src/internal/context-match.ts
+var ContextMatchError = class extends Error {
+  reason;
+  constructor(reason, message) {
+    super(message);
+    this.name = "ContextMatchError";
+    this.reason = reason;
+  }
+};
+function normalizeUnicode(s) {
+  return s.replace(/[‐-―−]/g, "-").replace(/[‘-‛]/g, "'").replace(/[“-‟]/g, '"').replace(/[ -   　]/g, " ");
+}
+var LINE_MATCH_LADDER = [
+  (s) => s,
+  // exact
+  (s) => s.replace(/\s+$/, ""),
+  // rstrip (ignore trailing whitespace)
+  (s) => s.trim(),
+  // trim (ignore leading + trailing)
+  (s) => normalizeUnicode(s).trim()
+  // unicode + trim (loosest)
+];
+function matchesAt(lines, pattern, i, norm) {
+  for (let p = 0; p < pattern.length; p++) {
+    const lineAt = lines[i + p];
+    const patAt = pattern[p];
+    if (lineAt === void 0 || patAt === void 0 || norm(lineAt) !== norm(patAt)) return false;
+  }
+  return true;
+}
+function findHits(lines, pattern, norm) {
+  const hits = [];
+  for (let i = 0; i + pattern.length <= lines.length; i++) {
+    if (matchesAt(lines, pattern, i, norm)) hits.push(i);
+  }
+  return hits;
+}
+function seekUniqueLineMatch(lines, pattern, find) {
+  if (pattern.length === 0 || pattern.length > lines.length) return null;
+  for (const norm of LINE_MATCH_LADDER) {
+    const hits = findHits(lines, pattern, norm);
+    if (hits.length === 1) return hits[0] ?? null;
+    if (hits.length > 1) {
+      throw new ContextMatchError(
+        "ambiguous",
+        `target text is ambiguous (multiple matches); include more context:
+${find}`
+      );
+    }
+  }
+  return null;
+}
+function replaceUnique(content, find, replace) {
+  if (find === "") {
+    throw new ContextMatchError(
+      "empty",
+      "empty find is not a valid target; provide the text to replace"
+    );
+  }
+  const first = content.indexOf(find);
+  if (first !== -1) {
+    if (content.indexOf(find, first + 1) !== -1) {
+      throw new ContextMatchError(
+        "ambiguous",
+        `target text is ambiguous (multiple matches); include more context:
+${find}`
+      );
+    }
+    return content.slice(0, first) + replace + content.slice(first + find.length);
+  }
+  const lines = content.split("\n");
+  const at = seekUniqueLineMatch(lines, find.split("\n"), find);
+  if (at === null) {
+    throw new ContextMatchError("not_found", `target text not found:
+${find}`);
+  }
+  const patternLen = find.split("\n").length;
+  const matchedCrlf = patternLen > 0 && lines.slice(at, at + patternLen).every((l) => l.endsWith("\r"));
+  const replaceLines = matchedCrlf ? replace.split("\n").map((l) => l.endsWith("\r") ? l : `${l}\r`) : replace.split("\n");
+  return [...lines.slice(0, at), ...replaceLines, ...lines.slice(at + patternLen)].join("\n");
+}
+
+// src/edit-file.ts
 function createEditFileTool(opts) {
   const { projectRoot } = opts;
   return sdk.Tool.create({
@@ -306,26 +390,36 @@ function createEditFileTool(opts) {
       const exactIdx = content.indexOf(old_string);
       if (exactIdx !== -1) {
         await promises.copyFile(absolutePath, `${absolutePath}.bak`);
-        const result2 = content.slice(0, exactIdx) + new_string + content.slice(exactIdx + old_string.length);
-        await promises.writeFile(absolutePath, result2, "utf-8");
+        const result = content.slice(0, exactIdx) + new_string + content.slice(exactIdx + old_string.length);
+        await promises.writeFile(absolutePath, result, "utf-8");
         return JSON.stringify({ ok: true, replacements: 1 });
       }
       const normalizedContent = normalizeWhitespace(content);
       const normalizedOld = normalizeWhitespace(old_string);
       const normalizedIdx = normalizedContent.indexOf(normalizedOld);
-      if (normalizedIdx === -1) {
-        return JSON.stringify({ ok: false, error: "no_match", path });
+      if (normalizedIdx !== -1) {
+        const span = findOriginalSpan(
+          content,
+          normalizedContent,
+          normalizedIdx,
+          normalizedOld.length
+        );
+        await promises.copyFile(absolutePath, `${absolutePath}.bak`);
+        const result = content.slice(0, span.start) + new_string + content.slice(span.end);
+        await promises.writeFile(absolutePath, result, "utf-8");
+        return JSON.stringify({ ok: true, replacements: 1 });
+      }
+      try {
+        const result = replaceUnique(content, old_string, new_string);
+        await promises.copyFile(absolutePath, `${absolutePath}.bak`);
+        await promises.writeFile(absolutePath, result, "utf-8");
+        return JSON.stringify({ ok: true, replacements: 1 });
+      } catch (err) {
+        if (err instanceof ContextMatchError) {
+          return JSON.stringify({ ok: false, error: "no_match", path });
+        }
+        throw err;
       }
-      const span = findOriginalSpan(
-        content,
-        normalizedContent,
-        normalizedIdx,
-        normalizedOld.length
-      );
-      await promises.copyFile(absolutePath, `${absolutePath}.bak`);
-      const result = content.slice(0, span.start) + new_string + content.slice(span.end);
-      await promises.writeFile(absolutePath, result, "utf-8");
-      return JSON.stringify({ ok: true, replacements: 1 });
     }
   });
 }
@@ -2250,6 +2344,7 @@ async function isBinaryFile(absolutePath) {
 }
 
 exports.CatastrophicCommandError = CatastrophicCommandError;
+exports.ContextMatchError = ContextMatchError;
 exports.DEFAULT_TOOL_GUIDANCE = DEFAULT_TOOL_GUIDANCE;
 exports.ReadTracker = ReadTracker;
 exports.ReasoningTools = ReasoningTools;
@@ -2286,6 +2381,7 @@ exports.injectGuidance = injectGuidance;
 exports.isBlockedIp = isBlockedIp;
 exports.isCommandAllowed = isCommandAllowed;
 exports.renderToolList = renderToolList;
+exports.replaceUnique = replaceUnique;
 exports.resolveAndScreen = resolveAndScreen;
 exports.screenedFetch = screenedFetch;
 exports.todoItemsToPlanNodes = todoItemsToPlanNodes;