pi-agent-flow 2.0.0 → 2.0.2

package/dist/batch/apply-patch.js

@@ -0,0 +1,477 @@
+/**
+ * apply-patch — 1:1 port of OpenAI Codex CLI apply_patch tool.
+ *
+ * Parses patch text into hunks, locates context via 4-stage fuzzy matching,
+ * computes replacements, and applies them to the filesystem.
+ */
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+// ---------------------------------------------------------------------------
+// Parser constants
+// ---------------------------------------------------------------------------
+const BEGIN_PATCH_MARKER = "*** Begin Patch";
+const END_PATCH_MARKER = "*** End Patch";
+const ENVIRONMENT_ID_MARKER = "*** Environment ID: ";
+const ADD_FILE_MARKER = "*** Add File: ";
+const DELETE_FILE_MARKER = "*** Delete File: ";
+const UPDATE_FILE_MARKER = "*** Update File: ";
+const MOVE_TO_MARKER = "*** Move to: ";
+const EOF_MARKER = "*** End of File";
+const CHANGE_CONTEXT_MARKER = "@@ ";
+const EMPTY_CHANGE_CONTEXT_MARKER = "@@";
+export class ParseError extends Error {
+    kind;
+    lineNumber;
+    constructor(kind, message, lineNumber) {
+        super(message);
+        this.kind = kind;
+        this.lineNumber = lineNumber;
+        this.name = "ParseError";
+    }
+}
+export class ComputeReplacementsError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "ComputeReplacementsError";
+    }
+}
+// ---------------------------------------------------------------------------
+// Patch parser
+// ---------------------------------------------------------------------------
+function checkPatchBoundariesStrict(lines) {
+    if (lines.length === 0) {
+        throw new ParseError("invalid-patch", "The first line of the patch must be '*** Begin Patch'");
+    }
+    const first = lines[0].trim();
+    const last = lines[lines.length - 1].trim();
+    if (first !== BEGIN_PATCH_MARKER) {
+        throw new ParseError("invalid-patch", "The first line of the patch must be '*** Begin Patch'");
+    }
+    if (last !== END_PATCH_MARKER) {
+        throw new ParseError("invalid-patch", "The last line of the patch must be '*** End Patch'");
+    }
+    return { patchLines: lines, hunkLines: lines.slice(1, -1) };
+}
+function checkPatchBoundariesLenient(lines) {
+    try {
+        return checkPatchBoundariesStrict(lines);
+    }
+    catch (strictErr) {
+        if (lines.length >= 4) {
+            const first = lines[0].trim();
+            const last = lines[lines.length - 1].trim();
+            if ((first === "<<EOF" || first === "<<'EOF'" || first === '<<"EOF"') &&
+                last.endsWith("EOF")) {
+                const inner = lines.slice(1, -1);
+                try {
+                    return checkPatchBoundariesStrict(inner);
+                }
+                catch {
+                    /* fall through to return original error */
+                }
+            }
+        }
+        throw strictErr;
+    }
+}
+function parseEnvironmentIdPreamble(lines) {
+    if (lines.length === 0) {
+        return { remaining: lines, lineNumber: 2 };
+    }
+    const first = lines[0].trimStart();
+    if (first.startsWith(ENVIRONMENT_ID_MARKER)) {
+        const id = first.slice(ENVIRONMENT_ID_MARKER.length).trim();
+        if (id === "") {
+            throw new ParseError("invalid-patch", "apply_patch environment_id cannot be empty");
+        }
+        return { environmentId: id, remaining: lines.slice(1), lineNumber: 3 };
+    }
+    return { remaining: lines, lineNumber: 2 };
+}
+function parseUpdateFileChunk(lines, lineNumber, allowMissingContext) {
+    if (lines.length === 0) {
+        throw new ParseError("invalid-hunk", "Update hunk does not contain any lines", lineNumber);
+    }
+    let changeContext;
+    let startIndex = 0;
+    if (lines[0] === EMPTY_CHANGE_CONTEXT_MARKER) {
+        changeContext = undefined;
+        startIndex = 1;
+    }
+    else if (lines[0].startsWith(CHANGE_CONTEXT_MARKER)) {
+        changeContext = lines[0].slice(CHANGE_CONTEXT_MARKER.length);
+        startIndex = 1;
+    }
+    else {
+        if (!allowMissingContext) {
+            throw new ParseError("invalid-hunk", `Expected update hunk to start with a @@ context marker, got: '${lines[0]}'`, lineNumber);
+        }
+        changeContext = undefined;
+        startIndex = 0;
+    }
+    if (startIndex >= lines.length) {
+        throw new ParseError("invalid-hunk", "Update hunk does not contain any lines", lineNumber + 1);
+    }
+    const oldLines = [];
+    const newLines = [];
+    let isEndOfFile = false;
+    let parsedLines = 0;
+    for (let i = startIndex; i < lines.length; i++) {
+        const line = lines[i];
+        if (line === EOF_MARKER) {
+            if (parsedLines === 0) {
+                throw new ParseError("invalid-hunk", "Update hunk does not contain any lines", lineNumber + 1);
+            }
+            isEndOfFile = true;
+            parsedLines += 1;
+            break;
+        }
+        const firstChar = line.charAt(0);
+        if (firstChar === "") {
+            oldLines.push("");
+            newLines.push("");
+        }
+        else if (firstChar === " ") {
+            oldLines.push(line.slice(1));
+            newLines.push(line.slice(1));
+        }
+        else if (firstChar === "+") {
+            newLines.push(line.slice(1));
+        }
+        else if (firstChar === "-") {
+            oldLines.push(line.slice(1));
+        }
+        else {
+            if (parsedLines === 0) {
+                throw new ParseError("invalid-hunk", `Unexpected line found in update hunk: '${line}'. Every line should start with ' ' (context line), '+' (added line), or '-' (removed line)`, lineNumber + 1);
+            }
+            // Assume start of next hunk.
+            break;
+        }
+        parsedLines += 1;
+    }
+    return {
+        chunk: { changeContext, oldLines, newLines, isEndOfFile },
+        parsedLines: parsedLines + startIndex,
+    };
+}
+function parseOneHunk(lines, lineNumber) {
+    const firstLine = lines[0].trim();
+    if (firstLine.startsWith(ADD_FILE_MARKER)) {
+        const filePath = firstLine.slice(ADD_FILE_MARKER.length);
+        let contents = "";
+        let parsedLines = 1;
+        for (let i = 1; i < lines.length; i++) {
+            const line = lines[i];
+            if (line.startsWith("+")) {
+                contents += line.slice(1) + "\n";
+                parsedLines += 1;
+            }
+            else {
+                break;
+            }
+        }
+        return { hunk: { type: "add", path: filePath, contents }, parsedLines };
+    }
+    if (firstLine.startsWith(DELETE_FILE_MARKER)) {
+        const filePath = firstLine.slice(DELETE_FILE_MARKER.length);
+        return { hunk: { type: "delete", path: filePath }, parsedLines: 1 };
+    }
+    if (firstLine.startsWith(UPDATE_FILE_MARKER)) {
+        const filePath = firstLine.slice(UPDATE_FILE_MARKER.length);
+        let remaining = lines.slice(1);
+        let parsedLines = 1;
+        let movePath;
+        if (remaining.length > 0 && remaining[0].startsWith(MOVE_TO_MARKER)) {
+            movePath = remaining[0].slice(MOVE_TO_MARKER.length);
+            remaining = remaining.slice(1);
+            parsedLines += 1;
+        }
+        const chunks = [];
+        while (remaining.length > 0) {
+            if (remaining[0].trim() === "") {
+                parsedLines += 1;
+                remaining = remaining.slice(1);
+                continue;
+            }
+            if (remaining[0].startsWith("*")) {
+                break;
+            }
+            const { chunk, parsedLines: chunkLines } = parseUpdateFileChunk(remaining, lineNumber + parsedLines, chunks.length === 0);
+            chunks.push(chunk);
+            parsedLines += chunkLines;
+            remaining = remaining.slice(chunkLines);
+        }
+        if (chunks.length === 0) {
+            throw new ParseError("invalid-hunk", `Update file hunk for path '${filePath}' is empty`, lineNumber);
+        }
+        return { hunk: { type: "update", path: filePath, movePath, chunks }, parsedLines };
+    }
+    throw new ParseError("invalid-hunk", `'${firstLine}' is not a valid hunk header. Valid hunk headers: '*** Add File: {path}', '*** Delete File: {path}', '*** Update File: {path}'`, lineNumber);
+}
+export function parsePatch(patch) {
+    const trimmed = patch.trim();
+    const lines = trimmed.split("\n");
+    const { patchLines, hunkLines } = checkPatchBoundariesLenient(lines);
+    const { environmentId, remaining, lineNumber } = parseEnvironmentIdPreamble(hunkLines);
+    let remainingLines = remaining;
+    let currentLine = lineNumber;
+    const hunks = [];
+    while (remainingLines.length > 0) {
+        const { hunk, parsedLines } = parseOneHunk(remainingLines, currentLine);
+        hunks.push(hunk);
+        currentLine += parsedLines;
+        remainingLines = remainingLines.slice(parsedLines);
+    }
+    return {
+        patch: patchLines.join("\n"),
+        hunks,
+        environmentId,
+    };
+}
+// ---------------------------------------------------------------------------
+// seek_sequence — 4-stage fuzzy matching
+// ---------------------------------------------------------------------------
+export function seekSequence(lines, pattern, start, eof) {
+    if (pattern.length === 0) {
+        return start;
+    }
+    if (pattern.length > lines.length) {
+        return undefined;
+    }
+    const searchStart = eof && lines.length >= pattern.length ? lines.length - pattern.length : start;
+    // Stage 1: exact match
+    for (let i = searchStart; i <= lines.length - pattern.length; i++) {
+        let ok = true;
+        for (let j = 0; j < pattern.length; j++) {
+            if (lines[i + j] !== pattern[j]) {
+                ok = false;
+                break;
+            }
+        }
+        if (ok)
+            return i;
+    }
+    // Stage 2: rstrip match (ignore trailing whitespace)
+    for (let i = searchStart; i <= lines.length - pattern.length; i++) {
+        let ok = true;
+        for (let j = 0; j < pattern.length; j++) {
+            if (lines[i + j].trimEnd() !== pattern[j].trimEnd()) {
+                ok = false;
+                break;
+            }
+        }
+        if (ok)
+            return i;
+    }
+    // Stage 3: trim match (ignore leading and trailing whitespace)
+    for (let i = searchStart; i <= lines.length - pattern.length; i++) {
+        let ok = true;
+        for (let j = 0; j < pattern.length; j++) {
+            if (lines[i + j].trim() !== pattern[j].trim()) {
+                ok = false;
+                break;
+            }
+        }
+        if (ok)
+            return i;
+    }
+    // Stage 4: Unicode normalisation
+    function normalise(s) {
+        return s
+            .trim()
+            .split("")
+            .map((c) => {
+            switch (c) {
+                // Dashes / hyphens → ASCII '-'
+                case "\u2010":
+                case "\u2011":
+                case "\u2012":
+                case "\u2013":
+                case "\u2014":
+                case "\u2015":
+                case "\u2212":
+                    return "-";
+                // Fancy single quotes → '\''
+                case "\u2018":
+                case "\u2019":
+                case "\u201A":
+                case "\u201B":
+                    return "'";
+                // Fancy double quotes → '"'
+                case "\u201C":
+                case "\u201D":
+                case "\u201E":
+                case "\u201F":
+                    return '"';
+                // Odd spaces → normal space
+                case "\u00A0":
+                case "\u2002":
+                case "\u2003":
+                case "\u2004":
+                case "\u2005":
+                case "\u2006":
+                case "\u2007":
+                case "\u2008":
+                case "\u2009":
+                case "\u200A":
+                case "\u202F":
+                case "\u205F":
+                case "\u3000":
+                    return " ";
+                default:
+                    return c;
+            }
+        })
+            .join("");
+    }
+    for (let i = searchStart; i <= lines.length - pattern.length; i++) {
+        let ok = true;
+        for (let j = 0; j < pattern.length; j++) {
+            if (normalise(lines[i + j]) !== normalise(pattern[j])) {
+                ok = false;
+                break;
+            }
+        }
+        if (ok)
+            return i;
+    }
+    return undefined;
+}
+// ---------------------------------------------------------------------------
+// compute_replacements + apply_replacements
+// ---------------------------------------------------------------------------
+export function computeReplacements(originalLines, filePath, chunks) {
+    const replacements = [];
+    let lineIndex = 0;
+    for (const chunk of chunks) {
+        if (chunk.changeContext) {
+            const idx = seekSequence(originalLines, [chunk.changeContext], lineIndex, false);
+            if (idx === undefined) {
+                throw new ComputeReplacementsError(`Failed to find context '${chunk.changeContext}' in ${filePath}`);
+            }
+            lineIndex = idx + 1;
+        }
+        if (chunk.oldLines.length === 0) {
+            // Pure addition — insert at end (or just before the trailing empty line).
+            const insertionIdx = originalLines.length > 0 && originalLines[originalLines.length - 1] === ""
+                ? originalLines.length - 1
+                : originalLines.length;
+            replacements.push({ startIdx: insertionIdx, oldLen: 0, newLines: chunk.newLines });
+            continue;
+        }
+        let pattern = chunk.oldLines;
+        let found = seekSequence(originalLines, pattern, lineIndex, chunk.isEndOfFile);
+        let newSlice = chunk.newLines;
+        if (found === undefined && pattern.length > 0 && pattern[pattern.length - 1] === "") {
+            // Retry without the trailing empty sentinel.
+            pattern = pattern.slice(0, -1);
+            if (newSlice.length > 0 && newSlice[newSlice.length - 1] === "") {
+                newSlice = newSlice.slice(0, -1);
+            }
+            found = seekSequence(originalLines, pattern, lineIndex, chunk.isEndOfFile);
+        }
+        if (found === undefined) {
+            throw new ComputeReplacementsError(`Failed to find expected lines in ${filePath}:\n${chunk.oldLines.join("\n")}`);
+        }
+        replacements.push({ startIdx: found, oldLen: pattern.length, newLines: newSlice });
+        lineIndex = found + pattern.length;
+    }
+    replacements.sort((a, b) => a.startIdx - b.startIdx);
+    return replacements;
+}
+export function applyReplacements(lines, replacements) {
+    const result = [...lines];
+    for (let i = replacements.length - 1; i >= 0; i--) {
+        const { startIdx, oldLen, newLines } = replacements[i];
+        result.splice(startIdx, oldLen, ...newLines);
+    }
+    return result;
+}
+function deriveNewContentsFromChunks(originalContent, chunks, filePath) {
+    let originalLines = originalContent.split("\n").map((l) => l);
+    // Drop the trailing empty element that results from the final newline
+    // so that line counts match the behaviour of standard diff.
+    if (originalLines.length > 0 && originalLines[originalLines.length - 1] === "") {
+        originalLines.pop();
+    }
+    const replacements = computeReplacements(originalLines, filePath, chunks);
+    let newLines = applyReplacements(originalLines, replacements);
+    // Ensure file terminates with a newline.
+    if (newLines.length === 0 || newLines[newLines.length - 1] !== "") {
+        newLines.push("");
+    }
+    return newLines.join("\n");
+}
+export async function applyPatch(patchText, cwd) {
+    const args = parsePatch(patchText);
+    const added = [];
+    const modified = [];
+    const deleted = [];
+    let exact = true;
+    for (const hunk of args.hunks) {
+        switch (hunk.type) {
+            case "add": {
+                const targetPath = path.resolve(cwd, hunk.path);
+                await fs.mkdir(path.dirname(targetPath), { recursive: true });
+                await fs.writeFile(targetPath, hunk.contents, "utf-8");
+                added.push(hunk.path);
+                break;
+            }
+            case "delete": {
+                const targetPath = path.resolve(cwd, hunk.path);
+                try {
+                    await fs.unlink(targetPath);
+                }
+                catch (err) {
+                    if (err.code === "ENOENT") {
+                        exact = false;
+                    }
+                    else {
+                        throw err;
+                    }
+                }
+                deleted.push(hunk.path);
+                break;
+            }
+            case "update": {
+                const targetPath = path.resolve(cwd, hunk.path);
+                let originalContent;
+                try {
+                    originalContent = await fs.readFile(targetPath, "utf-8");
+                }
+                catch (err) {
+                    if (err.code === "ENOENT") {
+                        throw new Error(`File not found: ${hunk.path}`);
+                    }
+                    throw err;
+                }
+                const newContent = deriveNewContentsFromChunks(originalContent, hunk.chunks, hunk.path);
+                if (hunk.movePath) {
+                    const destPath = path.resolve(cwd, hunk.movePath);
+                    await fs.mkdir(path.dirname(destPath), { recursive: true });
+                    await fs.writeFile(destPath, newContent, "utf-8");
+                    try {
+                        await fs.unlink(targetPath);
+                    }
+                    catch (err) {
+                        if (err.code === "ENOENT") {
+                            exact = false;
+                        }
+                        else {
+                            throw err;
+                        }
+                    }
+                    modified.push(hunk.movePath);
+                }
+                else {
+                    await fs.writeFile(targetPath, newContent, "utf-8");
+                    modified.push(hunk.path);
+                }
+                break;
+            }
+        }
+    }
+    return { affected: { added, modified, deleted }, exact };
+}
+//# sourceMappingURL=apply-patch.js.map

