@stackmemoryai/stackmemory 0.2.8 → 0.3.0

package/dist/src/core/merge/conflict-detector.js

@@ -0,0 +1,468 @@
+/**
+ * Conflict Detection Engine
+ * Detects paradoxes in parallel frame timelines
+ */
+import { v4 as uuidv4 } from 'uuid';
+import { logger } from '../monitoring/logger.js';
+export class ConflictDetector {
+    SIMILARITY_THRESHOLD = 0.8;
+    /**
+     * Detect all types of conflicts between two frame stacks
+     */
+    detectConflicts(stack1, stack2) {
+        const conflicts = [];
+        // Detect parallel solution conflicts
+        const parallelConflicts = this.detectParallelSolutions(stack1, stack2);
+        conflicts.push(...parallelConflicts);
+        // Detect conflicting decisions
+        const decisionConflicts = this.detectConflictingDecisions(stack1.events, stack2.events);
+        conflicts.push(...decisionConflicts);
+        // Detect structural divergence
+        const structuralConflicts = this.detectStructuralDivergence(stack1.frames, stack2.frames);
+        conflicts.push(...structuralConflicts);
+        logger.info(`Detected ${conflicts.length} conflicts between stacks`, {
+            stack1Id: stack1.id,
+            stack2Id: stack2.id,
+            conflictTypes: this.summarizeConflictTypes(conflicts),
+        });
+        return conflicts;
+    }
+    /**
+     * Analyze frames to find parallel solutions to the same problem
+     */
+    analyzeParallelSolutions(frames) {
+        const solutions = [];
+        // Group frames by similar purpose/name
+        const groupedFrames = this.groupSimilarFrames(frames);
+        for (const group of groupedFrames) {
+            if (group.length > 1) {
+                // Multiple frames solving similar problems
+                group.forEach((frame) => {
+                    solutions.push({
+                        frameId: frame.frame_id,
+                        solution: this.extractSolution(frame),
+                        approach: this.analyzeApproach(frame),
+                        author: frame.inputs?.author || 'unknown',
+                        timestamp: frame.created_at,
+                        effectiveness: this.calculateEffectiveness(frame),
+                    });
+                });
+            }
+        }
+        return solutions;
+    }
+    /**
+     * Identify conflicting decisions in event streams
+     */
+    identifyConflictingDecisions(events) {
+        const conflicts = [];
+        const decisions = this.extractDecisions(events);
+        for (let i = 0; i < decisions.length; i++) {
+            for (let j = i + 1; j < decisions.length; j++) {
+                if (this.decisionsConflict(decisions[i], decisions[j])) {
+                    conflicts.push({
+                        decision1: decisions[i].payload?.decision || '',
+                        decision2: decisions[j].payload?.decision || '',
+                        impact: this.assessImpact(decisions[i], decisions[j]),
+                        canCoexist: this.canCoexist(decisions[i], decisions[j]),
+                    });
+                }
+            }
+        }
+        return conflicts;
+    }
+    /**
+     * Detect parallel solutions between two stacks
+     */
+    detectParallelSolutions(stack1, stack2) {
+        const conflicts = [];
+        // Find frames that appear to solve the same problem
+        for (const frame1 of stack1.frames) {
+            for (const frame2 of stack2.frames) {
+                if (this.framesAreSimilar(frame1, frame2) &&
+                    !this.framesAreIdentical(frame1, frame2)) {
+                    conflicts.push({
+                        id: uuidv4(),
+                        type: 'parallel_solution',
+                        frameId1: frame1.frame_id,
+                        frameId2: frame2.frame_id,
+                        severity: this.calculateParallelSeverity(frame1, frame2),
+                        description: `Parallel solutions detected: "${frame1.name}" vs "${frame2.name}"`,
+                        detectedAt: Date.now(),
+                        conflictingPaths: this.extractPaths(frame1, frame2),
+                    });
+                }
+            }
+        }
+        return conflicts;
+    }
+    /**
+     * Detect conflicting decisions between event streams
+     */
+    detectConflictingDecisions(events1, events2) {
+        const conflicts = [];
+        const decisions1 = this.extractDecisions(events1);
+        const decisions2 = this.extractDecisions(events2);
+        for (const d1 of decisions1) {
+            for (const d2 of decisions2) {
+                if (this.decisionsConflict(d1, d2)) {
+                    conflicts.push({
+                        id: uuidv4(),
+                        type: 'conflicting_decision',
+                        frameId1: d1.frame_id,
+                        frameId2: d2.frame_id,
+                        severity: this.assessImpact(d1, d2),
+                        description: `Conflicting decisions: "${d1.payload?.decision}" vs "${d2.payload?.decision}"`,
+                        detectedAt: Date.now(),
+                    });
+                }
+            }
+        }
+        return conflicts;
+    }
+    /**
+     * Detect structural divergence in frame hierarchies
+     */
+    detectStructuralDivergence(frames1, frames2) {
+        const conflicts = [];
+        // Build frame trees
+        const tree1 = this.buildFrameTree(frames1);
+        const tree2 = this.buildFrameTree(frames2);
+        // Find divergence points
+        const divergences = this.findDivergences(tree1, tree2);
+        for (const divergence of divergences) {
+            conflicts.push({
+                id: uuidv4(),
+                type: 'structural_divergence',
+                frameId1: divergence.node1,
+                frameId2: divergence.node2,
+                severity: this.calculateDivergenceSeverity(divergence),
+                description: `Structural divergence at depth ${divergence.depth}`,
+                detectedAt: Date.now(),
+            });
+        }
+        return conflicts;
+    }
+    /**
+     * Helper: Check if two frames are similar (solving same problem)
+     */
+    framesAreSimilar(frame1, frame2) {
+        // Check name similarity
+        const nameSimilarity = this.calculateSimilarity(frame1.name, frame2.name);
+        if (nameSimilarity > this.SIMILARITY_THRESHOLD)
+            return true;
+        // Check type and parent
+        if (frame1.type === frame2.type &&
+            frame1.parent_frame_id === frame2.parent_frame_id) {
+            return true;
+        }
+        // Check inputs similarity
+        const inputSimilarity = this.compareInputs(frame1.inputs, frame2.inputs);
+        return inputSimilarity > this.SIMILARITY_THRESHOLD;
+    }
+    /**
+     * Helper: Check if frames are identical
+     */
+    framesAreIdentical(frame1, frame2) {
+        return frame1.frame_id === frame2.frame_id;
+    }
+    /**
+     * Helper: Calculate string similarity (Levenshtein-based)
+     */
+    calculateSimilarity(str1, str2) {
+        const maxLen = Math.max(str1.length, str2.length);
+        if (maxLen === 0)
+            return 1;
+        const distance = this.levenshteinDistance(str1, str2);
+        return 1 - distance / maxLen;
+    }
+    /**
+     * Helper: Levenshtein distance implementation
+     */
+    levenshteinDistance(str1, str2) {
+        const matrix = [];
+        for (let i = 0; i <= str2.length; i++) {
+            matrix[i] = [i];
+        }
+        for (let j = 0; j <= str1.length; j++) {
+            matrix[0][j] = j;
+        }
+        for (let i = 1; i <= str2.length; i++) {
+            for (let j = 1; j <= str1.length; j++) {
+                if (str2.charAt(i - 1) === str1.charAt(j - 1)) {
+                    matrix[i][j] = matrix[i - 1][j - 1];
+                }
+                else {
+                    matrix[i][j] = Math.min(matrix[i - 1][j - 1] + 1, matrix[i][j - 1] + 1, matrix[i - 1][j] + 1);
+                }
+            }
+        }
+        return matrix[str2.length][str1.length];
+    }
+    /**
+     * Helper: Compare frame inputs
+     */
+    compareInputs(inputs1, inputs2) {
+        const keys1 = Object.keys(inputs1 || {});
+        const keys2 = Object.keys(inputs2 || {});
+        const allKeys = new Set([...keys1, ...keys2]);
+        if (allKeys.size === 0)
+            return 1;
+        let matches = 0;
+        for (const key of allKeys) {
+            if (JSON.stringify(inputs1[key]) === JSON.stringify(inputs2[key])) {
+                matches++;
+            }
+        }
+        return matches / allKeys.size;
+    }
+    /**
+     * Helper: Calculate severity for parallel solutions
+     */
+    calculateParallelSeverity(frame1, frame2) {
+        // Critical if both are completed and have different outputs
+        if (frame1.state === 'closed' && frame2.state === 'closed') {
+            const outputSimilarity = this.compareInputs(frame1.outputs, frame2.outputs);
+            if (outputSimilarity < 0.5)
+                return 'critical';
+            if (outputSimilarity < 0.7)
+                return 'high';
+        }
+        // High if different approaches to same parent task
+        if (frame1.parent_frame_id === frame2.parent_frame_id) {
+            return 'high';
+        }
+        return 'medium';
+    }
+    /**
+     * Helper: Extract decision events
+     */
+    extractDecisions(events) {
+        return events.filter((e) => e.event_type === 'decision' ||
+            e.payload?.type === 'decision' ||
+            e.payload?.decision !== undefined);
+    }
+    /**
+     * Helper: Check if two decisions conflict
+     */
+    decisionsConflict(d1, d2) {
+        // Check if decisions affect same resource/path
+        const resource1 = d1.payload?.resource || d1.payload?.path;
+        const resource2 = d2.payload?.resource || d2.payload?.path;
+        if (resource1 && resource2 && resource1 === resource2) {
+            // Different decisions on same resource
+            return d1.payload?.decision !== d2.payload?.decision;
+        }
+        // Check for logical conflicts
+        return this.hasLogicalConflict(d1.payload, d2.payload);
+    }
+    /**
+     * Helper: Check for logical conflicts in payloads
+     */
+    hasLogicalConflict(payload1, payload2) {
+        // Architecture decisions
+        if (payload1?.architecture && payload2?.architecture) {
+            return payload1.architecture !== payload2.architecture;
+        }
+        // Technology choices
+        if (payload1?.technology && payload2?.technology) {
+            return payload1.technology !== payload2.technology;
+        }
+        return false;
+    }
+    /**
+     * Helper: Assess impact of conflicting decisions
+     */
+    assessImpact(d1, d2) {
+        // High impact for architecture/design decisions
+        if (d1.payload?.type === 'architecture' ||
+            d2.payload?.type === 'architecture') {
+            return 'high';
+        }
+        // Medium for implementation decisions
+        if (d1.payload?.scope === 'implementation' ||
+            d2.payload?.scope === 'implementation') {
+            return 'medium';
+        }
+        return 'low';
+    }
+    /**
+     * Helper: Check if decisions can coexist
+     */
+    canCoexist(d1, d2) {
+        // Different scopes can coexist
+        if (d1.payload?.scope !== d2.payload?.scope) {
+            return true;
+        }
+        // Non-conflicting resources can coexist
+        const resource1 = d1.payload?.resource;
+        const resource2 = d2.payload?.resource;
+        return resource1 !== resource2;
+    }
+    /**
+     * Helper: Build frame tree structure
+     */
+    buildFrameTree(frames) {
+        const tree = new Map();
+        for (const frame of frames) {
+            if (frame.parent_frame_id) {
+                if (!tree.has(frame.parent_frame_id)) {
+                    tree.set(frame.parent_frame_id, new Set());
+                }
+                tree.get(frame.parent_frame_id).add(frame.frame_id);
+            }
+        }
+        return tree;
+    }
+    /**
+     * Helper: Find divergence points in trees
+     */
+    findDivergences(tree1, tree2) {
+        const divergences = [];
+        // Find nodes that exist in both but have different children
+        for (const [node, children1] of tree1) {
+            if (tree2.has(node)) {
+                const children2 = tree2.get(node);
+                if (!this.setsEqual(children1, children2)) {
+                    divergences.push({
+                        node1: node,
+                        node2: node,
+                        depth: this.calculateDepth(node, tree1),
+                    });
+                }
+            }
+        }
+        return divergences;
+    }
+    /**
+     * Helper: Check if two sets are equal
+     */
+    setsEqual(set1, set2) {
+        if (set1.size !== set2.size)
+            return false;
+        for (const item of set1) {
+            if (!set2.has(item))
+                return false;
+        }
+        return true;
+    }
+    /**
+     * Helper: Calculate node depth in tree
+     */
+    calculateDepth(node, tree) {
+        let depth = 0;
+        let current = node;
+        // Find parent of current node
+        for (const [parent, children] of tree) {
+            if (children.has(current)) {
+                depth++;
+                current = parent;
+            }
+        }
+        return depth;
+    }
+    /**
+     * Helper: Calculate divergence severity
+     */
+    calculateDivergenceSeverity(divergence) {
+        if (divergence.depth === 0)
+            return 'critical'; // Root divergence
+        if (divergence.depth === 1)
+            return 'high';
+        if (divergence.depth === 2)
+            return 'medium';
+        return 'low';
+    }
+    /**
+     * Helper: Extract paths from frames
+     */
+    extractPaths(frame1, frame2) {
+        const paths = [];
+        if (frame1.inputs?.path)
+            paths.push(frame1.inputs.path);
+        if (frame2.inputs?.path)
+            paths.push(frame2.inputs.path);
+        if (frame1.outputs?.files)
+            paths.push(...frame1.outputs.files);
+        if (frame2.outputs?.files)
+            paths.push(...frame2.outputs.files);
+        return [...new Set(paths)];
+    }
+    /**
+     * Helper: Extract solution from frame
+     */
+    extractSolution(frame) {
+        return (frame.outputs?.solution || frame.digest_text || 'No solution description');
+    }
+    /**
+     * Helper: Analyze approach taken
+     */
+    analyzeApproach(frame) {
+        if (frame.outputs?.approach)
+            return frame.outputs.approach;
+        if (frame.type === 'debug')
+            return 'Debug approach';
+        if (frame.type === 'review')
+            return 'Review approach';
+        return 'Standard approach';
+    }
+    /**
+     * Helper: Calculate solution effectiveness
+     */
+    calculateEffectiveness(frame) {
+        let score = 0.5; // Base score
+        // Completed frames are more effective
+        if (frame.state === 'closed')
+            score += 0.2;
+        // Frames with outputs are more effective
+        if (frame.outputs && Object.keys(frame.outputs).length > 0)
+            score += 0.1;
+        // Frames with digests are more effective
+        if (frame.digest_text)
+            score += 0.1;
+        // Quick completion is more effective
+        if (frame.closed_at && frame.created_at) {
+            const duration = frame.closed_at - frame.created_at;
+            if (duration < 300000)
+                score += 0.1; // Less than 5 minutes
+        }
+        return Math.min(score, 1);
+    }
+    /**
+     * Helper: Group similar frames together
+     */
+    groupSimilarFrames(frames) {
+        const groups = [];
+        const processed = new Set();
+        for (const frame of frames) {
+            if (processed.has(frame.frame_id))
+                continue;
+            const group = [frame];
+            processed.add(frame.frame_id);
+            for (const other of frames) {
+                if (!processed.has(other.frame_id) &&
+                    this.framesAreSimilar(frame, other)) {
+                    group.push(other);
+                    processed.add(other.frame_id);
+                }
+            }
+            groups.push(group);
+        }
+        return groups;
+    }
+    /**
+     * Helper: Summarize conflict types
+     */
+    summarizeConflictTypes(conflicts) {
+        const summary = {
+            parallel_solution: 0,
+            conflicting_decision: 0,
+            structural_divergence: 0,
+        };
+        for (const conflict of conflicts) {
+            summary[conflict.type]++;
+        }
+        return summary;
+    }
+}
+//# sourceMappingURL=conflict-detector.js.map

