@keeroklab/cli 0.1.1 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keeroklab/cli",
-  "version": "0.1.1",
+  "version": "0.3.0",
   "description": "CLI wrapper for Keerok Lab — live Claude Code supervision",
   "type": "module",
   "bin": {
@@ -12,7 +12,14 @@
   "files": [
     "src/"
   ],
-  "keywords": ["claude", "lab", "supervision", "terminal", "claude-code", "keerok"],
+  "keywords": [
+    "claude",
+    "lab",
+    "supervision",
+    "terminal",
+    "claude-code",
+    "keerok"
+  ],
   "author": "Keerok <hello@keerok.tech> (https://keerok.tech)",
   "repository": {
     "type": "git",
@@ -24,10 +31,9 @@
   },
   "license": "MIT",
   "dependencies": {
+    "chalk": "^5.3.0",
     "commander": "^12.0.0",
-    "node-pty": "^1.0.0",
-    "ws": "^8.16.0",
-    "chalk": "^5.3.0"
+    "ws": "^8.16.0"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/index.js

@@ -39,13 +39,20 @@ program
         console.log(`\n📋 Instructions:\n${config.instructions}\n`);
       }
 
-      // Step 2: Connect WebSocket
+      // Step 2: Connect WebSocket and wait for session config
+      let resolveConfig;
+      const configReady = new Promise((resolve, reject) => {
+        resolveConfig = resolve;
+        setTimeout(() => reject(new Error('Timed out waiting for session config (5s)')), 5000);
+      });
+
       const ws = createWsClient(config.ws_url, {
         onSessionConfig: (data) => {
           // API key received — inject into environment
           if (data.api_key) {
             process.env.ANTHROPIC_API_KEY = data.api_key;
           }
+          resolveConfig(data);
         },
         onBudgetWarning: (data) => {
           console.log(`\n⚠️  Budget warning: $${data.remaining_usd.toFixed(2)} remaining (${data.percentage.toFixed(0)}% used)\n`);
@@ -70,9 +77,12 @@ program
         },
       });
 
-      // Wait for WS connection
+      // Wait for WS connection, then wait for session_config (API key)
       await ws.waitForConnection();
-      console.log('🔗 WebSocket connected\n');
+      console.log('🔗 WebSocket connected');
+      console.log('⏳ Waiting for session config...');
+      await configReady;
+      console.log('🔑 Session config received\n');
       console.log('─'.repeat(50));
       console.log(`Starting: ${options.command}`);
       console.log('─'.repeat(50) + '\n');

package/src/pty-capture.js

@@ -1,59 +1,60 @@
 /**
- * pty-capture.js — Spawns a PTY process and captures output.
- * Uses node-pty to create a pseudo-terminal that captures all output
- * including ANSI escape codes, colors, and cursor movements.
+ * pty-capture.js — Spawns a process and captures output.
+ * Uses child_process.spawn with pipes to capture terminal output
+ * and forward it to both stdout and the WebSocket handler.
  */
 
-import pty from 'node-pty';
+import { spawn } from 'child_process';
 import os from 'os';
 
 export function spawnPty(command, handlers) {
   const shell = os.platform() === 'win32' ? 'powershell.exe' : process.env.SHELL || '/bin/bash';
-  const args = command === shell ? [] : ['-c', command];
-  const useShell = command !== shell;
-
   const cols = process.stdout.columns || 80;
   const rows = process.stdout.rows || 24;
 
-  const term = pty.spawn(
-    useShell ? shell : command,
-    useShell ? args : [],
-    {
-      name: 'xterm-256color',
-      cols,
-      rows,
-      cwd: process.cwd(),
-      env: {
-        ...process.env,
-        TERM: 'xterm-256color',
-      },
-    }
-  );
+  const child = spawn(shell, ['-c', command], {
+    stdio: ['pipe', 'pipe', 'pipe'],
+    cwd: process.cwd(),
+    env: {
+      ...process.env,
+      TERM: 'xterm-256color',
+      FORCE_COLOR: '1',
+      COLUMNS: String(cols),
+      LINES: String(rows),
+    },
+  });
 
-  // Forward PTY output to both stdout and the handler
-  term.onData((data) => {
+  // Forward stdout to both terminal and handler
+  child.stdout.on('data', (data) => {
     process.stdout.write(data);
-    handlers.onData?.(data);
+    handlers.onData?.(data.toString());
   });
 
-  term.onExit(({ exitCode }) => {
-    handlers.onExit?.(exitCode);
+  // Forward stderr to both terminal and handler
+  child.stderr.on('data', (data) => {
+    process.stderr.write(data);
+    handlers.onData?.(data.toString());
   });
 
-  // Forward stdin to PTY
+  child.on('exit', (code) => {
+    handlers.onExit?.(code ?? 0);
+  });
+
+  // Forward stdin to child
   if (process.stdin.isTTY) {
     process.stdin.setRawMode(true);
   }
   process.stdin.resume();
   process.stdin.on('data', (data) => {
-    term.write(data.toString());
+    if (child.stdin.writable) {
+      child.stdin.write(data);
+    }
   });
 
   // Handle terminal resize
   process.stdout.on('resize', () => {
     const newCols = process.stdout.columns;
     const newRows = process.stdout.rows;
-    term.resize(newCols, newRows);
     handlers.onResize?.(newCols, newRows);
   });
 
@@ -62,13 +63,15 @@ export function spawnPty(command, handlers) {
 
   return {
     kill() {
-      term.kill();
+      child.kill();
     },
     write(data) {
-      term.write(data);
+      if (child.stdin.writable) {
+        child.stdin.write(data);
+      }
     },
-    resize(cols, rows) {
-      term.resize(cols, rows);
+    resize() {
+      // child_process doesn't support resize, but we notify the handler
     },
   };
 }