specweave 0.18.0 → 0.20.0

package/dist/src/core/increment/active-increment-manager.d.ts

@@ -14,9 +14,15 @@
  */
 /**
  * Active increment state stored in .specweave/state/active-increment.json
+ *
+ * **UPGRADED**: Now supports MULTIPLE active increments (up to 2)
+ * - One regular feature increment
+ * - One hotfix/bug increment (optional)
  */
 export interface ActiveIncrementState {
-    id: string | null;
+    ids: string[];
+    id?: string | null;
+    lastUpdated: string;
 }
 /**
  * Active Increment Manager
@@ -28,22 +34,43 @@ export declare class ActiveIncrementManager {
     private stateFile;
     constructor(rootDir?: string);
     /**
-     * Get the currently active increment ID
-     * Returns null if no increment is active
+     * Get all currently active increment IDs
+     * Returns empty array if no increments are active
+     *
+     * **NEW**: Returns array of ALL active increments (max 2)
+     */
+    getActive(): string[];
+    /**
+     * Get the primary active increment (first in list)
+     * Returns null if no increments are active
+     *
+     * This maintains backwards compatibility with code expecting a single ID
      */
-    getActive(): string | null;
+    getPrimary(): string | null;
     /**
-     * Set the active increment
+     * Add an increment to the active list
      * Validates that the increment exists and is actually active
+     *
+     * **NEW**: Adds to list instead of replacing (max 2)
+     * @param skipValidation - Skip validation (used during lazy initialization to prevent circular dependency)
+     */
+    addActive(incrementId: string, skipValidation?: boolean): void;
+    /**
+     * Remove an increment from the active list
+     */
+    removeActive(incrementId: string): void;
+    /**
+     * Set the active increment (legacy method for backwards compatibility)
+     * Now delegates to addActive()
+     * @param skipValidation - Skip validation (used during lazy initialization to prevent circular dependency)
      */
