git-shots-cli 0.1.0 → 0.1.1

package/dist/index.js

@@ -157,6 +157,65 @@ async function status(config) {
   }
 }
 
+// src/pull-baselines.ts
+import { mkdirSync, writeFileSync } from "fs";
+import { resolve as resolve3, dirname as dirname2 } from "path";
+import chalk4 from "chalk";
+async function pullBaselines(config, options) {
+  const branch = options.branch ?? "main";
+  const outputDir = resolve3(process.cwd(), options.output ?? config.directory);
+  console.log(chalk4.dim(`Project: ${config.project}`));
+  console.log(chalk4.dim(`Branch:  ${branch}`));
+  console.log(chalk4.dim(`Output:  ${outputDir}`));
+  console.log();
+  const manifestUrl = `${config.server}/api/projects/${encodeURIComponent(config.project)}/snapshots?branch=${encodeURIComponent(branch)}`;
+  let snapshots;
+  try {
+    const res = await fetch(manifestUrl);
+    const data = await res.json();
+    if (!res.ok) {
+      console.error(chalk4.red(`Failed to fetch snapshots: ${JSON.stringify(data)}`));
+      process.exit(1);
+    }
+    snapshots = data.snapshots;
+  } catch (err) {
+    console.error(chalk4.red(`Request failed: ${err}`));
+    process.exit(1);
+  }
+  if (snapshots.length === 0) {
+    console.log(chalk4.yellow("No baseline snapshots found."));
+    return;
+  }
+  console.log(chalk4.dim(`Found ${snapshots.length} baselines to download`));
+  console.log();
+  const batchSize = 5;
+  let downloaded = 0;
+  for (let i = 0; i < snapshots.length; i += batchSize) {
+    const batch = snapshots.slice(i, i + batchSize);
+    await Promise.all(
+      batch.map(async (snap) => {
+        const imageUrl = `${config.server}/api/images/${snap.r2_key}`;
+        const res = await fetch(imageUrl);
+        if (!res.ok) {
+          console.error(chalk4.red(`  Failed to download ${snap.screen_slug}: ${res.status}`));
+          return;
+        }
+        const buffer = Buffer.from(await res.arrayBuffer());
+        const subDir = snap.category ?? "";
+        const filePath = resolve3(outputDir, subDir, `${snap.screen_slug}.png`);
+        mkdirSync(dirname2(filePath), { recursive: true });
+        writeFileSync(filePath, buffer);
+        downloaded++;
+        console.log(
+          chalk4.green(`  [${downloaded}/${snapshots.length}]`) + ` ${subDir ? subDir + "/" : ""}${snap.screen_slug}.png`
+        );
+      })
+    );
+  }
+  console.log();
+  console.log(chalk4.green(`Downloaded ${downloaded} baselines to ${outputDir}`));
+}
+
 // src/index.ts
 var program = new Command();
 program.name("git-shots").description("CLI for git-shots visual regression platform").version("0.1.0");
@@ -191,4 +250,14 @@ program.command("status").description("Show current diff status").option("-p, --
   }
   await status(config);
 });
+program.command("pull-baselines").description("Download baseline screenshots from git-shots").option("-p, --project <slug>", "Project slug").option("-s, --server <url>", "Server URL").option("-o, --output <path>", "Output directory").option("-b, --branch <name>", "Branch to pull baselines from (default: main)").action(async (options) => {
+  const config = loadConfig();
+  if (options.project) config.project = options.project;
+  if (options.server) config.server = options.server;
+  if (!config.project) {
+    console.error("Error: project slug required. Use --project or .git-shots.json");
+    process.exit(1);
+  }
+  await pullBaselines(config, { branch: options.branch, output: options.output });
+});
 program.parse();

package/package.json

