@ai-setting/roy-agent-core 1.6.10 → 1.6.11

package/dist/env/index.js

@@ -21,7 +21,7 @@ import"../shared/@ai-setting/roy-agent-core-y5ymc4f8.js";
 import"../shared/@ai-setting/roy-agent-core-az13yzmc.js";
 import {
   WorkflowComponent
-} from "../shared/@ai-setting/roy-agent-core-4mhrz08q.js";
+} from "../shared/@ai-setting/roy-agent-core-06574wqa.js";
 import"../shared/@ai-setting/roy-agent-core-htjag2nr.js";
 import"../shared/@ai-setting/roy-agent-core-0n2a8cbn.js";
 import"../shared/@ai-setting/roy-agent-core-6atd905e.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-resnbd2j.js";
 import"../shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
-import"../shared/@ai-setting/roy-agent-core-g9p7e2ys.js";
+import"../shared/@ai-setting/roy-agent-core-mb7b62sm.js";
 import"../shared/@ai-setting/roy-agent-core-1db4vpc6.js";
 import"../shared/@ai-setting/roy-agent-core-p2vpsd1d.js";
 import"../shared/@ai-setting/roy-agent-core-8wd3qwx5.js";
@@ -48,10 +48,10 @@ 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-nzpw62d3.js";
+} from "../shared/@ai-setting/roy-agent-core-3rs38pf7.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-8bhncxep.js";
+import"../shared/@ai-setting/roy-agent-core-5w9a1eqa.js";
 import"../shared/@ai-setting/roy-agent-core-pzeexnhf.js";
 import"../shared/@ai-setting/roy-agent-core-9xby523m.js";
 import"../shared/@ai-setting/roy-agent-core-trdpar9f.js";

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

@@ -3,7 +3,7 @@ import {
   BackgroundTaskManager,
   createDelegateTool,
   createStopTool
-} from "../../../shared/@ai-setting/roy-agent-core-8bhncxep.js";
+} from "../../../shared/@ai-setting/roy-agent-core-5w9a1eqa.js";
 import"../../../shared/@ai-setting/roy-agent-core-pzeexnhf.js";
 import"../../../shared/@ai-setting/roy-agent-core-trdpar9f.js";
 import"../../../shared/@ai-setting/roy-agent-core-c1v263jn.js";

package/dist/env/task/index.js

@@ -5,12 +5,12 @@ import {
   TaskPriorityEnum,
   TaskStatusEnum,
   TaskTypeEnum
-} from "../../shared/@ai-setting/roy-agent-core-nzpw62d3.js";
+} from "../../shared/@ai-setting/roy-agent-core-3rs38pf7.js";
 import"../../shared/@ai-setting/roy-agent-core-amkqnyzy.js";
 import {
   TaskEntityEventTypes
 } from "../../shared/@ai-setting/roy-agent-core-8gxth0eh.js";
-import"../../shared/@ai-setting/roy-agent-core-8bhncxep.js";
+import"../../shared/@ai-setting/roy-agent-core-5w9a1eqa.js";
 import"../../shared/@ai-setting/roy-agent-core-pzeexnhf.js";
 import {
   SQLiteTaskStore,

package/dist/env/workflow/index.js

@@ -1,6 +1,6 @@
 import {
   WorkflowComponent
-} from "../../shared/@ai-setting/roy-agent-core-4mhrz08q.js";
+} from "../../shared/@ai-setting/roy-agent-core-06574wqa.js";
 import"../../shared/@ai-setting/roy-agent-core-htjag2nr.js";
 import"../../shared/@ai-setting/roy-agent-core-0n2a8cbn.js";
 import"../../shared/@ai-setting/roy-agent-core-6atd905e.js";
@@ -60,7 +60,7 @@ import {
   pathNotFound,
   unresolvedVariable
 } from "../../shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
