@towles/tool 0.0.96 → 0.0.103

package/src/commands/install.ts

@@ -1,7 +1,7 @@
-import { Flags } from "@oclif/core";
+import { defineCommand } from "citty";
 import { colors } from "consola/utils";
 import consola from "consola";
-import { BaseCommand } from "./base.js";
+import { debugArg } from "./shared.js";
 import {
   CLAUDE_SETTINGS_PATH,
   loadClaudeSettings,
@@ -9,159 +9,135 @@ import {
   saveClaudeSettings,
 } from "../lib/install/claude-settings.js";
 
-/**
- * Install and configure towles-tool with Claude Code
- */
-export default class Install extends BaseCommand {
-  static override description =
-    "Configure Claude Code settings and optionally enable observability";
-
-  static override examples = [
-    {
-      description: "Configure Claude Code settings",
-      command: "<%= config.bin %> <%= command.id %>",
-    },
-    {
-      description: "Include OTEL setup instructions",
-      command: "<%= config.bin %> <%= command.id %> --observability",
-    },
-  ];
-
-  static override flags = {
-    ...BaseCommand.baseFlags,
-    observability: Flags.boolean({
-      char: "o",
+export default defineCommand({
+  meta: {
+    name: "install",
+    description: "Configure Claude Code settings and optionally enable observability",
+  },
+  args: {
+    debug: debugArg,
+    observability: {
+      type: "boolean",
+      alias: "o",
       description: "Show OTEL setup instructions and configure SubagentStop hook",
       default: false,
-    }),
-  };
-
-  async run(): Promise<void> {
-    const { flags } = await this.parse(Install);
-
-    this.log(colors.bold("\n🔧 towles-tool install\n"));
+    },
+  },
+  async run({ args }) {
+    consola.log(colors.bold("\n🔧 towles-tool install\n"));
 
-    // Load or create Claude settings
     const existing = loadClaudeSettings(CLAUDE_SETTINGS_PATH);
     if (Object.keys(existing).length > 0) {
-      this.log(colors.dim(`Found existing Claude settings at ${CLAUDE_SETTINGS_PATH}`));
+      consola.log(colors.dim(`Found existing Claude settings at ${CLAUDE_SETTINGS_PATH}`));
     } else {
-      this.log(colors.dim(`No Claude settings file found, will create one`));
+      consola.log(colors.dim(`No Claude settings file found, will create one`));
     }
 
-    // Apply recommended settings
     const { settings, changes } = applyRecommendedSettings(existing);
 
     for (const change of changes) {
-      this.log(colors.green(`✓ ${change}`));
+      consola.log(colors.green(`✓ ${change}`));
     }
 
-    // Report already-correct settings
     if (!changes.some((c) => c.includes("cleanupPeriodDays"))) {
-      this.log(colors.dim("✓ cleanupPeriodDays already set to 99999"));
+      consola.log(colors.dim("✓ cleanupPeriodDays already set to 99999"));
     }
     if (!changes.some((c) => c.includes("alwaysThinkingEnabled"))) {
-      this.log(colors.dim("✓ alwaysThinkingEnabled already set to true"));
+      consola.log(colors.dim("✓ alwaysThinkingEnabled already set to true"));
     }
 
-    // Save settings if anything changed
     if (changes.length > 0) {
       saveClaudeSettings(CLAUDE_SETTINGS_PATH, settings);
-      this.log(colors.green(`\n✓ Saved Claude settings to ${CLAUDE_SETTINGS_PATH}`));
+      consola.log(colors.green(`\n✓ Saved Claude settings to ${CLAUDE_SETTINGS_PATH}`));
     }
 
-    // Show observability setup if requested
-    if (flags.observability) {
-      this.log(colors.bold("\n📊 Observability Setup\n"));
-      this.showOtelInstructions();
+    if (args.observability) {
+      consola.log(colors.bold("\n📊 Observability Setup\n"));
+      showOtelInstructions();
     }
 
-    // Install Claude plugins
-    this.log(colors.bold("\n📦 Claude Plugins\n"));
-    await this.ensureClaudePlugins();
+    consola.log(colors.bold("\n📦 Claude Plugins\n"));
+    await ensureClaudePlugins();
 
-    this.log(colors.bold(colors.green("\n✅ Installation complete!\n")));
+    consola.log(colors.bold(colors.green("\n✅ Installation complete!\n")));
+  },
+});
+
+async function ensureClaudePlugins(): Promise<void> {
+  const { x } = await import("tinyexec");
+
+  const requiredPlugins = [
+    {
+      id: "tt@towles-tool",
+      name: "tt-core",
+      marketplaceUrl: "https://github.com/ChrisTowles/towles-tool",
+      marketplace: "towles-tool",
+    },
+    {
+      id: "code-simplifier@claude-plugins-official",
+      name: "code-simplifier",
+    },
+  ];
+
+  let installedIds = new Set<string>();
+  try {
+    const result = await x("claude", ["plugin", "list", "--json"]);
+    const plugins: { id: string }[] = JSON.parse(result.stdout);
+    installedIds = new Set(plugins.map((p) => p.id));
+  } catch {
+    consola.log(colors.yellow("⚠ Could not list Claude plugins"));
   }
 
-  private async ensureClaudePlugins(): Promise<void> {
-    const { x } = await import("tinyexec");
-
-    const requiredPlugins = [
-      {
-        id: "tt@towles-tool",
-        name: "tt-core",
-        marketplaceUrl: "https://github.com/ChrisTowles/towles-tool",
-        marketplace: "towles-tool",
-      },
-      {
-        id: "code-simplifier@claude-plugins-official",
-        name: "code-simplifier",
-      },
-    ];
-
-    // Get installed plugins
-    let installedIds = new Set<string>();
-    try {
-      const result = await x("claude", ["plugin", "list", "--json"]);
-      const plugins: { id: string }[] = JSON.parse(result.stdout);
-      installedIds = new Set(plugins.map((p) => p.id));
-    } catch {
-      this.log(colors.yellow("⚠ Could not list Claude plugins"));
+  for (const plugin of requiredPlugins) {
+    if (plugin.marketplaceUrl && !installedIds.has(plugin.id)) {
+      try {
+        await x("claude", ["plugin", "marketplace", "add", plugin.marketplaceUrl]);
+        consola.log(colors.dim(`  Added marketplace: ${plugin.marketplace}`));
+      } catch {
+        // marketplace may already be added
+      }
     }
+  }
 
-    // Ensure marketplaces are added first
-    for (const plugin of requiredPlugins) {
-      if (plugin.marketplaceUrl && !installedIds.has(plugin.id)) {
-        try {
-          await x("claude", ["plugin", "marketplace", "add", plugin.marketplaceUrl]);
-          this.log(colors.dim(`  Added marketplace: ${plugin.marketplace}`));
-        } catch {
-          // marketplace may already be added
-        }
-      }
+  for (const plugin of requiredPlugins) {
+    if (installedIds.has(plugin.id)) {
+      consola.log(colors.dim(`✓ ${plugin.name} already installed`));
+      continue;
     }
 
-    // Install missing plugins
-    for (const plugin of requiredPlugins) {
-      if (installedIds.has(plugin.id)) {
-        this.log(colors.dim(`✓ ${plugin.name} already installed`));
-        continue;
-      }
+    const answer = await consola.prompt(`Install ${plugin.name} plugin?`, {
+      type: "confirm",
+      initial: true,
+    });
 
-      const answer = await consola.prompt(`Install ${plugin.name} plugin?`, {
-        type: "confirm",
-        initial: true,
-      });
-
-      if (answer) {
-        const result = await x("claude", ["plugin", "install", plugin.id, "--scope", "user"]);
-        if (result.exitCode === 0) {
-          this.log(colors.green(`✓ ${plugin.name} installed`));
-        } else {
-          if (result.stdout) this.log(result.stdout);
-          if (result.stderr) this.log(colors.dim(result.stderr));
-          this.log(colors.yellow(`⚠ ${plugin.name} install exited with code ${result.exitCode}`));
-        }
+    if (answer) {
+      const result = await x("claude", ["plugin", "install", plugin.id, "--scope", "user"]);
+      if (result.exitCode === 0) {
+        consola.log(colors.green(`✓ ${plugin.name} installed`));
       } else {
-        this.log(colors.dim(`  Skipped ${plugin.name}`));
+        if (result.stdout) consola.log(result.stdout);
+        if (result.stderr) consola.log(colors.dim(result.stderr));
+        consola.log(colors.yellow(`⚠ ${plugin.name} install exited with code ${result.exitCode}`));
       }
+    } else {
+      consola.log(colors.dim(`  Skipped ${plugin.name}`));
     }
   }
+}
 
-  private showOtelInstructions(): void {
-    this.log(colors.cyan("Add these environment variables to your shell profile:\n"));
+function showOtelInstructions(): void {
+  consola.log(colors.cyan("Add these environment variables to your shell profile:\n"));
 
-    consola.box(`export CLAUDE_CODE_ENABLE_TELEMETRY=1
+  consola.box(`export CLAUDE_CODE_ENABLE_TELEMETRY=1
 export OTEL_METRICS_EXPORTER=otlp
 export OTEL_LOGS_EXPORTER=otlp
 export OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4317`);
 
-    this.log("");
-    this.log(
-      colors.dim("For more info, see: https://github.com/anthropics/claude-code-monitoring-guide"),
-    );
-    this.log("");
-    this.log(colors.cyan("Quick cost analysis (no setup required):"));
-    this.log(colors.dim("  npx ccusage@latest --breakdown"));
-  }
+  consola.log("");
+  consola.log(
+    colors.dim("For more info, see: https://github.com/anthropics/claude-code-monitoring-guide"),
+  );
+  consola.log("");
+  consola.log(colors.cyan("Quick cost analysis (no setup required):"));
+  consola.log(colors.dim("  npx ccusage@latest --breakdown"));
 }

package/src/commands/journal/daily-notes.ts

@@ -1,9 +1,10 @@
 import { existsSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
+import { defineCommand } from "citty";
 import consola from "consola";
 import { colors } from "consola/utils";
-import { BaseCommand } from "../base.js";
+import { withSettings, debugArg } from "../shared.js";
 import { JOURNAL_TYPES } from "../../types/journal.js";
 import {
   createJournalContent,
@@ -13,29 +14,21 @@ import {
   openInEditor,
 } from "../../lib/journal/index.js";
 
-/**
- * Create or open daily notes journal file
- */
-export default class DailyNotes extends BaseCommand {
-  static override aliases = ["today"];
-  static override description = "Weekly files with daily sections for ongoing work and notes";
-
-  static override examples = [
-    {
-      description: "Open weekly notes for today",
-      command: "<%= config.bin %> <%= command.id %>",
-    },
-    { description: "Using alias", command: "<%= config.bin %> today" },
-  ];
-
-  async run(): Promise<void> {
-    await this.parse(DailyNotes);
+export default defineCommand({
+  meta: {
+    name: "daily-notes",
+    description: "Weekly files with daily sections for ongoing work and notes",
+  },
+  args: {
+    debug: debugArg,
+  },
+  async run({ args }) {
+    const { settings } = await withSettings(args.debug);
 
     try {
-      const journalSettings = this.userSettings.journalSettings;
+      const journalSettings = settings.journalSettings;
       const templateDir = journalSettings.templateDir;
 
-      // Ensure templates exist on first run
       ensureTemplatesExist(templateDir);
 
       const currentDate = new Date();
@@ -46,7 +39,6 @@ export default class DailyNotes extends BaseCommand {
         title: "",
       });
 
-      // Ensure journal directory exists
       ensureDirectoryExists(path.dirname(fileInfo.fullPath));
 
       if (existsSync(fileInfo.fullPath)) {
@@ -58,7 +50,7 @@ export default class DailyNotes extends BaseCommand {
       }
 
       await openInEditor({
-        editor: this.userSettings.preferredEditor,
+        editor: settings.preferredEditor,
         filePath: fileInfo.fullPath,
         folderPath: journalSettings.baseFolder,
       });
@@ -66,5 +58,5 @@ export default class DailyNotes extends BaseCommand {
       consola.warn(`Error creating daily-notes file:`, error);
       process.exit(1);
     }
-  }
-}
+  },
+});

package/src/commands/journal/index.ts

@@ -0,0 +1,10 @@
+import { defineCommand } from "citty";
+
+export default defineCommand({
+  meta: { name: "journal", description: "Journal and note-taking commands" },
+  subCommands: {
+    "daily-notes": () => import("./daily-notes.js").then((m) => m.default),
+    note: () => import("./note.js").then((m) => m.default),
+    meeting: () => import("./meeting.js").then((m) => m.default),
+  },
+});

package/src/commands/journal/meeting.ts

@@ -1,10 +1,10 @@
 import { existsSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
-import { Args } from "@oclif/core";
+import { defineCommand } from "citty";
 import consola from "consola";
 import { colors } from "consola/utils";
-import { BaseCommand } from "../base.js";
+import { withSettings, debugArg } from "../shared.js";
 import { JOURNAL_TYPES } from "../../types/journal.js";
 import {
   createMeetingContent,
@@ -14,42 +14,25 @@ import {
   openInEditor,
 } from "../../lib/journal/index.js";
 
-/**
- * Create or open meeting notes file
- */
-export default class Meeting extends BaseCommand {
-  static override description = "Structured meeting notes with agenda and action items";
-
-  static override args = {
-    title: Args.string({
-      description: "Meeting title",
+export default defineCommand({
+  meta: { name: "meeting", description: "Structured meeting notes with agenda and action items" },
+  args: {
+    debug: debugArg,
+    title: {
+      type: "positional",
       required: false,
-    }),
-  };
-
-  static override examples = [
-    {
-      description: "Create meeting note (prompts for title)",
-      command: "<%= config.bin %> <%= command.id %>",
-    },
-    {
-      description: "Create with title",
-      command: '<%= config.bin %> <%= command.id %> "Sprint Planning"',
+      description: "Meeting title",
     },
-    { description: "Using alias", command: '<%= config.bin %> m "Standup"' },
-  ];
-
-  async run(): Promise<void> {
-    const { args } = await this.parse(Meeting);
+  },
+  async run({ args }) {
+    const { settings } = await withSettings(args.debug);
 
     try {
-      const journalSettings = this.userSettings.journalSettings;
+      const journalSettings = settings.journalSettings;
       const templateDir = journalSettings.templateDir;
 
-      // Ensure templates exist on first run
       ensureTemplatesExist(templateDir);
 
-      // Prompt for title if not provided
       let title = args.title || "";
       if (title.trim().length === 0) {
         title = await consola.prompt(`Enter meeting title:`, {
@@ -65,7 +48,6 @@ export default class Meeting extends BaseCommand {
         title,
       });
 
-      // Ensure journal directory exists
       ensureDirectoryExists(path.dirname(fileInfo.fullPath));
 
       if (existsSync(fileInfo.fullPath)) {
@@ -77,7 +59,7 @@ export default class Meeting extends BaseCommand {
       }
 
       await openInEditor({
-        editor: this.userSettings.preferredEditor,
+        editor: settings.preferredEditor,
         filePath: fileInfo.fullPath,
         folderPath: journalSettings.baseFolder,
       });
@@ -85,5 +67,5 @@ export default class Meeting extends BaseCommand {
       consola.warn(`Error creating meeting file:`, error);
       process.exit(1);
     }
-  }
-}
+  },
+});

package/src/commands/journal/note.ts

@@ -1,10 +1,10 @@
 import { existsSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
-import { Args } from "@oclif/core";
+import { defineCommand } from "citty";
 import consola from "consola";
 import { colors } from "consola/utils";
-import { BaseCommand } from "../base.js";
+import { withSettings, debugArg } from "../shared.js";
 import { JOURNAL_TYPES } from "../../types/journal.js";
 import {
   createNoteContent,
@@ -14,42 +14,25 @@ import {
   openInEditor,
 } from "../../lib/journal/index.js";
 
-/**
- * Create or open general-purpose note file
- */
-export default class Note extends BaseCommand {
-  static override description = "General-purpose notes with structured sections";
-
-  static override args = {
-    title: Args.string({
-      description: "Note title",
+export default defineCommand({
+  meta: { name: "note", description: "General-purpose notes with structured sections" },
+  args: {
+    debug: debugArg,
+    title: {
+      type: "positional",
       required: false,
-    }),
-  };
-
-  static override examples = [
-    {
-      description: "Create note (prompts for title)",
-      command: "<%= config.bin %> <%= command.id %>",
-    },
-    {
-      description: "Create with title",
-      command: '<%= config.bin %> <%= command.id %> "Research Notes"',
+      description: "Note title",
     },
-    { description: "Using alias", command: '<%= config.bin %> n "Ideas"' },
-  ];
-
-  async run(): Promise<void> {
-    const { args } = await this.parse(Note);
+  },
+  async run({ args }) {
+    const { settings } = await withSettings(args.debug);
 
     try {
-      const journalSettings = this.userSettings.journalSettings;
+      const journalSettings = settings.journalSettings;
       const templateDir = journalSettings.templateDir;
 
-      // Ensure templates exist on first run
       ensureTemplatesExist(templateDir);
 
-      // Prompt for title if not provided
       let title = args.title || "";
       if (title.trim().length === 0) {
         title = await consola.prompt(`Enter note title:`, {
@@ -65,7 +48,6 @@ export default class Note extends BaseCommand {
         title,
       });
 
-      // Ensure journal directory exists
       ensureDirectoryExists(path.dirname(fileInfo.fullPath));
 
       if (existsSync(fileInfo.fullPath)) {
@@ -77,7 +59,7 @@ export default class Note extends BaseCommand {
       }
 
       await openInEditor({
-        editor: this.userSettings.preferredEditor,
+        editor: settings.preferredEditor,
         filePath: fileInfo.fullPath,
         folderPath: journalSettings.baseFolder,
       });
@@ -85,5 +67,5 @@ export default class Note extends BaseCommand {
       consola.warn(`Error creating note file:`, error);
       process.exit(1);
     }
-  }
-}
+  },
+});

package/src/commands/shared.ts

@@ -0,0 +1,21 @@
+import type { SettingsFile } from "../config/settings.js";
+import { loadSettings } from "../config/settings.js";
+
+export interface CommandContext {
+  settingsFile: SettingsFile;
+  settings: SettingsFile["settings"];
+  debug: boolean;
+}
+
+export async function withSettings(debug = false): Promise<CommandContext> {
+  const settingsFile = await loadSettings();
+  return { settingsFile, settings: settingsFile.settings, debug };
+}
+
+/** Common debug flag definition for citty args */
+export const debugArg = {
+  type: "boolean" as const,
+  alias: "d",
+  description: "Enable debug output",
+  default: false,
+};

package/src/lib/auto-claude/templates.test.ts

@@ -1,9 +1,14 @@
 import { describe, expect, it, vi, beforeEach } from "vitest";
+import type { Mock } from "vitest";
 
 import { resolveTemplate } from "./templates";
 import type { TemplateFsDeps, TokenValues } from "./templates";
 
-function createMockFs(): TemplateFsDeps {
+function createMockFs(): TemplateFsDeps & {
+  readFileSync: Mock;
+  writeFileSync: Mock;
+  mkdirSync: Mock;
+} {
   return {
     readFileSync: vi.fn().mockReturnValue(""),
     writeFileSync: vi.fn(),
@@ -12,7 +17,7 @@ function createMockFs(): TemplateFsDeps {
 }
 
 describe("resolveTemplate", () => {
-  let mockFs: TemplateFsDeps;
+  let mockFs: ReturnType<typeof createMockFs>;
 
   beforeEach(() => {
     mockFs = createMockFs();
@@ -25,13 +30,13 @@ describe("resolveTemplate", () => {
   };
 
   it("replaces all token placeholders in template", () => {
-    vi.mocked(mockFs.readFileSync).mockReturnValue(
+    mockFs.readFileSync.mockReturnValue(
       "Scope: {{SCOPE_PATH}}\nDir: {{ISSUE_DIR}}\nBranch: {{MAIN_BRANCH}}",
     );
 
     resolveTemplate("plan.md", tokens, "/tmp/issues/42", mockFs);
 
-    const writtenContent = vi.mocked(mockFs.writeFileSync).mock.calls[0][1];
+    const writtenContent = mockFs.writeFileSync.mock.calls[0][1];
     expect(writtenContent).toContain("/home/user/project");
     expect(writtenContent).toContain("/tmp/issues/42");
     expect(writtenContent).toContain("main");
@@ -43,16 +48,16 @@ describe("resolveTemplate", () => {
       ...tokens,
       REVIEW_FEEDBACK: "Needs more tests",
     };
-    vi.mocked(mockFs.readFileSync).mockReturnValue("Feedback: {{REVIEW_FEEDBACK}}");
+    mockFs.readFileSync.mockReturnValue("Feedback: {{REVIEW_FEEDBACK}}");
 
     resolveTemplate("review.md", tokensWithFeedback, "/tmp/issues/42", mockFs);
 
-    const writtenContent = vi.mocked(mockFs.writeFileSync).mock.calls[0][1];
+    const writtenContent = mockFs.writeFileSync.mock.calls[0][1];
     expect(writtenContent).toContain("Needs more tests");
   });
 
   it("creates output directory recursively", () => {
-    vi.mocked(mockFs.readFileSync).mockReturnValue("template content");
+    mockFs.readFileSync.mockReturnValue("template content");
 
     resolveTemplate("plan.md", tokens, "/tmp/issues/42", mockFs);
 
@@ -60,7 +65,7 @@ describe("resolveTemplate", () => {
   });
 
   it("writes resolved template to issue dir", () => {
-    vi.mocked(mockFs.readFileSync).mockReturnValue("simple content");
+    mockFs.readFileSync.mockReturnValue("simple content");
 
     resolveTemplate("plan.md", tokens, "/tmp/issues/42", mockFs);
 
@@ -72,7 +77,7 @@ describe("resolveTemplate", () => {
   });
 
   it("returns relative path from cwd", () => {
-    vi.mocked(mockFs.readFileSync).mockReturnValue("content");
+    mockFs.readFileSync.mockReturnValue("content");
 
     const result = resolveTemplate("plan.md", tokens, "/tmp/issues/42", mockFs);
     // Should be a relative path (not starting with /)
@@ -80,11 +85,11 @@ describe("resolveTemplate", () => {
   });
 
   it("handles multiple occurrences of the same token", () => {
-    vi.mocked(mockFs.readFileSync).mockReturnValue("{{MAIN_BRANCH}} and {{MAIN_BRANCH}} again");
+    mockFs.readFileSync.mockReturnValue("{{MAIN_BRANCH}} and {{MAIN_BRANCH}} again");
 
     resolveTemplate("plan.md", tokens, "/tmp/issues/42", mockFs);
 
-    const writtenContent = vi.mocked(mockFs.writeFileSync).mock.calls[0][1];
+    const writtenContent = mockFs.writeFileSync.mock.calls[0][1];
     expect(writtenContent).toBe("main and main again");
   });
 });