@jango-blockchained/hoox-cli 0.5.6 → 0.5.8

package/dist/index.js

@@ -23437,6 +23437,9 @@ var init_schema_service = __esm(() => {
   init_src();
 });
 
+// src/index.ts
+import { readFileSync as readFileSync5 } from "fs";
+
 // ../../node_modules/.bun/commander@14.0.3/node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
 var {
@@ -25147,6 +25150,52 @@ class CloudflareService {
     }
     return { ok: true, value: deployResult };
   }
+  async versionsList(workerName) {
+    const result = await this.runWrangler([
+      "versions",
+      "list",
+      "--name",
+      workerName,
+      "--json"
+    ]);
+    if (!result.ok) {
+      return result;
+    }
+    try {
+      const parsed = JSON.parse(result.value);
+      if (!Array.isArray(parsed)) {
+        return {
+          ok: false,
+          error: `Expected array from wrangler versions list, got ${typeof parsed}`
+        };
+      }
+      const versions2 = parsed.map((v2) => ({
+        id: String(v2.id ?? ""),
+        number: typeof v2.number === "number" ? v2.number : undefined,
+        created_on: typeof v2.metadata === "object" && v2.metadata !== null ? String(v2.metadata.created_on ?? "") : undefined,
+        author: typeof v2.metadata === "object" && v2.metadata !== null ? String(v2.metadata.author ?? "") : undefined,
+        message: typeof v2.metadata === "object" && v2.metadata !== null ? String(v2.metadata.message ?? "") : undefined,
+        source: typeof v2.metadata === "object" && v2.metadata !== null ? String(v2.metadata.source ?? "") : undefined
+      }));
+      return { ok: true, value: versions2 };
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      return {
+        ok: false,
+        error: `Failed to parse versions list: ${message}`
+      };
+    }
+  }
+  async versionsRollback(workerName, versionId) {
+    return this.runWrangler([
+      "versions",
+      "rollback",
+      "--name",
+      workerName,
+      "--version-id",
+      versionId
+    ]);
+  }
   async dev(workerPath, port) {
     const devPort = port ?? 8787;
     const resolvedPath = path.resolve(this.cwd, workerPath);
@@ -25291,6 +25340,27 @@ class CloudflareService {
     return;
   }
 }
