@towles/tool 0.0.96 → 0.0.103

package/src/commands/doctor.ts

@@ -1,9 +1,10 @@
 import { existsSync, readFileSync } from "node:fs";
 import { resolve, join } from "node:path";
+import { defineCommand } from "citty";
 import consola from "consola";
 import { x } from "tinyexec";
 import { colors } from "consola/utils";
-import { BaseCommand } from "./base.js";
+import { debugArg } from "./shared.js";
 
 interface CheckResult {
   name: string;
@@ -12,35 +13,146 @@ interface CheckResult {
   warning?: string;
 }
 
-/**
- * Check system dependencies and environment
- */
-export default class Doctor extends BaseCommand {
-  static override description = "Check system dependencies and environment";
+async function checkCommand(
+  name: string,
+  args: string[],
+  versionPattern: RegExp,
+  optional = false,
+): Promise<CheckResult> {
+  try {
+    const result = await x(name, args);
+    const output = result.stdout + result.stderr;
+    const match = output.match(versionPattern);
+    return {
+      name,
+      version: match?.[1] ?? output.trim().slice(0, 20),
+      ok: true,
+    };
+  } catch {
+    consola.debug(`Tool check failed for "${name}"`);
+    return {
+      name,
+      version: null,
+      ok: optional,
+      warning: optional ? "optional, not installed" : undefined,
+    };
+  }
+}
+
+async function checkGhAuth(): Promise<{ ok: boolean }> {
+  try {
+    const result = await x("gh", ["auth", "status"]);
+    return { ok: result.exitCode === 0 };
+  } catch {
+    consola.debug("GitHub CLI auth check failed");
+    return { ok: false };
+  }
+}
+
+function checkAgentBoard(): {
+  name: string;
+  value: string;
+  ok: boolean;
+  warning?: string;
+  hint?: string;
+}[] {
+  const results: { name: string; value: string; ok: boolean; warning?: string; hint?: string }[] =
+    [];
+
+  const defaultDataDir = resolve(
+    process.env.XDG_CONFIG_HOME ?? resolve(process.env.HOME ?? "~", ".config"),
+    "towles-tool",
+    "agentboard",
+  );
+  const dataDir = process.env.AGENTBOARD_DATA_DIR ?? defaultDataDir;
+  const dbPath = join(dataDir, "agentboard.db");
+  const configPath = join(dataDir, "config.json");
+
+  const dbExists = existsSync(dbPath);
+  results.push({
+    name: "database",
+    value: dbExists ? dbPath : "not found",
+    ok: dbExists,
+    hint: dbExists ? undefined : "Run: tt ag (starts server and creates DB automatically)",
+  });
+
+  let repoPaths: string[] = [];
+  if (existsSync(configPath)) {
+    try {
+      const config = JSON.parse(readFileSync(configPath, "utf-8"));
+      repoPaths = config.repoPaths ?? [];
+    } catch {
+      // Corrupted config
+    }
+  }
 
-  static override examples = [
-    { description: "Check system dependencies", command: "<%= config.bin %> <%= command.id %>" },
-    { description: "Verify environment after setup", command: "<%= config.bin %> doctor" },
+  results.push({
+    name: "scan paths",
+    value: repoPaths.length > 0 ? repoPaths.join(", ") : "none configured",
+    ok: repoPaths.length > 0,
+    warning: repoPaths.length === 0 ? "no scan paths" : undefined,
+    hint:
+      repoPaths.length === 0
+        ? "Run: tt ag → open Workspaces → run the onboarding wizard"
+        : undefined,
+  });
+
+  results.push({
+    name: "data dir",
+    value: dataDir,
+    ok: true,
+  });
+
+  return results;
+}
+
+async function checkClaudePlugins(): Promise<
+  { name: string; ok: boolean; installHint?: string }[]
+> {
+  const requiredPlugins = [
+    {
+      id: "code-simplifier@claude-plugins-official",
+      name: "code-simplifier",
+      installCmd: "claude plugin install code-simplifier@claude-plugins-official --scope user",
+    },
   ];
 
-  async run(): Promise<void> {
-    await this.parse(Doctor);
+  try {
+    const result = await x("claude", ["plugin", "list", "--json"]);
+    const plugins: { id: string }[] = JSON.parse(result.stdout);
+    const installedIds = new Set(plugins.map((p) => p.id));
+
+    return requiredPlugins.map((p) => ({
+      name: p.name,
+      ok: installedIds.has(p.id),
+      installHint: installedIds.has(p.id) ? undefined : `Run: ${p.installCmd}`,
+    }));
+  } catch {
+    consola.debug("Failed to list Claude plugins");
+    return requiredPlugins.map((p) => ({
+      name: p.name,
+      ok: false,
+      installHint: `Run: ${p.installCmd}`,
+    }));
+  }
+}
 
-    this.log("Checking dependencies...\n");
+export default defineCommand({
+  meta: { name: "doctor", description: "Check system dependencies and environment" },
+  args: { debug: debugArg },
+  async run() {
+    consola.info("Checking dependencies...\n");
 
     const checks: CheckResult[] = await Promise.all([
-      this.checkCommand("git", ["--version"], /git version ([\d.]+)/),
-      this.checkCommand("gh", ["--version"], /gh version ([\d.]+)/),
-      this.checkCommand("node", ["--version"], /v?([\d.]+)/),
-      this.checkCommand("bun", ["--version"], /([\d.]+)/),
-      this.checkCommand("pnpm", ["--version"], /([\d.]+)/),
-      this.checkCommand("tsx", ["--version"], /([\d.]+)/),
-      this.checkCommand("claude", ["--version"], /([\d.]+)/),
-      this.checkCommand("tmux", ["-V"], /tmux ([\d.]+)/),
-      this.checkCommand("ttyd", ["--version"], /ttyd version ([\d.]+)/, true),
+      checkCommand("git", ["--version"], /git version ([\d.]+)/),
+      checkCommand("gh", ["--version"], /gh version ([\d.]+)/),
+      checkCommand("node", ["--version"], /v?([\d.]+)/),
+      checkCommand("bun", ["--version"], /([\d.]+)/),
+      checkCommand("claude", ["--version"], /([\d.]+)/),
+      checkCommand("tmux", ["-V"], /tmux ([\d.]+)/),
+      checkCommand("ttyd", ["--version"], /ttyd version ([\d.]+)/, true),
     ]);
 
-    // Display results
     for (const check of checks) {
       const icon = check.ok
         ? colors.green("✓")
@@ -48,199 +160,65 @@ export default class Doctor extends BaseCommand {
           ? colors.yellow("⚠")
           : colors.red("✗");
       const version = check.version ?? "not found";
-      this.log(`${icon} ${check.name}: ${version}`);
+      consola.log(`${icon} ${check.name}: ${version}`);
       if (check.warning) {
-        this.log(`  ${colors.yellow("⚠")} ${check.warning}`);
+        consola.log(`  ${colors.yellow("⚠")} ${check.warning}`);
       }
     }
 
-    // Check gh auth
-    this.log("");
-    const ghAuth = await this.checkGhAuth();
+    consola.log("");
+    const ghAuth = await checkGhAuth();
     const authIcon = ghAuth.ok ? colors.green("✓") : colors.yellow("⚠");
-    this.log(`${authIcon} gh auth: ${ghAuth.ok ? "authenticated" : "not authenticated"}`);
+    consola.log(`${authIcon} gh auth: ${ghAuth.ok ? "authenticated" : "not authenticated"}`);
     if (!ghAuth.ok) {
-      this.log(`  ${colors.dim("Run: gh auth login")}`);
+      consola.log(`  ${colors.dim("Run: gh auth login")}`);
     }
 
-    // Node version check
     const nodeCheck = checks.find((c) => c.name === "node");
     if (nodeCheck?.version) {
       const major = Number.parseInt(nodeCheck.version.split(".")[0], 10);
       if (major < 18) {
-        this.log("");
-        this.log(`${colors.yellow("⚠")} Node.js 18+ recommended (found ${nodeCheck.version})`);
+        consola.log("");
+        consola.log(`${colors.yellow("⚠")} Node.js 18+ recommended (found ${nodeCheck.version})`);
       }
     }
 
-    // Claude plugin checks
-    this.log("");
-    const pluginChecks = await this.checkClaudePlugins();
+    consola.log("");
+    const pluginChecks = await checkClaudePlugins();
     for (const check of pluginChecks) {
       const icon = check.ok ? colors.green("✓") : colors.red("✗");
       const status = check.ok ? "installed" : "not installed";
-      this.log(`${icon} claude plugin ${check.name}: ${status}`);
+      consola.log(`${icon} claude plugin ${check.name}: ${status}`);
       if (!check.ok && check.installHint) {
-        this.log(`  ${colors.dim(check.installHint)}`);
+        consola.log(`  ${colors.dim(check.installHint)}`);
       }
     }
 
-    // AgentBoard checks
-    this.log("");
-    this.log(colors.bold("AgentBoard:"));
-    const agentboardChecks = this.checkAgentBoard();
+    consola.log("");
+    consola.log(colors.bold("AgentBoard:"));
+    const agentboardChecks = checkAgentBoard();
     for (const check of agentboardChecks) {
       const icon = check.ok
         ? colors.green("✓")
         : check.warning
           ? colors.yellow("⚠")
           : colors.red("✗");
-      this.log(`${icon} ${check.name}: ${check.value}`);
+      consola.log(`${icon} ${check.name}: ${check.value}`);
       if (check.hint) {
-        this.log(`  ${colors.dim(check.hint)}`);
+        consola.log(`  ${colors.dim(check.hint)}`);
       }
     }
 
-    // Summary
     const allOk =
       checks.every((c) => c.ok || !!c.warning) &&
       ghAuth.ok &&
       pluginChecks.every((c) => c.ok) &&
       agentboardChecks.every((c) => c.ok || !!c.warning);
-    this.log("");
+    consola.log("");
     if (allOk) {
-      this.log(colors.green("All checks passed!"));
+      consola.log(colors.green("All checks passed!"));
     } else {
-      this.log(colors.yellow("Some checks failed. See above for details."));
+      consola.log(colors.yellow("Some checks failed. See above for details."));
     }
-  }
-
-  private async checkCommand(
-    name: string,
-    args: string[],
-    versionPattern: RegExp,
-    optional = false,
-  ): Promise<CheckResult> {
-    try {
-      // tinyexec is safe - uses execFile internally, no shell injection risk
-      const result = await x(name, args);
-      const output = result.stdout + result.stderr;
-      const match = output.match(versionPattern);
-      return {
-        name,
-        version: match?.[1] ?? output.trim().slice(0, 20),
-        ok: true,
-      };
-    } catch {
-      consola.debug(`Tool check failed for "${name}"`);
-      return {
-        name,
-        version: null,
-        ok: optional,
-        warning: optional ? "optional, not installed" : undefined,
-      };
-    }
-  }
-
-  private async checkGhAuth(): Promise<{ ok: boolean }> {
-    try {
-      // tinyexec is safe - uses execFile internally, no shell injection risk
-      const result = await x("gh", ["auth", "status"]);
-      return { ok: result.exitCode === 0 };
-    } catch {
-      consola.debug("GitHub CLI auth check failed");
-      return { ok: false };
-    }
-  }
-
-  private checkAgentBoard(): {
-    name: string;
-    value: string;
-    ok: boolean;
-    warning?: string;
-    hint?: string;
-  }[] {
-    const results: { name: string; value: string; ok: boolean; warning?: string; hint?: string }[] =
-      [];
-
-    const defaultDataDir = resolve(
-      process.env.XDG_CONFIG_HOME ?? resolve(process.env.HOME ?? "~", ".config"),
-      "towles-tool",
-      "agentboard",
-    );
-    const dataDir = process.env.AGENTBOARD_DATA_DIR ?? defaultDataDir;
-    const dbPath = join(dataDir, "agentboard.db");
-    const configPath = join(dataDir, "config.json");
-
-    // DB exists
-    const dbExists = existsSync(dbPath);
-    results.push({
-      name: "database",
-      value: dbExists ? dbPath : "not found",
-      ok: dbExists,
-      hint: dbExists ? undefined : "Run: tt ag (starts server and creates DB automatically)",
-    });
-
-    // Config exists with repoPaths
-    let repoPaths: string[] = [];
-    if (existsSync(configPath)) {
-      try {
-        const config = JSON.parse(readFileSync(configPath, "utf-8"));
-        repoPaths = config.repoPaths ?? [];
-      } catch {
-        // Corrupted config
-      }
-    }
-
-    results.push({
-      name: "scan paths",
-      value: repoPaths.length > 0 ? repoPaths.join(", ") : "none configured",
-      ok: repoPaths.length > 0,
-      warning: repoPaths.length === 0 ? "no scan paths" : undefined,
-      hint:
-        repoPaths.length === 0
-          ? "Run: tt ag → open Workspaces → run the onboarding wizard"
-          : undefined,
-    });
-
-    // Data directory
-    results.push({
-      name: "data dir",
-      value: dataDir,
-      ok: true,
-    });
-
-    return results;
-  }
-
-  private async checkClaudePlugins(): Promise<
-    { name: string; ok: boolean; installHint?: string }[]
-  > {
-    const requiredPlugins = [
-      {
-        id: "code-simplifier@claude-plugins-official",
-        name: "code-simplifier",
-        installCmd: "claude plugin install code-simplifier@claude-plugins-official --scope user",
-      },
-    ];
-
-    try {
-      const result = await x("claude", ["plugin", "list", "--json"]);
-      const plugins: { id: string }[] = JSON.parse(result.stdout);
-      const installedIds = new Set(plugins.map((p) => p.id));
-
-      return requiredPlugins.map((p) => ({
-        name: p.name,
-        ok: installedIds.has(p.id),
-        installHint: installedIds.has(p.id) ? undefined : `Run: ${p.installCmd}`,
-      }));
-    } catch {
-      consola.debug("Failed to list Claude plugins");
-      return requiredPlugins.map((p) => ({
-        name: p.name,
-        ok: false,
-        installHint: `Run: ${p.installCmd}`,
-      }));
-    }
-  }
-}
+  },
+});

package/src/commands/gh/branch-clean.ts

@@ -1,52 +1,37 @@
-import { Flags } from "@oclif/core";
+import { defineCommand } from "citty";
 import { colors } from "consola/utils";
 import consola from "consola";
 import { x } from "tinyexec";
 
-import { BaseCommand } from "../base.js";
-
-/**
- * Clean up merged branches
- */
-export default class BranchClean extends BaseCommand {
-  static override description = "Delete local branches that have been merged into main";
-
-  static override examples = [
-    { description: "Clean merged branches", command: "<%= config.bin %> <%= command.id %>" },
-    {
-      description: "Preview without deleting",
-      command: "<%= config.bin %> <%= command.id %> --dry-run",
-    },
-    { description: "Skip confirmation", command: "<%= config.bin %> <%= command.id %> --force" },
-    {
-      description: "Check against develop",
-      command: "<%= config.bin %> <%= command.id %> --base develop",
-    },
-  ];
-
-  static override flags = {
-    ...BaseCommand.baseFlags,
-    force: Flags.boolean({
-      char: "f",
+import { debugArg } from "../shared.js";
+
+export default defineCommand({
+  meta: {
+    name: "branch-clean",
+    description: "Delete local branches that have been merged into main",
+  },
+  args: {
+    debug: debugArg,
+    force: {
+      type: "boolean",
+      alias: "f",
       description: "Skip confirmation prompt",
       default: false,
-    }),
-    "dry-run": Flags.boolean({
-      char: "d",
+    },
+    dryRun: {
+      type: "boolean",
       description: "Preview branches without deleting",
       default: false,
-    }),
-    base: Flags.string({
-      char: "b",
+    },
+    base: {
+      type: "string",
+      alias: "b",
       description: "Base branch to check against",
       default: "main",
-    }),
-  };
-
-  async run(): Promise<void> {
-    const { flags } = await this.parse(BranchClean);
-    const baseBranch = flags.base;
-    const dryRun = flags["dry-run"];
+    },
+  },
+  async run({ args }) {
+    const baseBranch = args.base;
 
     // Get current branch
     const currentResult = await x("git", ["branch", "--show-current"]);
@@ -73,12 +58,12 @@ export default class BranchClean extends BaseCommand {
       consola.log(`  - ${branch}`);
     }
 
-    if (dryRun) {
+    if (args.dryRun) {
       consola.info(colors.yellow("Dry run - no branches deleted"));
       return;
     }
 
-    if (!flags.force) {
+    if (!args.force) {
       const answer = await consola.prompt(`Delete ${toDelete.length} branch(es)?`, {
         type: "confirm",
         initial: false,
@@ -112,5 +97,5 @@ export default class BranchClean extends BaseCommand {
     if (failed > 0) {
       consola.warn(colors.yellow(`Failed to delete ${failed} branch(es)`));
     }
-  }
-}
+  },
+});

package/src/commands/gh/branch.ts

@@ -1,11 +1,11 @@
-import { Flags } from "@oclif/core";
+import { defineCommand } from "citty";
 import consola from "consola";
 import prompts from "prompts";
 import type { Choice } from "prompts";
 import { colors } from "consola/utils";
 import { Fzf } from "fzf";
 
-import { BaseCommand } from "../base.js";
+import { debugArg } from "../shared.js";
 import type { Issue } from "../../utils/git/gh-cli-wrapper.js";
 import { getIssues, isGithubCliInstalled } from "../../utils/git/gh-cli-wrapper.js";
 import { git } from "../../utils/git/exec.js";
@@ -46,46 +46,31 @@ export function buildIssueChoices(issues: Issue[], layout: ColumnLayout): Choice
   return choices;
 }
 
-/**
- * Create a git branch from a GitHub issue
- */
-export default class GhBranch extends BaseCommand {
-  static override description = "Create a git branch from a GitHub issue";
-
-  static override examples = [
-    { description: "Browse all open issues", command: "<%= config.bin %> <%= command.id %>" },
-    {
-      description: "Only issues assigned to me",
-      command: "<%= config.bin %> <%= command.id %> --assignedToMe",
-    },
-    { description: "Short flag for assigned", command: "<%= config.bin %> <%= command.id %> -a" },
-  ];
-
-  static override flags = {
-    ...BaseCommand.baseFlags,
-    assignedToMe: Flags.boolean({
-      char: "a",
+export default defineCommand({
+  meta: { name: "branch", description: "Create a git branch from a GitHub issue" },
+  args: {
+    debug: debugArg,
+    assignedToMe: {
+      type: "boolean",
+      alias: "a",
       description: "Only show issues assigned to me",
       default: false,
-    }),
-  };
-
-  async run(): Promise<void> {
-    const { flags } = await this.parse(GhBranch);
-
+    },
+  },
+  async run({ args }) {
     // Check prerequisites
     const cliInstalled = await isGithubCliInstalled();
     if (!cliInstalled) {
-      consola.log("Github CLI not installed");
-      this.exit(1);
+      consola.error("Github CLI not installed");
+      process.exit(1);
     }
 
-    consola.log("Assigned to me:", flags.assignedToMe);
+    consola.log("Assigned to me:", args.assignedToMe);
 
-    const currentIssues = await getIssues({ assignedToMe: flags.assignedToMe, cwd: process.cwd() });
+    const currentIssues = await getIssues({ assignedToMe: args.assignedToMe, cwd: process.cwd() });
     if (currentIssues.length === 0) {
       consola.log(colors.yellow("No issues found, check assignments"));
-      this.exit(1);
+      process.exit(1);
     } else {
       consola.log(colors.green(`${currentIssues.length} Issues found assigned to you`));
     }
@@ -114,14 +99,14 @@ export default class GhBranch extends BaseCommand {
         {
           onCancel: () => {
             consola.info(colors.dim("Canceled"));
-            this.exit(0);
+            process.exit(0);
           },
         },
       );
 
       if (result.issueNumber === "cancel") {
         consola.log(colors.dim("Canceled"));
-        this.exit(0);
+        process.exit(0);
       }
 
       const selectedIssue = currentIssues.find((i) => i.number === result.issueNumber)!;
@@ -133,7 +118,7 @@ export default class GhBranch extends BaseCommand {
       await git(["checkout", "-b", branchName]);
     } catch {
       consola.debug("Branch checkout failed");
-      this.exit(1);
+      process.exit(1);
     }
-  }
-}
+  },
+});

package/src/commands/gh/index.ts

@@ -0,0 +1,10 @@
+import { defineCommand } from "citty";
+
+export default defineCommand({
+  meta: { name: "gh", description: "GitHub utilities" },
+  subCommands: {
+    branch: () => import("./branch.js").then((m) => m.default),
+    "branch-clean": () => import("./branch-clean.js").then((m) => m.default),
+    pr: () => import("./pr.js").then((m) => m.default),
+  },
+});