engine7 7.1.18 → 7.1.20

package/dist/cli.mjs

@@ -115,11 +115,19 @@ function collectAllFiles(dir) {
   }
   return files;
 }
-function readMainSessionId(platformMapPath) {
+function readMainEngineUuid(agentsDir) {
   try {
-    if (!fs.existsSync(platformMapPath)) return null;
-    const map = JSON.parse(fs.readFileSync(platformMapPath, "utf-8"));
-    return map["scope:main"] || null;
+    const platformMapPath = path.join(agentsDir, "main", "sessions", "platform-map.json");
+    const indexMapPath = path.join(agentsDir, "main", "sessions", "session-index.json");
+    if (!fs.existsSync(platformMapPath) || !fs.existsSync(indexMapPath)) return null;
+    const platformMap = JSON.parse(fs.readFileSync(platformMapPath, "utf-8"));
+    const mainPlatformId = platformMap["scope:main"] || platformMap["main"];
+    if (!mainPlatformId) return null;
+    const indexMap = JSON.parse(fs.readFileSync(indexMapPath, "utf-8"));
+    const entry = indexMap[mainPlatformId];
+    if (!entry || !entry.file) return null;
+    const basename3 = path.basename(entry.file).replace(/\.jsonl$/, "");
+    return basename3;
   } catch {
     return null;
   }
@@ -164,9 +172,9 @@ function collectRecentSessions(agentsDir, _days = 7) {
     }
   }
   scanSessionsDir(agentsDir);
-  const mainSessionId = readMainSessionId(path.join(agentsDir, "main", "sessions", "platform-map.json"));
+  const mainEngineUuid = readMainEngineUuid(agentsDir);
   for (const [sessionKey, group] of sessionGroups) {
-    if (!mainSessionId || !sessionKey.includes(mainSessionId)) continue;
+    if (!mainEngineUuid || !sessionKey.startsWith(mainEngineUuid)) continue;
     if (group.jsonl) files.push(group.jsonl);
     group.archived.sort((a, b) => b.mtime - a.mtime);
     if (group.archived.length > 0) files.push(group.archived[0].file);
@@ -233,8 +241,13 @@ async function doExport(opts) {
     const relPath = path.relative(stateDir, srcFile);
     const destFile = path.join(stagingDir, relPath);
     fs.mkdirSync(path.dirname(destFile), { recursive: true });
-    const content = fs.readFileSync(srcFile, "utf-8");
-    fs.writeFileSync(destFile, sanitizeContent(content, dirs));
+    let content = fs.readFileSync(srcFile, "utf-8");
+    content = sanitizeContent(content, dirs);
+    const baseName = path.basename(srcFile);
+    if (baseName === "session-index.json" || baseName === "platform-map.json") {
+      content = content.split("\\\\").join("/");
+    }
+    fs.writeFileSync(destFile, content);
     fileCount++;
     totalSize += fs.statSync(srcFile).size;
   }
@@ -321,19 +334,25 @@ async function doImport(opts) {
   console.log(`   \u6587\u4EF6\u6570: ${manifest.fileCount}`);
   const wsStaging = path.join(stagingDir, "workspace");
   let restoredCount = 0;
+  let skipCount = 0;
   if (fs.existsSync(wsStaging)) {
     const allFiles = collectAllFiles(wsStaging);
     for (const srcFile of allFiles) {
       const relPath = path.relative(wsStaging, srcFile);
       const destFile = path.join(workspace, relPath);
       fs.mkdirSync(path.dirname(destFile), { recursive: true });
-      if (isTextFile(srcFile)) {
-        const content = fs.readFileSync(srcFile, "utf-8");
-        fs.writeFileSync(destFile, restoreContent(content, dirs));
-      } else {
-        fs.copyFileSync(srcFile, destFile);
+      try {
+        if (isTextFile(srcFile)) {
+          const content = fs.readFileSync(srcFile, "utf-8");
+          fs.writeFileSync(destFile, restoreContent(content, dirs));
+        } else {
+          fs.copyFileSync(srcFile, destFile);
+        }
+        restoredCount++;
+      } catch (e) {
+        skipCount++;
+        console.log(`   \u26A0\uFE0F \u8DF3\u8FC7: ${path.relative(wsStaging, srcFile)} (${e.code || e.message})`);
       }
-      restoredCount++;
     }
   }
   const agentsStaging = path.join(stagingDir, "agents");
@@ -364,7 +383,7 @@ async function doImport(opts) {
       restoredCount++;
     }
   }
-  console.log(`\u2705 \u6062\u590D\u5B8C\u6210: ${restoredCount} \u6587\u4EF6 \u2192 ${stateDir}`);
+  console.log(`\u2705 \u6062\u590D\u5B8C\u6210: ${restoredCount} \u6587\u4EF6 \u2192 ${stateDir}${skipCount ? ` (\u8DF3\u8FC7 ${skipCount})` : ""}`);
   const platformConfigName = process.platform === "darwin" ? "xiaoke-mac.json" : "xiaoke-win.json";
   const restoredConfigPath = path.join(stateDir, "configs", platformConfigName);
   const configToUse = fs.existsSync(restoredConfigPath) ? restoredConfigPath : path.join(stateDir, "configs", "xiaoke.json");
@@ -530,7 +549,8 @@ var init_cli_travel = __esm({
       "test-agent",
       "nul",
       "*.bak*",
-      "*.bak-*"
+      "*.bak-*",
+      "~$*"
     ]);
     TEXT_EXTENSIONS = /* @__PURE__ */ new Set([
       ".md",