@ai-setting/roy-agent-cli 1.7.58 → 1.7.59

package/dist/bin/roy-agent.js

@@ -9639,7 +9639,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.58",
+  version: "1.7.59",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -11799,6 +11799,15 @@ function isTelemetryEvent(type) {
     return false;
   return TELEMETRY_EVENT_TYPES.has(type);
 }
+var RULE_NOTICE_EVENT_TYPES = new Set([
+  "task.background.completed",
+  "task.background.timeout"
+]);
+function isRuleNoticeEvent(type) {
+  if (!type)
+    return false;
+  return RULE_NOTICE_EVENT_TYPES.has(type);
+}
 var MAX_TITLE_CHARS = 40;
 function pad2(n) {
   return n < 10 ? `0${n}` : String(n);
@@ -11871,11 +11880,61 @@ ${parts.join("，")}`;
 ${progressMessage}`;
   return text;
 }
+function parseTimeoutMsFromError(error) {
+  if (!error)
+    return;
+  const m = error.match(/timeout after\s+(\d+)\s*ms/i);
+  if (!m)
+    return;
+  const n = Number(m[1]);
+  return Number.isFinite(n) && n > 0 ? n : undefined;
+}
+function buildTerminalNoticeText(type, payload) {
+  const p = payload ?? {};
+  const taskId = pickNumber(p.associatedTaskId);
+  const bgId = pickString(p.backgroundTaskId);
+  const desc = truncateTitle(pickString(p.description) ?? "后台任务");
+  let label;
+  if (taskId !== undefined)
+    label = `Task #${taskId}`;
+  else if (bgId)
+    label = bgId;
+  else
+    label = "后台任务";
+  const elapsedMs = pickNumber(p.executionTimeMs);
+  const elapsed = elapsedMs !== undefined ? formatElapsed(elapsedMs) : undefined;
+  if (type === "task.background.timeout") {
+    const timeoutMs = pickNumber(p.timeoutMs) ?? parseTimeoutMsFromError(p.error);
+    const parts = [];
+    if (elapsed)
+      parts.push(`跑了 ${elapsed}`);
+    if (timeoutMs !== undefined)
+      parts.push(`timeout ${formatTimeoutLabel(timeoutMs)}`);
+    const head = `⏱️ ${label}「${desc}」已超时`;
+    return parts.length > 0 ? `${head}（${parts.join("，")}）
+助手随后补充结论与下一步选项。` : `${head}
+助手随后补充结论与下一步选项。`;
+  }
+  if (type === "task.background.completed") {
+    const head = `✅ ${label}「${desc}」已完成`;
+    return elapsed ? `${head}（耗时 ${elapsed}）
+助手随后补充交付摘要。` : `${head}
+助手随后补充交付摘要。`;
+  }
+  const bgStatus = type.replace("task.background.", "");
+  return `ℹ️ ${label}「${desc}」${bgStatus}${elapsed ? `（耗时 ${elapsed}）` : ""}`;
+}
 var DEFAULT_SEND_TIMEOUT_MS = 5000;
 var MAX_IDEMPOTENCY_KEY_LEN = 50;
 function deriveTelemetryIdempotencyKey(eventId, chatId) {
+  return deriveNoticeIdempotencyKey("telemetry", eventId, chatId);
+}
+function deriveRuleNoticeIdempotencyKey(eventId, chatId) {
+  return deriveNoticeIdempotencyKey("rule", eventId, chatId);
+}
+function deriveNoticeIdempotencyKey(namespace, eventId, chatId) {
   const anchor = pickString(eventId) ?? `ts-${Date.now()}-${Math.random()}`;
-  return deriveIdempotencyKey(["telemetry", anchor, chatId]);
+  return deriveIdempotencyKey([namespace, anchor, chatId]);
 }
 function buildLarkSendArgs(input) {
   const { chatId, text, profile, idempotencyKey } = input;
@@ -12181,17 +12240,50 @@ class EventHandler {
       this.sendTelemetryNotice(event);
       return;
     }
-    const formatted = await this.formatEvent(event);
+    const ruleNotice = isRuleNoticeEvent(event.type) ? await this.sendRuleNotice(event) : undefined;
+    const formatted = await this.formatEvent(event, { ruleNotice });
     this.enqueue(formatted);
   }
