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

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

@@ -1,51 +1,57 @@
 import {
   withTimeout
-} from "./roy-agent-core-8n0e62y4.js";
+} from "./roy-agent-core-c1stgqnw.js";
 import {
   truncateOutputInline
-} from "./roy-agent-core-eskgj8nc.js";
+} from "./roy-agent-core-h28gcd77.js";
+import {
+  enqueueToAddFakeUserMessage
+} from "./roy-agent-core-t3yqzgse.js";
 import {
   AskUserError,
   init_workflow_hil
 } from "./roy-agent-core-e25xkv53.js";
 import {
   AgentRegistry
-} from "./roy-agent-core-fntxq0gf.js";
+} from "./roy-agent-core-x0yztmm6.js";
+import {
+  getCurrentBgTaskId
+} from "./roy-agent-core-c1v263jn.js";
 import {
   ContextError
 } from "./roy-agent-core-ctdhjv68.js";
 import {
   SessionMessageConverter
-} from "./roy-agent-core-7r72622v.js";
+} from "./roy-agent-core-1k9j90s7.js";
 import {
   safeParseToolArgs
-} from "./roy-agent-core-e0kaxcy1.js";
+} from "./roy-agent-core-12gac5zn.js";
 import {
   envKeyToConfigKey
 } from "./roy-agent-core-7hh0brvs.js";
 import {
   BaseComponent
-} from "./roy-agent-core-akb8mb9v.js";
+} from "./roy-agent-core-pde8hkq4.js";
 import {
   globalHookManager,
   init_global_hook_manager
-} from "./roy-agent-core-vc7p80sd.js";
+} from "./roy-agent-core-j29yg06n.js";
 import {
   init_context
-} from "./roy-agent-core-sqt96sam.js";
+} from "./roy-agent-core-h7ak839w.js";
 import {
   getCurrentTaskId,
   getEnvContext,
   runWithEnvContextAsync
-} from "./roy-agent-core-dtkbj8fk.js";
+} from "./roy-agent-core-xrr7t0qc.js";
 import {
   TracedAs,
   init_decorator
-} from "./roy-agent-core-96mj6gvc.js";
+} from "./roy-agent-core-gb7pm9c0.js";
 import {
   createLogger,
   init_logger
-} from "./roy-agent-core-nna4s0qs.js";
+} from "./roy-agent-core-kaq037np.js";
 import {
   __legacyDecorateClassTS,
   __require
@@ -55,6 +61,102 @@ import {
 init_logger();
 import { z } from "zod";
 
+// src/env/task/plugins/max-iteration-reminder-plugin.ts
+init_logger();
+init_decorator();
+var logger = createLogger("MaxIterationReminderPlugin");
+var DEFAULT_REMINDER_MESSAGE = `⚠️ **系统提醒**: 你已经达到最大 ReAct 迭代次数（{maxIterations}次）。
+
+**请不要再调用任何工具**，利用目前已有的信息直接给用户一个简洁明了的总结，包括：
+1. 目前的进展
+2. 已完成的工作
+3. 遇到的问题（如有）
+4. 下一步建议（如有）
+
+总结后立即结束，不要继续工具调用。`;
+
+class MaxIterationReminderPlugin {
+  name = "MaxIterationReminderPlugin";
+  version = "3.0.0";
+  description = "在 iteration === maxIterations - 1 时通过共享 meta-protocol helper 注入 fake user 消息；AgentComponent 现有 for-loop 后 flush；适用于所有 agent。maxIterations<=1 防御性跳过。";
+  priority = 50;
+  messageTemplate;
+  injectedTraceIds = new Set;
+  constructor(config) {
+    this.messageTemplate = config?.messageTemplate ?? DEFAULT_REMINDER_MESSAGE;
+  }
+  async execute(ctx) {
+    const { iteration, maxIterations } = ctx;
+    const traceId = ctx.context?.traceId ?? ctx.context?.sessionId ?? "unknown";
+    const kind = "max-iter";
+    const makeResult = (willSet, reason) => {
+      const decision = { willSet, iteration, maxIterations, kind, reason, traceId };
+      return { continue: true, __maxIterDecision: decision };
+    };
+    if (typeof iteration !== "number" || typeof maxIterations !== "number") {
+      logger.debug(`[MaxIterReminder] skip — non-numeric iter=${iteration} or maxIter=${maxIterations}`);
+      return makeResult(false, "non-numeric-iter-or-maxIter");
+    }
+    if (maxIterations <= 1) {
+      logger.debug(`[MaxIterReminder] skip — maxIterations=${maxIterations} <= 1 (one-shot agent)`);
+      return makeResult(false, "max-iterations-le-1");
+    }
+    if (iteration !== maxIterations - 1) {
+      return makeResult(false, "iter-not-equal-max-iter-minus-1");
+    }
+    if (!ctx.toolResult) {
+      logger.warn(`[MaxIterReminder] skip — toolResult missing at iter=${iteration}`);
+      return makeResult(false, "no-tool-result");
+    }
+    if (this.injectedTraceIds.has(traceId)) {
+      logger.debug(`[MaxIterReminder] skip — traceId=${traceId.slice(0, 20)} already processed`);
+      return makeResult(false, "trace-id-already-processed");
+    }
+    const reminderContent = this.messageTemplate.replace(/\{maxIterations\}/g, String(maxIterations));
+    enqueueToAddFakeUserMessage(ctx.toolResult, {
+      role: "user",
+      content: reminderContent
+    }, kind);
+    this.injectedTraceIds.add(traceId);
+    logger.info(`[MaxIterReminder] max-iter reminder meta-protocol set (session=${(ctx.context?.sessionId ?? "unknown").slice(0, 12)}..., iteration=${iteration}, maxIterations=${maxIterations})`);
+    return makeResult(true, "fired");
+  }
+}
+__legacyDecorateClassTS([
+  TracedAs("plugin.max-iter-reminder.evaluate", {
+    recordParams: false,
+    recordResult: false,
+    log: true,
+    resultFilter: (result) => {
+      const d = result?.__maxIterDecision;
+      if (!d)
+        return {};
+      return {
+        "max-iter.iteration": d.iteration,
+        "max-iter.max_iterations": d.maxIterations,
+        "max-iter.will_set": d.willSet,
+        "max-iter.kind": d.kind,
+        "max-iter.reason": d.reason,
+        "max-iter.trace_id": d.traceId
+      };
+    }
+  })
+], MaxIterationReminderPlugin.prototype, "execute", null);
+function createMaxIterationReminderPlugin(config) {
+  const inst = new MaxIterationReminderPlugin(config);
+  return {
+    name: inst.name,
+    version: inst.version,
+    description: inst.description,
+    hooks: [
+      { point: "agent:after.tool", priority: inst.priority }
+    ],
+    execute: async (ctx) => {
+      return inst.execute(ctx);
+    }
+  };
+}
+
 // src/env/agent/agent-config-registration.ts
 var AGENT_DEFAULTS = {
   "agent.defaultAgent.maxIterations": 200,
@@ -128,7 +230,7 @@ function composeToolOutputForLLM(toolName, result) {
   }
   return `${tag} tool=${toolName} status=${status} (no error message and no runId — tool did not surface a diagnostic)`;
 }
-var logger = createLogger("agent:component");
+var logger2 = createLogger("agent:component");
 function toLLMMessage(msg) {
   let content;
   let toolCallId;
@@ -350,7 +452,7 @@ class AgentComponent extends BaseComponent {
       allowedTools: parseToolList(constructorDefaultAgent?.allowedTools ?? configComponent.get("agent.defaultAgent.allowedTools")),
       deniedTools: parseToolList(constructorDefaultAgent?.deniedTools ?? configComponent.get("agent.defaultAgent.deniedTools"))
     };
-    logger.info(`[registerConfig] Synced config from ConfigComponent: maxIterations=${this.config.defaultAgent.maxIterations}`);
+    logger2.info(`[registerConfig] Synced config from ConfigComponent: maxIterations=${this.config.defaultAgent.maxIterations}`);
     this.registerConfigWatcher(configComponent);
   }
   flattenConfig(obj, prefix = "agent") {
@@ -374,7 +476,7 @@ class AgentComponent extends BaseComponent {
     });
   }
   onConfigChange(event) {
-    logger.info(`Agent config changed: ${event.key}`, {
+    logger2.info(`Agent config changed: ${event.key}`, {
       oldValue: event.oldValue,
       newValue: event.newValue
     });
@@ -386,23 +488,23 @@ class AgentComponent extends BaseComponent {
         resolvePromptComponent: () => this.env?.getComponent?.("prompt") ?? null
       });
       const loadedCount = await this.registry.load();
-      logger.info(`[AgentComponent] Loaded ${loadedCount} agents from config directory`);
+      logger2.info(`[AgentComponent] Loaded ${loadedCount} agents from config directory`);
       this.registry.registerWorkflowRunner();
-      logger.info("[AgentComponent] Registered built-in workflow-runner");
+      logger2.info("[AgentComponent] Registered built-in workflow-runner");
       this.registry.registerTaskOrganizer();
-      logger.info("[AgentComponent] Registered built-in task-organizer");
+      logger2.info("[AgentComponent] Registered built-in task-organizer");
       this.registry.registerJsonExtractAgent();
-      logger.info("[AgentComponent] Registered built-in json-extract agent");
+      logger2.info("[AgentComponent] Registered built-in json-extract agent");
       this.registry.registerWorkflowCreator();
-      logger.info("[AgentComponent] Registered built-in workflow-creator");
+      logger2.info("[AgentComponent] Registered built-in workflow-creator");
       this.registry.registerWorkflowExtractAgent();
-      logger.info("[AgentComponent] Registered built-in workflow-extract agent");
+      logger2.info("[AgentComponent] Registered built-in workflow-extract agent");
       this.registry.registerCompactAgent();
-      logger.info("[AgentComponent] Registered built-in compact agent");
+      logger2.info("[AgentComponent] Registered built-in compact agent");
       this.registry.registerCompactHintAgent();
-      logger.info("[AgentComponent] Registered built-in compact-hint agent");
+      logger2.info("[AgentComponent] Registered built-in compact-hint agent");
       this.registry.registerRoyAgent();
-      logger.info("[AgentComponent] Registered built-in roy agent");
+      logger2.info("[AgentComponent] Registered built-in roy agent");
       for (const agentDef of this.registry.list()) {
         if (!this.agents.has(agentDef.name)) {
           const systemPrompt = await this.registry.getSystemPrompt(agentDef.name);
@@ -415,11 +517,11 @@ class AgentComponent extends BaseComponent {
             model: agentDef.model,
             maxIterations: agentDef.maxIterations
           });
-          logger.debug(`[AgentComponent] Registered agent from config: ${agentDef.name}`);
+          logger2.debug(`[AgentComponent] Registered agent from config: ${agentDef.name}`);
         }
       }
     } catch (error) {
-      logger.warn(`[AgentComponent] Failed to initialize AgentRegistry: ${error}`);
+      logger2.warn(`[AgentComponent] Failed to initialize AgentRegistry: ${error}`);
     }
   }
   async syncRegistryAgentsFromConfig() {
@@ -447,7 +549,7 @@ class AgentComponent extends BaseComponent {
           maxIterations: agentDef.maxIterations
         });
       }
