handmux 0.6.0 → 0.7.0

package/README.md

@@ -153,10 +153,6 @@ hook events in `~/.claude/settings.json` (idempotent; leaves your own hooks alon
 this too, and you can turn it on from the phone the first time you open the inbox. `handmux hooks uninstall`
 removes it. If you don't use Claude Code, this is skipped — nothing touches `~/.claude`.
 
-After installing the hooks it also offers (opt-in) to add a small block to `~/.tmux.conf` so each tmux
-window tab shows a live Claude status dot (working / needs you / done) — the same signal as the inbox, on
-your terminal. Decline it and nothing is changed; the block is marked and easy to remove later.
-
 ### start flags
 
 Flags override the config file for **one run** and never persist — handy for a quick try

package/README.zh-CN.md

@@ -141,10 +141,6 @@ Agent 收件箱和「需要你就推给你」靠的是 Claude Code 的生命周
 注册六个 hook 事件(幂等;不动你自己的 hook)。`handmux setup` 也会问一句,首次在手机上打开收件箱时
 还能一键开启。`handmux hooks uninstall` 移除它。不用 Claude Code 的话直接跳过——绝不碰 `~/.claude`。
 
-装完 hook 后,它还会(opt-in)问一句要不要往 `~/.tmux.conf` 加一小段配置,让每个 tmux 窗页签也显示一个
-实时的 Claude 状态点(进行中 / 需要你 / 已完成)——和收件箱同一个信号,直接画在你的终端上。拒绝则什么都不改;
-这段配置带标记,以后想删很容易。
-
 ### start 参数
 
 参数只对**这一次运行**覆盖配置文件、绝不落盘——适合不动已存配置就快速试一下

package/bin/handmux.js

@@ -32,7 +32,8 @@ import { readState, clearState, isAlive, pocketHome, logPath, configPath, claude
 import { runSetup } from '../src/cli/setupWizard.js';
 import { hooksStatus, installHooks, uninstallHooks } from '../src/cli/claudeHooks.js';
 import { codexHooksStatus, installCodexHooks, uninstallCodexHooks } from '../src/cli/codexHooks.js';
-import { tmuxDotStatus, installTmuxDot, tmuxConfPath } from '../src/cli/tmuxConf.js';
+import { statusLineStatus, installStatusLine, uninstallStatusLine, composeHint } from '../src/cli/statusLine.js';
+import { claudeUsagePath } from '../src/usage.js';
 import { probe } from '../src/cli/probe.js';
 import { notifyUpdate, runUpdateCheck, PKG_NAME } from '../src/cli/updateCheck.js';
 import { t, initLocale, setLocale } from '../src/cli/i18n/index.js';
@@ -319,33 +320,38 @@ async function setupCmd() {
   const offerHooks = hooksStatus(HOME) === 'absent' || codexHooksStatus(HOME) === 'absent';
   if (offerHooks && await confirm(t('hooks.confirmEnable'))) {
     installAgentHooks();
-    await maybeOfferTmuxDot();
   }
+  await maybeOfferStatusLine();
   if (await confirm(t('setup.confirmStart'))) { Object.assign(flags, cfg); return start(); }
   console.log(t('setup.later'));
 }
 
-// The per-window tmux status dot is the natural companion to the inbox hooks: the hook already writes a
-// colour into each window's `@claude_dot` on every Claude event, but tmux only SHOWS it if
-// `window-status-format` references it — otherwise it's a silent no-op. Offer to add that display block to
-// ~/.tmux.conf (opt-in, idempotent). Skip when it's already wired (ours or hand-rolled). Non-TTY: just hint.
-async function maybeOfferTmuxDot() {
-  if (tmuxDotStatus(HOME) !== 'absent') return;
-  if (!process.stdin.isTTY) {
-    console.log(t('tmuxdot.tip', { conf: tmuxConfPath(HOME) }));
+// Offer to enable the Claude statusLine usage capturer — it feeds the phone Usage page's 5h/weekly bars
+// (Claude Code's statusLine stdin is the only documented local source of those %). Opt-in and NON-
+// DESTRUCTIVE: auto-installs only when there's no statusLine yet; if the user already has one we print a
+// one-line compose snippet and change nothing. Codex needs no capturer — its rollout already carries the
+// quota. No-op when Claude Code isn't installed or ours is already in place.
+async function maybeOfferStatusLine() {
+  const st = statusLineStatus(HOME);
+  if (st === 'no-claude' || st === 'ours') return;
+  if (st === 'foreign') {
+    // Deploy the capturer script (doesn't touch their statusLine) so the compose one-liner is runnable.
+    installStatusLine(HOME, { srcDir: HOOKS_SRC, usageFile: claudeUsagePath(HOME) });
+    console.log(t('statusline.foreignHint'));
+    console.log('  ' + composeHint(HOME, { usageFile: claudeUsagePath(HOME) }));
     return;
   }
-  if (await confirm(t('tmuxdot.confirm'))) {
-    installTmuxDot(HOME);
-    console.log(t('tmuxdot.added', { path: tmuxConfPath(HOME) }));
-    console.log(t('tmuxdot.apply'));
+  if (await confirm(t('statusline.confirmEnable'))) {
+    installStatusLine(HOME, { srcDir: HOOKS_SRC, usageFile: claudeUsagePath(HOME) });
+    console.log(t('statusline.installed'));
+    console.log(t('statusline.reload'));
   }
 }
 
 // Install the inbox hooks for every coding agent present on this host (Claude Code, Codex — the state file
 // is shared, entries are agent-tagged). Each is opt-in by the mere presence of its config dir. Prints a
-// per-agent line and returns how many were wired, so callers can gate the tmux-dot offer / the "reload"
-// hint. Codex's single `notify` slot may already hold the user's OWN program — we never clobber it, we warn.
+// per-agent line and returns how many were wired, so callers can gate the "reload" hint. Codex's single
+// `notify` slot may already hold the user's OWN program — we never clobber it, we warn.
 function installAgentHooks() {
   let installed = 0;
   if (hooksStatus(HOME) !== 'no-claude') {
@@ -371,12 +377,13 @@ async function hooksCmd() {
       return;
     }
     if (installAgentHooks() > 0) console.log(t('hooks.installedHint'));
-    await maybeOfferTmuxDot();
+    await maybeOfferStatusLine();
     return;
   }
   if (sub === 'uninstall') {
     uninstallHooks(HOME);
     uninstallCodexHooks(HOME);
+    uninstallStatusLine(HOME);
     console.log(t('hooks.removed'));
     return;
   }

package/hooks/handmux-statusline.cjs

@@ -0,0 +1,75 @@
+#!/usr/bin/env node
+// handmux statusLine capturer. Claude Code pipes a JSON blob to its `statusLine` command on stdin — the
+// ONLY officially-documented local source of the 5-hour / weekly rate-limit percentages (the same numbers
+// `/usage` shows). See https://code.claude.com/docs/en/statusline ("Available data": rate_limits.five_hour
+// / seven_day, context_window, model). We snapshot those fields to a file the handmux server serves to the
+// phone's Usage page, then produce stdout so the terminal statusline still works:
+//
+//   node handmux-statusline.cjs <usageFile>                        # snapshot + print a compact status line
+//   HANDMUX_STATUS_TEE=1 node handmux-statusline.cjs <usageFile>   # snapshot + re-emit stdin verbatim
+//
+// TEE mode is for a user who ALREADY has a statusline: they pipe `... | handmux-statusline.cjs <f> | their
+// renderer`, so their renderer downstream receives the exact same JSON and their display is unchanged.
+//
+// .cjs so it runs standalone via `node <file>` regardless of any surrounding package.json "type". Best-
+// effort and silent throughout — a statusLine command must never fail Claude.
+const fs = require('node:fs');
+const path = require('node:path');
+
+const file = process.argv[2];
+const raw = (() => { try { return fs.readFileSync(0, 'utf8'); } catch { return ''; } })();
+let j = {};
+try { j = JSON.parse(raw || '{}'); } catch { /* not JSON → leave j = {} */ }
+
+// One rate-limit window → our shape, or undefined if the field is absent (rate_limits only appears for
+// Pro/Max plans, and only after a session's first API response).
+function win(o) {
+  if (!o || typeof o.used_percentage !== 'number') return undefined;
+  const w = { usedPercent: o.used_percentage };
+  if (typeof o.resets_at === 'number') w.resetsAt = o.resets_at;
+  return w;
+}
+
+if (file) {
+  try {
+    const rl = j.rate_limits || {};
+    const cw = j.context_window || {};
+    const rateLimits = {
+      fiveHour: win(rl.five_hour),
+      sevenDay: win(rl.seven_day),
+      sevenDayOpus: win(rl.seven_day_opus),
+      sevenDaySonnet: win(rl.seven_day_sonnet),
+    };
+    for (const k of Object.keys(rateLimits)) if (rateLimits[k] === undefined) delete rateLimits[k];
+    const snap = {
+      updatedAt: Date.now(),
+      model: (j.model && (j.model.display_name || j.model.id)) || null,
+      context: (typeof cw.used_percentage === 'number') ? { usedPercent: cw.used_percentage } : undefined,
+      rateLimits,
+    };
+    if (snap.context === undefined) delete snap.context;
+    fs.mkdirSync(path.dirname(file), { recursive: true });
+    const tmp = `${file}.${process.pid}.tmp`;
+    fs.writeFileSync(tmp, JSON.stringify(snap));
+    fs.renameSync(tmp, file); // atomic: concurrent statuslines (multiple sessions) can't tear the snapshot
+  } catch { /* best effort — never fail the statusline */ }
+}
+
+// Output. TEE → re-emit stdin so a downstream renderer is unaffected. Otherwise render a compact line from
+// whatever fields are present (a plain default statusline for users who had none).
+if (process.env.HANDMUX_STATUS_TEE === '1') {
+  process.stdout.write(raw);
+} else {
+  try {
+    const seg = [];
+    const dir = j.workspace && j.workspace.current_dir;
+    if (dir) seg.push(path.basename(dir));
+    if (j.model && j.model.display_name) seg.push(j.model.display_name);
+    const cw = j.context_window || {};
+    if (typeof cw.used_percentage === 'number') seg.push(`Ctx ${Math.round(cw.used_percentage)}%`);
+    const rl = j.rate_limits || {};
+    if (rl.five_hour && typeof rl.five_hour.used_percentage === 'number') seg.push(`5h ${Math.round(rl.five_hour.used_percentage)}%`);
+    if (rl.seven_day && typeof rl.seven_day.used_percentage === 'number') seg.push(`Wk ${Math.round(rl.seven_day.used_percentage)}%`);
+    if (seg.length) process.stdout.write(seg.join(' · '));
+  } catch { /* silent */ }
+}

package/hooks/handmux-write.cjs

@@ -27,8 +27,6 @@ try { payload = JSON.parse(fs.readFileSync(0, 'utf8') || '{}'); } catch { /* unr
 // terminates an ESC-interrupted working turn (→ clear the stuck 进行中). Flag it here; the read-modify-
 // write under the lock — the only place we can read the prior state safely — makes the call.
 const isIdle = src === 'notify' && payload && payload.notification_type === 'idle_prompt';
-let cleared = false; // set by update() when idle cleared an interrupted 进行中 → also clear @claude_dot below
-let noop = false;    // set when a codex PostToolUse resume had nothing to un-stick → skip the state + dot write
 
 // Synchronous nap without busy-spinning (the hook runs async, so a few ms is free). SharedArrayBuffer
 // may be unavailable in odd runtimes — fall back to a tiny busy loop so the lock retry still paces.
@@ -48,21 +46,21 @@ function update() {
     // idle after a resting state (done/needs/nothing) is just the "still waiting" reminder → drop and
     // leave the file as it was (recording it would bump ts and re-surface an already-cleared 已完成).
     // idle after a WORKING turn (prompt/resume) that never got a Stop = an ESC interrupt / walk-away —
-    // no Stop hook fires there, so idle is the only signal the turn ended. Without this the 进行中 dot
-    // sticks forever; treat it as a soft end and clear the pane (and its @claude_dot, below).
-    if (prevSrc === 'prompt' || prevSrc === 'resume') { delete obj[pane]; cleared = true; }
+    // no Stop hook fires there, so idle is the only signal the turn ended. Without this the pane would
+    // stay latched at 进行中 forever; treat it as a soft end and clear the pane.
+    if (prevSrc === 'prompt' || prevSrc === 'resume') { delete obj[pane]; }
     else return;                                             // resting → drop without writing
   } else if (src === 'end') {
     delete obj[pane];                                        // SessionEnd (clean exit) → drop the pane
   } else if (src === 'resume' && agent === 'codex') {
     // Codex fires PostToolUse on EVERY tool call, so its resume exists purely to un-stick a pane from 需要你
     // back to 进行中 after the user approved a PermissionRequest. Apply it ONLY as that transition — a mid-
-    // turn tool call (pane already 进行中 / 已完成) is a no-op, so we don't rewrite the entry or repaint the
-    // dot on every command (the load Claude's matcher avoids). Claude's resume — no agent arg — is unaffected.
+    // turn tool call (pane already 进行中 / 已完成) is a no-op, so we don't rewrite the entry on every
+    // command (the load Claude's matcher avoids). Claude's resume — no agent arg — is unaffected.
     const prev = obj[pane];
     const prevPerm = prev && (prev.src === 'permreq'
       || (prev.src === 'notify' && (prev.payload || {}).notification_type === 'permission_prompt'));
-    if (!prevPerm) { noop = true; return; }
+    if (!prevPerm) { return; }
     obj[pane] = { ts: Number(ts) || 0, src, host, payload, agent };
   } else {
     // agent tag lets the server dispatch classify + liveness per agent (Codex passes 'codex'); omitted for
@@ -85,21 +83,3 @@ for (let i = 0; i < 60 && !held; i++) {                       // ~0.9s budget, t
 }
 try { update(); } catch { /* best effort */ }
 if (held) { try { fs.unlinkSync(lock); } catch { /* ignore */ } }
-
-// tmux 页签状态色点（事件驱动）：把本次事件的状态色 markup 写进该 pane 所在窗的 @claude_dot 选项。
-// tmux 的 window-status-format 只读 #{@claude_dot}（纯查表、不跑任何 shell），所以稳态零重绘——只有
-// 状态真变化（即本 hook 触发的这一刻）才写一次、才重绘一次，不轮询、不卡。详见 tmux/README.md。
-// best-effort + 1s 超时：不在 tmux / tmux 不可达都静默忽略，永不阻塞或失败 Claude。
-function claudeDot(s, p) {
-  if (s === 'stop') return '#[fg=#2e7d46]●#[default] ';                              // 已完成 绿
-  if (s === 'prompt' || s === 'resume') return '#[fg=#2f6fed,blink]●#[default] ';   // 进行中 蓝闪
-  if (s === 'permreq') return '#[fg=#e0a020]●#[default] ';                           // 需要你 橙
-  if (s === 'notify' && p && p.notification_type === 'permission_prompt') return '#[fg=#e0a020]●#[default] ';
-  return null; // 其它无法分类 → 不动该窗的点（end 在下方单独清空）
-}
-try {
-  const dot = (src === 'end' || cleared) ? '' : claudeDot(src, payload);
-  if (dot !== null && !noop) {
-    require('node:child_process').execFileSync('tmux', ['set-option', '-w', '-t', pane, '@claude_dot', dot], { stdio: 'ignore', timeout: 1000 });
-  }
-} catch { /* 不在 tmux / tmux 不可达 → 忽略 */ }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "handmux",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Mobile vibe coding — drive your real tmux session (and Claude Code) from your phone.",
   "type": "module",
   "license": "AGPL-3.0-only",
@@ -24,7 +24,6 @@
     "bin",
     "src",
     "hooks",
-    "tmux",
     "public",
     "README.zh-CN.md"
   ],