specweave 0.18.1 → 0.20.0

package/dist/src/core/deduplication/command-deduplicator.js

@@ -0,0 +1,254 @@
+/**
+ * Global Command Deduplication System
+ *
+ * Prevents ANY command/tool from being invoked twice within a configurable time window.
+ * Tracks all SlashCommand, Write, Edit, and other tool invocations.
+ *
+ * Architecture:
+ * - File-based cache: `.specweave/state/command-invocations.json`
+ * - Hash-based deduplication: command + args → unique fingerprint
+ * - Time-windowed checks: Configurable window (default: 1000ms)
+ * - Automatic cleanup: Removes old entries to prevent bloat
+ *
+ * Usage:
+ * ```typescript
+ * import { CommandDeduplicator } from './command-deduplicator.js';
+ *
+ * const dedup = new CommandDeduplicator();
+ * const isDuplicate = await dedup.checkDuplicate('/specweave:do', ['0031']);
+ *
+ * if (isDuplicate) {
+ *   console.log('⚠️  Duplicate invocation blocked!');
+ *   return;
+ * }
+ *
+ * await dedup.recordInvocation('/specweave:do', ['0031']);
+ * // ... execute command
+ * ```
+ *
+ * @module core/deduplication
+ */
+import fs from 'fs-extra';
+import * as path from 'path';
+import * as crypto from 'crypto';
+/**
+ * Global command deduplication system
+ */
+export class CommandDeduplicator {
+    /**
+     * Create new deduplicator instance
+     *
+     * @param config - Configuration options
+     * @param projectRoot - Project root directory (default: process.cwd())
+     */
+    constructor(config = {}, projectRoot = process.cwd()) {
+        this.projectRoot = projectRoot;
+        this.lastCleanupCheck = 0;
+        this.config = {
+            windowMs: config.windowMs ?? 1000,
+            cachePath: config.cachePath ?? path.join(projectRoot, '.specweave', 'state', 'command-invocations.json'),
+            maxCacheSize: config.maxCacheSize ?? 1000,
+            debug: config.debug ?? false,
+            cleanupIntervalMs: config.cleanupIntervalMs ?? 60000
+        };
+        this.cache = this.loadCache();
+    }
+    /**
+     * Check if command invocation is a duplicate
+     *
+     * @param command - Command name (e.g., '/specweave:do')
+     * @param args - Command arguments
+     * @returns true if duplicate detected, false otherwise
+     */
+    async checkDuplicate(command, args = []) {
+        const fingerprint = this.createFingerprint(command, args);
+        const now = Date.now();
+        const windowStart = now - this.config.windowMs;
+        // Check for recent invocations with same fingerprint
+        const recentDuplicates = this.cache.invocations.filter(inv => inv.fingerprint === fingerprint &&
+            inv.timestamp >= windowStart);
+        if (recentDuplicates.length > 0) {
+            const mostRecent = recentDuplicates[recentDuplicates.length - 1];
+            const timeSince = now - mostRecent.timestamp;
+            if (this.config.debug) {
+                console.log(`[CommandDeduplicator] 🚫 DUPLICATE DETECTED!`);
+                console.log(`  Command: ${command}`);
+                console.log(`  Args: ${JSON.stringify(args)}`);
+                console.log(`  Time since last: ${timeSince}ms`);
+                console.log(`  Window: ${this.config.windowMs}ms`);
+            }
+            // Increment duplicate counter
+            this.cache.totalDuplicatesBlocked++;
+            await this.saveCache();
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Record command invocation
+     *
+     * @param command - Command name
+     * @param args - Command arguments
+     */
+    async recordInvocation(command, args = []) {
+        const fingerprint = this.createFingerprint(command, args);
+        const now = Date.now();
+        const record = {
+            fingerprint,
+            command,
+            args,
+            timestamp: now,
+            date: new Date(now).toISOString()
+        };
+        this.cache.invocations.push(record);
+        this.cache.totalInvocations++;
+        if (this.config.debug) {
+            console.log(`[CommandDeduplicator] ✅ Recorded invocation: ${command} ${args.join(' ')}`);
+        }
+        // Trigger cleanup if needed
+        if (now - this.lastCleanupCheck > this.config.cleanupIntervalMs) {
+            await this.cleanup();
+            this.lastCleanupCheck = now;
+        }
+        await this.saveCache();
+    }
+    /**
+     * Create unique fingerprint for command + args
+     *
+     * @param command - Command name
+     * @param args - Command arguments
+     * @returns SHA256 hash of command + args
+     */
+    createFingerprint(command, args) {
+        const data = JSON.stringify({ command, args });
+        return crypto.createHash('sha256').update(data).digest('hex');
+    }
+    /**
+     * Load cache from disk
+     *
+     * @returns Invocation cache
+     */
+    loadCache() {
+        try {
+            if (fs.existsSync(this.config.cachePath)) {
+                const data = fs.readJsonSync(this.config.cachePath);
+                if (this.config.debug) {
+                    console.log(`[CommandDeduplicator] 📂 Loaded cache: ${data.invocations.length} invocations`);
+                }
+                return data;
+            }
+        }
+        catch (error) {
+            if (this.config.debug) {
+                console.log(`[CommandDeduplicator] ⚠️  Failed to load cache: ${error}`);
+            }
+        }
+        // Return empty cache
+        return {
+            invocations: [],
+            lastCleanup: Date.now(),
+            totalInvocations: 0,
+            totalDuplicatesBlocked: 0
+        };
+    }
+    /**
+     * Save cache to disk
+     */
+    async saveCache() {
+        try {
+            await fs.ensureDir(path.dirname(this.config.cachePath));
+            await fs.writeJson(this.config.cachePath, this.cache, { spaces: 2 });
+            if (this.config.debug) {
+                console.log(`[CommandDeduplicator] 💾 Saved cache: ${this.cache.invocations.length} invocations`);
+            }
+        }
+        catch (error) {
+            console.error(`[CommandDeduplicator] ❌ Failed to save cache: ${error}`);
+        }
+    }
+    /**
+     * Clean up old invocation records
+     *
+     * Removes records older than 10x the deduplication window to prevent cache bloat.
+     */
+    async cleanup() {
+        const now = Date.now();
+        const cutoff = now - (this.config.windowMs * 10); // Keep 10x window
+        const before = this.cache.invocations.length;
+        this.cache.invocations = this.cache.invocations.filter(inv => inv.timestamp >= cutoff);
+        const after = this.cache.invocations.length;
+        // Also enforce max cache size
+        if (this.cache.invocations.length > this.config.maxCacheSize) {
+            this.cache.invocations = this.cache.invocations.slice(-this.config.maxCacheSize);
+        }
+        this.cache.lastCleanup = now;
+        if (this.config.debug && before > after) {
+            console.log(`[CommandDeduplicator] 🧹 Cleanup: Removed ${before - after} old records`);
+        }
+        await this.saveCache();
+    }
+    /**
+     * Get statistics about deduplication
+     *
+     * @returns Statistics object
+     */
+    getStats() {
+        return {
+            totalInvocations: this.cache.totalInvocations,
+            totalDuplicatesBlocked: this.cache.totalDuplicatesBlocked,
+            currentCacheSize: this.cache.invocations.length,
+            lastCleanup: new Date(this.cache.lastCleanup).toISOString()
+        };
+    }
+    /**
+     * Clear all cached invocations (useful for testing)
+     */
+    async clear() {
+        this.cache = {
+            invocations: [],
+            lastCleanup: Date.now(),
+            totalInvocations: 0,
+            totalDuplicatesBlocked: 0
+        };
+        await this.saveCache();
+        if (this.config.debug) {
+            console.log(`[CommandDeduplicator] 🗑️  Cache cleared`);
+        }
+    }
+}
+/**
+ * Global singleton instance (convenience)
+ */
+let globalInstance = null;
+/**
+ * Get global deduplicator instance
+ *
+ * @param config - Configuration (only used on first call)
+ * @returns Global deduplicator instance
+ */
+export function getGlobalDeduplicator(config) {
+    if (!globalInstance) {
+        globalInstance = new CommandDeduplicator(config);
+    }
+    return globalInstance;
+}
+/**
+ * Convenience function: Check if command is duplicate
+ *
+ * @param command - Command name
+ * @param args - Command arguments
+ * @returns true if duplicate, false otherwise
+ */
+export async function isDuplicate(command, args = []) {
+    return await getGlobalDeduplicator().checkDuplicate(command, args);
+}
+/**
+ * Convenience function: Record command invocation
+ *
+ * @param command - Command name
+ * @param args - Command arguments
+ */
+export async function recordCommand(command, args = []) {
+    await getGlobalDeduplicator().recordInvocation(command, args);
+}
+//# sourceMappingURL=command-deduplicator.js.map

package/dist/src/core/deduplication/command-deduplicator.js.map

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

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":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAoBxD;;;;GAIG;AACH,MAAM,OAAO,sBAAsB;IAGjC,YAAoB,UAAkB,OAAO,CAAC,GAAG,EAAE;QAA/B,YAAO,GAAP,OAAO,CAAwB;QACjD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,wCAAwC,CAAC,CAAC;IAChF,CAAC;IAED;;;;;OAKG;IACH,SAAS;QACP,IAAI,CAAC;YACH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;gBACnC,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACzD,MAAM,KAAK,GAAyB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAExD,8CAA8C;YAC9C,IAAI,KAAK,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;gBAC3B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACpB,CAAC;YAED,OAAO,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,+CAA+C;YAC/C,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,UAAU;QACR,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9C,CAAC;IAED;;;;;;OAMG;IACH,SAAS,CAAC,WAAmB,EAAE,iBAA0B,KAAK;QAC5D,0EAA0E;QAC1E,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEnD,wCAAwC;YACxC,IAAI,QAAQ,CAAC,MAAM,KAAK,eAAe,CAAC,MAAM,EAAE,CAAC;gBAC/C,MAAM,IAAI,KAAK,CACb,cAAc,WAAW,yBAAyB,QAAQ,CAAC,MAAM,cAAc,CAChF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,0BAA0B;QAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAEvC,+BAA+B;QAC/B,IAAI,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACxC,OAAO;QACT,CAAC;QAED,sBAAsB;QACtB,MAAM,SAAS,GAAG,CAAC,GAAG,aAAa,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAE9D,cAAc;QACd,MAAM,KAAK,GAAyB;YAClC,GAAG,EAAE,SAAS;YACd,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACtC,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,YAAY,CAAC,WAAmB;QAC9B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,WAAW,CAAC,CAAC;QAEjE,MAAM,KAAK,GAAyB;YAClC,GAAG,EAAE,SAAS;YACd,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACtC,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,WAAmB,EAAE,iBAA0B,KAAK;QAC5D,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,WAAW;QACT,MAAM,KAAK,GAAyB;YAClC,GAAG,EAAE,EAAE;YACP,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACtC,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,WAAW;QACT,MAAM,gBAAgB,GAAG,eAAe,CAAC,SAAS,EAAE,CAAC;QAErD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,2CAA2C;YAC3C,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC5C,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;gBACjD,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;gBACjD,OAAO,KAAK,GAAG,KAAK,CAAC,CAAC,aAAa;YACrC,CAAC,CAAC,CAAC;YAEH,aAAa;YACb,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAEpD,MAAM,KAAK,GAAyB;gBAClC,GAAG,EAAE,SAAS;gBACd,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACtC,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,uBAAuB;YACvB,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,QAAQ;QACN,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAEvC,qDAAqD;QACrD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,KAAK,MAAM,WAAW,IAAI,aAAa,EAAE,CAAC;YACxC,IAAI,CAAC;gBACH,kCAAkC;gBAClC,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAEnD,wCAAwC;gBACxC,IAAI,QAAQ,CAAC,MAAM,KAAK,eAAe,CAAC,MAAM,EAAE,CAAC;oBAC/C,8BAA8B;oBAC9B,OAAO,CAAC,IAAI,CACV,0CAA0C,WAAW,OAAO,QAAQ,CAAC,MAAM,EAAE,CAC9E,CAAC;oBACF,QAAQ,GAAG,IAAI,CAAC;gBAClB,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,0CAA0C;gBAC1C,OAAO,CAAC,IAAI,CAAC,4CAA4C,WAAW,YAAY,CAAC,CAAC;gBAClF,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;QACH,CAAC;QAED,iFAAiF;QACjF,6CAA6C;QAC7C,OAAO,CAAC,QAAQ,CAAC;IACnB,CAAC;IAED;;OAEG;IACK,UAAU,CAAC,KAA2B;QAC5C,gCAAgC;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;QAED,mCAAmC;QACnC,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,SAAS,MAAM,CAAC;QACzC,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QACpE,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;CACF"}

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"}