engine7 7.0.0 → 7.0.2

package/dist/cli.mjs

@@ -35,21 +35,25 @@ function parseArgs() {
 }
 function printHelp() {
   console.log(`
-engine7 init \u2014 \u521D\u59CB\u5316 agent \u5DE5\u4F5C\u76EE\u5F55
+Engine 7 \u2014 Self-hosted AI agent engine
 
 \u7528\u6CD5:
-  engine7 init --state-dir <path> [\u9009\u9879]
+  engine7 init --state-dir <path> [\u9009\u9879]   \u521D\u59CB\u5316 agent \u5DE5\u4F5C\u76EE\u5F55
+  engine7 start [--config <path>]          \u542F\u52A8 Engine
 
-\u9009\u9879:
+init \u9009\u9879:
   --state-dir <path>   agent \u6839\u76EE\u5F55\uFF08\u5FC5\u586B\uFF0C\u652F\u6301\u76F8\u5BF9\u8DEF\u5F84\uFF09
   --quick              \u7528\u9ED8\u8BA4\u914D\u7F6E\u8DF3\u8FC7\u4EA4\u4E92
   --dry-run            \u53EA\u663E\u793A\u4F1A\u521B\u5EFA\u4EC0\u4E48\uFF0C\u4E0D\u5B9E\u9645\u521B\u5EFA
-  -h, --help           \u663E\u793A\u5E2E\u52A9
+
+start \u9009\u9879:
+  --config <path>      config \u6587\u4EF6\u8DEF\u5F84\uFF08\u9ED8\u8BA4: configs/main7.json\uFF09
 
 \u793A\u4F8B:
   engine7 init --state-dir D:/my-agent
   engine7 init --state-dir ./my-agent --quick
-  engine7 init --state-dir D:/my-agent --dry-run
+  engine7 start
+  engine7 start --config configs/xiaowen.json
 `);
 }
 function createReadline() {
@@ -203,9 +207,7 @@ function generateConfig(v) {
     },
     api: { port: v.apiPort },
     prompt: {
-      mode: "custom",
-      staticFiles: ["AGENTS.md", "USER.md", "MEMORY.md"],
-      order: ["soul", "AGENTS.md", "using-tools", "USER.md", "MEMORY.md", "auto-memory-instructions"]
+      staticFiles: ["AGENTS.md", "USER.md", "MEMORY.md"]
     },
     compaction: {
       enabled: true,
@@ -214,6 +216,10 @@ function generateConfig(v) {
       minReductionRatio: 0.3,
       ruleBased: { enabled: true, essentialFields: [] },
       memoryFlush: { enabled: true, forceFlushTranscriptBytes: "2.0mb" }
+    },
+    skills: {
+      enabled: true,
+      path: "skills"
     }
   };
   const providerDefs = {
@@ -307,8 +313,8 @@ function buildDirTree(v) {
         description: `Engine 7 agent: ${v.agentName}`
       }, null, 2) + "\n"
     },
