@kynetic-ai/spec 0.1.2 → 0.4.0

package/dist/merge/file-type.js

@@ -0,0 +1,70 @@
+/**
+ * File type detection for kspec merge driver.
+ *
+ * Determines which merge strategy to apply based on file path patterns.
+ */
+/**
+ * Types of kspec files that require different merge strategies
+ */
+export var FileType;
+(function (FileType) {
+    /** Task files: *.tasks.yaml */
+    FileType["Tasks"] = "tasks";
+    /** Inbox files: *.inbox.yaml */
+    FileType["Inbox"] = "inbox";
+    /** Spec module files: modules/*.yaml */
+    FileType["SpecModules"] = "spec_modules";
+    /** Manifest file: kynetic.yaml */
+    FileType["Manifest"] = "manifest";
+    /** Meta file: kynetic.meta.yaml */
+    FileType["Meta"] = "meta";
+    /** Unrecognized files (fallback to default behavior) */
+    FileType["Unknown"] = "unknown";
+})(FileType || (FileType = {}));
+/**
+ * Detect the type of a kspec file based on its path.
+ *
+ * Supports both explicit names (kynetic.yaml) and slug-based names ({slug}.yaml).
+ *
+ * @param filePath - Path to the file (can be relative or absolute)
+ * @returns The detected file type
+ */
+export function detectFileType(filePath) {
+    // Normalize path separators for cross-platform compatibility
+    const normalizedPath = filePath.replace(/\\/g, "/");
+    // Extract just the filename for pattern matching
+    const parts = normalizedPath.split("/");
+    const fileName = parts[parts.length - 1];
+    // Check for task files (*.tasks.yaml pattern) - must be before manifest check
+    if (fileName.endsWith(".tasks.yaml")) {
+        return FileType.Tasks;
+    }
+    // Check for inbox files (*.inbox.yaml pattern)
+    if (fileName.endsWith(".inbox.yaml")) {
+        return FileType.Inbox;
+    }
+    // Check for meta file (*.meta.yaml pattern - supports slug-based naming)
+    if (fileName.endsWith(".meta.yaml")) {
+        return FileType.Meta;
+    }
+    // Check for workflow runs files (*.runs.yaml pattern)
+    if (fileName.endsWith(".runs.yaml")) {
+        return FileType.Unknown; // Runs files don't need special merge handling
+    }
+    // Check for spec modules (in modules/ directory)
+    // Match both "/modules/" and "modules/" at start of path
+    if ((normalizedPath.includes("/modules/") ||
+        normalizedPath.startsWith("modules/")) &&
+        fileName.endsWith(".yaml")) {
+        return FileType.SpecModules;
+    }
+    // Check for manifest - explicit names only for merge driver safety
+    // Slug-based manifests ({slug}.yaml) are handled at discovery time, not merge time
+    // The merge driver only needs to handle files that are definitely kspec files
+    if (fileName === "kynetic.yaml" || fileName === "kynetic.spec.yaml") {
+        return FileType.Manifest;
+    }
+    // Fallback for unrecognized files
+    return FileType.Unknown;
+}
+//# sourceMappingURL=file-type.js.map

