@ai-setting/roy-agent-core 1.7.72 → 1.7.75

package/dist/shared/@ai-setting/{roy-agent-core-add1zqsh.js → roy-agent-core-6cy43nss.js}

@@ -401,6 +401,27 @@ function __resetFailureReplyDedupForTest() {
   repliedTriggers.clear();
 }
 var DEFAULT_REPLY_TIMEOUT_MS = 5000;
+async function deliverAskUserMessage(options) {
+  const { chatId, messageId, profile, content } = options;
+  if (!chatId && !messageId) {
+    return { sent: false, error: "no-target" };
+  }
+  try {
+    await spawnLarkReply({
+      chatId,
+      messageId,
+      content,
+      profile,
+      timeoutMs: options.timeoutMs ?? DEFAULT_REPLY_TIMEOUT_MS
+    });
+    return { sent: true };
+  } catch (err) {
+    return {
+      sent: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
 function spawnLarkReply(options) {
   return new Promise((resolve, reject) => {
     const { chatId, messageId, content, profile } = options;
@@ -521,4 +542,4 @@ async function notifyReactFailure(options) {
   }
 }
 
-export { extractRetryAfterSeconds, humanizeRetryAfter, getFailureRuleIds, classifyReactFailure, buildFailureReplyMarkdown, formatCliFailureLine, __resetFailureReplyDedupForTest, notifyReactFailure };
+export { extractRetryAfterSeconds, humanizeRetryAfter, getFailureRuleIds, classifyReactFailure, buildFailureReplyMarkdown, formatCliFailureLine, __resetFailureReplyDedupForTest, deliverAskUserMessage, notifyReactFailure };

package/dist/shared/@ai-setting/{roy-agent-core-vah6g5yx.js → roy-agent-core-6rh8k6ba.js}

@@ -7,7 +7,7 @@ import {
 import {
   AgentComponentAdapter,
   init_agent_component_adapter
-} from "./roy-agent-core-attpry6g.js";
+} from "./roy-agent-core-dqxec05w.js";
 import {
   PythonCallNode,
   SkillNode,
@@ -37,23 +37,23 @@ import {
 import {
   TemplateResolver,
   init_template_resolver
-} from "./roy-agent-core-sjr1kmfz.js";
+} from "./roy-agent-core-acj8ag08.js";
 import {
   DAGManager,
   init_dag_manager
-} from "./roy-agent-core-mds8tqd0.js";
+} from "./roy-agent-core-cgtq6427.js";
 import {
   WorkflowError,
   createWorkflowEvent,
   init_event,
   init_types,
   init_workflow_error
-} from "./roy-agent-core-jrj30vq3.js";
+} from "./roy-agent-core-er070zjq.js";
 import {
   AskUserError,
   createNodeInterruptEvent,
   init_workflow_hil
-} from "./roy-agent-core-e25xkv53.js";
+} from "./roy-agent-core-mkc3zshb.js";
 import {
   TracedAs,
   init_decorator

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

@@ -2,8 +2,9 @@ import {
   understandImageTool
 } from "./roy-agent-core-xwm8zavb.js";
 import {
+  compactSessionTool,
   queryBackgroundProcessTool
-} from "./roy-agent-core-58804s3j.js";
+} from "./roy-agent-core-2akfd64z.js";
 import {
   getCurrentProcessRegistry,
   killProcessTree
@@ -939,7 +940,8 @@ function getAllBuiltInTools() {
     editFileTool,
     grepTool,
     understandImageTool,
-    queryBackgroundProcessTool
+    queryBackgroundProcessTool,
+    compactSessionTool
   ];
 }
 function getBuiltInTool(name) {

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

@@ -7,7 +7,7 @@ import {
   nodeNotFound,
   pathNotFound,
   unresolvedVariable
-} from "./roy-agent-core-jrj30vq3.js";
+} from "./roy-agent-core-er070zjq.js";
 import {
   TracedAs,
   init_decorator

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

@@ -1,7 +1,7 @@
 import {
   LoopGuardConfigSchema,
   init_types
-} from "./roy-agent-core-jrj30vq3.js";
+} from "./roy-agent-core-er070zjq.js";
 import {
   TracedAs,
   init_decorator

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

@@ -1,7 +1,7 @@
 import {
   MemorySessionStore,
   SQLiteSessionStore
-} from "./roy-agent-core-sm0sf6sb.js";
+} from "./roy-agent-core-0qyrk5k0.js";
 import {
   init_search_query_parser,
   matchesQuery,

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

@@ -1,28 +1,28 @@
 import {
   isToolUnavailableError,
   truncateOutputInline
-} from "./roy-agent-core-dt104qa1.js";
+} from "./roy-agent-core-v85n42ve.js";
 import {
   AgentRegistry
-} from "./roy-agent-core-vm8h5zyj.js";
+} from "./roy-agent-core-ed233k5z.js";
 import {
   enqueueToAddFakeUserMessage
 } from "./roy-agent-core-f77k3gqt.js";
 import {
   SessionMessageConverter
-} from "./roy-agent-core-kmbct9yg.js";
+} from "./roy-agent-core-0snm5hc5.js";
 import {
   parseToolArgsStrict,
   safeParseToolArgs,
   withTimeout
-} from "./roy-agent-core-40rv283c.js";
+} from "./roy-agent-core-fghc2m8z.js";
 import {
   getCurrentBgTaskId
 } from "./roy-agent-core-c1v263jn.js";
 import {
   AskUserError,
   init_workflow_hil
-} from "./roy-agent-core-e25xkv53.js";
+} from "./roy-agent-core-mkc3zshb.js";
 import {
   ContextError
 } from "./roy-agent-core-ctdhjv68.js";