-    setActive(incrementId: string): void;
+    setActive(incrementId: string, skipValidation?: boolean): void;
     /**
-     * Clear the active increment (no increment is active)
+     * Clear all active increments
      */
     clearActive(): void;
     /**
-     * Smart update: Set active increment to next available active increment,
-     * or clear if none are active.
+     * Smart update: Rebuild active list from metadata
      *
      * This is called when:
      * - An increment is completed
@@ -51,16 +78,16 @@ export declare class ActiveIncrementManager {
      * - An increment is abandoned
      *
      * Logic:
-     * 1. Get all active increments
-     * 2. If any exist, set the first one as active
-     * 3. Otherwise, clear active state
+     * 1. Scan all increments for status=active
+     * 2. Update cache to match reality
+     * 3. Max 2 increments (sorted by lastActivity)
      */
     smartUpdate(): void;
     /**
-     * Validate that the active increment pointer is correct
-     * Fixes stale pointers automatically
+     * Validate that all active increment pointers are correct
+     * Does NOT fix stale pointers - caller should call smartUpdate() if needed
      *
-     * Returns true if valid/fixed, false if invalid and couldn't fix
+     * Returns true if all valid, false if any invalid
      */
     validate(): boolean;
     /**

package/dist/src/core/increment/active-increment-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"active-increment-manager.d.ts","sourceRoot":"","sources":["../../../../src/core/increment/active-increment-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAOH;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CACnB;AAED;;;;GAIG;AACH,qBAAa,sBAAsB;IAGrB,OAAO,CAAC,OAAO;IAF3B,OAAO,CAAC,SAAS,CAAS;gBAEN,OAAO,GAAE,MAAsB;IAInD;;;OAGG;IACH,SAAS,IAAI,MAAM,GAAG,IAAI;IAgB1B;;;OAGG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAgBpC;;OAEG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;;;;;;;;OAaG;IACH,WAAW,IAAI,IAAI;IAanB;;;;;OAKG;IACH,QAAQ,IAAI,OAAO;IA+BnB;;OAEG;IACH,OAAO,CAAC,UAAU;IAalB;;OAEG;IACH,gBAAgB,IAAI,MAAM;IAI1B;;OAEG;IACH,MAAM,IAAI,OAAO;CAGlB"}
+{"version":3,"file":"active-increment-manager.d.ts","sourceRoot":"","sources":["../../../../src/core/increment/active-increment-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAOH;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IAEnC,GAAG,EAAE,MAAM,EAAE,CAAC;IAGd,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAGnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,qBAAa,sBAAsB;IAGrB,OAAO,CAAC,OAAO;IAF3B,OAAO,CAAC,SAAS,CAAS;gBAEN,OAAO,GAAE,MAAsB;IAInD;;;;;OAKG;IACH,SAAS,IAAI,MAAM,EAAE;IAqBrB;;;;;OAKG;IACH,UAAU,IAAI,MAAM,GAAG,IAAI;IAK3B;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,GAAE,OAAe,GAAG,IAAI;IAgCrE;;OAEG;IACH,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAWvC;;;;OAIG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,GAAE,OAAe,GAAG,IAAI;IAIrE;;OAEG;IACH,WAAW,IAAI,IAAI;IAQnB;;;;;;;;;;;;OAYG;IACH,WAAW,IAAI,IAAI;IAyBnB;;;;;OAKG;IACH,QAAQ,IAAI,OAAO;IAmCnB;;OAEG;IACH,OAAO,CAAC,UAAU;IAalB;;OAEG;IACH,gBAAgB,IAAI,MAAM;IAI1B;;OAEG;IACH,MAAM,IAAI,OAAO;CAGlB"}

package/dist/src/core/increment/active-increment-manager.js

@@ -27,48 +27,102 @@ export class ActiveIncrementManager {
         this.stateFile = path.join(rootDir, '.specweave/state/active-increment.json');
     }
     /**
-     * Get the currently active increment ID
-     * Returns null if no increment is active
+     * Get all currently active increment IDs
+     * Returns empty array if no increments are active
+     *
+     * **NEW**: Returns array of ALL active increments (max 2)
      */
     getActive() {
         try {
             if (!fs.existsSync(this.stateFile)) {
-                return null;
+                return [];
             }
             const content = fs.readFileSync(this.stateFile, 'utf-8');
             const state = JSON.parse(content);
-            return state.id || null;
+            // Backwards compatibility: Support old format
+            if (state.id && !state.ids) {
+                return [state.id];
+            }
+            return state.ids || [];
         }
         catch (error) {
-            // File read/parse error = no active increment
-            return null;
+            // File read/parse error = no active increments
+            return [];
         }
     }
     /**
-     * Set the active increment
+     * Get the primary active increment (first in list)
+     * Returns null if no increments are active
+     *
+     * This maintains backwards compatibility with code expecting a single ID
+     */
+    getPrimary() {
+        const active = this.getActive();
+        return active.length > 0 ? active[0] : null;
+    }
+    /**
+     * Add an increment to the active list
      * Validates that the increment exists and is actually active
+     *
+     * **NEW**: Adds to list instead of replacing (max 2)
+     * @param skipValidation - Skip validation (used during lazy initialization to prevent circular dependency)
      */