package/dist/merge/file-type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-type.js","sourceRoot":"","sources":["../../src/merge/file-type.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,CAAN,IAAY,QAaX;AAbD,WAAY,QAAQ;IAClB,+BAA+B;IAC/B,2BAAe,CAAA;IACf,gCAAgC;IAChC,2BAAe,CAAA;IACf,wCAAwC;IACxC,wCAA4B,CAAA;IAC5B,kCAAkC;IAClC,iCAAqB,CAAA;IACrB,mCAAmC;IACnC,yBAAa,CAAA;IACb,wDAAwD;IACxD,+BAAmB,CAAA;AACrB,CAAC,EAbW,QAAQ,KAAR,QAAQ,QAanB;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,6DAA6D;IAC7D,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAEpD,iDAAiD;IACjD,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEzC,8EAA8E;IAC9E,IAAI,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACrC,OAAO,QAAQ,CAAC,KAAK,CAAC;IACxB,CAAC;IAED,+CAA+C;IAC/C,IAAI,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACrC,OAAO,QAAQ,CAAC,KAAK,CAAC;IACxB,CAAC;IAED,yEAAyE;IACzE,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACpC,OAAO,QAAQ,CAAC,IAAI,CAAC;IACvB,CAAC;IAED,sDAAsD;IACtD,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACpC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,+CAA+C;IAC1E,CAAC;IAED,iDAAiD;IACjD,yDAAyD;IACzD,IACE,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC;QACnC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACxC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAC1B,CAAC;QACD,OAAO,QAAQ,CAAC,WAAW,CAAC;IAC9B,CAAC;IAED,mEAAmE;IACnE,mFAAmF;IACnF,8EAA8E;IAC9E,IAAI,QAAQ,KAAK,cAAc,IAAI,QAAQ,KAAK,mBAAmB,EAAE,CAAC;QACpE,OAAO,QAAQ,CAAC,QAAQ,CAAC;IAC3B,CAAC;IAED,kCAAkC;IAClC,OAAO,QAAQ,CAAC,OAAO,CAAC;AAC1B,CAAC"}

package/dist/merge/index.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Semantic YAML merge driver for kspec files.
+ *
+ * Public API exports for the merge module.
+ */
+export type { MergeResult, ConflictInfo, ConflictType, MergeOptions, ParsedVersions, ParseResult, } from "./types.js";
+export { parseYamlVersions } from "./parse.js";
+export { mergeUlidArrays, mergeSetArray, normalizeRef, detectDeletion, } from "./arrays.js";
+export { mergeObjects } from "./objects.js";
+export type { ObjectMergeResult } from "./objects.js";
+export { promptScalarConflict, promptDeleteModifyConflict, resolveConflictsInteractive, formatConflictComment, } from "./resolve.js";
+export type { ResolutionChoice, ConflictResolution } from "./resolve.js";
+export { detectFileType, FileType } from "./file-type.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/merge/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/merge/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,EACV,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,WAAW,GACZ,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EACL,eAAe,EACf,aAAa,EACb,YAAY,EACZ,cAAc,GACf,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEzE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/merge/index.js

@@ -0,0 +1,11 @@
+/**
+ * Semantic YAML merge driver for kspec files.
+ *
+ * Public API exports for the merge module.
+ */
+export { parseYamlVersions } from "./parse.js";
+export { mergeUlidArrays, mergeSetArray, normalizeRef, detectDeletion, } from "./arrays.js";
+export { mergeObjects } from "./objects.js";
+export { promptScalarConflict, promptDeleteModifyConflict, resolveConflictsInteractive, formatConflictComment, } from "./resolve.js";
+export { detectFileType, FileType } from "./file-type.js";
+//# sourceMappingURL=index.js.map

package/dist/merge/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/merge/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EACL,eAAe,EACf,aAAa,EACb,YAAY,EACZ,cAAc,GACf,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG5C,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/merge/objects.d.ts

@@ -0,0 +1,46 @@
+/**
+ * Object merging algorithms for semantic YAML merge.
+ *
+ * Handles field-level merging of objects, recursively merging nested structures
+ * and detecting conflicts when both sides modify the same scalar field.
+ */
+import type { ConflictInfo } from "./types.js";
+/**
+ * Result of merging two objects
+ */
+export interface ObjectMergeResult {
+    /** The merged object */
+    merged: Record<string, unknown>;
+    /** Conflicts detected during merge */
+    conflicts: ConflictInfo[];
+}
+/**
+ * Merge two objects field by field, recursively handling nested objects.
+ *
+ * AC: @yaml-merge-driver ac-3
+ * When both versions modify different fields of the same item, fields are merged.
+ *
+ * AC: @yaml-merge-driver ac-7
+ * Nested objects are merged recursively at field level.
+ *
+ * Strategy:
+ * 1. Collect all keys from base, ours, and theirs
+ * 2. For each key, determine what happened:
+ *    - Added in ours only → include ours value
+ *    - Added in theirs only → include theirs value
+ *    - Added in both (not in base) → conflict if different
+ *    - Modified in ours only → include ours value
+ *    - Modified in theirs only → include theirs value
+ *    - Modified in both → recurse if objects, else conflict
+ *    - Deleted in ours, kept in theirs → include theirs value
+ *    - Deleted in theirs, kept in ours → include ours value
+ *    - Deleted in both → omit from result
+ *
+ * @param base Object from common ancestor
+ * @param ours Object from current branch
+ * @param theirs Object from incoming branch
+ * @param path Path to this object (for conflict reporting)
+ * @returns Merged object and any conflicts detected
+ */
+export declare function mergeObjects(base: Record<string, unknown> | undefined, ours: Record<string, unknown> | undefined, theirs: Record<string, unknown> | undefined, path?: string): ObjectMergeResult;
+//# sourceMappingURL=objects.d.ts.map