@@ -1,23 +1,23 @@
-{
-	"name": "git-shots-cli",
-	"version": "0.1.0",
-	"description": "CLI for git-shots visual regression platform",
-	"type": "module",
-	"bin": {
-		"git-shots": "dist/index.js"
-	},
-	"scripts": {
-		"build": "tsup src/index.ts --format esm --dts",
-		"dev": "tsup src/index.ts --format esm --watch"
-	},
-	"dependencies": {
-		"commander": "^12.0.0",
-		"chalk": "^5.3.0",
-		"glob": "^11.0.0"
-	},
-	"devDependencies": {
-		"tsup": "^8.0.0",
-		"typescript": "^5.0.0",
-		"@types/node": "^22.0.0"
-	}
-}
+{
+	"name": "git-shots-cli",
+	"version": "0.1.1",
+	"description": "CLI for git-shots visual regression platform",
+	"type": "module",
+	"bin": {
+		"git-shots": "./dist/index.js"
+	},
+	"scripts": {
+		"build": "tsup src/index.ts --format esm --dts",
+		"dev": "tsup src/index.ts --format esm --watch"
+	},
+	"dependencies": {
+		"commander": "^12.0.0",
+		"chalk": "^5.3.0",
+		"glob": "^11.0.0"
+	},
+	"devDependencies": {
+		"tsup": "^8.0.0",
+		"typescript": "^5.0.0",
+		"@types/node": "^22.0.0"
+	}
+}

package/src/compare.ts

@@ -1,57 +1,57 @@
-import chalk from 'chalk';
-import type { GitShotsConfig } from './config.js';
-
-export async function compare(
-	config: GitShotsConfig,
-	options: { base?: string; head: string; threshold?: number }
-) {
-	const url = `${config.server}/api/compare`;
-	const body = {
-		project: config.project,
-		base: options.base ?? 'main',
-		head: options.head,
-		threshold: options.threshold ?? 0.1
-	};
-
-	console.log(chalk.dim(`Comparing ${body.base} vs ${body.head} for ${config.project}...`));
-
-	try {
-		const res = await fetch(url, {
-			method: 'POST',
-			headers: { 'Content-Type': 'application/json', Origin: config.server },
-			body: JSON.stringify(body)
-		});
-		const data = await res.json();
-
-		if (!res.ok) {
-			console.error(chalk.red(`Compare failed: ${JSON.stringify(data)}`));
-			process.exit(1);
-		}
-
-		console.log();
-		console.log(`Compared ${chalk.bold(data.compared)} screens`);
-		console.log();
-
-		if (data.diffs.length === 0) {
-			console.log(chalk.green('No visual differences found!'));
-			return;
-		}
-
-		// Print table
-		console.log(chalk.dim('Screen'.padEnd(30) + 'Mismatch'.padEnd(15) + 'Pixels'));
-		console.log(chalk.dim('-'.repeat(55)));
-
-		for (const d of data.diffs) {
-			const pct = d.mismatchPercentage.toFixed(2) + '%';
-			const color = d.mismatchPercentage > 10 ? chalk.red : d.mismatchPercentage > 1 ? chalk.yellow : chalk.green;
-			console.log(
-				d.screen.padEnd(30) +
-				color(pct.padEnd(15)) +
-				chalk.dim(d.mismatchPixels.toLocaleString())
-			);
-		}
-	} catch (err) {
-		console.error(chalk.red(`Request failed: ${err}`));
-		process.exit(1);
-	}
-}
+import chalk from 'chalk';
+import type { GitShotsConfig } from './config.js';
+
+export async function compare(
+	config: GitShotsConfig,
+	options: { base?: string; head: string; threshold?: number }
+) {
+	const url = `${config.server}/api/compare`;
+	const body = {
+		project: config.project,
+		base: options.base ?? 'main',
+		head: options.head,
+		threshold: options.threshold ?? 0.1
+	};
+
+	console.log(chalk.dim(`Comparing ${body.base} vs ${body.head} for ${config.project}...`));
+
+	try {
+		const res = await fetch(url, {
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json', Origin: config.server },
+			body: JSON.stringify(body)
+		});
+		const data = await res.json();
+
+		if (!res.ok) {
+			console.error(chalk.red(`Compare failed: ${JSON.stringify(data)}`));
+			process.exit(1);
+		}
+
+		console.log();
+		console.log(`Compared ${chalk.bold(data.compared)} screens`);
+		console.log();
+
+		if (data.diffs.length === 0) {
+			console.log(chalk.green('No visual differences found!'));
+			return;
+		}
+
+		// Print table
+		console.log(chalk.dim('Screen'.padEnd(30) + 'Mismatch'.padEnd(15) + 'Pixels'));
+		console.log(chalk.dim('-'.repeat(55)));
+
+		for (const d of data.diffs) {
+			const pct = d.mismatchPercentage.toFixed(2) + '%';
+			const color = d.mismatchPercentage > 10 ? chalk.red : d.mismatchPercentage > 1 ? chalk.yellow : chalk.green;
+			console.log(
+				d.screen.padEnd(30) +
+				color(pct.padEnd(15)) +
+				chalk.dim(d.mismatchPixels.toLocaleString())
+			);
+		}
+	} catch (err) {
+		console.error(chalk.red(`Request failed: ${err}`));
+		process.exit(1);
+	}
+}

