@ucsandman/legcli 0.15.0 → 0.15.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.15.1 (2026-09-19)
+
+Your own Claude Code status line comes back.
+
+- **Your status line runs first.** `leg claude` passes a `statusLine` through
+  `--settings`, and that key replaces yours rather than merging. Leg has
+  always read your `statusLine` command, but it only ever used its `padding`;
+  the command itself never ran, so on a build that honours a `--settings`
+  status line you saw Leg's row instead of your own. The command is now kept
+  on the session record and Leg's status-line hook runs it with the same JSON
+  Claude Code sends, printing its rows above Leg's one line. Reported by a
+  baton user on Discord. Claude Code 2.1.278 on Windows still shows its
+  built-in status line in place of any custom one passed this way, so the 5h
+  and 7d numbers keep coming from the usage endpoint (docs/faq.md).
+
 ## 0.15.0 (2026-09-18)
 
 A second login keeps the conversation, and the runtime does less work per

package/docs/DEVIATIONS.md

@@ -104,6 +104,7 @@ shape differs from what the plan assumed. Same columns as the table above.
 |------|------|---------------|-------------|-----|
 | 2026-09-11 | bin/leg.mjs `simulate-limit` | "sends a real StopFailure payload with error rate_limit through src/hook.mjs" | the payload carries `baton_simulated: true`; the hook records the wall with a 2-minute reset instead of the default 5 h, never keeps it as live evidence, and the event says `(simulated)`; agy gets the RESOURCE_EXHAUSTED line appended to its Leg-owned session log; codex is refused (its wall lives in a rollout file Leg never writes) with `leg sessions handoff` as the alternative | a test must never wall the real claude login for five hours, and a simulated payload must never flip a docs row to observed-live |
 | 2026-09-11 | src/live-capture.mjs | "save that payload under fixtures/live/" | `fixtures/live/<agent>/limit-<signal>.json` only in a dev clone (the checkout has `.git` and `fixtures/live/`), else `~/.leg/live/`; `LEG_LIVE_DIR` overrides; first arrival per (agent, signal) wins; docs rows flip through `scripts/live-limits.mjs` markers (`<!-- live:<agent>/<signal> -->`) in the same call | an installed package has no writable fixtures directory, and a doc row must flip from evidence on disk, not from memory |
+| 2026-09-19 | src/taps/claude.mjs `writeSettings`, src/hook.mjs | the user's own `statusLine` command runs first (claimed in the file header since baton 0.2.0) | it was read only for its `padding`; the command is now kept on the session record (`user_statusline`) and the status-line hook runs it with the same stdin, printing its rows above Leg's | a baton user reported on Discord (2026-09-19) that baton replaced the status line they had configured; on a build that honours a `--settings` status line, Leg's row displaced theirs |
 | 2026-09-11 | src/attach.mjs `spawnSpec` | the next agent starts with no args | `BATON_<AGENT>_ARGS` (space-separated) is prepended to a leg Leg starts itself after a hand-off; the user's own `baton <agent> …` args still never carry over | the live test had to keep the handed-off leg on a cheap model, and a user has the same need for a chain |
 | 2026-09-11 | src/taps/codex.mjs | the first `role: user` message is the task | a message starting `# AGENTS.md instructions` is skipped like `<environment_context>` | observed live 2026-09-11: codex prepends the AGENTS.md block as the first user message of every rollout, so the card's task read as the instructions file |
 | 2026-09-11 | src/attach.mjs, src/wait.mjs | all out: print the reset times and exit 3 | status `waiting` with `session.waiting = { agent, account, resets_at, since }`; a one-line countdown on stderr (rewritten in place on a TTY, once a minute otherwise); at the reset the chooser runs again and the first option back starts from the bundle; Ctrl-C or a board End quits with exit 3 and an `ended` event "quit while waiting" | the terminal is where the work is; quitting hands the human a restart to type at the reset time |

package/docs/adapters.md

@@ -55,8 +55,11 @@ documentation say docs-only.
   `src/hook.mjs`.
 - **Why not the status line.** Leg writes a `statusLine` entry into the same
   settings file that would record `rate_limits.five_hour.used_percentage` and
-  `resets_at`, and chains your own `statusLine` command first. Claude Code
-  2.1.268 did not run it when it was tried on this machine: an `echo` command
+  `resets_at`, and runs your own `statusLine` command first, its rows above
+  Leg's one (since 0.15.1; before that your command was read and never run,
+  so a build that honours the key showed Leg's row instead of yours). Claude
+  Code 2.1.268 and 2.1.278 did not run it when it was tried on this machine
+  (2026-09-11, 2026-09-19): an `echo` command
   passed through `--settings` and again through a project
   `.claude/settings.local.json` left the built-in status line in place, while
   hooks from the same `--settings` file fired. No artifact of that check was

