@yoooclaw/phone-notifications 1.11.4-beta.1 → 1.11.4-beta.2

package/dist/index.cjs

@@ -5480,7 +5480,7 @@ function readBuildInjectedVersion() {
   if (false) {
     return void 0;
   }
-  const version = "1.11.4-beta.1".trim();
+  const version = "1.11.4-beta.2".trim();
   return version || void 0;
 }
 function readPluginVersionFromPackageJson() {
@@ -7097,6 +7097,109 @@ function resolveLightTitle(title, reason, segments) {
   return `Effect: ${modeDesc || "custom"}`;
 }
 
+// src/light-rules/local-matcher.ts
+var CONTACT_PREFIXES = ["\u91CD\u8981\u8054\u7CFB\u4EBA", "\u8054\u7CFB\u4EBA"];
+var CONTACT_ACTION_RE = /(给我)?发(?:来)?消息|(给我)?发信息|来消息|回复(?:我)?|回应(?:我)?|私聊(?:我)?/u;
+var LEADING_SENDER_RE = /^(.{1,40}?)(?:\s+回应)?\s*[:：]/u;
+function matchNotificationsLocally(notifications, rules) {
+  const parsedRules = rules.map((rule) => parseContactRule(rule)).filter((item) => item !== null);
+  if (parsedRules.length === 0) {
+    return [];
+  }
+  const results = [];
+  notifications.forEach((notification, notificationIndex) => {
+    const senders = collectSenderCandidates(notification);
+    if (senders.length === 0) {
+      return;
+    }
+    parsedRules.forEach((rule) => {
+      if (senders.some((sender) => senderMatchesContact(sender, rule.contactName))) {
+        results.push({ notificationIndex, ruleName: rule.ruleName });
+      }
+    });
+  });
+  return results;
+}
+function parseContactRule(rule) {
+  const contactName = extractImportantContact(rule.description);
+  if (!contactName) {
+    return null;
+  }
+  return {
+    ruleName: rule.name,
+    contactName
+  };
+}
+function extractImportantContact(description) {
+  const text = description.trim();
+  if (!text) {
+    return null;
+  }
+  for (const prefix of CONTACT_PREFIXES) {
+    const start = text.indexOf(prefix);
+    if (start < 0) {
+      continue;
+    }
+    const tail = text.slice(start + prefix.length);
+    const actionMatch = CONTACT_ACTION_RE.exec(tail);
+    if (!actionMatch || actionMatch.index === 0) {
+      continue;
+    }
+    const rawName = tail.slice(0, actionMatch.index).trim();
+    const cleaned = trimContactName(rawName);
+    if (cleaned) {
+      return cleaned;
+    }
+  }
+  return null;
+}
+function trimContactName(value) {
+  const cleaned = value.replace(/^[是为叫做名为\s]+/u, "").replace(/[，。,.；;].*$/u, "").trim();
+  return cleaned || null;
+}
+function collectSenderCandidates(notification) {
+  const candidates = [
+    notification.senderName,
+    notification.title,
+    notification.conversationName,
+    extractLeadingSender(notification.content)
+  ];
+  const deduped = /* @__PURE__ */ new Map();
+  for (const candidate of candidates) {
+    if (!candidate) {
+      continue;
+    }
+    const normalized = normalizeComparableName(candidate);
+    if (normalized.length < 2) {
+      continue;
+    }
+    deduped.set(normalized, candidate);
+  }
+  return Array.from(deduped.values());
+}
+function extractLeadingSender(content) {
+  const text = content.trim();
+  if (!text) {
+    return null;
+  }
+  const match = LEADING_SENDER_RE.exec(text);
+  if (!match) {
+    return null;
+  }
+  return match[1]?.trim() || null;
+}
+function senderMatchesContact(sender, contactName) {
+  const normalizedSender = normalizeComparableName(sender);
+  const normalizedContact = normalizeComparableName(contactName);
+  if (!normalizedSender || !normalizedContact) {
+    return false;
+  }
+  return normalizedSender.includes(normalizedContact) || normalizedContact.includes(normalizedSender);
+}
+function normalizeComparableName(value) {
+  return value.normalize("NFKC").replace(new RegExp("\\p{Extended_Pictographic}", "gu"), "").replace(/\s+/gu, "").replace(/[^\p{L}\p{N}]/gu, "");
+}
+
 // src/light-rules/inline-evaluator.ts
 var InlineLightRuleEvaluator = class {
   logger;
@@ -7116,8 +7219,40 @@ var InlineLightRuleEvaluator = class {
     if (notifications.length === 0) return true;
     const rules = this.registry.getEnabled();
     if (rules.length === 0) return true;
-    const matches = await this.invoker.matchNotifications(notifications, rules);
-    if (matches === null) return false;
+    const localMatches = matchNotificationsLocally(notifications, rules);
+    const localMatchedRuleNames = new Set(localMatches.map((match) => match.ruleName));
+    const llmCandidateRules = rules.filter((rule) => !localMatchedRuleNames.has(rule.name));
+    const combinedMatches = /* @__PURE__ */ new Map();
+    for (const match of localMatches) {
+      combinedMatches.set(
+        `${match.notificationIndex}:${match.ruleName}`,
+        match
+      );
+    }
+    if (localMatches.length > 0) {
+      this.logger.info(
+        `lightrules: local matched ${localMatchedRuleNames.size} rule(s) (notifications=${notifications.length}, remainingRules=${llmCandidateRules.length})`
+      );
+    }
+    if (llmCandidateRules.length > 0) {
+      const llmMatches = await this.invoker.matchNotifications(notifications, llmCandidateRules);
+      if (llmMatches === null) {
+        if (combinedMatches.size === 0) {
+          return false;
+        }
+        this.logger.warn(
+          `lightrules: invoker failed; using ${combinedMatches.size} local fallback match(es)`
+        );
+      } else {
+        for (const match of llmMatches) {
+          combinedMatches.set(
+            `${match.notificationIndex}:${match.ruleName}`,
+            match
+          );
+        }
+      }
+    }
+    const matches = Array.from(combinedMatches.values());
     if (matches.length === 0) {
       this.logger.info(
         `lightrules: 0 matches (notifications=${notifications.length}, rules=${rules.length})`
@@ -7135,14 +7270,15 @@ var InlineLightRuleEvaluator = class {
         continue;
       }
       firedRules.add(match.ruleName);
-      await this.triggerLight(rule);
+      const notification = notifications[match.notificationIndex];
+      await this.triggerLight(rule, notification);
     }
     this.logger.info(
       `lightrules: fired ${firedRules.size} rule(s): ${[...firedRules].join(", ")} (from ${matches.length} match(es) across ${notifications.length} notification(s))`
     );
     return true;
   }
-  async triggerLight(rule) {
+  async triggerLight(rule, notification) {
     let apiKey;
     try {
       apiKey = requireApiKey();
@@ -7152,13 +7288,14 @@ var InlineLightRuleEvaluator = class {
       );
       return;
     }
+    const reason = buildTriggerReason(rule, notification);
     try {
       const result = await sendLightEffect(
         apiKey,
         rule.segments,
         this.logger,
         { repeat_times: rule.repeat_times },
-        rule.description,
+        reason,
         rule.title
       );
       if (!result.ok) {
@@ -7173,6 +7310,31 @@ var InlineLightRuleEvaluator = class {
     }
   }
 };
+var REASON_CONTENT_MAX = 40;
+function buildTriggerReason(rule, notification) {
+  const ruleLabel = rule.title?.trim() || rule.name;
+  if (!notification) {
+    return `\u89E6\u53D1"${ruleLabel}"\u706F\u6548`;
+  }
+  const app = notification.appDisplayName?.trim() || notification.appName.trim();
+  const sender = notification.senderName?.trim() || notification.title?.trim();
+  const conversation = notification.conversationName?.trim();
+  const isGroup = notification.conversationType === "group";
+  let where = app;
+  if (isGroup) {
+    where = conversation ? `${app}\u7FA4\u804A"${conversation}"` : `${app}\u7FA4\u804A`;
+  }
+  const action = sender ? `${sender}\u53D1\u6765\u6D88\u606F` : "\u6536\u5230\u65B0\u6D88\u606F";
+  const snippet = summarizeContent(notification.content);
+  const detail = snippet ? `\uFF1A${snippet}` : "";
+  return `\u68C0\u6D4B\u5230${where}\u4E2D${action}${detail}\uFF0C\u89E6\u53D1"${ruleLabel}"\u706F\u6548`;
+}
+function summarizeContent(content) {
+  const trimmed = content?.trim();
+  if (!trimmed) return "";
+  if (trimmed.length <= REASON_CONTENT_MAX) return trimmed;
+  return `${trimmed.slice(0, REASON_CONTENT_MAX)}\u2026`;
+}
 
 // src/light-rules/pi-invoker.ts
 var import_agent_runtime = require("openclaw/plugin-sdk/agent-runtime");
@@ -7180,6 +7342,7 @@ var DEFAULT_PROVIDER = "anthropic";
 var DEFAULT_MODEL_ID = "claude-haiku-4-5-20251001";
 var DEFAULT_AGENT_ID = "main";
 var DEFAULT_TIMEOUT_MS = 1e4;
+var DEFAULT_MAX_ATTEMPTS = 2;
 var MAX_OUTPUT_TOKENS = 512;
 var PiAiInvoker = class {
   constructor(api, logger, options = {}) {
@@ -7205,35 +7368,52 @@ var PiAiInvoker = class {
     }
     const systemPrompt = buildSystemPrompt(rules);
     const userMessage = buildUserMessage(notifications);
-    try {
-      const resp = await (0, import_agent_runtime.completeWithPreparedSimpleCompletionModel)({
-        model: prepared.model,
-        auth: prepared.auth,
-        context: {
-          systemPrompt,
-          messages: [
-            { role: "user", content: userMessage, timestamp: Date.now() }
-          ]
-        },
-        options: {
-          temperature: 0,
-          maxTokens: MAX_OUTPUT_TOKENS,
-          signal: AbortSignal.timeout(this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS),
-          cacheRetention: "short"
+    const baseTimeoutMs = this.options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+    const maxAttempts = Math.max(1, this.options.maxAttempts ?? DEFAULT_MAX_ATTEMPTS);
+    for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+      const timeoutMs = baseTimeoutMs * attempt;
+      try {
+        const resp = await (0, import_agent_runtime.completeWithPreparedSimpleCompletionModel)({
+          model: prepared.model,
+          auth: prepared.auth,
+          context: {
+            systemPrompt,
+            messages: [
+              { role: "user", content: userMessage, timestamp: Date.now() }
+            ]
+          },
+          options: {
+            temperature: 0,
+            maxTokens: MAX_OUTPUT_TOKENS,
+            signal: AbortSignal.timeout(timeoutMs),
+            cacheRetention: "short"
+          }
+        });
+        if (resp.stopReason === "error" || resp.stopReason === "aborted") {
+          const retryable = resp.stopReason === "aborted" && attempt < maxAttempts;
+          this.logger.warn(
+            `PiAiInvoker: complete stopped with ${resp.stopReason}: ${resp.errorMessage ?? "n/a"} (attempt ${attempt}/${maxAttempts}, timeoutMs=${timeoutMs}${retryable ? ", retrying" : ""})`
+          );
+          if (retryable) {
+            continue;
+          }
+          return null;
         }
-      });
-      if (resp.stopReason === "error" || resp.stopReason === "aborted") {
+        const text = extractText(resp.content);
+        return parseMatchResult(text, notifications.length, rules);
+      } catch (err2) {
+        const message = err2?.message ?? String(err2);
+        const retryable = attempt < maxAttempts && (err2?.name === "AbortError" || /\babort(?:ed)?\b/i.test(message));
         this.logger.warn(
-          `PiAiInvoker: complete stopped with ${resp.stopReason}: ${resp.errorMessage ?? "n/a"}`
+          `PiAiInvoker: complete failed: ${message} (attempt ${attempt}/${maxAttempts}${retryable ? ", retrying" : ""})`
         );
+        if (retryable) {
+          continue;
+        }
         return null;
       }
-      const text = extractText(resp.content);
-      return parseMatchResult(text, notifications.length, rules);
-    } catch (err2) {
-      this.logger.warn(`PiAiInvoker: complete failed: ${err2?.message ?? err2}`);
-      return null;
     }
+    return null;
   }
   async prepareCompletionModel() {
     if (this.options.provider || this.options.modelId) {