cicy-desktop 2.1.259 → 2.1.261

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.259",
+  "version": "2.1.261",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -139,10 +139,10 @@
   "//optionalDependencies": "(2026-06 回调): mac/linux 改回 native cicy-code(:8008,colima 在 16G mac 上压垮内存)→ 重新内置 cicy-code-<plat> / cicy-mihomo-<plat>,localbin.fromBundle 零网络 seed(npm 仅作更新通道,带 npmmirror→npmjs 回退)。这些由 scripts/sync-runtime-deps.cjs 在 tag-push 时同步到最新版。npm 的 os/cpu 字段保证每个平台只装自己那份。Windows 仍走 docker(WSL :8009),它那份 cicy-code-windows 用不到但 bundle 着无害。",
   "optionalDependencies": {
     "electron": "41.0.3",
-    "cicy-code-darwin-x64": "2.3.315",
-    "cicy-code-darwin-arm64": "2.3.315",
-    "cicy-code-linux-x64": "2.3.315",
-    "cicy-code-linux-arm64": "2.3.315",
+    "cicy-code-darwin-x64": "2.3.331",
+    "cicy-code-darwin-arm64": "2.3.331",
+    "cicy-code-linux-x64": "2.3.331",
+    "cicy-code-linux-arm64": "2.3.331",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/src/main.js

@@ -1470,12 +1470,6 @@ electronApp.whenReady().then(async () => {
           : [{ label: i18n.t("menu.close"), role: "close" }]),
       ],
     },
-    ...(process.platform !== "darwin" ? [{
-      label: i18n.t("menu.help"),
-      submenu: [
-        { label: "打开 cicy-ai.com", click: openCicyAi },
-      ],
-    }] : []),
     ];
     Menu.setApplicationMenu(Menu.buildFromTemplate(menuTemplate));
   };

package/src/sidecar/docker.js

@@ -32,7 +32,11 @@ const DOCKER_DESKTOP_URL = process.env.CICY_DOCKER_DESKTOP_URL
 const DOCKER_DESKTOP_MIRROR = process.env.CICY_DOCKER_DESKTOP_MIRROR
   || "https://cicy-1372193042.cos.ap-shanghai.myqcloud.com/binaries/DockerDesktopInstaller.exe";
 // CICY_* env vars forwarded into the container (team onboarding, version pin…).
-const PASS_ENV = ["CICY_TEAM_TOKEN", "CICY_CODE_VERSION", "NPM_REGISTRY", "CICY_NPM_REGISTRY", "CICY_AGENTS", "ENABLE_CDN", "CICY_CLOUDFLARED_TOKEN"];
+const PASS_ENV = [
+  "CICY_TEAM_TOKEN", "CICY_CODE_VERSION", "NPM_REGISTRY", "CICY_NPM_REGISTRY",
+  "CICY_AGENTS", "ENABLE_CDN", "CICY_CLOUDFLARED_TOKEN",
+  "CICY_CLOUD_EMAIL", "CICY_CLOUD_TEAM_ID",
+];
 
 // Resolve the docker CLI. CRITICAL on Windows: right after Docker Desktop
 // installs, it adds `...\Docker\resources\bin` to the SYSTEM PATH — but the

package/src/sidecar/wsl-docker.js

