@cortexkit/opencode-antigravity-auth 1.0.0 → 1.0.1

package/dist/index.js

@@ -299,6 +299,7 @@ import { createGunzip } from "node:zlib";
 var DEFAULT_HTTPS_PORT = 443;
 var DEFAULT_PROXY_PORT = 8080;
 var DEFAULT_AGY_RESPONSE_HEADER_TIMEOUT_MS = 18e4;
+var DEFAULT_AGY_IDLE_TIMEOUT_MS = 18e4;
 function headersToRecord(headers) {
   const result = {};
   if (!headers)
@@ -522,6 +523,7 @@ function parseResponseHead(head) {
   const headers = new Headers();
   let chunked = false;
   let gzip = false;
+  let contentLength;
   for (const line of lines) {
     const index = line.indexOf(":");
     if (index <= 0)
@@ -538,8 +540,13 @@ function parseResponseHead(head) {
       gzip = true;
       continue;
     }
-    if (gzip && lowerKey === "content-length") {
-      continue;
+    if (lowerKey === "content-length") {
+      const parsed = Number.parseInt(value, 10);
+      if (Number.isFinite(parsed) && parsed >= 0) {
+        contentLength = parsed;
+      }
+      if (gzip)
+        continue;
     }
     headers.append(key, value);
   }
@@ -548,9 +555,34 @@ function parseResponseHead(head) {
     statusText: match[2] ?? "",
     headers,
     chunked,
-    gzip
+    gzip,
+    contentLength
   };
 }
+var ContentLengthStream = class extends Transform {
+  remaining;
+  constructor(contentLength) {
+    super();
+    this.remaining = contentLength;
+  }
+  _transform(chunk, _encoding, callback) {
+    if (this.remaining <= 0) {
+      callback();
+      return;
+    }
+    if (chunk.length <= this.remaining) {
+      this.remaining -= chunk.length;
+      this.push(chunk);
+    } else {
+      this.push(chunk.subarray(0, this.remaining));
+      this.remaining = 0;
+    }
+    if (this.remaining <= 0) {
+      this.push(null);
+    }
+    callback();
+  }
+};
 var ChunkedDecodeStream = class extends Transform {
   buffer = Buffer2.alloc(0);
   _transform(chunk, _encoding, callback) {
@@ -596,7 +628,7 @@ var ChunkedDecodeStream = class extends Transform {
     }
   }
 };
-function buildResponseStream(socket, leftover, head, signal) {
+function buildResponseStream(socket, leftover, head, signal, idleTimeoutMs, onDebug) {
   const source = new PassThrough();
   if (leftover.length > 0) {
     source.write(leftover);
@@ -605,12 +637,36 @@ function buildResponseStream(socket, leftover, head, signal) {
   let responseBody = source;
   if (head.chunked) {
     responseBody = responseBody.pipe(new ChunkedDecodeStream());
+  } else if (typeof head.contentLength === "number") {
+    responseBody = responseBody.pipe(new ContentLengthStream(head.contentLength));
   }
   if (head.gzip) {
     responseBody = responseBody.pipe(createGunzip());
   }
+  let idleTimer;
+  const clearIdle = () => {
+    if (idleTimer) {
+      clearTimeout(idleTimer);
+      idleTimer = void 0;
+    }
+  };
+  const armIdle = () => {
+    if (!idleTimeoutMs || idleTimeoutMs <= 0)
+      return;
+    clearIdle();
+    idleTimer = setTimeout(() => {
+      onDebug?.(`agy transport idle timeout after ${idleTimeoutMs}ms with no body data`);
+      socket.destroy(new Error(`Antigravity response stalled: no data for ${idleTimeoutMs}ms`));
+    }, idleTimeoutMs);
+  };
+  socket.on("data", armIdle);
+  armIdle();
   const abort = () => socket.destroy(new DOMException("The operation was aborted", "AbortError"));
-  const cleanup = () => signal?.removeEventListener("abort", abort);
+  const cleanup = () => {
+    clearIdle();
+    socket.off("data", armIdle);
+    signal?.removeEventListener("abort", abort);
+  };
   if (signal?.aborted) {
     abort();
   } else {
@@ -632,11 +688,15 @@ async function fetchWithAgyCliTransport(url, init = {}, options = {}) {
   if (parsedUrl.protocol !== "https:") {
     throw new Error(`agy transport only supports https URLs: ${url}`);
   }
+  if (options.signal?.aborted) {
+    throw new DOMException("The operation was aborted", "AbortError");
+  }
   const body = bodyToBuffer(init.body);
   const requestBytes = serializeRequest(parsedUrl, init, body);
   const timeoutMs = options.timeoutMs ?? DEFAULT_AGY_RESPONSE_HEADER_TIMEOUT_MS;
+  const idleTimeoutMs = options.idleTimeoutMs ?? DEFAULT_AGY_IDLE_TIMEOUT_MS;
   options.onDebug?.(`agy transport connecting to ${parsedUrl.hostname} with header timeout ${timeoutMs}ms`);
-  const socket = await connectTls(parsedUrl, timeoutMs, options.onDebug);
+  const socket = await connectTlsWithAbort(parsedUrl, timeoutMs, options.signal, options.onDebug);
   const abort = () => {
     socket.destroy(new DOMException("The operation was aborted", "AbortError"));
   };
@@ -650,7 +710,7 @@ async function fetchWithAgyCliTransport(url, init = {}, options = {}) {
     });
     const parsedHead = parseResponseHead(head);
     options.onDebug?.(`agy transport response headers received: ${parsedHead.status} ${parsedHead.statusText}`);
-    const bodyStream = buildResponseStream(socket, leftover, parsedHead, options.signal);
+    const bodyStream = buildResponseStream(socket, leftover, parsedHead, options.signal, idleTimeoutMs, options.onDebug);
     return new Response(bodyStream, {
       status: parsedHead.status,
       statusText: parsedHead.statusText,
@@ -663,6 +723,27 @@ async function fetchWithAgyCliTransport(url, init = {}, options = {}) {
     options.signal?.removeEventListener("abort", abort);
   }
 }
+async function connectTlsWithAbort(targetUrl, timeoutMs, signal, onDebug) {
+  if (!signal) {
+    return connectTls(targetUrl, timeoutMs, onDebug);
+  }
+  const connectPromise = connectTls(targetUrl, timeoutMs, onDebug);
+  let onAbort;
+  const abortPromise = new Promise((_, reject) => {
+    onAbort = () => reject(new DOMException("The operation was aborted", "AbortError"));
+    signal.addEventListener("abort", onAbort, { once: true });
+  });
+  try {
+    return await Promise.race([connectPromise, abortPromise]);
+  } catch (error) {
+    void connectPromise.then((socket) => socket.destroy()).catch(() => {
+    });
+    throw error;
+  } finally {
+    if (onAbort)
+      signal.removeEventListener("abort", onAbort);
+  }
+}
 
 // ../core/dist/version.js
 var VERSION_URL = "https://antigravity-auto-updater-974169037036.us-central1.run.app";
@@ -3083,8 +3164,10 @@ async function getLockFunction() {
   if (_cachedLock) return _cachedLock;
   const mod = await import("proper-lockfile");
   const fn = (typeof mod.lock === "function" ? mod.lock : void 0) || (mod.default && typeof mod.default.lock === "function" ? mod.default.lock : void 0);
-  _cachedLock = fn || (async () => async () => {
-  });
+  if (typeof fn !== "function") {
+    throw new Error("proper-lockfile did not expose a lock() function; cannot acquire account file lock");
+  }
+  _cachedLock = fn;
   return _cachedLock;
 }
 var lockfile = { lock: (path5, options) => getLockFunction().then((fn) => fn(path5, options)) };
@@ -3598,9 +3681,11 @@ async function loadAccountsUnsafe() {
   }
 }
 async function clearAccounts() {
+  const path5 = getStoragePath();
   try {
-    const path5 = getStoragePath();
-    await fs.unlink(path5);
+    await withFileLock(path5, async () => {
+      await fs.unlink(path5);
+    });
   } catch (error) {
     const code = error.code;
     if (code !== "ENOENT") {
@@ -3625,7 +3710,7 @@ function getConfigDir2() {
 function getLogsDir(customLogDir) {
   const logsDir = customLogDir || join3(getConfigDir2(), "antigravity-logs");
   try {
-    mkdirSync3(logsDir, { recursive: true });
+    mkdirSync3(logsDir, { recursive: true, mode: 448 });
   } catch {
   }
   return logsDir;
@@ -3661,7 +3746,7 @@ function createLogWriter(filePath) {
     };
   }
   try {
-    const stream = createWriteStream(filePath, { flags: "a" });
+    const stream = createWriteStream(filePath, { flags: "a", mode: 384 });
     stream.on("error", () => {
     });
     return (line) => {
@@ -7644,6 +7729,8 @@ var DUMP_USAGE_TITLE = "## Gemini Dump Usage";
 var DUMP_USAGE = "Usage: `/gemini-dump`, `/gemini-dump on`, or `/gemini-dump off`.";
 var DUMP_DIR_ENV = "OPENCODE_ANTIGRAVITY_GEMINI_DUMP_DIR";
 var DEFAULT_DUMP_DIR = join9(tmpdir2(), "opencode-antigravity-gemini-dumps");
+var DUMP_DIR_MODE = 448;
+var DUMP_FILE_MODE = 384;
 var dumpEnabled = process.env.OPENCODE_ANTIGRAVITY_GEMINI_DUMP === "1";
 var nextDumpId = 0;
 function setGeminiDumpEnabled(enabled) {
@@ -7764,7 +7851,7 @@ function bodyStructureSummary(bodyText) {
 }
 function writeJson(path5, value) {
   writeFileSync6(path5, `${JSON.stringify(value, null, 2)}
-`, "utf8");
+`, { encoding: "utf8", mode: DUMP_FILE_MODE });
 }
 function updateMetadata(context, patch) {
   context.metadata = {
@@ -7781,7 +7868,7 @@ function dumpGeminiRequest(input2) {
   const id = `${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${String(nextDumpId).padStart(5, "0")}-${input2.streaming ? "stream" : "json"}`;
   const dumpDir = getGeminiDumpDirectory();
   const prefix = join9(dumpDir, id);
-  mkdirSync7(dumpDir, { recursive: true });
+  mkdirSync7(dumpDir, { recursive: true, mode: DUMP_DIR_MODE });
   const context = {
     id,
     files: {
@@ -7809,8 +7896,8 @@ function dumpGeminiRequest(input2) {
       }
     }
   };
-  writeFileSync6(context.files.request, input2.body, "utf8");
-  writeFileSync6(context.files.response, "", "utf8");
+  writeFileSync6(context.files.request, input2.body, { encoding: "utf8", mode: DUMP_FILE_MODE });
+  writeFileSync6(context.files.response, "", { encoding: "utf8", mode: DUMP_FILE_MODE });
   writeJson(context.files.metadata, context.metadata);
   return context;
 }
@@ -8421,17 +8508,15 @@ var _lastCacheStats = null;
 function getLastCacheStats() {
   return _lastCacheStats;
 }
-function generateSyntheticProjectId() {
-  const adjectives = ["useful", "bright", "swift", "calm", "bold"];
-  const nouns = ["fuze", "wave", "spark", "flow", "core"];
-  const adj = adjectives[Math.floor(Math.random() * adjectives.length)];
-  const noun = nouns[Math.floor(Math.random() * nouns.length)];
-  const randomPart = crypto2.randomUUID().slice(0, 5).toLowerCase();
-  return `${adj}-${noun}-${randomPart}`;
-}
 var STREAM_ACTION = "streamGenerateContent";
+function fetchInputToUrl(input2) {
+  if (typeof input2 === "string") return input2;
+  if (input2 instanceof URL) return input2.href;
+  const url = input2.url;
+  return typeof url === "string" ? url : String(input2);
+}
 function isGenerativeLanguageRequest(input2) {
-  return typeof input2 === "string" && input2.includes("generativelanguage.googleapis.com");
+  return fetchInputToUrl(input2).includes("generativelanguage.googleapis.com");
 }
 function prepareAntigravityRequest(input2, init, accessToken, projectId, endpointOverride, headerStyle = "antigravity", forceThinkingRecovery = false, options) {
   const baseInit = { ...init };
@@ -8456,7 +8541,8 @@ function prepareAntigravityRequest(input2, init, accessToken, projectId, endpoin
   headers.delete("x-goog-api-key");
   headers.delete("x-session-affinity");
   headers.delete("x-goog-user-project");
-  const match = input2.match(/\/models\/([^:]+):(\w+)/);
+  const urlString = fetchInputToUrl(input2);
+  const match = urlString.match(/\/models\/([^:]+):(\w+)/);
   if (!match) {
     return {
       request: input2,
@@ -8909,7 +8995,7 @@ function prepareAntigravityRequest(input2, init, accessToken, projectId, endpoin
         }
         stripInjectedDebugFromRequestPayload(requestPayload);
         sanitizeRequestPayloadForAntigravity(requestPayload);
-        const effectiveProjectId = projectId?.trim() || (headerStyle === "antigravity" ? generateSyntheticProjectId() : "");
+        const effectiveProjectId = projectId?.trim() || (headerStyle === "antigravity" ? ANTIGRAVITY_DEFAULT_PROJECT_ID : "");
         resolvedProjectId = effectiveProjectId;
         const wrappedBody = headerStyle === "antigravity" ? {
           project: effectiveProjectId,
@@ -10547,10 +10633,10 @@ var AccountManager = class _AccountManager {
   getAccounts() {
     return [...this.accounts];
   }
-  async saveToDisk() {
+  buildStorageSnapshot() {
     const claudeIndex = Math.max(0, this.currentAccountIndexByFamily.claude);
     const geminiIndex = Math.max(0, this.currentAccountIndexByFamily.gemini);
-    const storage = {
+    return {
       version: 4,
       accounts: this.accounts.map((a) => ({
         email: a.email,
@@ -10577,7 +10663,17 @@ var AccountManager = class _AccountManager {
         gemini: geminiIndex
       }
     };
-    await saveAccounts(storage);
+  }
+  async saveToDisk() {
+    await saveAccounts(this.buildStorageSnapshot());
+  }
+  /**
+   * Persist via full-file replace (no merge). Required after destructive
+   * operations (account removal) so a deleted account is not resurrected by
+   * mergeAccountStorage re-reading it from disk.
+   */
+  async saveToDiskReplace() {
+    await saveAccountsReplace(this.buildStorageSnapshot());
   }
   requestSaveToDisk() {
     if (this.savePending) {
@@ -13318,6 +13414,25 @@ var createAntigravityPlugin = (providerId) => async ({ client, directory }) => {
             if (!isOAuthAuth(latestAuth)) {
               return fetch(input2, init);
             }
+            if (typeof input2 !== "string") {
+              if (input2 instanceof Request) {
+                const req = input2;
+                const headers = new Headers(req.headers);
+                if (init?.headers) {
+                  new Headers(init.headers).forEach((v, k) => headers.set(k, v));
+                }
+                const bodyBuffer = req.body ? await req.clone().arrayBuffer() : void 0;
+                init = {
+                  method: init?.method ?? req.method,
+                  headers,
+                  body: init?.body ?? (bodyBuffer ? Buffer.from(bodyBuffer) : void 0),
+                  signal: init?.signal ?? req.signal
+                };
+                input2 = req.url;
+              } else {
+                input2 = String(input2.href ?? input2);
+              }
+            }
             if (accountManager.getAccountCount() === 0) {
               return createSyntheticErrorResponse(
                 "No Antigravity accounts configured. Run `opencode auth login`.",
@@ -13542,7 +13657,7 @@ var createAntigravityPlugin = (providerId) => async ({ client, directory }) => {
                     if (removed) {
                       log10.warn("Removed revoked account from pool - reauthenticate via `opencode auth login`");
                       try {
-                        await accountManager.saveToDisk();
+                        await accountManager.saveToDiskReplace();
                       } catch (persistError) {
                         log10.error("Failed to persist revoked account removal", { error: String(persistError) });
                       }