@nutthead/cc-statusline 0.1.9 → 0.2.0

package/index.ts

@@ -1,9 +1,38 @@
+import meow from "meow";
 import { configure } from "@logtape/logtape";
 import { log, logtapeConfig } from "./src/logging";
-import { defaultTheme } from "./src/theme/default";
+import { defaultTheme } from "./src/defaultTheme";
+import { loadTheme } from "./src/theme/loadTheme";
 
 await configure(logtapeConfig);
 
+const cli = meow(
+  `
+	Usage
+	  $ cc-statusline
+
+	Options
+	  --theme, -t  Use a custom theme
+
+	Examples
+	  $ cc-statusline --rainbow
+    $ cc-statusline --theme ~/.config/cc-statusline/basic.js
+	  
+`,
+  {
+    importMeta: import.meta, // This is required
+    flags: {
+      theme: {
+        type: "string",
+        shortFlag: "t",
+        isRequired: false,
+      },
+    },
+  },
+);
+
+const resolvedTheme = (cli.flags.theme && await loadTheme(cli.flags.theme)) || defaultTheme;
+
 const input = await Bun.stdin.stream().json();
 log.debug("input: {input}", input);
-console.log(await defaultTheme(input));
+console.log(await resolvedTheme(input));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nutthead/cc-statusline",
   "description": "Status Line for Claude Code",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "type": "module",
   "bin": {
     "cc-statusline": "bin/cc-statusline.js"
@@ -42,7 +42,9 @@
     "@logtape/file": "^1.3.6",
     "@logtape/logtape": "^1.3.6",
     "ansi-colors": "^4.1.3",
+    "meow": "^14.0.0",
     "simple-git": "^3.30.0",
+    "ts-pattern": "^5.9.0",
     "type-fest": "^5.3.1",
     "zod": "^4.3.5"
   },

