engine7 7.1.29 → 7.1.31

package/dist/cli.mjs

@@ -1,3 +1,4 @@
+const require=(await import('node:module')).createRequire(import.meta.url)
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __esm = (fn, res) => function __init() {
@@ -183,8 +184,8 @@ function collectRecentSessions(agentsDir, _days = 7) {
 }
 async function doExport(opts) {
   const { agentName, stateDir, note, dryRun: dryRun2 } = opts;
-  const workspace = opts.workspace || path.join(stateDir, "workspace");
-  const engineHome = path.join(os.homedir(), ".engine7");
+  const workspace = (opts.workspace || path.join(stateDir, "workspace")).replace(/[/\\]+$/, "");
+  const engineHome = path.join(os.homedir(), ".engine7").replace(/[/\\]+$/, "");
   console.log(`\u{1F4E6} engine7 export`);
   console.log(`   agent: ${agentName}`);
   console.log(`   state: ${stateDir}`);
@@ -326,9 +327,9 @@ async function doImport(opts) {
     process.exit(1);
   }
   const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
-  const workspace = path.join(stateDir, "workspace").replace(/\\/g, "/");
-  const engineHome = path.join(os.homedir(), ".engine7").replace(/\\/g, "/");
-  const dirs = { workspace, stateDir: stateDir.replace(/\\/g, "/"), engineHome };
+  const workspace = path.join(stateDir, "workspace").replace(/\\/g, "/").replace(/[/\\]+$/, "");
+  const engineHome = path.join(os.homedir(), ".engine7").replace(/\\/g, "/").replace(/[/\\]+$/, "");
+  const dirs = { workspace, stateDir: stateDir.replace(/\\/g, "/").replace(/[/\\]+$/, ""), engineHome };
   console.log(`   \u7248\u672C: ${manifest.version}`);
   console.log(`   \u521B\u5EFA: ${manifest.createdAt}`);
   console.log(`   \u6587\u4EF6\u6570: ${manifest.fileCount}`);
@@ -1332,13 +1333,253 @@ engine7 start \u2014 \u542F\u52A8 Engine
     } catch {
     }
     console.log("");
+    const envForChild = { ...process.env };
+    const secretsDir = path2.join(process.env.HOME || process.env.USERPROFILE || ".", ".engine7-secrets");
+    const cfgBase = path2.basename(configPath2, ".json");
+    const secretCandidates = [
+      path2.join(secretsDir, `${cfgBase}.env`),
+      path2.join(path2.dirname(configPath2), `.env.${cfgBase}`),
+      path2.join(path2.dirname(configPath2), ".env")
+    ];
+    for (const secretPath of secretCandidates) {
+      if (fs2.existsSync(secretPath)) {
+        const content = fs2.readFileSync(secretPath, "utf-8");
+        for (const line of content.split("\n")) {
+          const trimmed = line.trim();
+          if (!trimmed || trimmed.startsWith("#")) continue;
+          const eq = trimmed.indexOf("=");
+          if (eq > 0) {
+            const k = trimmed.slice(0, eq).trim();
+            const v = trimmed.slice(eq + 1).trim();
+            if (k && !(k in envForChild)) envForChild[k] = v;
+          }
+        }
+        console.log(`[start] Loaded API keys from ${secretPath}`);
+        break;
+      }
+    }
     const child = spawn(process.execPath, [enginePath, "--engine-config", configPath2], {
       stdio: "inherit",
-      shell: false
+      shell: false,
+      env: envForChild
     });
     child.on("exit", (code) => process.exit(code ?? 1));
     return;
   }
