codex-copilot-dx 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-copilot-dx",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Use Codex Desktop app with your GitHub Copilot subscription",
   "type": "module",
   "bin": {

package/src/adapter.mjs

@@ -100,18 +100,42 @@ async function proxyCopilotResponsesWS(reqBody, wsSend, onDone) {
   const reader = resp.body.getReader();
   const decoder = new TextDecoder();
   let buf = "";
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buf += decoder.decode(value, { stream: true });
-    const lines = buf.split("\n");
-    buf = lines.pop();
-    for (const line of lines) {
-      if (!line.startsWith("data: ")) continue;
-      const data = line.slice(6).trim();
-      if (data === "[DONE]") continue;
-      try { wsSend(JSON.stringify(JSON.parse(data))); } catch {}
+  let currentEvent = null;
+  let sawCompleted = false;
+  let lastResponseId = `resp_${uid()}`;
+  let lastModel = reqBody.model || "unknown";
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      buf += decoder.decode(value, { stream: true });
+      const lines = buf.split("\n");
+      buf = lines.pop();
+      for (const line of lines) {
+        if (line.startsWith("event: ")) { currentEvent = line.slice(7).trim(); continue; }
+        if (!line.startsWith("data: ")) { if (line === "") currentEvent = null; continue; }
+        const data = line.slice(6).trim();
+        if (data === "[DONE]") continue;
+        let parsed;
+        try { parsed = JSON.parse(data); } catch { continue; }
+        if (!parsed.type && currentEvent) parsed.type = currentEvent;
+        if (!parsed.type) continue;
+        if (parsed.response?.id) lastResponseId = parsed.response.id;
+        if (parsed.response?.model) lastModel = parsed.response.model;
+        if (parsed.type === "response.completed") sawCompleted = true;
+        wsSend(JSON.stringify(parsed));
+      }
     }
+  } catch (e) {
+    wsSend(JSON.stringify({ type: "error", error: { message: e.message || String(e), code: 500 } }));
+    onDone();
+    return;
+  }
+  if (!sawCompleted) {
+    wsSend(JSON.stringify({
+      type: "response.completed",
+      response: { id: lastResponseId, object: "response", status: "completed", model: lastModel, output: [], usage: { input_tokens: 0, output_tokens: 0, total_tokens: 0 } },
+    }));
   }
   onDone();
 }
@@ -179,7 +203,23 @@ function processStream(upstreamRes, emitEvent, onDone) {
   emitEvent("response.output_item.added", { output_index: 0, item: { type: "message", id: itemId, role: "assistant", status: "in_progress", content: [] } });
   emitEvent("response.content_part.added", { output_index: 0, content_index: 0, part: { type: "output_text", text: "" } });
 
-  let buf = "", fullText = "", toolCalls = {}, hasToolCalls = false;
+  let buf = "", fullText = "", toolCalls = {}, hasToolCalls = false, finished = false;
+
+  const finish = (errMsg) => {
+    if (finished) return;
+    finished = true;
+    if (errMsg) {
+      emitEvent("error", { error: { message: errMsg, code: 500 } });
+    } else {
+      emitEvent("response.output_text.done", { output_index: 0, content_index: 0, text: fullText });
+      emitEvent("response.output_item.done", { output_index: 0, item: { type: "message", id: itemId, role: "assistant", status: "completed", content: [{ type: "output_text", text: fullText }] } });
+      const output = hasToolCalls
+        ? Object.entries(toolCalls).map(([id, tc]) => ({ type: "function_call", id, call_id: id, name: tc.name, arguments: tc.arguments, status: "completed" }))
+        : [{ type: "message", id: itemId, role: "assistant", status: "completed", content: [{ type: "output_text", text: fullText }] }];
+      emitEvent("response.completed", { response: { id: respId, object: "response", status: "completed", model: actualModel, output, usage: { input_tokens: 0, output_tokens: 0, total_tokens: 0 } } });
+    }
+    onDone();
+  };
 
   upstreamRes.on("data", (chunk) => {
     buf += chunk.toString();
@@ -197,6 +237,7 @@ function processStream(upstreamRes, emitEvent, onDone) {
           ? Object.entries(toolCalls).map(([id, tc]) => ({ type: "function_call", id, call_id: id, name: tc.name, arguments: tc.arguments, status: "completed" }))
           : [{ type: "message", id: itemId, role: "assistant", status: "completed", content: [{ type: "output_text", text: fullText }] }];
         emitEvent("response.completed", { response: { id: respId, object: "response", status: "completed", model: actualModel, output, usage: { input_tokens: 0, output_tokens: 0, total_tokens: 0 } } });
+        finished = true;
         onDone();
         return;
       }
@@ -217,8 +258,8 @@ function processStream(upstreamRes, emitEvent, onDone) {
       }
     }
   });
-  upstreamRes.on("end", () => onDone());
-  upstreamRes.on("error", () => onDone());
+  upstreamRes.on("end", () => finish());
+  upstreamRes.on("error", (e) => finish(e?.message || "upstream stream error"));
 }
 
 function forwardToChat(chatReq, emitEvent, onDone, onError) {
@@ -274,7 +315,16 @@ function wsSend(socket, data, opcode = 0x1) {
 }
 
 async function handleWebSocket(req, socket) {
-  const key = req.headers["sec-websocket-key"];
+  let rawKey = req.headers["sec-websocket-key"];
+  if (Array.isArray(rawKey)) rawKey = rawKey[0];
+  const key = (rawKey || "").trim();
+  const upgrade = String(req.headers["upgrade"] || "").toLowerCase();
+  const connection = String(req.headers["connection"] || "").toLowerCase();
+  if (!key || upgrade !== "websocket" || !connection.includes("upgrade")) {
+    socket.write("HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n");
+    socket.destroy();
+    return;
+  }
   const accept = createHash("sha1").update(key + "258EAFA5-E914-47DA-95CA-5AB9FC6AB199").digest("base64");
   socket.write("HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: " + accept + "\r\n\r\n");
 
@@ -357,9 +407,13 @@ export function startAdapter(port = 4142) {
   });
 
   server.on("upgrade", (req, socket) => {
-    if (req.url?.startsWith("/v1/responses")) {
-      handleWebSocket(req, socket).catch((e) => { console.error("[codex-copilot-dx] WS error:", e.message); socket.destroy(); });
-    } else socket.destroy();
+    // Codex Desktop 0.130+ negotiates a "responses_websockets" server-push
+    // protocol on WS upgrade. We don't implement that protocol; accepting the
+    // upgrade and waiting for a client request just hangs and triggers a
+    // 5-attempt reconnect storm. Refuse the upgrade so Codex falls back to
+    // plain HTTP SSE, which this adapter handles correctly.
+    socket.write("HTTP/1.1 426 Upgrade Required\r\nConnection: close\r\nContent-Length: 0\r\n\r\n");
+    socket.destroy();
   });
 
   return new Promise((resolve) => {