@cuylabs/agent-core 5.4.0 → 5.6.0

package/dist/agent/chat-loop/loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../../src/agent/chat-loop/loop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAiBxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAQ/C;;;GAGG;AACH,wBAAuB,WAAW,CAChC,IAAI,EAAE,YAAY,GACjB,cAAc,CAAC,UAAU,CAAC,CA6V5B"}
+{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../../src/agent/chat-loop/loop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAkBxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAQ/C;;;GAGG;AACH,wBAAuB,WAAW,CAChC,IAAI,EAAE,YAAY,GACjB,cAAc,CAAC,UAAU,CAAC,CA+Y5B"}

package/dist/agent/chat-loop/model-step-runner.d.ts

@@ -2,6 +2,7 @@ import type { ModelContextCompactionReport } from "../../context/assembly/index.
 import type { AgentTurnEngine } from "../../execution/turn/index.js";
 import { type AgentTurnCommitApplier } from "../../execution/turn/index.js";
 import type { StepProcessingOutput } from "../../execution/turn/index.js";
+import type { AgentTurnLiveEventQueue } from "../../execution/turn/index.js";
 import type { AgentEvent } from "../../types/events.js";
 import { type ResolvedContextRecoveryConfig } from "./context-recovery.js";
 import { type ChatModelStepToolRecord } from "./model-step-snapshot.js";
@@ -22,5 +23,6 @@ export declare function runChatModelStepWithRecovery(options: {
     toolRecord: ChatModelStepToolRecord;
     contextRecovery: ResolvedContextRecoveryConfig;
     compactionReport?: ModelContextCompactionReport;
+    liveEvents?: AgentTurnLiveEventQueue;
 }): AsyncGenerator<AgentEvent, ChatModelStepRunResult>;
 //# sourceMappingURL=model-step-runner.d.ts.map

package/dist/agent/chat-loop/model-step-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-step-runner.d.ts","sourceRoot":"","sources":["../../../src/agent/chat-loop/model-step-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAEL,KAAK,6BAA6B,EAEnC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,oBAAoB,CAAC;IACjC,UAAU,EAAE,uBAAuB,CAAC;IACpC,gBAAgB,CAAC,EAAE,4BAA4B,CAAC;CACjD;AAED,wBAAuB,4BAA4B,CAAC,OAAO,EAAE;IAC3D,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,eAAe,CAAC;IAC5B,gBAAgB,EAAE,sBAAsB,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IACvC,UAAU,EAAE,uBAAuB,CAAC;IACpC,eAAe,EAAE,6BAA6B,CAAC;IAC/C,gBAAgB,CAAC,EAAE,4BAA4B,CAAC;CACjD,GAAG,cAAc,CAAC,UAAU,EAAE,sBAAsB,CAAC,CAmIrD"}
+{"version":3,"file":"model-step-runner.d.ts","sourceRoot":"","sources":["../../../src/agent/chat-loop/model-step-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAEL,KAAK,6BAA6B,EAEnC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,oBAAoB,CAAC;IACjC,UAAU,EAAE,uBAAuB,CAAC;IACpC,gBAAgB,CAAC,EAAE,4BAA4B,CAAC;CACjD;AAED,wBAAuB,4BAA4B,CAAC,OAAO,EAAE;IAC3D,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,eAAe,CAAC;IAC5B,gBAAgB,EAAE,sBAAsB,CAAC;IACzC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IACvC,UAAU,EAAE,uBAAuB,CAAC;IACpC,eAAe,EAAE,6BAA6B,CAAC;IAC/C,gBAAgB,CAAC,EAAE,4BAA4B,CAAC;IAChD,UAAU,CAAC,EAAE,uBAAuB,CAAC;CACtC,GAAG,cAAc,CAAC,UAAU,EAAE,sBAAsB,CAAC,CAoIrD"}

package/dist/{chunk-JZRLCTSD.js → chunk-2BRLPF3Z.js}

@@ -2,6 +2,68 @@ import {
   sleep
 } from "./chunk-SZ2XBPTW.js";
 
+// src/dispatch/event-store.ts
+function cloneEventRecord(record) {
+  try {
+    return structuredClone(record);
+  } catch {
+    return { ...record };
+  }
+}
+function matchesFilter(record, filter) {
+  if (!filter) {
+    return true;
+  }
+  if (filter.dispatchId && record.dispatchId !== filter.dispatchId) {
+    return false;
+  }
+  if (filter.parentSessionId && record.parentSessionId !== filter.parentSessionId) {
+    return false;
+  }
+  if (filter.parentTurnId && record.parentTurnId !== filter.parentTurnId) {
+    return false;
+  }
+  if (filter.parentDispatchId && record.parentDispatchId !== filter.parentDispatchId) {
+    return false;
+  }
+  if (filter.agentPath && record.agentPath !== filter.agentPath) {
+    return false;
+  }
+  if (filter.childSessionId && record.childSessionId !== filter.childSessionId) {
+    return false;
+  }
+  if (filter.targetType && record.targetType !== filter.targetType) {
+    return false;
+  }
+  if (filter.afterSequence !== void 0 && record.sequence <= filter.afterSequence) {
+    return false;
+  }
+  if (filter.type) {
+    const types = Array.isArray(filter.type) ? filter.type : [filter.type];
+    if (!types.includes(record.event.type)) {
+      return false;
+    }
+  }
+  return true;
+}
+var InMemoryDispatchEventStore = class {
+  events = [];
+  sequence = 0;
+  async append(event) {
+    const record = {
+      ...event,
+      id: `${event.dispatchId}:event:${this.sequence + 1}`,
+      sequence: this.sequence + 1
+    };
+    this.sequence = record.sequence;
+    this.events.push(cloneEventRecord(record));
+    return cloneEventRecord(record);
+  }
+  async list(filter) {
+    return this.events.filter((event) => matchesFilter(event, filter)).map((event) => cloneEventRecord(event));
+  }
+};
+
 // src/dispatch/executor.ts
 function ensureNonEmpty(input, label) {
   const trimmed = input.trim();
@@ -32,6 +94,7 @@ function defaultTaskRecord(input, targetName, startedAt, dispatchId, startResult
     createdAt: startedAt,
     updatedAt: startedAt,
     parentSessionId: input.parentSessionId,
+    parentTurnId: input.parentTurnId,
     sessionId: startResult.sessionId ?? input.runtime.member.sessionId,
     executionId: startResult.executionId ?? input.task.runId ?? dispatchId,
     redirectCount: 0
@@ -102,7 +165,12 @@ function createRuntimeDispatchTargets(options) {
         targetType: target.name,
         brief: input.brief,
         title: input.title,
-        parentSessionId: input.parentSessionId
+        parentSessionId: input.parentSessionId,
+        parentTurnId: input.parentTurnId,
+        parentDispatchId: input.parentDispatchId,
+        depth: input.depth,
+        agentPath: input.agentPath,
+        abort: input.abort
       });
       return {
         sessionId: record.sessionId,
@@ -148,7 +216,9 @@ function createDispatchTaskExecutor(options) {
       brief: input.prompt,
       title: input.task.title,
       parentSessionId: input.parentSessionId,
-      sessionId: input.runtime.member.sessionId
+      parentTurnId: input.parentTurnId,
+      sessionId: input.runtime.member.sessionId,
+      abort: input.abort
     });
     let record = options.createRecord?.({
       taskInput: input,
@@ -277,6 +347,7 @@ function createDispatchExternalTaskControl(options) {
 }
 
 export {
+  InMemoryDispatchEventStore,
   ensureNonEmpty,
   mergeInspection,
   createRuntimeDispatchTargets,

package/dist/{chunk-VT5FSYA2.js → chunk-NICU5N2S.js}

@@ -242,6 +242,51 @@ function createAgentTurnEngine(options) {
   return new AgentTurnEngine(options);
 }
 
+// src/execution/turn/runner/live-events.ts
+function createAgentTurnLiveEventQueue() {
+  const events = [];
+  let waiters = [];
+  let closed = false;
+  function wakeWaiters() {
+    const current = waiters;
+    waiters = [];
+    for (const resolve of current) {
+      resolve();
+    }
+  }
+  return {
+    emit(event) {
+      if (closed) {
+        return;
+      }
+      events.push(event);
+      wakeWaiters();
+    },
+    drain() {
+      return events.splice(0, events.length);
+    },
+    size() {
+      return events.length;
+    },
+    wait() {
+      if (closed || events.length > 0) {
+        return Promise.resolve();
+      }
+      return new Promise((resolve) => {
+        waiters.push(resolve);
+      });
+    },
+    wake() {
+      wakeWaiters();
+    },
+    close() {
+      closed = true;
+      events.length = 0;
+      wakeWaiters();
+    }
+  };
+}
+
 // src/execution/turn/runner/prepare.ts
 function prepareModelStep(options) {
   const modelMessages = Array.from(options.toModelMessages(options.messages));
@@ -622,6 +667,40 @@ async function* runModelStep(options) {
           resolveNext = null;
         }
       };
+      const emitToolEvent = async (event) => {
+        if (options.liveEvents) {
+          options.liveEvents.emit(event);
+          return;
+        }
+        await emitQueuedEvent(event);
+      };
+      async function* drainLiveEvents() {
+        if (!options.liveEvents) {
+          return;
+        }
+        for (const event of options.liveEvents.drain()) {
+          middleware?.emitEvent(event);
+          turnEngine.recordEvent(event, (/* @__PURE__ */ new Date()).toISOString());
+          yield event;
+        }
+      }
+      async function waitForQueuedOrLiveEvent() {
+        let streamResolved = false;
+        const streamWait = new Promise((resolve) => {
+          resolveNext = () => {
+            streamResolved = true;
+            resolve();
+          };
+        });
+        if (!options.liveEvents) {
+          await streamWait;
+          return;
+        }
+        await Promise.race([streamWait, options.liveEvents.wait()]);
+        if (!streamResolved) {
+          resolveNext = null;
+        }
+      }
       if (intervention) {
         intervention.onApplied = (item) => {
           eventQueue.push({
@@ -648,7 +727,7 @@ async function* runModelStep(options) {
       }
       const stream = await Inference.streamStep({
         ...preparedStep.inferenceInput,
-        onEvent: emitQueuedEvent
+        onEvent: emitToolEvent
       });
       const processPromise = processStepStream(stream, {
         sessionID: preparedStep.inferenceInput.sessionID,
@@ -681,7 +760,7 @@ async function* runModelStep(options) {
         }
         return null;
       });
-      while (!streamDone || eventQueue.length > 0) {
+      while (!streamDone || eventQueue.length > 0 || (options.liveEvents?.size() ?? 0) > 0) {
         while (eventQueue.length > 0) {
           const event = eventQueue.shift();
           turnEngine.recordEvent(event, (/* @__PURE__ */ new Date()).toISOString());
@@ -695,10 +774,9 @@ async function* runModelStep(options) {
             );
           }
         }
-        if (!streamDone) {
-          await new Promise((resolve) => {
-            resolveNext = resolve;
-          });
+        yield* drainLiveEvents();
+        if (!streamDone && eventQueue.length === 0) {
+          await waitForQueuedOrLiveEvent();
         }
       }
       if (streamError) {
@@ -729,6 +807,13 @@ async function* runModelStep(options) {
 }
 
 // src/execution/turn/runner/tool-batch.ts
+async function emitBatchEvent(event, accumulators) {
+  if (accumulators.onEvent) {
+    await accumulators.onEvent(event);
+    return;
+  }
+  accumulators.events.push(event);
+}
 function cloneToolResultRecord(options) {
   return new Map(
     options.snapshot.toolResults.map((toolResult) => [
@@ -737,8 +822,8 @@ function cloneToolResultRecord(options) {
     ])
   );
 }
-function recordToolResult(toolCall, event, result, accumulators, metadata) {
-  accumulators.events.push(event);
+async function recordToolResult(toolCall, event, result, accumulators, metadata) {
+  await emitBatchEvent(event, accumulators);
   accumulators.toolResultsByCallId.set(toolCall.toolCallId, {
     toolCallId: toolCall.toolCallId,
     toolName: toolCall.toolName,
@@ -772,7 +857,7 @@ async function executeBatchEntry(toolCall, options, accumulators, preInitialized
   const tool = options.tools[toolCall.toolName];
   if (!tool) {
     const errorMessage = `Tool '${toolCall.toolName}' is not registered`;
-    recordToolResult(
+    await recordToolResult(
       toolCall,
       {
         type: "tool-error",
@@ -801,11 +886,11 @@ async function executeBatchEntry(toolCall, options, accumulators, preInitialized
       ...options.turnTracker ? { turnTracker: options.turnTracker } : {},
       ...options.middleware ? { middleware: options.middleware } : {},
       onEvent: async (event) => {
-        accumulators.events.push(event);
+        await emitBatchEvent(event, accumulators);
       },
       ...preInitialized ? { initialized: preInitialized } : {}
     });
-    recordToolResult(
+    await recordToolResult(
       toolCall,
       {
         type: "tool-result",
@@ -820,7 +905,7 @@ async function executeBatchEntry(toolCall, options, accumulators, preInitialized
     );
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    recordToolResult(
+    await recordToolResult(
       toolCall,
       {
         type: "tool-error",
@@ -839,7 +924,12 @@ async function runToolBatch(options) {
   const turnState = {
     value: options.turnState ? structuredClone(options.turnState) : void 0
   };
-  const accumulators = { events, toolResultsByCallId, turnState };
+  const accumulators = {
+    events,
+    toolResultsByCallId,
+    turnState,
+    ...options.onEvent ? { onEvent: options.onEvent } : {}
+  };
   const pending = options.snapshot.toolCalls.filter(
     (tc) => !toolResultsByCallId.has(tc.toolCallId)
   );
@@ -876,7 +966,7 @@ async function runToolBatch(options) {
     if (options.intervention?.hasPending && initialized) {
       const interruptPolicy = initialized.capabilities?.onInterrupt ?? "finish";
       if (interruptPolicy === "cancel") {
-        recordToolResult(
+        await recordToolResult(
           toolCall,
           {
             type: "tool-error",
@@ -949,6 +1039,7 @@ export {
   createAgentTurnStepCommitBatch,
   AgentTurnEngine,
   createAgentTurnEngine,
+  createAgentTurnLiveEventQueue,
   prepareModelStep,
   DoomLoopError,
   ContextOverflowError,

package/dist/{chunk-35A3XLI4.js → chunk-SJCAIWLZ.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-TPZ37IWI.js";
 import {
   createLocalDispatchRuntime
-} from "./chunk-MO7V4H4A.js";
+} from "./chunk-ZETYNQ35.js";
 import {
   Tool
 } from "./chunk-MJML3A2F.js";
@@ -96,7 +96,9 @@ function formatWaitTimeoutResult(timeoutMs, runningIds) {
     title: "Wait timed out",
     output: `Timed out waiting after ${timeoutMs}ms.
 
-` + (runningIds.length > 0 ? `Still running: ${runningIds.join(", ")}` : "No requested subagents are still running."),
+` + (runningIds.length > 0 ? `Still running: ${runningIds.join(", ")}
+
+Use wait_agent again to keep waiting, close_agent if the result is no longer needed, or continue with any completed results you already have.` : "No requested subagents are still running. Check their status again or continue with any completed results you already have."),
     metadata: { timeoutMs, runningIds }
   };
 }
@@ -142,6 +144,8 @@ var SUBAGENT_TOOL_IDS = [
   "wait_agent",
   "close_agent"
 ];
+var DEFAULT_WAIT_AGENT_TIMEOUT_MS = 6e4;
+var MAX_WAIT_AGENT_TIMEOUT_MS = 6e5;
 function getRoleNames(roles) {
   return roles.map((role) => role.name);
 }
@@ -179,6 +183,15 @@ function toCompletedResult(record) {
     toolCalls: record.result.toolCalls
   };
 }
+function normalizeWaitAgentTimeoutMs(timeoutMs) {
+  if (timeoutMs === void 0) {
+    return DEFAULT_WAIT_AGENT_TIMEOUT_MS;
+  }
+  if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) {
+    return DEFAULT_WAIT_AGENT_TIMEOUT_MS;
+  }
+  return Math.min(Math.floor(timeoutMs), MAX_WAIT_AGENT_TIMEOUT_MS);
+}
 async function waitForTerminalDispatch(runtime, id) {
   for (; ; ) {
     const record = await runtime.check(id, { waitMs: 1e3 });
@@ -234,7 +247,9 @@ function createInvokeAgentTool(runtime, roles, options) {
           brief: params.task,
           title: params.title ?? `${titlePrefix}: ${role.name}`,
           parentSessionId: ctx.sessionID,
-          abort: ctx.abort
+          parentTurnId: ctx.turnID,
+          abort: ctx.abort,
+          emitEvent: ctx.emitEvent
         });
       } catch (error) {
         return formatSpawnBlockedResult(
@@ -274,7 +289,7 @@ function createWaitAgentTool(runtime) {
       timeout_ms: z.number().optional().describe("Timeout in milliseconds (default: 60000, max: 600000)")
     }),
     execute: async (params) => {
-      const timeoutMs = Math.min(params.timeout_ms ?? 6e4, 6e5);
+      const timeoutMs = normalizeWaitAgentTimeoutMs(params.timeout_ms);
       const existing = await Promise.all(
         params.ids.map(async (id) => [id, await runtime.check(id)])
       );
@@ -318,6 +333,7 @@ function createCloseAgentTool(runtime) {
         return formatCloseMissingAgentResult(params.id);
       }
       if (record.status !== "running") {
+        await runtime.cancel(params.id, "Parent subagent closed");
         return formatCloseAlreadyResolvedResult(params.id, record.status);
       }
       const cancelled = await runtime.cancel(params.id);
@@ -661,6 +677,9 @@ function toSubAgentRole(parsed, resolvers = {}) {
   };
   if (systemPrompt) role.systemPrompt = systemPrompt;
   if (maxSteps !== void 0 && !isNaN(maxSteps)) role.maxSteps = maxSteps;
+  if (reasoning !== void 0 && VALID_REASONING_LEVELS.has(reasoning)) {
+    role.reasoningLevel = reasoning;
+  }
   if (allowFurtherDispatch !== void 0) {
     role.allowFurtherDispatch = allowFurtherDispatch;
   }