claudekit-cli 1.2.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "claudekit-cli",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"bin": {

package/src/commands/new.ts

@@ -1,6 +1,5 @@
 import { resolve } from "node:path";
 import { pathExists, readdir } from "fs-extra";
-import ora from "ora";
 import { AuthManager } from "../lib/auth.js";
 import { DownloadManager } from "../lib/download.js";
 import { GitHubClient } from "../lib/github.js";
@@ -9,6 +8,7 @@ import { PromptsManager } from "../lib/prompts.js";
 import { AVAILABLE_KITS, type NewCommandOptions, NewCommandOptionsSchema } from "../types.js";
 import { ConfigManager } from "../utils/config.js";
 import { logger } from "../utils/logger.js";
+import { createSpinner } from "../utils/safe-spinner.js";
 
 export async function newCommand(options: NewCommandOptions): Promise<void> {
 	const prompts = new PromptsManager();
@@ -59,7 +59,7 @@ export async function newCommand(options: NewCommandOptions): Promise<void> {
 		const github = new GitHubClient();
 
 		// Check repository access
-		const spinner = ora("Checking repository access...").start();
+		const spinner = createSpinner("Checking repository access...").start();
 		const hasAccess = await github.checkAccess(kitConfig);
 		if (!hasAccess) {
 			spinner.fail("Access denied to repository");

package/src/commands/update.ts

@@ -1,6 +1,5 @@
 import { resolve } from "node:path";
 import { pathExists } from "fs-extra";
-import ora from "ora";
 import { AuthManager } from "../lib/auth.js";
 import { DownloadManager } from "../lib/download.js";
 import { GitHubClient } from "../lib/github.js";
@@ -10,6 +9,7 @@ import { AVAILABLE_KITS, type UpdateCommandOptions, UpdateCommandOptionsSchema }
 import { ConfigManager } from "../utils/config.js";
 import { FileScanner } from "../utils/file-scanner.js";
 import { logger } from "../utils/logger.js";
+import { createSpinner } from "../utils/safe-spinner.js";
 
 export async function updateCommand(options: UpdateCommandOptions): Promise<void> {
 	const prompts = new PromptsManager();
@@ -52,7 +52,7 @@ export async function updateCommand(options: UpdateCommandOptions): Promise<void
 		const github = new GitHubClient();
 
 		// Check repository access
-		const spinner = ora("Checking repository access...").start();
+		const spinner = createSpinner("Checking repository access...").start();
 		const hasAccess = await github.checkAccess(kitConfig);
 		if (!hasAccess) {
 			spinner.fail("Access denied to repository");

package/src/lib/download.ts

@@ -6,7 +6,6 @@ import { pipeline } from "node:stream";
 import { promisify } from "node:util";
 import cliProgress from "cli-progress";
 import ignore from "ignore";
-import ora from "ora";
 import * as tar from "tar";
 import unzipper from "unzipper";
 import {
@@ -16,6 +15,7 @@ import {
 	type GitHubReleaseAsset,
 } from "../types.js";
 import { logger } from "../utils/logger.js";
+import { createSpinner } from "../utils/safe-spinner.js";
 
 const streamPipeline = promisify(pipeline);
 
@@ -55,11 +55,11 @@ export class DownloadManager {
 
 			logger.info(`Downloading ${asset.name} (${this.formatBytes(asset.size)})...`);
 
-			// Create progress bar
+			// Create progress bar with simple ASCII characters
 			const progressBar = new cliProgress.SingleBar({
 				format: "Progress |{bar}| {percentage}% | {value}/{total} MB",
-				barCompleteChar: "\u2588",
-				barIncompleteChar: "\u2591",
+				barCompleteChar: "=",
+				barIncompleteChar: "-",
 				hideCursor: true,
 			});
 
@@ -137,7 +137,9 @@ export class DownloadManager {
 		// Add authentication for GitHub API URLs
 		if (token && url.includes("api.github.com")) {
 			headers.Authorization = `Bearer ${token}`;
-			headers.Accept = "application/vnd.github+json";
+			// Use application/octet-stream for asset downloads (not vnd.github+json)
+			headers.Accept = "application/octet-stream";
+			headers["X-GitHub-Api-Version"] = "2022-11-28";
 		} else {
 			headers.Accept = "application/octet-stream";
 		}
@@ -151,13 +153,13 @@ export class DownloadManager {
 		const totalSize = size || Number(response.headers.get("content-length")) || 0;
 		let downloadedSize = 0;
 
-		// Create progress bar only if we know the size
+		// Create progress bar only if we know the size (using simple ASCII characters)
 		const progressBar =
 			totalSize > 0
 				? new cliProgress.SingleBar({
 						format: "Progress |{bar}| {percentage}% | {value}/{total} MB",
-						barCompleteChar: "\u2588",
-						barIncompleteChar: "\u2591",
+						barCompleteChar: "=",
+						barIncompleteChar: "-",
 						hideCursor: true,
 					})
 				: null;
@@ -207,7 +209,7 @@ export class DownloadManager {
 		destDir: string,
 		archiveType?: ArchiveType,
 	): Promise<void> {
-		const spinner = ora("Extracting files...").start();
+		const spinner = createSpinner("Extracting files...").start();
 
 		try {
 			// Detect archive type from filename if not provided

package/src/lib/github.ts

@@ -159,7 +159,7 @@ export class GitHubClient {
 	 * Get downloadable asset or source code URL from release
 	 * Priority:
 	 * 1. "ClaudeKit Engineer Package" or "ClaudeKit Marketing Package" zip file
-	 * 2. Other custom uploaded assets (.tar.gz, .tgz, .zip)
+	 * 2. Other custom uploaded assets (.tar.gz, .tgz, .zip) excluding "Source code" archives
 	 * 3. GitHub's automatic tarball URL
 	 */
 	static getDownloadableAsset(release: GitHubRelease): {
@@ -168,41 +168,58 @@ export class GitHubClient {
 		name: string;
 		size?: number;
 	} {
+		// Log all available assets for debugging
+		logger.debug(`Available assets for ${release.tag_name}:`);
+		if (release.assets.length === 0) {
+			logger.debug("  No custom assets found");
+		} else {
+			release.assets.forEach((asset, index) => {
+				logger.debug(`  ${index + 1}. ${asset.name} (${(asset.size / 1024 / 1024).toFixed(2)} MB)`);
+			});
+		}
+
 		// First priority: Look for official ClaudeKit package assets
-		const packageAsset = release.assets.find(
-			(a) =>
-				a.name.toLowerCase().includes("claudekit") &&
-				a.name.toLowerCase().includes("package") &&
-				a.name.endsWith(".zip"),
-		);
+		const packageAsset = release.assets.find((a) => {
+			const nameLower = a.name.toLowerCase();
+			return (
+				nameLower.includes("claudekit") &&
+				nameLower.includes("package") &&
+				nameLower.endsWith(".zip")
+			);
+		});
 
 		if (packageAsset) {
-			logger.debug(`Using ClaudeKit package asset: ${packageAsset.name}`);
+			logger.debug(`✓ Selected ClaudeKit package asset: ${packageAsset.name}`);
 			return {
 				type: "asset",
-				url: packageAsset.browser_download_url,
+				url: packageAsset.url, // Use API endpoint for authenticated downloads
 				name: packageAsset.name,
 				size: packageAsset.size,
 			};
 		}
 
-		// Second priority: Look for any custom uploaded assets
+		logger.debug("⚠ No ClaudeKit package asset found, checking for other custom assets...");
+
+		// Second priority: Look for any custom uploaded assets (excluding GitHub's automatic source code archives)
 		const customAsset = release.assets.find(
-			(a) => a.name.endsWith(".tar.gz") || a.name.endsWith(".tgz") || a.name.endsWith(".zip"),
+			(a) =>
+				(a.name.endsWith(".tar.gz") || a.name.endsWith(".tgz") || a.name.endsWith(".zip")) &&
+				!a.name.toLowerCase().startsWith("source") &&
+				!a.name.toLowerCase().includes("source code"),
 		);
 
 		if (customAsset) {
-			logger.debug(`Using custom asset: ${customAsset.name}`);
+			logger.debug(`✓ Selected custom asset: ${customAsset.name}`);
 			return {
 				type: "asset",
-				url: customAsset.browser_download_url,
+				url: customAsset.url, // Use API endpoint for authenticated downloads
 				name: customAsset.name,
 				size: customAsset.size,
 			};
 		}
 
 		// Fall back to GitHub's automatic tarball
-		logger.debug("Using GitHub automatic tarball");
+		logger.debug("⚠ No custom assets found, falling back to GitHub automatic tarball");
 		return {
 			type: "tarball",
 			url: release.tarball_url,

package/src/types.ts

@@ -46,7 +46,8 @@ export type Config = z.infer<typeof ConfigSchema>;
 export const GitHubReleaseAssetSchema = z.object({
 	id: z.number(),
 	name: z.string(),
-	browser_download_url: z.string().url(),
+	url: z.string().url(), // API endpoint for authenticated downloads
+	browser_download_url: z.string().url(), // Direct download URL (public only)
 	size: z.number(),
 	content_type: z.string(),
 });

package/src/utils/logger.ts

@@ -4,9 +4,9 @@ import pc from "picocolors";
 // Use ASCII-safe symbols to avoid unicode rendering issues in certain terminals
 const symbols = {
 	info: "[i]",
-	success: "[✓]",
+	success: "[+]",
 	warning: "[!]",
-	error: "[✗]",
+	error: "[x]",
 };
 
 interface LogContext {

package/src/utils/safe-prompts.ts

@@ -1,53 +1,43 @@
-import * as clack from "@clack/prompts";
+import picocolors from "picocolors";
 
 /**
- * Safe wrapper around clack prompts that handles unicode rendering issues.
- * Sets up proper environment to minimize encoding problems.
+ * Safe wrapper around clack prompts that uses simple ASCII characters
+ * instead of unicode box drawing to avoid rendering issues.
  */
 
-// Store original methods
-const originalIntro = clack.intro;
-const originalOutro = clack.outro;
-const originalNote = clack.note;
-
 /**
- * Wrapped intro that handles encoding better
+ * Simple intro with ASCII characters
  */
 export function intro(message: string): void {
-	try {
-		originalIntro(message);
-	} catch {
-		// Fallback to simple console log if clack fails
-		console.log(`\n=== ${message} ===\n`);
-	}
+	console.log();
+	console.log(picocolors.cyan(`> ${message}`));
+	console.log();
 }
 
 /**
- * Wrapped outro that handles encoding better
+ * Simple outro with ASCII characters
  */
 export function outro(message: string): void {
-	try {
-		originalOutro(message);
-	} catch {
-		// Fallback to simple console log if clack fails
-		console.log(`\n=== ${message} ===\n`);
-	}
+	console.log();
+	console.log(picocolors.green(`[OK] ${message}`));
+	console.log();
 }
 
 /**
- * Wrapped note that handles encoding better
+ * Simple note with ASCII box drawing
  */
 export function note(message: string, title?: string): void {
-	try {
-		originalNote(message, title);
-	} catch {
-		// Fallback to simple console log if clack fails
-		if (title) {
-			console.log(`\n--- ${title} ---`);
-		}
-		console.log(message);
+	console.log();
+	if (title) {
+		console.log(picocolors.cyan(`  ${title}:`));
 		console.log();
 	}
+	// Split message into lines and indent each
+	const lines = message.split("\n");
+	for (const line of lines) {
+		console.log(`  ${line}`);
+	}
+	console.log();
 }
 
 // Re-export other clack functions unchanged

package/src/utils/safe-spinner.ts

@@ -0,0 +1,38 @@
+import ora, { type Ora, type Options } from "ora";
+
+/**
+ * Create a spinner with simple ASCII characters to avoid unicode rendering issues
+ */
+export function createSpinner(options: string | Options): Ora {
+	const spinnerOptions: Options = typeof options === "string" ? { text: options } : options;
+
+	const spinner = ora({
+		...spinnerOptions,
+		// Use simple ASCII spinner instead of unicode
+		spinner: "dots",
+		// Override symbols to use ASCII
+		prefixText: "",
+	});
+
+	// Override succeed and fail methods to use ASCII symbols
+	spinner.succeed = (text?: string) => {
+		spinner.stopAndPersist({
+			symbol: "[+]",
+			text: text || spinner.text,
+		});
+		return spinner;
+	};
+
+	spinner.fail = (text?: string) => {
+		spinner.stopAndPersist({
+			symbol: "[x]",
+			text: text || spinner.text,
+		});
+		return spinner;
+	};
+
+	return spinner;
+}
+
+// Re-export Ora type for convenience
+export type { Ora } from "ora";

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

@@ -17,6 +17,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -24,6 +25,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -35,7 +37,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 
 			expect(result.type).toBe("asset");
 			expect(result.name).toBe("ClaudeKit-Engineer-Package.zip");
-			expect(result.url).toBe("https://github.com/test/claudekit-package.zip");
+			expect(result.url).toBe("https://api.github.com/repos/test/repo/releases/assets/2");
 			expect(result.size).toBe(2048);
 		});
 
@@ -52,6 +54,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -59,6 +62,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -70,7 +74,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 
 			expect(result.type).toBe("asset");
 			expect(result.name).toBe("ClaudeKit-Marketing-Package.zip");
-			expect(result.url).toBe("https://github.com/test/marketing-package.zip");
+			expect(result.url).toBe("https://api.github.com/repos/test/repo/releases/assets/2");
 		});
 
 		test("should match ClaudeKit package case-insensitively", () => {
@@ -86,6 +90,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -111,8 +116,9 @@ describe("GitHubClient - Asset Download Priority", () => {
 				assets: [
 					{
 						id: 1,
-						name: "source-code.zip",
-						browser_download_url: "https://github.com/test/source.zip",
+						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",
 					},
@@ -122,7 +128,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 			const result = GitHubClient.getDownloadableAsset(release);
 
 			expect(result.type).toBe("asset");
-			expect(result.name).toBe("source-code.zip");
+			expect(result.name).toBe("release-package.zip");
 		});
 
 		test("should fallback to tar.gz files if no zip found", () => {
@@ -138,6 +144,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -164,6 +171,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -210,6 +218,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -217,6 +226,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -243,6 +253,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -250,6 +261,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -257,6 +269,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -285,6 +298,7 @@ describe("GitHubClient - Asset Download Priority", () => {
 					{
 						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",
@@ -297,5 +311,122 @@ describe("GitHubClient - Asset Download Priority", () => {
 			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/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,6 +152,7 @@ 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",