@gfxlabs/third-eye-cli 3.24.2 → 3.25.0

package/dist/bin.mjs

@@ -184,7 +184,8 @@ z$1.object({
 	storyName: z$1.string().optional(),
 	storyId: z$1.string().optional(),
 	storyArgs: z$1.record(z$1.string(), z$1.unknown()).optional(),
-	tags: z$1.array(z$1.string()).optional()
+	tags: z$1.array(z$1.string()).optional(),
+	designUrl: z$1.string().optional()
 });
 //#endregion
 //#region src/config.ts
@@ -1035,7 +1036,8 @@ const generateStorybookShotItems = (baseUrl, stories, mask, modeBreakpoints, bro
 			componentPath: story.kind,
 			storyName: story.story,
 			storyId: story.id,
-			storyArgs: story.parameters?.thirdeye?.args
+			storyArgs: story.parameters?.thirdeye?.args,
+			designUrl: (story.parameters?.design)?.url
 		};
 		const storyLevelBreakpoints = story.parameters?.thirdeye?.breakpoints ?? [];
 		const breakpoints = selectBreakpoints(config.breakpoints, modeBreakpoints, storyLevelBreakpoints);
@@ -1640,6 +1642,12 @@ const createShots = async (turboSnapFilter) => {
 //#region src/git.ts
 const INITIAL_BATCH_SIZE = 20;
 /**
+* Check if a commit exists in the local git index.
+*/
+const commitExists = (commit) => {
+	return execGit(`git cat-file -t ${commit}`) === "commit";
+};
+/**
 * Execute a git command and return the trimmed output.
 */
 const execGit = (command) => {
@@ -1652,34 +1660,28 @@ const execGit = (command) => {
 		return "";
 	}
 };
-/**
-* Find the "covering" set of ancestor commits that have builds on the server.
-*
-* This mirrors Chromatic's approach:
-* 1. Walk git history with `git rev-list`
-* 2. Ask the server which commits have builds
-* 3. Use `--not` to exclude ancestors of commits with builds
-* 4. Repeat with exponentially larger batches until no more uncovered commits
-*
-* The result is the minimal set of ancestor commits with builds such that
-* every ancestor of HEAD either has a build or is an ancestor of a commit
-* with a build.
-*/
-const getParentCommits = async (hasBuildsWithCommits) => {
+const getParentCommits = async (hasBuildsWithCommits, options) => {
 	if (!execGit("git rev-parse HEAD")) {
 		log.process("info", "general", "Not a git repository, skipping ancestor detection");
-		return [];
+		return {
+			parentCommits: [],
+			visitedCommitsWithoutBuilds: []
+		};
 	}
 	if (!execGit("git --no-pager log -n 1 --skip=1 --format=\"%H\"")) {
 		log.process("info", "general", "Initial commit, no ancestors");
-		return [];
+		return {
+			parentCommits: [],
+			visitedCommitsWithoutBuilds: []
+		};
 	}
-	let commitsWithBuilds = [];
+	const sinceArg = options?.firstCommittedAtSeconds ? `--since ${options.firstCommittedAtSeconds}` : "";
+	let commitsWithBuilds = [...options?.initialCommitsWithBuilds ?? []];
 	let commitsWithoutBuilds = [];
 	let limit = INITIAL_BATCH_SIZE;
 	for (;;) {
 		const notArgs = commitsWithBuilds.map((c) => c.trim()).join(" ");
-		const output = execGit(`git rev-list HEAD -n ${limit + commitsWithoutBuilds.length}${notArgs ? ` --not ${notArgs}` : ""}`);
+		const output = execGit(`git rev-list HEAD ${sinceArg} -n ${limit + commitsWithoutBuilds.length}${notArgs ? ` --not ${notArgs}` : ""}`);
 		const candidates = (output ? output.split("\n").filter(Boolean) : []).filter((c) => !commitsWithBuilds.includes(c)).filter((c) => !commitsWithoutBuilds.includes(c)).slice(0, limit);
 		if (candidates.length === 0) break;
 		log.process("info", "general", `🔍 Checking ${candidates.length} commits for builds (batch size ${limit})`);
@@ -1695,7 +1697,10 @@ const getParentCommits = async (hasBuildsWithCommits) => {
 	}
 	if (commitsWithBuilds.length === 0) {
 		log.process("info", "general", "No ancestor builds found — this may be the first build");
-		return [];
+		return {
+			parentCommits: [],
+			visitedCommitsWithoutBuilds: commitsWithoutBuilds
+		};
 	}
 	if (commitsWithBuilds.length > 1) {
 		const parentArgs = commitsWithBuilds.map((c) => `"${c}^@"`).join(" ");
@@ -1704,7 +1709,31 @@ const getParentCommits = async (hasBuildsWithCommits) => {
 		if (maxCommits.length > 0) commitsWithBuilds = maxCommits;
 	}
 	log.process("info", "general", `📌 Found ${commitsWithBuilds.length} ancestor build(s): ${commitsWithBuilds.map((c) => c.slice(0, 7)).join(", ")}`);
-	return commitsWithBuilds;
+	return {
+		parentCommits: commitsWithBuilds,
+		visitedCommitsWithoutBuilds: commitsWithoutBuilds
+	};
+};
+/**
+* Compute the merge base commit between the current HEAD and a base branch,
+* plus a list of ancestor commits on the base branch from that point backwards.
+* This gives the server enough git history to walk back and find a build
+* even if the exact merge base commit doesn't have one.
+*/
+const getMergeBaseInfo = (baseBranch) => {
+	const mergeBaseCommit = execGit(`git merge-base HEAD ${execGit(`git rev-parse origin/${baseBranch}`) ? `origin/${baseBranch}` : baseBranch}`);
+	if (!mergeBaseCommit) {
+		log.process("info", "general", `Could not compute merge base with ${baseBranch}`);
+		return null;
+	}
+	log.process("info", "general", `📍 Merge base with ${baseBranch}: ${mergeBaseCommit.slice(0, 7)}`);
+	const ancestorsOutput = execGit(`git rev-list ${mergeBaseCommit} -n 50`);
+	const mergeBaseAncestors = ancestorsOutput ? ancestorsOutput.split("\n").filter(Boolean) : [];
+	log.process("info", "general", `📍 Got ${mergeBaseAncestors.length} merge base ancestors for build lookup`);
+	return {
+		mergeBaseCommit,
+		mergeBaseAncestors
+	};
 };
 //#endregion
 //#region ../shared/dist/client.js
@@ -1775,7 +1804,7 @@ const getApiToken = async (config) => {
 		process.exit(1);
 	}
 };
-const sendInitToAPI = async (config, apiToken, parentCommits) => {
+const sendInitToAPI = async (config, apiToken, parentCommits, mergeBaseInfo) => {
 	const client = createClient(config.thirdEyePlatform, void 0, apiToken);
 	return withRetry("init", () => client.orgs.projects.builds.init({
 		orgId: config.thirdEyeOrgId,
@@ -1785,7 +1814,9 @@ const sendInitToAPI = async (config, apiToken, parentCommits) => {
 		buildNumber: config.ciBuildNumber,
 		baseBranch: config.baseBranch || void 0,
 		prNumber: config.prNumber,
-		parentCommits
+		parentCommits,
+		mergeBaseCommit: mergeBaseInfo?.mergeBaseCommit,
+		mergeBaseAncestors: mergeBaseInfo?.mergeBaseAncestors
 	}));
 };
 const sendHasBuildsWithCommitsToAPI = async (config, apiToken, commits) => {
@@ -1796,6 +1827,22 @@ const sendHasBuildsWithCommitsToAPI = async (config, apiToken, commits) => {
 		commits
 	}))).commits;
 };
+const getGitInfoFromAPI = async (config, apiToken, branch) => {
+	const client = createClient(config.thirdEyePlatform, void 0, apiToken);
+	return withRetry("getGitInfo", () => client.orgs.projects.builds.getGitInfo({
+		orgId: config.thirdEyeOrgId,
+		projectId: config.thirdEyeProjectId,
+		branch
+	}));
+};
+const sendFindSquashMergeParentsToAPI = async (config, apiToken, commits) => {
+	const client = createClient(config.thirdEyePlatform, void 0, apiToken);
+	return (await withRetry("findSquashMergeParents", () => client.orgs.projects.builds.findSquashMergeParents({
+		orgId: config.thirdEyeOrgId,
+		projectId: config.thirdEyeProjectId,
+		commits
+	}))).parents;
+};
 const sendFinalizeToAPI = async (config, apiToken) => {
 	const client = createClient(config.thirdEyePlatform, void 0, apiToken);
 	return withRetry("finalize", () => client.orgs.projects.builds.finalize({
@@ -1843,7 +1890,7 @@ const uploadShot = async ({ config, apiToken, uploadToken, name, file, shotMode,
 		metadata
 	}), logFn);
 };
-const processShots = async (config, apiToken, uploadToken, shotsConfig, cacheKey, turboSnap) => {
+const processShots = async (config, apiToken, uploadToken, shotsConfig, cacheKey, turboSnap, turboSnapAllStoryNames) => {
 	const client = createTypedClient({
 		url: config.thirdEyePlatform,
 		apiToken,
@@ -1859,7 +1906,8 @@ const processShots = async (config, apiToken, uploadToken, shotsConfig, cacheKey
 		},
 		log: logMemory,
 		cacheKey,
-		turboSnap
+		turboSnap,
+		turboSnapAllStoryNames
 	});
 	log.process("info", "api", "Successfully sent to API [processShots]");
 	return result;
@@ -1917,7 +1965,8 @@ const uploadRequiredShots = async ({ config, apiToken, uploadToken, requiredFile
 					...shotItem.viewport ? { viewport: shotItem.viewport } : {},
 					...shotItem.breakpoint !== void 0 ? { breakpoint: shotItem.breakpoint } : {},
 					...domHtml ? { dom_html: domHtml } : {},
-					...dependencyMap && shotItem.importPath && dependencyMap.has(shotItem.importPath) ? { dependencies: dependencyMap.get(shotItem.importPath) } : {}
+					...dependencyMap && shotItem.importPath && dependencyMap.has(shotItem.importPath) ? { dependencies: dependencyMap.get(shotItem.importPath) } : {},
+					...shotItem.designUrl ? { designUrl: shotItem.designUrl } : {}
 				},
 				logger
 			});
@@ -2194,14 +2243,41 @@ const platformRunner = async (config, apiToken) => {
 			`commitRefName = ${config.commitRefName}`,
 			`commitHash = ${config.commitHash}`
 		].join("\n   - "));
+		log.process("info", "general", "🔍 Querying server for git info...");
+		const gitInfo = await getGitInfoFromAPI(config, apiToken, config.commitRefName);
+		const initialCommitsWithBuilds = [];
+		if (gitInfo.lastBuildOnBranch) {
+			const lastCommit = gitInfo.lastBuildOnBranch.commit;
+			if (commitExists(lastCommit)) {
+				log.process("info", "general", `📌 Seeding with last build on branch: ${lastCommit.slice(0, 7)}`);
+				initialCommitsWithBuilds.push(lastCommit);
+			} else log.process("info", "general", `📌 Last build on branch ${lastCommit.slice(0, 7)} not in local git (rebase?), skipping`);
+		}
 		log.process("info", "general", "🔍 Resolving ancestor builds from git history...");
-		await sendInitToAPI(config, apiToken, await getParentCommits((commits) => sendHasBuildsWithCommitsToAPI(config, apiToken, commits)));
+		const { parentCommits, visitedCommitsWithoutBuilds } = await getParentCommits((commits) => sendHasBuildsWithCommitsToAPI(config, apiToken, commits), {
+			firstCommittedAtSeconds: gitInfo.firstBuildCreatedAt ?? void 0,
+			initialCommitsWithBuilds: initialCommitsWithBuilds.length > 0 ? initialCommitsWithBuilds : void 0
+		});
+		if (visitedCommitsWithoutBuilds.length > 0) {
+			log.process("info", "general", `🔀 Checking ${Math.min(visitedCommitsWithoutBuilds.length, 100)} commits for squash merges...`);
+			try {
+				const squashResult = await sendFindSquashMergeParentsToAPI(config, apiToken, visitedCommitsWithoutBuilds.slice(0, 100));
+				for (const { buildCommit } of squashResult) if (commitExists(buildCommit) && !parentCommits.includes(buildCommit)) {
+					log.process("info", "general", `🔀 Found squash merge parent: ${buildCommit.slice(0, 7)}`);
+					parentCommits.push(buildCommit);
+				}
+			} catch (err) {
+				log.process("info", "general", `Squash merge detection failed (non-fatal): ${err instanceof Error ? err.message : String(err)}`);
+			}
+		}
+		await sendInitToAPI(config, apiToken, parentCommits, config.baseBranch ? getMergeBaseInfo(config.baseBranch) : null);
 		if (!await checkForCachedBuild(config, apiToken)) {
 			log.process("info", "general", "📂 Creating shot folders");
 			const createShotsStart = process.hrtime();
 			createShotsFolders();
 			let turboSnapFilter;
 			let turboSnapDependencyMap;
+			let turboSnapAllStoryNames;
 			if (config.turboSnap && config.baseBranch) {
 				log.process("info", "general", `⚡ TurboSnap enabled, checking changed files against ${config.baseBranch}`);
 				const changedFiles = getChangedFiles(config.baseBranch);
@@ -2213,10 +2289,12 @@ const platformRunner = async (config, apiToken) => {
 						if (existsSync(indexJsonPath)) {
 							const indexJson = JSON.parse(fs.readFileSync(indexJsonPath, "utf-8"));
 							const entries = indexJson.entries ?? indexJson.stories ?? {};
-							const turboResult = getAffectedStoriesLocal(Object.values(entries).filter((e) => e.type !== "docs").map((e) => ({
+							const stories = Object.values(entries).filter((e) => e.type !== "docs").map((e) => ({
 								shotName: generateShotName(e.title, e.name),
 								importPath: e.importPath
-							})), changedFiles, process.cwd());
+							}));
+							const turboResult = getAffectedStoriesLocal(stories, changedFiles, process.cwd());
+							turboSnapAllStoryNames = stories.map((s) => `storybook/${s.shotName}`);
 							log.process("info", "general", `⚡ TurboSnap: ${turboResult.affected.length} affected, ${turboResult.skipped.length} skipped out of ${turboResult.total} stories`);
 							turboSnapFilter = new Set(turboResult.affected);
 							turboSnapDependencyMap = turboResult.dependencyMap;
@@ -2275,7 +2353,7 @@ const platformRunner = async (config, apiToken) => {
 			await processShots(config, apiToken, uploadToken, shotItems.map((shotItem) => ({
 				name: `${shotItem.shotMode}/${shotItem.shotName}`,
 				threshold: shotItem.threshold
-			})), process.env.THIRD_EYE_CACHE_KEY, !!turboSnapFilter);
+			})), process.env.THIRD_EYE_CACHE_KEY, !!turboSnapFilter, turboSnapAllStoryNames);
 			if (config.storybookStaticDir && existsSync(config.storybookStaticDir)) {
 				log.process("info", "general", "Uploading Storybook archive...");
 				const archive = execSync(`tar -czf - -C ${JSON.stringify(config.storybookStaticDir)} .`, { maxBuffer: 50 * 1024 * 1024 }).toString("base64");