-    // 启动脚本
-    {
+    // 启动脚本（根据 OS 生成）
+    ...process.platform === "win32" ? [{
       path: path.join(d, "start.cmd"),
       type: "file",
       content: `@echo off
@@ -327,7 +333,12 @@ echo [start] Starting Engine 7...
 echo [start] Config: configs\\main7.json
 echo.
 
-node node_modules/engine7/dist/main.mjs --engine-config configs/main7.json
+rem Auto-detect engine7 path (local > global)
+set ENGINE7_BIN=node_modules\\engine7\\dist\\main.mjs
+if not exist "%ENGINE7_BIN%" (
+  for /f "delims=" %%i in ('npm root -g') do set ENGINE7_BIN=%%i\\engine7\\dist\\main.mjs
+)
+node "%ENGINE7_BIN%" --engine-config configs/main7.json
 
 if %ERRORLEVEL% NEQ 0 (
     echo.
@@ -335,7 +346,36 @@ if %ERRORLEVEL% NEQ 0 (
     pause
 )
 `
-    }
+    }] : [{
+      path: path.join(d, "start.sh"),
+      type: "file",
+      content: `#!/bin/bash
+# Engine 7 startup script
+# Auto-generated by engine7 init
+
+cd "$(dirname "$0")"
+
+# Kill existing engine for main7.json
+PIDS=$(pgrep -f "main7.json.*dist/main.mjs" 2>/dev/null)
+if [ -n "$PIDS" ]; then
+  echo "[start] Killing existing engine (PID: $PIDS)..."
+  echo "$PIDS" | xargs kill -9 2>/dev/null
+  sleep 2
+fi
+
+echo "[start] Starting Engine 7..."
+echo "[start] Config: configs/main7.json"
+echo ""
+
+# Auto-detect engine7 path (local > global)
+if [ -f "node_modules/engine7/dist/main.mjs" ]; then
+  ENGINE7_BIN="node_modules/engine7/dist/main.mjs"
+else
+  ENGINE7_BIN="$(npm root -g)/engine7/dist/main.mjs"
+fi
+node "$ENGINE7_BIN" --engine-config configs/main7.json
+`
+    }]
   ];
 }
 function readTemplate(relativePath) {
@@ -371,6 +411,84 @@ function execute(entries) {
   }
 }
 async function main() {
+  const args = process.argv.slice(2);
+  const subcommand = args[0];
+  if (!subcommand) {
+    printHelp();
+    process.exit(0);
+  }
+  if (subcommand === "--help" || subcommand === "-h") {
+    printHelp();
+    process.exit(0);
+  }
+  if (subcommand === "start") {
+    let configPath2 = "";
+    for (let i = 1; i < args.length; i++) {
+      if (args[i] === "--config" && args[i + 1]) {
+        configPath2 = args[++i];
+      } else if (args[i] === "--help" || args[i] === "-h") {
+        console.log(`
+engine7 start \u2014 \u542F\u52A8 Engine
+
+\u7528\u6CD5:
+  engine7 start [--config <path>]
+
+\u9009\u9879:
+  --config <path>   config \u6587\u4EF6\u8DEF\u5F84\uFF08\u9ED8\u8BA4: configs/main7.json\uFF09
+  -h, --help        \u663E\u793A\u5E2E\u52A9
+`);
+        process.exit(0);
+      }
+    }
+    if (!configPath2) {
+      const defaultCfg = path.join("configs", "main7.json");
+      if (fs.existsSync(defaultCfg)) {
+        configPath2 = defaultCfg;
+      } else {
+        console.error("\u274C \u627E\u4E0D\u5230 config \u6587\u4EF6");
+        console.error("   \u7528\u6CD5: engine7 start --config <path>");
+        console.error("   \u6216\u5728\u5F53\u524D\u76EE\u5F55\u521B\u5EFA configs/main7.json");
+        process.exit(1);
+      }
+    }
+    const { execSync, spawn } = await import("node:child_process");
+    let enginePath;
+    const localPath = path.join("node_modules", "engine7", "dist", "main.mjs");
+    if (fs.existsSync(localPath)) {
+      enginePath = localPath;
+    } else {
+      const globalRoot = execSync("npm root -g", { encoding: "utf-8" }).trim();
+      enginePath = path.join(globalRoot, "engine7", "dist", "main.mjs");
+      if (!fs.existsSync(enginePath)) {
+        console.error("\u274C \u627E\u4E0D\u5230 engine7 \u5B89\u88C5");
+        process.exit(1);
+      }
+    }
+    console.log(`\u{1F680} engine7 start`);
+    console.log(`   config: ${configPath2}`);
+    console.log(`   engine: ${enginePath}`);
+    const configName = path.basename(configPath2);
+    try {
+      if (process.platform === "win32") {
+        execSync(`powershell -Command "Get-WmiObject Win32_Process | Where-Object { $_.Name -eq 'node.exe' -and $_.CommandLine -like '*${configName}*' -and $_.CommandLine -like '*dist*' } | ForEach-Object { Write-Host '[start] Killing PID' $_.ProcessId; Stop-Process -Id $_.ProcessId -Force }"`, { stdio: "inherit" });
+      } else {
+        const pids = execSync(`pgrep -f "${configName}.*dist/main.mjs" 2>/dev/null || true`, { encoding: "utf-8" }).trim();
+        if (pids) {
+          console.log(`[start] Killing existing engine (PID: ${pids})...`);
+          execSync(`echo "${pids}" | xargs kill -9 2>/dev/null || true`);
+          await new Promise((r) => setTimeout(r, 2e3));
+        }
+      }
+    } catch {
+    }
+    console.log("");
+    const child = spawn("node", [enginePath, "--engine-config", configPath2], {
+      stdio: "inherit",
+      shell: false
+    });
+    child.on("exit", (code) => process.exit(code ?? 1));
+    return;
+  }
   const opts = parseArgs();
   console.log(`
 \u{1F680} engine7 init`);
@@ -403,18 +521,58 @@ async function main() {
   });
   if (opts.dryRun) {
     dryRun(tree);
+    const skillsSrc = findTemplateDir("skills");
+    if (skillsSrc) {
+      const skills = fs.readdirSync(skillsSrc);
+      for (const s of skills) {
+        console.log(`  \u{1F4C1} ${path.join(opts.stateDir, "workspace", "skills", s)}`);
+      }
+    }
   } else {
     console.log("\n\u{1F4E6} \u6B63\u5728\u521B\u5EFA\u76EE\u5F55\u548C\u6587\u4EF6...\n");
     execute(tree);
+    const skillsSrc = findTemplateDir("skills");
+    if (skillsSrc) {
+      const skillsDest = path.join(opts.stateDir, "workspace", "skills");
+      fs.mkdirSync(skillsDest, { recursive: true });
+      const skills = fs.readdirSync(skillsSrc);
+      for (const s of skills) {
+        copyDirRecursive(path.join(skillsSrc, s), path.join(skillsDest, s));
+        console.log(`  \u{1F4E6} skill: ${s}`);
+      }
+    }
     console.log(`
 \u2705 \u521D\u59CB\u5316\u5B8C\u6210\uFF01
 `);
     console.log(`\u4E0B\u4E00\u6B65\uFF1A`);
     console.log(`  1. \u68C0\u67E5\u5E76\u4FEE\u6539 ${opts.stateDir}/configs/main7.json`);
-    console.log(`  2. \u542F\u52A8 Engine: start.cmd ${configPath}`);
+    console.log(`  2. \u542F\u52A8 Engine: cd ${opts.stateDir} && engine7 start`);
     console.log(`  3. \u67E5\u770B workspace: ${path.join(opts.stateDir, "workspace")}`);
   }
 }
