@jango-blockchained/hoox-cli 0.3.4 → 0.3.5

package/src/commands/repair/repair-service.ts

@@ -9,7 +9,8 @@ export class RepairService {
     // Step 1: Repository integrity (worker submodules)
     try {
       const proc = Bun.spawn(["bun", "run", "check:worker-submodules"], {
-        stdout: "pipe", stderr: "pipe",
+        stdout: "pipe",
+        stderr: "pipe",
       });
       const exit = await proc.exited;
       steps.push({
@@ -18,17 +19,25 @@ export class RepairService {
         message: exit === 0 ? "All submodules present" : "Missing submodules",
       });
     } catch (err) {
-      steps.push({ step: "Worker submodules", success: false, error: String(err) });
+      steps.push({
+        step: "Worker submodules",
+        success: false,
+        error: String(err),
+      });
     }
 
     // Step 2: Dependencies
     try {
-      const proc = Bun.spawn(["bun", "install"], { stdout: "pipe", stderr: "pipe" });
+      const proc = Bun.spawn(["bun", "install"], {
+        stdout: "pipe",
+        stderr: "pipe",
+      });
       const exit = await proc.exited;
       steps.push({
         step: "Dependencies",
         success: exit === 0,
-        message: exit === 0 ? "All dependencies installed" : "bun install failed",
+        message:
+          exit === 0 ? "All dependencies installed" : "bun install failed",
       });
     } catch (err) {
       steps.push({ step: "Dependencies", success: false, error: String(err) });
@@ -36,7 +45,10 @@ export class RepairService {
 
     // Step 3: TypeScript
     try {
-      const proc = Bun.spawn(["bun", "run", "typecheck"], { stdout: "pipe", stderr: "pipe" });
+      const proc = Bun.spawn(["bun", "run", "typecheck"], {
+        stdout: "pipe",
+        stderr: "pipe",
+      });
       const exit = await proc.exited;
       steps.push({
         step: "TypeScript",
@@ -58,13 +70,25 @@ export class RepairService {
       let infraOk = true;
       const details: string[] = [];
       if (d1Result.ok) details.push("D1: ✓");
-      else { infraOk = false; details.push("D1: ✗"); }
+      else {
+        infraOk = false;
+        details.push("D1: ✗");
+      }
       if (kvResult.ok) details.push("KV: ✓");
-      else { infraOk = false; details.push("KV: ✗"); }
+      else {
+        infraOk = false;
+        details.push("KV: ✗");
+      }
       if (r2Result.ok) details.push("R2: ✓");
-      else { infraOk = false; details.push("R2: ✗"); }
+      else {
+        infraOk = false;
+        details.push("R2: ✗");
+      }
       if (queueResult.ok) details.push("Queues: ✓");
-      else { infraOk = false; details.push("Queues: ✗"); }
+      else {
+        infraOk = false;
+        details.push("Queues: ✗");
+      }
 
       steps.push({
         step: "Infrastructure",
@@ -72,7 +96,11 @@ export class RepairService {
         message: details.join(", "),
       });
     } catch (err) {
-      steps.push({ step: "Infrastructure", success: false, error: String(err) });
+      steps.push({
+        step: "Infrastructure",
+        success: false,
+        error: String(err),
+      });
     }
 
     // Step 5: Secrets
@@ -89,7 +117,10 @@ export class RepairService {
       steps.push({
         step: "Secrets",
         success: missingCount === 0,
-        message: missingCount === 0 ? `All ${totalSecrets} secrets present` : `${missingCount}/${totalSecrets} missing`,
+        message:
+          missingCount === 0
+            ? `All ${totalSecrets} secrets present`
+            : `${missingCount}/${totalSecrets} missing`,
       });
     } catch (err) {
       steps.push({ step: "Secrets", success: false, error: String(err) });
@@ -97,6 +128,11 @@ export class RepairService {
 
     const passed = steps.filter((s) => s.success).length;
     const failed = steps.filter((s) => !s.success).length;
-    return { steps, allPassed: failed === 0, passedCount: passed, failedCount: failed };
+    return {
+      steps,
+      allPassed: failed === 0,
+      passedCount: passed,
+      failedCount: failed,
+    };
   }
 }

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

@@ -17,6 +17,7 @@ import {
   formatError,
   formatTable,
   formatJson,
+  getFormatOptions,
 } from "../../utils/formatters.js";
 import { CLIError, ExitCode } from "../../utils/errors.js";
 
@@ -50,15 +51,6 @@ export interface TestSummary {
   results: TestStepResult[];
 }
 
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-function getFormatOptions(cmd: Command) {
-  const opts = cmd.optsWithGlobals();
-  return { json: Boolean(opts.json), quiet: Boolean(opts.quiet) };
-}
-
 /**
  * Spawn a command with stdout/stderr piped, capture output, and return a
  * structured result. Does NOT print anything — the caller decides display.
@@ -391,7 +383,9 @@ export function registerTestCommand(program: Command): void {
           ? `tests/live/${options.service}.test.ts`
           : "tests/live/";
 
-        s.start(`Running live tests${options.service ? ` for ${options.service}` : ""}...`);
+        s.start(
+          `Running live tests${options.service ? ` for ${options.service}` : ""}...`
+        );
 
         const args = ["bun", "test", filePattern, "--jobs", "1"];
         const result = await runWithInherit(args, process.cwd());

package/src/commands/tui/index.ts

@@ -0,0 +1 @@
+export { registerTUICommand } from "./tui-command.js";

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

@@ -0,0 +1,87 @@
+/**
+ * `hoox tui` command — launch the OpenTUI terminal operations center.
+ *
+ * Spawns the TUI as a child Bun process so it can take over the terminal
+ * with alternate screen mode. When the TUI exits, control returns to the CLI.
+ */
+import { Command } from "commander";
+import { spawn } from "node:child_process";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { existsSync } from "node:fs";
+import { theme } from "../../utils/theme.js";
+import { CLIError, ExitCode } from "../../utils/errors.js";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/** Resolve the TUI entry point relative to the monorepo root */
+function resolveTUIEntry(): string {
+  // Try monorepo-relative paths first
+  const candidates = [
+    resolve(__dirname, "../../../../tui/src/main.tsx"), // packages/cli → packages/tui
+    resolve(process.cwd(), "packages/tui/src/main.tsx"), // CWD = repo root
+    resolve(process.cwd(), "../tui/src/main.tsx"), // CWD = packages/cli
+  ];
+
+  for (const path of candidates) {
+    if (existsSync(path)) return path;
+  }
+
+  throw new CLIError(
+    "Could not find TUI entry point. Ensure packages/tui/src/main.tsx exists.",
+    ExitCode.ERROR
+  );
+}
+
+export function registerTUICommand(program: Command): void {
+  program
+    .command("tui")
+    .description("Launch the OpenTUI terminal operations center")
+    .option("--fps <number>", "Target frames per second", "30")
+    .option("--no-mouse", "Disable mouse support")
+    .action(async (options) => {
+      const tuiEntry = resolveTUIEntry();
+
+      console.log(
+        theme.heading("\nLaunching HOOX Terminal Operations Center...\n")
+      );
+      console.log(theme.dim(`  Entry: ${tuiEntry}`));
+      console.log(theme.dim(`  FPS:   ${options.fps}`));
+      console.log(
+        theme.dim(`  Mouse: ${options.mouse ? "enabled" : "disabled"}\n`)
+      );
+
+      // Spawn the TUI as a child process — it takes over the terminal
+      const child = spawn("bun", ["run", tuiEntry], {
+        stdio: "inherit", // TUI gets full terminal control
+        env: {
+          ...process.env,
+          TUI_FPS: options.fps,
+          TUI_MOUSE: options.mouse ? "1" : "0",
+        },
+      });
+
+      // Wait for TUI to exit
+      await new Promise<void>((resolveChild, reject) => {
+        child.on("close", (code) => {
+          if (code === 0) {
+            console.log(theme.dim("\nTUI session ended.\n"));
+            resolveChild();
+          } else if (code !== null) {
+            console.log(theme.dim(`\nTUI exited with code ${code}\n`));
+            resolveChild();
+          } else {
+            reject(
+              new CLIError("TUI process terminated abnormally", ExitCode.ERROR)
+            );
+          }
+        });
+
+        child.on("error", (err) => {
+          reject(
+            new CLIError(`Failed to launch TUI: ${err.message}`, ExitCode.ERROR)
+          );
+        });
+      });
+    });
+}

package/src/commands/update/index.ts

@@ -0,0 +1 @@
+export { registerUpdateCommand } from "./update-command.js";

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

@@ -0,0 +1,51 @@
+import { Command } from "commander";
+import { UpdateService } from "../../services/update/index.js";
+import {
+  formatSuccess,
+  formatError,
+  getFormatOptions,
+} from "../../utils/formatters.js";
+import { CLIError, ExitCode } from "../../utils/errors.js";
+
+export function registerUpdateCommand(program: Command): void {
+  program
+    .command("update")
+    .summary("Update project dependencies (default: wrangler)")
+    .description(
+      `Update wrangler to the latest available version.
+
+Updates wrangler in the project's package.json
+via \`bun update wrangler\`.
+
+EXAMPLES:
+  hoox update              Check and update wrangler`
+    )
+    .action(async () => {
+      const fmt = getFormatOptions(program);
+      try {
+        const service = new UpdateService();
+        const result = await service.updateWrangler();
+
+        if (result.updated) {
+          formatSuccess(
+            result.newVersion
+              ? `Wrangler updated to ${result.newVersion}`
+              : "Wrangler updated",
+            fmt
+          );
+        } else if (result.error) {
+          formatError(
+            new CLIError(`Update failed: ${result.error}`, ExitCode.ERROR),
+            fmt
+          );
+          process.exitCode = ExitCode.ERROR;
+        } else {
+          formatSuccess("Wrangler is already up to date", fmt);
+        }
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        formatError(message, fmt);
+        process.exitCode = ExitCode.ERROR;
+      }
+    });
+}

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

@@ -30,7 +30,7 @@ const realEnv = { ...process.env };
 /** Mock CloudflareService.zonesList to return a known zone. */
 function mockZonesList(output: string, ok = true, error?: string): void {
   const result: WranglerResult<string> = ok
-    ? { ok: true, data: output }
+    ? { ok: true, value: output }
     : { ok: false, error: error ?? "zone list failed" };
 
   spyOn(CloudflareService.prototype, "zonesList").mockImplementation(() =>

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

@@ -86,7 +86,7 @@ async function cfApi<T>(
       return { ok: false, error: errorMsg };
     }
 
-    return { ok: true, data: json.result };
+    return { ok: true, value: json.result };
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     return { ok: false, error: `Cloudflare API request failed: ${message}` };
@@ -176,7 +176,7 @@ async function resolveZone(
   }
 
   // wrangler zones list outputs lines like "zone-name (zone-id)"
-  const lines = result.data.split("\n").filter(Boolean);
+  const lines = result.value.split("\n").filter(Boolean);
   if (lines.length === 0) {
     throw new CLIError(
       "No zones found. Set CLOUDFLARE_ZONE_ID environment variable.",
@@ -220,7 +220,7 @@ async function handleStatus(opts: FormatOptions): Promise<void> {
     "GET",
     `/zones/${zone.id}/firewall/rules?per_page=50`
   );
-  const activeRulesCount = rulesResult.ok ? rulesResult.data.length : 0;
+  const activeRulesCount = rulesResult.ok ? rulesResult.value.length : 0;
 
   // Fetch recent blocks (last 24h analytics overview)
   let recentBlocks = 0;
@@ -230,12 +230,12 @@ async function handleStatus(opts: FormatOptions): Promise<void> {
     `/zones/${zone.id}/analytics/dashboard?since=${encodeURIComponent(since)}&continuous=true`
   );
   if (analyticsResult.ok) {
-    recentBlocks = analyticsResult.data.totals?.threats ?? 0;
+    recentBlocks = analyticsResult.value.totals?.threats ?? 0;
   }
 
   const status: WafStatus = {
-    enabled: wafResult.data.value === "on",
-    mode: wafResult.data.value,
+    enabled: wafResult.value.value === "on",
+    mode: wafResult.value.value,
     activeRulesCount,
     recentBlocks,
     zoneId: zone.id,
@@ -278,7 +278,7 @@ async function handleRulesList(opts: FormatOptions): Promise<void> {
     );
   }
 
-  const rules: WafRule[] = result.data.map((r) => ({
+  const rules: WafRule[] = result.value.map((r) => ({
     id: r.id,
     description: r.description,
     mode: r.action,
@@ -364,7 +364,7 @@ async function handleRulesAdd(
   const ruleBody = {
     description: body.description,
     action,
-    filter: { id: filterResult.data.id },
+    filter: { id: filterResult.value.id },
   };
 
   const ruleResult = await cfApi<CfFirewallRule>(
@@ -380,9 +380,9 @@ async function handleRulesAdd(
   }
 
   // Cloudflare returns an array of created rules
-  const created = Array.isArray(ruleResult.data)
-    ? (ruleResult.data[0] as unknown as CfFirewallRule)
-    : (ruleResult.data as unknown as CfFirewallRule);
+  const created = Array.isArray(ruleResult.value)
+    ? (ruleResult.value[0] as unknown as CfFirewallRule)
+    : (ruleResult.value as unknown as CfFirewallRule);
 
   formatSuccess(
     `WAF rule added (${created.id}) — ${created.action} for "${value}"`,

package/src/index.ts

@@ -7,6 +7,10 @@
 
 import { Command } from "commander";
 import { toError } from "@jango-blockchained/hoox-shared";
+import {
+  FULL_LEGAL_NOTICE,
+  COPYRIGHT,
+} from "@jango-blockchained/hoox-shared/legal";
 import { CLIError, ExitCode } from "./utils/errors.js";
 import { formatError } from "./utils/formatters.js";
 import { theme } from "./utils/theme.js";
@@ -22,7 +26,7 @@ program
   .description(
     "Hoox CLI — manage Cloudflare Workers, infrastructure, secrets, and deployments"
   )
-  .version("0.2.0")
+  .version(`0.2.0\n\n${COPYRIGHT}`)
   .addHelpText(
     "beforeAll",
     theme.heading("\nHoox CLI — Cloudflare Workers Platform\n")
@@ -37,6 +41,7 @@ program
 // Global options — accessible by all commands via program.opts()
 program.option("--json", "Output in JSON format");
 program.option("--quiet", "Minimal output");
+program.option("-y, --yes", "Skip confirmation prompts");
 
 // ---------------------------------------------------------------------------
 // Error handling — map CommanderError and CLIError to proper exit codes
@@ -139,8 +144,21 @@ import { registerDashboardCommand } from "./commands/dashboard/index.js";
 import { registerDbCommand } from "./commands/db/index.js";
 import { registerMonitorCommand } from "./commands/monitor/index.js";
 import { registerRepairCommand } from "./commands/repair/index.js";
+import { registerUpdateCommand } from "./commands/update/index.js";
+import { registerTUICommand } from "./commands/tui/index.js";
 import { runInteractiveTUI } from "./ui/index.js";
 
+// ── Legal / Disclaimer command ──────────────────────────────────────────
+
+program
+  .command("disclaimer")
+  .description("Display legal disclaimers and trademark information")
+  .action(() => {
+    console.log(FULL_LEGAL_NOTICE);
+  });
+
+// ── Command registration ────────────────────────────────────────────────
+
 registerInitCommand(program);
 registerDevCommand(program);
 registerDeployCommand(program);
@@ -155,6 +173,39 @@ registerDashboardCommand(program);
 registerDbCommand(program);
 registerMonitorCommand(program);
 registerRepairCommand(program);
+registerUpdateCommand(program);
+registerTUICommand(program);
+
+// ---------------------------------------------------------------------------
+// preAction hooks — auto-check wrangler version before dev/deploy
+// ---------------------------------------------------------------------------
+
+import { UpdateService } from "./services/update/index.js";
+
+const devCmd = program.commands.find((c) => c.name() === "dev");
+if (devCmd) {
+  const devStartCmd = devCmd.commands.find((c) => c.name() === "start");
+  if (devStartCmd) {
+    devStartCmd.hook("preAction", async () => {
+      const service = new UpdateService();
+      await service.checkAndPromptUpdate({ yes: program.opts().yes });
+    });
+  }
+}
+
+const deployCmd = program.commands.find((c) => c.name() === "deploy");
+if (deployCmd) {
+  const deploySubs = ["all", "workers", "worker", "dashboard"];
+  for (const sub of deploySubs) {
+    const cmd = deployCmd.commands.find((c) => c.name() === sub);
+    if (cmd) {
+      cmd.hook("preAction", async () => {
+        const service = new UpdateService();
+        await service.checkAndPromptUpdate({ yes: program.opts().yes });
+      });
+    }
+  }
+}
 
 // ---------------------------------------------------------------------------
 // Main entry — exported so bin/hoox.js can invoke it explicitly

package/src/services/cloudflare/cloudflare-service.test.ts

@@ -116,7 +116,7 @@ describe("CloudflareService", () => {
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.data).toBe("user@example.com");
+        expect(result.value).toBe("user@example.com");
       }
       expect(lastSpawnCmd).toEqual(["wrangler", "whoami"]);
     });
@@ -147,7 +147,7 @@ describe("CloudflareService", () => {
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.data.url).toBe(
+        expect(result.value.url).toBe(
           "https://test-worker.cryptolinx.workers.dev"
         );
       }
@@ -164,7 +164,7 @@ describe("CloudflareService", () => {
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.data.url).toBe(
+        expect(result.value.url).toBe(
           "https://test-worker.cryptolinx.workers.dev"
         );
       }
@@ -184,7 +184,7 @@ describe("CloudflareService", () => {
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.data.url).toBeUndefined();
+        expect(result.value.url).toBeUndefined();
       }
     });
 
@@ -212,7 +212,7 @@ describe("CloudflareService", () => {
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.data.port).toBe(8787);
+        expect(result.value.port).toBe(8787);
       }
       expect(lastSpawnCmd).toEqual(["wrangler", "dev", "--port", "8787"]);
     });
@@ -225,7 +225,7 @@ describe("CloudflareService", () => {
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.data.port).toBe(3000);
+        expect(result.value.port).toBe(3000);
       }
       expect(lastSpawnCmd).toEqual(["wrangler", "dev", "--port", "3000"]);
     });
@@ -438,7 +438,11 @@ describe("CloudflareService", () => {
       mockSpawnWithCapture(successSpawn("Created index my-index"));
 
       const service = new CloudflareService();
-      const result = await service.vectorizeCreate("my-index", 384, "euclidean");
+      const result = await service.vectorizeCreate(
+        "my-index",
+        384,
+        "euclidean"
+      );
 
       expect(result.ok).toBe(true);
       expect(lastSpawnCmd).toEqual([
@@ -647,7 +651,7 @@ describe("CloudflareService", () => {
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.data).toBe("hello world");
+        expect(result.value).toBe("hello world");
       }
     });
   });

package/src/services/cloudflare/cloudflare-service.ts

@@ -13,7 +13,7 @@ import type { WranglerResult, DeployResult, DevResult } from "./types.js";
  * const cf = new CloudflareService();
  * const result = await cf.whoami();
  * if (result.ok) {
- *   console.log(result.data);
+ *   console.log(result.value);
  * } else {
  *   console.error(result.error);
  * }
@@ -53,7 +53,7 @@ export class CloudflareService {
       const exitCode = await proc.exited;
 
       if (exitCode === 0) {
-        return { ok: true, data: stdout.trim() };
+        return { ok: true, value: stdout.trim() };
       }
 
       return {
@@ -105,10 +105,10 @@ export class CloudflareService {
 
     // Extract the worker URL from deploy output.
     // wrangler prints lines like:  https://name.subdomain.workers.dev
-    const url = this.extractUrl(result.data);
+    const url = this.extractUrl(result.value);
 
     // Parse verbose output for metrics
-    const output = result.data;
+    const output = result.value;
     const deployResult: DeployResult = { url, rawOutput: output };
 
     // Extract worker name from path
@@ -135,7 +135,7 @@ export class CloudflareService {
       deployResult.versionId = versionMatch[1];
     }
 
-    return { ok: true, data: deployResult };
+    return { ok: true, value: deployResult };
   }
 
   // ---------------------------------------------------------------------------
@@ -167,7 +167,7 @@ export class CloudflareService {
       });
 
       // Dev runs indefinitely — return immediately with the known port.
-      return { ok: true, data: { port: devPort } };
+      return { ok: true, value: { port: devPort } };
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       return { ok: false, error: `Failed to start dev server: ${message}` };
@@ -320,9 +320,7 @@ export class CloudflareService {
    * Returns a helpful error — wrangler does not support creating analytics
    * datasets from the CLI. Users must create them via the Cloudflare Dashboard.
    */
-  async analyticsCreate(
-    _name: string
-  ): Promise<WranglerResult<string>> {
+  async analyticsCreate(_name: string): Promise<WranglerResult<string>> {
     return {
       ok: false,
       error:
@@ -372,7 +370,7 @@ export class CloudflareService {
       const exitCode = await proc.exited;
 
       if (exitCode === 0) {
-        return { ok: true, data: stdout.trim() };
+        return { ok: true, value: stdout.trim() };
       }
 
       return {

package/src/services/cloudflare/types.ts

@@ -1,10 +1,11 @@
+import type { Result } from "@jango-blockchained/hoox-shared";
+
 /**
- * WranglerResult<T> — discriminated union for all wrangler CLI operations.
- * Pattern: never throws; callers match on `ok` to handle success/error.
+ * WranglerResult<T> — alias for the shared Result<T> type, used for all
+ * wrangler CLI operations. Pattern: never throws; callers match on `ok`
+ * to handle success/error.
  */
-export type WranglerResult<T> =
-  | { ok: true; data: T }
-  | { ok: false; error: string };
+export type WranglerResult<T> = Result<T>;
 
 /** Result of a wrangler deploy operation. */
 export interface DeployResult {