@gkorepanov/ccodex 0.4.6 → 0.4.7

package/dist/desktop/stdioFrontend.js

@@ -0,0 +1,305 @@
+import { createConnection } from "node:net";
+import { createInterface } from "node:readline";
+import WebSocket from "ws";
+import { runDaemonCommand } from "../daemon/daemon.js";
+const INITIAL_CONNECT_DEADLINE_MS = 20_000;
+const RETRY_DELAY_MS = 200;
+const INPUT_HIGH_WATER = 256;
+const INPUT_LOW_WATER = 64;
+const OUTPUT_HIGH_WATER = 256;
+const OUTPUT_LOW_WATER = 64;
+const sleep = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds));
+function parseEnvelope(line) {
+    try {
+        const value = JSON.parse(line);
+        return value && typeof value === "object" ? value : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function requestKey(id) {
+    return `${typeof id}:${String(id)}`;
+}
+function openSocket(socketPath) {
+    return new Promise((resolve, reject) => {
+        const socket = new WebSocket("ws://ccodex/rpc", {
+            createConnection: () => createConnection(socketPath),
+            perMessageDeflate: false,
+            maxPayload: 64 * 1024 * 1024,
+        });
+        const onOpen = () => {
+            socket.off("error", onError);
+            resolve(socket);
+        };
+        const onError = (error) => {
+            socket.off("open", onOpen);
+            socket.terminate();
+            reject(error);
+        };
+        socket.once("open", onOpen);
+        socket.once("error", onError);
+    });
+}
+function send(socket, line) {
+    return new Promise((resolve, reject) => {
+        socket.send(line, (error) => error ? reject(error) : resolve());
+    });
+}
+async function defaultKick(config) {
+    try {
+        await runDaemonCommand(config, { command: "start", remoteControl: false }, process.argv[1] ?? process.execPath);
+    }
+    catch (error) {
+        process.stderr.write(`ccodex stdio frontend: gateway autostart failed: ${String(error)}\n`);
+    }
+}
+class StdioFrontend {
+    config;
+    socketPath;
+    kick;
+    initialConnectDeadlineMs;
+    retryDelayMs;
+    reader;
+    output;
+    inputLines = [];
+    outputLines = [];
+    pending = new Map();
+    serverRequests = new Set();
+    abandonedServerRequests = new Set();
+    socket;
+    inputEnded = false;
+    outputFailed = false;
+    failed = false;
+    inputDraining = false;
+    outputDraining = false;
+    connectedOnce = false;
+    ready = false;
+    initializeLine;
+    initializeId;
+    initializeSent = false;
+    initialized = false;
+    suppressInitializeResponse = false;
+    constructor(config, socketPath, input, output, kick, initialConnectDeadlineMs, retryDelayMs) {
+        this.config = config;
+        this.socketPath = socketPath;
+        this.kick = kick;
+        this.initialConnectDeadlineMs = initialConnectDeadlineMs;
+        this.retryDelayMs = retryDelayMs;
+        this.reader = createInterface({ input });
+        this.output = output;
+        this.reader.on("line", (line) => this.enqueueInput(line));
+        this.reader.once("close", () => {
+            this.inputEnded = true;
+            this.socket?.close();
+        });
+        this.output.once("error", (error) => {
+            this.outputFailed = true;
+            process.stderr.write(`ccodex stdio frontend: stdout failed: ${String(error)}\n`);
+            this.reader.close();
+            this.socket?.terminate();
+        });
+    }
+    async run() {
+        while (!this.inputEnded && !this.outputFailed) {
+            const socket = await this.connect();
+            if (!socket) {
+                this.reader.close();
+                return 1;
+            }
+            await this.serve(socket);
+            if (!this.inputEnded && !this.outputFailed) {
+                this.failPendingRequests();
+                for (const id of this.serverRequests)
+                    this.abandonedServerRequests.add(id);
+                this.serverRequests.clear();
+                this.ready = false;
+                this.initializeSent = false;
+            }
+        }
+        await this.flushOutput();
+        return this.outputFailed || this.failed ? 1 : 0;
+    }
+    async connect() {
+        await this.kick(this.config);
+        const deadline = this.connectedOnce ? Number.POSITIVE_INFINITY : Date.now() + this.initialConnectDeadlineMs;
+        while (!this.inputEnded && !this.outputFailed && Date.now() < deadline) {
+            try {
+                const socket = await openSocket(this.socketPath);
+                this.connectedOnce = true;
+                return socket;
+            }
+            catch {
+                await sleep(this.retryDelayMs);
+            }
+        }
+        if (!this.inputEnded && !this.outputFailed) {
+            process.stderr.write(`ccodex stdio frontend: gateway ${this.socketPath} did not become ready\n`);
+        }
+        return undefined;
+    }
+    serve(socket) {
+        this.socket = socket;
+        return new Promise((resolve) => {
+            let settled = false;
+            const finish = () => {
+                if (settled)
+                    return;
+                settled = true;
+                if (this.socket === socket)
+                    this.socket = undefined;
+                resolve();
+            };
+            socket.on("message", (data) => this.receive(data.toString()));
+            socket.once("close", finish);
+            socket.once("error", (error) => {
+                process.stderr.write(`ccodex stdio frontend: gateway connection failed: ${String(error)}\n`);
+                finish();
+            });
+            if (this.initializeLine) {
+                this.suppressInitializeResponse = this.initialized;
+                this.initializeSent = true;
+                void send(socket, this.initializeLine).catch(() => socket.terminate());
+            }
+            else {
+                this.ready = true;
+                void this.flushInput();
+            }
+        });
+    }
+    enqueueInput(line) {
+        if (line.length === 0)
+            return;
+        const envelope = parseEnvelope(line);
+        if (envelope?.id !== undefined && envelope.method === "initialize") {
+            this.initializeLine = line;
+            this.initializeId = envelope.id;
+        }
+        if (envelope?.id !== undefined && envelope.method === undefined) {
+            const key = requestKey(envelope.id);
+            if (this.abandonedServerRequests.delete(key))
+                return;
+            this.serverRequests.delete(key);
+        }
+        this.inputLines.push(line);
+        if (this.inputLines.length >= INPUT_HIGH_WATER)
+            this.reader.pause();
+        void this.flushInput();
+    }
+    async flushInput() {
+        if (this.inputDraining || !this.ready || !this.socket || this.socket.readyState !== WebSocket.OPEN)
+            return;
+        this.inputDraining = true;
+        const socket = this.socket;
+        try {
+            while (this.ready && this.socket === socket && socket.readyState === WebSocket.OPEN) {
+                const line = this.inputLines.shift();
+                if (line === undefined)
+                    break;
+                const envelope = parseEnvelope(line);
+                if (envelope?.id !== undefined && envelope.method === "initialize") {
+                    if (this.initializeSent)
+                        continue;
+                    this.initializeSent = true;
+                    this.suppressInitializeResponse = false;
+                    this.ready = false;
+                }
+                else if (envelope?.id !== undefined && envelope.method !== undefined) {
+                    this.pending.set(requestKey(envelope.id), envelope.id);
+                }
+                await send(socket, line);
+                if (this.inputLines.length <= INPUT_LOW_WATER)
+                    this.reader.resume();
+            }
+        }
+        catch {
+            socket.terminate();
+        }
+        finally {
+            this.inputDraining = false;
+        }
+    }
+    receive(line) {
+        const envelope = parseEnvelope(line);
+        if (envelope?.id !== undefined && envelope.method !== undefined) {
+            this.serverRequests.add(requestKey(envelope.id));
+        }
+        if (envelope?.id !== undefined && envelope.method === undefined) {
+            const key = requestKey(envelope.id);
+            if (this.initializeId !== undefined && key === requestKey(this.initializeId) && this.initializeSent) {
+                const suppress = this.suppressInitializeResponse;
+                this.suppressInitializeResponse = false;
+                if (envelope.error) {
+                    this.failed = true;
+                    if (suppress)
+                        this.failPendingRequests();
+                    this.reader.close();
+                    this.socket?.close();
+                }
+                else {
+                    this.initialized = true;
+                    this.ready = true;
+                    void this.flushInput();
+                }
+                if (suppress)
+                    return;
+            }
+            else {
+                this.pending.delete(key);
+            }
+        }
+        this.outputLines.push(line);
+        if (this.outputLines.length >= OUTPUT_HIGH_WATER)
+            this.socket?.pause();
+        void this.flushOutput();
+    }
+    failPendingRequests() {
+        for (const id of this.pending.values()) {
+            this.outputLines.push(JSON.stringify({
+                id,
+                error: {
+                    code: -32001,
+                    message: "CCodex gateway restarted before this request completed. Retry the request.",
+                },
+            }));
+        }
+        this.pending.clear();
+        void this.flushOutput();
+    }
+    async flushOutput() {
+        if (this.outputDraining || this.outputFailed)
+            return;
+        this.outputDraining = true;
+        try {
+            while (this.outputLines.length > 0 && !this.outputFailed) {
+                const line = this.outputLines.shift();
+                if (!this.output.write(`${line}\n`)) {
+                    await new Promise((resolve, reject) => {
+                        const onDrain = () => { cleanup(); resolve(); };
+                        const onError = (error) => { cleanup(); reject(error); };
+                        const cleanup = () => {
+                            this.output.off("drain", onDrain);
+                            this.output.off("error", onError);
+                        };
+                        this.output.once("drain", onDrain);
+                        this.output.once("error", onError);
+                    });
+                }
+                if (this.outputLines.length <= OUTPUT_LOW_WATER)
+                    this.socket?.resume();
+            }
+        }
+        catch {
+            this.outputFailed = true;
+            this.reader.close();
+            this.socket?.terminate();
+        }
+        finally {
+            this.outputDraining = false;
+        }
+    }
+}
+export function runStdioFrontend(config, socketPath, deps = {}) {
+    return new StdioFrontend(config, socketPath, deps.input ?? process.stdin, deps.output ?? process.stdout, deps.kick ?? defaultKick, deps.initialConnectDeadlineMs ?? INITIAL_CONNECT_DEADLINE_MS, deps.retryDelayMs ?? RETRY_DELAY_MS).run();
+}
+//# sourceMappingURL=stdioFrontend.js.map

package/dist/desktop/stdioFrontend.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stdioFrontend.js","sourceRoot":"","sources":["../../src/desktop/stdioFrontend.ts"],"names":[],"mappings":"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"}

package/dist/gateway/clientConnection.js

@@ -969,7 +969,7 @@ export function attachClientConnection(client, stockSocket, claudeModels, claude
                     const overlay = handoffs.overlay(params.threadId);
                     if ((logicalFork && handoffs.logical?.(params.threadId)) || overlay?.epochs) {
                         if (logicalFork) {
-                            sendResult(message.id, await logicalFork.call(handoffs, forkParams, stockRpc));
+                            sendResult(message.id, await logicalFork.call(handoffs, forkParams, stockRpc, connectionId));
                             return;
                         }
                         const turns = overlay.epochs.flatMap((epoch) => epoch.publicTurnIds.map((id) => ({ id, items: [], status: "completed" })));