gm-skill 2.0.1269 → 2.0.1271

package/README.md

@@ -35,7 +35,7 @@ An earlier generation fanned out fifteen per-platform downstream repos (gm-cc, g
 
 ## Version
 
-`2.0.1269` — auto-bumped from the canonical `gm` repo. Every push to `AnEntrypoint/gm` (or any cascading sibling crate) republishes this package.
+`2.0.1271` — auto-bumped from the canonical `gm` repo. Every push to `AnEntrypoint/gm` (or any cascading sibling crate) republishes this package.
 
 ## Source of truth
 

package/gm-plugkit/plugkit-wasm-wrapper.js

@@ -420,106 +420,6 @@ function writeJsonFile(fp, value) {
   try { fs.writeFileSync(fp, JSON.stringify(value, null, 2)); } catch (_) {}
 }
 
-function bundledBrowserCacheRoots() {
-  const roots = [];
-  const envOverride = process.env.PLAYWRIGHT_BROWSERS_PATH;
-  if (envOverride) roots.push(envOverride);
-  if (process.platform === 'win32') {
-    if (process.env.LOCALAPPDATA) roots.push(path.join(process.env.LOCALAPPDATA, 'ms-playwright'));
-  } else if (process.platform === 'darwin') {
-    if (process.env.HOME) roots.push(path.join(process.env.HOME, 'Library', 'Caches', 'ms-playwright'));
-  } else {
-    if (process.env.HOME) roots.push(path.join(process.env.HOME, '.cache', 'ms-playwright'));
-  }
-  return roots.filter(r => r && fs.existsSync(r));
-}
-
-function chromiumExeFromCacheRoot(root) {
-  try {
-    const entries = fs.readdirSync(root)
-      .filter(n => /^chromium-\d+$/.test(n))
-      .sort((a, b) => parseInt(b.split('-')[1], 10) - parseInt(a.split('-')[1], 10));
-    const subdirs = process.platform === 'win32'
-      ? ['chrome-win64', 'chrome-win']
-      : process.platform === 'darwin'
-        ? ['chrome-mac/Chromium.app/Contents/MacOS/Chromium']
-        : ['chrome-linux'];
-    const exeName = process.platform === 'win32' ? 'chrome.exe'
-      : process.platform === 'darwin' ? null
-      : 'chrome';
-    for (const e of entries) {
-      for (const sub of subdirs) {
-        const p = exeName ? path.join(root, e, sub, exeName) : path.join(root, e, sub);
-        if (fs.existsSync(p)) return p;
-      }
-    }
-  } catch (_) {}
-  return null;
-}
-
-function findBundledChromium() {
-  for (const root of bundledBrowserCacheRoots()) {
-    const exe = chromiumExeFromCacheRoot(root);
-    if (exe) return exe;
-  }
-  try {
-    const npmR = spawnSync('npm', ['root', '-g'], { encoding: 'utf-8', shell: true, windowsHide: true, timeout: 5000 });
-    if (npmR.status === 0 && npmR.stdout.trim()) {
-      const root = npmR.stdout.trim().split(/\r?\n/).pop();
-      const localBrowsers = path.join(root, 'playwriter', 'node_modules', '@xmorse', 'playwright-core', '.local-browsers');
-      if (fs.existsSync(localBrowsers)) {
-        const exe = chromiumExeFromCacheRoot(localBrowsers);
-        if (exe) return exe;
-      }
-    }
-  } catch (_) {}
-  return null;
-}
-
-function ensureBundledChromium(pw) {
-  const existing = findBundledChromium();
-  if (existing) return { exe: existing, installed: false };
-  if (!pw || !pw.cmd) {
-    return { exe: null, installed: false, error: 'playwriter not available to install browser' };
-  }
-  const installer = { cmd: pw.cmd, args: [...pw.baseArgs, 'install', 'chromium'], shell: pw.shell };
-  logEvent('bootstrap', 'browser.bundled-install.start', { via: 'playwriter' });
-  const r = spawnSync(installer.cmd, installer.args, {
-    encoding: 'utf-8',
-    timeout: 600000,
-    shell: installer.shell,
-    windowsHide: true,
-  });
-  logEvent('bootstrap', 'browser.bundled-install.done', { status: r.status });
-  const after = findBundledChromium();
-  if (after) return { exe: after, installed: true };
-  return { exe: null, installed: false, error: r.stderr || r.stdout || 'install failed' };
-}
-
-function findChrome() {
-  const bundled = findBundledChromium();
-  if (bundled) return bundled;
-  if (process.platform === 'win32') {
-    const candidates = [
-      path.join(process.env.PROGRAMFILES || 'C:\\Program Files', 'Google', 'Chrome', 'Application', 'chrome.exe'),
-      path.join(process.env['PROGRAMFILES(X86)'] || 'C:\\Program Files (x86)', 'Google', 'Chrome', 'Application', 'chrome.exe'),
-      path.join(process.env.LOCALAPPDATA || '', 'Google', 'Chrome', 'Application', 'chrome.exe'),
-    ];
-    for (const c of candidates) { if (c && fs.existsSync(c)) return c; }
-    return null;
-  }
-  if (process.platform === 'darwin') {
-    const mac = '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome';
-    if (fs.existsSync(mac)) return mac;
-    return null;
-  }
-  for (const bin of ['google-chrome', 'chromium', 'chromium-browser']) {
-    const r = spawnSync('which', [bin], { encoding: 'utf-8' });
-    if (r.status === 0 && r.stdout.trim()) return r.stdout.trim();
-  }
-  return null;
-}
-
 function findPlaywriter() {
   const npmR = spawnSync('npm', ['root', '-g'], { encoding: 'utf-8', shell: true });
   if (npmR.status === 0 && npmR.stdout.trim()) {
@@ -716,6 +616,124 @@ function scrubBrowserRunnerText(s) {
   return t;
 }
 
+function findInstalledChromiumBinary() {
+  try {
+    if (process.env.PLAYWRITER_BROWSER_PATH && fs.existsSync(process.env.PLAYWRITER_BROWSER_PATH)) {
+      return process.env.PLAYWRITER_BROWSER_PATH;
+    }
+    const roots = [];
+    if (process.platform === 'win32') {
+      const lad = process.env.LOCALAPPDATA;
+      if (lad) roots.push(path.join(lad, 'ms-playwright'));
+    } else {
+      const home = process.env.HOME || '';
+      if (home) {
+        roots.push(path.join(home, '.cache', 'ms-playwright'));
+        roots.push(path.join(home, 'Library', 'Caches', 'ms-playwright'));
+      }
+    }
+    const exeName = process.platform === 'win32' ? 'chrome.exe' : (process.platform === 'darwin' ? 'Chromium.app/Contents/MacOS/Chromium' : 'chrome');
+    const subdirs = process.platform === 'win32'
+      ? ['chrome-win64', 'chrome-win']
+      : process.platform === 'darwin' ? ['chrome-mac'] : ['chrome-linux'];
+    const found = [];
+    for (const root of roots) {
+      if (!fs.existsSync(root)) continue;
+      for (const name of fs.readdirSync(root)) {
+        if (!/^chromium-\d+$/.test(name)) continue;
+        for (const sub of subdirs) {
+          const candidate = path.join(root, name, sub, exeName);
+          if (fs.existsSync(candidate)) {
+            const ver = parseInt(name.split('-')[1], 10) || 0;
+            found.push({ ver, candidate });
+          }
+        }
+      }
+    }
+    if (found.length === 0) return null;
+    found.sort((a, b) => b.ver - a.ver);
+    return found[0].candidate;
+  } catch (_) {
+    return null;
+  }
+}
+
+function startManagedBrowser(pw, profileDir) {
+  const args = [...pw.baseArgs, 'browser', 'start', '--user-data-dir', profileDir, '--headless'];
+  const env = { ...process.env };
+  if (!env.PLAYWRITER_BROWSER_PATH) {
+    const browserBin = findInstalledChromiumBinary();
+    if (browserBin) {
+      env.PLAYWRITER_BROWSER_PATH = browserBin;
+      logEvent('plugkit', 'browser.binary-resolved', { path: browserBin });
+    } else {
+      logEvent('plugkit', 'browser.binary-missing', {});
+    }
+  }
+  const child = spawn(pw.cmd, args, {
+    detached: true,
+    stdio: 'ignore',
+    shell: pw.shell,
+    windowsHide: true,
+    env,
+    ...(process.platform === 'win32' ? { creationFlags: 0x08000000 | 0x00000008 } : {}),
+  });
+  const pid = child.pid;
+  child.unref();
+  return pid;
+}
+
+function isColdRunProfile(profileDir) {
+  try {
+    if (!fs.existsSync(profileDir)) return true;
+    const entries = fs.readdirSync(profileDir);
+    if (entries.length === 0) return true;
+    if (!entries.some(n => n === 'Default' || n === 'Local State')) return true;
+    return false;
+  } catch (_) {
+    return true;
+  }
+}
+
+function waitForExtensionReady(pw, profileDir, opts) {
+  const cold = (opts && typeof opts.cold === 'boolean') ? opts.cold : isColdRunProfile(profileDir);
+  const timeoutMs = (opts && opts.timeoutMs) || (cold ? 180000 : 30000);
+  const start = Date.now();
+  const deadline = start + timeoutMs;
+  const backoff = [2000, 4000, 8000];
+  let attempt = 0;
+  let lastErr = '';
+  let lastProgressAt = start;
+  while (Date.now() < deadline) {
+    const remaining = deadline - Date.now();
+    const innerTimeout = Math.max(28000, Math.min(remaining, 30000));
+    const r = runPlaywriter(pw, ['session', 'new'], innerTimeout);
+    if (r && r.status === 0) return r;
+    lastErr = scrubBrowserRunnerText((r && (r.stderr || r.stdout)) || '');
+    const now = Date.now();
+    if (now - lastProgressAt >= 10000) {
+      logEvent('plugkit', 'browser.extension-wait', {
+        elapsed_ms: now - start,
+        cold_run: cold,
+        profileDir,
+        attempt,
+      });
+      lastProgressAt = now;
+    }
+    const sleepMs = backoff[Math.min(attempt, backoff.length - 1)];
+    attempt++;
+    if (Date.now() + sleepMs >= deadline) break;
+    sleepSync(sleepMs);
+  }
+  const flavor = cold
+    ? `cold-run timeout after ${Math.round((Date.now() - start) / 1000)}s waiting for managed browser extension to connect (first run downloads chromium ~150MB and installs the extension; if this persists the extension never registered with the relay server)`
+    : `warm-run timeout after ${Math.round((Date.now() - start) / 1000)}s waiting for managed browser extension to reconnect (profile exists but extension is not registering; relay server may be wedged)`;
+  const err = new Error(`managed browser session start failed: ${flavor}${lastErr ? ` :: ${lastErr}` : ''}`);
+  err._lastErr = lastErr;
+  err._coldRun = cold;
+  throw err;
+}
+
 function getOrCreateBrowserSession(cwd, claudeSessionId, pw) {
   migrateLegacyBrowserState(cwd);
   const portsFile = browserPortsFile(cwd);
@@ -723,20 +741,18 @@ function getOrCreateBrowserSession(cwd, claudeSessionId, pw) {
   const ports = readJsonFile(portsFile, {});
   const sessions = readJsonFile(sessionsFile, {});
   const existing = ports[claudeSessionId];
-  if (existing && existing.port) {
+  if (existing && existing.pid) {
     const wantProfile = path.join(cwd, '.gm', 'browser-profile');
-    const pidOk = existing.pid && isProcessAliveSync(existing.pid);
+    const pidOk = isProcessAliveSync(existing.pid);
     const profileOk = !existing.profileDir || existing.profileDir === wantProfile || existing.profileDir.startsWith(path.join(cwd, '.gm', 'browser-profile'));
-    const portOk = isPortAliveSync(existing.port);
-    if (pidOk && profileOk && portOk) {
+    if (pidOk && profileOk) {
       const pwIds = sessions[claudeSessionId] || [];
       if (pwIds.length > 0) return pwIds[0];
     } else {
-      const reason = !pidOk ? 'pid-dead' : !profileOk ? 'profile-drift' : 'port-dead';
+      const reason = !pidOk ? 'pid-dead' : 'profile-drift';
       logEvent('hook', 'deviation.browser-profile-collision', {
         sid: claudeSessionId,
         stale_pid: existing.pid || null,
-        stale_port: existing.port || null,
         stale_profile: existing.profileDir || null,
         want_profile: wantProfile,
         reason,
@@ -748,44 +764,12 @@ function getOrCreateBrowserSession(cwd, claudeSessionId, pw) {
     }
   }
   cleanDeadProfileFragments(cwd);
-  let chrome = findBundledChromium();
-  if (!chrome) {
-    const ensured = ensureBundledChromium(pw);
-    if (ensured.exe) chrome = ensured.exe;
-  }
-  if (!chrome) chrome = findChrome();
-  if (!chrome) throw new Error('No chromium binary available. Run: bun x playwriter@latest install chromium');
+  const probedProfile = path.join(cwd, '.gm', 'browser-profile');
+  const coldRun = isColdRunProfile(probedProfile);
   const profileDir = acquireProfileDir(cwd);
-  const port = findFreePortSync();
-  const chromeArgs = [
-    `--remote-debugging-port=${port}`,
-    `--user-data-dir=${profileDir}`,
-    '--no-first-run',
-    '--no-default-browser-check',
-    '--disable-features=Translate',
-  ];
-  // Chrome itself is GUI but its remote-debugging port creates conhost
-  // when launched from a console-attached parent. CREATE_NO_WINDOW
-  // (0x08000000) | DETACHED_PROCESS (0x00000008) prevents the helper
-  // processes (sandbox, GPU, network service) from allocating consoles.
-  // Inherited by the entire chrome subprocess tree on Windows.
-  const child = spawn(chrome, chromeArgs, {
-    detached: true,
-    stdio: 'ignore',
-    windowsHide: true,
-    ...(process.platform === 'win32' ? { creationFlags: 0x08000000 | 0x00000008 } : {}),
-  });
-  const chromePid = child.pid;
-  child.unref();
-  const deadline = Date.now() + 10000;
-  let alive = false;
-  while (Date.now() < deadline) {
-    if (isPortAliveSync(port)) { alive = true; break; }
-    sleepSync(300);
-  }
-  if (!alive) throw new Error(`Chrome failed to open debug port ${port}`);
-  const newR = runPlaywriter(pw, ['session', 'new', '--direct', `localhost:${port}`], 30000);
-  if (newR.status !== 0) throw new Error(`managed browser session start failed: ${scrubBrowserRunnerText(newR.stderr || newR.stdout || 'unknown')}`);
+  logEvent('plugkit', 'browser.start', { profileDir, cold_run: coldRun });
+  const browserPid = startManagedBrowser(pw, profileDir);
+  const newR = waitForExtensionReady(pw, profileDir, { cold: coldRun });
   const stripAnsi = (s) => s.replace(/\x1b\[[0-9;]*m/g, '');
   const out = stripAnsi(newR.stdout || '').trim();
   let pwSessionId = null;
@@ -799,7 +783,7 @@ function getOrCreateBrowserSession(cwd, claudeSessionId, pw) {
     try { const j = JSON.parse(out); pwSessionId = j.id || j.session_id || j.session; } catch (_) {}
   }
   if (!pwSessionId) throw new Error(`could not parse managed browser session id from: ${scrubBrowserRunnerText(out)}`);
-  ports[claudeSessionId] = { port, profileDir, pid: chromePid };
+  ports[claudeSessionId] = { profileDir, pid: browserPid };
   sessions[claudeSessionId] = [pwSessionId];
   writeJsonFile(portsFile, ports);
   writeJsonFile(sessionsFile, sessions);
@@ -1413,12 +1397,7 @@ function makeHostFunctions(instanceRef) {
         if (!pw) return writeWasmJson(instanceRef.value, { ok: false, error: 'managed browser session runner not available' });
         if (body.startsWith('session ')) {
           const parts = body.slice(8).trim().split(/\s+/);
-          const ports = readJsonFile(browserPortsFile(cwd), {});
-          const existing = ports[sessionId];
-          const directArgs = (existing && existing.port && isPortAliveSync(existing.port))
-            ? [`--direct=localhost:${existing.port}`]
-            : [];
-          const r = runPlaywriter(pw, ['session', ...parts, ...directArgs], 30000);
+          const r = runPlaywriter(pw, ['session', ...parts], 30000);
           return writeWasmJson(instanceRef.value, {
             ok: r.status === 0,
             stdout: scrubBrowserRunnerText(r.stdout || ''),
@@ -1427,12 +1406,7 @@ function makeHostFunctions(instanceRef) {
           });
         }
         const pwSessionId = getOrCreateBrowserSession(cwd, sessionId, pw);
-        const portsAfter = readJsonFile(browserPortsFile(cwd), {});
-        const livePort = portsAfter[sessionId] && portsAfter[sessionId].port;
-        const directArgs = (livePort && isPortAliveSync(livePort))
-          ? [`--direct=localhost:${livePort}`]
-          : [];
-        const r = runPlaywriter(pw, ['-s', pwSessionId, '--timeout', '14000', ...directArgs, '-e', body], 60000);
+        const r = runPlaywriter(pw, ['-s', pwSessionId, '--timeout', '14000', '-e', body], 60000);
         return writeWasmJson(instanceRef.value, {
           ok: r.status === 0,
           stdout: scrubBrowserRunnerText(r.stdout || ''),
@@ -1801,9 +1775,9 @@ async function runSpoolWatcher(instance, spoolDir) {
         const ports = readJsonFile(browserPortsFile(process.cwd()), {});
         let browserAlive = false;
         for (const entry of Object.values(ports)) {
-          if (entry && Number.isFinite(entry.port) && isPortAliveSync(entry.port)) { browserAlive = true; break; }
+          if (entry && Number.isFinite(entry.pid) && isProcessAliveSync(entry.pid)) { browserAlive = true; break; }
         }
-        if (browserAlive) { markActivity('browser-port-alive'); return; }
+        if (browserAlive) { markActivity('browser-pid-alive'); return; }
       } catch (_) {}
       try {
         let anyRunning = false;

package/gm.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.1269",
+  "version": "2.0.1271",
   "description": "Spool-dispatch orchestration engine with unified state machine, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-skill",
-  "version": "2.0.1269",
+  "version": "2.0.1271",
   "description": "Canonical universal harness — AI-native software engineering via skill-driven orchestration; bootstraps plugkit for task execution and session isolation. Install in any AI coding agent host.",
   "author": "AnEntrypoint",
   "license": "MIT",
@@ -39,7 +39,7 @@
     "gm.json"
   ],
   "dependencies": {
-    "gm-plugkit": "^2.0.1269"
+    "gm-plugkit": "^2.0.1271"
   },
   "engines": {
     "node": ">=16.0.0"