@ai-setting/roy-agent-core 1.6.22 → 1.6.23

package/dist/env/agent/index.js

@@ -2,7 +2,7 @@ import {
   AgentComponent,
   AgentComponentConfigSchema,
   SummaryAgent
-} from "../../shared/@ai-setting/roy-agent-core-mz69jdvv.js";
+} from "../../shared/@ai-setting/roy-agent-core-3c1b7xh5.js";
 import"../../shared/@ai-setting/roy-agent-core-c1stgqnw.js";
 import"../../shared/@ai-setting/roy-agent-core-h28gcd77.js";
 import"../../shared/@ai-setting/roy-agent-core-br7dmedr.js";
@@ -10,6 +10,7 @@ import"../../shared/@ai-setting/roy-agent-core-t3yqzgse.js";
 import"../../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import"../../shared/@ai-setting/roy-agent-core-x0yztmm6.js";
 import"../../shared/@ai-setting/roy-agent-core-qxnbvgwe.js";
+import"../../shared/@ai-setting/roy-agent-core-c1v263jn.js";
 import"../../shared/@ai-setting/roy-agent-core-ctdhjv68.js";
 import"../../shared/@ai-setting/roy-agent-core-1k9j90s7.js";
 import"../../shared/@ai-setting/roy-agent-core-12gac5zn.js";

package/dist/env/index.js

@@ -41,7 +41,7 @@ import"../shared/@ai-setting/roy-agent-core-1ce3fqrk.js";
 import {
   AgentComponent,
   AgentComponentConfigSchema
-} from "../shared/@ai-setting/roy-agent-core-mz69jdvv.js";
+} from "../shared/@ai-setting/roy-agent-core-3c1b7xh5.js";
 import"../shared/@ai-setting/roy-agent-core-c1stgqnw.js";
 import"../shared/@ai-setting/roy-agent-core-h28gcd77.js";
 import"../shared/@ai-setting/roy-agent-core-br7dmedr.js";
@@ -49,20 +49,20 @@ import"../shared/@ai-setting/roy-agent-core-t3yqzgse.js";
 import"../shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
   TaskComponent
-} from "../shared/@ai-setting/roy-agent-core-h4sm7fyb.js";
+} from "../shared/@ai-setting/roy-agent-core-8s7qyr5y.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-067w3nt1.js";
+import"../shared/@ai-setting/roy-agent-core-50jdqb7r.js";
 import"../shared/@ai-setting/roy-agent-core-mvs5sen6.js";
 import"../shared/@ai-setting/roy-agent-core-3ep1dxf1.js";
 import"../shared/@ai-setting/roy-agent-core-skqt40yy.js";
-import"../shared/@ai-setting/roy-agent-core-c1v263jn.js";
 import"../shared/@ai-setting/roy-agent-core-x0yztmm6.js";
 import {
   XDG_PATHS,
   getXDGPath,
   getXDGPaths
 } from "../shared/@ai-setting/roy-agent-core-qxnbvgwe.js";
+import"../shared/@ai-setting/roy-agent-core-c1v263jn.js";
 import"../shared/@ai-setting/roy-agent-core-hks28tys.js";
 import"../shared/@ai-setting/roy-agent-core-rn57psp0.js";
 import"../shared/@ai-setting/roy-agent-core-1pg0fepg.js";

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

@@ -3,12 +3,12 @@ import {
   BackgroundTaskManager,
   createDelegateTool,
   createStopTool
-} from "../../../shared/@ai-setting/roy-agent-core-067w3nt1.js";
+} from "../../../shared/@ai-setting/roy-agent-core-50jdqb7r.js";
 import"../../../shared/@ai-setting/roy-agent-core-mvs5sen6.js";
 import"../../../shared/@ai-setting/roy-agent-core-skqt40yy.js";
-import"../../../shared/@ai-setting/roy-agent-core-c1v263jn.js";
 import"../../../shared/@ai-setting/roy-agent-core-x0yztmm6.js";
 import"../../../shared/@ai-setting/roy-agent-core-qxnbvgwe.js";
+import"../../../shared/@ai-setting/roy-agent-core-c1v263jn.js";
 import"../../../shared/@ai-setting/roy-agent-core-1pg0fepg.js";
 import"../../../shared/@ai-setting/roy-agent-core-j29yg06n.js";
 import"../../../shared/@ai-setting/roy-agent-core-h7ak839w.js";

