@ucsandman/legcli 0.14.0 → 0.15.1

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 }
 }

package/src/usage.mjs

@@ -21,8 +21,9 @@ import { join } from 'node:path'
 import { home } from './store.mjs'
 import { writeJsonAtomic, withFileLock } from './fsx.mjs'
 import { AGENTS } from './sessions.mjs'
-import { ACCOUNT_NAME_RE } from './accounts.mjs'
+import { ACCOUNT_NAME_RE, transcriptReachable } from './accounts.mjs'
 import { rungCost, staticCost } from './preferences.mjs'
+import { isDownshift } from './buckets.mjs'
 
 export const WARN_PCT = Number((process.env.LEG_WARN_PCT || process.env.BATON_WARN_PCT) || 85)
 // A limit hit with no reset time from the agent: assume the 5-hour window.
@@ -464,6 +465,31 @@ export function rungLabel(r) {
   return `${r.agent}${r.account && r.account !== 'default' ? '/' + r.account : ''}${r.model ? '/' + r.model : ''}`
 }
 
+// The hand-off that keeps the conversation instead of taking the bundle: the
+// next leg starts `claude --resume <id>` inside the same transcript, so nothing
+// is re-explained. Two cases, one rule, read by the terminal (src/attach.mjs)
+// and by the board's picker (src/server.mjs) so the row and the switch agree:
+//   1. a downshift on the same login (fixtures/live/claude/resume-model-probe.json:
+//      the conversation survives and only the new model answers; an upshift
+//      would re-read the whole context at the stronger model's price, so it
+//      takes the bundle);
+//   2. another login of the same agent whose home can see the transcript
+//      (the `projects` junction src/accounts.mjs cuts for every account). A
+//      weekly or Fable wall on one 20x login then moves the terminal to the
+//      other login with the conversation it already had, at whatever model the
+//      rung names or the destination's own default.
+// codex has a `resume` subcommand too, but composing it with `-m` and with a
+// second CODEX_HOME is unobserved, so codex never claims to keep anything.
+export function keepsConversation({ from, to, session }) {
+  if (!session?.agent_session_id || !from || !to) return false
+  if (from.agent !== 'claude' || to.agent !== 'claude') return false
+  if (isDownshift(from, to)) return true
+  const a = from.account ?? 'default'
+  const b = to.account ?? 'default'
+  if (a === b) return false
+  return transcriptReachable('claude', session.transcript_path, { from: a, to: b })
+}
+
 // One ledger line for a rung that was passed over. Exact wording matters: this
 // is what the terminal and the card say instead of going somewhere unexplained.
 export function skipLine(r) {