package/dist/batch/apply-patch.js.map

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

package/dist/batch/batch-bash.d.ts

@@ -80,12 +80,6 @@ export declare function createBatchBashPollTool(tracker: BashProcessTracker): {
         details: {
             results: PendingBashResult[];
         };
-    } | {
-        content: {
-            type: string;
-            text: string;
-        }[];
-        isError: boolean;
     }>;
 };
 export {};

package/dist/batch/batch-bash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batch-bash.d.ts","sourceRoot":"","sources":["../../src/batch/batch-bash.ts"],"names":[],"mappings":"AAiBA,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,iBAAiB,EAKtB,MAAM,gBAAgB,CAAC;AAgBxB,UAAU,iBAAiB;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,SAAS,CAAwC;IAEzD,sFAAsF;IACtF,MAAM,CACL,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,WAAW,GAClB,IAAI;IAoFP,2CAA2C;IAC3C,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAI9B,0DAA0D;IAC1D,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAOlC,4CAA4C;IAC5C,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIjD,iFAAiF;IACjF,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIxD,mFAAmF;IACnF,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAMvD,+CAA+C;IAC/C,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI5C,wCAAwC;IACxC,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAIjC,qCAAqC;IACrC,OAAO,CAAC,SAAS;IAWjB,6CAA6C;IAC7C,QAAQ,IAAI,IAAI;CAKhB;AAWD,sEAAsE;AACtE,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CACjC,IAAI,EAAE,MAAM,EACZ,QAAQ,GAAE,MAA8B,EACxC,QAAQ,GAAE,MAA8B,GACtC,MAAM,CAiCR;AAED,uEAAuE;AACvE,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASrF;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACrC,GAAG,EAAE,KAAK,CAAC;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,EAC5D,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,kBAAkB,EAC3B,MAAM,CAAC,EAAE,WAAW,EACpB,aAAa,GAAE,MAA6B,GAC1C,OAAO,CAAC,YAAY,EAAE,CAAC,CAqDzB;AAoCD,uCAAuC;AACvC,wBAAgB,oBAAoB,CACnC,GAAG,EAAE,MAAM,EAAE,EACb,OAAO,EAAE,kBAAkB,GACzB,iBAAiB,EAAE,CAgCrB;AAaD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,kBAAkB;;;;;;;4BAgBzC,OAAO,GAAG,OAAO;yBAS3B,MAAM,SACZ,OAAO,YACJ,WAAW,cACT,OAAO;;;;;;;;;;;;;;;EAqCrB"}
+{"version":3,"file":"batch-bash.d.ts","sourceRoot":"","sources":["../../src/batch/batch-bash.ts"],"names":[],"mappings":"AAyBA,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,iBAAiB,EAKtB,MAAM,gBAAgB,CAAC;AAgBxB,UAAU,iBAAiB;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,SAAS,CAAwC;IAEzD,sFAAsF;IACtF,MAAM,CACL,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,WAAW,GAClB,IAAI;IAwGP,2CAA2C;IAC3C,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAI9B,0DAA0D;IAC1D,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAOlC,4CAA4C;IAC5C,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIjD,iFAAiF;IACjF,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIxD,mFAAmF;IACnF,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAMvD,+CAA+C;IAC/C,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI5C,wCAAwC;IACxC,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAIjC,qCAAqC;IACrC,OAAO,CAAC,SAAS;IAWjB,6CAA6C;IAC7C,QAAQ,IAAI,IAAI;CAKhB;AAWD,sEAAsE;AACtE,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CACjC,IAAI,EAAE,MAAM,EACZ,QAAQ,GAAE,MAA8B,EACxC,QAAQ,GAAE,MAA8B,GACtC,MAAM,CA0CR;AAED,uEAAuE;AACvE,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASrF;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACrC,GAAG,EAAE,KAAK,CAAC;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,EAC5D,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,kBAAkB,EAC3B,MAAM,CAAC,EAAE,WAAW,EACpB,aAAa,GAAE,MAA6B,GAC1C,OAAO,CAAC,YAAY,EAAE,CAAC,CAqDzB;AAoCD,uCAAuC;AACvC,wBAAgB,oBAAoB,CACnC,GAAG,EAAE,MAAM,EAAE,EACb,OAAO,EAAE,kBAAkB,GACzB,iBAAiB,EAAE,CAgCrB;AAaD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,kBAAkB;;;;;;;4BAgBzC,OAAO,GAAG,OAAO;yBAS3B,MAAM,SACZ,OAAO,YACJ,WAAW,cACT,OAAO;;;;;;;;;EAkCrB"}

