@drazenbebic/wdid 0.1.3 → 0.2.0

package/README.md

@@ -2,7 +2,7 @@
 
 > What did I do? — a small CLI that summarizes your git activity as a tidy table, so you can fill in your timesheet without trying to remember Tuesday.
 
-`wdid` reads `git log` for your author across one or more repos and renders the output as a colorized table with **Date**, **Ticket** (JIRA-style `ABC-123`, parsed from the commit subject), and **Description**.
+`wdid` reads `git log` for your author across one or more repos and renders the output as a colorized table with **Date** (with commit time, shown in your local timezone), **Ticket** (JIRA-style `ABC-123` by default, parsed from the commit subject), and **Description**.
 
 ## Install
 
@@ -28,17 +28,36 @@ By default `wdid` uses `git config user.name` as the author and the current work
 ### Example output
 
 ```
-┌────────────┬──────────────┬──────────────────────────────────────────────────┐
-│ Date       │ Ticket       │ Description                                      │
-├────────────┼──────────────┼──────────────────────────────────────────────────┤
-│ 2026-05-27 │ ABC-123      │ feat(ABC-123): add login flow                    │
-│ 2026-05-27 │ —            │ chore: bump deps                                 │
-│ 2026-05-26 │ ABC-119      │ fix(ABC-119): handle empty payload               │
-└────────────┴──────────────┴──────────────────────────────────────────────────┘
+┌──────────────────┬──────────────┬──────────────────────────────────────────────────┐
+│ Date             │ Ticket       │ Description                                      │
+├──────────────────┼──────────────┼──────────────────────────────────────────────────┤
+│ 2026-05-27 16:42 │ ABC-123      │ feat(ABC-123): add login flow                    │
+│ 2026-05-27 11:08 │ —            │ chore: bump deps                                 │
+│ 2026-05-26 17:53 │ ABC-119      │ fix(ABC-119): handle empty payload               │
+└──────────────────┴──────────────┴──────────────────────────────────────────────────┘
 ```
 