-      logger.debug(`[AgentComponent] Synced registry agent: ${agentDef.name}`);
+      logger2.debug(`[AgentComponent] Synced registry agent: ${agentDef.name}`);
     }
   }
   getRegistry() {
@@ -460,11 +562,11 @@ class AgentComponent extends BaseComponent {
     return this.registry?.list() ?? [];
   }
   async onStop() {
-    logger.info("[AgentComponent] Stopping and cleaning up resources...");
+    logger2.info("[AgentComponent] Stopping and cleaning up resources...");
     for (const [name, agent] of this.agents) {
       if (agent.status === "running" || agent.status === "idle") {
         this.abort(name);
-        logger.debug(`[AgentComponent] Aborted agent: ${name}`);
+        logger2.debug(`[AgentComponent] Aborted agent: ${name}`);
       }
     }
     this.abortControllers.clear();
@@ -475,7 +577,7 @@ class AgentComponent extends BaseComponent {
     }
     this.agents.clear();
     this.setStatus("stopped");
-    logger.info("[AgentComponent] Cleanup completed");
+    logger2.info("[AgentComponent] Cleanup completed");
   }
   async refreshDependencies() {
     if (this.env) {
@@ -498,12 +600,12 @@ class AgentComponent extends BaseComponent {
             });
             return result.output?.content ?? "";
           });
