@kbediako/codex-orchestrator 0.1.4 → 0.1.6

package/dist/orchestrator/src/cli/delegationServer.js

@@ -826,11 +826,47 @@ async function runJsonRpcServer(handler, options = {}) {
                 const body = buffer.slice(0, expectedLength);
                 buffer = buffer.slice(expectedLength);
                 expectedLength = null;
-                await handleMessage(body.toString('utf8'));
+                await handleMessage(body.toString('utf8'), 'framed');
                 continue;
             }
             const headerEnd = buffer.indexOf('\r\n\r\n');
             if (headerEnd === -1) {
+                const newlineIndex = buffer.indexOf('\n');
+                if (newlineIndex !== -1) {
+                    const lineBuffer = buffer.slice(0, newlineIndex);
+                    const line = lineBuffer.toString('utf8').trim();
+                    buffer = buffer.slice(newlineIndex + 1);
+                    if (!line) {
+                        continue;
+                    }
+                    const normalizedLine = line.trimStart();
+                    const looksLikeHeaderLine = /^[A-Za-z0-9-]+:/.test(normalizedLine);
+                    const looksLikeJson = normalizedLine.startsWith('{') || normalizedLine.startsWith('[');
+                    const isContentLength = normalizedLine.toLowerCase().startsWith('content-length:');
+                    let restoredHeader = false;
+                    if (!looksLikeJson && looksLikeHeaderLine) {
+                        // Fall through to header-size checks for partial Content-Length frames (and other header lines).
+                        buffer = Buffer.concat([Buffer.from(lineBuffer), Buffer.from('\n'), buffer]);
+                        restoredHeader = true;
+                    }
+                    else if (!isContentLength) {
+                        const lineBytes = Buffer.byteLength(line, 'utf8');
+                        if (lineBytes > MAX_MCP_MESSAGE_BYTES) {
+                            handleProtocolViolation(`Rejecting MCP payload (${lineBytes} bytes) larger than ${MAX_MCP_MESSAGE_BYTES}`);
+                            return;
+                        }
+                        await handleMessage(line, 'jsonl');
+                        continue;
+                    }
+                    if (!restoredHeader && isContentLength) {
+                        // Fall through to header-size checks for partial Content-Length frames.
+                        buffer = Buffer.concat([Buffer.from(lineBuffer), Buffer.from('\n'), buffer]);
+                    }
+                }
+                else if (buffer.length > MAX_MCP_MESSAGE_BYTES) {
+                    handleProtocolViolation(`Rejecting MCP payload (${buffer.length} bytes) larger than ${MAX_MCP_MESSAGE_BYTES}`);
+                    return;
+                }
                 if (buffer.length > MAX_MCP_HEADER_BYTES) {
                     const overflow = buffer.slice(MAX_MCP_HEADER_BYTES);
                     const allowedPrefix = MCP_HEADER_DELIMITER_BUFFER.subarray(0, overflow.length);
@@ -851,6 +887,19 @@ async function runJsonRpcServer(handler, options = {}) {
                 return;
             }
             if (parsed.length === null) {
+                const lines = header.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+                if (lines.length === 0) {
+                    buffer = buffer.slice(headerEnd + 4);
+                    continue;
+                }
+                const allJsonLike = lines.every((line) => line.startsWith('{') || line.startsWith('['));
+                if (allJsonLike) {
+                    buffer = buffer.slice(headerEnd + 4);
+                    for (const line of lines) {
+                        await handleMessage(line, 'jsonl');
+                    }
+                    continue;
+                }
                 handleProtocolViolation('Missing Content-Length header in MCP message');
                 return;
             }
@@ -867,7 +916,7 @@ async function runJsonRpcServer(handler, options = {}) {
             buffer = buffer.slice(headerEnd + 4);
         }
     }
-    async function handleMessage(raw) {
+    async function handleMessage(raw, format) {
         let request;
         try {
             request = JSON.parse(raw);
@@ -883,7 +932,7 @@ async function runJsonRpcServer(handler, options = {}) {
         try {
             const result = await handler(request);
             if (id !== null && typeof id !== 'undefined') {
-                sendResponse({ jsonrpc: '2.0', id, result }, output);
+                sendResponse({ jsonrpc: '2.0', id, result }, output, format);
             }
         }
         catch (error) {
@@ -892,7 +941,7 @@ async function runJsonRpcServer(handler, options = {}) {
                     jsonrpc: '2.0',
                     id,
                     error: { code: -32603, message: error?.message ?? String(error) }
-                }, output);
+                }, output, format);
             }
         }
     }
@@ -920,10 +969,15 @@ function parseContentLengthHeader(header) {
     }
     return { length: contentLength };
 }
-function sendResponse(response, output = process.stdout) {
-    const payload = Buffer.from(JSON.stringify(response), 'utf8');
-    const header = Buffer.from(`Content-Length: ${payload.length}\r\n\r\n`, 'utf8');
-    output.write(Buffer.concat([header, payload]));
+function sendResponse(response, output = process.stdout, format = 'framed') {
+    const payload = JSON.stringify(response);
+    if (format === 'jsonl') {
+        output.write(`${payload}\n`);
+        return;
+    }
+    const buffer = Buffer.from(payload, 'utf8');
+    const header = Buffer.from(`Content-Length: ${buffer.length}\r\n\r\n`, 'utf8');
+    output.write(Buffer.concat([header, buffer]));
 }
 function safeJsonParse(text) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kbediako/codex-orchestrator",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
   "bin": {