@towles/tool 0.0.11 → 0.0.12

package/README.md

@@ -74,7 +74,7 @@ if that works, then you need to add the pnpm global bin directory to your PATH.
 - [rolldown-vite](https://voidzero.dev/posts/announcing-rolldown-vite) - A Vite plugin for rolling down your code
 - ~~[zx](https://github.com/google/zx) google created library to write shell scripts in a more powerful and expressive way via the Anthropic API.~~
 - [prompts](https://github.com/terkelg/prompts) - A library for creating beautiful command-line prompts, with fuzzy search and other features.
-- [commander](https://github.com/tj/commander.js) - A library for building command-line interfaces, with support for subcommands, argument parsing, and more.
+- [yargs](https://github.com/yargs/yargs) - A modern, feature-rich command-line argument parser with enhanced error handling, TypeScript support, and flexible command configuration.
 
 ## Document verbose and debug options
 
@@ -98,13 +98,13 @@ I'm using a lot of inspiration from [Anthony Fu](https://github.com/antfu) for t
 
 <!-- Badges -->
 
-[npm-version-src]: https://img.shields.io/npm/v/pkg-placeholder?style=flat&colorA=080f12&colorB=1fa669
-[npm-version-href]: https://npmjs.com/package/pkg-placeholder
-[npm-downloads-src]: https://img.shields.io/npm/dm/pkg-placeholder?style=flat&colorA=080f12&colorB=1fa669
-[npm-downloads-href]: https://npmjs.com/package/pkg-placeholder
-[bundle-src]: https://img.shields.io/bundlephobia/minzip/pkg-placeholder?style=flat&colorA=080f12&colorB=1fa669&label=minzip
-[bundle-href]: https://bundlephobia.com/result?p=pkg-placeholder
-[license-src]: https://img.shields.io/github/license/antfu/pkg-placeholder.svg?style=flat&colorA=080f12&colorB=1fa669
+[npm-version-src]: https://img.shields.io/npm/v/@towles/tool?style=flat&colorA=080f12&colorB=1fa669
+[npm-version-href]: https://npmjs.com/package/@towles/tool
+[npm-downloads-src]: https://img.shields.io/npm/dm/@towles/tool?style=flat&colorA=080f12&colorB=1fa669
+[npm-downloads-href]: https://npmjs.com/package/@towles/tool
+[bundle-src]: https://img.shields.io/bundlephobia/minzip/@towles/tool?style=flat&colorA=080f12&colorB=1fa669&label=minzip
+[bundle-href]: https://bundlephobia.com/result?p=@towles/tool
+[license-src]: https://img.shields.io/github/license/ChrisTowles/towles-tool.svg?style=flat&colorA=080f12&colorB=1fa669
 [license-href]: https://github.com/ChrisTowles/towles-tool/blob/main/LICENSE.md
 [jsdocs-src]: https://img.shields.io/badge/jsdocs-reference-080f12?style=flat&colorA=080f12&colorB=1fa669
-[jsdocs-href]: https://www.jsdocs.io/package/pkg-placeholder
+[jsdocs-href]: https://www.jsdocs.io/package/@towles/tool

package/dist/index.mjs

@@ -1,115 +1,313 @@
 #!/usr/bin/env node
-import process from 'node:process';
-import { Command } from 'commander';
-import consola from 'consola';
-import { colors } from 'consola/utils';
-import prompts from 'prompts';
+import process$1 from 'node:process';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+import { useState, createContext, Component, useEffect } from 'react';
+import { Box, Text, useInput, render } from 'ink';
 import { execSync, exec } from 'node:child_process';
+import * as fs from 'node:fs';
 import { existsSync, writeFileSync, mkdirSync } from 'node:fs';
 import * as path from 'node:path';
 import path__default from 'node:path';
-import util, { promisify } from 'node:util';
+import { promisify } from 'node:util';
+import consola from 'consola';
+import { colors } from 'consola/utils';
+import { DateTime } from 'luxon';
+import { z } from 'zod/v4';
 import { homedir } from 'node:os';
-import { setupDotenv, loadConfig } from 'c12';
-import { updateConfig } from 'c12/update';
+import stripJsonComments from 'strip-json-comments';
 
-const version = "0.0.11";
+const version = "0.0.12";
 
-function execCommand(cmd, cwd) {
-  return execSync(cmd, { encoding: "utf8", cwd }).trim();
+const AppContext = createContext(null);
+function AppProvider({ children, initialCommandContext }) {
+  const [appState, setAppState] = useState({
+    isLoading: false,
+    error: null,
+    currentCommand: null
+  });
+  const [commandContext, setCommandContext] = useState({
+    mode: "interactive",
+    exitCode: 0,
+    onExit: (code = 0) => process.exit(code),
+    ...initialCommandContext
+  });
+  const updateAppState = (updates) => {
+    setAppState((prev) => ({ ...prev, ...updates }));
+  };
+  const updateCommandContext = (updates) => {
+    setCommandContext((prev) => ({ ...prev, ...updates }));
+  };
+  return /* @__PURE__ */ React.createElement(AppContext.Provider, { value: {
+    appState,
+    updateAppState,
+    commandContext,
+    updateCommandContext
+  } }, children);
 }
 
-async function gitCommitCommand(config, messageArgs) {
-  let statusOutput;
-  try {
-    statusOutput = execCommand("git status --porcelain", config.cwd);
-  } catch (error) {
-    consola.error("Failed to get git status");
-    process.exit(1);
-  }
-  const lines = statusOutput.trim().split("\n").filter((line) => line.length > 0);
-  const stagedFiles = lines.filter((line) => line[0] !== " " && line[0] !== "?");
-  const unstagedFiles = lines.filter((line) => line[1] !== " " && line[1] !== "?");
-  const untrackedFiles = lines.filter((line) => line.startsWith("??"));
-  if (lines.length === 0) {
-    consola.info("Working tree clean - nothing to commit");
-    return;
+const ConfigContext = createContext(null);
+function ConfigProvider({ children, context }) {
+  return /* @__PURE__ */ React.createElement(ConfigContext.Provider, { value: { context } }, children);
+}
+
+const AppInfo = {
+  toolName: "towles-tool"
+};
+const DEFAULT_THEME = {
+  primary: "cyan",
+  warning: "yellow",
+  error: "red",
+  dim: "dim"
+};
+
+class ErrorBoundary extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { hasError: false };
   }
-  consola.info("Git status:");
-  if (stagedFiles.length > 0) {
-    consola.info(colors.green("Staged files:"));
-    stagedFiles.forEach((file) => consola.info(`  ${colors.green(file)}`));
+  static getDerivedStateFromError(error) {
+    return { hasError: true, error };
   }
-  if (unstagedFiles.length > 0) {
-    consola.info(colors.yellow("Modified files (not staged):"));
-    unstagedFiles.forEach((file) => consola.info(`  ${colors.yellow(file)}`));
+  componentDidCatch(error, errorInfo) {
   }
-  if (untrackedFiles.length > 0) {
-    consola.info(colors.red("Untracked files:"));
-    untrackedFiles.forEach((file) => consola.info(`  ${colors.red(file)}`));
+  render() {
+    if (this.state.hasError) {
+      if (this.props.fallback) {
+        return this.props.fallback;
+      }
+      return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Text, { bold: true, color: DEFAULT_THEME.error }, "Application Error"), /* @__PURE__ */ React.createElement(Text, { color: DEFAULT_THEME.error }, this.state.error?.message || "An unexpected error occurred"), /* @__PURE__ */ React.createElement(Text, { color: DEFAULT_THEME.dim }, "Press ESC to exit"));
+    }
+    return this.props.children;
   }
-  if (stagedFiles.length === 0) {
-    if (unstagedFiles.length > 0 || untrackedFiles.length > 0) {
-      const { shouldStage } = await prompts({
-        type: "confirm",
-        name: "shouldStage",
-        message: "No files are staged. Would you like to add files first?",
-        initial: true
-      });
-      if (shouldStage) {
-        const { addAll } = await prompts({
-          type: "confirm",
-          name: "addAll",
-          message: "Add all modified and untracked files?",
-          initial: true
-        });
-        if (addAll) {
-          try {
-            execCommand("git add .", config.cwd);
-            consola.success("All files staged successfully");
-          } catch (error) {
-            consola.error("Failed to stage files");
-            process.exit(1);
-          }
+}
+
+function execCommand(cmd, cwd) {
+  return execSync(cmd, { encoding: "utf8", cwd }).trim();
+}
+
+function useGitOperations(cwd) {
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const getGitStatus = async () => {
+    try {
+      setLoading(true);
+      setError(null);
+      const statusOutput = execCommand("git status --porcelain", cwd);
+      const lines = statusOutput.trim().split("\n").filter((line) => line.length > 0);
+      const staged = lines.filter((line) => line[0] !== " " && line[0] !== "?").map((line) => line.slice(3));
+      const unstaged = lines.filter((line) => line[1] !== " " && line[1] !== "?").map((line) => line.slice(3));
+      const untracked = lines.filter((line) => line.startsWith("??")).map((line) => line.slice(3));
+      return { staged, unstaged, untracked };
+    } catch (err) {
+      setError("Failed to get git status");
+      return null;
+    } finally {
+      setLoading(false);
+    }
+  };
+  const stageFiles = async (files) => {
+    try {
+      setLoading(true);
+      setError(null);
+      if (files.length === 0) return false;
+      const command = files.includes(".") ? "git add ." : `git add ${files.map((f) => `"${f}"`).join(" ")}`;
+      execCommand(command, cwd);
+      return true;
+    } catch (err) {
+      setError("Failed to stage files");
+      return false;
+    } finally {
+      setLoading(false);
+    }
+  };
+  const commit = async (message) => {
+    try {
+      setLoading(true);
+      setError(null);
+      const escapedMessage = message.replace(/"/g, '\\"');
+      execCommand(`git commit -m "${escapedMessage}"`, cwd);
+      return true;
+    } catch (err) {
+      setError("Failed to commit changes");
+      return false;
+    } finally {
+      setLoading(false);
+    }
+  };
+  return {
+    getGitStatus,
+    stageFiles,
+    commit,
+    loading,
+    error,
+    clearError: () => setError(null)
+  };
+}
+
+function GitCommit({ context, messageArgs, onExit }) {
+  const { getGitStatus, stageFiles, commit, loading, error } = useGitOperations(context.cwd);
+  const [step, setStep] = useState("loading");
+  const [gitStatus, setGitStatus] = useState(null);
+  const [commitMessage, setCommitMessage] = useState(messageArgs?.join(" ") || "");
+  const [userInput, setUserInput] = useState("");
+  const [waitingForInput, setWaitingForInput] = useState(false);
+  useEffect(() => {
+    async function init() {
+      const status = await getGitStatus();
+      if (status) {
+        setGitStatus(status);
+        if (status.staged.length === 0 && status.unstaged.length === 0 && status.untracked.length === 0) {
+          setStep("success");
+        } else if (status.staged.length === 0) {
+          setStep("staging");
+          setWaitingForInput(true);
+        } else if (messageArgs && messageArgs.length > 0) {
+          setStep("commit");
+          setCommitMessage(messageArgs.join(" "));
         } else {
-          consola.info(`Use ${colors.cyan("git add <file>...")} to stage specific files, then run the commit command again`);
-          return;
+          setStep("message");
+          setWaitingForInput(true);
         }
       } else {
-        consola.error(`No staged changes found to commit. Use ${colors.cyan("git add <file>...")} to stage changes before committing.`);
-        process.exit(1);
+        setStep("error");
       }
-    } else {
-      consola.error("No changes to commit");
+    }
+    init();
+  }, []);
+  useInput((input, key) => {
+    if (key.escape) {
+      onExit();
       return;
     }
+    if (step === "staging" && waitingForInput) {
+      if (input === "y" || input === "Y" || key.return) {
+        handleStageFiles();
+      } else if (input === "n" || input === "N") {
+        onExit();
+      }
+    } else if (step === "message" && waitingForInput) {
+      if (key.return && userInput.trim()) {
+        setCommitMessage(userInput.trim());
+        setStep("commit");
+        setWaitingForInput(false);
+      } else if (key.backspace || key.delete) {
+        setUserInput((prev) => prev.slice(0, -1));
+      } else if (input && !key.ctrl && !key.meta) {
+        setUserInput((prev) => prev + input);
+      }
+    }
+  });
+  const handleStageFiles = async () => {
+    setWaitingForInput(false);
+    const success = await stageFiles(["."]);
+    if (success) {
+      const newStatus = await getGitStatus();
+      if (newStatus) {
+        setGitStatus(newStatus);
+        if (messageArgs && messageArgs.length > 0) {
+          setStep("commit");
+        } else {
+          setStep("message");
+          setWaitingForInput(true);
+        }
+      }
+    } else {
+      setStep("error");
+    }
+  };
+  useEffect(() => {
+    if (step === "commit" && commitMessage && !waitingForInput) {
+      async function performCommit() {
+        const success = await commit(commitMessage);
+        if (success) {
+          setStep("success");
+        } else {
+          setStep("error");
+        }
+      }
+      performCommit();
+    }
+  }, [step, commitMessage, waitingForInput]);
+  if (step === "loading" || loading) {
+    return /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, null, "Loading git status..."));
   }
-  let commitMessage;
-  if (messageArgs && messageArgs.length > 0) {
-    commitMessage = messageArgs.join(" ");
-  } else {
-    const { message } = await prompts({
-      type: "text",
-      name: "message",
-      message: "Enter commit message:",
-      validate: (value) => value.trim().length > 0 || "Commit message cannot be empty"
-    });
-    if (!message) {
-      consola.info(colors.dim("Commit cancelled"));
-      return;
+  if (step === "error" || error) {
+    return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { color: "red" }, "Error: ", error || "An error occurred"), /* @__PURE__ */ React.createElement(Text, { color: "dim" }, "Press ESC to exit"));
+  }
+  if (step === "success") {
+    if (!gitStatus || gitStatus.staged.length === 0 && gitStatus.unstaged.length === 0 && gitStatus.untracked.length === 0) {
+      return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { color: "green" }, "\u2713 Working tree clean - nothing to commit"), /* @__PURE__ */ React.createElement(Text, { color: "dim" }, "Press ESC to exit"));
+    } else {
+      return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { color: "green" }, "\u2713 Commit created successfully!"), /* @__PURE__ */ React.createElement(Text, { color: "dim" }, "Press ESC to exit"));
     }
-    commitMessage = message.trim();
   }
-  const commandWithArgs = `git commit -m "${commitMessage.replace(/"/g, '\\"')}"`;
-  consola.info(`Running: ${colors.cyan(commandWithArgs)}`);
-  try {
-    execCommand(commandWithArgs, config.cwd);
-    consola.success("Commit created successfully!");
-  } catch (error) {
-    consola.error("Failed to commit changes:");
-    consola.error(error);
-    process.exit(1);
+  return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Text, { bold: true, color: "cyan" }, "Git Commit"), gitStatus && /* @__PURE__ */ React.createElement(Box, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { bold: true }, "Current Status:"), gitStatus.staged.length > 0 && /* @__PURE__ */ React.createElement(Box, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { color: "green" }, "\u2713 Staged files (", gitStatus.staged.length, "):"), gitStatus.staged.slice(0, 5).map((file) => /* @__PURE__ */ React.createElement(Text, { key: file, color: "green" }, "  ", file)), gitStatus.staged.length > 5 && /* @__PURE__ */ React.createElement(Text, { color: "green" }, "  ... and ", gitStatus.staged.length - 5, " more")), gitStatus.unstaged.length > 0 && /* @__PURE__ */ React.createElement(Box, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "M Modified files (", gitStatus.unstaged.length, "):"), gitStatus.unstaged.slice(0, 3).map((file) => /* @__PURE__ */ React.createElement(Text, { key: file, color: "yellow" }, "  ", file)), gitStatus.unstaged.length > 3 && /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "  ... and ", gitStatus.unstaged.length - 3, " more")), gitStatus.untracked.length > 0 && /* @__PURE__ */ React.createElement(Box, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { color: "red" }, "? Untracked files (", gitStatus.untracked.length, "):"), gitStatus.untracked.slice(0, 3).map((file) => /* @__PURE__ */ React.createElement(Text, { key: file, color: "red" }, "  ", file)), gitStatus.untracked.length > 3 && /* @__PURE__ */ React.createElement(Text, { color: "red" }, "  ... and ", gitStatus.untracked.length - 3, " more"))), /* @__PURE__ */ React.createElement(Box, { marginTop: 2, flexDirection: "column" }, step === "staging" && waitingForInput && /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "No files are staged. Add all modified and untracked files? (y/N)"), /* @__PURE__ */ React.createElement(Text, { color: "dim" }, "Press y for yes, n for no, or ESC to cancel")), step === "message" && waitingForInput && /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "Enter commit message:"), /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { color: "cyan" }, "> "), /* @__PURE__ */ React.createElement(Text, null, userInput), /* @__PURE__ */ React.createElement(Text, { color: "dim" }, "\u2588")), /* @__PURE__ */ React.createElement(Text, { color: "dim" }, "Press Enter to commit, ESC to cancel")), step === "commit" && /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "Committing changes...")), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, { color: "dim" }, "Press ESC to cancel")));
+}
+
+function ConfigDisplay({ context }) {
+  return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Text, { bold: true, color: "green" }, "Configuration"), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, { color: "cyan" }, "Settings File: "), /* @__PURE__ */ React.createElement(Text, null, context.settingsFile.path)), /* @__PURE__ */ React.createElement(Box, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { bold: true, color: "yellow" }, "User Config:"), /* @__PURE__ */ React.createElement(Box, { marginLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { color: "cyan" }, "Daily Path Template: "), /* @__PURE__ */ React.createElement(Text, null, context.settingsFile.settings.journalSettings.dailyPathTemplate)), /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { color: "cyan" }, "Meeting Path Template: "), /* @__PURE__ */ React.createElement(Text, null, context.settingsFile.settings.journalSettings.meetingPathTemplate)), /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { color: "cyan" }, "Note Path Template: "), /* @__PURE__ */ React.createElement(Text, null, context.settingsFile.settings.journalSettings.notePathTemplate)), /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, { color: "cyan" }, "Editor: "), /* @__PURE__ */ React.createElement(Text, null, context.settingsFile.settings.preferredEditor)))), /* @__PURE__ */ React.createElement(Box, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { bold: true, color: "yellow" }, "Working Directory:"), /* @__PURE__ */ React.createElement(Box, { marginLeft: 2, marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, context.cwd))));
+}
+
+function useTerminalSize() {
+  const [size, setSize] = useState({
+    columns: process.stdout.columns || 80,
+    rows: process.stdout.rows || 24
+  });
+  useEffect(() => {
+    const updateSize = () => {
+      setSize({
+        columns: process.stdout.columns || 80,
+        rows: process.stdout.rows || 24
+      });
+    };
+    process.stdout.on("resize", updateSize);
+    return () => {
+      process.stdout.off("resize", updateSize);
+    };
+  }, []);
+  return size;
+}
+
+function AppContent({ context, command, commandArgs }) {
+  const [isExiting, setIsExiting] = useState(false);
+  const terminalSize = useTerminalSize();
+  const handleExit = (code = 0) => {
+    setIsExiting(true);
+    setTimeout(() => process.exit(code), 100);
+  };
+  if (isExiting) {
+    return null;
   }
+  if (command === "git-commit") {
+    return /* @__PURE__ */ React.createElement(
+      GitCommit,
+      {
+        context,
+        messageArgs: commandArgs,
+        onExit: handleExit
+      }
+    );
+  }
+  if (command === "config") {
+    return /* @__PURE__ */ React.createElement(ConfigDisplay, { context });
+  }
+  return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Text, { bold: true, color: DEFAULT_THEME.primary }, "Towles Tool"), /* @__PURE__ */ React.createElement(Text, { color: DEFAULT_THEME.dim }, "Terminal size: ", terminalSize.columns, "x", terminalSize.rows), /* @__PURE__ */ React.createElement(Text, { color: DEFAULT_THEME.warning }, "No command specified"));
+}
+function App(props) {
+  return /* @__PURE__ */ React.createElement(ErrorBoundary, null, /* @__PURE__ */ React.createElement(AppProvider, null, /* @__PURE__ */ React.createElement(ConfigProvider, { context: props.context }, /* @__PURE__ */ React.createElement(AppContent, { ...props }))));
+}
+function renderApp(props) {
+  return render(/* @__PURE__ */ React.createElement(App, { ...props }));
+}
+
+async function gitCommitCommand(context, messageArgs) {
+  const { waitUntilExit } = renderApp({
+    context,
+    command: "git-commit",
+    commandArgs: messageArgs
+  });
+  await waitUntilExit();
 }
 
 function getMondayOfWeek(date) {
@@ -214,44 +412,71 @@ async function openInEditor({ editor, filePath }) {
     consola.warn(`Could not open in editor : '${editor}'. Modify your editor in the config: examples include 'code', 'code-insiders',  etc...`, ex);
   }
 }
