@ai-setting/roy-agent-core 1.7.38 → 1.7.40

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

@@ -7,7 +7,7 @@ import {
 import {
   AgentComponentAdapter,
   init_agent_component_adapter
-} from "./roy-agent-core-p0c98phj.js";
+} from "./roy-agent-core-3h7ajma5.js";
 import {
   PythonCallNode,
   SkillNode,

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

@@ -12,7 +12,7 @@ import {
 } from "./roy-agent-core-7hh0brvs.js";
 import {
   BaseComponent
-} from "./roy-agent-core-yv4anf1c.js";
+} from "./roy-agent-core-9t675te0.js";
 import {
   TracedAs,
   init_decorator
@@ -337,6 +337,23 @@ class SessionComponent extends BaseComponent {
   chatBindingCache = new Map;
   static CHAT_BINDING_CACHE_TTL_MS = 60000;
   static CHAT_BINDING_CACHE_MAX = 1000;
+  chatBindingLocks = new Map;
+  runChatBindingExclusive(chatId, fn) {
+    const prev = this.chatBindingLocks.get(chatId) ?? Promise.resolve();
+    const run = prev.catch(() => {}).then(() => fn());
+    const tail = run.then(() => {
+      return;
+    }, () => {
+      return;
+    });
+    this.chatBindingLocks.set(chatId, tail);
+    tail.then(() => {
+      if (this.chatBindingLocks.get(chatId) === tail) {
+        this.chatBindingLocks.delete(chatId);
+      }
+    });
+    return run;
+  }
   async upsertChatTaskBinding(opts) {
     if (!opts.chatId || typeof opts.chatId !== "string") {
       throw new Error("upsertChatTaskBinding: chatId is required (non-empty string)");
@@ -344,6 +361,9 @@ class SessionComponent extends BaseComponent {
     if (typeof opts.taskId !== "number" || !Number.isInteger(opts.taskId) || opts.taskId <= 0) {
       throw new Error(`upsertChatTaskBinding: taskId must be a positive integer, got ${JSON.stringify(opts.taskId)}`);
     }
+    return this.runChatBindingExclusive(opts.chatId, () => this.upsertChatTaskBindingLocked(opts));
+  }
+  async upsertChatTaskBindingLocked(opts) {
     const now = new Date().toISOString();
     const desiredStatus = opts.status ?? "ready";
     const existing = await this.getChatTaskBinding(opts.chatId);
@@ -959,14 +979,25 @@ __legacyDecorateClassTS([
   TracedAs("session.upsertChatTaskBinding", {
     recordParams: false,
     recordResult: false,
-    log: true
+    log: true,
+    resultFilter: (binding) => ({
+      chatId: binding?.chatId ?? null,
+      taskId: binding?.taskId ?? null,
+      status: binding?.status ?? null,
+      rebindCount: binding?.rebindCount ?? null
+    })
   })
 ], SessionComponent.prototype, "upsertChatTaskBinding", null);
 __legacyDecorateClassTS([
   TracedAs("session.getChatTaskBinding", {
     recordParams: false,
     recordResult: false,
-    log: false
+    log: false,
+    resultFilter: (binding) => ({
+      found: !!binding,
+      taskId: binding?.taskId ?? null,
+      status: binding?.status ?? null
+    })
   })
 ], SessionComponent.prototype, "getChatTaskBinding", null);
 __legacyDecorateClassTS([

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

@@ -1,6 +1,6 @@
 import {
   builtInPrompts
-} from "./roy-agent-core-skqt40yy.js";
+} from "./roy-agent-core-223v204d.js";
 import {
   getXDGPath
 } from "./roy-agent-core-qxnbvgwe.js";
@@ -10,14 +10,14 @@ import {
 } from "./roy-agent-core-7hh0brvs.js";
 import {
   BaseComponent
-} from "./roy-agent-core-yv4anf1c.js";
+} from "./roy-agent-core-9t675te0.js";
 import {
   createHook
-} from "./roy-agent-core-y7atw1kw.js";
+} from "./roy-agent-core-cw89yj9d.js";
 import {
   globalHookManager,
   init_global_hook_manager
-} from "./roy-agent-core-yjyvwxs4.js";
+} from "./roy-agent-core-a236mps6.js";
 import {
   createLogger,
   init_logger

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

@@ -2,7 +2,7 @@ import {
   getEnvContextOrEmpty,
   init_env_context,
   setCurrentTaskId
-} from "./roy-agent-core-z4486eek.js";
+} from "./roy-agent-core-zbb3sk72.js";
 import {
   createLogger,
   init_logger

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

@@ -1,7 +1,7 @@
 import {
   init_env_context,
   init_env_event
-} from "./roy-agent-core-z4486eek.js";
+} from "./roy-agent-core-zbb3sk72.js";
 import {
   __esm
 } from "./roy-agent-core-fs0mn2jk.js";

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

@@ -1,14 +1,14 @@
 import {
   defaultLarkCliRunner
 } from "./roy-agent-core-ck60j1q9.js";
-import {
-  getSharedEventStore
-} from "./roy-agent-core-xyys5m1a.js";
 import {
   TaskTagPlugin,
   createLarkCliTaskNotifyHook,
   createPerTaskGroupChatPlugin
-} from "./roy-agent-core-e5pnnzdm.js";
+} from "./roy-agent-core-zmr3jzpe.js";
+import {
+  getSharedEventStore
+} from "./roy-agent-core-xyys5m1a.js";
 import {
   normalizeLarkAtMentions
 } from "./roy-agent-core-rmn29nrh.js";
@@ -17,18 +17,19 @@ import {
 } from "./roy-agent-core-7hh0brvs.js";
 import {
   BaseComponent
-} from "./roy-agent-core-yv4anf1c.js";
+} from "./roy-agent-core-9t675te0.js";
 import {
   globalHookManager,
   init_global_hook_manager
-} from "./roy-agent-core-yjyvwxs4.js";
+} from "./roy-agent-core-a236mps6.js";
 import {
   init_context
-} from "./roy-agent-core-ff2ssff5.js";
+} from "./roy-agent-core-wn59p0zw.js";
 import {
   createEnvContext,
+  normalizeParentTaskId,
   runWithEnvContext
-} from "./roy-agent-core-z4486eek.js";
+} from "./roy-agent-core-zbb3sk72.js";
 import {
   TracedAs,
   init_decorator,
@@ -1158,6 +1159,7 @@ class LarkCliInstance {
   registerPluginHooks(plugin) {
     const pluginName = plugin.name || "unknown";
     this.injectTaskUpdater(plugin);
+    this.injectTaskGetter(plugin);
     this.injectSessionComponent(plugin);
     if (typeof plugin.init === "function") {
       const pluginEnv = {
@@ -1244,6 +1246,25 @@ class LarkCliInstance {
     };
     plugin.setTaskUpdater(taskUpdater);
   }
+  injectTaskGetter(plugin) {
+    if (typeof plugin.setTaskGetter !== "function") {
+      return;
+    }
+    if (typeof plugin.hasTaskGetter === "function" && plugin.hasTaskGetter()) {
+      return;
+    }
+    if (!this.environment?.getComponent) {
+      return;
+    }
+    const taskComponent = this.environment.getComponent("task");
+    if (!taskComponent?.getTask) {
+      if (isPluginDebugEnabled()) {
+        console.debug(`[LarkCliInstance] ${plugin.name || "plugin"} has setTaskGetter but ` + `taskComponent or getTask method not found. ` + `sub-task 上溯祖先群将不可用。`);
+      }
+      return;
+    }
+    plugin.setTaskGetter((id) => taskComponent.getTask(id));
+  }
   injectSessionComponent(plugin) {
     if (typeof plugin.setSessionComponent !== "function") {
       return;
@@ -1460,7 +1481,8 @@ class LarkCliInstance {
         } : undefined,
         replyChannel: envReplyChannel,
         pluginEnabled,
-        plugins
+        plugins,
+        parentTaskId: normalizeParentTaskId(parentTaskId)
       });
       runWithEnvContext(envContext, () => {
         this.eventHandler?.(evt);
@@ -1587,9 +1609,45 @@ __legacyDecorateClassTS([
 __legacyDecorateClassTS([
   TracedAs("lark-cli.registerPluginHooks", { recordParams: true, log: true })
 ], LarkCliInstance.prototype, "registerPluginHooks", null);
+__legacyDecorateClassTS([
+  TracedAs("lark-cli.resolveChatTaskBinding", {
+    recordParams: true,
+    recordResult: false,
+    paramFilter: (args) => ({ chatId: args[0] }),
+    flattenParamFilter: true,
+    resultFilter: (taskId) => ({ resolvedTaskId: taskId })
+  })
+], LarkCliInstance.prototype, "resolveChatTaskBinding", null);
 __legacyDecorateClassTS([
   TracedAs("lark-cli.handleEvent", { recordParams: true, log: true })
 ], LarkCliInstance.prototype, "handleEvent", null);
+var NOTIFY_TERMINAL_TYPES = new Set([
+  "task.background.completed",
+  "task.background.failed",
+  "task.background.timeout",
+  "task.background.stopped"
+]);
+function describeNotifyEvent(type, taskId, desc) {
+  const actionable = NOTIFY_TERMINAL_TYPES.has(type);
+  switch (type) {
+    case "task.background.completed":
+      return { headline: `Sub-agent 完成了 Task #${taskId}「${desc}」。`, actionable };
+    case "task.background.failed":
+      return { headline: `Sub-agent 执行 Task #${taskId}「${desc}」失败。`, actionable };
+    case "task.background.timeout":
+      return { headline: `Sub-agent 执行 Task #${taskId}「${desc}」超时。`, actionable };
+    case "task.background.stopped":
+      return { headline: `Sub-agent 已停止 Task #${taskId}「${desc}」。`, actionable };
+    case "task.background.ask_user":
+      return { headline: `Sub-agent 在 Task #${taskId}「${desc}」中请求用户输入。`, actionable };
+    case "task.background.started":
+      return { headline: `Sub-agent 已启动 Task #${taskId}「${desc}」（后台运行中）。`, actionable };
+    case "task.background.progress":
+      return { headline: `Sub-agent 仍在执行 Task #${taskId}「${desc}」（进行中）。`, actionable };
+    default:
+      return { headline: `Sub-agent 更新了 Task #${taskId}「${desc}」。`, actionable };
+  }
+}
 var larkCliHandler = {
   type: "lark-cli",
   validateConfig(config) {
@@ -1655,10 +1713,13 @@ var larkCliHandler = {
     const profileFlag = ctx.profile ? `--profile ${ctx.profile} ` : "";
     const desc = input.notifyEvent.description ?? "(未命名任务)";
     const result = input.subAgentResult.summary ?? input.notifyEvent.result ?? "";
-    const promptText = `
-## Notify Event: ${input.notifyEvent.type}
+    const notifyType = input.notifyEvent.type;
+    const taskId = input.notifyEvent.taskId ?? "?";
+    const { headline, actionable } = describeNotifyEvent(notifyType, taskId, desc);
+    const promptText = actionable ? `
+## Notify Event: ${notifyType}
 
-Sub-agent 完成了 Task #${input.notifyEvent.taskId ?? "?"}「${desc}」。
+${headline}
 
 ### Trigger event（原始飞书消息，来自 EventStore 反查）
 - ES: lark-cli
@@ -1676,8 +1737,20 @@ ${result}
 
 ⚠️ 不要 fallback 到 lastReplyChannel 或 metadata.replyChannel — 那个 chatId
 可能跟用户原始消息的 chatId 不一致（参见 #4035/#4038/#4039 bug）。
+` : `
+## Notify Event: ${notifyType}
+
+${headline}
+
+### Trigger event
+- ES: lark-cli
+- chatId: ${ctx.chatId}
+- messageId: ${ctx.messageId}
+
+（这是中间态通知：仅作状态同步，**不要**回复用户，也不要调用 lark-cli 发消息。
+等收到 task.background.completed / failed / timeout / stopped 终态通知后再回复。）
 `;
-    const systemHint = `回复必须用 lark-cli im +messages-reply（${profileFlag.trim() ? `带 ${profileFlag.trim()}；` : ""}` + `chatId=${ctx.chatId} / messageId=${ctx.messageId} 来自 trigger event，不要 fallback。`;
+    const systemHint = actionable ? `回复必须用 lark-cli im +messages-reply（${profileFlag.trim() ? `带 ${profileFlag.trim()}；` : ""}` + `chatId=${ctx.chatId} / messageId=${ctx.messageId} 来自 trigger event，不要 fallback。` : `这是 ${notifyType} 中间态通知，不要回复用户；仅等待终态通知。`;
     return { promptText, systemHint };
   },
   setRunner(runner) {
@@ -1685,7 +1758,11 @@ ${result}
   },
   async postProcessNotifyEvent(input) {
     try {
-      const chats = await searchChatsByTaskId(input.notifyEvent.taskId, input.profile);
+      const chats = dedupeChatIds(input.resolvedChatIds ?? []);
+      if (chats.length === 0) {
+        logger.info(`[larkCliHandler] postProcessNotifyEvent: no resolved target chat for ` + `taskId=${input.notifyEvent.taskId}; skip mirror.`);
+        return;
+      }
       for (const chatId of chats) {
         try {
           await sendMarkdownToChat(chatId, input.formattedPrompt, input.profile);
@@ -1709,40 +1786,27 @@ if (larkCliHandler.buildNotifyHandlePrompt) {
   larkCliHandler.buildNotifyHandlePrompt = wrapFunction(larkCliHandler.buildNotifyHandlePrompt, "buildNotifyHandlePrompt", { recordParams: true, recordResult: false, recordError: true });
 }
 if (larkCliHandler.postProcessNotifyEvent) {
-  larkCliHandler.postProcessNotifyEvent = wrapFunction(larkCliHandler.postProcessNotifyEvent, "postProcessNotifyEvent", { recordParams: true, recordResult: false, recordError: true });
+  larkCliHandler.postProcessNotifyEvent = wrapFunction(larkCliHandler.postProcessNotifyEvent, "postProcessNotifyEvent", {
+    recordParams: true,
+    recordResult: false,
+    recordError: true,
+    paramFilter: (args) => ({
+      taskId: args[0]?.notifyEvent?.taskId,
+      resolvedChatIds: args[0]?.resolvedChatIds
+    }),
+    flattenParamFilter: true
+  });
 }
-async function searchChatsByTaskId(taskId, profile) {
-  if (!taskId)
-    return [];
-  const profileFlag = profile ? `--profile ${profile} ` : "";
-  const runner = getLarkCliRunner();
-  const command = `lark-cli ${profileFlag}im +chat-search ` + `--query "Task ${taskId}" --as bot --format json`;
-  const result = await runner.run(command);
-  if (result.code !== 0) {
-    logger.warn(`[larkCliHandler] chat-search non-zero exit`, {
-      code: result.code,
-      stderr: result.stderr
-    });
-    return [];
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(result.stdout);
-  } catch {
-    logger.warn(`[larkCliHandler] chat-search stdout is not JSON`, {
-      stdout: result.stdout.slice(0, 200)
-    });
-    return [];
-  }
-  const items = parsed?.items ?? parsed?.data?.items ?? parsed?.data?.chats ?? [];
-  const ids = [];
-  for (const item of items) {
-    const cid = item?.chat_id ?? item?.chatId ?? item?.id;
-    if (typeof cid === "string" && cid.length > 0) {
-      ids.push(cid);
+function dedupeChatIds(ids) {
+  const out = [];
+  const seen = new Set;
+  for (const id of ids) {
+    if (typeof id === "string" && id.length > 0 && !seen.has(id)) {
+      seen.add(id);
+      out.push(id);
     }
   }
-  return ids;
+  return out;
 }
 async function sendMarkdownToChat(chatId, markdown, profile) {
   const profileFlag = profile ? `--profile ${profile} ` : "";

package/dist/shared/@ai-setting/{roy-agent-core-3m7j2wcb.js → roy-agent-core-wybj8emq.js}

@@ -6,7 +6,7 @@ import {
 } from "./roy-agent-core-7hh0brvs.js";
 import {
   BaseComponent
-} from "./roy-agent-core-yv4anf1c.js";
+} from "./roy-agent-core-9t675te0.js";
 import {
   createLogger,
   init_logger

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

@@ -111,6 +111,9 @@ async function runWithEnvContextAsync(context, fn) {
   }
   return fn();
 }
+function normalizeParentTaskId(value) {
+  return typeof value === "number" && Number.isInteger(value) && value > 0 ? value : undefined;
+}
 function createEnvContext(options) {
   let replyChannel = options.replyChannel;
   if (replyChannel && options.messageId && !replyChannel.messageId) {
@@ -184,13 +187,24 @@ function getEventFromEnvContext(ctx) {
   }
   return;
 }
-var logger, envContextStorage, setCurrentTaskId;
+var logger, envContextStorage, resolveEnvParentTaskId, setCurrentTaskId;
 var init_env_context = __esm(() => {
   init_logger();
   init_decorator();
   init_env_event();
   logger = createLogger("env:context:env-context");
   envContextStorage = new AsyncLocalStorage;
+  resolveEnvParentTaskId = wrapFunction(function _resolveEnvParentTaskId(envEvent, parentEnvContext) {
+    const fromEvent = normalizeParentTaskId(envEvent?.metadata?.parentTaskId);
+    return fromEvent ?? normalizeParentTaskId(parentEnvContext?.parentTaskId);
+  }, "env-context.resolveEnvParentTaskId", {
+    recordParams: false,
+    recordResult: false,
+    log: false,
+    resultFilter: (parentTaskId) => ({
+      parentTaskId: parentTaskId ?? null
+    })
+  });
   setCurrentTaskId = wrapFunction(function _setCurrentTaskId(taskId) {
     const prev = getCurrentTaskId();
     const ctx = envContextStorage.getStore();
@@ -204,4 +218,4 @@ var init_env_context = __esm(() => {
   }, "env-context.setCurrentTaskId", { recordParams: true, recordResult: false, log: true });
 });
 
-export { isLarkEvent, isGithubEvent, isJiraEvent, getLarkMessageId, getLarkChatId, getLarkUserId, EVENT_ENV_PREFIX, serializeEventToEnv, restoreEventFromEnv, init_env_event, envContextStorage, getEnvContext, getEnvContextOrEmpty, hasEnvContext, getCurrentTaskId, runWithEnvContext, runWithEnvContextAsync, createEnvContext, mergeEnvContext, setCurrentTaskId, getEventFromEnvContext, init_env_context };
+export { isLarkEvent, isGithubEvent, isJiraEvent, getLarkMessageId, getLarkChatId, getLarkUserId, EVENT_ENV_PREFIX, serializeEventToEnv, restoreEventFromEnv, init_env_event, envContextStorage, getEnvContext, getEnvContextOrEmpty, hasEnvContext, getCurrentTaskId, runWithEnvContext, runWithEnvContextAsync, normalizeParentTaskId, resolveEnvParentTaskId, createEnvContext, mergeEnvContext, setCurrentTaskId, getEventFromEnvContext, init_env_context };