@@ -670,7 +670,15 @@ async function runContainer({ port = 8008, container = "cicy-code-docker", volum
   if (await probeHealth(port)) { ensureDesktopShortcut(volume, port).catch(() => {}); return { adopted: true }; }
   // Replace any stale same-named container.
   try { await wslRun(`docker rm -f ${container}`, { timeout: 20000 }); } catch {}
-  const envArgs = Object.entries(env || {})
+  // Windows workflow/user-level environment is inherited by cicy-desktop, then
+  // explicitly forwarded across both boundaries: Windows → WSL → container.
+  // Without this, Desktop starts a healthy cicy-code that never registers the
+  // requested Cloud account/team even though the variables exist on Windows.
+  const inheritedCloudEnv = {};
+  for (const key of ["CICY_CLOUD_EMAIL", "CICY_CLOUD_TEAM_ID"]) {
+    if (process.env[key]) inheritedCloudEnv[key] = process.env[key];
+  }
+  const envArgs = Object.entries({ ...inheritedCloudEnv, ...(env || {}) })
     .filter(([, v]) => v != null && v !== "")
     .map(([k, v]) => `-e ${k}='${String(v).replace(/'/g, "'\\''")}'`)
     .join(" ");

package/src/tray.js

@@ -7,7 +7,7 @@
 // so they're available at runtime in both dev (./build/...) and packaged
 // (process.resourcesPath/build/...) modes.
 
-const { app, Tray, Menu, nativeImage, BrowserWindow } = require("electron");
+const { app, Tray, Menu, nativeImage, dialog } = require("electron");
 const path = require("path");
 const fs = require("fs");
 const log = require("electron-log");
@@ -42,6 +42,134 @@ function setupDockIcon() {
   }
 }
 
+async function openCicyAiInProfile1() {
+  try {
+    const tabs = require("./tools/tab-browser-tools");
+    await tabs.openTab(1, "https://cicy-ai.com", { activate: true });
+    const manager = tabs.ensureManager(1);
+    if (manager.win.isMinimized()) manager.win.restore();
+    manager.win.show();
+    manager.win.focus();
+  } catch (e) {
+    log.warn(`[Tray] open cicy-ai.com in Electron Profile 1 failed: ${e.message}`);
+  }
+}
+
+async function openElectronProfile(accountIdx) {
+  try {
+    const tabs = require("./tools/tab-browser-tools");
+    await tabs.openTab(accountIdx, undefined, { activate: true });
+    const manager = tabs.ensureManager(accountIdx);
+    if (manager.win.isMinimized()) manager.win.restore();
+    manager.win.show();
+    manager.win.focus();
+  } catch (e) {
+    showProfileError("Electron", e);
+  }
+}
+
+async function openChromeProfile(accountIdx) {
+  try {
+    await require("./tools/chrome-tools").launchOrActivateProfile({
+      accountIdx,
+      activateIfRunning: true,
+    });
+  } catch (e) {
+    showProfileError("Chrome", e);
+  }
+}
+
+function showProfileError(kind, error) {
+  dialog.showMessageBox({
+    type: "error",
+    message: `${kind} Profile 操作失败`,
+    detail: String((error && error.message) || error),
+    buttons: ["OK"],
+  });
+}
+
+function listProfiles(backend) {
+  try {
+    let rows = require("./profiles/profile-store").listProfiles(backend);
+    if (backend === "electron") {
+      rows = rows.filter((p) => ![0, 9].includes(Number(p.accountIdx)));
+    }
+    return rows;
+  } catch (_) {
+    return [];
+  }
+}
+
+async function addProfileFromTray(kind) {
+  try {
+    const { executeTool } = require("./server/tool-executor");
+    const result = await executeTool(kind === "Electron" ? "electron_add_profile" : "chrome_add_profile", {});
+    const text = result && result.content && result.content[0] && result.content[0].text;
+    let data = {};
+    try { data = JSON.parse(text || "{}"); } catch {}
+    if (result && result.isError) throw new Error(data.error || text || "unknown error");
+    const accountIdx = Number(data.accountIdx ?? (data.created && data.created.accountIdx));
+    installTrayMenu();
+    if (Number.isFinite(accountIdx)) {
+      if (kind === "Electron") await openElectronProfile(accountIdx);
+      else await openChromeProfile(accountIdx);
+    }
+  } catch (e) {
+    showProfileError(kind, e);
+  }
+}
+
+function installTrayMenu() {
+  if (!trayInstance) return;
+  const electronRows = listProfiles("electron");
+  const chromeRows = listProfiles("chrome");
+  const template = [
+    {
+      label: i18n.t("tray.openHomepage"),
+      click: () => openHomepage(),
+    },
+    ...(process.platform === "win32" ? [
+      {
+        label: "打开 cicy-ai.com",
+        click: () => openCicyAiInProfile1(),
+      },
+      { type: "separator" },
+      {
+        label: "Electron",
+        submenu: [
+          { label: "新增 Profile", click: () => addProfileFromTray("Electron") },
+          ...(electronRows.length ? [{ type: "separator" }] : []),
+          ...electronRows.map((p) => ({
+            label: `Profile ${p.accountIdx}${p.name ? ` · ${p.name}` : ""}`,
+            click: () => openElectronProfile(Number(p.accountIdx)),
+          })),
+        ],
+      },
+      {
+        label: "Chrome",
+        submenu: [
+          { label: "新增 Profile", click: () => addProfileFromTray("Chrome") },
+          { label: "原生 Chrome", click: () => {
+            try { require("./tools/chrome-tools").launchNativeChrome(); }
+            catch (e) { showProfileError("Chrome", e); }
+          } },
+          ...(chromeRows.length ? [{ type: "separator" }] : []),
+          ...chromeRows.map((p) => ({
+            label: `Profile ${p.accountIdx}${p.gmail ? ` · ${p.gmail}` : p.note ? ` · ${p.note}` : ""}`,
+            click: () => openChromeProfile(Number(p.accountIdx)),
+          })),
+        ],
+      },
+    ] : []),
+    { type: "separator" },
+    {
+      label: i18n.t("tray.quit"),
+      click: () => app.quit(),
+    },
+  ];
+  trayInstance.setContextMenu(Menu.buildFromTemplate(template));
+}
+
 function setupTray() {
   try {
     let iconPath;
@@ -65,19 +193,7 @@ function setupTray() {
 
     trayInstance = new Tray(img);
     trayInstance.setToolTip(i18n.t("tray.tooltip"));
-
-    const menu = Menu.buildFromTemplate([
-      {
-        label: i18n.t("tray.openHomepage"),
-        click: () => openHomepage(),
-      },
-      { type: "separator" },
-      {
-        label: i18n.t("tray.quit"),
-        click: () => app.quit(),
-      },
-    ]);
-    trayInstance.setContextMenu(menu);
+    installTrayMenu();
 
     // Click on tray icon: open homepage on macOS, toggle on others
     trayInstance.on("click", () => openHomepage());