package/dist/src/core/merge/conflict-detector.js.map

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

package/dist/src/core/merge/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Stack Merge Conflict Resolution System
+ * STA-101: Export all merge components
+ */
+export * from './types.js';
+export * from './conflict-detector.js';
+export * from './stack-diff.js';
+export * from './resolution-engine.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/core/merge/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC"}

package/dist/src/core/merge/index.js

@@ -0,0 +1,9 @@
+/**
+ * Stack Merge Conflict Resolution System
+ * STA-101: Export all merge components
+ */
+export * from './types.js';
+export * from './conflict-detector.js';
+export * from './stack-diff.js';
+export * from './resolution-engine.js';
+//# sourceMappingURL=index.js.map

package/dist/src/core/merge/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/merge/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC"}

package/dist/src/core/merge/resolution-engine.d.ts

@@ -0,0 +1,120 @@
+/**
+ * Resolution Engine
+ * Implements multiple strategies for resolving merge conflicts
+ */
+import { ConflictResolution, ResolutionStrategy, TeamVote, FrameStack, MergeResult } from './types.js';
+export interface ResolutionContext {
+    userId: string;
+    userRole: 'junior' | 'mid' | 'senior' | 'lead';
+    teamVotes?: TeamVote[];
+    aiConfidence?: number;
+    timeConstraint?: number;
+}
+export declare class ResolutionEngine {
+    private conflictDetector;
+    private diffVisualizer;
+    private resolutionHistory;
+    constructor();
+    /**
+     * Resolve conflicts using the specified strategy
+     */
+    resolveConflicts(stack1: FrameStack, stack2: FrameStack, strategy: ResolutionStrategy['type'], context: ResolutionContext): Promise<MergeResult>;
+    /**
+     * Strategy: Keep Both Solutions
+     * Creates a merged frame that includes both approaches
+     */
+    private keepBothStrategy;
+    /**
+     * Strategy: Team Vote
+     * Uses democratic voting to choose between options
+     */
+    private teamVoteStrategy;
+    /**
+     * Strategy: Senior Override
+     * Senior developer's choice takes precedence
+     */
+    private seniorOverrideStrategy;
+    /**
+     * Strategy: AI Suggest
+     * Uses AI analysis to recommend best resolution
+     */
+    private aiSuggestStrategy;
+    /**
+     * Strategy: Hybrid
+     * Combines multiple strategies based on conflict type
+     */
+    private hybridStrategy;
+    /**
+     * Execute the merge based on resolution
+     */
+    private executeMerge;
+    /**
+     * Count votes from team members
+     */
+    private countVotes;
+    /**
+     * Calculate confidence based on vote distribution
+     */
+    private calculateVoteConfidence;
+    /**
+     * Determine winner from vote results
+     */
+    private determineVoteWinner;
+    /**
+     * Determine preferred stack for senior override
+     */
+    private determinePreferredStack;
+    /**
+     * Analyze frame quality for AI suggestions
+     */
+    private analyzeFrameQuality;
+    /**
+     * Calculate stack completeness
+     */
+    private calculateCompleteness;
+    /**
+     * Calculate stack efficiency
+     */
+    private calculateEfficiency;
+    /**
+     * Calculate stack quality
+     */
+    private calculateQuality;
+    /**
+     * Generate AI reasoning for resolution
+     */
+    private generateAIReasoning;
+    /**
+     * Get AI recommendation for specific conflict
+     */
+    private getAIRecommendation;
+    /**
+     * Create rollback point before merge
+     */
+    private createRollbackPoint;
+    /**
+     * Merge frames based on resolution
+     */
+    private mergeFrames;
+    /**
+     * Hybrid merge implementation
+     */
+    private hybridMerge;
+    /**
+     * Validate merge integrity
+     */
+    private validateMerge;
+    /**
+     * Send notifications about merge
+     */
+    private sendNotifications;
+    /**
+     * Store resolution in history
+     */
+    private storeResolution;
+    /**
+     * Get resolution history for analysis
+     */
+    getResolutionHistory(): Map<string, ConflictResolution>;
+}
+//# sourceMappingURL=resolution-engine.d.ts.map

