@ai-setting/roy-agent-core 1.6.6 → 1.6.7

package/dist/env/event-source/index.js

@@ -10,7 +10,7 @@ import {
   larkCliHandler,
   resolveBountyIMSystemPrompt,
   timerHandler
-} from "../../shared/@ai-setting/roy-agent-core-mzhsk0jb.js";
+} from "../../shared/@ai-setting/roy-agent-core-jzza6c2r.js";
 import {
   BUILT_IN_EVENT_SOURCE_TYPES,
   BUILT_IN_EVENT_SOURCE_TYPE_LIST,

package/dist/env/index.js

@@ -5,7 +5,7 @@ import {
   EventSourceComponent,
   builtInHandlers,
   larkCliHandler
-} from "../shared/@ai-setting/roy-agent-core-mzhsk0jb.js";
+} from "../shared/@ai-setting/roy-agent-core-jzza6c2r.js";
 import {
   EventSourceInitHooks,
   getDefaultConfigForType,
@@ -21,9 +21,9 @@ import"../shared/@ai-setting/roy-agent-core-jayzyg7h.js";
 import"../shared/@ai-setting/roy-agent-core-az13yzmc.js";
 import {
   WorkflowComponent
-} from "../shared/@ai-setting/roy-agent-core-b9bnm4mj.js";
+} from "../shared/@ai-setting/roy-agent-core-kenhsgnf.js";
 import"../shared/@ai-setting/roy-agent-core-xgnpr28w.js";
-import"../shared/@ai-setting/roy-agent-core-4y3hdqw2.js";
+import"../shared/@ai-setting/roy-agent-core-39rvx3fw.js";
 import"../shared/@ai-setting/roy-agent-core-6atd905e.js";
 import"../shared/@ai-setting/roy-agent-core-w7mhnc4c.js";
 import"../shared/@ai-setting/roy-agent-core-q88vxmx5.js";
@@ -31,7 +31,7 @@ import"../shared/@ai-setting/roy-agent-core-ddwa0n6h.js";
 import"../shared/@ai-setting/roy-agent-core-hhrg314p.js";
 import"../shared/@ai-setting/roy-agent-core-0tfv18rf.js";
 import"../shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
-import"../shared/@ai-setting/roy-agent-core-smmr6wr3.js";
+import"../shared/@ai-setting/roy-agent-core-ka4b12eg.js";
 import"../shared/@ai-setting/roy-agent-core-1db4vpc6.js";
 import"../shared/@ai-setting/roy-agent-core-b75jtybq.js";
 import"../shared/@ai-setting/roy-agent-core-8wd3qwx5.js";
@@ -48,7 +48,7 @@ import"../shared/@ai-setting/roy-agent-core-5h49ct1a.js";
 import"../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
   TaskComponent
-} from "../shared/@ai-setting/roy-agent-core-a5rde2ky.js";
+} from "../shared/@ai-setting/roy-agent-core-gdkq55yg.js";
 import"../shared/@ai-setting/roy-agent-core-amkqnyzy.js";
 import"../shared/@ai-setting/roy-agent-core-8gxth0eh.js";
 import"../shared/@ai-setting/roy-agent-core-c94yan0b.js";
@@ -61,7 +61,7 @@ import {
   getXDGPath,
   getXDGPaths
 } from "../shared/@ai-setting/roy-agent-core-qxnbvgwe.js";
-import"../shared/@ai-setting/roy-agent-core-ktbkp661.js";
+import"../shared/@ai-setting/roy-agent-core-sxqy40cs.js";
 import"../shared/@ai-setting/roy-agent-core-t94ktchq.js";
 import"../shared/@ai-setting/roy-agent-core-1pg0fepg.js";
 import {

package/dist/env/task/index.js

@@ -5,7 +5,7 @@ import {
   TaskPriorityEnum,
   TaskStatusEnum,
   TaskTypeEnum
-} from "../../shared/@ai-setting/roy-agent-core-a5rde2ky.js";
+} from "../../shared/@ai-setting/roy-agent-core-gdkq55yg.js";
 import"../../shared/@ai-setting/roy-agent-core-amkqnyzy.js";
 import {
   TaskEntityEventTypes
@@ -19,7 +19,7 @@ import {
 import"../../shared/@ai-setting/roy-agent-core-4extx33r.js";
 import"../../shared/@ai-setting/roy-agent-core-as3phr7n.js";
 import"../../shared/@ai-setting/roy-agent-core-qxnbvgwe.js";
-import"../../shared/@ai-setting/roy-agent-core-ktbkp661.js";
+import"../../shared/@ai-setting/roy-agent-core-sxqy40cs.js";
 import"../../shared/@ai-setting/roy-agent-core-t94ktchq.js";
 import"../../shared/@ai-setting/roy-agent-core-1pg0fepg.js";
 import"../../shared/@ai-setting/roy-agent-core-qxhq8ven.js";

package/dist/env/task/tools/index.js

@@ -9,7 +9,7 @@ import {
   searchTasksTool,
   treeTasksTool,
   updateTaskTool
-} from "../../../shared/@ai-setting/roy-agent-core-ktbkp661.js";
+} from "../../../shared/@ai-setting/roy-agent-core-sxqy40cs.js";
 import"../../../shared/@ai-setting/roy-agent-core-scp0afxg.js";
 import"../../../shared/@ai-setting/roy-agent-core-cg146hmg.js";
 import"../../../shared/@ai-setting/roy-agent-core-vyygk314.js";

package/dist/env/workflow/engine/index.js

@@ -5,7 +5,7 @@ import {
   Scheduler,
   WorkflowEngine,
   init_engine
-} from "../../../shared/@ai-setting/roy-agent-core-4y3hdqw2.js";
+} from "../../../shared/@ai-setting/roy-agent-core-39rvx3fw.js";
 import"../../../shared/@ai-setting/roy-agent-core-6atd905e.js";
 import"../../../shared/@ai-setting/roy-agent-core-w7mhnc4c.js";
 import"../../../shared/@ai-setting/roy-agent-core-q88vxmx5.js";

