@ai-setting/roy-agent-core 1.7.53 → 1.7.55

package/dist/shared/@ai-setting/{roy-agent-core-35s1w7tc.js → roy-agent-core-aer5kw1j.js}

@@ -17,7 +17,7 @@ import {
   init_skill_node,
   init_tool_node,
   init_workflow_node
-} from "./roy-agent-core-x8n1r7h4.js";
+} from "./roy-agent-core-2bscfrr1.js";
 import {
   WORKFLOW_SUBMIT_OUTPUT_TOOL_NAME,
   init_json_schema_to_zod,
@@ -1254,6 +1254,10 @@ ${promptInjection}`;
           workflowName: context.workflowName
         }
       });
+      if (typeof context.registerAgentSubSession === "function") {
+        await context.registerAgentSubSession(this.definition.id, agentSessionId);
+        return agentSessionId;
+      }
       const workflowSession = await sessionComponent.get(context.sessionId);
       if (workflowSession) {
         const metadata = workflowSession.metadata || {};
@@ -1437,6 +1441,20 @@ function updateAgentSessionStatus(agentSessions, nodeId, status) {
 function markAgentSessionCompleted(agentSessions, nodeId) {
   return updateAgentSessionStatus(agentSessions, nodeId, "completed");
 }
+function upsertAgentSession(agentSessions, nodeId, agentSessionId) {
+  const next = {
+    nodeId,
+    sessionId: agentSessionId,
+    status: "active",
+    createdAt: Date.now()
+  };
+  const list = agentSessions ?? [];
+  const existingIndex = list.findIndex((ref) => ref.nodeId === nodeId);
+  if (existingIndex >= 0) {
+    return list.map((ref, index) => index === existingIndex ? { ...next } : ref);
+  }
+  return [...list, next];
+}
 function markAgentSessionFailed(agentSessions, nodeId) {
   return updateAgentSessionStatus(agentSessions, nodeId, "failed");
 }
@@ -1903,7 +1921,9 @@ var init_engine = __esm(() => {
         agentSessions: new Map,
         edges: dagManager.buildEdges(definition.edges || []),
         loopIterationCount: 0,
-        loopGuardCounters: new Map
+        loopGuardCounters: new Map,
+        inFlight: new Map,
+        sessionMetadataQueue: Promise.resolve()
       };
       this.setupEventHandlers(sessionState);
       return sessionState;
@@ -1995,10 +2015,10 @@ var init_engine = __esm(() => {
       sessionState.abortController.abort();
       sessionState.executor.cancelAll();
       if (this.sessionComponent) {
-        const metadata = await this.getSessionMetadata(sessionId);
-        await this.sessionComponent.update(sessionId, {
-          metadata: { ...metadata, status: "paused" }
-        });
+        await this.updateSessionMetadata(sessionState, (metadata) => ({
+          ...metadata,
+          status: "paused"
+        }));
       }
       await sessionState.eventBus.publish(createWorkflowEvent("workflow.paused", this.getRunIdFromSessionId(sessionId), {}));
       logger3.info(`[WorkflowEngine] Workflow paused: ${sessionId}`);
@@ -2036,15 +2056,11 @@ var init_engine = __esm(() => {
       }
       sessionState.executor.cancelAll();
       if (this.sessionComponent) {
-        const metadata = await this.getSessionMetadata(sessionId);
-        const updatedAgentSessions = markAllAgentSessionsStopped(metadata.agentSessions);
-        await this.sessionComponent.update(sessionId, {
-          metadata: {
-            ...metadata,
-            status: "stopped",
-            agentSessions: updatedAgentSessions
-          }
-        });
+        await this.updateSessionMetadata(sessionState, (metadata) => ({
+          ...metadata,
+          status: "stopped",
+          agentSessions: markAllAgentSessionsStopped(metadata.agentSessions)
+        }));
         await this.propagateStopToChildSessions(sessionId, stopReason);
       }
       await sessionState.eventBus.publish(createWorkflowEvent("workflow.stopped", this.getRunIdFromSessionId(sessionId), {
@@ -2151,28 +2167,18 @@ var init_engine = __esm(() => {
             sessionState.workflowHistory.push(...messages);
           }
         }
-        if (this.sessionComponent) {
-          const metadata = await this.getSessionMetadata(sessionId);
-          await this.sessionComponent.update(sessionId, {
-            metadata: {
-              ...metadata,
-              agentSessions: markAgentSessionCompleted(metadata.agentSessions, event.node_id)
-            }
-          });
-        }
+        await this.updateSessionMetadata(sessionState, (metadata) => ({
+          ...metadata,
+          agentSessions: markAgentSessionCompleted(metadata.agentSessions, event.node_id)
+        }));
       });
       eventBus.on("node.failed", async (event) => {
         if (event.type !== "node.failed")
           return;
-        if (this.sessionComponent) {
-          const metadata = await this.getSessionMetadata(sessionId);
-          await this.sessionComponent.update(sessionId, {
-            metadata: {
-              ...metadata,
-              agentSessions: markAgentSessionFailed(metadata.agentSessions, event.node_id)
-            }
-          });
-        }
+        await this.updateSessionMetadata(sessionState, (metadata) => ({
+          ...metadata,
+          agentSessions: markAgentSessionFailed(metadata.agentSessions, event.node_id)
+        }));
         scheduler.markFailed(event.node_id);
         await this.failWorkflow(sessionState, new Error(event.error.message));
       });
@@ -2183,10 +2189,9 @@ var init_engine = __esm(() => {
         sessionState.status = "paused";
         sessionState.abortController.abort();
         if (this.sessionComponent) {
-          const metadata = await this.getSessionMetadata(sessionId);
-          const agentSessions = updateAgentSessionStatus(metadata.agentSessions, event.node_id, "paused");
-          await this.sessionComponent.update(sessionId, {
-            metadata: {
+          await this.updateSessionMetadata(sessionState, (metadata) => {
+            const agentSessions = updateAgentSessionStatus(metadata.agentSessions, event.node_id, "paused");
+            return {
               ...metadata,
               status: "paused",
               pendingNodeId: event.node_id,
@@ -2194,7 +2199,7 @@ var init_engine = __esm(() => {
               pendingAskUserQuery: event.query,
               pendingAskUserAgentSessionId: event.agent_session_id,
               agentSessions
-            }
+            };
           });
         }
         await eventBus.publish(createWorkflowEvent("workflow.paused", runId, {
@@ -2237,14 +2242,16 @@ var init_engine = __esm(() => {
         if (readyNodes.length === 0 || !canStart) {
           return false;
         }
+        const parallelLimit = sessionState.config.parallelLimit ?? Infinity;
         let scheduled = 0;
         for (const nodeId of readyNodes) {
           if (!scheduler.canStartMore())
             break;
-          if (scheduled >= (sessionState.config.parallelLimit ?? Infinity))
+          if (scheduled >= parallelLimit)
             break;
-          await this.startNode(sessionState, nodeId, sessionState.config.workflowInput);
-          scheduled++;
+          if (this.dispatchNode(sessionState, nodeId, sessionState.config.workflowInput)) {
+            scheduled++;
+          }
         }
         return true;
       };
@@ -2258,13 +2265,12 @@ var init_engine = __esm(() => {
       }
       while (sessionState.status === "running" && !abortController.signal.aborted && !sessionState.cancellationScope?.signal.aborted) {
         const state = scheduler.getState();
-        if (state.pending.length === 0 && state.running.length === 0) {
+        if (state.pending.length === 0 && state.running.length === 0 && sessionState.inFlight.size === 0) {
           break;
         }
-        if (sessionState.config.loopEnabled && sessionState.loopIterationCount >= maxIterations) {
+        if (sessionState.config.loopEnabled && sessionState.loopIterationCount > maxIterations) {
           logger3.error(`[WorkflowEngine] Max loop iterations ${maxIterations} exceeded`);
-          sessionState.rejectCompleted(new WorkflowError(`Workflow exceeded maximum loop iterations: ${maxIterations}`));
-          await this.stop(sessionState.sessionId, "Max iterations exceeded");
+          await this.failWorkflow(sessionState, new WorkflowError(`Workflow exceeded maximum loop iterations: ${maxIterations}`));
           return;
         }
         try {
@@ -2274,13 +2280,42 @@ var init_engine = __esm(() => {
         }
         await scheduleAvailableNodes();
       }
+      while (sessionState.inFlight.size > 0) {
+        const pending = Array.from(sessionState.inFlight.values());
+        await Promise.allSettled(pending);
+        for (const [nodeId, promise] of Array.from(sessionState.inFlight.entries())) {
+          if (pending.includes(promise)) {
+            sessionState.inFlight.delete(nodeId);
+          }
+        }
+      }
+    }
+    dispatchNode(sessionState, nodeId, input) {
+      const { scheduler } = sessionState;
+      if (scheduler.isRunning(nodeId) || scheduler.isCompleted(nodeId) || scheduler.isFailed(nodeId)) {
+        return false;
+      }
+      const promise = this.startNode(sessionState, nodeId, input).catch((error) => {
+        logger3.error(`[WorkflowEngine] Unhandled dispatch error for node "${nodeId}":`, error);
+      }).finally(() => {
+        if (sessionState.inFlight.get(nodeId) === promise) {
+          sessionState.inFlight.delete(nodeId);
+        }
+      });
+      sessionState.inFlight.set(nodeId, promise);
+      return true;
     }
     waitForNextNodeEvent(sessionState, signal) {
       return new Promise((resolve) => {
         const state = sessionState.scheduler.getState();
         const hasRunningNodes = state.running.length > 0;
+        const hasInFlight = sessionState.inFlight.size > 0;
+        const limit = sessionState.config.parallelLimit ?? Infinity;
+        const atCapacity = sessionState.inFlight.size >= limit;
+        const mayHaveDeferredWork = atCapacity && state.pending.length + state.ready.length > 0;
+        const pureEventDriven = hasRunningNodes && hasInFlight && !mayHaveDeferredWork;
         let timeoutId;
-        if (!hasRunningNodes) {
+        if (!pureEventDriven) {
           timeoutId = setTimeout(() => {
             cleanup();
             resolve();
@@ -2291,6 +2326,7 @@ var init_engine = __esm(() => {
             clearTimeout(timeoutId);
           sessionState.eventBus.off("node.completed", onCompleted);
           sessionState.eventBus.off("node.failed", onFailed);
+          sessionState.eventBus.off("node.scheduled", onScheduled);
         };
         const onCompleted = (event) => {
           if (event.type === "node.completed") {
@@ -2304,8 +2340,15 @@ var init_engine = __esm(() => {
             resolve();
           }
         };
+        const onScheduled = (event) => {
+          if (event.type === "node.scheduled") {
+            cleanup();
+            resolve();
+          }
+        };
         sessionState.eventBus.on("node.completed", onCompleted);
         sessionState.eventBus.on("node.failed", onFailed);
+        sessionState.eventBus.on("node.scheduled", onScheduled);
         if (signal.aborted) {
           cleanup();
           resolve();
@@ -2541,6 +2584,9 @@ var init_engine = __esm(() => {
       logger3.debug(`[WorkflowEngine] Processing edges after "${completedNodeId}" completed. edges=${JSON.stringify(sessionState.edges)}`);
       const edgeResult = scheduler.processEdgesAfterCompletion(completedNodeId, sessionState.edges, templateResolver, sessionState.config.loopEnabled);
       logger3.debug(`[WorkflowEngine] Edge processing result: ${JSON.stringify(edgeResult)}`);
+      for (const reEntryId of edgeResult.reEntries) {
+        scheduler.markStarted(reEntryId);
+      }
       const loopGuardSnapshots = new Map;
       for (const reEntryId of edgeResult.reEntries) {
         const guard = sessionState.dagManager.getLoopGuard(reEntryId);
@@ -2609,6 +2655,8 @@ var init_engine = __esm(() => {
         }
       }
       const workflowInput = sessionState.config.workflowInput || {};
+      const parallelLimit = sessionState.config.parallelLimit ?? Infinity;
+      const reEntries = new Set(edgeResult.reEntries);
       for (const targetId of edgeResult.toStart) {
         if (loopGuardTripped.has(targetId)) {
           continue;
@@ -2617,8 +2665,14 @@ var init_engine = __esm(() => {
           logger3.info(`[WorkflowEngine] Workflow terminated via __end__ edge from node "${completedNodeId}"`);
           scheduler.markCompleted("__end__");
           await this.completeWorkflow(sessionState);
-        } else {
+        } else if (reEntries.has(targetId)) {
           await this.startNode(sessionState, targetId, workflowInput);
+        } else {
+          if (sessionState.inFlight.size >= parallelLimit) {
+            logger3.debug(`[WorkflowEngine] Deferring edge-triggered node "${targetId}" — in-flight ${sessionState.inFlight.size} >= parallel_limit ${parallelLimit}`);
+            continue;
+          }
+          this.dispatchNode(sessionState, targetId, workflowInput);
         }
       }
     }
@@ -2668,6 +2722,15 @@ var init_engine = __esm(() => {
         attachAgentSessionToLastStart: async (targetNodeId, agentSessionId) => {
           await sessionState.executor.attachAgentSessionToLastStart(sessionState.sessionId, targetNodeId, agentSessionId);
         },
+        registerAgentSubSession: async (targetNodeId, agentSessionId) => {
+          await this.updateSessionMetadata(sessionState, (metadata) => {
+            const existing = Array.isArray(metadata.agentSessions) ? metadata.agentSessions : [];
+            return {
+              ...metadata,
+              agentSessions: upsertAgentSession(existing, targetNodeId, agentSessionId)
+            };
+          });
+        },
         workflowInput,
         templateResolver,
         resolvedConfig: templateResolver.resolveValue(effectiveConfig),
@@ -2703,19 +2766,16 @@ var init_engine = __esm(() => {
         allNodeOutputs[nodeId] = nodeOutput;
       }
       if (this.sessionComponent) {
-        const metadata = await this.getSessionMetadata(sessionId);
-        await this.sessionComponent.update(sessionId, {
-          metadata: {
-            ...metadata,
-            status: "completed",
-            completedAt: Date.now(),
-            durationMs,
-            output: allNodeOutputs,
-            pendingNodeId: undefined,
-            pauseReason: undefined,
-            agentSessions: markAllAgentSessionsCompleted(metadata.agentSessions)
-          }
-        });
+        await this.updateSessionMetadata(sessionState, (metadata) => ({
+          ...metadata,
+          status: "completed",
+          completedAt: Date.now(),
+          durationMs,
+          output: allNodeOutputs,
+          pendingNodeId: undefined,
+          pauseReason: undefined,
+          agentSessions: markAllAgentSessionsCompleted(metadata.agentSessions)
+        }));
       }
       await sessionState.eventBus.publish(createWorkflowEvent("workflow.completed", runId, {
         result: finalOutput,
@@ -2750,16 +2810,13 @@ var init_engine = __esm(() => {
       const runId = this.getRunIdFromSessionId(sessionId);
       sessionState.executor.cancelAll();
       if (this.sessionComponent) {
-        const metadata = await this.getSessionMetadata(sessionId);
-        await this.sessionComponent.update(sessionId, {
-          metadata: {
-            ...metadata,
-            status: "failed",
-            failedAt: Date.now(),
-            durationMs,
-            agentSessions: markAllAgentSessionsFailed(metadata.agentSessions)
-          }
-        });
+        await this.updateSessionMetadata(sessionState, (metadata) => ({
+          ...metadata,
+          status: "failed",
+          failedAt: Date.now(),
+          durationMs,
+          agentSessions: markAllAgentSessionsFailed(metadata.agentSessions)
+        }));
       }
       await sessionState.eventBus.publish(createWorkflowEvent("workflow.failed", runId, {
         error: { message: error.message, stack: error.stack },
@@ -2825,6 +2882,21 @@ var init_engine = __esm(() => {
       const session = await this.sessionComponent.get(sessionId);
       return session?.metadata || { type: "workflow", workflowId: "", workflowName: "", status: "running" };
     }
+    async updateSessionMetadata(sessionState, mutate) {
+      if (!this.sessionComponent)
+        return;
+      const sessionId = sessionState.sessionId;
+      const run = (sessionState.sessionMetadataQueue ?? Promise.resolve()).then(async () => {
+        try {
+          const metadata = await this.getSessionMetadata(sessionId);
+          await this.sessionComponent.update(sessionId, { metadata: mutate(metadata) });
+        } catch (error) {
+          logger3.error(`[WorkflowEngine] Failed to update session metadata for ${sessionId}:`, error);
+        }
+      });
+      sessionState.sessionMetadataQueue = run;
+      await run;
+    }
     findDefinitionForWorkflow(workflowIdOrName) {
       if (!this.workflowRepository) {
         return null;

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

@@ -287,34 +287,6 @@ function buildChatAppLink(chatId, base = DEFAULT_APP_LINK_BASE) {
   return `${base}/client/chat/open?openChatId=${chatId}`;
 }
 var DEFAULT_APP_LINK_BASE = "https://applink.feishu.cn";
-function buildRedirectCard(opts) {
-  const taskLabel = opts.taskId !== undefined ? `#${opts.taskId}` : "本任务";
-  const title = opts.taskTitle ? ` ${sanitizeInlineText(opts.taskTitle, 120)}` : "";
-  const link = buildChatAppLink(opts.targetChatId);
-  const groupName = opts.targetChatName ? sanitizeInlineText(opts.targetChatName, 60) : "专属群";
-  return {
-    schema: "2.0",
-    header: {
-      title: { tag: "plain_text", content: "\uD83D\uDCC2 任务卡片已改投专属群" },
-      subtitle: { tag: "plain_text", content: "这里不是本任务的群，进展请看专属群" },
-      template: "grey"
-    },
-    body: {
-      elements: [
-        {
-          tag: "markdown",
-          content: [
-            `- **任务**：${taskLabel}${title}`,
-            `- **专属群**：[${groupName}](${link})`,
-            `- **群 ID**：\`${opts.targetChatId}\`（搜群名也能进）`,
-            opts.reason ? `- **原因**：${sanitizeInlineText(opts.reason, 280)}` : ""
-          ].filter(Boolean).join(`
-`)
-        }
-      ]
-    }
-  };
-}
 var WORKFLOW_STATUS_LABEL = {
   running: "\uD83D\uDD04 运行中",
   completed: "✅ 已完成",
@@ -449,7 +421,6 @@ class LarkCardPatchNotifier {
   mutexes = new Map;
   states = new Map;
   workflowStates = new Map;
-  redirectsSent = new Set;
   constructor(options = {}) {
     this.options = {
       pinOnStart: true,
@@ -505,36 +476,6 @@ class LarkCardPatchNotifier {
     }
     return { messageId, pinned, pinError };
   }
-  async sendRedirectNotice(opts) {
-    const redirectKey = opts.taskId !== undefined ? `${opts.taskId}:${opts.targetChatId}` : undefined;
-    if (redirectKey) {
-      if (this.redirectsSent.has(redirectKey)) {
-        logger.debug(`sendRedirectNotice: 已发过改投卡片（${redirectKey}）→ 跳过重复发送`);
-        return false;
-      }
-      this.redirectsSent.add(redirectKey);
-    }
-    const card = buildRedirectCard({
-      taskId: opts.taskId,
-      taskTitle: opts.taskTitle,
-      targetChatId: opts.targetChatId,
-      targetChatName: opts.targetChatName,
-      reason: opts.reason
-    });
-    try {
-      await this.runLarkCli(this.buildSendCardArgs({
-        chatId: opts.chatId,
-        profile: opts.profile,
-        card
-      }), "send-redirect");
-      return true;
-    } catch (err) {
-      if (redirectKey)
-        this.redirectsSent.delete(redirectKey);
-      logger.warn(`sendRedirectNotice failed (non-fatal) for chat ${opts.chatId}: ${err.message}`);
-      return false;
-    }
-  }
   async updateTask(opts) {
     await this.mutexFor(opts.messageId).run(async () => {
       const state = this.states.get(opts.messageId) ?? {

package/dist/shared/@ai-setting/{roy-agent-core-4sx6sdb2.js → roy-agent-core-cd62e9p1.js}

@@ -1,6 +1,6 @@
 import {
   createAutoTaskPlugin
-} from "./roy-agent-core-hch2geta.js";
+} from "./roy-agent-core-g36jevrk.js";
 import {
   ContextError,
   ErrorCodes

package/dist/shared/@ai-setting/{roy-agent-core-39xejr39.js → roy-agent-core-e2z1etk4.js}

@@ -31,7 +31,7 @@ import {
   BackgroundTaskManager,
   createDelegateTool,
   createStopTool
-} from "./roy-agent-core-p2r27era.js";
+} from "./roy-agent-core-mxdc756a.js";
 import {
   TaskHookPoints
 } from "./roy-agent-core-1pg0fepg.js";