@openhoo/hoopilot 0.6.0 → 0.6.1

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/auth-store.ts
-import { chmodSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { chmodSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 function authStorePath(env = process.env) {
   if (env.HOOPILOT_AUTH_FILE) {
@@ -31,25 +31,36 @@ function readStoredCopilotAuth(path = authStorePath()) {
 }
 function writeStoredCopilotAuth(auth, path = authStorePath()) {
   mkdirSync(dirname(path), { recursive: true });
-  writeFileSync(
-    path,
-    `${JSON.stringify(
-      {
-        ...auth,
-        createdAt: auth.createdAt ?? (/* @__PURE__ */ new Date()).toISOString()
-      },
-      null,
-      2
-    )}
-`,
-    { mode: 384 }
-  );
+  const data = `${JSON.stringify(
+    {
+      ...auth,
+      createdAt: auth.createdAt ?? (/* @__PURE__ */ new Date()).toISOString()
+    },
+    null,
+    2
+  )}
+`;
+  const tmpPath = `${path}.${process.pid}.tmp`;
+  writeFileSync(tmpPath, data, { mode: 384 });
+  renameSync(tmpPath, path);
   try {
     chmodSync(path, 384);
   } catch {
   }
 }
 
+// src/util.ts
+function trimTrailingSlash(value) {
+  return value.replace(/\/+$/, "");
+}
+async function truncatedResponseText(response, max = 500) {
+  const text = await response.text();
+  return text.slice(0, max);
+}
+function asRecord(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+
 // src/auth.ts
 var DEFAULT_COPILOT_API_BASE_URL = "https://api.githubcopilot.com";
 var REFRESH_SKEW_MS = 6e4;
@@ -92,11 +103,19 @@ var CopilotAuth = class {
     return access;
   }
 };
-function trimTrailingSlash(value) {
-  return value.replace(/\/+$/, "");
-}
 
 // src/copilot.ts
+function applyCopilotHeaders(headers, token) {
+  headers.set("accept", headers.get("accept") ?? "application/json");
+  headers.set("authorization", `Bearer ${token}`);
+  headers.set("copilot-integration-id", "vscode-chat");
+  headers.set("editor-plugin-version", "hoopilot/0.1.0");
+  headers.set("editor-version", "Hoopilot/0.1.0");
+  headers.set("openai-intent", "conversation-panel");
+  headers.set("user-agent", "hoopilot/0.1.0");
+  headers.set("x-github-api-version", "2026-06-01");
+  return headers;
+}
 var CopilotClient = class {
   #auth;
   #fetch;
@@ -135,15 +154,7 @@ var CopilotClient = class {
   }
   async fetchCopilot(path, init) {
     const access = await this.#auth.getAccess();
-    const headers = new Headers(init.headers);
-    headers.set("accept", headers.get("accept") ?? "application/json");
-    headers.set("authorization", `Bearer ${access.token}`);
-    headers.set("copilot-integration-id", "vscode-chat");
-    headers.set("editor-plugin-version", "hoopilot/0.1.0");
-    headers.set("editor-version", "Hoopilot/0.1.0");
-    headers.set("openai-intent", "conversation-panel");
-    headers.set("user-agent", "hoopilot/0.1.0");
-    headers.set("x-github-api-version", "2026-06-01");
+    const headers = applyCopilotHeaders(new Headers(init.headers), access.token);
     return this.#fetch(`${access.apiBaseUrl}${path}`, {
       ...init,
       headers
@@ -157,6 +168,7 @@ var DEFAULT_GITHUB_COPILOT_CLIENT_ID = "Ov23li8tweQw6odWQebz";
 var DEFAULT_GITHUB_DOMAIN = "github.com";
 var DEVICE_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:device_code";
 var POLLING_SAFETY_MARGIN_MS = 3e3;
+var REQUEST_TIMEOUT_MS = 15e3;
 async function githubCopilotDeviceLogin(options = {}) {
   const env = options.env ?? process.env;
   const fetcher = options.fetch ?? fetch;
@@ -191,16 +203,20 @@ async function requestDeviceCode(fetcher, domain, clientId) {
       scope: "read:user"
     }),
     headers: oauthHeaders(),
-    method: "POST"
+    method: "POST",
+    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
   });
   if (!response.ok) {
     throw new Error(
-      `GitHub device authorization failed with ${response.status}: ${await safeResponseText(
+      `GitHub device authorization failed with ${response.status}: ${await truncatedResponseText(
         response
       )}`
     );
   }
-  return await response.json();
+  return parseJsonResponse(
+    response,
+    "GitHub device authorization response was not valid JSON"
+  );
 }
 async function pollForAccessToken(fetcher, sleeper, domain, clientId, device) {
   let intervalMs = device.interval * 1e3 + POLLING_SAFETY_MARGIN_MS;
@@ -214,16 +230,20 @@ async function pollForAccessToken(fetcher, sleeper, domain, clientId, device) {
         grant_type: DEVICE_GRANT_TYPE
       }),
       headers: oauthHeaders(),
-      method: "POST"
+      method: "POST",
+      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
     });
     if (!response.ok) {
       throw new Error(
-        `GitHub device token exchange failed with ${response.status}: ${await safeResponseText(
+        `GitHub device token exchange failed with ${response.status}: ${await truncatedResponseText(
           response
         )}`
       );
     }
-    const data = await response.json();
+    const data = await parseJsonResponse(
+      response,
+      "GitHub device token response was not valid JSON"
+    );
     if (data.access_token) {
       return data.access_token;
     }
@@ -259,9 +279,13 @@ function normalizeDomain(value) {
 function positiveSeconds(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : fallback;
 }
-async function safeResponseText(response) {
+async function parseJsonResponse(response, context) {
   const text = await response.text();
-  return text.slice(0, 500);
+  try {
+    return JSON.parse(text);
+  } catch {
+    throw new Error(`${context}: ${text.slice(0, 500)}`);
+  }
 }
 
 // src/logger.ts
@@ -364,6 +388,16 @@ function shouldCreateLogger(options) {
     options.logger || options.logFormat || options.logLevel || options.env?.HOOPILOT_LOG_FORMAT || options.env?.HOOPILOT_LOG_LEVEL
   );
 }
+function errorDetails(error) {
+  if (error instanceof Error) {
+    return {
+      message: error.message,
+      name: error.name,
+      stack: error.stack
+    };
+  }
+  return { message: String(error) };
+}
 function isLogFormat(value) {
   return LOG_FORMATS.includes(value);
 }
@@ -541,17 +575,18 @@ function responsesStreamFromChatStream(chatStream, options) {
           const lines = buffer.split(/\r?\n/);
           buffer = lines.pop() ?? "";
           for (const line of lines) {
-            processChatSseLine(line, enqueue, tools, (delta) => {
+            processChatSseLine(messageId, line, enqueue, tools, (delta) => {
               text += delta;
             });
           }
         }
         if (buffer) {
-          processChatSseLine(buffer, enqueue, tools, (delta) => {
+          processChatSseLine(messageId, buffer, enqueue, tools, (delta) => {
             text += delta;
           });
         }
-        const output = streamOutputItems(messageId, text, [...tools.values()]);
+        const toolItems = [...tools.values()].map(functionCallItem);
+        const output = [messageOutputItem(text, messageId), ...toolItems];
         enqueue("response.output_text.done", {
           content_index: 0,
           item_id: messageId,
@@ -575,8 +610,7 @@ function responsesStreamFromChatStream(chatStream, options) {
           output_index: 0,
           type: "response.output_item.done"
         });
-        tools.forEach((tool, index) => {
-          const item = functionCallItem(tool);
+        toolItems.forEach((item, index) => {
           const outputIndex = index + 1;
           enqueue("response.output_item.added", {
             item,
@@ -584,7 +618,7 @@ function responsesStreamFromChatStream(chatStream, options) {
             type: "response.output_item.added"
           });
           enqueue("response.function_call_arguments.done", {
-            arguments: tool.arguments,
+            arguments: item.arguments,
             item_id: item.id,
             output_index: outputIndex,
             type: "response.function_call_arguments.done"
@@ -602,6 +636,8 @@ function responsesStreamFromChatStream(chatStream, options) {
         enqueue("done", "[DONE]");
         controller.close();
       } catch (error) {
+        await reader.cancel(error).catch(() => {
+        });
         controller.error(error);
       } finally {
         reader.releaseLock();
@@ -808,7 +844,7 @@ function firstChoice(completion) {
   const choices = Array.isArray(completion.choices) ? completion.choices : [];
   return asRecord(choices[0]);
 }
-function processChatSseLine(line, enqueue, tools, appendText) {
+function processChatSseLine(messageId, line, enqueue, tools, appendText) {
   const trimmed = line.trim();
   if (!trimmed.startsWith("data:")) {
     return;
@@ -829,7 +865,7 @@ function processChatSseLine(line, enqueue, tools, appendText) {
     enqueue("response.output_text.delta", {
       content_index: 0,
       delta: content,
-      item_id: "",
+      item_id: messageId,
       output_index: 0,
       type: "response.output_text.delta"
     });
@@ -851,9 +887,6 @@ function processChatSseLine(line, enqueue, tools, appendText) {
     tools.set(index, existing);
   }
 }
-function streamOutputItems(messageId, text, tools) {
-  return [messageOutputItem(text, messageId), ...tools.map((tool) => functionCallItem(tool))];
-}
 function baseStreamResponse(id, model, createdAt, status, output) {
   return {
     created_at: createdAt,
@@ -893,9 +926,6 @@ function parseJson(data) {
 function removeUndefined(record) {
   return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== void 0));
 }
-function asRecord(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
-}
 function randomId() {
   return crypto.randomUUID().replaceAll("-", "");
 }
@@ -1085,6 +1115,9 @@ async function handleCompletions(client, request, logger) {
     return proxyError(upstream, logger);
   }
   logUpstreamSuccess(logger, "/chat/completions", upstream.status);
+  if (isStreamingResponse(upstream)) {
+    return proxyResponse(upstream);
+  }
   return jsonResponse(chatCompletionToCompletion(await upstream.json()));
 }
 async function handleResponses(client, request, logger) {
@@ -1127,8 +1160,7 @@ function proxyResponse(upstream) {
 }
 async function readJson(request) {
   try {
-    const value = await request.json();
-    return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+    return asRecord(await request.json());
   } catch {
     throw new Error(INVALID_JSON_MESSAGE);
   }
@@ -1299,16 +1331,6 @@ function logUpstreamSuccess(logger, upstreamPath, status) {
     "copilot upstream request completed"
   );
 }
-function errorDetails(error) {
-  if (error instanceof Error) {
-    return {
-      message: error.message,
-      name: error.name,
-      stack: error.stack
-    };
-  }
-  return { message: String(error) };
-}
 export {
   CopilotAuth,
   CopilotAuthError,