assistme 0.1.11 → 0.1.13

package/dist/index.js

@@ -393,8 +393,9 @@ import {
 // src/tools/browser.ts
 import { WebSocket } from "ws";
 import { execSync, spawn } from "child_process";
-import { platform } from "os";
-import { existsSync, unlinkSync } from "fs";
+import { platform, homedir } from "os";
+import { existsSync, unlinkSync, mkdirSync, cpSync } from "fs";
+import { join } from "path";
 var BrowserController = class {
   ws = null;
   debugPort;
@@ -903,148 +904,97 @@ function findChromePath() {
   }
   return null;
 }
-function isChromeRunning(chromePath) {
-  try {
-    if (platform() === "win32") {
-      const out2 = execSync(
-        'tasklist /FI "IMAGENAME eq chrome.exe" /FI "IMAGENAME eq msedge.exe" /FI "IMAGENAME eq brave.exe" /NH',
-        { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
-      );
-      return /chrome\.exe|msedge\.exe|brave\.exe/i.test(out2);
-    }
-    if (platform() === "darwin") {
-      if (chromePath) {
-        const appDir = chromePath.replace(/\/Contents\/MacOS\/.*$/, "");
-        const out3 = execSync(`pgrep -f ${JSON.stringify(appDir)}`, {
-          encoding: "utf-8",
-          stdio: ["pipe", "pipe", "pipe"]
-        });
-        return out3.trim().length > 0;
-      }
-      const out2 = execSync(
-        'pgrep -f "(Google Chrome|Microsoft Edge|Brave Browser|Chromium).app/Contents/MacOS/"',
-        { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
-      );
-      return out2.trim().length > 0;
-    }
-    if (chromePath) {
-      const out2 = execSync(`pgrep -f ${JSON.stringify(chromePath)} 2>/dev/null || true`, {
-        encoding: "utf-8",
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-      return out2.trim().length > 0;
-    }
-    const out = execSync("pgrep -f '(chrome|chromium|msedge|brave)' 2>/dev/null || true", {
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-    return out.trim().length > 0;
-  } catch {
-    return false;
+function getDefaultProfileDir(chromePath) {
+  const home = homedir();
+  const os = platform();
+  if (os === "darwin") {
+    if (chromePath.includes("Brave Browser"))
+      return join(home, "Library", "Application Support", "BraveSoftware", "Brave-Browser");
+    if (chromePath.includes("Microsoft Edge"))
+      return join(home, "Library", "Application Support", "Microsoft Edge");
+    if (chromePath.includes("Chromium"))
+      return join(home, "Library", "Application Support", "Chromium");
+    if (chromePath.includes("Canary"))
+      return join(home, "Library", "Application Support", "Google", "Chrome Canary");
+    return join(home, "Library", "Application Support", "Google", "Chrome");
   }
+  if (os === "win32") {
+    const appData = process.env.LOCALAPPDATA || join(home, "AppData", "Local");
+    if (chromePath.includes("brave"))
+      return join(appData, "BraveSoftware", "Brave-Browser", "User Data");
+    if (chromePath.includes("msedge")) return join(appData, "Microsoft", "Edge", "User Data");
+    return join(appData, "Google", "Chrome", "User Data");
+  }
+  if (chromePath.includes("brave")) return join(home, ".config", "BraveSoftware", "Brave-Browser");
+  if (chromePath.includes("microsoft-edge")) return join(home, ".config", "microsoft-edge");
+  if (chromePath.includes("chromium")) return join(home, ".config", "chromium");
+  return join(home, ".config", "google-chrome");
 }
-function macAppName(chromePath) {
-  if (chromePath.includes("Brave Browser")) return "Brave Browser";
-  if (chromePath.includes("Microsoft Edge")) return "Microsoft Edge";
-  if (chromePath.includes("Chromium")) return "Chromium";
-  if (chromePath.includes("Canary")) return "Google Chrome Canary";
-  return "Google Chrome";
+function getDebugProfileDir(chromePath) {
+  const home = homedir();
+  const debugDir = join(home, ".assistme", "browser-profile");
+  if (!existsSync(debugDir)) {
+    mkdirSync(debugDir, { recursive: true });
+    log.debug(`Created debug profile directory: ${debugDir}`);
+    const realDir = getDefaultProfileDir(chromePath);
+    if (existsSync(realDir)) {
+      seedDebugProfile(realDir, debugDir);
+    }
+  }
+  return debugDir;
 }
-async function killChromeGracefully(chromePath) {
-  const os = platform();
-  try {
-    if (os === "darwin") {
-      const app = macAppName(chromePath);
-      execSync(`osascript -e 'quit app "${app}"'`, {
-        timeout: 5e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-    } else if (os === "linux") {
-      execSync(`pkill -TERM -f ${JSON.stringify(chromePath)}`, {
-        timeout: 5e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-    } else if (os === "win32") {
-      const exe = chromePath.split("\\").pop() || "chrome.exe";
-      execSync(`taskkill /IM "${exe}"`, {
-        timeout: 5e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-    }
-  } catch {
-  }
-  const start = Date.now();
-  while (Date.now() - start < 8e3) {
-    if (!isChromeRunning(chromePath)) {
-      log.debug(`Browser exited after ${Date.now() - start}ms`);
-      return;
-    }
-    await new Promise((r) => setTimeout(r, 500));
-  }
-  log.debug("Browser still running after graceful quit, force-killing...");
-  try {
-    if (os === "win32") {
-      const exe = chromePath.split("\\").pop() || "chrome.exe";
-      execSync(`taskkill /F /IM "${exe}"`, {
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-    } else {
-      execSync(`pkill -9 -f ${JSON.stringify(chromePath)}`, {
-        stdio: ["pipe", "pipe", "pipe"]
-      });
+function seedDebugProfile(realDir, debugDir) {
+  const rootFiles = ["Local State"];
+  const profileFiles = ["Bookmarks", "Preferences", "Favicons", "Top Sites", "Shortcuts"];
+  for (const file of rootFiles) {
+    const src = join(realDir, file);
+    const dest = join(debugDir, file);
+    try {
+      if (existsSync(src)) {
+        cpSync(src, dest, { force: true });
+        log.debug(`Seeded: ${file}`);
+      }
+    } catch {
     }
-  } catch {
   }
-  await new Promise((r) => setTimeout(r, 1e3));
-  if (os !== "win32") {
-    const home = process.env.HOME;
-    if (home) {
-      const lockSuffixes = ["SingletonLock", "SingletonSocket", "SingletonCookie"];
-      const profileDirs = os === "darwin" ? [
-        `${home}/Library/Application Support/Google/Chrome`,
-        `${home}/Library/Application Support/Microsoft Edge`,
-        `${home}/Library/Application Support/BraveSoftware/Brave-Browser`
-      ] : [
-        `${home}/.config/google-chrome`,
-        `${home}/.config/chromium`,
-        `${home}/.config/microsoft-edge`,
-        `${home}/.config/BraveSoftware/Brave-Browser`
-      ];
-      for (const dir of profileDirs) {
-        for (const suffix of lockSuffixes) {
-          const lockPath = `${dir}/${suffix}`;
-          try {
-            if (existsSync(lockPath)) {
-              unlinkSync(lockPath);
-              log.debug(`Removed stale lock: ${lockPath}`);
-            }
-          } catch {
-          }
+  const srcProfile = join(realDir, "Default");
+  const destProfile = join(debugDir, "Default");
+  if (existsSync(srcProfile)) {
+    mkdirSync(destProfile, { recursive: true });
+    for (const file of profileFiles) {
+      const src = join(srcProfile, file);
+      const dest = join(destProfile, file);
+      try {
+        if (existsSync(src)) {
+          cpSync(src, dest, { force: true });
+          log.debug(`Seeded: Default/${file}`);
         }
+      } catch {
       }
     }
+    const srcExt = join(srcProfile, "Extensions");
+    const destExt = join(destProfile, "Extensions");
+    try {
+      if (existsSync(srcExt)) {
+        cpSync(srcExt, destExt, { recursive: true, force: true });
+        log.debug("Seeded: Default/Extensions");
+      }
+    } catch {
+    }
   }
 }
 function spawnChrome(chromePath, port) {
-  const cdpFlag = `--remote-debugging-port=${port}`;
-  const os = platform();
-  let child;
-  if (os === "darwin") {
-    const appName = macAppName(chromePath);
-    log.debug(
-      `Spawning browser via: open -a "${appName}" --args ${cdpFlag} --restore-last-session`
-    );
-    child = spawn("open", ["-a", appName, "--args", cdpFlag, "--restore-last-session"], {
-      detached: true,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-  } else {
-    log.debug(`Spawning Chrome: ${chromePath} ${cdpFlag} --restore-last-session`);
-    child = spawn(chromePath, [cdpFlag, "--restore-last-session"], {
-      detached: true,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-  }
+  const profileDir = getDebugProfileDir(chromePath);
+  const flags = [
+    `--remote-debugging-port=${port}`,
+    `--user-data-dir=${profileDir}`,
+    "--restore-last-session"
+  ];
+  log.debug(`Spawning browser: ${chromePath} ${flags.join(" ")}`);
+  const child = spawn(chromePath, flags, {
+    detached: true,
+    stdio: ["ignore", "pipe", "pipe"]
+  });
   let stderr = "";
   child.stderr?.on("data", (chunk) => {
     stderr += chunk.toString();
@@ -1086,7 +1036,7 @@ async function isPortInUse(port) {
       signal: AbortSignal.timeout(1e3)
     });
     const body = await res.text();
-    return !body.includes("Chrome");
+    return !body.includes("webSocketDebuggerUrl");
   } catch {
     return false;
   }
@@ -1111,71 +1061,34 @@ async function ensureBrowserAvailable(port = 9222) {
     return { success: false, action: "chrome_not_found" };
   }
   log.debug(`Found Chrome at: ${chromePath}`);
-  const running = isChromeRunning(chromePath);
-  log.debug(`Browser currently running: ${running}`);
-  if (running) {
-    log.debug("Killing browser gracefully for restart with CDP...");
-    await killChromeGracefully(chromePath);
-    if (isChromeRunning(chromePath)) {
-      log.debug("Browser still running after kill attempt \u2014 cannot restart with CDP");
-      return {
-        success: false,
-        action: "launch_failed",
-        chromePath,
-        detail: "Could not stop the existing browser process. Please quit the browser manually and run assistme again."
-      };
-    }
-    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(
-        `Browser process already exited (code ${child2.exitCode}) \u2014 may have crashed or profile is locked`
-      );
-      return {
-        success: false,
-        action: "launch_failed",
-        chromePath,
-        detail: `Browser exited immediately (code ${child2.exitCode}). The profile may be locked. Try closing all browser 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(chromePath);
-    return {
-      success: false,
-      action: "launch_failed",
-      chromePath,
-      detail: stillRunning2 ? "Browser is running but CDP port is not responding. Try: 1) Quit the browser completely, 2) Run assistme again." : "Browser was restarted but exited unexpectedly. Try launching it manually to check for errors."
-    };
-  }
-  const child = spawnChrome(chromePath, port);
+  spawnChrome(chromePath, port);
   if (await waitForCDP(browser)) {
     return { success: true, action: "launched", chromePath };
   }
-  if (child.exitCode !== null) {
-    log.debug(`Browser process already exited (code ${child.exitCode})`);
-    return {
-      success: false,
-      action: "launch_failed",
-      chromePath,
-      detail: `Browser exited immediately (code ${child.exitCode}). Try launching it 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 debugDir = getDebugProfileDir(chromePath);
+  const lockPath = join(debugDir, "SingletonLock");
+  if (existsSync(lockPath)) {
+    log.debug("Found stale SingletonLock in debug profile \u2014 removing and retrying");
+    try {
+      unlinkSync(lockPath);
+      for (const f of ["SingletonSocket", "SingletonCookie"]) {
+        try {
+          unlinkSync(join(debugDir, f));
+        } catch {
+        }
+      }
+    } catch {
+    }
+    spawnChrome(chromePath, port);
+    if (await waitForCDP(browser, 15e3)) {
+      return { success: true, action: "launched", chromePath };
+    }
   }
-  const stillRunning = isChromeRunning(chromePath);
   return {
     success: false,
     action: "launch_failed",
     chromePath,
-    detail: stillRunning ? "Chrome is running but CDP port is not responding. Try quitting Chrome completely and running assistme again." : "Chrome exited unexpectedly after launch."
+    detail: "Could not start browser with remote debugging. Possible causes:\n  1) Another assistme debug browser is already using port " + port + "\n  2) The browser crashed on startup\nTry: rm -rf ~/.assistme/browser-profile && assistme"
   };
 }
 var browserInstance = null;
@@ -1326,16 +1239,16 @@ var MemoryManager = class {
 // src/agent/skills.ts
 import {
   existsSync as existsSync2,
-  mkdirSync,
-  readdirSync,
+  mkdirSync as mkdirSync2,
+  readdirSync as readdirSync2,
   readFileSync,
   writeFileSync,
   statSync,
   unlinkSync as unlinkSync2,
   rmSync
 } from "fs";
-import { join, basename, dirname } from "path";
-import { homedir } from "os";
+import { join as join2, basename, dirname } from "path";
+import { homedir as homedir2 } from "os";
 var STOP_WORDS = /* @__PURE__ */ new Set([
   "the",
   "a",
@@ -1455,8 +1368,8 @@ function bigrams(tokens) {
   }
   return result;
 }
-var SKILLS_DIR = join(homedir(), ".config", "assistme", "skills");
-var BUNDLED_SKILLS_DIR = join(
+var SKILLS_DIR = join2(homedir2(), ".config", "assistme", "skills");
+var BUNDLED_SKILLS_DIR = join2(
   new URL(".", import.meta.url).pathname,
   "..",
   "..",
@@ -1464,7 +1377,7 @@ var BUNDLED_SKILLS_DIR = join(
 );
 function ensureSkillsDir() {
   if (!existsSync2(SKILLS_DIR)) {
-    mkdirSync(SKILLS_DIR, { recursive: true });
+    mkdirSync2(SKILLS_DIR, { recursive: true });
   }
 }
 function parseSkillFile(filePath, source = "user") {
@@ -1540,13 +1453,13 @@ var SkillManager = class {
   }
   loadFromDir(dir, source) {
     try {
-      const entries = readdirSync(dir);
+      const entries = readdirSync2(dir);
       for (const entry of entries) {
-        const fullPath = join(dir, entry);
+        const fullPath = join2(dir, entry);
         const stat2 = statSync(fullPath);
         if (stat2.isDirectory()) {
-          const skillMd = join(fullPath, "SKILL.md");
-          const skillMdLower = join(fullPath, "skill.md");
+          const skillMd = join2(fullPath, "SKILL.md");
+          const skillMdLower = join2(fullPath, "skill.md");
           const mdPath = existsSync2(skillMd) ? skillMd : existsSync2(skillMdLower) ? skillMdLower : null;
           if (mdPath) {
             const skill = parseSkillFile(mdPath, source);
@@ -1655,9 +1568,9 @@ var SkillManager = class {
    */
   create(name, description, content) {
     ensureSkillsDir();
-    const skillDir = join(SKILLS_DIR, name);
-    mkdirSync(skillDir, { recursive: true });
-    const filePath = join(skillDir, "SKILL.md");
+    const skillDir = join2(SKILLS_DIR, name);
+    mkdirSync2(skillDir, { recursive: true });
+    const filePath = join2(skillDir, "SKILL.md");
     const fileContent = `---
 name: ${name}
 description: ${description}
@@ -1696,7 +1609,7 @@ ${content}
       gitUrl += ".git";
     }
     const name = basename(gitUrl, ".git");
-    const targetDir = join(SKILLS_DIR, name);
+    const targetDir = join2(SKILLS_DIR, name);
     if (existsSync2(targetDir)) {
       throw new Error(`Skill "${name}" already exists. Remove it first.`);
     }
@@ -1713,8 +1626,8 @@ ${content}
         { cause: err }
       );
     }
-    const skillMd = join(targetDir, "SKILL.md");
-    const skillMdLower = join(targetDir, "skill.md");
+    const skillMd = join2(targetDir, "SKILL.md");
+    const skillMdLower = join2(targetDir, "skill.md");
     if (!existsSync2(skillMd) && !existsSync2(skillMdLower)) {
       rmSync(targetDir, { recursive: true, force: true });
       throw new Error(
@@ -1740,9 +1653,9 @@ ${content}
         throw new Error(`HTTP ${dlResp.status}`);
       }
       const buffer = Buffer.from(await dlResp.arrayBuffer());
-      const skillDir = join(SKILLS_DIR, name);
-      mkdirSync(skillDir, { recursive: true });
-      const zipPath = join(skillDir, "_download.zip");
+      const skillDir = join2(SKILLS_DIR, name);
+      mkdirSync2(skillDir, { recursive: true });
+      const zipPath = join2(skillDir, "_download.zip");
       writeFileSync(zipPath, buffer);
       const { exec: execCb } = await import("child_process");
       const { promisify: promisifyUtil } = await import("util");
@@ -1761,12 +1674,12 @@ ${content}
           throw new Error(`Could not fetch SKILL.md`);
         }
         writeFileSync(
-          join(skillDir, "SKILL.md"),
+          join2(skillDir, "SKILL.md"),
           await fileResp.text(),
           "utf-8"
         );
       }
-      const skillMd = join(skillDir, "SKILL.md");
+      const skillMd = join2(skillDir, "SKILL.md");
       if (!existsSync2(skillMd)) {
         rmSync(skillDir, { recursive: true, force: true });
         throw new Error("No SKILL.md in downloaded package");
@@ -2204,7 +2117,7 @@ import { z } from "zod/v4";
 
 // src/tools/filesystem.ts
 import { readFile, writeFile, readdir, stat, mkdir } from "fs/promises";
-import { resolve, relative, join as join2 } from "path";
+import { resolve, relative, join as join3 } from "path";
 import { glob } from "glob";
 function assertWithinWorkspace(filePath) {
   const config = getConfig();
@@ -2241,7 +2154,7 @@ async function searchFiles(pattern, directory) {
     ignore: ["node_modules/**", ".git/**", "dist/**", ".next/**"]
   });
   if (matches.length === 0) return "No files found matching the pattern.";
-  return matches.slice(0, 50).map((m) => relative(config.workspacePath, join2(cwd, m))).join("\n");
+  return matches.slice(0, 50).map((m) => relative(config.workspacePath, join3(cwd, m))).join("\n");
 }
 async function listDirectory(path) {
   const config = getConfig();
@@ -2251,7 +2164,7 @@ async function listDirectory(path) {
   for (const entry of entries) {
     if (entry.name.startsWith(".") && entry.name !== ".env.example") continue;
     const icon = entry.isDirectory() ? "\u{1F4C1}" : "\u{1F4C4}";
-    const info = entry.isFile() ? await stat(join2(resolved, entry.name)).then(
+    const info = entry.isFile() ? await stat(join3(resolved, entry.name)).then(
       (s) => ` (${formatSize(s.size)})`
     ) : "";
     results.push(`${icon} ${entry.name}${info}`);
@@ -2275,11 +2188,11 @@ async function searchContent(pattern, fileGlob, directory) {
   const results = [];
   for (const file of files.slice(0, 200)) {
     try {
-      const content = await readFile(join2(cwd, file), "utf-8");
+      const content = await readFile(join3(cwd, file), "utf-8");
       const lines = content.split("\n");
       for (let i = 0; i < lines.length; i++) {
         if (regex.test(lines[i])) {
-          const relPath = relative(config.workspacePath, join2(cwd, file));
+          const relPath = relative(config.workspacePath, join3(cwd, file));
           results.push(`${relPath}:${i + 1}: ${lines[i].trim()}`);
           regex.lastIndex = 0;
           if (results.length >= 30) break;
@@ -3331,13 +3244,10 @@ browserCmd.command("setup").description("Set up Chrome for AI control").option("
     if (result.success) {
       switch (result.action) {
         case "already_available":
-          spinner.succeed("Chrome is already running with remote debugging enabled");
+          spinner.succeed("Browser is already running with remote debugging enabled");
           break;
         case "launched":
-          spinner.succeed("Chrome launched with remote debugging enabled");
-          break;
-        case "restarted":
-          spinner.succeed("Chrome restarted with remote debugging enabled (tabs restored)");
+          spinner.succeed("Browser launched with remote debugging (debug profile)");
           break;
       }
       console.log(chalk.dim("\n  You can now run: assistme start\n"));
@@ -3430,13 +3340,10 @@ program.command("start", { isDefault: true }).description("Start the agent and l
   if (launchResult.success) {
     switch (launchResult.action) {
       case "already_available":
-        launchSpinner.succeed("Chrome browser detected (CDP port 9222)");
+        launchSpinner.succeed("Browser detected (CDP port 9222)");
         break;
       case "launched":
-        launchSpinner.succeed("Chrome launched with remote debugging enabled");
-        break;
-      case "restarted":
-        launchSpinner.succeed("Chrome restarted with remote debugging enabled (tabs restored)");
+        launchSpinner.succeed("Browser launched with remote debugging (debug profile)");
         break;
     }
   } else {

package/package.json

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

package/src/index.ts

@@ -191,13 +191,10 @@ browserCmd
       if (result.success) {
         switch (result.action) {
           case "already_available":
-            spinner.succeed("Chrome is already running with remote debugging enabled");
+            spinner.succeed("Browser is already running with remote debugging enabled");
             break;
           case "launched":
-            spinner.succeed("Chrome launched with remote debugging enabled");
-            break;
-          case "restarted":
-            spinner.succeed("Chrome restarted with remote debugging enabled (tabs restored)");
+            spinner.succeed("Browser launched with remote debugging (debug profile)");
             break;
         }
         console.log(chalk.dim("\n  You can now run: assistme start\n"));
@@ -318,13 +315,10 @@ program
     if (launchResult.success) {
       switch (launchResult.action) {
         case "already_available":
-          launchSpinner.succeed("Chrome browser detected (CDP port 9222)");
+          launchSpinner.succeed("Browser detected (CDP port 9222)");
           break;
         case "launched":
-          launchSpinner.succeed("Chrome launched with remote debugging enabled");
-          break;
-        case "restarted":
-          launchSpinner.succeed("Chrome restarted with remote debugging enabled (tabs restored)");
+          launchSpinner.succeed("Browser launched with remote debugging (debug profile)");
           break;
       }
     } else {

package/src/tools/browser.ts

@@ -16,8 +16,9 @@
 
 import { WebSocket } from "ws";
 import { execSync, spawn, type ChildProcess } from "node:child_process";
-import { platform } from "node:os";
-import { existsSync, unlinkSync } from "node:fs";
+import { platform, homedir } from "node:os";
+import { existsSync, unlinkSync, mkdirSync, cpSync, readdirSync } from "node:fs";
+import { join } from "node:path";
 import { log } from "../utils/logger.js";
 
 interface CDPTab {
@@ -807,40 +808,160 @@ async function killChromeGracefully(chromePath: string): Promise<void> {
 }
 
 /**
- * Spawn Chrome with the remote-debugging-port flag.
- * Returns the child process so callers can detect early failures.
+ * Return the browser's default profile directory.
+ */
+function getDefaultProfileDir(chromePath: string): string {
+  const home = homedir();
+  const os = platform();
+
+  if (os === "darwin") {
+    if (chromePath.includes("Brave Browser"))
+      return join(home, "Library", "Application Support", "BraveSoftware", "Brave-Browser");
+    if (chromePath.includes("Microsoft Edge"))
+      return join(home, "Library", "Application Support", "Microsoft Edge");
+    if (chromePath.includes("Chromium"))
+      return join(home, "Library", "Application Support", "Chromium");
+    if (chromePath.includes("Canary"))
+      return join(home, "Library", "Application Support", "Google", "Chrome Canary");
+    return join(home, "Library", "Application Support", "Google", "Chrome");
+  }
+
+  if (os === "win32") {
+    const appData = process.env.LOCALAPPDATA || join(home, "AppData", "Local");
+    if (chromePath.includes("brave"))
+      return join(appData, "BraveSoftware", "Brave-Browser", "User Data");
+    if (chromePath.includes("msedge")) return join(appData, "Microsoft", "Edge", "User Data");
+    return join(appData, "Google", "Chrome", "User Data");
+  }
+
+  // Linux
+  if (chromePath.includes("brave")) return join(home, ".config", "BraveSoftware", "Brave-Browser");
+  if (chromePath.includes("microsoft-edge")) return join(home, ".config", "microsoft-edge");
+  if (chromePath.includes("chromium")) return join(home, ".config", "chromium");
+  return join(home, ".config", "google-chrome");
+}
+
+/**
+ * Return a dedicated debug profile directory for assistme.
+ *
+ * Chrome 136+ silently ignores --remote-debugging-port when launched with the
+ * DEFAULT user-data-dir (security hardening against cookie-stealing malware).
+ * It also ignores --user-data-dir pointing to the default path.
+ * The flag ONLY works with a NON-DEFAULT --user-data-dir.
  *
- * On macOS, uses `open -a` which goes through Launch Services — the correct
- * way to launch a .app bundle and ensure flags reach the Chrome process.
- * Direct binary invocation on macOS can fail because Chrome's Mach-O binary
- * goes through framework wrappers that may drop command-line flags.
+ * Strategy: use ~/.assistme/browser-profile as a dedicated debug profile.
+ * On first use, copy key files from the real profile (bookmarks, cookies,
+ * login data, preferences) so the user doesn't start completely fresh.
+ * Sessions accumulate in the debug profile from then on.
  *
- * IMPORTANT: On macOS, `open -a` ignores --args if Chrome is ALREADY running.
- * Callers must ensure Chrome is fully quit before calling this function.
+ * See: https://developer.chrome.com/blog/remote-debugging-port
  */
-function spawnChrome(chromePath: string, port: number): ChildProcess {
-  const cdpFlag = `--remote-debugging-port=${port}`;
-  const os = platform();
+function getDebugProfileDir(chromePath: string): string {
+  const home = homedir();
+  const debugDir = join(home, ".assistme", "browser-profile");
+
+  if (!existsSync(debugDir)) {
+    mkdirSync(debugDir, { recursive: true });
+    log.debug(`Created debug profile directory: ${debugDir}`);
+
+    // Seed from the real profile — copy lightweight files, skip caches
+    const realDir = getDefaultProfileDir(chromePath);
+    if (existsSync(realDir)) {
+      seedDebugProfile(realDir, debugDir);
+    }
+  }
 
-  let child: ChildProcess;
+  return debugDir;
+}
 
-  if (os === "darwin") {
-    const appName = macAppName(chromePath);
-    log.debug(
-      `Spawning browser via: open -a "${appName}" --args ${cdpFlag} --restore-last-session`
-    );
-    child = spawn("open", ["-a", appName, "--args", cdpFlag, "--restore-last-session"], {
-      detached: true,
-      stdio: ["ignore", "pipe", "pipe"],
-    });
-  } else {
-    log.debug(`Spawning Chrome: ${chromePath} ${cdpFlag} --restore-last-session`);
-    child = spawn(chromePath, [cdpFlag, "--restore-last-session"], {
-      detached: true,
-      stdio: ["ignore", "pipe", "pipe"],
-    });
+/**
+ * Copy essential profile data from the user's real Chrome profile to the
+ * debug profile. This preserves bookmarks, preferences, and (where possible)
+ * login state without copying multi-GB caches.
+ *
+ * Note: cookies/login data are encrypted with a key tied to the user-data-dir
+ * on Chrome 136+, so they won't decrypt in the debug profile. The user will
+ * need to log in once in the debug browser. After that, sessions persist.
+ */
+function seedDebugProfile(realDir: string, debugDir: string): void {
+  // Files to copy from the profile root
+  const rootFiles = ["Local State"];
+  // Files to copy from the "Default" sub-profile
+  const profileFiles = ["Bookmarks", "Preferences", "Favicons", "Top Sites", "Shortcuts"];
+
+  for (const file of rootFiles) {
+    const src = join(realDir, file);
+    const dest = join(debugDir, file);
+    try {
+      if (existsSync(src)) {
+        cpSync(src, dest, { force: true });
+        log.debug(`Seeded: ${file}`);
+      }
+    } catch {
+      /* best effort */
+    }
   }
 
+  // Copy the Default profile sub-directory essentials
+  const srcProfile = join(realDir, "Default");
+  const destProfile = join(debugDir, "Default");
+  if (existsSync(srcProfile)) {
+    mkdirSync(destProfile, { recursive: true });
+    for (const file of profileFiles) {
+      const src = join(srcProfile, file);
+      const dest = join(destProfile, file);
+      try {
+        if (existsSync(src)) {
+          cpSync(src, dest, { force: true });
+          log.debug(`Seeded: Default/${file}`);
+        }
+      } catch {
+        /* best effort */
+      }
+    }
+
+    // Copy Extensions directory if it exists (preserves user's extensions)
+    const srcExt = join(srcProfile, "Extensions");
+    const destExt = join(destProfile, "Extensions");
+    try {
+      if (existsSync(srcExt)) {
+        cpSync(srcExt, destExt, { recursive: true, force: true });
+        log.debug("Seeded: Default/Extensions");
+      }
+    } catch {
+      /* best effort — extensions can be large */
+    }
+  }
+}
+
+/**
+ * Spawn a Chromium-based browser with CDP enabled.
+ * Returns the child process for exit-code monitoring.
+ *
+ * Key design decisions:
+ * - Launches the binary directly (not via macOS `open -a`) so flags are
+ *   guaranteed to reach the process and the child stays alive.
+ * - Uses a dedicated debug profile (not the default profile) so that:
+ *   (a) Chrome 136+ allows --remote-debugging-port
+ *   (b) Can run alongside the user's regular Chrome (different singleton)
+ * - Callers should ensure no OTHER debug-profile Chrome is running, but
+ *   the user's regular Chrome can stay open.
+ */
+function spawnChrome(chromePath: string, port: number): ChildProcess {
+  const profileDir = getDebugProfileDir(chromePath);
+  const flags = [
+    `--remote-debugging-port=${port}`,
+    `--user-data-dir=${profileDir}`,
+    "--restore-last-session",
+  ];
+
+  log.debug(`Spawning browser: ${chromePath} ${flags.join(" ")}`);
+
+  const child = spawn(chromePath, flags, {
+    detached: true,
+    stdio: ["ignore", "pipe", "pipe"],
+  });
+
   // Capture stderr for diagnostics — Chrome prints errors here
   let stderr = "";
   child.stderr?.on("data", (chunk: Buffer) => {
@@ -894,9 +1015,10 @@ async function isPortInUse(port: number): Promise<boolean> {
     const res = await fetch(`http://127.0.0.1:${port}/json/version`, {
       signal: AbortSignal.timeout(1000),
     });
-    // If we get a response but it's not Chrome, the port is occupied
+    // CDP /json/version returns a JSON object with "Browser" and "webSocketDebuggerUrl" keys.
+    // All Chromium-based browsers (Chrome, Edge, Brave) include these.
     const body = await res.text();
-    return !body.includes("Chrome");
+    return !body.includes("webSocketDebuggerUrl");
   } catch {
     // Connection refused → port is free
     return false;
@@ -908,27 +1030,23 @@ async function isPortInUse(port: number): Promise<boolean> {
  */
 export interface AutoLaunchResult {
   success: boolean;
-  action:
-    | "already_available"
-    | "launched"
-    | "restarted"
-    | "chrome_not_found"
-    | "launch_failed"
-    | "port_conflict";
+  action: "already_available" | "launched" | "chrome_not_found" | "launch_failed" | "port_conflict";
   chromePath?: string;
   detail?: string;
 }
 
 /**
- * Ensure Chrome is running with CDP enabled.
+ * Ensure a Chromium browser is running with CDP enabled.
  *
- * 1. Already listening on the port → return immediately.
- * 2. Port occupied by non-Chrome process → report conflict.
- * 3. Chrome not running → launch with --remote-debugging-port.
- * 4. Chrome running without CDP → graceful quit, then relaunch with CDP.
- *    Chrome's session restore brings back all tabs.
+ * Uses a SEPARATE debug profile (~/.assistme/browser-profile) so that:
+ * - The user's regular Chrome can stay open — no killing required
+ * - Chrome 136+ enables --remote-debugging-port (requires non-default dir)
+ * - The debug browser has its own singleton — no conflicts
  *
- * On launch failure, retries once with a longer wait.
+ * Flow:
+ * 1. CDP already reachable on the port → return immediately.
+ * 2. Port occupied by a non-Chromium process → report conflict.
+ * 3. Launch a new browser instance with the debug profile + CDP flag.
  */
 export async function ensureBrowserAvailable(port = 9222): Promise<AutoLaunchResult> {
   const browser = getBrowser(port);
@@ -958,97 +1076,51 @@ export async function ensureBrowserAvailable(port = 9222): Promise<AutoLaunchRes
 
   log.debug(`Found Chrome at: ${chromePath}`);
 
-  const running = isChromeRunning(chromePath);
-  log.debug(`Browser currently running: ${running}`);
-
-  // Case 3: Browser running without CDP → restart
-  if (running) {
-    log.debug("Killing browser gracefully for restart with CDP...");
-    await killChromeGracefully(chromePath);
-
-    // Verify browser is fully dead — critical on macOS where `open -a`
-    // ignores --args if the app is still alive.
-    if (isChromeRunning(chromePath)) {
-      log.debug("Browser still running after kill attempt — cannot restart with CDP");
-      return {
-        success: false,
-        action: "launch_failed",
-        chromePath,
-        detail:
-          "Could not stop the existing browser process. Please quit the browser manually and run assistme again.",
-      };
-    }
-
-    // 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 browser process exited immediately
-    if (child.exitCode !== null) {
-      log.debug(
-        `Browser process already exited (code ${child.exitCode}) — may have crashed or profile is locked`
-      );
-      return {
-        success: false,
-        action: "launch_failed",
-        chromePath,
-        detail: `Browser exited immediately (code ${child.exitCode}). The profile may be locked. Try closing all browser windows first, then run assistme again.`,
-      };
-    }
-
-    // Retry once — browser 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(chromePath);
-    return {
-      success: false,
-      action: "launch_failed",
-      chromePath,
-      detail: stillRunning
-        ? "Browser is running but CDP port is not responding. Try: 1) Quit the browser completely, 2) Run assistme again."
-        : "Browser was restarted but exited unexpectedly. Try launching it manually to check for errors.",
-    };
-  }
-
-  // Case 4: Browser not running → launch
-  const child = spawnChrome(chromePath, port);
+  // Launch a debug Chrome instance (separate profile — no need to kill the user's Chrome)
+  spawnChrome(chromePath, port);
 
   if (await waitForCDP(browser)) {
     return { success: true, action: "launched", chromePath };
   }
 
-  if (child.exitCode !== null) {
-    log.debug(`Browser process already exited (code ${child.exitCode})`);
-    return {
-      success: false,
-      action: "launch_failed",
-      chromePath,
-      detail: `Browser exited immediately (code ${child.exitCode}). Try launching it manually to see any error dialogs.`,
-    };
-  }
+  // CDP didn't come up — check if the debug profile is locked by a previous
+  // crashed assistme session (stale SingletonLock)
+  const debugDir = getDebugProfileDir(chromePath);
+  const lockPath = join(debugDir, "SingletonLock");
+  if (existsSync(lockPath)) {
+    log.debug("Found stale SingletonLock in debug profile — removing and retrying");
+    try {
+      unlinkSync(lockPath);
+      // Also clean SingletonSocket/Cookie
+      for (const f of ["SingletonSocket", "SingletonCookie"]) {
+        try {
+          unlinkSync(join(debugDir, f));
+        } catch {
+          /* ok */
+        }
+      }
+    } catch {
+      /* best effort */
+    }
 
-  // Retry once
-  log.debug("First CDP wait timed out after launch, retrying...");
-  if (await waitForCDP(browser, 15000)) {
-    return { success: true, action: "launched", chromePath };
+    // Retry spawn
+    spawnChrome(chromePath, port);
+    if (await waitForCDP(browser, 15000)) {
+      return { success: true, action: "launched", chromePath };
+    }
   }
 
-  const stillRunning = isChromeRunning(chromePath);
   return {
     success: false,
     action: "launch_failed",
     chromePath,
-    detail: stillRunning
-      ? "Chrome is running but CDP port is not responding. Try quitting Chrome completely and running assistme again."
-      : "Chrome exited unexpectedly after launch.",
+    detail:
+      "Could not start browser with remote debugging. Possible causes:\n" +
+      "  1) Another assistme debug browser is already using port " +
+      port +
+      "\n" +
+      "  2) The browser crashed on startup\n" +
+      "Try: rm -rf ~/.assistme/browser-profile && assistme",
   };
 }