@jango-blockchained/hoox-cli 0.5.1 → 0.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jango-blockchained/hoox-cli",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Hoox CLI — manage Cloudflare Workers, infrastructure, secrets, and deployments (@jango-blockchained/hoox-cli)",
   "type": "module",
   "main": "./bin/hoox.js",

package/src/commands/check/check-command.ts

@@ -21,8 +21,10 @@ import {
   formatSuccess,
   formatError,
   formatTable,
+  getFormatOptions,
 } from "../../utils/formatters.js";
-import { CLIError, ExitCode } from "../../utils/errors.js";
+import { ExitCode } from "../../utils/errors.js";
+import { isGitTracked, gitUntrackFile } from "../../utils/git.js";
 import type { FormatOptions } from "../../utils/formatters.js";
 import type {
   CheckResult,
@@ -104,13 +106,6 @@ function buildReport(categories: CheckCategory[]): CheckReport {
   };
 }
 
-/**
- * Return a single-character icon for a check result.
- */
-function checkIcon(success: boolean): string {
-  return success ? icons.success : icons.error;
-}
-
 // ---------------------------------------------------------------------------
 // Submodule Gitignore Helpers
 // ---------------------------------------------------------------------------
@@ -136,42 +131,6 @@ async function getWorkerDirs(): Promise<string[]> {
   }
 }
 
-/**
- * Check if a file or directory is tracked by git in a given directory.
- */
-async function isGitTracked(dir: string, filename: string): Promise<boolean> {
-  try {
-    const proc = Bun.spawn(["git", "ls-files", "--error-unmatch", filename], {
-      cwd: dir,
-      stdout: "pipe",
-      stderr: "pipe",
-    });
-    const exitCode = await proc.exited;
-    return exitCode === 0;
-  } catch {
-    return false;
-  }
-}
-
-/**
- * Run git rm --cached to untrack a file while keeping it locally.
- */
-async function gitUntrackFile(dir: string, filename: string): Promise<void> {
-  await new Promise<void>((resolve, reject) => {
-    const proc = Bun.spawn(["git", "rm", "--cached", filename], {
-      cwd: dir,
-      stdout: "pipe",
-      stderr: "pipe",
-    });
-    proc.exited
-      .then((code) => {
-        if (code === 0) resolve();
-        else reject(new Error(`git rm --cached failed with code ${code}`));
-      })
-      .catch(reject);
-  });
-}
-
 // ---------------------------------------------------------------------------
 // Category 1: Config checks
 // ---------------------------------------------------------------------------
@@ -871,7 +830,7 @@ interface SubmoduleGitignoreResult {
  * - Untracks wrangler.jsonc if it's mistakenly tracked by git
  */
 async function checkSubmoduleGitignore(
-  opts: FormatOptions
+  _opts: FormatOptions
 ): Promise<SubmoduleGitignoreResult> {
   const workerDirs = await getWorkerDirs();
   const issues: string[] = [];
@@ -1039,11 +998,7 @@ EXAMPLES:
   hoox check setup --json`
     )
     .action(async (_, cmd: Command) => {
-      const rootCmd = cmd.parent?.parent as Command | undefined;
-      const opts: FormatOptions = {
-        json: Boolean(rootCmd?.optsWithGlobals()?.json),
-        quiet: Boolean(rootCmd?.optsWithGlobals()?.quiet),
-      };
+      const opts = getFormatOptions(cmd);
       await handleSetup(opts);
     });
 
@@ -1072,11 +1027,7 @@ EXAMPLES:
     )
     .option("--fix", "Attempt automatic repair for detected issues")
     .action(async (options: { fix?: boolean }, cmd: Command) => {
-      const rootCmd = cmd.parent?.parent as Command | undefined;
-      const opts: FormatOptions = {
-        json: Boolean(rootCmd?.optsWithGlobals()?.json),
-        quiet: Boolean(rootCmd?.optsWithGlobals()?.quiet),
-      };
+      const opts = getFormatOptions(cmd);
       await handleHealth(opts, Boolean(options.fix));
     });
 
@@ -1101,11 +1052,7 @@ EXAMPLES:
     )
     .option("--dry-run", "Preview changes without applying them")
     .action(async (options: { dryRun?: boolean }, cmd: Command) => {
-      const rootCmd = cmd.parent?.parent as Command | undefined;
-      const opts: FormatOptions = {
-        json: Boolean(rootCmd?.optsWithGlobals()?.json),
-        quiet: Boolean(rootCmd?.optsWithGlobals()?.quiet),
-      };
+      const opts = getFormatOptions(cmd);
       await handleFix(opts, Boolean(options.dryRun));
     });
 
@@ -1134,11 +1081,7 @@ EXAMPLES:
   hoox check sg  # alias`
     )
     .action(async (_, cmd: Command) => {
-      const rootCmd = cmd.parent?.parent as Command | undefined;
-      const opts: FormatOptions = {
-        json: Boolean(rootCmd?.optsWithGlobals()?.json),
-        quiet: Boolean(rootCmd?.optsWithGlobals()?.quiet),
-      };
+      const opts = getFormatOptions(cmd);
       await handleSubmoduleGitignore(opts);
     });
 }

