claudekit-cli 1.1.0 → 1.2.1

package/tests/lib/github-download-priority.test.ts

@@ -0,0 +1,432 @@
+import { describe, expect, test } from "bun:test";
+import { GitHubClient } from "../../src/lib/github.js";
+import type { GitHubRelease } from "../../src/types.js";
+
+describe("GitHubClient - Asset Download Priority", () => {
+	describe("getDownloadableAsset", () => {
+		test("should prioritize ClaudeKit Engineer Package zip file", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.0.0",
+				name: "Release 1.0.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.0.0",
+				assets: [
+					{
+						id: 1,
+						name: "other-file.tar.gz",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/other-file.tar.gz",
+						size: 1024,
+						content_type: "application/gzip",
+					},
+					{
+						id: 2,
+						name: "ClaudeKit-Engineer-Package.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/2",
+						browser_download_url: "https://github.com/test/claudekit-package.zip",
+						size: 2048,
+						content_type: "application/zip",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			expect(result.type).toBe("asset");
+			expect(result.name).toBe("ClaudeKit-Engineer-Package.zip");
+			expect(result.url).toBe("https://api.github.com/repos/test/repo/releases/assets/2");
+			expect(result.size).toBe(2048);
+		});
+
+		test("should prioritize ClaudeKit Marketing Package zip file", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.0.0",
+				name: "Release 1.0.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.0.0",
+				assets: [
+					{
+						id: 1,
+						name: "random.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/random.zip",
+						size: 512,
+						content_type: "application/zip",
+					},
+					{
+						id: 2,
+						name: "ClaudeKit-Marketing-Package.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/2",
+						browser_download_url: "https://github.com/test/marketing-package.zip",
+						size: 2048,
+						content_type: "application/zip",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			expect(result.type).toBe("asset");
+			expect(result.name).toBe("ClaudeKit-Marketing-Package.zip");
+			expect(result.url).toBe("https://api.github.com/repos/test/repo/releases/assets/2");
+		});
+
+		test("should match ClaudeKit package case-insensitively", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.0.0",
+				name: "Release 1.0.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.0.0",
+				assets: [
+					{
+						id: 1,
+						name: "claudekit-engineer-package.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/package.zip",
+						size: 2048,
+						content_type: "application/zip",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			expect(result.type).toBe("asset");
+			expect(result.name).toBe("claudekit-engineer-package.zip");
+		});
+
+		test("should fallback to other zip files if no ClaudeKit package found", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.0.0",
+				name: "Release 1.0.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.0.0",
+				assets: [
+					{
+						id: 1,
+						name: "release-package.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/release.zip",
+						size: 1024,
+						content_type: "application/zip",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			expect(result.type).toBe("asset");
+			expect(result.name).toBe("release-package.zip");
+		});
+
+		test("should fallback to tar.gz files if no zip found", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.0.0",
+				name: "Release 1.0.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.0.0",
+				assets: [
+					{
+						id: 1,
+						name: "release.tar.gz",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/release.tar.gz",
+						size: 1024,
+						content_type: "application/gzip",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			expect(result.type).toBe("asset");
+			expect(result.name).toBe("release.tar.gz");
+		});
+
+		test("should fallback to tgz files", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.0.0",
+				name: "Release 1.0.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.0.0",
+				assets: [
+					{
+						id: 1,
+						name: "release.tgz",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/release.tgz",
+						size: 1024,
+						content_type: "application/gzip",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			expect(result.type).toBe("asset");
+			expect(result.name).toBe("release.tgz");
+		});
+
+		test("should fallback to GitHub automatic tarball if no assets", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.0.0",
+				name: "Release 1.0.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.0.0",
+				assets: [],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			expect(result.type).toBe("tarball");
+			expect(result.url).toBe("https://api.github.com/repos/test/repo/tarball/v1.0.0");
+			expect(result.name).toBe("v1.0.0.tar.gz");
+			expect(result.size).toBeUndefined();
+		});
+
+		test("should fallback to tarball if assets have no archive files", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.0.0",
+				name: "Release 1.0.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.0.0",
+				assets: [
+					{
+						id: 1,
+						name: "README.md",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/README.md",
+						size: 128,
+						content_type: "text/markdown",
+					},
+					{
+						id: 2,
+						name: "checksums.txt",
+						url: "https://api.github.com/repos/test/repo/releases/assets/2",
+						browser_download_url: "https://github.com/test/checksums.txt",
+						size: 64,
+						content_type: "text/plain",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			expect(result.type).toBe("tarball");
+			expect(result.url).toBe("https://api.github.com/repos/test/repo/tarball/v1.0.0");
+		});
+
+		test("should prioritize ClaudeKit package over other archives", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.0.0",
+				name: "Release 1.0.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.0.0",
+				assets: [
+					{
+						id: 1,
+						name: "source.tar.gz",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/source.tar.gz",
+						size: 5000,
+						content_type: "application/gzip",
+					},
+					{
+						id: 2,
+						name: "docs.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/2",
+						browser_download_url: "https://github.com/test/docs.zip",
+						size: 3000,
+						content_type: "application/zip",
+					},
+					{
+						id: 3,
+						name: "ClaudeKit-Engineer-Package.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/3",
+						browser_download_url: "https://github.com/test/package.zip",
+						size: 2000,
+						content_type: "application/zip",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			// Should pick the ClaudeKit package even though it's listed last
+			expect(result.type).toBe("asset");
+			expect(result.name).toBe("ClaudeKit-Engineer-Package.zip");
+			expect(result.size).toBe(2000);
+		});
+
+		test("should handle assets with variations in naming", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.0.0",
+				name: "Release 1.0.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.0.0",
+				assets: [
+					{
+						id: 1,
+						name: "claudekit_marketing_package.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/package.zip",
+						size: 2000,
+						content_type: "application/zip",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			expect(result.type).toBe("asset");
+			expect(result.name).toBe("claudekit_marketing_package.zip");
+		});
+
+		test("should handle assets with spaces in name", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.4.0",
+				name: "Release 1.4.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.4.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.4.0",
+				assets: [
+					{
+						id: 1,
+						name: "Changelog",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/changelog",
+						size: 7979,
+						content_type: "text/plain",
+					},
+					{
+						id: 2,
+						name: "ClaudeKit Engineer Package.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/2",
+						browser_download_url: "https://github.com/test/package.zip",
+						size: 3334963,
+						content_type: "application/zip",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			expect(result.type).toBe("asset");
+			expect(result.name).toBe("ClaudeKit Engineer Package.zip");
+			expect(result.size).toBe(3334963);
+		});
+
+		test("should exclude assets named 'Source code' or starting with 'source'", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.0.0",
+				name: "Release 1.0.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.0.0",
+				assets: [
+					{
+						id: 1,
+						name: "Source code.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/source.zip",
+						size: 5000,
+						content_type: "application/zip",
+					},
+					{
+						id: 2,
+						name: "source-archive.tar.gz",
+						url: "https://api.github.com/repos/test/repo/releases/assets/2",
+						browser_download_url: "https://github.com/test/source.tar.gz",
+						size: 4500,
+						content_type: "application/gzip",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			// Should fall back to tarball instead of using "Source code" assets
+			expect(result.type).toBe("tarball");
+			expect(result.url).toBe("https://api.github.com/repos/test/repo/tarball/v1.0.0");
+		});
+
+		test("should prioritize ClaudeKit package over source code archives", () => {
+			const release: GitHubRelease = {
+				id: 1,
+				tag_name: "v1.4.0",
+				name: "Release 1.4.0",
+				draft: false,
+				prerelease: false,
+				tarball_url: "https://api.github.com/repos/test/repo/tarball/v1.4.0",
+				zipball_url: "https://api.github.com/repos/test/repo/zipball/v1.4.0",
+				assets: [
+					{
+						id: 1,
+						name: "Source code.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/1",
+						browser_download_url: "https://github.com/test/source.zip",
+						size: 5000,
+						content_type: "application/zip",
+					},
+					{
+						id: 2,
+						name: "ClaudeKit Engineer Package.zip",
+						url: "https://api.github.com/repos/test/repo/releases/assets/2",
+						browser_download_url: "https://github.com/test/package.zip",
+						size: 3334963,
+						content_type: "application/zip",
+					},
+					{
+						id: 3,
+						name: "Source code.tar.gz",
+						url: "https://api.github.com/repos/test/repo/releases/assets/3",
+						browser_download_url: "https://github.com/test/source.tar.gz",
+						size: 4500,
+						content_type: "application/gzip",
+					},
+				],
+			};
+
+			const result = GitHubClient.getDownloadableAsset(release);
+
+			// Should pick the ClaudeKit package and ignore source code archives
+			expect(result.type).toBe("asset");
+			expect(result.name).toBe("ClaudeKit Engineer Package.zip");
+			expect(result.size).toBe(3334963);
+		});
+	});
+});

package/tests/lib/github.test.ts

@@ -36,13 +36,13 @@ describe("GitHubClient", () => {
 	describe("integration scenarios", () => {
 		test("should handle kit configuration correctly", () => {
 			const engineerKit = AVAILABLE_KITS.engineer;
-			expect(engineerKit.owner).toBe("mrgoonie");
+			expect(engineerKit.owner).toBe("claudekit");
 			expect(engineerKit.repo).toBe("claudekit-engineer");
 		});
 
 		test("should handle marketing kit configuration", () => {
 			const marketingKit = AVAILABLE_KITS.marketing;
-			expect(marketingKit.owner).toBe("mrgoonie");
+			expect(marketingKit.owner).toBe("claudekit");
 			expect(marketingKit.repo).toBe("claudekit-marketing");
 		});
 	});

package/tests/lib/merge.test.ts

@@ -135,4 +135,81 @@ describe("FileMerger", () => {
 			expect(existsSync(join(testDestDir, "custom-ignore.txt"))).toBe(false);
 		});
 	});
+
+	describe("custom .claude file preservation", () => {
+		test("should preserve custom .claude files when patterns are added", async () => {
+			// Create .claude directories
+			const sourceClaudeDir = join(testSourceDir, ".claude");
+			const destClaudeDir = join(testDestDir, ".claude");
+			await mkdir(sourceClaudeDir, { recursive: true });
+			await mkdir(destClaudeDir, { recursive: true });
+
+			// Create files in source (from release package)
+			await writeFile(join(sourceClaudeDir, "standard.md"), "standard content");
+
+			// Create files in destination (existing + custom)
+			await writeFile(join(destClaudeDir, "standard.md"), "old standard content");
+			await writeFile(join(destClaudeDir, "custom.md"), "custom content");
+
+			// Add custom file to ignore patterns (this would be done by update.ts)
+			merger.addIgnorePatterns([".claude/custom.md"]);
+
+			await merger.merge(testSourceDir, testDestDir, true);
+
+			// Standard file should be overwritten
+			const standardContent = await Bun.file(join(destClaudeDir, "standard.md")).text();
+			expect(standardContent).toBe("standard content");
+
+			// Custom file should be preserved
+			expect(existsSync(join(destClaudeDir, "custom.md"))).toBe(true);
+			const customContent = await Bun.file(join(destClaudeDir, "custom.md")).text();
+			expect(customContent).toBe("custom content");
+		});
+
+		test("should preserve nested custom .claude files", async () => {
+			// Create nested .claude structure
+			const sourceCommandsDir = join(testSourceDir, ".claude", "commands");
+			const destCommandsDir = join(testDestDir, ".claude", "commands");
+			await mkdir(sourceCommandsDir, { recursive: true });
+			await mkdir(destCommandsDir, { recursive: true });
+
+			// Create standard file in source
+			await writeFile(join(sourceCommandsDir, "standard-cmd.md"), "standard command");
+
+			// Create custom file in destination
+			await writeFile(join(destCommandsDir, "custom-cmd.md"), "custom command");
+
+			// Add custom file to ignore patterns
+			merger.addIgnorePatterns([".claude/commands/custom-cmd.md"]);
+
+			await merger.merge(testSourceDir, testDestDir, true);
+
+			// Custom file should be preserved
+			expect(existsSync(join(destCommandsDir, "custom-cmd.md"))).toBe(true);
+			const customContent = await Bun.file(join(destCommandsDir, "custom-cmd.md")).text();
+			expect(customContent).toBe("custom command");
+		});
+
+		test("should preserve multiple custom .claude files", async () => {
+			const sourceClaudeDir = join(testSourceDir, ".claude");
+			const destClaudeDir = join(testDestDir, ".claude");
+			await mkdir(sourceClaudeDir, { recursive: true });
+			await mkdir(destClaudeDir, { recursive: true });
+
+			// Create multiple custom files in destination
+			await writeFile(join(destClaudeDir, "custom1.md"), "custom1");
+			await writeFile(join(destClaudeDir, "custom2.md"), "custom2");
+			await writeFile(join(destClaudeDir, "custom3.md"), "custom3");
+
+			// Add all custom files to ignore patterns
+			merger.addIgnorePatterns([".claude/custom1.md", ".claude/custom2.md", ".claude/custom3.md"]);
+
+			await merger.merge(testSourceDir, testDestDir, true);
+
+			// All custom files should be preserved
+			expect(existsSync(join(destClaudeDir, "custom1.md"))).toBe(true);
+			expect(existsSync(join(destClaudeDir, "custom2.md"))).toBe(true);
+			expect(existsSync(join(destClaudeDir, "custom3.md"))).toBe(true);
+		});
+	});
 });

package/tests/types.test.ts

@@ -108,6 +108,7 @@ describe("Types and Schemas", () => {
 			const asset = {
 				id: 123,
 				name: "release.tar.gz",
+				url: "https://api.github.com/repos/test/repo/releases/assets/123",
 				browser_download_url: "https://github.com/test/release.tar.gz",
 				size: 1024,
 				content_type: "application/gzip",
@@ -122,6 +123,7 @@ describe("Types and Schemas", () => {
 			const asset = {
 				id: 123,
 				name: "release.tar.gz",
+				url: "not-a-url",
 				browser_download_url: "not-a-url",
 				size: 1024,
 				content_type: "application/gzip",
@@ -150,12 +152,15 @@ describe("Types and Schemas", () => {
 					{
 						id: 123,
 						name: "release.tar.gz",
+						url: "https://api.github.com/repos/test/repo/releases/assets/123",
 						browser_download_url: "https://github.com/test/release.tar.gz",
 						size: 1024,
 						content_type: "application/gzip",
 					},
 				],
 				published_at: "2024-01-01T00:00:00Z",
+				tarball_url: "https://api.github.com/repos/test/test-repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/test-repo/zipball/v1.0.0",
 			};
 			const result = GitHubReleaseSchema.parse(release);
 			expect(result.id).toBe(1);
@@ -171,6 +176,8 @@ describe("Types and Schemas", () => {
 				draft: false,
 				prerelease: false,
 				assets: [],
+				tarball_url: "https://api.github.com/repos/test/test-repo/tarball/v1.0.0",
+				zipball_url: "https://api.github.com/repos/test/test-repo/zipball/v1.0.0",
 			};
 			const result = GitHubReleaseSchema.parse(release);
 			expect(result.published_at).toBeUndefined();