cicy-desktop 2.1.213 → 2.1.215

package/package.json

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

package/src/profiles/profile-store.js

@@ -148,8 +148,34 @@ function writeChromeConfig(next) {
   } catch {}
 }
 
+// Identity is recorded in the `accounts` map (accounts.gmail / .google / .github
+// → {account,password,totp}) via the account CLI; older code only wrote a bare
+// top-level `gmail`. normalizeAccounts coerces the map; resolveGmail prefers the
+// accounts map and falls back to the legacy field — so gmail shows whichever way
+// it was recorded (this is why panels showed empty: read top-level, wrote accounts).
+function normalizeAccounts(raw) {
+  const out = {};
+  if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+    for (const [svc, val] of Object.entries(raw)) {
+      if (typeof val === "string") out[svc] = { account: val };
+      else if (val && typeof val === "object" && !Array.isArray(val)) out[svc] = val;
+    }
+  }
+  return out;
+}
+function resolveGmail(accounts, fallback) {
+  const a = accounts || {};
+  return (
+    (a.gmail && a.gmail.account) ||
+    (a.google && a.google.account) ||
+    (typeof fallback === "string" ? fallback : "") ||
+    ""
+  );
+}
+
 function chromeView(idx, entry) {
   const e = entry && typeof entry === "object" ? entry : {};
+  const accounts = normalizeAccounts(e.accounts);
   return {
     id: `chrome-${idx}`,
     backend: "chrome",
@@ -159,7 +185,8 @@ function chromeView(idx, entry) {
     logins: (Array.isArray(e.logins) ? e.logins : []).map(normalizeLogin),
     note: typeof e.note === "string" ? e.note : "",
     // chrome-specific extras (read-only passthrough)
-    gmail: typeof e.gmail === "string" ? e.gmail : "",
+    gmail: resolveGmail(accounts, e.gmail),
+    accounts,
     port: typeof e.port === "number" ? e.port : 11000 + idx,
     rpaDir: typeof e.rpaDir === "string" ? e.rpaDir : `~/chrome/profile_${idx}`,
     platform: e.platform && typeof e.platform === "object" ? e.platform : {},
@@ -208,6 +235,9 @@ function writeAccount(data) {
 function electronView(idx, data) {
   const d = data && typeof data === "object" ? data : { accountIdx: idx };
   const meta = d.metadata && typeof d.metadata === "object" ? d.metadata : {};
+  // Electron identities may live on the account file directly (d.accounts) or
+  // under metadata (meta.accounts / meta.gmail); resolve from whichever is set.
+  const accounts = normalizeAccounts(d.accounts || meta.accounts);
   return {
     id: `electron-${idx}`,
     backend: "electron",
@@ -216,6 +246,8 @@ function electronView(idx, data) {
     proxy: normalizeProxy(d.proxy),
     logins: (Array.isArray(d.logins) ? d.logins : []).map(normalizeLogin),
     note: typeof d.note === "string" ? d.note : meta.description || "",
+    gmail: resolveGmail(accounts, d.gmail || meta.gmail),
+    accounts,
     partition: `persist:sandbox-${idx}`,
     ipInfo: normalizeIpInfo(d.ipInfo),
   };

package/src/tools/chrome-tools.js

@@ -166,6 +166,22 @@ function normalizePrivateChromeEntry(profileKey, accountIdx, entry) {
   };
 }
 
+// resolveGmail derives a profile's Google identity. The `account` CLI / UI now
+// records identities in the `accounts` map (accounts.gmail / accounts.google),
+// so read from there FIRST and only fall back to the legacy top-level `gmail`
+// field (which was only ever set at `add --gmail` time). This is why gmail/login
+// info showed empty: it was recorded into accounts.* but everything read the
+// top-level gmail field.
+function resolveGmail(normalized) {
+  const a = (normalized && normalized.accounts) || {};
+  return (
+    (a.gmail && a.gmail.account) ||
+    (a.google && a.google.account) ||
+    (normalized && normalized.gmail) ||
+    ""
+  );
+}
+
 function normalizeEffectiveChromeProfile(accountIdx, effectiveChromeProfile) {
   const parsed = injectedChromeProfileSchema.parse(effectiveChromeProfile || {});
   const gmail = typeof parsed.gmail === "string" ? parsed.gmail : "";
@@ -507,7 +523,7 @@ function registerChromeTools(registerTool) {
         views.push({
           profileKey,
           accountIdx,
-          gmail: normalized.gmail,
+          gmail: resolveGmail(normalized),
           note: normalized.note,
           orgPath: normalized.orgPath,
           rpaDir: normalized.rpaDir,
@@ -515,6 +531,9 @@ function registerChromeTools(registerTool) {
           proxy: normalized.proxyUrl,
           proxyRaw: normalized.proxy,
           platform: normalized.platform,
+          // The service→credentials map (accounts.gmail / .github / …) — the panel
+          // reads identities from here, so it must travel with the list view.
+          accounts: normalized.accounts,
           // parity with electron_list_profiles so the panel renders the same row
           ipInfo: profileStore.normalizeIpInfo(entry.ipInfo),
           logins: (Array.isArray(entry.logins) ? entry.logins : []).map(profileStore.normalizeLogin),
@@ -537,7 +556,7 @@ function registerChromeTools(registerTool) {
     async ({ includeHidden } = {}) => {
       const entries = listPrivateChromeEntries({ includeHidden: !!includeHidden });
       const gmails = entries
-        .map(({ profileKey, accountIdx, entry }) => normalizePrivateChromeEntry(profileKey, accountIdx, entry).gmail)
+        .map(({ profileKey, accountIdx, entry }) => resolveGmail(normalizePrivateChromeEntry(profileKey, accountIdx, entry)))
         .filter(Boolean);
       return toToolResult({ gmails });
     },
@@ -555,12 +574,13 @@ function registerChromeTools(registerTool) {
       const accounts = entries.map(({ profileKey, accountIdx, entry }) => {
         const normalized = normalizePrivateChromeEntry(profileKey, accountIdx, entry);
         const gh = normalized.platform?.github || {};
+        const ghAcct = (normalized.accounts && normalized.accounts.github) || {};
         return {
           profileKey,
           accountIdx,
-          gmail: normalized.gmail,
-          email: gh.email || "",
-          username: gh.username || "",
+          gmail: resolveGmail(normalized),
+          email: gh.email || ghAcct.email || "",
+          username: gh.username || ghAcct.account || "",
         };
       });
       return toToolResult({ githubAccounts: accounts });