clanka 0.2.9 → 0.2.11

package/dist/ScriptPreprocessing.js

@@ -0,0 +1,314 @@
+const isIdentifierChar = (char) => char !== undefined && /[A-Za-z0-9_$]/.test(char);
+const isIdentifierStartChar = (char) => char !== undefined && /[A-Za-z_$]/.test(char);
+const hasIdentifierBoundary = (text, index, length) => !isIdentifierChar(text[index - 1]) && !isIdentifierChar(text[index + length]);
+const findNextIdentifier = (text, identifier, from) => {
+    let index = text.indexOf(identifier, from);
+    while (index !== -1) {
+        if (hasIdentifierBoundary(text, index, identifier.length)) {
+            return index;
+        }
+        index = text.indexOf(identifier, index + identifier.length);
+    }
+    return -1;
+};
+const skipWhitespace = (text, start) => {
+    let i = start;
+    while (i < text.length && /\s/.test(text[i])) {
+        i++;
+    }
+    return i;
+};
+const parseIdentifier = (text, start) => {
+    if (!isIdentifierStartChar(text[start])) {
+        return undefined;
+    }
+    let end = start + 1;
+    while (end < text.length && isIdentifierChar(text[end])) {
+        end++;
+    }
+    return {
+        name: text.slice(start, end),
+        end,
+    };
+};
+const isEscaped = (text, index) => {
+    let slashCount = 0;
+    let i = index - 1;
+    while (i >= 0 && text[i] === "\\") {
+        slashCount++;
+        i--;
+    }
+    return slashCount % 2 === 1;
+};
+const needsTemplateEscaping = (text) => {
+    for (let i = 0; i < text.length; i++) {
+        const char = text[i];
+        if (char === "`" && !isEscaped(text, i)) {
+            return true;
+        }
+        if (char === "$" && text[i + 1] === "{" && !isEscaped(text, i)) {
+            return true;
+        }
+    }
+    return false;
+};
+const escapeTemplateLiteralContent = (text) => {
+    if (!needsTemplateEscaping(text)) {
+        return text;
+    }
+    let out = "";
+    for (let i = 0; i < text.length; i++) {
+        const char = text[i];
+        if (char === "\\") {
+            out += "\\\\";
+            continue;
+        }
+        if (char === "`" && !isEscaped(text, i)) {
+            out += "\\`";
+            continue;
+        }
+        if (char === "$" && text[i + 1] === "{" && !isEscaped(text, i)) {
+            out += "\\$";
+            continue;
+        }
+        out += char;
+    }
+    return out;
+};
+const findTemplateEnd = (text, start, isTerminator) => {
+    for (let i = start + 1; i < text.length; i++) {
+        if (text[i] !== "`" || isEscaped(text, i)) {
+            continue;
+        }
+        const next = skipWhitespace(text, i + 1);
+        if (isTerminator(text[next])) {
+            return i;
+        }
+    }
+    return -1;
+};
+const findTypeAnnotationAssignment = (text, start) => {
+    let i = start;
+    while (i < text.length) {
+        const char = text[i];
+        if (char === "=") {
+            return i;
+        }
+        if (char === "\n" || char === ";") {
+            return -1;
+        }
+        i++;
+    }
+    return -1;
+};
+const fixCallTemplateArgument = (script, functionName, isTerminator) => {
+    let out = script;
+    let cursor = 0;
+    while (cursor < out.length) {
+        const callStart = findNextIdentifier(out, functionName, cursor);
+        if (callStart === -1) {
+            break;
+        }
+        const openParen = skipWhitespace(out, callStart + functionName.length);
+        if (out[openParen] !== "(") {
+            cursor = callStart + functionName.length;
+            continue;
+        }
+        const templateStart = skipWhitespace(out, openParen + 1);
+        if (out[templateStart] !== "`") {
+            cursor = openParen + 1;
+            continue;
+        }
+        const templateEnd = findTemplateEnd(out, templateStart, isTerminator);
+        if (templateEnd === -1) {
+            cursor = templateStart + 1;
+            continue;
+        }
+        const original = out.slice(templateStart + 1, templateEnd);
+        const escaped = escapeTemplateLiteralContent(original);
+        if (escaped !== original) {
+            out = `${out.slice(0, templateStart + 1)}${escaped}${out.slice(templateEnd)}`;
+            cursor = templateEnd + (escaped.length - original.length) + 1;
+            continue;
+        }
+        cursor = templateEnd + 1;
+    }
+    return out;
+};
+const collectCallArgumentIdentifiers = (script, functionName) => {
+    const out = new Set();
+    let cursor = 0;
+    while (cursor < script.length) {
+        const callStart = findNextIdentifier(script, functionName, cursor);
+        if (callStart === -1) {
+            break;
+        }
+        const openParen = skipWhitespace(script, callStart + functionName.length);
+        if (script[openParen] !== "(") {
+            cursor = callStart + functionName.length;
+            continue;
+        }
+        const argumentStart = skipWhitespace(script, openParen + 1);
+        const identifier = parseIdentifier(script, argumentStart);
+        if (identifier === undefined) {
+            cursor = openParen + 1;
+            continue;
+        }
+        const argumentEnd = skipWhitespace(script, identifier.end);
+        if (script[argumentEnd] === ")" || script[argumentEnd] === ",") {
+            out.add(identifier.name);
+        }
+        cursor = identifier.end;
+    }
+    return out;
+};
+const fixWriteFileContentTemplates = (script) => {
+    let out = script;
+    let cursor = 0;
+    while (cursor < out.length) {
+        const callStart = findNextIdentifier(out, "writeFile", cursor);
+        if (callStart === -1) {
+            break;
+        }
+        const openParen = skipWhitespace(out, callStart + "writeFile".length);
+        if (out[openParen] !== "(") {
+            cursor = callStart + "writeFile".length;
+            continue;
+        }
+        const contentKey = findNextIdentifier(out, "content", openParen + 1);
+        if (contentKey === -1) {
+            cursor = openParen + 1;
+            continue;
+        }
+        const colon = skipWhitespace(out, contentKey + "content".length);
+        if (out[colon] !== ":") {
+            cursor = contentKey + "content".length;
+            continue;
+        }
+        const templateStart = skipWhitespace(out, colon + 1);
+        if (out[templateStart] !== "`") {
+            cursor = templateStart + 1;
+            continue;
+        }
+        const templateEnd = findTemplateEnd(out, templateStart, (char) => char === "}" || char === ",");
+        if (templateEnd === -1) {
+            cursor = templateStart + 1;
+            continue;
+        }
+        const original = out.slice(templateStart + 1, templateEnd);
+        const escaped = escapeTemplateLiteralContent(original);
+        if (escaped !== original) {
+            out = `${out.slice(0, templateStart + 1)}${escaped}${out.slice(templateEnd)}`;
+            cursor = templateEnd + (escaped.length - original.length) + 1;
+            continue;
+        }
+        cursor = templateEnd + 1;
+    }
+    return out;
+};
+const collectWriteFileContentIdentifiers = (script) => {
+    const out = new Set();
+    let cursor = 0;
+    while (cursor < script.length) {
+        const callStart = findNextIdentifier(script, "writeFile", cursor);
+        if (callStart === -1) {
+            break;
+        }
+        const openParen = skipWhitespace(script, callStart + "writeFile".length);
+        if (script[openParen] !== "(") {
+            cursor = callStart + "writeFile".length;
+            continue;
+        }
+        const contentKey = findNextIdentifier(script, "content", openParen + 1);
+        if (contentKey === -1) {
+            cursor = openParen + 1;
+            continue;
+        }
+        const afterContent = skipWhitespace(script, contentKey + "content".length);
+        if (script[afterContent] === ":") {
+            const valueStart = skipWhitespace(script, afterContent + 1);
+            const identifier = parseIdentifier(script, valueStart);
+            if (identifier !== undefined) {
+                const valueEnd = skipWhitespace(script, identifier.end);
+                if (script[valueEnd] === "}" || script[valueEnd] === ",") {
+                    out.add(identifier.name);
+                }
+            }
+            cursor = valueStart + 1;
+            continue;
+        }
+        if (script[afterContent] === "}" || script[afterContent] === ",") {
+            out.add("content");
+            cursor = afterContent + 1;
+            continue;
+        }
+        cursor = afterContent + 1;
+    }
+    return out;
+};
+const fixAssignedTemplate = (script, variableName) => {
+    let out = script;
+    let cursor = 0;
+    while (cursor < out.length) {
+        const variableStart = findNextIdentifier(out, variableName, cursor);
+        if (variableStart === -1) {
+            break;
+        }
+        let assignmentStart = skipWhitespace(out, variableStart + variableName.length);
+        if (out[assignmentStart] === ":") {
+            assignmentStart = findTypeAnnotationAssignment(out, assignmentStart + 1);
+            if (assignmentStart === -1) {
+                cursor = variableStart + variableName.length;
+                continue;
+            }
+        }
+        if (out[assignmentStart] !== "=" ||
+            out[assignmentStart + 1] === "=" ||
+            out[assignmentStart + 1] === ">") {
+            cursor = variableStart + variableName.length;
+            continue;
+        }
+        const templateStart = skipWhitespace(out, assignmentStart + 1);
+        if (out[templateStart] !== "`") {
+            cursor = templateStart + 1;
+            continue;
+        }
+        const templateEnd = findTemplateEnd(out, templateStart, (char) => char === undefined ||
+            char === ";" ||
+            char === "," ||
+            char === ")" ||
+            char === "}" ||
+            char === "]");
+        if (templateEnd === -1) {
+            cursor = templateStart + 1;
+            continue;
+        }
+        const original = out.slice(templateStart + 1, templateEnd);
+        const escaped = escapeTemplateLiteralContent(original);
+        if (escaped !== original) {
+            out = `${out.slice(0, templateStart + 1)}${escaped}${out.slice(templateEnd)}`;
+            cursor = templateEnd + (escaped.length - original.length) + 1;
+            continue;
+        }
+        cursor = templateEnd + 1;
+    }
+    return out;
+};
+const fixAssignedTemplatesForToolCalls = (script) => {
+    const identifiers = new Set();
+    for (const functionName of ["applyPatch", "taskComplete"]) {
+        for (const identifier of collectCallArgumentIdentifiers(script, functionName)) {
+            identifiers.add(identifier);
+        }
+    }
+    for (const identifier of collectWriteFileContentIdentifiers(script)) {
+        identifiers.add(identifier);
+    }
+    let out = script;
+    for (const identifier of identifiers) {
+        out = fixAssignedTemplate(out, identifier);
+    }
+    return out;
+};
+export const preprocessScript = (script) => fixAssignedTemplatesForToolCalls(["applyPatch", "taskComplete"].reduce((current, functionName) => fixCallTemplateArgument(current, functionName, (char) => char === ")"), fixWriteFileContentTemplates(script)));
+//# sourceMappingURL=ScriptPreprocessing.js.map