package/src/commands/check/prerequisites-command.ts

@@ -2,7 +2,11 @@ import { Command } from "commander";
 import { PrerequisitesService } from "../../services/prerequisites/index.js";
 import type { PrerequisitesReport } from "../../services/prerequisites/prerequisites-service.js";
 import { theme, icons } from "../../utils/theme.js";
-import { formatError, formatJson } from "../../utils/formatters.js";
+import {
+  getFormatOptions,
+  formatError,
+  formatJson,
+} from "../../utils/formatters.js";
 import { CLIError, ExitCode } from "../../utils/errors.js";
 import type { FormatOptions } from "../../utils/formatters.js";
 
@@ -46,6 +50,7 @@ async function handlePrerequisites(
     if (opts.json) {
       formatJson(report, opts);
     } else if (opts.quiet) {
+      // quiet mode — no output
     } else {
       renderReport(report);
     }
@@ -86,11 +91,7 @@ EXAMPLES:
     )
     .option("--tool <name>", "Only check a specific tool")
     .action(async (options: { tool?: string }, cmd: Command) => {
-      const rootCmd = cmd.parent?.parent as Command | undefined;
-      const opts: FormatOptions = {
-        json: Boolean(rootCmd?.optsWithGlobals()?.json),
-        quiet: Boolean(rootCmd?.optsWithGlobals()?.quiet),
-      };
+      const opts = getFormatOptions(cmd);
       await handlePrerequisites(opts, options.tool);
     });
 }