-function generateJournalFileInfoByType({ date = /* @__PURE__ */ new Date(), type = JOURNAL_TYPES.DAILY_NOTES, title }) {
+function resolvePathTemplate(template, title, date) {
+  const dateTime = DateTime.fromJSDate(date, { zone: "utc" });
+  return template.replace(/\{([^}]+)\}/g, (match, token) => {
+    try {
+      if (token === "title") {
+        return title.toLowerCase().replace(/\s+/g, "-");
+      }
+      const result = dateTime.toFormat(token);
+      const isLikelyInvalid = token.includes("invalid") || result.length > 20 || // Very long results are likely garbage
+      result.length > token.length * 2 && /\d{10,}/.test(result) || // Contains very long numbers
+      result.includes("UTC");
+      if (isLikelyInvalid) {
+        consola.warn(`Invalid date format token: ${token}`);
+        return match;
+      }
+      return result;
+    } catch (error) {
+      consola.warn(`Invalid date format token: ${token}`);
+      return match;
+    }
+  });
+}
+function generateJournalFileInfoByType({ journalSettings, date = /* @__PURE__ */ new Date(), type = JOURNAL_TYPES.DAILY_NOTES, title }) {
   const currentDate = new Date(date);
-  const year = currentDate.getFullYear().toString();
+  let templatePath = "";
+  let mondayDate = getMondayOfWeek(currentDate);
   switch (type) {
     case JOURNAL_TYPES.DAILY_NOTES: {
       const monday = getMondayOfWeek(currentDate);
-      const fileName = `${formatDate(monday)}-week-log.md`;
-      const pathPrefix = [year, "daily-notes"];
-      return { pathPrefix, fileName, mondayDate: monday };
+      templatePath = journalSettings.dailyPathTemplate;
+      mondayDate = monday;
+      break;
     }
     case JOURNAL_TYPES.MEETING: {
-      const dateStr = formatDate(currentDate);
-      const timeStr = currentDate.toLocaleTimeString("en-US", { hour12: false, hour: "2-digit", minute: "2-digit" }).replace(":", "");
-      const titleSlug = title ? `-${title.toLowerCase().replace(/\s+/g, "-")}` : "";
-      const fileName = `${dateStr}-${timeStr}-meeting${titleSlug}.md`;
-      const pathPrefix = [year, "meetings"];
-      return { pathPrefix, fileName, mondayDate: currentDate };
+      templatePath = journalSettings.meetingPathTemplate;
+      mondayDate = currentDate;
+      break;
     }
     case JOURNAL_TYPES.NOTE: {
-      const dateStr = formatDate(currentDate);
-      const timeStr = currentDate.toLocaleTimeString("en-US", { hour12: false, hour: "2-digit", minute: "2-digit" }).replace(":", "");
-      const titleSlug = title ? `-${title.toLowerCase().replace(/\s+/g, "-")}` : "";
-      const fileName = `${dateStr}-${timeStr}-note${titleSlug}.md`;
-      const pathPrefix = [year, "notes"];
-      return { pathPrefix, fileName, mondayDate: currentDate };
+      templatePath = journalSettings.notePathTemplate;
+      mondayDate = currentDate;
+      break;
     }
     default:
       throw new Error(`Unknown journal type: ${type}`);
   }
+  const resolvedPath = resolvePathTemplate(templatePath, title, currentDate);
+  return {
+    currentDate,
+    fullPath: resolvedPath,
+    mondayDate
+  };
 }