@@ -1393,6 +1393,7 @@ class AgentComponent extends BaseComponent {
                 role: "assistant",
                 content: assistantParts
               });
+              this.addRemainingToolResults(hookCtx, llmOutput.toolCalls, 0, "[Tool result missing: run interrupted] ContextError");
             } else if (llmOutput.content) {
               const assistantParts = [];
               if (llmOutput.content) {
@@ -1438,7 +1439,9 @@ class AgentComponent extends BaseComponent {
                 query: error.query,
                 sessionId: error.sessionId,
                 nodeId: error.nodeId,
-                nodeType: error.nodeType
+                nodeType: error.nodeType,
+                agentSessionId: error.agentSessionId,
+                delivered: error.delivered === true
               };
               result.error = `__ASK_USER_ERROR__:${JSON.stringify(errorInfo)}`;
             } else {
@@ -1979,7 +1982,13 @@ class AgentComponent extends BaseComponent {
         fallbackModel: ctx.context.fallbackModel,
         ...effectiveFallbackModels.length > 0 ? { fallbackModels: effectiveFallbackModels } : fallbackExplicitlySet ? { fallbackModels: [] } : {},
         workdir: ctx.context.metadata?.workdir,
-        metadata: ctx.context.metadata
+        metadata: {
+          ...ctx.context.metadata ?? {},
+          ...ctx._runId ? { runId: ctx._runId } : {},
+          ...ctx.context.sessionId ? { sessionId: ctx.context.sessionId } : {},
+          ...ctx.context.agentType ? { agentType: ctx.context.agentType } : {},
+          ...ctx.agent?.name ? { agentName: ctx.agent.name } : {}
+        }
       };
       const request = {
         name: toolName,

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

@@ -5,7 +5,7 @@ import {
 import {
   AskUserError,
   init_workflow_hil
-} from "./roy-agent-core-e25xkv53.js";
+} from "./roy-agent-core-mkc3zshb.js";
 import {
   globalHookManager,
   init_global_hook_manager
@@ -324,7 +324,8 @@ var init_agent_component_adapter = __esm(() => {
           runId,
           nodeId,
           sessionId: agentSessionId,
-          outputSchema
+          outputSchema,
+          askUserDelivery: "off"
         };
         if (outputSchema) {
           context.pluginEnabled = {
@@ -359,7 +360,7 @@ var init_agent_component_adapter = __esm(() => {
         if (result.error?.startsWith("__ASK_USER_ERROR__:")) {
           const jsonStr = result.error.substring("__ASK_USER_ERROR__:".length);
           const errorInfo = JSON.parse(jsonStr);
-          throw new AskUserError(runId, errorInfo.sessionId, errorInfo.nodeId, errorInfo.nodeType || "agent", errorInfo.query);
+          throw new AskUserError(runId, errorInfo.sessionId, errorInfo.nodeId, errorInfo.nodeType || "agent", errorInfo.query, errorInfo.agentSessionId, undefined, errorInfo.delivered === true);
         }
         const duration = Date.now() - startTime;
         if (agentSessionId) {

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

@@ -323,7 +323,7 @@ class AgentRegistry {
       type: "sub",
       description: "Roy — versatile AI assistant inspired by Jarvis. Built-in general-purpose subagent for coding, research, planning, and complex multi-step tasks. Always available without `agent add roy`.",
       systemPromptRef: "roy",
-      deniedTools: ["delegate_task", "stop_task"]
+      deniedTools: ["delegate_task", "stop_task", "task_complete", "task_cancel"]
     };
     this.agents.set(name, agent);
   }

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

@@ -1,7 +1,7 @@
 import {
   AskUserError,
   init_workflow_hil
-} from "./roy-agent-core-e25xkv53.js";
+} from "./roy-agent-core-mkc3zshb.js";
 import {
   __esm,
   __require

package/dist/shared/@ai-setting/{roy-agent-core-40rv283c.js → roy-agent-core-fghc2m8z.js}

@@ -838,6 +838,126 @@ import { createGoogleGenerativeAI } from "@ai-sdk/google";
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 init_logger();
 
+// src/env/llm/orphan-toolcall.ts
+var ORPHAN_PLACEHOLDER_PREFIX = "[Tool result missing: run interrupted]";
+function toolNameOf(tc) {
+  return tc.function?.name || tc.name || "unknown";
+}
+function extractPendingEvent(msg, events) {
+  const added = [];
+  const removed = [];
+  const toolCalls = msg.toolCalls;
+  if (Array.isArray(toolCalls)) {
+    for (const tc of toolCalls) {
+      if (tc?.id)
+        added.push({ id: tc.id, name: toolNameOf(tc) });
+    }
+  }
+  const content = msg.content;
+  if (Array.isArray(content)) {
+    for (const part of content) {
+      if (!part)
+        continue;
+      if (part.type === "tool-call" && typeof part.toolCallId === "string") {
+        added.push({
+          id: part.toolCallId,
+          name: typeof part.toolName === "string" ? part.toolName : "unknown"
+        });
+      }
+      if (part.type === "tool-result" && typeof part.toolCallId === "string") {
+        removed.push(part.toolCallId);
+      }
+    }
+  }
+  if (msg.role === "tool" && typeof msg.toolCallId === "string") {
+    removed.push(msg.toolCallId);
+  }
+  events.push({ added, removed });
+}
+function collectOrphans(roles, events) {
+  const pending = new Map;
+  const orphans = [];
+  const reported = new Set;
+  for (let index = 0;index < roles.length; index++) {
+    const { added, removed } = events[index];
+    for (const id of removed)
+      pending.delete(id);
+    for (const { id, name } of added) {
+      if (!pending.has(id))
+        pending.set(id, name);
+    }
+    const role = roles[index];
+    if ((role === "user" || role === "system") && pending.size > 0) {
+      for (const [id, name] of pending) {
+        if (!reported.has(id)) {
+          reported.add(id);
+          orphans.push({ toolCallId: id, toolName: name, messageIndex: index });
+        }
+      }
+      pending.clear();
+    }
+  }
+  for (const [id, name] of pending) {
+    if (!reported.has(id)) {
+      reported.add(id);
+      orphans.push({
+        toolCallId: id,
+        toolName: name,
+        messageIndex: roles.length
+      });
+    }
+  }
+  return orphans;
+}
+function repairOrphanSdkMessages(messages, options) {
+  const events = [];
+  const roles = [];
+  for (const msg of messages) {
+    roles.push(msg.role);
+    extractPendingEvent(msg, events);
+  }
+  const orphans = collectOrphans(roles, events);
+  if (orphans.length === 0) {
+    return { messages, orphans: [], repairedCount: 0 };
+  }
+  const reason = options?.reason ?? "context limit or crash";
+  const value = JSON.stringify({ error: `${ORPHAN_PLACEHOLDER_PREFIX} ${reason}` });
+  const byIndex = new Map;
+  for (const orphan of orphans) {
+    const list = byIndex.get(orphan.messageIndex) ?? [];
+    list.push(orphan);
+    byIndex.set(orphan.messageIndex, list);
+  }
+  const result = [];
+  const endGroup = byIndex.get(messages.length);
+  const placeholder = (orphan) => ({
+    role: "tool",
+    content: [
+      {
+        type: "tool-result",
+        toolCallId: orphan.toolCallId,
+        toolName: orphan.toolName,
+        output: { type: "text", value }
+      }
+    ]
+  });
+  messages.forEach((msg, index) => {
+    const group = byIndex.get(index);
+    if (group) {
+      for (const orphan of group) {
+        result.push(placeholder(orphan));
+      }
+    }
+    result.push(msg);
+  });
+  if (endGroup) {
+    for (const orphan of endGroup) {
+      result.push(placeholder(orphan));
+    }
+  }
+  return { messages: result, orphans, repairedCount: orphans.length };
+}
+
 // src/env/llm/llm-cache.ts
 function isOpenAICompatibleProvider(providerName) {
   return providerName === "openai-compatible" || providerName === "openai" || providerName.startsWith("minimax") || providerName === "deepseek" || providerName.startsWith("deepseek") || providerName === "glm" || providerName.startsWith("glm");
@@ -1207,6 +1327,24 @@ function convertToSDKMessages(messages, options) {
       };
     }
     if (msg.role === "tool") {
+      if (!msg.toolCallId && Array.isArray(msg.content)) {
+        const part = msg.content.find((p) => p?.type === "tool-result" && typeof p.toolCallId === "string");
+        if (part) {
+          const convertedPart = {
+            role: "tool",
+            content: [{
+              type: "tool-result",
+              toolCallId: part.toolCallId,
+              toolName: part.toolName || "unknown",
+              output: {
+                type: "text",
+                value: typeof part.output === "string" ? part.output : JSON.stringify(part.output ?? "")
+              }
+            }]
+          };
+          return convertedPart;
+        }
+      }
       if (!msg.toolCallId) {
         logger3.warn("Tool message missing toolCallId", { msg });
       }
@@ -1410,6 +1548,12 @@ async function invoke(config, options, ctx) {
       sessionId: options.context?.sessionId,
       provider: providerId
     });
+    const orphanRepair = repairOrphanSdkMessages(messages, {
+      reason: "repaired before AI SDK fallback (Task #4992 defence 2)"
+    });
+    if (orphanRepair.repairedCount > 0) {
+      logger3.warn(`[invoke] Repaired ${orphanRepair.repairedCount} orphan tool-call(s) before AI SDK fallback: ` + orphanRepair.orphans.map((o) => o.toolCallId).join(", "));
+    }
     const toolCallIds = new Set;
     const assistantToolCalls = [];
     const toolResultIds = [];
@@ -1457,7 +1601,7 @@ async function invoke(config, options, ctx) {
     }
     const streamTextOptions = {
       model: provider.languageModel(modelId),
-      messages,
+      messages: orphanRepair.messages,
       tools,
       temperature: providerOptions.temperature,
       maxTokens: providerOptions.maxTokens,
@@ -1704,6 +1848,12 @@ async function invokeNonStream(config, options, ctx) {
     sessionId: options.context?.sessionId,
     provider: providerId
   });
+  const orphanRepair = repairOrphanSdkMessages(messages, {
+    reason: "repaired before AI SDK generateText (Task #4992 defence 2)"
+  });
+  if (orphanRepair.repairedCount > 0) {
+    logger3.warn(`[invokeNonStream] Repaired ${orphanRepair.repairedCount} orphan tool-call(s): ` + orphanRepair.orphans.map((o) => o.toolCallId).join(", "));
+  }
   const tools = options.tools && options.tools.length > 0 ? convertToolsToSDK(options.tools, providerId) : undefined;
   const providerOptions = generateProviderOptions(providerId, {
     temperature: options.temperature,
@@ -1713,7 +1863,7 @@ async function invokeNonStream(config, options, ctx) {
   const genTextFn = generateText;
   const result = await genTextFn({
     model: provider.languageModel(modelId),
-    messages,
+    messages: orphanRepair.messages,
     tools,
     temperature: providerOptions.temperature,
     maxTokens: providerOptions.maxTokens,

package/dist/shared/@ai-setting/{roy-agent-core-7sj9xs9c.js → roy-agent-core-hnyk1by7.js}

@@ -7,7 +7,7 @@ import {
   TASK_COMPLETE_VERIFY_DUTY,
   TASK_COMPLETION_HINT_ANCHOR,
   TASK_DISCIPLINE_GOALS
-} from "./roy-agent-core-4jjwewvw.js";
+} from "./roy-agent-core-11shp00p.js";
 import {
   getEnvContextOrEmpty,
   init_env_context,
@@ -103,6 +103,9 @@ var DeleteTaskToolSchema = z.object({
 var CompleteTaskToolSchema = withLegacyTaskId({
   deliverable_storage_path: z.string().optional().describe("交付物的寻址地址（路径 / URL / 分支名等）。" + "调用本工具前，请先读取任务的 goal（description）和 delivery（goals_and_expected_deliverables）栏位，" + "建议验证目标和交付物是否符合预期，然后将实际交付物的寻址地址填入此参数。")
 });
+var CancelTaskToolSchema = withLegacyTaskId({
+  reason: z.string().optional().describe("取消原因（可选）。会写入该任务的 operation 记录，便于事后追溯验收结论。")
+});
 var BatchArchiveToolSchema = z.object({
   task_ids: z.array(z.number()).describe("要归档的任务 ID 列表"),
   reason: z.string().optional().describe("归档原因（可选，会写入每个任务的 operation 记录）")
@@ -828,6 +831,22 @@ function updateTaskTool(taskComponent) {
             };
           }
         }
+        const callerAgentType = ctx.metadata?.agentType ?? undefined;
+        const callerAgentName = ctx.metadata?.agentName ?? undefined;
+        if (params.status === "completed" && callerAgentType === "sub") {
+          const agentComponent = taskComponent.env?.getComponent?.("agent");
+          const callerAgent = callerAgentName && agentComponent?.getAgent ? agentComponent.getAgent(callerAgentName) : undefined;
+          const cfg = callerAgent?.config;
+          const hasCompletePermission = cfg ? Array.isArray(cfg.allowedTools) && cfg.allowedTools.includes("task_complete") || !Array.isArray(cfg.allowedTools) && !(Array.isArray(cfg.deniedTools) && cfg.deniedTools.includes("task_complete")) : false;
+          if (!hasCompletePermission) {
+            return {
+              success: false,
+              output: "",
+              error: `Cannot set status="completed" without acceptance permission (Task #5007 — 验收权分离). ` + `执行方只能推进进度：用 task_update(progress=100) 表示"我这边干完了"，` + `再 task_operation_create 记录结论，然后结束返回；` + `任务终态必须由验收方（default agent / 主智能体）调用 task_complete 落定。`,
+              metadata: { execution_time_ms: 0 }
+            };
+          }
+        }
         const task = await taskComponent.updateTask(params.task_id, {
           title: params.title,
           description: params.description,
@@ -1020,6 +1039,95 @@ Deliverable: (no path provided)`,
     }
   };
 }
+// src/env/task/tools/cancel-tool.ts
+init_logger();
+var logger5 = createLogger("tool:cancel-task");
+var NON_CANCELLABLE_STATUSES = new Set(["completed", "cancelled", "archived"]);
+var TASK_CANCEL_DESCRIPTION = `
+Cancel a task (task.status = "cancelled"). This is the **acceptance-side** cancel:
+use it when the work is abandoned, the user asked to stop, or acceptance failed.
+
+**When to use**:
+- The user asks to cancel / stop / drop the task
+- Acceptance failed and re-delegation is not worth it
+- The sub-agent timed out or went off-track and the task is no longer relevant
+
+**What it does NOT do**:
+- It does **NOT** stop a running background process — that is \`stop_task\`
+  (which takes a bg-process id from \`delegate_task\`). If the sub-agent is still
+  running, call \`stop_task\` **first**, then \`task_cancel\` to close the record.
+
+**Side effects**:
+- Sets \`status = "cancelled"\` and fires the task terminal-state hooks
+  (notifications / card state machine converge to the cancelled state).
+- Writes an operation record so the cancellation reason stays auditable.
+- A cancelled task can be reopened later with \`task_update(status="active")\`.
+
+**Parameters**:
+- \`task_id\` (required): the task to cancel
+- \`reason\` (optional): why it is being cancelled — recorded in the operation trail
+`.trim();
+function cancelTaskTool(taskComponent) {
+  return {
+    name: "task_cancel",
+    description: TASK_CANCEL_DESCRIPTION,
+    parameters: CancelTaskToolSchema,
+    execute: async (args, ctx) => {
+      const params = CancelTaskToolSchema.parse(args);
+      const sessionId = ctx.session_id || "unknown";
+      try {
+        const current = await taskComponent.getTask(params.task_id);
+        if (!current) {
+          return {
+            success: false,
+            output: "",
+            error: `Task not found: ${params.task_id}`,
+            metadata: { execution_time_ms: 0 }
+          };
+        }
+        if (NON_CANCELLABLE_STATUSES.has(current.status)) {
+          return {
+            success: false,
+            output: "",
+            error: `Cannot cancel task #${params.task_id}: it is already in terminal status "${current.status}".`,
+            metadata: { execution_time_ms: 0, task_id: params.task_id }
+          };
+        }
+        const task = await taskComponent.updateTask(params.task_id, {
+          status: "cancelled"
+        });
+        if (!task) {
+          return {
+            success: false,
+            output: "",
+            error: `Task not found: ${params.task_id}`,
+            metadata: { execution_time_ms: 0 }
+          };
+        }
+        await taskComponent.createOperation({
+          taskId: params.task_id,
+          sessionId,
+          milestoneType: "decision",
+          milestoneTitle: `Task cancelled: #${params.task_id}`,
+          milestoneDescription: params.reason ? `Cancelled by acceptance side. Reason: ${params.reason}` : "Cancelled by acceptance side (no reason given)."
+        });
+        logger5.info(`[cancelTask] Task #${params.task_id} cancelled (previous status: ${current.status})`);
+        return {
+          success: true,
+          output: `Task cancelled: #${params.task_id} - ${task.title}`,
+          metadata: { execution_time_ms: 0, task }
+        };
+      } catch (error) {
+        return {
+          success: false,
+          output: "",
+          error: error instanceof Error ? error.message : String(error),
+          metadata: { execution_time_ms: 0 }
+        };
+      }
+    }
+  };
+}
 // src/env/task/tools/task-tree-tool.ts
 function compareTasksDesc(a, b) {
   if (a.updatedAt < b.updatedAt)
@@ -1158,4 +1266,4 @@ function treeTasksTool(taskComponent) {
     }
   };
 }
-export { createTaskTool, getTaskTool, listTasksTool, searchTasksTool, batchArchiveTaskTool, batchDeleteTaskTool, updateTaskTool, deleteTaskTool, completeTaskTool, treeTasksTool };
+export { createTaskTool, getTaskTool, listTasksTool, searchTasksTool, batchArchiveTaskTool, batchDeleteTaskTool, updateTaskTool, deleteTaskTool, completeTaskTool, cancelTaskTool, treeTasksTool };

package/dist/shared/@ai-setting/{roy-agent-core-7qvw65jt.js → roy-agent-core-jg65qnwa.js}

@@ -7,13 +7,13 @@ import {
 } from "./roy-agent-core-na18zwj0.js";
 import {
   builtInPrompts
-} from "./roy-agent-core-yhwxpj12.js";
+} from "./roy-agent-core-3e6gg17d.js";
 import {
   TaskHookPoints
 } from "./roy-agent-core-1pg0fepg.js";
 import {
   DEFAULT_SUBAGENT_PROMPT
-} from "./roy-agent-core-vm8h5zyj.js";
+} from "./roy-agent-core-ed233k5z.js";
 import {
   runWithBgTaskIdAsync
 } from "./roy-agent-core-c1v263jn.js";
@@ -819,7 +819,7 @@ var builtInSubAgents = [
     mode: "subagent",
     description: "Versatile AI assistant inspired by Jarvis — intelligent, proactive, and capable. Use for general-purpose tasks, coding, research, and complex multi-step work. Always available (built-in) without `agent add roy`.",
     promptOverride: builtInPrompts["roy"],
-    deniedTools: ["delegate_task", "stop_task"]
+    deniedTools: ["delegate_task", "stop_task", "task_complete", "task_cancel"]
   }
 ];
 function getSubAgentSpec(id) {
@@ -1089,6 +1089,7 @@ class BackgroundTaskManager {
         nodeId: e.nodeId,
         nodeType: e.nodeType || "agent",
         agentSessionId: e.agentSessionId,
+        delivered: e.delivered === true,
         rawErrorMessage
       };
     }
@@ -1103,6 +1104,7 @@ class BackgroundTaskManager {
           nodeId: parsed.nodeId,
           nodeType: parsed.nodeType || "agent",
           agentSessionId: parsed.agentSessionId,
+          delivered: parsed.delivered === true,
           rawErrorMessage
         };
       } catch (parseErr) {
@@ -1267,9 +1269,9 @@ class BackgroundTaskManager {
       task.lastUpdatedAt = completedAt;
       task.result = result;
       const executionTimeMs = task.completedAt - task.startedAt;
-      task.associatedTaskId = getCurrentTaskId();
+      task.associatedTaskId = await this.resolveAssociatedTaskIdBySubSession(task.subSessionId);
       if (task.associatedTaskId === undefined) {
-        task.associatedTaskId = await this.resolveAssociatedTaskIdBySubSession(task.subSessionId);
+        task.associatedTaskId = getCurrentTaskId();
       }
       const completedPayload = {
         backgroundTaskId: task.id,
@@ -1294,9 +1296,9 @@ class BackgroundTaskManager {
       const completedAt = Date.now();
       task.completedAt = completedAt;
       task.lastUpdatedAt = completedAt;
-      task.associatedTaskId = getCurrentTaskId();
+      task.associatedTaskId = await this.resolveAssociatedTaskIdBySubSession(task.subSessionId);
       if (task.associatedTaskId === undefined) {
-        task.associatedTaskId = await this.resolveAssociatedTaskIdBySubSession(task.subSessionId);
+        task.associatedTaskId = getCurrentTaskId();
       }
       if (askUserInfo) {
         task.status = "awaiting-user";
@@ -1313,6 +1315,7 @@ class BackgroundTaskManager {
           nodeId: askUserInfo.nodeId,
           nodeType: askUserInfo.nodeType,
           agentSessionId: askUserInfo.agentSessionId,
+          delivered: askUserInfo.delivered === true,
           error: askUserInfo.rawErrorMessage,
           executionTimeMs,
           hints: [
@@ -1399,7 +1402,7 @@ class BackgroundTaskManager {
         return;
       }
       const currentTaskId = getCurrentTaskId();
-      if (currentTaskId !== undefined) {
+      if (currentTaskId !== undefined && task.associatedTaskId === undefined) {
         task.associatedTaskId = currentTaskId;
       }
       task.lastUpdatedAt = Date.now();

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

@@ -35,9 +35,10 @@ var init_workflow_hil = __esm(() => {
     query;
     agentSessionId;
     timestamp;
+    delivered;
     type = "ask-user";
     name = "AskUserError";
-    constructor(runId, sessionId, nodeId, nodeType, query, agentSessionId, timestamp = Date.now()) {
+    constructor(runId, sessionId, nodeId, nodeType, query, agentSessionId, timestamp = Date.now(), delivered = false) {
       super(`[${nodeType}:${nodeId}] Ask user: ${query}`);
       this.runId = runId;
       this.sessionId = sessionId;
@@ -46,6 +47,7 @@ var init_workflow_hil = __esm(() => {
       this.query = query;
       this.agentSessionId = agentSessionId;
       this.timestamp = timestamp;
+      this.delivered = delivered;
     }
     toEvent() {
       return {