package/src/commands/clone/clone-command.test.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck
 /**
  * Unit tests for the clone command.
  *
@@ -27,7 +26,6 @@ type MockSpawnResult = {
 
 const realSpawn = Bun.spawn;
 let origCwd: string;
-let lastSpawnCmd: string[] = [];
 
 function successSpawn(stdout = ""): MockSpawnResult {
   return {
@@ -57,9 +55,7 @@ function enqueueSpawn(result: MockSpawnResult): void {
 }
 
 function installSpawnMock(): void {
-  lastSpawnCmd = [];
-  const spawnMock = mock((cmd: string[], _opts?: { cwd?: string }) => {
-    lastSpawnCmd = [...cmd];
+  const spawnMock = mock((_cmd: string[], _opts?: { cwd?: string }) => {
     return spawnQueue.shift() ?? errorSpawn("unexpected spawn call", 127);
   });
   (Bun as Record<string, unknown>).spawn = spawnMock;
@@ -115,10 +111,12 @@ async function captureStdout(
 
   let output = "";
   const orig = process.stdout.write.bind(process.stdout);
-  (process.stdout as Record<string, unknown>).write = mock((chunk: string) => {
-    output += chunk;
-    return true;
-  });
+  (process.stdout as unknown as Record<string, unknown>).write = mock(
+    (chunk: string) => {
+      output += chunk;
+      return true;
+    }
+  );
 
   try {
     await program.parseAsync([...args], { from: "user" });
@@ -126,7 +124,7 @@ async function captureStdout(
     // exitOverride throws CommanderError — swallow
   }
 
-  (process.stdout as Record<string, unknown>).write = orig;
+  (process.stdout as unknown as Record<string, unknown>).write = orig;
   process.chdir(origCwd);
   return output;
 }

package/src/commands/config/config-command.test.ts

@@ -508,10 +508,10 @@ describe("config keys", () => {
     expect(text).toContain(".keys/");
 
     // Verify files were created
-    const internalKeyFile = Bun.file(".keys/internal_service_key.env");
+    const internalKeyFile = Bun.file(".keys/internal_key_binding.env");
     expect(await internalKeyFile.exists()).toBe(true);
     const content = await internalKeyFile.text();
-    expect(content).toMatch(/^INTERNAL_SERVICE_KEY=[a-f0-9]{64}\n$/);
+    expect(content).toMatch(/^INTERNAL_KEY_BINDING=[a-f0-9]{64}\n$/);
   });
 
   it("lists generated key files", async () => {
@@ -572,10 +572,10 @@ describe("config keys", () => {
     const capture = await runCommand(program, ["config", "keys", "generate"]);
     capture.restore();
 
-    const file = Bun.file(".keys/webhook_api_key.env");
+    const file = Bun.file(".keys/webhook_api_key_binding.env");
     expect(await file.exists()).toBe(true);
     const content = await file.text();
-    const match = content.match(/^WEBHOOK_API_KEY=([a-f0-9]+)\n$/);
+    const match = content.match(/^WEBHOOK_API_KEY_BINDING=([a-f0-9]+)\n$/);
     expect(match).not.toBeNull();
     // Service keys are 32 bytes = 64 hex chars
     expect(match![1].length).toBe(64);

package/src/commands/config/config-command.ts

@@ -204,7 +204,7 @@ EXAMPLES:
   hoox config show                    Display current configuration
   hoox config set workers.agent-worker.enabled false
   hoox config secrets list            List secrets for a worker
-  hoox config secrets set trade-worker BINANCE_API_KEY
+  hoox config secrets set trade-worker BINANCE_KEY_BINDING
   hoox config keys generate           Generate new internal keys`
     );
 
@@ -454,7 +454,7 @@ The command will prompt for the secret value (hidden input).
 It writes to the worker's .dev.vars file and syncs to Cloudflare.
 
 EXAMPLES:
-  hoox config secrets set trade-worker BINANCE_API_KEY
+  hoox config secrets set trade-worker BINANCE_KEY_BINDING
   hoox config secrets set agent-worker OPENAI_KEY`
     )
     .action(async (workerName: string, secretName: string) => {
@@ -529,7 +529,7 @@ ARGUMENTS:
 This removes the secret from Cloudflare and from the worker's .dev.vars file.
 
 EXAMPLES:
-  hoox config secrets delete trade-worker BINANCE_API_KEY`
+  hoox config secrets delete trade-worker BINANCE_KEY_BINDING`
     )
     .action(async (workerName: string, secretName: string) => {
       const opts = formatOpts(program);
@@ -718,11 +718,11 @@ EXAMPLES:
       `Generate new internal auth keys and save to .keys/ directory.
 
 Creates the following keys:
-  - INTERNAL_SERVICE_KEY   (32 char)
-  - WEBHOOK_API_KEY        (32 char)
+  - INTERNAL_KEY_BINDING   (32 char)
+  - WEBHOOK_API_KEY_BINDING        (32 char)
   - AGENT_INTERNAL_KEY     (32 char)
-  - TELEGRAM_BOT_TOKEN     (16 char)
-  - INTERNAL_KEY           (32 char)
+  - TG_BOT_TOKEN_BINDING   (16 char)
+  - INTERNAL_KEY_BINDING   (32 char)
 
 WARNING: Add .keys/ to your .gitignore to avoid committing secrets!
 
@@ -739,11 +739,10 @@ EXAMPLES:
         }
 
         const keys: Record<string, string> = {
-          INTERNAL_SERVICE_KEY: generateKey(),
-          WEBHOOK_API_KEY: generateKey(),
+          INTERNAL_KEY_BINDING: generateKey(),
+          WEBHOOK_API_KEY_BINDING: generateKey(),
           AGENT_INTERNAL_KEY: generateKey(),
-          TELEGRAM_BOT_TOKEN: generateKey(16),
-          INTERNAL_KEY: generateKey(),
+          TG_BOT_TOKEN_BINDING: generateKey(16),
         };
 
         for (const [name, value] of Object.entries(keys)) {

package/src/commands/config/env-command.test.ts

@@ -14,12 +14,12 @@ describe("env command", () => {
         CLOUDFLARE_API_TOKEN: "cfut_xxx",
         CLOUDFLARE_ACCOUNT_ID: "abc123",
         SUBDOMAIN_PREFIX: "myapp",
-        D1_INTERNAL_KEY: "d1-key",
         TRADE_INTERNAL_KEY: "trade-key",
         AGENT_INTERNAL_KEY: "agent-key",
         WEBHOOK_API_KEY_BINDING: "webhook-key",
         INTERNAL_KEY_BINDING: "inter-key",
-        API_SERVICE_KEY: "api-key",
+        API_SERVICE_KEY_BINDING: "api-key",
+        TELEGRAM_INTERNAL_KEY: "tg-key",
         DASHBOARD_USER: "admin",
         DASHBOARD_PASS: "pass123",
         SESSION_SECRET: "a".repeat(32),

package/src/commands/config/env-command.ts

@@ -13,11 +13,8 @@ import * as p from "@clack/prompts";
 
 import { EnvService } from "../../services/env/index.js";
 import { CLIError, ExitCode } from "../../utils/errors.js";
-import {
-  formatSuccess,
-  formatError,
-  formatJson,
-} from "../../utils/formatters.js";
+import { formatSuccess, formatJson } from "../../utils/formatters.js";
+import { withErrorHandling } from "../../utils/error-handler.js";
 import type { FormatOptions } from "../../utils/formatters.js";
 
 // ---------------------------------------------------------------------------
@@ -50,7 +47,7 @@ async function handleInit(opts: FormatOptions): Promise<void> {
     });
     if (p.isCancel(overwrite)) {
       p.cancel("Setup cancelled.");
-      process.exit(0);
+      process.exitCode = 0;
     }
     if (!overwrite) {
       p.outro("Setup cancelled. Existing .env.local preserved.");
@@ -89,7 +86,7 @@ async function handleInit(opts: FormatOptions): Promise<void> {
       }
       if (p.isCancel(value)) {
         p.cancel("Setup cancelled.");
-        process.exit(0);
+        process.exitCode = 0;
       }
       collected[def.name] = typeof value === "string" ? value : "";
     }
@@ -244,52 +241,52 @@ EXAMPLES:
   envCmd
     .command("init")
     .description("Interactive wizard to generate .env.local and .dev.vars")
-    .action(async (_, cmd: Command) => {
-      const opts = formatOpts(cmd);
-      try {
-        await handleInit(opts);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (_, cmd: Command) => {
+          const opts = formatOpts(cmd);
+          await handleInit(opts);
+        },
+        { service: "env" }
+      )
+    );
 
   envCmd
     .command("show")
     .description("Display current .env.local (secrets redacted)")
-    .action(async (_, cmd: Command) => {
-      const opts = formatOpts(cmd);
-      try {
-        await handleShow(opts);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (_, cmd: Command) => {
+          const opts = formatOpts(cmd);
+          await handleShow(opts);
+        },
+        { service: "env" }
+      )
+    );
 
   envCmd
     .command("validate")
     .description("Check required environment variables")
-    .action(async (_, cmd: Command) => {
-      const opts = formatOpts(cmd);
-      try {
-        await handleValidate(opts);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (_, cmd: Command) => {
+          const opts = formatOpts(cmd);
+          await handleValidate(opts);
+        },
+        { service: "env" }
+      )
+    );
 
   envCmd
     .command("generate-dev-vars")
     .description("Create per-worker .dev.vars from .env.local")
-    .action(async (_, cmd: Command) => {
-      const opts = formatOpts(cmd);
-      try {
-        await handleGenerateDevVars(opts);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (_, cmd: Command) => {
+          const opts = formatOpts(cmd);
+          await handleGenerateDevVars(opts);
+        },
+        { service: "env" }
+      )
+    );
 }

package/src/commands/config/kv-command.ts

@@ -14,11 +14,11 @@ import { Command } from "commander";
 import { KvSyncService } from "../../services/kv/index.js";
 import {
   formatSuccess,
-  formatError,
   formatTable,
   formatJson,
 } from "../../utils/formatters.js";
 import { CLIError, ExitCode } from "../../utils/errors.js";
+import { withErrorHandling } from "../../utils/error-handler.js";
 import { theme } from "../../utils/theme.js";
 import type { FormatOptions } from "../../utils/formatters.js";
 
@@ -203,88 +203,88 @@ EXAMPLES:
   kvCmd
     .command("list")
     .description("List all keys in the KV namespace")
-    .action(async (_, cmd: Command) => {
-      const opts = formatOpts(cmd);
-      try {
-        const nsId = await resolveNs(cmd);
-        await handleList(opts, nsId);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (_, cmd: Command) => {
+          const opts = formatOpts(cmd);
+          const nsId = await resolveNs(cmd);
+          await handleList(opts, nsId);
+        },
+        { service: "kv" }
+      )
+    );
 
   // -- get
   kvCmd
     .command("get <key>")
     .description("Get a key's value from the KV namespace")
-    .action(async (key: string, _, cmd: Command) => {
-      const opts = formatOpts(cmd);
-      try {
-        const nsId = await resolveNs(cmd);
-        await handleGet(opts, nsId, key);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (key: string, _, cmd: Command) => {
+          const opts = formatOpts(cmd);
+          const nsId = await resolveNs(cmd);
+          await handleGet(opts, nsId, key);
+        },
+        { service: "kv" }
+      )
+    );
 
   // -- set
   kvCmd
     .command("set <key> <value>")
     .description("Set a key's value in the KV namespace")
-    .action(async (key: string, value: string, _, cmd: Command) => {
-      const opts = formatOpts(cmd);
-      try {
-        const nsId = await resolveNs(cmd);
-        await handleSet(opts, nsId, key, value);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (key: string, value: string, _, cmd: Command) => {
+          const opts = formatOpts(cmd);
+          const nsId = await resolveNs(cmd);
+          await handleSet(opts, nsId, key, value);
+        },
+        { service: "kv" }
+      )
+    );
 
   // -- delete
   kvCmd
     .command("delete <key>")
     .description("Delete a key from the KV namespace")
-    .action(async (key: string, _, cmd: Command) => {
-      const opts = formatOpts(cmd);
-      try {
-        const nsId = await resolveNs(cmd);
-        await handleDelete(opts, nsId, key);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (key: string, _, cmd: Command) => {
+          const opts = formatOpts(cmd);
+          const nsId = await resolveNs(cmd);
+          await handleDelete(opts, nsId, key);
+        },
+        { service: "kv" }
+      )
+    );
 
   // -- apply-manifest
   kvCmd
     .command("apply-manifest")
     .description("Apply manifest key defaults to the KV namespace")
-    .action(async (_, cmd: Command) => {
-      const opts = formatOpts(cmd);
-      try {
-        const nsId = await resolveNs(cmd);
-        await handleApplyManifest(opts, nsId);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (_, cmd: Command) => {
+          const opts = formatOpts(cmd);
+          const nsId = await resolveNs(cmd);
+          await handleApplyManifest(opts, nsId);
+        },
+        { service: "kv" }
+      )
+    );
 
   // -- manifest
   kvCmd
     .command("manifest")
     .description("Show expected KV keys from manifest")
-    .action(async (_, cmd: Command) => {
-      const opts = formatOpts(cmd);
-      try {
-        await handleManifest(opts);
-      } catch (err) {
-        formatError(err instanceof Error ? err : String(err), opts);
-        process.exit(err instanceof CLIError ? err.code : ExitCode.ERROR);
-      }
-    });
+    .action(
+      withErrorHandling(
+        async (_, cmd: Command) => {
+          const opts = formatOpts(cmd);
+          await handleManifest(opts);
+        },
+        { service: "kv" }
+      )
+    );
 }