package/dist/src/core/merge/resolution-engine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolution-engine.d.ts","sourceRoot":"","sources":["../../../../src/core/merge/resolution-engine.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAEL,kBAAkB,EAClB,kBAAkB,EAClB,QAAQ,EACR,UAAU,EACV,WAAW,EAEZ,MAAM,YAAY,CAAC;AAMpB,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC/C,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,iBAAiB,CAA8C;;IAOvE;;OAEG;IACG,gBAAgB,CACpB,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,kBAAkB,CAAC,MAAM,CAAC,EACpC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,WAAW,CAAC;IA6EvB;;;OAGG;YACW,gBAAgB;IAiC9B;;;OAGG;YACW,gBAAgB;IAyC9B;;;OAGG;YACW,sBAAsB;IA0CpC;;;OAGG;YACW,iBAAiB;IAoC/B;;;OAGG;YACW,cAAc;IA4D5B;;OAEG;YACW,YAAY;IAyD1B;;OAEG;IACH,OAAO,CAAC,UAAU;IA0BlB;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAQ/B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAU3B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAqB/B;;OAEG;YACW,mBAAmB;IAoBjC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAO7B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAkB3B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAaxB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAkB3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAgB3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAiB3B;;OAEG;IACH,OAAO,CAAC,WAAW;IAoDnB;;OAEG;IACH,OAAO,CAAC,WAAW;IAgCnB;;OAEG;IACH,OAAO,CAAC,aAAa;IAyCrB;;OAEG;YACW,iBAAiB;IAsB/B;;OAEG;IACH,OAAO,CAAC,eAAe;IAavB;;OAEG;IACH,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;CAGxD"}