+The time is rendered dimmed and shown in your local timezone (parsed from the committer's full ISO timestamp).
+
 If a commit doesn't reference a ticket, the Ticket column is left blank (rendered as `—`).
 
+With `--group-by-day`, the date moves into a section heading instead of repeating per row, making longer outputs feel more like a journal:
+
+```
+┌───────┬──────────────┬─────────────────────────────────────┐
+│ Time  │ Ticket       │ Description                         │
+├───────┴──────────────┴─────────────────────────────────────┤
+│ 2026-05-27                                                 │
+├───────┬──────────────┬─────────────────────────────────────┤
+│ 16:42 │ ABC-123      │ feat(ABC-123): add login flow       │
+│ 11:08 │ —            │ chore: bump deps                    │
+├───────┴──────────────┴─────────────────────────────────────┤
+│ 2026-05-26                                                 │
+├───────┬──────────────┬─────────────────────────────────────┤
+│ 17:53 │ ABC-119      │ fix(ABC-119): handle empty payload  │
+└───────┴──────────────┴─────────────────────────────────────┘
+```
+
 ## Options
 
 | Option                     | Description                                                                                  |
@@ -50,6 +69,10 @@ If a commit doesn't reference a ticket, the Ticket column is left blank (rendere
 | `--repo <path...>`         | One or more repo paths to query. Defaults to `defaultRepos` in config, then the current dir. |
 | `--format <preset>`        | Ticket format: `jira`, `github`, `conventional`, or `custom`. Defaults to `jira`.            |
 | `--ticket-pattern <regex>` | Custom regex for ticket extraction. Implies `--format custom`; overrides `--format`.         |
+| `--no-color`               | Disable colored output. Also honored via the `NO_COLOR` env var.                             |
+| `--limit <N>`              | Cap the table to the most recent `N` rows. Positive integer.                                 |
+| `--group-by-day`           | Group rows under a bold date heading per day; the row only shows the time.                   |
+| `--json`                   | Emit a JSON array of commit entries to stdout instead of the table. Empty result is `[]`.    |
 
 ## Configuration
 
@@ -71,21 +94,24 @@ CLI flags always win. The first match in this list is used in full (configs do n
 }
 ```
 
-| Field           | Type                                               | Description                                                                        |
-| --------------- | -------------------------------------------------- | ---------------------------------------------------------------------------------- |
-| `format`        | `"jira" \| "github" \| "conventional" \| "custom"` | Ticket extraction preset. Default `jira`.                                          |
-| `customPattern` | `string`                                           | Regex used when `format` is `"custom"`. First capture group wins, else full match. |
-| `defaultAuthor` | `string`                                           | Used when `--author` is not passed and you want to skip the `git config` lookup.   |
-| `defaultRepos`  | `string[]`                                         | Paths to query when no `--repo` is given. `~` is expanded.                         |
+| Field               | Type                                               | Description                                                                        |
+| ------------------- | -------------------------------------------------- | ---------------------------------------------------------------------------------- |
+| `format`            | `"jira" \| "github" \| "conventional" \| "custom"` | Ticket extraction preset. Default `jira`.                                          |
+| `customPattern`     | `string`                                           | Regex used when `format` is `"custom"`. First capture group wins, else full match. |
+| `defaultAuthor`     | `string`                                           | Used when `--author` is not passed and you want to skip the `git config` lookup.   |
+| `defaultRepos`      | `string[]`                                         | Paths to query when no `--repo` is given. `~` is expanded.                         |
+| `ticketColumnLabel` | `string`                                           | Override the auto-picked column header (see below).                                |
 
 ### Format presets
 
-| Preset         | Matches                                          | Example commit → ticket                |
-| -------------- | ------------------------------------------------ | -------------------------------------- |
-| `jira`         | `ABC-123` style (uppercase project key + digits) | `feat(ABC-123): add login` → `ABC-123` |
-| `github`       | `#123` style                                     | `Closes #42` → `42`                    |
-| `conventional` | Conventional Commit `type(scope)!`               | `feat(auth)!: ...` → `feat(auth)!`     |
-| `custom`       | Your `customPattern` regex                       | depends on the regex                   |
+| Preset         | Matches                                          | Example commit → match                 | Column header |
+| -------------- | ------------------------------------------------ | -------------------------------------- | ------------- |
+| `jira`         | `ABC-123` style (uppercase project key + digits) | `feat(ABC-123): add login` → `ABC-123` | `Ticket`      |
+| `github`       | `#123` style                                     | `Closes #42` → `42`                    | `Issue`       |
+| `conventional` | Conventional Commit `type(scope)!`               | `feat(auth)!: ...` → `feat(auth)!`     | `Type`        |
+| `custom`       | Your `customPattern` regex                       | depends on the regex                   | `Match`       |
+
+The column header is picked automatically based on the active format. To override it for a specific preset (e.g. call them "Tasks" instead of "Ticket"), set `ticketColumnLabel` in your config.
 
 ## Development
 

package/dist/index.js

@@ -1,14 +1,26 @@
 #!/usr/bin/env node
 
 // src/index.ts
+import chalk2 from "chalk";
 import { Command } from "commander";
 
 // src/git.ts
-import { execFile } from "child_process";
+import { execFile, spawn } from "child_process";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
 var FIELD_SEP = "";
 var RECORD_SEP = "";
+var TRUNK_BRANCHES = /* @__PURE__ */ new Set(["main", "master"]);
+var pad2 = (n) => String(n).padStart(2, "0");
+function formatLocalDateTime(iso) {
+  const d = new Date(iso);
+  if (Number.isNaN(d.getTime())) {
+    return { date: "", time: "" };
+  }
+  const date = `${d.getFullYear()}-${pad2(d.getMonth() + 1)}-${pad2(d.getDate())}`;
+  const time = `${pad2(d.getHours())}:${pad2(d.getMinutes())}`;
+  return { date, time };
+}
 function extractTicket(message, pattern) {
   const match = message.match(pattern);
   if (!match) {
@@ -16,6 +28,80 @@ function extractTicket(message, pattern) {
   }
   return match[1] ?? match[0];
 }
+function normalizeBranchName(rawName) {
+  const clean = rawName.replace(/[~^].*$/, "").trim();
+  if (!clean || clean === "undefined" || TRUNK_BRANCHES.has(clean)) {
+    return null;
+  }
+  return clean;
+}
+async function runGitWithStdin(cwd, args, input) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn("git", args, { cwd });
+    let stdout = "";
+    let stderr = "";
+    proc.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    proc.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    proc.on("error", reject);
+    proc.on("close", (code) => {
+      if (code !== 0) {
+        reject(new Error(`git ${args.join(" ")} failed: ${stderr.trim()}`));
+        return;
+      }
+      resolve(stdout);
+    });
+    proc.stdin.write(input);
+    proc.stdin.end();
+  });
+}
+async function getBranchMap(cwd, shas) {
+  const map = /* @__PURE__ */ new Map();
+  if (shas.length === 0) {
+    return map;
+  }
+  let stdout;
+  try {
+    stdout = await runGitWithStdin(
+      cwd,
+      ["name-rev", "--stdin", "--refs=refs/heads/*"],
+      shas.join("\n") + "\n"
+    );
+  } catch {
+    return map;
+  }
+  for (const line of stdout.split("\n")) {
+    const m = line.match(/^([0-9a-fA-F]+)\s+\((.+)\)\s*$/);
+    if (!m) {
+      continue;
+    }
+    const sha = m[1];
+    const rawName = m[2];
+    if (!sha || !rawName) {
+      continue;
+    }
+    map.set(sha, normalizeBranchName(rawName));
+  }
+  return map;
+}
+async function assertGitRepo(cwd) {
+  try {
+    await execFileAsync("git", ["rev-parse", "--is-inside-work-tree"], {
+      cwd
+    });
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      throw new Error("git is not installed or not on PATH", { cause: err });
+    }
+    throw new Error(
+      `not inside a git repository: ${cwd} \u2014 cd into a repo or pass --repo <path>`,
+      { cause: err }
+    );
+  }
+}
 async function getGitUserName(cwd) {
   try {
     const { stdout } = await execFileAsync("git", ["config", "user.name"], {
@@ -37,13 +123,14 @@ async function getGitUserName(cwd) {
   }
 }
 async function getCommits(opts) {
+  await assertGitRepo(opts.cwd);
   const args = [
     "log",
     "--all",
     "--author-date-order",
     "--regexp-ignore-case",
     `--author=${opts.author}`,
-    `--pretty=format:%cs${FIELD_SEP}%s${RECORD_SEP}`
+    `--pretty=format:%H${FIELD_SEP}%cI${FIELD_SEP}%s${RECORD_SEP}`
   ];
   if (opts.from) {
     args.push(`--after=${opts.from} 00:00`);
@@ -51,43 +138,127 @@ async function getCommits(opts) {
   if (opts.to) {
     args.push(`--before=${opts.to} 23:59`);
   }
-  const { stdout } = await execFileAsync("git", args, {
-    cwd: opts.cwd,
-    maxBuffer: 32 * 1024 * 1024
-  });
-  return stdout.split(RECORD_SEP).map((r) => r.trim()).filter((r) => r.length > 0).map((record) => {
-    const [date = "", subject = ""] = record.split(FIELD_SEP);
+  if (opts.limit !== void 0) {
+    args.push(`--max-count=${opts.limit}`);
+  }
+  let stdout;
+  try {
+    const result = await execFileAsync("git", args, {
+      cwd: opts.cwd,
+      maxBuffer: 32 * 1024 * 1024
+    });
+    stdout = result.stdout;
+  } catch (err) {
+    const stderr = String(err.stderr ?? "");
+    if (stderr.includes("does not have any commits") || stderr.includes("bad default revision") || stderr.includes("unknown revision")) {
+      return [];
+    }
+    throw err;
+  }
+  const parsed = stdout.split(RECORD_SEP).map((r) => r.trim()).filter((r) => r.length > 0).map((record) => {
+    const [sha = "", iso = "", subject = ""] = record.split(FIELD_SEP);
+    const { date, time } = formatLocalDateTime(iso);
     return {
+      sha,
       date,
+      time,
       ticket: extractTicket(subject, opts.pattern),
       description: subject
     };
   });
+  const branchMap = await getBranchMap(
+    opts.cwd,
+    parsed.map((p) => p.sha).filter((s) => s.length > 0)
+  );
+  return parsed.map((p) => ({
+    date: p.date,
+    time: p.time,
+    ticket: p.ticket,
+    description: p.description,
+    branch: branchMap.get(p.sha) ?? null
+  }));
 }
 
 // src/format.ts
 import Table from "cli-table3";
 import chalk from "chalk";
-function renderTable(entries) {
+function renderDateCell(entry) {
+  if (!entry.time) {
+    return entry.date;
+  }
+  return `${entry.date} ${chalk.dim(entry.time)}`;
+}
+function renderDescriptionCell(entry) {
+  if (!entry.branch) {
+    return entry.description;
+  }
+  return `${entry.description} ${chalk.magenta(`[${entry.branch}]`)}`;
+}
+function renderTable(entries, ticketColumnLabel = "Ticket") {
   const table = new Table({
     head: [
       chalk.bold.cyan("Date"),
-      chalk.bold.cyan("Ticket"),
+      chalk.bold.cyan(ticketColumnLabel),
+      chalk.bold.cyan("Description")
+    ],
+    style: { head: [], border: [] },
+    wordWrap: true,
+    colWidths: [18, 14, 80]
+  });
+  for (const entry of entries) {
+    table.push([
+      renderDateCell(entry),
+      entry.ticket ? chalk.yellow(entry.ticket) : chalk.gray("\u2014"),
+      renderDescriptionCell(entry)
+    ]);
+  }
+  return table.toString();
+}
+function renderTableGroupedByDay(entries, ticketColumnLabel = "Ticket") {
+  const table = new Table({
+    head: [
+      chalk.bold.cyan("Time"),
+      chalk.bold.cyan(ticketColumnLabel),
       chalk.bold.cyan("Description")
     ],
     style: { head: [], border: [] },
     wordWrap: true,
-    colWidths: [12, 14, 80]
+    colWidths: [8, 14, 90]
   });
+  let currentDate = "";
   for (const entry of entries) {
+    if (entry.date && entry.date !== currentDate) {
+      table.push([
+        {
+          content: chalk.bold(entry.date),
+          colSpan: 3,
+          hAlign: "left"
+        }
+      ]);
+      currentDate = entry.date;
+    }
     table.push([
-      chalk.dim(entry.date),
+      entry.time ? chalk.dim(entry.time) : chalk.gray("\u2014"),
       entry.ticket ? chalk.yellow(entry.ticket) : chalk.gray("\u2014"),
-      entry.description
+      renderDescriptionCell(entry)
     ]);
   }
   return table.toString();
 }
+function toJsonKey(label) {
+  return label.toLowerCase().replace(/\s+/g, "_");
+}
+function renderJson(entries, ticketColumnLabel = "Ticket") {
+  const key = toJsonKey(ticketColumnLabel);
+  const transformed = entries.map((e) => ({
+    date: e.date,
+    time: e.time,
+    [key]: e.ticket,
+    description: e.description,
+    branch: e.branch
+  }));
+  return JSON.stringify(transformed, null, 2);
+}
 function renderEmpty() {
   return chalk.gray("No commits found for the given filters.");
 }
@@ -100,6 +271,15 @@ import { homedir } from "os";
 import { readFile } from "fs/promises";
 import { join } from "path";
 import { cosmiconfig } from "cosmiconfig";
+var DEFAULT_COLUMN_LABELS = {
+  jira: "Ticket",
+  github: "Issue",
+  conventional: "Type",
+  custom: "Match"
+};
+function getColumnLabel(format, override) {
+  return override ?? DEFAULT_COLUMN_LABELS[format];
+}
 var PRESET_PATTERNS = {
   jira: /\b([A-Z][A-Z0-9]+-\d+)\b/,
   github: /#(\d+)/,
@@ -111,12 +291,28 @@ var VALID_FORMATS = [
   "conventional",
   "custom"
 ];
+var MAX_CUSTOM_PATTERN_LENGTH = 500;
+function compileUserRegex(pattern) {
+  if (pattern.length > MAX_CUSTOM_PATTERN_LENGTH) {
+    throw new Error(
+      `customPattern is ${pattern.length} characters; limit is ${MAX_CUSTOM_PATTERN_LENGTH}`
+    );
+  }
+  try {
+    return new RegExp(pattern);
+  } catch (err) {
+    throw new Error(
+      `customPattern is not a valid regex: ${err.message}`,
+      { cause: err }
+    );
+  }
+}
 function getTicketPattern(format, customPattern) {
   if (format === "custom") {
     if (!customPattern) {
       throw new Error('format "custom" requires customPattern to be set');
     }
-    return new RegExp(customPattern);
+    return compileUserRegex(customPattern);
   }
   return PRESET_PATTERNS[format];
 }
@@ -147,6 +343,11 @@ function validateConfig(raw) {
     if (typeof obj.customPattern !== "string") {
       throw new Error("customPattern must be a string");
     }
+    if (obj.customPattern.length > MAX_CUSTOM_PATTERN_LENGTH) {
+      throw new Error(
+        `customPattern is ${obj.customPattern.length} characters; limit is ${MAX_CUSTOM_PATTERN_LENGTH}`
+      );
+    }
     cfg.customPattern = obj.customPattern;
   }
   if (cfg.format === "custom" && !cfg.customPattern) {
@@ -164,6 +365,12 @@ function validateConfig(raw) {
     }
     cfg.defaultRepos = obj.defaultRepos;
   }
+  if ("ticketColumnLabel" in obj) {
+    if (typeof obj.ticketColumnLabel !== "string") {
+      throw new Error("ticketColumnLabel must be a string");
+    }
+    cfg.ticketColumnLabel = obj.ticketColumnLabel;
+  }
   return cfg;
 }
 function globalConfigPath() {
@@ -195,6 +402,23 @@ async function loadConfig(cwd) {
 }
 
 // src/index.ts
+function parseLimit(raw) {
+  if (raw === void 0) {
+    return void 0;
+  }
+  const n = Number.parseInt(raw, 10);
+  if (!Number.isInteger(n) || n < 1 || String(n) !== raw.trim()) {
+    throw new Error(`invalid --limit "${raw}" \u2014 must be a positive integer`);
+  }
+  return n;
+}
+function shouldDisableColor(options) {
+  if (options.color === false) {
+    return true;
+  }
+  const noColor = process.env.NO_COLOR ?? "";
+  return noColor.length > 0;
+}
 var VALID_PRESETS = [
   "jira",
   "github",
@@ -242,21 +466,32 @@ async function run(dateArg, options) {
     from = day;
     to = day;
   }
-  const allEntries = [];
-  for (const cwd of repos) {
-    const author = options.author ?? config.defaultAuthor ?? await getGitUserName(cwd);
-    const entries = await getCommits({ author, from, to, cwd, pattern });
-    allEntries.push(...entries);
+  const limit = parseLimit(options.limit);
+  const perRepoEntries = await Promise.all(
+    repos.map(async (cwd) => {
+      const author = options.author ?? config.defaultAuthor ?? await getGitUserName(cwd);
+      return getCommits({ author, from, to, cwd, pattern, limit });
+    })
+  );
+  const allEntries = perRepoEntries.flat();
+  allEntries.sort(
+    (a, b) => `${b.date} ${b.time}`.localeCompare(`${a.date} ${a.time}`)
+  );
+  const display = limit !== void 0 ? allEntries.slice(0, limit) : allEntries;
+  const ticketColumnLabel = getColumnLabel(format, config.ticketColumnLabel);
+  if (options.json) {
+    process.stdout.write(renderJson(display, ticketColumnLabel) + "\n");
+    return;
   }
-  allEntries.sort((a, b) => b.date.localeCompare(a.date));
-  if (allEntries.length === 0) {
+  if (display.length === 0) {
     process.stdout.write(renderEmpty() + "\n");
     return;
   }
-  process.stdout.write(renderTable(allEntries) + "\n");
+  const rendered = options.groupByDay ? renderTableGroupedByDay(display, ticketColumnLabel) : renderTable(display, ticketColumnLabel);
+  process.stdout.write(rendered + "\n");
 }
 var program = new Command();
-program.name("wdid").description("What did I do? \u2014 summarize your git commits as a table").version("0.1.3", "-V, --version", "output the version number").argument("[date]", 'a YYYY-MM-DD date or "today"; omit to show all history').option("--from <date>", 'start date (YYYY-MM-DD or "today")').option("--to <date>", 'end date (YYYY-MM-DD or "today")').option(
+program.name("wdid").description("What did I do? \u2014 summarize your git commits as a table").version("0.2.0", "-V, --version", "output the version number").argument("[date]", 'a YYYY-MM-DD date or "today"; omit to show all history').option("--from <date>", 'start date (YYYY-MM-DD or "today")').option("--to <date>", 'end date (YYYY-MM-DD or "today")').option(
   "--author <name>",
   "override the git author (defaults to git config user.name, then defaultAuthor in config)"
 ).option(
@@ -268,7 +503,19 @@ program.name("wdid").description("What did I do? \u2014 summarize your git commi
 ).option(
   "--ticket-pattern <regex>",
   "custom regex for ticket extraction (implies --format custom; overrides --format)"
-).action(async (dateArg, options) => {
+).option(
+  "--no-color",
+  "disable colored output (also honored via the NO_COLOR env var)"
+).option(
+  "--limit <N>",
+  "cap the table to the most recent N rows (positive integer)"
+).option(
+  "--group-by-day",
+  "group rows under a bold date heading per day (time-only in row)"
+).option("--json", "emit a JSON array of commit entries instead of the table").action(async (dateArg, options) => {
+  if (shouldDisableColor(options)) {
+    chalk2.level = 0;
+  }
   try {
     await run(dateArg, options);
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drazenbebic/wdid",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "What did I do? — summarize your git activity per day as a tidy table, grouped by JIRA ticket.",
   "keywords": [
     "git",