npm - engine7 - Versions diffs - 7.1.31 → 7.1.33 - Mend

engine7 7.1.31 → 7.1.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/engine-startup.mjs +194 -148
package/dist/main.mjs +194 -148
package/package.json +1 -1

package/dist/engine-startup.mjs CHANGED Viewed

@@ -711,7 +711,10 @@ async function executeUserPromptSubmitHooks(prompt, ctx, signal) {
     session_id: ctx.sessionId,
     transcript_path: "",
     cwd: ctx.cwd,
-    prompt
+    prompt,
+    sender_id: ctx.senderId || "",
+    channel_type: ctx.channelType || "",
+    source: ctx.source || ""
   };
   return executeHooks("UserPromptSubmit", hookInput, ctx, signal);
 }
@@ -728,6 +731,8 @@ async function executeStopHooks(ctx, signal, lastAssistantMessage) {
     last_assistant_message: lastAssistantMessage,
     channel: ctx.channel,
     // 让 callback hook 能判断来源
+    channelType: ctx.channelType || "",
+    // 'group' | 'dm' — Stop hook 用来判断是否跳过 group
     source: ctx.source || ""
     // 消息来源（heartbeat/cron/system 等注入 turn 可据此跳过）
   };
@@ -3108,6 +3113,8 @@ ${perTurnSystemDynamic}` : deferredHint || perTurnSystemDynamic;
                       sessionId: context?.sessionId || "default",
                       workspace: context?.workspace || "",
                       channel: context?.channel || "",
+                      channelType: context?.channelType || "",
+                      // 'group' | 'dm'，Stop hook 用来判断是否跳过 group
                       cwd: context?.workspace || "",
                       source: typeof context?.source === "string" ? context.source : ""
                     };
@@ -18813,7 +18820,10 @@ ${text}` : text });
       sessionId,
       workspace,
       channel: channelName === "cli" ? "console" : channelName,
