engine7 7.1.60 → 7.1.62

package/dist/cli.mjs

@@ -1,4 +1,12 @@
 const require=(await import('node:module')).createRequire(import.meta.url)
+const __origEmitWarning = process.emitWarning.bind(process);
+process.emitWarning = (w, ...r) => {
+  const name = typeof w === 'object' ? w?.name : r?.[0];
+  const msg = typeof w === 'object' ? String(w?.message) : String(w);
+  if (name === 'ExperimentalWarning' && msg.includes('SQLite')) return;
+  return __origEmitWarning(w, ...r);
+};
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -13532,9 +13540,13 @@ var init_body_move = __esm({
 });
 
 // src/calendar/db.ts
-import { DatabaseSync } from "node:sqlite";
 import * as path21 from "node:path";
 import * as fs20 from "node:fs";
+import { createRequire as createRequire2 } from "node:module";
+function getSqlite() {
+  if (!_sqlite) _sqlite = createRequire2(import.meta.url)("node:sqlite");
+  return _sqlite;
+}
 function openDb(workspace) {
   const dir = path21.join(workspace, ".calendar");
   fs20.mkdirSync(dir, { recursive: true });
@@ -13591,10 +13603,20 @@ function migrate(db) {
     db.exec("ALTER TABLE events ADD COLUMN doc_path TEXT");
   }
 }
-var TZ_OFFSET_MS;
+var _sqlite, DatabaseSync, TZ_OFFSET_MS;
 var init_db = __esm({
   "src/calendar/db.ts"() {
     "use strict";
+    _sqlite = null;
+    DatabaseSync = new Proxy(function() {
+    }, {
+      construct(_t, args) {
+        return new (getSqlite()).DatabaseSync(...args);
+      },
+      get(_t, prop) {
+        return getSqlite().DatabaseSync[prop];
+      }
+    });
     TZ_OFFSET_MS = 8 * 60 * 60 * 1e3;
   }
 });
