@stackmemoryai/stackmemory 0.2.8 → 0.3.0

package/dist/core/merge/stack-diff.js

@@ -0,0 +1,528 @@
+import { ConflictDetector } from "./conflict-detector.js";
+class StackDiffVisualizer {
+  conflictDetector;
+  constructor() {
+    this.conflictDetector = new ConflictDetector();
+  }
+  /**
+   * Visualize divergence between two frame stacks
+   */
+  visualizeDivergence(baseFrame, branch1, branch2) {
+    const nodes = [];
+    const edges = [];
+    nodes.push({
+      id: baseFrame.frame_id,
+      type: "common",
+      frame: baseFrame,
+      position: { x: 0, y: 0 },
+      metadata: { label: "Common Ancestor" }
+    });
+    const branch1Nodes = this.processBranch(
+      branch1,
+      baseFrame.frame_id,
+      -100,
+      // Left side
+      100
+    );
+    nodes.push(...branch1Nodes.nodes);
+    edges.push(...branch1Nodes.edges);
+    const branch2Nodes = this.processBranch(
+      branch2,
+      baseFrame.frame_id,
+      100,
+      // Right side
+      100
+    );
+    nodes.push(...branch2Nodes.nodes);
+    edges.push(...branch2Nodes.edges);
+    const conflicts = this.conflictDetector.detectConflicts(branch1, branch2);
+    this.markConflicts(nodes, edges, conflicts);
+    return {
+      nodes,
+      edges,
+      layout: "tree"
+    };
+  }
+  /**
+   * Render conflict markers for visualization
+   */
+  renderConflictMarkers(conflicts) {
+    const markers = [];
+    for (const conflict of conflicts) {
+      markers.push({
+        frameId: conflict.frameId1,
+        type: "conflict",
+        color: this.getSeverityColor(conflict.severity),
+        symbol: this.getConflictSymbol(conflict.type),
+        description: conflict.description
+      });
+      markers.push({
+        frameId: conflict.frameId2,
+        type: "conflict",
+        color: this.getSeverityColor(conflict.severity),
+        symbol: this.getConflictSymbol(conflict.type),
+        description: conflict.description
+      });
+    }
+    return markers;
+  }
+  /**
+   * Generate a merge preview based on resolution strategy
+   */
+  generateMergePreview(stack1, stack2, strategy) {
+    const mergedFrames = [];
+    const keptFromStack1 = [];
+    const keptFromStack2 = [];
+    const conflicts = this.conflictDetector.detectConflicts(stack1, stack2);
+    switch (strategy) {
+      case "keep_both":
+        return this.previewKeepBoth(stack1, stack2, conflicts);
+      case "team_vote":
+        return this.previewTeamVote(stack1, stack2, conflicts);
+      case "senior_override":
+        return this.previewSeniorOverride(stack1, stack2, conflicts);
+      case "ai_suggest":
+        return this.previewAISuggest(stack1, stack2, conflicts);
+      case "hybrid":
+        return this.previewHybrid(stack1, stack2, conflicts);
+      default:
+        return {
+          mergedFrames,
+          keptFromStack1,
+          keptFromStack2,
+          conflicts,
+          estimatedSuccess: 0
+        };
+    }
+  }
+  /**
+   * Create a stack diff comparison
+   */
+  createStackDiff(baseFrameId, stack1, stack2) {
+    const conflicts = this.conflictDetector.detectConflicts(stack1, stack2);
+    const divergencePoint = this.findDivergencePoint(stack1, stack2);
+    const commonAncestor = this.findCommonAncestor(stack1, stack2);
+    const baseFrame = stack1.frames.find((f) => f.frame_id === baseFrameId) || stack2.frames.find((f) => f.frame_id === baseFrameId);
+    const visualRepresentation = baseFrame ? this.visualizeDivergence(baseFrame, stack1, stack2) : void 0;
+    return {
+      baseFrame: baseFrameId,
+      branch1: stack1,
+      branch2: stack2,
+      divergencePoint,
+      conflicts,
+      commonAncestor,
+      visualRepresentation
+    };
+  }
+  /**
+   * Process a branch for visualization
+   */
+  processBranch(stack, parentId, xOffset, yStart) {
+    const nodes = [];
+    const edges = [];
+    let yPos = yStart;
+    const children = stack.frames.filter((f) => f.parent_frame_id === parentId);
+    for (const frame of children) {
+      nodes.push({
+        id: frame.frame_id,
+        type: xOffset < 0 ? "branch1" : "branch2",
+        frame,
+        position: { x: xOffset, y: yPos },
+        metadata: {
+          branch: xOffset < 0 ? "left" : "right",
+          depth: frame.depth
+        }
+      });
+      edges.push({
+        source: parentId,
+        target: frame.frame_id,
+        type: "parent",
+        weight: 1
+      });
+      const childResults = this.processBranch(
+        stack,
+        frame.frame_id,
+        xOffset + (xOffset < 0 ? -50 : 50),
+        yPos + 100
+      );
+      nodes.push(...childResults.nodes);
+      edges.push(...childResults.edges);
+      yPos += 150;
+    }
+    return { nodes, edges };
+  }
+  /**
+   * Mark conflicts in the visualization
+   */
+  markConflicts(nodes, edges, conflicts) {
+    for (const conflict of conflicts) {
+      const node1 = nodes.find((n) => n.id === conflict.frameId1);
+      const node2 = nodes.find((n) => n.id === conflict.frameId2);
+      if (node1) {
+        node1.type = "conflict";
+        node1.metadata = {
+          ...node1.metadata,
+          conflictType: conflict.type,
+          severity: conflict.severity
+        };
+      }
+      if (node2) {
+        node2.type = "conflict";
+        node2.metadata = {
+          ...node2.metadata,
+          conflictType: conflict.type,
+          severity: conflict.severity
+        };
+      }
+      if (node1 && node2) {
+        edges.push({
+          source: conflict.frameId1,
+          target: conflict.frameId2,
+          type: "conflict",
+          weight: this.getSeverityWeight(conflict.severity)
+        });
+      }
+    }
+  }
+  /**
+   * Get color for severity level
+   */
+  getSeverityColor(severity) {
+    switch (severity) {
+      case "critical":
+        return "#ff0000";
+      case "high":
+        return "#ff6600";
+      case "medium":
+        return "#ffaa00";
+      case "low":
+        return "#ffdd00";
+      default:
+        return "#888888";
+    }
+  }
+  /**
+   * Get symbol for conflict type
+   */
+  getConflictSymbol(type) {
+    switch (type) {
+      case "parallel_solution":
+        return "\u26A1";
+      case "conflicting_decision":
+        return "\u26A0\uFE0F";
+      case "structural_divergence":
+        return "\u{1F500}";
+      default:
+        return "\u2753";
+    }
+  }
+  /**
+   * Get weight for severity level
+   */
+  getSeverityWeight(severity) {
+    switch (severity) {
+      case "critical":
+        return 4;
+      case "high":
+        return 3;
+      case "medium":
+        return 2;
+      case "low":
+        return 1;
+      default:
+        return 0;
+    }
+  }
+  /**
+   * Preview keep both strategy
+   */
+  previewKeepBoth(stack1, stack2, conflicts) {
+    const mergedFrames = [];
+    const keptFromStack1 = [];
+    const keptFromStack2 = [];
+    for (const frame of stack1.frames) {
+      mergedFrames.push(frame);
+      keptFromStack1.push(frame.frame_id);
+    }
+    for (const frame of stack2.frames) {
+      if (!mergedFrames.find((f) => f.frame_id === frame.frame_id)) {
+        mergedFrames.push(frame);
+        keptFromStack2.push(frame.frame_id);
+      }
+    }
+    const criticalConflicts = conflicts.filter(
+      (c) => c.severity === "critical"
+    ).length;
+    const estimatedSuccess = Math.max(0, 1 - criticalConflicts * 0.2);
+    return {
+      mergedFrames,
+      keptFromStack1,
+      keptFromStack2,
+      conflicts,
+      estimatedSuccess
+    };
+  }
+  /**
+   * Preview team vote strategy
+   */
+  previewTeamVote(stack1, stack2, conflicts) {
+    const mergedFrames = [];
+    const keptFromStack1 = [];
+    const keptFromStack2 = [];
+    const conflictingFrameIds = /* @__PURE__ */ new Set();
+    for (const conflict of conflicts) {
+      conflictingFrameIds.add(conflict.frameId1);
+      conflictingFrameIds.add(conflict.frameId2);
+    }
+    for (const frame of stack1.frames) {
+      if (!conflictingFrameIds.has(frame.frame_id)) {
+        mergedFrames.push(frame);
+        keptFromStack1.push(frame.frame_id);
+      }
+    }
+    for (const frame of stack2.frames) {
+      if (!conflictingFrameIds.has(frame.frame_id) && !mergedFrames.find((f) => f.frame_id === frame.frame_id)) {
+        mergedFrames.push(frame);
+        keptFromStack2.push(frame.frame_id);
+      }
+    }
+    let useStack1 = true;
+    for (const conflict of conflicts) {
+      if (useStack1) {
+        const frame = stack1.frames.find(
+          (f) => f.frame_id === conflict.frameId1
+        );
+        if (frame) {
+          mergedFrames.push(frame);
+          keptFromStack1.push(frame.frame_id);
+        }
+      } else {
+        const frame = stack2.frames.find(
+          (f) => f.frame_id === conflict.frameId2
+        );
+        if (frame) {
+          mergedFrames.push(frame);
+          keptFromStack2.push(frame.frame_id);
+        }
+      }
+      useStack1 = !useStack1;
+    }
+    return {
+      mergedFrames,
+      keptFromStack1,
+      keptFromStack2,
+      conflicts,
+      estimatedSuccess: 0.75
+      // Team consensus usually works well
+    };
+  }
+  /**
+   * Preview senior override strategy
+   */
+  previewSeniorOverride(stack1, stack2, conflicts) {
+    const mergedFrames = [...stack1.frames];
+    const keptFromStack1 = stack1.frames.map((f) => f.frame_id);
+    const keptFromStack2 = [];
+    const stack1Ids = new Set(keptFromStack1);
+    for (const frame of stack2.frames) {
+      const hasConflict = conflicts.some((c) => c.frameId2 === frame.frame_id);
+      if (!hasConflict && !stack1Ids.has(frame.frame_id)) {
+        mergedFrames.push(frame);
+        keptFromStack2.push(frame.frame_id);
+      }
+    }
+    return {
+      mergedFrames,
+      keptFromStack1,
+      keptFromStack2,
+      conflicts,
+      estimatedSuccess: 0.85
+      // Senior override is usually reliable
+    };
+  }
+  /**
+   * Preview AI suggest strategy
+   */
+  previewAISuggest(stack1, stack2, conflicts) {
+    const mergedFrames = [];
+    const keptFromStack1 = [];
+    const keptFromStack2 = [];
+    for (const conflict of conflicts) {
+      const frame1 = stack1.frames.find(
+        (f) => f.frame_id === conflict.frameId1
+      );
+      const frame2 = stack2.frames.find(
+        (f) => f.frame_id === conflict.frameId2
+      );
+      if (frame1 && frame2) {
+        const score1 = this.scoreFrame(frame1);
+        const score2 = this.scoreFrame(frame2);
+        if (score1 >= score2) {
+          mergedFrames.push(frame1);
+          keptFromStack1.push(frame1.frame_id);
+        } else {
+          mergedFrames.push(frame2);
+          keptFromStack2.push(frame2.frame_id);
+        }
+      }
+    }
+    this.addNonConflictingFrames(
+      stack1,
+      stack2,
+      conflicts,
+      mergedFrames,
+      keptFromStack1,
+      keptFromStack2
+    );
+    return {
+      mergedFrames,
+      keptFromStack1,
+      keptFromStack2,
+      conflicts,
+      estimatedSuccess: 0.9
+      // AI suggestions are usually optimal
+    };
+  }
+  /**
+   * Preview hybrid strategy
+   */
+  previewHybrid(stack1, stack2, conflicts) {
+    const mergedFrames = [];
+    const keptFromStack1 = [];
+    const keptFromStack2 = [];
+    for (const conflict of conflicts) {
+      if (conflict.type === "parallel_solution") {
+        const frame1 = stack1.frames.find(
+          (f) => f.frame_id === conflict.frameId1
+        );
+        const frame2 = stack2.frames.find(
+          (f) => f.frame_id === conflict.frameId2
+        );
+        if (frame1) {
+          mergedFrames.push(frame1);
+          keptFromStack1.push(frame1.frame_id);
+        }
+        if (frame2) {
+          mergedFrames.push(frame2);
+          keptFromStack2.push(frame2.frame_id);
+        }
+      } else if (conflict.type === "conflicting_decision") {
+        const frame1 = stack1.frames.find(
+          (f) => f.frame_id === conflict.frameId1
+        );
+        const frame2 = stack2.frames.find(
+          (f) => f.frame_id === conflict.frameId2
+        );
+        if (frame1 && frame2) {
+          const score1 = this.scoreFrame(frame1);
+          const score2 = this.scoreFrame(frame2);
+          if (score1 >= score2) {
+            mergedFrames.push(frame1);
+            keptFromStack1.push(frame1.frame_id);
+          } else {
+            mergedFrames.push(frame2);
+            keptFromStack2.push(frame2.frame_id);
+          }
+        }
+      } else {
+        const frame1 = stack1.frames.find(
+          (f) => f.frame_id === conflict.frameId1
+        );
+        if (frame1) {
+          mergedFrames.push(frame1);
+          keptFromStack1.push(frame1.frame_id);
+        }
+      }
+    }
+    this.addNonConflictingFrames(
+      stack1,
+      stack2,
+      conflicts,
+      mergedFrames,
+      keptFromStack1,
+      keptFromStack2
+    );
+    return {
+      mergedFrames,
+      keptFromStack1,
+      keptFromStack2,
+      conflicts,
+      estimatedSuccess: 0.88
+      // Hybrid is very effective
+    };
+  }
+  /**
+   * Score a frame for quality
+   */
+  scoreFrame(frame) {
+    let score = 0;
+    if (frame.state === "closed") score += 0.3;
+    if (frame.outputs && Object.keys(frame.outputs).length > 0) score += 0.2;
+    if (frame.digest_text) score += 0.2;
+    if (frame.closed_at && frame.created_at) {
+      const duration = frame.closed_at - frame.created_at;
+      if (duration < 6e5) score += 0.3;
+    }
+    return score;
+  }
+  /**
+   * Add non-conflicting frames to merge
+   */
+  addNonConflictingFrames(stack1, stack2, conflicts, mergedFrames, keptFromStack1, keptFromStack2) {
+    const conflictingIds = /* @__PURE__ */ new Set();
+    const mergedIds = new Set(mergedFrames.map((f) => f.frame_id));
+    for (const conflict of conflicts) {
+      conflictingIds.add(conflict.frameId1);
+      conflictingIds.add(conflict.frameId2);
+    }
+    for (const frame of stack1.frames) {
+      if (!conflictingIds.has(frame.frame_id) && !mergedIds.has(frame.frame_id)) {
+        mergedFrames.push(frame);
+        keptFromStack1.push(frame.frame_id);
+        mergedIds.add(frame.frame_id);
+      }
+    }
+    for (const frame of stack2.frames) {
+      if (!conflictingIds.has(frame.frame_id) && !mergedIds.has(frame.frame_id)) {
+        mergedFrames.push(frame);
+        keptFromStack2.push(frame.frame_id);
+        mergedIds.add(frame.frame_id);
+      }
+    }
+  }
+  /**
+   * Find divergence point between stacks
+   */
+  findDivergencePoint(stack1, stack2) {
+    const events1 = stack1.events.sort((a, b) => a.ts - b.ts);
+    const events2 = stack2.events.sort((a, b) => a.ts - b.ts);
+    for (let i = 0; i < Math.min(events1.length, events2.length); i++) {
+      if (events1[i].event_id !== events2[i].event_id) {
+        return events1[i].ts;
+      }
+    }
+    return Math.min(
+      events1[events1.length - 1]?.ts || 0,
+      events2[events2.length - 1]?.ts || 0
+    );
+  }
+  /**
+   * Find common ancestor frame
+   */
+  findCommonAncestor(stack1, stack2) {
+    const frames1 = new Set(stack1.frames.map((f) => f.frame_id));
+    let deepestCommon;
+    let maxDepth = -1;
+    for (const frame of stack2.frames) {
+      if (frames1.has(frame.frame_id) && frame.depth > maxDepth) {
+        deepestCommon = frame;
+        maxDepth = frame.depth;
+      }
+    }
+    return deepestCommon?.frame_id;
+  }
+}
+export {
+  StackDiffVisualizer
+};
+//# sourceMappingURL=stack-diff.js.map

