@prisma-next/cli 0.12.0-dev.76 → 0.12.0-dev.78

package/dist/cli.mjs

@@ -7,15 +7,15 @@ import { createDbSchemaCommand } from "./commands/db-schema.mjs";
 import { createDbSignCommand } from "./commands/db-sign.mjs";
 import { createDbUpdateCommand } from "./commands/db-update.mjs";
 import { t as createDbVerifyCommand } from "./db-verify-C24FKhb7.mjs";
-import { t as createMigrationListCommand } from "./migration-list-CihF6w5z.mjs";
+import { t as createMigrationListCommand } from "./migration-list-DlJJ_38Z.mjs";
 import { createMigrateCommand } from "./commands/migrate.mjs";
 import { t as createMigrationCheckCommand } from "./migration-check-VwM8xCZV.mjs";
 import { createMigrationGraphCommand } from "./commands/migration-graph.mjs";
-import { t as createMigrationLogCommand } from "./migration-log-B75IArji.mjs";
+import { t as createMigrationLogCommand } from "./migration-log-CG0qQAFm.mjs";
 import { createMigrationNewCommand } from "./commands/migration-new.mjs";
 import { t as createMigrationPlanCommand } from "./migration-plan-z5Ing-TD.mjs";
 import { createMigrationShowCommand } from "./commands/migration-show.mjs";
-import { r as createMigrationStatusCommand } from "./migration-status-CSVe6ZlD.mjs";
+import { r as createMigrationStatusCommand } from "./migration-status-CD-LC2Ip.mjs";
 import { createRefCommand } from "./commands/ref.mjs";
 import { t as createTelemetryCommand } from "./telemetry-BIM4beEO.mjs";
 import { Command } from "commander";
