crosssync 0.1.2 → 0.1.3

package/README.md

@@ -82,7 +82,8 @@ crosssync sync --json                 # 机器可读报告
 ```
 
 如果配置的 profile（默认 `Default`）在某个浏览器中不存在，交互式终端会列出可用的
-profile 让你按序号选择（支持多选），并自动保存选择。
+profile 让你按序号选择（支持多选），并自动保存选择。列表会附带 `Local State` 中记录的
+本地名称和已登录账号（如 `Profile 11  Roe <roe@example.com>`），便于区分 profile。
 
 ### `crosssync profiles`
 

package/dist/index.js

@@ -3036,7 +3036,7 @@ var require_constants = __commonJS({
   "../shared/dist/constants.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.DEFAULT_CRON_SCHEDULE = exports2.DEFAULT_EXPORT_RETENTION = exports2.CONFIG_VERSION = exports2.DEFAULT_LOG_LEVEL = exports2.DEFAULT_PROFILE = exports2.PROFILE_NAME_PATTERN = exports2.HISTORY_FILE_NAME = exports2.BOOKMARKS_FILE_NAME = exports2.LOG_FILE_NAME = exports2.CONFIG_FILE_NAME = exports2.LOG_DIR_NAME = exports2.EXPORT_DIR_NAME = exports2.BACKUP_DIR_NAME = exports2.CROSSSYNC_DIR_NAME = exports2.CHROMIUM_EPOCH_OFFSET_MS = exports2.BROWSERS = exports2.LOG_LEVELS = exports2.SHARED_VERSION = exports2.SHARED_PACKAGE = void 0;
+    exports2.DEFAULT_CRON_SCHEDULE = exports2.DEFAULT_EXPORT_RETENTION = exports2.CONFIG_VERSION = exports2.DEFAULT_LOG_LEVEL = exports2.DEFAULT_PROFILE = exports2.PROFILE_NAME_PATTERN = exports2.LOCAL_STATE_FILE_NAME = exports2.HISTORY_FILE_NAME = exports2.BOOKMARKS_FILE_NAME = exports2.LOG_FILE_NAME = exports2.CONFIG_FILE_NAME = exports2.LOG_DIR_NAME = exports2.EXPORT_DIR_NAME = exports2.BACKUP_DIR_NAME = exports2.CROSSSYNC_DIR_NAME = exports2.CHROMIUM_EPOCH_OFFSET_MS = exports2.BROWSERS = exports2.LOG_LEVELS = exports2.SHARED_VERSION = exports2.SHARED_PACKAGE = void 0;
     exports2.SHARED_PACKAGE = "@crosssync/shared";
     exports2.SHARED_VERSION = "0.1.0";
     exports2.LOG_LEVELS = ["debug", "info", "warn", "error"];
@@ -3050,6 +3050,7 @@ var require_constants = __commonJS({
     exports2.LOG_FILE_NAME = "crosssync.log";
     exports2.BOOKMARKS_FILE_NAME = "Bookmarks";
     exports2.HISTORY_FILE_NAME = "History";
+    exports2.LOCAL_STATE_FILE_NAME = "Local State";
     exports2.PROFILE_NAME_PATTERN = /^(Default|Profile \d+)$/;
     exports2.DEFAULT_PROFILE = "Default";
     exports2.DEFAULT_LOG_LEVEL = "info";
@@ -3809,11 +3810,40 @@ var require_chromium = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.readProfileInfos = readProfileInfos;
     exports2.toHistoryEntry = toHistoryEntry;
     exports2.countBookmarkFileNodes = countBookmarkFileNodes;
     exports2.createBrowserReader = createBrowserReader3;
     var path_1 = __importDefault(require("path"));
     var shared_1 = require_dist();
+    function readProfileInfos(dataDir) {
+      const localState = (0, shared_1.readJsonFile)(path_1.default.join(dataDir, shared_1.LOCAL_STATE_FILE_NAME));
+      const cache = localState?.profile?.info_cache ?? {};
+      return (0, shared_1.listProfiles)(dataDir).map((profile) => toProfileInfo(profile, cache[profile]));
+    }
+    function toProfileInfo(profile, raw) {
+      const info = { profile };
+      const name = readString(raw, "name");
+      const userName = readString(raw, "user_name");
+      const gaiaName = readString(raw, "gaia_name");
+      if (name !== void 0) {
+        info.name = name;
+      }
+      if (userName !== void 0) {
+        info.userName = userName;
+      }
+      if (gaiaName !== void 0) {
+        info.gaiaName = gaiaName;
+      }
+      if (typeof raw?.is_using_default_name === "boolean") {
+        info.isUsingDefaultName = raw.is_using_default_name;
+      }
+      return info;
+    }
+    function readString(raw, key) {
+      const value = raw?.[key];
+      return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
+    }
     function toHistoryEntry(row) {
       return {
         id: typeof row.id === "number" ? row.id : void 0,
@@ -3839,6 +3869,8 @@ var require_chromium = __commonJS({
       const bookmarksPath = (profile) => path_1.default.join((0, shared_1.resolveProfileDir)(dataDir, profile), shared_1.BOOKMARKS_FILE_NAME);
       const historyPath = (profile) => path_1.default.join((0, shared_1.resolveProfileDir)(dataDir, profile), shared_1.HISTORY_FILE_NAME);
       const profiles = () => (0, shared_1.listProfiles)(dataDir);
+      const profileInfos = () => readProfileInfos(dataDir);
+      const profileInfo = (profile) => profileInfos().find((info) => info.profile === profile) ?? null;
       const resolveSelectedProfiles = (profile) => {
         const found = profiles();
         if (profile.trim() === "all") {
@@ -3868,6 +3900,8 @@ var require_chromium = __commonJS({
         browser,
         dataDir,
         profiles,
+        profileInfos,
+        profileInfo,
         resolveProfiles: resolveSelectedProfiles,
         bookmarksPath,
         historyPath,
@@ -4231,6 +4265,7 @@ var require_sync = __commonJS({
           const outcome = {
             browser: reader.browser,
             profile,
+            profileInfo: reader.profileInfo(profile),
             bookmarksRead: 0,
             historyRead: 0,
             writtenBack: false,
@@ -4395,7 +4430,7 @@ var require_dist2 = __commonJS({
   "../core/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.writeBackBookmarks = exports2.runSync = exports2.pruneBackups = exports2.listBackups = exports2.formatBackupId = exports2.createBackup = exports2.backupFileName = exports2.BACKUP_MANIFEST_FILE = exports2.mergeHistory = exports2.mergeBookmarkFiles = exports2.toHistoryEntry = exports2.supportedBrowsers = exports2.createConfiguredBrowserReaders = exports2.createBrowserReader = exports2.countBookmarkFileNodes = exports2.parseProcessOutput = exports2.isBrowserRunning = exports2.getRunningBrowsers = exports2.getRunningBrowserNames = exports2.getProcessName = exports2.buildProcessQuery = exports2.readLogEntries = exports2.clearLogFile = exports2.Logger = exports2.MAX_BUFFERED_LOG_ENTRIES = exports2.DEFAULT_LOG_LIMIT = exports2.DEFAULT_BACKUP_RETENTION = exports2.BROWSER_PROCESS_NAMES = exports2.VERSION = exports2.PACKAGE = void 0;
+    exports2.writeBackBookmarks = exports2.runSync = exports2.pruneBackups = exports2.listBackups = exports2.formatBackupId = exports2.createBackup = exports2.backupFileName = exports2.BACKUP_MANIFEST_FILE = exports2.mergeHistory = exports2.mergeBookmarkFiles = exports2.toHistoryEntry = exports2.supportedBrowsers = exports2.readProfileInfos = exports2.createConfiguredBrowserReaders = exports2.createBrowserReader = exports2.countBookmarkFileNodes = exports2.parseProcessOutput = exports2.isBrowserRunning = exports2.getRunningBrowsers = exports2.getRunningBrowserNames = exports2.getProcessName = exports2.buildProcessQuery = exports2.readLogEntries = exports2.clearLogFile = exports2.Logger = exports2.MAX_BUFFERED_LOG_ENTRIES = exports2.DEFAULT_LOG_LIMIT = exports2.DEFAULT_BACKUP_RETENTION = exports2.BROWSER_PROCESS_NAMES = exports2.VERSION = exports2.PACKAGE = void 0;
     var constants_1 = require_constants2();
     Object.defineProperty(exports2, "PACKAGE", { enumerable: true, get: function() {
       return constants_1.CORE_PACKAGE;
@@ -4455,6 +4490,9 @@ var require_dist2 = __commonJS({
     Object.defineProperty(exports2, "createConfiguredBrowserReaders", { enumerable: true, get: function() {
       return readers_1.createConfiguredBrowserReaders;
     } });
+    Object.defineProperty(exports2, "readProfileInfos", { enumerable: true, get: function() {
+      return readers_1.readProfileInfos;
+    } });
     Object.defineProperty(exports2, "supportedBrowsers", { enumerable: true, get: function() {
       return readers_1.supportedBrowsers;
     } });
@@ -4528,7 +4566,7 @@ var {
 } = import_index.default;
 
 // src/constants.ts
-var CLI_VERSION = "0.1.2";
+var CLI_VERSION = "0.1.3";
 var CLI_NAME = "crosssync";
 var CLI_DESCRIPTION = "Cross-browser bookmark & history sync CLI (Chrome + Edge)";
 var WINDOWS_TASK_NAME = "CrossSync";
@@ -5482,6 +5520,24 @@ function pruneExports(exportDir, keep) {
 var readline = __toESM(require("readline/promises"));
 var import_shared10 = __toESM(require_dist());
 var import_core4 = __toESM(require_dist2());
+
+// src/profile-info.ts
+function formatProfileAccount(info) {
+  if (!info) {
+    return null;
+  }
+  const displayName = info.isUsingDefaultName ? info.gaiaName ?? info.name : info.name ?? info.gaiaName;
+  const parts = [];
+  if (displayName) {
+    parts.push(displayName);
+  }
+  if (info.userName && info.userName !== displayName) {
+    parts.push(`<${info.userName}>`);
+  }
+  return parts.length > 0 ? parts.join(" ") : null;
+}
+
+// src/commands/sync.ts
 function resolveTargets(options) {
   if (options.all) {
     return { bookmarks: true, history: true };
@@ -5552,6 +5608,7 @@ async function ensureProfilesSelected(context, options) {
       browser: reader.browser,
       dataDir: reader.dataDir,
       available,
+      infos: reader.profileInfos(),
       current: context.config.profile
     });
     if (!selected || selected.length === 0) {
@@ -5576,8 +5633,10 @@ No ${request.browser} profile matched "${request.current}".
 `);
   output.write(`Available ${request.browser} profiles in ${request.dataDir}:
 `);