package/src/config.ts

@@ -1,28 +1,28 @@
-import { readFileSync, existsSync } from 'node:fs';
-import { resolve } from 'node:path';
-
-export interface GitShotsConfig {
-	project: string;
-	server: string;
-	directory: string;
-}
-
-const DEFAULT_CONFIG: GitShotsConfig = {
-	project: '',
-	server: 'https://git-shots.rijid356.workers.dev',
-	directory: 'docs/screenshots/current'
-};
-
-export function loadConfig(cwd: string = process.cwd()): GitShotsConfig {
-	const configPath = resolve(cwd, '.git-shots.json');
-	if (!existsSync(configPath)) {
-		return DEFAULT_CONFIG;
-	}
-	try {
-		const raw = readFileSync(configPath, 'utf-8');
-		const parsed = JSON.parse(raw);
-		return { ...DEFAULT_CONFIG, ...parsed };
-	} catch {
-		return DEFAULT_CONFIG;
-	}
-}
+import { readFileSync, existsSync } from 'node:fs';
+import { resolve } from 'node:path';
+
+export interface GitShotsConfig {
+	project: string;
+	server: string;
+	directory: string;
+}
+
+const DEFAULT_CONFIG: GitShotsConfig = {
+	project: '',
+	server: 'https://git-shots.rijid356.workers.dev',
+	directory: 'docs/screenshots/current'
+};
+
+export function loadConfig(cwd: string = process.cwd()): GitShotsConfig {
+	const configPath = resolve(cwd, '.git-shots.json');
+	if (!existsSync(configPath)) {
+		return DEFAULT_CONFIG;
+	}
+	try {
+		const raw = readFileSync(configPath, 'utf-8');
+		const parsed = JSON.parse(raw);
+		return { ...DEFAULT_CONFIG, ...parsed };
+	} catch {
+		return DEFAULT_CONFIG;
+	}
+}

package/src/index.ts

