cicy-desktop 2.1.36 → 2.1.38

package/bin/cicy-desktop

@@ -377,6 +377,12 @@ function ensureMacDesktopApp() {
   // via `do shell script`, then quits. Icon = the applet's applet.icns.
   const { execFileSync } = require("child_process");
   const appDir = path.join(DESKTOP_DIR, "CiCy Desktop.app");
+  // Idempotent — create only when missing. When the app is launched FROM this
+  // very applet (double-click), the old code's fs.rmSync(appDir) tries to
+  // delete the running bundle: the rmdir syscall blocks FOREVER (the app
+  // deleting itself), so startup hangs at "Cleaning up ports" and no window
+  // ever appears ("打不开"). Skip if it already exists.
+  if (fs.existsSync(appDir)) return;
   const nodeDir = nodeBinDir();
   // do shell script needs node on PATH (GUI launch has a minimal PATH); the
   // trailing & + nohup + </dev/null lets the shell return so the applet quits.
@@ -407,6 +413,7 @@ function ensureMacDesktopApp() {
 function ensureLinuxDesktopEntry() {
   const icon = path.join(PACKAGE_ROOT, "build", "icons", "icon-256.png");
   const file = path.join(DESKTOP_DIR, "cicy-desktop.desktop");
+  if (fs.existsSync(file)) return; // idempotent: create only when missing
   fs.mkdirSync(DESKTOP_DIR, { recursive: true });
   fs.writeFileSync(file,
 `[Desktop Entry]
@@ -433,6 +440,7 @@ function ensureWindowsShortcut() {
   // launches via the global bin (see README "Run via npx" / install one-liner).
   const ico = path.join(PACKAGE_ROOT, "build", "icon.ico");
   const lnk = path.join(DESKTOP_DIR, "CiCy Desktop.lnk");
+  if (fs.existsSync(lnk)) return; // idempotent: create only when missing (also avoids re-popping 360 each launch)
   const nodeDir = nodeBinDir();
   const ps = path.join(require("os").tmpdir(), `cicy-shortcut-${process.pid}.ps1`);
   fs.writeFileSync(ps,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.36",
+  "version": "2.1.38",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {

package/src/tools/chrome-tools.js

@@ -59,7 +59,11 @@ function writePrivateChromeConfig(nextConfig) {
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
-  fs.writeFileSync(PRIVATE_CHROME_JSON, JSON.stringify(nextConfig || {}, null, 2));
+  // chrome.json now holds per-account passwords + TOTP secrets — keep it
+  // owner-only (0600). mode on writeFileSync only applies on create, so chmod
+  // explicitly to also tighten a pre-existing world/group-readable file.
+  fs.writeFileSync(PRIVATE_CHROME_JSON, JSON.stringify(nextConfig || {}, null, 2), { mode: 0o600 });
+  try { fs.chmodSync(PRIVATE_CHROME_JSON, 0o600); } catch {}
 }
 
 function listPrivateChromeEntries({ includeHidden = false } = {}) {
@@ -97,14 +101,19 @@ function normalizePrivateChromeEntry(profileKey, accountIdx, entry) {
   const port = typeof safeEntry.port === "number" ? safeEntry.port : null;
   const proxyUrl = normalizePrivateProxy(safeEntry.proxy);
   const platform = safeEntry.platform && typeof safeEntry.platform === "object" ? safeEntry.platform : {};
-  // Free-text note + a service→account map (e.g. {github:"octocat",
-  // gmail:"me@gmail.com"}) for `list profile with <svc>` — written via
-  // chrome_set_profile_meta. Legacy array values normalize to {}.
+  // Free-text note + a service→credentials map for `list profile with <svc>` —
+  // written via chrome_set_profile_meta. Each value is {account,password,totp}.
+  // Legacy normalization: array → {}; a bare string value → {account:<string>}.
   const note = typeof safeEntry.note === "string" ? safeEntry.note : "";
-  const accounts =
+  const rawAccounts =
     safeEntry.accounts && typeof safeEntry.accounts === "object" && !Array.isArray(safeEntry.accounts)
       ? safeEntry.accounts
       : {};
+  const accounts = {};
+  for (const [svc, val] of Object.entries(rawAccounts)) {
+    if (typeof val === "string") accounts[svc] = { account: val };
+    else if (val && typeof val === "object" && !Array.isArray(val)) accounts[svc] = val;
+  }
 
   return {
     profileKey,
@@ -666,14 +675,24 @@ function registerChromeTools(registerTool) {
 
   registerTool(
     "chrome_set_profile_meta",
-    "设置 ~/cicy-ai/db/chrome.json 中指定 accountIdx 的 note（备注）/ accounts（服务→账号 map，用于 list profile with <svc>）",
+    "设置 ~/cicy-ai/db/chrome.json 中指定 accountIdx 的 note（备注）/ accounts（服务→{account,password,totp} map，用于 list profile with <svc> + 自动 2FA）",
     z.object({
       accountIdx: z.number().describe("账户索引"),
       note: z.string().optional().describe("自由文本备注；省略则不动"),
       accounts: z
-        .record(z.string())
+        .record(
+          z
+            .object({
+              account: z.string().optional(),
+              password: z.string().optional(),
+              totp: z.string().optional(),
+            })
+            .partial()
+        )
         .optional()
-        .describe("服务→账号 map，如 {github:'octocat',gmail:'me@gmail.com'}；空值删除该服务；省略则整体不动；与现有合并"),
+        .describe(
+          "服务→{account,password,totp} map，如 {github:{account:'octocat',password:'..',totp:'BASE32'}}；字段级合并，字段空值删该字段，svc 清空则删该服务；省略则整体不动"
+        ),
     }),
     async ({ accountIdx, note, accounts } = {}) => {
       const data = readPrivateChromeConfig();
@@ -683,18 +702,27 @@ function registerChromeTools(registerTool) {
       }
       const patch = { ...data[key], ...(note !== undefined ? { note: String(note) } : {}) };
       if (accounts !== undefined) {
-        // Merge into the existing service→account map; empty value deletes a service.
-        const cur =
+        // Field-level merge into the existing service→credentials map.
+        // Empty field value deletes that field; a service with no fields left
+        // is removed entirely. Legacy string value normalizes to {account}.
+        const base =
           data[key].accounts && typeof data[key].accounts === "object" && !Array.isArray(data[key].accounts)
             ? data[key].accounts
             : {};
-        const next = { ...cur };
-        for (const [k, v] of Object.entries(accounts)) {
-          const svc = String(k).trim().toLowerCase();
-          const val = String(v ?? "").trim();
+        const next = { ...base };
+        for (const [rawSvc, fieldPatch] of Object.entries(accounts)) {
+          const svc = String(rawSvc).trim().toLowerCase();
           if (!svc) continue;
-          if (val === "") delete next[svc];
-          else next[svc] = val;
+          let cur = next[svc];
+          if (typeof cur === "string") cur = { account: cur }; // 1.3.0 compat
+          cur = cur && typeof cur === "object" && !Array.isArray(cur) ? { ...cur } : {};
+          for (const [f, v] of Object.entries(fieldPatch || {})) {
+            const val = String(v ?? "").trim();
+            if (val === "") delete cur[f];
+            else cur[f] = val;
+          }
+          if (Object.keys(cur).length === 0) delete next[svc];
+          else next[svc] = cur;
         }
         patch.accounts = next;
       }