bestviber 0.3.1 → 0.3.2

package/bin/bestviber.mjs

@@ -3,6 +3,7 @@ import { readFileSync } from 'node:fs'
 import { parse } from '../src/args.mjs'
 import { CliError } from '../src/client.mjs'
 import { commands } from '../src/commands.mjs'
+import { refreshHooksIfMoved } from '../src/hooks.mjs'
 
 const pkg = JSON.parse(
   readFileSync(new URL('../package.json', import.meta.url), 'utf8'),
@@ -49,6 +50,8 @@ async function main() {
   const json = flags.json === true
   delete flags.json
   const result = await command.run({ flags, args, json })
+  // Keep the Claude Code hooks pointing at this copy after an upgrade.
+  if (name !== 'hook') await refreshHooksIfMoved()
   if (result === undefined) return
   console.log(
     json && typeof result !== 'string'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bestviber",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Focus timer and focus analytics for you and your AI agents. Start, pause and finish sessions, and get daily, weekly and monthly stats from the terminal.",
   "keywords": [
     "focus",

package/src/commands.mjs

@@ -502,7 +502,7 @@ export const commands = {
       return rows
         .map(
           (s) =>
-            `${new Date(s.startedAt).toLocaleDateString()} ${clock(s.startedAt)}  ${duration(s.durationMs).padStart(7)}${s.notes ? `  ${s.notes}` : ''}`,
+            `${new Date(s.startedAt).toLocaleDateString()} ${clock(s.startedAt)}  ${duration(s.durationMs).padStart(7)}${s.project ? `  ${s.project}` : ''}${s.notes ? `  ${s.notes}` : ''}`,
         )
         .join('\n')
     },

package/src/format.mjs

@@ -41,7 +41,7 @@ export function stats(stats) {
   lines.push(`${title}  (${range.tz})`)
   lines.push('')
   lines.push(`  focused     ${duration(stats.totalMs)}`)
-  if (stats.parallelMs > 0)
+  if (stats.parallelMs >= 60_000)
     lines.push(
       `  in parallel ${duration(stats.parallelMs)} (up to ${stats.maxParallel} sessions at once; ${duration(stats.sessionTimeMs)} of session time)`,
     )
@@ -89,7 +89,12 @@ export function stats(stats) {
   }
 
   if (stats.byProject?.length) {
-    lines.push('', '  by project')
+    lines.push(
+      '',
+      stats.parallelMs >= 60_000
+        ? '  by project (each counts its own time, so parallel time is in each)'
+        : '  by project',
+    )
     const width = Math.max(
       16,
       ...stats.byProject.map((/** @type {any} */ p) => p.project.length),

package/src/hooks.mjs

@@ -236,12 +236,15 @@ function hookCommand() {
   } catch {
     // Not on PATH (for example run through pnpm dlx).
   }
-  return onPath ? `${q(onPath)} hook` : `${q(process.execPath)} ${q(BIN)} hook`
+  // Never fail at Claude Code: if the CLI moved (an upgrade outside PATH),
+  // the hook does nothing until any `bestviber` command repairs the path.
+  const run = onPath ? q(onPath) : `${q(process.execPath)} ${q(BIN)}`
+  return `${run} hook 2>/dev/null || true`
 }
 
 const isOurs = (/** @type {any} */ h) =>
   typeof h?.command === 'string' &&
-  /bestviber(\.mjs)?"?\s+hook$/.test(h.command)
+  /bestviber(\.mjs)?"?\s+hook\b/.test(h.command)
 
 /** Remove our hook entries from every event, keeping everything else. */
 function withoutOurs(/** @type {Record<string, any>} */ hooks) {
@@ -307,6 +310,26 @@ export async function installHooks() {
   return { settings: settingsPath(), command }
 }
 
+/**
+ * If tracking is on but the hooks point at another copy of the CLI (it was
+ * upgraded or moved), point them at this one. Cheap; runs with every command.
+ */
+export async function refreshHooksIfMoved() {
+  try {
+    const hooks = (await readSettings()).hooks ?? {}
+    const ours = Object.values(hooks)
+      .flatMap((groups) => (Array.isArray(groups) ? groups : []))
+      .flatMap((g) => (Array.isArray(g?.hooks) ? g.hooks : []))
+      .filter(isOurs)
+    if (ours.length === 0) return
+    const command = hookCommand()
+    if (ours.every((h) => h.command === command)) return
+    await installHooks()
+  } catch {
+    // Best-effort: never break the command the user actually ran.
+  }
+}
+
 export async function uninstallHooks() {
   if (!existsSync(settingsPath())) return false
   const settings = await readSettings()

package/src/hooks.test.mjs

@@ -6,6 +6,7 @@ import {
   __test,
   hooksInstalled,
   installHooks,
+  refreshHooksIfMoved,
   uninstallHooks,
 } from './hooks.mjs'
 
@@ -91,6 +92,45 @@ describe('installing into ~/.claude/settings.json', () => {
     expect(await hooksInstalled()).toBe(false)
   })
 
+  test('hooks never fail at Claude Code, even if the CLI is gone', async () => {
+    await installHooks()
+    const s = await settings()
+    expect(s.hooks.Stop[0].hooks[0].command).toMatch(
+      / hook 2>\/dev\/null \|\| true$/,
+    )
+  })
+
+  test('after an upgrade moves the CLI, any command repoints the hooks', async () => {
+    const stale =
+      '"/old/node" "/old/node_modules/bestviber/bin/bestviber.mjs" hook'
+    await writeFile(
+      join(dir, 'settings.json'),
+      JSON.stringify({
+        hooks: {
+          UserPromptSubmit: [{ hooks: [{ type: 'command', command: stale }] }],
+        },
+      }),
+    )
+    await refreshHooksIfMoved()
+    const s = await settings()
+    const commands = JSON.stringify(s.hooks)
+    expect(commands).not.toContain('/old/node')
+    expect(s.hooks.UserPromptSubmit).toHaveLength(1)
+    expect(s.hooks.SessionEnd).toHaveLength(1)
+  })
+
+  test('hooks written by older versions are still recognised on logout', async () => {
+    const old = '"/usr/local/bin/bestviber" hook'
+    await writeFile(
+      join(dir, 'settings.json'),
+      JSON.stringify({
+        hooks: { Stop: [{ hooks: [{ type: 'command', command: old }] }] },
+      }),
+    )
+    expect(await uninstallHooks()).toBe(true)
+    expect((await settings()).hooks).toBeUndefined()
+  })
+
   test('a settings file that is not valid JSON is left alone', async () => {
     await writeFile(join(dir, 'settings.json'), '{ not json')
     await expect(installHooks()).rejects.toThrow(/Left it unchanged/)