@@ -1,70 +1,89 @@
-#!/usr/bin/env node
-import { Command } from 'commander';
-import { loadConfig } from './config.js';
-import { upload } from './upload.js';
-import { compare } from './compare.js';
-import { status } from './status.js';
-
-const program = new Command();
-
-program
-	.name('git-shots')
-	.description('CLI for git-shots visual regression platform')
-	.version('0.1.0');
-
-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)')
-	.action(async (options) => {
-		const config = loadConfig();
-		if (options.project) config.project = options.project;
-		if (options.server) config.server = options.server;
-		if (options.directory) config.directory = options.directory;
-		if (!config.project) {
-			console.error('Error: project slug required. Use --project or .git-shots.json');
-			process.exit(1);
-		}
-		await upload(config, { branch: options.branch, sha: options.sha });
-	});
-
-program
-	.command('compare')
-	.description('Compare screenshots between branches')
-	.requiredOption('--head <branch>', 'Head branch to compare')
-	.option('-p, --project <slug>', 'Project slug')
-	.option('-s, --server <url>', 'Server URL')
-	.option('--base <branch>', 'Base branch (default: main)')
-	.option('-t, --threshold <number>', 'Mismatch threshold 0-1', parseFloat)
-	.action(async (options) => {
-		const config = loadConfig();
-		if (options.project) config.project = options.project;
-		if (options.server) config.server = options.server;
-		if (!config.project) {
-			console.error('Error: project slug required. Use --project or .git-shots.json');
-			process.exit(1);
-		}
-		await compare(config, { base: options.base, head: options.head, threshold: options.threshold });
-	});
-
-program
-	.command('status')
-	.description('Show current diff status')
-	.option('-p, --project <slug>', 'Project slug')
-	.option('-s, --server <url>', 'Server URL')
-	.action(async (options) => {
-		const config = loadConfig();
-		if (options.project) config.project = options.project;
-		if (options.server) config.server = options.server;
-		if (!config.project) {
-			console.error('Error: project slug required. Use --project or .git-shots.json');
-			process.exit(1);
-		}
-		await status(config);
-	});
-
-program.parse();
+#!/usr/bin/env node
+import { Command } from 'commander';
+import { loadConfig } from './config.js';
+import { upload } from './upload.js';
+import { compare } from './compare.js';
+import { status } from './status.js';
+import { pullBaselines } from './pull-baselines.js';
+
+const program = new Command();
+
+program
+	.name('git-shots')
+	.description('CLI for git-shots visual regression platform')
+	.version('0.1.0');
+
+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)')
+	.action(async (options) => {
+		const config = loadConfig();
+		if (options.project) config.project = options.project;
+		if (options.server) config.server = options.server;
+		if (options.directory) config.directory = options.directory;
+		if (!config.project) {
+			console.error('Error: project slug required. Use --project or .git-shots.json');
+			process.exit(1);
+		}
+		await upload(config, { branch: options.branch, sha: options.sha });
+	});
+
+program
+	.command('compare')
+	.description('Compare screenshots between branches')
+	.requiredOption('--head <branch>', 'Head branch to compare')
+	.option('-p, --project <slug>', 'Project slug')
+	.option('-s, --server <url>', 'Server URL')
+	.option('--base <branch>', 'Base branch (default: main)')
+	.option('-t, --threshold <number>', 'Mismatch threshold 0-1', parseFloat)
+	.action(async (options) => {
+		const config = loadConfig();
+		if (options.project) config.project = options.project;
+		if (options.server) config.server = options.server;
+		if (!config.project) {
+			console.error('Error: project slug required. Use --project or .git-shots.json');
+			process.exit(1);
+		}
+		await compare(config, { base: options.base, head: options.head, threshold: options.threshold });
+	});
+
+program
+	.command('status')
+	.description('Show current diff status')
+	.option('-p, --project <slug>', 'Project slug')
+	.option('-s, --server <url>', 'Server URL')
+	.action(async (options) => {
+		const config = loadConfig();
+		if (options.project) config.project = options.project;
+		if (options.server) config.server = options.server;
+		if (!config.project) {
+			console.error('Error: project slug required. Use --project or .git-shots.json');
+			process.exit(1);
+		}
+		await status(config);
+	});
+
+program
+	.command('pull-baselines')
+	.description('Download baseline screenshots from git-shots')
+	.option('-p, --project <slug>', 'Project slug')
+	.option('-s, --server <url>', 'Server URL')
+	.option('-o, --output <path>', 'Output directory')
+	.option('-b, --branch <name>', 'Branch to pull baselines from (default: main)')
+	.action(async (options) => {
+		const config = loadConfig();
+		if (options.project) config.project = options.project;
+		if (options.server) config.server = options.server;
+		if (!config.project) {
+			console.error('Error: project slug required. Use --project or .git-shots.json');
+			process.exit(1);
+		}
+		await pullBaselines(config, { branch: options.branch, output: options.output });
+	});
+
+program.parse();

package/src/pull-baselines.ts

