@promptwheel/core 0.7.22 → 0.7.34

package/dist/waves/merge.js

@@ -0,0 +1,305 @@
+/**
+ * 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.
+ */
+/**
+ * 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 function enrichWithSymbols(proposals, symbolMap) {
+    for (const p of proposals) {
+        // Don't overwrite scout-provided symbols
+        if (p.target_symbols?.length)
+            continue;
+        if (p.files.length === 0)
+            continue;
+        // Only concrete file paths (no globs)
+        const concreteFiles = p.files.filter(f => !f.includes('*'));
+        if (concreteFiles.length === 0)
+            continue;
+        // All files must have symbol data for the enrichment to be reliable
+        const allSymbols = [];
+        let allResolved = true;
+        for (const file of concreteFiles) {
+            const symbols = symbolMap[file];
+            if (!symbols) {
+                allResolved = false;
+                break;
+            }
+            for (const s of symbols) {
+                allSymbols.push(s.name);
+            }
+        }
+        if (allResolved && allSymbols.length > 0) {
+            // Deduplicate
+            p.target_symbols = [...new Set(allSymbols)];
+        }
+    }
+}
+// ---------------------------------------------------------------------------
+// Pre-merge conflict prediction
+// ---------------------------------------------------------------------------
+/**
+ * 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 function predictMergeConflict(filesA, filesB, symbolsA, symbolsB, symbolMap) {
+    const setB = new Set(filesB);
+    const sharedFiles = filesA.filter(f => setB.has(f));
+    if (sharedFiles.length === 0)
+        return 'safe';
+    for (const file of sharedFiles) {
+        const fileSymbols = symbolMap[file];
+        const symsA = symbolsA[file];
+        const symsB = symbolsB[file];
+        // If we don't have symbol data for a shared file, can't predict
+        if (!fileSymbols?.length || !symsA?.length || !symsB?.length)
+            return 'unknown';
+        // Build a map of symbol name → line range for quick lookup
+        const rangeByName = new Map(fileSymbols.map(s => [s.name, s]));
+        // Check if any symbol is modified by both branches
+        for (const symName of symsA) {
+            if (!symsB.includes(symName))
+                continue;
+            // Same symbol modified by both branches — check line range overlap
+            const range = rangeByName.get(symName);
+            if (range) {
+                // Both branches touch the same symbol → likely conflict
+                return 'risky';
+            }
+        }
+        // Even if no named symbol overlaps, check if any line ranges overlap
+        // by matching unnamed modifications
+        const rangesA = symsA.map(s => rangeByName.get(s)).filter(Boolean);
+        const rangesB = symsB.map(s => rangeByName.get(s)).filter(Boolean);
+        for (const ra of rangesA) {
+            for (const rb of rangesB) {
+                // Line range overlap check
+                if (ra.startLine <= rb.endLine && rb.startLine <= ra.endLine) {
+                    return 'risky';
+                }
+            }
+        }
+    }
+    return 'safe';
+}
+/**
+ * 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 function orderMergeSequence(candidates, symbolMap) {
+    // Score each candidate: count how many other candidates it conflicts with
+    const scores = candidates.map((c, i) => {
+        let riskyCount = 0;
+        for (let j = 0; j < candidates.length; j++) {
+            if (i === j)
+                continue;
+            const prediction = predictMergeConflict(c.files, candidates[j].files, c.targetSymbols, candidates[j].targetSymbols, symbolMap);
+            if (prediction === 'risky')
+                riskyCount++;
+        }
+        return { index: i, riskyCount };
+    });
+    // Sort: fewest conflicts first (safest merges go first)
+    scores.sort((a, b) => a.riskyCount - b.riskyCount);
+    return scores.map(s => s.index);
+}
+// ---------------------------------------------------------------------------
+// Scout escalation
+// ---------------------------------------------------------------------------
+/**
+ * Build escalation prompt text for scout retries.
+ * Suggests unexplored modules and fresh angles when previous attempts found nothing.
+ */
+export function buildScoutEscalation(retryCount, scoutedDirs, codebaseIndex, sectorState) {
+    const parts = [
+        '## Previous Attempts Found Nothing — Fresh Approach Required',
+        '',
+    ];
+    if (scoutedDirs.length > 0) {
+        parts.push('### What Was Already Tried');
+        for (const dir of scoutedDirs) {
+            parts.push(`- Scouted \`${dir}\``);
+        }
+        parts.push('');
+    }
+    // Suggest unexplored modules from codebase index
+    const exploredSet = new Set(scoutedDirs.map(d => d.replace(/\/$/, '')));
+    const unexplored = [];
+    if (codebaseIndex) {
+        for (const mod of codebaseIndex.modules) {
+            if (!exploredSet.has(mod.path) && !exploredSet.has(mod.path + '/')) {
+                unexplored.push(mod.path);
+            }
+        }
+    }
+    // Sort unexplored by sector history when available
+    if (sectorState && unexplored.length > 0) {
+        const sectorByPath = new Map(sectorState.sectors.map(s => [s.path, s]));
+        unexplored.sort((a, b) => {
+            const sa = sectorByPath.get(a);
+            const sb = sectorByPath.get(b);
+            // Fewer scans first
+            const scanA = sa?.scanCount ?? 0;
+            const scanB = sb?.scanCount ?? 0;
+            if (scanA !== scanB)
+                return scanA - scanB;
+            // Higher yield first
+            const yieldA = sa?.proposalYield ?? 0;
+            const yieldB = sb?.proposalYield ?? 0;
+            return yieldB - yieldA;
+        });
+    }
+    parts.push('### What to Do Differently');
+    parts.push('');
+    parts.push('Knowing everything from the attempts above, take a completely different angle:');
+    parts.push('- Do NOT re-read the directories listed above.');
+    if (unexplored.length > 0) {
+        parts.push(`- Try unexplored areas: ${unexplored.slice(0, 8).map(d => `\`${d}\``).join(', ')}`);
+    }
+    parts.push('- Switch categories: if you looked for bugs, look for tests. If tests, try security.');
+    parts.push('- Read at least 15 NEW source files.');
+    parts.push('- If genuinely nothing to improve, explain your analysis across all attempts.');
+    return parts.join('\n');
+}
+/**
+ * Split file content into symbol-aligned blocks using SymbolRange data.
+ * Produces a sequence of blocks covering the entire file: inter-symbol gaps
+ * are their own blocks (symbol=null), and each symbol gets its own block.
+ *
+ * SymbolRanges use 1-based line numbers; this function converts to 0-based
+ * for array indexing.
+ */
+function splitIntoBlocks(lines, symbols) {
+    const blocks = [];
+    // Sort symbols by start line
+    const sorted = [...symbols].sort((a, b) => a.startLine - b.startLine);
+    let cursor = 0; // 0-based current line
+    for (const sym of sorted) {
+        const symStart = sym.startLine - 1; // convert 1-based to 0-based
+        const symEnd = sym.endLine; // 1-based endLine → 0-based exclusive
+        // Gap before this symbol
+        if (cursor < symStart) {
+            blocks.push({
+                symbol: null,
+                startLine: cursor,
+                endLine: symStart,
+                lines: lines.slice(cursor, symStart),
+            });
+        }
+        // The symbol block
+        const effectiveStart = Math.max(cursor, symStart);
+        const effectiveEnd = Math.min(symEnd, lines.length);
+        blocks.push({
+            symbol: sym.name,
+            startLine: effectiveStart,
+            endLine: effectiveEnd,
+            lines: lines.slice(effectiveStart, effectiveEnd),
+        });
+        cursor = effectiveEnd;
+    }
+    // Trailing gap after last symbol
+    if (cursor < lines.length) {
+        blocks.push({
+            symbol: null,
+            startLine: cursor,
+            endLine: lines.length,
+            lines: lines.slice(cursor),
+        });
+    }
+    return blocks;
+}
+/**
+ * Check if two arrays of strings are identical.
+ */
+function linesEqual(a, b) {
+    if (a.length !== b.length)
+        return false;
+    for (let i = 0; i < a.length; i++) {
+        if (a[i] !== b[i])
+            return false;
+    }
+    return true;
+}
+/**
+ * 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 function tryStructuralMerge(baseContent, oursContent, theirsContent, baseSymbols, oursSymbols, theirsSymbols) {
+    if (!baseSymbols.length || !oursSymbols.length || !theirsSymbols.length) {
+        return null;
+    }
+    const baseLines = baseContent.split('\n');
+    const oursLines = oursContent.split('\n');
+    const theirsLines = theirsContent.split('\n');
+    const baseBlocks = splitIntoBlocks(baseLines, baseSymbols);
+    const oursBlocks = splitIntoBlocks(oursLines, oursSymbols);
+    const theirsBlocks = splitIntoBlocks(theirsLines, theirsSymbols);
+    // Block counts must match — structural shifts (added/removed symbols) are too risky
+    if (baseBlocks.length !== oursBlocks.length || baseBlocks.length !== theirsBlocks.length) {
+        return null;
+    }
+    // Symbol names must match in order — reordered symbols are too risky
+    for (let i = 0; i < baseBlocks.length; i++) {
+        if (baseBlocks[i].symbol !== oursBlocks[i].symbol || baseBlocks[i].symbol !== theirsBlocks[i].symbol) {
+            return null;
+        }
+    }
+    // For each block, determine which side(s) modified it
+    const resolvedLines = [];
+    for (let i = 0; i < baseBlocks.length; i++) {
+        const base = baseBlocks[i].lines;
+        const ours = oursBlocks[i].lines;
+        const theirs = theirsBlocks[i].lines;
+        const oursChanged = !linesEqual(base, ours);
+        const theirsChanged = !linesEqual(base, theirs);
+        if (oursChanged && theirsChanged) {
+            // Both sides modified the same block — true conflict, bail out
+            return null;
+        }
+        else if (oursChanged) {
+            resolvedLines.push(...ours);
+        }
+        else if (theirsChanged) {
+            resolvedLines.push(...theirs);
+        }
+        else {
+            // Neither side changed — use base
+            resolvedLines.push(...base);
+        }
+    }
+    return resolvedLines.join('\n');
+}
+//# sourceMappingURL=merge.js.map

package/dist/waves/merge.js.map

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

package/dist/waves/shared.d.ts

@@ -1,106 +1,10 @@
 /**
- * Wave scheduling shared algorithms — pure functions for conflict-free
- * parallel execution partitioning.
+ * Wave scheduling shared algorithms — barrel re-export.
  *
- * Detects potential merge conflicts between proposals based on file paths,
- * sibling files, shared directories, monorepo packages, and conflict-prone
- * hub files (index.ts, configs, etc.).
- *
- * No filesystem, git, or child_process I/O.
- */
-import type { CodebaseIndex } from '../codebase-index/shared.js';
-import type { SectorState } from '../sectors/shared.js';
-export type ConflictSensitivity = 'strict' | 'normal' | 'relaxed';
-export interface ConflictDetectionOptions {
-    /**
-     * Sensitivity level:
-     * - 'strict': Any shared directory or package = conflict (safest, most sequential)
-     * - 'normal': Sibling files + conflict-prone files + shared dirs (balanced)
-     * - 'relaxed': Only direct file overlap + glob overlap (most parallel, riskier)
-     */
-    sensitivity?: ConflictSensitivity;
-}
-/**
- * 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 declare const CONFLICT_PRONE_FILENAMES: Set<string>;
-/**
- * Directory patterns that indicate shared/common code.
- * Files in these directories are more likely to be touched by multiple tickets.
- */
-export declare const SHARED_DIRECTORY_PATTERNS: RegExp[];
-/** Monorepo top-level directory patterns. */
-export declare const PACKAGE_PATTERN: RegExp;
-/** Default directory overlap threshold for normal mode. */
-export declare const DIRECTORY_OVERLAP_NORMAL = 0.3;
-/** Default directory overlap threshold for strict mode. */
-export declare const DIRECTORY_OVERLAP_STRICT = 0.2;
-/** Extract the directory and filename from a path. */
-export declare function parsePath(filePath: string): {
-    dir: string;
-    filename: string;
-};
-/**
- * Check if two file paths overlap: exact match, directory containment,
- * or glob pattern overlap.
- */
-export declare function pathsOverlap(pathA: string, pathB: string): boolean;
-/**
- * Check if two sets of file paths share directories above a threshold.
- * Used for semantic conflict detection in wave scheduling.
- */
-export declare function directoriesOverlap(pathsA: string[], pathsB: string[], threshold?: number): boolean;
-/** Check if a file is conflict-prone (index files, configs, etc.) */
-export declare function isConflictProneFile(filePath: string): boolean;
-/** Check if a path is in a shared/common directory. */
-export declare function isInSharedDirectory(filePath: string): boolean;
-/** Get all unique directories from a list of file paths, including parent hierarchy. */
-export declare function getDirectories(files: string[]): Set<string>;
-/**
- * Check if two proposals have sibling files (different files in the same directory).
- */
-export declare function hasSiblingFiles(filesA: string[], filesB: string[]): boolean;
-/**
- * Check if either proposal touches conflict-prone files in overlapping directories.
- */
-export declare function hasConflictProneOverlap(filesA: string[], filesB: string[]): boolean;
-/**
- * Check if proposals share a common parent directory that might have
- * configuration or index files affected by both changes.
- */
-export declare function hasSharedParentConflict(filesA: string[], filesB: string[]): boolean;
-/**
- * Monorepo-aware: check if both proposals touch the same package.
- * Common patterns: packages/*, apps/*, libs/*, modules/*
- */
-export declare function touchesSamePackage(filesA: string[], filesB: string[]): boolean;
-/**
- * Check if two proposals have a potential conflict based on their file lists.
- */
-export declare function proposalsConflict<T extends {
-    files: string[];
-    category?: string;
-}>(a: T, b: T, options?: ConflictDetectionOptions): boolean;
-/**
- * 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 declare function partitionIntoWaves<T extends {
-    files: string[];
-    category?: string;
-}>(proposals: T[], options?: ConflictDetectionOptions): T[][];
-/**
- * Build escalation prompt text for scout retries.
- * Suggests unexplored modules and fresh angles when previous attempts found nothing.
+ * All implementations live in focused submodules:
+ * - conflict.ts — conflict detection, path helpers, wave partitioning
+ * - merge.ts — symbol enrichment, merge prediction, structural merge, scout escalation
  */
-export declare function buildScoutEscalation(retryCount: number, scoutedDirs: string[], codebaseIndex: CodebaseIndex | null, sectorState?: SectorState): string;
+export { type ConflictSensitivity, type ConflictDetectionOptions, CONFLICT_PRONE_FILENAMES, SHARED_DIRECTORY_PATTERNS, PACKAGE_PATTERN, DIRECTORY_OVERLAP_NORMAL, DIRECTORY_OVERLAP_STRICT, parsePath, pathsOverlap, directoriesOverlap, isConflictProneFile, isInSharedDirectory, getDirectories, hasSiblingFiles, hasConflictProneOverlap, hasSharedParentConflict, touchesSamePackage, hasImportChainConflict, hasCallGraphConflict, proposalsConflict, partitionIntoWaves, } from './conflict.js';
+export { type SymbolMap, enrichWithSymbols, predictMergeConflict, orderMergeSequence, buildScoutEscalation, tryStructuralMerge, } from './merge.js';
 //# sourceMappingURL=shared.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/waves/shared.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAMxD,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAElE,MAAM,WAAW,wBAAwB;IACvC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACnC;AAMD;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,aAgCnC,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,yBAAyB,UAUrC,CAAC;AAEF,6CAA6C;AAC7C,eAAO,MAAM,eAAe,QAA2C,CAAC;AAExE,2DAA2D;AAC3D,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAE5C,2DAA2D;AAC3D,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAM5C,sDAAsD;AACtD,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAU7E;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CA6BlE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,SAAS,SAAM,GAAG,OAAO,CAO/F;AAMD,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAG7D;AAED,uDAAuD;AACvD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,wFAAwF;AACxF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAY3D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU3E;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAanF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAUnF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAkB9E;AAMD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,EAChF,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,OAAO,GAAE,wBAA6B,GACrC,OAAO,CA0CT;AAMD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,EACjF,SAAS,EAAE,CAAC,EAAE,EACd,OAAO,GAAE,wBAA6B,GACrC,CAAC,EAAE,EAAE,CAmBP;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"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/waves/shared.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAG7B,wBAAwB,EACxB,yBAAyB,EACzB,eAAe,EACf,wBAAwB,EACxB,wBAAwB,EAGxB,SAAS,EACT,YAAY,EACZ,kBAAkB,EAGlB,mBAAmB,EACnB,mBAAmB,EACnB,cAAc,EACd,eAAe,EACf,uBAAuB,EACvB,uBAAuB,EACvB,kBAAkB,EAGlB,sBAAsB,EACtB,oBAAoB,EACpB,iBAAiB,EAGjB,kBAAkB,GACnB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAEL,KAAK,SAAS,EACd,iBAAiB,EAGjB,oBAAoB,EACpB,kBAAkB,EAGlB,oBAAoB,EAGpB,kBAAkB,GACnB,MAAM,YAAY,CAAC"}