assistme 0.1.8 → 0.1.10

package/dist/index.js

@@ -394,7 +394,7 @@ import {
 import { WebSocket } from "ws";
 import { execSync, spawn } from "child_process";
 import { platform } from "os";
-import { existsSync } from "fs";
+import { existsSync, unlinkSync } from "fs";
 var BrowserController = class {
   ws = null;
   debugPort;
@@ -860,7 +860,7 @@ function isChromeRunning() {
       return out2.includes("chrome.exe");
     }
     if (platform() === "darwin") {
-      const out2 = execSync('pgrep -f "Google Chrome.app/Contents/MacOS/Google Chrome$"', {
+      const out2 = execSync('pgrep -f "Google Chrome.app/Contents/MacOS/Google Chrome"', {
         encoding: "utf-8",
         stdio: ["pipe", "pipe", "pipe"]
       });
@@ -884,7 +884,7 @@ async function killChromeGracefully() {
         stdio: ["pipe", "pipe", "pipe"]
       });
     } else if (os === "linux") {
-      execSync("pkill -TERM -f chrome", {
+      execSync("pkill -TERM -f '(chrome|chromium)'", {
         timeout: 5e3,
         stdio: ["pipe", "pipe", "pipe"]
       });
@@ -898,44 +898,78 @@ async function killChromeGracefully() {
   }
   const start = Date.now();
   while (Date.now() - start < 8e3) {
-    if (!isChromeRunning()) return;
+    if (!isChromeRunning()) {
+      log.debug(`Chrome exited after ${Date.now() - start}ms`);
+      return;
+    }
     await new Promise((r) => setTimeout(r, 500));
   }
+  log.debug("Chrome still running after graceful quit, force-killing...");
   try {
     if (os === "win32") {
       execSync("taskkill /F /IM chrome.exe", {
         stdio: ["pipe", "pipe", "pipe"]
       });
     } else {
-      execSync("pkill -9 -f chrome", {
+      execSync("pkill -9 -f '(chrome|chromium)'", {
         stdio: ["pipe", "pipe", "pipe"]
       });
     }
   } catch {
   }
   await new Promise((r) => setTimeout(r, 1e3));
+  if (os !== "win32") {
+    const home = process.env.HOME;
+    if (home) {
+      const lockPaths = os === "darwin" ? [
+        `${home}/Library/Application Support/Google/Chrome/SingletonLock`,
+        `${home}/Library/Application Support/Google/Chrome/SingletonSocket`,
+        `${home}/Library/Application Support/Google/Chrome/SingletonCookie`
+      ] : [
+        `${home}/.config/google-chrome/SingletonLock`,
+        `${home}/.config/google-chrome/SingletonSocket`,
+        `${home}/.config/google-chrome/SingletonCookie`,
+        `${home}/.config/chromium/SingletonLock`,
+        `${home}/.config/chromium/SingletonSocket`,
+        `${home}/.config/chromium/SingletonCookie`
+      ];
+      for (const lockPath of lockPaths) {
+        try {
+          if (existsSync(lockPath)) {
+            unlinkSync(lockPath);
+            log.debug(`Removed stale lock: ${lockPath}`);
+          }
+        } catch {
+        }
+      }
+    }
+  }
 }
 function spawnChrome(chromePath, port) {
-  const os = platform();
   const cdpFlag = `--remote-debugging-port=${port}`;
-  let child;
-  if (os === "darwin") {
-    const appName = chromePath.includes("Chromium") ? "Chromium" : chromePath.includes("Canary") ? "Google Chrome Canary" : "Google Chrome";
-    log.debug(`Spawning Chrome via: open -a "${appName}" --args ${cdpFlag} --restore-last-session`);
-    child = spawn("open", ["-a", appName, "--args", cdpFlag, "--restore-last-session"], {
-      detached: true,
-      stdio: "ignore"
-    });
-  } else {
-    log.debug(`Spawning Chrome via: ${chromePath} ${cdpFlag} --restore-last-session`);
-    child = spawn(chromePath, [cdpFlag, "--restore-last-session"], {
-      detached: true,
-      stdio: "ignore"
-    });
-  }
+  log.debug(`Spawning Chrome: ${chromePath} ${cdpFlag} --restore-last-session`);
+  const child = spawn(chromePath, [cdpFlag, "--restore-last-session"], {
+    detached: true,
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  let stderr = "";
+  child.stderr?.on("data", (chunk) => {
+    stderr += chunk.toString();
+  });
   child.on("error", (err) => {
     log.error(`Chrome spawn error: ${err.message}`);
   });
+  child.on("exit", (code, signal) => {
+    if (code !== null && code !== 0) {
+      log.debug(`Chrome exited with code ${code}${signal ? ` (signal: ${signal})` : ""}`);
+      if (stderr) {
+        const lines = stderr.split("\n").filter(Boolean).slice(0, 5);
+        for (const line of lines) {
+          log.debug(`  chrome stderr: ${line}`);
+        }
+      }
+    }
+  });
   child.unref();
   return child;
 }
@@ -989,34 +1023,57 @@ async function ensureBrowserAvailable(port = 9222) {
   if (running) {
     log.debug("Killing Chrome gracefully for restart with CDP...");
     await killChromeGracefully();
-    spawnChrome(chromePath, port);
+    await new Promise((r) => setTimeout(r, 2e3));
+    const child2 = spawnChrome(chromePath, port);
     if (await waitForCDP(browser)) {
       return { success: true, action: "restarted", chromePath };
     }
+    if (child2.exitCode !== null) {
+      log.debug(
+        `Chrome process already exited (code ${child2.exitCode}) \u2014 may have crashed or profile is locked`
+      );
+      return {
+        success: false,
+        action: "launch_failed",
+        chromePath,
+        detail: `Chrome exited immediately (code ${child2.exitCode}). This often means the profile is locked by another Chrome instance. Try closing all Chrome windows first, then run assistme again.`
+      };
+    }
     log.debug("First CDP wait timed out after restart, retrying...");
     if (await waitForCDP(browser, 15e3)) {
       return { success: true, action: "restarted", chromePath };
     }
+    const stillRunning2 = isChromeRunning();
     return {
       success: false,
       action: "launch_failed",
       chromePath,
-      detail: "Chrome was restarted but CDP did not become reachable within timeout."
+      detail: stillRunning2 ? "Chrome is running but CDP port is not responding. Chrome may have started without the --remote-debugging-port flag. Try: 1) Quit Chrome completely, 2) Run assistme again." : "Chrome was restarted but exited unexpectedly. Check if Chrome can start normally from the command line."
     };
   }
-  spawnChrome(chromePath, port);
+  const child = spawnChrome(chromePath, port);
   if (await waitForCDP(browser)) {
     return { success: true, action: "launched", chromePath };
   }
+  if (child.exitCode !== null) {
+    log.debug(`Chrome process already exited (code ${child.exitCode})`);
+    return {
+      success: false,
+      action: "launch_failed",
+      chromePath,
+      detail: `Chrome exited immediately (code ${child.exitCode}). Try launching Chrome manually to see any error dialogs.`
+    };
+  }
   log.debug("First CDP wait timed out after launch, retrying...");
   if (await waitForCDP(browser, 15e3)) {
     return { success: true, action: "launched", chromePath };
   }
+  const stillRunning = isChromeRunning();
   return {
     success: false,
     action: "launch_failed",
     chromePath,
-    detail: "Chrome was launched but CDP did not become reachable within timeout."
+    detail: stillRunning ? "Chrome is running but CDP port is not responding. Try quitting Chrome completely and running assistme again." : "Chrome exited unexpectedly after launch."
   };
 }
 var browserInstance = null;
@@ -1172,7 +1229,7 @@ import {
   readFileSync,
   writeFileSync,
   statSync,
-  unlinkSync,
+  unlinkSync as unlinkSync2,
   rmSync
 } from "fs";
 import { join, basename, dirname } from "path";
@@ -1592,9 +1649,9 @@ ${content}
         await execUnzip(`unzip -o "${zipPath}" -d "${skillDir}"`, {
           timeout: 15e3
         });
-        unlinkSync(zipPath);
+        unlinkSync2(zipPath);
       } catch {
-        unlinkSync(zipPath);
+        unlinkSync2(zipPath);
         const fileResp = await fetch(
           `${CLAWHUB_API}/skills/${encodeURIComponent(name)}/file?path=SKILL.md&tag=latest`
         );
@@ -1665,7 +1722,7 @@ ${content}
       if (dir !== SKILLS_DIR) {
         rmSync(dir, { recursive: true, force: true });
       } else {
-        unlinkSync(skill.filePath);
+        unlinkSync2(skill.filePath);
       }
       this.skills.delete(name);
       return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assistme",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "AssistMe CLI Agent - AI-powered assistant that controls your real browser",
   "type": "module",
   "main": "dist/index.js",

package/src/tools/browser.ts

@@ -17,7 +17,7 @@
 import { WebSocket } from "ws";
 import { execSync, spawn, type ChildProcess } from "node:child_process";
 import { platform } from "node:os";
-import { existsSync } from "node:fs";
+import { existsSync, unlinkSync } from "node:fs";
 import { log } from "../utils/logger.js";
 
 interface CDPTab {
@@ -607,8 +607,9 @@ export function isChromeRunning(): boolean {
       return out.includes("chrome.exe");
     }
     if (platform() === "darwin") {
-      // Match the actual macOS process name "Google Chrome" (not helper processes)
-      const out = execSync('pgrep -f "Google Chrome.app/Contents/MacOS/Google Chrome$"', {
+      // Match the main Chrome process (not helper/renderer sub-processes).
+      // No trailing $ — the process command line includes flags after the binary.
+      const out = execSync('pgrep -f "Google Chrome.app/Contents/MacOS/Google Chrome"', {
         encoding: "utf-8",
         stdio: ["pipe", "pipe", "pipe"],
       });
@@ -638,7 +639,7 @@ async function killChromeGracefully(): Promise<void> {
         stdio: ["pipe", "pipe", "pipe"],
       });
     } else if (os === "linux") {
-      execSync("pkill -TERM -f chrome", {
+      execSync("pkill -TERM -f '(chrome|chromium)'", {
         timeout: 5000,
         stdio: ["pipe", "pipe", "pipe"],
       });
@@ -655,10 +656,15 @@ async function killChromeGracefully(): Promise<void> {
   // Wait for Chrome to fully exit (up to 8s)
   const start = Date.now();
   while (Date.now() - start < 8000) {
-    if (!isChromeRunning()) return;
+    if (!isChromeRunning()) {
+      log.debug(`Chrome exited after ${Date.now() - start}ms`);
+      return;
+    }
     await new Promise((r) => setTimeout(r, 500));
   }
 
+  log.debug("Chrome still running after graceful quit, force-killing...");
+
   // Force kill if still alive
   try {
     if (os === "win32") {
@@ -666,14 +672,49 @@ async function killChromeGracefully(): Promise<void> {
         stdio: ["pipe", "pipe", "pipe"],
       });
     } else {
-      execSync("pkill -9 -f chrome", {
+      execSync("pkill -9 -f '(chrome|chromium)'", {
         stdio: ["pipe", "pipe", "pipe"],
       });
     }
   } catch {
     /* already dead */
   }
+
+  // Wait for processes to fully terminate after SIGKILL
   await new Promise((r) => setTimeout(r, 1000));
+
+  // On macOS/Linux, remove the Chrome profile SingletonLock that may linger
+  // after a force-kill, preventing the next Chrome instance from starting.
+  if (os !== "win32") {
+    const home = process.env.HOME;
+    if (home) {
+      const lockPaths =
+        os === "darwin"
+          ? [
+              `${home}/Library/Application Support/Google/Chrome/SingletonLock`,
+              `${home}/Library/Application Support/Google/Chrome/SingletonSocket`,
+              `${home}/Library/Application Support/Google/Chrome/SingletonCookie`,
+            ]
+          : [
+              `${home}/.config/google-chrome/SingletonLock`,
+              `${home}/.config/google-chrome/SingletonSocket`,
+              `${home}/.config/google-chrome/SingletonCookie`,
+              `${home}/.config/chromium/SingletonLock`,
+              `${home}/.config/chromium/SingletonSocket`,
+              `${home}/.config/chromium/SingletonCookie`,
+            ];
+      for (const lockPath of lockPaths) {
+        try {
+          if (existsSync(lockPath)) {
+            unlinkSync(lockPath);
+            log.debug(`Removed stale lock: ${lockPath}`);
+          }
+        } catch {
+          /* best effort */
+        }
+      }
+    }
+  }
 }
 
 /**
@@ -681,35 +722,40 @@ async function killChromeGracefully(): Promise<void> {
  * Returns the child process so callers can detect early failures.
  */
 function spawnChrome(chromePath: string, port: number): ChildProcess {
-  const os = platform();
   const cdpFlag = `--remote-debugging-port=${port}`;
 
-  let child: ChildProcess;
+  // Always invoke the Chrome binary directly rather than `open -a`.
+  // On macOS, `open -a` silently ignores --args when Chrome is already
+  // running, which would cause CDP to never be enabled.
+  log.debug(`Spawning Chrome: ${chromePath} ${cdpFlag} --restore-last-session`);
+  const child = spawn(chromePath, [cdpFlag, "--restore-last-session"], {
+    detached: true,
+    stdio: ["ignore", "pipe", "pipe"],
+  });
 
-  if (os === "darwin") {
-    // Determine app name from binary path
-    const appName = chromePath.includes("Chromium")
-      ? "Chromium"
-      : chromePath.includes("Canary")
-        ? "Google Chrome Canary"
-        : "Google Chrome";
-    log.debug(`Spawning Chrome via: open -a "${appName}" --args ${cdpFlag} --restore-last-session`);
-    child = spawn("open", ["-a", appName, "--args", cdpFlag, "--restore-last-session"], {
-      detached: true,
-      stdio: "ignore",
-    });
-  } else {
-    log.debug(`Spawning Chrome via: ${chromePath} ${cdpFlag} --restore-last-session`);
-    child = spawn(chromePath, [cdpFlag, "--restore-last-session"], {
-      detached: true,
-      stdio: "ignore",
-    });
-  }
+  // Capture stderr for diagnostics — Chrome prints errors here
+  let stderr = "";
+  child.stderr?.on("data", (chunk: Buffer) => {
+    stderr += chunk.toString();
+  });
 
   child.on("error", (err) => {
     log.error(`Chrome spawn error: ${err.message}`);
   });
 
+  child.on("exit", (code, signal) => {
+    if (code !== null && code !== 0) {
+      log.debug(`Chrome exited with code ${code}${signal ? ` (signal: ${signal})` : ""}`);
+      if (stderr) {
+        // Log first few lines of stderr for diagnostics
+        const lines = stderr.split("\n").filter(Boolean).slice(0, 5);
+        for (const line of lines) {
+          log.debug(`  chrome stderr: ${line}`);
+        }
+      }
+    }
+  });
+
   child.unref();
   return child;
 }
@@ -811,44 +857,77 @@ export async function ensureBrowserAvailable(port = 9222): Promise<AutoLaunchRes
   if (running) {
     log.debug("Killing Chrome gracefully for restart with CDP...");
     await killChromeGracefully();
-    spawnChrome(chromePath, port);
+
+    // Extra wait for profile lock release after kill
+    await new Promise((r) => setTimeout(r, 2000));
+
+    const child = spawnChrome(chromePath, port);
 
     if (await waitForCDP(browser)) {
       return { success: true, action: "restarted", chromePath };
     }
 
+    // Check if Chrome is still alive before retrying
+    if (child.exitCode !== null) {
+      log.debug(
+        `Chrome process already exited (code ${child.exitCode}) — may have crashed or profile is locked`
+      );
+      return {
+        success: false,
+        action: "launch_failed",
+        chromePath,
+        detail: `Chrome exited immediately (code ${child.exitCode}). This often means the profile is locked by another Chrome instance. Try closing all Chrome windows first, then run assistme again.`,
+      };
+    }
+
     // Retry once — Chrome can be slow to start (extensions, session restore)
     log.debug("First CDP wait timed out after restart, retrying...");
     if (await waitForCDP(browser, 15000)) {
       return { success: true, action: "restarted", chromePath };
     }
 
+    const stillRunning = isChromeRunning();
     return {
       success: false,
       action: "launch_failed",
       chromePath,
-      detail: "Chrome was restarted but CDP did not become reachable within timeout.",
+      detail: stillRunning
+        ? "Chrome is running but CDP port is not responding. Chrome may have started without the --remote-debugging-port flag. Try: 1) Quit Chrome completely, 2) Run assistme again."
+        : "Chrome was restarted but exited unexpectedly. Check if Chrome can start normally from the command line.",
     };
   }
 
   // Case 4: Chrome not running → launch
-  spawnChrome(chromePath, port);
+  const child = spawnChrome(chromePath, port);
 
   if (await waitForCDP(browser)) {
     return { success: true, action: "launched", chromePath };
   }
 
+  if (child.exitCode !== null) {
+    log.debug(`Chrome process already exited (code ${child.exitCode})`);
+    return {
+      success: false,
+      action: "launch_failed",
+      chromePath,
+      detail: `Chrome exited immediately (code ${child.exitCode}). Try launching Chrome manually to see any error dialogs.`,
+    };
+  }
+
   // Retry once
   log.debug("First CDP wait timed out after launch, retrying...");
   if (await waitForCDP(browser, 15000)) {
     return { success: true, action: "launched", chromePath };
   }
 
+  const stillRunning = isChromeRunning();
   return {
     success: false,
     action: "launch_failed",
     chromePath,
-    detail: "Chrome was launched but CDP did not become reachable within timeout.",
+    detail: stillRunning
+      ? "Chrome is running but CDP port is not responding. Try quitting Chrome completely and running assistme again."
+      : "Chrome exited unexpectedly after launch.",
   };
 }