package/docs/cli-contracts.md

@@ -246,10 +246,16 @@ variable and `LEG_SESSION` (source: src/attach.mjs, src/env.mjs).
 - Attach: `claude <args> -n "leg#<short id> <repo>/<branch>" --settings <LEG_HOME>/sessions/<id>/claude-settings.json`
   (source: src/attach.mjs `spawnSpec`; src/taps/claude.mjs `writeSettings`).
   Hooks in a `--settings` file merge with the user's rather than replacing
-  them; `statusLine` is the one key that replaces, so Leg runs the user's own
-  command first (source: code.claude.com/docs/en/settings;
-  src/taps/claude.mjs `userStatusLine`). observed-live 2026-09-11: a Leg
-  session ran with every user hook still firing.
+  them; `statusLine` is the one key that replaces, so Leg keeps the user's own
+  command on the session record (`user_statusline`) and its status-line hook
+  runs that command with the same stdin JSON, printing its rows above Leg's
+  one (source: code.claude.com/docs/en/settings, docs/en/statusline "Display
+  multiple lines"; src/taps/claude.mjs `userStatusLine`, `userStatusLineText`;
+  src/hook.mjs). Before 0.15.1 the user's command was read only for its
+  `padding` and never run, so a build that honours a `--settings` status line
+  showed Leg's row in place of the user's (reported by a baton user,
+  2026-09-19). observed-live 2026-09-11: a Leg session ran with every user
+  hook still firing.
 - Terminal title: `-n, --name <name>` "Set a display name for this session
   (shown in the prompt box, /resume picker, and terminal title)" —
   fixtures/help/claude.txt line 132. It sits in the general Options block, not
@@ -327,11 +333,13 @@ variable and `LEG_SESSION` (source: src/attach.mjs, src/env.mjs).
   path can also be run live with `leg sessions simulate-limit` (the same
   payload through `src/hook.mjs`, marked `leg_simulated`, never kept as
   evidence).
-- Status line, not usable on 2.1.268: a custom `statusLine` command passed
+- Status line, not usable on 2.1.268 or 2.1.278: a custom `statusLine` command passed
   through `--settings`, and again through a project
   `.claude/settings.local.json`, was not run at all when it was tried; an
   `echo` command at both levels left the built-in status line in place while