package/dist/merge/objects.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"objects.d.ts","sourceRoot":"","sources":["../../src/merge/objects.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,wBAAwB;IACxB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,sCAAsC;IACtC,SAAS,EAAE,YAAY,EAAE,CAAC;CAC3B;AAcD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EACzC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EACzC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC3C,IAAI,SAAK,GACR,iBAAiB,CAmInB"}

package/dist/merge/objects.js

@@ -0,0 +1,193 @@
+/**
+ * Object merging algorithms for semantic YAML merge.
+ *
+ * Handles field-level merging of objects, recursively merging nested structures
+ * and detecting conflicts when both sides modify the same scalar field.
+ */
+/**
+ * Check if a value is a plain object (not an array, null, or other type)
+ */
+function isPlainObject(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        !Array.isArray(value) &&
+        Object.getPrototypeOf(value) === Object.prototype);
+}
+/**
+ * Merge two objects field by field, recursively handling nested objects.
+ *
+ * AC: @yaml-merge-driver ac-3
+ * When both versions modify different fields of the same item, fields are merged.
+ *
+ * AC: @yaml-merge-driver ac-7
+ * Nested objects are merged recursively at field level.
+ *
+ * Strategy:
+ * 1. Collect all keys from base, ours, and theirs
+ * 2. For each key, determine what happened:
+ *    - Added in ours only → include ours value
+ *    - Added in theirs only → include theirs value
+ *    - Added in both (not in base) → conflict if different
+ *    - Modified in ours only → include ours value
+ *    - Modified in theirs only → include theirs value
+ *    - Modified in both → recurse if objects, else conflict
+ *    - Deleted in ours, kept in theirs → include theirs value
+ *    - Deleted in theirs, kept in ours → include ours value
+ *    - Deleted in both → omit from result
+ *
+ * @param base Object from common ancestor
+ * @param ours Object from current branch
+ * @param theirs Object from incoming branch
+ * @param path Path to this object (for conflict reporting)
+ * @returns Merged object and any conflicts detected
+ */
+export function mergeObjects(base, ours, theirs, path = "") {
+    const baseObj = base ?? {};
+    const oursObj = ours ?? {};
+    const theirsObj = theirs ?? {};
+    const merged = {};
+    const conflicts = [];
+    // Collect all keys from all three versions
+    const allKeys = new Set([
+        ...Object.keys(baseObj),
+        ...Object.keys(oursObj),
+        ...Object.keys(theirsObj),
+    ]);
+    for (const key of allKeys) {
+        const fieldPath = path ? `${path}.${key}` : key;
+        const inBase = key in baseObj;
+        const inOurs = key in oursObj;
+        const inTheirs = key in theirsObj;
+        const baseVal = baseObj[key];
+        const oursVal = oursObj[key];
+        const theirsVal = theirsObj[key];
+        // Case 1: Field only in ours (added in ours)
+        if (!inBase && inOurs && !inTheirs) {
+            merged[key] = oursVal;
+            continue;
+        }
+        // Case 2: Field only in theirs (added in theirs)
+        if (!inBase && !inOurs && inTheirs) {
+            merged[key] = theirsVal;
+            continue;
+        }
+        // Case 3: Field added in both (not in base)
+        if (!inBase && inOurs && inTheirs) {
+            if (valuesEqual(oursVal, theirsVal)) {
+                // Same value added in both - no conflict
+                merged[key] = oursVal;
+            }
+            else if (isPlainObject(oursVal) && isPlainObject(theirsVal)) {
+                // Both added nested objects - try to merge them
+                const result = mergeObjects(undefined, oursVal, theirsVal, fieldPath);
+                merged[key] = result.merged;
+                conflicts.push(...result.conflicts);
+            }
+            else {
+                // Different values added - conflict
+                conflicts.push({
+                    type: "scalar_field",
+                    path: fieldPath,
+                    oursValue: oursVal,
+                    theirsValue: theirsVal,
+                    description: `Field "${key}" added with different values in both branches`,
+                });
+                // Default to ours for now (will be resolved interactively)
+                merged[key] = oursVal;
+            }
+            continue;
+        }
+        // Case 4: Field deleted in ours, kept/modified in theirs
+        if (inBase && !inOurs && inTheirs) {
+            // Deletion in ours, but theirs kept it - include theirs value
+            merged[key] = theirsVal;
+            continue;
+        }
+        // Case 5: Field deleted in theirs, kept/modified in ours
+        if (inBase && inOurs && !inTheirs) {
+            // Deletion in theirs, but ours kept it - include ours value
+            merged[key] = oursVal;
+            continue;
+        }
+        // Case 6: Field deleted in both
+        if (inBase && !inOurs && !inTheirs) {
+            // Both deleted - omit from result
+            continue;
+        }
+        // Case 7: Field exists in all three versions
+        if (inBase && inOurs && inTheirs) {
+            // Check if modified in ours
+            const modifiedInOurs = !valuesEqual(baseVal, oursVal);
+            // Check if modified in theirs
+            const modifiedInTheirs = !valuesEqual(baseVal, theirsVal);
+            if (!modifiedInOurs && !modifiedInTheirs) {
+                // No changes in either - keep base value
+                merged[key] = baseVal;
+            }
+            else if (modifiedInOurs && !modifiedInTheirs) {
+                // Only modified in ours - take ours
+                merged[key] = oursVal;
+            }
+            else if (!modifiedInOurs && modifiedInTheirs) {
+                // Only modified in theirs - take theirs
+                merged[key] = theirsVal;
+            }
+            else {
+                // Modified in both - need to check for conflicts
+                if (valuesEqual(oursVal, theirsVal)) {
+                    // Same modification in both - no conflict
+                    merged[key] = oursVal;
+                }
+                else if (isPlainObject(oursVal) && isPlainObject(theirsVal)) {
+                    // Both modified nested objects - recurse
+                    const result = mergeObjects(isPlainObject(baseVal) ? baseVal : undefined, oursVal, theirsVal, fieldPath);
+                    merged[key] = result.merged;
+                    conflicts.push(...result.conflicts);
+                }
+                else {
+                    // Both modified scalar field with different values - conflict
+                    conflicts.push({
+                        type: "scalar_field",
+                        path: fieldPath,
+                        oursValue: oursVal,
+                        theirsValue: theirsVal,
+                        description: `Field "${key}" modified with different values in both branches`,
+                    });
+                    // Default to ours for now (will be resolved interactively)
+                    merged[key] = oursVal;
+                }
+            }
+            continue;
+        }
+    }
+    return { merged, conflicts };
+}
+/**
+ * Compare two values for equality.
+ * Handles primitives, arrays, and objects.
+ */
+function valuesEqual(a, b) {
+    // Handle primitives
+    if (a === b)
+        return true;
+    // Handle null/undefined
+    if (a == null || b == null)
+        return a === b;
+    // Handle arrays
+    if (Array.isArray(a) && Array.isArray(b)) {
+        if (a.length !== b.length)
+            return false;
+        return a.every((val, idx) => valuesEqual(val, b[idx]));
+    }
+    // Handle objects
+    if (isPlainObject(a) && isPlainObject(b)) {
+        const aKeys = Object.keys(a);
+        const bKeys = Object.keys(b);
+        if (aKeys.length !== bKeys.length)
+            return false;
+        return aKeys.every((key) => valuesEqual(a[key], b[key]));
+    }
+    // Different types or values
+    return false;
+}
+//# sourceMappingURL=objects.js.map