-async function createJournalFile({ userConfig, type, title }) {
+async function createJournalFile({ context, type, title }) {
   try {
     const currentDate = /* @__PURE__ */ new Date();
-    const fileInfo = generateJournalFileInfoByType({ date: currentDate, type, title });
-    const filePath = path__default.join(userConfig.journalDir, ...fileInfo.pathPrefix, fileInfo.fileName);
-    ensureDirectoryExists(path__default.join(userConfig.journalDir, ...fileInfo.pathPrefix));
-    if (existsSync(filePath)) {
-      consola.info(`Opening existing ${type} file: ${colors.cyan(filePath)}`);
+    const fileInfo = generateJournalFileInfoByType({
+      journalSettings: context.settingsFile.settings.journalSettings,
+      date: currentDate,
+      type,
+      title
+    });
+    ensureDirectoryExists(path__default.dirname(fileInfo.fullPath));
+    if (existsSync(fileInfo.fullPath)) {
+      consola.info(`Opening existing ${type} file: ${colors.cyan(fileInfo.fullPath)}`);
     } else {
       let content;
       switch (type) {
@@ -267,122 +492,197 @@ async function createJournalFile({ userConfig, type, title }) {
         default:
           throw new Error(`Unknown journal type: ${type}`);
       }
-      writeFileSync(filePath, content, "utf8");
-      consola.info(`Created new ${type} file: ${colors.cyan(filePath)}`);
+      consola.info(`Creating new ${type} file: ${colors.cyan(fileInfo.fullPath)}`);
+      writeFileSync(fileInfo.fullPath, content, "utf8");
     }
-    await openInEditor({ editor: userConfig.editor, filePath });
+    await openInEditor({ editor: context.settingsFile.settings.preferredEditor, filePath: fileInfo.fullPath });
   } catch (error) {
     consola.warn(`Error creating ${type} file:`, error);
-    process.exit(1);
+    process$1.exit(1);
   }
 }
 
-const constants = {
-  toolName: "towles-tool"
-};
+async function loadTowlesToolContext({
+  cwd,
+  settingsFile,
+  debug = false
+}) {
+  return {
+    cwd,
+    settingsFile,
+    args: [],
+    // TODO: Load args from yargs
+    debug
+  };
+}
 
-function printJson(obj) {
-  consola.log(util.inspect(obj, {
-    depth: 2,
-    colors: true,
-    showHidden: false,
-    compact: false
-  }));
+async function configCommand(context) {
+  const { waitUntilExit } = renderApp({
+    context,
+    command: "config"
+  });
+  await waitUntilExit();
 }
-function printDebug(message, ...args) {
-  if (process.env.DEBUG) {
-    consola.debug(`DEBUG: ${message}`, ...args);
+
+const USER_SETTINGS_DIR = path.join(homedir(), ".config", AppInfo.toolName);
+const USER_SETTINGS_PATH = path.join(USER_SETTINGS_DIR, `${AppInfo.toolName}.settings.json`);
+const JournalSettingsSchema = z.object({
+  // https://moment.github.io/luxon/#/formatting?id=table-of-tokens
+  dailyPathTemplate: z.string().default(path.join(homedir(), "journal", "{yyyy}/{MM}/daily-notes/{yyyy}-{MM}-{dd}-daily-notes.md")),
+  meetingPathTemplate: z.string().default(path.join(homedir(), "journal", "{yyyy}/{MM}/meetings/{yyyy}-{MM}-{dd}-{title}.md")),
+  notePathTemplate: z.string().default(path.join(homedir(), "journal", "{yyyy}/{MM}/notes/{yyyy}-{MM}-{dd}-{title}.md"))
+});
+const UserSettingsSchema = z.object({
+  preferredEditor: z.string().default("code"),
+  journalSettings: JournalSettingsSchema
+});
+class LoadedSettings {
+  constructor(settingsFile) {
+    this.settingsFile = settingsFile;
   }
+  settingsFile;
 }
-
-function getDefaultUserConfig() {
-  return {
-    journalDir: path.join(homedir(), "journal"),
-    editor: "code"
+function createSettingsFile() {
+  const defaultSettings = UserSettingsSchema.parse({
+    // its odd, but but we have to get default value from each schema object, if we don't it failes.
+    // https://github.com/colinhacks/zod/discussions/1953
+    journalSettings: JournalSettingsSchema.parse({})
+  });
+  const settingsFile = {
+    path: USER_SETTINGS_PATH,
+    settings: defaultSettings
   };
+  saveSettings(settingsFile);
+  consola.success(`Created settings file: ${USER_SETTINGS_PATH}`);
+  return defaultSettings;
 }
-async function loadTowlesToolConfig({
-  cwd,
-  overrides
-}) {
-  await setupDotenv({ cwd });
-  const defaults = getDefaultUserConfig();
-  const defaultConfigFolder = path.join(homedir(), ".config", constants.toolName);
-  const updateResult = await updateConfig({
-    cwd: defaultConfigFolder,
-    configFile: `${constants.toolName}.config`,
-    createExtension: ".ts",
-    async onCreate({ configFile: configFile2 }) {
-      const shallCreate = await consola.prompt(
-        `Do you want to initialize a new config in ${colors.cyan(configFile2)}?`,
-        {
-          type: "confirm",
-          default: true
-        }
-      );
-      if (shallCreate !== true) {
-        return false;
-      }
-      return `
-// Default configuration for Towles Tool
-// You can customize these values to fit your needs
-// cwd: null means it will use the current working directory
-export default  ${JSON.stringify(defaults, null, 2)};
-`;
-    },
-    async onUpdate(config) {
-      return config;
+function saveSettings(settingsFile) {
+  try {
+    const dirPath = path.dirname(settingsFile.path);
+    if (!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath, { recursive: true });
     }
-  }).catch((error) => {
-    consola.error(`Failed to update config: ${error.message}`);
-    return null;
-  });
-  if (!updateResult?.configFile) {
-    consola.error(`Failed to load or update config. Please check your configuration.`);
-    process.exit(1);
+    fs.writeFileSync(
+      settingsFile.path,
+      JSON.stringify(settingsFile.settings, null, 2),
+      "utf-8"
+    );
+  } catch (error) {
+    consola.error("Error saving user settings file:", error);
   }
-  const { config: userConfig, configFile } = await loadConfig({
-    cwd: cwd || defaultConfigFolder,
-    configFile: updateResult.configFile,
-    name: constants.toolName,
-    packageJson: true,
-    defaults,
-    overrides: {
-      // cwd,
-      ...overrides
+}
+async function loadSettings() {
+  let userSettings = null;
+  if (fs.existsSync(USER_SETTINGS_PATH)) {
+    const userContent = fs.readFileSync(USER_SETTINGS_PATH, "utf-8");
+    const parsedUserSettings = JSON.parse(stripJsonComments(userContent));
+    userSettings = UserSettingsSchema.parse(parsedUserSettings);
+    if (JSON.stringify(parsedUserSettings) !== JSON.stringify(userSettings)) {
+      consola.warn(`Settings file ${USER_SETTINGS_PATH} has been updated with default values.`);
+      const tempSettingsFile = {
+        path: USER_SETTINGS_PATH,
+        settings: userSettings
+      };
+      saveSettings(tempSettingsFile);
     }
-  });
-  printDebug(`Using config from: ${colors.cyan(configFile)}`);
-  return {
-    configFile,
-    cwd,
-    userConfig
-  };
+  } else {
+    const confirmed = await consola.prompt(`Settings file not found. Create ${colors.cyan(USER_SETTINGS_PATH)}?`, {
+      type: "confirm"
+    });
+    if (!confirmed) {
+      throw new Error(`Settings file not found and user chose not to create it.`);
+    }
+    userSettings = createSettingsFile();
+  }
+  return new LoadedSettings(
+    {
+      path: USER_SETTINGS_PATH,
+      settings: userSettings
+    }
+  );
 }
 
 async function main() {
-  const consola$1 = consola.withTag(constants.toolName);
-  const config = await loadTowlesToolConfig({ cwd: process.cwd() });
-  const program = new Command();
-  program.name(constants.toolName).description("One off quality of life scripts that I use on a daily basis").version(version);
-  const journalCmd = program.command("journal").description("quickly create md files from templates files like daily-notes, meeting, notes, etc.");
-  journalCmd.command("daily-notes").description("Weekly files with daily sections for ongoing work and notes").action(async () => {
-    await createJournalFile({ userConfig: config.userConfig, type: JOURNAL_TYPES.DAILY_NOTES });
-  });
-  journalCmd.command("meeting [title]").description("Structured meeting notes with agenda and action items").action(async (title) => {
-    await createJournalFile({ userConfig: config.userConfig, type: JOURNAL_TYPES.MEETING, title });
-  });
-  journalCmd.command("note [title]").description("General-purpose notes with structured sections").action(async (title) => {
-    await createJournalFile({ userConfig: config.userConfig, type: JOURNAL_TYPES.NOTE, title });
-  });
-  program.command("git-commit [message...]").alias("gc").description("Git commit command with optional message").action(async (message) => {
-    await gitCommitCommand(config, message);
+  const settings = await loadSettings();
+  const context = await loadTowlesToolContext({
+    cwd: process$1.cwd(),
+    settingsFile: settings.settingsFile,
+    debug: true
+    // later can be set to false in production or when not debugging
   });
-  program.command("config").description("set or show configuration file.").action(async () => {
-    consola$1.log(colors.green("Showing configuration..."));
-    consola$1.log("Settings File:", config.configFile);
-    printJson(config);
-  });
-  program.parse();
+  consola.info(`Using configuration from ${settings.settingsFile.path}`);
+  const parser = yargs(hideBin(process$1.argv)).scriptName(AppInfo.toolName).usage("Usage: $0 <command> [options]").version(version).demandCommand(1, "You need at least one command").recommendCommands().strict().help().wrap(yargs().terminalWidth());
+  parser.command(
+    ["journal", "j"],
+    "quickly create md files from templates files like daily-notes, meeting, notes, etc.",
+    (yargs2) => {
+      return yargs2.command(
+        ["daily-notes", "today"],
+        "Weekly files with daily sections for ongoing work and notes",
+        {},
+        async () => {
+          await createJournalFile({ context, type: JOURNAL_TYPES.DAILY_NOTES, title: "" });
+        }
+      ).command(
+        ["meeting [title]", "m"],
+        "Structured meeting notes with agenda and action items",
+        (yargs3) => {
+          return yargs3.positional("title", {
+            type: "string",
+            describe: "Meeting title"
+          });
+        },
+        async (argv) => {
+          await createJournalFile({ context, type: JOURNAL_TYPES.MEETING, title: argv.title || "" });
+        }
+      ).command(
+        ["note [title]", "n"],
+        "General-purpose notes with structured sections",
+        (yargs3) => {
+          return yargs3.positional("title", {
+            type: "string",
+            describe: "Note title"
+          });
+        },
+        async (argv) => {
+          await createJournalFile({ context, type: JOURNAL_TYPES.NOTE, title: argv.title || "" });
+        }
+      ).demandCommand(1, "You need to specify a journal subcommand").help();
+    },
+    () => {
+      parser.showHelp();
+    }
+  );
+  parser.command(
+    ["git-commit [message...]", "gc"],
+    "Git commit command with optional message",
+    (yargs2) => {
+      return yargs2.positional("message", {
+        type: "string",
+        array: true,
+        describe: "Commit message words"
+      });
+    },
+    async (argv) => {
+      await gitCommitCommand(context, argv.message || []);
+    }
+  );
+  parser.command(
+    ["config", "cfg"],
+    "set or show configuration file.",
+    {},
+    async () => {
+      await configCommand(context);
+    }
+  );
+  await parser.parse();
 }
-await main();
+main().catch((error) => {
+  consola.error("An unexpected critical error occurred:");
+  if (error instanceof Error) {
+    consola.error(error.stack);
+  } else {
+    consola.error(String(error));
+  }
+  process$1.exit(1);
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@towles/tool",
   "type": "module",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "One off quality of life scripts that I use on a daily basis.",
   "author": "Chris Towles <Chris.Towles.Dev@gmail.com>",
   "license": "MIT",
@@ -36,22 +36,31 @@
     "@anthropic-ai/claude-code": "^1.0.51",
     "@anthropic-ai/sdk": "^0.56.0",
     "@clack/prompts": "^0.11.0",
+    "@inkjs/ui": "^2.0.0",
     "c12": "^3.0.4",
     "changelogen": "^0.6.2",
-    "commander": "^14.0.0",
     "consola": "^3.4.2",
     "fzf": "^0.5.2",
+    "ink": "^5.0.1",
+    "luxon": "^3.7.1",
     "magicast": "^0.3.5",
     "neverthrow": "^8.2.0",
     "prompts": "^2.4.2",
+    "react": "^18.3.1",
+    "strip-json-comments": "^5.0.2",
+    "yargs": "^17.7.2",
     "zod": "^4.0.5"
   },
   "devDependencies": {
     "@antfu/ni": "^25.0.0",
     "@antfu/utils": "^9.2.0",
+    "@types/luxon": "^3.6.2",
     "@types/node": "^22.16.3",
     "@types/prompts": "^2.4.9",
+    "@types/react": "^18.3.12",
+    "@types/yargs": "^17.0.32",
     "bumpp": "^10.2.0",
+    "ink-testing-library": "^4.0.0",
     "lint-staged": "^15.5.2",
     "oxlint": "^1.7.0",
     "simple-git-hooks": "^2.13.0",
@@ -81,9 +90,9 @@
     "lint:fix_all": "oxlint --fix .",
     "release:local": "bumpp && pnpm publish --no-git-checks -r --access public",
     "release": "bumpp && echo \"github action will run and publish to npm\"",
-    "start": "tsx src/index.ts",
+    "start": "tsx src/index.tsx",
     "test": "vitest --run",
-    "test:watch": "vitest",
+    "test:watch": "CI=DisableCallingClaude vitest --watch",
     "typecheck": "tsc --noEmit"
   }
 }