koguma 2.2.3 → 2.2.4

package/cli/dev-sync.ts

@@ -233,8 +233,13 @@ function startMediaWatcher(opts: MediaWatcherOptions): { stop: () => void } {
             // Remove from local R2
             const { ensureWranglerConfig } = require('./config.ts');
             const configPath = ensureWranglerConfig(root);
+            const localBin = existsSync(
+              resolve(root, 'node_modules/.bin/wrangler')
+            )
+              ? resolve(root, 'node_modules/.bin/wrangler')
+              : 'bunx wrangler';
             run(
-              `bunx wrangler r2 object delete ${key} --config ${configPath} --local`,
+              `${localBin} r2 object delete ${key} --config ${configPath} --local`,
               { cwd: root, silent: true }
             );
           } catch {
@@ -250,8 +255,13 @@ function startMediaWatcher(opts: MediaWatcherOptions): { stop: () => void } {
             const { run } = require('./exec.ts');
             const { ensureWranglerConfig } = require('./config.ts');
             const configPath = ensureWranglerConfig(root);
+            const localBin = existsSync(
+              resolve(root, 'node_modules/.bin/wrangler')
+            )
+              ? resolve(root, 'node_modules/.bin/wrangler')
+              : 'bunx wrangler';
             run(
-              `bunx wrangler d1 execute ${dbName} --local --config ${configPath} --command "DELETE FROM assets WHERE id = '${id}'"`,
+              `${localBin} d1 execute ${dbName} --local --config ${configPath} --command "DELETE FROM assets WHERE id = '${id}'"`,
               { cwd: root, silent: true }
             );
           } catch {

package/cli/preflight.ts

@@ -14,6 +14,12 @@ import { fail, warn, log, ANSI } from './log.ts';
 import { CONFIG_FILE, SITE_CONFIG_FILE, KOGUMA_DIR } from './constants.ts';
 import { runCapture } from './exec.ts';
 
+/** Prefer locally installed wrangler; fall back to bunx. */
+function wranglerBin(root: string): string {
+  const local = resolve(root, 'node_modules/.bin/wrangler');
+  return existsSync(local) ? local : 'bunx wrangler';
+}
+
 export interface PreflightOptions {
   /** Command needs wrangler login (remote D1/R2 operations) */
   needsAuth?: boolean;
@@ -67,12 +73,13 @@ function requireSiteConfig(root: string): void {
 }
 
 function requireWranglerAuth(root: string): void {
+  const bin = wranglerBin(root);
   try {
-    runCapture('bunx wrangler whoami', root);
+    runCapture(`${bin} whoami`, root);
   } catch {
     fail(
       `Not logged in to Cloudflare.\n` +
-        `  Run ${ANSI.CYAN}bunx wrangler login${ANSI.RESET} first, ` +
+        `  Run ${ANSI.CYAN}${bin} login${ANSI.RESET} first, ` +
         `or ${ANSI.CYAN}koguma init${ANSI.RESET} which handles login for you.`
     );
     process.exit(1);

package/cli/wrangler.ts

@@ -14,6 +14,21 @@ import { run, runCapture, runAsync } from './exec.ts';
 import { ok, warn, fail, log } from './log.ts';
 import { DB_DIR, MIGRATION_FILE } from './constants.ts';
 
+// ── Wrangler binary resolution ─────────────────────────────────────
+
+/**
+ * Resolve the wrangler binary to use.
+ *
+ * Prefers the locally installed copy (node_modules/.bin/wrangler) so the
+ * project controls its own wrangler version via package.json devDependencies.
+ * Falls back to `bunx wrangler` when no local binary is found (e.g. before
+ * `bun install` has been run or in CI with a fresh checkout).
+ */
+function wranglerBin(root: string): string {
+  const localBin = resolve(root, 'node_modules/.bin/wrangler');
+  return existsSync(localBin) ? localBin : 'bunx wrangler';
+}
+
 // ── Preflight checks ───────────────────────────────────────────────
 
 /**
@@ -21,11 +36,12 @@ import { DB_DIR, MIGRATION_FILE } from './constants.ts';
  * Gives a clear, actionable error message if not logged in.
  */
 export function checkWranglerAuth(root: string): void {
+  const bin = wranglerBin(root);
   try {
-    runCapture('bunx wrangler whoami', root);
+    runCapture(`${bin} whoami`, root);
   } catch {
     fail(
-      "Not logged in to Cloudflare. Run 'bunx wrangler login' first, " +
+      `Not logged in to Cloudflare. Run '${bin} login' first, ` +
         "or run 'koguma init' which handles login for you."
     );
     process.exit(1);
@@ -56,7 +72,7 @@ export function d1Execute(
   command: string
 ): void {
   run(
-    `bunx wrangler d1 execute ${dbName} ${target} ${configFlag(root)} --command "${wrapForShell(command)}"`,
+    `${wranglerBin(root)} d1 execute ${dbName} ${target} ${configFlag(root)} --command "${wrapForShell(command)}"`,
     { cwd: root, silent: true }
   );
 }
@@ -71,7 +87,7 @@ export function d1ExecuteFile(
   filePath: string
 ): void {
   run(
-    `bunx wrangler d1 execute ${dbName} ${target} ${configFlag(root)} --file=${filePath}`,
+    `${wranglerBin(root)} d1 execute ${dbName} ${target} ${configFlag(root)} --file=${filePath}`,
     { cwd: root, silent: true }
   );
 }
@@ -86,7 +102,7 @@ export function d1Query(
   query: string
 ): Record<string, unknown>[] {
   const output = runCapture(
-    `bunx wrangler d1 execute ${dbName} ${target} ${configFlag(root)} --command "${query}" --json`,
+    `${wranglerBin(root)} d1 execute ${dbName} ${target} ${configFlag(root)} --command "${query}" --json`,
     root
   );
   const parsed = JSON.parse(output);
@@ -161,7 +177,7 @@ export async function applySchemaAsync(
   const sqlFile = resolve(dbDir, MIGRATION_FILE);
   writeFileSync(sqlFile, INIT_SQL);
   await runAsync(
-    `bunx wrangler d1 execute ${dbName} ${target} ${configFlag(root)} --file=${sqlFile}`,
+    `${wranglerBin(root)} d1 execute ${dbName} ${target} ${configFlag(root)} --file=${sqlFile}`,
     { cwd: root, silent: true }
   );
 }
@@ -185,7 +201,7 @@ export async function d1InsertBatchAsync(
   const statements = rows.map(row => buildInsertSql(table, row) + ';');
   writeFileSync(sqlFile, statements.join('\n'));
   await runAsync(
-    `bunx wrangler d1 execute ${dbName} ${target} ${configFlag(root)} --file=${sqlFile}`,
+    `${wranglerBin(root)} d1 execute ${dbName} ${target} ${configFlag(root)} --file=${sqlFile}`,
     { cwd: root, silent: true }
   );
 }
@@ -212,7 +228,7 @@ export async function d1ExecuteBatchSqlAsync(
     statements.map(s => (s.endsWith(';') ? s : s + ';')).join('\n')
   );
   await runAsync(
-    `bunx wrangler d1 execute ${dbName} ${target} ${configFlag(root)} --file=${sqlFile}`,
+    `${wranglerBin(root)} d1 execute ${dbName} ${target} ${configFlag(root)} --file=${sqlFile}`,
     { cwd: root, silent: true }
   );
 }
@@ -227,7 +243,7 @@ export function r2PutLocal(
   filePath: string
 ): void {
   run(
-    `bunx wrangler r2 object put ${bucketName}/${key} ${configFlag(root)} --file=${filePath} --local`,
+    `${wranglerBin(root)} r2 object put ${bucketName}/${key} ${configFlag(root)} --file=${filePath} --local`,
     { cwd: root, silent: true }
   );
 }
@@ -242,7 +258,7 @@ export async function r2PutLocalAsync(
   filePath: string
 ): Promise<void> {
   await runAsync(
-    `bunx wrangler r2 object put ${bucketName}/${key} ${configFlag(root)} --file=${filePath} --local`,
+    `${wranglerBin(root)} r2 object put ${bucketName}/${key} ${configFlag(root)} --file=${filePath} --local`,
     { cwd: root, silent: true }
   );
 }
@@ -257,7 +273,7 @@ export function r2PutRemote(
   filePath: string
 ): void {
   run(
-    `bunx wrangler r2 object put ${bucketName}/${key} ${configFlag(root)} --file=${filePath}`,
+    `${wranglerBin(root)} r2 object put ${bucketName}/${key} ${configFlag(root)} --file=${filePath}`,
     { cwd: root, silent: true }
   );
 }
@@ -272,7 +288,7 @@ export async function r2PutRemoteAsync(
   filePath: string
 ): Promise<void> {
   await runAsync(
-    `bunx wrangler r2 object put ${bucketName}/${key} ${configFlag(root)} --file=${filePath}`,
+    `${wranglerBin(root)} r2 object put ${bucketName}/${key} ${configFlag(root)} --file=${filePath}`,
     { cwd: root, silent: true }
   );
 }
@@ -329,21 +345,49 @@ export function wranglerDev(
     const shouldSuppress = (line: string): boolean =>
       suppressPatterns.some(p => p.test(line));
 
-    // ── In-place status line for transient events ──
+    // ── Animated spinner for reload status ──
+    const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
     let reloadCount = 0;
     let hasStatusLine = false;
+    let spinnerFrame = 0;
+    let spinnerTimer: ReturnType<typeof setInterval> | null = null;
     const isTTY = process.stdout.isTTY;
 
-    /** Write a transient status that overwrites itself on the next call */
-    const writeStatus = (text: string) => {
-      if (isTTY) {
-        process.stdout.write(`\r\x1b[K  ⟳ ${text}`);
-        hasStatusLine = true;
+    const drawStatus = (suffix = '') => {
+      if (!isTTY) return;
+      const frame = SPINNER_FRAMES[spinnerFrame % SPINNER_FRAMES.length]!;
+      process.stdout.write(`\r\x1b[K  ${frame} reloading${suffix}`);
+      hasStatusLine = true;
+    };
+
+    const startSpinner = () => {
+      if (!isTTY) return;
+      if (spinnerTimer) return; // already running
+      drawStatus();
+      spinnerTimer = setInterval(() => {
+        spinnerFrame++;
+        drawStatus();
+      }, 80);
+    };
+
+    const stopSpinner = (finalMsg?: string) => {
+      if (spinnerTimer) {
+        clearInterval(spinnerTimer);
+        spinnerTimer = null;
+      }
+      if (!isTTY) return;
+      if (finalMsg) {
+        process.stdout.write(`\r\x1b[K  ✓ ${finalMsg}\n`);
+        hasStatusLine = false;
       }
     };
 
     /** Clear the status line before printing a permanent line */
     const clearStatus = () => {
+      if (spinnerTimer) {
+        clearInterval(spinnerTimer);
+        spinnerTimer = null;
+      }
       if (hasStatusLine && isTTY) {
         process.stdout.write('\r\x1b[K');
         hasStatusLine = false;
@@ -360,19 +404,20 @@ export function wranglerDev(
         if (trimmed.includes('Ready on http')) {
           const urlMatch = trimmed.match(/(https?:\/\/[^\s]+)/);
           const url = urlMatch?.[1] ?? 'http://localhost:8787';
+          stopSpinner();
           clearStatus();
           ok(`Server ready → ${url}`);
           continue;
         }
 
-        // Reload events → transient status line (overwrites in place)
+        // Reload events → animated spinner (overwrites in place)
         if (/Reloading local server/.test(trimmed)) {
           reloadCount++;
-          writeStatus(`reload #${reloadCount}`);
+          startSpinner();
           continue;
         }
         if (/Local server updated/.test(trimmed)) {
-          writeStatus(`reload #${reloadCount} ✓`);
+          stopSpinner(`reload #${reloadCount}`);
           continue;
         }
 
@@ -411,7 +456,7 @@ export function wranglerDev(
  * Deploy via wrangler.
  */
 export function wranglerDeploy(root: string): void {
-  run(`bunx wrangler deploy ${configFlag(root)}`, { cwd: root });
+  run(`${wranglerBin(root)} deploy ${configFlag(root)}`, { cwd: root });
 }
 
 // ── D1 / R2 resource creation ──────────────────────────────────────
@@ -421,7 +466,7 @@ export function wranglerDeploy(root: string): void {
  */
 export function createD1Database(root: string, dbName: string): string | null {
   try {
-    const output = runCapture(`bunx wrangler d1 create ${dbName}`, root);
+    const output = runCapture(`${wranglerBin(root)} d1 create ${dbName}`, root);
     const idMatch = output.match(/database_id\s*=\s*"([^"]+)"/);
     return idMatch?.[1] ?? null;
   } catch {
@@ -434,9 +479,9 @@ export function createD1Database(root: string, dbName: string): string | null {
  */
 export function ensureR2Bucket(root: string, bucketName: string): boolean {
   try {
-    const buckets = runCapture('bunx wrangler r2 bucket list', root);
+    const buckets = runCapture(`${wranglerBin(root)} r2 bucket list`, root);
     if (buckets.includes(bucketName)) return true;
-    runCapture(`bunx wrangler r2 bucket create ${bucketName}`, root);
+    runCapture(`${wranglerBin(root)} r2 bucket create ${bucketName}`, root);
     return true;
   } catch {
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koguma",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "🐻 A little CMS with big heart — schema-driven, runs on Cloudflare's free tier",
   "type": "module",
   "license": "MIT",