package/dist/merge/objects.js.map

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

package/dist/merge/parse.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Parsing utilities for merge driver.
+ *
+ * Handles reading and parsing all three versions (base, ours, theirs)
+ * of a YAML file, with graceful fallback when parsing fails.
+ */
+import type { ParseResult } from "./types.js";
+/**
+ * Parse all three versions of a YAML file.
+ *
+ * AC: @yaml-merge-driver ac-1
+ * Parses base, ours, and theirs as structured data instead of text.
+ *
+ * AC: @yaml-merge-driver ac-11
+ * Returns parse failure if any file cannot be parsed.
+ *
+ * @param basePath Path to base version (common ancestor)
+ * @param oursPath Path to ours version (current branch)
+ * @param theirsPath Path to theirs version (incoming branch)
+ * @returns ParseResult with parsed versions or error
+ */
+export declare function parseYamlVersions(basePath: string, oursPath: string, theirsPath: string): Promise<ParseResult>;
+//# sourceMappingURL=parse.d.ts.map

package/dist/merge/parse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/merge/parse.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,YAAY,CAAC;AAE9D;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,WAAW,CAAC,CAuDtB"}

package/dist/merge/parse.js

@@ -0,0 +1,78 @@
+/**
+ * Parsing utilities for merge driver.
+ *
+ * Handles reading and parsing all three versions (base, ours, theirs)
+ * of a YAML file, with graceful fallback when parsing fails.
+ */
+import * as fs from "node:fs/promises";
+import { parseYaml } from "../parser/yaml.js";
+/**
+ * Parse all three versions of a YAML file.
+ *
+ * AC: @yaml-merge-driver ac-1
+ * Parses base, ours, and theirs as structured data instead of text.
+ *
+ * AC: @yaml-merge-driver ac-11
+ * Returns parse failure if any file cannot be parsed.
+ *
+ * @param basePath Path to base version (common ancestor)
+ * @param oursPath Path to ours version (current branch)
+ * @param theirsPath Path to theirs version (incoming branch)
+ * @returns ParseResult with parsed versions or error
+ */
+export async function parseYamlVersions(basePath, oursPath, theirsPath) {
+    try {
+        // Read all three files
+        const [baseContent, oursContent, theirsContent] = await Promise.all([
+            fs.readFile(basePath, "utf-8"),
+            fs.readFile(oursPath, "utf-8"),
+            fs.readFile(theirsPath, "utf-8"),
+        ]);
+        // Parse all three versions
+        let base;
+        let ours;
+        let theirs;
+        try {
+            base = parseYaml(baseContent);
+        }
+        catch (err) {
+            return {
+                success: false,
+                error: `Failed to parse base: ${err instanceof Error ? err.message : String(err)}`,
+                failedFile: "base",
+            };
+        }
+        try {
+            ours = parseYaml(oursContent);
+        }
+        catch (err) {
+            return {
+                success: false,
+                error: `Failed to parse ours: ${err instanceof Error ? err.message : String(err)}`,
+                failedFile: "ours",
+            };
+        }
+        try {
+            theirs = parseYaml(theirsContent);
+        }
+        catch (err) {
+            return {
+                success: false,
+                error: `Failed to parse theirs: ${err instanceof Error ? err.message : String(err)}`,
+                failedFile: "theirs",
+            };
+        }
+        return {
+            success: true,
+            versions: { base, ours, theirs },
+        };
+    }
+    catch (err) {
+        // File read error
+        return {
+            success: false,
+            error: `Failed to read files: ${err instanceof Error ? err.message : String(err)}`,
+        };
+    }
+}
+//# sourceMappingURL=parse.js.map

