@towles/tool 0.0.96 → 0.0.103

package/bin/run.ts

@@ -1,5 +1,6 @@
-#!/usr/bin/env tsx
+#!/usr/bin/env bun
 
-import { execute } from "@oclif/core";
+import { runMain } from "citty";
+import { main } from "../src/cli.js";
 
-await execute({ dir: import.meta.url });
+runMain(main);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towles/tool",
-  "version": "0.0.96",
+  "version": "0.0.103",
   "description": "One off quality of life scripts that I use on a daily basis.",
   "homepage": "https://github.com/ChrisTowles/towles-tool#readme",
   "bugs": {
@@ -29,19 +29,14 @@
     "access": "public"
   },
   "scripts": {
-    "version:sync": "pnpm tsx scripts/sync-versions.ts",
-    "prepublishOnly": "pnpm run version:sync",
-    "dev": "tsx bin/run.ts",
+    "version:sync": "bun run scripts/sync-versions.ts",
+    "prepublishOnly": "bun run version:sync",
+    "dev": "bun run bin/run.ts",
     "format": "oxfmt --write .",
     "format:check": "oxfmt --check .",
     "lint": "oxlint",
     "lint:fix": "oxlint --fix",
     "test": "vitest run",
-    "test:prompts": "promptfoo eval && promptfoo eval -c plugins/tt-core/promptfooconfig.yaml && promptfoo eval -c plugins/tt-auto-claude/promptfooconfig.yaml",
-    "test:prompts:root": "promptfoo eval",
-    "test:prompts:tt-core": "promptfoo eval -c plugins/tt-core/promptfooconfig.yaml",
-    "test:prompts:tt-core:llm": "promptfoo eval -c plugins/tt-core/promptfooconfig.llm.yaml",
-    "test:prompts:tt-auto-claude": "promptfoo eval -c plugins/tt-auto-claude/promptfooconfig.yaml",
     "test:watch": "CI=DisableCallingClaude vitest watch",
     "typecheck": "tsgo --noEmit --incremental",
     "prepare": "simple-git-hooks"
@@ -49,7 +44,7 @@
   "dependencies": {
     "@anthropic-ai/claude-code": "^2.1.4",
     "@anthropic-ai/sdk": "^0.56.0",
-    "@oclif/core": "^4.3.2",
+    "citty": "^0.1.6",
     "consola": "^3.4.2",
     "d3-hierarchy": "^3.1.2",
     "fzf": "^0.5.2",
@@ -62,7 +57,6 @@
     "zod": "^4.0.5"
   },
   "devDependencies": {
-    "@oclif/test": "^4.1.10",
     "@types/d3-hierarchy": "^3.1.7",
     "@types/luxon": "^3.6.2",
     "@types/node": "^22.16.3",
@@ -71,38 +65,15 @@
     "bumpp": "^10.4.0",
     "oxfmt": "^0.24.0",
     "oxlint": "^1.7.0",
-    "promptfoo": "^0.121.2",
     "simple-git-hooks": "^2.13.0",
-    "tsx": "^4.19.4",
     "typescript": "^5.8.3",
     "vitest": "^4.0.17"
   },
   "simple-git-hooks": {
-    "pre-commit": "pnpm format && pnpm lint:fix && pnpm typecheck && claude plugin validate ."
+    "pre-commit": "bun run format && bun run lint:fix && bun run typecheck && claude plugin validate ."
   },
-  "oclif": {
-    "bin": "tt",
-    "commands": "./src/commands",
-    "dirname": "towles-tool",
-    "topicSeparator": " "
-  },
-  "packageManager": "pnpm@10.27.0",
-  "pnpm": {
-    "patchedDependencies": {
-      "prompts@2.4.2": "patches/prompts.patch"
-    },
-    "onlyBuiltDependencies": [
-      "@anthropic-ai/claude-code",
-      "@parcel/watcher",
-      "@playwright/browser-chromium",
-      "@swc/core",
-      "better-sqlite3",
-      "esbuild",
-      "onnxruntime-node",
-      "protobufjs",
-      "sharp",
-      "simple-git-hooks"
-    ]
+  "patchedDependencies": {
+    "prompts@2.4.2": "patches/prompts.patch"
   },
   "trustedDependencies": [
     "@anthropic-ai/claude-code"

package/src/cli.ts

@@ -0,0 +1,19 @@
+import { defineCommand } from "citty";
+
+export const main = defineCommand({
+  meta: { name: "tt", description: "towles-tool — personal CLI utilities" },
+  subCommands: {
+    config: () => import("./commands/config.js").then((m) => m.default),
+    doctor: () => import("./commands/doctor.js").then((m) => m.default),
+    install: () => import("./commands/install.js").then((m) => m.default),
+    agentboard: () => import("./commands/agentboard.js").then((m) => m.default),
+    ag: () => import("./commands/agentboard.js").then((m) => m.default),
+    gh: () => import("./commands/gh/index.js").then((m) => m.default),
+    pr: () => import("./commands/gh/pr.js").then((m) => m.default),
+    journal: () => import("./commands/journal/index.js").then((m) => m.default),
+    today: () => import("./commands/journal/daily-notes.js").then((m) => m.default),
+    "auto-claude": () => import("./commands/auto-claude/index.js").then((m) => m.default),
+    ac: () => import("./commands/auto-claude/index.js").then((m) => m.default),
+    graph: () => import("./commands/graph/index.js").then((m) => m.default),
+  },
+});

package/src/commands/agentboard.ts

@@ -1,10 +1,13 @@
-import { Args } from "@oclif/core";
-import { execSync } from "node:child_process";
+import { defineCommand } from "citty";
+import { execSync, spawn, spawnSync } from "node:child_process";
 import { readFileSync, writeFileSync, existsSync, realpathSync } from "node:fs";
 import { resolve } from "node:path";
 import consola from "consola";
 import { colors } from "consola/utils";
-import { BaseCommand } from "./base.js";
+import { debugArg } from "./shared.js";
+
+const SERVER_HOST = "127.0.0.1";
+const SERVER_PORT = 4201;
 
 const PLUGIN_DIR = resolve(import.meta.dirname, "../../plugins/tt-agentboard");
 
@@ -30,251 +33,295 @@ function findTmuxConf(): string | null {
   return null;
 }
 
-export default class Agentboard2 extends BaseCommand {
-  static override aliases = ["ag2"];
-  static override description = "AgentBoard2 — opensessions-style tmux TUI sidebar";
-
-  static override examples = [
-    {
-      description: "Install agentboard into tmux",
-      command: "<%= config.bin %> agentboard setup",
-    },
-    {
-      description: "Uninstall from tmux",
-      command: "<%= config.bin %> agentboard uninstall",
-    },
-    {
-      description: "Launch the server",
-      command: "<%= config.bin %> agentboard server",
-    },
-    {
-      description: "Launch the TUI directly",
-      command: "<%= config.bin %> agentboard tui",
-    },
-  ];
-
-  static override args = {
-    subcommand: Args.string({
-      description: "Subcommand: setup, uninstall, server, tui, keys",
-      required: false,
-      options: ["setup", "uninstall", "server", "tui", "start", "keys"],
-    }),
-  };
-
-  async run(): Promise<void> {
-    const { args } = await this.parse(Agentboard2);
+function ensureDeps(): void {
+  try {
+    execSync("bun --version", { stdio: "pipe" });
+  } catch {
+    consola.error("bun is required but not found. Install: https://bun.sh");
+    process.exit(1);
+  }
 
-    switch (args.subcommand) {
-      case "setup":
-        this.setup();
-        break;
-      case "uninstall":
-        this.uninstall();
-        break;
-      case "server":
-        this.startServer();
-        break;
-      case "tui":
-        this.startTui();
-        break;
-      case "start":
-        // For backwards compat, start = tui
-        this.startTui();
-        break;
-      case "keys":
-        this.showKeys();
-        break;
-      default:
-        this.showKeys();
-        break;
-    }
+  const runtimeNodeModules = resolve(PLUGIN_DIR, "packages/runtime/node_modules");
+  if (!existsSync(runtimeNodeModules)) {
+    consola.info("Installing agentboard dependencies...");
+    execSync("bun install", { cwd: PLUGIN_DIR, stdio: "inherit" });
   }
+}
 
-  private ensureDeps(): void {
-    // Check bun is installed
-    try {
-      execSync("bun --version", { stdio: "pipe" });
-    } catch {
-      this.error("bun is required but not found. Install: https://bun.sh");
-    }
+function reloadTmux(): void {
+  try {
+    execSync(
+      "tmux source-file ~/.config/tmux/tmux.conf 2>/dev/null || tmux source-file ~/.tmux.conf 2>/dev/null",
+      {
+        stdio: "pipe",
+      },
+    );
+    consola.success("tmux config reloaded");
+  } catch {
+    consola.info("Reload tmux manually: tmux source-file ~/.config/tmux/tmux.conf");
+  }
+}
 
-    // Install deps if needed for runtime package
-    const runtimeNodeModules = resolve(PLUGIN_DIR, "packages/runtime/node_modules");
-    if (!existsSync(runtimeNodeModules)) {
-      consola.info("Installing agentboard dependencies...");
-      execSync("pnpm install", { cwd: PLUGIN_DIR, stdio: "inherit" });
-    }
+function showKeys(): void {
+  let prefix = "C-a";
+  let key = DEFAULT_KEY;
+  try {
+    prefix = execSync("tmux show-option -gv prefix", {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"],
+    }).trim();
+    const abKey = execSync(
+      `tmux show-option -gv @agentboard-key 2>/dev/null || echo ${DEFAULT_KEY}`,
+      {
+        encoding: "utf8",
+        stdio: ["pipe", "pipe", "pipe"],
+      },
+    ).trim();
+    if (abKey) key = abKey;
+  } catch {
+    // use defaults
   }
 
-  private setup(): void {
-    this.ensureDeps();
+  const { toggle, focus } = TMUX_BINDINGS;
+  consola.box(
+    [
+      `${colors.bold("AgentBoard Keybindings")}\n`,
+      `${colors.cyan(`tmux (prefix = ${prefix}, C = Ctrl):`)}`,
+      `  ${prefix} ${key} ${toggle}     toggle sidebar`,
+      `  ${prefix} ${key} ${focus}     focus sidebar`,
+      `  ${prefix} ${key} 1-9   jump to session\n`,
+      `${colors.cyan("In sidebar:")}`,
+      `  Tab         cycle sessions`,
+      `  j / ↓       move down`,
+      `  k / ↑       move up`,
+      `  Enter / l   switch to selected session`,
+      `  1-9         jump to session`,
+      `  d           hide session`,
+      `  x           kill session`,
+      `  r           refresh`,
+      `  ?           help`,
+      `  q           quit`,
+    ].join("\n"),
+  );
+}
 
-    // Find tmux.conf
-    const confPath = findTmuxConf();
-    if (!confPath) {
-      consola.warn("No tmux.conf found. Add this line manually:");
-      consola.info(colors.cyan(`  ${RUN_SHELL_LINE}`));
-      return;
-    }
+function setup(): void {
+  ensureDeps();
 
-    // If it's a symlink, resolve to the real file for editing
-    let editPath = confPath;
-    try {
-      editPath = realpathSync(confPath);
-    } catch {
-      // keep confPath
-    }
+  const confPath = findTmuxConf();
+  if (!confPath) {
+    consola.warn("No tmux.conf found. Add this line manually:");
+    consola.info(colors.cyan(`  ${RUN_SHELL_LINE}`));
+    return;
+  }
 
-    // Check if already installed
-    const content = readFileSync(editPath, "utf8");
-    if (content.includes("agentboard.tmux")) {
-      consola.success("Already installed in tmux.conf");
-      this.reloadTmux();
-      return;
-    }
+  let editPath = confPath;
+  try {
+    editPath = realpathSync(confPath);
+  } catch {
+    // keep confPath
+  }
 
-    // Add run-shell line before TPM init
-    const tpmLine = "run '~/.config/tmux/plugins/tpm/tpm'";
-    const altTpmLine = "run-shell '~/.tmux/plugins/tpm/tpm'";
-    const insertLines = `\n${MARKER}\n${RUN_SHELL_LINE}\n`;
+  const content = readFileSync(editPath, "utf8");
+  if (content.includes("agentboard.tmux")) {
+    consola.success("Already installed in tmux.conf");
+    reloadTmux();
+    return;
+  }
 
-    let newContent: string;
-    if (content.includes(tpmLine)) {
-      newContent = content.replace(tpmLine, `${insertLines}\n${tpmLine}`);
-    } else if (content.includes(altTpmLine)) {
-      newContent = content.replace(altTpmLine, `${insertLines}\n${altTpmLine}`);
-    } else {
-      // No TPM found, append to end
-      newContent = content + insertLines;
-    }
+  const tpmLine = "run '~/.config/tmux/plugins/tpm/tpm'";
+  const altTpmLine = "run-shell '~/.tmux/plugins/tpm/tpm'";
+  const insertLines = `\n${MARKER}\n${RUN_SHELL_LINE}\n`;
+
+  let newContent: string;
+  if (content.includes(tpmLine)) {
+    newContent = content.replace(tpmLine, `${insertLines}\n${tpmLine}`);
+  } else if (content.includes(altTpmLine)) {
+    newContent = content.replace(altTpmLine, `${insertLines}\n${altTpmLine}`);
+  } else {
+    newContent = content + insertLines;
+  }
 
-    writeFileSync(editPath, newContent);
-    consola.success(`Added agentboard to ${editPath}`);
+  writeFileSync(editPath, newContent);
+  consola.success(`Added agentboard to ${editPath}`);
 
-    this.reloadTmux();
-    this.showKeys();
+  reloadTmux();
+  showKeys();
+}
+
+function uninstall(): void {
+  const confPath = findTmuxConf();
+  if (!confPath) {
+    consola.info("No tmux.conf found.");
+    return;
   }
 
-  private uninstall(): void {
-    const confPath = findTmuxConf();
-    if (!confPath) {
-      consola.info("No tmux.conf found.");
-      return;
-    }
+  let editPath = confPath;
+  try {
+    editPath = realpathSync(confPath);
+  } catch {
+    // keep confPath
+  }
 
-    let editPath = confPath;
-    try {
-      editPath = realpathSync(confPath);
-    } catch {
-      // keep confPath
-    }
+  const content = readFileSync(editPath, "utf8");
+  if (!content.includes("agentboard")) {
+    consola.info("agentboard not found in tmux.conf");
+    return;
+  }
 
-    const content = readFileSync(editPath, "utf8");
-    if (!content.includes("agentboard")) {
-      consola.info("agentboard not found in tmux.conf");
-      return;
-    }
+  const newContent = content
+    .split("\n")
+    .filter((line) => !line.includes("agentboard"))
+    .join("\n")
+    .replace(/\n{3,}/g, "\n\n");
 
-    // Remove the marker line and run-shell line
-    const newContent = content
-      .split("\n")
-      .filter((line) => !line.includes("agentboard"))
-      .join("\n")
-      .replace(/\n{3,}/g, "\n\n");
+  writeFileSync(editPath, newContent);
+  consola.success("Removed agentboard from tmux.conf");
+  reloadTmux();
+}
 
-    writeFileSync(editPath, newContent);
-    consola.success("Removed agentboard from tmux.conf");
-    this.reloadTmux();
-  }
+function startServer(): void {
+  ensureDeps();
 
-  // Foreground command — blocks until server exits (Ctrl+C to stop)
-  private startServer(): void {
-    this.ensureDeps();
+  const serverEntry = resolve(PLUGIN_DIR, "apps/server/src/main.ts");
+  consola.info("Starting agentboard server (foreground, Ctrl+C to stop)...");
 
-    const serverEntry = resolve(PLUGIN_DIR, "apps/server/src/main.ts");
-    consola.info("Starting agentboard server (foreground, Ctrl+C to stop)...");
+  execSync(`bun run ${serverEntry}`, {
+    stdio: "inherit",
+    cwd: PLUGIN_DIR,
+    env: {
+      ...process.env,
+      AGENTBOARD_DIR: PLUGIN_DIR,
+    },
+  });
+}
 
-    execSync(`bun run ${serverEntry}`, {
-      stdio: "inherit",
-      cwd: PLUGIN_DIR,
-      env: {
-        ...process.env,
-        AGENTBOARD2_DIR: PLUGIN_DIR,
-      },
+async function serverAlive(): Promise<boolean> {
+  try {
+    const res = await fetch(`http://${SERVER_HOST}:${SERVER_PORT}/`, {
+      signal: AbortSignal.timeout(500),
     });
+    return res.ok;
+  } catch {
+    return false;
   }
+}
 
-  // Foreground command — blocks until TUI exits
-  private startTui(): void {
-    this.ensureDeps();
+async function ensureServerUp(): Promise<boolean> {
+  if (await serverAlive()) return true;
+
+  const serverEntry = resolve(PLUGIN_DIR, "apps/server/src/main.ts");
+  consola.info("Starting agentboard server...");
+  const child = spawn("bun", ["run", serverEntry], {
+    stdio: "ignore",
+    cwd: PLUGIN_DIR,
+    detached: true,
+    env: { ...process.env, AGENTBOARD_DIR: PLUGIN_DIR },
+  });
+  child.unref();
+
+  for (let i = 0; i < 30; i++) {
+    await new Promise((r) => setTimeout(r, 100));
+    if (await serverAlive()) return true;
+  }
+  return false;
+}
 
-    const tuiEntry = resolve(PLUGIN_DIR, "apps/tui/src/index.tsx");
+async function restart(): Promise<void> {
+  ensureDeps();
 
-    execSync(`bun run ${tuiEntry}`, {
-      stdio: "inherit",
-      cwd: resolve(PLUGIN_DIR, "apps/tui"),
-      env: {
-        ...process.env,
-        AGENTBOARD2_DIR: PLUGIN_DIR,
-      },
+  // 1. Kill stash sessions left over from hidden sidebars
+  try {
+    const result = spawnSync("tmux", ["list-sessions", "-F", "#{session_name}"], {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"],
     });
-  }
-
-  private showKeys(): void {
-    // Get tmux prefix and agentboard key from tmux
-    let prefix = "C-a";
-    let key = DEFAULT_KEY;
-    try {
-      prefix = execSync("tmux show-option -gv prefix", {
-        encoding: "utf8",
-        stdio: ["pipe", "pipe", "pipe"],
-      }).trim();
-      const ab2Key = execSync(
-        `tmux show-option -gv @agentboard-key 2>/dev/null || echo ${DEFAULT_KEY}`,
-        {
-          encoding: "utf8",
-          stdio: ["pipe", "pipe", "pipe"],
-        },
-      ).trim();
-      if (ab2Key) key = ab2Key;
-    } catch {
-      // use defaults
+    const sessions = (result.stdout ?? "").trim().split("\n").filter(Boolean);
+    for (const name of sessions) {
+      if (name.startsWith("_ab_stash")) {
+        spawnSync("tmux", ["kill-session", "-t", name], { stdio: "pipe" });
+        consola.info(`Killed stash session: ${name}`);
+      }
     }
-
-    const { toggle, focus } = TMUX_BINDINGS;
-    consola.box(
-      [
-        `${colors.bold("AgentBoard2 Keybindings")}\n`,
-        `${colors.cyan(`tmux (prefix = ${prefix}, C = Ctrl):`)}`,
-        `  ${prefix} ${key} ${toggle}     toggle sidebar`,
-        `  ${prefix} ${key} ${focus}     focus sidebar`,
-        `  ${prefix} ${key} 1-9   jump to session\n`,
-        `${colors.cyan("In sidebar:")}`,
-        `  Tab         cycle sessions`,
-        `  j / ↓       move down`,
-        `  k / ↑       move up`,
-        `  Enter / l   switch to selected session`,
-        `  1-9         jump to session`,
-        `  d           hide session`,
-        `  x           kill session`,
-        `  t           theme picker`,
-        `  r           refresh`,
-        `  q           quit`,
-      ].join("\n"),
-    );
+  } catch {
+    // no tmux or no sessions
   }
 
-  private reloadTmux(): void {
-    try {
-      execSync(
-        "tmux source-file ~/.config/tmux/tmux.conf 2>/dev/null || tmux source-file ~/.tmux.conf 2>/dev/null",
-        {
-          stdio: "pipe",
-        },
-      );
-      consola.success("tmux config reloaded");
-    } catch {
-      consola.info("Reload tmux manually: tmux source-file ~/.config/tmux/tmux.conf");
+  // 2. Ensure server is running
+  if (!(await ensureServerUp())) {
+    consola.error("Failed to start agentboard server");
+    process.exit(1);
+  }
+  consola.success("Server is running");
+
+  // 3. Toggle sidebar on (the server spawns sidebars in all active windows)
+  try {
+    const res = await fetch(`http://${SERVER_HOST}:${SERVER_PORT}/toggle`, {
+      method: "POST",
+      body: "",
+      signal: AbortSignal.timeout(2000),
+    });
+    if (res.ok) {
+      consola.success("Sidebar toggled on for all sessions");
+    } else {
+      consola.warn(`Toggle returned: ${res.status}`);
     }
+  } catch (err) {
+    consola.error("Failed to toggle sidebar:", err);
   }
 }
+
+function startTui(): void {
+  ensureDeps();
+
+  const tuiEntry = resolve(PLUGIN_DIR, "apps/tui/src/index.tsx");
+
+  execSync(`bun run ${tuiEntry}`, {
+    stdio: "inherit",
+    cwd: resolve(PLUGIN_DIR, "apps/tui"),
+    env: {
+      ...process.env,
+      AGENTBOARD_DIR: PLUGIN_DIR,
+    },
+  });
+}
+
+export default defineCommand({
+  meta: { name: "agentboard", description: "AgentBoard — tmux TUI sidebar" },
+  args: {
+    debug: debugArg,
+    subcommand: {
+      type: "positional",
+      required: false,
+      description: "Subcommand: setup, uninstall, server, tui, start, restart, keys",
+    },
+  },
+  async run({ args }) {
+    switch (args.subcommand) {
+      case "setup":
+        setup();
+        break;
+      case "uninstall":
+        uninstall();
+        break;
+      case "server":
+        startServer();
+        break;
+      case "tui":
+        startTui();
+        break;
+      case "start":
+        startTui();
+        break;
+      case "restart":
+        await restart();
+        break;
+      case "keys":
+        showKeys();
+        break;
+      default:
+        showKeys();
+        break;
+    }
+  },
+});