@chances-ai/engine 28.0.0 → 30.0.0

package/dist/hashline/parser.js

@@ -0,0 +1,295 @@
+/**
+ * Token-driven state machine that turns a stream of {@link Token}s into a
+ * flat list of {@link Edit}s. Sits between the {@link Tokenizer} and the
+ * applier. Ported from oh-my-pi `packages/hashline/src/parser.ts`.
+ */
+import { HL_PAYLOAD_REPLACE } from "./format.js";
+import { BARE_BODY_AUTO_PIPED_WARNING, DELETE_BLOCK_TAKES_NO_BODY, DELETE_TAKES_NO_BODY, EMPTY_BLOCK, EMPTY_INSERT, MINUS_ROW_REJECTED, } from "./messages.js";
+import { cloneCursor, Tokenizer } from "./tokenizer.js";
+function validateRangeOrder(range, lineNum) {
+    if (range.end.line < range.start.line) {
+        throw new Error(`line ${lineNum}: range ${range.start.line}..${range.end.line} ends before it starts.`);
+    }
+}
+function expandRange(range) {
+    const anchors = [];
+    for (let line = range.start.line; line <= range.end.line; line++)
+        anchors.push({ line });
+    return anchors;
+}
+function isSkippableCommentLine(line) {
+    return line.trimStart().startsWith("#");
+}
+function detectApplyPatchContamination(text, _hasPending) {
+    const trimmed = text.trimStart();
+    if (trimmed.length === 0)
+        return null;
+    if (trimmed.startsWith("*** Update File:") ||
+        trimmed.startsWith("*** Add File:") ||
+        trimmed.startsWith("*** Delete File:") ||
+        trimmed.startsWith("*** Move to:")) {
+        const preview = trimmed.length > 48 ? `${trimmed.slice(0, 48)}…` : trimmed;
+        return (`apply_patch sentinel ${JSON.stringify(preview)} is not valid in hashline. ` +
+            "File sections start with `¶path#HASH` (no `Update File:` / `Add File:` keyword). " +
+            "Use `replace N..M:`, `delete N..M`, or `insert before|after|head|tail:` ops.");
+    }
+    if (/^@@\s+[-+]?\d+,\d+\s+[-+]?\d+,\d+\s+@@/.test(trimmed)) {
+        return ("unified-diff hunk header (`@@ -N,M +N,M @@`) is not valid in hashline. " +
+            "Use `replace N..M:`, `delete N..M`, or `insert before|after|head|tail:` ops.");
+    }
+    if (trimmed.startsWith("@@")) {
+        const preview = trimmed.length > 48 ? `${trimmed.slice(0, 48)}…` : trimmed;
+        return (`\`@@\`-bracketed hunk header ${JSON.stringify(preview)} is not valid in hashline. ` +
+            "Drop the `@@ ... @@` brackets and write a verb header such as `replace N..M:`.");
+    }
+    if (/^delete\s+[1-9]\d*(?:\s*(?:\.\.|-|…|\s)\s*[1-9]\d*)?\s*:/.test(trimmed)) {
+        return "`delete N..M` has no colon and no body. Remove the colon and body rows.";
+    }
+    if (/^[1-9]\d*\s*$/.test(trimmed)) {
+        return `hunk headers need a verb. Use \`replace ${trimmed}..${trimmed}:\` to replace, or \`delete ${trimmed}\` to delete.`;
+    }
+    const bareRange = /^([1-9]\d*)\s*[-. …]+\s*([1-9]\d*)\s*:?$/.exec(trimmed);
+    if (bareRange !== null) {
+        return (`bare range hunk header ${JSON.stringify(trimmed)} is not valid. ` +
+            `Hunk headers need a verb: write \`replace ${bareRange[1]}..${bareRange[2]}:\` or \`delete ${bareRange[1]}..${bareRange[2]}\`.`);
+    }
+    return null;
+}
+export class Executor {
+    #edits = [];
+    #warnings = [];
+    #editIndex = 0;
+    #pending;
+    #terminated = false;
+    #skippableComments = [];
+    #discardPendingSkippableComments() {
+        this.#skippableComments = [];
+    }
+    #consumePendingSkippableComments() {
+        if (this.#skippableComments.length === 0)
+            return;
+        for (const comment of this.#skippableComments)
+            this.#handleRaw(comment.text, comment.lineNum);
+        this.#skippableComments = [];
+    }
+    feed(token) {
+        if (this.#terminated)
+            return;
+        switch (token.kind) {
+            case "envelope-begin":
+                this.#consumePendingSkippableComments();
+                return;
+            case "envelope-end":
+                this.#consumePendingSkippableComments();
+                this.#terminated = true;
+                return;
+            case "abort":
+                this.#terminated = true;
+                return;
+            case "header":
+                this.#consumePendingSkippableComments();
+                this.#flushPending();
+                return;
+            case "blank":
+                this.#consumePendingSkippableComments();
+                return;
+            case "payload-literal":
+                this.#consumePendingSkippableComments();
+                this.#handleLiteralPayload(token.text, token.lineNum);
+                return;
+            case "raw":
+                if (this.#pending === undefined && isSkippableCommentLine(token.text)) {
+                    this.#skippableComments.push({ text: token.text, lineNum: token.lineNum });
+                    return;
+                }
+                this.#consumePendingSkippableComments();
+                this.#handleRaw(token.text, token.lineNum);
+                return;
+            case "op-block":
+                this.#discardPendingSkippableComments();
+                if (token.target.kind === "replace" || token.target.kind === "delete") {
+                    validateRangeOrder(token.target.range, token.lineNum);
+                }
+                this.#flushPending();
+                this.#pending = { target: token.target, lineNum: token.lineNum, payloads: [] };
+                return;
+        }
+    }
+    end() {
+        this.#consumePendingSkippableComments();
+        this.#flushPending();
+        this.#validateNoOverlappingDeletes();
+        return { edits: this.#edits, warnings: this.#warnings };
+    }
+    endStreaming() {
+        this.#consumePendingSkippableComments();
+        if (this.#pending && this.#pending.payloads.length > 0)
+            this.#flushPending();
+        else if (this.#pending?.target.kind === "delete" || this.#pending?.target.kind === "delete_block")
+            this.#flushPending();
+        else
+            this.#pending = undefined;
+        this.#validateNoOverlappingDeletes();
+        return { edits: this.#edits, warnings: this.#warnings };
+    }
+    reset() {
+        this.#edits = [];
+        this.#warnings = [];
+        this.#editIndex = 0;
+        this.#pending = undefined;
+        this.#skippableComments = [];
+        this.#terminated = false;
+    }
+    #validateNoOverlappingDeletes() {
+        const sourceLinesByAnchor = new Map();
+        for (const edit of this.#edits) {
+            if (edit.kind !== "delete")
+                continue;
+            let sourceLines = sourceLinesByAnchor.get(edit.anchor.line);
+            if (sourceLines === undefined) {
+                sourceLines = [];
+                sourceLinesByAnchor.set(edit.anchor.line, sourceLines);
+            }
+            if (!sourceLines.includes(edit.lineNum))
+                sourceLines.push(edit.lineNum);
+        }
+        for (const [anchorLine, sourceLines] of sourceLinesByAnchor) {
+            if (sourceLines.length < 2)
+                continue;
+            const [firstBlock, secondBlock] = [...sourceLines].sort((a, b) => a - b);
+            throw new Error(`line ${secondBlock}: anchor line ${anchorLine} is already targeted by another hunk on line ${firstBlock}. ` +
+                "Issue ONE hunk per range; payload is only the final desired content, never a before/after pair.");
+        }
+    }
+    #handleLiteralPayload(text, lineNum) {
+        const pending = this.#pending;
+        if (!pending) {
+            throw new Error(`line ${lineNum}: payload line has no preceding hunk header. ` +
+                `Got ${JSON.stringify(`${HL_PAYLOAD_REPLACE}${text}`)}.`);
+        }
+        if (pending.target.kind === "delete")
+            throw new Error(`line ${lineNum}: ${DELETE_TAKES_NO_BODY}`);
+        if (pending.target.kind === "delete_block")
+            throw new Error(`line ${lineNum}: ${DELETE_BLOCK_TAKES_NO_BODY}`);
+        pending.payloads.push({ kind: "literal", text, lineNum });
+    }
+    #handleRaw(text, lineNum) {
+        const contamination = detectApplyPatchContamination(text, this.#pending !== undefined);
+        if (contamination !== null)
+            throw new Error(`line ${lineNum}: ${contamination}`);
+        if (this.#pending) {
+            if (text.trim().length === 0)
+                return;
+            if (this.#pending.target.kind === "delete")
+                throw new Error(`line ${lineNum}: ${DELETE_TAKES_NO_BODY}`);
+            if (this.#pending.target.kind === "delete_block")
+                throw new Error(`line ${lineNum}: ${DELETE_BLOCK_TAKES_NO_BODY}`);
+            if (text.trimStart().charCodeAt(0) === 45 /* - */)
+                throw new Error(`line ${lineNum}: ${MINUS_ROW_REJECTED}`);
+            if (!this.#warnings.includes(BARE_BODY_AUTO_PIPED_WARNING))
+                this.#warnings.push(BARE_BODY_AUTO_PIPED_WARNING);
+            this.#pending.payloads.push({ kind: "literal", text, lineNum });
+            return;
+        }
+        if (text.trim().length === 0)
+            return;
+        throw new Error(`line ${lineNum}: payload line has no preceding hunk header. ` +
+            `Use \`replace N..M:\`, \`delete N..M\`, or \`insert before|after|head|tail:\` above the body. Got ${JSON.stringify(text)}.`);
+    }
+    #pushInsert(cursor, text, lineNum, mode) {
+        this.#edits.push({
+            kind: "insert",
+            cursor: cloneCursor(cursor),
+            text,
+            lineNum,
+            index: this.#editIndex++,
+            ...(mode === undefined ? {} : { mode }),
+        });
+    }
+    #pushDelete(anchor, lineNum) {
+        this.#edits.push({ kind: "delete", anchor: { ...anchor }, lineNum, index: this.#editIndex++ });
+    }
+    #pushBlock(anchor, payloads, lineNum) {
+        this.#edits.push({
+            kind: "block",
+            anchor: { ...anchor },
+            payloads: payloads.map((payload) => payload.text),
+            lineNum,
+            index: this.#editIndex++,
+        });
+    }
+    #emitPayloadRows(cursor, payloads, lineNum, mode) {
+        for (const payload of payloads)
+            this.#pushInsert(cursor, payload.text, lineNum, mode);
+    }
+    #flushPending() {
+        const pending = this.#pending;
+        if (!pending)
+            return;
+        const { target, lineNum, payloads } = pending;
+        this.#pending = undefined;
+        if (target.kind === "delete") {
+            for (const anchor of expandRange(target.range))
+                this.#pushDelete(anchor, lineNum);
+            return;
+        }
+        if (target.kind === "delete_block") {
+            // A block edit with no payloads resolves to a pure block deletion.
+            this.#pushBlock(target.anchor, [], lineNum);
+            return;
+        }
+        if (target.kind === "block") {
+            if (payloads.length === 0)
+                throw new Error(`line ${lineNum}: ${EMPTY_BLOCK}`);
+            this.#pushBlock(target.anchor, payloads, lineNum);
+            return;
+        }
+        if (payloads.length === 0) {
+            if (target.kind === "replace") {
+                for (const anchor of expandRange(target.range))
+                    this.#pushDelete(anchor, lineNum);
+                return;
+            }
+            throw new Error(`line ${lineNum}: ${EMPTY_INSERT}`);
+        }
+        if (target.kind === "replace") {
+            const cursor = { kind: "before_anchor", anchor: { ...target.range.start } };
+            this.#emitPayloadRows(cursor, payloads, lineNum, "replacement");
+            for (const anchor of expandRange(target.range))
+                this.#pushDelete(anchor, lineNum);
+            return;
+        }
+        if (target.kind === "insert_before") {
+            this.#emitPayloadRows({ kind: "before_anchor", anchor: { ...target.anchor } }, payloads, lineNum);
+            return;
+        }
+        if (target.kind === "insert_after") {
+            this.#emitPayloadRows({ kind: "after_anchor", anchor: { ...target.anchor } }, payloads, lineNum);
+            return;
+        }
+        const cursor = target.kind === "bof" ? { kind: "bof" } : { kind: "eof" };
+        this.#emitPayloadRows(cursor, payloads, lineNum);
+    }
+}
+function drain(executor, tokenizer) {
+    for (const token of tokenizer.end())
+        executor.feed(token);
+    return executor.end();
+}
+export function parsePatch(diff) {
+    const tokenizer = new Tokenizer();
+    const executor = new Executor();
+    for (const token of tokenizer.feed(diff))
+        executor.feed(token);
+    return drain(executor, tokenizer);
+}
+export function parsePatchStreaming(diff) {
+    const tokenizer = new Tokenizer();
+    const executor = new Executor();
+    for (const token of tokenizer.feed(diff))
+        executor.feed(token);
+    for (const token of tokenizer.end())
+        executor.feed(token);
+    return executor.endStreaming();
+}
+//# sourceMappingURL=parser.js.map

