engine7 7.1.57 → 7.1.59

package/dist/cli.mjs

@@ -3120,10 +3120,26 @@ var init_anthropic_provider = __esm({
             }
           }
         }
+        if (process.env.ENGINE_DUMP_REQUEST === "1") {
+          try {
+            const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+            const dumpPath = __require("node:path").join(process.env.ENGINE_STATE_DIR || ".", "logs", `req-${params.model.replace(/[\/:]/g, "_")}-${ts}.json`);
+            __require("node:fs").writeFileSync(dumpPath, JSON.stringify({ url, headers, body }, null, 1));
+            console.log(`[anthropic] \u{1F4F8} request dumped \u2192 ${__require("node:path").basename(dumpPath)} (${(JSON.stringify(body).length / 1024).toFixed(0)}KB)`);
+          } catch {
+          }
+        }
+        let bodyStr = JSON.stringify(body);
+        if (this.config.wafSingleQuoteWorkaround) {
+          const before = bodyStr.length;
+          bodyStr = bodyStr.replace(/'/g, "\u2019");
+          if (bodyStr.length !== before) {
+          }
+        }
         const retryGen = fetchWithRetry(url, {
           method: "POST",
           headers,
-          body: JSON.stringify(body),
+          body: bodyStr,
           signal: params.signal
         }, "anthropic", this.config.proxy);
         let response;
@@ -3638,7 +3654,9 @@ function createProvider(config) {
         baseUrl: config.baseUrl,
         apiKey: config.apiKey,
         thinking: config.thinking,
-        proxy
+        proxy,
+        wafSingleQuoteWorkaround: config.wafSingleQuoteWorkaround
+        // 0902 agentrouter WAF 引号规避
       });
     case "gemini":
       return new GeminiProvider({
@@ -9404,13 +9422,17 @@ function isDestructiveCommand(command) {
 function sanitizeEnv(env) {
   const result = {};
   for (const [k, v] of Object.entries(env)) {
+    if (ENV_ALLOW_KEYS.includes(k)) {
+      result[k] = v;
+      continue;
+    }
     if (!BLOCKED_ENV_KEYS.some((b) => k.toUpperCase().includes(b))) {
       result[k] = v;
     }
   }
   return result;
 }
-var DANGEROUS_COMMANDS, DESTRUCTIVE_PATTERNS, BLOCKED_ENV_KEYS;
+var DANGEROUS_COMMANDS, DESTRUCTIVE_PATTERNS, BLOCKED_ENV_KEYS, ENV_ALLOW_KEYS;
 var init_bashSecurity = __esm({
   "src/tools/BashTool/bashSecurity.ts"() {
     "use strict";
@@ -9461,6 +9483,7 @@ var init_bashSecurity = __esm({
       "PASSWORD",
       "PRIVATE_KEY"
     ];
+    ENV_ALLOW_KEYS = ["MULTICA_TOKEN"];
   }
 });
 
@@ -18707,11 +18730,15 @@ var init_autoDream = __esm({
 var handle_query_exports = {};
 __export(handle_query_exports, {
   handleQuery: () => handleQuery,
-  resetSessionStartInjection: () => resetSessionStartInjection
+  resetSessionStartInjection: () => resetSessionStartInjection,
+  resolveSystemPrompt: () => resolveSystemPrompt
 });
 import { readFileSync as readFileSync25, existsSync as existsSync22 } from "node:fs";
 import { join as join33, resolve as resolve8 } from "node:path";
 import * as path27 from "node:path";
+function resolveSystemPrompt(v) {
+  return typeof v === "function" ? v() : v || "";
+}
 function resetSessionStartInjection(sessionId) {
   sessionStartDone.delete(sessionId);
 }
@@ -19028,8 +19055,8 @@ ${text}` : text });
     model,
     parentMessages: messages,
     // 对齐 CC: fork subagent 继承父对话历史
-    parentSystemPrompt: deps.systemPrompt,
-    // 对齐 CC: fork 共享 prompt cache
+    parentSystemPrompt: resolveSystemPrompt(deps.systemPrompt),
+    // 对齐 CC: fork 共享 prompt cache（0902 每消息现取）
     features: liveConfig.get("agents.defaults.features"),
     // engine config features（AgentTool 读 agentTool.showProgress）
     channelTarget: channelTarget ?? "",

package/dist/engine-startup.mjs

@@ -4124,13 +4124,17 @@ function isDestructiveCommand(command) {
 function sanitizeEnv(env) {
   const result = {};
   for (const [k, v] of Object.entries(env)) {
+    if (ENV_ALLOW_KEYS.includes(k)) {
+      result[k] = v;
+      continue;
+    }
     if (!BLOCKED_ENV_KEYS.some((b) => k.toUpperCase().includes(b))) {
       result[k] = v;
     }
   }
   return result;
 }
-var DANGEROUS_COMMANDS, DESTRUCTIVE_PATTERNS, BLOCKED_ENV_KEYS;
+var DANGEROUS_COMMANDS, DESTRUCTIVE_PATTERNS, BLOCKED_ENV_KEYS, ENV_ALLOW_KEYS;
 var init_bashSecurity = __esm({
   "src/tools/BashTool/bashSecurity.ts"() {
     "use strict";
@@ -4181,6 +4185,7 @@ var init_bashSecurity = __esm({
       "PASSWORD",
       "PRIVATE_KEY"
     ];
+    ENV_ALLOW_KEYS = ["MULTICA_TOKEN"];
   }
 });
 
@@ -13570,10 +13575,26 @@ var AnthropicProvider = class {
         }
       }
     }
+    if (process.env.ENGINE_DUMP_REQUEST === "1") {
+      try {
+        const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+        const dumpPath = __require("node:path").join(process.env.ENGINE_STATE_DIR || ".", "logs", `req-${params.model.replace(/[\/:]/g, "_")}-${ts}.json`);
+        __require("node:fs").writeFileSync(dumpPath, JSON.stringify({ url, headers, body }, null, 1));
+        console.log(`[anthropic] \u{1F4F8} request dumped \u2192 ${__require("node:path").basename(dumpPath)} (${(JSON.stringify(body).length / 1024).toFixed(0)}KB)`);
+      } catch {
+      }
+    }
+    let bodyStr = JSON.stringify(body);
+    if (this.config.wafSingleQuoteWorkaround) {
+      const before = bodyStr.length;
+      bodyStr = bodyStr.replace(/'/g, "\u2019");
+      if (bodyStr.length !== before) {
+      }
+    }
     const retryGen = fetchWithRetry(url, {
       method: "POST",
       headers,
-      body: JSON.stringify(body),
+      body: bodyStr,
       signal: params.signal
     }, "anthropic", this.config.proxy);
     let response;
@@ -14076,7 +14097,9 @@ function createProvider(config) {
         baseUrl: config.baseUrl,
         apiKey: config.apiKey,
         thinking: config.thinking,
-        proxy
+        proxy,
+        wafSingleQuoteWorkaround: config.wafSingleQuoteWorkaround
+        // 0902 agentrouter WAF 引号规避
       });
     case "gemini":
       return new GeminiProvider({
@@ -20180,6 +20203,9 @@ function buildConversationAnchor(inboundMeta, channelName, source, workspace) {
 
 // src/handle-query.ts
 var sessionStartDone = /* @__PURE__ */ new Set();
+function resolveSystemPrompt(v) {
+  return typeof v === "function" ? v() : v || "";
+}
 function resetSessionStartInjection(sessionId) {
   sessionStartDone.delete(sessionId);
 }
@@ -20497,8 +20523,8 @@ ${text}` : text });
     model,
     parentMessages: messages,
     // 对齐 CC: fork subagent 继承父对话历史
-    parentSystemPrompt: deps.systemPrompt,
-    // 对齐 CC: fork 共享 prompt cache
+    parentSystemPrompt: resolveSystemPrompt(deps.systemPrompt),
+    // 对齐 CC: fork 共享 prompt cache（0902 每消息现取）
     features: liveConfig.get("agents.defaults.features"),
     // engine config features（AgentTool 读 agentTool.showProgress）
     channelTarget: channelTarget ?? "",
@@ -25271,7 +25297,7 @@ var VoiceChatPlugin = class _VoiceChatPlugin {
 - \u5982\u679C\u5B9E\u5728\u9700\u8981\u67E5\uFF1A\u5148\u8BF4"\u7B49\u6211\u67E5\u4E0B"\u5E76\u6781\u7B80\u8C03\u7528\uFF0C\u67E5\u5B8C\u7ACB\u523B\u603B\u7ED3\u6210\u4E00\u53E5\u8BDD`;
     const engine = new QueryEngine(llmProvider, {
       model: modelId,
-      systemPrompt: (ctx.deps.systemPrompt || "") + voiceChatRules,
+      systemPrompt: resolveSystemPrompt(ctx.deps.systemPrompt) + voiceChatRules,
       maxTokens: 4096,
       temperature: 0.7,
       disableThinking: !this.config.thinking,
@@ -29771,8 +29797,8 @@ registerCommand({
         sessionManager: deps.sessions,
         sessionId: sid,
         model: deps.config.model,
-        contextWindow: deps.compactConfig.contextWindow || 2e5,
-        systemPrompt: deps.systemPrompt,
+        contextWindow: (typeof deps.compactConfig === "function" ? deps.compactConfig() : deps.compactConfig).contextWindow || 2e5,
+        systemPrompt: resolveSystemPrompt(deps.systemPrompt),
         toolDefs: registry.definitions(),
         workspace: deps.config.workspace
       });
@@ -29820,7 +29846,7 @@ ${question}`;
       const stream = deps.provider.streamChat({
         model: deps.config.model,
         messages: [{ role: "user", content: wrappedQuestion }],
-        systemPrompt: deps.systemPrompt,
+        systemPrompt: resolveSystemPrompt(deps.systemPrompt),
         maxTokens: 2048,
         signal: void 0
       });

package/dist/main.mjs

@@ -4124,13 +4124,17 @@ function isDestructiveCommand(command) {
 function sanitizeEnv(env) {
   const result = {};
   for (const [k, v] of Object.entries(env)) {
+    if (ENV_ALLOW_KEYS.includes(k)) {
+      result[k] = v;
+      continue;
+    }
     if (!BLOCKED_ENV_KEYS.some((b) => k.toUpperCase().includes(b))) {
       result[k] = v;
     }
   }
   return result;
 }
-var DANGEROUS_COMMANDS, DESTRUCTIVE_PATTERNS, BLOCKED_ENV_KEYS;
+var DANGEROUS_COMMANDS, DESTRUCTIVE_PATTERNS, BLOCKED_ENV_KEYS, ENV_ALLOW_KEYS;
 var init_bashSecurity = __esm({
   "src/tools/BashTool/bashSecurity.ts"() {
     "use strict";
@@ -4181,6 +4185,7 @@ var init_bashSecurity = __esm({
       "PASSWORD",
       "PRIVATE_KEY"
     ];
+    ENV_ALLOW_KEYS = ["MULTICA_TOKEN"];
   }
 });
 
@@ -13944,10 +13949,26 @@ var AnthropicProvider = class {
         }
       }
     }
+    if (process.env.ENGINE_DUMP_REQUEST === "1") {
+      try {
+        const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+        const dumpPath = __require("node:path").join(process.env.ENGINE_STATE_DIR || ".", "logs", `req-${params.model.replace(/[\/:]/g, "_")}-${ts}.json`);
+        __require("node:fs").writeFileSync(dumpPath, JSON.stringify({ url, headers, body }, null, 1));
+        console.log(`[anthropic] \u{1F4F8} request dumped \u2192 ${__require("node:path").basename(dumpPath)} (${(JSON.stringify(body).length / 1024).toFixed(0)}KB)`);
+      } catch {
+      }
+    }
+    let bodyStr = JSON.stringify(body);
+    if (this.config.wafSingleQuoteWorkaround) {
+      const before = bodyStr.length;
+      bodyStr = bodyStr.replace(/'/g, "\u2019");
+      if (bodyStr.length !== before) {
+      }
+    }
     const retryGen = fetchWithRetry(url, {
       method: "POST",
       headers,
-      body: JSON.stringify(body),
+      body: bodyStr,
       signal: params.signal
     }, "anthropic", this.config.proxy);
     let response;
@@ -14450,7 +14471,9 @@ function createProvider(config2) {
         baseUrl: config2.baseUrl,
         apiKey: config2.apiKey,
         thinking: config2.thinking,
-        proxy
+        proxy,
+        wafSingleQuoteWorkaround: config2.wafSingleQuoteWorkaround
+        // 0902 agentrouter WAF 引号规避
       });
     case "gemini":
       return new GeminiProvider({
@@ -20554,6 +20577,9 @@ function buildConversationAnchor(inboundMeta, channelName, source, workspace) {
 
 // src/handle-query.ts
 var sessionStartDone = /* @__PURE__ */ new Set();
+function resolveSystemPrompt(v) {
+  return typeof v === "function" ? v() : v || "";
+}
 function resetSessionStartInjection(sessionId) {
   sessionStartDone.delete(sessionId);
 }
@@ -20871,8 +20897,8 @@ ${text}` : text });
     model,
     parentMessages: messages,
     // 对齐 CC: fork subagent 继承父对话历史
-    parentSystemPrompt: deps.systemPrompt,
-    // 对齐 CC: fork 共享 prompt cache
+    parentSystemPrompt: resolveSystemPrompt(deps.systemPrompt),
+    // 对齐 CC: fork 共享 prompt cache（0902 每消息现取）
     features: liveConfig.get("agents.defaults.features"),
     // engine config features（AgentTool 读 agentTool.showProgress）
     channelTarget: channelTarget ?? "",
@@ -25645,7 +25671,7 @@ var VoiceChatPlugin = class _VoiceChatPlugin {
 - \u5982\u679C\u5B9E\u5728\u9700\u8981\u67E5\uFF1A\u5148\u8BF4"\u7B49\u6211\u67E5\u4E0B"\u5E76\u6781\u7B80\u8C03\u7528\uFF0C\u67E5\u5B8C\u7ACB\u523B\u603B\u7ED3\u6210\u4E00\u53E5\u8BDD`;
     const engine = new QueryEngine(llmProvider, {
       model: modelId,
-      systemPrompt: (ctx.deps.systemPrompt || "") + voiceChatRules,
+      systemPrompt: resolveSystemPrompt(ctx.deps.systemPrompt) + voiceChatRules,
       maxTokens: 4096,
       temperature: 0.7,
       disableThinking: !this.config.thinking,
@@ -29855,8 +29881,8 @@ registerCommand({
         sessionManager: deps.sessions,
         sessionId: sid,
         model: deps.config.model,
-        contextWindow: deps.compactConfig.contextWindow || 2e5,
-        systemPrompt: deps.systemPrompt,
+        contextWindow: (typeof deps.compactConfig === "function" ? deps.compactConfig() : deps.compactConfig).contextWindow || 2e5,
+        systemPrompt: resolveSystemPrompt(deps.systemPrompt),
         toolDefs: registry.definitions(),
         workspace: deps.config.workspace
       });
@@ -29904,7 +29930,7 @@ ${question}`;
       const stream = deps.provider.streamChat({
         model: deps.config.model,
         messages: [{ role: "user", content: wrappedQuestion }],
-        systemPrompt: deps.systemPrompt,
+        systemPrompt: resolveSystemPrompt(deps.systemPrompt),
         maxTokens: 2048,
         signal: void 0
       });

package/package.json

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