harlay 0.1.1 → 0.1.2

package/app/renderer/popover.css

@@ -87,6 +87,29 @@ button { font: inherit; color: inherit; background: none; border: 0; text-align:
 .label { display: flex; align-items: center; gap: 7px; padding: 8px 16px 6px; font: 500 10.5px var(--mono); letter-spacing: .08em; text-transform: uppercase; color: var(--fg3); }
 .label::before { content: ""; width: 5px; height: 5px; background: var(--accent); }
 
+/* usage */
+.usage { padding: 0 8px 4px; }
+.usage .label { padding: 2px 8px 6px; }
+.u-row { display: flex; gap: 10px; padding: 6px 8px; }
+.u-name { flex: none; width: 86px; font-size: 12px; font-weight: 600; padding-top: 1px; }
+.u-body { flex: 1; min-width: 0; }
+.u-win { display: flex; align-items: center; gap: 8px; height: 18px; }
+.u-lbl { flex: none; width: 34px; font: 10.5px var(--mono); color: var(--fg3); }
+.u-bar { flex: 1; height: 5px; border-radius: 999px; background: rgba(var(--ink-rgb), .08); overflow: hidden; }
+.u-bar i { display: block; height: 100%; border-radius: inherit; background: var(--accent); }
+.u-bar i.warm { background: var(--warn); }
+.u-bar i.hot { background: var(--err); }
+.u-pct { flex: none; width: 38px; text-align: right; font: 500 11px var(--mono); color: var(--fg); }
+.u-reset { flex: none; width: 92px; font: 10.5px var(--mono); color: var(--fg3); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.u-meta { margin-top: 2px; font-size: 11px; color: var(--fg3); }
+.link.inline { margin: 0 0 0 6px; font-size: 11px; }
+.switch:disabled { opacity: .4; }
+
+.ask { margin: 0 8px 8px; padding: 11px 12px; border-radius: 10px; background: var(--card); border: 1px solid rgba(var(--accent-rgb), .35); }
+.ask-title { font-size: 12.5px; font-weight: 600; }
+.ask-body { margin-top: 3px; font-size: 11.5px; color: var(--fg2); }
+.ask-btns { display: flex; gap: 6px; margin-top: 9px; }
+
 /* sessions */
 .label.group { padding: 10px 8px 4px; }
 .label.group:first-child { padding-top: 2px; }

package/app/renderer/popover.js

@@ -122,15 +122,56 @@ function groupSessions(sessions) {
   return { attention, projects: [...projects.values()] };
 }
 
+/** A bar's fill. The page's CSP forbids style attributes, so the width is set through the CSSOM. */
+function fill(pct, cls) {
+  const el = h('i', { class: cls });
+  el.style.width = `${Math.max(2, Math.min(100, pct))}%`;
+  return el;
+}
+
+/** Per-agent usage: a bar per window (≈ marks Harlay's estimate), then reset time, pace and notes. */
+function renderUsage() {
+  const rows = model.usage ?? [];
+  if (!rows.length) return null;
+  const ask = model.askClaudeBridge
+    ? h('div', { class: 'ask' },
+        h('p', { class: 'ask-title' }, 'Show Claude’s exact usage?'),
+        h('p', { class: 'ask-body' }, 'Claude Code in Terminal can pass its real usage to Harlay through its status line. Harlay adds one line to ~/.claude/settings.json; a status line you already have keeps working.'),
+        h('div', { class: 'ask-btns' },
+          h('button', { class: 'btn primary', onclick: () => api.act({ type: 'answerClaudeBridge', allow: true }) }, 'Allow'),
+          h('button', { class: 'btn', onclick: () => api.act({ type: 'answerClaudeBridge', allow: false }) }, 'Not now')))
+    : null;
+  return h('div', { class: 'usage' },
+    h('div', { class: 'label' }, 'Usage'),
+    ask,
+    rows.map((r) => {
+      const level = (pct) => (pct >= 90 ? ' hot' : pct >= 70 ? ' warm' : '');
+      const meta = [r.windows.length === 1 ? r.windows[0].resets : null, r.pace, r.note].filter(Boolean);
+      return h('div', { class: 'u-row' },
+        h('div', { class: 'u-name' }, r.label),
+        h('div', { class: 'u-body' },
+          r.windows.map((w) => h('div', { class: 'u-win', title: w.exact ? 'Reported by the agent' : 'Harlay’s estimate from your session logs' },
+            h('span', { class: 'u-lbl' }, w.label),
+            h('span', { class: 'u-bar' }, fill(w.pct, level(w.pct))),
+            h('span', { class: 'u-pct' }, `${w.exact ? '' : '≈'}${w.pct}%`),
+            r.windows.length > 1 && w.resets ? h('span', { class: 'u-reset' }, w.resets.replace('resets ', '')) : null)),
+          meta.length || r.usagePage
+            ? h('div', { class: 'u-meta' }, meta.join(' · '),
+                r.usagePage ? h('button', { class: 'link inline', onclick: () => api.act({ type: 'openCursorUsage' }) }, 'Open usage page') : null)
+            : null));
+    }));
+}
+
 function renderHome() {
   const { sessions } = model;
   if (!sessions.length) {
-    $('#home').replaceChildren(renderHero(), h('p', { class: 'empty' }, 'Harlay reads session logs from ~/.claude, ~/.codex and ~/.cursor on this Mac.'));
+    $('#home').replaceChildren(renderHero(), renderUsage(), h('p', { class: 'empty' }, 'Harlay reads session logs from ~/.claude, ~/.codex and ~/.cursor on this Mac.'));
     return;
   }
   const { attention, projects } = groupSessions(sessions);
   $('#home').replaceChildren(
     renderHero(),
+    renderUsage(),
     h('div', { class: 'scroll' },
       attention.length ? [h('div', { class: 'label group attn' }, 'Needs attention'), attention.map((s) => renderSession(s, true))] : null,
       projects.map((p) => [
@@ -144,10 +185,10 @@ function seg(options, current, onPick) {
     h('button', { 'aria-pressed': String(o.value === current), disabled: o.disabled, onclick: () => onPick(o.value) }, o.label)));
 }
 
-function toggleRow(label, hint, checked, action) {
+function toggleRow(label, hint, checked, action, disabled = false) {
   return h('div', { class: 'set-row' },
     h('span', { class: 'k' }, label, hint ? h('span', { class: 'hint' }, hint) : null),
-    h('button', { class: 'switch', role: 'switch', 'aria-checked': String(checked), 'aria-label': label, onclick: () => api.act(action) }));
+    h('button', { class: 'switch', role: 'switch', disabled, 'aria-checked': String(checked), 'aria-label': label, onclick: () => api.act(action) }));
 }
 
 function renderSettings() {
@@ -172,7 +213,16 @@ function renderSettings() {
       ], settings.theme, (v) => api.act({ type: 'setTheme', theme: v })),
       h('div', { class: 'label' }, 'Behavior'),
       toggleRow('Auto-continue', 'Hand off without asking when an agent stops', settings.autoContinue, { type: 'toggleAuto' }),
-      toggleRow('Open at login', null, settings.openAtLogin, { type: 'toggleLogin' })));
+      toggleRow('Open at login', null, settings.openAtLogin, { type: 'toggleLogin' }),
+      h('div', { class: 'label' }, 'Usage'),
+      toggleRow(
+        'Exact Claude usage',
+        settings.claudeBridge === 'unavailable'
+          ? 'Claude Code’s ~/.claude/settings.json isn’t valid JSON, so Harlay leaves it alone.'
+          : 'Claude Code in Terminal passes its real usage to Harlay through its status line. Your own status line keeps working; turning this off restores it.',
+        settings.claudeBridge === 'on',
+        { type: 'toggleClaudeBridge' },
+        settings.claudeBridge === 'unavailable')));
 }
 
 /** Inline markdown: `code` and **bold**; everything else stays plain text. */