package/dist/hashline/parser.js.map

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

package/dist/hashline/patcher.d.ts

@@ -0,0 +1,111 @@
+import type { Filesystem } from "./fs.js";
+import type { Patch, PatchSection } from "./input.js";
+import { type LineEnding } from "./normalize.js";
+import { Recovery } from "./recovery.js";
+import type { SnapshotStore } from "./snapshots.js";
+import type { ApplyResult, BlockResolver } from "./types.js";
+export interface PatcherOptions {
+    /** Storage backend used for all reads and writes. */
+    fs: Filesystem;
+    /** Snapshot store that minted and resolves hashline section tags. Required. */
+    snapshots: SnapshotStore;
+    /**
+     * Resolves `replace block N:` anchors to concrete line spans via tree-sitter.
+     * Optional: when omitted, any `replace block N:` edit throws on apply (the
+     * host did not wire a resolver). Plain line-range ops never need it. In
+     * chances-cli this is backed by `native.blockRangeAt` (capability-gated).
+     */
+    blockResolver?: BlockResolver;
+}
+/** Per-section result returned by {@link Patcher.apply} / {@link Patcher.commit}. */
+export interface PatchSectionResult {
+    /** Section path (as authored, after cwd-resolution at parse time). */
+    path: string;
+    /** Filesystem-canonical key for this section (e.g. absolute path). */
+    canonicalPath: string;
+    /** `"noop"` when the apply produced no change; otherwise `"create"` / `"update"`. */
+    op: "create" | "update" | "noop";
+    /** Pre-edit text (LF-normalized, BOM-stripped). */
+    before: string;
+    /** Post-edit text (LF-normalized, BOM-stripped). For `"noop"` equals `before`. */
+    after: string;
+    /** Same text as `after` but with the original BOM and line ending restored. */
+    persisted: string;
+    /** Final text that the {@link Filesystem} actually wrote (may differ if the FS transformed it). */
+    written: string;
+    /** 4-hex content-hash snapshot tag for `after`. Use to anchor follow-up edits. */
+    fileHash: string;
+    /** Hashline section header (`¶path#tag`) of the post-edit content. */
+    header: string;
+    /** 1-indexed first changed line in `after`, or `undefined` for noops. */
+    firstChangedLine?: number;
+    /** Warnings collected by the parser, applier, and (optionally) recovery. */
+    warnings: string[];
+}
+export interface PatcherApplyResult {
+    sections: PatchSectionResult[];
+}
+/**
+ * Opaque token returned by {@link Patcher.prepare}. Carries the section, the
+ * raw file content read off disk, and the in-memory apply result.
+ * {@link Patcher.commit} just writes the {@link PreparedSection.applyResult}.
+ */
+export declare class PreparedSection {
+    readonly section: PatchSection;
+    readonly canonicalPath: string;
+    readonly exists: boolean;
+    readonly rawContent: string;
+    readonly bom: string;
+    readonly lineEnding: LineEnding;
+    readonly normalized: string;
+    readonly applyResult: ApplyResult;
+    readonly parseWarnings: readonly string[];
+    /** @internal */
+    constructor(section: PatchSection, canonicalPath: string, exists: boolean, rawContent: string, bom: string, lineEnding: LineEnding, normalized: string, applyResult: ApplyResult, parseWarnings: readonly string[]);
+    /** Convenience: returns true when the apply produced no change. */
+    get isNoop(): boolean;
+}
+/**
+ * High-level patcher. Wires a {@link Filesystem} and a required
+ * {@link SnapshotStore} together with the parsing + applying core.
+ *
+ * Construct once per FS configuration; reuse across patches.
+ */
+export declare class Patcher {
+    #private;
+    readonly fs: Filesystem;
+    readonly snapshots: SnapshotStore;
+    readonly recovery: Recovery;
+    readonly blockResolver: BlockResolver | undefined;
+    constructor(options: PatcherOptions);
+    /**
+     * Apply every section in `patch`. `prepare` runs the full apply for each
+     * section in memory before any write hits the filesystem, so a
+     * multi-section batch is naturally all-or-nothing. Returns one
+     * {@link PatchSectionResult} per section in the original patch order.
+     */
+    apply(patch: Patch): Promise<PatcherApplyResult>;
+    /**
+     * Run the preflight pass only: read, parse, validate, apply-in-memory.
+     * No writes hit the filesystem. Use for CI checks and dry runs.
+     */
+    preflight(patch: Patch): Promise<void>;
+    /**
+     * Read a section's target file, parse the section, validate the snapshot
+     * tag (with recovery), and apply the edits in memory. Returns a
+     * {@link PreparedSection} which can be fed to {@link commit} to land
+     * the result on the filesystem.
+     *
+     * Throws on parse error, missing-file-for-anchored-edit, or unrecovered
+     * tag mismatch ({@link MismatchError}).
+     */
+    prepare(section: PatchSection): Promise<PreparedSection>;
+    /**
+     * Commit a previously {@link prepare}d section to the filesystem.
+     * Restores line endings and BOM, writes via the {@link Filesystem}, and
+     * records a fresh snapshot in the {@link SnapshotStore} keyed by the
+     * filesystem-canonical path.
+     */
+    commit(prepared: PreparedSection): Promise<PatchSectionResult>;
+}
+//# sourceMappingURL=patcher.d.ts.map

package/dist/hashline/patcher.d.ts.map

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