-          logger.debug("[refreshDependencies] understand_image LLM provider injected");
+          logger2.debug("[refreshDependencies] understand_image LLM provider injected");
         } catch (err) {
-          logger.warn(`[refreshDependencies] failed to inject understand_image provider: ${err.message}`);
+          logger2.warn(`[refreshDependencies] failed to inject understand_image provider: ${err.message}`);
         }
       }
-      logger.debug("[refreshDependencies] AgentComponent refreshed", {
+      logger2.debug("[refreshDependencies] AgentComponent refreshed", {
         hasLLM: !!this.llmComponent,
         hasTool: !!this.toolComponent
       });
@@ -517,17 +619,17 @@ class AgentComponent extends BaseComponent {
       return;
     }
     if (!this.registry) {
-      logger.debug(`[resolveSystemPrompt] No registry available for ${agentName}`);
+      logger2.debug(`[resolveSystemPrompt] No registry available for ${agentName}`);
       return;
     }
     try {
       const resolvedPrompt = await this.registry.getSystemPrompt(agentName);
       if (resolvedPrompt) {
         agent.config.systemPrompt = resolvedPrompt;
-        logger.debug(`[AgentComponent] Resolved systemPrompt for agent: ${agentName}`);
+        logger2.debug(`[AgentComponent] Resolved systemPrompt for agent: ${agentName}`);
       }
     } catch (error) {
-      logger.warn(`[AgentComponent] Failed to resolve systemPrompt for agent ${agentName}: ${error}`);
+      logger2.warn(`[AgentComponent] Failed to resolve systemPrompt for agent ${agentName}: ${error}`);
     }
   }
   getAgent(agentName) {
@@ -575,13 +677,14 @@ class AgentComponent extends BaseComponent {
       plugins: new Map
     };
     this.agents.set(name, instance);
-    logger.info(`Agent registered: ${name}`, { type: instance.config.type });
+    this.registerPlugin(name, createMaxIterationReminderPlugin());
+    logger2.info(`Agent registered: ${name}`, { type: instance.config.type });
     return instance;
   }
   unregisterAgent(name) {
     const deleted = this.agents.delete(name);
     if (deleted) {
-      logger.info(`Agent unregistered: ${name}`);
+      logger2.info(`Agent unregistered: ${name}`);
     }
     return deleted;
   }
@@ -591,7 +694,7 @@ class AgentComponent extends BaseComponent {
       throw new Error(`Agent not found: ${agentName}`);
     }
     agent.plugins.set(plugin.name, plugin);
-    logger.info(`Plugin registered: ${plugin.name} to ${agentName}`, {
+    logger2.info(`Plugin registered: ${plugin.name} to ${agentName}`, {
       hooks: plugin.hooks.map((h) => h.point)
     });
   }
@@ -602,7 +705,7 @@ class AgentComponent extends BaseComponent {
     }
     const deleted = agent.plugins.delete(pluginName);
     if (deleted) {
-      logger.info(`Plugin unregistered: ${pluginName} from ${agentName}`);
+      logger2.info(`Plugin unregistered: ${pluginName} from ${agentName}`);
     }
     return deleted;
   }
@@ -611,7 +714,7 @@ class AgentComponent extends BaseComponent {
   }
   getAvailableTools(agent, context) {
     let tools = filterToolsByAgent([...this.defaultTools], agent);
-    logger.debug(`[getAvailableTools] After defaultTools (filtered): ${tools.length} tools`, {
+    logger2.debug(`[getAvailableTools] After defaultTools (filtered): ${tools.length} tools`, {
       toolNames: tools.map((t) => t.name)
     });
     if (this.toolComponent?.listTools) {
@@ -620,33 +723,33 @@ class AgentComponent extends BaseComponent {
       });
       const filteredComponentTools = filterToolsByAgent(componentTools, agent);
       tools = [...tools, ...filteredComponentTools];
-      logger.debug(`[getAvailableTools] After adding componentTools: ${tools.length} tools`, {
+      logger2.debug(`[getAvailableTools] After adding componentTools: ${tools.length} tools`, {
         componentToolNames: filteredComponentTools.map((t) => t.name)
       });
     }
     const allowedTools = context?.allowedTools ?? agent.config.allowedTools;
     const deniedTools = context?.deniedTools ?? agent.config.deniedTools;
-    logger.debug(`[getAvailableTools] Filtering: allowed=${allowedTools}, denied=${deniedTools}`);
+    logger2.debug(`[getAvailableTools] Filtering: allowed=${allowedTools}, denied=${deniedTools}`);
     if (allowedTools !== undefined && allowedTools !== null) {
       tools = tools.filter((t) => allowedTools.includes(t.name));
-      logger.debug(`[getAvailableTools] After allowedTools filter: ${tools.length} tools`, {
+      logger2.debug(`[getAvailableTools] After allowedTools filter: ${tools.length} tools`, {
         toolNames: tools.map((t) => t.name)
       });
     }
     if (deniedTools?.length) {
       tools = tools.filter((t) => !deniedTools.includes(t.name));
-      logger.debug(`[getAvailableTools] After deniedTools filter: ${tools.length} tools`, {
+      logger2.debug(`[getAvailableTools] After deniedTools filter: ${tools.length} tools`, {
         toolNames: tools.map((t) => t.name)
       });
     }
     if (context?.extraTools?.length) {
       const filteredExtraTools = filterToolsByAgent(context.extraTools, agent);
       tools = [...tools, ...filteredExtraTools];
-      logger.debug(`[getAvailableTools] After extraTools (filtered): ${tools.length} tools`, {
+      logger2.debug(`[getAvailableTools] After extraTools (filtered): ${tools.length} tools`, {
         extraToolNames: filteredExtraTools.map((t) => t.name)
       });
     }
-    logger.debug(`[getAvailableTools] Final tools: ${tools.length}`, {
+    logger2.debug(`[getAvailableTools] Final tools: ${tools.length}`, {
       toolNames: tools.map((t) => t.name)
     });
     return tools;
@@ -672,7 +775,7 @@ class AgentComponent extends BaseComponent {
   }
   flushPendingFakeUserMessage(hookCtx, pendingMsg, iter) {
     this.pushMessage(hookCtx, pendingMsg);
-    logger.debug(`[ReAct] Meta-protocol: flushed user message AFTER all tool-results (iter=${iter})`);
+    logger2.debug(`[ReAct] Meta-protocol: flushed user message AFTER all tool-results (iter=${iter})`);
   }
   async _run(agentName, query, context) {
     await this.refreshDependencies();
@@ -680,9 +783,18 @@ 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]";
-    logger.info(`Starting agent run: ${agentName} (runId=${runId})`, { query: querySummary });
+    logger2.info(`Starting agent run: ${agentName} (runId=${runId})`, { query: querySummary });
     agent.status = "running";
     this.aborted.set(runId, false);
     const abortController = new AbortController;
@@ -708,7 +820,7 @@ class AgentComponent extends BaseComponent {
             resolvedSystemPrompt = resolvedSystemPrompt.replaceAll("{{memory}}", "(Memory component not available)");
           }
         } catch (err) {
-          logger.warn(`[AgentComponent._run] Failed to replace {{memory}}: ${err}`);
+          logger2.warn(`[AgentComponent._run] Failed to replace {{memory}}: ${err}`);
           resolvedSystemPrompt = resolvedSystemPrompt.replaceAll("{{memory}}", "(Failed to load memory)");
         }
       }
@@ -757,7 +869,7 @@ class AgentComponent extends BaseComponent {
           historyMessageCount = hookCtx.messages.length;
         }
       } catch (err) {
-        logger.warn(`Failed to load session history: ${err}`);
+        logger2.warn(`Failed to load session history: ${err}`);
       }
     }
     const parentEnvContext = getEnvContext();
@@ -813,14 +925,14 @@ class AgentComponent extends BaseComponent {
         iteration++;
         hookCtx.iteration = iteration;
         result.iterations = iteration;
-        logger.debug(`Iteration ${iteration} started`);
+        logger2.debug(`Iteration ${iteration} started`);
         this.doomLoopCaches.set(runId, new Map);
         hookCtx.currentToolCall = undefined;
         hookCtx.maxIterations = agent.config.maxIterations;
         let iterAllToolCalls = [];
         let iterProcessedCount = 0;
         try {
-          logger.debug(`[ReAct] Iteration ${iteration} buildMessages result: ${hookCtx.messages.length} messages`);
+          logger2.debug(`[ReAct] Iteration ${iteration} buildMessages result: ${hookCtx.messages.length} messages`);
           await this.executePluginHooks(agent, "agent:before.llm", hookCtx);
           if (hookCtx._stopped)
             break;
@@ -905,7 +1017,7 @@ class AgentComponent extends BaseComponent {
             }
             const assistantContent = llmOutput.content?.substring(0, 80) || "(no text)";
             const toolCallNames = llmOutput.toolCalls?.map((tc) => tc.function?.name || tc.name).join(", ") || "none";
-            logger.debug(`[ReAct] Iteration ${iteration} Adding assistant message: text="${assistantContent}" toolCalls=[${toolCallNames}]`);
+            logger2.debug(`[ReAct] Iteration ${iteration} Adding assistant message: text="${assistantContent}" toolCalls=[${toolCallNames}]`);
             this.pushMessage(hookCtx, {
               role: "assistant",
               content: assistantParts
@@ -954,7 +1066,7 @@ class AgentComponent extends BaseComponent {
               }
               const toolOutput = composeToolOutputForLLM(toolResult.name, toolResult.result);
               const toolOutputPreview = typeof toolOutput === "string" ? toolOutput.substring(0, 50) : JSON.stringify(toolOutput).substring(0, 50);
-              logger.debug(`[ReAct] Iteration ${iteration} Adding tool message: tool=${toolResult.name} output="${toolOutputPreview}..."`);
+              logger2.debug(`[ReAct] Iteration ${iteration} Adding tool message: tool=${toolResult.name} output="${toolOutputPreview}..."`);
               this.pushMessage(hookCtx, {
                 role: "tool",
                 content: [{
@@ -968,7 +1080,7 @@ class AgentComponent extends BaseComponent {
                 const captured = this.consumeMetaProtocolUserMessage(hookCtx);
                 if (captured) {
                   pendingFakeUserMessage = captured;
-                  logger.debug(`[ReAct] Meta-protocol: captured user message (tool=${toolResult.name}, iter=${iteration}); will flush after loop`);
+                  logger2.debug(`[ReAct] Meta-protocol: captured user message (tool=${toolResult.name}, iter=${iteration}); will flush after loop`);
                 }
               }
               result.toolCalls.push(hookCtx.currentToolCall);
@@ -980,7 +1092,7 @@ class AgentComponent extends BaseComponent {
             await this.executePluginHooks(agent, "agent:on.iteration", hookCtx);
           }
         } catch (error) {
-          logger.error(`Iteration ${iteration} error`, { error });
+          logger2.error(`Iteration ${iteration} error`, { error });
           hookCtx.error = error instanceof Error ? error : new Error(String(error));
           if (error instanceof ContextError && error.llmOutput) {
             const llmOutput = error.llmOutput;
@@ -1112,7 +1224,7 @@ class AgentComponent extends BaseComponent {
       if (effectiveContext.persistSession !== false) {
         await this.recordSessionMessages(effectiveContext.sessionId, newMessages);
       } else {
-        logger.debug(`Skipping session message recording (persistSession=false, sessionId=${effectiveContext.sessionId})`);
+        logger2.debug(`Skipping session message recording (persistSession=false, sessionId=${effectiveContext.sessionId})`);
       }
       const reactContext = {
         messages: hookCtx.messages,
@@ -1152,7 +1264,7 @@ class AgentComponent extends BaseComponent {
           }
         });
       }
-      logger.info(`Agent run completed: ${agentName}`, {
+      logger2.info(`Agent run completed: ${agentName}`, {
         iterations: result.iterations,
         hasError: !!result.error,
         hookCtxMessages: hookCtx.messages.length,
@@ -1171,10 +1283,40 @@ class AgentComponent extends BaseComponent {
     for (const [key, controller] of this.abortControllers) {
       if (key.startsWith(agentName + ":")) {
         controller.abort();
-        logger.debug(`[abort] AbortController.abort() called for run: ${key}`);
+        logger2.debug(`[abort] AbortController.abort() called for run: ${key}`);
       }
     }
-    logger.info(`Agent aborted: ${agentName}`);
+    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()) {
@@ -1182,9 +1324,9 @@ class AgentComponent extends BaseComponent {
     }
     for (const [key, controller] of this.abortControllers) {
       controller.abort();
-      logger.debug(`[abortAll] AbortController.abort() called for run: ${key}`);
+      logger2.debug(`[abortAll] AbortController.abort() called for run: ${key}`);
     }
-    logger.info(`All agents aborted (${this.abortControllers.size} runs)`);
+    logger2.info(`All agents aborted (${this.abortControllers.size} runs)`);
   }
   async _buildAdditionInfo(ctx) {
     let additionInfo = ctx.context?.additionInfo || "";
@@ -1217,11 +1359,11 @@ ${additionInfo}`
     return messages;
   }
   async invokeLLM(ctx) {
-    logger.debug("[invokeLLM] Starting LLM invocation");
+    logger2.debug("[invokeLLM] Starting LLM invocation");
     if (this.llmComponent?.invoke) {
       const messages = await this.buildMessages(ctx);
       const convertedMessages = messages.map(toLLMMessage);
-      logger.debug(`[invokeLLM] Calling LLMComponent.invoke with ${convertedMessages.length} messages`);
+      logger2.debug(`[invokeLLM] Calling LLMComponent.invoke with ${convertedMessages.length} messages`);
       try {
         const llmPromise = this.llmComponent.invoke({
           messages: convertedMessages,
@@ -1240,7 +1382,7 @@ ${additionInfo}`
           ...ctx.context.toolChoice ? { toolChoice: ctx.context.toolChoice } : {}
         });
         const result = await withTimeout(llmPromise, 300000, "LLM invocation timeout after 300s");
-        logger.debug("[invokeLLM] LLMComponent.invoke returned successfully");
+        logger2.debug("[invokeLLM] LLMComponent.invoke returned successfully");
         return {
           content: result.output?.content || "",
           reasoning: result.output?.reasoning,
@@ -1256,11 +1398,11 @@ ${additionInfo}`
           finishReason: result.output?.finishReason
         };
       } catch (error) {
-        logger.error("[invokeLLM] LLMComponent.invoke threw an error:", error);
+        logger2.error("[invokeLLM] LLMComponent.invoke threw an error:", error);
         throw error;
       }
     }
-    logger.warn("[invokeLLM] No LLMComponent available, using mock");
+    logger2.warn("[invokeLLM] No LLMComponent available, using mock");
     return {
       content: "Mock response: Hello!",
       finishReason: "stop"
@@ -1269,8 +1411,8 @@ ${additionInfo}`
   async executeTool(ctx) {
     const toolCall = ctx.currentToolCall;
     const toolName = toolCall.function?.name || toolCall.name || "unknown";
-    logger.debug(`[executeTool] Looking for tool: "${toolName}"`);
-    logger.debug(`[executeTool] Available tools: [${ctx.tools.map((t) => t.name).join(", ")}]`);
+    logger2.debug(`[executeTool] Looking for tool: "${toolName}"`);
+    logger2.debug(`[executeTool] Available tools: [${ctx.tools.map((t) => t.name).join(", ")}]`);
     const tool = ctx.tools.find((t) => t.name === toolName);
     if (!tool) {
       this.pushEnvEvent({
@@ -1316,7 +1458,7 @@ ${additionInfo}`
       const isLongRunningTool = toolName === "delegate_task" || toolName === "stop_task" || toolName === "bash" || toolName === "workflow_run" || toolName === "run-workflow";
       const isExtraTool = this.toolComponent?.getTool ? !this.toolComponent.getTool(toolName) : false;
       if (isExtraTool) {
-        logger.debug(`[executeTool] Tool "${toolName}" is an extraTool, executing directly`);
+        logger2.debug(`[executeTool] Tool "${toolName}" is an extraTool, executing directly`);
         const toolPromise = tool.execute(toolCall.arguments, toolContext);
         if (isLongRunningTool) {
           result = await toolPromise;
@@ -1332,7 +1474,7 @@ ${additionInfo}`
           result = await withTimeout(toolPromise, 120000, `Tool '${toolName}' execution timeout after 120s`);
         }
       } else {
-        logger.debug(`[executeTool] No ToolComponent available, executing tool directly`);
+        logger2.debug(`[executeTool] No ToolComponent available, executing tool directly`);
         const toolPromise = tool.execute(toolCall.arguments, toolContext);
         if (isLongRunningTool) {
           result = await toolPromise;
@@ -1399,14 +1541,14 @@ ${additionInfo}`
         if (!result.continue) {
           ctx._stopped = true;
           ctx._stopReason = `Plugin ${plugin.name} stopped execution`;
-          logger.info(`Hook ${point} stopped by plugin ${plugin.name}`);
+          logger2.info(`Hook ${point} stopped by plugin ${plugin.name}`);
           break;
         }
         if (result.action) {
           await this.handleHookAction(result.action, ctx);
         }
       } catch (error) {
-        logger.error(`Hook ${point} error in plugin ${plugin.name}`, { error });
+        logger2.error(`Hook ${point} error in plugin ${plugin.name}`, { error });
         ctx._errors = ctx._errors || [];
         ctx._errors.push({
           plugin: plugin.name,
@@ -1438,7 +1580,7 @@ ${additionInfo}`
     }
   }
   notifyMessageAdded(message) {
-    logger.debug(`Message added: ${message.role}`);
+    logger2.debug(`Message added: ${message.role}`);
   }
   finalizeResult(result, ctx) {
     return {
@@ -1455,7 +1597,7 @@ ${additionInfo}`
     try {
       const sessionComponent = this.env.getComponent("session");
       if (!sessionComponent) {
-        logger.warn("SessionComponent not found, skipping session recording");
+        logger2.warn("SessionComponent not found, skipping session recording");
         return;
       }
       filtered = [];
@@ -1480,9 +1622,9 @@ ${additionInfo}`
     } catch (err) {
       const kind = err && typeof err === "object" && "kind" in err ? err.kind : undefined;
       if (kind === "lock_exhausted") {
-        logger.error(`[recordSessionMessages] DROPPED ${filtered?.length ?? "?"} message(s) — SQLITE_BUSY retry exhausted after ${err.attempts ?? "?"} attempts. Session ${sessionId} is now inconsistent with LLM context. Original: ${err}`);
+        logger2.error(`[recordSessionMessages] DROPPED ${filtered?.length ?? "?"} message(s) — SQLITE_BUSY retry exhausted after ${err.attempts ?? "?"} attempts. Session ${sessionId} is now inconsistent with LLM context. Original: ${err}`);
       } else {
-        logger.error(`[recordSessionMessages] Failed to record session messages for ${sessionId}: ${err}`);
+        logger2.error(`[recordSessionMessages] Failed to record session messages for ${sessionId}: ${err}`);
       }
     }
   }
@@ -1513,7 +1655,7 @@ ${additionInfo}`
         };
         this.env?.pushEnvEvent(fullEvent);
       } catch (err) {
-        logger.warn(`[pushEnvEvent] Failed to push event: ${err}`);
+        logger2.warn(`[pushEnvEvent] Failed to push event: ${err}`);
       }
     }
   }