@keeroklab/cli 0.5.1 → 0.6.0

package/README.md

@@ -6,16 +6,32 @@ Students connect to a supervised session where the instructor can monitor termin
 
 ## Quick Start
 
+Your instructor will provide the `<token>` via email or the session page.
+
+### macOS / Linux (no install needed)
+
 ```bash
-npx @keeroklab/cli connect <token> --server https://keerok.tech
+curl -fsSL https://keerok.tech/lab/install.sh | bash -s -- <TOKEN>
 ```
 
-Your instructor will provide the `<token>` via email or the session page.
+This will automatically download Node.js if it's not installed on your machine.
+
+### Windows (PowerShell)
+
+```powershell
+irm https://keerok.tech/lab/install.ps1 -OutFile keerok.ps1; .\keerok.ps1 <TOKEN>
+```
+
+### If you already have Node.js
+
+```bash
+npx @keeroklab/cli connect <token> --server https://keerok.tech
+```
 
 ## Requirements
 
-- **Node.js 18+** — [Download](https://nodejs.org)
 - A terminal (macOS Terminal, iTerm2, Windows Terminal, etc.)
+- Node.js 18+ is downloaded automatically if not present
 
 ## What happens when you connect
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keeroklab/cli",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "CLI wrapper for Keerok Lab — live Claude Code supervision",
   "type": "module",
   "bin": {

package/src/index.js

@@ -12,6 +12,19 @@ program
   .description('CLI wrapper for Keerok Lab — live Claude Code supervision')
   .version('0.1.0');
 
+/**
+ * Extract a Claude Code resume session ID from terminal output.
+ * Claude prints: "Resume this session with:\n  claude --resume <uuid>"
+ * Output may contain ANSI escape codes from the PTY.
+ */
+function extractResumeId(output) {
+  const clean = output.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '');
+  const match = clean.match(
+    /--resume\s+([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/
+  );
+  return match ? match[1] : null;
+}
+
 program
   .command('connect')
   .description('Connect to a lab session')
@@ -87,24 +100,50 @@ program
       console.log(`Starting: ${options.command}`);
       console.log('─'.repeat(50) + '\n');
 
-      // Step 3: Spawn PTY with the command
-      const pty = spawnPty(options.command, {
-        onData: (data) => {
-          // Forward terminal output to server
-          ws.send({
-            type: 'terminal_output',
-            data: Buffer.from(data).toString('base64'),
-          });
-        },
-        onResize: (cols, rows) => {
-          ws.send({ type: 'terminal_resize', cols, rows });
-        },
-        onExit: (code) => {
-          console.log(`\n\nProcess exited with code ${code}`);
-          ws.close();
-          process.exit(code);
-        },
-      });
+      // Step 3: Spawn PTY with resume support
+      let outputBuffer = '';
+      const MAX_BUFFER = 4096;
+      let currentPty = null;
+
+      function spawnClaude(resumeId = null) {
+        const cmd = resumeId
+          ? `${options.command} --resume ${resumeId}`
+          : options.command;
+        outputBuffer = '';
+
+        currentPty = spawnPty(cmd, {
+          onData: (data) => {
+            // Maintain rolling buffer for resume ID detection
+            outputBuffer += data;
+            if (outputBuffer.length > MAX_BUFFER) {
+              outputBuffer = outputBuffer.slice(-MAX_BUFFER);
+            }
+            // Forward terminal output to server
+            ws.send({
+              type: 'terminal_output',
+              data: Buffer.from(data).toString('base64'),
+            });
+          },
+          onResize: (cols, rows) => {
+            ws.send({ type: 'terminal_resize', cols, rows });
+          },
+          onExit: (code) => {
+            const detectedResumeId = extractResumeId(outputBuffer);
+
+            if (detectedResumeId) {
+              console.log('\n🔄 Resuming Claude Code session...\n');
+              ws.send({ type: 'session_resumed', resume_id: detectedResumeId });
+              setTimeout(() => spawnClaude(detectedResumeId), 1000);
+            } else {
+              console.log(`\n\nProcess exited with code ${code}`);
+              ws.close();
+              process.exit(code);
+            }
+          },
+        });
+      }
+
+      spawnClaude();
 
       // Heartbeat every 30s
       const heartbeat = setInterval(() => {
@@ -114,7 +153,7 @@ program
       // Handle SIGINT gracefully
       process.on('SIGINT', () => {
         clearInterval(heartbeat);
-        pty.kill();
+        if (currentPty) currentPty.kill();
         ws.close();
         process.exit(0);
       });

package/src/pty-capture.js

@@ -31,30 +31,36 @@ export function spawnPty(command, handlers) {
     handlers.onData?.(data);
   });
 
-  child.onExit(({ exitCode }) => {
-    handlers.onExit?.(exitCode ?? 0);
-  });
-
   // Forward stdin to child
+  const stdinHandler = (data) => {
+    child.write(data.toString());
+  };
+
   if (process.stdin.isTTY) {
     process.stdin.setRawMode(true);
   }
   process.stdin.resume();
-  process.stdin.on('data', (data) => {
-    child.write(data.toString());
-  });
+  process.stdin.on('data', stdinHandler);
 
   // Handle terminal resize
-  process.stdout.on('resize', () => {
+  const resizeHandler = () => {
     const newCols = process.stdout.columns;
     const newRows = process.stdout.rows;
     child.resize(newCols, newRows);
     handlers.onResize?.(newCols, newRows);
-  });
+  };
+  process.stdout.on('resize', resizeHandler);
 
   // Send initial size
   handlers.onResize?.(cols, rows);
 
+  child.onExit(({ exitCode }) => {
+    // Clean up listeners to prevent leaks on respawn
+    process.stdin.removeListener('data', stdinHandler);
+    process.stdout.removeListener('resize', resizeHandler);
+    handlers.onExit?.(exitCode ?? 0);
+  });
+
   return {
     kill() {
       child.kill();