binary-collections 2.0.10 → 2.0.12

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,17 +32,113 @@ 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();
   }
 });
 
-// src/binary-collections-config.cjs
-var require_binary_collections_config = __commonJS({
-  "src/binary-collections-config.cjs"(exports2, module2) {
+// src/utils/findEnvFiles.cjs
+var require_findEnvFiles = __commonJS({
+  "src/utils/findEnvFiles.cjs"(exports2, module2) {
     init_cjs_shims();
+    var fs3 = require("fs");
     var path3 = require("path");
-    require("dotenv").config({ path: path3.join(process.cwd(), ".env") });
+    var glob = require("glob");
+    var DEFAULT_IGNORES = [
+      "**/node_modules/**",
+      "**/.git/**",
+      "**/.yarn/**",
+      "**/.pnpm/**",
+      "**/dist/**",
+      "**/build/**",
+      "**/coverage/**",
+      "**/vendor/**",
+      "**/tmp/**",
+      "**/.cache/**",
+      "**/assets/**",
+      "**/logs/**",
+      "**/output/**",
+      "**/public/**",
+      "**/static/**",
+      "**/temp/**",
+      "**/backup/**",
+      "**/backups/**",
+      "**/examples/**",
+      "**/docs/**",
+      "**/tests/**",
+      "**/__tests__/**",
+      "**/spec/**",
+      "**/__specs__/**",
+      "**/scripts/**",
+      "**/bin/**",
+      "**/hooks/**",
+      "**/config/**",
+      "**/configs/**",
+      "**/settings/**",
+      "**/.vscode/**",
+      "**/.idea/**"
+    ];
+    function findEnvFiles(startDir = process.cwd(), filter) {
+      const found = /* @__PURE__ */ new Set();
+      function addFile(file) {
+        const normalized = path3.normalize(file);
+        if (typeof filter === "function" && !filter(normalized)) {
+          return;
+        }
+        found.add(normalized);
+      }
+      let current = path3.resolve(startDir);
+      while (true) {
+        const envPath = path3.join(current, ".env");
+        if (fs3.existsSync(envPath)) {
+          addFile(envPath);
+        }
+        const parent = path3.dirname(current);
+        if (parent === current) {
+          break;
+        }
+        current = parent;
+      }
+      const files = glob.globSync("**/.env*", {
+        cwd: startDir,
+        absolute: true,
+        nodir: true,
+        ignore: DEFAULT_IGNORES
+      });
+      for (const file of files) {
+        addFile(file);
+      }
+      return [...found];
+    }
+    function findEnvWithToken(startDir = process.cwd(), tokenName = "GITHUB_TOKEN") {
+      const envFiles = findEnvFiles(startDir);
+      return envFiles.find((file) => {
+        try {
+          const content = fs3.readFileSync(file, "utf-8");
+          const regex = new RegExp(`^\\s*${tokenName}\\s*=`, "m");
+          return regex.test(content);
+        } catch (err) {
+          console.warn(`Failed to read ${file}: ${err instanceof Error ? err.message : String(err)}`);
+          return false;
+        }
+      });
+    }
+    module2.exports = {
+      DEFAULT_IGNORES,
+      findEnvFiles,
+      findEnvWithToken,
+      default: findEnvFiles
+    };
+  }
+});
+
+// src/binary-collections/config.cjs
+var require_config = __commonJS({
+  "src/binary-collections/config.cjs"(exports2, module2) {
+    init_cjs_shims();
+    var path3 = require("path");
+    var { findEnvWithToken } = require_findEnvFiles();
+    require("dotenv").config({ path: findEnvWithToken(), quiet: true, overwrite: true });
     function getTempDir() {
       return process.env.TEMP_DIR || path3.join(process.cwd(), "tmp");
     }
@@ -112,31 +209,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;
@@ -187,11 +331,13 @@ init_cjs_shims();
 
 // src/git-diff.js
 init_cjs_shims();
+var import_ansi_colors = __toESM(require("ansi-colors"), 1);
 var import_child_process = require("child_process");
 var import_fs_extra2 = __toESM(require("fs-extra"), 1);
+var import_sbg_utility = require("sbg-utility");
 var import_upath2 = __toESM(require("upath"), 1);
 var import_url = require("url");
-var import_binary_collections_config = __toESM(require_binary_collections_config(), 1);
+var import_config = __toESM(require_config(), 1);
 
 // src/utils/chatgpt.js
 init_cjs_shims();
@@ -201,7 +347,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 +376,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 +416,157 @@ 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 +639,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 +660,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 +672,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 +702,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 +716,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 +724,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 +752,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 +780,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 +827,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);
@@ -545,20 +855,24 @@ async function runChatGpt(chatgptOptions = {}) {
 var import_utils = __toESM(require_utils(), 1);
 var __filename2 = (0, import_url.fileURLToPath)(importMetaUrl);
 var __dirname = import_upath2.default.dirname(__filename2);
-var DIFF_OUTPUT = (0, import_binary_collections_config.getTempPath)("git-diff.txt");
-var GPT_DIFF_OUTPUT = (0, import_binary_collections_config.getTempPath)("gpt-question.txt");
+var args = (0, import_utils.getArgs)();
+var positional = args._ || [];
+var FILENAME = (0, import_sbg_utility.md5)((positional[0] || "default") + JSON.stringify(args));
+var DIFF_OUTPUT = (0, import_config.getTempPath)(`git-diff/${FILENAME}.txt`);
+var GPT_DIFF_OUTPUT = (0, import_config.getTempPath)(`git-diff/gpt-${FILENAME}.txt`);
 var CACHE_DIR = import_upath2.default.dirname(DIFF_OUTPUT);
 var DIFF_OUTPUT_RELATIVE = import_upath2.default.relative(process.cwd(), DIFF_OUTPUT);
 var GPT_DIFF_OUTPUT_RELATIVE = import_upath2.default.relative(process.cwd(), GPT_DIFF_OUTPUT);
-if (!import_fs_extra2.default.existsSync(CACHE_DIR)) {
-  import_fs_extra2.default.mkdirSync(CACHE_DIR, { recursive: true });
-}
+import_fs_extra2.default.ensureDirSync(CACHE_DIR, { mode: 493 });
 function showHelp() {
   console.log("\u{1F4DD} Git Diff Helper");
   console.log("\u{1F4C4} Usage:");
   console.log("  \u{1F4C2} git-diff FILE             Show staged diff of specified file");
   console.log("  \u{1F4C2} git-diff --staged-only    Show staged diff of all files");
   console.log("  \u{1F4C2} git-diff -s | -S          Same as --staged-only");
+  console.log("  \u{1F4C2} git-diff --unstaged FILE  Show unstaged diff of specified file");
+  console.log("  \u{1F4C2} git-diff --unstaged       Show unstaged diff of all files");
+  console.log("  \u{1F4C2} git-diff -u               Same as --unstaged");
   console.log("  \u{1F4C2} git-diff --ai             Run ChatGPT automation for commit message");
   console.log("  \u{1F4C2} git-diff --help | -h      Show this help message");
   console.log("");
@@ -575,13 +889,13 @@ function runGitDiff(command, successMessage, errorMessage) {
       // 10MB buffer to handle large diffs
     });
     if (!result || result.trim() === "") {
-      console.log(`\u2139\uFE0F [i] No changes found for the specified criteria`);
-      import_fs_extra2.default.writeFileSync(DIFF_OUTPUT, "# No changes found\n");
+      console.log(`\u2139\uFE0F  [i] No changes found for the specified criteria`);
+      (0, import_sbg_utility.writefile)(DIFF_OUTPUT, "# No changes found\n");
       console.log(`\u2705 Empty diff saved to "${DIFF_OUTPUT_RELATIVE}"`);
-      return;
+      return false;
     }
-    import_fs_extra2.default.writeFileSync(DIFF_OUTPUT, result);
-    import_fs_extra2.default.writeFileSync(
+    (0, import_sbg_utility.writefile)(DIFF_OUTPUT, result);
+    (0, import_sbg_utility.writefile)(
       GPT_DIFF_OUTPUT,
       `Hello, ChatGPT!
 Can you create a conventional commit message by diff content below:
@@ -594,7 +908,8 @@ Give me result as codeblock with language "text" only.
 Thank you!`
     );
     console.log(`\u2705 ${successMessage}`);
-    console.log(`\u{1F4BE} GPT diff prompt saved to "${GPT_DIFF_OUTPUT_RELATIVE}"`);
+    console.log(`\u{1F4BE} GPT diff prompt saved to "${import_ansi_colors.default.green(GPT_DIFF_OUTPUT_RELATIVE)}"`);
+    return true;
   } catch (error) {
     console.error(`\u274C ${errorMessage}`);
     console.error(`\u{1F4DD} Command: ${command}`);
@@ -605,34 +920,71 @@ Thank you!`
     process.exit(1);
   }
 }
+function fileHasChanges(file, mode) {
+  const command = mode === "staged" ? `git diff --cached --quiet -- "${file}"` : `git diff --quiet -- "${file}"`;
+  try {
+    (0, import_child_process.execSync)(command, { stdio: "ignore" });
+    return false;
+  } catch (error) {
+    if (error.status === 1) {
+      return true;
+    }
+    throw error;
+  }
+}
 async function mainGitDiff() {
-  const args = (0, import_utils.getArgs)();
-  const positional = args._ || [];
   if (args.help || args.h) {
     showHelp();
   }
+  const useUnstaged = args.unstaged || args.u;
+  const fileFromFlag = typeof args.unstaged === "string" ? args.unstaged : typeof args.u === "string" ? args.u : null;
+  let hasDiff = false;
   if (args["staged-only"] || args.s || args.S) {
-    runGitDiff(
+    hasDiff = runGitDiff(
       "git --no-pager diff --staged",
-      `Full staged diff saved to "${DIFF_OUTPUT_RELATIVE}"`,
+      `Full staged diff saved to "${import_ansi_colors.default.green(DIFF_OUTPUT_RELATIVE)}"`,
       "Failed to save staged diff"
     );
   } else {
-    const file = positional[0];
+    const file = positional[0] || fileFromFlag;
     if (!file) {
-      runGitDiff(
+      const fullDiffModeLabel = useUnstaged ? "unstaged" : "unstaged";
+      hasDiff = runGitDiff(
         "git --no-pager diff",
-        `Full staged diff saved to "${DIFF_OUTPUT_RELATIVE}"`,
+        `Full ${fullDiffModeLabel} diff saved to "${import_ansi_colors.default.green(DIFF_OUTPUT_RELATIVE)}"`,
         "Failed to save all diff's"
       );
     } else {
-      runGitDiff(
-        `git --no-pager diff --cached -- "${file}"`,
-        `Staged diff of "${file}" saved to "${DIFF_OUTPUT_RELATIVE}"`,
-        `Failed to generate diff for "${file}"`
+      let fileDiffMode = useUnstaged ? "unstaged" : "staged";
+      if (!useUnstaged && !fileHasChanges(file, "staged") && fileHasChanges(file, "unstaged")) {
+        fileDiffMode = "unstaged";
+      }
+      hasDiff = runGitDiff(
+        fileDiffMode === "unstaged" ? `git --no-pager diff -- "${file}"` : `git --no-pager diff --cached -- "${file}"`,
+        `${fileDiffMode[0].toUpperCase() + fileDiffMode.slice(1)} diff of "${file}" saved to "${import_ansi_colors.default.green(
+          DIFF_OUTPUT_RELATIVE
+        )}"`,
+        `Failed to generate ${fileDiffMode} diff for "${file}"`
       );
     }
   }
+  if (hasDiff) {
+    const opencodePrompt = [
+      "",
+      "\u{1F916} OpenCode Prompt Helper",
+      "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
+      "",
+      "\u{1F4C4} App Prompt:",
+      `   Generate a conventional commit message from diff file: ${DIFF_OUTPUT}`,
+      "",
+      "\u{1F4BB} CLI Command:",
+      `   opencode run "Generate a conventional commit message from diff file ${DIFF_OUTPUT}"`,
+      ""
+    ];
+    const opencodePromptPath = (0, import_config.getTempPath)(`git-diff/opencode-${FILENAME}.txt`);
+    (0, import_sbg_utility.writefile)(opencodePromptPath, opencodePrompt.join("\n"));
+    console.log(`\u{1F4A1} OpenCode prompt saved to "${import_ansi_colors.default.green(import_upath2.default.relative(process.cwd(), opencodePromptPath))}"`);
+  }
   if (args.ai) {
     try {
       await runChatGpt({ headless: true, questionFile: GPT_DIFF_OUTPUT });