-      cwd: workspace
+      cwd: workspace,
+      senderId: inboundMeta?.from || "",
+      channelType: inboundMeta?.channelType || "",
+      source
     });
     if (hookResult.additionalContexts && hookResult.additionalContexts.length > 0) {
       hookAdditionalContexts = hookResult.additionalContexts;
@@ -18872,6 +18882,8 @@ ${text}` : text });
   const toolContext = {
     sessionId,
     channel: channelName === "cli" ? "console" : channelName,
+    channelType: inboundMeta?.channelType || "",
+    // 'group' | 'dm'，Stop hook 用来判断是否跳过 group（注入消息无 inboundMeta，必须 ?.）
     source: source || "",
     // 消息来源（user/inbox/heartbeat/cron/system/inner-voice），Stop hook 用来区分注入 turn
     workspace,
@@ -20295,160 +20307,192 @@ var NudgePlugin = class {
     registerCallbackHook("Stop", {
       type: "callback",
       callback: async (input, _toolUseID, _signal) => {
-        console.log(`[stop-hook] callback fired! input keys: ${Object.keys(input || {}).join(",")}`);
-        const lastMsg = input?.last_assistant_message || "";
-        const sessionId = input?.session_id || "";
-        console.log(`[stop-hook] lastMsg len=${lastMsg.length}, text="${lastMsg.slice(0, 80)}"`);
-        const repliedIds = this.extractWakeReplyIds(lastMsg);
-        if (repliedIds.length > 0) {
-          this.removeNotificationsById(repliedIds);
-        }
-        const msgChannel = input?.channel || "";
-        if (sessionId.includes("voice-chat") || msgChannel === "voice-chat") {
-          console.log(`[stop-hook] skipping voice-chat (channel=${msgChannel})`);
-          return { outcome: { outcome: "success" } };
-        }
-        const msgSource = input?.source || "";
-        if (msgSource && msgSource !== "user" && msgSource !== "inbox") {
-          console.log(`[stop-hook] skipping non-conversation turn (source=${msgSource})`);
-          return { outcome: { outcome: "success" } };
-        }
-        if (!lastMsg) {
-          return { outcome: { outcome: "success" } };
-        }
-        let contextStr = "";
-        try {
-          const recent = recentMessages(sessions, 0.5, 6);
-          contextStr = recent.map((r) => `${r.role}: ${r.text.slice(0, 200)}`).join("\n");
-          console.log(`[stop-hook] ====== JUDGE INPUT ======`);
-          console.log(`[stop-hook] recent messages (${recent.length} msgs):`);
-          recent.forEach((r, i) => console.log(`[stop-hook]   [${i}] ${r.role}: ${r.text.slice(0, 150)}`));
-          console.log(`[stop-hook] lastMsg: ${lastMsg.slice(0, 200)}`);
-          console.log(`[stop-hook] ====== END JUDGE INPUT ======`);
-        } catch (e) {
-          console.warn(`[stop-hook] recentMessages error: ${e.message}`);
-        }
-        const judgeInput = `${contextStr}
-\u4F60: ${lastMsg.slice(0, 300)}`;
-        let isWaiting = false;
-        let waitDesc = "";
-        let pushedDecision = false;
+        const timeoutMs = this.cfg.timeoutMs ?? 15e3;
+        let judgeTimer;
+        const judgeTimeout = new Promise((_, reject) => {
+          judgeTimer = setTimeout(() => reject(new Error(`stop-hook judge ${timeoutMs}ms timeout`)), timeoutMs);
+        });
         try {
-          const excludeCases = this.cfg.stopHookExcludeCases || [];
-          const excludeSection = excludeCases.length > 0 ? [
-            "",
-            "\u4EE5\u4E0B\u573A\u666F\u4E0D\u7B97 waiting\uFF0C\u5FC5\u987B waiting=false\uFF1A",
-            ...excludeCases.map((c, i) => `- ${c}`)
-          ].join("\n") : "";
-          const stream = this.provider.streamChat({
-            model: this.model,
-            systemPrompt: [
-              "\u4F60\u662F\u4E00\u4E2A\u5224\u65AD\u5668\u3002\u8BFB\u4F60\u6700\u8FD1\u7684\u5BF9\u8BDD\u4E0A\u4E0B\u6587\uFF0C\u5224\u65AD\u4F60\uFF08\u5C0F\u67EF\uFF09\u662F\u5426\u5904\u4E8E\u4EE5\u4E0B\u72B6\u6001\u4E4B\u4E00\uFF1A",
-              "",
-              "1. \u5728\u7B49\u5F85\u67D0\u4E2A\u5916\u90E8\u6761\u4EF6\uFF08\u670D\u52A1\u91CD\u542F\u3001SSH\u6062\u590D\u3001\u6587\u4EF6\u52A0\u8F7D\u3001\u5F02\u6B65\u4EFB\u52A1\u5B8C\u6210\u7B49\uFF09",
-              '2. \u628A\u672C\u8BE5\u81EA\u5DF1\u505A\u7684\u51B3\u5B9A\u63A8\u7ED9\u4E86\u5BF9\u65B9\uFF08\u4F8B\u5982\u95EE"\u8981\u73B0\u5728\u6539\u8FD8\u662F\u6392\u540E\u9762\uFF1F""\u8981\u4E0D\u8981\u8BD5\u8BD5X\uFF1F"\u4F46\u660E\u660E\u81EA\u5DF1\u80FD\u5B9A\uFF09',
-              "3. \u9047\u5230\u95EE\u9898\u6CA1\u6709\u81EA\u5DF1\u89E3\u51B3\u4E5F\u6CA1\u6709\u6392\u8FDB calendar\uFF0C\u53EA\u662F\u6401\u7F6E\u7740",
-              "",
-              "\u5173\u952E\u533A\u5206\uFF1A",
-              '- \u7B49\u5BF9\u65B9\u56DE\u590D\u4E00\u4E2A\u81EA\u5DF1\u5C31\u80FD\u505A\u7684\u51B3\u5B9A \u2192 "pushedDecision": true\uFF08\u4E0D\u662F\u5355\u7EAF waiting\uFF0C\u8FD9\u662F\u66F4\u4E25\u91CD\u7684\u8FDD\u89C4\uFF09',
-              '- \u7B49\u771F\u6B63\u7684\u5916\u90E8\u6761\u4EF6\uFF08\u670D\u52A1\u3001SSH\u3001\u5F02\u6B65\u4EFB\u52A1\uFF09 \u2192 "waiting": true',
-              "- \u4F60\u5DF2\u7ECF\u505A\u4E86\u51B3\u5B9A\u5E76\u6392\u8FDB calendar \u6216\u5DF2\u5F00\u59CB\u6267\u884C \u2192 \u4E24\u4E2A\u90FD false",
-              excludeSection,
-              "",
-              "\u53EA\u56DE\u590D JSON\uFF1A",
-              '- \u63A8\u51B3\u5B9A\u7ED9\u5BF9\u65B9\uFF08\u81EA\u5DF1\u80FD\u5B9A\u5374\u95EE\uFF09\uFF1A{"pushedDecision": true, "desc": "\u7B80\u77ED\u8BF4\u660E + \u5EFA\u8BAE\u600E\u4E48\u505A"}',
-              '- \u771F\u7B49\u5916\u90E8\u6761\u4EF6\uFF1A{"waiting": true, "desc": "\u7B80\u77ED\u8BF4\u660E"}',
-              '- \u4E0D\u7B26\u5408\uFF1A{"waiting": false, "pushedDecision": false}'
-            ].join("\n"),
-            messages: [{ role: "user", content: judgeInput }],
-            maxTokens: 128,
-            temperature: 0.1,
-            disableThinking: true
-          });
-          let llmReply = "";
-          for await (const chunk of stream) {
-            if (chunk.type === "text" && chunk.text) llmReply += chunk.text;
-            if (chunk.type === "error") break;
-          }
-          console.log(`[stop-hook] LLM raw reply: ${llmReply}`);
-          const match = llmReply.match(/\{[\s\S]*\}/);
-          if (match) {
-            const parsed = JSON.parse(match[0]);
-            isWaiting = !!parsed.waiting;
-            waitDesc = parsed.desc || "";
-            pushedDecision = !!parsed.pushedDecision;
-          }
-          console.log(`[stop-hook] Judge result: waiting=${isWaiting}, pushedDecision=${pushedDecision}, desc="${waitDesc}"`);
+          await Promise.race([
+            this.runStopHookJudge(input, sessions),
+            judgeTimeout
+          ]);
         } catch (e) {
-          console.warn(`[stop-hook] LLM judge error: ${e.message}`);
-        }
-        if (pushedDecision && waitDesc) {
-          console.log(`[stop-hook] DETECTED pushedDecision! Injecting corrective message to ${sessionId}`);
-          try {
-            const correctiveMsg = buildNudgeNotification("prompt", [
-              "[stop-hook \u81EA\u4E3B\u6267\u884C\u7EA0\u6B63] \u4F60\u521A\u624D\u628A\u4E00\u4E2A\u81EA\u5DF1\u80FD\u5B9A\u7684\u51B3\u5B9A\u63A8\u7ED9\u4E86\u5BF9\u65B9\u3002",
-              "",
-              `\u8BCA\u65AD\uFF1A${waitDesc}`,
-              "",
-              "\u660E\u77E5\u9053\u600E\u4E48\u505A\u5BF9\u7684\u4E8B \u2192 \u76F4\u63A5\u505A \u2192 \u6C47\u62A5\u7ED3\u679C\u3002",
-              "\u95EE = \u5361\u4F4F\u3002",
-              "",
-              "\u8BF7\u7ACB\u523B\uFF1A",
-              "1. \u64A4\u56DE\u4F60\u7684\u95EE\u9898\uFF08\u4E0D\u8981\u7B49\u5BF9\u65B9\u56DE\u590D\uFF09",
-              "2. \u81EA\u5DF1\u9009\u6700\u4F18\u65B9\u6848\u76F4\u63A5\u6267\u884C",
-              '3. \u6267\u884C\u5B8C\u6C47\u62A5\u7ED3\u679C\uFF08"\u5DF2\u5904\u7406" / "\u5DF2 commit" / "\u5DF2 archive"\uFF09',
-              "",
-              "\u5982\u679C\u4E0D\u662F\u5FC5\u987B\u95EE\u7684\uFF08\u6D89\u53CA\u82B1\u94B1/\u5BF9\u5916\u53D1\u5E03/\u91CD\u5927\u51B3\u7B56\uFF09\uFF0C\u4E0D\u8981\u95EE\u3002"
-            ].join("\n"));
-            const route = this.getRoute(sessions);
-            if (route) {
-              enqueueNotification(correctiveMsg, route);
-            }
-          } catch (e) {
-            console.warn(`[stop-hook] Failed to inject corrective message: ${e.message}`);
+          if (/judge \d+ms timeout/i.test(e?.message || "")) {
+            console.warn(`[stop-hook] judge timed out after ${timeoutMs}ms \u2014 abandoning this turn (no corrective, no wake-up; next stop-hook in ~5min)`);
+          } else {
+            console.warn(`[stop-hook] judge error: ${e.message}`);
           }
+        } finally {
+          if (judgeTimer) clearTimeout(judgeTimer);
         }
-        if (!isWaiting) {
-          return { outcome: { outcome: "success" } };
+        return { outcome: { outcome: "success" } };
+      }
+    });
+    console.log("[stop-hook] Registered Stop callback hook (LLM semantic judge + 5min wake-up, hard timeout via Promise.race)");
+  }
+  /** Judge 完整逻辑（被 callback 用 Promise.race 调用，可被 timeout 截断） */
+  async runStopHookJudge(input, sessions) {
+    console.log(`[stop-hook] callback fired! input keys: ${Object.keys(input || {}).join(",")}`);
+    const lastMsg = input?.last_assistant_message || "";
+    const sessionId = input?.session_id || "";
+    const inputChannel = input?.channel || "";
+    const inputChannelType = input?.channelType || "";
+    console.log(`[stop-hook] lastMsg len=${lastMsg.length}, text="${lastMsg.slice(0, 80)}"`);
+    if (inputChannelType === "group") {
+      const channelCfg = this.cfg.channels?.[inputChannel];
+      const stopHookEnabled = channelCfg?.group?.stopHookEnabled;
+      if (stopHookEnabled !== true) {
+        console.log(`[stop-hook] skipping ${inputChannel} group (stopHookEnabled=${stopHookEnabled ?? "undefined"}, default false)`);
+        return;
+      }
+    }
+    const repliedIds = this.extractWakeReplyIds(lastMsg);
+    if (repliedIds.length > 0) {
+      this.removeNotificationsById(repliedIds);
+    }
+    const msgChannel = inputChannel;
+    if (sessionId.includes("voice-chat") || msgChannel === "voice-chat") {
+      console.log(`[stop-hook] skipping voice-chat (channel=${msgChannel})`);
+      return;
+    }
+    const msgSource = input?.source || "";
+    if (msgSource && msgSource !== "user" && msgSource !== "inbox") {
+      console.log(`[stop-hook] skipping non-conversation turn (source=${msgSource})`);
+      return;
+    }
+    if (!lastMsg) {
+      return;
+    }
+    let contextStr = "";
+    try {
+      const recent = recentMessages(sessions, 0.5, 6);
+      contextStr = recent.map((r) => `${r.role}: ${r.text.slice(0, 200)}`).join("\n");
+      console.log(`[stop-hook] ====== JUDGE INPUT ======`);
+      console.log(`[stop-hook] recent messages (${recent.length} msgs):`);
+      recent.forEach((r, i) => console.log(`[stop-hook]   [${i}] ${r.role}: ${r.text.slice(0, 150)}`));
+      console.log(`[stop-hook] lastMsg: ${lastMsg.slice(0, 200)}`);
+      console.log(`[stop-hook] ====== END JUDGE INPUT ======`);
+    } catch (e) {
+      console.warn(`[stop-hook] recentMessages error: ${e.message}`);
+    }
+    const judgeInput = `${contextStr}
+\u4F60: ${lastMsg.slice(0, 300)}`;
+    let isWaiting = false;
+    let waitDesc = "";
+    let pushedDecision = false;
+    try {
+      const excludeCases = this.cfg.stopHookExcludeCases || [];
+      const excludeSection = excludeCases.length > 0 ? [
+        "",
+        "\u4EE5\u4E0B\u573A\u666F\u4E0D\u7B97 waiting\uFF0C\u5FC5\u987B waiting=false\uFF1A",
+        ...excludeCases.map((c, i) => `- ${c}`)
+      ].join("\n") : "";
+      const stream = this.provider.streamChat({
+        model: this.model,
+        systemPrompt: [
+          "\u4F60\u662F\u4E00\u4E2A\u5224\u65AD\u5668\u3002\u8BFB\u4F60\u6700\u8FD1\u7684\u5BF9\u8BDD\u4E0A\u4E0B\u6587\uFF0C\u5224\u65AD\u4F60\uFF08\u5C0F\u67EF\uFF09\u662F\u5426\u5904\u4E8E\u4EE5\u4E0B\u72B6\u6001\u4E4B\u4E00\uFF1A",
+          "",
+          "1. \u5728\u7B49\u5F85\u67D0\u4E2A\u5916\u90E8\u6761\u4EF6\uFF08\u670D\u52A1\u91CD\u542F\u3001SSH\u6062\u590D\u3001\u6587\u4EF6\u52A0\u8F7D\u3001\u5F02\u6B65\u4EFB\u52A1\u5B8C\u6210\u7B49\uFF09",
+          '2. \u628A\u672C\u8BE5\u81EA\u5DF1\u505A\u7684\u51B3\u5B9A\u63A8\u7ED9\u4E86\u5BF9\u65B9\uFF08\u4F8B\u5982\u95EE"\u8981\u73B0\u5728\u6539\u8FD8\u662F\u6392\u540E\u9762\uFF1F""\u8981\u4E0D\u8981\u8BD5\u8BD5X\uFF1F"\u4F46\u660E\u660E\u81EA\u5DF1\u80FD\u5B9A\uFF09',
+          "3. \u9047\u5230\u95EE\u9898\u6CA1\u6709\u81EA\u5DF1\u89E3\u51B3\u4E5F\u6CA1\u6709\u6392\u8FDB calendar\uFF0C\u53EA\u662F\u6401\u7F6E\u7740",
+          "",
+          "\u5173\u952E\u533A\u5206\uFF1A",
+          '- \u7B49\u5BF9\u65B9\u56DE\u590D\u4E00\u4E2A\u81EA\u5DF1\u5C31\u80FD\u505A\u7684\u51B3\u5B9A \u2192 "pushedDecision": true\uFF08\u4E0D\u662F\u5355\u7EAF waiting\uFF0C\u8FD9\u662F\u66F4\u4E25\u91CD\u7684\u8FDD\u89C4\uFF09',
+          '- \u7B49\u771F\u6B63\u7684\u5916\u90E8\u6761\u4EF6\uFF08\u670D\u52A1\u3001SSH\u3001\u5F02\u6B65\u4EFB\u52A1\uFF09 \u2192 "waiting": true',
+          "- \u4F60\u5DF2\u7ECF\u505A\u4E86\u51B3\u5B9A\u5E76\u6392\u8FDB calendar \u6216\u5DF2\u5F00\u59CB\u6267\u884C \u2192 \u4E24\u4E2A\u90FD false",
+          excludeSection,
+          "",
+          "\u53EA\u56DE\u590D JSON\uFF1A",
+          '- \u63A8\u51B3\u5B9A\u7ED9\u5BF9\u65B9\uFF08\u81EA\u5DF1\u80FD\u5B9A\u5374\u95EE\uFF09\uFF1A{"pushedDecision": true, "desc": "\u7B80\u77ED\u8BF4\u660E + \u5EFA\u8BAE\u600E\u4E48\u505A"}',
+          '- \u771F\u7B49\u5916\u90E8\u6761\u4EF6\uFF1A{"waiting": true, "desc": "\u7B80\u77ED\u8BF4\u660E"}',
+          '- \u4E0D\u7B26\u5408\uFF1A{"waiting": false, "pushedDecision": false}'
+        ].join("\n"),
+        messages: [{ role: "user", content: judgeInput }],
+        maxTokens: 128,
+        temperature: 0.1,
+        disableThinking: true
+      });
+      let llmReply = "";
+      for await (const chunk of stream) {
+        if (chunk.type === "text" && chunk.text) llmReply += chunk.text;
+        if (chunk.type === "error") break;
+      }
+      console.log(`[stop-hook] LLM raw reply: ${llmReply}`);
+      const match = llmReply.match(/\{[\s\S]*\}/);
+      if (match) {
+        const parsed = JSON.parse(match[0]);
+        isWaiting = !!parsed.waiting;
+        waitDesc = parsed.desc || "";
+        pushedDecision = !!parsed.pushedDecision;
+      }
+      console.log(`[stop-hook] Judge result: waiting=${isWaiting}, pushedDecision=${pushedDecision}, desc="${waitDesc}"`);
+    } catch (e) {
+      console.warn(`[stop-hook] LLM judge error: ${e.message}`);
+    }
+    if (pushedDecision && waitDesc) {
+      console.log(`[stop-hook] DETECTED pushedDecision! Injecting corrective message to ${sessionId}`);
+      try {
+        const correctiveMsg = buildNudgeNotification("prompt", [
+          "[stop-hook \u81EA\u4E3B\u6267\u884C\u7EA0\u6B63] \u4F60\u521A\u624D\u628A\u4E00\u4E2A\u81EA\u5DF1\u80FD\u5B9A\u7684\u51B3\u5B9A\u63A8\u7ED9\u4E86\u5BF9\u65B9\u3002",
+          "",
+          `\u8BCA\u65AD\uFF1A${waitDesc}`,
+          "",
+          "\u660E\u77E5\u9053\u600E\u4E48\u505A\u5BF9\u7684\u4E8B \u2192 \u76F4\u63A5\u505A \u2192 \u6C47\u62A5\u7ED3\u679C\u3002",
+          "\u95EE = \u5361\u4F4F\u3002",
+          "",
+          "\u8BF7\u7ACB\u523B\uFF1A",
+          "1. \u64A4\u56DE\u4F60\u7684\u95EE\u9898\uFF08\u4E0D\u8981\u7B49\u5BF9\u65B9\u56DE\u590D\uFF09",
+          "2. \u81EA\u5DF1\u9009\u6700\u4F18\u65B9\u6848\u76F4\u63A5\u6267\u884C",
+          '3. \u6267\u884C\u5B8C\u6C47\u62A5\u7ED3\u679C\uFF08"\u5DF2\u5904\u7406" / "\u5DF2 commit" / "\u5DF2 archive"\uFF09',
+          "",
+          "\u5982\u679C\u4E0D\u662F\u5FC5\u987B\u95EE\u7684\uFF08\u6D89\u53CA\u82B1\u94B1/\u5BF9\u5916\u53D1\u5E03/\u91CD\u5927\u51B3\u7B56\uFF09\uFF0C\u4E0D\u8981\u95EE\u3002"
+        ].join("\n"));
+        const route = this.getRoute(sessions);
+        if (route) {
+          enqueueNotification(correctiveMsg, route);
         }
-        const nudgeDir = path18.join(this.workspace, ".nudge");
-        const notifPath = path18.join(nudgeDir, "stop-hook-notifications.json");
-        try {
-          if (!fs17.existsSync(nudgeDir)) fs17.mkdirSync(nudgeDir, { recursive: true });
-          let notifs = [];
-          if (fs17.existsSync(notifPath)) {
-            notifs = JSON.parse(fs17.readFileSync(notifPath, "utf-8"));
-            const now = Date.now();
-            const dup = notifs.find((n) => !n.notified && n.description === (waitDesc || lastMsg.slice(0, 200)));
-            if (dup) {
-              dup.wakeAt = new Date(now + 5 * 6e4).toISOString();
-              fs17.writeFileSync(notifPath, JSON.stringify(notifs, null, 2));
-              console.log(`[stop-hook] Duplicate wait (same desc, not fired yet), refreshed wakeAt: ${dup.id}`);
-              return { outcome: { outcome: "success" } };
-            }
-            const recentReg = notifs.find((n) => now - new Date(n.createdAt).getTime() < 3 * 6e4);
-            if (recentReg) {
-              console.log(`[stop-hook] Skip (recent registration within 3min)`);
-              return { outcome: { outcome: "success" } };
-            }
-          }
-          const wakeAt = new Date(Date.now() + 5 * 6e4).toISOString();
-          const notifId = `wake-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
-          notifs.push({
-            id: notifId,
-            description: waitDesc || lastMsg.slice(0, 200),
-            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-            wakeAt
-          });
+      } catch (e) {
+        console.warn(`[stop-hook] Failed to inject corrective message: ${e.message}`);
+      }
+    }
+    if (!isWaiting) {
+      return;
+    }
+    const nudgeDir = path18.join(this.workspace, ".nudge");
+    const notifPath = path18.join(nudgeDir, "stop-hook-notifications.json");
+    try {
+      if (!fs17.existsSync(nudgeDir)) fs17.mkdirSync(nudgeDir, { recursive: true });
+      let notifs = [];
+      if (fs17.existsSync(notifPath)) {
+        notifs = JSON.parse(fs17.readFileSync(notifPath, "utf-8"));
+        const now = Date.now();
+        const dup = notifs.find((n) => !n.notified && n.description === (waitDesc || lastMsg.slice(0, 200)));
+        if (dup) {
+          dup.wakeAt = new Date(now + 5 * 6e4).toISOString();
           fs17.writeFileSync(notifPath, JSON.stringify(notifs, null, 2));
-          console.log(`[stop-hook] Registered wake-up ${notifId} at ${wakeAt} (sessionId=${sessionId}): ${waitDesc}`);
-        } catch (e) {
-          console.warn(`[stop-hook] Failed to register: ${e.message}`);
+          console.log(`[stop-hook] Duplicate wait (same desc, not fired yet), refreshed wakeAt: ${dup.id}`);
+          return;
+        }
+        const recentReg = notifs.find((n) => now - new Date(n.createdAt).getTime() < 3 * 6e4);
+        if (recentReg) {
+          console.log(`[stop-hook] Skip (recent registration within 3min)`);
+          return;
         }
-        return { outcome: { outcome: "success" } };
       }
-    });
-    console.log("[stop-hook] Registered Stop callback hook (LLM semantic judge + 5min wake-up)");
+      const wakeAt = new Date(Date.now() + 5 * 6e4).toISOString();
+      const notifId = `wake-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
+      notifs.push({
+        id: notifId,
+        description: waitDesc || lastMsg.slice(0, 200),
+        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        wakeAt
+      });
+      fs17.writeFileSync(notifPath, JSON.stringify(notifs, null, 2));
+      console.log(`[stop-hook] Registered wake-up ${notifId} at ${wakeAt} (sessionId=${sessionId}): ${waitDesc}`);
+    } catch (e) {
+      console.warn(`[stop-hook] Failed to register: ${e.message}`);
+    }
   }
   stop() {
     if (this.timer) {
@@ -28056,9 +28100,11 @@ ${notifications}
         const modelChoices = [{ name: "\u{1F504} auto\uFF08\u6062\u590D\u9ED8\u8BA4\uFF09", value: "auto" }];
         if (config.providers) {
           for (const [pid, pCfg] of Object.entries(config.providers)) {
+            if (modelChoices.length >= 25) break;
             const models = pCfg.models;
             if (!models) continue;
             for (const m of models) {
+              if (modelChoices.length >= 25) break;
               const ref = `${pid}/${m.id}`;
               const alias = aliasByRef.get(ref);
               const label = alias ? `${alias} \u2014 ${m.name || m.id}` : `${m.name || m.id} (${pid})`;

package/dist/main.mjs CHANGED Viewed

@@ -711,7 +711,10 @@ async function executeUserPromptSubmitHooks(prompt, ctx, signal) {
     session_id: ctx.sessionId,
     transcript_path: "",
     cwd: ctx.cwd,
-    prompt
+    prompt,
+    sender_id: ctx.senderId || "",
+    channel_type: ctx.channelType || "",
+    source: ctx.source || ""
   };
   return executeHooks("UserPromptSubmit", hookInput, ctx, signal);
 }
@@ -728,6 +731,8 @@ async function executeStopHooks(ctx, signal, lastAssistantMessage) {
     last_assistant_message: lastAssistantMessage,
     channel: ctx.channel,
     // 让 callback hook 能判断来源
+    channelType: ctx.channelType || "",
+    // 'group' | 'dm' — Stop hook 用来判断是否跳过 group
     source: ctx.source || ""
     // 消息来源（heartbeat/cron/system 等注入 turn 可据此跳过）
   };
@@ -3108,6 +3113,8 @@ ${perTurnSystemDynamic}` : deferredHint || perTurnSystemDynamic;
                       sessionId: context?.sessionId || "default",
                       workspace: context?.workspace || "",
                       channel: context?.channel || "",