@@ -17038,7 +17060,7 @@ Return ONLY valid JSON: {"selected_memories": ["filename1.md", "filename2.md"]}`
 // src/memory/memdir/findRelevantMemoriesVector.ts
 import { statSync as statSync13 } from "node:fs";
 import { join as join26, resolve as resolve7, sep as sep6 } from "node:path";
-import { createRequire as createRequire2 } from "node:module";
+import { createRequire as createRequire3 } from "node:module";
 async function embedQuery(text, ollamaUrl, model) {
   try {
     const resp = await fetch(ollamaUrl, {
@@ -17226,7 +17248,7 @@ var require3, DEFAULT_TOP_K, DEFAULT_MIN_SCORE, DEFAULT_OLLAMA_URL, DEFAULT_OLLA
 var init_findRelevantMemoriesVector = __esm({
   "src/memory/memdir/findRelevantMemoriesVector.ts"() {
     "use strict";
-    require3 = createRequire2(import.meta.url);
+    require3 = createRequire3(import.meta.url);
     DEFAULT_TOP_K = 3;
     DEFAULT_MIN_SCORE = 0.3;
     DEFAULT_OLLAMA_URL = "http://localhost:11434/api/embeddings";
@@ -19735,6 +19757,8 @@ function parseCcRunArgs(argv) {
       args.configName = takeValue().trim();
     } else if (a === "--agent") {
       args.agentName = takeValue().trim();
+    } else if (a === "--resume") {
+      takeValue();
     }
   }
   if (!hasPrompt) {
@@ -19885,6 +19909,14 @@ async function runQuery(args) {
     systemPrompt,
     channels: config.channels,
     config,
+    // 0902 修2: recall 走 everos——之前 deps 没传 everosCfg，handle-query 每单打
+    // "everosCfg not configured, falling back to LLM recall"，sideQuery 拿整个任务
+    // prompt 当查询词（查"赢男"召回"cc-run 协议"）+ 拖 30-65s。装配对齐 engine-startup:680。
+    everosCfg: config.everos ? {
+      ...config.everos,
+      llm: config.everos.llm?.provider && config.providers?.[config.everos.llm.provider] ? { ...config.everos.llm, apiKey: config.providers[config.everos.llm.provider].apiKey } : config.everos.llm,
+      rerank: config.everos.rerank?.provider && config.providers?.[config.everos.rerank.provider] ? { ...config.everos.rerank, apiKey: config.providers[config.everos.rerank.provider].apiKey } : config.everos.rerank
+    } : void 0,
     mcpManager: void 0
   };
   let thinking = "";
@@ -19980,6 +20012,41 @@ function emitTurn(result, model) {
   });
 }
 async function doCcRun(argv) {
+  if (argv.includes("--list-models")) {
+    try {
+      const stateDirIdx = argv.indexOf("--state-dir");
+      const configIdx = argv.indexOf("--config");
+      const configVal = configIdx >= 0 ? argv[configIdx + 1] : "";
+      let stateDir = stateDirIdx >= 0 ? argv[stateDirIdx + 1] : "";
+      if (!stateDir) {
+        const home = process.env.HOME || process.env.USERPROFILE || ".";
+        try {
+          const pointer = JSON.parse(readFileSync26(join35(home, ".engine7.json"), "utf-8"));
+          stateDir = pointer.stateDir || join35(home, ".engine7");
+        } catch {
+          stateDir = join35(home, ".engine7");
+        }
+      }
+      const configName = configVal.replace(/\.json$/, "") || "main7";
+      const configPath = configVal.includes("/") || configVal.includes("\\") ? configVal : join35(stateDir, "configs", `${configName}.json`);
+      loadSecretsEnv(stateDir, configName);
+      const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_loader(), loader_exports));
+      const config = loadConfig2(configPath);
+      const models = [];
+      for (const [pid, prov] of Object.entries(config.providers || {})) {
+        for (const m of prov?.models || []) {
+          const mid = typeof m === "string" ? m : m?.id;
+          if (mid) models.push(`${pid}/${mid}`);
+        }
+      }
+      process.stdout.write(JSON.stringify(models, null, 2) + "\n");
+    } catch (e) {
+      process.stdout.write("[]\n");
+      process.stderr.write(`[cc-run] --list-models failed: ${e?.message}
+`);
+    }
+    return 0;
+  }
   const args = parseCcRunArgs(argv);
   if (!args) {
     process.stderr.write('cc-run: \u9700\u8981 -p "<prompt>" \u6216 --input-format stream-json \u4ECE stdin \u6536\n');
@@ -20691,6 +20758,13 @@ import * as path29 from "node:path";
 import * as fs27 from "node:fs";
 import * as readline3 from "node:readline";
 import { fileURLToPath } from "node:url";
+var origEmitWarning = process.emitWarning.bind(process);
+process.emitWarning = (warning, ...rest) => {
+  const name = typeof warning === "object" ? warning?.name : rest?.[0];
+  const msg2 = typeof warning === "object" ? String(warning?.message) : String(warning);
+  if (name === "ExperimentalWarning" && msg2.includes("SQLite")) return;
+  return origEmitWarning(warning, ...rest);
+};
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path29.dirname(__filename);
 var SCHEMA_VERSION = 1;

package/dist/engine-startup.mjs

@@ -22559,9 +22559,23 @@ function taskIdFromTitle(title) {
 }
 
 // src/calendar/db.ts
-import { DatabaseSync } from "node:sqlite";
 import * as path21 from "node:path";
 import * as fs21 from "node:fs";
+import { createRequire as createRequire2 } from "node:module";
+var _sqlite = null;
+function getSqlite() {
+  if (!_sqlite) _sqlite = createRequire2(import.meta.url)("node:sqlite");
+  return _sqlite;
+}
+var DatabaseSync = new Proxy(function() {
+}, {
+  construct(_t, args) {
+    return new (getSqlite()).DatabaseSync(...args);
+  },
+  get(_t, prop) {
+    return getSqlite().DatabaseSync[prop];
+  }
+});
 var TZ_OFFSET_MS = 8 * 60 * 60 * 1e3;
 function openDb(workspace) {
   const dir = path21.join(workspace, ".calendar");
@@ -30486,7 +30500,7 @@ Use full ref like \`/primary ${candidates[0].ref}\``);
       await fs45.promises.writeFile(writePath, JSON.stringify(cfg, null, 2), "utf-8");
       console.log(`[primary] Persisted primary=${target} to ${writePath}`);
       await ctx.reply(`\u2705 Primary model set to **${target}** (${candidates[0].name})
-Written to config. **Restart required** to take effect.`);
+Written to config, hot-reloading provider chain now.`);
     } catch (err) {
       await ctx.reply(`\u26A0\uFE0F Failed to write config: ${err.message}`);
     }
@@ -32500,6 +32514,10 @@ async function doReloadConfig(config, deps, provider) {
     lastLoadedConfigRaw = configRaw.trim();
     const changes = [];
     const oldProviderKey = JSON.stringify({
+      // 0902 修：必须含"选中的 primary 是哪个 provider"——此前 key 只有 providers 整字典
+      // + model 名，从 agentrouter/glm-5.3 切 zai-anthropic/glm-5.3（同模型名）时 key
+      // 完全相同 → 不重建链 → /primary 热加载失效（翀哥 0902 15:03 实测切了还在走旧链）。
+      primary: config.provider?.id,
       providers: config.providers,
       model: config.model,
       fallbacks: config.fallbacks,

package/dist/main.mjs

@@ -22933,9 +22933,23 @@ function taskIdFromTitle(title) {
 }
 
 // src/calendar/db.ts
-import { DatabaseSync } from "node:sqlite";
 import * as path21 from "node:path";
 import * as fs21 from "node:fs";
+import { createRequire as createRequire2 } from "node:module";
+var _sqlite = null;
+function getSqlite() {
+  if (!_sqlite) _sqlite = createRequire2(import.meta.url)("node:sqlite");
+  return _sqlite;
+}
+var DatabaseSync = new Proxy(function() {
+}, {
+  construct(_t, args2) {
+    return new (getSqlite()).DatabaseSync(...args2);
+  },
+  get(_t, prop) {
+    return getSqlite().DatabaseSync[prop];
+  }
+});
 var TZ_OFFSET_MS = 8 * 60 * 60 * 1e3;
 function openDb(workspace) {
   const dir = path21.join(workspace, ".calendar");
@@ -30570,7 +30584,7 @@ Use full ref like \`/primary ${candidates[0].ref}\``);
       await fs45.promises.writeFile(writePath, JSON.stringify(cfg, null, 2), "utf-8");
       console.log(`[primary] Persisted primary=${target} to ${writePath}`);
       await ctx.reply(`\u2705 Primary model set to **${target}** (${candidates[0].name})
-Written to config. **Restart required** to take effect.`);
+Written to config, hot-reloading provider chain now.`);
     } catch (err) {
       await ctx.reply(`\u26A0\uFE0F Failed to write config: ${err.message}`);
     }
@@ -32584,6 +32598,10 @@ async function doReloadConfig(config2, deps, provider) {
     lastLoadedConfigRaw = configRaw.trim();
     const changes = [];
     const oldProviderKey = JSON.stringify({
+      // 0902 修：必须含"选中的 primary 是哪个 provider"——此前 key 只有 providers 整字典
+      // + model 名，从 agentrouter/glm-5.3 切 zai-anthropic/glm-5.3（同模型名）时 key
+      // 完全相同 → 不重建链 → /primary 热加载失效（翀哥 0902 15:03 实测切了还在走旧链）。
+      primary: config2.provider?.id,
       providers: config2.providers,
       model: config2.model,
       fallbacks: config2.fallbacks,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engine7",
-  "version": "7.1.60",
+  "version": "7.1.62",
   "type": "module",
   "description": "Engine 7 — 给助手一个家 / A home for your AI assistant",
   "main": "dist/main.mjs",