claudekit-cli 1.1.0 → 1.2.0

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

@@ -156,6 +156,8 @@ describe("Types and Schemas", () => {
 					},
 				],
 				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 +173,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();

package/tests/utils/file-scanner.test.ts

@@ -0,0 +1,202 @@
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import { join } from "node:path";
+import { mkdir, remove, writeFile } from "fs-extra";
+import { FileScanner } from "../../src/utils/file-scanner.js";
+
+describe("FileScanner", () => {
+	const testDir = join(__dirname, "..", "..", "temp-test-file-scanner");
+	const destDir = join(testDir, "dest");
+	const sourceDir = join(testDir, "source");
+
+	beforeEach(async () => {
+		// Clean up and create test directories
+		await remove(testDir);
+		await mkdir(testDir, { recursive: true });
+		await mkdir(destDir, { recursive: true });
+		await mkdir(sourceDir, { recursive: true });
+	});
+
+	afterEach(async () => {
+		// Clean up test directories
+		await remove(testDir);
+	});
+
+	describe("getFiles", () => {
+		test("should return empty array for non-existent directory", async () => {
+			const files = await FileScanner.getFiles(join(testDir, "non-existent"));
+			expect(files).toEqual([]);
+		});
+
+		test("should return files from directory", async () => {
+			// Create test files
+			await writeFile(join(destDir, "file1.txt"), "content1");
+			await writeFile(join(destDir, "file2.txt"), "content2");
+
+			const files = await FileScanner.getFiles(destDir);
+
+			expect(files).toHaveLength(2);
+			expect(files).toContain("file1.txt");
+			expect(files).toContain("file2.txt");
+		});
+
+		test("should recursively scan subdirectories", async () => {
+			// Create nested structure
+			await mkdir(join(destDir, "subdir"), { recursive: true });
+			await writeFile(join(destDir, "file1.txt"), "content1");
+			await writeFile(join(destDir, "subdir", "file2.txt"), "content2");
+
+			const files = await FileScanner.getFiles(destDir);
+
+			expect(files).toHaveLength(2);
+			expect(files).toContain("file1.txt");
+			expect(files).toContain("subdir/file2.txt");
+		});
+
+		test("should handle empty directory", async () => {
+			const files = await FileScanner.getFiles(destDir);
+			expect(files).toEqual([]);
+		});
+
+		test("should handle deeply nested directories", async () => {
+			// Create deeply nested structure
+			const deepPath = join(destDir, "a", "b", "c", "d");
+			await mkdir(deepPath, { recursive: true });
+			await writeFile(join(deepPath, "deep.txt"), "deep content");
+
+			const files = await FileScanner.getFiles(destDir);
+
+			expect(files).toHaveLength(1);
+			expect(files).toContain("a/b/c/d/deep.txt");
+		});
+
+		test("should return relative paths", async () => {
+			await mkdir(join(destDir, "subdir"), { recursive: true });
+			await writeFile(join(destDir, "subdir", "file.txt"), "content");
+
+			const files = await FileScanner.getFiles(destDir);
+
+			// Should return relative path, not absolute
+			expect(files[0]).toBe("subdir/file.txt");
+			expect(files[0]).not.toContain(destDir);
+		});
+	});
+
+	describe("findCustomFiles", () => {
+		test("should identify files in dest but not in source", async () => {
+			// Create .claude directories
+			const destClaudeDir = join(destDir, ".claude");
+			const sourceClaudeDir = join(sourceDir, ".claude");
+			await mkdir(destClaudeDir, { recursive: true });
+			await mkdir(sourceClaudeDir, { recursive: true });
+
+			// Create files
+			await writeFile(join(destClaudeDir, "custom.md"), "custom content");
+			await writeFile(join(destClaudeDir, "standard.md"), "standard content");
+			await writeFile(join(sourceClaudeDir, "standard.md"), "standard content");
+
+			const customFiles = await FileScanner.findCustomFiles(destDir, sourceDir, ".claude");
+
+			expect(customFiles).toHaveLength(1);
+			expect(customFiles).toContain(".claude/custom.md");
+		});
+
+		test("should return empty array when no custom files exist", async () => {
+			// Create .claude directories
+			const destClaudeDir = join(destDir, ".claude");
+			const sourceClaudeDir = join(sourceDir, ".claude");
+			await mkdir(destClaudeDir, { recursive: true });
+			await mkdir(sourceClaudeDir, { recursive: true });
+
+			// Create same files in both
+			await writeFile(join(destClaudeDir, "file1.md"), "content1");
+			await writeFile(join(sourceClaudeDir, "file1.md"), "content1");
+
+			const customFiles = await FileScanner.findCustomFiles(destDir, sourceDir, ".claude");
+
+			expect(customFiles).toEqual([]);
+		});
+
+		test("should handle missing .claude in destination", async () => {
+			// Only create source .claude directory
+			const sourceClaudeDir = join(sourceDir, ".claude");
+			await mkdir(sourceClaudeDir, { recursive: true });
+			await writeFile(join(sourceClaudeDir, "file1.md"), "content1");
+
+			const customFiles = await FileScanner.findCustomFiles(destDir, sourceDir, ".claude");
+
+			expect(customFiles).toEqual([]);
+		});
+
+		test("should handle missing .claude in source", async () => {
+			// Only create dest .claude directory
+			const destClaudeDir = join(destDir, ".claude");
+			await mkdir(destClaudeDir, { recursive: true });
+			await writeFile(join(destClaudeDir, "custom.md"), "custom content");
+
+			const customFiles = await FileScanner.findCustomFiles(destDir, sourceDir, ".claude");
+
+			expect(customFiles).toHaveLength(1);
+			expect(customFiles).toContain(".claude/custom.md");
+		});
+
+		test("should handle nested subdirectories", async () => {
+			// Create nested structure
+			const destNestedDir = join(destDir, ".claude", "commands");
+			const sourceNestedDir = join(sourceDir, ".claude", "commands");
+			await mkdir(destNestedDir, { recursive: true });
+			await mkdir(sourceNestedDir, { recursive: true });
+
+			// Create custom file in nested dir
+			await writeFile(join(destNestedDir, "custom-cmd.md"), "custom command");
+			await writeFile(join(destNestedDir, "standard-cmd.md"), "standard command");
+			await writeFile(join(sourceNestedDir, "standard-cmd.md"), "standard command");
+
+			const customFiles = await FileScanner.findCustomFiles(destDir, sourceDir, ".claude");
+
+			expect(customFiles).toHaveLength(1);
+			expect(customFiles).toContain(".claude/commands/custom-cmd.md");
+		});
+
+		test("should handle multiple custom files", async () => {
+			// Create .claude directories
+			const destClaudeDir = join(destDir, ".claude");
+			const sourceClaudeDir = join(sourceDir, ".claude");
+			await mkdir(destClaudeDir, { recursive: true });
+			await mkdir(sourceClaudeDir, { recursive: true });
+
+			// Create multiple custom files
+			await writeFile(join(destClaudeDir, "custom1.md"), "custom1");
+			await writeFile(join(destClaudeDir, "custom2.md"), "custom2");
+			await writeFile(join(destClaudeDir, "custom3.md"), "custom3");
+			await writeFile(join(destClaudeDir, "standard.md"), "standard");
+			await writeFile(join(sourceClaudeDir, "standard.md"), "standard");
+
+			const customFiles = await FileScanner.findCustomFiles(destDir, sourceDir, ".claude");
+
+			expect(customFiles).toHaveLength(3);
+			expect(customFiles).toContain(".claude/custom1.md");
+			expect(customFiles).toContain(".claude/custom2.md");
+			expect(customFiles).toContain(".claude/custom3.md");
+		});
+
+		test("should handle files with special characters in names", async () => {
+			// Create .claude directories
+			const destClaudeDir = join(destDir, ".claude");
+			const sourceClaudeDir = join(sourceDir, ".claude");
+			await mkdir(destClaudeDir, { recursive: true });
+			await mkdir(sourceClaudeDir, { recursive: true });
+
+			// Create files with special characters
+			await writeFile(join(destClaudeDir, "file-with-dash.md"), "content");
+			await writeFile(join(destClaudeDir, "file_with_underscore.md"), "content");
+			await writeFile(join(destClaudeDir, "file.multiple.dots.md"), "content");
+
+			const customFiles = await FileScanner.findCustomFiles(destDir, sourceDir, ".claude");
+
+			expect(customFiles).toHaveLength(3);
+			expect(customFiles).toContain(".claude/file-with-dash.md");
+			expect(customFiles).toContain(".claude/file_with_underscore.md");
+			expect(customFiles).toContain(".claude/file.multiple.dots.md");
+		});
+	});
+});

