claude-code-remote-pilot 0.2.10 → 0.2.12

package/bin/claude-pilot.js

@@ -32,11 +32,14 @@ function tmuxInstallCmd() {
   return 'sudo apt-get install -y tmux';
 }
 
+function isYes(answer) { return answer === '' || answer === 'y' || answer === 'yes'; }
+function isNo(answer)  { return answer === '' || answer === 'n' || answer === 'no'; }
+
 async function ensureDep(rl, cmd, label, installCmd) {
   if (has(cmd)) return;
   console.log(`\n${label} is not installed.`);
-  const answer = await question(rl, 'Install it now? (y/n) ');
-  if (answer !== 'y' && answer !== 'yes') {
+  const answer = await question(rl, 'Install it now? (Y/n) ');
+  if (!isYes(answer)) {
     console.log(`Run manually: ${installCmd}`);
     process.exit(1);
   }
@@ -67,8 +70,8 @@ async function setupTelegram(rl) {
     return saved;
   }
   console.log('\nTelegram notifications (optional).');
-  const answer = await question(rl, 'Set up Telegram now? (y/n) ');
-  if (answer !== 'y' && answer !== 'yes') { console.log('Skipping.\n'); return {}; }
+  const answer = await question(rl, 'Set up Telegram now? (y/N) ');
+  if (answer === '' || !isYes(answer)) { console.log('Skipping.\n'); return {}; }
   const token = await questionRaw(rl, 'Bot token: ');
   const chatId = await questionRaw(rl, 'Chat ID: ');
   config.saveTelegram(token, chatId);
@@ -118,14 +121,25 @@ function uptime(startedAt) {
   return `${Math.floor(s / 3600)}h ${Math.floor((s % 3600) / 60)}m`;
 }
 
+function formatUsage(session) {
+  if (session.status === 'limit' && session.resetTime) {
+    return `resets ${session.resetTime}`;
+  }
+  if (session.tokens) {
+    return `↑${session.tokens.sent} ↓${session.tokens.received}`;
+  }
+  return '';
+}
+
 function renderTable(sessions) {
-  const NW = 18, SW = 14, UW = 8;
-  const bar = '  ' + '─'.repeat(NW + SW + UW + 34);
-  const header = `  ${'SESSION'.padEnd(NW)}  ${'STATUS'.padEnd(SW)}  ${'UP'.padEnd(UW)}  DIRECTORY`;
+  const NW = 18, SW = 14, UW = 7, TW = 16;
+  const bar = '  ' + '─'.repeat(NW + SW + UW + TW + 10);
+  const header = `  ${'SESSION'.padEnd(NW)}  ${'STATUS'.padEnd(SW)}  ${'UP'.padEnd(UW)}  ${'USAGE / RESET'.padEnd(TW)}`;
   const rows = sessions.map(s => {
     const { plain, colored } = formatStatus(s);
     const pad = ' '.repeat(Math.max(0, SW - plain.length));
-    return `  ${trunc(s.name, NW)}  ${colored}${pad}  ${uptime(s.startedAt).padEnd(UW)}  ${trunc(s.path, 32)}`;
+    const usage = formatUsage(s);
+    return `  ${trunc(s.name, NW)}  ${colored}${pad}  ${uptime(s.startedAt).padEnd(UW)}  ${trunc(usage, TW)}`;
   });
   const footer = `  ${sessions.length} session${sessions.length !== 1 ? 's' : ''}   ${new Date().toLocaleTimeString()}   q to exit`;
   return ['\n', '  Claude Code Remote Pilot', bar, header, bar, ...rows, bar, footer, ''].join('\n');
@@ -169,8 +183,8 @@ async function handleExit(manager, rl) {
     console.log('');
     process.exit(0);
   }
-  const answer = await questionRaw(rl, `\n  Kill all ${sessions.length} session(s) before exiting? (y/n) `);
-  if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
+  const answer = await question(rl, `\n  Kill all ${sessions.length} session(s) before exiting? (y/N) `);
+  if (isYes(answer) && answer !== '') {
     manager.killAll();
     config.clearSessions();
     console.log('  All sessions killed.\n');
@@ -318,8 +332,8 @@ ${HELP}`);
   if (savedSessions.length) {
     console.log(`\n  Found ${savedSessions.length} session(s) still running from last time:`);
     savedSessions.forEach(s => console.log(`    ${s.name.padEnd(22)} ${s.path}`));
-    const recover = await question(setupRl, '  Re-adopt and watch them? (y/n) ');
-    if (recover === 'y' || recover === 'yes') {
+    const recover = await question(setupRl, '  Re-adopt and watch them? (Y/n) ');
+    if (isYes(recover)) {
       savedSessions.forEach(s => {
         try { manager.adopt(s.name, s.path); console.log(`  ✓ Re-adopted "${s.name}"`); }
         catch (e) { console.log(`  ✗ Could not adopt "${s.name}": ${e.message}`); }
@@ -330,9 +344,9 @@ ${HELP}`);
 
   const cwd = process.cwd();
   const defaultName = path.basename(cwd);
-  const mount = await question(setupRl, `Mount current directory as a session? (${defaultName}) [y/n] `);
+  const mount = await question(setupRl, `Mount current directory as a session? (${defaultName}) [Y/n] `);
 
-  if (mount === 'y' || mount === 'yes') {
+  if (isYes(mount)) {
     const rawName = await questionRaw(setupRl, `Session name [${defaultName}]: `);
     const session = manager.spawn(cwd, rawName || defaultName);
     console.log(`  ✓ "${session.name}" started at ${session.path}`);

package/lib/Watcher.js

@@ -4,12 +4,13 @@ const crypto = require('crypto');
 const notifier = require('./notifier');
 
 const LIMIT_RE = /hit your limit|usage limit|rate limit|limit reached|try again|resets/i;
-// Checked against full capture — these messages persist on screen
 const RESPONSE_RE = /do you want to proceed|esc to cancel|ctrl\+e to explain|❯\s*\d+\.\s*yes/i;
-// Checked against last 5 lines only — footer disappears when Claude finishes
 const RUNNING_RE = /esc to interrupt/i;
-// Checked against the single last non-empty line
 const IDLE_RE = /^\s*>\s*$/;
+// Claude Code footer: "tokens: ↑1,234 ↓567" or "↑1.2k ↓890"
+const TOKEN_RE = /↑\s*([\d.,]+[km]?)\s*↓\s*([\d.,]+[km]?)/i;
+// Limit reset time: "resets at 2:00 AM" or "resets at 14:30"
+const RESET_AT_RE = /resets?\s+(?:at\s+)?(\d{1,2}:\d{2}\s*(?:am|pm)?)/i;
 
 class Watcher {
   constructor(session, opts = {}) {
@@ -66,6 +67,21 @@ class Watcher {
     return this.fallbackWait;
   }
 
+  _parseResetTime(text) {
+    // "resets at 2:00 AM"
+    const atMatch = text.match(RESET_AT_RE);
+    if (atMatch) return atMatch[1].trim().toUpperCase();
+    // "try again in X minutes" — calculate clock time
+    const inMatch = text.match(/(?:try again|retry|wait).*?in\s+(\d+)\s*(second|minute|hour)/i);
+    if (inMatch) {
+      const v = parseInt(inMatch[1]);
+      const mult = inMatch[2].startsWith('second') ? 1 : inMatch[2].startsWith('minute') ? 60 : 3600;
+      const resetMs = Date.now() + v * mult * 1000;
+      return new Date(resetMs).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
+    }
+    return null;
+  }
+
   async _check() {
     if (this._busy) return;
     this._busy = true;
@@ -85,7 +101,13 @@ class Watcher {
       const lastLine = nonEmptyLines[nonEmptyLines.length - 1] || '';
       const recentLines = nonEmptyLines.slice(-5).join('\n');
 
-      // Track whether output is changing between checks
+      // Extract token usage from footer whenever Claude is running
+      const tokenMatch = recentLines.match(TOKEN_RE);
+      if (tokenMatch) {
+        this.session.tokens = { sent: tokenMatch[1], received: tokenMatch[2] };
+      }
+
+      // Track output stability
       const outputHash = this._hash(recentLines);
       if (outputHash === this._prevOutputHash) {
         this._outputUnchangedCount++;
@@ -128,13 +150,16 @@ class Watcher {
     if ((Date.now() / 1000) - this.lastResumeAt < this.cooldown) return;
 
     this.lastHash = hash;
-    this._outputUnchangedCount = 0; // reset — we're intentionally waiting
+    this._outputUnchangedCount = 0;
     const wait = this._parseWait(text);
+    const resetTime = this._parseResetTime(text);
+
     this.session.status = 'limit';
     this.session.resumeAt = Date.now() + wait * 1000;
+    this.session.resetTime = resetTime;
 
     notifier.send(this.telegram.token, this.telegram.chatId,
-      `Pilot: limit in "${this.session.name}". Waiting ${wait}s before resume.`);
+      `Pilot: limit in "${this.session.name}". Resets ${resetTime || `in ${Math.ceil(wait / 60)}m`}.`);
 
     await new Promise(r => setTimeout(r, wait * 1000));
 
@@ -144,6 +169,7 @@ class Watcher {
     this.lastResumeAt = Date.now() / 1000;
     this.session.status = 'running';
     this.session.resumeAt = null;
+    this.session.resetTime = null;
 
     notifier.send(this.telegram.token, this.telegram.chatId,
       `Pilot: resumed "${this.session.name}".`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-remote-pilot",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "Interactive Claude Code supervisor — spawn and monitor multiple Claude sessions from a single terminal.",
   "type": "commonjs",
   "bin": {