package/dist/env/workflow/index.js

@@ -1,8 +1,8 @@
 import {
   WorkflowComponent
-} from "../../shared/@ai-setting/roy-agent-core-b9bnm4mj.js";
+} from "../../shared/@ai-setting/roy-agent-core-kenhsgnf.js";
 import"../../shared/@ai-setting/roy-agent-core-xgnpr28w.js";
-import"../../shared/@ai-setting/roy-agent-core-4y3hdqw2.js";
+import"../../shared/@ai-setting/roy-agent-core-39rvx3fw.js";
 import"../../shared/@ai-setting/roy-agent-core-6atd905e.js";
 import"../../shared/@ai-setting/roy-agent-core-w7mhnc4c.js";
 import"../../shared/@ai-setting/roy-agent-core-q88vxmx5.js";
@@ -60,7 +60,7 @@ import {
   pathNotFound,
   unresolvedVariable
 } from "../../shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
-import"../../shared/@ai-setting/roy-agent-core-smmr6wr3.js";
+import"../../shared/@ai-setting/roy-agent-core-ka4b12eg.js";
 import"../../shared/@ai-setting/roy-agent-core-1db4vpc6.js";
 import"../../shared/@ai-setting/roy-agent-core-b75jtybq.js";
 import"../../shared/@ai-setting/roy-agent-core-8wd3qwx5.js";

package/dist/env/workflow/tools/index.js

@@ -24,7 +24,7 @@ import {
   getRunWorkflowTool,
   initRunWorkflowTool,
   resetRunWorkflowTool
-} from "../../../shared/@ai-setting/roy-agent-core-smmr6wr3.js";
+} from "../../../shared/@ai-setting/roy-agent-core-ka4b12eg.js";
 import {
   WORKFLOW_SUBMIT_OUTPUT_TOOL_NAME,
   WorkflowJsonOutputMarker,

package/dist/index.js

@@ -74,7 +74,7 @@ import {
   larkCliHandler,
   resolveBountyIMSystemPrompt,
   timerHandler
-} from "./shared/@ai-setting/roy-agent-core-mzhsk0jb.js";
+} from "./shared/@ai-setting/roy-agent-core-jzza6c2r.js";
 import {
   BUILT_IN_EVENT_SOURCE_TYPES,
   BUILT_IN_EVENT_SOURCE_TYPE_LIST,
@@ -100,12 +100,12 @@ import {
 } from "./shared/@ai-setting/roy-agent-core-az13yzmc.js";
 import {
   WorkflowComponent
-} from "./shared/@ai-setting/roy-agent-core-b9bnm4mj.js";
+} from "./shared/@ai-setting/roy-agent-core-kenhsgnf.js";
 import {
   init_node_registry_helper,
   registerDecoratorNodeType
 } from "./shared/@ai-setting/roy-agent-core-xgnpr28w.js";
-import"./shared/@ai-setting/roy-agent-core-4y3hdqw2.js";
+import"./shared/@ai-setting/roy-agent-core-39rvx3fw.js";
 import"./shared/@ai-setting/roy-agent-core-6atd905e.js";
 import"./shared/@ai-setting/roy-agent-core-w7mhnc4c.js";
 import"./shared/@ai-setting/roy-agent-core-q88vxmx5.js";
@@ -113,7 +113,7 @@ import"./shared/@ai-setting/roy-agent-core-ddwa0n6h.js";
 import"./shared/@ai-setting/roy-agent-core-hhrg314p.js";
 import"./shared/@ai-setting/roy-agent-core-0tfv18rf.js";
 import"./shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
-import"./shared/@ai-setting/roy-agent-core-smmr6wr3.js";
+import"./shared/@ai-setting/roy-agent-core-ka4b12eg.js";
 import"./shared/@ai-setting/roy-agent-core-1db4vpc6.js";
 import"./shared/@ai-setting/roy-agent-core-b75jtybq.js";
 import"./shared/@ai-setting/roy-agent-core-8wd3qwx5.js";