package/dist/ScriptPreprocessing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScriptPreprocessing.js","sourceRoot":"","sources":["../src/ScriptPreprocessing.ts"],"names":[],"mappings":"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"}

package/dist/ScriptPreprocessing.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ScriptPreprocessing.test.d.ts.map

package/dist/ScriptPreprocessing.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScriptPreprocessing.test.d.ts","sourceRoot":"","sources":["../src/ScriptPreprocessing.test.ts"],"names":[],"mappings":""}

package/dist/ScriptPreprocessing.test.js

@@ -0,0 +1,108 @@
+import { assert, describe, it } from "@effect/vitest";
+import { preprocessScript } from "./ScriptPreprocessing.js";
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+const tick = "`";
+const escaped = "\\`";
+const escapedInterpolation = "\\${";
+const wrapTemplate = (value) => `${tick}${value}${tick}`;
+describe("preprocessScript", () => {
+    it("escapes internal backticks in applyPatch templates", () => {
+        const input = [
+            "await applyPatch(`",
+            "*** Begin Patch",
+            "*** Update File: src/example.ts",
+            "@@",
+            "-const oldValue = `old`",
+            "+const newValue = `new`",
+            "*** End Patch",
+            "`)",
+        ].join("\n");
+        const output = preprocessScript(input);
+        assert.strictEqual(output.includes(`-const oldValue = ${escaped}old${escaped}`), true);
+        assert.strictEqual(output.includes(`+const newValue = ${escaped}new${escaped}`), true);
+    });
+    it("escapes internal interpolations in applyPatch templates", () => {
+        const input = [
+            "await applyPatch(`",
+            "*** Begin Patch",
+            "*** Update File: src/example.ts",
+            "@@",
+            "+const value = ${nextValue}",
+            "*** End Patch",
+            "`)",
+        ].join("\n");
+        const output = preprocessScript(input);
+        assert.strictEqual(output.includes(`+const value = ${escapedInterpolation}nextValue}`), true);
+    });
+    it("escapes internal backticks in writeFile content templates", () => {
+        const input = [
+            "await writeFile({",
+            '  path: "src/example.ts",',
+            "  content: `const value = `next``,",
+            "})",
+        ].join("\n");
+        const output = preprocessScript(input);
+        assert.strictEqual(output.includes(`content: ${wrapTemplate(`const value = ${escaped}next${escaped}`)},`), true);
+    });
+    it("escapes internal backticks in taskComplete templates", () => {
+        const input = "await taskComplete(`Implemented `TypeBuilder` updates.`)";
+        const output = preprocessScript(input);
+        assert.strictEqual(output, `await taskComplete(${wrapTemplate(`Implemented ${escaped}TypeBuilder${escaped} updates.`)})`);
+    });
+    it("does not change scripts when target templates are already escaped", () => {
+        const input = [
+            `await applyPatch(${wrapTemplate(`const value = ${escaped}safe${escaped}`)})`,
+            `await applyPatch(${wrapTemplate(`const value = ${escapedInterpolation}safe}`)})`,
+            `await writeFile({ path: "src/example.ts", content: ${wrapTemplate(`already ${escaped}safe${escaped}`)} })`,
+            `await taskComplete(${wrapTemplate(`All done with ${escaped}safe${escaped} backticks.`)})`,
+        ].join("\n");
+        assert.strictEqual(preprocessScript(input), input);
+    });
+    it("does not modify non-target function calls", () => {
+        const input = "await otherTool(`Keep `this` untouched.`)";
+        assert.strictEqual(preprocessScript(input), input);
+    });
+    it("escapes internal backticks in applyPatch templates assigned to variables", () => {
+        const input = [
+            "const patch = `*** Begin Patch",
+            "*** Update File: src/example.ts",
+            "@@",
+            "-const oldValue = `old`",
+            "+const newValue = `new`",
+            "*** End Patch`;",
+            "await applyPatch(patch)",
+        ].join("\n");
+        const output = preprocessScript(input);
+        assert.strictEqual(output.includes(`-const oldValue = ${escaped}old${escaped}`), true);
+        assert.strictEqual(output.includes(`+const newValue = ${escaped}new${escaped}`), true);
+    });
+    it("escapes internal backticks in taskComplete templates assigned to variables", () => {
+        const input = [
+            "const summary = `Implemented `TypeBuilder` updates.`;",
+            "await taskComplete(summary)",
+        ].join("\n");
+        const output = preprocessScript(input);
+        assert.strictEqual(output, [
+            `const summary = ${wrapTemplate(`Implemented ${escaped}TypeBuilder${escaped} updates.`)};`,
+            "await taskComplete(summary)",
+        ].join("\n"));
+    });
+    it("escapes internal backticks in writeFile content assigned to variables", () => {
+        const input = [
+            "const body = `const value = `next``;",
+            "await writeFile({",
+            '  path: "src/example.ts",',
+            "  content: body,",
+            "})",
+        ].join("\n");
+        const output = preprocessScript(input);
+        assert.strictEqual(output.includes(`const body = ${wrapTemplate(`const value = ${escaped}next${escaped}`)};`), true);
+    });
+    it.each(["patch", "patch2"])("fixes broken %s", (fixture) => {
+        const content = readFileSync(join(__dirname, "fixtures", `${fixture}-broken.txt`), "utf-8");
+        const fixed = readFileSync(join(__dirname, "fixtures", `${fixture}-fixed.txt`), "utf-8");
+        assert.equal(preprocessScript(content), fixed);
+    });
+});
+//# sourceMappingURL=ScriptPreprocessing.test.js.map

