@dmsdc-ai/aigentry-deliberation 0.0.28 → 0.0.30

package/index.js

@@ -719,7 +719,10 @@ function dedupeBrowserTabs(tabs = []) {
     const title = String(tab?.title || "").trim();
     const url = String(tab?.url || "").trim();
     if (!url || (!isLlmUrl(url) && !isExtensionLlmTab(url, title))) continue;
-    const key = `${browser}\t${title}\t${url}`;
+    // Dedup by title+url (ignore browser name) so that the same tab detected
+    // via both AppleScript and CDP is not duplicated. The first occurrence wins,
+    // so callers should add preferred sources first (e.g., CDP before AppleScript).
+    const key = `${title}\t${url}`;
     if (seen.has(key)) continue;
     seen.add(key);
     out.push({
@@ -946,16 +949,28 @@ async function ensureCdpAvailable() {
 
     // Chrome 145+ requires --user-data-dir for CDP to work.
     // The default data dir is rejected, so we copy the profile to ~/.chrome-cdp.
+    // Profile can be set via env DELIBERATION_CHROME_PROFILE or config.chrome_profile (e.g., "Profile 1").
     const cdpDataDir = path.join(os.homedir(), ".chrome-cdp");
-    const profileDir = "Default";
+    const cdpConfig = loadDeliberationConfig();
+    const profileDir = process.env.DELIBERATION_CHROME_PROFILE || cdpConfig.chrome_profile || "Default";
 
     try {
       if (chromeUserDataDir) {
         const srcProfile = path.join(chromeUserDataDir, profileDir);
         const dstProfile = path.join(cdpDataDir, profileDir);
-        if (!fs.existsSync(dstProfile) && fs.existsSync(srcProfile)) {
+        // Track which profile was copied; re-copy if profile changed
+        const profileMarker = path.join(cdpDataDir, ".cdp-profile");
+        const lastProfile = fs.existsSync(profileMarker) ? fs.readFileSync(profileMarker, "utf8").trim() : null;
+        const needsCopy = !fs.existsSync(dstProfile) || (lastProfile && lastProfile !== profileDir);
+        if (needsCopy && fs.existsSync(srcProfile)) {
+          // Clean old profile if switching
+          if (lastProfile && lastProfile !== profileDir) {
+            const oldDst = path.join(cdpDataDir, lastProfile);
+            if (fs.existsSync(oldDst)) fs.rmSync(oldDst, { recursive: true, force: true });
+          }
           fs.mkdirSync(cdpDataDir, { recursive: true });
           execFileSync("cp", ["-R", srcProfile, dstProfile], { timeout: 30000, stdio: "ignore" });
+          fs.writeFileSync(profileMarker, profileDir);
           // Create minimal Local State with single profile to avoid profile picker
           const localStateSrc = path.join(chromeUserDataDir, "Local State");
           if (fs.existsSync(localStateSrc)) {
@@ -1133,6 +1148,16 @@ async function collectBrowserLlmTabs() {
     };
   }
 
+  // CDP first: CDP-detected tabs are preferred over AppleScript-detected ones
+  // because they carry CDP metadata (tab ID, WebSocket URL) for browser_auto transport.
+  // Since dedupeBrowserTabs keeps the first occurrence, CDP entries win the dedup.
+  const shouldUseCdp = mode === "auto" || mode === "cdp";
+  if (shouldUseCdp) {
+    const cdp = await collectBrowserLlmTabsViaCdp();
+    tabs.push(...cdp.tabs);
+    if (cdp.note) notes.push(cdp.note);
+  }
+
   const shouldUseAppleScript = mode === "auto" || mode === "applescript";
   if (shouldUseAppleScript && process.platform === "darwin") {
     const mac = collectBrowserLlmTabsViaAppleScript();
@@ -1142,13 +1167,6 @@ async function collectBrowserLlmTabs() {
     notes.push("AppleScript scanning is macOS only. Switch to CDP scanning.");
   }
 
-  const shouldUseCdp = mode === "auto" || mode === "cdp";
-  if (shouldUseCdp) {
-    const cdp = await collectBrowserLlmTabsViaCdp();
-    tabs.push(...cdp.tabs);
-    if (cdp.note) notes.push(cdp.note);
-  }
-
   const uniqTabs = dedupeBrowserTabs(tabs);
   return {
     tabs: uniqTabs,
@@ -1333,6 +1351,17 @@ async function collectSpeakerCandidates({ include_cli = true, include_browser =
         }
       }
     }
+
+    // Third pass: upgrade browser-detected candidates that missed the first hostname match.
+    // When CDP is reachable, AppleScript-detected speakers should also get browser_auto
+    // transport. The OrchestratedBrowserPort will create/navigate tabs on demand if needed.
+    if (cdpReachable) {
+      for (const candidate of candidates) {
+        if (candidate.type !== "browser" || candidate.auto_registered) continue;
+        if (candidate.cdp_available) continue; // already matched
+        candidate.cdp_available = true;
+      }
+    }
   }
 
   return { candidates, browserNote };
@@ -3427,8 +3456,10 @@ server.tool(
       .describe("Default number of rounds (1-10, default 3)"),
     default_ordering: z.enum(["auto", "cyclic", "random", "weighted-random"]).optional()
       .describe("Default ordering strategy: auto (automatic based on speaker count), cyclic, random, weighted-random"),
+    chrome_profile: z.string().optional()
+      .describe("Chrome profile directory name for CDP (e.g., \"Default\", \"Profile 1\"). Stored for auto-launch."),
   },
-  safeToolHandler("deliberation_cli_config", async ({ enabled_clis, require_speaker_selection, default_rounds, default_ordering }) => {
+  safeToolHandler("deliberation_cli_config", async ({ enabled_clis, require_speaker_selection, default_rounds, default_ordering, chrome_profile }) => {
     const config = loadDeliberationConfig();
 
     // Handle setup config updates
@@ -3445,6 +3476,10 @@ server.tool(
       config.default_ordering = default_ordering;
       configChanged = true;
     }
+    if (chrome_profile !== undefined && chrome_profile !== null) {
+      config.chrome_profile = chrome_profile;
+      configChanged = true;
+    }
     if (configChanged) {
       config.setup_complete = true;
       saveDeliberationConfig(config);
@@ -3459,7 +3494,7 @@ server.tool(
       return {
         content: [{
           type: "text",
-          text: `## Deliberation CLI Settings\n\n**Mode:** ${mode}\n**Speaker selection:** ${config.require_speaker_selection === false ? "auto (all detected speakers join)" : "manual (user selects)"}\n**Default rounds:** ${config.default_rounds || 3}\n**Ordering:** ${config.default_ordering || "auto"}\n**Configured CLIs:** ${configured.length > 0 ? configured.join(", ") : "(none — full auto-detection)"}\n**Currently detected CLIs:** ${detected.join(", ") || "(none)"}\n**All supported CLIs:** ${DEFAULT_CLI_CANDIDATES.join(", ")}\n\nTo change:\n\`deliberation_cli_config(require_speaker_selection: false, default_rounds: 3, default_ordering: "auto")\`\n\nTo revert to full auto-detection:\n\`deliberation_cli_config(enabled_clis: [])\``,
+          text: `## Deliberation CLI Settings\n\n**Mode:** ${mode}\n**Speaker selection:** ${config.require_speaker_selection === false ? "auto (all detected speakers join)" : "manual (user selects)"}\n**Default rounds:** ${config.default_rounds || 3}\n**Ordering:** ${config.default_ordering || "auto"}\n**Chrome profile:** ${config.chrome_profile || "Default"} (env: DELIBERATION_CHROME_PROFILE)\n**Configured CLIs:** ${configured.length > 0 ? configured.join(", ") : "(none — full auto-detection)"}\n**Currently detected CLIs:** ${detected.join(", ") || "(none)"}\n**All supported CLIs:** ${DEFAULT_CLI_CANDIDATES.join(", ")}\n\nTo change:\n\`deliberation_cli_config(require_speaker_selection: false, default_rounds: 3, default_ordering: "auto")\`\n\nTo set Chrome profile for CDP:\n\`deliberation_cli_config(chrome_profile: "Profile 1")\`\n\nTo revert to full auto-detection:\n\`deliberation_cli_config(enabled_clis: [])\``,
         }],
       };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmsdc-ai/aigentry-deliberation",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "MCP Deliberation Server — Multi-session AI deliberation with smart speaker ordering and persona roles",
   "type": "module",
   "license": "MIT",