@@ -148,7 +148,7 @@ import {
 } from "./shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
   TaskComponent
-} from "./shared/@ai-setting/roy-agent-core-a5rde2ky.js";
+} from "./shared/@ai-setting/roy-agent-core-gdkq55yg.js";
 import"./shared/@ai-setting/roy-agent-core-amkqnyzy.js";
 import"./shared/@ai-setting/roy-agent-core-8gxth0eh.js";
 import"./shared/@ai-setting/roy-agent-core-c94yan0b.js";
@@ -169,7 +169,7 @@ import {
   getXDGPath,
   getXDGPaths
 } from "./shared/@ai-setting/roy-agent-core-qxnbvgwe.js";
-import"./shared/@ai-setting/roy-agent-core-ktbkp661.js";
+import"./shared/@ai-setting/roy-agent-core-sxqy40cs.js";
 import"./shared/@ai-setting/roy-agent-core-t94ktchq.js";
 import {
   TaskHookPoints

package/dist/shared/@ai-setting/{roy-agent-core-4y3hdqw2.js → roy-agent-core-39rvx3fw.js}

@@ -1027,6 +1027,7 @@ var init_agent_node = __esm(() => {
           const promptTemplate = config.prompt || "";
           resolvedPrompt = context.templateResolver?.resolveValue(promptTemplate) ?? promptTemplate;
         }
+        resolvedPrompt = this.applyPromptInjection(resolvedPrompt, context.workflowInput?.prompt_injection);
         let resolvedAgentType = agentType;
         let inheritedModel;
         let inheritedAllowedTools;
@@ -1137,6 +1138,16 @@ var init_agent_node = __esm(() => {
         };
       }
     }
+    applyPromptInjection(basePrompt, promptInjection) {
+      if (typeof promptInjection !== "string" || promptInjection.length === 0) {
+        return basePrompt;
+      }
+      return `${basePrompt}
+
+---
+[Caller Injection]
+${promptInjection}`;
+    }
     async resolveAgentSessionIdFromWorkflow(context) {
       const sessionComponent = context.sessionComponent;
       if (!sessionComponent) {
@@ -1199,6 +1210,9 @@ var init_agent_node = __esm(() => {
   __legacyDecorateClassTS([
     TracedAs("workflow.agent.execute")
   ], AgentNode.prototype, "execute", null);
+  __legacyDecorateClassTS([
+    TracedAs("workflow.agent.applyPromptInjection", { recordParams: true, recordResult: false })
+  ], AgentNode.prototype, "applyPromptInjection", null);
   __legacyDecorateClassTS([
     TracedAs("agent.node.createAgentSubSession", { recordParams: true, recordResult: true, log: true })
   ], AgentNode.prototype, "createAgentSubSession", null);
@@ -2184,6 +2198,9 @@ var init_engine = __esm(() => {
       let timer;
       const timeoutPromise = new Promise((_, reject) => {
         timer = setTimeout(() => {
+          this.stop(sessionId, "execution timeout").catch((stopError) => {
+            logger3.warn(`[WorkflowEngine.waitForCompletion] Failed to stop ${sessionId} after execution timeout: ${stopError instanceof Error ? stopError.message : String(stopError)}`);
+          });
           reject(new Error(`Workflow execution timeout: ${timeoutMs}ms`));
         }, timeoutMs);
       });
@@ -2266,6 +2283,12 @@ var init_engine = __esm(() => {
   __legacyDecorateClassTS([
     TracedAs("workflow.engine.failWorkflow", { recordParams: true, recordResult: true })
   ], WorkflowEngine.prototype, "failWorkflow", null);
+  __legacyDecorateClassTS([
+    TracedAs("workflow.engine.waitForCompletion", {
+      recordParams: true,
+      recordResult: true
+    })
+  ], WorkflowEngine.prototype, "waitForCompletion", null);
 });
 
 // src/env/workflow/engine/index.ts

package/dist/shared/@ai-setting/{roy-agent-core-a5rde2ky.js → roy-agent-core-gdkq55yg.js}

@@ -24,7 +24,7 @@ import {
   searchTasksTool,
   treeTasksTool,
   updateTaskTool
-} from "./roy-agent-core-ktbkp661.js";
+} from "./roy-agent-core-sxqy40cs.js";
 import {
   createOperationTool,
   deleteOperationTool,

package/dist/shared/@ai-setting/{roy-agent-core-mzhsk0jb.js → roy-agent-core-jzza6c2r.js}

@@ -194,18 +194,23 @@ var timerHandler = {
 
 // src/env/event-source/bounty-im-handler.ts
 function readBountyIMConfig(config) {
-  const topLevelAddress = config.address;
   const topLevelUrl = config.imServerUrl;
   const topLevelEmail = config.email;
-  const optionsAddress = config.options?.address;
   const optionsUrl = config.options?.imServerUrl;
   const optionsEmail = config.options?.email;
   return {
-    address: topLevelAddress || optionsAddress,
-    imServerUrl: topLevelUrl || optionsUrl,
-    email: topLevelEmail || optionsEmail
+    email: topLevelEmail || optionsEmail,
+    imServerUrl: topLevelUrl || optionsUrl
   };
 }
+function assertNoLegacyAddressField(config) {
+  const legacyTopLevel = config.address;
+  const legacyInOptions = config.options?.address;
+  const legacyValue = typeof legacyTopLevel === "string" && legacyTopLevel.trim() !== "" && legacyTopLevel || typeof legacyInOptions === "string" && legacyInOptions.trim() !== "" && legacyInOptions;
+  if (legacyValue) {
+    throw new Error(`[BountyIM] v0.14 strict email-only: legacy 'address' field is no longer supported. ` + `Found: address="${legacyValue}". ` + `Migration: remove the 'address' field and add 'email' (your registered bounty email) ` + `to event-sources.json. Example: { "id": "<source-id>", "type": "bounty-im", ` + `"email": "<you@bounty.example.com>", "imServerUrl": "<ws-url>" }`);
+  }
+}
 function readBountyIMTlsSkipVerify(config) {
   const topLevel = config.tlsSkipVerify;
   const fromOptions = config.options?.tlsSkipVerify;
@@ -216,18 +221,17 @@ function buildDefaultBountyIMSystemPrompt(input) {
   const server = input.imServerUrl || "ws://localhost:4005/ws";
   const httpScheme = server.startsWith("wss://") ? "https://" : "http://";
   const endpoint = server.replace(/^wss?:\/\//, httpScheme).replace(/\/ws$/, "");
-  const hasEmail = !!input.currentEmail;
-  const identity = input.currentEmail || input.currentAddress || "unknown";
-  const command = hasEmail ? `bounty com send --server-url ${endpoint} --from-email ${input.currentEmail} --to-email <recipient-email> --body "..."` : `bounty com send --endpoint ${endpoint} -f ${input.currentAddress} -t <to-address> -b "..."`;
-  const rule = hasEmail ? `规则：from-email 永远固定为 ${input.currentEmail}; to-email 是收到消息的 from 字段。` : `规则：to-address 总是收到的消息的 from 字段；from-address 永远固定为 ${input.currentAddress}。`;
-  const tlsCommand = hasEmail ? `  bounty com send --server-url ${endpoint} --from-email ${input.currentEmail} --to-email <recipient-email> --body "..."` : `  bounty com send --endpoint ${endpoint} -k -f ${input.currentAddress} -t <to-address> -b "..."`;
+  const email = input.currentEmail || "<your-registered-email>";
+  const command = `bounty com send --server-url ${endpoint} --from-email ${email} --to-email <recipient-email> --body "..."`;
+  const tlsCommand = `  bounty com send --server-url ${endpoint} --from-email ${email} --to-email <recipient-email> --body "..."`;
+  const rule = `规则：from-email 永远固定为 ${email}; to-email 是收到消息的 from 字段。`;
   return [
     "你正在通过 Bounty IM 与其他 agent 通信。",
     "",
-    `你的 IM 身份：${identity}`,
+    `你的 IM 身份（v0.14 strict email-only）：${email}`,
     `IM Server：${endpoint} (k8s remote server)`,
     "",
-    "回复收到的消息时，**必须**使用以下命令格式（注意 --server-url / --endpoint 不可省略，省略会默认连 localhost:4000 而失败）：",
+    "回复收到的消息时，**必须**使用以下命令格式（注意 --server-url 不可省略，省略会默认连 localhost:4000 而失败）：",
     "",
     `  ${command}`,
     "",
@@ -238,9 +242,80 @@ function buildDefaultBountyIMSystemPrompt(input) {
   ].join(`
 `);
 }
+function translateImServerUrlToHttpApi(imServerUrl) {
+  const httpScheme = imServerUrl.startsWith("wss://") ? "https://" : "http://";
+  return imServerUrl.replace(/^wss?:\/\//, httpScheme).replace(/\/ws$/, "");
+}
+function resolveCanonicalToEmail(canonical, profileEmail) {
+  if (!canonical)
+    return null;
+  const trimmed = canonical.trim();
+  if (!trimmed)
+    return null;
+  const UUID_HOST = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}@(.+)$/i;
+  const match = trimmed.match(UUID_HOST);
+  if (match) {
+    const host = match[1];
+    if (host === "authenticated") {
+      return profileEmail?.trim() || null;
+    }
+    return null;
+  }
+  if (/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(trimmed)) {
+    return trimmed;
+  }
+  return null;
+}
 function resolveBountyIMSystemPrompt(input) {
   return input.configSystemPrompt || buildDefaultBountyIMSystemPrompt(input);
 }
+function isSelfEcho(msg, currentEmail) {
+  if (!msg || typeof msg !== "object")
+    return false;
+  const m = msg;
+  const fromEmailRaw = typeof m.fromEmail === "string" ? m.fromEmail.trim() : "";
+  const currentTrim = typeof currentEmail === "string" ? currentEmail.trim() : "";
+  if (fromEmailRaw && currentTrim) {
+    return fromEmailRaw.toLowerCase() === currentTrim.toLowerCase();
+  }
+  const fromAddr = typeof m.from === "string" ? m.from : undefined;
+  const toAddr = typeof m.to === "string" ? m.to : undefined;
+  if (fromAddr && toAddr) {
+    const fromLocal = fromAddr.split("@")[0]?.trim();
+    const toLocal = toAddr.split("@")[0]?.trim();
+    const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    if (fromLocal && toLocal && UUID_RE.test(fromLocal) && UUID_RE.test(toLocal)) {
+      return fromLocal.toLowerCase() === toLocal.toLowerCase();
+    }
+  }
+  return false;
+}
+function isWrongAddress(msg, currentEmail) {
+  if (!msg || typeof msg !== "object")
+    return false;
+  const m = msg;
+  const toAddr = typeof m.to === "string" ? m.to.trim() : "";
+  if (!toAddr)
+    return false;
+  const currentTrim = typeof currentEmail === "string" ? currentEmail.trim() : "";
+  if (!currentTrim)
+    return false;
+  const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  const toLocal = toAddr.split("@")[0] ?? "";
+  const currentLocal = currentTrim.split("@")[0] ?? "";
+  const toIsEmail = EMAIL_RE.test(toAddr) && !UUID_RE.test(toLocal);
+  const currentIsEmail = EMAIL_RE.test(currentTrim) && !UUID_RE.test(currentLocal);
+  const toIsUuid = UUID_RE.test(toLocal);
+  const currentIsUuid = UUID_RE.test(currentLocal);
+  if (toIsEmail && currentIsEmail) {
+    return toAddr.toLowerCase() !== currentTrim.toLowerCase();
+  }
+  if (toIsUuid && currentIsUuid) {
+    return toLocal.toLowerCase() !== currentLocal.toLowerCase();
+  }
+  return false;
+}
 function shouldWriteBunTlsSkipEnv(tlsSkipVerify, isBunRuntimeOverride) {
   const isBun = isBunRuntimeOverride ?? typeof Bun !== "undefined";
   return tlsSkipVerify === true && isBun;
@@ -256,18 +331,17 @@ class BountyIMInstance {
     this.config = config;
   }
   getCurrentIdentity() {
-    const { email, address } = readBountyIMConfig(this.config);
-    return { email, address };
+    const { email } = readBountyIMConfig(this.config);
+    return { email };
   }
   getCurrentAddress() {
-    const { email, address } = readBountyIMConfig(this.config);
-    return address || email || "unknown";
+    const { email } = readBountyIMConfig(this.config);
+    return email || "unknown";
   }
   getCurrentSystemPrompt() {
-    const { email, address, imServerUrl } = readBountyIMConfig(this.config);
+    const { email, imServerUrl } = readBountyIMConfig(this.config);
     return resolveBountyIMSystemPrompt({
       configSystemPrompt: this.config.systemPrompt,
-      currentAddress: address,
       currentEmail: email,
       imServerUrl
     });
@@ -279,15 +353,14 @@ class BountyIMInstance {
     if (this.status === "running")
       return;
     this.setStatus("starting");
-    const { email, address, imServerUrl } = readBountyIMConfig(this.config);
+    assertNoLegacyAddressField(this.config);
+    const { email, imServerUrl } = readBountyIMConfig(this.config);
     if (!imServerUrl) {
       throw new Error("imServerUrl is required for bounty-im event source");
     }
     const wsUrl = new URL(imServerUrl);
     if (email) {
       wsUrl.searchParams.set("email", email);
-    } else if (address) {
-      wsUrl.searchParams.set("address", address);
     }
     console.log(`[BountyIM] Connecting to ${wsUrl.toString()}...`);
     try {
@@ -302,7 +375,7 @@ class BountyIMInstance {
         rejectUnauthorized: !tlsSkipVerify
       });
       this.ws.on("open", () => {
-        console.log(`[BountyIM] Connected${address ? ` as ${address}` : ""}`);
+        console.log(`[BountyIM] Connected${email ? ` as ${email}` : ""}`);
         this.setStatus("running");
       });
       this.ws.on("message", (data) => {
@@ -340,6 +413,15 @@ class BountyIMInstance {
   setStatus(status) {
     this.status = status;
   }
+  sendAck(messageId) {
+    if (!messageId || !this.ws)
+      return;
+    try {
+      this.ws.send(JSON.stringify({ event: "ack", data: { messageIds: [messageId] } }));
+    } catch (ackErr) {
+      console.error(`[BountyIM] 发送 ACK 失败:`, ackErr);
+    }
+  }
   handleMessage(data) {
     this.buffer += data;
     try {
@@ -366,28 +448,42 @@ class BountyIMInstance {
       }
       const eventType = `bounty-im.${evt.event || "message"}`;
       const fromAddress = msg.from || "unknown";
-      const currentAddress = this.getCurrentAddress();
-      const currentIdentity = this.getCurrentIdentity();
-      const currentEmail = currentIdentity.email;
-      const toAddress = msg.to || currentAddress;
-      const identityMatches = currentEmail ? msg.to === currentEmail || msg.to === currentAddress : msg.to === currentAddress;
-      if (msg.to && !identityMatches) {
-        console.warn(`[BountyIM] Warning: message.to (${msg.to}) !== current identity (${currentEmail || currentAddress})`);
+      const currentEmail = this.getCurrentIdentity().email || "unknown";
+      const toAddress = msg.to || currentEmail;
+      if (isSelfEcho(msg, currentEmail)) {
+        console.log(`[BountyIM] Skipped self-echo: from=${msg.from ?? "?"} to=${msg.to ?? "?"}`);
+        this.sendAck(msg.id);
+        return;
+      }
+      if (isWrongAddress(msg, currentEmail)) {
+        console.warn(`[BountyIM] Skipped wrong-address event: to=${msg.to ?? "?"} currentEmail=${currentEmail}`);
+        this.sendAck(msg.id);
+        return;
+      }
+      if (msg.to && msg.to !== currentEmail) {
+        console.warn(`[BountyIM] Warning: message.to (${msg.to}) !== current email (${currentEmail})`);
       }
       const msgContent = msg.content;
       const content = msgContent?.type === "text" ? String(msgContent.body || "") : "";
       const { imServerUrl, email } = readBountyIMConfig(this.config);
       const agent = this.config.handleRule?.agent;
+      const fromEmailRaw = msg.fromEmail;
+      const fromEmailResolved = resolveCanonicalToEmail(fromAddress, email);
+      const senderEmail = typeof fromEmailRaw === "string" && fromEmailRaw.trim() !== "" && fromEmailRaw.trim() || fromEmailResolved || fromAddress;
       const metadata = {
         eventType,
         senderId: fromAddress,
+        senderEmail,
         chatId: toAddress,
         agent
       };
-      const replyCommandHint = email ? `bounty com send --server-url ${imServerUrl} --from-email ${email} --to-email <recipient-email> --body "..."` : `bounty com send -f ${toAddress} -t ${fromAddress} -b "回复内容"`;
-      const inlineReplyHint = email ? `bounty com send --server-url ${imServerUrl} --from-email ${email} --to-email ${fromAddress} --body "回复内容"` : `bounty com send -f ${toAddress} -t ${fromAddress} -b "回复内容"`;
+      const httpApiUrl = imServerUrl ? translateImServerUrlToHttpApi(imServerUrl) : "<your-server-url>";
+      const fromEmailForCmd = email || "<your-registered-email>";
+      const toEmailForCmd = senderEmail !== fromAddress ? senderEmail : "<recipient-registered-email>";
+      const replyCommandHint = `bounty com send --server-url ${httpApiUrl} --from-email ${fromEmailForCmd} --to-email ${toEmailForCmd} --body "..."`;
+      const inlineReplyHint = `bounty com send --server-url ${httpApiUrl} --from-email ${fromEmailForCmd} --to-email ${toEmailForCmd} --body "回复内容"`;
       let recommendedAction;
-      if (evt.event === "message") {
+      if (evt.event === "message" && fromAddress !== toAddress) {
         recommendedAction = {
           action: `处理消息并通过 bounty com send 回复发件人。使用格式：${replyCommandHint}`,
           replyTo: {
@@ -404,7 +500,8 @@ class BountyIMInstance {
           imServerUrl
         }
       };
-      const displayMessage = content ? `[From ${fromAddress}] ${content}
+      const displayFrom = senderEmail;
+      const displayMessage = content ? `[From ${displayFrom}] ${content}
 
 \uD83D\uDCA1 回复: ${inlineReplyHint}` : this.formatMessage(rawEvent);
       const event = {
@@ -430,18 +527,10 @@ class BountyIMInstance {
         }
       };
       this.eventHandler?.(event);
-      if (msg.id && this.ws) {
-        try {
-          const ackPayload = JSON.stringify({
-            event: "ack",
-            data: { messageIds: [msg.id] }
-          });
-          this.ws.send(ackPayload);
-          console.log(`[BountyIM] 已发送 ACK for message: ${msg.id}`);
-        } catch (ackErr) {
-          console.error(`[BountyIM] 发送 ACK 失败:`, ackErr);
-        }
+      if (msg.id) {
+        console.log(`[BountyIM] 已发送 ACK for message: ${msg.id}`);
       }
+      this.sendAck(msg.id);
     } catch (err) {
       console.error(`[BountyIM] Error processing message:`, err);
     }
@@ -471,20 +560,20 @@ var bountyIMHandler = {
       errors.push("EventSource ID is required");
     if (!config.name)
       errors.push("EventSource name is required");
-    const { address, imServerUrl, email } = readBountyIMConfig(config);
-    if (!email && !address) {
-      errors.push("Bounty IM email or address is required (top-level email/address or options.email/address)");
+    try {
+      assertNoLegacyAddressField(config);
+    } catch (err) {
+      errors.push(err instanceof Error ? err.message : String(err));
+    }
+    const { imServerUrl, email } = readBountyIMConfig(config);
+    if (!email) {
+      errors.push("Bounty IM email is required (v0.14 strict email-only; top-level email or options.email)");
     }
     if (email !== undefined && email !== "") {
       if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
         errors.push("Bounty IM email format invalid (expected: user@domain.tld)");
       }
     }
-    if (address !== undefined && address !== "") {
-      if (!/^[\w-]+@[\w.-]+$/.test(address)) {
-        errors.push("Bounty IM address format invalid (expected: agent-id@host)");
-      }
-    }
     if (!imServerUrl) {
       errors.push("Bounty IM imServerUrl is required (top-level imServerUrl or options.imServerUrl)");
     } else if (!imServerUrl.startsWith("ws://") && !imServerUrl.startsWith("wss://")) {
@@ -568,7 +657,7 @@ function extractMetadata(rawEvent, eventType) {
     const profileFlag = profile2 ? `--profile ${profile2} ` : "";
     const profileHint = profile2 ? `（⚠️ 必须使用 profile="${profile2}" 调用 lark-cli，否则会因 openId 跨 app 失败）` : "";
     recommendedAction = {
-      action: `处理飞书消息并以机器人身份回复${profileHint}，例如：lark-cli ${profileFlag}im +messages-reply --message-id "xxxxid" --as bot --text "回复内容"`,
+      action: `处理飞书消息并以机器人身份回复${profileHint}，例如：lark-cli ${profileFlag}im +messages-reply --message-id "xxxxid" --as bot --markdown "Markdown 格式回复内容"`,
       replyTo: {
         appId: metadata.appId,
         profile: profile2,

package/dist/shared/@ai-setting/{roy-agent-core-smmr6wr3.js → roy-agent-core-ka4b12eg.js}

@@ -613,6 +613,7 @@ function createWorkflowSearchTool(workflowService) {
 
 // src/env/workflow/tools/run-workflow.ts
 init_logger();
+init_decorator();
 import { z as z8 } from "zod";
 var logger7 = createLogger("run-workflow-tool");
 function synthFallbackRunId(now = Date.now()) {
@@ -625,6 +626,24 @@ function attemptStopOnTimeout(workflowService, runId, reason) {
     logger7.warn(`Failed to stop workflow ${runId} after timeout: ${stopErr instanceof Error ? stopErr.message : String(stopErr)}`);
   });
 }
+function buildErrorReturn(args) {
+  const { errorRunId, status, errorMessage, durationMs } = args;
+  const errorWithRunId = `${errorMessage} (runId: ${errorRunId})`;
+  return {
+    success: false,
+    output: {
+      run_id: errorRunId,
+      status,
+      error: errorWithRunId,
+      duration_ms: durationMs
+    },
+    error: errorWithRunId,
+    metadata: {
+      execution_time_ms: durationMs,
+      run_id: errorRunId
+    }
+  };
+}
 var RunWorkflowInputSchema = z8.object({
   workflow_name: z8.string().describe("Name of the workflow to run"),
   input: z8.record(z8.any()).optional().describe("Input to pass to the workflow"),
@@ -632,8 +651,24 @@ var RunWorkflowInputSchema = z8.object({
   node_config: z8.record(z8.string(), z8.record(z8.string(), z8.any())).optional().describe("Per-node runtime config overrides keyed by node id (Task #1974). " + "Shallow-merged into each node's effective config; input wins over nodeDef.config."),
   session: z8.string().regex(/^workflow_/, { message: "session must start with 'workflow_'" }).optional().describe("Existing session ID (workflow_xxx) to resume from. Mutually exclusive with fresh `input` runs.")
 }).strict();
+
+class RunWorkflowToolRunner {
+  executeImpl;
+  constructor(executeImpl) {
+    this.executeImpl = executeImpl;
+  }
+  async execute(args, ctx) {
+    return this.executeImpl(args, ctx);
+  }
+}
+__legacyDecorateClassTS([
+  TracedAs("workflow.run-workflow-tool.execute", {
+    recordParams: true,
+    recordResult: true
+  })
+], RunWorkflowToolRunner.prototype, "execute", null);
 function createRunWorkflowTool(workflowService) {
-  return {
+  const tool = {
     name: "workflow_run",
     description: "Run a workflow by name with optional input, OR resume an existing workflow run via the `session` field (the runId itself acts as session ID, both have `workflow_` prefix natively — pass the workflow run's runId directly). Returns run_id (== session_id, ALWAYS populated — even on timeout/abort/error paths), status, output, error, and duration_ms. Default timeout: 30 minutes.",
     parameters: RunWorkflowInputSchema,
@@ -738,57 +773,42 @@ function createRunWorkflowTool(workflowService) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         const errorRunId = capturedRunId ?? reservedRunId;
         if (errorMessage.includes("Workflow not found")) {
-          return {
-            success: false,
-            output: {
-              run_id: errorRunId,
-              status: "failed",
-              error: `Workflow not found: ${workflow_name}`,
-              duration_ms: durationMs
-            },
-            error: `Workflow not found: ${workflow_name}`,
-            metadata: {
-              execution_time_ms: durationMs,
-              run_id: errorRunId
-            }
-          };
+          return buildErrorReturn({
+            errorRunId,
+            status: "failed",
+            errorMessage: `Workflow not found: ${workflow_name}`,
+            durationMs
+          });
         }
-        if (errorMessage.includes("abort") || errorMessage.includes("timed out")) {
-          return {
-            success: false,
-            output: {
-              run_id: errorRunId,
-              status: "timeout",
-              error: `Workflow execution timed out or was aborted: ${workflow_name}`,
-              duration_ms: durationMs
-            },
-            error: `Workflow execution timed out or was aborted: ${workflow_name}`,
-            metadata: {
-              execution_time_ms: durationMs,
-              run_id: errorRunId
-            }
-          };
+        const isTimeoutLike = errorMessage.includes("abort") || errorMessage.includes("timed out") || errorMessage.includes("execution timeout:");
+        if (isTimeoutLike) {
+          if (!timedOut) {
+            attemptStopOnTimeout(workflowService, errorRunId, "timed out");
+          }
+          return buildErrorReturn({
+            errorRunId,
+            status: "timeout",
+            errorMessage: `Workflow execution timed out or was aborted: ${workflow_name}`,
+            durationMs
+          });
         }
         if (logger7?.error) {
           logger7.error(`Failed to run workflow: ${workflow_name}`, { error: errorMessage });
         }
-        return {
-          success: false,
-          output: {
-            run_id: errorRunId,
-            status: "failed",
-            error: `Failed to run workflow ${workflow_name}: ${errorMessage}`,
-            duration_ms: durationMs
-          },
-          error: `Failed to run workflow ${workflow_name}: ${errorMessage}`,
-          metadata: {
-            execution_time_ms: durationMs,
-            run_id: errorRunId
-          }
-        };
+        return buildErrorReturn({
+          errorRunId,
+          status: "failed",
+          errorMessage: `Failed to run workflow ${workflow_name}: ${errorMessage}`,
+          durationMs
+        });
       }
     }
   };
+  const runner = new RunWorkflowToolRunner(tool.execute);
+  return {
+    ...tool,
+    execute: runner.execute.bind(runner)
+  };
 }
 var _runWorkflowTool = null;
 var _workflowService = null;

package/dist/shared/@ai-setting/{roy-agent-core-b9bnm4mj.js → roy-agent-core-kenhsgnf.js}

@@ -6,7 +6,7 @@ import {
   WorkflowEngine,
   exports_engine,
   init_engine
-} from "./roy-agent-core-4y3hdqw2.js";
+} from "./roy-agent-core-39rvx3fw.js";
 import {
   askUserTool,
   createRunWorkflowTool,
@@ -18,7 +18,7 @@ import {
   createWorkflowSearchTool,
   createWorkflowTagListTool,
   createWorkflowValidateTool
-} from "./roy-agent-core-smmr6wr3.js";
+} from "./roy-agent-core-ka4b12eg.js";
 import {
   WorkflowService
 } from "./roy-agent-core-b75jtybq.js";

package/dist/shared/@ai-setting/{roy-agent-core-ktbkp661.js → roy-agent-core-sxqy40cs.js}

@@ -98,10 +98,10 @@ function createTaskTool(taskComponent) {
     description: `
       Create a new task for tracking work.
 
-      ## ⚠️ CALL task_tree(depth=2) BEFORE THIS TOOL
+      ## ⚠️ CALL task_tree(depth=1) BEFORE THIS TOOL
 
       Before calling \`task_create\`, you **MUST** first call
-      \`task_tree(depth=2)\` to inspect the existing task hierarchy.
+      \`task_tree(depth=1)\` to inspect the existing task hierarchy.
       This is critical because:
 
       1. Avoid duplicating root tasks (root tasks should stay ≤ 10).
@@ -109,7 +109,7 @@ function createTaskTool(taskComponent) {
       3. Avoid creating stranded/orphan tasks.
 
       Workflow:
-        step 1: task_tree({depth: 2})
+        step 1: task_tree({depth: 1})
         step 2: read the tree, then decide per "Decision Tree" below
         step 3: task_create({...})
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-core",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "type": "module",
   "description": "Core SDK for roy-agent - Environment, Components, Tools, Sessions, Tasks",
   "main": "./dist/index.js",