@@ -24,7 +24,7 @@ import { ensureInstallationId, readUserConfig, resolveGating, runTelemetry, user
 import { distance } from "closest-match";
 import { fileURLToPath } from "node:url";
 //#region package.json
-var version = "0.12.0-dev.76";
+var version = "0.12.0-dev.78";
 //#endregion
 //#region src/commands/init/templates/code-templates.ts
 function targetPackageName(target) {

package/dist/commands/migrate.mjs

@@ -5,8 +5,8 @@ import { n as planMemberPath, t as createControlClient } from "../client-CJzuo5w
 import { a as refuseContractSpaceIntegrity, i as loadContractSpaceAggregateForCli, n as buildReadAggregate } from "../contract-space-aggregate-loader-ClI1KN6d.mjs";
 import { i as readContractIR, r as executeRefAdvancement } from "../ref-advancement-BkXlikCA.mjs";
 import { t as mapContractAtError } from "../contract-at-errors-CFXsstzm.mjs";
-import { d as highlightFromEdgeAnnotations, f as indentMigrationGraphTreeBlock, h as buildGrid, i as formatOnPathMigrationRow, m as buildMigrationGraphRows, n as computeMaxDirNameWidth, r as renderMigrationGraphCommand, t as computeLabelColumn } from "../migration-graph-command-render-BAOzyYF6.mjs";
-import { r as listRefsByContractHash } from "../migration-list-CihF6w5z.mjs";
+import { d as highlightFromEdgeAnnotations, f as indentMigrationGraphTreeBlock, h as buildGrid, i as formatOnPathMigrationRow, m as buildMigrationGraphRows, n as computeMaxDirNameWidth, r as renderMigrationGraphCommand, t as computeLabelColumn } from "../migration-graph-command-render-CEez7YUK.mjs";
+import { r as listRefsByContractHash } from "../migration-list-DlJJ_38Z.mjs";
 import { Command } from "commander";
 import { ifDefined } from "@prisma-next/utils/defined";
 import { notOk, ok } from "@prisma-next/utils/result";

package/dist/commands/migration-graph.mjs

@@ -1,8 +1,8 @@
 import { t as loadConfig } from "../config-loader-p9JMrekQ.mjs";
 import { A as formatStyledHeader, _ as createTerminalUI, d as setCommandSeeAlso, g as parseGlobalFlagsOrExit, l as setCommandDescriptions, s as resolveMigrationPaths, t as addGlobalOptions, u as setCommandExamples, y as handleResult } from "../command-helpers-DGMvGBeX.mjs";
 import { n as buildReadAggregate } from "../contract-space-aggregate-loader-ClI1KN6d.mjs";
-import { a as renderMigrationGraphLegend, f as indentMigrationGraphTreeBlock, l as computeGlobalMaxDirNameWidth, p as renderMigrationGraphSpaceTree, u as computeGlobalMaxEdgeTreePrefixWidth } from "../migration-graph-command-render-BAOzyYF6.mjs";
-import { c as validateLegendOptions, i as migrationSpaceListEntriesFromAggregate, o as runMigrationList, r as listRefsByContractHash, s as shouldShowLegend } from "../migration-list-CihF6w5z.mjs";
+import { a as renderMigrationGraphLegend, f as indentMigrationGraphTreeBlock, l as computeGlobalMaxDirNameWidth, p as renderMigrationGraphSpaceTree, u as computeGlobalMaxEdgeTreePrefixWidth } from "../migration-graph-command-render-CEez7YUK.mjs";
+import { c as validateLegendOptions, i as migrationSpaceListEntriesFromAggregate, o as runMigrationList, r as listRefsByContractHash, s as shouldShowLegend } from "../migration-list-DlJJ_38Z.mjs";
 import { Command } from "commander";
 import { ifDefined } from "@prisma-next/utils/defined";
 import { ok } from "@prisma-next/utils/result";

package/dist/commands/migration-list.mjs

@@ -1,2 +1,2 @@
-import { a as renderMigrationListHumanOutput, i as migrationSpaceListEntriesFromAggregate, n as executeMigrationListCommand, o as runMigrationList, r as listRefsByContractHash, t as createMigrationListCommand } from "../migration-list-CihF6w5z.mjs";
+import { a as renderMigrationListHumanOutput, i as migrationSpaceListEntriesFromAggregate, n as executeMigrationListCommand, o as runMigrationList, r as listRefsByContractHash, t as createMigrationListCommand } from "../migration-list-DlJJ_38Z.mjs";
 export { createMigrationListCommand, executeMigrationListCommand, listRefsByContractHash, migrationSpaceListEntriesFromAggregate, renderMigrationListHumanOutput, runMigrationList };

package/dist/commands/migration-log.mjs

@@ -1,2 +1,2 @@
-import { n as executeMigrationLogCommand, t as createMigrationLogCommand } from "../migration-log-B75IArji.mjs";
+import { n as executeMigrationLogCommand, t as createMigrationLogCommand } from "../migration-log-CG0qQAFm.mjs";
 export { createMigrationLogCommand, executeMigrationLogCommand };

package/dist/commands/migration-status.mjs

@@ -1,3 +1,3 @@
 import { n as migrationStatusJsonResultSchema } from "../schemas-KhXMzNA_.mjs";
-import { a as formatStatusHumanOutput, i as executeMigrationStatusCommand, n as buildStatusHeadline, o as formatStatusSummary, r as createMigrationStatusCommand, t as buildNoPathSummary } from "../migration-status-CSVe6ZlD.mjs";
+import { a as formatStatusHumanOutput, i as executeMigrationStatusCommand, n as buildStatusHeadline, o as formatStatusSummary, r as createMigrationStatusCommand, t as buildNoPathSummary } from "../migration-status-CD-LC2Ip.mjs";
 export { buildNoPathSummary, buildStatusHeadline, createMigrationStatusCommand, executeMigrationStatusCommand, formatStatusHumanOutput, formatStatusSummary, migrationStatusJsonResultSchema };

package/dist/{migration-graph-command-render-BAOzyYF6.mjs → migration-graph-command-render-CEez7YUK.mjs}

@@ -96,9 +96,10 @@ function renderCell(cell, colorEnabled, alphabet) {
 * Render a single grid row to a coloured string. A completely empty row returns
 * the empty string (the row is NOT dropped) so callers that pair grid rows with
 * an external per-row label list keep a 1:1 index correspondence. `renderGrid`
-* itself drops empty rows for its standalone output.
+* itself drops empty rows for its standalone output (but preserves separator rows).
 */
 function renderGridRow(row, opts = {}) {
+	if (row[0]?.separator === true) return "";
 	let lastNonEmpty = -1;
 	for (let i = row.length - 1; i >= 0; i--) {
 		const cell = row[i];
@@ -143,8 +144,6 @@ function padFromHashColumn(text, width) {
 * inbound migration rows — in display order (tips first, then roots).
 */
 function buildLaneAssignment(nodes, edges) {
-	const allNodes = /* @__PURE__ */ new Set();
-	for (const n of nodes) if (n !== null) allNodes.add(n);
 	const fwdEdges = edges.filter((e) => e.kind === "forward" && e.from !== e.to);
 	const outbound = /* @__PURE__ */ new Map();
 	const inbound = /* @__PURE__ */ new Map();
@@ -158,13 +157,22 @@ function buildLaneAssignment(nodes, edges) {
 	}
 	for (const list of outbound.values()) list.sort((a, b) => a.dirName.localeCompare(b.dirName));
 	for (const list of inbound.values()) list.sort((a, b) => a.dirName.localeCompare(b.dirName));
+	const components = [];
+	let current = [];
+	for (const n of nodes) if (n === null) {
+		if (current.length > 0) components.push(current);
+		current = [];
+	} else current.push(n);
+	if (current.length > 0) components.push(current);
+	const allNodes = /* @__PURE__ */ new Set();
+	for (const n of nodes) if (n !== null) allNodes.add(n);
 	const nodeRank = /* @__PURE__ */ new Map();
 	for (const n of allNodes) nodeRank.set(n, 0);
 	for (let pass = 0; pass < allNodes.size; pass++) {
 		let changed = false;
-		for (const [from, edges] of outbound) {
+		for (const [from, es] of outbound) {
 			const base = nodeRank.get(from) ?? 0;
-			for (const e of edges) {
+			for (const e of es) {
 				const next = base + 1;
 				if (next > (nodeRank.get(e.to) ?? 0)) {
 					nodeRank.set(e.to, next);
@@ -175,60 +183,117 @@ function buildLaneAssignment(nodes, edges) {
 		if (!changed) break;
 	}
 	const nodeLane = /* @__PURE__ */ new Map();
-	let nextLane = 0;
-	const roots = [];
-	for (const n of allNodes) if ((inbound.get(n) ?? []).length === 0) roots.push(n);
-	roots.sort((a, b) => {
-		if (a === EMPTY_CONTRACT_HASH) return -1;
-		if (b === EMPTY_CONTRACT_HASH) return 1;
-		return a.localeCompare(b);
-	});
-	const bfsQueue = [];
-	for (const root of roots) if (!nodeLane.has(root)) {
-		nodeLane.set(root, nextLane++);
-		bfsQueue.push({
-			node: root,
-			lane: nodeLane.get(root)
+	const edgeLane = /* @__PURE__ */ new Map();
+	let totalLanes = 0;
+	for (const componentNodes of components) {
+		const componentSet = new Set(componentNodes);
+		let nextLane = 0;
+		const roots = [];
+		for (const n of componentNodes) if ((inbound.get(n) ?? []).length === 0) roots.push(n);
+		roots.sort((a, b) => {
+			if (a === EMPTY_CONTRACT_HASH) return -1;
+			if (b === EMPTY_CONTRACT_HASH) return 1;
+			return a.localeCompare(b);
 		});
-	}
-	let head = 0;
-	while (head < bfsQueue.length) {
-		const { node, lane } = bfsQueue[head++];
-		const children = outbound.get(node) ?? [];
-		let first = true;
-		for (const childEdge of children) {
-			const child = childEdge.to;
-			if (!nodeLane.has(child)) {
-				const childLane = first ? lane : nextLane++;
-				nodeLane.set(child, childLane);
-				bfsQueue.push({
-					node: child,
-					lane: childLane
-				});
+		const bfsQueue = [];
+		for (const root of roots) if (!nodeLane.has(root)) {
+			nodeLane.set(root, nextLane++);
+			bfsQueue.push({
+				node: root,
+				lane: nodeLane.get(root)
+			});
+		}
+		let head = 0;
+		while (head < bfsQueue.length) {
+			const { node, lane } = bfsQueue[head++];
+			const children = outbound.get(node) ?? [];
+			let first = true;
+			for (const childEdge of children) {
+				const child = childEdge.to;
+				if (!componentSet.has(child)) continue;
+				if (!nodeLane.has(child)) {
+					const childLane = first ? lane : nextLane++;
+					nodeLane.set(child, childLane);
+					bfsQueue.push({
+						node: child,
+						lane: childLane
+					});
+					edgeLane.set(childEdge.migrationHash, childLane);
+				} else edgeLane.set(childEdge.migrationHash, Math.max(lane, nodeLane.get(child)));
+				first = false;
+			}
+		}
+		for (const n of componentNodes) if (!nodeLane.has(n)) nodeLane.set(n, nextLane++);
+		for (const n of componentNodes) {
+			const parents = inbound.get(n);
+			if (!parents || parents.length <= 1) continue;
+			let trunkParent = parents[0].from;
+			let trunkRank = nodeRank.get(trunkParent) ?? 0;
+			let trunkLane = nodeLane.get(trunkParent) ?? 0;
+			for (let i = 1; i < parents.length; i++) {
+				const parent = parents[i].from;
+				const rank = nodeRank.get(parent) ?? 0;
+				const lane = nodeLane.get(parent) ?? 0;
+				if (rank > trunkRank || rank === trunkRank && lane < trunkLane) {
+					trunkParent = parent;
+					trunkRank = rank;
+					trunkLane = lane;
+				}
+			}
+			const trunkParentLane = nodeLane.get(trunkParent) ?? 0;
+			const currentNodeLane = nodeLane.get(n) ?? 0;
+			if (currentNodeLane === trunkParentLane) continue;
+			nodeLane.set(n, trunkParentLane);
+			for (const parentEdge of parents) if (parentEdge.from === trunkParent) edgeLane.set(parentEdge.migrationHash, trunkParentLane);
+			const bfsDescendants = [n];
+			let descHead = 0;
+			while (descHead < bfsDescendants.length) {
+				const current = bfsDescendants[descHead++];
+				const children = outbound.get(current) ?? [];
+				for (const childEdge of children) {
+					const child = childEdge.to;
+					if (!componentSet.has(child)) continue;
+					if ((nodeLane.get(child) ?? 0) !== currentNodeLane) continue;
+					nodeLane.set(child, trunkParentLane);
+					const existingEdgeLane = edgeLane.get(childEdge.migrationHash);
+					if (existingEdgeLane !== void 0 && existingEdgeLane === currentNodeLane) edgeLane.set(childEdge.migrationHash, trunkParentLane);
+					bfsDescendants.push(child);
+				}
 			}
-			first = false;
 		}
+		if (nextLane > totalLanes) totalLanes = nextLane;
 	}
-	for (const n of allNodes) if (!nodeLane.has(n)) nodeLane.set(n, nextLane++);
 	return {
 		nodeLane,
 		nodeRank,
-		numLanes: nextLane
+		edgeLane,
+		numLanes: totalLanes
 	};
 }
 function computeDisplayOrder(nodes, nodeLane, nodeRank) {
 	const seen = /* @__PURE__ */ new Set();
 	const result = [];
+	let componentBuffer = [];
+	function flushComponent() {
+		componentBuffer.sort((a, b) => b.rank - a.rank || a.lane - b.lane);
+		for (const d of componentBuffer) result.push(d);
+		componentBuffer = [];
+	}
 	for (const n of nodes) {
-		if (n === null || seen.has(n)) continue;
+		if (n === null) {
+			flushComponent();
+			result.push(null);
+			continue;
+		}
+		if (seen.has(n)) continue;
 		seen.add(n);
-		result.push({
+		componentBuffer.push({
 			hash: n,
 			lane: nodeLane.get(n) ?? 0,
 			rank: nodeRank.get(n) ?? 0
 		});
 	}
-	result.sort((a, b) => b.rank - a.rank || a.lane - b.lane);
+	flushComponent();
 	return result;
 }
 /** Create an empty cell. */
@@ -241,12 +306,11 @@ function buildGrid(rowModel, opts = {}, highlight = {
 }) {
 	const colsPerLane = opts.colsPerLane ?? 2;
 	const isFocus = highlight.mode === "focus";
-	const { nodeLane, nodeRank, numLanes } = buildLaneAssignment(rowModel.nodes, rowModel.edges);
+	const { nodeLane, nodeRank, edgeLane, numLanes } = buildLaneAssignment(rowModel.nodes, rowModel.edges);
 	const displayOrder = computeDisplayOrder(rowModel.nodes, nodeLane, nodeRank);
 	const displayIndex = /* @__PURE__ */ new Map();
-	displayOrder.forEach((d, i) => {
-		displayIndex.set(d.hash, i);
-	});
+	let nodeIdx = 0;
+	for (const d of displayOrder) if (d !== null) displayIndex.set(d.hash, nodeIdx++);
 	const rollbackEdges = rowModel.edges.filter((e) => e.kind === "rollback" && e.from !== e.to);
 	const adjacentRollbacks = [];
 	const skippingRollbacks = [];
@@ -257,27 +321,86 @@ function buildGrid(rowModel, opts = {}, highlight = {
 		if (ti === si + 1) adjacentRollbacks.push(e);
 		else skippingRollbacks.push(e);
 	}
-	const colourLaneOf = /* @__PURE__ */ new Map();
-	[...skippingRollbacks].sort((a, b) => a.dirName.localeCompare(b.dirName)).forEach((e, i) => {
-		colourLaneOf.set(e.migrationHash, numLanes + i);
-	});
-	const geomOrder = [...skippingRollbacks].sort((a, b) => {
-		const ta = displayIndex.get(a.to) ?? 0;
-		const tb = displayIndex.get(b.to) ?? 0;
-		if (ta !== tb) return tb - ta;
-		return (displayIndex.get(a.from) ?? 0) - (displayIndex.get(b.from) ?? 0);
+	const targetGroups = /* @__PURE__ */ new Map();
+	for (const e of skippingRollbacks) {
+		const group = targetGroups.get(e.to);
+		if (group) group.push(e);
+		else targetGroups.set(e.to, [e]);
+	}
+	const sortedTargetKeys = [...targetGroups.keys()].sort((a, b) => {
+		const ta = displayIndex.get(a) ?? 0;
+		return (displayIndex.get(b) ?? 0) - ta;
 	});
+	const numTargetGroups = sortedTargetKeys.length;
 	const geomLaneOf = /* @__PURE__ */ new Map();
-	const outermost = numLanes + skippingRollbacks.length - 1;
-	geomOrder.forEach((e, i) => {
-		geomLaneOf.set(e.migrationHash, outermost - i);
+	const outermostGroup = numLanes + numTargetGroups - 1;
+	sortedTargetKeys.forEach((targetHash, i) => {
+		const groupGeomLane = outermostGroup - i;
+		for (const e of targetGroups.get(targetHash)) geomLaneOf.set(e.migrationHash, groupGeomLane);
 	});
+	const totalDisplayNodes = displayOrder.filter((d) => d !== null).length;
+	const planeLaneOf = /* @__PURE__ */ new Map();
+	for (const e of skippingRollbacks) {
+		const si = displayIndex.get(e.from) ?? 0;
+		planeLaneOf.set(e.migrationHash, totalDisplayNodes - si);
+	}
+	const PALETTE_SIZE = 6;
+	const GREEN_PALETTE_IDX = 5;
+	const arcSourceIndex = /* @__PURE__ */ new Map();
+	const arcTargetIndex = /* @__PURE__ */ new Map();
+	for (const e of skippingRollbacks) {
+		arcSourceIndex.set(e.migrationHash, displayIndex.get(e.from) ?? 0);
+		arcTargetIndex.set(e.migrationHash, displayIndex.get(e.to) ?? 0);
+	}
+	const arcsByTarget = /* @__PURE__ */ new Map();
+	const arcsBySource = /* @__PURE__ */ new Map();
+	for (const e of skippingRollbacks) {
+		const tb = arcsByTarget.get(e.to);
+		if (tb) tb.push(e);
+		else arcsByTarget.set(e.to, [e]);
+		const sb = arcsBySource.get(e.from);
+		if (sb) sb.push(e);
+		else arcsBySource.set(e.from, [e]);
+	}
+	const colourLaneOf = /* @__PURE__ */ new Map();
+	const activeArcColours = /* @__PURE__ */ new Map();
+	const activeFwdLaneColours = /* @__PURE__ */ new Set();
+	for (let i = displayOrder.length - 1; i >= 0; i--) {
+		const nd = displayOrder[i];
+		if (nd === null || nd === void 0) continue;
+		const { hash: nodeHash } = nd;
+		const nodeFwdLane = nodeLane.get(nodeHash) ?? 0;
+		activeFwdLaneColours.add(nodeFwdLane % PALETTE_SIZE);
+		const sortedIncoming = [...arcsByTarget.get(nodeHash) ?? []].sort((a, b) => a.dirName.localeCompare(b.dirName));
+		for (const arc of sortedIncoming) {
+			const originLaneColour = (nodeLane.get(arc.from) ?? 0) % PALETTE_SIZE;
+			const occupied = new Set(activeFwdLaneColours);
+			for (const c of activeArcColours.values()) occupied.add(c);
+			occupied.add(GREEN_PALETTE_IDX);
+			occupied.add(originLaneColour);
+			let chosen = -1;
+			for (let ci = 0; ci < PALETTE_SIZE; ci++) if (!occupied.has(ci)) {
+				chosen = ci;
+				break;
+			}
+			if (chosen === -1) {
+				for (let ci = 0; ci < PALETTE_SIZE; ci++) if (ci !== GREEN_PALETTE_IDX) {
+					chosen = ci;
+					break;
+				}
+			}
+			colourLaneOf.set(arc.migrationHash, chosen === -1 ? 0 : chosen);
+			activeArcColours.set(arc.migrationHash, chosen === -1 ? 0 : chosen);
+		}
+		for (const arc of arcsBySource.get(nodeHash) ?? []) activeArcColours.delete(arc.migrationHash);
+	}
 	const routedBackArcs = skippingRollbacks.map((e) => ({
 		edge: e,
 		sourceIndex: displayIndex.get(e.from) ?? 0,
 		targetIndex: displayIndex.get(e.to) ?? 0,
 		geomLane: geomLaneOf.get(e.migrationHash) ?? numLanes,
-		colourLane: colourLaneOf.get(e.migrationHash) ?? numLanes
+		colourLane: colourLaneOf.get(e.migrationHash) ?? 0,
+		planeLane: planeLaneOf.get(e.migrationHash) ?? numLanes
 	}));
 	const backArcsBySource = /* @__PURE__ */ new Map();
 	const backArcsByTarget = /* @__PURE__ */ new Map();
@@ -300,7 +423,7 @@ function buildGrid(rowModel, opts = {}, highlight = {
 		else adjacentByTarget.set(e.to, [e]);
 	}
 	for (const list of adjacentBySource.values()) list.sort((a, b) => a.dirName.localeCompare(b.dirName));
-	const totalCols = (numLanes + skippingRollbacks.length) * colsPerLane;
+	const totalCols = (numLanes + numTargetGroups) * colsPerLane;
 	const fwdEdges = rowModel.edges.filter((e) => e.kind === "forward" && e.from !== e.to);
 	const selfEdges = rowModel.edges.filter((e) => e.kind === "self");
 	const outboundFwd = /* @__PURE__ */ new Map();
@@ -412,8 +535,8 @@ function buildGrid(rowModel, opts = {}, highlight = {
 	}
 	function backArcPlane(arc) {
 		const role = roleOf(arc.edge.migrationHash);
-		if (!isFocus) return arc.colourLane;
-		return role === "on-path" ? 0 : arc.colourLane + 1;
+		if (!isFocus) return arc.planeLane;
+		return role === "on-path" ? 0 : arc.planeLane + 1;
 	}
 	function composeLine(row, col, line, dirs, plane, extra) {
 		const existing = row[col];
@@ -507,14 +630,24 @@ function buildGrid(rowModel, opts = {}, highlight = {
 		return row;
 	}
 	for (const nodeDisplay of displayOrder) {
+		if (nodeDisplay === null) {
+			const sepRow = makeRow();
+			sepRow[0] = {
+				lines: [],
+				separator: true
+			};
+			grid.push(sepRow);
+			continue;
+		}
 		const { hash: nodeHash } = nodeDisplay;
 		const nodeLaneNum = nodeLane.get(nodeHash) ?? 0;
 		activeLanes.add(nodeLaneNum);
 		const outEdges = outboundFwd.get(nodeHash) ?? [];
 		if (outEdges.length > 1) {
-			const trunkChildLane = nodeLane.get(outEdges[0].to) ?? nodeLaneNum;
+			const trunkEdgeForFork = outEdges[0];
+			const trunkChildLane = edgeLane.get(trunkEdgeForFork.migrationHash) ?? nodeLane.get(trunkEdgeForFork.to) ?? nodeLaneNum;
 			const branchEntries = outEdges.slice(1).map((e) => ({
-				lane: nodeLane.get(e.to) ?? 0,
+				lane: edgeLane.get(e.migrationHash) ?? nodeLane.get(e.to) ?? 0,
 				edge: e
 			})).filter((b) => b.lane !== trunkChildLane && activeLanes.has(b.lane));
 			if (branchEntries.length > 0) {
@@ -566,12 +699,19 @@ function buildGrid(rowModel, opts = {}, highlight = {
 				edge: adj
 			});
 		}
-		const inEdges = inboundFwd.get(nodeHash) ?? [];
-		inEdges.sort((a, b) => a.dirName.localeCompare(b.dirName));
-		for (const edge of inEdges) {
-			const edgeLane = Math.max(nodeLane.get(edge.from) ?? 0, nodeLane.get(edge.to) ?? 0);
-			laneCurrentEdge.set(edgeLane, edge);
+		function edgeLaneFor(edge) {
+			const override = edgeLane.get(edge.migrationHash);
+			if (override !== void 0) return override;
+			return Math.max(nodeLane.get(edge.from) ?? 0, nodeLane.get(edge.to) ?? 0);
 		}
+		const inEdges = inboundFwd.get(nodeHash) ?? [];
+		inEdges.sort((a, b) => {
+			const aLane = edgeLaneFor(a);
+			const bLane = edgeLaneFor(b);
+			if (aLane !== bLane) return aLane - bLane;
+			return a.dirName.localeCompare(b.dirName);
+		});
+		for (const edge of inEdges) laneCurrentEdge.set(edgeLaneFor(edge), edge);
 		{
 			const teeArcs = backArcsBySource.get(nodeHash) ?? [];
 			for (const arc of teeArcs) {
@@ -589,7 +729,7 @@ function buildGrid(rowModel, opts = {}, highlight = {
 		}
 		if (inEdges.length > 1) {
 			const branchEntries = inEdges.slice(1).map((e) => ({
-				lane: nodeLane.get(e.from) ?? 0,
+				lane: edgeLaneFor(e),
 				edge: e
 			}));
 			const trunkEdge = inEdges[0];
@@ -599,16 +739,14 @@ function buildGrid(rowModel, opts = {}, highlight = {
 			for (const b of branchEntries) activeLanes.add(b.lane);
 		}
 		for (const edge of inEdges) {
-			const fromLane = nodeLane.get(edge.from) ?? 0;
-			const toLane = nodeLane.get(edge.to) ?? 0;
-			const edgeLane = Math.max(fromLane, toLane);
+			const eLane = edgeLaneFor(edge);
 			const row = makeRow();
-			const railCol = edgeLane * colsPerLane;
-			const connCol = edgeLane * colsPerLane + 1;
-			const line = lineRefFor(edge, edgeLane);
+			const railCol = eLane * colsPerLane;
+			const connCol = eLane * colsPerLane + 1;
+			const line = lineRefFor(edge, eLane);
 			row[railCol] = vertCell(line);
 			row[connCol] = dirCell(line, new Set(["up"]));
-			placeVerticals(row, new Set([edgeLane]));
+			placeVerticals(row, new Set([eLane]));
 			placeBackVerticals(row);
 			grid.push(row);
 		}
@@ -1439,7 +1577,7 @@ const DB_MARKER_NAME = "db";
 * environment (NO_COLOR, piped output). Used so on-path green / off-path dim are
 * deterministically emitted in tests that request colour while NO_COLOR is set.
 */
-const { dim: forcedDim, bold: forcedBold } = createColors({ useColor: true });
+const { dim: forcedDim } = createColors({ useColor: true });
 const { greenBright: forcedGreen } = createColors({ useColor: true });
 /**
 * The two label styles used in `migrate --show` path-highlight mode.
@@ -1583,13 +1721,13 @@ function formatMigrationLabel(edge, dirNameWidth, opts, lane) {
 	let dirNameStyler;
 	let hashOverride;
 	if (highlight === "on-path") {
-		dirNameStyler = (text) => bold(text);
+		dirNameStyler = opts.colorize ? forcedGreen : (text) => text;
 		hashOverride = void 0;
 	} else if (highlight === "off-path") {
 		dirNameStyler = opts.colorize ? forcedDim : style.dirName;
 		hashOverride = opts.colorize ? forcedDim : void 0;
 	} else if (opts.colorize && lane !== void 0) {
-		dirNameStyler = (text) => forcedBold(laneColorizer(lane)(text));
+		dirNameStyler = (text) => laneColorizer(lane)(text);
 		hashOverride = void 0;
 	} else {
 		dirNameStyler = style.dirName;
@@ -1819,4 +1957,4 @@ function renderMigrationGraphCommand(input) {
 //#endregion
 export { migrationListEmptySource as _, renderMigrationGraphLegend as a, renderMigrationListWithStyle as c, highlightFromEdgeAnnotations as d, indentMigrationGraphTreeBlock as f, abbreviateContractHash as g, buildGrid as h, formatOnPathMigrationRow as i, computeGlobalMaxDirNameWidth as l, buildMigrationGraphRows as m, computeMaxDirNameWidth as n, createAnsiMigrationListStyler as o, renderMigrationGraphSpaceTree as p, renderMigrationGraphCommand as r, IDENTITY_MIGRATION_LIST_STYLER as s, computeLabelColumn as t, computeGlobalMaxEdgeTreePrefixWidth as u, migrationListForwardArrow as v };
 
-//# sourceMappingURL=migration-graph-command-render-BAOzyYF6.mjs.map
+//# sourceMappingURL=migration-graph-command-render-CEez7YUK.mjs.map