@@ -0,0 +1,87 @@
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { resolve, dirname } from 'node:path';
+import chalk from 'chalk';
+import type { GitShotsConfig } from './config.js';
+
+interface Snapshot {
+	screen_slug: string;
+	category: string | null;
+	r2_key: string;
+	git_sha: string;
+	width: number;
+	height: number;
+}
+
+export async function pullBaselines(
+	config: GitShotsConfig,
+	options: { branch?: string; output?: string }
+) {
+	const branch = options.branch ?? 'main';
+	const outputDir = resolve(process.cwd(), options.output ?? config.directory);
+
+	console.log(chalk.dim(`Project: ${config.project}`));
+	console.log(chalk.dim(`Branch:  ${branch}`));
+	console.log(chalk.dim(`Output:  ${outputDir}`));
+	console.log();
+
+	// Fetch manifest
+	const manifestUrl = `${config.server}/api/projects/${encodeURIComponent(config.project)}/snapshots?branch=${encodeURIComponent(branch)}`;
+	let snapshots: Snapshot[];
+
+	try {
+		const res = await fetch(manifestUrl);
+		const data = await res.json();
+
+		if (!res.ok) {
+			console.error(chalk.red(`Failed to fetch snapshots: ${JSON.stringify(data)}`));
+			process.exit(1);
+		}
+
+		snapshots = data.snapshots;
+	} catch (err) {
+		console.error(chalk.red(`Request failed: ${err}`));
+		process.exit(1);
+	}
+
+	if (snapshots.length === 0) {
+		console.log(chalk.yellow('No baseline snapshots found.'));
+		return;
+	}
+
+	console.log(chalk.dim(`Found ${snapshots.length} baselines to download`));
+	console.log();
+
+	// Download in batches of 5
+	const batchSize = 5;
+	let downloaded = 0;
+
+	for (let i = 0; i < snapshots.length; i += batchSize) {
+		const batch = snapshots.slice(i, i + batchSize);
+		await Promise.all(
+			batch.map(async (snap) => {
+				const imageUrl = `${config.server}/api/images/${snap.r2_key}`;
+				const res = await fetch(imageUrl);
+				if (!res.ok) {
+					console.error(chalk.red(`  Failed to download ${snap.screen_slug}: ${res.status}`));
+					return;
+				}
+
+				const buffer = Buffer.from(await res.arrayBuffer());
+				const subDir = snap.category ?? '';
+				const filePath = resolve(outputDir, subDir, `${snap.screen_slug}.png`);
+
+				mkdirSync(dirname(filePath), { recursive: true });
+				writeFileSync(filePath, buffer);
+
+				downloaded++;
+				console.log(
+					chalk.green(`  [${downloaded}/${snapshots.length}]`) +
+						` ${subDir ? subDir + '/' : ''}${snap.screen_slug}.png`
+				);
+			})
+		);
+	}
+
+	console.log();
+	console.log(chalk.green(`Downloaded ${downloaded} baselines to ${outputDir}`));
+}

package/src/status.ts

