cicy-desktop 2.1.89 → 2.1.90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.89",
+  "version": "2.1.90",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -133,11 +133,11 @@
   },
   "//optionalDependencies": "Runtime Bundle v1 (主人指令): platform binaries delivered by `npm i -g cicy-desktop` itself — npm installs only the current-platform subpackage (os/cpu pinned in each), so first start seeds the runtime store with ZERO network, ZERO npx. Windows packages are named *-windows-* (npm spam filter 403s new names containing win32). cicy-msys2 added once published.",
   "optionalDependencies": {
-    "cicy-code-darwin-x64": "2.3.9",
-    "cicy-code-darwin-arm64": "2.3.9",
-    "cicy-code-linux-x64": "2.3.9",
-    "cicy-code-linux-arm64": "2.3.9",
-    "cicy-code-windows-x64": "2.3.9",
+    "cicy-code-darwin-x64": "2.3.11",
+    "cicy-code-darwin-arm64": "2.3.11",
+    "cicy-code-linux-x64": "2.3.11",
+    "cicy-code-linux-arm64": "2.3.11",
+    "cicy-code-windows-x64": "2.3.11",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",
     "cicy-mihomo-linux-x64": "1.10.4",

package/src/chrome/chrome-cdp-client.js

@@ -17,7 +17,31 @@ async function getTargets(debuggerPort, host = "127.0.0.1") {
 }
 
 async function createTarget(debuggerPort, targetUrl = "about:blank", host = "127.0.0.1") {
-  const url = `http://${host}:${debuggerPort}/json/new?${encodeURIComponent(String(targetUrl || "about:blank"))}`;
+  const wantUrl = String(targetUrl || "about:blank");
+  // Prefer the browser-level CDP endpoint (Target.createTarget over the browser
+  // websocket). Newer Chrome (149+) rejects/closes the HTTP /json/new endpoint,
+  // and — crucially — the browser websocket can open a tab even when there are
+  // 0 page targets: the windowless Chrome that lingers on macOS after its last
+  // window is closed. Without this, /json/new fails, ensurePageTargets can't
+  // create a tab, and the profile is stuck at "No inspectable targets".
+  try {
+    const version = await getVersion(debuggerPort, host);
+    const browserWs = version && version.webSocketDebuggerUrl;
+    if (browserWs) {
+      const res = await callCdp({
+        debuggerPort,
+        host,
+        target: browserWs,
+        method: "Target.createTarget",
+        params: { url: wantUrl },
+      });
+      const id = res && res.targetId;
+      if (id) return { id, targetId: id };
+    }
+  } catch (_) {
+    // Fall through to the legacy HTTP endpoint (older Chrome / unexpected shape).
+  }
+  const url = `http://${host}:${debuggerPort}/json/new?${encodeURIComponent(wantUrl)}`;
   const response = await fetch(url, { method: "PUT" });
   if (!response.ok) {
     throw new Error(`Request failed ${response.status} ${response.statusText} for ${url}`);

package/src/main.js

@@ -267,6 +267,11 @@ const {
 const automationEnabled =
   process.env.CICY_DESKTOP_HTTP === "1" || enableMcp || !!process.env.CICY_MASTER_URL;
 
+// CDP 调试口(9221)默认开(主人令),只绑 127.0.0.1 回环、不暴露到网络。与上面的
+// HTTP/MCP server 解耦:HTTP server 仍按 automationEnabled 控制(避免对外 0.0.0.0
+// 暴露 / 防火墙弹窗),CDP 单独默认开。要关 CDP:显式设 CICY_DESKTOP_CDP=0。
+const cdpEnabled = process.env.CICY_DESKTOP_CDP !== "0";
+
 config.port = PORT;
 if (chromeBinary) {
   config.chromeBinary = chromeBinary;
@@ -458,12 +463,12 @@ const server = http.createServer(app);
 
 // 必须在 whenReady 之前设置调试端口。CDP 无鉴权,仅在自动化启用时才开,并显式
 // 绑回环地址(默认已是 127.0.0.1,显式设置防止意外暴露到 0.0.0.0)。
-if (automationEnabled) {
+if (cdpEnabled) {
   electronApp.commandLine.appendSwitch("remote-debugging-port", "9221");
   electronApp.commandLine.appendSwitch("remote-debugging-address", "127.0.0.1");
-  log.info("[MCP] Remote debugging enabled on 127.0.0.1:9221 (automation enabled)");
+  log.info("[MCP] Remote debugging enabled on 127.0.0.1:9221 (default on; set CICY_DESKTOP_CDP=0 to disable)");
 } else {
-  log.info("[MCP] Remote debugging port NOT opened (automation disabled — set --mcp / CICY_DESKTOP_HTTP=1 / CICY_MASTER_URL to enable)");
+  log.info("[MCP] Remote debugging port NOT opened (CICY_DESKTOP_CDP=0)");
 }
 
 // Register the cicy:// scheme (tab-browser start page) — must run before ready.

package/src/tools/chrome-tools.js

@@ -62,6 +62,25 @@ function normalizePrivateProxy(proxyValue) {
   return p.enabled && p.url ? p.url : null;
 }
 
+// All Chrome profiles share the single chrome-profile-1 mihomo listener (20001):
+// cicy-mihomo's default config only emits that one listener (profile-2/3 are
+// commented out), so a profile pointing at a dead per-profile port (20002…) or
+// at no proxy at all can't load pages. Self-heal at launch — empty proxy or a
+// local chrome-profile-range port (20000–20099) collapses to 20001; a genuine
+// external proxy is left untouched. Non-destructive: only the launch arg is
+// rewritten, chrome.json is not.
+const SHARED_CHROME_PROXY = "socks5://127.0.0.1:20001";
+function canonicalChromeProxy(proxyUrl) {
+  if (!proxyUrl) return SHARED_CHROME_PROXY;
+  try {
+    const u = new URL(proxyUrl);
+    const isLocal = u.hostname === "127.0.0.1" || u.hostname === "localhost";
+    const port = Number(u.port);
+    if (isLocal && port >= 20000 && port <= 20099) return SHARED_CHROME_PROXY;
+  } catch {}
+  return proxyUrl;
+}
+
 function readPrivateChromeConfig() {
   if (!fs.existsSync(PRIVATE_CHROME_JSON)) return {};
   return JSON.parse(fs.readFileSync(PRIVATE_CHROME_JSON, "utf-8"));
@@ -317,7 +336,7 @@ async function launchOrActivateProfile({
     throw new Error("Chrome debugger port 9221 is reserved by Electron. Please use another port.");
   }
 
-  const effectiveProxy = normalized.proxyUrl;
+  const effectiveProxy = canonicalChromeProxy(normalized.proxyUrl);
   const effectiveUserDataDirRoot =
     normalized.expanded.rpaDir ||
     getDefaultUserDataDirRoot(accountIdx, config.chromeUserDataRoot || DEFAULT_USER_DATA_BASE_ROOT);
@@ -327,38 +346,72 @@ async function launchOrActivateProfile({
   // Script parity: if /json/version reachable => activate first page target and return reused
   const liveStatus = await probeChromeDebugger(effectivePort);
   if (liveStatus.isRunning) {
-    const { targets, activatedTargetId } = await ensurePageTargets({
-      debuggerPort: effectivePort,
-      url,
-      activateIfRunning,
-    });
-    if (activateIfRunning) bringChromeAppToForeground();
-
-    const nextRuntime = registry.upsert(accountIdx, {
-      status: "running",
-      debuggerPort: effectivePort,
-      proxy: effectiveProxy || null,
-      userDataDirRoot: displayUserDataDir,
-      profileDirectory: getProfileDirectory(accountIdx),
-      url: url || null,
-      webSocketDebuggerUrl: liveStatus.webSocketDebuggerUrl || null,
-      error: null,
-    });
+    // Detect a windowless Chrome — debugger up but 0 page targets. It lingers on
+    // macOS after its last window is closed; reusing it is unreliable because a
+    // CDP-created tab has no browser window and Chrome discards it, leaving the
+    // profile stuck at "No inspectable targets". Only trust an explicit empty
+    // list (a transient /json/list failure must NOT be read as windowless, or we
+    // could kill a Chrome that actually has the user's tabs open).
+    let windowless = false;
+    try {
+      const live = await getTargets(effectivePort);
+      windowless = Array.isArray(live) && live.filter((t) => t.type === "page").length === 0;
+    } catch (_) {
+      windowless = false;
+    }
 
-    return {
-      reused: true,
-      activatedTargetId,
-      profileKey,
-      profileSource,
-      accountIdx,
-      gmail: normalized.gmail,
-      port: effectivePort,
-      proxy: effectiveProxy || null,
-      userDataDirRoot: displayUserDataDir,
-      runtime: nextRuntime,
-      liveStatus,
-      targetsPreview: buildTargetsPreview(targets),
-    };
+    if (!windowless) {
+      const { targets, activatedTargetId } = await ensurePageTargets({
+        debuggerPort: effectivePort,
+        url,
+        activateIfRunning,
+      });
+      if (activateIfRunning) bringChromeAppToForeground();
+
+      const nextRuntime = registry.upsert(accountIdx, {
+        status: "running",
+        debuggerPort: effectivePort,
+        proxy: effectiveProxy || null,
+        userDataDirRoot: displayUserDataDir,
+        profileDirectory: getProfileDirectory(accountIdx),
+        url: url || null,
+        webSocketDebuggerUrl: liveStatus.webSocketDebuggerUrl || null,
+        error: null,
+      });
+
+      return {
+        reused: true,
+        activatedTargetId,
+        profileKey,
+        profileSource,
+        accountIdx,
+        gmail: normalized.gmail,
+        port: effectivePort,
+        proxy: effectiveProxy || null,
+        userDataDirRoot: displayUserDataDir,
+        runtime: nextRuntime,
+        liveStatus,
+        targetsPreview: buildTargetsPreview(targets),
+      };
+    }
+
+    // Windowless: tear the lingering process down (release its SingletonLock on
+    // the user-data-dir) before falling through to the fresh-launch path, which
+    // spawns Chrome with a real, persistent window.
+    const lingering = registry.get(accountIdx);
+    if (lingering?.pid) {
+      closeChromeProcess(lingering.pid);
+    } else if (liveStatus.webSocketDebuggerUrl) {
+      try {
+        await callCdp({
+          debuggerPort: effectivePort,
+          target: liveStatus.webSocketDebuggerUrl,
+          method: "Browser.close",
+          params: {},
+        });
+      } catch (_) {}
+    }
+    await new Promise((resolve) => setTimeout(resolve, 1000));
   }
 
   ensureRpaProfileInitialized({
@@ -910,11 +963,25 @@ function registerChromeTools(registerTool) {
       }
 
       try {
+        // Browser-level CDP methods (Target.*, Browser.*) must attach to the
+        // browser endpoint, not a page target. Without an explicit target, CRI
+        // defaults to the first page target and fails with "No inspectable
+        // targets" when the profile has 0 page targets — a windowless Chrome
+        // lingering after its last window was closed, or Chrome 149 where the
+        // HTTP /json/new tab-create endpoint is disabled. Resolve the browser
+        // websocket so "add tab" (Target.createTarget) works from any state.
+        let effectiveTarget = target;
+        if (!effectiveTarget && /^(Target|Browser)\./.test(method)) {
+          try {
+            const v = await getVersion(port);
+            if (v && v.webSocketDebuggerUrl) effectiveTarget = v.webSocketDebuggerUrl;
+          } catch (_) {}
+        }
         const result = await callCdp({
           debuggerPort: port,
           method,
           params: params || {},
-          target,
+          target: effectiveTarget,
         });
         registry.upsert(accountIdx, {
           status: "running",