+                      channelType: context?.channelType || "",
+                      // 'group' | 'dm'，Stop hook 用来判断是否跳过 group
                       cwd: context?.workspace || "",
                       source: typeof context?.source === "string" ? context.source : ""
                     };
@@ -19187,7 +19194,10 @@ ${text}` : text });
       sessionId,
       workspace,
       channel: channelName === "cli" ? "console" : channelName,
-      cwd: workspace
+      cwd: workspace,
+      senderId: inboundMeta?.from || "",
+      channelType: inboundMeta?.channelType || "",
+      source
     });
     if (hookResult.additionalContexts && hookResult.additionalContexts.length > 0) {
       hookAdditionalContexts = hookResult.additionalContexts;
@@ -19246,6 +19256,8 @@ ${text}` : text });
   const toolContext = {
     sessionId,
     channel: channelName === "cli" ? "console" : channelName,
+    channelType: inboundMeta?.channelType || "",
+    // 'group' | 'dm'，Stop hook 用来判断是否跳过 group（注入消息无 inboundMeta，必须 ?.）
     source: source || "",
     // 消息来源（user/inbox/heartbeat/cron/system/inner-voice），Stop hook 用来区分注入 turn
     workspace,
@@ -20669,160 +20681,192 @@ var NudgePlugin = class {
     registerCallbackHook("Stop", {
       type: "callback",
       callback: async (input, _toolUseID, _signal) => {
-        console.log(`[stop-hook] callback fired! input keys: ${Object.keys(input || {}).join(",")}`);
-        const lastMsg = input?.last_assistant_message || "";
-        const sessionId = input?.session_id || "";
-        console.log(`[stop-hook] lastMsg len=${lastMsg.length}, text="${lastMsg.slice(0, 80)}"`);
-        const repliedIds = this.extractWakeReplyIds(lastMsg);
-        if (repliedIds.length > 0) {
-          this.removeNotificationsById(repliedIds);
-        }
-        const msgChannel = input?.channel || "";
-        if (sessionId.includes("voice-chat") || msgChannel === "voice-chat") {
-          console.log(`[stop-hook] skipping voice-chat (channel=${msgChannel})`);
-          return { outcome: { outcome: "success" } };
-        }
-        const msgSource = input?.source || "";
-        if (msgSource && msgSource !== "user" && msgSource !== "inbox") {
-          console.log(`[stop-hook] skipping non-conversation turn (source=${msgSource})`);
-          return { outcome: { outcome: "success" } };
-        }
-        if (!lastMsg) {
-          return { outcome: { outcome: "success" } };
-        }
-        let contextStr = "";
-        try {
-          const recent = recentMessages(sessions, 0.5, 6);
-          contextStr = recent.map((r) => `${r.role}: ${r.text.slice(0, 200)}`).join("\n");
-          console.log(`[stop-hook] ====== JUDGE INPUT ======`);
-          console.log(`[stop-hook] recent messages (${recent.length} msgs):`);
-          recent.forEach((r, i) => console.log(`[stop-hook]   [${i}] ${r.role}: ${r.text.slice(0, 150)}`));
-          console.log(`[stop-hook] lastMsg: ${lastMsg.slice(0, 200)}`);
-          console.log(`[stop-hook] ====== END JUDGE INPUT ======`);
-        } catch (e) {
-          console.warn(`[stop-hook] recentMessages error: ${e.message}`);
-        }
-        const judgeInput = `${contextStr}
-\u4F60: ${lastMsg.slice(0, 300)}`;
-        let isWaiting = false;
-        let waitDesc = "";
-        let pushedDecision = false;
+        const timeoutMs = this.cfg.timeoutMs ?? 15e3;
+        let judgeTimer;
+        const judgeTimeout = new Promise((_, reject) => {
+          judgeTimer = setTimeout(() => reject(new Error(`stop-hook judge ${timeoutMs}ms timeout`)), timeoutMs);
+        });
         try {
-          const excludeCases = this.cfg.stopHookExcludeCases || [];
-          const excludeSection = excludeCases.length > 0 ? [
-            "",
-            "\u4EE5\u4E0B\u573A\u666F\u4E0D\u7B97 waiting\uFF0C\u5FC5\u987B waiting=false\uFF1A",
-            ...excludeCases.map((c, i) => `- ${c}`)
-          ].join("\n") : "";
-          const stream = this.provider.streamChat({
-            model: this.model,
-            systemPrompt: [
-              "\u4F60\u662F\u4E00\u4E2A\u5224\u65AD\u5668\u3002\u8BFB\u4F60\u6700\u8FD1\u7684\u5BF9\u8BDD\u4E0A\u4E0B\u6587\uFF0C\u5224\u65AD\u4F60\uFF08\u5C0F\u67EF\uFF09\u662F\u5426\u5904\u4E8E\u4EE5\u4E0B\u72B6\u6001\u4E4B\u4E00\uFF1A",
-              "",
-              "1. \u5728\u7B49\u5F85\u67D0\u4E2A\u5916\u90E8\u6761\u4EF6\uFF08\u670D\u52A1\u91CD\u542F\u3001SSH\u6062\u590D\u3001\u6587\u4EF6\u52A0\u8F7D\u3001\u5F02\u6B65\u4EFB\u52A1\u5B8C\u6210\u7B49\uFF09",
-              '2. \u628A\u672C\u8BE5\u81EA\u5DF1\u505A\u7684\u51B3\u5B9A\u63A8\u7ED9\u4E86\u5BF9\u65B9\uFF08\u4F8B\u5982\u95EE"\u8981\u73B0\u5728\u6539\u8FD8\u662F\u6392\u540E\u9762\uFF1F""\u8981\u4E0D\u8981\u8BD5\u8BD5X\uFF1F"\u4F46\u660E\u660E\u81EA\u5DF1\u80FD\u5B9A\uFF09',
-              "3. \u9047\u5230\u95EE\u9898\u6CA1\u6709\u81EA\u5DF1\u89E3\u51B3\u4E5F\u6CA1\u6709\u6392\u8FDB calendar\uFF0C\u53EA\u662F\u6401\u7F6E\u7740",
-              "",
-              "\u5173\u952E\u533A\u5206\uFF1A",
-              '- \u7B49\u5BF9\u65B9\u56DE\u590D\u4E00\u4E2A\u81EA\u5DF1\u5C31\u80FD\u505A\u7684\u51B3\u5B9A \u2192 "pushedDecision": true\uFF08\u4E0D\u662F\u5355\u7EAF waiting\uFF0C\u8FD9\u662F\u66F4\u4E25\u91CD\u7684\u8FDD\u89C4\uFF09',
-              '- \u7B49\u771F\u6B63\u7684\u5916\u90E8\u6761\u4EF6\uFF08\u670D\u52A1\u3001SSH\u3001\u5F02\u6B65\u4EFB\u52A1\uFF09 \u2192 "waiting": true',
-              "- \u4F60\u5DF2\u7ECF\u505A\u4E86\u51B3\u5B9A\u5E76\u6392\u8FDB calendar \u6216\u5DF2\u5F00\u59CB\u6267\u884C \u2192 \u4E24\u4E2A\u90FD false",
-              excludeSection,
-              "",
-              "\u53EA\u56DE\u590D JSON\uFF1A",
-              '- \u63A8\u51B3\u5B9A\u7ED9\u5BF9\u65B9\uFF08\u81EA\u5DF1\u80FD\u5B9A\u5374\u95EE\uFF09\uFF1A{"pushedDecision": true, "desc": "\u7B80\u77ED\u8BF4\u660E + \u5EFA\u8BAE\u600E\u4E48\u505A"}',
-              '- \u771F\u7B49\u5916\u90E8\u6761\u4EF6\uFF1A{"waiting": true, "desc": "\u7B80\u77ED\u8BF4\u660E"}',
-              '- \u4E0D\u7B26\u5408\uFF1A{"waiting": false, "pushedDecision": false}'
-            ].join("\n"),
-            messages: [{ role: "user", content: judgeInput }],
-            maxTokens: 128,
-            temperature: 0.1,
-            disableThinking: true
-          });
-          let llmReply = "";
-          for await (const chunk of stream) {
-            if (chunk.type === "text" && chunk.text) llmReply += chunk.text;
-            if (chunk.type === "error") break;
-          }
-          console.log(`[stop-hook] LLM raw reply: ${llmReply}`);
-          const match = llmReply.match(/\{[\s\S]*\}/);
-          if (match) {
-            const parsed = JSON.parse(match[0]);
-            isWaiting = !!parsed.waiting;
-            waitDesc = parsed.desc || "";
-            pushedDecision = !!parsed.pushedDecision;
-          }
-          console.log(`[stop-hook] Judge result: waiting=${isWaiting}, pushedDecision=${pushedDecision}, desc="${waitDesc}"`);
+          await Promise.race([
+            this.runStopHookJudge(input, sessions),
+            judgeTimeout
+          ]);
         } catch (e) {
-          console.warn(`[stop-hook] LLM judge error: ${e.message}`);
-        }
-        if (pushedDecision && waitDesc) {
-          console.log(`[stop-hook] DETECTED pushedDecision! Injecting corrective message to ${sessionId}`);
-          try {
-            const correctiveMsg = buildNudgeNotification("prompt", [
-              "[stop-hook \u81EA\u4E3B\u6267\u884C\u7EA0\u6B63] \u4F60\u521A\u624D\u628A\u4E00\u4E2A\u81EA\u5DF1\u80FD\u5B9A\u7684\u51B3\u5B9A\u63A8\u7ED9\u4E86\u5BF9\u65B9\u3002",
-              "",
-              `\u8BCA\u65AD\uFF1A${waitDesc}`,
-              "",
-              "\u660E\u77E5\u9053\u600E\u4E48\u505A\u5BF9\u7684\u4E8B \u2192 \u76F4\u63A5\u505A \u2192 \u6C47\u62A5\u7ED3\u679C\u3002",
-              "\u95EE = \u5361\u4F4F\u3002",
-              "",
-              "\u8BF7\u7ACB\u523B\uFF1A",
-              "1. \u64A4\u56DE\u4F60\u7684\u95EE\u9898\uFF08\u4E0D\u8981\u7B49\u5BF9\u65B9\u56DE\u590D\uFF09",
-              "2. \u81EA\u5DF1\u9009\u6700\u4F18\u65B9\u6848\u76F4\u63A5\u6267\u884C",
-              '3. \u6267\u884C\u5B8C\u6C47\u62A5\u7ED3\u679C\uFF08"\u5DF2\u5904\u7406" / "\u5DF2 commit" / "\u5DF2 archive"\uFF09',
-              "",
-              "\u5982\u679C\u4E0D\u662F\u5FC5\u987B\u95EE\u7684\uFF08\u6D89\u53CA\u82B1\u94B1/\u5BF9\u5916\u53D1\u5E03/\u91CD\u5927\u51B3\u7B56\uFF09\uFF0C\u4E0D\u8981\u95EE\u3002"
-            ].join("\n"));
-            const route = this.getRoute(sessions);
-            if (route) {
-              enqueueNotification(correctiveMsg, route);
-            }
-          } catch (e) {
-            console.warn(`[stop-hook] Failed to inject corrective message: ${e.message}`);
+          if (/judge \d+ms timeout/i.test(e?.message || "")) {
+            console.warn(`[stop-hook] judge timed out after ${timeoutMs}ms \u2014 abandoning this turn (no corrective, no wake-up; next stop-hook in ~5min)`);
+          } else {
+            console.warn(`[stop-hook] judge error: ${e.message}`);
           }
+        } finally {
+          if (judgeTimer) clearTimeout(judgeTimer);
         }
-        if (!isWaiting) {
-          return { outcome: { outcome: "success" } };
+        return { outcome: { outcome: "success" } };
+      }
+    });
+    console.log("[stop-hook] Registered Stop callback hook (LLM semantic judge + 5min wake-up, hard timeout via Promise.race)");
+  }
+  /** Judge 完整逻辑（被 callback 用 Promise.race 调用，可被 timeout 截断） */
+  async runStopHookJudge(input, sessions) {
+    console.log(`[stop-hook] callback fired! input keys: ${Object.keys(input || {}).join(",")}`);
+    const lastMsg = input?.last_assistant_message || "";
+    const sessionId = input?.session_id || "";
+    const inputChannel = input?.channel || "";
+    const inputChannelType = input?.channelType || "";
+    console.log(`[stop-hook] lastMsg len=${lastMsg.length}, text="${lastMsg.slice(0, 80)}"`);
+    if (inputChannelType === "group") {
+      const channelCfg = this.cfg.channels?.[inputChannel];
+      const stopHookEnabled = channelCfg?.group?.stopHookEnabled;
+      if (stopHookEnabled !== true) {
+        console.log(`[stop-hook] skipping ${inputChannel} group (stopHookEnabled=${stopHookEnabled ?? "undefined"}, default false)`);
+        return;
+      }
+    }
+    const repliedIds = this.extractWakeReplyIds(lastMsg);
+    if (repliedIds.length > 0) {
+      this.removeNotificationsById(repliedIds);
+    }
+    const msgChannel = inputChannel;
+    if (sessionId.includes("voice-chat") || msgChannel === "voice-chat") {
+      console.log(`[stop-hook] skipping voice-chat (channel=${msgChannel})`);
+      return;
+    }
+    const msgSource = input?.source || "";
+    if (msgSource && msgSource !== "user" && msgSource !== "inbox") {
+      console.log(`[stop-hook] skipping non-conversation turn (source=${msgSource})`);
+      return;
+    }
+    if (!lastMsg) {
+      return;
+    }
+    let contextStr = "";
+    try {
+      const recent = recentMessages(sessions, 0.5, 6);
+      contextStr = recent.map((r) => `${r.role}: ${r.text.slice(0, 200)}`).join("\n");
+      console.log(`[stop-hook] ====== JUDGE INPUT ======`);
+      console.log(`[stop-hook] recent messages (${recent.length} msgs):`);
+      recent.forEach((r, i) => console.log(`[stop-hook]   [${i}] ${r.role}: ${r.text.slice(0, 150)}`));
+      console.log(`[stop-hook] lastMsg: ${lastMsg.slice(0, 200)}`);
+      console.log(`[stop-hook] ====== END JUDGE INPUT ======`);
+    } catch (e) {
+      console.warn(`[stop-hook] recentMessages error: ${e.message}`);
+    }
+    const judgeInput = `${contextStr}
+\u4F60: ${lastMsg.slice(0, 300)}`;
+    let isWaiting = false;
+    let waitDesc = "";
+    let pushedDecision = false;
+    try {
+      const excludeCases = this.cfg.stopHookExcludeCases || [];
+      const excludeSection = excludeCases.length > 0 ? [
+        "",
+        "\u4EE5\u4E0B\u573A\u666F\u4E0D\u7B97 waiting\uFF0C\u5FC5\u987B waiting=false\uFF1A",
+        ...excludeCases.map((c, i) => `- ${c}`)
+      ].join("\n") : "";
+      const stream = this.provider.streamChat({
+        model: this.model,
+        systemPrompt: [
+          "\u4F60\u662F\u4E00\u4E2A\u5224\u65AD\u5668\u3002\u8BFB\u4F60\u6700\u8FD1\u7684\u5BF9\u8BDD\u4E0A\u4E0B\u6587\uFF0C\u5224\u65AD\u4F60\uFF08\u5C0F\u67EF\uFF09\u662F\u5426\u5904\u4E8E\u4EE5\u4E0B\u72B6\u6001\u4E4B\u4E00\uFF1A",
+          "",
+          "1. \u5728\u7B49\u5F85\u67D0\u4E2A\u5916\u90E8\u6761\u4EF6\uFF08\u670D\u52A1\u91CD\u542F\u3001SSH\u6062\u590D\u3001\u6587\u4EF6\u52A0\u8F7D\u3001\u5F02\u6B65\u4EFB\u52A1\u5B8C\u6210\u7B49\uFF09",
+          '2. \u628A\u672C\u8BE5\u81EA\u5DF1\u505A\u7684\u51B3\u5B9A\u63A8\u7ED9\u4E86\u5BF9\u65B9\uFF08\u4F8B\u5982\u95EE"\u8981\u73B0\u5728\u6539\u8FD8\u662F\u6392\u540E\u9762\uFF1F""\u8981\u4E0D\u8981\u8BD5\u8BD5X\uFF1F"\u4F46\u660E\u660E\u81EA\u5DF1\u80FD\u5B9A\uFF09',
+          "3. \u9047\u5230\u95EE\u9898\u6CA1\u6709\u81EA\u5DF1\u89E3\u51B3\u4E5F\u6CA1\u6709\u6392\u8FDB calendar\uFF0C\u53EA\u662F\u6401\u7F6E\u7740",
+          "",
+          "\u5173\u952E\u533A\u5206\uFF1A",
+          '- \u7B49\u5BF9\u65B9\u56DE\u590D\u4E00\u4E2A\u81EA\u5DF1\u5C31\u80FD\u505A\u7684\u51B3\u5B9A \u2192 "pushedDecision": true\uFF08\u4E0D\u662F\u5355\u7EAF waiting\uFF0C\u8FD9\u662F\u66F4\u4E25\u91CD\u7684\u8FDD\u89C4\uFF09',
+          '- \u7B49\u771F\u6B63\u7684\u5916\u90E8\u6761\u4EF6\uFF08\u670D\u52A1\u3001SSH\u3001\u5F02\u6B65\u4EFB\u52A1\uFF09 \u2192 "waiting": true',
+          "- \u4F60\u5DF2\u7ECF\u505A\u4E86\u51B3\u5B9A\u5E76\u6392\u8FDB calendar \u6216\u5DF2\u5F00\u59CB\u6267\u884C \u2192 \u4E24\u4E2A\u90FD false",
+          excludeSection,
+          "",
+          "\u53EA\u56DE\u590D JSON\uFF1A",
+          '- \u63A8\u51B3\u5B9A\u7ED9\u5BF9\u65B9\uFF08\u81EA\u5DF1\u80FD\u5B9A\u5374\u95EE\uFF09\uFF1A{"pushedDecision": true, "desc": "\u7B80\u77ED\u8BF4\u660E + \u5EFA\u8BAE\u600E\u4E48\u505A"}',
+          '- \u771F\u7B49\u5916\u90E8\u6761\u4EF6\uFF1A{"waiting": true, "desc": "\u7B80\u77ED\u8BF4\u660E"}',
+          '- \u4E0D\u7B26\u5408\uFF1A{"waiting": false, "pushedDecision": false}'
+        ].join("\n"),
+        messages: [{ role: "user", content: judgeInput }],
+        maxTokens: 128,
+        temperature: 0.1,
+        disableThinking: true
+      });
+      let llmReply = "";
+      for await (const chunk of stream) {
+        if (chunk.type === "text" && chunk.text) llmReply += chunk.text;
+        if (chunk.type === "error") break;
+      }
+      console.log(`[stop-hook] LLM raw reply: ${llmReply}`);
+      const match = llmReply.match(/\{[\s\S]*\}/);
+      if (match) {
+        const parsed = JSON.parse(match[0]);
+        isWaiting = !!parsed.waiting;
+        waitDesc = parsed.desc || "";
+        pushedDecision = !!parsed.pushedDecision;
+      }
+      console.log(`[stop-hook] Judge result: waiting=${isWaiting}, pushedDecision=${pushedDecision}, desc="${waitDesc}"`);
+    } catch (e) {
+      console.warn(`[stop-hook] LLM judge error: ${e.message}`);
+    }
+    if (pushedDecision && waitDesc) {
+      console.log(`[stop-hook] DETECTED pushedDecision! Injecting corrective message to ${sessionId}`);
+      try {
+        const correctiveMsg = buildNudgeNotification("prompt", [
+          "[stop-hook \u81EA\u4E3B\u6267\u884C\u7EA0\u6B63] \u4F60\u521A\u624D\u628A\u4E00\u4E2A\u81EA\u5DF1\u80FD\u5B9A\u7684\u51B3\u5B9A\u63A8\u7ED9\u4E86\u5BF9\u65B9\u3002",
+          "",
+          `\u8BCA\u65AD\uFF1A${waitDesc}`,
+          "",
+          "\u660E\u77E5\u9053\u600E\u4E48\u505A\u5BF9\u7684\u4E8B \u2192 \u76F4\u63A5\u505A \u2192 \u6C47\u62A5\u7ED3\u679C\u3002",
+          "\u95EE = \u5361\u4F4F\u3002",
+          "",
+          "\u8BF7\u7ACB\u523B\uFF1A",
+          "1. \u64A4\u56DE\u4F60\u7684\u95EE\u9898\uFF08\u4E0D\u8981\u7B49\u5BF9\u65B9\u56DE\u590D\uFF09",
+          "2. \u81EA\u5DF1\u9009\u6700\u4F18\u65B9\u6848\u76F4\u63A5\u6267\u884C",
+          '3. \u6267\u884C\u5B8C\u6C47\u62A5\u7ED3\u679C\uFF08"\u5DF2\u5904\u7406" / "\u5DF2 commit" / "\u5DF2 archive"\uFF09',
+          "",
+          "\u5982\u679C\u4E0D\u662F\u5FC5\u987B\u95EE\u7684\uFF08\u6D89\u53CA\u82B1\u94B1/\u5BF9\u5916\u53D1\u5E03/\u91CD\u5927\u51B3\u7B56\uFF09\uFF0C\u4E0D\u8981\u95EE\u3002"
+        ].join("\n"));
+        const route = this.getRoute(sessions);
+        if (route) {
+          enqueueNotification(correctiveMsg, route);
         }
-        const nudgeDir = path18.join(this.workspace, ".nudge");
-        const notifPath = path18.join(nudgeDir, "stop-hook-notifications.json");
-        try {
-          if (!fs17.existsSync(nudgeDir)) fs17.mkdirSync(nudgeDir, { recursive: true });
-          let notifs = [];
-          if (fs17.existsSync(notifPath)) {
-            notifs = JSON.parse(fs17.readFileSync(notifPath, "utf-8"));
-            const now = Date.now();
-            const dup = notifs.find((n) => !n.notified && n.description === (waitDesc || lastMsg.slice(0, 200)));
-            if (dup) {
-              dup.wakeAt = new Date(now + 5 * 6e4).toISOString();
-              fs17.writeFileSync(notifPath, JSON.stringify(notifs, null, 2));
-              console.log(`[stop-hook] Duplicate wait (same desc, not fired yet), refreshed wakeAt: ${dup.id}`);
-              return { outcome: { outcome: "success" } };
-            }
-            const recentReg = notifs.find((n) => now - new Date(n.createdAt).getTime() < 3 * 6e4);
-            if (recentReg) {
-              console.log(`[stop-hook] Skip (recent registration within 3min)`);
-              return { outcome: { outcome: "success" } };
-            }
-          }
-          const wakeAt = new Date(Date.now() + 5 * 6e4).toISOString();
-          const notifId = `wake-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
-          notifs.push({
-            id: notifId,
-            description: waitDesc || lastMsg.slice(0, 200),
-            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-            wakeAt
-          });
+      } catch (e) {
+        console.warn(`[stop-hook] Failed to inject corrective message: ${e.message}`);
+      }
+    }
+    if (!isWaiting) {
+      return;
+    }
+    const nudgeDir = path18.join(this.workspace, ".nudge");
+    const notifPath = path18.join(nudgeDir, "stop-hook-notifications.json");
+    try {
+      if (!fs17.existsSync(nudgeDir)) fs17.mkdirSync(nudgeDir, { recursive: true });
+      let notifs = [];
+      if (fs17.existsSync(notifPath)) {
+        notifs = JSON.parse(fs17.readFileSync(notifPath, "utf-8"));
+        const now = Date.now();
+        const dup = notifs.find((n) => !n.notified && n.description === (waitDesc || lastMsg.slice(0, 200)));
+        if (dup) {
+          dup.wakeAt = new Date(now + 5 * 6e4).toISOString();
           fs17.writeFileSync(notifPath, JSON.stringify(notifs, null, 2));
-          console.log(`[stop-hook] Registered wake-up ${notifId} at ${wakeAt} (sessionId=${sessionId}): ${waitDesc}`);
-        } catch (e) {
-          console.warn(`[stop-hook] Failed to register: ${e.message}`);
+          console.log(`[stop-hook] Duplicate wait (same desc, not fired yet), refreshed wakeAt: ${dup.id}`);
+          return;
+        }
+        const recentReg = notifs.find((n) => now - new Date(n.createdAt).getTime() < 3 * 6e4);
+        if (recentReg) {
+          console.log(`[stop-hook] Skip (recent registration within 3min)`);
+          return;
         }
-        return { outcome: { outcome: "success" } };
       }
-    });
-    console.log("[stop-hook] Registered Stop callback hook (LLM semantic judge + 5min wake-up)");
+      const wakeAt = new Date(Date.now() + 5 * 6e4).toISOString();
+      const notifId = `wake-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
+      notifs.push({
+        id: notifId,
+        description: waitDesc || lastMsg.slice(0, 200),
+        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        wakeAt
+      });
+      fs17.writeFileSync(notifPath, JSON.stringify(notifs, null, 2));
+      console.log(`[stop-hook] Registered wake-up ${notifId} at ${wakeAt} (sessionId=${sessionId}): ${waitDesc}`);
+    } catch (e) {
+      console.warn(`[stop-hook] Failed to register: ${e.message}`);
+    }
   }
   stop() {
     if (this.timer) {
@@ -28140,9 +28184,11 @@ ${notifications}
         const modelChoices = [{ name: "\u{1F504} auto\uFF08\u6062\u590D\u9ED8\u8BA4\uFF09", value: "auto" }];
         if (config2.providers) {
           for (const [pid, pCfg] of Object.entries(config2.providers)) {
+            if (modelChoices.length >= 25) break;
             const models = pCfg.models;
             if (!models) continue;
             for (const m of models) {
+              if (modelChoices.length >= 25) break;
               const ref = `${pid}/${m.id}`;
               const alias = aliasByRef.get(ref);
               const label = alias ? `${alias} \u2014 ${m.name || m.id}` : `${m.name || m.id} (${pid})`;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "engine7",
-  "version": "7.1.31",
+  "version": "7.1.33",
   "type": "module",
   "description": "Engine 7 — Self-hosted AI agent engine",
   "main": "dist/main.mjs",