+  if (subcommand === "session") {
+    const action = args[1];
+    if (!action || action === "--help" || action === "-h") {
+      console.log(`
+engine7 session \u2014 \u4F1A\u8BDD\u7BA1\u7406\u5DE5\u5177
+
+\u7528\u6CD5:
+  engine7 session reset --config <path> [--mode archive|drop-last|strip-images] [--n N] [--restart]
+
+\u6A21\u5F0F:
+  archive        \u5F52\u6863\u6574\u4E2A\u4F1A\u8BDD\uFF0C\u91CD\u542F\u540E\u4ECE\u7A7A\u767D\u5F00\u59CB
+  drop-last      \u780D\u6700\u8FD1 N \u8F6E\u5BF9\u8BDD\uFF08\u9ED8\u8BA4 N=3\uFF09\uFF0C\u4FDD\u7559\u66F4\u65E9\u7684\u5386\u53F2
+  strip-images   \u53EA\u6458\u9664 image block / [\u56FE\u7247\xD7N] \u6807\u8BB0\uFF0C\u4FDD\u7559\u6587\u5B57\uFF08\u6025\u6551\u654F\u611F\u56FE\uFF09
+
+\u9009\u9879:
+  --config <path>   config \u6587\u4EF6\u8DEF\u5F84\uFF08\u5FC5\u987B\u6307\u5B9A\uFF09
+  --mode <mode>     \u91CD\u7F6E\u6A21\u5F0F\uFF08\u9ED8\u8BA4: archive\uFF09
+  --n <N>           drop-last \u6A21\u5F0F\u780D\u51E0\u8F6E\uFF08\u9ED8\u8BA4: 3\uFF09
+  --restart         \u6539\u5B8C\u81EA\u52A8 kill + \u62C9\u8D77 engine
+  -h, --help        \u663E\u793A\u5E2E\u52A9
+`);
+      process.exit(0);
+    }
+    if (action === "reset") {
+      const { execSync: execSync2 } = await import("node:child_process");
+      let configPath2 = "";
+      let mode = "archive";
+      let dropN = 3;
+      let autoRestart = false;
+      for (let i = 2; i < args.length; i++) {
+        if (args[i] === "--config" && args[i + 1]) {
+          configPath2 = args[++i];
+        } else if (args[i] === "--mode" && args[i + 1]) {
+          mode = args[++i];
+        } else if (args[i] === "--n" && args[i + 1]) {
+          dropN = parseInt(args[++i], 10);
+        } else if (args[i] === "--restart") {
+          autoRestart = true;
+        } else if (args[i] === "-h" || args[i] === "--help") {
+          console.log(`engine7 session reset --config <path> [--mode archive|drop-last|strip-images] [--n N] [--restart]`);
+          process.exit(0);
+        }
+      }
+      if (!configPath2) {
+        console.error("\u274C \u5FC5\u987B\u6307\u5B9A --config <path>");
+        process.exit(1);
+      }
+      if (!["archive", "drop-last", "strip-images"].includes(mode)) {
+        console.error(`\u274C \u672A\u77E5\u6A21\u5F0F: ${mode}\uFF08\u53EF\u9009: archive / drop-last / strip-images\uFF09`);
+        process.exit(1);
+      }
+      const configRaw = JSON.parse(fs2.readFileSync(configPath2, "utf-8"));
+      const stateDir = configRaw.stateDir;
+      if (!stateDir) {
+        console.error("\u274C config \u91CC\u6CA1\u6709 stateDir");
+        process.exit(1);
+      }
+      const sessionsDir = path2.join(stateDir, "agents", "main", "sessions");
+      if (!fs2.existsSync(sessionsDir)) {
+        console.error(`\u274C sessions \u76EE\u5F55\u4E0D\u5B58\u5728: ${sessionsDir}`);
+        process.exit(1);
+      }
+      console.log(`\u{1F504} session reset`);
+      console.log(`   config: ${configPath2}`);
+      console.log(`   mode:   ${mode}`);
+      if (mode === "drop-last") console.log(`   n:      ${dropN}`);
+      const platformMapPath = path2.join(sessionsDir, "platform-map.json");
+      const indexPath = path2.join(sessionsDir, "session-index.json");
+      let sessionFileUUID = null;
+      if (fs2.existsSync(indexPath)) {
+        const index = JSON.parse(fs2.readFileSync(indexPath, "utf-8"));
+        const entries = Object.values(index);
+        if (entries.length > 0) {
+          const fileVal = entries[0].file || "";
+          sessionFileUUID = path2.isAbsolute(fileVal) ? path2.basename(fileVal, ".jsonl") : fileVal.replace(".jsonl", "");
+        }
+      }
+      if (!sessionFileUUID) {
+        const jsonlFiles = fs2.readdirSync(sessionsDir).filter((f) => f.endsWith(".jsonl") && !f.includes(".archived.") && !f.includes(".compaction.")).map((f) => ({ name: f, mtime: fs2.statSync(path2.join(sessionsDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
+        if (jsonlFiles.length === 0) {
+          console.error("\u274C \u627E\u4E0D\u5230\u6D3B\u8DC3\u7684 session JSONL \u6587\u4EF6");
+          process.exit(1);
+        }
+        sessionFileUUID = jsonlFiles[0].name.replace(".jsonl", "");
+      }
+      let jsonlPath = path2.join(sessionsDir, `${sessionFileUUID}.jsonl`);
+      if (!fs2.existsSync(jsonlPath)) {
+        const jsonlFiles = fs2.readdirSync(sessionsDir).filter((f) => f.endsWith(".jsonl") && !f.includes(".archived.") && !f.includes(".compaction.")).map((f) => ({ name: f, mtime: fs2.statSync(path2.join(sessionsDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
+        if (jsonlFiles.length === 0) {
+          console.error(`\u274C JSONL \u6587\u4EF6\u4E0D\u5B58\u5728: ${jsonlPath}`);
+          process.exit(1);
+        }
+        sessionFileUUID = jsonlFiles[0].name.replace(".jsonl", "");
+        jsonlPath = path2.join(sessionsDir, `${sessionFileUUID}.jsonl`);
+      }
+      console.log(`   file:   ${jsonlPath}`);
+      const configName = path2.basename(configPath2);
+      if (autoRestart) {
+        try {
+          const myPid = process.pid;
+          const pids = execSync2(`pgrep -f "dist/main.mjs.*${configName}" 2>/dev/null || true`, { encoding: "utf-8" }).trim();
+          const otherPids = pids.split("\n").filter((p) => p && p.trim() !== String(myPid)).join("\n").trim();
+          if (otherPids) {
+            console.log(`
+   Killing engine (PID: ${otherPids})...`);
+            execSync2(`echo "${otherPids}" | xargs kill -9 2>/dev/null || true`);
+            await new Promise((r) => setTimeout(r, 2e3));
+          }
+        } catch {
+        }
+      }
+      const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+      const { readFileSync: readFileSync3, writeFileSync: writeFileSync3, renameSync } = fs2;
+      if (mode === "archive") {
+        const archiveName = `${sessionFileUUID}.jsonl.archived.${timestamp}`;
+        renameSync(jsonlPath, path2.join(sessionsDir, archiveName));
+        console.log(`
+\u2705 \u5F52\u6863\u5B8C\u6210: ${archiveName}`);
+        console.log(`   \u91CD\u542F\u540E\u5C06\u4ECE\u7A7A\u767D\u4F1A\u8BDD\u5F00\u59CB`);
+      } else if (mode === "drop-last") {
+        const lines = readFileSync3(jsonlPath, "utf-8").trim().split("\n");
+        const parsed = lines.map((l) => {
+          try {
+            return JSON.parse(l);
+          } catch {
+            return null;
+          }
+        }).filter(Boolean);
+        let cutIndex = parsed.length;
+        let userCount = 0;
+        for (let i = parsed.length - 1; i >= 0; i--) {
+          if (parsed[i].type === "message" && parsed[i].role === "user") {
+            userCount++;
+            cutIndex = i;
+            if (userCount >= dropN) break;
+          }
+        }
+        const kept = parsed.slice(0, cutIndex);
+        const newContent = kept.map((p) => JSON.stringify(p)).join("\n") + "\n";
+        writeFileSync3(jsonlPath, newContent);
+        console.log(`
+\u2705 \u780D\u6389\u6700\u8FD1 ${parsed.length - cutIndex} \u884C\uFF08${dropN} \u8F6E\uFF09`);
+        console.log(`   \u4FDD\u7559 ${kept.length} \u884C`);
+      } else if (mode === "strip-images") {
+        const lines = readFileSync3(jsonlPath, "utf-8").trim().split("\n");
+        let stripped = 0;
+        const newLines = lines.map((line) => {
+          try {
+            const obj = JSON.parse(line);
+            let changed = false;
+            if (obj.type === "message") {
+              const msg = obj.message || obj;
+              if (typeof msg.content === "string") {
+                const cleaned = msg.content.replace(/\n?\[图片×\d+\]/g, "").replace(/\n?\[图片来自[^\]]*\]/g, "");
+                if (cleaned !== msg.content) {
+                  msg.content = cleaned;
+                  changed = true;
+                }
+              }
+              if (Array.isArray(msg.content)) {
+                msg.content = msg.content.map((block) => {
+                  if (block.type === "text" && typeof block.text === "string") {
+                    const cleaned = block.text.replace(/\n?\[图片×\d+\]/g, "").replace(/\n?\[图片来自[^\]]*\]/g, "");
+                    if (cleaned !== block.text) {
+                      changed = true;
+                      return { ...block, text: cleaned };
+                    }
+                  }
+                  if (block.type === "toolCall" && block.arguments?.image_path) {
+                    changed = true;
+                    return { ...block, arguments: { ...block.arguments, image_path: "[stripped]" } };
+                  }
+                  return block;
+                });
+              }
+            }
+            if (changed) {
+              stripped++;
+              return JSON.stringify(obj);
+            }
+            return line;
+          } catch {
+            return line;
+          }
+        });
+        writeFileSync3(jsonlPath, newLines.join("\n") + "\n");
+        console.log(`
+\u2705 \u6458\u9664 ${stripped} \u884C\u56FE\u7247\u76F8\u5173\u5185\u5BB9`);
+      }
+      if (autoRestart) {
+        const realCliPath = fs2.realpathSync(process.argv[1]);
+        const cliDir = path2.dirname(realCliPath);
+        const pkgRoot = path2.resolve(cliDir, "..");
+        let enginePath = path2.join(pkgRoot, "dist", "main.mjs");
+        if (!fs2.existsSync(enginePath)) {
+          enginePath = path2.join(cliDir, "main.mjs");
+        }
+        console.log(`
+\u{1F680} \u62C9\u8D77 engine...`);
+        const { spawn } = await import("node:child_process");
+        const child = spawn(process.execPath, [enginePath, "--engine-config", configPath2], {
+          detached: true,
+          stdio: "inherit"
+        });
+        child.on("exit", (code) => process.exit(code ?? 0));
+        return;
+      } else {
+        console.log(`
+\u26A0\uFE0F  \u8BF7\u624B\u52A8\u91CD\u542F engine \u4F7F\u6539\u52A8\u751F\u6548`);
+      }
+      process.exit(0);
+    }
+    process.exit(0);
+  }
   if (subcommand === "service") {
     const action = args[1];
     if (!action || action === "--help" || action === "-h") {