package/dist/env/task/index.js

@@ -5,21 +5,21 @@ import {
   TaskPriorityEnum,
   TaskStatusEnum,
   TaskTypeEnum
-} from "../../shared/@ai-setting/roy-agent-core-h4sm7fyb.js";
+} from "../../shared/@ai-setting/roy-agent-core-8s7qyr5y.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-067w3nt1.js";
+import"../../shared/@ai-setting/roy-agent-core-50jdqb7r.js";
 import"../../shared/@ai-setting/roy-agent-core-mvs5sen6.js";
 import {
   SQLiteTaskStore,
   getDefaultTaskDbPath
 } from "../../shared/@ai-setting/roy-agent-core-3ep1dxf1.js";
 import"../../shared/@ai-setting/roy-agent-core-skqt40yy.js";
-import"../../shared/@ai-setting/roy-agent-core-c1v263jn.js";
 import"../../shared/@ai-setting/roy-agent-core-x0yztmm6.js";
 import"../../shared/@ai-setting/roy-agent-core-qxnbvgwe.js";
+import"../../shared/@ai-setting/roy-agent-core-c1v263jn.js";
 import"../../shared/@ai-setting/roy-agent-core-hks28tys.js";
 import"../../shared/@ai-setting/roy-agent-core-rn57psp0.js";
 import"../../shared/@ai-setting/roy-agent-core-1pg0fepg.js";

package/dist/index.js