+function copyDirRecursive(src, dest) {
+  fs.mkdirSync(dest, { recursive: true });
+  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+    if (entry.isDirectory()) {
+      copyDirRecursive(srcPath, destPath);
+    } else {
+      fs.copyFileSync(srcPath, destPath);
+    }
+  }
+}
+function findTemplateDir(name) {
+  const candidates = [
+    path.join(__dirname, "..", "templates", name),
+    path.join(__dirname, "..", "..", "templates", name),
+    path.join(process.cwd(), "templates", name)
+  ];
+  for (const p of candidates) {
+    if (fs.existsSync(p)) return p;
+  }
+  return null;
+}
 main().catch((err) => {
   console.error(`
 \u274C \u5931\u8D25: ${err.message}`);

package/dist/engine-startup.mjs

@@ -3527,6 +3527,46 @@ var init_loader = __esm({
   }
 });
 
+// src/config/live.ts
+var LiveConfigClass, liveConfig;
+var init_live = __esm({
+  "src/config/live.ts"() {
+    "use strict";
+    LiveConfigClass = class {
+      current = null;
+      /** 启动时注入（替代 registry.config = config） */
+      init(config) {
+        this.current = config;
+      }
+      /** 取整个 config 对象（只读引用，不要缓存） */
+      all() {
+        if (!this.current) {
+          throw new Error("[liveConfig] not initialized \u2014 call liveConfig.init() first");
+        }
+        return this.current;
+      }
+      /** 安全取子段（'services.voice-chat.start' → current.services.voice-chat.start） */
+      get(dotPath) {
+        if (!this.current) return void 0;
+        return dotPath.split(".").reduce((acc, key) => acc == null ? void 0 : acc[key], this.current);
+      }
+      /** reload 时原地更新（Object.assign 保持引用不变） */
+      assign(newConfig) {
+        if (!this.current) {
+          this.current = newConfig;
+          return;
+        }
+        Object.assign(this.current, newConfig);
+      }
+      /** 是否已初始化 */
+      isReady() {
+        return this.current !== null;
+      }
+    };
+    liveConfig = new LiveConfigClass();
+  }
+});
+
 // src/memory/shims/memory-core-host-engine-foundation.ts
 import path5 from "node:path";
 function resolveAgentDir(cfg, agentId) {
@@ -5760,13 +5800,8 @@ __export(config_exports, {
   isAutoDreamEnabled: () => isAutoDreamEnabled,
   setAutoDreamConfig: () => setAutoDreamConfig
 });
-import fsSync from "node:fs";
 function dlog(msg2) {
-  try {
-    fsSync.appendFileSync(DEBUG_LOG, `[${(/* @__PURE__ */ new Date()).toISOString()}] ${msg2}
-`);
-  } catch {
-  }
+  if (process.env.AUTODREAM_DEBUG) console.log(`[autoDream] ${msg2}`);
 }
 function setAutoDreamConfig(config) {
   _config = config;
@@ -5803,11 +5838,10 @@ function getMaxEntrypointLines() {
   if (typeof maxScan === "number" && maxScan > 200) return maxScan;
   return void 0;
 }
-var DEBUG_LOG, _config, DEFAULTS;
+var _config, DEFAULTS;
 var init_config2 = __esm({
   "src/memory/autoDream/config.ts"() {
     "use strict";
-    DEBUG_LOG = "C:\\Users\\24045\\.openclaw\\logs\\autoDream-debug.log";
     _config = null;
     DEFAULTS = {
       minHours: 24,
@@ -6002,13 +6036,8 @@ __export(autoDream_exports, {
   executeAutoDream: () => executeAutoDream,
   initAutoDream: () => initAutoDream
 });
-import fsSync2 from "node:fs";
 function dlog2(msg2) {
-  try {
-    fsSync2.appendFileSync(DEBUG_LOG2, `[${(/* @__PURE__ */ new Date()).toISOString()}] ${msg2}
-`);
-  } catch {
-  }
+  if (process.env.AUTODREAM_DEBUG) console.log(`[autoDream] ${msg2}`);
 }
 function initAutoDream(deps) {
   _deps2 = deps;
@@ -6130,7 +6159,7 @@ stack: ${err.stack ?? "(no stack)"}`);
     return { fired: false, reason: `fork failed: ${err.message}` };
   }
 }
-var DEBUG_LOG2, SESSION_SCAN_INTERVAL_MS, _deps2, lastSessionScanAt;
+var SESSION_SCAN_INTERVAL_MS, _deps2, lastSessionScanAt;
 var init_autoDream = __esm({
   "src/memory/autoDream/autoDream.ts"() {
     "use strict";
@@ -6138,7 +6167,6 @@ var init_autoDream = __esm({
     init_config2();
     init_consolidationLock();
     init_consolidationPrompt();
-    DEBUG_LOG2 = "C:\\Users\\24045\\.openclaw\\logs\\autoDream-debug.log";
     SESSION_SCAN_INTERVAL_MS = 10 * 60 * 1e3;
     _deps2 = null;
     lastSessionScanAt = 0;
@@ -11434,10 +11462,12 @@ var init_wx_query = __esm({
   "src/tools/wechat/wx-query.ts"() {
     "use strict";
     init_registry();
+    init_live();
     SCRIPT = "C:/Users/24045/.openclaw/engine/src/tools/wechat/wx_query.py";
     PYTHON = "python3";
     registry.register({
       name: "wx_query",
+      isEnabled: () => !!liveConfig?.agents?.defaults?.privateTools,
       description: getDescription(),
       schema: {
         type: "object",
@@ -20130,12 +20160,12 @@ var init_hash2 = __esm({
 
 // src/memory/host/internal.ts
 import crypto8 from "node:crypto";
-import fsSync3 from "node:fs";
+import fsSync from "node:fs";
 import fs44 from "node:fs/promises";
 import path46 from "node:path";
 function ensureDir(dir) {
   try {
-    fsSync3.mkdirSync(dir, { recursive: true });
+    fsSync.mkdirSync(dir, { recursive: true });
   } catch {
   }
   return dir;
@@ -21412,7 +21442,7 @@ var init_provider_adapter_registration = __esm({
 });
 
 // src/memory/tools/memory/provider-adapters.ts
-import fsSync4 from "node:fs";
+import fsSync2 from "node:fs";
 function canAutoSelectLocal(modelPath) {
   const trimmed = modelPath?.trim();
   if (!trimmed) {
@@ -21423,7 +21453,7 @@ function canAutoSelectLocal(modelPath) {
   }
   const resolved = resolveUserPath(trimmed);
   try {
-    return fsSync4.statSync(resolved).isFile();
+    return fsSync2.statSync(resolved).isFile();
   } catch {
     return false;
   }
@@ -24346,7 +24376,7 @@ var init_watch_settle = __esm({
 
 // src/memory/tools/memory/manager-sync-ops.ts
 import { randomUUID as randomUUID10 } from "node:crypto";
-import fsSync5 from "node:fs";
+import fsSync3 from "node:fs";
 import fs49 from "node:fs/promises";
 import path51 from "node:path";
 function isSyncDisabled(cfg) {
@@ -24649,7 +24679,7 @@ var init_manager_sync_ops = __esm({
         const additionalPaths = normalizeExtraMemoryPaths(this.workspaceDir, this.settings.extraPaths);
         for (const entry of additionalPaths) {
           try {
-            const stat8 = fsSync5.lstatSync(entry);
+            const stat8 = fsSync3.lstatSync(entry);
             if (stat8.isSymbolicLink()) {
               continue;
             }
@@ -29638,40 +29668,7 @@ function getActiveQueryEngine(sessionId) {
 
 // src/engine-startup.ts
 init_loader();
-
-// src/config/live.ts
-var LiveConfigClass = class {
-  current = null;
-  /** 启动时注入（替代 registry.config = config） */
-  init(config) {
-    this.current = config;
-  }
-  /** 取整个 config 对象（只读引用，不要缓存） */
-  all() {
-    if (!this.current) {
-      throw new Error("[liveConfig] not initialized \u2014 call liveConfig.init() first");
-    }
-    return this.current;
-  }
-  /** 安全取子段（'services.voice-chat.start' → current.services.voice-chat.start） */
-  get(dotPath) {
-    if (!this.current) return void 0;
-    return dotPath.split(".").reduce((acc, key) => acc == null ? void 0 : acc[key], this.current);
-  }
-  /** reload 时原地更新（Object.assign 保持引用不变） */
-  assign(newConfig) {
-    if (!this.current) {
-      this.current = newConfig;
-      return;
-    }
-    Object.assign(this.current, newConfig);
-  }
-  /** 是否已初始化 */
-  isReady() {
-    return this.current !== null;
-  }
-};
-var liveConfig = new LiveConfigClass();
+init_live();
 
 // src/services/withRetry.ts
 var DEFAULT_MAX_RETRIES = 10;
@@ -40822,6 +40819,7 @@ ${rawOutput}
 }
 
 // src/tools/msg-send.ts
+init_live();
 init_registry();
 function getConfig() {
   return liveConfig.all();
@@ -40965,6 +40963,7 @@ Examples:
 
 // src/tools/msg-husband.ts
 init_registry();
+init_live();
 import fs26 from "node:fs";
 import path26 from "node:path";
 function getHusbandFeishuId(workspace) {
@@ -40985,6 +40984,7 @@ var FALLBACK_IDS = [
 ];
 registry.register({
   name: "msg_husband",
+  isEnabled: () => !!liveConfig?.agents?.defaults?.privateTools,
   description: `\u7ED9\u7FC0\u54E5\uFF08\u8001\u516C\uFF09\u53D1\u98DE\u4E66\u79C1\u4FE1\u3002\u53C2\u6570\u5199\u6B7B\uFF1Ato=\u7FC0\u54E5\u98DE\u4E66open_id, source=feishu\u3002\u53EA\u9700\u4F20 content\u3002
 
 Parameters:
@@ -41167,6 +41167,7 @@ Examples:
 });
 
 // src/tools/my-eyes.ts
+init_live();
 init_registry();
 import * as fs27 from "node:fs";
 import * as path27 from "node:path";
@@ -41246,6 +41247,7 @@ registry.register({
 });
 
 // src/tools/my-voice.ts
+init_live();
 init_registry();
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
@@ -41459,6 +41461,7 @@ registry.register({
 });
 
 // src/tools/my-selfie.ts
+init_live();
 init_registry();
 import * as fs29 from "node:fs";
 import * as path29 from "node:path";
@@ -41751,6 +41754,7 @@ registry.register({
 
 // src/tools/service.ts
 init_registry();
+init_live();
 import { exec as exec3, spawn as spawn6 } from "node:child_process";
 import { promisify as promisify2 } from "node:util";
 var execAsync = promisify2(exec3);