package/src/cli.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import meow from "meow";
 import { execSync } from "node:child_process";
 import { existsSync, mkdirSync, copyFileSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
@@ -9,70 +10,107 @@ const BINARY_NAME = "statusline";
 const CLAUDE_DIR = join(homedir(), ".claude");
 const TARGET_PATH = join(CLAUDE_DIR, BINARY_NAME);
 
-function build(): void {
+const cli = meow(
+  `
+  Usage
+    $ cc-statusline <command>
+
+  Commands
+    install    Build and install statusline to ~/.claude/
+
+  Options
+    --overwrite  Overwrite existing file if it exists
+
+  Examples
+    $ cc-statusline install
+    $ cc-statusline install --overwrite
+`,
+  {
+    importMeta: import.meta,
+    flags: {
+      overwrite: {
+        type: "boolean",
+        default: false,
+      },
+    },
+  },
+);
+
+export function build(): void {
   console.log("Building statusline binary...");
-  execSync("mkdir -p target && bun build --compile ./index.ts --outfile target/statusline", {
-    stdio: "inherit",
-  });
+  execSync(
+    "mkdir -p target && bun build --compile ./index.ts --outfile target/statusline",
+    { stdio: "inherit" },
+  );
   console.log("Build complete.");
 }
 
-function install(overwrite: boolean): void {
-  // Build first
-  build();
+export interface InstallDeps {
+  claudeDir: string;
+  targetPath: string;
+  sourcePath: string;
+  doBuild: () => void;
+  existsSync: (path: string) => boolean;
+  mkdirSync: (path: string, options?: { recursive?: boolean }) => void;
+  copyFileSync: (src: string, dest: string) => void;
+  unlinkSync: (path: string) => void;
+}
+
+const defaultDeps: InstallDeps = {
+  claudeDir: CLAUDE_DIR,
+  targetPath: TARGET_PATH,
+  sourcePath: join(process.cwd(), "target", BINARY_NAME),
+  doBuild: build,
+  existsSync,
+  mkdirSync,
+  copyFileSync,
+  unlinkSync,
+};
+
+export function installBinary(
+  overwrite: boolean,
+  deps: InstallDeps = defaultDeps,
+): void {
+  deps.doBuild();
 
-  // Ensure ~/.claude directory exists
-  if (!existsSync(CLAUDE_DIR)) {
-    mkdirSync(CLAUDE_DIR, { recursive: true });
+  if (!deps.existsSync(deps.claudeDir)) {
+    deps.mkdirSync(deps.claudeDir, { recursive: true });
   }
 
-  // Check if target file exists
-  if (existsSync(TARGET_PATH)) {
+  if (deps.existsSync(deps.targetPath)) {
     if (!overwrite) {
-      console.error(`Error: ${TARGET_PATH} already exists.`);
+      console.error(`Error: ${deps.targetPath} already exists.`);
       console.error("Use --overwrite to replace the existing file.");
       process.exit(1);
     }
-    console.log(`Overwriting existing file at ${TARGET_PATH}...`);
-    unlinkSync(TARGET_PATH); // Remove first to avoid ETXTBSY if binary is running
+    console.log(`Overwriting existing file at ${deps.targetPath}...`);
+    deps.unlinkSync(deps.targetPath);
   }
 
-  // Copy binary to destination
-  const sourcePath = join(process.cwd(), "target", BINARY_NAME);
-  copyFileSync(sourcePath, TARGET_PATH);
-  console.log(`Installed statusline to ${TARGET_PATH}`);
+  deps.copyFileSync(deps.sourcePath, deps.targetPath);
+  console.log(`Installed statusline to ${deps.targetPath}`);
 }
 
-function printUsage(): void {
-  console.log(`Usage: cc-statusline <command> [options]
-
-Commands:
-  install             Build and install statusline to ~/.claude/
-
-Options:
-  --overwrite         Overwrite existing file if it exists
-  --help, -h          Show this help message`);
+export function install(overwrite: boolean): void {
+  installBinary(overwrite);
 }
 
 function main(): void {
-  const args = process.argv.slice(2);
-  const command = args.find((arg) => !arg.startsWith("-"));
-  const flags = new Set(args.filter((arg) => arg.startsWith("-")));
-
-  if (flags.has("--help") || flags.has("-h") || args.length === 0) {
-    printUsage();
-    process.exit(0);
-  }
+  const command = cli.input[0];
 
   switch (command) {
     case "install":
-      install(flags.has("--overwrite"));
+      install(cli.flags.overwrite);
+      break;
+    case undefined:
+      cli.showHelp();
       break;
     default:
       console.error(`Unknown command: ${command}`);
-      printUsage();
-      process.exit(1);
+      cli.showHelp(1);
   }
 }
 
-main();
+if (import.meta.main) {
+  main();
+}

package/src/{theme/default.ts → defaultTheme.ts}

@@ -1,16 +1,16 @@
 import { z } from "zod";
-import { log } from "../logging";
-import { statusSchema } from "../statusLineSchema";
+import { log } from "./logging";
+import { statusSchema } from "./statusLineSchema";
 import {
   currentDirStatus,
   currentGitStatus,
   currentModelStatus,
   currentSessionId,
-} from "../utils";
+} from "./utils";
 
 import c from "ansi-colors";
 
-async function defaultTheme(input?: string) {
+async function defaultTheme(input?: string): Promise<string> {
   let statusLine = null;
 
   if (input) {
@@ -22,9 +22,14 @@ async function defaultTheme(input?: string) {
       const gitStatus = c.green(await currentGitStatus());
       const modelStatus = c.magenta(currentModelStatus(status));
       const sessionId = c.blue(currentSessionId(status));
-      const separator = c.bold.gray("⋮");
+      const separator = c.bold.gray(" ⋮ ");
 
-      statusLine = `${dirStatus} ${separator} ${gitStatus}\n${modelStatus} ${separator} ${sessionId}`;
+      statusLine = [
+        [dirStatus, gitStatus],
+        [modelStatus, sessionId],
+      ]
+        .map((row) => row.join(separator))
+        .join("\n");
     } else {
       log.error("Failed to parse input: {error}", {
         error: JSON.stringify(z.treeifyError(result.error)),

package/src/theme/loadTheme.ts

@@ -0,0 +1,35 @@
+import { join, resolve } from "node:path";
+import { homedir } from "node:os";
+
+type ThemeFunction = (input?: string) => Promise<string>;
+
+interface ThemeModule {
+  default: ThemeFunction;
+}
+
+function expandTilde(path: string) {
+  if (path.startsWith("~")) {
+    return join(homedir(), path.slice(1));
+  }
+
+  return path;
+}
+
+function resolvePath(path: string) {
+  const expandedPath = expandTilde(path);
+  return resolve(expandedPath);
+}
+
+async function loadTheme(themePath: string): Promise<ThemeFunction | null> {
+  const resovedPath = resolvePath(themePath);
+
+  const module = (await import(resovedPath)) as ThemeModule;
+
+  if (typeof module.default !== `function`) {
+    return null;
+  }
+
+  return module.default;
+}
+
+export { type ThemeModule, type ThemeFunction, loadTheme };