engine7 7.1.59 → 7.1.61

package/dist/cli.mjs

@@ -12272,8 +12272,14 @@ var init_my_eyes = __esm({
           return { content: "Error: my_eyes \u672A\u914D\u7F6E\u3002\u8BF7\u5728 config.tools.my_eyes.model \u8BBE\u7F6E\uFF08\u683C\u5F0F\uFF1Aprovider/model\uFF09\u3002", isError: true };
         }
         const slashIdx = modelRef.indexOf("/");
+        const providerId = modelRef.slice(0, slashIdx);
         const modelId = modelRef.slice(slashIdx + 1);
-        const provider = ctx.provider;
+        const providerCfg = (liveConfig.get("providers") || {})[providerId];
+        if (!providerCfg) {
+          return { content: `Error: tools.my_eyes.model \u7684 provider "${providerId}" \u4E0D\u5B58\u5728\u4E8E providers \u914D\u7F6E\u3002\u68C0\u67E5 config \u91CC models.providers.${providerId}\u3002`, isError: true };
+        }
+        const { createProvider: createProvider2 } = await Promise.resolve().then(() => (init_provider_factory(), provider_factory_exports));
+        const provider = createProvider2(providerCfg);
         if (!provider?.streamChat) {
           return { content: "Error: provider \u4E0D\u53EF\u7528\u3002", isError: true };
         }
@@ -12781,6 +12787,115 @@ async function wavToOggOpus(wavPath) {
   fs18.unlinkSync(wavPath);
   return oggPath;
 }
+async function sendVoiceToMulticaIssue(text, issueId, opts) {
+  const vc = liveConfig.get("tools.my_voice");
+  let audioPath = "";
+  let actualEngine = opts.engine || vc?.provider || "edge";
+  try {
+    if (actualEngine === "qwen3-3060" && vc?.url) {
+      try {
+        const { oggPath } = await ttsQwen3Opus(text, { url: vc.url, voice: vc.voice, lang: vc.lang });
+        audioPath = oggPath;
+      } catch (e) {
+        console.warn(`[my-voice:multaca] qwen3 opus failed (${e.message}), trying PCM`);
+        const pcmChunks = [];
+        await ttsQwen3Local(text, { url: vc.url, voice: vc.voice, lang: vc.lang }, (pcm2) => pcmChunks.push(pcm2));
+        const pcm = Buffer.concat(pcmChunks);
+        fs18.mkdirSync(VOICE_DIR, { recursive: true });
+        const wavPath = path19.join(VOICE_DIR, `tts_mc_${Date.now()}.wav`);
+        const header = Buffer.alloc(44);
+        header.write("RIFF", 0);
+        header.writeUInt32LE(36 + pcm.length, 4);
+        header.write("WAVE", 8);
+        header.write("fmt ", 12);
+        header.writeUInt32LE(16, 16);
+        header.writeUInt16LE(1, 20);
+        header.writeUInt16LE(1, 22);
+        header.writeUInt32LE(24e3, 24);
+        header.writeUInt32LE(48e3, 28);
+        header.writeUInt16LE(2, 32);
+        header.writeUInt16LE(16, 34);
+        header.write("data", 36);
+        header.writeUInt32LE(pcm.length, 40);
+        fs18.writeFileSync(wavPath, Buffer.concat([header, pcm]));
+        audioPath = wavPath;
+      }
+    } else if (actualEngine === "cosyvoice" && vc?.apiKey) {
+      audioPath = await ttsCosyvoice(text, vc.apiKey, vc.model || "cosyvoice-v1", vc.voice, vc.workspaceId, vc.instruction);
+    } else if (actualEngine === "gptsovits") {
+      audioPath = await ttsGptsovits(text);
+    } else {
+      audioPath = await ttsEdge(text);
+      actualEngine = "edge";
+    }
+  } catch (e) {
+    return { content: `\u8BED\u97F3\u751F\u6210\u5931\u8D25\uFF08headless\u2192multaca\uFF09\uFF1A${e.message}\u3002\u8BF7\u7528\u6587\u5B57\u56DE\u590D\u4EE3\u66FF\u3002`, isError: true };
+  }
+  if (!audioPath || !fs18.existsSync(audioPath)) {
+    return { content: "\u8BED\u97F3\u751F\u6210\u5931\u8D25\uFF08headless\u2192multaca\uFF09\uFF1ATTS \u672A\u4EA7\u51FA\u6587\u4EF6\u3002\u8BF7\u7528\u6587\u5B57\u56DE\u590D\u4EE3\u66FF\u3002", isError: true };
+  }
+  if (audioPath.endsWith(".wav")) {
+    try {
+      audioPath = await wavToOggOpus(audioPath);
+    } catch (e) {
+      console.warn(`[my-voice:multaca] opus encode failed (${e.message}), attaching wav`);
+    }
+  }
+  const ext = path19.extname(audioPath).toLowerCase();
+  const sizeKB = fs18.statSync(audioPath).size / 1024;
+  const voiceFile = `voice_${Date.now()}${ext}`;
+  const cwdCopy = path19.join(process.cwd(), voiceFile);
+  try {
+    fs18.copyFileSync(audioPath, cwdCopy);
+  } catch (e) {
+    try {
+      fs18.unlinkSync(audioPath);
+    } catch {
+    }
+    return { content: `\u8BED\u97F3\u6302\u8F7D\u5931\u8D25\uFF08\u62F7\u8D1D\u5230\u5DE5\u4F5C\u76EE\u5F55\uFF09\uFF1A${e.message}`, isError: true };
+  }
+  try {
+    fs18.unlinkSync(audioPath);
+  } catch {
+  }
+  const content = opts.caption || `\u{1F399}\uFE0F \u8BED\u97F3\u6D88\u606F\uFF08${text.length} \u5B57\uFF09`;
+  try {
+    const { execFile: execFile3 } = await import("node:child_process");
+    const { promisify: promisify3 } = await import("node:util");
+    const execFileA = promisify3(execFile3);
+    const { stdout } = await execFileA("multica", [
+      "issue",
+      "comment",
+      "add",
+      issueId,
+      "--content",
+      content,
+      "--attachment",
+      voiceFile,
+      "--output",
+      "json"
+    ], { timeout: 6e4 });
+    let ok = false;
+    try {
+      const parsed = JSON.parse(stdout);
+      ok = !!(parsed?.comment_id || parsed?.id || parsed?.attachments && parsed.attachments.length > 0);
+    } catch {
+      ok = stdout.includes("Comment added");
+    }
+    if (!ok) throw new Error(`unexpected CLI output: ${String(stdout).slice(0, 200)}`);
+    try {
+      fs18.unlinkSync(cwdCopy);
+    } catch {
+    }
+    return { content: `Voice sent to multaca issue ${issueId}! (${actualEngine}, ${sizeKB.toFixed(0)}KB, \u9644\u4EF6\u5DF2\u6302\u5230\u8BC4\u8BBA\u2014\u2014\u5728 multaca \u5BA2\u6237\u7AEF\u64AD\u653E)` };
+  } catch (e) {
+    try {
+      fs18.unlinkSync(cwdCopy);
+    } catch {
+    }
+    return { content: `\u8BED\u97F3\u6302\u5230 multaca issue \u5931\u8D25\uFF1A${e.message}\u3002\u8BF7\u7528\u6587\u5B57\u56DE\u590D\u4EE3\u66FF\u3002`, isError: true };
+  }
+}
 var execFileAsync, VOICE_DIR, _pyCache, GPTSOVITS_API, GPTSOVITS_REF_WAV, GPTSOVITS_REF_TEXT, GPTSOVITS_REF_LANG, EDGE_VOICE;
 var init_my_voice = __esm({
   "src/tools/my-voice.ts"() {
@@ -12806,7 +12921,8 @@ var init_my_voice = __esm({
           text: { type: "string", description: "What to say (Chinese text)." },
           engine: { type: "string", enum: ["cosyvoice", "gptsovits", "qwen3-3060", "edge"], description: "TTS engine. cosyvoice = \u767E\u70BCAPI (default if configured), gptsovits = local voice clone, qwen3-3060 = \u672C\u5730 GGML Q8_0 (3060), edge = backup." },
           channel: { type: "string", enum: ["weixin", "feishu", "discord"], description: "Target channel. Default: current channel." },
-          to: { type: "string", description: "Recipient ID. \u5FAE\u4FE1\u683C\u5F0F o\u5F00\u5934@im.wechat\u7ED3\u5C3E\uFF0C\u98DE\u4E66\u683C\u5F0F ou_\u5F00\u5934 open_id\u3002\u4E0D\u786E\u5B9A\u5C31\u5148 read prompts/contacts.md \u67E5\u6536\u4EF6\u4EBA ID\u3002" },
+          to: { type: "string", description: "Recipient ID. \u5FAE\u4FE1\u683C\u5F0F o\u5F00\u5934@im.wechat\u7ED3\u5C3E\uFF0C\u98DE\u4E66\u683C\u5F0F ou_\u5F00\u5934 open_id\u3002\u4E0D\u786E\u5B9A\u5C31\u5148 read prompts/contacts.md \u67E5\u6536\u4EF6\u4EBA ID\u3002multaca \u4EFB\u52A1\u91CC\u4E0D\u9700\u8981\u586B to\u2014\u2014\u8BED\u97F3\u4F1A\u6302\u5230\u5F53\u524D issue \u8BC4\u8BBA\uFF0C\u586B issueId \u6307\u5B9A\u76EE\u6807 issue\u3002" },
+          issueId: { type: "string", description: 'multaca headless \u4E13\u7528\uFF1A\u76EE\u6807 issue ID\uFF08\u4EFB\u52A1 prompt \u91CC\u7684 "Your assigned issue ID"\uFF09\u3002\u666E\u901A\u98DE\u4E66/\u5FAE\u4FE1\u573A\u666F\u4E0D\u8981\u586B\u3002' },
           caption: { type: "string", description: "Optional text to accompany the voice message." }
         },
         required: ["text"]
@@ -12817,7 +12933,17 @@ var init_my_voice = __esm({
         const requestedEngine = args.engine || "";
         const caption = args.caption || "";
         const mgr = ctx.channelManager;
-        if (!mgr) return { content: "\u53D1\u9001\u5931\u8D25: \u6CA1\u6709 ChannelManager", isError: true };
+        if (!mgr) {
+          const multicaTaskId = process.env.MULTICA_TASK_ID || "";
+          const issueId = args.issueId || multicaTaskId;
+          if (multicaTaskId && issueId) {
+            return await sendVoiceToMulticaIssue(text, issueId, { engine: requestedEngine, caption });
+          }
+          return {
+            content: "\u8BED\u97F3\u672A\u53D1\u9001\uFF1A\u5F53\u524D\u662F\u65E0\u6E20\u9053\u73AF\u5883\uFF08headless/CLI\uFF09\uFF0C\u4E14\u6CA1\u6709 multaca \u4EFB\u52A1\u4E0A\u4E0B\u6587\uFF08MULTICA_TASK_ID\uFF09\u6216 issueId\u3002\u6CA1\u6709\u53EF\u7528\u7684\u53D1\u9001\u51FA\u53E3\uFF0C\u8BF7\u7528\u6587\u5B57\u56DE\u590D\u4EE3\u66FF\u3002",
+            isError: true
+          };
+        }
         const resolvedChannelRaw = args.channel || (ctx.channel === "deskBuddy" ? "feishu" : ctx.channel) || "feishu";
         const resolvedChannel = resolvedChannelRaw === "weixin" ? "wechat" : resolvedChannelRaw;
         let target = args.to || ctx.channelTarget || ctx.from;
@@ -19566,6 +19692,7 @@ function parseCcRunArgs(argv) {
     verbose: false,
     sessionId: "",
     maxTurns: void 0,
+    noRecall: false,
     stateDir: "",
     configName: "",
     agentName: ""
@@ -19600,12 +19727,16 @@ function parseCcRunArgs(argv) {
       args.sessionId = takeValue();
     } else if (a === "--max-turns") {
       args.maxTurns = parseInt(takeValue(), 10) || void 0;
+    } else if (a === "--no-recall") {
+      args.noRecall = true;
     } else if (a === "--state-dir") {
       args.stateDir = takeValue().trim();
     } else if (a === "--config") {
       args.configName = takeValue().trim();
     } else if (a === "--agent") {
       args.agentName = takeValue().trim();
+    } else if (a === "--resume") {
+      takeValue();
     }
   }
   if (!hasPrompt) {
@@ -19739,6 +19870,8 @@ async function runQuery(args) {
   await Promise.resolve().then(() => (init_tools_bundle(), tools_bundle_exports));
   const { registry: registry2 } = await Promise.resolve().then(() => (init_registry(), registry_exports));
   registry2.config = config;
+  const { liveConfig: liveConfig2 } = await Promise.resolve().then(() => (init_live(), live_exports));
+  liveConfig2.init(config);
   const { handleQuery: handleQuery2 } = await Promise.resolve().then(() => (init_handle_query(), handle_query_exports));
   const deps = {
     engine,
@@ -19754,6 +19887,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 = "";
@@ -19777,8 +19918,8 @@ async function runQuery(args) {
     // channelTarget
     void 0,
     // inboundMeta
-    void 0,
-    // skipRecall
+    args.noRecall || /quick-create assistant/i.test(args.prompt),
+    // skipRecall（--no-recall 或建单任务自动跳过：daemon 拼的 quick-create prompt 是机械转述，recall sideQuery 在子进程里拖 30-65s）
     "cc-run"
     // source
   );