package/dist/ScriptPreprocessing.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScriptPreprocessing.test.js","sourceRoot":"","sources":["../src/ScriptPreprocessing.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "clanka",
   "type": "module",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "publishConfig": {
     "access": "public"
   },
@@ -27,8 +27,8 @@
     "@vscode/ripgrep": "^1.17.1",
     "chalk": "^5.6.2",
     "glob": "^13.0.6",
-    "tree-sitter": "^0.22.4",
-    "tree-sitter-javascript": "^0.25.0",
+    "tree-sitter": "^0.21.0",
+    "tree-sitter-javascript": "^0.23.1",
     "tree-sitter-typescript": "^0.23.2",
     "turndown": "^7.2.2"
   },

package/src/AgentExecutor.ts

@@ -38,6 +38,7 @@ import * as RpcGroup from "effect/unstable/rpc/RpcGroup"
 import * as Rpc from "effect/unstable/rpc/Rpc"
 import * as Result from "effect/Result"
 import { SemanticSearch } from "./SemanticSearch.ts"
+import { preprocessScript } from "./ScriptPreprocessing.ts"
 import * as References from "effect/References"
 
 /**
@@ -144,9 +145,7 @@ export const makeLocal = Effect.fnUntraced(function* <
       const console = yield* Console.Console
       let running = 0
 
-      const vmScript = new NodeVm.Script(`async function main() {
-${opts.script}
-}`)
+      const vmScript = compileScript(opts.script)
       const sandbox: ScriptSandbox = {
         main: defaultMain,
         console,
@@ -433,6 +432,31 @@ interface ScriptSandbox {
   [toolName: string]: unknown
 }
 
+const wrapScript = (script: string): string => `async function main() {
+${script}
+}`
+
+const compileScript = (script: string): NodeVm.Script => {
+  try {
+    return new NodeVm.Script(wrapScript(script))
+  } catch (error) {
+    if (!(error instanceof SyntaxError)) {
+      throw error
+    }
+
+    const preprocessed = preprocessScript(script)
+    if (preprocessed === script) {
+      throw error
+    }
+
+    try {
+      return new NodeVm.Script(wrapScript(preprocessed))
+    } catch {
+      throw error
+    }
+  }
+}
+
 const defaultMain = () => Promise.resolve()
 
 const makeConsole = Effect.fn(function* (

package/src/CodeChunker.test.ts

@@ -5,6 +5,7 @@ import {
   isProbablyMinified,
 } from "./CodeChunker.ts"
 import { readFileSync } from "node:fs"
+import { join } from "node:path"
 
 describe("isMeaningfulFile", () => {
   it("keeps source and documentation files", () => {
@@ -322,7 +323,7 @@ describe("chunkFileContent", () => {
 
   it("seperates class methods into their own chunks", () => {
     const fixture = readFileSync(
-      "/Volumes/Code/effect/effect-smol/packages/effect/src/internal/effect.ts",
+      join(__dirname, "fixtures", "fiber.txt"),
       "utf-8",
     )
     const chunks = chunkFileContent("src/fiber.ts", fixture, {

package/src/CodeChunker.ts

@@ -534,7 +534,7 @@ const collectAstRanges = (
 
   try {
     const parser = new TreeSitter()
-    parser.setLanguage(language as TreeSitter.Language)
+    parser.setLanguage(language)
     const tree = parser.parse(content, undefined, {
       bufferSize: 1024 * 1024,
     })