@promptwheel/core 0.7.22 → 0.7.34

package/dist/waves/conflict.js

@@ -0,0 +1,400 @@
+/**
+ * Conflict detection — pure functions that determine whether two proposals
+ * can safely execute in parallel or risk merge conflicts.
+ *
+ * Checks file path overlap, sibling files, directory proximity, import chains,
+ * call-graph edges, and monorepo package boundaries.
+ *
+ * No filesystem, git, or child_process I/O.
+ */
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+/**
+ * Files that frequently cause merge conflicts when multiple tickets
+ * touch the same directory. These are "hub" files that re-export or
+ * aggregate content from sibling files.
+ */
+export const CONFLICT_PRONE_FILENAMES = new Set([
+    'index.ts',
+    'index.tsx',
+    'index.js',
+    'index.jsx',
+    'index.mjs',
+    'index.cjs',
+    'mod.ts', // Deno convention
+    'mod.js',
+    'package.json',
+    'tsconfig.json',
+    'vite.config.ts',
+    'vitest.config.ts',
+    'jest.config.js',
+    'jest.config.ts',
+    '.eslintrc.js',
+    '.eslintrc.json',
+    'eslint.config.js',
+    'eslint.config.mjs',
+    '__init__.py', // Python
+    'Cargo.toml', // Rust
+    'go.mod', // Go
+    'build.gradle', // Java/Kotlin
+    'pom.xml', // Maven
+    'Gemfile', // Ruby
+    'mix.exs', // Elixir
+    'Package.swift', // Swift
+    'pubspec.yaml', // Dart/Flutter
+    'build.sbt', // Scala
+    'stack.yaml', // Haskell
+    'build.zig', // Zig
+    'CMakeLists.txt', // C/C++
+]);
+/**
+ * Directory patterns that indicate shared/common code.
+ * Files in these directories are more likely to be touched by multiple tickets.
+ */
+export const SHARED_DIRECTORY_PATTERNS = [
+    /\/shared\//,
+    /\/common\//,
+    /\/utils\//,
+    /\/helpers\//,
+    /\/lib\//,
+    /\/types\//,
+    /\/interfaces\//,
+    /\/constants\//,
+    /\/config\//,
+];
+/** Monorepo top-level directory patterns. */
+export const PACKAGE_PATTERN = /^(packages|apps|libs|modules)\/([^/]+)/;
+/** Default directory overlap threshold for normal mode. */
+export const DIRECTORY_OVERLAP_NORMAL = 0.3;
+/** Default directory overlap threshold for strict mode. */
+export const DIRECTORY_OVERLAP_STRICT = 0.2;
+// ---------------------------------------------------------------------------
+// Path helpers
+// ---------------------------------------------------------------------------
+/** Extract the directory and filename from a path. */
+export function parsePath(filePath) {
+    const normalized = filePath.replace(/^\.\//, '').replace(/\/$/, '');
+    const lastSlash = normalized.lastIndexOf('/');
+    if (lastSlash === -1) {
+        return { dir: '.', filename: normalized };
+    }
+    return {
+        dir: normalized.slice(0, lastSlash),
+        filename: normalized.slice(lastSlash + 1),
+    };
+}
+/**
+ * Check if two file paths overlap: exact match, directory containment,
+ * or glob pattern overlap.
+ */
+export function pathsOverlap(pathA, pathB) {
+    // Normalize paths (remove trailing slashes, handle ./prefix)
+    const normA = pathA.replace(/^\.\//, '').replace(/\/$/, '');
+    const normB = pathB.replace(/^\.\//, '').replace(/\/$/, '');
+    // Exact match
+    if (normA === normB) {
+        return true;
+    }
+    // One is prefix of other (directory containment)
+    if (normA.startsWith(normB + '/') || normB.startsWith(normA + '/')) {
+        return true;
+    }
+    // Check for glob pattern overlaps
+    const hasGlobA = normA.includes('*');
+    const hasGlobB = normB.includes('*');
+    if (hasGlobA || hasGlobB) {
+        const baseA = normA.split('*')[0].replace(/\/$/, '');
+        const baseB = normB.split('*')[0].replace(/\/$/, '');
+        if (baseA === baseB || baseA.startsWith(baseB + '/') || baseB.startsWith(baseA + '/')) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Check if two sets of file paths share directories above a threshold.
+ * Used for semantic conflict detection in wave scheduling.
+ */
+export function directoriesOverlap(pathsA, pathsB, threshold = 0.3) {
+    const dirsA = new Set(pathsA.map(p => parsePath(p).dir));
+    const dirsB = new Set(pathsB.map(p => parsePath(p).dir));
+    if (dirsA.size === 0 || dirsB.size === 0)
+        return false;
+    let n = 0;
+    for (const d of dirsA) {
+        if (dirsB.has(d))
+            n++;
+    }
+    return (n / Math.min(dirsA.size, dirsB.size)) >= threshold;
+}
+// ---------------------------------------------------------------------------
+// Conflict detection helpers
+// ---------------------------------------------------------------------------
+/** Check if a file is conflict-prone (index files, configs, etc.) */
+export function isConflictProneFile(filePath) {
+    const { filename } = parsePath(filePath);
+    return CONFLICT_PRONE_FILENAMES.has(filename);
+}
+/** Check if a path is in a shared/common directory. */
+export function isInSharedDirectory(filePath) {
+    return SHARED_DIRECTORY_PATTERNS.some(pattern => pattern.test(filePath));
+}
+/** Get all unique directories from a list of file paths, including parent hierarchy. */
+export function getDirectories(files) {
+    const dirs = new Set();
+    for (const file of files) {
+        const { dir } = parsePath(file);
+        dirs.add(dir);
+        // Also add parent directories for hierarchical conflict detection
+        const parts = dir.split('/');
+        for (let i = 1; i < parts.length; i++) {
+            dirs.add(parts.slice(0, i).join('/'));
+        }
+    }
+    return dirs;
+}
+/**
+ * Check if two proposals have sibling files (different files in the same directory).
+ */
+export function hasSiblingFiles(filesA, filesB) {
+    const dirsA = new Set(filesA.map(f => parsePath(f).dir));
+    const dirsB = new Set(filesB.map(f => parsePath(f).dir));
+    for (const dir of dirsA) {
+        if (dirsB.has(dir)) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Check if either proposal touches conflict-prone files in overlapping directories.
+ */
+export function hasConflictProneOverlap(filesA, filesB) {
+    const dirsA = new Set(filesA.map(f => parsePath(f).dir));
+    const dirsB = new Set(filesB.map(f => parsePath(f).dir));
+    for (const file of [...filesA, ...filesB]) {
+        if (isConflictProneFile(file)) {
+            const { dir } = parsePath(file);
+            if (dirsA.has(dir) && dirsB.has(dir)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+/**
+ * Check if proposals share a common parent directory that might have
+ * configuration or index files affected by both changes.
+ */
+export function hasSharedParentConflict(filesA, filesB) {
+    const dirsA = getDirectories(filesA);
+    const dirsB = getDirectories(filesB);
+    for (const dir of dirsA) {
+        if (dirsB.has(dir) && isInSharedDirectory(dir + '/')) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Monorepo-aware: check if both proposals touch the same package.
+ * Common patterns: packages/*, apps/*, libs/*, modules/*
+ */
+export function touchesSamePackage(filesA, filesB) {
+    const packagesA = new Set();
+    const packagesB = new Set();
+    for (const file of filesA) {
+        const match = file.match(PACKAGE_PATTERN);
+        if (match)
+            packagesA.add(match[0]);
+    }
+    for (const file of filesB) {
+        const match = file.match(PACKAGE_PATTERN);
+        if (match)
+            packagesB.add(match[0]);
+    }
+    for (const pkg of packagesA) {
+        if (packagesB.has(pkg))
+            return true;
+    }
+    return false;
+}
+// ---------------------------------------------------------------------------
+// Main conflict detection
+// ---------------------------------------------------------------------------
+/**
+ * Resolve files to their containing module path in the dependency graph.
+ * A file `src/core/index.ts` matches module `src/core` if that key exists in edges.
+ */
+function resolveModules(files, edges) {
+    const mods = new Set();
+    for (const f of files) {
+        const parts = f.split('/');
+        for (let i = parts.length - 1; i >= 1; i--) {
+            const candidate = parts.slice(0, i).join('/');
+            if (candidate in edges) {
+                mods.add(candidate);
+                break; // most-specific match
+            }
+        }
+    }
+    return mods;
+}
+/**
+ * Check if two sets of modules are connected by a direct import edge.
+ * Returns true if any module in A imports any module in B, or vice versa.
+ */
+export function hasImportChainConflict(filesA, filesB, edges) {
+    const modsA = resolveModules(filesA, edges);
+    const modsB = resolveModules(filesB, edges);
+    if (modsA.size === 0 || modsB.size === 0)
+        return false;
+    // Check: does any module in A import any module in B?
+    for (const modA of modsA) {
+        const deps = edges[modA];
+        if (deps) {
+            for (const dep of deps) {
+                if (modsB.has(dep))
+                    return true;
+            }
+        }
+    }
+    // Check reverse: does any module in B import any module in A?
+    for (const modB of modsB) {
+        const deps = edges[modB];
+        if (deps) {
+            for (const dep of deps) {
+                if (modsA.has(dep))
+                    return true;
+            }
+        }
+    }
+    return false;
+}
+/**
+ * Check if two sets of target symbols are connected by a caller→callee edge.
+ * Returns true if any symbol in A calls any symbol in B, or vice versa.
+ */
+export function hasCallGraphConflict(symbolsA, symbolsB, callEdges) {
+    if (symbolsA.length === 0 || symbolsB.length === 0)
+        return false;
+    const setA = new Set(symbolsA);
+    const setB = new Set(symbolsB);
+    for (const edge of callEdges) {
+        // A calls B or B calls A
+        if ((setA.has(edge.caller) && setB.has(edge.callee)) ||
+            (setB.has(edge.caller) && setA.has(edge.callee))) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Check if two proposals have a potential conflict based on their file lists.
+ *
+ * When both proposals provide `target_symbols` and their file paths overlap,
+ * an AST-aware escape hatch checks whether the targeted symbols are disjoint.
+ * If symbols don't overlap, the proposals can safely run in parallel even
+ * though they touch the same file.
+ */
+export function proposalsConflict(a, b, options = {}) {
+    const { sensitivity = 'normal' } = options;
+    // Always check: direct file path overlap (exact match or containment)
+    const hasPathOverlap = a.files.some(fA => b.files.some(fB => pathsOverlap(fA, fB)));
+    if (hasPathOverlap) {
+        // AST-aware escape hatch: if both proposals declare which symbols they
+        // modify and those symbol sets are disjoint, they can run in parallel.
+        if (a.target_symbols?.length && b.target_symbols?.length) {
+            const symbolsA = new Set(a.target_symbols);
+            const hasSymbolOverlap = b.target_symbols.some(s => symbolsA.has(s));
+            if (!hasSymbolOverlap) {
+                // Different symbols in same file — safe to parallelize
+                return false;
+            }
+        }
+        return true;
+    }
+    if (sensitivity === 'relaxed') {
+        return false;
+    }
+    // Normal and strict: check sibling files in same directory
+    if (hasSiblingFiles(a.files, b.files)) {
+        if (sensitivity === 'strict') {
+            return true;
+        }
+        // Normal: sibling + (conflict-prone OR same category)
+        if (hasConflictProneOverlap(a.files, b.files)) {
+            return true;
+        }
+        if (a.category && b.category && a.category === b.category) {
+            // AST-aware escape: same category but disjoint symbols → safe
+            if (a.target_symbols?.length && b.target_symbols?.length) {
+                const symbolsA = new Set(a.target_symbols);
+                if (!b.target_symbols.some(s => symbolsA.has(s))) {
+                    // Different symbols, same category — not a real conflict
+                    // (skip returning true, fall through to remaining checks)
+                }
+                else {
+                    return true;
+                }
+            }
+            else {
+                return true;
+            }
+        }
+    }
+    // Normal and strict: check directory overlap threshold
+    if (directoriesOverlap(a.files, b.files, sensitivity === 'strict' ? DIRECTORY_OVERLAP_STRICT : DIRECTORY_OVERLAP_NORMAL)) {
+        return true;
+    }
+    // Normal and strict: import-chain conflict (dependency graph)
+    if (options.edges && hasImportChainConflict(a.files, b.files, options.edges)) {
+        return true;
+    }
+    // Normal and strict: call-graph conflict (cross-file caller→callee)
+    if (options.callEdges && a.target_symbols?.length && b.target_symbols?.length) {
+        if (hasCallGraphConflict(a.target_symbols, b.target_symbols, options.callEdges)) {
+            return true;
+        }
+    }
+    // Strict only: same package in monorepo
+    if (sensitivity === 'strict' && touchesSamePackage(a.files, b.files)) {
+        return true;
+    }
+    // Strict only: shared parent directory
+    if (sensitivity === 'strict' && hasSharedParentConflict(a.files, b.files)) {
+        return true;
+    }
+    return false;
+}
+/**
+ * Partition proposals into conflict-free waves.
+ * Proposals with overlapping file paths go into separate waves
+ * so they run sequentially, avoiding merge conflicts.
+ *
+ * Uses a greedy first-fit bin-packing algorithm.
+ *
+ * @param proposals - List of proposals with file paths
+ * @param options - Conflict detection options
+ * @returns Array of waves, each containing non-conflicting proposals
+ */
+export function partitionIntoWaves(proposals, options = {}) {
+    const waves = [];
+    for (const proposal of proposals) {
+        let placed = false;
+        for (const wave of waves) {
+            const conflicts = wave.some(existing => proposalsConflict(existing, proposal, options));
+            if (!conflicts) {
+                wave.push(proposal);
+                placed = true;
+                break;
+            }
+        }
+        if (!placed) {
+            waves.push([proposal]);
+        }
+    }
+    return waves;
+}
+//# sourceMappingURL=conflict.js.map

package/dist/waves/conflict.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict.js","sourceRoot":"","sources":["../../src/waves/conflict.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAkCH,8EAA8E;AAC9E,YAAY;AACZ,8EAA8E;AAE9E;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAC;IAC9C,UAAU;IACV,WAAW;IACX,UAAU;IACV,WAAW;IACX,WAAW;IACX,WAAW;IACX,QAAQ,EAAY,kBAAkB;IACtC,QAAQ;IACR,cAAc;IACd,eAAe;IACf,gBAAgB;IAChB,kBAAkB;IAClB,gBAAgB;IAChB,gBAAgB;IAChB,cAAc;IACd,gBAAgB;IAChB,kBAAkB;IAClB,mBAAmB;IACnB,aAAa,EAAO,SAAS;IAC7B,YAAY,EAAQ,OAAO;IAC3B,QAAQ,EAAY,KAAK;IACzB,cAAc,EAAM,cAAc;IAClC,SAAS,EAAW,QAAQ;IAC5B,SAAS,EAAW,OAAO;IAC3B,SAAS,EAAW,SAAS;IAC7B,eAAe,EAAK,QAAQ;IAC5B,cAAc,EAAM,eAAe;IACnC,WAAW,EAAS,QAAQ;IAC5B,YAAY,EAAQ,UAAU;IAC9B,WAAW,EAAS,MAAM;IAC1B,gBAAgB,EAAI,QAAQ;CAC7B,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,YAAY;IACZ,YAAY;IACZ,WAAW;IACX,aAAa;IACb,SAAS;IACT,WAAW;IACX,gBAAgB;IAChB,eAAe;IACf,YAAY;CACb,CAAC;AAEF,6CAA6C;AAC7C,MAAM,CAAC,MAAM,eAAe,GAAG,wCAAwC,CAAC;AAExE,2DAA2D;AAC3D,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,CAAC;AAE5C,2DAA2D;AAC3D,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,CAAC;AAE5C,8EAA8E;AAC9E,eAAe;AACf,8EAA8E;AAE9E,sDAAsD;AACtD,MAAM,UAAU,SAAS,CAAC,QAAgB;IACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;QACrB,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IAC5C,CAAC;IACD,OAAO;QACL,GAAG,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC;QACnC,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC;KAC1C,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,KAAa,EAAE,KAAa;IACvD,6DAA6D;IAC7D,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAE5D,cAAc;IACd,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iDAAiD;IACjD,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,kCAAkC;IAClC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAErC,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAErD,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;YACtF,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAgB,EAAE,MAAgB,EAAE,SAAS,GAAG,GAAG;IACpF,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACvD,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,CAAC,EAAE,CAAC;IAAC,CAAC;IACjD,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,SAAS,CAAC;AAC7D,CAAC;AAED,8EAA8E;AAC9E,6BAA6B;AAC7B,8EAA8E;AAE9E,qEAAqE;AACrE,MAAM,UAAU,mBAAmB,CAAC,QAAgB;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACzC,OAAO,wBAAwB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAChD,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,mBAAmB,CAAC,QAAgB;IAClD,OAAO,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,wFAAwF;AACxF,MAAM,UAAU,cAAc,CAAC,KAAe;IAC5C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,kEAAkE;QAClE,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,MAAgB,EAAE,MAAgB;IAChE,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAEzD,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,uBAAuB,CAAC,MAAgB,EAAE,MAAgB;IACxE,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAEzD,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QAC1C,IAAI,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrC,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAC,MAAgB,EAAE,MAAgB;IACxE,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAErC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,mBAAmB,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC;YACrD,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAgB,EAAE,MAAgB;IACnE,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC1C,IAAI,KAAK;YAAE,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC1C,IAAI,KAAK;YAAE,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;IACtC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,8EAA8E;AAC9E,0BAA0B;AAC1B,8EAA8E;AAE9E;;;GAGG;AACH,SAAS,cAAc,CAAC,KAAe,EAAE,KAA+B;IACtE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3C,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9C,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;gBACvB,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACpB,MAAM,CAAC,sBAAsB;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CACpC,MAAgB,EAChB,MAAgB,EAChB,KAA+B;IAE/B,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC5C,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAEvD,sDAAsD;IACtD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,IAAI,EAAE,CAAC;YACT,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;oBAAE,OAAO,IAAI,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IACD,8DAA8D;IAC9D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,IAAI,EAAE,CAAC;YACT,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;oBAAE,OAAO,IAAI,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAAkB,EAClB,QAAkB,EAClB,SAAqB;IAErB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACjE,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,yBAAyB;QACzB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAChD,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YACrD,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB,CAC/B,CAAI,EACJ,CAAI,EACJ,UAAoC,EAAE;IAEtC,MAAM,EAAE,WAAW,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE3C,sEAAsE;IACtE,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACpF,IAAI,cAAc,EAAE,CAAC;QACnB,uEAAuE;QACvE,uEAAuE;QACvE,IAAI,CAAC,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;YACzD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;YAC3C,MAAM,gBAAgB,GAAG,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACrE,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,uDAAuD;gBACvD,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,2DAA2D;IAC3D,IAAI,eAAe,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,sDAAsD;QACtD,IAAI,uBAAuB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC1D,8DAA8D;YAC9D,IAAI,CAAC,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;gBACzD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;gBAC3C,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACjD,yDAAyD;oBACzD,0DAA0D;gBAC5D,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAED,uDAAuD;IACvD,IAAI,kBAAkB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,wBAAwB,CAAC,EAAE,CAAC;QACzH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,8DAA8D;IAC9D,IAAI,OAAO,CAAC,KAAK,IAAI,sBAAsB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oEAAoE;IACpE,IAAI,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;QAC9E,IAAI,oBAAoB,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,cAAc,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAChF,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,wCAAwC;IACxC,IAAI,WAAW,KAAK,QAAQ,IAAI,kBAAkB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uCAAuC;IACvC,IAAI,WAAW,KAAK,QAAQ,IAAI,uBAAuB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,kBAAkB,CAChC,SAAc,EACd,UAAoC,EAAE;IAEtC,MAAM,KAAK,GAAU,EAAE,CAAC;IAExB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;YACxF,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACpB,MAAM,GAAG,IAAI,CAAC;gBACd,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/waves/merge.d.ts

@@ -0,0 +1,75 @@
+/**
+ * Merge resolution and symbol enrichment — pure functions for AST-aware
+ * merge conflict prediction, structural merge, and scout escalation.
+ *
+ * No filesystem, git, or child_process I/O.
+ */
+import type { CodebaseIndex, SymbolRange } from '../codebase-index/shared.js';
+import type { SectorState } from '../sectors/shared.js';
+/**
+ * Map from relative file path to its top-level symbols.
+ * Typically loaded from the AST cache.
+ */
+export type SymbolMap = Record<string, SymbolRange[]>;
+/**
+ * Enrich proposals with target_symbols from a pre-loaded AST symbol map.
+ *
+ * For each proposal that lacks target_symbols, looks up its files in the
+ * symbol map and collects all symbol names. This makes symbol-aware conflict
+ * detection work automatically without relying on scout LLM compliance.
+ *
+ * Only sets target_symbols when ALL of a proposal's files have symbol data.
+ * If any file is missing from the map, we leave target_symbols unset so
+ * conflict detection falls back to the conservative path-based check.
+ *
+ * Mutates proposals in place for efficiency.
+ */
+export declare function enrichWithSymbols<T extends {
+    files: string[];
+    target_symbols?: string[];
+}>(proposals: T[], symbolMap: SymbolMap): void;
+/**
+ * Predict whether merging two sets of file changes will conflict,
+ * based on symbol-level line ranges.
+ *
+ * For each file both branches modified, checks if the modified symbol ranges
+ * overlap. Returns:
+ * - 'safe'    — all shared files have disjoint symbol ranges (merge likely succeeds)
+ * - 'risky'   — at least one shared file has overlapping symbol ranges (merge may conflict)
+ * - 'unknown' — symbol data missing for one or more shared files (can't predict)
+ */
+export declare function predictMergeConflict(filesA: string[], filesB: string[], symbolsA: Record<string, string[]>, symbolsB: Record<string, string[]>, symbolMap: SymbolMap): 'safe' | 'risky' | 'unknown';
+/**
+ * Reorder a list of ticket branches for merge, placing "safe" merges first
+ * and "risky" ones last. This minimizes the chance of early merge failures
+ * blocking later safe merges.
+ *
+ * Takes already-merged files (from the milestone) and each candidate's files+symbols.
+ * Returns indices sorted from safest to riskiest.
+ */
+export declare function orderMergeSequence(candidates: Array<{
+    files: string[];
+    targetSymbols: Record<string, string[]>;
+}>, symbolMap: SymbolMap): number[];
+/**
+ * Build escalation prompt text for scout retries.
+ * Suggests unexplored modules and fresh angles when previous attempts found nothing.
+ */
+export declare function buildScoutEscalation(retryCount: number, scoutedDirs: string[], codebaseIndex: CodebaseIndex | null, sectorState?: SectorState): string;
+/**
+ * Attempt to structurally resolve a merge conflict for a single file.
+ *
+ * Given three versions (base, ours, theirs) and symbol ranges for each,
+ * splits each version into symbol-aligned blocks. If modifications from
+ * "ours" and "theirs" affect disjoint symbols, produces a resolved version
+ * that includes both sets of changes.
+ *
+ * Returns the resolved content as a string, or null if:
+ * - Symbol data is unavailable for any version
+ * - Both sides modified the same symbol (true conflict)
+ * - Block structure doesn't align across versions (structural shift)
+ *
+ * Conservative by design: returns null on any ambiguity.
+ */
+export declare function tryStructuralMerge(baseContent: string, oursContent: string, theirsContent: string, baseSymbols: SymbolRange[], oursSymbols: SymbolRange[], theirsSymbols: SymbolRange[]): string | null;
+//# sourceMappingURL=merge.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/waves/merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAMxD;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;AAEtD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,EACxF,SAAS,EAAE,CAAC,EAAE,EACd,SAAS,EAAE,SAAS,GACnB,IAAI,CA6BN;AAMD;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EAAE,EAChB,MAAM,EAAE,MAAM,EAAE,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAClC,SAAS,EAAE,SAAS,GACnB,MAAM,GAAG,OAAO,GAAG,SAAS,CA6C9B;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,KAAK,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACzC,CAAC,EACF,SAAS,EAAE,SAAS,GACnB,MAAM,EAAE,CAmBV;AAMD;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EAAE,EACrB,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,WAAW,CAAC,EAAE,WAAW,GACxB,MAAM,CAsDR;AAwFD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,WAAW,EAAE,EAC1B,WAAW,EAAE,WAAW,EAAE,EAC1B,aAAa,EAAE,WAAW,EAAE,GAC3B,MAAM,GAAG,IAAI,CAiDf"}