package/dist/merge/parse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/merge/parse.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAG9C;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAgB,EAChB,QAAgB,EAChB,UAAkB;IAElB,IAAI,CAAC;QACH,uBAAuB;QACvB,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAClE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;YAC9B,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;YAC9B,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;SACjC,CAAC,CAAC;QAEH,2BAA2B;QAC3B,IAAI,IAAa,CAAC;QAClB,IAAI,IAAa,CAAC;QAClB,IAAI,MAAe,CAAC;QAEpB,IAAI,CAAC;YACH,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,yBAAyB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;gBAClF,UAAU,EAAE,MAAM;aACnB,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,yBAAyB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;gBAClF,UAAU,EAAE,MAAM;aACnB,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,2BAA2B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;gBACpF,UAAU,EAAE,QAAQ;aACrB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE;SACjC,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,kBAAkB;QAClB,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,yBAAyB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;SACnF,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/merge/resolve.d.ts

@@ -0,0 +1,66 @@
+/**
+ * Conflict resolution for semantic YAML merge.
+ *
+ * Handles interactive prompts for conflicts and formatting
+ * conflicts as YAML comments in non-interactive mode.
+ */
+import type { ConflictInfo } from "./types.js";
+import * as readline from "node:readline/promises";
+/**
+ * Resolution choice for a conflict
+ */
+export type ResolutionChoice = "ours" | "theirs" | "skip";
+/**
+ * Result of resolving a single conflict
+ */
+export interface ConflictResolution {
+    /** The conflict that was resolved */
+    conflict: ConflictInfo;
+    /** The choice made */
+    choice: ResolutionChoice;
+    /** The resolved value (undefined if skipped) */
+    value?: unknown;
+}
+/**
+ * AC: @yaml-merge-driver ac-4
+ * Prompt user interactively to resolve a scalar field conflict.
+ *
+ * @param conflict The conflict to resolve
+ * @param createInterface Optional readline factory for testing
+ * @returns The resolution choice and value
+ */
+export declare function promptScalarConflict(conflict: ConflictInfo, createInterface?: typeof readline.createInterface): Promise<ConflictResolution>;
+/**
+ * AC: @yaml-merge-driver ac-8
+ * Prompt user to choose between deletion and keeping modified version.
+ *
+ * @param conflict The delete-modify conflict to resolve
+ * @param createInterface Optional readline factory for testing
+ * @returns The resolution choice
+ */
+export declare function promptDeleteModifyConflict(conflict: ConflictInfo, createInterface?: typeof readline.createInterface): Promise<ConflictResolution>;
+/**
+ * Resolve multiple conflicts interactively.
+ *
+ * @param conflicts Array of conflicts to resolve
+ * @returns Array of resolutions
+ */
+export declare function resolveConflictsInteractive(conflicts: ConflictInfo[]): Promise<ConflictResolution[]>;
+/**
+ * AC: @yaml-merge-driver ac-10
+ * Format a conflict as a YAML comment for non-interactive mode.
+ *
+ * Example output:
+ * ```yaml
+ * # CONFLICT: Field "title" modified with different values in both branches
+ * # Path: tasks[0].title
+ * # Ours: "Fix authentication bug"
+ * # Theirs: "Fix auth issue"
+ * title: "Fix authentication bug"  # Using ours
+ * ```
+ *
+ * @param conflict The conflict to format
+ * @returns YAML comment lines
+ */
+export declare function formatConflictComment(conflict: ConflictInfo): string[];
+//# sourceMappingURL=resolve.d.ts.map

package/dist/merge/resolve.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/merge/resolve.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAC;AAGnD;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,qCAAqC;IACrC,QAAQ,EAAE,YAAY,CAAC;IACvB,sBAAsB;IACtB,MAAM,EAAE,gBAAgB,CAAC;IACzB,gDAAgD;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,YAAY,EACtB,eAAe,CAAC,EAAE,OAAO,QAAQ,CAAC,eAAe,GAChD,OAAO,CAAC,kBAAkB,CAAC,CAoC7B;AAED;;;;;;;GAOG;AACH,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,YAAY,EACtB,eAAe,CAAC,EAAE,OAAO,QAAQ,CAAC,eAAe,GAChD,OAAO,CAAC,kBAAkB,CAAC,CA6C7B;AAED;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,YAAY,EAAE,GACxB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAuB/B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,EAAE,CAetE"}