glassbox 0.12.0-beta.2 → 0.12.0-beta.3

package/README.md

@@ -299,7 +299,7 @@ git difftool HEAD~1 HEAD              # step through changed files one at a time
 
 When you're finished, click **Done** in the review (a difftool session shows this instead of the normal completion flow) — the `git difftool` command returns to your prompt cleanly, no Ctrl-C needed. Closing the browser tab ends the session too.
 
-**Desktop vs browser:** in a browser (npm) install the accumulating model above applies. If the desktop app is installed, `--dir-diff` opens the whole change set in one Glassbox window (matching what `glassbox --commit` does from the same folder) on macOS, Linux, and Windows; desktop per-file mode currently opens one window per file, so `--dir-diff` is the recommended desktop invocation.
+**Desktop vs browser:** the accumulating model is the same either way — only the window differs. In a browser (npm) install the review opens in a tab; if the desktop app is installed, it opens in one Glassbox window (matching what `glassbox --commit` does from the same folder) on macOS, Linux, and Windows, and per-file mode accumulates into that single window just like the browser. Closing the window ends the session.
 
 **Under the hood:** `git difftool --dir-diff` materializes its two snapshot directories asymmetrically — the right side is symlinks pointing into your working tree, which trips up plain `git diff --no-index`. `glassbox-difftool` dereferences those symlinks into a temp tree before handing the dirs to `glassbox --diff`, then cleans up when the session ends. In per-file mode the wrapper reads each file's content before it returns (git deletes the temp files the instant the tool exits) and POSTs it to the accumulating server; the last file holds the connection open so `git difftool` stays attached until you click Done. Without the wrapper you'd see every modified file show up as a "deleted + added" pair instead of a modified entry, and per-file mode would hang waiting for a manual Ctrl-C between files.
 

package/dist/cli-difftool.js