package/dist/core/merge/stack-diff.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/core/merge/stack-diff.ts"],
+  "sourcesContent": ["/**\n * Stack Diff Visualizer\n * Creates visual representations of frame stack divergence\n */\n\nimport {\n  StackDiff,\n  FrameStack,\n  DiffTree,\n  DiffNode,\n  DiffEdge,\n  MergeConflict,\n} from './types.js';\nimport { Frame } from '../context/frame-manager.js';\nimport { ConflictDetector } from './conflict-detector.js';\nimport { logger } from '../monitoring/logger.js';\n\nexport interface VisualMarker {\n  frameId: string;\n  type: 'added' | 'removed' | 'modified' | 'conflict';\n  color: string;\n  symbol: string;\n  description: string;\n}\n\nexport interface PreviewResult {\n  mergedFrames: Frame[];\n  keptFromStack1: string[];\n  keptFromStack2: string[];\n  conflicts: MergeConflict[];\n  estimatedSuccess: number;\n}\n\nexport class StackDiffVisualizer {\n  private conflictDetector: ConflictDetector;\n\n  constructor() {\n    this.conflictDetector = new ConflictDetector();\n  }\n\n  /**\n   * Visualize divergence between two frame stacks\n   */\n  visualizeDivergence(\n    baseFrame: Frame,\n    branch1: FrameStack,\n    branch2: FrameStack\n  ): DiffTree {\n    const nodes: DiffNode[] = [];\n    const edges: DiffEdge[] = [];\n\n    // Add base node\n    nodes.push({\n      id: baseFrame.frame_id,\n      type: 'common',\n      frame: baseFrame,\n      position: { x: 0, y: 0 },\n      metadata: { label: 'Common Ancestor' },\n    });\n\n    // Process branch 1\n    const branch1Nodes = this.processBranch(\n      branch1,\n      baseFrame.frame_id,\n      -100, // Left side\n      100\n    );\n    nodes.push(...branch1Nodes.nodes);\n    edges.push(...branch1Nodes.edges);\n\n    // Process branch 2\n    const branch2Nodes = this.processBranch(\n      branch2,\n      baseFrame.frame_id,\n      100, // Right side\n      100\n    );\n    nodes.push(...branch2Nodes.nodes);\n    edges.push(...branch2Nodes.edges);\n\n    // Detect and mark conflicts\n    const conflicts = this.conflictDetector.detectConflicts(branch1, branch2);\n    this.markConflicts(nodes, edges, conflicts);\n\n    return {\n      nodes,\n      edges,\n      layout: 'tree',\n    };\n  }\n\n  /**\n   * Render conflict markers for visualization\n   */\n  renderConflictMarkers(conflicts: MergeConflict[]): VisualMarker[] {\n    const markers: VisualMarker[] = [];\n\n    for (const conflict of conflicts) {\n      markers.push({\n        frameId: conflict.frameId1,\n        type: 'conflict',\n        color: this.getSeverityColor(conflict.severity),\n        symbol: this.getConflictSymbol(conflict.type),\n        description: conflict.description,\n      });\n\n      markers.push({\n        frameId: conflict.frameId2,\n        type: 'conflict',\n        color: this.getSeverityColor(conflict.severity),\n        symbol: this.getConflictSymbol(conflict.type),\n        description: conflict.description,\n      });\n    }\n\n    return markers;\n  }\n\n  /**\n   * Generate a merge preview based on resolution strategy\n   */\n  generateMergePreview(\n    stack1: FrameStack,\n    stack2: FrameStack,\n    strategy:\n      | 'keep_both'\n      | 'team_vote'\n      | 'senior_override'\n      | 'ai_suggest'\n      | 'hybrid'\n  ): PreviewResult {\n    const mergedFrames: Frame[] = [];\n    const keptFromStack1: string[] = [];\n    const keptFromStack2: string[] = [];\n    const conflicts = this.conflictDetector.detectConflicts(stack1, stack2);\n\n    switch (strategy) {\n      case 'keep_both':\n        return this.previewKeepBoth(stack1, stack2, conflicts);\n\n      case 'team_vote':\n        return this.previewTeamVote(stack1, stack2, conflicts);\n\n      case 'senior_override':\n        return this.previewSeniorOverride(stack1, stack2, conflicts);\n\n      case 'ai_suggest':\n        return this.previewAISuggest(stack1, stack2, conflicts);\n\n      case 'hybrid':\n        return this.previewHybrid(stack1, stack2, conflicts);\n\n      default:\n        return {\n          mergedFrames,\n          keptFromStack1,\n          keptFromStack2,\n          conflicts,\n          estimatedSuccess: 0,\n        };\n    }\n  }\n\n  /**\n   * Create a stack diff comparison\n   */\n  createStackDiff(\n    baseFrameId: string,\n    stack1: FrameStack,\n    stack2: FrameStack\n  ): StackDiff {\n    const conflicts = this.conflictDetector.detectConflicts(stack1, stack2);\n    const divergencePoint = this.findDivergencePoint(stack1, stack2);\n    const commonAncestor = this.findCommonAncestor(stack1, stack2);\n\n    // Find base frame\n    const baseFrame =\n      stack1.frames.find((f) => f.frame_id === baseFrameId) ||\n      stack2.frames.find((f) => f.frame_id === baseFrameId);\n\n    const visualRepresentation = baseFrame\n      ? this.visualizeDivergence(baseFrame, stack1, stack2)\n      : undefined;\n\n    return {\n      baseFrame: baseFrameId,\n      branch1: stack1,\n      branch2: stack2,\n      divergencePoint,\n      conflicts,\n      commonAncestor,\n      visualRepresentation,\n    };\n  }\n\n  /**\n   * Process a branch for visualization\n   */\n  private processBranch(\n    stack: FrameStack,\n    parentId: string,\n    xOffset: number,\n    yStart: number\n  ): { nodes: DiffNode[]; edges: DiffEdge[] } {\n    const nodes: DiffNode[] = [];\n    const edges: DiffEdge[] = [];\n    let yPos = yStart;\n\n    // Find frames that are children of parent\n    const children = stack.frames.filter((f) => f.parent_frame_id === parentId);\n\n    for (const frame of children) {\n      // Add node\n      nodes.push({\n        id: frame.frame_id,\n        type: xOffset < 0 ? 'branch1' : 'branch2',\n        frame,\n        position: { x: xOffset, y: yPos },\n        metadata: {\n          branch: xOffset < 0 ? 'left' : 'right',\n          depth: frame.depth,\n        },\n      });\n\n      // Add edge from parent\n      edges.push({\n        source: parentId,\n        target: frame.frame_id,\n        type: 'parent',\n        weight: 1,\n      });\n\n      // Process children recursively\n      const childResults = this.processBranch(\n        stack,\n        frame.frame_id,\n        xOffset + (xOffset < 0 ? -50 : 50),\n        yPos + 100\n      );\n\n      nodes.push(...childResults.nodes);\n      edges.push(...childResults.edges);\n\n      yPos += 150;\n    }\n\n    return { nodes, edges };\n  }\n\n  /**\n   * Mark conflicts in the visualization\n   */\n  private markConflicts(\n    nodes: DiffNode[],\n    edges: DiffEdge[],\n    conflicts: MergeConflict[]\n  ): void {\n    for (const conflict of conflicts) {\n      // Mark conflicting nodes\n      const node1 = nodes.find((n) => n.id === conflict.frameId1);\n      const node2 = nodes.find((n) => n.id === conflict.frameId2);\n\n      if (node1) {\n        node1.type = 'conflict';\n        node1.metadata = {\n          ...node1.metadata,\n          conflictType: conflict.type,\n          severity: conflict.severity,\n        };\n      }\n\n      if (node2) {\n        node2.type = 'conflict';\n        node2.metadata = {\n          ...node2.metadata,\n          conflictType: conflict.type,\n          severity: conflict.severity,\n        };\n      }\n\n      // Add conflict edge\n      if (node1 && node2) {\n        edges.push({\n          source: conflict.frameId1,\n          target: conflict.frameId2,\n          type: 'conflict',\n          weight: this.getSeverityWeight(conflict.severity),\n        });\n      }\n    }\n  }\n\n  /**\n   * Get color for severity level\n   */\n  private getSeverityColor(severity: string): string {\n    switch (severity) {\n      case 'critical':\n        return '#ff0000';\n      case 'high':\n        return '#ff6600';\n      case 'medium':\n        return '#ffaa00';\n      case 'low':\n        return '#ffdd00';\n      default:\n        return '#888888';\n    }\n  }\n\n  /**\n   * Get symbol for conflict type\n   */\n  private getConflictSymbol(type: string): string {\n    switch (type) {\n      case 'parallel_solution':\n        return '\u26A1';\n      case 'conflicting_decision':\n        return '\u26A0\uFE0F';\n      case 'structural_divergence':\n        return '\uD83D\uDD00';\n      default:\n        return '\u2753';\n    }\n  }\n\n  /**\n   * Get weight for severity level\n   */\n  private getSeverityWeight(severity: string): number {\n    switch (severity) {\n      case 'critical':\n        return 4;\n      case 'high':\n        return 3;\n      case 'medium':\n        return 2;\n      case 'low':\n        return 1;\n      default:\n        return 0;\n    }\n  }\n\n  /**\n   * Preview keep both strategy\n   */\n  private previewKeepBoth(\n    stack1: FrameStack,\n    stack2: FrameStack,\n    conflicts: MergeConflict[]\n  ): PreviewResult {\n    const mergedFrames: Frame[] = [];\n    const keptFromStack1: string[] = [];\n    const keptFromStack2: string[] = [];\n\n    // Keep all frames from both stacks\n    for (const frame of stack1.frames) {\n      mergedFrames.push(frame);\n      keptFromStack1.push(frame.frame_id);\n    }\n\n    for (const frame of stack2.frames) {\n      // Only add if not already present\n      if (!mergedFrames.find((f) => f.frame_id === frame.frame_id)) {\n        mergedFrames.push(frame);\n        keptFromStack2.push(frame.frame_id);\n      }\n    }\n\n    // Success depends on conflict severity\n    const criticalConflicts = conflicts.filter(\n      (c) => c.severity === 'critical'\n    ).length;\n    const estimatedSuccess = Math.max(0, 1 - criticalConflicts * 0.2);\n\n    return {\n      mergedFrames,\n      keptFromStack1,\n      keptFromStack2,\n      conflicts,\n      estimatedSuccess,\n    };\n  }\n\n  /**\n   * Preview team vote strategy\n   */\n  private previewTeamVote(\n    stack1: FrameStack,\n    stack2: FrameStack,\n    conflicts: MergeConflict[]\n  ): PreviewResult {\n    // Simulate team voting - for preview, assume 50/50 split\n    const mergedFrames: Frame[] = [];\n    const keptFromStack1: string[] = [];\n    const keptFromStack2: string[] = [];\n\n    // Add non-conflicting frames from both\n    const conflictingFrameIds = new Set<string>();\n    for (const conflict of conflicts) {\n      conflictingFrameIds.add(conflict.frameId1);\n      conflictingFrameIds.add(conflict.frameId2);\n    }\n\n    for (const frame of stack1.frames) {\n      if (!conflictingFrameIds.has(frame.frame_id)) {\n        mergedFrames.push(frame);\n        keptFromStack1.push(frame.frame_id);\n      }\n    }\n\n    for (const frame of stack2.frames) {\n      if (\n        !conflictingFrameIds.has(frame.frame_id) &&\n        !mergedFrames.find((f) => f.frame_id === frame.frame_id)\n      ) {\n        mergedFrames.push(frame);\n        keptFromStack2.push(frame.frame_id);\n      }\n    }\n\n    // For conflicts, alternate between stacks (simulating vote)\n    let useStack1 = true;\n    for (const conflict of conflicts) {\n      if (useStack1) {\n        const frame = stack1.frames.find(\n          (f) => f.frame_id === conflict.frameId1\n        );\n        if (frame) {\n          mergedFrames.push(frame);\n          keptFromStack1.push(frame.frame_id);\n        }\n      } else {\n        const frame = stack2.frames.find(\n          (f) => f.frame_id === conflict.frameId2\n        );\n        if (frame) {\n          mergedFrames.push(frame);\n          keptFromStack2.push(frame.frame_id);\n        }\n      }\n      useStack1 = !useStack1;\n    }\n\n    return {\n      mergedFrames,\n      keptFromStack1,\n      keptFromStack2,\n      conflicts,\n      estimatedSuccess: 0.75, // Team consensus usually works well\n    };\n  }\n\n  /**\n   * Preview senior override strategy\n   */\n  private previewSeniorOverride(\n    stack1: FrameStack,\n    stack2: FrameStack,\n    conflicts: MergeConflict[]\n  ): PreviewResult {\n    // Assume stack1 is senior developer's work\n    const mergedFrames = [...stack1.frames];\n    const keptFromStack1 = stack1.frames.map((f) => f.frame_id);\n    const keptFromStack2: string[] = [];\n\n    // Add non-conflicting frames from stack2\n    const stack1Ids = new Set(keptFromStack1);\n    for (const frame of stack2.frames) {\n      const hasConflict = conflicts.some((c) => c.frameId2 === frame.frame_id);\n\n      if (!hasConflict && !stack1Ids.has(frame.frame_id)) {\n        mergedFrames.push(frame);\n        keptFromStack2.push(frame.frame_id);\n      }\n    }\n\n    return {\n      mergedFrames,\n      keptFromStack1,\n      keptFromStack2,\n      conflicts,\n      estimatedSuccess: 0.85, // Senior override is usually reliable\n    };\n  }\n\n  /**\n   * Preview AI suggest strategy\n   */\n  private previewAISuggest(\n    stack1: FrameStack,\n    stack2: FrameStack,\n    conflicts: MergeConflict[]\n  ): PreviewResult {\n    const mergedFrames: Frame[] = [];\n    const keptFromStack1: string[] = [];\n    const keptFromStack2: string[] = [];\n\n    // AI would analyze effectiveness - simulate with heuristics\n    for (const conflict of conflicts) {\n      const frame1 = stack1.frames.find(\n        (f) => f.frame_id === conflict.frameId1\n      );\n      const frame2 = stack2.frames.find(\n        (f) => f.frame_id === conflict.frameId2\n      );\n\n      if (frame1 && frame2) {\n        // Choose based on completion and output quality\n        const score1 = this.scoreFrame(frame1);\n        const score2 = this.scoreFrame(frame2);\n\n        if (score1 >= score2) {\n          mergedFrames.push(frame1);\n          keptFromStack1.push(frame1.frame_id);\n        } else {\n          mergedFrames.push(frame2);\n          keptFromStack2.push(frame2.frame_id);\n        }\n      }\n    }\n\n    // Add non-conflicting frames\n    this.addNonConflictingFrames(\n      stack1,\n      stack2,\n      conflicts,\n      mergedFrames,\n      keptFromStack1,\n      keptFromStack2\n    );\n\n    return {\n      mergedFrames,\n      keptFromStack1,\n      keptFromStack2,\n      conflicts,\n      estimatedSuccess: 0.9, // AI suggestions are usually optimal\n    };\n  }\n\n  /**\n   * Preview hybrid strategy\n   */\n  private previewHybrid(\n    stack1: FrameStack,\n    stack2: FrameStack,\n    conflicts: MergeConflict[]\n  ): PreviewResult {\n    const mergedFrames: Frame[] = [];\n    const keptFromStack1: string[] = [];\n    const keptFromStack2: string[] = [];\n\n    // Hybrid: Use different strategies based on conflict type\n    for (const conflict of conflicts) {\n      if (conflict.type === 'parallel_solution') {\n        // Keep both for parallel solutions\n        const frame1 = stack1.frames.find(\n          (f) => f.frame_id === conflict.frameId1\n        );\n        const frame2 = stack2.frames.find(\n          (f) => f.frame_id === conflict.frameId2\n        );\n\n        if (frame1) {\n          mergedFrames.push(frame1);\n          keptFromStack1.push(frame1.frame_id);\n        }\n        if (frame2) {\n          mergedFrames.push(frame2);\n          keptFromStack2.push(frame2.frame_id);\n        }\n      } else if (conflict.type === 'conflicting_decision') {\n        // Use AI for decisions\n        const frame1 = stack1.frames.find(\n          (f) => f.frame_id === conflict.frameId1\n        );\n        const frame2 = stack2.frames.find(\n          (f) => f.frame_id === conflict.frameId2\n        );\n\n        if (frame1 && frame2) {\n          const score1 = this.scoreFrame(frame1);\n          const score2 = this.scoreFrame(frame2);\n\n          if (score1 >= score2) {\n            mergedFrames.push(frame1);\n            keptFromStack1.push(frame1.frame_id);\n          } else {\n            mergedFrames.push(frame2);\n            keptFromStack2.push(frame2.frame_id);\n          }\n        }\n      } else {\n        // Use senior override for structural divergence\n        const frame1 = stack1.frames.find(\n          (f) => f.frame_id === conflict.frameId1\n        );\n        if (frame1) {\n          mergedFrames.push(frame1);\n          keptFromStack1.push(frame1.frame_id);\n        }\n      }\n    }\n\n    // Add non-conflicting frames\n    this.addNonConflictingFrames(\n      stack1,\n      stack2,\n      conflicts,\n      mergedFrames,\n      keptFromStack1,\n      keptFromStack2\n    );\n\n    return {\n      mergedFrames,\n      keptFromStack1,\n      keptFromStack2,\n      conflicts,\n      estimatedSuccess: 0.88, // Hybrid is very effective\n    };\n  }\n\n  /**\n   * Score a frame for quality\n   */\n  private scoreFrame(frame: Frame): number {\n    let score = 0;\n\n    if (frame.state === 'closed') score += 0.3;\n    if (frame.outputs && Object.keys(frame.outputs).length > 0) score += 0.2;\n    if (frame.digest_text) score += 0.2;\n    if (frame.closed_at && frame.created_at) {\n      const duration = frame.closed_at - frame.created_at;\n      if (duration < 600000) score += 0.3; // Less than 10 minutes\n    }\n\n    return score;\n  }\n\n  /**\n   * Add non-conflicting frames to merge\n   */\n  private addNonConflictingFrames(\n    stack1: FrameStack,\n    stack2: FrameStack,\n    conflicts: MergeConflict[],\n    mergedFrames: Frame[],\n    keptFromStack1: string[],\n    keptFromStack2: string[]\n  ): void {\n    const conflictingIds = new Set<string>();\n    const mergedIds = new Set<string>(mergedFrames.map((f) => f.frame_id));\n\n    for (const conflict of conflicts) {\n      conflictingIds.add(conflict.frameId1);\n      conflictingIds.add(conflict.frameId2);\n    }\n\n    for (const frame of stack1.frames) {\n      if (\n        !conflictingIds.has(frame.frame_id) &&\n        !mergedIds.has(frame.frame_id)\n      ) {\n        mergedFrames.push(frame);\n        keptFromStack1.push(frame.frame_id);\n        mergedIds.add(frame.frame_id);\n      }\n    }\n\n    for (const frame of stack2.frames) {\n      if (\n        !conflictingIds.has(frame.frame_id) &&\n        !mergedIds.has(frame.frame_id)\n      ) {\n        mergedFrames.push(frame);\n        keptFromStack2.push(frame.frame_id);\n        mergedIds.add(frame.frame_id);\n      }\n    }\n  }\n\n  /**\n   * Find divergence point between stacks\n   */\n  private findDivergencePoint(stack1: FrameStack, stack2: FrameStack): number {\n    const events1 = stack1.events.sort((a, b) => a.ts - b.ts);\n    const events2 = stack2.events.sort((a, b) => a.ts - b.ts);\n\n    for (let i = 0; i < Math.min(events1.length, events2.length); i++) {\n      if (events1[i].event_id !== events2[i].event_id) {\n        return events1[i].ts;\n      }\n    }\n\n    return Math.min(\n      events1[events1.length - 1]?.ts || 0,\n      events2[events2.length - 1]?.ts || 0\n    );\n  }\n\n  /**\n   * Find common ancestor frame\n   */\n  private findCommonAncestor(\n    stack1: FrameStack,\n    stack2: FrameStack\n  ): string | undefined {\n    const frames1 = new Set(stack1.frames.map((f) => f.frame_id));\n\n    // Find the deepest common frame\n    let deepestCommon: Frame | undefined;\n    let maxDepth = -1;\n\n    for (const frame of stack2.frames) {\n      if (frames1.has(frame.frame_id) && frame.depth > maxDepth) {\n        deepestCommon = frame;\n        maxDepth = frame.depth;\n      }\n    }\n\n    return deepestCommon?.frame_id;\n  }\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/core/merge/types.js

@@ -0,0 +1 @@
+//# sourceMappingURL=types.js.map

package/dist/core/merge/types.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": [],
+  "sourcesContent": [],
+  "mappings": "",
+  "names": []
+}