gm-plugkit 2.0.1718 → 2.0.1720

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1718",
+  "version": "2.0.1720",
   "description": "Bootstrap and daemon-spawn tool for gm plugkit binary. Downloads the correct platform binary, verifies SHA256, and starts the spool watcher daemon. Includes plugkit-wasm-wrapper for WASM-based spool watching.",
   "main": "index.js",
   "bin": {

package/plugkit-wasm-wrapper.js

@@ -608,7 +608,12 @@ function stampBrowserLastUse(cwd, claudeSessionId) {
 function atomicWriteRaw(filePath, data) {
   const tmp = filePath + '.tmp.' + process.pid + '.' + Date.now() + '.' + Math.random().toString(36).slice(2, 8);
   fs.writeFileSync(tmp, data);
-  fs.renameSync(tmp, filePath);
+  try {
+    fs.renameSync(tmp, filePath);
+  } catch (err) {
+    try { fs.unlinkSync(tmp); } catch (_) {}
+    throw err;
+  }
 }
 
 function atomicWriteJson(filePath, obj) {
@@ -1198,7 +1203,7 @@ function chromeLogHasSandboxDenied(chromeLogPath) {
   }
 }
 
-function spawnChromiumOnce(browserBin, profileDir, port, headless, noSandbox) {
+function spawnChromiumOnce(browserBin, profileDir, port, headless, noSandbox, cwd) {
   const args = [
     '--user-data-dir=' + profileDir,
     '--remote-debugging-port=' + port,
@@ -1214,7 +1219,7 @@ function spawnChromiumOnce(browserBin, profileDir, port, headless, noSandbox) {
   if (headless) {
     args.push('--headless=new');
   } else {
-    args.push('about:blank');
+    args.push(resolveBrowserStartUrl(cwd));
   }
   const chromeLogPath = path.join(profileDir, '.chrome-launch.log');
   let logFd;
@@ -1230,6 +1235,17 @@ function spawnChromiumOnce(browserBin, profileDir, port, headless, noSandbox) {
   return { pid: child.pid, chromeLogPath };
 }
 
+function resolveBrowserStartUrl(cwd) {
+  if (process.env.GM_BROWSER_START_URL) return process.env.GM_BROWSER_START_URL;
+  try {
+    const root = cwd || process.env.CLAUDE_PROJECT_DIR || process.cwd();
+    const cfgPath = path.join(root, '.gm', 'browser-target-url');
+    const url = fs.readFileSync(cfgPath, 'utf-8').trim();
+    if (url) return url;
+  } catch (_) {}
+  return 'about:blank';
+}
+
 function waitForCdpReady(port, deadlineMs) {
   const start = Date.now();
   const deadline = start + deadlineMs;
@@ -1241,7 +1257,7 @@ function waitForCdpReady(port, deadlineMs) {
   return null;
 }
 
-function startManagedBrowser(pw, profileDir) {
+function startManagedBrowser(pw, profileDir, cwd) {
   const rawHeadlessEnv = process.env.GM_BROWSER_HEADLESS;
   const headless = rawHeadlessEnv === '1';
   const unexpectedHeadlessEnv = rawHeadlessEnv !== undefined && rawHeadlessEnv !== '1';
@@ -1273,7 +1289,7 @@ function startManagedBrowser(pw, profileDir) {
   }
   const port = findFreePortSync();
   let noSandbox = process.env.GM_BROWSER_NO_SANDBOX === '1';
-  let { pid, chromeLogPath } = spawnChromiumOnce(browserBin, profileDir, port, headless, noSandbox);
+  let { pid, chromeLogPath } = spawnChromiumOnce(browserBin, profileDir, port, headless, noSandbox, cwd);
   logEvent('plugkit', 'browser.chromium-launched', { pid, port, profileDir, headless, noSandbox, binary: browserBin, chromeLogPath });
   let ready = waitForCdpReady(port, 30000);
   if (!ready) {
@@ -1288,7 +1304,7 @@ function startManagedBrowser(pw, profileDir) {
     purgeProfileLockFiles(profileDir);
     noSandbox = true;
     const port2 = findFreePortSync();
-    ({ pid, chromeLogPath } = spawnChromiumOnce(browserBin, profileDir, port2, headless, noSandbox));
+    ({ pid, chromeLogPath } = spawnChromiumOnce(browserBin, profileDir, port2, headless, noSandbox, cwd));
     logEvent('plugkit', 'browser.chromium-launched', { pid, port: port2, profileDir, headless, noSandbox, binary: browserBin, chromeLogPath, retry: true });
     ready = waitForCdpReady(port2, 30000);
     if (!ready) {
@@ -1485,7 +1501,7 @@ function getOrCreateBrowserSession(cwd, claudeSessionId, pw) {
     logEvent('plugkit', 'browser.reused-existing-chromium', { pid: browserPid, port, profileDir });
   } else {
     logEvent('plugkit', 'browser.start', { profileDir });
-    ({ pid: browserPid, port, wsEndpoint } = startManagedBrowser(pw, profileDir));
+    ({ pid: browserPid, port, wsEndpoint } = startManagedBrowser(pw, profileDir, cwd));
     freshLaunch = true;
   }
   markLaunching(browserPid);
@@ -2913,6 +2929,22 @@ async function runSpoolWatcher(instance, spoolDir) {
   }
   writeBootActive();
 
+  function sweepStaleAtomicTmpFiles(dir, maxAgeMs) {
+    try {
+      const entries = fs.readdirSync(dir);
+      const now = Date.now();
+      for (const name of entries) {
+        if (!/\.tmp(\.|$)/.test(name)) continue;
+        const full = path.join(dir, name);
+        try {
+          const st = fs.statSync(full);
+          if (now - st.mtimeMs > maxAgeMs) fs.unlinkSync(full);
+        } catch (_) {}
+      }
+    } catch (_) {}
+  }
+  sweepStaleAtomicTmpFiles(GM_TOOLS_ROOT, 10 * 60 * 1000);
+
   const PEER_REGISTRY_PATH = path.join(GM_TOOLS_ROOT, 'peer-registry.json');
   function registerSelfAsPeer() {
     try {
@@ -3942,12 +3974,15 @@ async function runSpoolWatcher(instance, spoolDir) {
     return null;
   }
   function writeSharedUpdateCache(latest, status) {
+    let tmp = null;
     try {
       fs.mkdirSync(path.dirname(UPDATE_CHECK_SHARED_CACHE), { recursive: true });
-      const tmp = UPDATE_CHECK_SHARED_CACHE + '.tmp.' + process.pid;
+      tmp = UPDATE_CHECK_SHARED_CACHE + '.tmp.' + process.pid;
       fs.writeFileSync(tmp, JSON.stringify({ ts: Date.now(), latest, status, by_pid: process.pid }));
       fs.renameSync(tmp, UPDATE_CHECK_SHARED_CACHE);
-    } catch (_) {}
+    } catch (_) {
+      if (tmp) { try { fs.unlinkSync(tmp); } catch (_) {} }
+    }
   }
   const UPDATE_CHECK_ERROR_MARKER = path.join(GM_TOOLS_ROOT, '.update-check-error.json');
   let _lastKnownUpdateError = null;
@@ -3962,11 +3997,13 @@ async function runSpoolWatcher(instance, spoolDir) {
     return null;
   }
   function writeSharedUpdateErrorKey(key) {
+    const tmp = UPDATE_CHECK_ERROR_MARKER + '.tmp.' + process.pid;
     try {
-      const tmp = UPDATE_CHECK_ERROR_MARKER + '.tmp';
       fs.writeFileSync(tmp, JSON.stringify({ ts: Date.now(), key, by_pid: process.pid }));
       fs.renameSync(tmp, UPDATE_CHECK_ERROR_MARKER);
-    } catch (_) {}
+    } catch (_) {
+      try { fs.unlinkSync(tmp); } catch (_) {}
+    }
   }
   function clearSharedUpdateErrorKey() {
     try { fs.unlinkSync(UPDATE_CHECK_ERROR_MARKER); } catch (_) {}