@@ -1,42 +1,42 @@
-import chalk from 'chalk';
-import type { GitShotsConfig } from './config.js';
-
-export async function status(config: GitShotsConfig) {
-	const url = `${config.server}/api/diffs?project=${encodeURIComponent(config.project)}`;
-
-	try {
-		const res = await fetch(url);
-		const data = await res.json();
-
-		if (!res.ok) {
-			console.error(chalk.red(`Status failed: ${JSON.stringify(data)}`));
-			process.exit(1);
-		}
-
-		if (data.length === 0) {
-			console.log(chalk.dim('No diffs found for this project.'));
-			return;
-		}
-
-		console.log(`${chalk.bold(data.length)} diffs for ${config.project}`);
-		console.log();
-		console.log(chalk.dim('ID'.padEnd(8) + 'Status'.padEnd(12) + 'Mismatch'.padEnd(12) + 'Date'));
-		console.log(chalk.dim('-'.repeat(50)));
-
-		for (const { diff } of data) {
-			const statusColor =
-				diff.status === 'approved' ? chalk.green :
-				diff.status === 'rejected' ? chalk.red :
-				chalk.yellow;
-			console.log(
-				String(diff.id).padEnd(8) +
-				statusColor(diff.status.padEnd(12)) +
-				(diff.mismatch_percentage.toFixed(2) + '%').padEnd(12) +
-				chalk.dim(new Date(diff.created_at * 1000).toLocaleDateString())
-			);
-		}
-	} catch (err) {
-		console.error(chalk.red(`Request failed: ${err}`));
-		process.exit(1);
-	}
-}
+import chalk from 'chalk';
+import type { GitShotsConfig } from './config.js';
+
+export async function status(config: GitShotsConfig) {
+	const url = `${config.server}/api/diffs?project=${encodeURIComponent(config.project)}`;
+
+	try {
+		const res = await fetch(url);
+		const data = await res.json();
+
+		if (!res.ok) {
+			console.error(chalk.red(`Status failed: ${JSON.stringify(data)}`));
+			process.exit(1);
+		}
+
+		if (data.length === 0) {
+			console.log(chalk.dim('No diffs found for this project.'));
+			return;
+		}
+
+		console.log(`${chalk.bold(data.length)} diffs for ${config.project}`);
+		console.log();
+		console.log(chalk.dim('ID'.padEnd(8) + 'Status'.padEnd(12) + 'Mismatch'.padEnd(12) + 'Date'));
+		console.log(chalk.dim('-'.repeat(50)));
+
+		for (const { diff } of data) {
+			const statusColor =
+				diff.status === 'approved' ? chalk.green :
+				diff.status === 'rejected' ? chalk.red :
+				chalk.yellow;
+			console.log(
+				String(diff.id).padEnd(8) +
+				statusColor(diff.status.padEnd(12)) +
+				(diff.mismatch_percentage.toFixed(2) + '%').padEnd(12) +
+				chalk.dim(new Date(diff.created_at * 1000).toLocaleDateString())
+			);
+		}
+	} catch (err) {
+		console.error(chalk.red(`Request failed: ${err}`));
+		process.exit(1);
+	}
+}

package/src/upload.ts