+  const infos = new Map((request.infos ?? []).map((info) => [info.profile, info]));
   request.available.forEach((name, index) => {
-    output.write(`  ${index + 1}) ${name}
+    const account = formatProfileAccount(infos.get(name));
+    output.write(`  ${index + 1}) ${name}${account ? `  ${account}` : ""}
 `);
   });
   const rl = readline.createInterface({ input: process.stdin, output });
@@ -5672,7 +5731,8 @@ function formatSyncReport(report) {
   ].filter((kind) => kind !== null).join(" + ");
   lines.push(`CrossSync sync (${report.strategy}, ${kinds})${report.dryRun ? " [dry run]" : ""}`);
   for (const outcome of report.browsers) {
-    const parts = [`${outcome.browser}/${outcome.profile}`];
+    const account = formatProfileAccount(outcome.profileInfo);
+    const parts = [`${outcome.browser}/${outcome.profile}${account ? ` \u2014 ${account}` : ""}`];
     if (report.targets.bookmarks) {
       parts.push(`${outcome.bookmarksRead} bookmark nodes`);
     }
@@ -5871,9 +5931,13 @@ function listProfiles(context, options) {
       context.io.out("  (no profiles found)");
       continue;
     }
+    const infos = new Map(reader.profileInfos().map((info) => [info.profile, info]));
     for (const name of available) {
       const isSelected = selected === null || selected.includes(name);
-      context.io.out(`  ${name}${isSelected ? "  [selected]" : ""}`);
+      const account = formatProfileAccount(infos.get(name));
+      context.io.out(
+        `  ${name}${account ? `  ${account}` : ""}${isSelected ? "  [selected]" : ""}`
+      );
     }
     const missing = selected?.filter((name) => !available.includes(name)) ?? [];
     if (missing.length > 0) {