-    setActive(incrementId) {
-        // Validate increment exists
-        const metadata = MetadataManager.read(incrementId);
-        // Validate increment is actually active
-        if (metadata.status !== IncrementStatus.ACTIVE) {
-            throw new Error(`Cannot set ${incrementId} as active: status is ${metadata.status}, not active`);
+    addActive(incrementId, skipValidation = false) {
+        // Validate increment exists and is active (unless skipValidation is true)
+        if (!skipValidation) {
+            const metadata = MetadataManager.read(incrementId);
+            // Validate increment is actually active
+            if (metadata.status !== IncrementStatus.ACTIVE) {
+                throw new Error(`Cannot add ${incrementId} as active: status is ${metadata.status}, not active`);
+            }
+        }
+        // Get current active list
+        const currentActive = this.getActive();
+        // Don't add if already in list
+        if (currentActive.includes(incrementId)) {
+            return;
         }
-        // Write state file atomically
-        const state = { id: incrementId };
+        // Add to list (max 2)
+        const newActive = [...currentActive, incrementId].slice(0, 2);
+        // Write state
+        const state = {
+            ids: newActive,
+            lastUpdated: new Date().toISOString()
+        };
         this.writeState(state);
     }
     /**
-     * Clear the active increment (no increment is active)
+     * Remove an increment from the active list
+     */
+    removeActive(incrementId) {
+        const currentActive = this.getActive();
+        const newActive = currentActive.filter(id => id !== incrementId);
+        const state = {
+            ids: newActive,
+            lastUpdated: new Date().toISOString()
+        };
+        this.writeState(state);
+    }
+    /**
+     * Set the active increment (legacy method for backwards compatibility)
+     * Now delegates to addActive()
+     * @param skipValidation - Skip validation (used during lazy initialization to prevent circular dependency)
+     */
+    setActive(incrementId, skipValidation = false) {
+        this.addActive(incrementId, skipValidation);
+    }
+    /**
+     * Clear all active increments
      */
     clearActive() {
-        const state = { id: null };
+        const state = {
+            ids: [],
+            lastUpdated: new Date().toISOString()
+        };
         this.writeState(state);
     }
     /**
-     * Smart update: Set active increment to next available active increment,
-     * or clear if none are active.
+     * Smart update: Rebuild active list from metadata
      *
      * This is called when:
      * - An increment is completed
@@ -76,16 +130,26 @@ export class ActiveIncrementManager {
      * - An increment is abandoned
      *
      * Logic:
-     * 1. Get all active increments
-     * 2. If any exist, set the first one as active
-     * 3. Otherwise, clear active state
+     * 1. Scan all increments for status=active
+     * 2. Update cache to match reality
+     * 3. Max 2 increments (sorted by lastActivity)
      */
     smartUpdate() {
         const activeIncrements = MetadataManager.getActive();
         if (activeIncrements.length > 0) {
-            // Set first active increment as the active one
-            // (Could be improved with "most recently active" logic)
-            this.setActive(activeIncrements[0].id);
+            // Sort by lastActivity (most recent first)
+            const sorted = activeIncrements.sort((a, b) => {
+                const aTime = new Date(a.lastActivity).getTime();
+                const bTime = new Date(b.lastActivity).getTime();
+                return bTime - aTime; // Descending
+            });
+            // Take max 2
+            const activeIds = sorted.slice(0, 2).map(m => m.id);
+            const state = {
+                ids: activeIds,
+                lastUpdated: new Date().toISOString()
+            };
+            this.writeState(state);
         }
         else {
             // No active increments
@@ -93,35 +157,38 @@ export class ActiveIncrementManager {
         }
     }
     /**
-     * Validate that the active increment pointer is correct
-     * Fixes stale pointers automatically
+     * Validate that all active increment pointers are correct
+     * Does NOT fix stale pointers - caller should call smartUpdate() if needed
      *
-     * Returns true if valid/fixed, false if invalid and couldn't fix
+     * Returns true if all valid, false if any invalid
      */
     validate() {
         const currentActive = this.getActive();
-        // No active increment = valid (nothing to validate)
-        if (currentActive === null) {
+        // No active increments = valid (nothing to validate)
+        if (currentActive.length === 0) {
             return true;
         }
-        try {
-            // Check if increment still exists
-            const metadata = MetadataManager.read(currentActive);
-            // Check if increment is actually active
-            if (metadata.status !== IncrementStatus.ACTIVE) {
-                // Stale pointer! Fix it automatically
-                console.warn(`⚠️  Active increment pointer is stale: ${currentActive} is ${metadata.status}`);
-                this.smartUpdate();
-                return false;
+        let hasStale = false;
+        for (const incrementId of currentActive) {
+            try {
+                // Check if increment still exists
+                const metadata = MetadataManager.read(incrementId);
+                // Check if increment is actually active
+                if (metadata.status !== IncrementStatus.ACTIVE) {
+                    // Stale pointer! Mark for fix
+                    console.warn(`⚠️  Active increment pointer is stale: ${incrementId} is ${metadata.status}`);
+                    hasStale = true;
+                }
+            }
+            catch (error) {
+                // Increment doesn't exist = stale pointer
+                console.warn(`⚠️  Active increment pointer is invalid: ${incrementId} not found`);
+                hasStale = true;
             }
-            return true;
-        }
-        catch (error) {
-            // Increment doesn't exist = stale pointer
-            console.warn(`⚠️  Active increment pointer is invalid: ${currentActive} not found`);
-            this.smartUpdate();
-            return false;
         }
+        // Return false if stale found, but DON'T auto-fix (prevents circular dependency)
+        // Caller should call smartUpdate() if needed
+        return !hasStale;
     }
     /**
      * Write state file atomically (temp file → rename)

package/dist/src/core/increment/active-increment-manager.js.map

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

package/dist/src/core/increment/conflict-resolver.d.ts

@@ -0,0 +1,40 @@
+/**
+ * Conflict Resolver - Merge content and resolve duplicate conflicts
+ *
+ * Provides utilities to merge valuable content from losing versions to winning version,
+ * and delete losing versions with user confirmation.
+ *
+ * Part of increment 0033: Duplicate Increment Prevention System
+ */
+import type { Duplicate, IncrementLocation } from './duplicate-detector.js';
+/**
+ * Options for conflict resolution
+ */
+export interface ResolveOptions {
+    dryRun?: boolean;
+    force?: boolean;
+    merge?: boolean;
+}
+/**
+ * Result of conflict resolution
+ */
+export interface ResolutionResult {
+    winner: string;
+    merged: string[];
+    deleted: string[];
+    reportPath: string;
+    dryRun: boolean;
+}
+/**
+ * Resolve conflict by merging winner + losers
+ */
+export declare function resolveConflict(duplicate: Duplicate, options?: ResolveOptions): Promise<ResolutionResult>;
+/**
+ * Merge content from losing versions into winner
+ */
+export declare function mergeContent(winner: IncrementLocation, losers: IncrementLocation[], options?: ResolveOptions): Promise<string[]>;
+/**
+ * Resolve multiple duplicates in batch
+ */
+export declare function resolveAllDuplicates(duplicates: Duplicate[], options?: ResolveOptions): Promise<ResolutionResult[]>;
+//# sourceMappingURL=conflict-resolver.d.ts.map

package/dist/src/core/increment/conflict-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-resolver.d.ts","sourceRoot":"","sources":["../../../../src/core/increment/conflict-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5E;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,SAAS,EACpB,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,gBAAgB,CAAC,CAmC3B;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,iBAAiB,EAAE,EAC3B,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,MAAM,EAAE,CAAC,CAiEnB;AAgHD;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,SAAS,EAAE,EACvB,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAa7B"}

package/dist/src/core/increment/conflict-resolver.js

@@ -0,0 +1,219 @@
+/**
+ * Conflict Resolver - Merge content and resolve duplicate conflicts
+ *
+ * Provides utilities to merge valuable content from losing versions to winning version,
+ * and delete losing versions with user confirmation.
+ *
+ * Part of increment 0033: Duplicate Increment Prevention System
+ */
+import fs from 'fs-extra';
+import * as path from 'path';
+/**
+ * Resolve conflict by merging winner + losers
+ */
+export async function resolveConflict(duplicate, options = {}) {
+    const winner = duplicate.recommendedWinner;
+    const losers = duplicate.losingVersions;
+    // Step 1: Merge valuable content from losers → winner (if merge enabled)
+    const mergedFiles = [];
+    if (options.merge) {
+        const merged = await mergeContent(winner, losers, options);
+        mergedFiles.push(...merged);
+    }
+    // Step 2: Create resolution report
+    const reportPath = await createResolutionReport(duplicate, mergedFiles, options);
+    // Step 3: Delete losing versions (if not dry-run)
+    const deletedPaths = [];
+    if (!options.dryRun) {
+        for (const loser of losers) {
+            if (options.force || await confirmDeletion(loser)) {
+                await fs.remove(loser.path);
+                deletedPaths.push(loser.path);
+            }
+        }
+    }
+    else {
+        // Dry-run: just record what would be deleted
+        deletedPaths.push(...losers.map(l => l.path));
+    }
+    return {
+        winner: winner.path,
+        merged: mergedFiles,
+        deleted: deletedPaths,
+        reportPath,
+        dryRun: options.dryRun || false
+    };
+}
+/**
+ * Merge content from losing versions into winner
+ */
+export async function mergeContent(winner, losers, options = {}) {
+    const mergedFiles = [];
+    for (const loser of losers) {
+        // Merge reports/ folder (preserve all reports)
+        const loserReportsDir = path.join(loser.path, 'reports');
+        if (await fs.pathExists(loserReportsDir)) {
+            const winnerReportsDir = path.join(winner.path, 'reports');
+            await fs.ensureDir(winnerReportsDir);
+            const reportFiles = await fs.readdir(loserReportsDir);
+            for (const file of reportFiles) {
+                const sourcePath = path.join(loserReportsDir, file);
+                const targetPath = path.join(winnerReportsDir, file);
+                // Skip if not a file
+                const stats = await fs.stat(sourcePath);
+                if (!stats.isFile())
+                    continue;
+                // Rename if file exists (add timestamp)
+                let finalPath = targetPath;
+                if (await fs.pathExists(targetPath)) {
+                    const ext = path.extname(file);
+                    const base = path.basename(file, ext);
+                    const timestamp = new Date().toISOString().replace(/[:.]/g, '-').split('T')[0];
+                    finalPath = path.join(winnerReportsDir, `${base}-MERGED-${timestamp}${ext}`);
+                }
+                if (!options.dryRun) {
+                    await fs.copy(sourcePath, finalPath);
+                }
+                mergedFiles.push(finalPath);
+            }
+        }
+        // Merge metadata (union of GitHub/JIRA/ADO links)
+        const loserMetadataPath = path.join(loser.path, 'metadata.json');
+        if (await fs.pathExists(loserMetadataPath)) {
+            const winnerMetadataPath = path.join(winner.path, 'metadata.json');
+            if (await fs.pathExists(winnerMetadataPath)) {
+                try {
+                    const loserMetadata = await fs.readJson(loserMetadataPath);
+                    const winnerMetadata = await fs.readJson(winnerMetadataPath);
+                    // Merge external links (take non-null values)
+                    const merged = {
+                        ...winnerMetadata,
+                        github: winnerMetadata.github || loserMetadata.github,
+                        jira: winnerMetadata.jira || loserMetadata.jira,
+                        ado: winnerMetadata.ado || loserMetadata.ado
+                    };
+                    if (!options.dryRun) {
+                        await fs.writeJson(winnerMetadataPath, merged, { spaces: 2 });
+                    }
+                    mergedFiles.push(winnerMetadataPath);
+                }
+                catch (error) {
+                    // Skip corrupted metadata
+                }
+            }
+        }
+    }
+    return mergedFiles;
+}
+/**
+ * Create resolution report in winner's reports/ folder
+ */
+async function createResolutionReport(duplicate, mergedFiles, options) {
+    const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+    const reportName = `DUPLICATE-RESOLUTION-${timestamp}.md`;
+    const reportPath = path.join(duplicate.recommendedWinner.path, 'reports', reportName);
+    const content = generateReportContent(duplicate, mergedFiles, options);
+    if (!options.dryRun) {
+        await fs.ensureDir(path.dirname(reportPath));
+        await fs.writeFile(reportPath, content, 'utf-8');
+    }
+    return reportPath;
+}
+/**
+ * Generate resolution report content
+ */
+function generateReportContent(duplicate, mergedFiles, options) {
+    const winner = duplicate.recommendedWinner;
+    const losers = duplicate.losingVersions;
+    const timestamp = new Date().toISOString();
+    return `# Duplicate Resolution Report
+
+**Generated**: ${timestamp}
+**Increment Number**: ${duplicate.incrementNumber}
+**Resolution Strategy**: ${options.merge ? 'Merge + Delete' : 'Delete Only'}
+
+## Conflict Summary
+
+**Total Locations Found**: ${duplicate.locations.length}
+
+### Winner: ${winner.name}
+- **Path**: \`${winner.path}\`
+- **Status**: ${winner.status}
+- **Last Activity**: ${winner.lastActivity}
+- **File Count**: ${winner.fileCount}
+- **Has Reports**: ${winner.hasReports ? 'Yes' : 'No'}
+- **Has GitHub Link**: ${winner.hasGitHubLink ? 'Yes' : 'No'}
+
+**Reason Selected**: ${duplicate.resolutionReason}
+
+## Losing Versions
+
+${losers.map((loser, idx) => `
+### ${idx + 1}. ${loser.name}
+- **Path**: \`${loser.path}\`
+- **Status**: ${loser.status}
+- **Last Activity**: ${loser.lastActivity}
+- **File Count**: ${loser.fileCount}
+- **Action**: ${options.dryRun ? 'Would be deleted' : 'Deleted'}
+`).join('\n')}
+
+## Merged Content
+
+${options.merge ? `
+**Total Files Merged**: ${mergedFiles.length}
+
+${mergedFiles.length > 0 ? mergedFiles.map(f => `- \`${path.basename(f)}\``).join('\n') : 'No files merged'}
+` : 'Content merge was not enabled (--merge flag not used)'}
+
+## Command Used
+
+\`\`\`bash
+/specweave:fix-duplicates ${options.merge ? '--merge ' : ''}${options.force ? '--force ' : ''}${options.dryRun ? '--dry-run' : ''}
+\`\`\`
+
+## Next Steps
+
+${options.dryRun ? `
+This was a dry-run. To apply these changes:
+1. Review this report
+2. Run: \`/specweave:fix-duplicates --merge\` (without --dry-run)
+` : `
+✅ Duplicate resolved successfully!
+
+- Winner preserved at: \`${winner.path}\`
+- ${losers.length} losing version(s) deleted
+- ${mergedFiles.length} file(s) merged
+`}
+
+---
+
+🤖 Generated by SpecWeave Duplicate Prevention System
+`;
+}
+/**
+ * Confirm deletion with user (interactive)
+ */
+async function confirmDeletion(loser) {
+    // In a real CLI, this would prompt the user
+    // For now, we'll just return true (force mode)
+    // This will be implemented properly in the CLI command
+    console.log(`⚠️  Delete ${loser.path}? (Use --force to skip this prompt)`);
+    return true;
+}
+/**
+ * Resolve multiple duplicates in batch
+ */
+export async function resolveAllDuplicates(duplicates, options = {}) {
+    const results = [];
+    for (const duplicate of duplicates) {
+        try {
+            const result = await resolveConflict(duplicate, options);
+            results.push(result);
+        }
+        catch (error) {
+            console.error(`Failed to resolve duplicate ${duplicate.incrementNumber}:`, error);
+        }
+    }
+    return results;
+}
+//# sourceMappingURL=conflict-resolver.js.map

package/dist/src/core/increment/conflict-resolver.js.map

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

package/dist/src/core/increment/discipline-checker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discipline-checker.d.ts","sourceRoot":"","sources":["../../../../src/core/increment/discipline-checker.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EACL,gBAAgB,EAEhB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAIpB;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,QAAQ,CAA0B;IAE1C;;;;;OAKG;gBACS,WAAW,GAAE,MAAsB,EAAE,YAAY,CAAC,EAAE,gBAAgB;IAchF;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAcxB;;;;;OAKG;IACG,QAAQ,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAuE3E;;OAEG;YACW,gBAAgB;IAgC9B;;OAEG;IACH,OAAO,CAAC,aAAa;IA0ErB;;OAEG;IACH,OAAO,CAAC,eAAe;IAmBvB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAkBxB;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAsB9B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;CAW/B"}
+{"version":3,"file":"discipline-checker.d.ts","sourceRoot":"","sources":["../../../../src/core/increment/discipline-checker.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EACL,gBAAgB,EAEhB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAIpB;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,QAAQ,CAA0B;IAE1C;;;;;OAKG;gBACS,WAAW,GAAE,MAAsB,EAAE,YAAY,CAAC,EAAE,gBAAgB;IAchF;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAcxB;;;;;OAKG;IACG,QAAQ,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAwE3E;;OAEG;YACW,gBAAgB;IAgC9B;;OAEG;IACH,OAAO,CAAC,aAAa;IAgFrB;;OAEG;IACH,OAAO,CAAC,eAAe;IAmBvB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAkBxB;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAsB9B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;CAW/B"}