@@ -353,7 +403,12 @@ function demoApi() {
     { tool: 'codex', label: 'Codex', mode: 'app', app: true, terminal: true },
     { tool: 'cursor', label: 'Cursor', mode: 'app', app: true, terminal: false },
   ];
-  const settings = { defaultTarget: 'codex', autoContinue: false, openAtLogin: true, theme: 'system' };
+  const settings = { defaultTarget: 'codex', autoContinue: false, openAtLogin: true, theme: 'system', claudeBridge: 'off' };
+  const usage = [
+    { tool: 'claude-code', label: 'Claude Code', windows: [{ label: '5h', pct: 72, exact: false, resets: 'resets 4:10 PM' }], pace: '≈ 38 min to limit at this pace', note: '≈ estimated from your session logs', usagePage: false },
+    { tool: 'codex', label: 'Codex', windows: [{ label: '5h', pct: 18, exact: true, resets: 'resets in 52m' }, { label: 'Week', pct: 41, exact: true, resets: 'resets Fri 7:12 PM' }], pace: null, note: '1 free limit reset available', usagePage: false },
+    { tool: 'cursor', label: 'Cursor', windows: [], pace: null, note: 'Cursor keeps no usage on this Mac', usagePage: true },
+  ];
   const targets = (from) => {
     const order = [settings.defaultTarget, ...tools.map((t) => t.tool).filter((t) => t !== settings.defaultTarget)];
     return order.filter((t) => t !== from).map((t) => {
@@ -373,6 +428,8 @@ function demoApi() {
   const sampleBrief = (title) => `---\nharlay: 1\n---\n\n# Continue: ${title}\n\n> You are continuing a coding task that another AI agent started.\n\n## 1. Goal (user's words)\n> Move auth from session cookies to JWT across \`api/\`.\n\n## 2. Next step\nMigrate the last 3 route handlers in \`api/routes/\`.\n\n## 4. Progress\n- [x] Added \`src/lib/jwt.ts\`\n- [ ] Migrate \`billing.ts\`\n\n\`\`\`text\nnpm test -- auth\n\`\`\`\n`;
   const emit = () => onModel({
     sessions: sessions.map((s) => ({ ...s, targets: targets(s.from) })),
+    usage,
+    askClaudeBridge: !settings.asked,
     settings: { ...settings },
     tools: tools.map((t) => ({ ...t })),
     hotkey: '⌥H',
@@ -391,6 +448,11 @@ function demoApi() {
       if (a.type === 'toggleAuto') settings.autoContinue = !settings.autoContinue;
       if (a.type === 'toggleLogin') settings.openAtLogin = !settings.openAtLogin;
       if (a.type === 'setTheme') settings.theme = a.theme;
+      if (a.type === 'answerClaudeBridge') {
+        settings.asked = true;
+        settings.claudeBridge = a.allow ? 'on' : 'off';
+      }
+      if (a.type === 'toggleClaudeBridge') settings.claudeBridge = settings.claudeBridge === 'on' ? 'off' : 'on';
       if (a.type === 'previewBrief') {
         const s = sessions.find((x) => x.key === a.key);
         setTimeout(() => onBrief({ key: s.key, title: s.title, path: `${s.cwd}/.harlay/HANDOFF.md`, text: sampleBrief(s.title) }), 600);

package/dist/harlay.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/main.ts
-import { homedir as homedir3 } from "node:os";
+import { homedir as homedir4 } from "node:os";
 import { parseArgs } from "node:util";
 
 // ../core/src/types.ts
@@ -1610,12 +1610,70 @@ var Watcher = class extends EventEmitter {
   }
 };
 
+// ../core/src/usage/codex.ts
+var PACE_MS = 60 * 6e4;
+var TAIL_BYTES = 1024 * 1024;
+
+// ../core/src/usage/claude.ts
+var HOUR = 36e5;
+var SAMPLE_MAX_AGE_MS = 30 * 24 * HOUR;
+var PACE_MS2 = 30 * 6e4;
+
+// ../core/src/usage/bridge.ts
+import { chmod as chmod2, mkdir as mkdir3, readFile as readFile5, rename, rm, writeFile as writeFile3 } from "node:fs/promises";
+import { join as join9 } from "node:path";
+var BRIDGE_MARKER = "# harlay-usage";
+function claudeSettingsPath(home) {
+  return join9(home, ".claude", "settings.json");
+}
+var previousJson = (dataDir) => join9(dataDir, "claude-statusline.previous.json");
+var previousCommand = (dataDir) => join9(dataDir, "claude-statusline.previous");
+function isObj2(x) {
+  return typeof x === "object" && x !== null && !Array.isArray(x);
+}
+function isOurs(statusLine) {
+  return isObj2(statusLine) && typeof statusLine.command === "string" && statusLine.command.includes(BRIDGE_MARKER);
+}
+async function readSettings(path) {
+  let text;
+  try {
+    text = await readFile5(path, "utf8");
+  } catch (e) {
+    if (e.code === "ENOENT") return {};
+    throw e;
+  }
+  const parsed = JSON.parse(text);
+  if (!isObj2(parsed)) throw new Error(`${path} is not a JSON object`);
+  return parsed;
+}
+async function writeAtomic(path, text) {
+  const tmp = `${path}.harlay-tmp`;
+  await writeFile3(tmp, text);
+  await rename(tmp, path);
+}
+async function removeBridge(home, dataDir) {
+  const path = claudeSettingsPath(home);
+  const s = await readSettings(path);
+  if (!isOurs(s.statusLine)) return;
+  let prev;
+  try {
+    prev = JSON.parse(await readFile5(previousJson(dataDir), "utf8"));
+  } catch {
+    prev = void 0;
+  }
+  if (prev === void 0) delete s.statusLine;
+  else s.statusLine = prev;
+  await writeAtomic(path, JSON.stringify(s, null, 2) + "\n");
+  await rm(previousJson(dataDir), { force: true });
+  await rm(previousCommand(dataDir), { force: true });
+}
+
 // src/app.ts
 import { execFile as execFile3 } from "node:child_process";
 import { existsSync } from "node:fs";
-import { cp, mkdir as mkdir3, mkdtemp, rm, writeFile as writeFile3 } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { dirname as dirname3, join as join9, resolve } from "node:path";
+import { cp, mkdir as mkdir4, mkdtemp, rm as rm2, writeFile as writeFile4 } from "node:fs/promises";
+import { homedir as homedir3, tmpdir } from "node:os";
+import { dirname as dirname3, join as join10, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { promisify as promisify3 } from "node:util";
 var run = promisify3(execFile3);
@@ -1624,19 +1682,19 @@ var APP_BUNDLE_ID = "com.corelabs.harlay";
 var APP_FILES = ["dist", "renderer", "assets"];
 function findAppSource(cliFile = fileURLToPath(import.meta.url)) {
   const pkg = resolve(dirname3(cliFile), "..");
-  for (const dir of [join9(pkg, "app"), resolve(pkg, "..", "..", "apps", "desktop")]) {
-    if (existsSync(join9(dir, "dist", "main.cjs")) && existsSync(join9(dir, "renderer", "popover.html")) && existsSync(join9(dir, "assets", "icon.png"))) return dir;
+  for (const dir of [join10(pkg, "app"), resolve(pkg, "..", "..", "apps", "desktop")]) {
+    if (existsSync(join10(dir, "dist", "main.cjs")) && existsSync(join10(dir, "renderer", "popover.html")) && existsSync(join10(dir, "assets", "icon.png"))) return dir;
   }
   return null;
 }
 async function makeIcns(png, work) {
-  const set = join9(work, "icon.iconset");
-  await mkdir3(set);
+  const set = join10(work, "icon.iconset");
+  await mkdir4(set);
   for (const size of [16, 32, 128, 256, 512]) {
-    await run("sips", ["-z", String(size), String(size), png, "--out", join9(set, `icon_${size}x${size}.png`)]);
-    await run("sips", ["-z", String(size * 2), String(size * 2), png, "--out", join9(set, `icon_${size}x${size}@2x.png`)]);
+    await run("sips", ["-z", String(size), String(size), png, "--out", join10(set, `icon_${size}x${size}.png`)]);
+    await run("sips", ["-z", String(size * 2), String(size * 2), png, "--out", join10(set, `icon_${size}x${size}@2x.png`)]);
   }
-  const icns = join9(work, "icon.icns");
+  const icns = join10(work, "icon.icns");
   await run("iconutil", ["-c", "icns", set, "-o", icns]);
   return icns;
 }
@@ -1654,25 +1712,47 @@ async function quitRunningApp() {
     await new Promise((r) => setTimeout(r, 250));
   }
 }
+function harlayDataDir(home = homedir3()) {
+  return join10(home, "Library", "Application Support", "Harlay");
+}
+async function uninstallApp(opts) {
+  await quitRunningApp();
+  try {
+    await removeBridge(opts.home, harlayDataDir(opts.home));
+    opts.log("Restored your Claude Code status line settings.\n");
+  } catch (e) {
+    opts.log(`Left ~/.claude/settings.json unchanged: ${e instanceof Error ? e.message : String(e)}
+`);
+  }
+  const app = join10(opts.dir, "Harlay.app");
+  if (!existsSync(app)) {
+    opts.log(`No Harlay.app in ${opts.dir}.
+`);
+    return;
+  }
+  await run("osascript", ["-e", "on run argv", "-e", 'tell application "Finder" to delete (POSIX file (item 1 of argv) as alias)', "-e", "end run", app]);
+  opts.log(`Moved ${app} to the Trash.
+`);
+}
 async function installApp(opts) {
   if (process.platform !== "darwin") throw new Error("The Harlay app is macOS only; the CLI works without it.");
   const source = findAppSource();
   if (!source) throw new Error("App files are missing from this install. Reinstall with `npm install -g harlay`.");
-  const work = await mkdtemp(join9(tmpdir(), "harlay-app-"));
+  const work = await mkdtemp(join10(tmpdir(), "harlay-app-"));
   try {
-    const appSrc = join9(work, "src");
-    for (const f of APP_FILES) await cp(join9(source, f), join9(appSrc, f), { recursive: true });
-    await writeFile3(
-      join9(appSrc, "package.json"),
+    const appSrc = join10(work, "src");
+    for (const f of APP_FILES) await cp(join10(source, f), join10(appSrc, f), { recursive: true });
+    await writeFile4(
+      join10(appSrc, "package.json"),
       JSON.stringify({ name: "harlay-desktop", productName: "Harlay", version: opts.version, main: "dist/main.cjs" }, null, 2)
     );
-    const icon = await makeIcns(join9(source, "assets", "icon.png"), work);
+    const icon = await makeIcns(join10(source, "assets", "icon.png"), work);
     opts.log(`Building Harlay.app (Electron ${ELECTRON_VERSION}; the first install downloads it, about 100 MB)\u2026
 `);
     const { packager } = await import("@electron/packager");
     const [outDir] = await packager({
       dir: appSrc,
-      out: join9(work, "out"),
+      out: join10(work, "out"),
       name: "Harlay",
       platform: "darwin",
       arch: process.arch === "arm64" ? "arm64" : "x64",
@@ -1687,24 +1767,24 @@ async function installApp(opts) {
       quiet: true,
       extendInfo: { LSUIElement: true, NSUserNotificationAlertStyle: "alert" }
     });
-    const built = join9(outDir, "Harlay.app");
+    const built = join10(outDir, "Harlay.app");
     await run("codesign", ["--force", "--deep", "--sign", "-", built]);
-    const dest = join9(opts.dir, "Harlay.app");
+    const dest = join10(opts.dir, "Harlay.app");
     await quitRunningApp();
-    await mkdir3(opts.dir, { recursive: true });
-    await rm(dest, { recursive: true, force: true });
+    await mkdir4(opts.dir, { recursive: true });
+    await rm2(dest, { recursive: true, force: true });
     await run("ditto", [built, dest]);
     opts.log(`Installed ${dest}
 `);
     if (opts.open) await run("open", [dest]);
     return dest;
   } finally {
-    await rm(work, { recursive: true, force: true });
+    await rm2(work, { recursive: true, force: true });
   }
 }
 
 // src/main.ts
-var VERSION = "0.1.1";
+var VERSION = "0.1.2";
 var HELP = `harlay ${VERSION} \u2014 hand off a stalled AI coding session to another agent
 
 Usage:
@@ -1712,6 +1792,7 @@ Usage:
   harlay handoff --to <claude|codex|cursor> [--session <tool>:<id>] [--mode app|terminal] [--no-launch] [--terminal <App>]
   harlay watch [--auto <claude|codex|cursor>] [--mode app|terminal] [--threshold N]
   harlay app install [--dir <folder>] [--no-open]   install or update the macOS menu bar app (default folder: /Applications)
+  harlay app uninstall [--dir <folder>]             quit it, restore Claude Code's status line, move it to the Trash
   harlay --version
 `;
 var UsageError = class extends Error {
@@ -1775,7 +1856,7 @@ async function cmdHandoff(args, readers, ctx) {
   if (!values.to) throw new UsageError("--to is required (claude, codex or cursor)");
   const target = parseTool(values.to);
   const mode = parseMode(values.mode, target);
-  const session = await pickSession(readers, values.session, ctx.cwd, ctx.env.HARLAY_HOME ?? homedir3());
+  const session = await pickSession(readers, values.session, ctx.cwd, ctx.env.HARLAY_HOME ?? homedir4());
   const res = await runHandoff({
     session,
     target,
@@ -1836,7 +1917,19 @@ async function cmdWatch(args, readers, ctx) {
 }
 async function cmdApp(args, ctx) {
   const [sub, ...rest] = args;
-  if (sub !== "install") throw new UsageError(sub ? `Unknown app command: ${sub}` : "Usage: harlay app install [--dir <folder>] [--no-open]");
+  if (sub === "uninstall") {
+    const { values: values2 } = parseArgs({ args: rest, options: { dir: { type: "string" } }, strict: true });
+    try {
+      await uninstallApp({ dir: values2.dir ?? "/Applications", home: ctx.env.HARLAY_HOME ?? homedir4(), log: ctx.out });
+    } catch (e) {
+      ctx.err(`harlay: could not uninstall the app: ${e instanceof Error ? e.message : String(e)}
+`);
+      return 1;
+    }
+    ctx.out("Uninstall the CLI too with: npm rm -g harlay\n");
+    return 0;
+  }
+  if (sub !== "install") throw new UsageError(sub ? `Unknown app command: ${sub}` : "Usage: harlay app install|uninstall [--dir <folder>]");
   const { values } = parseArgs({ args: rest, options: { dir: { type: "string" }, "no-open": { type: "boolean" } }, strict: true });
   try {
     await installApp({ dir: values.dir ?? "/Applications", version: VERSION, open: !values["no-open"], log: ctx.out });
@@ -1849,7 +1942,7 @@ async function cmdApp(args, ctx) {
   return 0;
 }
 async function main(argv, ctx = defaultContext()) {
-  const readers = createReaders({ home: ctx.env.HARLAY_HOME ?? homedir3(), slugRoot: ctx.env.HARLAY_SLUG_ROOT });
+  const readers = createReaders({ home: ctx.env.HARLAY_HOME ?? homedir4(), slugRoot: ctx.env.HARLAY_SLUG_ROOT });
   const [cmd, ...rest] = argv;
   try {
     switch (cmd) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "harlay",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Hand off a stalled AI coding session (Claude Code, Codex, Cursor) to another agent. CLI and macOS menu bar app.",
   "license": "UNLICENSED",
   "type": "module",