@caupulican/pi-agent-core 0.93.18 → 0.94.0

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

@@ -1 +1 @@
-{"version":3,"file":"agent-loop.d.ts","sourceRoot":"","sources":["../src/agent-loop.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAgC7D,OAAO,EAAE,uBAAuB,EAAsC,MAAM,iCAAiC,CAAC;AAE9G,OAAO,KAAK,EACX,YAAY,EACZ,UAAU,EACV,eAAe,EACf,YAAY,EAEZ,aAAa,EAGb,QAAQ,EACR,kBAAkB,EAClB,MAAM,YAAY,CAAC;AAIpB,OAAO,EACN,0BAA0B,EAC1B,sBAAsB,EACtB,gCAAgC,GAChC,MAAM,+BAA+B,CAAC;AAEvC,MAAM,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAKzE,gGAAgG;AAChG,MAAM,WAAW,0BAA0B;IAC1C,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,uBAAuB,EAAE,uBAAuB,CAAC;CACjD;AAED,wBAAgB,gCAAgC,IAAI,0BAA0B,CAE7E;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACxB,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,GACjB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CAEzC;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,GACjB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CAIzC;AAuBD,wBAAsB,YAAY,CACjC,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,EACnB,iBAAiB,GAAE,0BAA+D,GAChF,OAAO,CAAC,YAAY,EAAE,CAAC,CAwBzB;AAED,wBAAsB,oBAAoB,CACzC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,EACnB,iBAAiB,GAAE,0BAA+D,GAChF,OAAO,CAAC,YAAY,EAAE,CAAC,CAezB;AAmWD;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAC9C,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAExC;AA6iCD,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,kBAAkB,GAAG,SAAS,CAO7F"}
+{"version":3,"file":"agent-loop.d.ts","sourceRoot":"","sources":["../src/agent-loop.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAmC7D,OAAO,EAAE,uBAAuB,EAAsC,MAAM,iCAAiC,CAAC;AAE9G,OAAO,KAAK,EACX,YAAY,EACZ,UAAU,EACV,eAAe,EACf,YAAY,EAGZ,aAAa,EAGb,QAAQ,EACR,kBAAkB,EAElB,MAAM,YAAY,CAAC;AAIpB,OAAO,EACN,0BAA0B,EAC1B,sBAAsB,EACtB,gCAAgC,GAChC,MAAM,+BAA+B,CAAC;AAEvC,MAAM,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAKzE,gGAAgG;AAChG,MAAM,WAAW,0BAA0B;IAC1C,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,uBAAuB,EAAE,uBAAuB,CAAC;CACjD;AAED,wBAAgB,gCAAgC,IAAI,0BAA0B,CAE7E;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACxB,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,GACjB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CAEzC;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,GACjB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CAIzC;AAuBD,wBAAsB,YAAY,CACjC,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,EACnB,iBAAiB,GAAE,0BAA+D,GAChF,OAAO,CAAC,YAAY,EAAE,CAAC,CAwBzB;AAED,wBAAsB,oBAAoB,CACzC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,EACnB,iBAAiB,GAAE,0BAA+D,GAChF,OAAO,CAAC,YAAY,EAAE,CAAC,CAezB;AAsWD;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAC9C,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAExC;AA6lCD,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,kBAAkB,GAAG,SAAS,CAO7F"}

package/dist/agent-loop.js

@@ -6,7 +6,7 @@ import { EventStream } from "@caupulican/pi-ai/event-stream";
 import { formatToolRepairStandingRule, REPEATED_SUCCESSFUL_TOOL_CALL_FAILURE, } from "@caupulican/pi-ai/tool-repair-registry";
 import { ToolArgumentValidationError, validateToolArguments, } from "@caupulican/pi-ai/validation";
 import { assistantMessageText, collapseDegenerateAssistantMessage, shouldAbortDegenerateStream, } from "./degenerate-assistant-text.js";
-import { startPlannedAgentProviderRequest } from "./provider-request-planner.js";
+import { startPlannedAgentProviderRequest, startPlannedAgentProviderRequestWithId, } from "./provider-request-planner.js";
 import { assessToolFailure, clearToolFailure, createRepeatedToolFailureResult, createToolFailureMemoryTracker, createToolFailureResult, describeOperationOutcome, getUnresolvedToolFailure, normalizeToolSignature, rememberToolFailure, toolFailureCorrection, } from "./tool-failure-memory.js";
 import { ToolFailureRecoveryGate } from "./tool-failure-recovery-gate.js";
 import { rejectNativeToolProtocolResidue, rejectToolCallsFromToolFreeResponse } from "./tool-protocol-residue.js";
@@ -239,7 +239,8 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
             // Process pending messages (inject before next assistant response).
             await processPendingMessages();
             continuationState.providerTurns++;
-            const message = await streamAssistantResponse(currentContext, config, signal, emit, streamFn);
+            const response = await streamAssistantResponse(currentContext, config, signal, emit, streamFn);
+            const message = response.message;
             newMessages.push(message);
             if (message.stopReason === "error" || message.stopReason === "aborted") {
                 await emit({ type: "turn_end", message, toolResults: [] });
@@ -257,7 +258,7 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
                     repeatsSuccessfulTextProtocolBatch(incomingBatchSignature, toolCalls, lastSuccessfulTextProtocolBatch)
                     ? lastSuccessfulTextProtocolBatch?.messages
                     : undefined;
-                const executedToolBatch = await executeToolCalls(currentContext, message, config, validationFailureTracker, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, previousSuccessfulTextProtocolResults, signal, emit);
+                const executedToolBatch = await executeToolCalls(currentContext, message, response.requestId, config, validationFailureTracker, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, previousSuccessfulTextProtocolResults, signal, emit);
                 toolResults.push(...executedToolBatch.messages);
                 hasMoreToolCalls = !executedToolBatch.terminate;
                 for (const result of toolResults) {
@@ -365,9 +366,10 @@ async function streamToollessClosingTurn(currentContext, newMessages, config, co
             : RUNAWAY_STOP_CLOSING_SYSTEM_PROMPT,
         tools: [],
     };
-    const message = await streamAssistantResponse(closingContext, config, signal, emit, streamFn, {
+    const response = await streamAssistantResponse(closingContext, config, signal, emit, streamFn, {
         rejectToolCalls: true,
     });
+    const message = response.message;
     newMessages.push(message);
     await emit({ type: "turn_end", message, toolResults: [] });
 }
@@ -392,11 +394,11 @@ async function streamAssistantResponse(context, config, signal, emit, streamFn,
         degenerationAbort.abort();
     else
         signal?.addEventListener("abort", onOuterAbort, { once: true });
-    const response = await startAgentProviderRequest(context, config, degenerationAbort.signal, streamFn);
+    const response = await startPlannedAgentProviderRequestWithId(context, config, degenerationAbort.signal, streamFn);
     let partialMessage = null;
     let addedPartial = false;
     let abortedForDegeneration = false;
-    responseEvents: for await (const event of response) {
+    responseEvents: for await (const event of response.stream) {
         switch (event.type) {
             case "start":
                 partialMessage = event.partial;
@@ -436,7 +438,7 @@ async function streamAssistantResponse(context, config, signal, emit, streamFn,
         }
     }
     signal?.removeEventListener("abort", onOuterAbort);
-    const providerMessage = await response.result();
+    const providerMessage = await response.stream.result();
     let finalMessage = policy?.rejectToolCalls
         ? rejectToolCallsFromToolFreeResponse(providerMessage)
         : rejectNativeToolProtocolResidue(providerMessage, context.tools ?? [], Boolean(config.textToolCallProtocol));
@@ -453,17 +455,18 @@ async function streamAssistantResponse(context, config, signal, emit, streamFn,
         await emit({ type: "message_start", message: { ...finalMessage } });
     }
     await emit({ type: "message_end", message: finalMessage });
-    return finalMessage;
+    return { message: finalMessage, requestId: response.requestId };
 }
 /**
  * Execute tool calls from an assistant message.
  */
-async function executeToolCalls(currentContext, assistantMessage, config, validationFailureTracker, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, previousSuccessfulTextProtocolResults, signal, emit) {
+async function executeToolCalls(currentContext, assistantMessage, requestId, config, validationFailureTracker, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, previousSuccessfulTextProtocolResults, signal, emit) {
     const toolCalls = assistantMessage.content.filter((c) => c.type === "toolCall");
     const hasSequentialToolCall = toolCalls.some((tc) => currentContext.tools?.find((t) => t.name === tc.name)?.executionMode === "sequential");
     const execCtx = {
         context: currentContext,
         assistantMessage,
+        requestId,
         config,
         validationFailureTracker,
         repairTeachTracker,
@@ -481,9 +484,9 @@ async function executeToolCalls(currentContext, assistantMessage, config, valida
 async function prepareAndStartToolCall(execCtx, toolCall, index) {
     const preparation = execCtx.previousSuccessfulResults
         ? createRepeatedSuccessfulToolCallOutcome(execCtx.previousSuccessfulResults[index])
-        : await prepareToolCall(execCtx.context, execCtx.assistantMessage, toolCall, execCtx.config, execCtx.validationFailureTracker, execCtx.toolFailureMemory, execCtx.toolFailureRecoveryGate, execCtx.signal);
-    await emitToolExecutionStart(toolCall, execCtx.emit);
+        : await prepareToolCall(execCtx.context, execCtx.assistantMessage, toolCall, execCtx.config, execCtx.validationFailureTracker, execCtx.toolFailureMemory, execCtx.toolFailureRecoveryGate, execCtx.signal, execCtx.requestId);
     if (preparation.kind === "immediate") {
+        await emitToolExecutionStart(toolCall, execCtx.emit);
         emitToolArgumentValidationTelemetry(execCtx.config, preparation.validationEvent, "not_run", "none");
         return {
             kind: "finalized",
@@ -495,13 +498,37 @@ async function prepareAndStartToolCall(execCtx, toolCall, index) {
 async function finalizeStartedToolCall(execCtx, started) {
     if (started.kind === "finalized")
         return started.finalized;
-    return executeAndFinalizePreparedToolCall(execCtx.context, execCtx.assistantMessage, started.preparation, execCtx.config, execCtx.repairTeachTracker, execCtx.toolFailureMemory, execCtx.toolFailureRecoveryGate, execCtx.signal, execCtx.emit);
+    return executeAndFinalizePreparedToolCall(execCtx.context, execCtx.assistantMessage, started.preparation, execCtx.requestId, execCtx.config, execCtx.repairTeachTracker, execCtx.toolFailureMemory, execCtx.toolFailureRecoveryGate, execCtx.signal, execCtx.emit);
+}
+async function reservePreparedToolCalls(execCtx, preparedCalls) {
+    if (preparedCalls.length === 0)
+        return;
+    execCtx.signal?.throwIfAborted();
+    if (execCtx.config.onToolCallStart) {
+        const calls = preparedCalls.map((prepared) => ({
+            requestId: execCtx.requestId,
+            callId: prepared.toolCall.id,
+            toolName: prepared.toolCall.name,
+            assistantMessage: execCtx.assistantMessage,
+            toolCall: prepared.toolCall,
+            args: prepared.args,
+            context: execCtx.context,
+        }));
+        await execCtx.config.onToolCallStart(calls, execCtx.signal);
+    }
+    execCtx.signal?.throwIfAborted();
+    for (const prepared of preparedCalls) {
+        await emitToolExecutionStart(prepared.toolCall, execCtx.emit);
+    }
 }
 async function executeToolCallsSequential(execCtx, toolCalls) {
     const finalizedCalls = [];
     const messages = [];
     for (const [index, toolCall] of toolCalls.entries()) {
         const started = await prepareAndStartToolCall(execCtx, toolCall, index);
+        if (started.kind === "prepared") {
+            await reservePreparedToolCalls(execCtx, [started.preparation]);
+        }
         const finalized = await finalizeStartedToolCall(execCtx, started);
         execCtx.toolFailureRecoveryGate.apply(finalized.executionGateEffect);
         await emitToolExecutionEnd(finalized, execCtx.emit);
@@ -523,6 +550,7 @@ async function executeToolCallsParallel(execCtx, toolCalls) {
     while (nextIndex < toolCalls.length && !execCtx.signal?.aborted) {
         const waveEnd = Math.min(nextIndex + TOOL_EXECUTION_WAVE_SIZE, toolCalls.length);
         const wave = [];
+        const preparedWave = [];
         const completionOrder = [];
         for (; nextIndex < waveEnd; nextIndex++) {
             const toolCall = toolCalls[nextIndex];
@@ -532,6 +560,7 @@ async function executeToolCallsParallel(execCtx, toolCalls) {
                 wave.push(started.finalized);
             }
             else {
+                preparedWave.push(started.preparation);
                 wave.push(async () => {
                     const finalized = await finalizeStartedToolCall(execCtx, started);
                     completionOrder.push(finalized);
@@ -543,6 +572,7 @@ async function executeToolCallsParallel(execCtx, toolCalls) {
                 break;
             }
         }
+        await reservePreparedToolCalls(execCtx, preparedWave);
         const finalizedWave = await Promise.all(wave.map((entry) => (typeof entry === "function" ? entry() : Promise.resolve(entry))));
         for (const finalized of finalizedWave)
             execCtx.toolFailureRecoveryGate.apply(finalized.executionGateEffect);
@@ -687,7 +717,7 @@ function handleValidationFailure(error, config, tracker) {
     });
     return `${error.message}\n\nRepeated validation failure (${tracker.repeats} identical attempts). Use this full schema and example before retrying:\n${error.enrichment}`;
 }
-async function prepareToolCall(currentContext, assistantMessage, toolCall, config, validationFailureTracker, toolFailureMemory, toolFailureRecoveryGate, signal) {
+async function prepareToolCall(currentContext, assistantMessage, toolCall, config, validationFailureTracker, toolFailureMemory, toolFailureRecoveryGate, signal, requestId) {
     const tool = currentContext.tools?.find((candidate) => candidate.name === toolCall.name);
     if (!tool) {
         return {
@@ -750,6 +780,7 @@ async function prepareToolCall(currentContext, assistantMessage, toolCall, confi
         }
         if (config.beforeToolCall) {
             const beforeResult = await config.beforeToolCall({
+                requestId,
                 assistantMessage,
                 toolCall,
                 args: validatedArgs,
@@ -866,12 +897,12 @@ function getBackgroundToolCallDelay(config) {
         return undefined;
     return delay;
 }
-async function executeAndFinalizePreparedToolCall(currentContext, assistantMessage, prepared, config, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, foregroundSignal, emit) {
+async function executeAndFinalizePreparedToolCall(currentContext, assistantMessage, prepared, requestId, config, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, foregroundSignal, emit) {
     const backgroundDelay = getBackgroundToolCallDelay(config);
     if (!config.handoffToolCall ||
         (backgroundDelay === undefined && config.subscribeToolCallHandoffRequest === undefined)) {
         const executed = await executePreparedToolCall(prepared, foregroundSignal, emit);
-        return finalizeExecutedToolCall(currentContext, assistantMessage, prepared, executed, config, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, foregroundSignal);
+        return finalizeExecutedToolCall(currentContext, assistantMessage, prepared, requestId, executed, config, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, foregroundSignal);
     }
     const executionAbort = createLinkedToolAbort(foregroundSignal);
     const startedAt = Date.now();
@@ -881,7 +912,7 @@ async function executeAndFinalizePreparedToolCall(currentContext, assistantMessa
             if (emitForegroundUpdates)
                 return emit(event);
         });
-        const finalized = await finalizeExecutedToolCall(currentContext, assistantMessage, prepared, executed, config, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, executionAbort.signal);
+        const finalized = await finalizeExecutedToolCall(currentContext, assistantMessage, prepared, requestId, executed, config, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, executionAbort.signal);
         return finalized;
     })();
     completion.then(executionAbort.detachForeground, executionAbort.detachForeground);
@@ -930,6 +961,7 @@ async function executeAndFinalizePreparedToolCall(currentContext, assistantMessa
     let handoff;
     try {
         handoff = config.handoffToolCall({
+            requestId,
             assistantMessage,
             toolCall: prepared.toolCall,
             args: prepared.args,
@@ -1015,7 +1047,7 @@ function appendRepairTeachNotes(result, toolCall, tracker, config) {
         taught: true,
     };
 }
-async function finalizeExecutedToolCall(currentContext, assistantMessage, prepared, executed, config, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, signal) {
+async function finalizeExecutedToolCall(currentContext, assistantMessage, prepared, requestId, executed, config, repairTeachTracker, toolFailureMemory, toolFailureRecoveryGate, signal) {
     let result = executed.result;
     let isError = executed.isError;
     let failureMessage = executed.failureMessage ?? "";
@@ -1027,6 +1059,7 @@ async function finalizeExecutedToolCall(currentContext, assistantMessage, prepar
     if (config.afterToolCall) {
         try {
             const afterResult = await config.afterToolCall({
+                requestId,
                 assistantMessage,
                 toolCall: prepared.toolCall,
                 args: prepared.args,