@@ -131,7 +131,7 @@ import"./shared/@ai-setting/roy-agent-core-1ce3fqrk.js";
 import {
   AgentComponent,
   AgentComponentConfigSchema
-} from "./shared/@ai-setting/roy-agent-core-mz69jdvv.js";
+} from "./shared/@ai-setting/roy-agent-core-3c1b7xh5.js";
 import {
   createInvokeConfig,
   invoke,
@@ -151,10 +151,10 @@ import {
 } from "./shared/@ai-setting/roy-agent-core-e25xkv53.js";
 import {
   TaskComponent
-} from "./shared/@ai-setting/roy-agent-core-h4sm7fyb.js";
+} from "./shared/@ai-setting/roy-agent-core-8s7qyr5y.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-067w3nt1.js";
+import"./shared/@ai-setting/roy-agent-core-50jdqb7r.js";
 import"./shared/@ai-setting/roy-agent-core-mvs5sen6.js";
 import {
   SQLiteTaskStore,
@@ -164,7 +164,6 @@ import {
   getBuiltInPrompt,
   getBuiltInPromptNames
 } from "./shared/@ai-setting/roy-agent-core-skqt40yy.js";
-import"./shared/@ai-setting/roy-agent-core-c1v263jn.js";
 import {
   AgentRegistry
 } from "./shared/@ai-setting/roy-agent-core-x0yztmm6.js";
@@ -173,6 +172,7 @@ import {
   getXDGPath,
   getXDGPaths
 } from "./shared/@ai-setting/roy-agent-core-qxnbvgwe.js";
+import"./shared/@ai-setting/roy-agent-core-c1v263jn.js";
 import"./shared/@ai-setting/roy-agent-core-hks28tys.js";
 import"./shared/@ai-setting/roy-agent-core-rn57psp0.js";
 import {

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

@@ -14,6 +14,9 @@ import {
 import {
   AgentRegistry
 } from "./roy-agent-core-x0yztmm6.js";
+import {
+  getCurrentBgTaskId
+} from "./roy-agent-core-c1v263jn.js";
 import {
   ContextError
 } from "./roy-agent-core-ctdhjv68.js";
@@ -780,7 +783,16 @@ class AgentComponent extends BaseComponent {
     if (!agent) {
       throw new Error(`Agent not found: ${agentName}`);
     }
-    const runId = `${agentName}:${++this.runCounter}`;
+    if (context?.runId !== undefined && context.runId.trim() === "") {
+      throw new Error(`AgentComponent._run: caller-provided runId must not be empty`);
+    }
+    const internalRunId = `${agentName}:${++this.runCounter}`;
+    const runId = context?.runId ?? internalRunId;
+    if (context?.runId) {
+      if (this.aborted.has(runId) || this.abortControllers.has(runId)) {
+        throw new Error(`AgentComponent._run: caller-provided runId '${runId}' is already in use`);
+      }
+    }
     const querySummary = typeof query === "string" ? query.substring(0, 100) : query.filter((p) => p.type === "text").map((p) => p.text).join(" ").substring(0, 100) || "[multimodal query]";
     logger2.info(`Starting agent run: ${agentName} (runId=${runId})`, { query: querySummary });
     agent.status = "running";
@@ -1276,6 +1288,36 @@ class AgentComponent extends BaseComponent {
     }
     logger2.info(`Agent aborted: ${agentName}`);
   }
+  abortRun(runId, reason) {
+    if (!runId) {
+      return false;
+    }
+    const foundInAborted = this.aborted.has(runId);
+    const foundInControllers = this.abortControllers.has(runId);
+    if (!foundInAborted && !foundInControllers) {
+      logger2.debug(`[abort] abortRun: runId not found (already finalized?)`, {
+        runId,
+        reason
+      });
+      return false;
+    }
+    if (foundInAborted) {
+      this.aborted.set(runId, true);
+    }
+    const controller = this.abortControllers.get(runId);
+    if (controller && !controller.signal.aborted) {
+      try {
+        controller.abort();
+      } catch {}
+    }
+    logger2.info(`[abort] run-scoped abort`, {
+      runId,
+      reason,
+      currentBgTaskId: getCurrentBgTaskId(),
+      currentTaskId: getCurrentTaskId()
+    });
+    return true;
+  }
   abortAll() {
     for (const key of this.aborted.keys()) {
       this.aborted.set(key, true);

package/dist/shared/@ai-setting/{roy-agent-core-067w3nt1.js → roy-agent-core-50jdqb7r.js}

@@ -5,12 +5,12 @@ import {
 import {
   builtInPrompts
 } from "./roy-agent-core-skqt40yy.js";
-import {
-  runWithBgTaskIdAsync
-} from "./roy-agent-core-c1v263jn.js";
 import {
   DEFAULT_SUBAGENT_PROMPT
 } from "./roy-agent-core-x0yztmm6.js";
+import {
+  runWithBgTaskIdAsync
+} from "./roy-agent-core-c1v263jn.js";
 import {
   TaskHookPoints
 } from "./roy-agent-core-1pg0fepg.js";
@@ -984,10 +984,12 @@ class BackgroundTaskManager {
       this.terminalTasks.set(taskId, task);
     }
     const abortCtl = this.abortControllers.get(taskId);
-    if (abortCtl) {
-      try {
-        abortCtl.abort();
-      } catch {}
+    if (abortCtl && reason !== "completed") {
+      if (!abortCtl.signal.aborted) {
+        try {
+          abortCtl.abort();
+        } catch {}
+      }
     }
     this.abortControllers.delete(taskId);
     this.workflowRunRegistries.delete(taskId);
@@ -1132,8 +1134,10 @@ class BackgroundTaskManager {
     const processRegistry = new ProcessRegistry;
     this.processRegistries.set(taskIdGen, processRegistry);
     const createdAt = Date.now();
+    const taskRunId = `${subagentType}:bg_${taskIdGen}`;
     const task = {
       id: taskIdGen,
+      runId: taskRunId,
       subSessionId: subSession.id,
       parentSessionId,
       description,
@@ -1182,7 +1186,7 @@ class BackgroundTaskManager {
         throw new Error(`Sub session not found: ${task.subSessionId}`);
       }
       const taskRegistry = this.processRegistries.get(taskId);
-      const result = await this.executeWithAbort(subSession, prompt, timeoutMs, taskId, abortController?.signal, task.similarTaskIds, taskRegistry);
+      const result = await this.executeWithAbort(subSession, prompt, timeoutMs, taskId, abortController?.signal, task.similarTaskIds, taskRegistry, () => abortController?.abort());
       if (abortController?.signal.aborted) {
         logger3.info(`[BackgroundTaskManager] Task was aborted`, { taskId });
         return;
@@ -1311,7 +1315,7 @@ class BackgroundTaskManager {
       this.progressTimers.delete(taskId);
     }
   }
-  async executeWithAbort(subSession, prompt, timeoutMs, bgTaskId, signal, similarTaskIds, processRegistry) {
+  async executeWithAbort(subSession, prompt, timeoutMs, bgTaskId, signal, similarTaskIds, processRegistry, abortTask) {
     const metadata = subSession.info?.metadata || {};
     const taskId = metadata.task_id;
     const taskDescription = metadata.task_description || "";
@@ -1453,37 +1457,84 @@ ${reuseSection.markdown}`;
           });
         }
       };
-      const timer = setTimeout(async () => {
-        await killProcessTreeSafely();
-        reject(new Error(`Task execution timeout after ${timeoutMs}ms`));
+      let settled = false;
+      let timer;
+      let capturedRunId;
+      const task = this.tasks.get(bgTaskId);
+      if (task?.runId) {
+        capturedRunId = task.runId;
+      }
+      const detachAbortListener = () => {
+        if (signal && onAbort) {
+          try {
+            signal.removeEventListener("abort", onAbort);
+          } catch {}
+        }
+      };
+      let onAbort;
+      onAbort = () => {
+        if (settled)
+          return;
+        settled = true;
+        if (timer)
+          clearTimeout(timer);
+        detachAbortListener();
         try {
-          agentComponent?.abort?.(subagentType);
+          const agentComp = this.env?.getComponent?.("agent");
+          if (agentComp?.abortRun && capturedRunId) {
+            agentComp.abortRun(capturedRunId, "task_signal_abort");
+          }
+        } catch {}
+        killProcessTreeSafely().catch(() => {}).then(() => {
+          reject(new Error("Task execution stopped"));
+        });
+      };
+      timer = setTimeout(() => {
+        if (settled)
+          return;
+        settled = true;
+        if (timer)
+          clearTimeout(timer);
+        detachAbortListener();
+        try {
+          abortTask?.();
         } catch {}
-      }, timeoutMs);
-      signal?.addEventListener("abort", async () => {
-        clearTimeout(timer);
         try {
-          const env = this.env;
-          const agentComp = env?.getComponent?.("agent");
-          if (agentComp?.abort) {
-            agentComp.abort(subagentType);
+          const agentComp = this.env?.getComponent?.("agent");
+          if (agentComp?.abortRun && capturedRunId) {
+            agentComp.abortRun(capturedRunId, "task_timeout");
           }
         } catch {}
-        await killProcessTreeSafely();
-        reject(new Error("Task execution stopped"));
-      });
+        killProcessTreeSafely().catch(() => {}).then(() => {
+          reject(new Error(`Task execution timeout after ${timeoutMs}ms`));
+        });
+      }, timeoutMs);
+      if (signal) {
+        signal.addEventListener("abort", onAbort);
+      }
       const invokeHandleQuery = () => this.env.handle_query?.(delegateQuery, {
         sessionId,
         deniedTools: deniedTools.length > 0 ? deniedTools : undefined,
         agentType: subagentType,
-        abort: signal
+        abort: signal,
+        runId: capturedRunId
       });
       const wrappedPromise = processRegistry ? runWithProcessRegistryAsync(processRegistry, () => runWithBgTaskIdAsync(bgTaskId, () => invokeHandleQuery())) : runWithBgTaskIdAsync(bgTaskId, () => invokeHandleQuery());
       wrappedPromise?.then((result) => {
-        clearTimeout(timer);
+        if (settled)
+          return;
+        settled = true;
+        if (timer)
+          clearTimeout(timer);
+        detachAbortListener();
         resolve(result);
       }).catch((error) => {
-        clearTimeout(timer);
+        if (settled)
+          return;
+        settled = true;
+        if (timer)
+          clearTimeout(timer);
+        detachAbortListener();
         reject(error);
       });
     });
@@ -1510,6 +1561,18 @@ ${reuseSection.markdown}`;
     const completedAt = Date.now();
     task.status = "stopped";
     task.abortController?.abort();
+    if (task.runId) {
+      try {
+        const agentComp = this.env?.getComponent?.("agent");
+        agentComp?.abortRun?.(task.runId, "stop_task");
+      } catch (err) {
+        logger3.warn(`[BackgroundTaskManager] abortRun failed during stopTask`, {
+          taskId,
+          runId: task.runId,
+          error: err instanceof Error ? err.message : String(err)
+        });
+      }
+    }
     task.completedAt = completedAt;
     task.lastUpdatedAt = completedAt;
     try {

package/dist/shared/@ai-setting/{roy-agent-core-h4sm7fyb.js → roy-agent-core-8s7qyr5y.js}

@@ -8,7 +8,7 @@ import {
   BackgroundTaskManager,
   createDelegateTool,
   createStopTool
-} from "./roy-agent-core-067w3nt1.js";
+} from "./roy-agent-core-50jdqb7r.js";
 import {
   SQLiteTaskStore,
   getDefaultTaskDbPath

package/package.json

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