@@ -1,74 +1,74 @@
-import { readFileSync, existsSync } from 'node:fs';
-import { resolve, basename, relative, dirname } from 'node:path';
-import { execSync } from 'node:child_process';
-import { glob } from 'glob';
-import chalk from 'chalk';
-import type { GitShotsConfig } from './config.js';
-
-export async function upload(config: GitShotsConfig, options: { branch?: string; sha?: string }) {
-	const dir = resolve(process.cwd(), config.directory);
-	if (!existsSync(dir)) {
-		console.error(chalk.red(`Directory not found: ${dir}`));
-		process.exit(1);
-	}
-
-	// Get git info
-	const branch = options.branch ?? execSync('git rev-parse --abbrev-ref HEAD', { encoding: 'utf-8' }).trim();
-	const sha = options.sha ?? execSync('git rev-parse HEAD', { encoding: 'utf-8' }).trim();
-
-	console.log(chalk.dim(`Project: ${config.project}`));
-	console.log(chalk.dim(`Branch:  ${branch}`));
-	console.log(chalk.dim(`SHA:     ${sha.slice(0, 7)}`));
-	console.log(chalk.dim(`Dir:     ${dir}`));
-	console.log();
-
-	// Find all PNGs
-	const files = await glob('**/*.png', { cwd: dir });
-	if (files.length === 0) {
-		console.log(chalk.yellow('No PNG files found.'));
-		return;
-	}
-
-	console.log(chalk.dim(`Found ${files.length} screenshots`));
-
-	// Build multipart form
-	const formData = new FormData();
-	formData.append('project', config.project);
-	formData.append('branch', branch);
-	formData.append('gitSha', sha);
-
-	for (const file of files) {
-		const fullPath = resolve(dir, file);
-		const buffer = readFileSync(fullPath);
-		const blob = new Blob([buffer], { type: 'image/png' });
-
-		// Use directory as field name for category derivation
-		const dirName = dirname(file);
-		const fieldName = dirName !== '.' ? `${dirName}/${basename(file)}` : basename(file);
-
-		formData.append(fieldName, blob, basename(file));
-	}
-
-	// Upload
-	const url = `${config.server}/api/upload`;
-	console.log(chalk.dim(`Uploading to ${url}...`));
-
-	try {
-		const res = await fetch(url, {
-			method: 'POST',
-			body: formData,
-			headers: { Origin: config.server },
-		});
-		const data = await res.json();
-
-		if (!res.ok) {
-			console.error(chalk.red(`Upload failed: ${JSON.stringify(data)}`));
-			process.exit(1);
-		}
-
-		console.log(chalk.green(`Uploaded ${data.uploaded} screenshots`));
-	} catch (err) {
-		console.error(chalk.red(`Request failed: ${err}`));
-		process.exit(1);
-	}
-}
+import { readFileSync, existsSync } from 'node:fs';
+import { resolve, basename, relative, dirname } from 'node:path';
+import { execSync } from 'node:child_process';
+import { glob } from 'glob';
+import chalk from 'chalk';
+import type { GitShotsConfig } from './config.js';
+
+export async function upload(config: GitShotsConfig, options: { branch?: string; sha?: string }) {
+	const dir = resolve(process.cwd(), config.directory);
+	if (!existsSync(dir)) {
+		console.error(chalk.red(`Directory not found: ${dir}`));
+		process.exit(1);
+	}
+
+	// Get git info
+	const branch = options.branch ?? execSync('git rev-parse --abbrev-ref HEAD', { encoding: 'utf-8' }).trim();
+	const sha = options.sha ?? execSync('git rev-parse HEAD', { encoding: 'utf-8' }).trim();
+
+	console.log(chalk.dim(`Project: ${config.project}`));
+	console.log(chalk.dim(`Branch:  ${branch}`));
+	console.log(chalk.dim(`SHA:     ${sha.slice(0, 7)}`));
+	console.log(chalk.dim(`Dir:     ${dir}`));
+	console.log();
+
+	// Find all PNGs
+	const files = await glob('**/*.png', { cwd: dir });
+	if (files.length === 0) {
+		console.log(chalk.yellow('No PNG files found.'));
+		return;
+	}
+
+	console.log(chalk.dim(`Found ${files.length} screenshots`));
+
+	// Build multipart form
+	const formData = new FormData();
+	formData.append('project', config.project);
+	formData.append('branch', branch);
+	formData.append('gitSha', sha);
+
+	for (const file of files) {
+		const fullPath = resolve(dir, file);
+		const buffer = readFileSync(fullPath);
+		const blob = new Blob([buffer], { type: 'image/png' });
+
+		// Use directory as field name for category derivation
+		const dirName = dirname(file);
+		const fieldName = dirName !== '.' ? `${dirName}/${basename(file)}` : basename(file);
+
+		formData.append(fieldName, blob, basename(file));
+	}
+
+	// Upload
+	const url = `${config.server}/api/upload`;
+	console.log(chalk.dim(`Uploading to ${url}...`));
+
+	try {
+		const res = await fetch(url, {
+			method: 'POST',
+			body: formData,
+			headers: { Origin: config.server },
+		});
+		const data = await res.json();
+
+		if (!res.ok) {
+			console.error(chalk.red(`Upload failed: ${JSON.stringify(data)}`));
+			process.exit(1);
+		}
+
+		console.log(chalk.green(`Uploaded ${data.uploaded} screenshots`));
+	} catch (err) {
+		console.error(chalk.red(`Request failed: ${err}`));
+		process.exit(1);
+	}
+}

package/tsconfig.json

@@ -1,14 +1,14 @@
-{
-	"compilerOptions": {
-		"target": "ES2022",
-		"module": "ESNext",
-		"moduleResolution": "bundler",
-		"esModuleInterop": true,
-		"strict": true,
-		"outDir": "dist",
-		"rootDir": "src",
-		"declaration": true,
-		"skipLibCheck": true
-	},
-	"include": ["src"]
-}
+{
+	"compilerOptions": {
+		"target": "ES2022",
+		"module": "ESNext",
+		"moduleResolution": "bundler",
+		"esModuleInterop": true,
+		"strict": true,
+		"outDir": "dist",
+		"rootDir": "src",
+		"declaration": true,
+		"skipLibCheck": true
+	},
+	"include": ["src"]
+}