-  async sendTelemetryNotice(event) {
+  async resolveNoticeTarget(event) {
+    const metadata = event.metadata;
+    const target = targetFromEventMetadata(metadata);
+    if (target)
+      return target;
+    const triggerEventId = typeof metadata?.triggerEventId === "string" ? metadata.triggerEventId : undefined;
+    return targetFromTriggerEvent(this.eventStore, triggerEventId);
+  }
+  async sendRuleNotice(event) {
     try {
-      const metadata = event.metadata;
-      let target = targetFromEventMetadata(metadata);
+      const target = await this.resolveNoticeTarget(event);
       if (!target) {
-        const triggerEventId = typeof metadata?.triggerEventId === "string" ? metadata.triggerEventId : undefined;
-        target = await targetFromTriggerEvent(this.eventStore, triggerEventId);
+        return { attempted: true, delivered: false, error: "no-target" };
       }
+      const text = buildTerminalNoticeText(event.type, event.payload);
+      await this.telemetrySender({
+        chatId: target.chatId,
+        ...target.profile ? { profile: target.profile } : {},
+        text,
+        idempotencyKey: deriveRuleNoticeIdempotencyKey(event.id, target.chatId)
+      });
+      return {
+        attempted: true,
+        delivered: true,
+        chatId: target.chatId,
+        text,
+        sentAt: Date.now()
+      };
+    } catch (err) {
+      console.error(`[EventHandler] rule notice failed (swallowed) type=${event.type}`, err);
+      return {
+        attempted: true,
+        delivered: false,
+        error: err instanceof Error ? err.message : String(err)
+      };
+    }
+  }
+  async sendTelemetryNotice(event) {
+    try {
+      const target = await this.resolveNoticeTarget(event);
       if (!target) {
         return;
       }
@@ -12206,10 +12298,10 @@ class EventHandler {
       console.error(`[EventHandler] telemetry notice failed (swallowed) type=${event.type}`, err);
     }
   }
-  async formatEvent(event) {
+  async formatEvent(event, opts = {}) {
     if (NOTIFY_V2_TERMINAL_TYPES.has(event.type) && event.metadata?.triggerEventId && this.eventStore && this.getHandlerForEsType) {
       try {
-        const v2Formatted = await this.formatEventViaESPluginV2(event);
+        const v2Formatted = await this.formatEventViaESPluginV2(event, opts.ruleNotice);
         if (v2Formatted) {
           return v2Formatted;
         }
@@ -12219,7 +12311,26 @@ class EventHandler {
     }
     return this.formatter.formatWithEvent(event);
   }
-  async formatEventViaESPluginV2(event) {
+  buildNotifyChannelInfo(triggerEvent, handler, profile) {
+    const meta = triggerEvent.metadata ?? {};
+    const ctx = handler.extractReplyContext?.(triggerEvent, profile);
+    const chatId = ctx?.chatId || meta.chatId || undefined;
+    const messageId = ctx?.messageId || meta.messageId || undefined;
+    const senderId = ctx?.senderOpenId || meta.senderId || undefined;
+    const resolvedProfile = ctx?.profile ?? profile ?? meta.profile;
+    const rawChatType = meta.chatType;
+    const chatType = rawChatType === "group" || rawChatType === "p2p" ? rawChatType : "unknown";
+    return {
+      esType: triggerEvent.esType ?? handler.type,
+      ...chatId ? { chatId } : {},
+      chatType,
+      ...messageId ? { messageId } : {},
+      ...senderId ? { senderId } : {},
+      ...resolvedProfile ? { profile: resolvedProfile } : {},
+      replyKind: chatId ? messageId ? "reply" : "send" : "none"
+    };
+  }
+  async formatEventViaESPluginV2(event, ruleNotice) {
     const triggerEventId = event.metadata.triggerEventId;
     const triggerEvent = await this.eventStore.getEventById(triggerEventId);
     if (!triggerEvent) {
@@ -12234,17 +12345,21 @@ class EventHandler {
       summary: typeof payload?.result === "string" ? payload.result : typeof payload?.error === "string" ? payload.error : "(无结果)"
     };
     const profile = triggerEvent.metadata?.profile ?? undefined;
+    const channel = this.buildNotifyChannelInfo(triggerEvent, handler, profile);
     const prompt = handler.buildNotifyHandlePrompt({
       notifyEvent: {
         type: event.type,
         taskId: typeof payload?.associatedTaskId === "number" ? payload.associatedTaskId : undefined,
         description: typeof payload?.description === "string" ? payload.description : undefined,
         result: typeof payload?.result === "string" ? payload.result : undefined,
-        error: typeof payload?.error === "string" ? payload.error : undefined
+        error: typeof payload?.error === "string" ? payload.error : undefined,
+        subSessionId: typeof payload?.subSessionId === "string" ? payload.subSessionId : undefined
       },
       triggerEvent,
       subAgentResult,
-      profile
+      profile,
+      channel,
+      ...ruleNotice ? { ruleNotice } : {}
     });
     if (handler.postProcessNotifyEvent) {
       const notifyEventForHook = {
@@ -12693,6 +12808,14 @@ __legacyDecorateClassTS([
   ]),
   __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "handleEvent", null);
+__legacyDecorateClassTS([
+  TracedAs5("event_handler.rule_notice", { recordParams: true, recordResult: false }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    typeof EnvEvent === "undefined" ? Object : EnvEvent
+  ]),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], EventHandler.prototype, "sendRuleNotice", null);
 __legacyDecorateClassTS([
   TracedAs5("event_handler.telemetry_notice", { recordParams: true, recordResult: false }),
   __legacyMetadataTS("design:type", Function),
@@ -12705,7 +12828,8 @@ __legacyDecorateClassTS([
   TracedAs5("cli.event-handler.formatEvent", { recordParams: true, recordResult: false }),
   __legacyMetadataTS("design:type", Function),
   __legacyMetadataTS("design:paramtypes", [
-    typeof EnvEvent === "undefined" ? Object : EnvEvent
+    typeof EnvEvent === "undefined" ? Object : EnvEvent,
+    Object
   ]),
   __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "formatEvent", null);
@@ -12713,7 +12837,8 @@ __legacyDecorateClassTS([
   TracedAs5("event_handler.process_notify", { recordParams: true, recordResult: false }),
   __legacyMetadataTS("design:type", Function),
   __legacyMetadataTS("design:paramtypes", [
-    typeof EnvEvent === "undefined" ? Object : EnvEvent
+    typeof EnvEvent === "undefined" ? Object : EnvEvent,
+    typeof RuleNoticeInfo === "undefined" ? Object : RuleNoticeInfo
   ]),
   __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "formatEventViaESPluginV2", null);

package/dist/index.js

@@ -9638,7 +9638,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.58",
+  version: "1.7.59",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -11798,6 +11798,15 @@ function isTelemetryEvent(type) {
     return false;
   return TELEMETRY_EVENT_TYPES.has(type);
 }
+var RULE_NOTICE_EVENT_TYPES = new Set([
+  "task.background.completed",
+  "task.background.timeout"
+]);
+function isRuleNoticeEvent(type) {
+  if (!type)
+    return false;
+  return RULE_NOTICE_EVENT_TYPES.has(type);
+}
 var MAX_TITLE_CHARS = 40;
 function pad2(n) {
   return n < 10 ? `0${n}` : String(n);
@@ -11870,11 +11879,61 @@ ${parts.join("，")}`;
 ${progressMessage}`;
   return text;
 }
+function parseTimeoutMsFromError(error) {
+  if (!error)
+    return;
+  const m = error.match(/timeout after\s+(\d+)\s*ms/i);
+  if (!m)
+    return;
+  const n = Number(m[1]);
+  return Number.isFinite(n) && n > 0 ? n : undefined;
+}
+function buildTerminalNoticeText(type, payload) {
+  const p = payload ?? {};
+  const taskId = pickNumber(p.associatedTaskId);
+  const bgId = pickString(p.backgroundTaskId);
+  const desc = truncateTitle(pickString(p.description) ?? "后台任务");
+  let label;
+  if (taskId !== undefined)
+    label = `Task #${taskId}`;
+  else if (bgId)
+    label = bgId;
+  else
+    label = "后台任务";
+  const elapsedMs = pickNumber(p.executionTimeMs);
+  const elapsed = elapsedMs !== undefined ? formatElapsed(elapsedMs) : undefined;
+  if (type === "task.background.timeout") {
+    const timeoutMs = pickNumber(p.timeoutMs) ?? parseTimeoutMsFromError(p.error);
+    const parts = [];
+    if (elapsed)
+      parts.push(`跑了 ${elapsed}`);
+    if (timeoutMs !== undefined)
+      parts.push(`timeout ${formatTimeoutLabel(timeoutMs)}`);
+    const head = `⏱️ ${label}「${desc}」已超时`;
+    return parts.length > 0 ? `${head}（${parts.join("，")}）
+助手随后补充结论与下一步选项。` : `${head}
+助手随后补充结论与下一步选项。`;
+  }
+  if (type === "task.background.completed") {
+    const head = `✅ ${label}「${desc}」已完成`;
+    return elapsed ? `${head}（耗时 ${elapsed}）
+助手随后补充交付摘要。` : `${head}
+助手随后补充交付摘要。`;
+  }
+  const bgStatus = type.replace("task.background.", "");
+  return `ℹ️ ${label}「${desc}」${bgStatus}${elapsed ? `（耗时 ${elapsed}）` : ""}`;
+}
 var DEFAULT_SEND_TIMEOUT_MS = 5000;
 var MAX_IDEMPOTENCY_KEY_LEN = 50;
 function deriveTelemetryIdempotencyKey(eventId, chatId) {
+  return deriveNoticeIdempotencyKey("telemetry", eventId, chatId);
+}
+function deriveRuleNoticeIdempotencyKey(eventId, chatId) {
+  return deriveNoticeIdempotencyKey("rule", eventId, chatId);
+}
+function deriveNoticeIdempotencyKey(namespace, eventId, chatId) {
   const anchor = pickString(eventId) ?? `ts-${Date.now()}-${Math.random()}`;
-  return deriveIdempotencyKey(["telemetry", anchor, chatId]);
+  return deriveIdempotencyKey([namespace, anchor, chatId]);
 }
 function buildLarkSendArgs(input) {
   const { chatId, text, profile, idempotencyKey } = input;
@@ -12180,17 +12239,50 @@ class EventHandler {
       this.sendTelemetryNotice(event);
       return;
     }
-    const formatted = await this.formatEvent(event);
+    const ruleNotice = isRuleNoticeEvent(event.type) ? await this.sendRuleNotice(event) : undefined;
+    const formatted = await this.formatEvent(event, { ruleNotice });
     this.enqueue(formatted);
   }
-  async sendTelemetryNotice(event) {
+  async resolveNoticeTarget(event) {
+    const metadata = event.metadata;
+    const target = targetFromEventMetadata(metadata);
+    if (target)
+      return target;
+    const triggerEventId = typeof metadata?.triggerEventId === "string" ? metadata.triggerEventId : undefined;
+    return targetFromTriggerEvent(this.eventStore, triggerEventId);
+  }
+  async sendRuleNotice(event) {
     try {
-      const metadata = event.metadata;
-      let target = targetFromEventMetadata(metadata);
+      const target = await this.resolveNoticeTarget(event);
       if (!target) {
-        const triggerEventId = typeof metadata?.triggerEventId === "string" ? metadata.triggerEventId : undefined;
-        target = await targetFromTriggerEvent(this.eventStore, triggerEventId);
+        return { attempted: true, delivered: false, error: "no-target" };
       }
+      const text = buildTerminalNoticeText(event.type, event.payload);
+      await this.telemetrySender({
+        chatId: target.chatId,
+        ...target.profile ? { profile: target.profile } : {},
+        text,
+        idempotencyKey: deriveRuleNoticeIdempotencyKey(event.id, target.chatId)
+      });
+      return {
+        attempted: true,
+        delivered: true,
+        chatId: target.chatId,
+        text,
+        sentAt: Date.now()
+      };
+    } catch (err) {
+      console.error(`[EventHandler] rule notice failed (swallowed) type=${event.type}`, err);
+      return {
+        attempted: true,
+        delivered: false,
+        error: err instanceof Error ? err.message : String(err)
+      };
+    }
+  }
+  async sendTelemetryNotice(event) {
+    try {
+      const target = await this.resolveNoticeTarget(event);
       if (!target) {
         return;
       }
@@ -12205,10 +12297,10 @@ class EventHandler {
       console.error(`[EventHandler] telemetry notice failed (swallowed) type=${event.type}`, err);
     }
   }
-  async formatEvent(event) {
+  async formatEvent(event, opts = {}) {
     if (NOTIFY_V2_TERMINAL_TYPES.has(event.type) && event.metadata?.triggerEventId && this.eventStore && this.getHandlerForEsType) {
       try {
-        const v2Formatted = await this.formatEventViaESPluginV2(event);
+        const v2Formatted = await this.formatEventViaESPluginV2(event, opts.ruleNotice);
         if (v2Formatted) {
           return v2Formatted;
         }
@@ -12218,7 +12310,26 @@ class EventHandler {
     }
     return this.formatter.formatWithEvent(event);
   }
-  async formatEventViaESPluginV2(event) {
+  buildNotifyChannelInfo(triggerEvent, handler, profile) {
+    const meta = triggerEvent.metadata ?? {};
+    const ctx = handler.extractReplyContext?.(triggerEvent, profile);
+    const chatId = ctx?.chatId || meta.chatId || undefined;
+    const messageId = ctx?.messageId || meta.messageId || undefined;
+    const senderId = ctx?.senderOpenId || meta.senderId || undefined;
+    const resolvedProfile = ctx?.profile ?? profile ?? meta.profile;
+    const rawChatType = meta.chatType;
+    const chatType = rawChatType === "group" || rawChatType === "p2p" ? rawChatType : "unknown";
+    return {
+      esType: triggerEvent.esType ?? handler.type,
+      ...chatId ? { chatId } : {},
+      chatType,
+      ...messageId ? { messageId } : {},
+      ...senderId ? { senderId } : {},
+      ...resolvedProfile ? { profile: resolvedProfile } : {},
+      replyKind: chatId ? messageId ? "reply" : "send" : "none"
+    };
+  }
+  async formatEventViaESPluginV2(event, ruleNotice) {
     const triggerEventId = event.metadata.triggerEventId;
     const triggerEvent = await this.eventStore.getEventById(triggerEventId);
     if (!triggerEvent) {
@@ -12233,17 +12344,21 @@ class EventHandler {
       summary: typeof payload?.result === "string" ? payload.result : typeof payload?.error === "string" ? payload.error : "(无结果)"
     };
     const profile = triggerEvent.metadata?.profile ?? undefined;
+    const channel = this.buildNotifyChannelInfo(triggerEvent, handler, profile);
     const prompt = handler.buildNotifyHandlePrompt({
       notifyEvent: {
         type: event.type,
         taskId: typeof payload?.associatedTaskId === "number" ? payload.associatedTaskId : undefined,
         description: typeof payload?.description === "string" ? payload.description : undefined,
         result: typeof payload?.result === "string" ? payload.result : undefined,
-        error: typeof payload?.error === "string" ? payload.error : undefined
+        error: typeof payload?.error === "string" ? payload.error : undefined,
+        subSessionId: typeof payload?.subSessionId === "string" ? payload.subSessionId : undefined
       },
       triggerEvent,
       subAgentResult,
-      profile
+      profile,
+      channel,
+      ...ruleNotice ? { ruleNotice } : {}
     });
     if (handler.postProcessNotifyEvent) {
       const notifyEventForHook = {
@@ -12692,6 +12807,14 @@ __legacyDecorateClassTS([
   ]),
   __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "handleEvent", null);
+__legacyDecorateClassTS([
+  TracedAs5("event_handler.rule_notice", { recordParams: true, recordResult: false }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    typeof EnvEvent === "undefined" ? Object : EnvEvent
+  ]),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], EventHandler.prototype, "sendRuleNotice", null);
 __legacyDecorateClassTS([
   TracedAs5("event_handler.telemetry_notice", { recordParams: true, recordResult: false }),
   __legacyMetadataTS("design:type", Function),
@@ -12704,7 +12827,8 @@ __legacyDecorateClassTS([
   TracedAs5("cli.event-handler.formatEvent", { recordParams: true, recordResult: false }),
   __legacyMetadataTS("design:type", Function),
   __legacyMetadataTS("design:paramtypes", [
-    typeof EnvEvent === "undefined" ? Object : EnvEvent
+    typeof EnvEvent === "undefined" ? Object : EnvEvent,
+    Object
   ]),
   __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "formatEvent", null);
@@ -12712,7 +12836,8 @@ __legacyDecorateClassTS([
   TracedAs5("event_handler.process_notify", { recordParams: true, recordResult: false }),
   __legacyMetadataTS("design:type", Function),
   __legacyMetadataTS("design:paramtypes", [
-    typeof EnvEvent === "undefined" ? Object : EnvEvent
+    typeof EnvEvent === "undefined" ? Object : EnvEvent,
+    typeof RuleNoticeInfo === "undefined" ? Object : RuleNoticeInfo
   ]),
   __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "formatEventViaESPluginV2", null);

package/dist/roy-agent-linux-x64/bin/roy-agent

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/roy-agent-linux-x64/bin/roy-agent
-size: 109897856 bytes
-sha256: 0343f071cd373c6540cd1f19d6a561e9cacce93efac9be7b3f424490521d7044
+size: 109906048 bytes
+sha256: a97336c59bd5ce3cada998cc8b03fec204414ec9ecc0995b494c0a3f6613d1b2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-cli",
-  "version": "1.7.58",
+  "version": "1.7.59",
   "type": "module",
   "description": "CLI for roy-agent - Non-interactive command execution",
   "main": "./dist/index.js",