cicy-desktop 2.1.78 → 2.1.79

package/src/tools/account-tools.js

@@ -3,6 +3,10 @@ const path = require("path");
 const os = require("os");
 const { z } = require("zod");
 
+const profileStore = require("../profiles/profile-store");
+const { summarizeCookieLogins } = require("../utils/cookie-logins");
+const { probeIpViaSession } = require("../utils/ip-probe");
+
 const ACCOUNT_DIR = path.join(os.homedir(), "data", "electron");
 
 function ensureAccountDir() {
@@ -175,40 +179,25 @@ module.exports = (registerTool) => {
     { tag: "Account" }
   );
 
-  // 设置账户代理
+  // 设置账户代理（持久化到 account-N.json + 立即应用到 session）
   registerTool(
     "set_account_proxy",
-    "为指定账户设置代理，该账户下所有窗口都会使用此代理",
+    "为指定账户设置代理：持久化写入 account-N.json，并立即应用到该 sandbox session（之后新开窗口也会自动套用）。留空则清除。",
     z.object({
       accountIdx: z.number().describe("账户索引"),
-      proxy: z.string().optional().describe("代理地址，如 http://127.0.0.1:8888，留空则清除代理"),
+      proxy: z.string().optional().describe("代理地址，如 socks5://127.0.0.1:20001，留空则清除代理"),
     }),
     async ({ accountIdx, proxy }) => {
       try {
+        // 1) persist the desired proxy (canonical {url, enabled}) to the store
+        const view = profileStore.setProxy("electron", accountIdx, proxy || "");
+        // 2) apply to the live session now
         const { session } = require("electron");
         const ses = session.fromPartition(`persist:sandbox-${accountIdx}`);
-
-        if (proxy) {
-          await ses.setProxy({ proxyRules: proxy });
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify({ success: true, accountIdx, proxy }, null, 2),
-              },
-            ],
-          };
-        } else {
-          await ses.setProxy({ proxyRules: "" });
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify({ success: true, accountIdx, proxy: "cleared" }, null, 2),
-              },
-            ],
-          };
-        }
+        await ses.setProxy({ proxyRules: profileStore.proxyRules(view.proxy) });
+        return {
+          content: [{ type: "text", text: JSON.stringify({ success: true, accountIdx, proxy: view.proxy }, null, 2) }],
+        };
       } catch (error) {
         return {
           content: [{ type: "text", text: `Error: ${error.message}` }],
@@ -218,4 +207,181 @@ module.exports = (registerTool) => {
     },
     { tag: "Account" }
   );
+
+  // ── Unified profile surface (mirrors agent-chrome verbs) ──────────────────
+  const toResult = (obj, isError = false) => ({
+    content: [{ type: "text", text: JSON.stringify(obj, null, 2) }],
+    ...(isError ? { isError: true } : {}),
+  });
+
+  registerTool(
+    "electron_list_profiles",
+    "列出所有 Electron profile（从 account-N.json 配置读取，含 name/proxy/logins）",
+    z.object({}),
+    async () => {
+      try {
+        return toResult(profileStore.listProfiles("electron"));
+      } catch (e) {
+        return toResult({ error: e.message }, true);
+      }
+    },
+    { tag: "Account" }
+  );
+
+  registerTool(
+    "electron_add_profile",
+    "新增一个 Electron profile：在 ~/data/electron/ 写入下一个 account-N.json（N=现有最大+1，至少为 1），返回统一视图",
+    z.object({ name: z.string().optional().describe("可选：profile 名称（metadata.name）") }),
+    async ({ name } = {}) => {
+      try {
+        ensureAccountDir();
+        const re = /^account-(\d+)\.json$/;
+        const nums = fs.readdirSync(ACCOUNT_DIR).map((f) => (re.exec(f) ? Number(re.exec(f)[1]) : null)).filter((n) => typeof n === "number");
+        const next = nums.length ? Math.max(...nums) + 1 : 1;
+        const file = path.join(ACCOUNT_DIR, `account-${next}.json`);
+        if (fs.existsSync(file)) return toResult({ error: `account-${next}.json already exists` }, true);
+        const now = new Date().toISOString();
+        const data = {
+          accountIdx: next, createdAt: now, updatedAt: now, windows: [],
+          metadata: { description: `Account ${next}`, ...(name ? { name } : {}), tags: [] },
+          proxy: { url: "", enabled: false }, logins: [],
+        };
+        fs.writeFileSync(file, JSON.stringify(data, null, 2));
+        return toResult({ success: true, accountIdx: next, profile: profileStore.getProfile("electron", next) });
+      } catch (e) {
+        return toResult({ error: e.message }, true);
+      }
+    },
+    { tag: "Account" }
+  );
+
+  registerTool(
+    "electron_get_profile",
+    "获取单个 Electron profile 的统一视图（name/proxy/logins/partition）",
+    z.object({ accountIdx: z.number().describe("账户索引") }),
+    async ({ accountIdx }) => {
+      try {
+        const p = profileStore.getProfile("electron", accountIdx);
+        return p ? toResult(p) : toResult({ error: `electron-${accountIdx} not found` }, true);
+      } catch (e) {
+        return toResult({ error: e.message }, true);
+      }
+    },
+    { tag: "Account" }
+  );
+
+  registerTool(
+    "electron_probe_ip",
+    "探测某 Electron profile 当前出口 IP + 地区(经该 sandbox session 的代理),写入 config 并盖探测时间;可重复探测",
+    z.object({ accountIdx: z.number().describe("账户索引") }),
+    async ({ accountIdx }) => {
+      try {
+        const { session } = require("electron");
+        const ses = session.fromPartition(`persist:sandbox-${accountIdx}`);
+        // Ensure the profile's configured proxy is applied to the session before
+        // probing — otherwise (e.g. no window opened yet) it goes DIRECT and we'd
+        // report the machine's own IP instead of the profile's egress.
+        const prof = profileStore.getProfile("electron", accountIdx);
+        const rules = profileStore.proxyRules(prof && prof.proxy);
+        await ses.setProxy({ proxyRules: rules || "direct://" });
+        const info = await probeIpViaSession(ses);
+        const view = profileStore.setIpInfo("electron", accountIdx, info);
+        return toResult({ accountIdx, backend: "electron", proxy: rules || null, ipInfo: view.ipInfo });
+      } catch (e) {
+        return toResult({ error: e.message }, true);
+      }
+    },
+    { tag: "Account" }
+  );
+
+  registerTool(
+    "electron_detect_logins",
+    "探测指定 Electron profile（persist:sandbox-N）当前 session 登录了哪些站点：读取该 partition 全部 cookie 按域名归并，标记带会话 cookie 的域名（cookie 在≠一定登录，仅强信号）",
+    z.object({ accountIdx: z.number().describe("账户索引") }),
+    async ({ accountIdx }) => {
+      try {
+        const { session } = require("electron");
+        const ses = session.fromPartition(`persist:sandbox-${accountIdx}`);
+        const cookies = await ses.cookies.get({});
+        return toResult({ accountIdx, backend: "electron", ...summarizeCookieLogins(cookies) });
+      } catch (e) {
+        return toResult({ error: e.message }, true);
+      }
+    },
+    { tag: "Account" }
+  );
+
+  registerTool(
+    "electron_profile_login_add",
+    "记录某 Electron profile 登录了哪个平台账号（每个平台一条，重复平台覆盖）",
+    z.object({
+      accountIdx: z.number().describe("账户索引"),
+      platform: z.string().describe("平台，如 github / google / x"),
+      account: z.string().describe("账号标识，如 alice@x.com"),
+    }),
+    async ({ accountIdx, platform, account }) => {
+      try {
+        return toResult(profileStore.addLogin("electron", accountIdx, platform, account));
+      } catch (e) {
+        return toResult({ error: e.message }, true);
+      }
+    },
+    { tag: "Account" }
+  );
+
+  registerTool(
+    "electron_profile_login_set",
+    "新增/更新某 Electron profile 的一条登录记录（富字段：地址/名称/用户名/邮箱/手机/2FA/备用邮箱/备注；按名称 name 归并，只覆盖传入的非空字段）",
+    z.object({
+      accountIdx: z.number().describe("账户索引"),
+      name: z.string().describe("名称＝平台/站点名，如 抖音 / Google（归并键）"),
+      url: z.string().optional().describe("地址，如 https://www.douyin.com"),
+      username: z.string().optional().describe("用户名"),
+      email: z.string().optional().describe("邮箱"),
+      mobile: z.string().optional().describe("手机号"),
+      twofa: z.string().optional().describe("2FA（TOTP 秘钥或说明）"),
+      secondEmail: z.string().optional().describe("备用邮箱"),
+      note: z.string().optional().describe("备注"),
+      loginAt: z.string().optional().describe("登录时间 ISO（不传则首次记录时自动 now）"),
+    }),
+    async ({ accountIdx, ...login }) => {
+      try {
+        return toResult(profileStore.setLogin("electron", accountIdx, login));
+      } catch (e) {
+        return toResult({ error: e.message }, true);
+      }
+    },
+    { tag: "Account" }
+  );
+
+  registerTool(
+    "electron_profile_login_rm",
+    "移除某 Electron profile 的某平台登录记录",
+    z.object({
+      accountIdx: z.number().describe("账户索引"),
+      platform: z.string().describe("平台"),
+    }),
+    async ({ accountIdx, platform }) => {
+      try {
+        return toResult(profileStore.removeLogin("electron", accountIdx, platform));
+      } catch (e) {
+        return toResult({ error: e.message }, true);
+      }
+    },
+    { tag: "Account" }
+  );
+
+  registerTool(
+    "electron_profile_logins",
+    "列出某 Electron profile 已记录的平台登录",
+    z.object({ accountIdx: z.number().describe("账户索引") }),
+    async ({ accountIdx }) => {
+      try {
+        return toResult(profileStore.listLogins("electron", accountIdx));
+      } catch (e) {
+        return toResult({ error: e.message }, true);
+      }
+    },
+    { tag: "Account" }
+  );
 };