-  hooks from the same `--settings` file fired (no artifact kept; note in the
+  hooks from the same `--settings` file fired (probed again 2026-09-19 on
+  2.1.278 with a screenshot of two haiku sessions, not kept; 0 of 87 session
+  hook logs on this machine hold a statusline entry; note in the
   src/taps/claude-usage.mjs header, 2026-09-11). Leg still writes the
   `statusLine` entry, which records the
   same `rate_limits.five_hour` / `seven_day` fields

package/docs/faq.md

@@ -20,14 +20,15 @@ launch, and does not count as a usage limit.
 
 **Why does Leg poll an endpoint for claude's usage instead of reading the
 status line?**
-Because Claude Code 2.1.268 did not run a custom status line from a settings
-file Leg controls when this was tried on 2026-09-11 (recorded in
+Because Claude Code 2.1.268 and 2.1.278 did not run a custom status line from a settings
+file Leg controls when this was tried on 2026-09-11 and 2026-09-19 (recorded in
 [DEVIATIONS.md](DEVIATIONS.md)); hooks from the same `--settings` file did
 fire. So the numbers come from
 `GET api.anthropic.com/api/oauth/usage` with the login Claude Code already
 stored, which is the same data `/usage` shows. Leg still writes the
 `statusLine` entry, so the endpoint poll becomes a fallback the moment a build
-honours it, and your own status-line command is chained first either way. See
+honours it, and your own status-line command runs first, its rows above
+Leg's one, either way (since 0.15.1). See
 [adapters.md](adapters.md#claude) and `src/taps/claude-usage.mjs`.
 
 **Why does codex get no hook when claude does?**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucsandman/legcli",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Usage-limit monitor and automatic handoff for Claude Code, Codex, agy and Grok. Type leg claude|codex|agy|grok and get the same interactive agent with a board alongside, auto-approve on by default, usage tracking per agent and account, a live context handoff bundle, and at the limit the next agent continuing in the same terminal. 14-day free trial, then $79 once, 30-day money-back guarantee.",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",

package/src/board/board.js

@@ -68,7 +68,7 @@
   // release lands on disk under a board that was started before it: the page
   // then draws controls the process has no routes for (an empty agent select,
   // no buckets). test/files-version.test.mjs pins this to package.json.
-  const FILES_VERSION = '0.15.0'
+  const FILES_VERSION = '0.15.1'
   const TIMELINE_CAP = 12
   // mirrors LOOPBACK in src/auth.mjs; state.bind is "<host>:<port>" and an IPv6
   // host arrives bracketed

package/src/board/floor.js

@@ -50,7 +50,7 @@
   // name. test/board-updates.test.mjs pins `state.stopped` in this file by
   // source text, which is why the module object keeps the name.
   // pinned to package.json by test/files-version.test.mjs; see board.js FILES_VERSION
-  const FILES_VERSION = '0.15.0'
+  const FILES_VERSION = '0.15.1'
   const state = { es: null, retryMs: 1000, timers: [], stopped: false, sseRequest: 0, floorRequest: 0, trunkRequest: 0, headRequest: 0, cardsRequest: 0, lastReadingAt: null, bind: (typeof location !== 'undefined' && location.host) || '127.0.0.1:4747', pendingFloor: null, pendingCards: null, cards: new Map(), blockers: new Map(), doneOpen: false, ringId: null, scheduler: {}, trunkOff: false }
 
   // What the entry row reads on every render: the terminals (for the repo it

package/src/hook.mjs

@@ -6,7 +6,8 @@
 //   node hook.mjs claude-hook --session <id>
 //   node hook.mjs claude-statusline --session <id>
 // The status line entry records rate_limits when a Claude Code build runs it
-// (2.1.268 does not; see src/taps/claude-usage.mjs) and prints one Leg line.
+// (2.1.268 and 2.1.278 did not on this machine; see src/taps/claude-usage.mjs),
+// prints the user's own status line first, then one Leg line.
 import { appendFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { handleHook, handleStatusline, terminalSequenceFor } from './taps/claude.mjs'
@@ -47,9 +48,9 @@ try {
     const seq = terminalSequenceFor(payload)
     if (seq) process.stdout.write(JSON.stringify({ terminalSequence: seq }) + '\n')
   } else if (kind === 'claude-statusline') {
-    const { text } = handleStatusline(sessionId, payload)
-    try { appendFileSync(join(sessionDir(sessionId), 'hook.log'), `${new Date().toISOString()} statusline rate_limits=${JSON.stringify(payload.rate_limits ?? null)}\n`) } catch {}
-    process.stdout.write(text + '\n')
+    const { text, user } = handleStatusline(sessionId, payload, raw)
+    try { appendFileSync(join(sessionDir(sessionId), 'hook.log'), `${new Date().toISOString()} statusline rate_limits=${JSON.stringify(payload.rate_limits ?? null)} user_rows=${user ? user.split('\n').length : 0}\n`) } catch {}
+    process.stdout.write((user ? user + '\n' : '') + text + '\n')
   }
 } catch {}
 process.exit(0)

package/src/taps/claude-usage.mjs

@@ -1,9 +1,10 @@
 // claude usage — the 5h / 7d percentages for a Claude Code login, from the
 // same endpoint Claude Code's own /usage and built-in status line read.
-// Why not the status line: Claude Code 2.1.268 renders its built-in status
-// line and does not run a custom `statusLine` command passed via --settings
-// or a project settings file (verified 2026-09-11 with an `echo` command at
-// both levels; hooks from the same --settings file do run). So Leg asks the
+// Why not the status line: Claude Code 2.1.268 and 2.1.278 render their
+// built-in status line and do not run a custom `statusLine` command passed
+// via --settings or a project settings file (verified 2026-09-11 and
+// 2026-09-19 with an `echo` command at both levels; hooks from the same
+// --settings file do run). So Leg asks the
 // usage endpoint directly with the OAuth token Claude Code stored at login.
 // The token is read by this process only, sent only to api.anthropic.com,
 // and never written anywhere (the ledger scrubs bearer tokens regardless).

package/src/taps/claude.mjs

@@ -1,11 +1,13 @@
 // claude tap — how `leg claude` sees inside a normal interactive Claude Code.
 // Nothing in ~/.claude is edited: the session gets one extra settings file via
 // `--settings` (hooks merge with the user's; statusLine is the only key that
-// replaces, so Leg's status line runs the user's own command first).
+// replaces, so Leg's status-line hook runs the user's own command with the
+// same stdin and prints its rows above Leg's one line).
 // Sources: code.claude.com/docs/en/hooks (StopFailure `error: rate_limit`),
 // docs/en/statusline (rate_limits.five_hour/seven_day used_percentage,
 // resets_at), docs/en/settings (`--settings` sits above user settings).
 import { existsSync, readFileSync, openSync, closeSync, fstatSync, readSync } from 'node:fs'
+import { spawnSync } from 'node:child_process'
 import { join, dirname, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { sessionDir, updateSession, appendEvent, readSession, workRoot } from '../sessions.mjs'
@@ -64,12 +66,37 @@ export function settingsFor(sessionId, { statusLine = null } = {}) {
   return settings
 }
 
-export function writeSettings(sessionId, opts) {
+export function writeSettings(sessionId, opts = {}) {
   const file = join(sessionDir(sessionId), 'claude-settings.json')
   writeJsonAtomic(file, settingsFor(sessionId, opts))
+  // the hook process reads this back to run the user's command (see userStatusLineText)
+  if (opts.statusLine?.command) updateSession(sessionId, { user_statusline: { command: opts.statusLine.command } })
   return file
 }
 
+// The shell Claude Code itself uses for a status-line command: /bin/sh, or on
+// Windows Git Bash when installed, else PowerShell (docs/en/statusline,
+// "Windows configuration").
+function statusLineShell(command) {
+  if (process.platform !== 'win32') return { file: '/bin/sh', args: ['-c', command] }
+  const bash = process.env.CLAUDE_CODE_GIT_BASH_PATH || 'C:\\Program Files\\Git\\bin\\bash.exe'
+  if (existsSync(bash)) return { file: bash, args: ['-c', command] }
+  return { file: 'powershell', args: ['-NoProfile', '-Command', command] }
+}
+
+// The user's own status line, rendered: their command gets the same JSON on
+// stdin Claude Code handed Leg, and whatever it prints goes above Leg's row.
+// Never throws; an absent, slow (3 s) or broken command yields ''.
+export function userStatusLineText(session, raw) {
+  const command = session?.user_statusline?.command
+  if (!command) return ''
+  try {
+    const { file, args } = statusLineShell(command)
+    const r = spawnSync(file, args, { input: raw ?? '', encoding: 'utf8', timeout: 3000, windowsHide: true })
+    return String(r.stdout ?? '').replace(/\s+$/, '')
+  } catch { return '' }
+}
+
 function textOf(content) {
   if (typeof content === 'string') return content
   if (Array.isArray(content)) return content.filter((c) => c?.type === 'text' && c.text).map((c) => c.text).join('\n')
@@ -288,10 +315,11 @@ export function relTo(root, file) {
   return r && a.toLowerCase().startsWith(r.toLowerCase() + '/') ? a.slice(r.length + 1) : a
 }
 
-// Status line: record the limits and print. Returns the text to print.
-export function handleStatusline(sessionId, p) {
+// Status line: record the limits and print. Returns Leg's row as `text` and
+// the user's own status line (from `raw`, the stdin JSON) as `user`.
+export function handleStatusline(sessionId, p, raw = '') {
   const s = readSession(sessionId)
-  if (!s) return { text: '', limits: null }
+  if (!s) return { text: '', user: '', limits: null }
   const limits = limitsFrom(p.rate_limits)
   if (limits) recordUsage('claude', s.account, limits, 'claude statusline')
   const hot = limits ? [['5h', limits.five_hour], ['7d', limits.seven_day]].filter(([, w]) => w).sort((a, b) => b[1].pct - a[1].pct)[0] : null
@@ -312,5 +340,5 @@ export function handleStatusline(sessionId, p) {
   const next = s.chain?.[0] ? `${s.chain[0].agent}${s.chain[0].account !== 'default' ? '/' + s.chain[0].account : ''}` : 'nothing'
   const pct = limits ? ` 5h ${limits.five_hour ? Math.round(limits.five_hour.pct) + '%' : '-'} · 7d ${limits.seven_day ? Math.round(limits.seven_day.pct) + '%' : '-'}` : ''
   const text = warn ? `⚠ leg: ${hot[0]} at ${Math.round(hot[1].pct)}% → next ${next}${pct}` : `leg ·${pct || ' limits pending'} · next ${next} · board ${s.board_url ?? ''}`
-  return { text, limits, warn }
+  return { text, user: userStatusLineText(s, raw), limits, warn }
 }