refactor: add onData to SpawnOptions for isolated output handling in tests

Author: MBanucu

src/plugin/pty/manager.ts

@@ -19,10 +19,6 @@ export function onRawOutput(callback: RawOutputCallback): void {
   rawOutputCallbacks.push(callback)
 }
 
-export function clearRawOutputCallbacks(): void {
-  rawOutputCallbacks.length = 0
-}
-
 function notifyRawOutput(sessionId: string, rawData: string): void {
   for (const callback of rawOutputCallbacks) {
     try {
@@ -48,15 +44,16 @@ class PTYManager {
     console.log(`${new Date().toISOString()}: Manager spawn called with opts:`, opts)
     const session = this.lifecycleManager.spawn(
       opts,
-      (id, data) => {
-        console.log(
-          `${new Date().toISOString()}: Manager onData callback for id:`,
-          id,
-          'data length:',
-          data.length
-        )
-        notifyRawOutput(id, data)
-      },
+      opts.onData ||
+        ((id, data) => {
+          console.log(
+            `${new Date().toISOString()}: Manager onData callback for id:`,
+            id,
+            'data length:',
+            data.length
+          )
+          notifyRawOutput(id, data)
+        }),
       async (id, exitCode) => {
         console.log(
           `${new Date().toISOString()}: Manager onExit callback for id:`,

src/plugin/pty/types.ts

@@ -44,6 +44,7 @@ export interface SpawnOptions {
   description?: string
   parentSessionId: string
   notifyOnExit?: boolean
+  onData?: (sessionId: string, data: string) => void
 }
 
 export interface ReadResult {

test/pty-echo.test.ts

@@ -1,10 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach } from 'bun:test'
-import {
-  initManager,
-  manager,
-  onRawOutput,
-  clearRawOutputCallbacks,
-} from '../src/plugin/pty/manager.ts'
+import { initManager, manager } from '../src/plugin/pty/manager.ts'
 
 describe('PTY Echo Behavior', () => {
   const fakeClient = {
@@ -17,29 +12,25 @@ describe('PTY Echo Behavior', () => {
 
   beforeEach(() => {
     initManager(fakeClient)
-    clearRawOutputCallbacks()
   })
 
   afterEach(() => {
     // Clean up any sessions
     manager.clearAllSessions()
-    clearRawOutputCallbacks()
   })
 
   it('should echo input characters in interactive bash session', async () => {
     const receivedOutputs: string[] = []
 
-    // Subscribe to raw output events
-    onRawOutput((_sessionId, rawData) => {
-      receivedOutputs.push(rawData)
-    })
-
     // Spawn interactive bash session
     const session = manager.spawn({
       command: 'bash',
       args: ['-i'],
       description: 'Echo test session',
       parentSessionId: 'test',
+      onData: (_sessionId, rawData) => {
+        receivedOutputs.push(rawData)
+      },
     })
 
     console.log('Echo session:', session)
@@ -72,17 +63,15 @@ describe('PTY Echo Behavior', () => {
   it('should echo different input characters in interactive bash session', async () => {
     const receivedOutputs: string[] = []
 
-    // Subscribe to raw output events
-    onRawOutput((_sessionId, rawData) => {
-      receivedOutputs.push(rawData)
-    })
-
     // Spawn interactive bash session
     const session = manager.spawn({
       command: 'bash',
       args: ['-i'],
       description: 'Echo test session 2',
       parentSessionId: 'test2',
+      onData: (_sessionId, rawData) => {
+        receivedOutputs.push(rawData)
+      },
     })
 
     console.log('Echo session 2:', session)

test/web-server.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeEach, afterEach } from 'bun:test'
 import { startWebServer, stopWebServer, getServerUrl } from '../src/web/server/server.ts'
-import { initManager, manager, clearRawOutputCallbacks } from '../src/plugin/pty/manager.ts'
+import { initManager, manager } from '../src/plugin/pty/manager.ts'
 
 describe('Web Server', () => {
   const fakeClient = {
@@ -13,13 +13,11 @@ describe('Web Server', () => {
 
   beforeEach(() => {
     initManager(fakeClient)
-    clearRawOutputCallbacks()
   })
 
   afterEach(() => {
     stopWebServer()
     manager.cleanupAll() // Ensure cleanup after each test
-    clearRawOutputCallbacks()
   })
 
   describe('Server Lifecycle', () => {
@@ -53,7 +51,6 @@ describe('Web Server', () => {
 
     beforeEach(async () => {
       manager.cleanupAll() // Clean up any leftover sessions
-      clearRawOutputCallbacks()
       serverUrl = await startWebServer({ port: 8771 })
     })