wotann 0.5.0 → 0.5.39

package/dist/intelligence/apply-patch-dsl.js

@@ -0,0 +1,264 @@
+/**
+ * apply-patch-dsl — Parser for Codex's `apply_patch` DSL.
+ *
+ * Port of the patch DSL documented at:
+ *   https://github.com/openai/codex/blob/main/codex-rs/apply-patch/apply_patch_tool_instructions.md
+ *
+ * The motivation:
+ *   Unified-diff (the default of multi-patch-voter.ts) is fragile when
+ *   the model produces partial line numbers, when files are renamed,
+ *   or when the surrounding context drifts. Codex's apply_patch DSL
+ *   uses line-anchored hunks with explicit `@@` context markers and
+ *   first-class Add/Update/Delete file operations, which gives us:
+ *     - rename support (Update + new path)
+ *     - context-anchored hunks that survive line-number drift
+ *     - explicit Add for new files (vs unified-diff's empty-file hunk)
+ *     - explicit Delete for removed files (clearer than `-` everything)
+ *
+ * This module is PURE PARSER — it returns a structured representation
+ * of the patch's intent. The actual file mutation is the caller's
+ * responsibility. That keeps the parser deterministic, testable, and
+ * usable in dry-run / preview / apply / vote modes alike.
+ *
+ * Quality bars:
+ *   - QB#1 immutable: ParsedPatch + operations are readonly + frozen
+ *   - QB#3 honest: returns a tagged result; never throws on bad input
+ *   - QB#7 stateless: pure function, no I/O
+ *   - QB#11 sibling-site: the file-mutation layer (multi-patch-voter
+ *     or future apply-patch-executor) consumes ParsedPatch and writes
+ *     to disk. The parser stays pure.
+ *
+ * DSL grammar (subset that covers 95% of real usage):
+ *
+ *   *** Begin Patch
+ *   *** Add File: path/to/new.ts
+ *   +line 1
+ *   +line 2
+ *   *** Update File: path/to/existing.ts
+ *   *** Move to: path/to/renamed.ts        (optional — rename)
+ *   @@ optional context line
+ *    unchanged context
+ *   -removed line
+ *   +added line
+ *    unchanged context
+ *   *** Delete File: path/to/old.ts
+ *   *** End Patch
+ *
+ * Source: github.com/openai/codex/tree/main/codex-rs/apply-patch
+ */
+// ── Parser ───────────────────────────────────────────────────────────
+const BEGIN_MARKER = "*** Begin Patch";
+const END_MARKER = "*** End Patch";
+const ADD_PREFIX = "*** Add File: ";
+const UPDATE_PREFIX = "*** Update File: ";
+const DELETE_PREFIX = "*** Delete File: ";
+const MOVE_PREFIX = "*** Move to: ";
+const HUNK_PREFIX = "@@";
+/**
+ * Parse a patch source string. Returns a tagged result; never throws.
+ */
+export function parsePatch(source) {
+    if (typeof source !== "string" || source.length === 0) {
+        return { ok: false, error: "patch source must be a non-empty string" };
+    }
+    const lines = source.split("\n");
+    if (!lines[0]?.startsWith(BEGIN_MARKER)) {
+        return { ok: false, error: `patch must start with "${BEGIN_MARKER}"`, line: 1 };
+    }
+    const operations = [];
+    const state = {
+        current: null,
+        hunks: [],
+        hunkLines: [],
+        inHunk: false,
+    };
+    function commitHunk() {
+        if (state.inHunk && state.hunkLines.length > 0) {
+            const hunk = state.hunkContext
+                ? Object.freeze({
+                    contextLabel: state.hunkContext,
+                    lines: Object.freeze(state.hunkLines.slice()),
+                })
+                : Object.freeze({
+                    lines: Object.freeze(state.hunkLines.slice()),
+                });
+            state.hunks.push(hunk);
+            state.hunkLines = [];
+            state.hunkContext = undefined;
+        }
+    }
+    function commitOperation() {
+        if (!state.current)
+            return;
+        if (state.current.kind === "update") {
+            commitHunk();
+            const updated = state.current.movedTo
+                ? Object.freeze({
+                    kind: "update",
+                    path: state.current.path,
+                    movedTo: state.current.movedTo,
+                    hunks: Object.freeze(state.hunks.slice()),
+                })
+                : Object.freeze({
+                    kind: "update",
+                    path: state.current.path,
+                    hunks: Object.freeze(state.hunks.slice()),
+                });
+            operations.push(updated);
+        }
+        else if (state.current.kind === "add") {
+            operations.push(Object.freeze({
+                kind: "add",
+                path: state.current.path,
+                lines: Object.freeze((state.addLines ?? []).slice()),
+            }));
+        }
+        else {
+            operations.push(state.current);
+        }
+        state.current = null;
+        state.hunks = [];
+        state.hunkLines = [];
+        state.hunkContext = undefined;
+        state.inHunk = false;
+        state.addLines = undefined;
+    }
+    for (let i = 1; i < lines.length; i += 1) {
+        const line = lines[i] ?? "";
+        const lineNo = i + 1;
+        if (line.startsWith(END_MARKER)) {
+            commitOperation();
+            return Object.freeze({
+                ok: true,
+                patch: Object.freeze({
+                    operations: Object.freeze(operations),
+                }),
+            });
+        }
+        if (line.startsWith(ADD_PREFIX)) {
+            commitOperation();
+            const path = line.slice(ADD_PREFIX.length).trim();
+            if (path.length === 0) {
+                return { ok: false, error: "Add File: missing path", line: lineNo };
+            }
+            state.current = { kind: "add", path };
+            state.addLines = [];
+            continue;
+        }
+        if (line.startsWith(UPDATE_PREFIX)) {
+            commitOperation();
+            const path = line.slice(UPDATE_PREFIX.length).trim();
+            if (path.length === 0) {
+                return { ok: false, error: "Update File: missing path", line: lineNo };
+            }
+            state.current = { kind: "update", path, hunks: [] };
+            state.hunks = [];
+            continue;
+        }
+        if (line.startsWith(DELETE_PREFIX)) {
+            commitOperation();
+            const path = line.slice(DELETE_PREFIX.length).trim();
+            if (path.length === 0) {
+                return { ok: false, error: "Delete File: missing path", line: lineNo };
+            }
+            state.current = Object.freeze({ kind: "delete", path });
+            commitOperation();
+            continue;
+        }
+        if (line.startsWith(MOVE_PREFIX)) {
+            if (!state.current || state.current.kind !== "update") {
+                return {
+                    ok: false,
+                    error: "Move to: requires a preceding Update File operation",
+                    line: lineNo,
+                };
+            }
+            const target = line.slice(MOVE_PREFIX.length).trim();
+            if (target.length === 0) {
+                return { ok: false, error: "Move to: missing target path", line: lineNo };
+            }
+            state.current = { ...state.current, movedTo: target };
+            continue;
+        }
+        if (line.startsWith(HUNK_PREFIX)) {
+            if (!state.current || state.current.kind !== "update") {
+                return {
+                    ok: false,
+                    error: "@@ marker outside an Update File block",
+                    line: lineNo,
+                };
+            }
+            commitHunk();
+            const ctx = line.slice(HUNK_PREFIX.length).trim();
+            state.hunkContext = ctx.length > 0 ? ctx : undefined;
+            state.inHunk = true;
+            continue;
+        }
+        // Body line — either Add file content or hunk content.
+        if (state.current?.kind === "add") {
+            // Add: lines may be plain (no sentinel) OR + sentinel; strip leading +
+            const stripped = line.startsWith("+") ? line.slice(1) : line;
+            state.addLines.push(stripped);
+            continue;
+        }
+        if (state.current?.kind === "update") {
+            // Inside an update — accept context (' '), add ('+'), remove ('-')
+            // sentinel lines. Anything outside ends the implicit hunk-by-default
+            // (when no @@ marker was used).
+            if (!state.inHunk) {
+                // Implicit hunk start (some Codex outputs omit @@ for tiny edits).
+                state.inHunk = true;
+                state.hunkContext = undefined;
+            }
+            state.hunkLines.push(line);
+            continue;
+        }
+        // Empty/blank line outside any operation — tolerated.
+        if (line.trim().length === 0)
+            continue;
+        return {
+            ok: false,
+            error: `unexpected line outside any operation: "${line.slice(0, 60)}"`,
+            line: lineNo,
+        };
+    }
+    return { ok: false, error: `missing "${END_MARKER}"` };
+}
+/** Convenience predicate. */
+export function isPatchSource(s) {
+    return typeof s === "string" && s.includes(BEGIN_MARKER) && s.includes(END_MARKER);
+}
+export function countOperations(patch) {
+    let add = 0;
+    let update = 0;
+    let del = 0;
+    for (const op of patch.operations) {
+        if (op.kind === "add")
+            add += 1;
+        else if (op.kind === "update")
+            update += 1;
+        else
+            del += 1;
+    }
+    return Object.freeze({
+        add,
+        update,
+        delete: del,
+        total: add + update + del,
+    });
+}
+/**
+ * Extract the set of distinct file paths the patch touches — useful
+ * for permission checks (file-scope-policy) and for blast-radius
+ * preview UIs. Includes both source `path` and `movedTo` for renames.
+ */
+export function extractTouchedPaths(patch) {
+    const set = new Set();
+    for (const op of patch.operations) {
+        set.add(op.path);
+        if (op.kind === "update" && op.movedTo)
+            set.add(op.movedTo);
+    }
+    return Object.freeze([...set]);
+}
+//# sourceMappingURL=apply-patch-dsl.js.map