+// src/utils/error-handler.ts
+function withErrorHandling(handler, options) {
+  return async (...args) => {
+    try {
+      await handler(...args);
+    } catch (error51) {
+      const service = options?.service ?? "cli";
+      if (error51 instanceof CLIError) {
+        formatError2(error51, options?.opts);
+        process.exitCode = error51.code;
+      } else if (error51 instanceof Error) {
+        formatError2(`[${service}] ${error51.message}`, options?.opts);
+        process.exitCode = 1 /* ERROR */;
+      } else {
+        formatError2(`[${service}] Unknown error: ${String(error51)}`, options?.opts);
+        process.exitCode = -1 /* CommandFailed */;
+      }
+    }
+  };
+}
+
 // src/commands/init/cli-provisioner.ts
 class CLIProvisioner {
   async provision(plan) {
@@ -25341,9 +25411,7 @@ class CLIProvisioner {
   async check(plan) {
     const created = [
       ...plan.d1Databases.map((d) => `D1:${d}`),
-      ...plan.kvNamespaces.map((k2) => `KV:${k2}`),
-      ...plan.r2Buckets.map((b2) => `R2:${b2}`),
-      ...plan.queues.map((q2) => `Queue:${q2}`)
+      ...plan.kvNamespaces.map((k2) => `KV:${k2}`)
     ];
     return { success: true, created, errors: [] };
   }
@@ -25483,18 +25551,11 @@ OPTIONS:
 
 EXAMPLES:
   hoox init                           Interactive wizard
-  hoox init --token cfut_xxx --account xxx  Non-interactive`).option("--token <token>", "Cloudflare API token (non-interactive)").option("--account <id>", "Cloudflare Account ID (non-interactive)").option("--secret-store <id>", "Secret Store ID (non-interactive)").option("--prefix <prefix>", "Subdomain prefix (non-interactive, default: cryptolinx)").option("--preset <name>", "Worker preset (minimal, standard, full)").option("--resume", "Resume from saved wizard state").option("--accept-risk", "Skip the risk acknowledgment confirmation").action(async (options) => {
+  hoox init --token cfut_xxx --account xxx  Non-interactive`).option("--token <token>", "Cloudflare API token (non-interactive)").option("--account <id>", "Cloudflare Account ID (non-interactive)").option("--secret-store <id>", "Secret Store ID (non-interactive)").option("--prefix <prefix>", "Subdomain prefix (non-interactive, default: cryptolinx)").option("--preset <name>", "Worker preset (minimal, standard, full)").option("--resume", "Resume from saved wizard state").option("--accept-risk", "Skip the risk acknowledgment confirmation").action(withErrorHandling(async (options) => {
     const globalOpts = getFormatOptions(program2);
     const isNonInteractive = Boolean(options.token && options.account);
-    try {
-      await runInitCommand(options, globalOpts, isNonInteractive);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      R2.error(message);
-      formatError2(new CLIError(message, 1 /* ERROR */), globalOpts);
-      process.exitCode = 1 /* ERROR */;
-    }
-  });
+    await runInitCommand(options, globalOpts, isNonInteractive);
+  }, { service: "init" }));
 }
 async function runInitCommand(options, globalOpts, isNonInteractive) {
   if (isNonInteractive) {
@@ -26188,119 +26249,113 @@ OPTIONS:
 EXAMPLES:
   hoox dev start
   hoox dev start --runtime native
-  hoox dev start --runtime docker`).option("--runtime <native|docker>", "Choose dev runtime (overrides saved preference)").action(async (options) => {
+  hoox dev start --runtime docker`).option("--runtime <native|docker>", "Choose dev runtime (overrides saved preference)").action(withErrorHandling(async (options) => {
     const fmt = getFormatOptions(program2);
-    try {
-      const configService = new ConfigService;
-      const prereqs = new PrerequisitesService;
-      const docker = new DockerService;
-      await configService.load();
-      const wranglerCheck = await prereqs.checkWranglerVersion();
-      if (wranglerCheck.outdated) {
-        process.stdout.write(`
+    const configService = new ConfigService;
+    const prereqs = new PrerequisitesService;
+    const docker = new DockerService;
+    await configService.load();
+    const wranglerCheck = await prereqs.checkWranglerVersion();
+    if (wranglerCheck.outdated) {
+      process.stdout.write(`
 ! wrangler is outdated (${wranglerCheck.current} < ${wranglerCheck.minimum})
 ` + `   Run \`bunx wrangler update\` to update.
 ` + `   Press Enter to continue or Ctrl+C to abort.
 
 `);
-      }
-      const dockerStatus = await docker.checkAvailability();
-      const dockerViable = dockerStatus.docker && dockerStatus.compose;
-      const composeExists = await docker.composeFileExists();
-      let runtime = "native";
-      if (options.runtime === "native" || options.runtime === "docker") {
-        runtime = options.runtime;
-      } else {
-        const savedRuntime = configService.getDevRuntime();
-        if (savedRuntime) {
-          runtime = savedRuntime;
-        } else if (dockerViable && composeExists) {
-          const choice = await Ee({
-            message: "Which runtime would you like to use?",
-            options: [
-              {
-                value: "native",
-                label: "Native (wrangler dev)",
-                hint: "run locally with wrangler"
-              },
-              {
-                value: "docker",
-                label: "Docker",
-                hint: "run via docker compose"
-              }
-            ]
-          });
-          if (choice === "native" || choice === "docker") {
-            runtime = choice;
-            await configService.setDevRuntime(runtime);
-          }
+    }
+    const dockerStatus = await docker.checkAvailability();
+    const dockerViable = dockerStatus.docker && dockerStatus.compose;
+    const composeExists = await docker.composeFileExists();
+    let runtime = "native";
+    if (options.runtime === "native" || options.runtime === "docker") {
+      runtime = options.runtime;
+    } else {
+      const savedRuntime = configService.getDevRuntime();
+      if (savedRuntime) {
+        runtime = savedRuntime;
+      } else if (dockerViable && composeExists) {
+        const choice = await Ee({
+          message: "Which runtime would you like to use?",
+          options: [
+            {
+              value: "native",
+              label: "Native (wrangler dev)",
+              hint: "run locally with wrangler"
+            },
+            {
+              value: "docker",
+              label: "Docker",
+              hint: "run via docker compose"
+            }
+          ]
+        });
+        if (choice === "native" || choice === "docker") {
+          runtime = choice;
+          await configService.setDevRuntime(runtime);
         }
       }
-      const validation = configService.validate();
-      if (!validation.valid) {
-        formatError2(new CLIError(`Invalid configuration:
+    }
+    const validation = configService.validate();
+    if (!validation.valid) {
+      formatError2(new CLIError(`Invalid configuration:
 ${validation.errors.map((e2) => `  - ${e2}`).join(`
 `)}`, 2 /* INVALID_USAGE */), fmt);
-        process.exitCode = 2 /* INVALID_USAGE */;
-        return;
-      }
-      if (runtime === "docker") {
-        const profiles = ["workers"];
-        formatSuccess(`Starting workers via Docker Compose (profiles: ${profiles.join(", ")})...`, fmt);
-        const result = await docker.composeUp(profiles, false);
-        if (!result.ok) {
-          formatError2(new CLIError(result.error ?? "Docker compose failed", 1 /* ERROR */), fmt);
-          process.exitCode = 1 /* ERROR */;
-        }
-        return;
-      }
-      const enabledWorkers = configService.listEnabledWorkers();
-      if (enabledWorkers.length === 0) {
-        formatError2(new CLIError("No enabled workers found in wrangler.jsonc. Enable at least one worker.", 2 /* INVALID_USAGE */), fmt);
-        process.exitCode = 2 /* INVALID_USAGE */;
-        return;
-      }
-      const LOCAL_PORTS = {
-        hoox: 8787,
-        "trade-worker": 8788,
-        "d1-worker": 8789,
-        "telegram-worker": 8790,
-        "web3-wallet-worker": 8792
-      };
-      let nextFallbackPort = 8800;
-      const cf = new CloudflareService;
-      let started = 0;
-      let failed = 0;
-      for (const name of enabledWorkers) {
-        const worker = configService.getWorker(name);
-        if (!worker) {
-          formatError2(`Worker "${name}" not found in config, skipping.`, fmt);
-          failed++;
-          continue;
-        }
-        const port = LOCAL_PORTS[name] ?? nextFallbackPort++;
-        formatSuccess(`Starting worker "${name}" (${worker.path}) on port ${port}...`, fmt);
-        const result = await cf.dev(worker.path, port);
-        if (!result.ok) {
-          formatError2(`Failed to start worker "${name}": ${result.error}`, fmt);
-          failed++;
-        } else {
-          formatSuccess(`Worker "${name}" running on http://localhost:${result.value.port}`, fmt);
-          started++;
-        }
+      process.exitCode = 2 /* INVALID_USAGE */;
+      return;
+    }
+    if (runtime === "docker") {
+      const profiles = ["workers"];
+      formatSuccess(`Starting workers via Docker Compose (profiles: ${profiles.join(", ")})...`, fmt);
+      const result = await docker.composeUp(profiles, false);
+      if (!result.ok) {
+        formatError2(new CLIError(result.error ?? "Docker compose failed", 1 /* ERROR */), fmt);
+        process.exitCode = 1 /* ERROR */;
       }
-      if (started > 0) {
-        formatSuccess(`Started ${started} worker(s) \u2014 http://localhost:8787 (and adjacent ports)`, fmt);
+      return;
+    }
+    const enabledWorkers = configService.listEnabledWorkers();
+    if (enabledWorkers.length === 0) {
+      formatError2(new CLIError("No enabled workers found in wrangler.jsonc. Enable at least one worker.", 2 /* INVALID_USAGE */), fmt);
+      process.exitCode = 2 /* INVALID_USAGE */;
+      return;
+    }
+    const LOCAL_PORTS = {
+      hoox: 8787,
+      "trade-worker": 8788,
+      "d1-worker": 8789,
+      "telegram-worker": 8790,
+      "web3-wallet-worker": 8792
+    };
+    let nextFallbackPort = 8800;
+    const cf = new CloudflareService;
+    let started = 0;
+    let failed = 0;
+    for (const name of enabledWorkers) {
+      const worker = configService.getWorker(name);
+      if (!worker) {
+        formatError2(`Worker "${name}" not found in config, skipping.`, fmt);
+        failed++;
+        continue;
       }
-      if (failed > 0) {
-        process.exitCode = 1 /* ERROR */;
+      const port = LOCAL_PORTS[name] ?? nextFallbackPort++;
+      formatSuccess(`Starting worker "${name}" (${worker.path}) on port ${port}...`, fmt);
+      const result = await cf.dev(worker.path, port);
+      if (!result.ok) {
+        formatError2(`Failed to start worker "${name}": ${result.error}`, fmt);
+        failed++;
+      } else {
+        formatSuccess(`Worker "${name}" running on http://localhost:${result.value.port}`, fmt);
+        started++;
       }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(message, fmt);
+    }
+    if (started > 0) {
+      formatSuccess(`Started ${started} worker(s) \u2014 http://localhost:8787 (and adjacent ports)`, fmt);
+    }
+    if (failed > 0) {
       process.exitCode = 1 /* ERROR */;
     }
-  });
+  }, { service: "dev" }));
   devCmd.command("worker <name>").summary("Start a single worker for local development").description(`Start a specific worker using wrangler dev.
 
 ARGUMENTS:
@@ -26313,39 +26368,33 @@ OPTIONS:
 EXAMPLES:
   hoox dev worker trade-worker
   hoox dev worker agent-worker --port 8788
-  hoox dev worker hoox --runtime docker`).option("--port <port>", "Dev server port (default: 8787)", (v2) => parseInt(v2, 10)).option("--runtime <native|docker>", "Choose dev runtime (overrides saved preference)").action(async (name, options) => {
+  hoox dev worker hoox --runtime docker`).option("--port <port>", "Dev server port (default: 8787)", (v2) => parseInt(v2, 10)).option("--runtime <native|docker>", "Choose dev runtime (overrides saved preference)").action(withErrorHandling(async (name, options) => {
     const fmt = getFormatOptions(program2);
-    try {
-      const configService = new ConfigService;
-      await configService.load();
-      const worker = configService.getWorker(name);
-      if (!worker) {
-        formatError2(new CLIError(`Worker "${name}" not found in wrangler.jsonc.
+    const configService = new ConfigService;
+    await configService.load();
+    const worker = configService.getWorker(name);
+    if (!worker) {
+      formatError2(new CLIError(`Worker "${name}" not found in wrangler.jsonc.
 ` + `Available workers: ${configService.listWorkers().join(", ")}`, 2 /* INVALID_USAGE */), fmt);
-        process.exitCode = 2 /* INVALID_USAGE */;
-        return;
-      }
-      if (!worker.enabled) {
-        formatError2(new CLIError(`Worker "${name}" is disabled. Enable it with the config command first.`, 2 /* INVALID_USAGE */), fmt);
-        process.exitCode = 2 /* INVALID_USAGE */;
-        return;
-      }
-      const port = options.port ?? 8787;
-      formatSuccess(`Starting worker "${name}" (${worker.path}) on port ${port}...`, fmt);
-      const cf = new CloudflareService;
-      const result = await cf.dev(worker.path, port);
-      if (!result.ok) {
-        formatError2(new CLIError(`Failed to start worker "${name}": ${result.error}`, 1 /* ERROR */), fmt);
-        process.exitCode = 1 /* ERROR */;
-        return;
-      }
-      formatSuccess(`Worker "${name}" running on http://localhost:${result.value.port}`, fmt);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(message, fmt);
+      process.exitCode = 2 /* INVALID_USAGE */;
+      return;
+    }
+    if (!worker.enabled) {
+      formatError2(new CLIError(`Worker "${name}" is disabled. Enable it with the config command first.`, 2 /* INVALID_USAGE */), fmt);
+      process.exitCode = 2 /* INVALID_USAGE */;
+      return;
+    }
+    const port = options.port ?? 8787;
+    formatSuccess(`Starting worker "${name}" (${worker.path}) on port ${port}...`, fmt);
+    const cf = new CloudflareService;
+    const result = await cf.dev(worker.path, port);
+    if (!result.ok) {
+      formatError2(new CLIError(`Failed to start worker "${name}": ${result.error}`, 1 /* ERROR */), fmt);
       process.exitCode = 1 /* ERROR */;
+      return;
     }
-  });
+    formatSuccess(`Worker "${name}" running on http://localhost:${result.value.port}`, fmt);
+  }, { service: "dev" }));
   devCmd.command("dashboard").summary("Start the Next.js dashboard dev server").description(`Start the Hoox dashboard development server using Next.js.
 
 The dashboard runs on http://localhost:3000 with hot-reloading enabled.
@@ -26355,29 +26404,23 @@ OPTIONS:
 
 EXAMPLES:
   hoox dev dashboard
-  hoox dev dashboard --runtime docker`).option("--runtime <native|docker>", "Choose dev runtime (overrides saved preference)").action(async () => {
+  hoox dev dashboard --runtime docker`).option("--runtime <native|docker>", "Choose dev runtime (overrides saved preference)").action(withErrorHandling(async () => {
     const fmt = getFormatOptions(program2);
-    try {
-      const dashboardPath = path2.resolve(process.cwd(), "workers/dashboard");
-      const dashboardDir = Bun.file(dashboardPath);
-      if (!await dashboardDir.exists()) {
-        formatError2(new CLIError(`Dashboard directory not found: ${dashboardPath}`, 2 /* INVALID_USAGE */), fmt);
-        process.exitCode = 2 /* INVALID_USAGE */;
-        return;
-      }
-      formatSuccess("Starting Next.js dashboard dev server...", fmt);
-      Bun.spawn(["bun", "run", "dev"], {
-        cwd: dashboardPath,
-        stdout: "inherit",
-        stderr: "inherit"
-      });
-      formatSuccess("Dashboard starting on http://localhost:3000", fmt);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(message, fmt);
-      process.exitCode = 1 /* ERROR */;
+    const dashboardPath = path2.resolve(process.cwd(), "workers/dashboard");
+    const dashboardDir = Bun.file(dashboardPath);
+    if (!await dashboardDir.exists()) {
+      formatError2(new CLIError(`Dashboard directory not found: ${dashboardPath}`, 2 /* INVALID_USAGE */), fmt);
+      process.exitCode = 2 /* INVALID_USAGE */;
+      return;
     }
-  });
+    formatSuccess("Starting Next.js dashboard dev server...", fmt);
+    Bun.spawn(["bun", "run", "dev"], {
+      cwd: dashboardPath,
+      stdout: "inherit",
+      stderr: "inherit"
+    });
+    formatSuccess("Dashboard starting on http://localhost:3000", fmt);
+  }, { service: "dev" }));
 }
 // src/commands/deploy/deploy-command.ts
 init_config2();
@@ -26997,7 +27040,7 @@ ${theme.heading("Deploying Dashboard")}
       }
       return {
         worker: "dashboard",
-        url: urlMatch?.[0] || "https://dashboard.cryptolinx.workers.dev",
+        url: urlMatch?.[0],
         success: true,
         size: sizeMatch ? `${sizeMatch[1]} ${sizeMatch[2]}` : undefined,
         startupTime: startupMatch ? `${startupMatch[1]} ms` : undefined
@@ -27034,7 +27077,7 @@ ${theme.heading("Deploying Dashboard")}
       }
       return {
         worker: "dashboard",
-        url: urlMatch?.[0] || "https://dashboard.cryptolinx.workers.dev",
+        url: urlMatch?.[0],
         success: true
       };
     }
@@ -27116,12 +27159,9 @@ async function doUpdateInternalUrls(fmt) {
     const global = config2.getGlobal();
     const prefix = global.subdomain_prefix ?? "hoox";
     const workers = config2.listEnabledWorkers();
-    let filePath = resolve(process.cwd(), "pages", "dashboard", "wrangler.jsonc");
-    if (!existsSync2(filePath)) {
-      filePath = resolve(process.cwd(), "workers", "dashboard", "wrangler.jsonc");
-    }
+    const filePath = resolve(process.cwd(), "workers", "dashboard", "wrangler.jsonc");
     if (!existsSync2(filePath)) {
-      formatError2(new CLIError("Dashboard wrangler.jsonc not found (checked pages/dashboard and workers/dashboard)", 1 /* ERROR */), fmt);
+      formatError2(new CLIError("Dashboard wrangler.jsonc not found at workers/dashboard/wrangler.jsonc", 1 /* ERROR */), fmt);
       process.exitCode = 1 /* ERROR */;
       return;
     }
@@ -27204,6 +27244,100 @@ ${setCount} key(s) set, ${errorCount} error(s)
     process.exitCode = 1 /* ERROR */;
   }
 }
+async function doVersionHistory(worker, fmt) {
+  const s = vt();
+  s.start(`Fetching deployment history for ${worker}...`);
+  const cf = new CloudflareService;
+  const result = await cf.versionsList(worker);
+  if (!result.ok) {
+    s.stop(`${theme.error(icons.error)} Failed to fetch history`);
+    formatError2(new CLIError(result.error, 1 /* ERROR */), fmt);
+    process.exitCode = 1 /* ERROR */;
+    return;
+  }
+  const versions2 = result.value;
+  s.stop(`${theme.success(icons.success)} ${versions2.length} version(s) found`);
+  if (versions2.length === 0) {
+    if (!fmt.quiet) {
+      process.stdout.write(`${theme.dim(`No deployment history found.
+`)}`);
+    }
+    return;
+  }
+  const rows = versions2.map((v2) => ({
+    "Version ID": v2.id,
+    Number: v2.number !== undefined ? String(v2.number) : "-",
+    Created: v2.created_on ? new Date(v2.created_on).toLocaleString() : "-",
+    Author: v2.author ?? "-",
+    Source: v2.source ?? "-"
+  }));
+  formatTable(rows, fmt);
+}
+async function doVersionRollback(worker, version2, fmt, yes) {
+  const cf = new CloudflareService;
+  let targetVersion = version2;
+  if (!targetVersion) {
+    const s2 = vt();
+    s2.start(`Fetching recent versions for ${worker}...`);
+    const result = await cf.versionsList(worker);
+    if (!result.ok) {
+      s2.stop(`${theme.error(icons.error)} Failed to fetch versions`);
+      formatError2(new CLIError(result.error, 1 /* ERROR */), fmt);
+      process.exitCode = 1 /* ERROR */;
+      return;
+    }
+    const versions2 = result.value;
+    if (versions2.length === 0) {
+      s2.stop(`${theme.dim("No versions found")}`);
+      process.stdout.write(`${theme.dim(`No deployment history found for this worker.
+`)}`);
+      return;
+    }
+    s2.stop(`${theme.success(icons.success)} Versions fetched`);
+    const recent = versions2.slice(0, 5);
+    const selected = await Ee({
+      message: `Select a version to roll ${worker} back to:`,
+      options: recent.map((v2) => ({
+        value: v2.id,
+        label: `v${v2.number ?? "?"}  ${v2.id.slice(0, 8)}...  ${v2.created_on ? new Date(v2.created_on).toLocaleDateString() : "?"}`,
+        hint: v2.source ? `via ${v2.source}` : undefined
+      }))
+    });
+    if (R(selected)) {
+      process.stdout.write(`${theme.dim(`Rollback cancelled.
+`)}`);
+      return;
+    }
+    targetVersion = selected;
+  }
+  if (!yes) {
+    const confirmed = await le({
+      message: `Roll back ${worker} to version ${targetVersion}? This will replace the current deployment.`
+    });
+    if (R(confirmed) || !confirmed) {
+      process.stdout.write(`${theme.dim(`Rollback cancelled.
+`)}`);
+      return;
+    }
+  }
+  const s = vt();
+  s.start(`Rolling back ${worker} to version ${targetVersion}...`);
+  const rollResult = await cf.versionsRollback(worker, targetVersion);
+  if (!rollResult.ok) {
+    s.stop(`${theme.error(icons.error)} Rollback failed`);
+    formatError2(new CLIError(rollResult.error, 1 /* ERROR */), fmt);
+    process.exitCode = 1 /* ERROR */;
+    return;
+  }
+  s.stop(`${theme.success(icons.success)} ${worker} rolled back to ${targetVersion.slice(0, 8)}...`);
+  if (rollResult.value && !fmt.quiet) {
+    const snippet = rollResult.value.split(`
+`).find((l) => l.trim())?.trim().slice(0, 120);
+    if (snippet) {
+      R2.step(`  ${theme.dim("Output:")} ${snippet}`);
+    }
+  }
+}
 function registerDeployCommand(program2) {
   const deployCmd = program2.command("deploy").summary("Deploy workers and/or dashboard to Cloudflare Workers").description(`Deploy your Hoox trading system to Cloudflare's edge network.
 
@@ -27234,19 +27368,43 @@ EXAMPLES:
   hoox deploy all
   hoox deploy all --env production
   hoox deploy all --rebuild
-  hoox deploy all --auto`).option("--env <env>", "Cloudflare environment (e.g. production, staging)").option("--rebuild", "Force rebuild of dashboard before deploying").option("--auto", "Skip dashboard rebuild prompt, use existing build if available").action(async (options) => {
-    const fmt = getFormatOptions(program2);
-    try {
-      const configService = new ConfigService;
-      await configService.load();
-      const cf = new CloudflareService;
-      await deployAll(configService, cf, options.env, options.rebuild ?? false, options.auto ?? false);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(message, fmt);
-      process.exitCode = 1 /* ERROR */;
+  hoox deploy all --auto`).option("--env <env>", "Cloudflare environment (e.g. production, staging)").option("--rebuild", "Force rebuild of dashboard before deploying").option("--auto", "Skip dashboard rebuild prompt, use existing build if available").option("--dry-run", "Preview deployment plan without executing").action(withErrorHandling(async (options) => {
+    const configService = new ConfigService;
+    await configService.load();
+    if (options.dryRun) {
+      const enabled = configService.listEnabledWorkers();
+      const workers = DEPLOY_ORDER.filter((w3) => w3 !== "dashboard" && enabled.includes(w3));
+      const unknown2 = enabled.filter((w3) => w3 !== "dashboard" && !DEPLOY_ORDER.includes(w3));
+      const ordered = [...workers, ...unknown2];
+      process.stdout.write(`
+${theme.heading("Deployment Plan (dry-run)")}
+`);
+      process.stdout.write(`${theme.dim("\u2500".repeat(50))}
+`);
+      process.stdout.write(`Workers to deploy (${ordered.length + unknown2.length}):
+`);
+      for (const w3 of [...ordered, ...unknown2]) {
+        process.stdout.write(`  ${theme.dim("\u25CB")} ${w3}
+`);
+      }
+      const buildInfo = getDashboardBuildInfo("workers/dashboard");
+      if (buildInfo.exists) {
+        process.stdout.write(`
+Dashboard: ${buildInfo.age ? `build exists (${buildInfo.age})` : "build exists"}
+`);
+      } else {
+        process.stdout.write(`
+Dashboard: no build found (will be built)
+`);
+      }
+      process.stdout.write(`
+${theme.dim("Run without --dry-run to deploy.")}
+`);
+      return;
     }
-  });
+    const cf = new CloudflareService;
+    await deployAll(configService, cf, options.env, options.rebuild ?? false, options.auto ?? false);
+  }, { service: "deploy" }));
   deployCmd.command("workers").summary("Deploy all enabled workers to Cloudflare").description(`Deploy all enabled workers to Cloudflare Workers.
 
 Workers are deployed in the correct order based on their dependencies. This command skips the dashboard deployment.
@@ -27256,81 +27414,74 @@ OPTIONS:
 
 EXAMPLES:
   hoox deploy workers
-  hoox deploy workers --env staging`).option("--env <env>", "Cloudflare environment (e.g. production, staging)").action(async (options) => {
-    try {
-      const configService = new ConfigService;
-      await configService.load();
-      const cf = new CloudflareService;
-      const enabled = configService.listEnabledWorkers();
-      const workers = DEPLOY_ORDER.filter((w3) => w3 !== "dashboard" && enabled.includes(w3));
-      const unknown2 = enabled.filter((w3) => w3 !== "dashboard" && !DEPLOY_ORDER.includes(w3));
-      const ordered = [...workers, ...unknown2];
-      const results = [];
-      if (ordered.length === 0) {
-        process.stdout.write(`${theme.dim(`No enabled workers to deploy
+  hoox deploy workers --env staging`).option("--env <env>", "Cloudflare environment (e.g. production, staging)").action(withErrorHandling(async (options) => {
+    const configService = new ConfigService;
+    await configService.load();
+    const cf = new CloudflareService;
+    const enabled = configService.listEnabledWorkers();
+    const workers = DEPLOY_ORDER.filter((w3) => w3 !== "dashboard" && enabled.includes(w3));
+    const unknown2 = enabled.filter((w3) => w3 !== "dashboard" && !DEPLOY_ORDER.includes(w3));
+    const ordered = [...workers, ...unknown2];
+    const results = [];
+    if (ordered.length === 0) {
+      process.stdout.write(`${theme.dim(`No enabled workers to deploy
 `)}`);
-        return;
-      }
-      process.stdout.write(`
+      return;
+    }
+    process.stdout.write(`
 ${theme.heading("Deploying Workers")}
 `);
-      process.stdout.write(`${theme.dim("\u2500".repeat(60))}
+    process.stdout.write(`${theme.dim("\u2500".repeat(60))}
 `);
-      for (const name of ordered) {
-        process.stdout.write(`${theme.dim("\u25CB")} ${name.padEnd(25)} pending
+    for (const name of ordered) {
+      process.stdout.write(`${theme.dim("\u25CB")} ${name.padEnd(25)} pending
 `);
-      }
-      process.stdout.write(`${theme.dim("\u2500".repeat(60))}
+    }
+    process.stdout.write(`${theme.dim("\u2500".repeat(60))}
 
 `);
-      for (const name of ordered) {
-        const s = vt();
-        s.start(`Deploying ${name}...`);
-        const result = await deploySingle(configService, cf, name, options.env);
-        results.push(result);
-        if (result.success) {
-          s.stop(`${theme.success(icons.success)} ${name} deployed`);
-          if (result.url)
-            process.stdout.write(`   ${theme.dim("URL:")}     ${result.url}
-`);
-          if (result.size)
-            process.stdout.write(`   ${theme.dim("Size:")}     ${result.size}
+    for (const name of ordered) {
+      const s = vt();
+      s.start(`Deploying ${name}...`);
+      const result = await deploySingle(configService, cf, name, options.env);
+      results.push(result);
+      if (result.success) {
+        s.stop(`${theme.success(icons.success)} ${name} deployed`);
+        if (result.url)
+          process.stdout.write(`   ${theme.dim("URL:")}     ${result.url}
 `);
-          if (result.startupTime)
-            process.stdout.write(`   ${theme.dim("Startup:")} ${result.startupTime}
+        if (result.size)
+          process.stdout.write(`   ${theme.dim("Size:")}     ${result.size}
 `);
-          if (result.versionId)
-            process.stdout.write(`   ${theme.dim("Version:")} ${result.versionId.slice(0, 8)}...
+        if (result.startupTime)
+          process.stdout.write(`   ${theme.dim("Startup:")} ${result.startupTime}
 `);
-          if (!result.url && !result.size && !result.startupTime && !result.versionId && result.rawOutput) {
-            process.stdout.write(`   ${theme.dim("Output:")}  ${result.rawOutput.slice(0, 80)}
+        if (result.versionId)
+          process.stdout.write(`   ${theme.dim("Version:")} ${result.versionId.slice(0, 8)}...
 `);
-          }
-        } else {
-          s.stop(`${theme.error(icons.error)} ${name} failed`);
-          if (result.error)
-            process.stdout.write(`   ${theme.error("Error:")} ${result.error}
+        if (!result.url && !result.size && !result.startupTime && !result.versionId && result.rawOutput) {
+          process.stdout.write(`   ${theme.dim("Output:")}  ${result.rawOutput.slice(0, 80)}
 `);
         }
+      } else {
+        s.stop(`${theme.error(icons.error)} ${name} failed`);
+        if (result.error)
+          process.stdout.write(`   ${theme.error("Error:")} ${result.error}
+`);
       }
-      const succeeded = results.filter((r) => r.success).length;
-      const failed = results.filter((r) => !r.success).length;
-      process.stdout.write(`
+    }
+    const succeeded = results.filter((r) => r.success).length;
+    const failed = results.filter((r) => !r.success).length;
+    process.stdout.write(`
 ${theme.heading("Summary:")} ${succeeded}/${ordered.length} deployed`);
-      if (failed > 0)
-        process.stdout.write(` ${theme.error(`(${failed} failed)`)}
+    if (failed > 0)
+      process.stdout.write(` ${theme.error(`(${failed} failed)`)}
 `);
-      else
-        process.stdout.write(` ${theme.success(" \u2713")}
+    else
+      process.stdout.write(` ${theme.success(" \u2713")}
 
 `);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      process.stdout.write(`${theme.error(`Error: ${message}`)}
-`);
-      process.exitCode = 1 /* ERROR */;
-    }
-  });
+  }, { service: "deploy" }));
   deployCmd.command("worker <name>").summary("Deploy a single worker by name").description(`Deploy a specific worker to Cloudflare Workers.
 
 ARGUMENTS:
@@ -27341,26 +27492,20 @@ OPTIONS:
 
 EXAMPLES:
   hoox deploy worker trade-worker
-  hoox deploy worker agent-worker --env production`).option("--env <env>", "Cloudflare environment (e.g. production, staging)").action(async (name, options) => {
+  hoox deploy worker agent-worker --env production`).option("--env <env>", "Cloudflare environment (e.g. production, staging)").action(withErrorHandling(async (name, options) => {
     const fmt = getFormatOptions(program2);
-    try {
-      const configService = new ConfigService;
-      await configService.load();
-      const cf = new CloudflareService;
-      const result = await deploySingle(configService, cf, name, options.env);
-      if (result.success) {
-        const url2 = result.url ? ` \u2014 ${result.url}` : "";
-        formatSuccess(`Deployed ${name}${url2}`, fmt);
-      } else {
-        formatError2(new CLIError(`Failed to deploy "${name}": ${result.error}`, 1 /* ERROR */), fmt);
-        process.exitCode = 1 /* ERROR */;
-      }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(message, fmt);
+    const configService = new ConfigService;
+    await configService.load();
+    const cf = new CloudflareService;
+    const result = await deploySingle(configService, cf, name, options.env);
+    if (result.success) {
+      const url2 = result.url ? ` \u2014 ${result.url}` : "";
+      formatSuccess(`Deployed ${name}${url2}`, fmt);
+    } else {
+      formatError2(new CLIError(`Failed to deploy "${name}": ${result.error}`, 1 /* ERROR */), fmt);
       process.exitCode = 1 /* ERROR */;
     }
-  });
+  }, { service: "deploy" }));
   deployCmd.command("dashboard").summary("Build and deploy the Next.js dashboard").description(`Build and deploy the Hoox dashboard to Cloudflare Workers.
 
 The dashboard is built using OpenNext which converts Next.js to Cloudflare Workers format. Before deploying, the CLI checks for an existing build and prompts you to rebuild or use the existing build.
@@ -27370,24 +27515,18 @@ OPTIONS:
 
 EXAMPLES:
   hoox deploy dashboard              Interactive: choose to rebuild or use existing
-  hoox deploy dashboard --rebuild    Force rebuild before deploying`).option("--rebuild", "Force rebuild of dashboard before deploying").action(async (options) => {
+  hoox deploy dashboard --rebuild    Force rebuild before deploying`).option("--rebuild", "Force rebuild of dashboard before deploying").action(withErrorHandling(async (options) => {
     const fmt = getFormatOptions(program2);
-    try {
-      const cf = new CloudflareService;
-      const result = await deployDashboard(cf, options.rebuild);
-      if (result.success) {
-        const url2 = result.url ? ` \u2014 ${result.url}` : "";
-        formatSuccess(`Dashboard deployed${url2}`, fmt);
-      } else {
-        formatError2(new CLIError(`Dashboard deployment failed: ${result.error}`, 1 /* ERROR */), fmt);
-        process.exitCode = 1 /* ERROR */;
-      }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(message, fmt);
+    const cf = new CloudflareService;
+    const result = await deployDashboard(cf, options.rebuild);
+    if (result.success) {
+      const url2 = result.url ? ` \u2014 ${result.url}` : "";
+      formatSuccess(`Dashboard deployed${url2}`, fmt);
+    } else {
+      formatError2(new CLIError(`Dashboard deployment failed: ${result.error}`, 1 /* ERROR */), fmt);
       process.exitCode = 1 /* ERROR */;
     }
-  });
+  }, { service: "deploy" }));
   deployCmd.command("telegram-webhook").summary("Set Telegram bot webhook (post-deploy step)").description(`Configure the Telegram bot webhook after deploying telegram-worker.
 
 Calls the Telegram Bot API to set the webhook URL.
@@ -27403,30 +27542,62 @@ Use --token and --secret-token to override.
 EXAMPLES:
   hoox deploy telegram-webhook
   hoox deploy telegram-webhook --token 123456:ABC-DEF1234
-  hoox deploy telegram-webhook --subdomain myapp`).option("--token <token>", "Telegram bot token (from @BotFather)").option("--secret-token <secret>", "Telegram webhook secret token").option("--subdomain <prefix>", "Worker subdomain prefix (default: from config)").action(async (options) => {
+  hoox deploy telegram-webhook --subdomain myapp`).option("--token <token>", "Telegram bot token (from @BotFather)").option("--secret-token <secret>", "Telegram webhook secret token").option("--subdomain <prefix>", "Worker subdomain prefix (default: from config)").action(withErrorHandling(async (options) => {
     const fmt = getFormatOptions(program2);
     await doTelegramWebhook(fmt, options.token, options.secretToken, options.subdomain);
-  });
+  }, { service: "deploy" }));
   deployCmd.command("update-internal-urls").summary("Update dashboard wrangler.jsonc with current service URLs").description(`Update the dashboard's wrangler.jsonc with the current service URLs.
 
 This is a post-deployment step that ensures the dashboard has correct
 service binding URLs for all workers.
 
 EXAMPLES:
-  hoox deploy update-internal-urls`).action(async () => {
+  hoox deploy update-internal-urls`).action(withErrorHandling(async () => {
     const fmt = getFormatOptions(program2);
     await doUpdateInternalUrls(fmt);
-  });
+  }, { service: "deploy" }));
   deployCmd.command("kv-config").summary("Apply KV manifest keys post-deployment").description(`Apply the KV manifest key-value pairs after deploying workers.
 
 Sets all KV keys from the manifest to their default values.
 This post-deployment step initializes the CONFIG_KV namespace.
 
 EXAMPLES:
-  hoox deploy kv-config`).action(async () => {
+  hoox deploy kv-config`).action(withErrorHandling(async () => {
     const fmt = getFormatOptions(program2);
     await doKvConfig(fmt);
-  });
+  }, { service: "deploy" }));
+  deployCmd.command("history <worker>").summary("Show deployment version history for a worker").description(`Display the deployment version history for a Cloudflare Worker.
+
+Shows version ID, version number, creation date, author, and source for each deployment.
+
+ARGUMENTS:
+  name          Worker name (e.g., trade-worker, agent-worker)
+
+EXAMPLES:
+  hoox deploy history trade-worker
+  hoox deploy history hoox --json`).action(withErrorHandling(async (worker) => {
+    const fmt = getFormatOptions(program2);
+    await doVersionHistory(worker, fmt);
+  }, { service: "deploy" }));
+  deployCmd.command("rollback <worker>").argument("[version]", "Version ID to rollback to (if omitted, prompts to select)").summary("Rollback a worker to a previous version").description(`Rollback a Cloudflare Worker to a previous version.
+
+If no version is specified, the CLI fetches the 5 most recent versions
+and prompts you to select one.
+
+ARGUMENTS:
+  name          Worker name (e.g., trade-worker, agent-worker)
+  version       Version ID to rollback to (optional)
+
+OPTIONS:
+  --yes         Skip confirmation prompt
+
+EXAMPLES:
+  hoox deploy rollback trade-worker
+  hoox deploy rollback trade-worker <version-id>
+  hoox deploy rollback trade-worker <version-id> --yes`).option("--yes", "Skip confirmation prompt").action(withErrorHandling(async (worker, version2, options) => {
+    const fmt = getFormatOptions(program2);
+    await doVersionRollback(worker, version2, fmt, options.yes ?? false);
+  }, { service: "deploy" }));
 }
 // src/commands/infra/infra-command.ts
 init_main();
@@ -27558,6 +27729,95 @@ async function doQueueDelete(name, opts, cf) {
   const cloudflare = cf ?? new CloudflareService;
   await handleDelete(name, "Queue", (n) => cloudflare.queueDelete(n), opts);
 }
+async function doProvisionDryRun(opts) {
+  const configService = new ConfigService;
+  try {
+    await configService.load();
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    formatError2(new CLIError(message, 1 /* ERROR */), opts);
+    return;
+  }
+  const enabledWorkers = configService.listEnabledWorkers();
+  if (enabledWorkers.length === 0) {
+    if (!opts.quiet) {
+      process.stdout.write(theme.dim(`No enabled workers found in wrangler.jsonc.
+`));
+    }
+    return;
+  }
+  const plan = [];
+  for (const workerName of enabledWorkers) {
+    const workerConfig = configService.getWorker(workerName);
+    if (!workerConfig?.path)
+      continue;
+    const wranglerPath = resolve2(workerConfig.path, "wrangler.jsonc");
+    const file2 = Bun.file(wranglerPath);
+    if (!await file2.exists())
+      continue;
+    let wranglerConfig;
+    try {
+      const content = await file2.text();
+      wranglerConfig = parse6(content) ?? {};
+    } catch {
+      continue;
+    }
+    const resources = [];
+    const d1Databases = Array.isArray(wranglerConfig.d1_databases) ? wranglerConfig.d1_databases : [];
+    for (const db of d1Databases) {
+      const dbName = db.database_name ?? db.binding;
+      if (dbName)
+        resources.push(`D1: ${dbName}`);
+    }
+    const kvNamespaces = Array.isArray(wranglerConfig.kv_namespaces) ? wranglerConfig.kv_namespaces : [];
+    for (const kv of kvNamespaces) {
+      const kvBinding = kv.binding ?? `kv-${workerName}`;
+      resources.push(`KV: ${kvBinding}`);
+    }
+    const r2Buckets = Array.isArray(wranglerConfig.r2_buckets) ? wranglerConfig.r2_buckets : [];
+    for (const bucket of r2Buckets) {
+      const bucketName = bucket.bucket_name ?? bucket.binding;
+      if (bucketName)
+        resources.push(`R2: ${bucketName}`);
+    }
+    let queueNames = [];
+    if (wranglerConfig.queues && typeof wranglerConfig.queues === "object") {
+      const queues = wranglerConfig.queues;
+      const producers = Array.isArray(queues.producers) ? queues.producers : [];
+      const consumers = Array.isArray(queues.consumers) ? queues.consumers : [];
+      queueNames = [
+        ...producers.map((q2) => q2.queue),
+        ...consumers.map((q2) => q2.queue)
+      ].filter(Boolean);
+    }
+    for (const qName of [...new Set(queueNames)]) {
+      resources.push(`Queue: ${qName}`);
+    }
+    if (resources.length > 0) {
+      plan.push({ worker: workerName, resources });
+    }
+  }
+  if (plan.length === 0) {
+    process.stdout.write(theme.dim(`No provisionable resources found in any worker config.
+`));
+    return;
+  }
+  process.stdout.write(theme.heading(`Resources to provision:
+
+`));
+  for (const entry of plan) {
+    process.stdout.write(`${theme.bold(entry.worker)}
+`);
+    for (const r of entry.resources) {
+      process.stdout.write(`${theme.dim("  \u2500")} ${r}
+`);
+    }
+    process.stdout.write(`
+`);
+  }
+  process.stdout.write(`${theme.dim(`Run without --dry-run to provision these resources.
+`)}`);
+}
 async function doProvision(opts, cf, config2) {
   const cloudflare = cf ?? new CloudflareService;
   const configService = config2 ?? new ConfigService;
@@ -27787,10 +28047,19 @@ This reads each worker's wrangler.jsonc and creates:
   - R2 buckets (from r2_buckets)
   - Queues (from queues)
 
+OPTIONS:
+  --dry-run     Preview what resources would be created without creating them
+
 EXAMPLES:
-  hoox infra provision`).action(async function() {
-    const opts = getOptions(this);
-    await doProvision(opts);
+  hoox infra provision
+  hoox infra provision --dry-run`).option("--dry-run", "Preview what resources would be created without creating them").action(async (_, cmd) => {
+    const opts = getOptions(cmd);
+    const globalOpts = cmd.optsWithGlobals();
+    if (globalOpts.dryRun) {
+      await doProvisionDryRun(opts);
+    } else {
+      await doProvision(opts);
+    }
   });
   const d1Cmd = infraCmd.command("d1").summary("Manage D1 SQL databases").description(`D1 is Cloudflare's serverless SQL database.
 
@@ -27801,8 +28070,8 @@ EXAMPLES:
   d1Cmd.command("list").summary("List all D1 databases").description(`List all D1 databases in your Cloudflare account.
 
 EXAMPLES:
-  hoox infra d1 list`).action(async function() {
-    const opts = getOptions(this);
+  hoox infra d1 list`).action(async (_, cmd) => {
+    const opts = getOptions(cmd);
     await doD1List(opts);
   });
   d1Cmd.command("create <name>").summary("Create a new D1 database").description(`Create a new D1 database.
@@ -27811,8 +28080,8 @@ ARGUMENTS:
   name    Database name
 
 EXAMPLES:
-  hoox infra d1 create trade-data-db`).action(async function(name) {
-    const opts = getOptions(this);
+  hoox infra d1 create trade-data-db`).action(async (name, _, cmd) => {
+    const opts = getOptions(cmd);
     await doD1Create(name, opts);
   });
   d1Cmd.command("delete <name>").summary("Delete a D1 database").description(`Delete a D1 database (WARNING: destructive operation).
@@ -27821,8 +28090,8 @@ ARGUMENTS:
   name    Database name
 
 EXAMPLES:
-  hoox infra d1 delete trade-data-db`).action(async function(name) {
-    const opts = getOptions(this);
+  hoox infra d1 delete trade-data-db`).action(async (name, _, cmd) => {
+    const opts = getOptions(cmd);
     await doD1Delete(name, opts);
   });
   const kvCmd = infraCmd.command("kv").summary("Manage KV namespaces").description(`KV (Key-Value) namespaces for configuration and caching.
@@ -27834,8 +28103,8 @@ EXAMPLES:
   kvCmd.command("list").summary("List all KV namespaces").description(`List all KV namespaces in your Cloudflare account.
 
 EXAMPLES:
-  hoox infra kv list`).action(async function() {
-    const opts = getOptions(this);
+  hoox infra kv list`).action(async (_, cmd) => {
+    const opts = getOptions(cmd);
     await doKvList(opts);
   });
   kvCmd.command("create <name>").summary("Create a new KV namespace").description(`Create a new KV namespace.
@@ -27844,8 +28113,8 @@ ARGUMENTS:
   name    KV namespace title
 
 EXAMPLES:
-  hoox infra kv create CONFIG_KV`).action(async function(name) {
-    const opts = getOptions(this);
+  hoox infra kv create CONFIG_KV`).action(async (name, _, cmd) => {
+    const opts = getOptions(cmd);
     await doKvCreate(name, opts);
   });
   kvCmd.command("delete <id>").summary("Delete a KV namespace by ID").description(`Delete a KV namespace by its ID (WARNING: destructive operation).
@@ -27854,8 +28123,8 @@ ARGUMENTS:
   id    KV namespace ID (get from 'kv list')
 
 EXAMPLES:
-  hoox infra kv delete c5917667a21745e390ff969f32b1847d`).action(async function(id) {
-    const opts = getOptions(this);
+  hoox infra kv delete c5917667a21745e390ff969f32b1847d`).action(async (id, _, cmd) => {
+    const opts = getOptions(cmd);
     await doKvDelete(id, opts);
   });
   const r2Cmd = infraCmd.command("r2").summary("Manage R2 object storage buckets").description(`R2 is Cloudflare's S3-compatible object storage.
@@ -27867,8 +28136,8 @@ EXAMPLES:
   r2Cmd.command("list").summary("List all R2 buckets").description(`List all R2 buckets in your Cloudflare account.
 
 EXAMPLES:
-  hoox infra r2 list`).action(async function() {
-    const opts = getOptions(this);
+  hoox infra r2 list`).action(async (_, cmd) => {
+    const opts = getOptions(cmd);
     await doR2List(opts);
   });
   r2Cmd.command("create <name>").summary("Create a new R2 bucket").description(`Create a new R2 bucket.
@@ -27877,8 +28146,8 @@ ARGUMENTS:
   name    Bucket name
 
 EXAMPLES:
-  hoox infra r2 create trade-reports`).action(async function(name) {
-    const opts = getOptions(this);
+  hoox infra r2 create trade-reports`).action(async (name, _, cmd) => {
+    const opts = getOptions(cmd);
     await doR2Create(name, opts);
   });
   r2Cmd.command("delete <name>").summary("Delete an R2 bucket").description(`Delete an R2 bucket (WARNING: destructive operation).
@@ -27887,8 +28156,8 @@ ARGUMENTS:
   name    Bucket name
 
 EXAMPLES:
-  hoox infra r2 delete trade-reports`).action(async function(name) {
-    const opts = getOptions(this);
+  hoox infra r2 delete trade-reports`).action(async (name, _, cmd) => {
+    const opts = getOptions(cmd);
     await doR2Delete(name, opts);
   });
   const queuesCmd = infraCmd.command("queues").summary("Manage Cloudflare Queues").description(`Queues for asynchronous message processing between workers.
@@ -27900,8 +28169,8 @@ EXAMPLES:
   queuesCmd.command("list").summary("List all Queues").description(`List all queues in your Cloudflare account.
 
 EXAMPLES:
-  hoox infra queues list`).action(async function() {
-    const opts = getOptions(this);
+  hoox infra queues list`).action(async (_, cmd) => {
+    const opts = getOptions(cmd);
     await doQueueList(opts);
   });
   queuesCmd.command("create <name>").summary("Create a new Queue").description(`Create a new queue.
@@ -27910,8 +28179,8 @@ ARGUMENTS:
   name    Queue name
 
 EXAMPLES:
-  hoox infra queues create trade-execution`).action(async function(name) {
-    const opts = getOptions(this);
+  hoox infra queues create trade-execution`).action(async (name, _, cmd) => {
+    const opts = getOptions(cmd);
     await doQueueCreate(name, opts);
   });
   queuesCmd.command("delete <name>").summary("Delete a Queue").description(`Delete a queue (WARNING: destructive operation).
@@ -27920,8 +28189,8 @@ ARGUMENTS:
   name    Queue name
 
 EXAMPLES:
-  hoox infra queues delete trade-execution`).action(async function(name) {
-    const opts = getOptions(this);
+  hoox infra queues delete trade-execution`).action(async (name, _, cmd) => {
+    const opts = getOptions(cmd);
     await doQueueDelete(name, opts);
   });
   const vectorizeCmd = infraCmd.command("vectorize").summary("Manage Vectorize indexes").description(`Vectorize is Cloudflare's vector database for AI-powered search.
@@ -27930,16 +28199,16 @@ EXAMPLES:
   hoox infra vectorize list
   hoox infra vectorize create my-rag-index
   hoox infra vectorize delete my-rag-index`);
-  vectorizeCmd.command("list").summary("List all Vectorize indexes").description("List all Vectorize indexes in your Cloudflare account.").action(async function() {
-    const opts = getOptions(this);
+  vectorizeCmd.command("list").summary("List all Vectorize indexes").description("List all Vectorize indexes in your Cloudflare account.").action(async (_, cmd) => {
+    const opts = getOptions(cmd);
     await doVectorizeList(opts);
   });
-  vectorizeCmd.command("create <name>").summary("Create a new Vectorize index").description("Create a new Vectorize index with default dimensions (768) and cosine metric.").action(async function(name) {
-    const opts = getOptions(this);
+  vectorizeCmd.command("create <name>").summary("Create a new Vectorize index").description("Create a new Vectorize index with default dimensions (768) and cosine metric.").action(async (name, _, cmd) => {
+    const opts = getOptions(cmd);
     await doVectorizeCreate(name, opts);
   });
-  vectorizeCmd.command("delete <name>").summary("Delete a Vectorize index").description("Delete a Vectorize index (WARNING: destructive operation).").action(async function(name) {
-    const opts = getOptions(this);
+  vectorizeCmd.command("delete <name>").summary("Delete a Vectorize index").description("Delete a Vectorize index (WARNING: destructive operation).").action(async (name, _, cmd) => {
+    const opts = getOptions(cmd);
     await doVectorizeDelete(name, opts);
   });
   const analyticsCmd = infraCmd.command("analytics").summary("Manage Analytics Engine datasets").description(`Analytics Engine for storing and querying time-series data.
@@ -27950,12 +28219,12 @@ The CLI provides creation instructions.
 EXAMPLES:
   hoox infra analytics list
   hoox infra analytics create hoox-analytics`);
-  analyticsCmd.command("list").summary("List all Analytics Engine datasets").description("List all Analytics Engine datasets in your account.").action(async function() {
-    const opts = getOptions(this);
+  analyticsCmd.command("list").summary("List all Analytics Engine datasets").description("List all Analytics Engine datasets in your account.").action(async (_, cmd) => {
+    const opts = getOptions(cmd);
     await doAnalyticsList(opts);
   });
-  analyticsCmd.command("create <name>").summary("Show instructions for creating an Analytics Engine dataset").description("Analytics Engine datasets must be created via Cloudflare Dashboard.").action(async function(name) {
-    const opts = getOptions(this);
+  analyticsCmd.command("create <name>").summary("Show instructions for creating an Analytics Engine dataset").description("Analytics Engine datasets must be created via Cloudflare Dashboard.").action(async (name, _, cmd) => {
+    const opts = getOptions(cmd);
     await doAnalyticsCreate(name, opts);
   });
 }
@@ -28134,32 +28403,7 @@ class SecretsService {
     }
   }
 }
-// src/utils/error-handler.ts
-function withErrorHandling(handler, options) {
-  return async (...args) => {
-    try {
-      await handler(...args);
-    } catch (error51) {
-      const service = options?.service ?? "cli";
-      if (error51 instanceof CLIError) {
-        formatError2(error51, options?.opts);
-        process.exit(error51.code);
-      } else if (error51 instanceof Error) {
-        formatError2(`[${service}] ${error51.message}`, options?.opts);
-        process.exit(1 /* ERROR */);
-      } else {
-        formatError2(`[${service}] Unknown error: ${String(error51)}`, options?.opts);
-        process.exit(-1 /* CommandFailed */);
-      }
-    }
-  };
-}
-
 // src/commands/config/env-command.ts
-function formatOpts(cmd) {
-  const opts = cmd.optsWithGlobals();
-  return { json: Boolean(opts.json), quiet: Boolean(opts.quiet) };
-}
 async function handleInit(opts) {
   ye("Environment Setup");
   const existingEnv = Bun.file(".env.local");
@@ -28313,27 +28557,23 @@ EXAMPLES:
   hoox config env validate
   hoox config env generate-dev-vars`);
   envCmd.command("init").description("Interactive wizard to generate .env.local and .dev.vars").action(withErrorHandling(async (_, cmd) => {
-    const opts = formatOpts(cmd);
+    const opts = getFormatOptions(cmd);
     await handleInit(opts);
   }, { service: "env" }));
   envCmd.command("show").description("Display current .env.local (secrets redacted)").action(withErrorHandling(async (_, cmd) => {
-    const opts = formatOpts(cmd);
+    const opts = getFormatOptions(cmd);
     await handleShow(opts);
   }, { service: "env" }));
   envCmd.command("validate").description("Check required environment variables").action(withErrorHandling(async (_, cmd) => {
-    const opts = formatOpts(cmd);
+    const opts = getFormatOptions(cmd);
     await handleValidate(opts);
   }, { service: "env" }));
   envCmd.command("generate-dev-vars").description("Create per-worker .dev.vars from .env.local").action(withErrorHandling(async (_, cmd) => {
-    const opts = formatOpts(cmd);
+    const opts = getFormatOptions(cmd);
     await handleGenerateDevVars(opts);
   }, { service: "env" }));
 }
 // src/commands/config/kv-command.ts
-function formatOpts2(cmd) {
-  const opts = cmd.optsWithGlobals();
-  return { json: Boolean(opts.json), quiet: Boolean(opts.quiet) };
-}
 async function resolveNs(cmd) {
   const svc = new KvSyncService;
   const opts = cmd.optsWithGlobals();
@@ -28434,32 +28674,32 @@ EXAMPLES:
   hoox config kv apply-manifest
   hoox config kv manifest`).option("--namespace-id <id>", "KV namespace ID (auto-detected if omitted)");
   kvCmd.command("list").description("List all keys in the KV namespace").action(withErrorHandling(async (_, cmd) => {
-    const opts = formatOpts2(cmd);
+    const opts = getFormatOptions(cmd);
     const nsId = await resolveNs(cmd);
     await handleList(opts, nsId);
   }, { service: "kv" }));
   kvCmd.command("get <key>").description("Get a key's value from the KV namespace").action(withErrorHandling(async (key, _, cmd) => {
-    const opts = formatOpts2(cmd);
+    const opts = getFormatOptions(cmd);
     const nsId = await resolveNs(cmd);
     await handleGet(opts, nsId, key);
   }, { service: "kv" }));
   kvCmd.command("set <key> <value>").description("Set a key's value in the KV namespace").action(withErrorHandling(async (key, value, _, cmd) => {
-    const opts = formatOpts2(cmd);
+    const opts = getFormatOptions(cmd);
     const nsId = await resolveNs(cmd);
     await handleSet(opts, nsId, key, value);
   }, { service: "kv" }));
   kvCmd.command("delete <key>").description("Delete a key from the KV namespace").action(withErrorHandling(async (key, _, cmd) => {
-    const opts = formatOpts2(cmd);
+    const opts = getFormatOptions(cmd);
     const nsId = await resolveNs(cmd);
     await handleDelete2(opts, nsId, key);
   }, { service: "kv" }));
   kvCmd.command("apply-manifest").description("Apply manifest key defaults to the KV namespace").action(withErrorHandling(async (_, cmd) => {
-    const opts = formatOpts2(cmd);
+    const opts = getFormatOptions(cmd);
     const nsId = await resolveNs(cmd);
     await handleApplyManifest(opts, nsId);
   }, { service: "kv" }));
   kvCmd.command("manifest").description("Show expected KV keys from manifest").action(withErrorHandling(async (_, cmd) => {
-    const opts = formatOpts2(cmd);
+    const opts = getFormatOptions(cmd);
     await handleManifest(opts);
   }, { service: "kv" }));
 }
@@ -28486,10 +28726,6 @@ async function writeConfigRaw(content, configPath) {
   const path3 = configPath ?? "wrangler.jsonc";
   await Bun.write(path3, content);
 }
-function formatOpts3(program2) {
-  const opts = program2.optsWithGlobals();
-  return { json: Boolean(opts.json), quiet: Boolean(opts.quiet) };
-}
 async function promptSecret(promptText) {
   process.stdout.write(`${theme.info(icons.info)} ${promptText}: `);
   if (process.stdin.isTTY) {
@@ -28589,48 +28825,43 @@ OPTIONS:
 
 EXAMPLES:
   hoox config show
-  hoox config show --json`).action(async () => {
-    const opts = formatOpts3(program2);
-    try {
-      if (opts.json) {
-        const raw = await readConfigRaw();
-        const parsed = JSON.parse(raw);
-        formatJson(parsed, opts);
-        return;
-      }
-      const svc = new ConfigService;
-      await svc.load();
-      const global = svc.getGlobal();
-      const globalPairs = {};
-      for (const [k2, v2] of Object.entries(global)) {
-        globalPairs[k2] = v2 ?? "(not set)";
-      }
-      process.stdout.write(`${theme.heading(`
+  hoox config show --json`).action(withErrorHandling(async (_, cmd) => {
+    const opts = getFormatOptions(cmd);
+    if (opts.json) {
+      const raw = await readConfigRaw();
+      const parsed = parse6(raw);
+      formatJson(parsed, opts);
+      return;
+    }
+    const svc = new ConfigService;
+    await svc.load();
+    const global = svc.getGlobal();
+    const globalPairs = {};
+    for (const [k2, v2] of Object.entries(global)) {
+      globalPairs[k2] = v2 ?? "(not set)";
+    }
+    process.stdout.write(`${theme.heading(`
 Global Configuration`)}
 `);
-      formatKeyValue(globalPairs, opts);
-      const workers = svc.listWorkers();
-      if (workers.length > 0) {
-        process.stdout.write(`
+    formatKeyValue(globalPairs, opts);
+    const workers = svc.listWorkers();
+    if (workers.length > 0) {
+      process.stdout.write(`
 ${theme.heading("Workers")}
 `);
-        const rows = workers.map((name) => {
-          const w3 = svc.getWorker(name);
-          return {
-            Worker: name,
-            Enabled: w3.enabled ? `${theme.success("\u2022")} yes` : "-",
-            Path: w3.path,
-            Secrets: w3.secrets?.length ? String(w3.secrets.length) : "-",
-            Vars: w3.vars && Object.keys(w3.vars).length ? String(Object.keys(w3.vars).length) : "-"
-          };
-        });
-        formatTable(rows, opts);
-      }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(new CLIError(`Failed to show config: ${message}`, 1 /* ERROR */), opts);
+      const rows = workers.map((name) => {
+        const w3 = svc.getWorker(name);
+        return {
+          Worker: name,
+          Enabled: w3.enabled ? `${theme.success("\u2022")} yes` : "-",
+          Path: w3.path,
+          Secrets: w3.secrets?.length ? String(w3.secrets.length) : "-",
+          Vars: w3.vars && Object.keys(w3.vars).length ? String(Object.keys(w3.vars).length) : "-"
+        };
+      });
+      formatTable(rows, opts);
     }
-  });
+  }, { service: "config" }));
   configCmd.command("set <key> <value>").summary("Update a config value in wrangler.jsonc").description(`Update a configuration value in wrangler.jsonc.
 
 ARGUMENTS:
@@ -28645,32 +28876,23 @@ PATH EXAMPLES:
 EXAMPLES:
   hoox config set global.subdomain_prefix myapp
   hoox config set workers.trade-worker.enabled false
-  hoox config set workers.agent-worker.vars.interval 5`).action(async (key, value) => {
-    const opts = formatOpts3(program2);
+  hoox config set workers.agent-worker.vars.interval 5`).action(withErrorHandling(async (key, value, _, cmd) => {
+    const opts = getFormatOptions(cmd);
+    const raw = await readConfigRaw();
+    const jsonPath = keyToPath(key);
+    let edits;
     try {
-      const raw = await readConfigRaw();
-      const jsonPath = keyToPath(key);
-      let edits;
-      try {
-        edits = modify(raw, jsonPath, parseValue(value), {
-          formattingOptions: FORMATTING_OPTIONS
-        });
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        throw new CLIError(`Invalid key path "${key}": ${msg}`, 2 /* INVALID_USAGE */);
-      }
-      const updated = applyEdits(raw, edits);
-      await writeConfigRaw(updated);
-      formatSuccess(`Updated "${key}" = "${value}" in wrangler.jsonc`, opts);
+      edits = modify(raw, jsonPath, parseValue(value), {
+        formattingOptions: FORMATTING_OPTIONS
+      });
     } catch (err) {
-      if (err instanceof CLIError) {
-        formatError2(err, opts);
-      } else {
-        const message = err instanceof Error ? err.message : String(err);
-        formatError2(new CLIError(`Failed to set config: ${message}`, 1 /* ERROR */), opts);
-      }
+      const msg = err instanceof Error ? err.message : String(err);
+      throw new CLIError(`Invalid key path "${key}": ${msg}`, 2 /* INVALID_USAGE */);
     }
-  });
+    const updated = applyEdits(raw, edits);
+    await writeConfigRaw(updated);
+    formatSuccess(`Updated "${key}" = "${value}" in wrangler.jsonc`, opts);
+  }, { service: "config" }));
   const secretsCmd = configCmd.command("secrets").summary("Manage Cloudflare Worker secrets").description(`Manage secrets for your Cloudflare Workers.
 
 Secrets are defined in wrangler.jsonc under each worker's 'secrets' array.
@@ -28693,58 +28915,53 @@ ARGUMENTS:
 
 EXAMPLES:
   hoox config secrets list
-  hoox config secrets list trade-worker`).action(async (worker) => {
-    const opts = formatOpts3(program2);
-    try {
-      const svc = await SecretsService.create();
-      if (worker) {
-        const secrets = svc.listSecrets(worker);
-        if (secrets.length === 0) {
-          process.stdout.write(`${theme.dim(`No secrets declared for worker "${worker}".`)}
+  hoox config secrets list trade-worker`).action(withErrorHandling(async (worker, _, cmd) => {
+    const opts = getFormatOptions(cmd);
+    const svc = await SecretsService.create();
+    if (worker) {
+      const secrets = svc.listSecrets(worker);
+      if (secrets.length === 0) {
+        process.stdout.write(`${theme.dim(`No secrets declared for worker "${worker}".`)}
 `);
-          return;
-        }
-        if (opts.json) {
-          formatJson({ worker, secrets }, opts);
-        } else {
-          process.stdout.write(`${theme.heading(`
+        return;
+      }
+      if (opts.json) {
+        formatJson({ worker, secrets }, opts);
+      } else {
+        process.stdout.write(`${theme.heading(`
 Secrets for ${worker}`)}
 `);
-          for (const s of secrets) {
-            process.stdout.write(`  ${theme.label("\u2022")} ${s}
+        for (const s of secrets) {
+          process.stdout.write(`  ${theme.label("\u2022")} ${s}
 `);
-          }
         }
-      } else {
-        const all = svc.listAllSecrets();
-        const workers = Object.keys(all);
-        if (workers.length === 0) {
-          process.stdout.write(`${theme.dim("No secrets declared for any worker.")}
+      }
+    } else {
+      const all = svc.listAllSecrets();
+      const workers = Object.keys(all);
+      if (workers.length === 0) {
+        process.stdout.write(`${theme.dim("No secrets declared for any worker.")}
 `);
-          return;
-        }
-        if (opts.json) {
-          formatJson(all, opts);
-        } else {
-          process.stdout.write(`${theme.heading(`
+        return;
+      }
+      if (opts.json) {
+        formatJson(all, opts);
+      } else {
+        process.stdout.write(`${theme.heading(`
 Secrets by Worker`)}
 `);
-          for (const [name, secrets] of Object.entries(all)) {
-            process.stdout.write(`
+        for (const [name, secrets] of Object.entries(all)) {
+          process.stdout.write(`
   ${theme.bold(name)} (${secrets.length})
 `);
-            for (const s of secrets) {
-              process.stdout.write(`    ${theme.dim("\u2022")} ${s}
+          for (const s of secrets) {
+            process.stdout.write(`    ${theme.dim("\u2022")} ${s}
 `);
-            }
           }
         }
       }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(new CLIError(`Failed to list secrets: ${message}`, 1 /* ERROR */), opts);
     }
-  });
+  }, { service: "config" }));
   secretsCmd.command("set <worker> <name>").summary("Set a secret value for a worker").description(`Set a secret value for a worker and sync to Cloudflare.
 
 ARGUMENTS:
@@ -28756,39 +28973,30 @@ It writes to the worker's .dev.vars file and syncs to Cloudflare.
 
 EXAMPLES:
   hoox config secrets set trade-worker BINANCE_KEY_BINDING
-  hoox config secrets set agent-worker OPENAI_KEY`).action(async (workerName, secretName) => {
-    const opts = formatOpts3(program2);
-    try {
-      const svc = await SecretsService.create();
-      const declared = svc.listSecrets(workerName);
-      if (!declared.includes(secretName) && declared.length > 0) {
-        throw new CLIError(`Secret "${secretName}" is not declared for worker "${workerName}". ` + `Declared secrets: ${declared.join(", ")}`, 2 /* INVALID_USAGE */);
-      }
-      const value = await promptSecret(`Enter value for "${secretName}"`);
-      if (!value) {
-        throw new CLIError("Secret value cannot be empty", 2 /* INVALID_USAGE */);
-      }
-      const devVarsPath = `workers/${workerName}/.dev.vars`;
-      await updateDevVars(devVarsPath, secretName, value);
-      formatSuccess(`Secret "${secretName}" updated in ${devVarsPath}`, opts);
-      const syncSpin = vt();
-      syncSpin.start("Syncing to Cloudflare...");
-      const result = await svc.syncToCloudflare(workerName);
-      if (result.ok) {
-        syncSpin.stop(`Secret "${secretName}" synced to Cloudflare`);
-      } else {
-        syncSpin.stop(`Sync partial: ${result.error ?? "unknown error"}`);
-        formatError2(new CLIError(`Sync partial: ${result.error ?? "unknown error"}`, 1 /* ERROR */), opts);
-      }
-    } catch (err) {
-      if (err instanceof CLIError) {
-        formatError2(err, opts);
-      } else {
-        const message = err instanceof Error ? err.message : String(err);
-        formatError2(new CLIError(`Failed to set secret: ${message}`, 1 /* ERROR */), opts);
-      }
+  hoox config secrets set agent-worker OPENAI_KEY`).action(withErrorHandling(async (workerName, secretName, _, cmd) => {
+    const opts = getFormatOptions(cmd);
+    const svc = await SecretsService.create();
+    const declared = svc.listSecrets(workerName);
+    if (!declared.includes(secretName) && declared.length > 0) {
+      throw new CLIError(`Secret "${secretName}" is not declared for worker "${workerName}". ` + `Declared secrets: ${declared.join(", ")}`, 2 /* INVALID_USAGE */);
+    }
+    const value = await promptSecret(`Enter value for "${secretName}"`);
+    if (!value) {
+      throw new CLIError("Secret value cannot be empty", 2 /* INVALID_USAGE */);
+    }
+    const devVarsPath = `workers/${workerName}/.dev.vars`;
+    await updateDevVars(devVarsPath, secretName, value);
+    formatSuccess(`Secret "${secretName}" updated in ${devVarsPath}`, opts);
+    const syncSpin = vt();
+    syncSpin.start("Syncing to Cloudflare...");
+    const result = await svc.syncToCloudflare(workerName);
+    if (result.ok) {
+      syncSpin.stop(`Secret "${secretName}" synced to Cloudflare`);
+    } else {
+      syncSpin.stop(`Sync partial: ${result.error ?? "unknown error"}`);
+      formatError2(new CLIError(`Sync partial: ${result.error ?? "unknown error"}`, 1 /* ERROR */), opts);
     }
-  });
+  }, { service: "config" }));
   secretsCmd.command("delete <worker> <name>").summary("Delete a secret from Cloudflare").description(`Delete a secret from Cloudflare Workers.
 
 ARGUMENTS:
@@ -28798,45 +29006,36 @@ ARGUMENTS:
 This removes the secret from Cloudflare and from the worker's .dev.vars file.
 
 EXAMPLES:
-  hoox config secrets delete trade-worker BINANCE_KEY_BINDING`).action(async (workerName, secretName) => {
-    const opts = formatOpts3(program2);
-    try {
-      const svc = await SecretsService.create();
-      const declared = svc.listSecrets(workerName);
-      if (!declared.includes(secretName)) {
-        throw new CLIError(`Secret "${secretName}" is not declared for worker "${workerName}".`, 2 /* INVALID_USAGE */);
-      }
-      const proc = Bun.spawn(["wrangler", "secret", "delete", secretName], {
-        cwd: `workers/${workerName}`,
-        stdout: "pipe",
-        stderr: "pipe"
-      });
-      const exitCode = await proc.exited;
-      if (exitCode !== 0) {
-        const stderrText = await new Response(proc.stderr).text();
-        throw new CLIError(`wrangler exited with code ${exitCode}: ${stderrText.trim()}`, 1 /* ERROR */);
-      }
-      const devVarsPath = `workers/${workerName}/.dev.vars`;
-      const devFile = Bun.file(devVarsPath);
-      if (await devFile.exists()) {
-        let content = await devFile.text();
-        const lines = content.split(`
+  hoox config secrets delete trade-worker BINANCE_KEY_BINDING`).action(withErrorHandling(async (workerName, secretName, _, cmd) => {
+    const opts = getFormatOptions(cmd);
+    const svc = await SecretsService.create();
+    const declared = svc.listSecrets(workerName);
+    if (!declared.includes(secretName)) {
+      throw new CLIError(`Secret "${secretName}" is not declared for worker "${workerName}".`, 2 /* INVALID_USAGE */);
+    }
+    const proc = Bun.spawn(["wrangler", "secret", "delete", secretName], {
+      cwd: `workers/${workerName}`,
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const exitCode = await proc.exited;
+    if (exitCode !== 0) {
+      const stderrText = await new Response(proc.stderr).text();
+      throw new CLIError(`wrangler exited with code ${exitCode}: ${stderrText.trim()}`, 1 /* ERROR */);
+    }
+    const devVarsPath = `workers/${workerName}/.dev.vars`;
+    const devFile = Bun.file(devVarsPath);
+    if (await devFile.exists()) {
+      let content = await devFile.text();
+      const lines = content.split(`
 `);
-        const filtered = lines.filter((line) => !line.startsWith(`${secretName}=`) && line.trim() !== "");
-        await Bun.write(devVarsPath, filtered.join(`
+      const filtered = lines.filter((line) => !line.startsWith(`${secretName}=`) && line.trim() !== "");
+      await Bun.write(devVarsPath, filtered.join(`
 `) + (filtered.length > 0 ? `
 ` : ""));
-      }
-      formatSuccess(`Secret "${secretName}" deleted from Cloudflare`, opts);
-    } catch (err) {
-      if (err instanceof CLIError) {
-        formatError2(err, opts);
-      } else {
-        const message = err instanceof Error ? err.message : String(err);
-        formatError2(new CLIError(`Failed to delete secret: ${message}`, 1 /* ERROR */), opts);
-      }
     }
-  });
+    formatSuccess(`Secret "${secretName}" deleted from Cloudflare`, opts);
+  }, { service: "config" }));
   secretsCmd.command("sync [worker]").summary("Sync secrets to Cloudflare").description(`Sync secrets from .dev.vars files to Cloudflare Workers.
 
 ARGUMENTS:
@@ -28846,56 +29045,47 @@ This reads .dev.vars files and uploads secrets to Cloudflare via wrangler.
 
 EXAMPLES:
   hoox config secrets sync                 Sync all workers
-  hoox config secrets sync trade-worker    Sync specific worker`).action(async (workerName) => {
-    const opts = formatOpts3(program2);
-    try {
-      const svc = await SecretsService.create();
-      if (workerName) {
-        const syncSpin = vt();
-        syncSpin.start(`Syncing secrets for "${workerName}"...`);
-        const result = await svc.syncToCloudflare(workerName);
-        if (result.ok) {
-          syncSpin.stop(`Synced ${result.value?.length ?? 0} secrets for "${workerName}"`);
-        } else {
-          syncSpin.stop(`Sync failed: ${result.error ?? "unknown error"}`);
-          formatError2(new CLIError(`Sync failed: ${result.error ?? "unknown error"}`, 1 /* ERROR */), opts);
-        }
+  hoox config secrets sync trade-worker    Sync specific worker`).action(withErrorHandling(async (workerName, _, cmd) => {
+    const opts = getFormatOptions(cmd);
+    const svc = await SecretsService.create();
+    if (workerName) {
+      const syncSpin = vt();
+      syncSpin.start(`Syncing secrets for "${workerName}"...`);
+      const result = await svc.syncToCloudflare(workerName);
+      if (result.ok) {
+        syncSpin.stop(`Synced ${result.value?.length ?? 0} secrets for "${workerName}"`);
       } else {
-        const all = svc.listAllSecrets();
-        const workers = Object.keys(all);
-        if (workers.length === 0) {
-          formatSuccess("No secrets to sync.", opts);
-          return;
-        }
-        let synced = 0;
-        let failed = 0;
-        const syncSpin = vt();
-        for (const name of workers) {
-          syncSpin.start(`Syncing ${name}...`);
-          const result = await svc.syncToCloudflare(name);
-          if (result.ok) {
-            syncSpin.stop(`${theme.success("synced")} ${result.value?.length ?? 0} for ${name}`);
-            synced++;
-          } else {
-            syncSpin.stop(`${theme.error("failed")} ${name}`);
-            failed++;
-          }
-        }
-        if (failed === 0) {
-          formatSuccess(`All ${synced} workers synced successfully`, opts);
+        syncSpin.stop(`Sync failed: ${result.error ?? "unknown error"}`);
+        formatError2(new CLIError(`Sync failed: ${result.error ?? "unknown error"}`, 1 /* ERROR */), opts);
+      }
+    } else {
+      const all = svc.listAllSecrets();
+      const workers = Object.keys(all);
+      if (workers.length === 0) {
+        formatSuccess("No secrets to sync.", opts);
+        return;
+      }
+      let synced = 0;
+      let failed = 0;
+      const syncSpin = vt();
+      for (const name of workers) {
+        syncSpin.start(`Syncing ${name}...`);
+        const result = await svc.syncToCloudflare(name);
+        if (result.ok) {
+          syncSpin.stop(`${theme.success("synced")} ${result.value?.length ?? 0} for ${name}`);
+          synced++;
         } else {
-          formatError2(new CLIError(`${synced} synced, ${failed} failed`, 1 /* ERROR */), opts);
+          syncSpin.stop(`${theme.error("failed")} ${name}`);
+          failed++;
         }
       }
-    } catch (err) {
-      if (err instanceof CLIError) {
-        formatError2(err, opts);
+      if (failed === 0) {
+        formatSuccess(`All ${synced} workers synced successfully`, opts);
       } else {
-        const message = err instanceof Error ? err.message : String(err);
-        formatError2(new CLIError(`Failed to sync secrets: ${message}`, 1 /* ERROR */), opts);
+        formatError2(new CLIError(`${synced} synced, ${failed} failed`, 1 /* ERROR */), opts);
       }
     }
-  });
+  }, { service: "config" }));
   registerEnvCommand(configCmd);
   registerKvCommand(configCmd);
   const keysCmd = configCmd.command("keys").summary("Manage internal auth keys").description(`Generate and manage internal auth keys for inter-worker communication.
@@ -28913,86 +29103,75 @@ Creates the following keys:
   - WEBHOOK_API_KEY_BINDING        (32 char)
   - AGENT_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!
 
 EXAMPLES:
-  hoox config keys generate`).action(async () => {
-    const opts = formatOpts3(program2);
-    try {
-      const keysDir = ".keys";
-      if (!existsSync3(keysDir)) {
-        mkdirSync2(keysDir, { recursive: true });
-      }
-      const keys = {
-        INTERNAL_KEY_BINDING: generateKey(),
-        WEBHOOK_API_KEY_BINDING: generateKey(),
-        AGENT_INTERNAL_KEY: generateKey(),
-        TG_BOT_TOKEN_BINDING: generateKey(16)
-      };
-      for (const [name, value] of Object.entries(keys)) {
-        const filePath = `${keysDir}/${name.toLowerCase()}.env`;
-        await Bun.write(filePath, `${name}=${value}
+  hoox config keys generate`).action(withErrorHandling(async (_, cmd) => {
+    const opts = getFormatOptions(cmd);
+    const keysDir = ".keys";
+    if (!existsSync3(keysDir)) {
+      mkdirSync2(keysDir, { recursive: true });
+    }
+    const keys = {
+      INTERNAL_KEY_BINDING: generateKey(),
+      WEBHOOK_API_KEY_BINDING: generateKey(),
+      AGENT_INTERNAL_KEY: generateKey(),
+      TG_BOT_TOKEN_BINDING: generateKey(16)
+    };
+    for (const [name, value] of Object.entries(keys)) {
+      const filePath = `${keysDir}/${name.toLowerCase()}.env`;
+      await Bun.write(filePath, `${name}=${value}
 `);
-      }
-      formatSuccess(`Generated ${Object.keys(keys).length} keys in ${keysDir}/`, opts);
-      if (!opts.quiet && !opts.json) {
-        process.stdout.write(`${theme.warning("!")}  Keep these keys secret. Add ${keysDir}/ to .gitignore.
+    }
+    formatSuccess(`Generated ${Object.keys(keys).length} keys in ${keysDir}/`, opts);
+    if (!opts.quiet && !opts.json) {
+      process.stdout.write(`${theme.warning("!")}  Keep these keys secret. Add ${keysDir}/ to .gitignore.
 `);
-        formatKeyValue(keys, opts);
-      }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(new CLIError(`Failed to generate keys: ${message}`, 1 /* ERROR */), opts);
+      formatKeyValue(keys, opts);
     }
-  });
+  }, { service: "config" }));
   keysCmd.command("list").summary("List existing internal auth keys").description(`List existing internal auth keys from the .keys/ directory.
 
 Shows key names (values are hidden for security).
 
 EXAMPLES:
-  hoox config keys list`).action(async () => {
-    const opts = formatOpts3(program2);
-    try {
-      const keysDir = ".keys";
-      if (!existsSync3(keysDir)) {
-        process.stdout.write(`${theme.dim("No .keys/ directory found.")}
+  hoox config keys list`).action(withErrorHandling(async (_, cmd) => {
+    const opts = getFormatOptions(cmd);
+    const keysDir = ".keys";
+    if (!existsSync3(keysDir)) {
+      process.stdout.write(`${theme.dim("No .keys/ directory found.")}
 `);
-        return;
-      }
-      const glob = new Bun.Glob("*.env");
-      const entries = [];
-      for await (const f2 of glob.scan({ cwd: keysDir, absolute: false })) {
-        entries.push(f2);
-      }
-      if (entries.length === 0) {
-        process.stdout.write(`${theme.dim("No key files found in .keys/")}
+      return;
+    }
+    const glob = new Bun.Glob("*.env");
+    const entries = [];
+    for await (const f2 of glob.scan({ cwd: keysDir, absolute: false })) {
+      entries.push(f2);
+    }
+    if (entries.length === 0) {
+      process.stdout.write(`${theme.dim("No key files found in .keys/")}
 `);
-        return;
-      }
-      const keyMap = {};
-      for (const entry of entries) {
-        const filePath = `${keysDir}/${entry}`;
-        const content = await (await Bun.file(filePath).text()).trim();
-        const eqIdx = content.indexOf("=");
-        if (eqIdx > 0) {
-          keyMap[content.substring(0, eqIdx)] = "****";
-        }
+      return;
+    }
+    const keyMap = {};
+    for (const entry of entries) {
+      const filePath = `${keysDir}/${entry}`;
+      const content = await (await Bun.file(filePath).text()).trim();
+      const eqIdx = content.indexOf("=");
+      if (eqIdx > 0) {
+        keyMap[content.substring(0, eqIdx)] = "****";
       }
-      if (opts.json) {
-        formatJson({ keys: entries.length, files: entries }, opts);
-      } else {
-        process.stdout.write(`${theme.heading(`
+    }
+    if (opts.json) {
+      formatJson({ keys: entries.length, files: entries }, opts);
+    } else {
+      process.stdout.write(`${theme.heading(`
 Key files in ${keysDir}/`)}
 `);
-        formatKeyValue(keyMap, opts);
-      }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(new CLIError(`Failed to list keys: ${message}`, 1 /* ERROR */), opts);
+      formatKeyValue(keyMap, opts);
     }
-  });
+  }, { service: "config" }));
 }
 function parseValue(raw) {
   if (raw === "true")
@@ -29037,6 +29216,7 @@ async function updateDevVars(filePath, key, value) {
 // src/commands/check/check-command.ts
 import { readdir } from "fs/promises";
 import path3 from "path";
+init_main();
 init_config2();
 
 // src/commands/check/prerequisites-command.ts
@@ -29644,18 +29824,33 @@ async function handleFix(opts, dryRun) {
           };
           if (!dryRun) {
             try {
-              const { parse: parse7 } = await Promise.resolve().then(() => (init_main(), exports_main));
-              const config2 = parse7(content);
-              if (!config2.compatibility_flags) {
-                config2.compatibility_flags = ["nodejs_compat"];
-              } else if (Array.isArray(config2.compatibility_flags)) {
-                const flags = config2.compatibility_flags;
+              const parsedConfig = parse6(content);
+              let updated = content;
+              if (!parsedConfig.compatibility_flags) {
+                const edits = modify(content, ["compatibility_flags"], ["nodejs_compat"], {
+                  formattingOptions: {
+                    tabSize: 2,
+                    insertSpaces: true,
+                    eol: `
+`
+                  }
+                });
+                updated = applyEdits(content, edits);
+              } else if (Array.isArray(parsedConfig.compatibility_flags)) {
+                const flags = parsedConfig.compatibility_flags;
                 if (!flags.includes("nodejs_compat")) {
-                  flags.push("nodejs_compat");
+                  const newFlags = [...flags, "nodejs_compat"];
+                  const edits = modify(content, ["compatibility_flags"], newFlags, {
+                    formattingOptions: {
+                      tabSize: 2,
+                      insertSpaces: true,
+                      eol: `
+`
+                    }
+                  });
+                  updated = applyEdits(content, edits);
                 }
               }
-              const updated = JSON.stringify(config2, null, 2) + `
-`;
               await Bun.write(wranglerPath, updated);
               action.applied = true;
             } catch (err) {
@@ -29674,10 +29869,9 @@ async function handleFix(opts, dryRun) {
       const wranglerFile = Bun.file(wranglerPath);
       if (await wranglerFile.exists()) {
         const content = await wranglerFile.text();
-        const strippedContent = content.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
         try {
-          const config2 = JSON.parse(strippedContent);
-          if (!config2.name) {
+          const parsedConfig = parse6(content);
+          if (!parsedConfig.name) {
             const action = {
               description: `Add missing "name" field to wrangler.jsonc for worker "${workerName}"`,
               type: "config",
@@ -29686,9 +29880,15 @@ async function handleFix(opts, dryRun) {
               applied: false
             };
             if (!dryRun) {
-              config2.name = workerName;
-              const updated = JSON.stringify(config2, null, 2) + `
-`;
+              const edits = modify(content, ["name"], workerName, {
+                formattingOptions: {
+                  tabSize: 2,
+                  insertSpaces: true,
+                  eol: `
+`
+                }
+              });
+              const updated = applyEdits(content, edits);
               await Bun.write(wranglerPath, updated);
               action.applied = true;
             }
@@ -29868,10 +30068,10 @@ OUTPUT:
 
 EXAMPLES:
   hoox check setup
-  hoox check setup --json`).action(async (_, cmd) => {
+  hoox check setup --json`).action(withErrorHandling(async (_, cmd) => {
     const opts = getFormatOptions(cmd);
     await handleSetup(opts);
-  });
+  }, { service: "check" }));
   checkCmd.command("health").summary("Check worker connectivity and responsiveness").description(`Run health checks on all enabled workers to verify they are running and responsive.
 
 Each worker is probed to verify:
@@ -29888,10 +30088,10 @@ OUTPUT:
 EXAMPLES:
   hoox check health
   hoox check health --json
-  hoox check health --fix`).option("--fix", "Attempt automatic repair for detected issues").action(async (options, cmd) => {
+  hoox check health --fix`).option("--fix", "Attempt automatic repair for detected issues").action(withErrorHandling(async (options, cmd) => {
     const opts = getFormatOptions(cmd);
     await handleHealth(opts, Boolean(options.fix));
-  });
+  }, { service: "check" }));
   checkCmd.command("fix").summary("Auto-repair common issues").description(`Automatically repair known common issues in your Hoox setup.
 
 Repairs performed:
@@ -29904,10 +30104,10 @@ OPTIONS:
 
 EXAMPLES:
   hoox check fix                Apply fixes automatically
-  hoox check fix --dry-run     Preview what would be fixed`).option("--dry-run", "Preview changes without applying them").action(async (options, cmd) => {
+  hoox check fix --dry-run     Preview what would be fixed`).option("--dry-run", "Preview changes without applying them").action(withErrorHandling(async (options, cmd) => {
     const opts = getFormatOptions(cmd);
     await handleFix(opts, Boolean(options.dryRun));
-  });
+  }, { service: "check" }));
   registerPrerequisitesCommand(checkCmd);
   checkCmd.command("submodule-gitignore").alias("sg").summary("Validate and fix worker submodule .gitignore files").description(`Validate and fix .gitignore files in worker submodules.
 
@@ -29922,10 +30122,10 @@ Also removes wrangler.jsonc from git tracking if mistakenly tracked.
 
 EXAMPLES:
   hoox check submodule-gitignore
-  hoox check sg  # alias`).action(async (_, cmd) => {
+  hoox check sg  # alias`).action(withErrorHandling(async (_, cmd) => {
     const opts = getFormatOptions(cmd);
     await handleSubmoduleGitignore(opts);
-  });
+  }, { service: "check" }));
 }
 // src/commands/logs/logs-command.ts
 init_config2();
@@ -30071,9 +30271,8 @@ async function tailAllWorkers(opts, fmt) {
       });
     }
     const decoder = new TextDecoder;
-    const buffers = new Map;
     const readFromWorker = async (p2) => {
-      let buffer = buffers.get(p2.name) ?? "";
+      let buffer = "";
       while (true) {
         const { done, value } = await p2.reader.read();
         if (done)
@@ -30112,7 +30311,6 @@ async function tailAllWorkers(opts, fmt) {
         process.stdout.write(`${theme.bold(`[${p2.name}]`)} ${buffer}
 `);
       }
-      buffers.set(p2.name, buffer);
     };
     if (opts.follow) {
       await Promise.all(processes.map((p2) => readFromWorker(p2)));
@@ -30263,34 +30461,26 @@ var PIPELINE_STEPS = [
 ];
 function registerTestCommand(program2) {
   const testCmd = program2.command("test").description("Run tests and CI pipeline");
-  testCmd.command("all").description("Run full CI pipeline: lint \u2192 typecheck \u2192 unit tests \u2192 integration tests").option("--json", "Output results as JSON").action(async (options) => {
+  testCmd.command("all").description("Run full CI pipeline: lint \u2192 typecheck \u2192 unit tests \u2192 integration tests").option("--json", "Output results as JSON").action(withErrorHandling(async (options) => {
     const fmt = getFormatOptions(program2);
     const useJson = options.json || fmt.json;
     const opts = { json: useJson, quiet: fmt.quiet };
     const results = [];
     const s = vt();
     s.start("Running CI pipeline...");
-    try {
-      for (const step of PIPELINE_STEPS) {
-        s.message(`${theme.info(icons.info)} ${step.label}...`);
-        const result = await runStep(step.args, process.cwd());
-        results.push({ ...result, step: step.label });
-        if (result.success) {
-          s.message(`  ${theme.success(icons.success)} ${step.label} passed (${result.duration}ms)`);
-        } else {
-          s.message(`  ${theme.error(icons.error)} ${step.label} failed (${result.duration}ms)`);
-          if (result.error) {
-            s.message(theme.dim(result.error.slice(0, 500)));
-          }
-          break;
+    for (const step of PIPELINE_STEPS) {
+      s.message(`${theme.info(icons.info)} ${step.label}...`);
+      const result = await runStep(step.args, process.cwd());
+      results.push({ ...result, step: step.label });
+      if (result.success) {
+        s.message(`  ${theme.success(icons.success)} ${step.label} passed (${result.duration}ms)`);
+      } else {
+        s.message(`  ${theme.error(icons.error)} ${step.label} failed (${result.duration}ms)`);
+        if (result.error) {
+          s.message(theme.dim(result.error.slice(0, 500)));
         }
+        break;
       }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(message, opts);
-      process.exitCode = 1 /* ERROR */;
-      s.stop("Pipeline aborted with unexpected error");
-      return;
     }
     const summary = {
       total: results.length,
@@ -30303,7 +30493,7 @@ function registerTestCommand(program2) {
     if (summary.failed > 0) {
       process.exitCode = 1 /* ERROR */;
     }
-  });
+  }, { service: "test" }));
   testCmd.command("unit").description("Run unit tests with bun test").option("--coverage", "Run with coverage reporting").action(async (options) => {
     const fmt = getFormatOptions(program2);
     const args = ["bun", "test"];
@@ -30330,55 +30520,41 @@ function registerTestCommand(program2) {
       process.exitCode = 1 /* ERROR */;
     }
   });
-  testCmd.command("worker <name>").description("Run tests for a specific worker by name").option("--coverage", "Run with coverage reporting").action(async (name, options) => {
+  testCmd.command("worker <name>").description("Run tests for a specific worker by name").option("--coverage", "Run with coverage reporting").action(withErrorHandling(async (name, options) => {
     const fmt = getFormatOptions(program2);
-    try {
-      const configService = new ConfigService;
-      await configService.load();
-      const workerConfig = configService.getWorker(name);
-      if (!workerConfig) {
-        formatError2(new CLIError(`Worker "${name}" not found in wrangler.jsonc`, 2 /* INVALID_USAGE */), fmt);
-        process.exitCode = 2 /* INVALID_USAGE */;
-        return;
-      }
-      const workerDir = `${process.cwd()}/${workerConfig.path}`;
-      const args = ["bun", "test"];
-      if (options.coverage)
-        args.push("--coverage");
-      const result = await runWithInherit(args, workerDir);
-      if (result.success) {
-        formatSuccess(`Worker "${name}" tests passed`, fmt);
-      } else {
-        formatError2(new CLIError(`Worker "${name}" tests failed (exit code ${result.exitCode})`, 1 /* ERROR */), fmt);
-        process.exitCode = 1 /* ERROR */;
-      }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(message, fmt);
+    const configService = new ConfigService;
+    await configService.load();
+    const workerConfig = configService.getWorker(name);
+    if (!workerConfig) {
+      formatError2(new CLIError(`Worker "${name}" not found in wrangler.jsonc`, 2 /* INVALID_USAGE */), fmt);
+      process.exitCode = 2 /* INVALID_USAGE */;
+      return;
+    }
+    const workerDir = `${process.cwd()}/${workerConfig.path}`;
+    const args = ["bun", "test"];
+    if (options.coverage)
+      args.push("--coverage");
+    const result = await runWithInherit(args, workerDir);
+    if (result.success) {
+      formatSuccess(`Worker "${name}" tests passed`, fmt);
+    } else {
+      formatError2(new CLIError(`Worker "${name}" tests failed (exit code ${result.exitCode})`, 1 /* ERROR */), fmt);
       process.exitCode = 1 /* ERROR */;
     }
-  });
-  testCmd.command("live").description("Run live Cloudflare service integration tests (no mocks)").option("--service <name>", "Test a specific service: d1, kv, r2, queues, ai, api, secrets, durable-objects").action(async (options) => {
-    const fmt = getFormatOptions(program2);
+  }, { service: "test" }));
+  testCmd.command("live").description("Run live Cloudflare service integration tests (no mocks)").option("--service <name>", "Test a specific service: d1, kv, r2, queues, ai, api, secrets, durable-objects").action(withErrorHandling(async (options) => {
     const s = vt();
-    try {
-      let filePattern = options.service ? `tests/live/${options.service}.test.ts` : "tests/live/";
-      s.start(`Running live tests${options.service ? ` for ${options.service}` : ""}...`);
-      const args = ["bun", "test", filePattern, "--jobs", "1"];
-      const result = await runWithInherit(args, process.cwd());
-      if (result.success) {
-        s.stop("Live tests complete");
-      } else {
-        s.stop(`Live tests: some failures (exit code ${result.exitCode})`);
-        process.exitCode = 1 /* ERROR */;
-      }
-    } catch (err) {
-      s.stop("Live tests aborted");
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(message, fmt);
+    let filePattern = options.service ? `tests/live/${options.service}.test.ts` : "tests/live/";
+    s.start(`Running live tests${options.service ? ` for ${options.service}` : ""}...`);
+    const args = ["bun", "test", filePattern, "--jobs", "1"];
+    const result = await runWithInherit(args, process.cwd());
+    if (result.success) {
+      s.stop("Live tests complete");
+    } else {
+      s.stop(`Live tests: some failures (exit code ${result.exitCode})`);
       process.exitCode = 1 /* ERROR */;
     }
-  });
+  }, { service: "test" }));
 }
 // src/commands/waf/waf-command.ts
 var CF_API_BASE = "https://api.cloudflare.com/client/v4";
@@ -30600,29 +30776,29 @@ async function handleMode(mode, opts) {
 function registerWafCommand(program2) {
   const waf = program2.command("waf").description("Manage Cloudflare WAF (Web Application Firewall)");
   waf.command("status").description("Show WAF status (enabled/disabled, active rules, recent blocks)").action(withErrorHandling(async (_, cmd) => {
-    const opts = cmd.parent.parent.opts();
+    const opts = getFormatOptions(cmd);
     await handleStatus(opts);
   }, { service: "waf" }));
   const rules = waf.command("rules").description("Manage WAF firewall rules");
   rules.command("list").description("List all WAF firewall rules").action(withErrorHandling(async (_, cmd) => {
-    const opts = cmd.parent.parent.parent.opts();
+    const opts = getFormatOptions(cmd);
     await handleRulesList(opts);
   }, { service: "waf" }));
   rules.command("add <type> <value>").description("Add a WAF rule. Types: ip-allowlist, ip-blocklist, rate-limit, custom").action(withErrorHandling(async (type, value, _, cmd) => {
-    const opts = cmd.parent.parent.parent.opts();
+    const opts = getFormatOptions(cmd);
     await handleRulesAdd(type, value, opts);
   }, { service: "waf" }));
   rules.command("remove <ruleId>").description("Remove a WAF rule by ID").action(withErrorHandling(async (ruleId, _, cmd) => {
-    const opts = cmd.parent.parent.parent.opts();
+    const opts = getFormatOptions(cmd);
     await handleRulesRemove(ruleId, opts);
   }, { service: "waf" }));
   const mode = waf.command("mode").description("Enable or disable WAF protection");
   mode.command("enable").description("Enable WAF protection on the zone").action(withErrorHandling(async (_, cmd) => {
-    const opts = cmd.parent.parent.parent.opts();
+    const opts = getFormatOptions(cmd);
     await handleMode("on", opts);
   }, { service: "waf" }));
   mode.command("disable").description("Disable WAF protection on the zone").action(withErrorHandling(async (_, cmd) => {
-    const opts = cmd.parent.parent.parent.opts();
+    const opts = getFormatOptions(cmd);
     await handleMode("off", opts);
   }, { service: "waf" }));
 }
@@ -30726,129 +30902,123 @@ EXAMPLES:
   hoox clone                     List all workers' clone status
   hoox clone --all               Clone all workers
   hoox clone trade-worker        Clone specific worker
-  hoox clone --org my-org        Clone from specific org`).option("--all", "Clone all worker repositories").option("--org <org>", "GitHub organization (derived from git remote by default)").argument("[name]", "Worker name to clone (omit to list status)").action(async (name, options) => {
+  hoox clone --org my-org        Clone from specific org`).option("--all", "Clone all worker repositories").option("--org <org>", "GitHub organization (derived from git remote by default)").argument("[name]", "Worker name to clone (omit to list status)").action(withErrorHandling(async (name, options) => {
     const fmt = getFormatOptions(program2);
-    try {
-      const configService = new ConfigService;
-      await configService.load();
-      const workers = configService.listWorkers();
-      if (!options.all && !name) {
-        const repoBase = options.org ? `https://github.com/${options.org}` : await resolveRepoBase();
-        const statuses = await buildStatusList(configService, repoBase);
-        if (fmt.json) {
-          formatJson(statuses, fmt);
-          return;
-        }
-        if (fmt.quiet) {
-          for (const s of statuses) {
-            process.stdout.write(`${s.worker}: ${s.cloned ? "cloned" : "not cloned"}
+    const configService = new ConfigService;
+    await configService.load();
+    const workers = configService.listWorkers();
+    if (!options.all && !name) {
+      const repoBase = options.org ? `https://github.com/${options.org}` : await resolveRepoBase();
+      const statuses = await buildStatusList(configService, repoBase);
+      if (fmt.json) {
+        formatJson(statuses, fmt);
+        return;
+      }
+      if (fmt.quiet) {
+        for (const s of statuses) {
+          process.stdout.write(`${s.worker}: ${s.cloned ? "cloned" : "not cloned"}
 `);
-          }
-          return;
         }
-        const rows = statuses.map((s) => ({
-          Worker: s.worker,
-          Status: s.cloned ? "cloned" : "not cloned",
-          Repo: s.repo ?? "-"
-        }));
-        formatTable(rows, fmt);
         return;
       }
-      if (options.all) {
-        if (workers.length === 0) {
-          formatSuccess("No workers defined in wrangler.jsonc", fmt);
-          return;
-        }
-        const repoBase = options.org ? `https://github.com/${options.org}` : await resolveRepoBase();
-        const s = vt();
-        s.start(`Cloning ${workers.length} worker(s)...`);
-        const results = [];
-        for (let i = 0;i < workers.length; i++) {
-          const name2 = workers[i];
-          const workerConfig = configService.getWorker(name2);
-          if (!workerConfig)
-            continue;
-          const alreadyCloned = await isWorkerCloned(workerConfig.path);
-          if (alreadyCloned) {
-            s.message(`[${i + 1}/${workers.length}] ${icons.info} ${name2} already cloned \u2014 skipping`);
-            results.push({
-              worker: name2,
-              path: workerConfig.path,
-              cloned: true,
-              repo: getRepoUrl(repoBase, name2)
-            });
-            continue;
-          }
-          s.message(`[${i + 1}/${workers.length}] Cloning ${name2}...`);
-          const result = await cloneWorker(getRepoUrl(repoBase, name2), workerConfig.path, name2, process.cwd());
-          results.push(result);
-          if (result.cloned) {
-            s.message(`[${i + 1}/${workers.length}] ${icons.success} ${name2} cloned`);
-          } else {
-            s.message(`[${i + 1}/${workers.length}] ${icons.error} ${name2} failed: ${result.error}`);
-          }
-        }
-        try {
-          s.message("Updating submodules...");
-          await updateSubmodules(process.cwd());
-        } catch (updateErr) {
-          const msg = updateErr instanceof Error ? updateErr.message : String(updateErr);
-          s.message(`Warning: submodule update failed: ${msg}`);
-        }
-        const succeeded = results.filter((r) => r.cloned).length;
-        const failed = results.filter((r) => !r.cloned).length;
-        if (failed > 0) {
-          s.stop(`Clone complete: ${succeeded} succeeded, ${failed} failed`);
-          process.exitCode = 1 /* ERROR */;
-        } else {
-          s.stop(`All ${succeeded} worker(s) cloned successfully`);
-        }
-        if (!fmt.quiet) {
-          const rows = results.map((r) => ({
-            Worker: r.worker,
-            Status: r.cloned ? "cloned" : "failed",
-            Repo: r.repo ?? "-"
-          }));
-          formatTable(rows, { json: fmt.json, quiet: false });
-        }
+      const rows = statuses.map((s) => ({
+        Worker: s.worker,
+        Status: s.cloned ? "cloned" : "not cloned",
+        Repo: s.repo ?? "-"
+      }));
+      formatTable(rows, fmt);
+      return;
+    }
+    if (options.all) {
+      if (workers.length === 0) {
+        formatSuccess("No workers defined in wrangler.jsonc", fmt);
         return;
       }
-      if (name) {
-        const workerConfig = configService.getWorker(name);
-        if (!workerConfig) {
-          formatError2(new CLIError(`Worker "${name}" not found in wrangler.jsonc`, 1 /* ERROR */), fmt);
-          process.exitCode = 1 /* ERROR */;
-          return;
-        }
+      const repoBase = options.org ? `https://github.com/${options.org}` : await resolveRepoBase();
+      const s = vt();
+      s.start(`Cloning ${workers.length} worker(s)...`);
+      const results = [];
+      for (let i = 0;i < workers.length; i++) {
+        const name2 = workers[i];
+        const workerConfig = configService.getWorker(name2);
+        if (!workerConfig)
+          continue;
         const alreadyCloned = await isWorkerCloned(workerConfig.path);
         if (alreadyCloned) {
-          formatSuccess(`Worker "${name}" is already cloned at ${workerConfig.path}`, fmt);
-          return;
+          s.message(`[${i + 1}/${workers.length}] ${icons.info} ${name2} already cloned \u2014 skipping`);
+          results.push({
+            worker: name2,
+            path: workerConfig.path,
+            cloned: true,
+            repo: getRepoUrl(repoBase, name2)
+          });
+          continue;
         }
-        const repoBase = options.org ? `https://github.com/${options.org}` : await resolveRepoBase();
-        const s = vt();
-        s.start(`Cloning ${name}...`);
-        const result = await cloneWorker(getRepoUrl(repoBase, name), workerConfig.path, name, process.cwd());
+        s.message(`[${i + 1}/${workers.length}] Cloning ${name2}...`);
+        const result = await cloneWorker(getRepoUrl(repoBase, name2), workerConfig.path, name2, process.cwd());
+        results.push(result);
         if (result.cloned) {
-          try {
-            s.message("Updating submodules...");
-            await updateSubmodules(process.cwd());
-          } catch {}
-          s.stop(`Successfully cloned ${name}`);
-          formatSuccess(`Cloned ${name} from ${result.repo}`, fmt);
+          s.message(`[${i + 1}/${workers.length}] ${icons.success} ${name2} cloned`);
         } else {
-          s.stop(`Failed to clone ${name}`);
-          formatError2(new CLIError(`Failed to clone "${name}": ${result.error}`, 1 /* ERROR */), fmt);
-          process.exitCode = 1 /* ERROR */;
+          s.message(`[${i + 1}/${workers.length}] ${icons.error} ${name2} failed: ${result.error}`);
         }
+      }
+      try {
+        s.message("Updating submodules...");
+        await updateSubmodules(process.cwd());
+      } catch (updateErr) {
+        const msg = updateErr instanceof Error ? updateErr.message : String(updateErr);
+        s.message(`Warning: submodule update failed: ${msg}`);
+      }
+      const succeeded = results.filter((r) => r.cloned).length;
+      const failed = results.filter((r) => !r.cloned).length;
+      if (failed > 0) {
+        s.stop(`Clone complete: ${succeeded} succeeded, ${failed} failed`);
+        process.exitCode = 1 /* ERROR */;
+      } else {
+        s.stop(`All ${succeeded} worker(s) cloned successfully`);
+      }
+      if (!fmt.quiet) {
+        const rows = results.map((r) => ({
+          Worker: r.worker,
+          Status: r.cloned ? "cloned" : "failed",
+          Repo: r.repo ?? "-"
+        }));
+        formatTable(rows, { json: fmt.json, quiet: false });
+      }
+      return;
+    }
+    if (name) {
+      const workerConfig = configService.getWorker(name);
+      if (!workerConfig) {
+        formatError2(new CLIError(`Worker "${name}" not found in wrangler.jsonc`, 1 /* ERROR */), fmt);
+        process.exitCode = 1 /* ERROR */;
         return;
       }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(message, fmt);
-      process.exitCode = 1 /* ERROR */;
+      const alreadyCloned = await isWorkerCloned(workerConfig.path);
+      if (alreadyCloned) {
+        formatSuccess(`Worker "${name}" is already cloned at ${workerConfig.path}`, fmt);
+        return;
+      }
+      const repoBase = options.org ? `https://github.com/${options.org}` : await resolveRepoBase();
+      const s = vt();
+      s.start(`Cloning ${name}...`);
+      const result = await cloneWorker(getRepoUrl(repoBase, name), workerConfig.path, name, process.cwd());
+      if (result.cloned) {
+        try {
+          s.message("Updating submodules...");
+          await updateSubmodules(process.cwd());
+        } catch {}
+        s.stop(`Successfully cloned ${name}`);
+        formatSuccess(`Cloned ${name} from ${result.repo}`, fmt);
+      } else {
+        s.stop(`Failed to clone ${name}`);
+        formatError2(new CLIError(`Failed to clone "${name}": ${result.error}`, 1 /* ERROR */), fmt);
+        process.exitCode = 1 /* ERROR */;
+      }
+      return;
     }
-  });
+  }, { service: "clone" }));
 }
 // src/commands/dashboard/dashboard-command.ts
 init_config2();
@@ -30892,8 +31062,9 @@ function updateWranglerVars(filePath, urls, dryRun, opts) {
       Old: c.oldValue,
       New: theme.success(c.newValue)
     }));
-    console.log(theme.heading(`
-Service URL changes:`));
+    process.stdout.write(theme.heading(`
+Service URL changes:`) + `
+`);
     formatTable(rows, opts);
   }
   if (dryRun) {
@@ -30911,6 +31082,7 @@ Service URL changes:`));
 function registerDashboardCommand(program2) {
   const dashboardCmd = program2.command("dashboard").description("Dashboard-specific operations");
   dashboardCmd.command("update-urls").description("Update dashboard wrangler.jsonc with current service URLs").option("--dry-run", "Show changes without applying").action(withErrorHandling(async (options) => {
+    process.stdout.write(theme.warning("! This command is deprecated. Use `hoox deploy update-internal-urls` instead.\n"));
     const opts = {
       json: program2.opts().json,
       quiet: program2.opts().quiet
@@ -31032,20 +31204,36 @@ async function resolveDb(cmd, svc) {
 }
 async function handleApply(opts, dbName, remote, file2) {
   const svc = new DbService;
-  const output = await svc.apply(dbName, remote, file2);
-  formatSuccess(`Schema applied to ${dbName}${remote ? " (remote)" : " (local)"}`, opts);
-  if (!opts.quiet && output) {
-    process.stdout.write(`${output}
+  const s = vt();
+  s.start("Applying schema...");
+  try {
+    const output = await svc.apply(dbName, remote, file2);
+    s.stop("Schema applied");
+    formatSuccess(`Schema applied to ${dbName}${remote ? " (remote)" : " (local)"}`, opts);
+    if (!opts.quiet && output) {
+      process.stdout.write(`${output}
 `);
+    }
+  } catch (err) {
+    s.stop("Schema apply failed");
+    throw err;
   }
 }
 async function handleMigrate(opts, dbName, remote) {
   const svc = new DbService;
-  const output = await svc.migrate(dbName, remote);
-  formatSuccess(`Migrations applied to ${dbName}${remote ? " (remote)" : " (local)"}`, opts);
-  if (!opts.quiet && output) {
-    process.stdout.write(`${output}
+  const s = vt();
+  s.start("Running migrations...");
+  try {
+    const output = await svc.migrate(dbName, remote);
+    s.stop("Migrations complete");
+    formatSuccess(`Migrations applied to ${dbName}${remote ? " (remote)" : " (local)"}`, opts);
+    if (!opts.quiet && output) {
+      process.stdout.write(`${output}
 `);
+    }
+  } catch (err) {
+    s.stop("Migrations failed");
+    throw err;
   }
 }
 async function handleList2(opts, dbName, remote) {
@@ -31081,8 +31269,16 @@ async function handleQuery(opts, dbName, sql, remote) {
 }
 async function handleExport(opts, dbName, outputPath) {
   const svc = new DbService;
-  const path4 = await svc.export(dbName, outputPath);
-  formatSuccess(`Database exported to ${path4}`, opts);
+  const s = vt();
+  s.start("Exporting database...");
+  try {
+    const path4 = await svc.export(dbName, outputPath);
+    s.stop("Database exported");
+    formatSuccess(`Database exported to ${path4}`, opts);
+  } catch (err) {
+    s.stop("Export failed");
+    throw err;
+  }
 }
 async function handleReset(opts, dbName, confirmed) {
   if (!confirmed) {
@@ -31096,11 +31292,19 @@ async function handleReset(opts, dbName, confirmed) {
     }
   }
   const svc = new DbService;
-  const output = await svc.reset(dbName);
-  formatSuccess(`Database "${dbName}" has been recreated`, opts);
-  if (!opts.quiet && output) {
-    process.stdout.write(`${output}
+  const s = vt();
+  s.start("Resetting database...");
+  try {
+    const output = await svc.reset(dbName);
+    s.stop("Database reset");
+    formatSuccess(`Database "${dbName}" has been recreated`, opts);
+    if (!opts.quiet && output) {
+      process.stdout.write(`${output}
 `);
+    }
+  } catch (err) {
+    s.stop("Reset failed");
+    throw err;
   }
 }
 function registerDbCommand(program2) {
@@ -31266,7 +31470,10 @@ async function doMonitorLogs(workerName, fmt) {
     const dbName = await db.resolveDbName();
     let sql;
     if (workerName) {
-      sql = `SELECT * FROM system_logs WHERE worker = '${workerName.replace(/'/g, "''")}' ORDER BY timestamp DESC LIMIT 20`;
+      if (!/^[a-zA-Z0-9_-]+$/.test(workerName)) {
+        throw new Error(`Invalid worker name: "${workerName}"`);
+      }
+      sql = `SELECT * FROM system_logs WHERE worker = '${workerName}' ORDER BY timestamp DESC LIMIT 20`;
     } else {
       sql = "SELECT * FROM system_logs ORDER BY timestamp DESC LIMIT 20";
     }
@@ -31317,6 +31524,66 @@ async function doMonitorQueueDepth(fmt) {
     process.exitCode = 1 /* ERROR */;
   }
 }
+async function doMonitorAnalyticsSummary(fmt) {
+  try {
+    const db = new DbService;
+    const dbName = await db.resolveDbName();
+    const sql = "SELECT COUNT(*) as total_events, MIN(timestamp) as earliest, MAX(timestamp) as latest FROM system_logs";
+    const output = await db.query(dbName, sql, true);
+    if (fmt.json) {
+      process.stdout.write(output + `
+`);
+      return;
+    }
+    const parsed = JSON.parse(output);
+    const results = parsed[0]?.results;
+    if (results && results.length > 0) {
+      const row = results[0];
+      const rows = [
+        {
+          "Total Events": String(row.total_events ?? "-"),
+          Earliest: String(row.earliest ?? "-"),
+          Latest: String(row.latest ?? "-")
+        }
+      ];
+      formatTable(rows, fmt);
+    } else {
+      process.stdout.write(`No analytics data found.
+`);
+    }
+  } catch (err) {
+    formatError2(err instanceof Error ? err.message : String(err), fmt);
+    process.exitCode = 1 /* ERROR */;
+  }
+}
+async function doMonitorAnalyticsErrors(hours, fmt) {
+  try {
+    const db = new DbService;
+    const dbName = await db.resolveDbName();
+    const sql = `SELECT level, COUNT(*) as count FROM system_logs WHERE level IN ('error', 'warn') AND timestamp > unixepoch('now', '-${hours} hours') GROUP BY level`;
+    const output = await db.query(dbName, sql, true);
+    if (fmt.json) {
+      process.stdout.write(output + `
+`);
+      return;
+    }
+    const parsed = JSON.parse(output);
+    const results = parsed[0]?.results;
+    if (results && results.length > 0) {
+      const rows = results.map((r) => ({
+        Level: String(r.level ?? "-"),
+        Count: String(r.count ?? "0")
+      }));
+      formatTable(rows, fmt);
+    } else {
+      process.stdout.write(`No errors or warnings in the last ${hours} hours.
+`);
+    }
+  } catch (err) {
+    formatError2(err instanceof Error ? err.message : String(err), fmt);
+    process.exitCode = 1 /* ERROR */;
+  }
+}
 async function doMonitorBackup(fmt) {
   try {
     const db = new DbService;
@@ -31338,54 +31605,177 @@ SUBCOMMANDS:
   kill-switch     Emergency stop/resume trading
   queue-depth     List queues and pending messages
   backup          Export D1 database to timestamped .sql file
+  analytics       Query analytics data from D1
 
 EXAMPLES:
-  hoox monitor status             Check all workers health
-  hoox monitor trades 20          Show 20 recent trades
-  hoox monitor logs hoox          Show logs for hoox worker
-  hoox monitor kill-switch show   Check kill switch status
-  hoox monitor kill-switch on     Halt all trading
-  hoox monitor kill-switch off    Resume trading
-  hoox monitor queue-depth        Show queue info
-  hoox monitor backup             Export D1 database`);
-  monitorCmd.command("status").summary("Check health of all workers").description("Probe each worker's /health endpoint and report status.").action(async function() {
-    const fmt = getFormatOptions(this);
+  hoox monitor status                  Check all workers health
+  hoox monitor trades 20               Show 20 recent trades
+  hoox monitor logs hoox               Show logs for hoox worker
+  hoox monitor kill-switch show        Check kill switch status
+  hoox monitor kill-switch on          Halt all trading
+  hoox monitor kill-switch off         Resume trading
+  hoox monitor queue-depth             Show queue info
+  hoox monitor backup                  Export D1 database
+  hoox monitor analytics summary       Show event rollup statistics
+  hoox monitor analytics errors        Show error/warning counts`);
+  monitorCmd.command("status").summary("Check health of all workers").description("Probe each worker's /health endpoint and report status.").action(withErrorHandling(async (_, cmd) => {
+    const fmt = getFormatOptions(cmd);
     await doMonitorStatus(fmt);
-  });
-  monitorCmd.command("trades").summary("Show recent trades from D1").description("Query the trades table for the most recent entries.").argument("[limit]", "Number of trades to show (default: 10, max: 100)", "10").action(async function(limit) {
-    const fmt = getFormatOptions(this);
+  }, { service: "monitor" }));
+  monitorCmd.command("trades").summary("Show recent trades from D1").description("Query the trades table for the most recent entries.").argument("[limit]", "Number of trades to show (default: 10, max: 100)", "10").action(withErrorHandling(async (limit, _, cmd) => {
+    const fmt = getFormatOptions(cmd);
     await doMonitorTrades(parseInt(limit, 10) || 10, fmt);
-  });
-  monitorCmd.command("logs").summary("Show recent system logs from D1").description("Query the system_logs table. Optionally filter by worker name.").argument("[worker]", "Worker name to filter (optional)").action(async function(worker) {
-    const fmt = getFormatOptions(this);
+  }, { service: "monitor" }));
+  monitorCmd.command("logs").summary("Show recent system logs from D1").description("Query the system_logs table. Optionally filter by worker name.").argument("[worker]", "Worker name to filter (optional)").action(withErrorHandling(async (worker, _, cmd) => {
+    const fmt = getFormatOptions(cmd);
     await doMonitorLogs(worker, fmt);
-  });
+  }, { service: "monitor" }));
   const ksCmd = monitorCmd.command("kill-switch").summary("Emergency stop or resume trading").description(`Control the trade:kill_switch KV key.
 
 Commands:
   show   Display current kill switch status
   on     Halt all trading (set kill_switch=true)
   off    Resume trading (set kill_switch=false)`);
-  ksCmd.command("show").summary("Show kill switch status").description("Display whether trading is halted or active.").action(async function() {
-    const fmt = getFormatOptions(this);
+  ksCmd.command("show").summary("Show kill switch status").description("Display whether trading is halted or active.").action(withErrorHandling(async (_, cmd) => {
+    const fmt = getFormatOptions(cmd);
     await doMonitorKillSwitch("show", fmt);
-  });
-  ksCmd.command("on").summary("Halt all trading").description("Set trade:kill_switch=true to stop all trading operations. WARNING: This halts ALL trading activity immediately.").action(async function() {
-    const fmt = getFormatOptions(this);
+  }, { service: "monitor" }));
+  ksCmd.command("on").summary("Halt all trading").description("Set trade:kill_switch=true to stop all trading operations. WARNING: This halts ALL trading activity immediately.").action(withErrorHandling(async (_, cmd) => {
+    const fmt = getFormatOptions(cmd);
     await doMonitorKillSwitch("on", fmt);
-  });
-  ksCmd.command("off").summary("Resume trading").description("Set trade:kill_switch=false to resume normal trading operations.").action(async function() {
-    const fmt = getFormatOptions(this);
+  }, { service: "monitor" }));
+  ksCmd.command("off").summary("Resume trading").description("Set trade:kill_switch=false to resume normal trading operations.").action(withErrorHandling(async (_, cmd) => {
+    const fmt = getFormatOptions(cmd);
     await doMonitorKillSwitch("off", fmt);
-  });
-  monitorCmd.command("queue-depth").summary("Show queue details").description("List queues via wrangler queues list to show configured queues.").action(async function() {
-    const fmt = getFormatOptions(this);
+  }, { service: "monitor" }));
+  monitorCmd.command("queue-depth").summary("Show queue details").description("List queues via wrangler queues list to show configured queues.").action(withErrorHandling(async (_, cmd) => {
+    const fmt = getFormatOptions(cmd);
     await doMonitorQueueDepth(fmt);
-  });
-  monitorCmd.command("backup").summary("Export D1 database to .sql file").description("Export the D1 database to a timestamped .sql backup file via wrangler d1 export.").action(async function() {
-    const fmt = getFormatOptions(this);
+  }, { service: "monitor" }));
+  monitorCmd.command("backup").summary("Export D1 database to .sql file").description("Export the D1 database to a timestamped .sql backup file via wrangler d1 export.").action(withErrorHandling(async (_, cmd) => {
+    const fmt = getFormatOptions(cmd);
     await doMonitorBackup(fmt);
+  }, { service: "monitor" }));
+  const analyticsCmd = monitorCmd.command("analytics").summary("Query analytics data from D1").description(`Run analytical queries against the system_logs table.
+
+SUBCOMMANDS:
+  summary       Show rollup statistics of system events
+  errors        Show error/warning counts by level`);
+  analyticsCmd.command("summary").summary("Show event rollup statistics").description("Query system_logs for total events, earliest and latest timestamps.").action(withErrorHandling(async (_, cmd) => {
+    const fmt = getFormatOptions(cmd);
+    await doMonitorAnalyticsSummary(fmt);
+  }, { service: "monitor" }));
+  analyticsCmd.command("errors").summary("Show error and warning counts by level").description("Query system_logs for error/warning counts grouped by level, filtered by hours.").option("--hours <n>", "Hours to look back (default: 24)", "24").action(withErrorHandling(async (options, cmd) => {
+    const fmt = getFormatOptions(cmd);
+    const hours = parseInt(options.hours ?? "24", 10) || 24;
+    await doMonitorAnalyticsErrors(hours, fmt);
+  }, { service: "monitor" }));
+}
+// src/commands/workers/workers-command.ts
+init_config2();
+async function doListWorkers(fmt) {
+  const configService = new ConfigService;
+  await configService.load();
+  const workers = configService.listWorkers();
+  const rows = workers.map((name) => {
+    const worker = configService.getWorker(name);
+    return {
+      Worker: name,
+      Status: worker?.enabled ? "enabled" : "disabled",
+      Path: worker?.path ?? "-",
+      Secrets: String(worker?.secrets?.length ?? 0)
+    };
   });
+  if (fmt.json) {
+    formatJson(rows, fmt);
+    return;
+  }
+  formatTable(rows, fmt);
+}
+function registerWorkersCommand(program2) {
+  const workersCmd = program2.command("workers").summary("Manage and monitor Cloudflare Workers").description(`Manage and monitor your Hoox Cloudflare Workers.
+
+SUBCOMMANDS:
+  list              List all workers with status, path, and secrets count
+  status            Check health status of all workers (delegates to monitor status)
+  dev <name>        Start a worker for local development (delegates to dev worker)
+  logs <name>       Tail logs for a specific worker (delegates to logs worker)
+
+EXAMPLES:
+  hoox workers list                   List all workers
+  hoox workers list --json            List workers as JSON (respects global --json)
+  hoox workers status                 Check health of all workers
+  hoox workers dev trade-worker       Start dev server for trade-worker
+  hoox workers logs hoox              Tail logs for the hoox gateway`);
+  workersCmd.command("list").summary("List all workers with their enabled/disabled status").description(`List all workers defined in wrangler.jsonc.
+
+Displays each worker's:
+  - Name
+  - Status (enabled / disabled)
+  - Path (relative from project root)
+  - Secrets (count of Cloudflare secrets configured)
+
+EXAMPLES:
+  hoox workers list              Default table output
+  hoox workers list --json       JSON-formatted output
+  hoox workers list --quiet      Minimal output`).action(withErrorHandling(async (_opts, cmd) => {
+    const fmt = getFormatOptions(cmd);
+    await doListWorkers(fmt);
+  }, { service: "workers" }));
+  workersCmd.command("status").summary("Check health status of all workers").description(`Check the health of all workers by delegating to \`hoox monitor status\`.
+
+This command spawns \`hoox monitor status\` with inherited stdio, passing
+all output directly to the terminal.
+
+EXAMPLES:
+  hoox workers status            Check all worker health
+  hoox workers status --json     JSON output (via delegated command)`).action(withErrorHandling(async () => {
+    const proc = Bun.spawn(["hoox", "monitor", "status"], {
+      stdio: ["inherit", "inherit", "inherit"]
+    });
+    const exitCode = await proc.exited;
+    if (exitCode !== 0) {
+      process.exitCode = exitCode;
+    }
+  }, { service: "workers" }));
+  workersCmd.command("dev <name>").summary("Start a single worker for local development").description(`Start a specific worker for local development by delegating to \`hoox dev worker <name>\`.
+
+This command spawns \`hoox dev worker <name>\` with inherited stdio,
+so all wrangler dev output and prompts appear directly in the terminal.
+
+ARGUMENTS:
+  name      Worker name (e.g., trade-worker, agent-worker, hoox)
+
+EXAMPLES:
+  hoox workers dev trade-worker      Start dev server for trade-worker
+  hoox workers dev hoox              Start dev server for the hoox gateway`).action(withErrorHandling(async (name) => {
+    const proc = Bun.spawn(["hoox", "dev", "worker", name], {
+      stdio: ["inherit", "inherit", "inherit"]
+    });
+    const exitCode = await proc.exited;
+    if (exitCode !== 0) {
+      process.exitCode = exitCode;
+    }
+  }, { service: "workers" }));
+  workersCmd.command("logs <name>").summary("Tail logs for a specific worker").description(`Tail logs for a specific worker by delegating to \`hoox logs worker <name>\`.
+
+This command spawns \`hoox logs worker <name>\` with inherited stdio,
+preserving all formatting and log-level filtering from the logs command.
+
+ARGUMENTS:
+  name      Worker name (e.g., trade-worker, agent-worker, hoox)
+
+EXAMPLES:
+  hoox workers logs hoox             Tail logs for the hoox gateway
+  hoox workers logs trade-worker     Tail logs for trade-worker`).action(withErrorHandling(async (name) => {
+    const proc = Bun.spawn(["hoox", "logs", "worker", name], {
+      stdio: ["inherit", "inherit", "inherit"]
+    });
+    const exitCode = await proc.exited;
+    if (exitCode !== 0) {
+      process.exitCode = exitCode;
+    }
+  }, { service: "workers" }));
 }
 // src/commands/repair/repair-service.ts
 class RepairService {
@@ -31623,7 +32013,12 @@ async function handleDb(fmt) {
 async function handleRebuild(fmt) {
   try {
     const repair = new RepairService;
-    await repair.runSystemCheck();
+    const result = await repair.runSystemCheck();
+    if (!result.allPassed) {
+      formatError2(new CLIError(`${result.failedCount} check(s) failed \u2014 aborting rebuild`, 1 /* ERROR */), fmt);
+      process.exitCode = 1 /* ERROR */;
+      return;
+    }
     const cf = new CloudflareService;
     const { ConfigService: ConfigService2 } = await Promise.resolve().then(() => (init_config2(), exports_config));
     const config2 = new ConfigService2;
@@ -31642,34 +32037,34 @@ async function handleRebuild(fmt) {
 }
 function registerRepairCommand(program2) {
   const repairCmd = program2.command("repair").summary("Diagnose and repair the Hoox system").description("Run checks, deploy workers, or fix infrastructure, secrets, KV, and DB issues.");
-  repairCmd.command("check").description("Run system diagnostics (workers, deps, types, infra, secrets)").action(async () => {
+  repairCmd.command("check").description("Run system diagnostics (workers, deps, types, infra, secrets)").action(withErrorHandling(async () => {
     const fmt = getFormatOptions(repairCmd);
     await handleCheck(fmt);
-  });
-  repairCmd.command("worker <name>").description("Deploy a specific worker to fix it").action(async (name) => {
+  }, { service: "repair" }));
+  repairCmd.command("worker <name>").description("Deploy a specific worker to fix it").action(withErrorHandling(async (name) => {
     const fmt = getFormatOptions(repairCmd);
     await handleWorker(name, fmt);
-  });
-  repairCmd.command("infra").description("Provision missing infrastructure (D1, KV, R2, Queues)").action(async () => {
+  }, { service: "repair" }));
+  repairCmd.command("infra").description("Provision missing infrastructure (D1, KV, R2, Queues)").action(withErrorHandling(async () => {
     const fmt = getFormatOptions(repairCmd);
     await handleInfra(fmt);
-  });
-  repairCmd.command("secrets").description("Upload missing secrets to Cloudflare").action(async () => {
+  }, { service: "repair" }));
+  repairCmd.command("secrets").description("Upload missing secrets to Cloudflare").action(withErrorHandling(async () => {
     const fmt = getFormatOptions(repairCmd);
     await handleSecrets(fmt);
-  });
-  repairCmd.command("kv").description("Re-sync KV namespace entries").action(async () => {
+  }, { service: "repair" }));
+  repairCmd.command("kv").description("Re-sync KV namespace entries").action(withErrorHandling(async () => {
     const fmt = getFormatOptions(repairCmd);
     await handleKv(fmt);
-  });
-  repairCmd.command("db").description("Re-apply database schema").action(async () => {
+  }, { service: "repair" }));
+  repairCmd.command("db").description("Re-apply database schema").action(withErrorHandling(async () => {
     const fmt = getFormatOptions(repairCmd);
     await handleDb(fmt);
-  });
-  repairCmd.command("rebuild").description("Full rebuild: check, deploy all workers, fix infra/secrets/db").action(async () => {
+  }, { service: "repair" }));
+  repairCmd.command("rebuild").description("Full rebuild: check, deploy all workers, fix infra/secrets/db").action(withErrorHandling(async () => {
     const fmt = getFormatOptions(repairCmd);
     await handleRebuild(fmt);
-  });
+  }, { service: "repair" }));
 }
 // src/commands/update/update-command.ts
 init_config2();
@@ -31799,49 +32194,41 @@ With "wrangler", updates wrangler to the latest version.
 EXAMPLES:
   hoox update              Pull latest for main repo
   hoox update d1-worker    Update the d1-worker submodule
-  hoox update wrangler     Update wrangler to latest version`).argument("[target]", 'What to update: worker name (e.g. d1-worker) or "wrangler"').action(async (target) => {
-    const fmt = getFormatOptions(program2);
+  hoox update wrangler     Update wrangler to latest version`).argument("[target]", 'What to update: worker name (e.g. d1-worker) or "wrangler"').action(withErrorHandling(async (target) => {
     const cwd = process.cwd();
-    try {
-      if (target === "wrangler") {
-        const service = new UpdateService;
-        const result = await service.updateWrangler();
-        if (result.error) {
-          formatError2(new CLIError(`Update failed: ${result.error}`, 1 /* ERROR */), fmt);
-          process.exitCode = 1 /* ERROR */;
-        }
-        return;
+    if (target === "wrangler") {
+      const service = new UpdateService;
+      const result = await service.updateWrangler();
+      if (result.error) {
+        throw new CLIError(`Update failed: ${result.error}`, 1 /* ERROR */);
       }
-      if (!await isGitRepo(cwd)) {
-        throw new CLIError("Not a git repository \u2014 run this command from the project root", 2 /* INVALID_USAGE */);
+      return;
+    }
+    if (!await isGitRepo(cwd)) {
+      throw new CLIError("Not a git repository \u2014 run this command from the project root", 2 /* INVALID_USAGE */);
+    }
+    if (target) {
+      const configService = new ConfigService;
+      await configService.load();
+      const worker = configService.getWorker(target);
+      if (!worker) {
+        throw new CLIError(`Unknown worker "${target}" \u2014 not found in wrangler.jsonc`, 2 /* INVALID_USAGE */);
       }
-      if (target) {
-        const configService = new ConfigService;
-        await configService.load();
-        const worker = configService.getWorker(target);
-        if (!worker) {
-          throw new CLIError(`Unknown worker "${target}" \u2014 not found in wrangler.jsonc`, 2 /* INVALID_USAGE */);
-        }
-        const submodulePath = worker.path;
-        if (!await isSubmodule(cwd, submodulePath)) {
-          throw new CLIError(`"${submodulePath}" is not a git submodule \u2014 nothing to update`, 2 /* INVALID_USAGE */);
-        }
-        const s = vt();
-        s.start(`Updating ${target}...`);
-        const output = await gitSubmoduleUpdate(cwd, submodulePath);
-        s.stop(output ? theme.success(`Updated ${target}`) : theme.muted(`${target} already up to date`));
-      } else {
-        const s = vt();
-        s.start("Pulling latest from remote...");
-        const output = await gitPull(cwd);
-        s.stop(output ? theme.success("Repository up to date") : theme.muted("Already up to date"));
+      const submodulePath = worker.path;
+      if (!await isSubmodule(cwd, submodulePath)) {
+        throw new CLIError(`"${submodulePath}" is not a git submodule \u2014 nothing to update`, 2 /* INVALID_USAGE */);
       }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      formatError2(message, fmt);
-      process.exitCode = 1 /* ERROR */;
+      const s = vt();
+      s.start(`Updating ${target}...`);
+      const output = await gitSubmoduleUpdate(cwd, submodulePath);
+      s.stop(output ? theme.success(`Updated ${target}`) : theme.muted(`${target} already up to date`));
+    } else {
+      const s = vt();
+      s.start("Pulling latest from remote...");
+      const output = await gitPull(cwd);
+      s.stop(output ? theme.success("Repository up to date") : theme.muted("Already up to date"));
     }
-  });
+  }, { service: "update" }));
 }
 // src/commands/schema/schema-command.ts
 init_schema_service();
@@ -32420,8 +32807,9 @@ async function runCommand(program2, commandStr) {
   }
 }
 // src/index.ts
+var pkgVersion = JSON.parse(readFileSync5(new URL("../package.json", import.meta.url), "utf-8")).version;
 var program2 = new Command;
-program2.name("hoox").description("Hoox CLI \u2014 manage Cloudflare Workers, infrastructure, secrets, and deployments").version(`0.2.0
+program2.name("hoox").description("Hoox CLI \u2014 manage Cloudflare Workers, infrastructure, secrets, and deployments").version(`${pkgVersion}
 
 ${COPYRIGHT}`).addHelpText("beforeAll", theme.heading(`
 Hoox CLI \u2014 Cloudflare Workers Platform
@@ -32478,11 +32866,67 @@ registerCloneCommand(program2);
 registerDashboardCommand(program2);
 registerDbCommand(program2);
 registerMonitorCommand(program2);
+registerWorkersCommand(program2);
 registerRepairCommand(program2);
 registerSchemaCommand(program2);
 registerUpdateCommand(program2);
 registerTUICommand(program2);
 registerDisclaimerCommand(program2);
+program2.command("completion").description("Generate shell completion script").argument("[shell]", "Shell type (bash, zsh, fish)").action(async (shell) => {
+  if (!shell) {
+    process.stdout.write(`Usage: hoox completion <bash|zsh|fish>
+`);
+    return;
+  }
+  const validShells = ["bash", "zsh", "fish"];
+  if (!validShells.includes(shell)) {
+    process.stderr.write(`Unsupported shell "${shell}". Use: ${validShells.join(", ")}
+`);
+    process.exitCode = 1;
+    return;
+  }
+  if (shell === "bash") {
+    process.stdout.write(`_hoox_completion() {
+  local cur prev opts
+  COMPREPLY=()
+  cur="\${COMP_WORDS[COMP_CWORD]}"
+  opts="--help --version --json --quiet --yes init clone dev deploy infra config check db monitor repair logs test waf dashboard schema update tui disclaimer workers"
+  COMPREPLY=( $(compgen -W "\${opts}" -- \${cur}) )
+  return 0
+}
+complete -F _hoox_completion hoox
+`);
+  } else if (shell === "zsh") {
+    process.stdout.write(`#compdef hoox
+_hoox() {
+  local -a opts
+  opts=(
+    '--help:Show help'
+    '--version:Show version'
+    '--json:JSON output'
+    '--quiet:Minimal output'
+    'init:Interactive setup wizard'
+    'clone:Clone worker repositories'
+    'dev:Local development'
+    'deploy:Deploy to Cloudflare'
+    'infra:Manage infrastructure'
+    'config:Manage configuration'
+    'check:Validate and health-check'
+    'db:Database operations'
+    'monitor:Monitor system'
+    'repair:Repair system'
+    'logs:View worker logs'
+    'test:Run tests'
+    'waf:Manage Web Application Firewall'
+    'dashboard:Dashboard operations'
+    'workers:Worker operations'
+  )
+  _describe 'hoox' opts
+}
+compdef _hoox hoox
+`);
+  }
+});
 var devCmd = program2.commands.find((c) => c.name() === "dev");
 if (devCmd) {
   const devStartCmd = devCmd.commands.find((c) => c.name() === "start");