@juspay/shooter 1.0.0 → 1.2.0

package/src/lib/modules/server/terminal/pty-holder.cjs

@@ -15,7 +15,7 @@ const pty = require('node-pty');
 // Parse arguments
 // ---------------------------------------------------------------------------
 
-const [,, id, socketPath, cwd, colsStr, rowsStr, command, ...args] = process.argv;
+const [, , id, socketPath, cwd, colsStr, rowsStr, command, ...args] = process.argv;
 
 if (!id || !socketPath || !cwd || !colsStr || !rowsStr || !command) {
   process.stderr.write('pty-holder: missing required arguments\n');
@@ -31,6 +31,29 @@ const rows = parseInt(rowsStr, 10);
 
 const MAX_SCROLLBACK_LINES = 5000;
 const MAX_INPUT_BYTES = 65_536; // 64 KB — cap per-write to prevent memory abuse
+
+/**
+ * Truncate a string to at most maxBytes bytes without splitting a multi-byte
+ * UTF-8 character. String.prototype.slice() counts UTF-16 code units, not
+ * bytes, so a naive slice can produce more bytes than intended or cut a
+ * multi-byte character in half. This helper uses Buffer to measure byte length
+ * and binary-searches for the right code-unit boundary.
+ */
+function truncateUtf8(str, maxBytes) {
+  if (Buffer.byteLength(str, 'utf8') <= maxBytes) return str;
+  // Binary search for the largest code-unit prefix that fits
+  let lo = 0;
+  let hi = str.length;
+  while (lo < hi) {
+    const mid = (lo + hi + 1) >>> 1;
+    if (Buffer.byteLength(str.slice(0, mid), 'utf8') <= maxBytes) {
+      lo = mid;
+    } else {
+      hi = mid - 1;
+    }
+  }
+  return str.slice(0, lo);
+}
 const GRACE_PERIOD_MS = 60_000; // 60 seconds after PTY exit before self-terminating
 const ACTIVITY_IDLE_MS = 5_000; // 5 seconds of no output → idle
 
@@ -49,7 +72,7 @@ function pushScrollback(data) {
   while (scrollbackLineCount > MAX_SCROLLBACK_LINES && scrollbackChunks.length > 1) {
     const removed = scrollbackChunks.shift();
     if (removed) {
-      scrollbackLineCount -= (removed.split('\n').length - 1);
+      scrollbackLineCount -= removed.split('\n').length - 1;
     }
   }
 }
@@ -85,7 +108,11 @@ const ptyEnv = { ...process.env };
 
 // Clipboard image paste support: per-terminal clipboard directory
 const clipboardDir = path.join(os.tmpdir(), `shooter-clipboard-${id}`);
-try { fs.mkdirSync(clipboardDir, { recursive: true }); } catch { /* best effort */ }
+try {
+  fs.mkdirSync(clipboardDir, { recursive: true });
+} catch {
+  /* best effort */
+}
 ptyEnv.SHOOTER_CLIPBOARD_DIR = clipboardDir;
 
 // Prepend clipboard shim scripts to PATH so tools find our xclip/wl-paste
@@ -102,7 +129,10 @@ let spawnCommand;
 let spawnArgs;
 
 if (SHELL_COMMANDS.includes(commandBase)) {
-  if (commandBase === 'zsh' || (commandBase === 'sh' && (process.env.SHELL || '').includes('zsh'))) {
+  if (
+    commandBase === 'zsh' ||
+    (commandBase === 'sh' && (process.env.SHELL || '').includes('zsh'))
+  ) {
     // zsh: use ZDOTDIR with custom .zshrc
     const zdotdir = path.join(os.tmpdir(), `shooter-zd-${id}`);
     try {
@@ -208,7 +238,8 @@ function broadcast(msg) {
 // ---------------------------------------------------------------------------
 
 // Matches: \x1b]7;file://hostname/path\x1b\\ or \x1b]7;file://hostname/path\x07
-const OSC7_RE = /\x1b\]7;file:\/\/[^/]*([^\x07\x1b]*)\x07|\x1b\]7;file:\/\/[^/]*([^\x07\x1b]*)\x1b\\/g;
+const OSC7_RE =
+  /\x1b\]7;file:\/\/[^/]*([^\x07\x1b]*)\x07|\x1b\]7;file:\/\/[^/]*([^\x07\x1b]*)\x1b\\/g;
 
 // Buffer for incomplete OSC 7 sequences split across data chunks
 let osc7PartialBuf = '';
@@ -391,9 +422,7 @@ function handleMessage(msg) {
       // static-analysis scanners and prevent memory abuse.
       if (!exited && typeof msg.data === 'string' && msg.data.length > 0) {
         try {
-          const input = msg.data.length > MAX_INPUT_BYTES
-            ? msg.data.slice(0, MAX_INPUT_BYTES)
-            : msg.data;
+          const input = truncateUtf8(msg.data, MAX_INPUT_BYTES);
           ptyProcess.write(input); // CodeQL[js/code-injection] — intentional PTY stdin
         } catch {
           // PTY may have closed between check and write

package/src/lib/modules/server/terminal/pty-manager.ts

@@ -1,3 +1,4 @@
+import type { TerminalRecord } from '$generated/types';
 import type WebSocket from 'ws';
 
 import { type ChildProcess, fork } from 'child_process';
@@ -6,9 +7,10 @@ import { existsSync, readdirSync, readFileSync, statSync, unlinkSync } from 'fs'
 import path from 'path';
 import { fileURLToPath } from 'url';
 
+import type { ConversationMessage } from '../sessions/types';
+
 import { HolderClient } from './holder-client';
 import { openCodeWatcher } from './opencode-watcher';
-import { sessionWatcher } from './session-watcher';
 import { terminalStore } from './terminal-store';
 
 // ---------------------------------------------------------------------------
@@ -28,7 +30,7 @@ interface ManagedTerminal {
   holderPid: number;
   id: string;
   isActive: boolean;
-  openCodeNoopCb: ((messages: import('../sessions/types').ConversationMessage[]) => void) | null;
+  openCodeNoopCb: ((messages: ConversationMessage[]) => void) | null;
   openCodeSessionId: null | string;
   outputBuffers: Map<WebSocket, OutputBuffer>;
   pid: number;
@@ -75,7 +77,9 @@ class PtyManager {
   private terminals = new Map<string, ManagedTerminal>();
 
   constructor() {
-    this.cleanupTimer = setInterval(() => { this.cleanup(); }, CLEANUP_INTERVAL_MS);
+    this.cleanupTimer = setInterval(() => {
+      this.cleanup();
+    }, CLEANUP_INTERVAL_MS);
   }
 
   // -----------------------------------------------------------------------
@@ -85,13 +89,15 @@ class PtyManager {
 
   attach(id: string, ws: WebSocket): boolean {
     const terminal = this.terminals.get(id);
-    if (!terminal) {return false;}
+    if (!terminal) {
+      return false;
+    }
 
     terminal.clients.add(ws);
     terminal.outputBuffers.set(ws, { data: [], size: 0 });
 
     // Send cached scrollback in chunks
-    this.sendScrollback(terminal, ws);
+    void this.sendScrollback(terminal, ws);
 
     return true;
   }
@@ -102,10 +108,12 @@ class PtyManager {
 
   cleanup(): void {
     const now = Date.now();
-    const exited: { exitedAt: number; id: string; }[] = [];
+    const exited: { exitedAt: number; id: string }[] = [];
 
     for (const [id, terminal] of this.terminals) {
-      if (terminal.status !== 'exited') {continue;}
+      if (terminal.status !== 'exited') {
+        continue;
+      }
 
       const exitTime = terminal.exitedAt?.getTime() ?? terminal.createdAt.getTime();
 
@@ -200,8 +208,8 @@ class PtyManager {
       cols,
       command,
       createdAt: now,
-      cwd,
       currentCwd: null,
+      cwd,
       exitCode: connectResult.exitCode,
       exitedAt: null,
       holderPid,
@@ -303,7 +311,9 @@ class PtyManager {
 
   detach(id: string, ws: WebSocket): boolean {
     const terminal = this.terminals.get(id);
-    if (!terminal) {return false;}
+    if (!terminal) {
+      return false;
+    }
 
     terminal.clients.delete(ws);
     terminal.outputBuffers.delete(ws);
@@ -359,7 +369,9 @@ class PtyManager {
 
   getScrollback(id: string): null | string {
     const terminal = this.terminals.get(id);
-    if (!terminal) {return null;}
+    if (!terminal) {
+      return null;
+    }
 
     return terminal.scrollback;
   }
@@ -370,8 +382,12 @@ class PtyManager {
 
   kill(id: string): boolean {
     const terminal = this.terminals.get(id);
-    if (!terminal) {return false;}
-    if (terminal.status === 'exited') {return true;} // already dead
+    if (!terminal) {
+      return false;
+    }
+    if (terminal.status === 'exited') {
+      return true;
+    } // already dead
 
     try {
       // Send SIGTERM through the holder protocol
@@ -454,8 +470,12 @@ class PtyManager {
 
   remove(id: string): boolean {
     const terminal = this.terminals.get(id);
-    if (!terminal) {return false;}
-    if (terminal.status === 'running') {return false;} // cannot remove running terminals
+    if (!terminal) {
+      return false;
+    }
+    if (terminal.status === 'running') {
+      return false;
+    } // cannot remove running terminals
 
     this.evict(id);
     return true;
@@ -467,7 +487,9 @@ class PtyManager {
 
   resize(id: string, cols: number, rows: number): boolean {
     const terminal = this.terminals.get(id);
-    if (!terminal || terminal.status === 'exited') {return false;}
+    if (!terminal || terminal.status === 'exited') {
+      return false;
+    }
 
     try {
       terminal.pty.resize(cols, rows);
@@ -515,7 +537,9 @@ class PtyManager {
       }
 
       const buffer = terminal.outputBuffers.get(ws);
-      if (!buffer) {continue;}
+      if (!buffer) {
+        continue;
+      }
 
       const msgSize = Buffer.byteLength(msg, 'utf8');
 
@@ -556,7 +580,9 @@ class PtyManager {
   /** Evict a terminal, freeing all resources. */
   private evict(id: string): void {
     const terminal = this.terminals.get(id);
-    if (!terminal) {return;}
+    if (!terminal) {
+      return;
+    }
 
     // Clear session-file poll timer if still running
     if (terminal.pollTimer) {
@@ -611,11 +637,9 @@ class PtyManager {
   //          with backpressure management
   // -----------------------------------------------------------------------
 
-  private handleReconnectFailure(record: {
-    holderPid: null | number;
-    id: string;
-    socketPath: null | string;
-  }): void {
+  private handleReconnectFailure(
+    record: Pick<TerminalRecord, 'holderPid' | 'id' | 'socketPath'>
+  ): void {
     // Check if holder PID is still alive
     if (record.holderPid) {
       try {
@@ -631,7 +655,7 @@ class PtyManager {
 
     // Check for .exit sidecar
     if (record.socketPath) {
-      const exitFilePath = `${record.socketPath  }.exit`;
+      const exitFilePath = `${record.socketPath}.exit`;
       if (existsSync(exitFilePath)) {
         try {
           const exitData = JSON.parse(readFileSync(exitFilePath, 'utf8')) as {
@@ -655,30 +679,14 @@ class PtyManager {
     console.log(`[pty-manager] Marked terminal ${record.id} as orphaned`);
   }
 
-  private async reconnectOne(record: {
-    args: string;
-    cols: number;
-    command: string;
-    createdAt: string;
-    cwd: string;
-    exitCode: null | number;
-    exitedAt: null | string;
-    holderPid: null | number;
-    id: string;
-    opencodeSessionId: null | string;
-    pid: null | number;
-    rows: number;
-    sessionFile: null | string;
-    socketPath: null | string;
-    status: string;
-  }): Promise<void> {
+  private async reconnectOne(record: TerminalRecord): Promise<void> {
     if (!record.socketPath) {
       throw new Error('No socket path stored');
     }
 
     // Check for .exit sidecar file — the PTY may have exited while
     // the server was down
-    const exitFilePath = `${record.socketPath  }.exit`;
+    const exitFilePath = `${record.socketPath}.exit`;
     if (existsSync(exitFilePath)) {
       try {
         const exitData = JSON.parse(readFileSync(exitFilePath, 'utf8')) as {
@@ -751,7 +759,9 @@ class PtyManager {
       // which blocked real subscribers due to the single-callback guard.
     }
     if (terminal.openCodeSessionId) {
-      const noopCb: (messages: import('../sessions/types').ConversationMessage[]) => void = () => {};
+      const noopCb = (_messages: ConversationMessage[]): void => {
+        /* noop */
+      };
       terminal.openCodeNoopCb = noopCb;
       openCodeWatcher.watch(terminal.openCodeSessionId, noopCb);
     }
@@ -773,60 +783,13 @@ class PtyManager {
     );
   }
 
-  /** Wire up all HolderClient callbacks (activity, CWD, output, exit, disconnect). */
-  private wireHolderCallbacks(client: HolderClient, terminal: ManagedTerminal): void {
-    client.onActivity((active: boolean) => {
-      terminal.isActive = active;
-      const msg = JSON.stringify({ active, type: 'activity' });
-      for (const ws of terminal.clients) {
-        this.safeSend(ws, msg);
-      }
-    });
-
-    client.onCwd((path: string) => {
-      terminal.currentCwd = path;
-      const msg = JSON.stringify({ path, type: 'cwd' });
-      for (const ws of terminal.clients) {
-        this.safeSend(ws, msg);
-      }
-    });
-
-    client.onOutput((data: string) => {
-      this.appendScrollback(terminal, data);
-      this.broadcastOutput(terminal, data);
-    });
-
-    client.onExit((exitCode: null | number) => {
-      terminal.status = 'exited';
-      terminal.exitCode = exitCode;
-      terminal.exitedAt = new Date();
-      terminalStore.markExited(terminal.id, exitCode);
-
-      const exitMsg = JSON.stringify({
-        code: exitCode,
-        signal: null,
-        type: 'exit',
-      });
-      for (const ws of terminal.clients) {
-        this.safeSend(ws, exitMsg);
-      }
-    });
-
-    client.onDisconnect(() => {
-      if (terminal.status === 'running') {
-        console.warn(`[pty-manager] Holder disconnected unexpectedly for terminal ${terminal.id}`);
-        terminal.status = 'exited';
-        terminal.exitedAt = new Date();
-        terminalStore.markOrphaned(terminal.id);
-      }
-    });
-  }
-
   /** Safely send a message to a WebSocket, returning false on failure. */
   private safeSend(ws: WebSocket, msg: string): boolean {
     try {
       // readyState 1 === OPEN
-      if (ws.readyState !== 1) {return false;}
+      if (ws.readyState !== 1) {
+        return false;
+      }
       ws.send(msg);
       return true;
     } catch {
@@ -837,7 +800,9 @@ class PtyManager {
   /** Send cached scrollback data to a newly connected client in 50 KB chunks. */
   private async sendScrollback(terminal: ManagedTerminal, ws: WebSocket): Promise<void> {
     const fullData = terminal.scrollback;
-    if (fullData.length === 0) {return;}
+    if (fullData.length === 0) {
+      return;
+    }
 
     const totalBytes = Buffer.byteLength(fullData, 'utf8');
     const totalChunks = Math.ceil(totalBytes / SCROLLBACK_CHUNK_SIZE);
@@ -862,7 +827,7 @@ class PtyManager {
     while (offset < buf.length) {
       // Gate scrollback sending on actual socket backpressure
       if (ws.bufferedAmount > SCROLLBACK_CHUNK_SIZE * 2) {
-        await new Promise(resolve => setTimeout(resolve, 50));
+        await new Promise((resolve) => setTimeout(resolve, 50));
       }
 
       const end = Math.min(offset + SCROLLBACK_CHUNK_SIZE, buf.length);
@@ -886,9 +851,31 @@ class PtyManager {
     // directory for new JSONL files created after launch.
     if (command === 'claude') {
       const projectDir = path.join(
-        process.env.HOME || '', '.claude', 'projects',
+        process.env.HOME || '',
+        '.claude',
+        'projects',
         cwd.replace(/\//g, '-')
       );
+
+      // Fast path: `claude --resume <uuid>` resumes an existing session whose
+      // JSONL file was created before this terminal launched. The birthtime
+      // filter used in the polling loop would never find it, so check directly.
+      const resumeIdx = terminal.args.indexOf('--resume');
+      if (resumeIdx !== -1 && resumeIdx + 1 < terminal.args.length) {
+        const resumeId = terminal.args[resumeIdx + 1];
+        // Validate resumeId is a safe identifier (UUID or hex string, no path separators)
+        if (!/^[0-9a-f-]+$/i.test(resumeId)) {
+          console.warn(`[pty-manager] Invalid resume ID: ${resumeId}`);
+        } else {
+          const resumeFile = path.join(projectDir, `${resumeId}.jsonl`);
+          if (existsSync(resumeFile)) {
+            terminal.sessionFile = resumeFile;
+            terminalStore.update(id, { sessionFile: resumeFile });
+            return; // File found immediately — no polling needed
+          }
+        }
+      }
+
       const launchTime = terminal.createdAt.getTime();
 
       terminal.pollTimer = setInterval(() => {
@@ -897,15 +884,12 @@ class PtyManager {
             clearInterval(terminal.pollTimer);
             terminal.pollTimer = null;
           }
-          if (terminal.sessionFile) {
-            // No-op: session-handler.ts subscribes when a client connects.
-      // Previously called sessionWatcher.watch() with an empty callback,
-      // which blocked real subscribers due to the single-callback guard.
-          }
           return;
         }
         try {
-          if (!existsSync(projectDir)) {return;}
+          if (!existsSync(projectDir)) {
+            return;
+          }
           const files = readdirSync(projectDir)
             .filter((f) => f.endsWith('.jsonl'))
             .map((f) => {
@@ -929,9 +913,6 @@ class PtyManager {
               clearInterval(terminal.pollTimer);
               terminal.pollTimer = null;
             }
-            // No-op: session-handler.ts subscribes when a client connects.
-      // Previously called sessionWatcher.watch() with an empty callback,
-      // which blocked real subscribers due to the single-callback guard.
             // Persist session file to SQLite
             terminalStore.update(id, { sessionFile: terminal.sessionFile });
           }
@@ -940,12 +921,15 @@ class PtyManager {
         }
       }, 1500);
 
-      setTimeout(() => {
-        if (terminal.pollTimer) {
-          clearInterval(terminal.pollTimer);
-          terminal.pollTimer = null;
-        }
-      }, 5 * 60 * 1000);
+      setTimeout(
+        () => {
+          if (terminal.pollTimer) {
+            clearInterval(terminal.pollTimer);
+            terminal.pollTimer = null;
+          }
+        },
+        5 * 60 * 1000
+      );
     }
 
     // For OpenCode: detect the session via SQLite database lookup.
@@ -957,7 +941,9 @@ class PtyManager {
         if (terminal.status === 'exited' || terminal.openCodeSessionId) {
           clearInterval(pollInterval);
           if (terminal.openCodeSessionId) {
-            const noopCb: (messages: import('../sessions/types').ConversationMessage[]) => void = () => {};
+            const noopCb = (_messages: ConversationMessage[]): void => {
+              /* noop */
+            };
             terminal.openCodeNoopCb = noopCb;
             openCodeWatcher.watch(terminal.openCodeSessionId, noopCb);
           }
@@ -967,7 +953,9 @@ class PtyManager {
         if (sessionId) {
           terminal.openCodeSessionId = sessionId;
           clearInterval(pollInterval);
-          const noopCb: (messages: import('../sessions/types').ConversationMessage[]) => void = () => {};
+          const noopCb = (_messages: ConversationMessage[]): void => {
+            /* noop */
+          };
           terminal.openCodeNoopCb = noopCb;
           openCodeWatcher.watch(sessionId, noopCb);
           // Persist session ID to SQLite
@@ -976,9 +964,64 @@ class PtyManager {
       }, 2000);
 
       terminal.pollTimer = pollInterval;
-      setTimeout(() => { clearInterval(pollInterval); terminal.pollTimer = null; }, 5 * 60 * 1000);
+      setTimeout(
+        () => {
+          clearInterval(pollInterval);
+          terminal.pollTimer = null;
+        },
+        5 * 60 * 1000
+      );
     }
   }
+
+  /** Wire up all HolderClient callbacks (activity, CWD, output, exit, disconnect). */
+  private wireHolderCallbacks(client: HolderClient, terminal: ManagedTerminal): void {
+    client.onActivity((active: boolean) => {
+      terminal.isActive = active;
+      const msg = JSON.stringify({ active, type: 'activity' });
+      for (const ws of terminal.clients) {
+        this.safeSend(ws, msg);
+      }
+    });
+
+    client.onCwd((path: string) => {
+      terminal.currentCwd = path;
+      const msg = JSON.stringify({ path, type: 'cwd' });
+      for (const ws of terminal.clients) {
+        this.safeSend(ws, msg);
+      }
+    });
+
+    client.onOutput((data: string) => {
+      this.appendScrollback(terminal, data);
+      this.broadcastOutput(terminal, data);
+    });
+
+    client.onExit((exitCode: null | number) => {
+      terminal.status = 'exited';
+      terminal.exitCode = exitCode;
+      terminal.exitedAt = new Date();
+      terminalStore.markExited(terminal.id, exitCode);
+
+      const exitMsg = JSON.stringify({
+        code: exitCode,
+        signal: null,
+        type: 'exit',
+      });
+      for (const ws of terminal.clients) {
+        this.safeSend(ws, exitMsg);
+      }
+    });
+
+    client.onDisconnect(() => {
+      if (terminal.status === 'running') {
+        console.warn(`[pty-manager] Holder disconnected unexpectedly for terminal ${terminal.id}`);
+        terminal.status = 'exited';
+        terminal.exitedAt = new Date();
+        terminalStore.markOrphaned(terminal.id);
+      }
+    });
+  }
 }
 
 // ---------------------------------------------------------------------------
@@ -1007,6 +1050,5 @@ function resolveHolderPath(): string {
 // server.ts (tsx) and SvelteKit's build handler load this module separately.
 const PTY_GLOBAL_KEY = '__shooter_pty_manager';
 export const ptyManager: PtyManager =
-	((globalThis as Record<string, unknown>)[PTY_GLOBAL_KEY] as PtyManager) ||
-	new PtyManager();
+  ((globalThis as Record<string, unknown>)[PTY_GLOBAL_KEY] as PtyManager) || new PtyManager();
 (globalThis as Record<string, unknown>)[PTY_GLOBAL_KEY] = ptyManager;

package/src/lib/modules/server/terminal/session-watcher.ts

@@ -85,7 +85,9 @@ class SessionWatcher {
       const entries: Record<string, unknown>[] = [];
       for (const line of raw.split('\n')) {
         const trimmed = line.trim();
-        if (!trimmed) {continue;}
+        if (!trimmed) {
+          continue;
+        }
         try {
           entries.push(JSON.parse(trimmed));
         } catch {
@@ -108,7 +110,7 @@ class SessionWatcher {
       return;
     }
 
-    watched.watcher.close();
+    void watched.watcher.close();
     this.watchedFiles.delete(filePath);
     this.assistantTurnsPerFile.delete(filePath);
     this.messageIndexPerFile.delete(filePath);
@@ -315,6 +317,6 @@ function encodeCwd(cwd: string): string {
 // Use globalThis to ensure a single shared instance across module loaders.
 const SW_GLOBAL_KEY = '__shooter_session_watcher';
 export const sessionWatcher: SessionWatcher =
-	((globalThis as Record<string, unknown>)[SW_GLOBAL_KEY] as SessionWatcher) ||
-	new SessionWatcher();
+  ((globalThis as Record<string, unknown>)[SW_GLOBAL_KEY] as SessionWatcher) ||
+  new SessionWatcher();
 (globalThis as Record<string, unknown>)[SW_GLOBAL_KEY] = sessionWatcher;