♻️ refactor(engine): rename mergedIntoStem to mergedIntoBaseStem for clarity

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: 2 people

packages/analysis-engine/src/csm.spec.ts

@@ -63,12 +63,12 @@ describe("csm", () => {
   // Set mergedIntoStem flags based on merge structure
   // Node 8 (parents=[7, 13]) is merged into master at node 2
   // Node 11 (parents=[10, 16]) is merged into master at node 3
-  fakeCommitNodeDict.get("8")!.mergedIntoStem = "master";
-  fakeCommitNodeDict.get("11")!.mergedIntoStem = "master";
+  fakeCommitNodeDict.get("8")!.mergedIntoBaseStem = "master";
+  fakeCommitNodeDict.get("11")!.mergedIntoBaseStem = "master";
   // Node 13 is merged into sub1 at node 8
-  fakeCommitNodeDict.get("13")!.mergedIntoStem = "sub1";
+  fakeCommitNodeDict.get("13")!.mergedIntoBaseStem = "sub1";
   // Node 16 is merged into sub1 at node 11
-  fakeCommitNodeDict.get("16")!.mergedIntoStem = "sub1";
+  fakeCommitNodeDict.get("16")!.mergedIntoBaseStem = "sub1";
 
   describe("buildCSM", () => {
     let csmDict: CSMDictionary;
@@ -150,12 +150,12 @@ describe("csm", () => {
     // Set mergedIntoStem flags for sub1 as base branch
     // Node 8 (parents=[7, 13]) is merged into sub1 at itself
     // Node 11 (parents=[10, 16]) is merged into sub1 at itself
-    fakeCommitNodeDictWithSub1.get("8")!.mergedIntoStem = "sub1";
-    fakeCommitNodeDictWithSub1.get("11")!.mergedIntoStem = "sub1";
+    fakeCommitNodeDictWithSub1.get("8")!.mergedIntoBaseStem = "sub1";
+    fakeCommitNodeDictWithSub1.get("11")!.mergedIntoBaseStem = "sub1";
     // Node 13 is merged into sub1 at node 8
-    fakeCommitNodeDictWithSub1.get("13")!.mergedIntoStem = "sub1";
+    fakeCommitNodeDictWithSub1.get("13")!.mergedIntoBaseStem = "sub1";
     // Node 16 is merged into sub1 at node 11
-    fakeCommitNodeDictWithSub1.get("16")!.mergedIntoStem = "sub1";
+    fakeCommitNodeDictWithSub1.get("16")!.mergedIntoBaseStem = "sub1";
 
     beforeAll(() => {
       csmDict = buildCSMDict(fakeCommitNodeDictWithSub1, fakeStemDictWithSub1, "sub1");
@@ -253,9 +253,9 @@ describe("csm", () => {
     );
 
     // Set mergedIntoStem flags
-    octopusCommitNodeDict.get("3")!.mergedIntoStem = "master";
-    octopusCommitNodeDict.get("5")!.mergedIntoStem = "master";
-    octopusCommitNodeDict.get("7")!.mergedIntoStem = "master";
+    octopusCommitNodeDict.get("3")!.mergedIntoBaseStem = "master";
+    octopusCommitNodeDict.get("5")!.mergedIntoBaseStem = "master";
+    octopusCommitNodeDict.get("7")!.mergedIntoBaseStem = "master";
 
     it("should handle octopus merge with 4 parents", () => {
       const csmDict = buildCSMDict(octopusCommitNodeDict, octopusStemDict, "master");
@@ -379,7 +379,7 @@ describe("csm", () => {
       new Map<string, CommitNode>()
     );
 
-    edgeCaseCommitNodeDict.get("2")!.mergedIntoStem = "master";
+    edgeCaseCommitNodeDict.get("2")!.mergedIntoBaseStem = "master";
 
     it("should filter out non-existent parent commits", () => {
       const csmDict = buildCSMDict(edgeCaseCommitNodeDict, edgeCaseStemDict, "master");

packages/analysis-engine/src/csm.ts

@@ -50,7 +50,7 @@ const buildCSMNode = (baseCommitNode: CommitNode, commitDict: CommitDict, stemDi
     // First, find the end index (before next mergedIntoStem or end of stem)
     let endIndex = squashStem.nodes.length - 1;
     for (let i = squashStartNodeIndex + 1; i < squashStem.nodes.length; i++) {
-      if (squashStem.nodes[i].mergedIntoStem) {
+      if (squashStem.nodes[i].mergedIntoBaseStem) {
         endIndex = i - 1;
         break;
       }

packages/analysis-engine/src/stem.ts

@@ -19,7 +19,7 @@ export function getStemNodes(
         if (idx === 0) return;
         const parentNode = commitDict.get(parent);
         if (parentNode) {
-          parentNode.mergedIntoStem = stemId;
+          parentNode.mergedIntoBaseStem = stemId;
           q.push(parentNode);
         }
       }, q);

packages/analysis-engine/src/types/CommitNode.ts

@@ -4,7 +4,7 @@ export interface CommitNode {
   // stemId does not exist before traversal.
   stemId?: string;
   // ID of the stem this node was merged into (for merge parents)
-  mergedIntoStem?: string;
+  mergedIntoBaseStem?: string;
   commit: CommitRaw;
 }