@@ -14590,6 +14590,7 @@ function tryAcquireStartingLock(home = difftoolHome()) {
 
 // src/git/difftool-client.ts
 var DISCOVER_TIMEOUT_MS = 15 * 1e3;
+var DESKTOP_DISCOVER_TIMEOUT_MS = 30 * 1e3;
 var PROBE_INTERVAL_MS = 150;
 function delay(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -14609,7 +14610,7 @@ async function ping(port) {
     return false;
   }
 }
-function spawnDetachedServer(cliPath, cwd) {
+function spawnDetachedBrowserServer(cliPath, cwd) {
   const child = spawn(process.execPath, [cliPath, "--difftool-serve"], {
     cwd,
     detached: true,
@@ -14617,8 +14618,22 @@ function spawnDetachedServer(cliPath, cwd) {
   });
   child.unref();
 }
-async function discoverOrStartServer(cliPath, cwd) {
-  const deadline = Date.now() + DISCOVER_TIMEOUT_MS;
+function launchDetachedDesktopSession(launcher, cwd) {
+  if (process.platform === "win32") {
+    const child = spawn(`"${launcher}" --difftool-serve`, {
+      cwd,
+      detached: true,
+      stdio: "ignore",
+      shell: true
+    });
+    child.unref();
+  } else {
+    const child = spawn(launcher, ["--difftool-serve"], { cwd, detached: true, stdio: "ignore" });
+    child.unref();
+  }
+}
+async function discoverOrStartServer(startServer, timeoutMs = DISCOVER_TIMEOUT_MS) {
+  const deadline = Date.now() + timeoutMs;
   let startedByUs = false;
   while (Date.now() < deadline) {
     const discovery = readDiscovery();
@@ -14627,7 +14642,7 @@ async function discoverOrStartServer(cliPath, cwd) {
     }
     if (!startedByUs && tryAcquireStartingLock()) {
       startedByUs = true;
-      spawnDetachedServer(cliPath, cwd);
+      startServer();
     }
     await delay(PROBE_INTERVAL_MS);
   }
@@ -14752,11 +14767,11 @@ function readFileOrEmpty(p) {
     return Buffer.alloc(0);
   }
 }
-async function runThinClient(cliPath) {
+async function runThinClient(start, timeoutMs) {
   const oldContent = readFileOrEmpty(local);
   const newContent = readFileOrEmpty(remote);
   const displayPath = merged || basename(remote) || basename(local) || "file";
-  const port = await discoverOrStartServer(cliPath, process.cwd());
+  const port = await discoverOrStartServer(start, timeoutMs);
   await appendFile(port, displayPath, oldContent, newContent);
   if (shouldHoldForSession(process.env)) {
     await holdUntilEnd(port);
@@ -14799,16 +14814,27 @@ function runBlockingLaunch() {
     cleanup();
   }
 }
+var onThinClientDone = () => process.exit(0);
+var onThinClientError = (err) => {
+  console.error(err instanceof Error ? err.message : String(err));
+  return process.exit(1);
+};
 if (localIsFile && target.kind === "browser") {
-  runThinClient(target.cli).then(
+  const cliPath = target.cli;
+  void runThinClient(() => {
+    spawnDetachedBrowserServer(cliPath, process.cwd());
+  }).then(
+    onThinClientDone,
+    onThinClientError
+  );
+} else if (localIsFile && target.kind === "desktop") {
+  const launcher = target.launcher;
+  void runThinClient(
     () => {
-      process.exit(0);
+      launchDetachedDesktopSession(launcher, process.cwd());
     },
-    (err) => {
-      console.error(err instanceof Error ? err.message : String(err));
-      process.exit(1);
-    }
-  );
+    DESKTOP_DISCOVER_TIMEOUT_MS
+  ).then(onThinClientDone, onThinClientError);
 } else {
   runBlockingLaunch();
 }

package/dist/cli.js

@@ -17019,8 +17019,15 @@ import { basename, dirname, join as join3, resolve } from "path";
 
 // src/git/repo.ts
 import { spawnSync as spawnSync3 } from "child_process";
+function scrubbedGitEnv() {
+  const env = { ...process.env };
+  delete env.GIT_EXTERNAL_DIFF;
+  delete env.GIT_DIFF_PATH_COUNTER;
+  delete env.GIT_DIFF_PATH_TOTAL;
+  return env;
+}
 function git(args, cwd) {
-  const result = spawnSync3("git", args, { cwd, encoding: "utf-8", maxBuffer: 50 * 1024 * 1024 });
+  const result = spawnSync3("git", args, { cwd, encoding: "utf-8", maxBuffer: 50 * 1024 * 1024, env: scrubbedGitEnv() });
   if (result.status === 0) return result.stdout;
   if (result.stdout !== "") return result.stdout;
   const err = new Error(result.stderr);
@@ -17045,7 +17052,7 @@ function isGitRepo(cwd) {
   }
 }
 function getHeadCommit(cwd) {
-  return spawnSync3("git", ["rev-parse", "HEAD"], { cwd, encoding: "utf-8" }).stdout.trim();
+  return spawnSync3("git", ["rev-parse", "HEAD"], { cwd, encoding: "utf-8", env: scrubbedGitEnv() }).stdout.trim();
 }
 
 // src/git/types.ts
@@ -17096,7 +17103,7 @@ function parseDiffData(raw) {
 // src/git/diff.ts
 var toGitArg = (p) => process.platform === "win32" ? p.replace(/\\/g, "/") : p;
 function git2(args, cwd) {
-  const result = spawnSync4("git", args, { cwd, encoding: "utf-8", maxBuffer: 50 * 1024 * 1024 });
+  const result = spawnSync4("git", args, { cwd, encoding: "utf-8", maxBuffer: 50 * 1024 * 1024, env: scrubbedGitEnv() });
   if (result.status === 0) return result.stdout;
   if (result.stdout !== "") return result.stdout;
   const err = new Error(result.stderr);
@@ -21050,7 +21057,7 @@ function getNewRef(mode) {
 }
 function gitShowFile(ref, filePath, repoRoot) {
   const spec = ref === ":" ? `:${filePath}` : `${ref}:${filePath}`;
-  const result = spawnSync6("git", ["show", spec], { cwd: repoRoot, maxBuffer: 50 * 1024 * 1024 });
+  const result = spawnSync6("git", ["show", spec], { cwd: repoRoot, maxBuffer: 50 * 1024 * 1024, env: scrubbedGitEnv() });
   if (result.status !== 0 || result.stdout.length === 0) return null;
   return result.stdout;
 }
@@ -23810,7 +23817,7 @@ async function main() {
     console.log("AI service test mode enabled \u2014 using mock AI responses");
   }
   if (debug) {
-    console.log(`[debug] Build timestamp: ${"2026-06-04T00:06:05.686Z"}`);
+    console.log(`[debug] Build timestamp: ${"2026-06-04T01:28:18.249Z"}`);
   }
   if (projectDir !== null) {
     process.chdir(projectDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glassbox",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.3",
   "description": "A local code review tool for AI-generated code. Review diffs, annotate lines, and export structured feedback that AI tools can act on.",
   "type": "module",
   "license": "MIT",