git-shots-cli 0.6.2 → 0.8.0

package/dist/index.js

@@ -44,6 +44,7 @@ function checkAuthError(res) {
 
 // src/upload.ts
 import { readFileSync as readFileSync2, existsSync as existsSync2 } from "fs";
+import { createHash } from "crypto";
 import { resolve as resolve2, basename, dirname } from "path";
 import { execSync } from "child_process";
 import { glob } from "glob";
@@ -56,6 +57,25 @@ function chunk(arr, size) {
   }
   return chunks;
 }
+function computeFileHash(buffer) {
+  return createHash("sha256").update(buffer).digest("hex");
+}
+async function fetchServerHashes(config, branch) {
+  try {
+    const params = new URLSearchParams({ branch });
+    if (config.platform) params.set("platform", config.platform);
+    const url = `${config.server}/api/projects/${config.project}/hashes?${params}`;
+    const res = await fetch(url, {
+      headers: { ...authHeaders(config) }
+    });
+    checkAuthError(res);
+    if (!res.ok) return null;
+    const data = await res.json();
+    return data.hashes;
+  } catch {
+    return null;
+  }
+}
 async function upload(config, options) {
   const dir = resolve2(process.cwd(), config.directory);
   if (!existsSync2(dir)) {
@@ -77,19 +97,82 @@ async function upload(config, options) {
   }
   const files = rawFiles.map((file) => {
     const dirName = dirname(file);
+    const fileName = basename(file);
     return {
-      fieldName: dirName !== "." ? `${dirName}/${basename(file)}` : basename(file),
-      fileName: basename(file),
+      fieldName: dirName !== "." ? `${dirName}/${fileName}` : fileName,
+      fileName,
+      slug: fileName.replace(/\.png$/, ""),
       fullPath: resolve2(dir, file)
     };
   });
-  const localSlugs = files.map((f) => f.fileName.replace(/\.png$/, ""));
-  const allSlugs = [.../* @__PURE__ */ new Set([...options.baseManifest ?? [], ...localSlugs])];
+  const allSlugs = [.../* @__PURE__ */ new Set([...options.baseManifest ?? [], ...files.map((f) => f.slug)])];
+  if (options.force) {
+    console.log(chalk2.yellow("Force mode: bypassing content hash dedup"));
+  }
   console.log(chalk2.dim(`Found ${files.length} screenshots`));
+  let filesToUpload = files;
+  let clientDedupSkipped = 0;
+  if (!options.force) {
+    const [branchHashes, mainHashes] = await Promise.all([
+      fetchServerHashes(config, branch),
+      branch !== "main" ? fetchServerHashes(config, "main") : Promise.resolve(null)
+    ]);
+    if (branchHashes || mainHashes) {
+      console.log(chalk2.dim("Computing local hashes..."));
+      filesToUpload = files.filter((file) => {
+        file.buffer = readFileSync2(file.fullPath);
+        const localHash = computeFileHash(file.buffer);
+        const branchHash = branchHashes?.[file.slug];
+        const mainHash = mainHashes?.[file.slug];
+        if (branchHash && localHash === branchHash) return false;
+        if (mainHash && localHash === mainHash) return false;
+        return true;
+      });
+      clientDedupSkipped = files.length - filesToUpload.length;
+      if (clientDedupSkipped > 0) {
+        console.log(
+          chalk2.cyan(
+            `Client dedup: ${clientDedupSkipped} unchanged, ${filesToUpload.length} to upload`
+          )
+        );
+      }
+    } else {
+      console.log(chalk2.dim("Hash endpoint unavailable, uploading all files"));
+    }
+  }
   const url = `${config.server}/api/upload`;
-  const batches = chunk(files, BATCH_SIZE);
+  if (filesToUpload.length === 0) {
+    console.log(chalk2.dim("All files unchanged, sending manifest only"));
+    const formData = new FormData();
+    formData.append("project", config.project);
+    formData.append("branch", branch);
+    formData.append("gitSha", sha);
+    if (config.platform) formData.append("platform", config.platform);
+    formData.append("allSlugs", JSON.stringify(allSlugs));
+    try {
+      const res = await fetch(url, {
+        method: "POST",
+        body: formData,
+        headers: { Origin: config.server, ...authHeaders(config) }
+      });
+      checkAuthError(res);
+      if (!res.ok) {
+        const data = await res.json();
+        console.error(chalk2.red(`Manifest update failed: ${JSON.stringify(data)}`));
+        process.exit(1);
+      }
+    } catch (err) {
+      console.error(chalk2.red(`Manifest request failed: ${err}`));
+      process.exit(1);
+    }
+    console.log(`
+${chalk2.dim(`${clientDedupSkipped} unchanged`)} (manifest updated)`);
+    return;
+  }
+  const batches = chunk(filesToUpload, BATCH_SIZE);
   let totalUploaded = 0;
-  let totalSkipped = 0;
+  let serverSkipped = 0;
+  const totalSkippedScreens = [];
   for (let i = 0; i < batches.length; i++) {
     const batch = batches[i];
     const isLastBatch = i === batches.length - 1;
@@ -98,11 +181,12 @@ async function upload(config, options) {
     formData.append("branch", branch);
     formData.append("gitSha", sha);
     if (config.platform) formData.append("platform", config.platform);
+    if (options.force) formData.append("forceUpload", "true");
     if (isLastBatch) {
       formData.append("allSlugs", JSON.stringify(allSlugs));
     }
     for (const file of batch) {
-      const buffer = readFileSync2(file.fullPath);
+      const buffer = file.buffer ?? readFileSync2(file.fullPath);
       const blob = new Blob([buffer], { type: "image/png" });
       formData.append(file.fieldName, blob, file.fileName);
     }
@@ -120,7 +204,8 @@ async function upload(config, options) {
         process.exit(1);
       }
       totalUploaded += data.uploaded ?? 0;
-      totalSkipped += data.skipped ?? 0;
+      serverSkipped += data.skipped ?? 0;
+      if (data.skippedScreens) totalSkippedScreens.push(...data.skippedScreens);
       if (batches.length > 1) {
         const parts2 = [];
         if (data.uploaded > 0) parts2.push(chalk2.green(`${data.uploaded} uploaded`));
@@ -134,9 +219,22 @@ async function upload(config, options) {
   }
   const parts = [];
   if (totalUploaded > 0) parts.push(chalk2.green(`${totalUploaded} uploaded`));
-  if (totalSkipped > 0) parts.push(chalk2.dim(`${totalSkipped} unchanged`));
+  const totalUnchanged = clientDedupSkipped + serverSkipped;
+  if (totalUnchanged > 0) parts.push(chalk2.dim(`${totalUnchanged} unchanged`));
   console.log(`
 ${parts.join(", ") || chalk2.dim("nothing to do")}`);
+  if (clientDedupSkipped > 0) {
+    console.log(chalk2.dim(`  (${clientDedupSkipped} skipped client-side, ${serverSkipped} server-side)`));
+  }
+  if (totalSkippedScreens.length > 0) {
+    const MAX_DISPLAY = 20;
+    if (totalSkippedScreens.length <= MAX_DISPLAY) {
+      console.log(chalk2.dim(`Skipped: ${totalSkippedScreens.join(", ")}`));
+    } else {
+      const shown = totalSkippedScreens.slice(0, MAX_DISPLAY).join(", ");
+      console.log(chalk2.dim(`Skipped: ${shown} ... and ${totalSkippedScreens.length - MAX_DISPLAY} more`));
+    }
+  }
 }
 
 // src/compare.ts
@@ -333,7 +431,7 @@ async function review(config, options) {
   } catch {
   }
   console.log(chalk6.dim("Uploading screenshots..."));
-  await upload(config, { branch, sha, baseManifest });
+  await upload(config, { branch, sha, baseManifest, force: options.force });
   console.log();
   console.log(chalk6.dim("Creating review session..."));
   const reviewUrl = `${config.server}/api/reviews`;
@@ -687,7 +785,7 @@ var require2 = createRequire(import.meta.url);
 var { version } = require2("../package.json");
 var program = new Command();
 program.name("git-shots").description("CLI for git-shots visual regression platform").version(version);
-program.command("upload").description("Upload screenshots to git-shots").option("-p, --project <slug>", "Project slug").option("-s, --server <url>", "Server URL").option("-d, --directory <path>", "Screenshots directory").option("-b, --branch <name>", "Git branch (auto-detected)").option("--sha <hash>", "Git SHA (auto-detected)").option("--platform <name>", "Platform tag (e.g., android, web)").action(async (options) => {
+program.command("upload").description("Upload screenshots to git-shots").option("-p, --project <slug>", "Project slug").option("-s, --server <url>", "Server URL").option("-d, --directory <path>", "Screenshots directory").option("-b, --branch <name>", "Git branch (auto-detected)").option("--sha <hash>", "Git SHA (auto-detected)").option("--platform <name>", "Platform tag (e.g., android, web)").option("-f, --force", "Re-upload all files, bypassing content hash dedup").action(async (options) => {
   const config = loadConfig();
   if (options.project) config.project = options.project;
   if (options.server) config.server = options.server;
@@ -697,7 +795,7 @@ program.command("upload").description("Upload screenshots to git-shots").option(
     console.error("Error: project slug required. Use --project or .git-shots.json");
     process.exit(1);
   }
-  await upload(config, { branch: options.branch, sha: options.sha });
+  await upload(config, { branch: options.branch, sha: options.sha, force: options.force });
   if (config.flows && config.flows.length > 0) {
     await syncFlows(config);
   }
@@ -734,7 +832,7 @@ program.command("pull-baselines").description("Download baseline screenshots fro
   }
   await pullBaselines(config, { branch: options.branch, output: options.output });
 });
-program.command("review").description("Upload screenshots, create review session, and poll for verdict").option("-p, --project <slug>", "Project slug").option("-s, --server <url>", "Server URL").option("-d, --directory <path>", "Screenshots directory").option("-b, --branch <name>", "Git branch (auto-detected)").option("--sha <hash>", "Git SHA (auto-detected)").option("--platform <name>", "Platform tag (e.g., android, web)").option("--open", "Open review URL in browser", true).option("--no-open", "Do not open review URL in browser").option("--poll", "Poll for verdict and exit with code", true).option("--no-poll", "Do not poll for verdict").option("--timeout <seconds>", "Polling timeout in seconds", parseInt, 300).option("--screens <patterns>", "Screen slug patterns to compare (comma-separated, supports *)").action(async (options) => {
+program.command("review").description("Upload screenshots, create review session, and poll for verdict").option("-p, --project <slug>", "Project slug").option("-s, --server <url>", "Server URL").option("-d, --directory <path>", "Screenshots directory").option("-b, --branch <name>", "Git branch (auto-detected)").option("--sha <hash>", "Git SHA (auto-detected)").option("--platform <name>", "Platform tag (e.g., android, web)").option("--open", "Open review URL in browser", true).option("--no-open", "Do not open review URL in browser").option("--poll", "Poll for verdict and exit with code", true).option("--no-poll", "Do not poll for verdict").option("--timeout <seconds>", "Polling timeout in seconds", parseInt, 300).option("--screens <patterns>", "Screen slug patterns to compare (comma-separated, supports *)").option("-f, --force", "Re-upload all files, bypassing content hash dedup").action(async (options) => {
   const config = loadConfig();
   if (options.project) config.project = options.project;
   if (options.server) config.server = options.server;
@@ -751,7 +849,8 @@ program.command("review").description("Upload screenshots, create review session
     open: options.open,
     poll: options.poll,
     timeout: options.timeout,
-    screens
+    screens,
+    force: options.force
   });
 });
 program.command("rename <old-slug> <new-slug>").description("Rename a screen slug (moves R2 objects server-side)").option("-p, --project <slug>", "Project slug").option("-s, --server <url>", "Server URL").option("--platform <name>", "Platform to disambiguate (e.g., android, web)").option("--category <value>", "Set new category (use empty string to clear)").action(async (oldSlug, newSlug, options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "git-shots-cli",
-	"version": "0.6.2",
+	"version": "0.8.0",
 	"description": "CLI for git-shots visual regression platform",
 	"type": "module",
 	"bin": {