package/dist/intelligence/apply-patch-dsl.js.map

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

package/dist/intelligence/apply-patch-executor.d.ts

@@ -0,0 +1,147 @@
+/**
+ * apply-patch-executor — End-to-end executor for the Codex apply_patch
+ * DSL parsed by `apply-patch-dsl.ts`.
+ *
+ * Composes:
+ *   - parsePatch from apply-patch-dsl.ts (parser)
+ *   - file-scope-policy.ts (per-agent allow/deny gate)
+ *   - command-sanitizer.ts conventions (no shell-substitution surface)
+ *   - filesystem operations (atomic per-file, with rollback)
+ *
+ * Pipeline:
+ *   1. parse   — parsePatch(source) returns ParsedPatch | error
+ *   2. preview — extractTouchedPaths + countOperations + per-op validate
+ *   3. policy  — checkFileScope on every touched path; deny short-circuits
+ *   4. plan    — read all source files, compute new content per op
+ *   5. atomic  — write all new files to a sibling .wotann-patch-tmp dir
+ *   6. commit  — rename atomic dir into place; on partial failure, roll
+ *               back any files already moved
+ *   7. audit   — append a JSONL entry per applied operation
+ *
+ * The executor is async + I/O-bound; callers can pass an `fs` shim to
+ * test in-memory.
+ *
+ * Quality bars:
+ *   - QB#1 immutable: results + plans are readonly
+ *   - QB#3 honest: returns tagged result; never throws — every error
+ *     is in the result
+ *   - QB#7 stateless: per-call state; no module-global mutation
+ *   - QB#11 sibling-site: composes parser + policy; doesn't reimplement
+ *   - QB#19 zombie-free: each helper has a runtime caller in this file
+ */
+import { type PatchHunk } from "./apply-patch-dsl.js";
+import { type AgentScopePolicy } from "../agents/file-scope-policy.js";
+/**
+ * Filesystem shim — production code uses `node:fs/promises`; tests
+ * inject an in-memory map. Only the operations the executor needs.
+ */
+export interface PatchFs {
+    readFile(path: string, encoding: "utf8"): Promise<string>;
+    writeFile(path: string, content: string, encoding: "utf8"): Promise<void>;
+    mkdir(path: string, options: {
+        recursive: true;
+    }): Promise<void>;
+    rm(path: string, options: {
+        recursive: true;
+        force: true;
+    }): Promise<void>;
+    rename(from: string, to: string): Promise<void>;
+    stat(path: string): Promise<{
+        isFile(): boolean;
+        isDirectory(): boolean;
+    }>;
+    appendFile(path: string, content: string, encoding: "utf8"): Promise<void>;
+}
+export interface ExecutePatchRequest {
+    /** The raw patch source string. */
+    readonly source: string;
+    /** Workspace root — all paths resolved relative to this. */
+    readonly workspaceRoot: string;
+    /** When true, computes the plan but does NOT write anything. */
+    readonly dryRun: boolean;
+    /**
+     * Optional file-scope policy — if set, every touched path is gated
+     * through `checkFileScope`. A single deny aborts the whole patch.
+     */
+    readonly scopePolicy?: AgentScopePolicy;
+    /**
+     * Optional path to append a JSONL audit entry per applied operation.
+     * When unset, no audit log is written.
+     */
+    readonly auditLogPath?: string;
+    /** Optional fs shim. Defaults to node:fs/promises. */
+    readonly fs?: PatchFs;
+}
+export interface PerOpResult {
+    readonly path: string;
+    readonly kind: "add" | "update" | "delete";
+    readonly status: "applied" | "skipped" | "failed";
+    readonly reason: string;
+    readonly bytesBefore?: number;
+    readonly bytesAfter?: number;
+}
+export type ExecuteResult = {
+    readonly status: "ok";
+    readonly dryRun: boolean;
+    readonly operations: readonly PerOpResult[];
+    readonly counts: {
+        readonly add: number;
+        readonly update: number;
+        readonly delete: number;
+    };
+} | {
+    readonly status: "rejected";
+    readonly reason: string;
+    readonly operations?: readonly PerOpResult[];
+};
+/**
+ * Apply a sequence of hunks to a file's existing content. Pure: takes
+ * input content, returns new content. Returns ok:false when a hunk's
+ * "context + remove" lines do not line up against the file.
+ */
+export declare function applyHunks(source: string, hunks: readonly PatchHunk[]): {
+    readonly ok: true;
+    readonly content: string;
+} | {
+    readonly ok: false;
+    readonly error: string;
+};
+/**
+ * Refuse paths that escape the workspace via `..` or absolute paths.
+ * Returns the resolved absolute path on success.
+ */
+export declare function resolveSafePath(workspaceRoot: string, relPath: string): {
+    readonly ok: true;
+    readonly absolute: string;
+} | {
+    readonly ok: false;
+    readonly error: string;
+};
+/**
+ * Execute a patch end-to-end. Returns a structured result; never
+ * throws. On policy denial, returns `rejected` with `reason`. On any
+ * per-op failure, the operation's result is `failed` and execution
+ * continues for the remaining operations (best-effort) — callers
+ * inspect each operation's status to decide rollback semantics.
+ *
+ * Dry-run mode: walks the same code path but skips all writes and
+ * emits `would-*` reasons so callers can preview blast-radius before
+ * committing.
+ */
+export declare function executePatch(req: ExecutePatchRequest): Promise<ExecuteResult>;
+/**
+ * Convenience: run a dry-run preview and return the same shape.
+ * Callers wanting to show "this is what will happen" UI without
+ * touching the disk should use this rather than passing dryRun:true
+ * inline.
+ */
+export declare function previewPatch(source: string, workspaceRoot: string, scopePolicy?: AgentScopePolicy): Promise<ExecuteResult>;
+/**
+ * Build an in-memory filesystem shim from a record of `path → content`.
+ * Useful for testing without touching the disk.
+ */
+export declare function createMemoryFs(initial?: Readonly<Record<string, string>>): PatchFs & {
+    readonly snapshot: () => Readonly<Record<string, string>>;
+};
+export { join as joinPath } from "node:path";
+//# sourceMappingURL=apply-patch-executor.d.ts.map

package/dist/intelligence/apply-patch-executor.d.ts.map

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