package/dist/batch/batch-bash.js

@@ -1,4 +1,5 @@
-import { appendStrategicHintOnce } from "../steering/tool-utils.js";
+import { appendDirectiveOnce } from "../steering/tool-utils.js";
+import { compressOutput } from "./shell-compress.js";
 /**
  * batch bash -- parallel bash execution and polling.
  *
@@ -10,6 +11,13 @@ import { appendStrategicHintOnce } from "../steering/tool-utils.js";
  * wait time before the batch tool returns partial results. Commands that
  * haven't finished continue running in the background and can be polled
  * via the `batch_bash_poll` tool.
+ *
+ * Why not `createLocalBashOperations` from `@mariozechner/pi-coding-agent`?
+ * That helper is a simple exec wrapper (returns a promise when the process exits).
+ * Our tracker needs background execution + polling: processes must outlive the
+ * soft timeout and be queried later via `batch_bash_poll`. We therefore use raw
+ * `node:child_process.spawn` directly to retain full control over detached mode,
+ * per-process AbortControllers, and background lifecycle.
  */
 import { spawn } from "node:child_process";
 import { Type } from "@sinclair/typebox";
@@ -62,8 +70,19 @@ export class BashProcessTracker {
         }
         child.on("close", (code) => {
             this.running.delete(id);
-            const stdout = truncateBashOutput(rp.stdoutChunks.join(""));
-            const stderr = truncateBashOutput(rp.stderrChunks.join(""));
+            let stdout;
+            let stderr;
+            try {
+                const rawStdout = rp.stdoutChunks.join("");
+                const rawStderr = rp.stderrChunks.join("");
+                const { stdout: compressedStdout, stderr: compressedStderr } = compressOutput(rp.command, rawStdout, rawStderr);
+                stdout = truncateBashOutput(compressedStdout);
+                stderr = truncateBashOutput(compressedStderr);
+            }
+            catch {
+                stdout = truncateBashOutput(rp.stdoutChunks.join(""));
+                stderr = truncateBashOutput(rp.stderrChunks.join(""));
+            }
             const duration = Date.now() - rp.startedAt;
             const report = classifyDuration(duration);
             this.completed.set(id, {
@@ -81,8 +100,19 @@ export class BashProcessTracker {
             this.running.delete(id);
             const duration = Date.now() - rp.startedAt;
             const report = classifyDuration(duration);
-            const stdout = truncateBashOutput(rp.stdoutChunks.join(""));
-            const stderr = truncateBashOutput(rp.stderrChunks.join("")) || err.message;
+            let stdout;
+            let stderr;
+            try {
+                const rawStdout = rp.stdoutChunks.join("");
+                const rawStderr = rp.stderrChunks.join("");
+                const { stdout: compressedStdout, stderr: compressedStderr } = compressOutput(rp.command, rawStdout, rawStderr);
+                stdout = truncateBashOutput(compressedStdout);
+                stderr = truncateBashOutput(compressedStderr) || err.message;
+            }
+            catch {
+                stdout = truncateBashOutput(rp.stdoutChunks.join(""));
+                stderr = truncateBashOutput(rp.stderrChunks.join("")) || err.message;
+            }
             this.completed.set(id, {
                 id,
                 command,
@@ -182,14 +212,25 @@ export function truncateBashOutput(text, maxBytes = MAX_BASH_OUTPUT_BYTES, maxLi
     const resultBytes = Buffer.byteLength(result, "utf-8");
     if (resultBytes > maxBytes) {
         const buf = Buffer.from(result, "utf-8");
-        // Find last newline before maxBytes
+        // Find last newline before maxBytes, never cutting inside a multi-byte UTF-8 character
         let cutAt = maxBytes;
-        while (cutAt > 0 && buf[cutAt] !== 0x0a) {
+        while (cutAt > 0) {
+            // Skip UTF-8 continuation bytes so we land on a character boundary
+            while (cutAt > 0 && (buf[cutAt] & 0xc0) === 0x80) {
+                cutAt--;
+            }
+            if (cutAt <= 0)
+                break;
+            if (buf[cutAt] === 0x0a)
+                break;
             cutAt--;
         }
         if (cutAt <= 0) {
-            // No newline found within safe range; force cut at maxBytes
+            // No newline found within safe range; force cut at maxBytes aligned to char boundary
             cutAt = maxBytes;
+            while (cutAt > 0 && (buf[cutAt] & 0xc0) === 0x80) {
+                cutAt--;
+            }
         }
         result = buf.slice(0, cutAt).toString("utf-8");
         result += `\n[... truncated at ${(maxBytes / 1024).toFixed(0)} KB, ${totalBytes} total ...]`;
@@ -349,7 +390,7 @@ export function createBatchBashPollTool(tracker) {
         ].join("\n"),
         promptSnippet: "Poll pending bash commands for results",
         promptGuidelines: [
-            "Use batch_bash_poll to check on bash commands that returned pending from a batch call.",
+            "Use `batch_bash_poll` to check on bash commands that returned pending from a batch call.",
             "Pass the `i` (id) values from the pending results.",
         ],
         parameters: BatchBashPollParams,
@@ -366,10 +407,7 @@ export function createBatchBashPollTool(tracker) {
             const args = (input ?? {});
             const ids = Array.isArray(args.i) ? args.i : Array.isArray(args.ids) ? args.ids : [];
             if (ids.length === 0) {
-                return {
-                    content: [{ type: "text", text: "Error: i (ids) array is required and must not be empty." }],
-                    isError: true,
-                };
+                throw new Error("Error: i (ids) array is required and must not be empty.");
             }
             const results = pollBatchBashResults(ids, tracker);
             const lines = [];
@@ -395,7 +433,7 @@ export function createBatchBashPollTool(tracker) {
                 content: [{ type: "text", text: lines.join("\n").trimEnd() }],
                 details: { results },
             };
-            appendStrategicHintOnce(pollResult);
+            appendDirectiveOnce(pollResult);
             return pollResult;
         },
     };