@towles/tool 0.0.96 → 0.0.103

package/src/commands/gh/pr.ts

@@ -1,58 +1,87 @@
-import { Flags } from "@oclif/core";
+import { defineCommand } from "citty";
 import { x } from "tinyexec";
 import consola from "consola";
 import { colors } from "consola/utils";
 
-import { BaseCommand } from "../base.js";
+import { debugArg } from "../shared.js";
 import { isGithubCliInstalled } from "../../utils/git/gh-cli-wrapper.js";
 
-/**
- * Create a pull request from the current branch
- * Note: Uses tinyexec which is safe (execFile-based, no shell injection)
- */
-export default class Pr extends BaseCommand {
-  static override aliases = ["pr"];
-  static override description = "Create a pull request from the current branch";
-
-  static override examples = [
-    {
-      description: "Create PR from current branch",
-      command: "<%= config.bin %> <%= command.id %>",
-    },
-    { description: "Create draft PR", command: "<%= config.bin %> <%= command.id %> --draft" },
-    {
-      description: "PR against develop branch",
-      command: "<%= config.bin %> <%= command.id %> --base develop",
-    },
-  ];
+function generatePrContent(branch: string, commits: string[]): { title: string; body: string } {
+  // Extract issue number from branch name if present (e.g., feature/123-some-feature)
+  const issueMatch = branch.match(/(\d+)/);
+  const issueNumber = issueMatch ? issueMatch[1] : null;
+
+  // Generate title from first commit or branch name
+  let title: string;
+  if (commits.length === 1) {
+    title = commits[0];
+  } else {
+    // Use branch name, cleaned up
+    title = branch
+      .replace(/^(feature|fix|bugfix|hotfix|chore|refactor)\//, "")
+      .replace(/^\d+-/, "")
+      .replace(/-/g, " ")
+      .replace(/\b\w/g, (c) => c.toUpperCase());
+  }
+
+  // Generate body
+  const lines: string[] = ["## Summary", ""];
+
+  if (commits.length === 1) {
+    lines.push(`- ${commits[0]}`);
+  } else {
+    for (const commit of commits.slice(0, 10)) {
+      lines.push(`- ${commit}`);
+    }
+    if (commits.length > 10) {
+      lines.push(`- ... and ${commits.length - 10} more commits`);
+    }
+  }
 
-  static override flags = {
-    ...BaseCommand.baseFlags,
-    draft: Flags.boolean({
-      char: "D",
+  lines.push("");
+
+  if (issueNumber) {
+    lines.push(`Closes #${issueNumber}`);
+    lines.push("");
+  }
+
+  lines.push("## Test plan");
+  lines.push("");
+  lines.push("- [ ] Tests pass");
+  lines.push("- [ ] Manual testing");
+
+  return { title, body: lines.join("\n") };
+}
+
+export default defineCommand({
+  meta: { name: "pr", description: "Create a pull request from the current branch" },
+  args: {
+    debug: debugArg,
+    draft: {
+      type: "boolean",
+      alias: "D",
       description: "Create as draft PR",
       default: false,
-    }),
-    base: Flags.string({
-      char: "b",
+    },
+    base: {
+      type: "string",
+      alias: "b",
       description: "Base branch for the PR",
       default: "main",
-    }),
-    yes: Flags.boolean({
-      char: "y",
+    },
+    yes: {
+      type: "boolean",
+      alias: "y",
       description: "Skip confirmation prompt",
       default: false,
-    }),
-  };
-
-  async run(): Promise<void> {
-    const { flags } = await this.parse(Pr);
-
+    },
+  },
+  async run({ args }) {
     // Check prerequisites
     const cliInstalled = await isGithubCliInstalled();
     if (!cliInstalled) {
       consola.error("GitHub CLI not installed");
-      this.exit(1);
+      process.exit(1);
     }
 
     // Get current branch
@@ -61,31 +90,31 @@ export default class Pr extends BaseCommand {
 
     if (!currentBranch) {
       consola.error("Not on a branch (detached HEAD?)");
-      this.exit(1);
+      process.exit(1);
     }
 
-    if (currentBranch === flags.base) {
-      consola.error(`Already on base branch ${flags.base}`);
-      this.exit(1);
+    if (currentBranch === args.base) {
+      consola.error(`Already on base branch ${args.base}`);
+      process.exit(1);
     }
 
     consola.info(`Current branch: ${colors.cyan(currentBranch)}`);
-    consola.info(`Base branch: ${colors.cyan(flags.base)}`);
+    consola.info(`Base branch: ${colors.cyan(args.base)}`);
 
     // Get commits between base and current branch
-    const logResult = await x("git", ["log", `${flags.base}..HEAD`, "--pretty=format:%s"]);
+    const logResult = await x("git", ["log", `${args.base}..HEAD`, "--pretty=format:%s"]);
 
     const commits = logResult.stdout.trim().split("\n").filter(Boolean);
 
     if (commits.length === 0) {
-      consola.error(`No commits between ${flags.base} and ${currentBranch}`);
-      this.exit(1);
+      consola.error(`No commits between ${args.base} and ${currentBranch}`);
+      process.exit(1);
     }
 
     consola.info(`Found ${colors.green(commits.length.toString())} commits`);
 
     // Generate PR title and body
-    const { title, body } = this.generatePrContent(currentBranch, commits);
+    const { title, body } = generatePrContent(currentBranch, commits);
 
     consola.box({
       title: "PR Preview",
@@ -93,7 +122,7 @@ export default class Pr extends BaseCommand {
     });
 
     // Confirm unless --yes
-    if (!flags.yes) {
+    if (!args.yes) {
       const confirmed = await consola.prompt("Create this PR?", {
         type: "confirm",
         initial: true,
@@ -101,7 +130,7 @@ export default class Pr extends BaseCommand {
 
       if (!confirmed) {
         consola.info(colors.dim("Canceled"));
-        this.exit(0);
+        process.exit(0);
       }
     }
 
@@ -115,9 +144,9 @@ export default class Pr extends BaseCommand {
     }
 
     // Create PR
-    const prArgs = ["pr", "create", "--title", title, "--body", body, "--base", flags.base];
+    const prArgs = ["pr", "create", "--title", title, "--body", body, "--base", args.base];
 
-    if (flags.draft) {
+    if (args.draft) {
       prArgs.push("--draft");
     }
 
@@ -125,52 +154,5 @@ export default class Pr extends BaseCommand {
     const prUrl = prResult.stdout.trim();
 
     consola.success(`PR created: ${colors.cyan(prUrl)}`);
-  }
-
-  private generatePrContent(branch: string, commits: string[]): { title: string; body: string } {
-    // Extract issue number from branch name if present (e.g., feature/123-some-feature)
-    const issueMatch = branch.match(/(\d+)/);
-    const issueNumber = issueMatch ? issueMatch[1] : null;
-
-    // Generate title from first commit or branch name
-    let title: string;
-    if (commits.length === 1) {
-      title = commits[0];
-    } else {
-      // Use branch name, cleaned up
-      title = branch
-        .replace(/^(feature|fix|bugfix|hotfix|chore|refactor)\//, "")
-        .replace(/^\d+-/, "")
-        .replace(/-/g, " ")
-        .replace(/\b\w/g, (c) => c.toUpperCase());
-    }
-
-    // Generate body
-    const lines: string[] = ["## Summary", ""];
-
-    if (commits.length === 1) {
-      lines.push(`- ${commits[0]}`);
-    } else {
-      for (const commit of commits.slice(0, 10)) {
-        lines.push(`- ${commit}`);
-      }
-      if (commits.length > 10) {
-        lines.push(`- ... and ${commits.length - 10} more commits`);
-      }
-    }
-
-    lines.push("");
-
-    if (issueNumber) {
-      lines.push(`Closes #${issueNumber}`);
-      lines.push("");
-    }
-
-    lines.push("## Test plan");
-    lines.push("");
-    lines.push("- [ ] Tests pass");
-    lines.push("- [ ] Manual testing");
-
-    return { title, body: lines.join("\n") };
-  }
-}
+  },
+});

package/src/commands/graph/index.ts

@@ -1,10 +1,12 @@
-import { Flags } from "@oclif/core";
+import { defineCommand } from "citty";
 import { DateTime } from "luxon";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { x } from "tinyexec";
-import { BaseCommand } from "../base.js";
+import consola from "consola";
+
+import { debugArg } from "../shared.js";
 import {
   buildAllSessionsTreemap,
   buildBarChartData,
@@ -40,86 +42,73 @@ export type {
   TreemapNode,
 } from "../../lib/graph/index.js";
 
-/**
- * Generate interactive HTML treemap from session token data
- */
-export default class Graph extends BaseCommand {
-  static override description = "Generate interactive HTML treemap from session token data";
-
-  static override examples = [
-    {
-      description: "Generate treemap for all recent sessions",
-      command: "<%= config.bin %> <%= command.id %>",
-    },
-    {
-      description: "Generate treemap for a specific session",
-      command: "<%= config.bin %> <%= command.id %> --session abc123",
-    },
-    {
-      description: "Generate and auto-open in browser",
-      command: "<%= config.bin %> <%= command.id %> --open",
-    },
-  ];
-
-  static override flags = {
-    ...BaseCommand.baseFlags,
-    session: Flags.string({
-      char: "s",
+export default defineCommand({
+  meta: { name: "graph", description: "Generate interactive HTML treemap from session token data" },
+  args: {
+    debug: debugArg,
+    session: {
+      type: "string" as const,
+      alias: "s",
       description: "Session ID to analyze (shows all sessions if not provided)",
-    }),
-    open: Flags.boolean({
-      char: "o",
+    },
+    open: {
+      type: "boolean" as const,
+      alias: "o",
       description: "Open treemap in browser after generating",
       default: true,
-      allowNo: true,
-    }),
-    serve: Flags.boolean({
+    },
+    serve: {
+      type: "boolean" as const,
       description: "Start local HTTP server to serve treemap (default: true)",
       default: true,
-      allowNo: true,
-    }),
-    port: Flags.integer({
-      char: "p",
-      description: "Port for local server",
-      default: 8765,
-    }),
-    days: Flags.integer({
-      description: "Filter to sessions from last N days (0=no limit)",
-      default: 7,
-    }),
-  };
-
-  async run(): Promise<void> {
-    const { flags } = await this.parse(Graph);
+    },
+    port: {
+      type: "string" as const,
+      alias: "p",
+      description: "Port for local server (default: 8765)",
+      default: "8765",
+    },
+    days: {
+      type: "string" as const,
+      description: "Filter to sessions from last N days (0=no limit, default: 7)",
+      default: "7",
+    },
+  },
+  async run({ args }) {
+    const port = Number(args.port);
+    const days = Number(args.days);
 
     const projectsDir = path.join(os.homedir(), ".claude", "projects");
     if (!fs.existsSync(projectsDir)) {
-      this.error("No Claude projects directory found at ~/.claude/projects/");
+      consola.error("No Claude projects directory found at ~/.claude/projects/");
+      process.exit(1);
     }
 
-    const sessionId = flags.session;
+    const sessionId = args.session;
     let treemapData;
     let barChartData = { days: [] as any[] };
 
     if (!sessionId) {
       // All sessions mode
-      const sessions = findRecentSessions(projectsDir, 500, flags.days);
+      const sessions = findRecentSessions(projectsDir, 500, days);
       if (sessions.length === 0) {
-        this.error("No sessions found");
+        consola.error("No sessions found");
+        process.exit(1);
       }
 
-      const daysMsg = flags.days > 0 ? ` (last ${flags.days} days)` : "";
-      this.log(`📊 Generating treemap for ${sessions.length} sessions${daysMsg}...`);
+      const daysMsg = days > 0 ? ` (last ${days} days)` : "";
+      consola.info(`📊 Generating treemap for ${sessions.length} sessions${daysMsg}...`);
       treemapData = buildAllSessionsTreemap(sessions);
       barChartData = buildBarChartData(sessions);
     } else {
       // Single session mode
       const sessionPath = findSessionPath(projectsDir, sessionId);
       if (!sessionPath) {
-        this.error(`Session ${sessionId} not found`);
+        consola.error(`Session ${sessionId} not found`);
+        process.exit(1);
       }
 
-      this.log(`📊 Generating treemap for session ${sessionId}...`);
+      consola.info(`📊 Generating treemap for session ${sessionId}...`);
       const entries = parseJsonl(sessionPath);
       treemapData = buildSessionTreemap(sessionId, entries);
       // Bar chart not meaningful for single session, leave empty
@@ -135,35 +124,35 @@ export default class Graph extends BaseCommand {
     }
 
     const timestamp = DateTime.now().toFormat("yyyy-MM-dd'T'HH-mmZZZ");
-    const daysLabel = flags.days > 0 ? `${flags.days}d` : "all";
+    const daysLabel = days > 0 ? `${days}d` : "all";
     const filename = sessionId
       ? `treemap-${sessionId.slice(0, 8)}-${timestamp}.html`
       : `treemap-${daysLabel}-${timestamp}.html`;
     const outputPath = path.join(reportsDir, filename);
 
     fs.writeFileSync(outputPath, html);
-    this.log(`✓ Saved to ${outputPath}`);
+    consola.info(`✓ Saved to ${outputPath}`);
 
-    if (flags.serve) {
-      const { server, port: actualPort } = await startServer(html, filename, flags.port);
+    if (args.serve) {
+      const { server, port: actualPort } = await startServer(html, filename, port);
       const url = `http://localhost:${actualPort}/`;
-      if (actualPort !== flags.port) {
-        this.log(`\n⚠️  Port ${flags.port} in use, using ${actualPort}`);
+      if (actualPort !== port) {
+        consola.info(`\n⚠️  Port ${port} in use, using ${actualPort}`);
       }
-      this.log(`🌐 Server running at ${url}`);
-      this.log("   Press Ctrl+C to stop\n");
+      consola.info(`🌐 Server running at ${url}`);
+      consola.info("   Press Ctrl+C to stop\n");
 
-      if (flags.open) {
+      if (args.open) {
         openInBrowser(url);
       }
 
       // Keep server running until Ctrl+C
       await waitForShutdown(server);
-      this.log("\n👋 Stopping server...");
-    } else if (flags.open) {
-      this.log("\n📈 Opening treemap...");
+      consola.info("\n👋 Stopping server...");
+    } else if (args.open) {
+      consola.info("\n📈 Opening treemap...");
       const openCmd = process.platform === "darwin" ? "open" : "xdg-open";
       await x(openCmd, [outputPath]);
     }
-  }
-}
+  },
+});