binary-collections 2.0.10 → 2.0.11

package/lib/git-diff-cli.cjs

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -31,7 +32,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var getImportMetaUrl, importMetaUrl;
 var init_cjs_shims = __esm({
   "node_modules/tsup/assets/cjs_shims.js"() {
-    getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
+    getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.tagName.toUpperCase() === "SCRIPT" ? document.currentScript.src : new URL("main.js", document.baseURI).href;
     importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
   }
 });
@@ -41,7 +42,7 @@ var require_binary_collections_config = __commonJS({
   "src/binary-collections-config.cjs"(exports2, module2) {
     init_cjs_shims();
     var path3 = require("path");
-    require("dotenv").config({ path: path3.join(process.cwd(), ".env") });
+    require("dotenv").config({ path: path3.join(process.cwd(), ".env"), quiet: true, override: true });
     function getTempDir() {
       return process.env.TEMP_DIR || path3.join(process.cwd(), "tmp");
     }
@@ -112,31 +113,78 @@ var require_utils = __commonJS({
     }
     module2.exports.getArgs = getArgs2;
     function del(fullPath) {
-      if (fs3.statSync(fullPath).isDirectory()) {
-        const subdir = fs3.readdirSync(fullPath).map((dirPath) => path3.resolve(fullPath, dirPath));
-        for (let i = 0; i < subdir.length; i++) {
-          del(subdir[i]);
+      try {
+        if (!fs3.existsSync(fullPath)) return;
+        const stat = fs3.lstatSync(fullPath);
+        if (stat.isSymbolicLink()) {
+          try {
+            fs3.unlinkSync(fullPath);
+            console.log("deleted symlink", fullPath);
+          } catch (e) {
+            console.log("failed delete symlink", fullPath, e && e.message);
+          }
+          return;
+        }
+        if (stat.isDirectory()) {
+          const subdir = fs3.readdirSync(fullPath).map((dirPath) => path3.resolve(fullPath, dirPath));
+          for (let i = 0; i < subdir.length; i++) {
+            del(subdir[i]);
+          }
+          try {
+            fs3.rmdirSync(fullPath);
+            console.log("deleted", fullPath);
+          } catch (e) {
+            try {
+              fs3.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+              console.log("deleted", fullPath);
+            } catch (ee) {
+              console.log("failed delete", fullPath, ee && ee.message);
+            }
+          }
+          return;
         }
-      } else {
         try {
-          fs3.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+          fs3.unlinkSync(fullPath);
           console.log("deleted", fullPath);
-        } catch (_) {
-          console.log("failed delete", fullPath);
+        } catch (e) {
+          try {
+            fs3.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+            console.log("deleted", fullPath);
+          } catch (ee) {
+            console.log("failed delete", fullPath, ee && ee.message);
+          }
         }
+      } catch (err) {
+        console.log("failed delete", fullPath, err && err.message);
       }
     }
     module2.exports.del = del;
     function delStream(globStream) {
       globStream.stream().on("data", (result) => {
         const fullPath = path3.resolve(process.cwd(), result);
-        if (fs3.statSync(fullPath).isDirectory()) {
-          const subdir = fs3.readdirSync(fullPath).map((dirPath) => path3.resolve(fullPath, dirPath));
-          for (let i = 0; i < subdir.length; i++) {
-            del(subdir[i]);
+        try {
+          if (fs3.existsSync(fullPath)) {
+            const stat = fs3.lstatSync(fullPath);
+            if (stat.isSymbolicLink()) {
+              try {
+                fs3.unlinkSync(fullPath);
+                console.log("deleted symlink", fullPath);
+              } catch (e) {
+                console.log("failed delete symlink", fullPath, e && e.message);
+              }
+              return;
+            }
+            if (stat.isDirectory()) {
+              const subdir = fs3.readdirSync(fullPath).map((dirPath) => path3.resolve(fullPath, dirPath));
+              for (let i = 0; i < subdir.length; i++) {
+                del(subdir[i]);
+              }
+            }
           }
+          del(fullPath);
+        } catch (err) {
+          console.log("failed processing", fullPath, err && err.message);
         }
-        del(fullPath);
       });
     }
     module2.exports.delStream = delStream;
@@ -201,7 +249,17 @@ var import_puppeteer_extra_plugin_stealth = __toESM(require("puppeteer-extra-plu
 var import_upath = __toESM(require("upath"), 1);
 var COOKIE_DIR = import_upath.default.join(process.cwd(), "tmp", "cookies");
 var DEFAULT_COOKIE_PATH = import_upath.default.join(COOKIE_DIR, "cookies.json");
+var NAVIGATION_TIMEOUT_MS = 9e4;
+var NETWORK_IDLE_TIMEOUT_MS = 15e3;
+var MAX_INLINE_QUESTION_FILE_BYTES = 2 * 1024;
 import_fs_extra.default.ensureDirSync(COOKIE_DIR);
+async function gotoWithFallback(page, url) {
+  await page.goto(url, { waitUntil: "domcontentloaded", timeout: NAVIGATION_TIMEOUT_MS });
+  try {
+    await page.waitForNetworkIdle({ idleTime: 1e3, timeout: NETWORK_IDLE_TIMEOUT_MS });
+  } catch {
+  }
+}
 async function saveCookies(page, path3 = DEFAULT_COOKIE_PATH) {
   const cookies = await page.cookies();
   import_fs_extra.default.writeFileSync(path3, JSON.stringify(cookies, null, 2));
@@ -220,7 +278,7 @@ async function navigatePage(page, url) {
   if (cookies) {
     await page.setCookie(...cookies);
   }
-  await page.goto(url, { waitUntil: "networkidle0" });
+  await gotoWithFallback(page, url);
   await page.evaluate(() => {
     window.__domStillUpdating = true;
     if (window.__domObserver) {
@@ -260,46 +318,151 @@ function loadCookies(cookieFilePath = DEFAULT_COOKIE_PATH) {
   return JSON.parse(import_fs_extra.default.readFileSync(cookieFilePath));
 }
 async function writeQuestion(page, question) {
-  const questions = question.split("\n");
   const promptTextarea = await page.waitForSelector("#prompt-textarea", { timeout: 3e4 });
   if (!promptTextarea) {
     console.log(
       "Cannot find the prompt input on the webpage. Please check whether you have access to chat.openai.com without logging in via your browser."
     );
-  }
-  await page.evaluate(() => {
-    document.querySelector("#prompt-textarea").innerHTML = `<p></p>`;
-  });
-  if (questions.length === 1) {
-    await page.type("#prompt-textarea", questions[0], { delay: 100 });
     return;
   }
-  for (const q of questions) {
-    await page.type("#prompt-textarea", q, { delay: 100 });
-    if (q !== questions[questions.length - 1]) {
-      await page.keyboard.down("Shift");
-      await page.keyboard.press("Enter");
-      await page.keyboard.up("Shift");
+  await page.evaluate((text) => {
+    const promptEl = document.querySelector("#prompt-textarea");
+    if (!promptEl) {
+      return;
     }
+    promptEl.focus();
+    promptEl.innerHTML = "";
+    const lines = String(text).split("\n");
+    for (const line of lines) {
+      const p = document.createElement("p");
+      p.textContent = line;
+      promptEl.appendChild(p);
+    }
+    promptEl.dispatchEvent(new InputEvent("beforeinput", { bubbles: true, inputType: "insertFromPaste", data: text }));
+    promptEl.dispatchEvent(new InputEvent("input", { bubbles: true, inputType: "insertFromPaste", data: text }));
+    promptEl.dispatchEvent(new Event("change", { bubbles: true }));
+  }, question);
+  const hasPromptText = await page.evaluate(() => {
+    const promptEl = document.querySelector("#prompt-textarea");
+    return Boolean(promptEl && promptEl.textContent && promptEl.textContent.trim().length > 0);
+  });
+  if (!hasPromptText) {
+    console.log("Prompt state not updated by DOM injection. Falling back to keyboard insertText.");
+    await promptTextarea.click({ clickCount: 1 });
+    await page.keyboard.down("Control");
+    await page.keyboard.press("KeyA");
+    await page.keyboard.up("Control");
+    await page.keyboard.insertText(question);
   }
 }
 async function clickSubmitButton(page) {
+  console.log("Attempting to click the submit button...");
   try {
-    const fruitjuiceSendButton = await page.evaluate(() => {
-      return document.querySelector('[data-testid="fruitjuice-send-button"]') !== null;
+    const userMessageCountBefore = await page.$$eval('[data-message-author-role="user"]', (elements) => elements.length);
+    const waitForSubmit = async (timeout = 5e3) => {
+      try {
+        await page.waitForFunction(
+          (previousCount) => {
+            const currentCount = document.querySelectorAll('[data-message-author-role="user"]').length;
+            return currentCount > previousCount;
+          },
+          { timeout },
+          userMessageCountBefore
+        );
+        return true;
+      } catch {
+        return false;
+      }
+    };
+    await page.waitForFunction(() => {
+      const candidates = [
+        document.querySelector('[data-testid="fruitjuice-send-button"]'),
+        document.querySelector("#composer-submit-button"),
+        document.querySelector('[data-testid="send-button"]')
+      ].filter(Boolean);
+      return candidates.some((button) => {
+        const isDisabled = button.disabled || button.getAttribute("aria-disabled") === "true";
+        const isVisible = button.offsetParent !== null;
+        return !isDisabled && isVisible;
+      });
+    }, { timeout: 5e3 }).catch(() => {
     });
-    const sendButton = await page.evaluate(() => {
-      return document.querySelector('[data-testid="send-button"]') !== null;
+    const buttonDetails = await page.evaluate(() => {
+      const selectors = [
+        '[data-testid="fruitjuice-send-button"]',
+        "#composer-submit-button",
+        '[data-testid="send-button"]'
+      ];
+      const details = selectors.map((selector) => {
+        const el = document.querySelector(selector);
+        const exists = Boolean(el);
+        const disabled = exists ? Boolean(el.disabled || el.getAttribute("aria-disabled") === "true") : null;
+        const visible = exists ? el.offsetParent !== null : null;
+        return { selector, exists, disabled, visible };
+      });
+      return details;
     });
-    if (fruitjuiceSendButton) {
-      await page.click('[data-testid="fruitjuice-send-button"]');
-    } else if (sendButton) {
-      await page.click('[data-testid="send-button"]');
-    } else {
-      console.log("Neither send button is present");
+    console.log(`Submit button details: ${JSON.stringify(buttonDetails)}`);
+    const clickable = buttonDetails.find((item) => item.exists && item.visible && item.disabled === false);
+    const selectedSelector = clickable ? clickable.selector : null;
+    if (selectedSelector) {
+      await page.click(selectedSelector);
+      console.log(`Clicked submit button selector: ${selectedSelector}`);
+      if (await waitForSubmit(5e3)) {
+        console.log("Submission detected after selector click.");
+        return true;
+      }
+      const forcedClickWorked = await page.evaluate((selector) => {
+        const el = document.querySelector(selector);
+        if (!el) {
+          return false;
+        }
+        el.click();
+        return true;
+      }, selectedSelector);
+      if (forcedClickWorked) {
+        console.log(`Forced DOM click on selector: ${selectedSelector}`);
+        if (await waitForSubmit(5e3)) {
+          console.log("Submission detected after forced DOM click.");
+          return true;
+        }
+      }
+    }
+    console.log("Submit button path did not submit. Trying Enter key fallback on prompt.");
+    await page.focus("#prompt-textarea");
+    await page.keyboard.press("Enter");
+    if (await waitForSubmit(5e3)) {
+      console.log("Submission detected after Enter key fallback.");
+      return true;
+    }
+    const didRequestSubmit = await page.evaluate(() => {
+      const prompt = document.querySelector("#prompt-textarea");
+      if (!prompt) {
+        return false;
+      }
+      const form = prompt.closest("form");
+      if (!form) {
+        return false;
+      }
+      if (typeof form.requestSubmit === "function") {
+        form.requestSubmit();
+      } else {
+        form.submit();
+      }
+      return true;
+    });
+    if (didRequestSubmit) {
+      console.log("Triggered form submit fallback.");
+      if (await waitForSubmit(5e3)) {
+        console.log("Submission detected after form submit fallback.");
+        return true;
+      }
     }
+    console.log("Failed to submit prompt after all strategies.");
+    return false;
   } catch (e) {
     console.log(`Failed to click the send button: ${e}`);
+    return false;
   }
 }
 var lastMessageId = null;
@@ -372,11 +535,15 @@ async function isLoggedIn(page) {
   return result === true;
 }
 async function createBrowser(browserOptions = {}) {
+  const windowsChromeExecutable = "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe";
+  const hasWindowsChrome = process.platform === "win32" && import_fs_extra.default.existsSync(windowsChromeExecutable);
   const defaultOptions = {
     headless: false,
+    defaultViewport: null,
     userDataDir: import_upath.default.join(process.cwd(), "tmp/puppeteer-profile"),
     // Windows-specific options to handle browser launch issues
     args: [
+      "--start-maximized",
       "--no-sandbox",
       "--disable-setuid-sandbox",
       "--disable-dev-shm-usage",
@@ -389,10 +556,9 @@ async function createBrowser(browserOptions = {}) {
       "--disable-renderer-backgrounding"
     ],
     ignoreDefaultArgs: ["--disable-extensions"],
-    ...process.platform === "win32" && {
-      // Additional Windows-specific options
-      executablePath: void 0
-      // Let Puppeteer find Chrome automatically
+    ...hasWindowsChrome && {
+      // Prefer local Chrome installation when present on Windows.
+      executablePath: windowsChromeExecutable
     }
   };
   try {
@@ -402,8 +568,12 @@ async function createBrowser(browserOptions = {}) {
     try {
       return await import_puppeteer_extra.default.use((0, import_puppeteer_extra_plugin_stealth.default)()).launch({
         headless: browserOptions.headless || false,
-        args: ["--no-sandbox", "--disable-setuid-sandbox"],
+        defaultViewport: null,
+        args: ["--start-maximized", "--no-sandbox", "--disable-setuid-sandbox"],
         ignoreDefaultArgs: false,
+        ...hasWindowsChrome && {
+          executablePath: windowsChromeExecutable
+        },
         ...browserOptions
       });
     } catch (fallbackError) {
@@ -428,7 +598,11 @@ async function loginToChatGpt() {
   if (loginButtonExists) {
     console.log("Login button found, clicking to log in...");
     await page.click('[data-testid="login-button"]');
-    await page.waitForNavigation({ waitUntil: "networkidle0" });
+    await page.waitForNavigation({ waitUntil: "domcontentloaded", timeout: NAVIGATION_TIMEOUT_MS });
+    try {
+      await page.waitForNetworkIdle({ idleTime: 1e3, timeout: NETWORK_IDLE_TIMEOUT_MS });
+    } catch {
+    }
     console.log("Login process completed.");
   } else {
     console.log("No login required - user appears to be already logged in.");
@@ -438,6 +612,7 @@ async function runChatGpt(chatgptOptions = {}) {
   const headless = chatgptOptions.headless !== void 0 ? chatgptOptions.headless : true;
   const questionFile = chatgptOptions.questionFile;
   let question = chatgptOptions.question;
+  let shouldUploadQuestionFile = Boolean(questionFile);
   const responseFile = chatgptOptions.responseFile || import_upath.default.join(process.cwd(), "tmp", "response.txt");
   const noInputProvided = !question && !questionFile;
   const questionIsEmpty = question && question.trim().length === 0;
@@ -445,6 +620,22 @@ async function runChatGpt(chatgptOptions = {}) {
   if (noInputProvided || questionIsEmpty || questionFileIsEmpty) {
     throw new Error("You must provide a question or a question file.");
   }
+  if (!question && questionFile) {
+    if (!import_fs_extra.default.existsSync(questionFile)) {
+      throw new Error(`Question file does not exist: ${questionFile}`);
+    }
+    const questionFileStats = import_fs_extra.default.statSync(questionFile);
+    if (questionFileStats.size <= MAX_INLINE_QUESTION_FILE_BYTES) {
+      question = import_fs_extra.default.readFileSync(questionFile, "utf8").trim();
+      if (!question) {
+        throw new Error("Question file is empty.");
+      }
+      shouldUploadQuestionFile = false;
+      console.log(
+        `Question file is ${questionFileStats.size} bytes (<= ${MAX_INLINE_QUESTION_FILE_BYTES}). Sending as text prompt.`
+      );
+    }
+  }
   let browser;
   try {
     browser = await createBrowser({ headless });
@@ -457,7 +648,16 @@ async function runChatGpt(chatgptOptions = {}) {
     console.error("4. Close any running Chrome instances and try again");
     throw error;
   }
-  const page = (await browser.pages()).length > 0 ? (await browser.pages())[0] : await browser.newPage();
+  const allPages = await browser.pages();
+  const page = allPages.length > 0 ? allPages[0] : await browser.newPage();
+  await page.bringToFront();
+  if (allPages.length > 1) {
+    for (const p of allPages) {
+      if (p !== page) {
+        await p.close();
+      }
+    }
+  }
   try {
     const url = "https://chat.openai.com";
     const navigate = await navigatePage(page, url);
@@ -476,12 +676,15 @@ async function runChatGpt(chatgptOptions = {}) {
     }
     if (question) {
       await writeQuestion(page, question);
-      await clickSubmitButton(page);
+      const didSubmit = await clickSubmitButton(page);
+      if (!didSubmit) {
+        throw new Error("Prompt was not submitted. The composer button may be disabled or blocked.");
+      }
       await navigate.waitForDomIdle(1e3, 3e4);
       await waitForInitialResponse(page);
       await handleStreamingResponse(page, responseFile);
       await saveCookies(page, getCookiePathForUrl(url));
-    } else if (questionFile) {
+    } else if (shouldUploadQuestionFile && questionFile) {
       await navigate.waitForDomIdle(2e3, 1e4);
       const isUserLoggedIn = await isLoggedIn(page);
       console.log(`Login status: ${isUserLoggedIn ? "Logged in" : "Not logged in"}`);
@@ -520,7 +723,10 @@ async function runChatGpt(chatgptOptions = {}) {
             await fileInput.uploadFile(questionFile);
             await navigate.waitForDomIdle(2e3, 15e3);
             console.log("File uploaded successfully");
-            await clickSubmitButton(page);
+            const didSubmit = await clickSubmitButton(page);
+            if (!didSubmit) {
+              throw new Error("Prompt was not submitted after file upload.");
+            }
             await navigate.waitForDomIdle(1e3, 3e4);
             await waitForInitialResponse(page);
             await handleStreamingResponse(page, responseFile);

package/lib/git-diff-cli.d.ts

@@ -1 +1,2 @@
+#!/usr/bin/env node
 export {};

package/lib/git-diff-cli.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }

package/lib/git-diff-cli.mjs

@@ -1,10 +1,11 @@
+#!/usr/bin/env node
 import { createRequire } from 'module'; const require = createRequire(import.meta.url);
 import {
   mainGitDiff
-} from "./chunk-SBNDSKG5.mjs";
-import "./chunk-GJTGHXRA.mjs";
-import "./chunk-66PAU5PS.mjs";
-import "./chunk-V3N3JEUF.mjs";
+} from "./chunk-FCDQGYBF.mjs";
+import "./chunk-N436BNBK.mjs";
+import "./chunk-YYLIQQKF.mjs";
+import "./chunk-Z6JLYU2J.mjs";
 import {
   init_esm_shims
 } from "./chunk-QQ4A6DLD.mjs";