@travisennis/acai 0.0.12 → 0.0.13

package/dist/tools/apply-patch.js

@@ -38,47 +38,53 @@ function parsePatchHeader(lines, startIdx) {
     }
     return null;
 }
+function parseOneChunk(lines, startIdx) {
+    const contextLine = lines[startIdx].substring(2).trim();
+    let i = startIdx + 1;
+    const oldLines = [];
+    const newLines = [];
+    let isEndOfFile = false;
+    while (i < lines.length && !lines[i].startsWith("@@")) {
+        const changeLine = lines[i];
+        if (changeLine === "*** End of File") {
+            isEndOfFile = true;
+            i++;
+            break;
+        }
+        if (changeLine.startsWith("***")) {
+            break;
+        }
+        if (changeLine.startsWith(" ")) {
+            const content = changeLine.substring(1);
+            oldLines.push(content);
+            newLines.push(content);
+        }
+        else if (changeLine.startsWith("-")) {
+            oldLines.push(changeLine.substring(1));
+        }
+        else if (changeLine.startsWith("+")) {
+            newLines.push(changeLine.substring(1));
+        }
+        i++;
+    }
+    return {
+        chunk: {
+            oldLines,
+            newLines,
+            changeContext: contextLine || undefined,
+            isEndOfFile: isEndOfFile || undefined,
+        },
+        nextIdx: i,
+    };
+}
 function parseUpdateFileChunks(lines, startIdx) {
     const chunks = [];
     let i = startIdx;
     while (i < lines.length && !lines[i].startsWith("***")) {
         if (lines[i].startsWith("@@")) {
-            const contextLine = lines[i].substring(2).trim();
-            i++;
-            const oldLines = [];
-            const newLines = [];
-            let isEndOfFile = false;
-            while (i < lines.length && !lines[i].startsWith("@@")) {
-                const changeLine = lines[i];
-                // Check for end of file marker first (before general *** check)
-                if (changeLine === "*** End of File") {
-                    isEndOfFile = true;
-                    i++;
-                    break;
-                }
-                // Check for other *** markers (new file operations)
-                if (changeLine.startsWith("***")) {
-                    break;
-                }
-                if (changeLine.startsWith(" ")) {
-                    const content = changeLine.substring(1);
-                    oldLines.push(content);
-                    newLines.push(content);
-                }
-                else if (changeLine.startsWith("-")) {
-                    oldLines.push(changeLine.substring(1));
-                }
-                else if (changeLine.startsWith("+")) {
-                    newLines.push(changeLine.substring(1));
-                }
-                i++;
-            }
-            chunks.push({
-                oldLines,
-                newLines,
-                changeContext: contextLine || undefined,
-                isEndOfFile: isEndOfFile || undefined,
-            });
+            const { chunk, nextIdx } = parseOneChunk(lines, i);
+            chunks.push(chunk);
+            i = nextIdx;
         }
         else {
             i++;
@@ -175,36 +181,50 @@ function applyReplacements(lines, replacements) {
     }
     return result;
 }
-function computeReplacements(originalLines, filePath, chunks) {
+function findContextLine(originalLines, changeContext, lineIndex, filePath) {
+    const contextIdx = seekSequence(originalLines, [changeContext], lineIndex);
+    if (contextIdx === -1) {
+        throw new Error(`Failed to find context '${changeContext}' in ${filePath}`);
+    }
+    return contextIdx + 1;
+}
+function computeInsertionIndex(originalLines) {
+    return originalLines.length > 0 &&
+        originalLines[originalLines.length - 1] === ""
+        ? originalLines.length - 1
+        : originalLines.length;
+}
+function findPatternWithFallback(originalLines, oldLines, newLines, lineIndex) {
+    let pattern = oldLines;
+    let newSlice = newLines;
+    let found = seekSequence(originalLines, pattern, lineIndex);
+    if (found === -1 &&
+        pattern.length > 0 &&
+        pattern[pattern.length - 1] === "") {
+        pattern = pattern.slice(0, -1);
+        if (newSlice.length > 0 && newSlice[newSlice.length - 1] === "") {
+            newSlice = newSlice.slice(0, -1);
+        }
+        found = seekSequence(originalLines, pattern, lineIndex);
+    }
+    return { pattern, newSlice, found };
+}
+export function computeReplacements(originalLines, filePath, chunks) {
     const replacements = [];
     let lineIndex = 0;
     for (const chunk of chunks) {
         if (chunk.changeContext) {
-            const contextIdx = seekSequence(originalLines, [chunk.changeContext], lineIndex);
-            if (contextIdx === -1) {
-                throw new Error(`Failed to find context '${chunk.changeContext}' in ${filePath}`);
-            }
-            lineIndex = contextIdx + 1;
+            lineIndex = findContextLine(originalLines, chunk.changeContext, lineIndex, filePath);
         }
         if (chunk.oldLines.length === 0) {
-            const insertionIdx = originalLines.length > 0 &&
-                originalLines[originalLines.length - 1] === ""
-                ? originalLines.length - 1
-                : originalLines.length;
-            replacements.push([insertionIdx, 0, chunk.newLines]);
+            replacements.push([
+                computeInsertionIndex(originalLines),
+                0,
+                chunk.newLines,
+            ]);
             continue;
         }
-        let pattern = chunk.oldLines;
-        let newSlice = chunk.newLines;
-        let found = seekSequence(originalLines, pattern, lineIndex);
-        if (found === -1 &&
-            pattern.length > 0 &&
-            pattern[pattern.length - 1] === "") {
-            pattern = pattern.slice(0, -1);
-            if (newSlice.length > 0 && newSlice[newSlice.length - 1] === "")
-                newSlice = newSlice.slice(0, -1);
-            found = seekSequence(originalLines, pattern, lineIndex);
-        }
+        const { pattern, newSlice, found } = findPatternWithFallback(originalLines, chunk.oldLines, chunk.newLines, lineIndex);
         if (found !== -1) {
             replacements.push([found, pattern.length, newSlice]);
             lineIndex = found + pattern.length;
@@ -242,39 +262,91 @@ function deriveNewContentsFromChunks(fileAbsPath, chunks) {
         content: newContent,
     };
 }
-async function applyChanges(changes, signal) {
+async function applyAddChange(change, changed) {
+    const dir = path.dirname(change.path);
+    if (dir !== "." && dir !== "/")
+        await fsp.mkdir(dir, { recursive: true });
+    await fsp.writeFile(change.path, change.content, "utf-8");
+    changed.push(change.path);
+}
+async function applyDeleteChange(change, changed) {
+    await fsp.unlink(change.path).catch(() => { });
+    changed.push(change.path);
+}
+async function applyUpdateChange(change, changed) {
+    if (change.movePath) {
+        const dir = path.dirname(change.movePath);
+        if (dir !== "." && dir !== "/")
+            await fsp.mkdir(dir, { recursive: true });
+        await fsp.writeFile(change.movePath, change.newContent, "utf-8");
+        await fsp.unlink(change.path).catch(() => { });
+        changed.push(change.movePath);
+        return;
+    }
+    await fsp.writeFile(change.path, change.newContent, "utf-8");
+    changed.push(change.path);
+}
+export async function applyChanges(changes, signal) {
     const changed = [];
     for (const change of changes) {
         if (signal?.aborted)
             throw new Error("Cancelled");
         if (change.type === "add") {
-            const dir = path.dirname(change.path);
-            if (dir !== "." && dir !== "/")
-                await fsp.mkdir(dir, { recursive: true });
-            await fsp.writeFile(change.path, change.content, "utf-8");
-            changed.push(change.path);
+            await applyAddChange(change, changed);
             continue;
         }
         if (change.type === "delete") {
-            await fsp.unlink(change.path).catch(() => { });
-            changed.push(change.path);
-            continue;
-        }
-        // update
-        if (change.movePath) {
-            const dir = path.dirname(change.movePath);
-            if (dir !== "." && dir !== "/")
-                await fsp.mkdir(dir, { recursive: true });
-            await fsp.writeFile(change.movePath, change.newContent, "utf-8");
-            await fsp.unlink(change.path).catch(() => { });
-            changed.push(change.movePath);
+            await applyDeleteChange(change, changed);
             continue;
         }
-        await fsp.writeFile(change.path, change.newContent, "utf-8");
-        changed.push(change.path);
+        await applyUpdateChange(change, changed);
     }
     return changed;
 }
+async function processHunk(hunk, root, allowedDirectories, projectConfig, primaryDir, abortSignal) {
+    if (abortSignal?.aborted) {
+        throw new Error("Cancelled");
+    }
+    const p = resolvePathInRoot(root, hunk.path);
+    const validPath = await validatePath(p.abs, allowedDirectories, {
+        requireExistence: hunk.type !== "add",
+        abortSignal,
+    });
+    if (hunk.type === "add") {
+        return {
+            change: { type: "add", path: validPath, content: hunk.contents },
+        };
+    }
+    if (hunk.type === "delete") {
+        validateFileNotReadOnly(validPath, projectConfig, primaryDir);
+        return { change: { type: "delete", path: validPath } };
+    }
+    // update
+    validateFileNotReadOnly(validPath, projectConfig, primaryDir);
+    let moveAbs;
+    if (hunk.movePath) {
+        const moveP = resolvePathInRoot(root, hunk.movePath);
+        moveAbs = await validatePath(moveP.abs, allowedDirectories, {
+            requireExistence: false,
+            abortSignal,
+        });
+    }
+    const upd = deriveNewContentsFromChunks(validPath, hunk.chunks);
+    const change = {
+        type: "update",
+        path: validPath,
+        movePath: moveAbs,
+        newContent: upd.content,
+        unifiedDiff: upd.unifiedDiff,
+    };
+    if (upd.unifiedDiff) {
+        return {
+            change,
+            diffLine: `*** Update File: ${path.relative(root, moveAbs ?? validPath)}\n${upd.unifiedDiff}\n`,
+        };
+    }
+    return { change };
+}
 export const createApplyPatchTool = async (options) => {
     const { primaryDir, allowedDirs } = options.workspace;
     const allowedDirectories = allowedDirs ?? [primaryDir];
@@ -316,56 +388,15 @@ export const createApplyPatchTool = async (options) => {
             if (hunks.length === 0) {
                 return "No changes found in patch.";
             }
-            // Build a list of resolved file changes (absolute paths), and a diff preview.
             const changes = [];
             let diffOutput = "";
             for (const hunk of hunks) {
-                if (abortSignal?.aborted)
-                    throw new Error("Cancelled");
-                const p = resolvePathInRoot(root, hunk.path);
-                // Validate path is within allowed directories
-                const validPath = await validatePath(p.abs, allowedDirectories, {
-                    requireExistence: hunk.type !== "add",
-                    abortSignal,
-                });
-                if (hunk.type === "add") {
-                    changes.push({
-                        type: "add",
-                        path: validPath,
-                        content: hunk.contents,
-                    });
-                    continue;
-                }
-                if (hunk.type === "delete") {
-                    // Validate file is not read-only before deletion
-                    validateFileNotReadOnly(validPath, projectConfig, primaryDir);
-                    changes.push({ type: "delete", path: validPath });
-                    continue;
-                }
-                // update - validate file is not read-only
-                validateFileNotReadOnly(validPath, projectConfig, primaryDir);
-                let moveAbs;
-                if (hunk.movePath) {
-                    const moveP = resolvePathInRoot(root, hunk.movePath);
-                    moveAbs = await validatePath(moveP.abs, allowedDirectories, {
-                        requireExistence: false,
-                        abortSignal,
-                    });
-                }
-                const upd = deriveNewContentsFromChunks(validPath, hunk.chunks);
-                changes.push({
-                    type: "update",
-                    path: validPath,
-                    movePath: moveAbs,
-                    newContent: upd.content,
-                    unifiedDiff: upd.unifiedDiff,
-                });
-                if (upd.unifiedDiff) {
-                    diffOutput += `*** Update File: ${path.relative(root, moveAbs ?? validPath)}\n`;
-                    diffOutput += `${upd.unifiedDiff}\n`;
+                const { change, diffLine } = await processHunk(hunk, root, allowedDirectories, projectConfig, primaryDir, abortSignal);
+                changes.push(change);
+                if (diffLine) {
+                    diffOutput += diffLine;
                 }
             }
-            // Apply changes
             const changedAbs = await applyChanges(changes, abortSignal);
             const changedRel = changedAbs.map((p) => path.relative(root, p));
             clearProjectStatusCache();

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

@@ -1 +1 @@
-{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../source/tools/bash.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAepD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA0CvD,eAAO,MAAM,QAAQ;;CAEpB,CAAC;AA6MF,QAAA,MAAM,WAAW;;;;;iBAkBf,CAAC;AAEH,KAAK,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEnD,eAAO,MAAM,cAAc,GAAU,SAAS;IAC5C,SAAS,EAAE,gBAAgB,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;;;;;;;;;;yBAyGwB,eAAe;mDAIK,eAAe,mBACrC,oBAAoB,GACpC,OAAO,CAAC,MAAM,CAAC;EA6BrB,CAAC"}
+{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../source/tools/bash.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAepD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA0CvD,eAAO,MAAM,QAAQ;;CAEpB,CAAC;AAkNF,QAAA,MAAM,WAAW;;;;;iBAkBf,CAAC;AAEH,KAAK,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEnD,eAAO,MAAM,cAAc,GAAU,SAAS;IAC5C,SAAS,EAAE,gBAAgB,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;;;;;;;;;;yBA8GwB,eAAe;mDAIK,eAAe,mBACrC,oBAAoB,GACpC,OAAO,CAAC,MAAM,CAAC;EA6BrB,CAAC"}

package/dist/tools/bash.js

@@ -206,7 +206,7 @@ export const BashTool = {
 // }
 // Tools available:
 // ${installedTools}`;
-const simpleDescription = "Run terminal commands.";
+const simpleDescription = "Run terminal commands. When you need to run multiple independent commands (e.g. `git status`, `git diff`, `git log`; or several `rg`/`grep` searches with different patterns), ALWAYS issue multiple Bash tool calls in the same assistant message rather than running one, waiting for the result, then running the next. The runtime executes parallel tool calls concurrently, so batching independent commands is several times faster than serial calls. Only sequence commands when one truly depends on the output of another.";
 // Command execution timeout in milliseconds
 const DEFAULT_TIMEOUT = 1.5 * 60 * 1000; // 1.5 minutes
 // Maximum output size in bytes (50KB) to prevent context window exhaustion
@@ -217,6 +217,9 @@ const MAX_OUTPUT_SIZE = 50 * 1024;
  * The footer is always appended at the end, even when output is truncated.
  */
 function truncateOutput(output, footer) {
+    if (output.length === 0) {
+        return footer;
+    }
     if (output.length <= MAX_OUTPUT_SIZE) {
         return `${output}\n${footer}`;
     }
@@ -297,13 +300,13 @@ export const createBashTool = async (options) => {
         const timeStr = elapsedMs < 1000 ? `${elapsedMs}ms` : `${(elapsedMs / 1000).toFixed(1)}s`;
         const metadataFooter = `[exit:${exitCode} | ${timeStr}]`;
         if (exitCode !== 0) {
-            const errorMessage = error
-                ? error.message
-                : `Command exited with code ${exitCode}`;
-            const combinedOutput = output
-                ? `${errorMessage}\n${output}`
-                : errorMessage;
-            throw new Error(truncateOutput(combinedOutput, metadataFooter));
+            const execError = error;
+            const wasKilled = execError?.killed === true || execError?.signal != null;
+            if (wasKilled) {
+                const timeoutOutput = output || `Command timed out after ${timeout.toLocaleString()}ms`;
+                return truncateOutput(timeoutOutput, metadataFooter);
+            }
+            return truncateOutput(output, metadataFooter);
         }
         // Check for binary output and handle specially
         if (isBinaryOutput(output)) {

package/dist/tools/dynamic-tool-loader.d.ts

@@ -25,7 +25,12 @@ export declare function getShebang(scriptPath: string): string | null;
 export declare function parseShebang(shebang: string, scriptPath: string): InterpreterResult;
 export declare function resolveToolInterpreter(scriptPath: string): InterpreterResult | null;
 export declare function parseTextSchema(content: string): ToolMetadata | null;
-export declare function parseToolMetadata(output: string): ToolMetadata;
+/**
+ * Processes child process stdout/stderr into a result string.
+ * Trims, truncates oversized output, falls back to stderr or a placeholder,
+ * and attempts JSON parsing for structured output.
+ */
+export declare function processChildOutput(stdout: string, stderr: string): string;
 interface DynamicToolObject {
     toolDef: {
         description: string;

package/dist/tools/dynamic-tool-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-tool-loader.d.ts","sourceRoot":"","sources":["../../source/tools/dynamic-tool-loader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAGvE,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;iBAatB,CAAC;AAEH,KAAK,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAMvD,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAyBD,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAc5D;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,iBAAiB,CAUnB;AAED,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,GACjB,iBAAiB,GAAG,IAAI,CA0B1B;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAwFpE;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAS9D;AAsOD,UAAU,iBAAiB;IACzB,OAAO,EAAE;QACP,WAAW,EAAE,MAAM,CAAC;QAEpB,WAAW,EAAE,GAAG,CAAC;KAClB,CAAC;IACF,OAAO,EAAE,CACP,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,OAAO,EAAE,oBAAoB,KAC1B,OAAO,CAAC,MAAM,CAAC,CAAC;CACtB;AAwED,wBAAsB,gBAAgB,CAAC,EACrC,OAAO,EACP,iBAAsB,EACtB,cAAc,GACf,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,8CAuJA"}
+{"version":3,"file":"dynamic-tool-loader.d.ts","sourceRoot":"","sources":["../../source/tools/dynamic-tool-loader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAGvE,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;iBAatB,CAAC;AAEH,KAAK,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAMvD,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAyBD,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAc5D;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,iBAAiB,CAUnB;AAED,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,GACjB,iBAAiB,GAAG,IAAI,CA0B1B;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CA4CpE;AA4LD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CA4BzE;AAoFD,UAAU,iBAAiB;IACzB,OAAO,EAAE;QACP,WAAW,EAAE,MAAM,CAAC;QAEpB,WAAW,EAAE,GAAG,CAAC;KAClB,CAAC;IACF,OAAO,EAAE,CACP,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,OAAO,EAAE,oBAAoB,KAC1B,OAAO,CAAC,MAAM,CAAC,CAAC;CACtB;AAwED,wBAAsB,gBAAgB,CAAC,EACrC,OAAO,EACP,iBAAsB,EACtB,cAAc,GACf,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,8CAiKA"}