-import"../../shared/@ai-setting/roy-agent-core-g9p7e2ys.js";
+import"../../shared/@ai-setting/roy-agent-core-mb7b62sm.js";
 import"../../shared/@ai-setting/roy-agent-core-1db4vpc6.js";
 import"../../shared/@ai-setting/roy-agent-core-p2vpsd1d.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-g9p7e2ys.js";
+} from "../../../shared/@ai-setting/roy-agent-core-mb7b62sm.js";
 import {
   WORKFLOW_SUBMIT_OUTPUT_TOOL_NAME,
   WorkflowJsonOutputMarker,

package/dist/index.js

@@ -101,7 +101,7 @@ import {
 } from "./shared/@ai-setting/roy-agent-core-az13yzmc.js";
 import {
   WorkflowComponent
-} from "./shared/@ai-setting/roy-agent-core-4mhrz08q.js";
+} from "./shared/@ai-setting/roy-agent-core-06574wqa.js";
 import {
   init_node_registry_helper,
   registerDecoratorNodeType
@@ -114,7 +114,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-resnbd2j.js";
 import"./shared/@ai-setting/roy-agent-core-qnrf2aw6.js";
-import"./shared/@ai-setting/roy-agent-core-g9p7e2ys.js";
+import"./shared/@ai-setting/roy-agent-core-mb7b62sm.js";
 import"./shared/@ai-setting/roy-agent-core-1db4vpc6.js";
 import"./shared/@ai-setting/roy-agent-core-p2vpsd1d.js";
 import"./shared/@ai-setting/roy-agent-core-8wd3qwx5.js";
@@ -149,10 +149,10 @@ import {
 } from "./shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
   TaskComponent
-} from "./shared/@ai-setting/roy-agent-core-nzpw62d3.js";
+} from "./shared/@ai-setting/roy-agent-core-3rs38pf7.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-8bhncxep.js";
+import"./shared/@ai-setting/roy-agent-core-5w9a1eqa.js";
 import"./shared/@ai-setting/roy-agent-core-pzeexnhf.js";
 import {
   SQLiteTaskStore,

package/dist/shared/@ai-setting/{roy-agent-core-4mhrz08q.js → roy-agent-core-06574wqa.js}

@@ -18,7 +18,7 @@ import {
   createWorkflowSearchTool,
   createWorkflowTagListTool,
   createWorkflowValidateTool
-} from "./roy-agent-core-g9p7e2ys.js";
+} from "./roy-agent-core-mb7b62sm.js";
 import {
   WorkflowService
 } from "./roy-agent-core-p2vpsd1d.js";
