@meistrari/agent-core 0.2.0-experimental.0 → 0.2.0-experimental.2

package/src/agents/codex/codex-json-rpc-client.ts

@@ -10,6 +10,7 @@ import type {
     ServerRequestMethod,
     ServerRequestParamsByMethod,
 } from './codex-protocol'
+import { Buffer } from 'node:buffer'
 import { spawn } from 'node:child_process'
 import { createInterface } from 'node:readline'
 import { CodexJsonRpcResponseError, CodexJsonRpcTransportClosedError } from './codex.errors'
@@ -74,6 +75,7 @@ export class CodexJsonRpcClient {
             onMessage: (message: CodexJsonRpcMessage) => void
             onInvalidLine: (line: string, error: unknown) => void
             onStderr: (line: string) => void
+            maxLineBytes?: number
         },
     ) {
         this.child = spawn(executable, ['app-server', '--listen', 'stdio://', ...(options.configOverrides ?? []).flatMap(value => ['-c', value])], {
@@ -130,21 +132,32 @@ export class CodexJsonRpcClient {
             this.pending.clear()
         })
 
-        readLines(this.child.stdout, (line) => {
-            if (this.stopped)
-                return
-            try {
-                const parsed = JSON.parse(line) as CodexJsonRpcMessage
-                this.handleMessage(parsed, options.onMessage)
-            }
-            catch (error) {
-                if (!this.stopped)
-                    options.onInvalidLine(line, error)
-            }
+        const lineLimit = options.maxLineBytes === undefined
+            ? undefined
+            : { maxBytes: options.maxLineBytes, onOversize: () => options.onInvalidLine('', new Error('Codex transport line exceeded limit.')) }
+        readLines({
+            stream: this.child.stdout,
+            limit: lineLimit,
+            onLine: (line) => {
+                if (this.stopped)
+                    return
+                try {
+                    const parsed = JSON.parse(line) as CodexJsonRpcMessage
+                    this.handleMessage(parsed, options.onMessage)
+                }
+                catch (error) {
+                    if (!this.stopped)
+                        options.onInvalidLine(line, error)
+                }
+            },
         })
-        readLines(this.child.stderr, (line) => {
-            if (!this.stopped)
-                options.onStderr(line)
+        readLines({
+            stream: this.child.stderr,
+            limit: lineLimit,
+            onLine: (line) => {
+                if (!this.stopped)
+                    options.onStderr(line)
+            },
         })
     }
 
@@ -217,7 +230,8 @@ export class CodexJsonRpcClient {
 
     async closeInputAndStop(): Promise<void> {
         if (this.stopped) {
-            await this.closed
+            if (!await waitForClosed(this.closed, PROCESS_SHUTDOWN_GRACE_MS))
+                await terminateChild(this.child, this.closed)
             return
         }
         this.stopped = true
@@ -225,7 +239,9 @@ export class CodexJsonRpcClient {
             waiter.reject(closedClientError(waiter.method, 'possible_write'))
         }
         this.pending.clear()
-        await endWritable(this.child.stdin)
+        // EOF/drain and process exit share one grace window. Never wait separately for a
+        // buffered stdin write: a child that stops reading must still reach signal escalation.
+        this.child.stdin.end()
         if (await waitForClosed(this.closed, PROCESS_SHUTDOWN_GRACE_MS))
             return
         await terminateChild(this.child, this.closed)
@@ -272,10 +288,6 @@ export class CodexJsonRpcClient {
     }
 }
 
-async function endWritable(stream: NodeJS.WritableStream): Promise<void> {
-    await new Promise<void>(resolve => stream.end(resolve))
-}
-
 async function terminateChild(child: ChildProcessWithoutNullStreams, closed: Promise<void>): Promise<void> {
     if (child.exitCode !== null || child.signalCode !== null) {
         await closed
@@ -317,7 +329,40 @@ function closedClientError(method: ClientRequestMethod, writeState: 'before_writ
     return new CodexJsonRpcTransportClosedError({ method, writeState, message: 'Codex app-server client is closed.' })
 }
 
-function readLines(stream: NodeJS.ReadableStream, onLine: (line: string) => void): void {
+function readLines({ stream, onLine, limit }: {
+    stream: NodeJS.ReadableStream
+    onLine: (line: string) => void
+    limit: { maxBytes: number, onOversize: () => void } | undefined
+}): void {
+    if (limit) {
+        let buffer = Buffer.alloc(0)
+        let failed = false
+        stream.on('data', (chunk: Buffer) => {
+            if (failed)
+                return
+            let start = 0
+            for (let index = 0; index <= chunk.length; index += 1) {
+                if (index !== chunk.length && chunk[index] !== 10)
+                    continue
+                const part = chunk.subarray(start, index)
+                if (buffer.length + part.length > limit.maxBytes) {
+                    failed = true
+                    buffer = Buffer.alloc(0)
+                    limit.onOversize()
+                    return
+                }
+                buffer = Buffer.concat([buffer, part])
+                if (index !== chunk.length) {
+                    const line = buffer.toString('utf8').trim()
+                    buffer = Buffer.alloc(0)
+                    if (line)
+                        onLine(line)
+                }
+                start = index + 1
+            }
+        })
+        return
+    }
     const rl = createInterface({ input: stream })
     rl.on('line', (line) => {
         const trimmed = line.trim()