package/tests/utils/logger.test.ts

@@ -7,6 +7,10 @@ describe("Logger Utilities", () => {
 	const originalDebug = process.env.DEBUG;
 
 	beforeEach(() => {
+		// Reset logger state
+		logger.setVerbose(false);
+		logger.setLogFile(undefined);
+
 		consoleLogSpy = mock(() => {});
 		consoleErrorSpy = mock(() => {});
 		console.log = consoleLogSpy;
@@ -101,6 +105,18 @@ describe("Logger Utilities", () => {
 			expect(sanitized).toBe("Token: ghr_***");
 		});
 
+		test("should sanitize Bearer tokens", () => {
+			const text = "Authorization: Bearer abc123xyz-token_value";
+			const sanitized = logger.sanitize(text);
+			expect(sanitized).toBe("Authorization: Bearer ***");
+		});
+
+		test("should sanitize query string tokens", () => {
+			const text = "https://api.example.com?token=secret123";
+			const sanitized = logger.sanitize(text);
+			expect(sanitized).toBe("https://api.example.com?token=***");
+		});
+
 		test("should sanitize multiple tokens", () => {
 			const ghpToken = "123456789012345678901234567890123456";
 			const patToken =
@@ -121,4 +137,103 @@ describe("Logger Utilities", () => {
 			expect(sanitized).toBe("");
 		});
 	});
+
+	describe("verbose", () => {
+		beforeEach(() => {
+			logger.setVerbose(false);
+		});
+
+		test("should not log when verbose is disabled", () => {
+			logger.verbose("Test verbose message");
+			expect(consoleErrorSpy).not.toHaveBeenCalled();
+		});
+
+		test("should log to stderr when verbose is enabled", () => {
+			logger.setVerbose(true);
+			logger.verbose("Test verbose message");
+			expect(consoleErrorSpy).toHaveBeenCalled();
+			const call = consoleErrorSpy.mock.calls[1][0];
+			expect(call).toContain("[VERBOSE]");
+			expect(call).toContain("Test verbose message");
+		});
+
+		test("should include timestamp in verbose logs", () => {
+			logger.setVerbose(true);
+			logger.verbose("Test message");
+			const call = consoleErrorSpy.mock.calls[1][0];
+			expect(call).toMatch(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
+		});
+
+		test("should sanitize sensitive data in verbose logs", () => {
+			logger.setVerbose(true);
+			logger.verbose("Token: ghp_123456789012345678901234567890123456");
+			const call = consoleErrorSpy.mock.calls[1][0];
+			expect(call).toContain("ghp_***");
+			expect(call).not.toContain("ghp_123456789012345678901234567890123456");
+		});
+
+		test("should include context in verbose logs", () => {
+			logger.setVerbose(true);
+			logger.verbose("Test message", { key: "value", num: 123 });
+			const call = consoleErrorSpy.mock.calls[1][0];
+			expect(call).toContain('"key": "value"');
+			expect(call).toContain('"num": 123');
+		});
+
+		test("should sanitize context strings", () => {
+			logger.setVerbose(true);
+			logger.verbose("Test message", {
+				token: "ghp_123456789012345678901234567890123456",
+			});
+			const call = consoleErrorSpy.mock.calls[1][0];
+			expect(call).toContain("ghp_***");
+			expect(call).not.toContain("ghp_123456789012345678901234567890123456");
+		});
+
+		test("should handle nested objects in context", () => {
+			logger.setVerbose(true);
+			logger.verbose("Test message", {
+				nested: { key: "value" },
+			});
+			const call = consoleErrorSpy.mock.calls[1][0];
+			expect(call).toContain('"nested"');
+		});
+	});
+
+	describe("setVerbose", () => {
+		test("should enable verbose logging", () => {
+			logger.setVerbose(true);
+			expect(logger.isVerbose()).toBe(true);
+		});
+
+		test("should disable verbose logging", () => {
+			logger.setVerbose(true);
+			logger.setVerbose(false);
+			expect(logger.isVerbose()).toBe(false);
+		});
+
+		test("should log when enabling verbose", () => {
+			logger.setVerbose(true);
+			expect(consoleErrorSpy).toHaveBeenCalled();
+			const call = consoleErrorSpy.mock.calls[0][0];
+			expect(call).toContain("Verbose logging enabled");
+		});
+	});
+
+	describe("isVerbose", () => {
+		test("should return false by default", () => {
+			expect(logger.isVerbose()).toBe(false);
+		});
+
+		test("should return true when enabled", () => {
+			logger.setVerbose(true);
+			expect(logger.isVerbose()).toBe(true);
+		});
+
+		test("should return false when disabled", () => {
+			logger.setVerbose(true);
+			logger.setVerbose(false);
+			expect(logger.isVerbose()).toBe(false);
+		});
+	});
 });