package/src/tools/chrome-tools.js

@@ -17,6 +17,9 @@ const { isPortOpen } = require("../utils/process-utils");
 const { getVersion, getTargets, createTarget, activateTarget, callCdp } = require("../chrome/chrome-cdp-client");
 const { resolveChromeDebuggerPort } = require("../chrome/debugger-port-resolver");
 const { config } = require("../config");
+const profileStore = require("../profiles/profile-store");
+const { summarizeCookieLogins } = require("../utils/cookie-logins");
+const { probeIpViaSession } = require("../utils/ip-probe");
 
 const PRIVATE_CHROME_JSON = path.join(os.homedir(), "cicy-ai", "db", "chrome.json");
 const PRIVATE_CHROME_TMP_DIR = path.join(os.homedir(), "chrome", "_tmp");
@@ -39,14 +42,24 @@ function expandHome(input) {
   return input;
 }
 
+// tildify — collapse the home-dir prefix back to "~" for DISPLAY only.
+// The machine has its own user (e.g. /Users/ton); surfacing that absolute path
+// is non-portable for other people/agents, so anything shown/returned uses "~".
+// NEVER feed a tildified path to Chrome's --user-data-dir or fs (use expandHome).
+function tildify(input) {
+  if (typeof input !== "string" || input.length === 0) return input;
+  const home = os.homedir();
+  if (input === home) return "~";
+  if (input.startsWith(home + path.sep)) return "~/" + input.slice(home.length + 1);
+  return input;
+}
+
+// Delegate to the shared normalizer (profile-store) so chrome + electron agree
+// on proxy encoding. Accepts string | {enable,url} | {url,enabled}; returns the
+// URL string when enabled, else null (the contract chrome-launcher expects).
 function normalizePrivateProxy(proxyValue) {
-  if (typeof proxyValue === "string") {
-    return proxyValue || null;
-  }
-  if (proxyValue && typeof proxyValue === "object" && proxyValue.enable && proxyValue.url) {
-    return proxyValue.url;
-  }
-  return null;
+  const p = profileStore.normalizeProxy(proxyValue);
+  return p.enabled && p.url ? p.url : null;
 }
 
 function readPrivateChromeConfig() {
@@ -71,7 +84,7 @@ function listPrivateChromeEntries({ includeHidden = false } = {}) {
   const entries = Object.entries(data)
     .filter(([k]) => (includeHidden ? true : !k.startsWith("__")))
     .map(([profileKey, entry]) => {
-      const m = /^account_(\d+)$/.exec(profileKey);
+      const m = /^profile_(\d+)$/.exec(profileKey);
       const accountIdx = m ? Number(m[1]) : null;
       return { profileKey, accountIdx, entry };
     })
@@ -87,7 +100,7 @@ function listPrivateChromeEntries({ includeHidden = false } = {}) {
 
 function getPrivateChromeEntryByAccountIdx(accountIdx) {
   const data = readPrivateChromeConfig();
-  const profileKey = `account_${accountIdx}`;
+  const profileKey = `profile_${accountIdx}`;
   const entry = data[profileKey] || null;
   if (!entry) return null;
   return { profileKey, accountIdx, entry };
@@ -144,7 +157,7 @@ function normalizeEffectiveChromeProfile(accountIdx, effectiveChromeProfile) {
   const platform = parsed.platform && typeof parsed.platform === "object" ? parsed.platform : {};
 
   return {
-    profileKey: `account_${accountIdx}`,
+    profileKey: `profile_${accountIdx}`,
     accountIdx,
     gmail,
     orgPath,
@@ -279,7 +292,7 @@ async function launchOrActivateProfile({
   effectiveChromeProfile,
 }) {
   const registry = getChromeRuntimeRegistry();
-  const profileKey = `account_${accountIdx}`;
+  const profileKey = `profile_${accountIdx}`;
 
   let normalized;
   let profileSource;
@@ -290,7 +303,7 @@ async function launchOrActivateProfile({
     const cfg = getPrivateChromeEntryByAccountIdx(accountIdx);
     if (!cfg) {
       throw new Error(
-        `Missing chrome profile for account_${accountIdx}. Use master dispatch or pass effectiveChromeProfile.`
+        `Missing chrome profile for profile_${accountIdx}. Use master dispatch or pass effectiveChromeProfile.`
       );
     }
     normalized = normalizePrivateChromeEntry(cfg.profileKey, cfg.accountIdx, cfg.entry);
@@ -308,6 +321,8 @@ async function launchOrActivateProfile({
   const effectiveUserDataDirRoot =
     normalized.expanded.rpaDir ||
     getDefaultUserDataDirRoot(accountIdx, config.chromeUserDataRoot || DEFAULT_USER_DATA_BASE_ROOT);
+  // ~-collapsed form for anything returned/stored for display (portable across users)
+  const displayUserDataDir = tildify(effectiveUserDataDirRoot);
 
   // Script parity: if /json/version reachable => activate first page target and return reused
   const liveStatus = await probeChromeDebugger(effectivePort);
@@ -323,7 +338,7 @@ async function launchOrActivateProfile({
       status: "running",
       debuggerPort: effectivePort,
       proxy: effectiveProxy || null,
-      userDataDirRoot: effectiveUserDataDirRoot,
+      userDataDirRoot: displayUserDataDir,
       profileDirectory: getProfileDirectory(accountIdx),
       url: url || null,
       webSocketDebuggerUrl: liveStatus.webSocketDebuggerUrl || null,
@@ -339,7 +354,7 @@ async function launchOrActivateProfile({
       gmail: normalized.gmail,
       port: effectivePort,
       proxy: effectiveProxy || null,
-      userDataDirRoot: effectiveUserDataDirRoot,
+      userDataDirRoot: displayUserDataDir,
       runtime: nextRuntime,
       liveStatus,
       targetsPreview: buildTargetsPreview(targets),
@@ -363,7 +378,7 @@ async function launchOrActivateProfile({
     debuggerPort: effectivePort,
     proxy: effectiveProxy || null,
     chromeBinary: config.chromeBinary || null,
-    userDataDirRoot: effectiveUserDataDirRoot,
+    userDataDirRoot: displayUserDataDir,
     profileDirectory: getProfileDirectory(accountIdx),
     url: url || null,
     error: null,
@@ -385,7 +400,7 @@ async function launchOrActivateProfile({
     debuggerPort: launched.debuggerPort,
     proxy: launched.proxy,
     chromeBinary: launched.chromeBinary,
-    userDataDirRoot: launched.userDataDirRoot,
+    userDataDirRoot: tildify(launched.userDataDirRoot),
     profileDirectory: launched.profileDirectory,
     url: launched.url,
     webSocketDebuggerUrl: launched.webSocketDebuggerUrl,
@@ -406,7 +421,7 @@ async function launchOrActivateProfile({
     gmail: normalized.gmail,
     port: effectivePort,
     proxy: effectiveProxy || null,
-    userDataDirRoot: effectiveUserDataDirRoot,
+    userDataDirRoot: displayUserDataDir,
     runtime: nextRuntime,
     activatedTargetId,
     targetsPreview: buildTargetsPreview(targets),
@@ -440,12 +455,16 @@ function registerChromeTools(registerTool) {
           profileKey,
           accountIdx,
           gmail: normalized.gmail,
+          note: normalized.note,
           orgPath: normalized.orgPath,
           rpaDir: normalized.rpaDir,
           port,
           proxy: normalized.proxyUrl,
           proxyRaw: normalized.proxy,
           platform: normalized.platform,
+          // 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),
           runtime,
           liveStatus,
         });
@@ -528,14 +547,14 @@ function registerChromeTools(registerTool) {
     "chrome_get_profile",
     "获取指定 accountIdx 的 profile：privateConfig + runtime + liveStatus（脚本心智）",
     z.object({
-      accountIdx: z.number().describe("账户索引，映射到 ~/cicy-ai/db/chrome.json 的 account_<idx>"),
+      accountIdx: z.number().describe("账户索引，映射到 ~/cicy-ai/db/chrome.json 的 profile_<idx>"),
     }),
     async ({ accountIdx }) => {
       const registry = getChromeRuntimeRegistry();
       const cfg = getPrivateChromeEntryByAccountIdx(accountIdx);
       if (!cfg) {
         return toToolResult(
-          { error: `Missing chrome.json entry: account_${accountIdx}` },
+          { error: `Missing chrome.json entry: profile_${accountIdx}` },
           { isError: true }
         );
       }
@@ -587,7 +606,7 @@ function registerChromeTools(registerTool) {
 
   registerTool(
     "chrome_add_profile",
-    "新增账号（等价于 chrome-rpa.sh add）：从 ~/chrome/__tmp 创建 ~/chrome/account_N 并写回 ~/cicy-ai/db/chrome.json",
+    "新增账号（等价于 chrome-rpa.sh add）：从 ~/chrome/__tmp 创建 ~/chrome/profile_N 并写回 ~/cicy-ai/db/chrome.json",
     z.object({
       gmail: z.string().optional().describe("可选：新账号 gmail"),
       orgPath: z.string().optional().describe("可选：orgPath（默认 Profile 9）"),
@@ -596,13 +615,13 @@ function registerChromeTools(registerTool) {
     async ({ gmail, orgPath, launchAfterCreate } = {}) => {
       const data = readPrivateChromeConfig();
       const nums = Object.keys(data)
-        .map((k) => (/^account_(\d+)$/.exec(k) ? Number(/^account_(\d+)$/.exec(k)[1]) : null))
+        .map((k) => (/^profile_(\d+)$/.exec(k) ? Number(/^profile_(\d+)$/.exec(k)[1]) : null))
         .filter((n) => typeof n === "number");
       const nextNum = nums.length ? Math.max(...nums) + 1 : 1;
 
-      const profileKey = `account_${nextNum}`;
+      const profileKey = `profile_${nextNum}`;
       const port = 11000 + nextNum;
-      const rpaDirTilde = `~/chrome/${profileKey}`;
+      const rpaDirTilde = `~/chrome/profile_${nextNum}`;
       const rpaDir = expandHome(rpaDirTilde);
 
       if (fs.existsSync(rpaDir)) {
@@ -652,23 +671,92 @@ function registerChromeTools(registerTool) {
 
   registerTool(
     "chrome_set_profile_proxy",
-    "设置 ~/cicy-ai/db/chrome.json 中指定 accountIdx 的 proxy（脚本对齐；下次启动生效）",
+    "设置 ~/cicy-ai/db/chrome.json 中指定 accountIdx 的 proxy（持久化为 {url,enabled}；下次启动生效）",
     z.object({
       accountIdx: z.number().describe("账户索引"),
       proxy: z.string().optional().describe("代理 URL；留空则清空"),
     }),
     async ({ accountIdx, proxy } = {}) => {
-      const data = readPrivateChromeConfig();
-      const key = `account_${accountIdx}`;
-      if (!data[key]) {
-        return toToolResult({ error: `Missing chrome.json entry: ${key}` }, { isError: true });
+      try {
+        const view = profileStore.setProxy("chrome", accountIdx, proxy || "");
+        return toToolResult({ success: true, profileKey: `profile_${accountIdx}`, profile: view });
+      } catch (e) {
+        return toToolResult({ error: e.message }, { isError: true });
+      }
+    },
+    { tag: "Chrome" }
+  );
+
+  registerTool(
+    "chrome_profile_login_add",
+    "记录某 Chrome profile 登录了哪个平台账号（每个平台一条，重复平台覆盖）",
+    z.object({
+      accountIdx: z.number().describe("账户索引"),
+      platform: z.string().describe("平台，如 github / google / x"),
+      account: z.string().describe("账号标识，如 alice@x.com"),
+    }),
+    async ({ accountIdx, platform, account } = {}) => {
+      try {
+        return toToolResult(profileStore.addLogin("chrome", accountIdx, platform, account));
+      } catch (e) {
+        return toToolResult({ error: e.message }, { isError: true });
+      }
+    },
+    { tag: "Chrome" }
+  );
+
+  registerTool(
+    "chrome_profile_login_set",
+    "新增/更新某 Chrome profile 的一条登录记录（富字段：地址/名称/用户名/邮箱/手机/2FA/备用邮箱/备注；按名称 name 归并，只覆盖传入的非空字段）",
+    z.object({
+      accountIdx: z.number().describe("账户索引"),
+      name: z.string().describe("名称＝平台/站点名，如 抖音 / Google（归并键）"),
+      url: z.string().optional().describe("地址，如 https://www.douyin.com"),
+      username: z.string().optional().describe("用户名"),
+      email: z.string().optional().describe("邮箱"),
+      mobile: z.string().optional().describe("手机号"),
+      twofa: z.string().optional().describe("2FA（TOTP 秘钥或说明）"),
+      secondEmail: z.string().optional().describe("备用邮箱"),
+      note: z.string().optional().describe("备注"),
+      loginAt: z.string().optional().describe("登录时间 ISO（不传则首次记录时自动 now）"),
+    }),
+    async ({ accountIdx, ...login } = {}) => {
+      try {
+        return toToolResult(profileStore.setLogin("chrome", accountIdx, login));
+      } catch (e) {
+        return toToolResult({ error: e.message }, { isError: true });
+      }
+    },
+    { tag: "Chrome" }
+  );
+
+  registerTool(
+    "chrome_profile_login_rm",
+    "移除某 Chrome profile 的某平台登录记录",
+    z.object({
+      accountIdx: z.number().describe("账户索引"),
+      platform: z.string().describe("平台"),
+    }),
+    async ({ accountIdx, platform } = {}) => {
+      try {
+        return toToolResult(profileStore.removeLogin("chrome", accountIdx, platform));
+      } catch (e) {
+        return toToolResult({ error: e.message }, { isError: true });
+      }
+    },
+    { tag: "Chrome" }
+  );
+
+  registerTool(
+    "chrome_profile_logins",
+    "列出某 Chrome profile 已记录的平台登录",
+    z.object({ accountIdx: z.number().describe("账户索引") }),
+    async ({ accountIdx } = {}) => {
+      try {
+        return toToolResult(profileStore.listLogins("chrome", accountIdx));
+      } catch (e) {
+        return toToolResult({ error: e.message }, { isError: true });
       }
-      data[key] = {
-        ...data[key],
-        proxy: typeof proxy === "string" ? proxy : "",
-      };
-      writePrivateChromeConfig(data);
-      return toToolResult({ success: true, profileKey: key, privateConfig: data[key] });
     },
     { tag: "Chrome" }
   );
@@ -696,7 +784,7 @@ function registerChromeTools(registerTool) {
     }),
     async ({ accountIdx, note, accounts } = {}) => {
       const data = readPrivateChromeConfig();
-      const key = `account_${accountIdx}`;
+      const key = `profile_${accountIdx}`;
       if (!data[key]) {
         return toToolResult({ error: `Missing chrome.json entry: ${key}` }, { isError: true });
       }
@@ -775,7 +863,7 @@ function registerChromeTools(registerTool) {
       const cfg = getPrivateChromeEntryByAccountIdx(accountIdx);
       const { debuggerPort: port } = resolveChromeDebuggerPort(accountIdx, {
         registry,
-        chromeConfig: cfg ? { [`account_${accountIdx}`]: cfg.entry } : null,
+        chromeConfig: cfg ? { [`profile_${accountIdx}`]: cfg.entry } : null,
       });
 
       if (!port) {
@@ -813,7 +901,7 @@ function registerChromeTools(registerTool) {
       const cfg = getPrivateChromeEntryByAccountIdx(accountIdx);
       const { debuggerPort: port } = resolveChromeDebuggerPort(accountIdx, {
         registry,
-        chromeConfig: cfg ? { [`account_${accountIdx}`]: cfg.entry } : null,
+        chromeConfig: cfg ? { [`profile_${accountIdx}`]: cfg.entry } : null,
       });
 
       if (!port) {
@@ -841,6 +929,54 @@ function registerChromeTools(registerTool) {
     },
     { tag: "Chrome" }
   );
+
+  registerTool(
+    "chrome_probe_ip",
+    "探测某 Chrome profile 当前出口 IP + 地区(经其配置代理,用临时 Electron session,无需启动 Chrome),写入 config 并盖探测时间;可重复探测",
+    z.object({ accountIdx: z.number().describe("账户索引") }),
+    async ({ accountIdx }) => {
+      try {
+        const { session } = require("electron");
+        const view = profileStore.getProfile("chrome", accountIdx);
+        const rules = profileStore.proxyRules(view && view.proxy);
+        const ses = session.fromPartition(`chrome-ipprobe-${accountIdx}`, { cache: false });
+        await ses.setProxy({ proxyRules: rules || "direct://" });
+        const info = await probeIpViaSession(ses);
+        const saved = profileStore.setIpInfo("chrome", accountIdx, info);
+        return toToolResult({ accountIdx, backend: "chrome", proxy: rules || null, ipInfo: saved.ipInfo });
+      } catch (e) {
+        return toToolResult({ error: e.message }, { isError: true });
+      }
+    },
+    { tag: "Chrome" }
+  );
+
+  registerTool(
+    "chrome_detect_logins",
+    "探测指定 Chrome profile 当前 session 登录了哪些站点：读取全部 cookie 按域名归并，标记带会话 cookie 的域名（cookie 在≠一定登录，仅强信号；profile 需在运行）",
+    z.object({ accountIdx: z.number().describe("账户索引") }),
+    async ({ accountIdx }) => {
+      const registry = getChromeRuntimeRegistry();
+      const cfg = getPrivateChromeEntryByAccountIdx(accountIdx);
+      const { debuggerPort: port } = resolveChromeDebuggerPort(accountIdx, {
+        registry,
+        chromeConfig: cfg ? { [`profile_${accountIdx}`]: cfg.entry } : null,
+      });
+      if (!port) {
+        return toToolResult(
+          { error: `Missing debuggerPort for accountIdx=${accountIdx}（profile 未启动？先 launch）` },
+          { isError: true }
+        );
+      }
+      try {
+        const { cookies } = await callCdp({ debuggerPort: port, method: "Storage.getCookies", params: {} });
+        return toToolResult({ accountIdx, backend: "chrome", ...summarizeCookieLogins(cookies) });
+      } catch (error) {
+        return toToolResult({ error: error.message }, { isError: true });
+      }
+    },
+    { tag: "Chrome" }
+  );
 }
 
 module.exports = registerChromeTools;

package/src/tools/device-tools.js

@@ -0,0 +1,25 @@
+const { z } = require("zod");
+
+// get_device_info — return this machine's identity + detected network/locale
+// info, read from global.json (deviceInfo block + deviceId). Instant, no
+// network: the egress-IP/region/system-language detection runs at startup
+// (src/main.js → cloud-client.detectAndPersistDeviceInfo) and persists here.
+// The cicy-code app SPA calls this over electronRPC and forwards it on the
+// chat-WS register so the cicy-code backend (and agent-webpage `clients`) can
+// see each desktop client's ip / region / system language / deviceId.
+module.exports = (registerTool) => {
+  registerTool(
+    "get_device_info",
+    "返回本机 deviceId + 出口公网 IP + IP 所在地区 + 系统语言（读 global.json 的 deviceInfo，秒回，不发网络请求）",
+    z.object({}),
+    async () => {
+      try {
+        const info = require("../cloud/cloud-client").getDeviceInfo();
+        return { content: [{ type: "text", text: JSON.stringify(info, null, 2) }] };
+      } catch (error) {
+        return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };
+      }
+    },
+    { tag: "Device" }
+  );
+};

package/src/tools/index.js

@@ -13,9 +13,11 @@ module.exports = [
   require("./system-tools"),
   require("./automation-tools"),
   require("./account-tools"),
+  require("./device-tools"),
   require("./download-tools"),
   require("./ipc-bridge"),
   require("./hook-gemini"),
   require("./chrome-tools"),
+  require("./tab-browser-tools"),
   require("./list-tools"),
 ];