@@ -217,7 +217,8 @@ class WorkflowComponent extends BaseComponent {
       }
       const lifecycleHooks = backgroundTaskManager ? {
         attachWorkflowRun: (bgTaskId, runId) => backgroundTaskManager.attachWorkflowRun(bgTaskId, runId),
-        detachWorkflowRun: (bgTaskId, runId) => backgroundTaskManager.detachWorkflowRun(bgTaskId, runId)
+        detachWorkflowRun: (bgTaskId, runId) => backgroundTaskManager.detachWorkflowRun(bgTaskId, runId),
+        replaceWorkflowRun: (bgTaskId, oldRunId, newRunId) => backgroundTaskManager.replaceWorkflowRun(bgTaskId, oldRunId, newRunId)
       } : undefined;
       const tools = [
         createWorkflowGetTool(this.workflowService),

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

@@ -8,7 +8,7 @@ import {
   BackgroundTaskManager,
   createDelegateTool,
   createStopTool
-} from "./roy-agent-core-8bhncxep.js";
+} from "./roy-agent-core-5w9a1eqa.js";
 import {
   SQLiteTaskStore,
   getDefaultTaskDbPath

package/dist/shared/@ai-setting/{roy-agent-core-8bhncxep.js → roy-agent-core-5w9a1eqa.js}

@@ -296,24 +296,48 @@ class BackgroundTaskManager {
   detachWorkflowRun(bgTaskId, workflowRunId) {
     this.workflowRunRegistries.get(bgTaskId)?.delete(workflowRunId);
   }
-  async propagateStopToWorkflowRuns(bgTaskId, reason) {
+  replaceWorkflowRun(bgTaskId, oldRunId, newRunId) {
+    if (!bgTaskId)
+      return;
     const set = this.workflowRunRegistries.get(bgTaskId);
-    if (!set || set.size === 0)
+    if (!set)
       return;
+    if (oldRunId) {
+      set.delete(oldRunId);
+    }
+    if (newRunId) {
+      set.add(newRunId);
+    }
+  }
+  async propagateStopToWorkflowRuns(bgTaskId, reason) {
+    const set = this.workflowRunRegistries.get(bgTaskId);
+    if (!set || set.size === 0) {
+      return { runIds: [], stopResults: [] };
+    }
     const runIds = Array.from(set);
     logger.info(`[BackgroundTaskManager] propagateStopToWorkflowRuns count=${runIds.length} bgTaskId=${bgTaskId}`);
+    const stopResults = [];
     for (const runId of runIds) {
       if (typeof this.workflowService?.stopRun !== "function") {
         logger.warn(`[BackgroundTaskManager] workflowService not injected; cannot stop ${runId}`);
+        stopResults.push({
+          runId,
+          success: false,
+          error: "workflowService not injected"
+        });
         continue;
       }
       try {
         await this.workflowService.stopRun(runId, reason);
+        stopResults.push({ runId, success: true });
       } catch (err) {
-        logger.warn(`[BackgroundTaskManager] workflowService.stopRun(${runId}) failed (likely already terminal): ${err instanceof Error ? err.message : String(err)}`);
+        const errMsg = err instanceof Error ? err.message : String(err);
+        logger.warn(`[BackgroundTaskManager] workflowService.stopRun(${runId}) failed (likely already terminal): ${errMsg}`);
+        stopResults.push({ runId, success: false, error: errMsg });
       }
     }
     set.clear();
+    return { runIds, stopResults };
   }
   static DEFAULT_WORKFLOW_ENTRY_AGENT = "workflow-runner";
   resolveEntryAgent(subagentType) {
@@ -758,7 +782,7 @@ Use these as guidance to improve task execution efficiency.`;
         error: err instanceof Error ? err.message : String(err)
       });
     }
-    await this.propagateStopToWorkflowRuns(taskId, "Task stopped by user");
+    const { runIds, stopResults } = await this.propagateStopToWorkflowRuns(taskId, "Task stopped by user");
     const stoppedPayload = {
       backgroundTaskId: task.id,
       subSessionId: task.subSessionId,
@@ -770,7 +794,13 @@ Use these as guidance to improve task execution efficiency.`;
       associatedTaskId: task.associatedTaskId
     };
     this.publishBackgroundEvent(BackgroundTaskEventTypes.STOPPED, stoppedPayload, task.parentSessionId);
-    return { success: true, task, message: "Task has been stopped" };
+    return {
+      success: true,
+      task,
+      message: "Task has been stopped",
+      attached_workflow_run_ids: runIds,
+      workflow_stop_results: stopResults
+    };
   }
   getTask(taskId) {
     return this.tasks.get(taskId);
@@ -817,11 +847,18 @@ __legacyDecorateClassTS([
   })
 ], BackgroundTaskManager.prototype, "detachWorkflowRun", null);
 __legacyDecorateClassTS([
-  TracedAs("task.background.propagateStopToWorkflowRuns", {
+  TracedAs("task.background.replaceWorkflowRun", {
     recordParams: true,
     recordResult: false,
     log: true
   })
+], BackgroundTaskManager.prototype, "replaceWorkflowRun", null);
+__legacyDecorateClassTS([
+  TracedAs("task.background.propagateStopToWorkflowRuns", {
+    recordParams: true,
+    recordResult: true,
+    log: true
+  })
 ], BackgroundTaskManager.prototype, "propagateStopToWorkflowRuns", null);
 __legacyDecorateClassTS([
   TracedAs("task.background.resolveEntryAgent", { recordParams: true, recordResult: true })

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

@@ -671,6 +671,48 @@ __legacyDecorateClassTS([
     recordResult: true
   })
 ], RunWorkflowToolRunner.prototype, "execute", null);
+
+class RunWorkflowLifecycleTracer {
+  runner;
+  bgTaskId;
+  hooks;
+  constructor(runner, bgTaskId, hooks) {
+    this.runner = runner;
+    this.bgTaskId = bgTaskId;
+    this.hooks = hooks;
+  }
+  async execute(args, ctx) {
+    const hasHooks = !!this.hooks?.attachWorkflowRun;
+    const hasBgTask = !!this.bgTaskId;
+    const result = await this.runner.execute(args, ctx);
+    let detached = false;
+    if (this.bgTaskId && this.hooks?.detachWorkflowRun) {
+      const runId = result?.metadata?.run_id ?? result?.output?.run_id ?? "";
+      if (runId && result.success) {
+        this.hooks.detachWorkflowRun(this.bgTaskId, runId);
+        detached = true;
+      }
+    }
+    return {
+      ...result,
+      metadata: {
+        ...result.metadata,
+        __pre_attach: {
+          hasBgTask,
+          hasHooks,
+          detached,
+          success: !!result.success
+        }
+      }
+    };
+  }
+}
+__legacyDecorateClassTS([
+  TracedAs("workflow.run-tool.pre-attach", {
+    recordParams: true,
+    recordResult: true
+  })
+], RunWorkflowLifecycleTracer.prototype, "execute", null);
 function createRunWorkflowTool(workflowService, hooks) {
   const tool = {
     name: "workflow_run",
@@ -708,12 +750,19 @@ function createRunWorkflowTool(workflowService, hooks) {
       let timedOut = false;
       let capturedByCallback = false;
       let capturedRunId = session ? session : reservedRunId;
+      const bgTaskIdForAttach = getCurrentBgTaskId();
+      if (bgTaskIdForAttach && hooks?.attachWorkflowRun) {
+        hooks.attachWorkflowRun(bgTaskIdForAttach, reservedRunId);
+      }
       const onSessionCreated = (sid) => {
         capturedRunId = sid;
         capturedByCallback = true;
         if (timedOut) {
           attemptStopOnTimeout(workflowService, sid, "timed out");
         }
+        if (bgTaskIdForAttach && hooks?.replaceWorkflowRun) {
+          hooks.replaceWorkflowRun(bgTaskIdForAttach, reservedRunId, sid);
+        }
       };
       try {
         let result;
@@ -811,19 +860,8 @@ function createRunWorkflowTool(workflowService, hooks) {
   const runner = new RunWorkflowToolRunner(tool.execute);
   const wrappedExecute = async (args, ctx) => {
     const bgTaskId = getCurrentBgTaskId();
-    if (!bgTaskId || !hooks?.attachWorkflowRun) {
-      return runner.execute(args, ctx);
-    }
-    const initialRunId = "wf_attach_pending_placeholder";
-    const result = await runner.execute(args, ctx);
-    const runId = result?.metadata?.run_id ?? result?.output?.run_id ?? "";
-    if (runId) {
-      hooks.attachWorkflowRun?.(bgTaskId, runId);
-      if (result.success) {
-        hooks.detachWorkflowRun?.(bgTaskId, runId);
-      }
-    }
-    return result;
+    const lifecycleTracer = new RunWorkflowLifecycleTracer(runner, bgTaskId, hooks);
+    return lifecycleTracer.execute(args, ctx);
   };
   return {
     ...tool,

package/package.json

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