@agentick/core 0.5.0 → 0.6.0

package/dist/app/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/app/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/app/session.ts"],"names":[],"mappings":"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"}

package/dist/app/session.js

@@ -24,6 +24,8 @@ import { jsx } from "../jsx/jsx-runtime";
 import { devToolsEmitter, forwardToDevTools, FrameworkChannels, getEffectiveModelInfo, getContextUtilization, } from "@agentick/shared";
 import { computeTokenSummary } from "../utils/token-estimate";
 import React from "react";
+// ════════════════════════════════════════════════════════════════════════════
+const log = Logger.for("Session");
 /**
  * Get session context from the current ALS context.
  */
@@ -44,6 +46,17 @@ function ensureMessageId(message) {
         return message;
     return { ...message, id: randomUUID() };
 }
+function tryDisplaySummary(tool, input) {
+    if (!tool?.metadata?.displaySummary)
+        return undefined;
+    try {
+        return tool.metadata.displaySummary(input);
+    }
+    catch (err) {
+        log.warn({ error: err, tool: tool.metadata.name }, "displaySummary threw");
+        return undefined;
+    }
+}
 /**
  * Session implementation.
  *
@@ -1345,6 +1358,7 @@ export class SessionImpl extends EventEmitter {
             timestamp: timestamp(),
         });
         const executionStartTimelineIndex = this._timeline.length;
+        let executionError;
         try {
             // Tick loop
             let shouldContinue = true;
@@ -1549,12 +1563,15 @@ export class SessionImpl extends EventEmitter {
                     toolStartTime = Date.now();
                     for (const call of response.toolCalls) {
                         const toolCallTimestamp = timestamp();
+                        const toolDef = compiled.tools?.find((t) => t.metadata?.name === call.name);
+                        const summary = tryDisplaySummary(toolDef, call.input);
                         this.emitEvent({
                             type: "tool_call",
                             callId: call.id,
                             blockIndex: 0,
                             name: call.name,
                             input: call.input,
+                            summary,
                             startedAt: toolCallTimestamp,
                             completedAt: toolCallTimestamp,
                         });
@@ -1572,9 +1589,11 @@ export class SessionImpl extends EventEmitter {
                         tickText = textContent.text;
                     }
                 }
-                // Build TickResult with data and control methods
+                // Build TickResult with data and control methods.
+                // shouldContinue is initialized from ingestResult so callbacks see the framework default.
                 const tickResult = {
                     tick: currentTick,
+                    shouldContinue: ingestResult.shouldContinue,
                     text: tickText,
                     content: modelOutput?.message?.content ?? [],
                     toolCalls: response.toolCalls ?? [],
@@ -1599,8 +1618,9 @@ export class SessionImpl extends EventEmitter {
                         }
                     },
                 };
-                // Run useTickEnd/useContinuation callbacks
-                // These can call tickResult.stop() or tickResult.continue() to influence continuation
+                // Run useTickEnd/useContinuation callbacks.
+                // storeRunTickEndCallbacks chains shouldContinue through each callback
+                // via _resolveCurrentShouldContinue, so each sees the accumulated decision.
                 const tickEndState = {
                     tick: currentTick,
                     current: this._currentOutput,
@@ -1609,11 +1629,11 @@ export class SessionImpl extends EventEmitter {
                     stop: () => { }, // No-op at tick end - use tickResult.stop() instead
                 };
                 await this.compiler?.notifyTickEnd(tickEndState, tickResult);
-                // Resolve final tick control using COM's priority-based system
-                // This considers: explicit stop/continue requests from callbacks > default behavior
-                const defaultStatus = ingestResult.shouldContinue ? "continue" : "completed";
-                const tickDecision = this.ctx?._resolveTickControl(defaultStatus, ingestResult.stopReason) ?? { status: defaultStatus };
-                shouldContinue = tickDecision.status === "continue";
+                // Final decision comes from tickResult.shouldContinue (already resolved
+                // incrementally through callbacks). Fall back to _resolveTickControl for
+                // any remaining requests not consumed by chaining (shouldn't happen, but safe).
+                const remainingDecision = this.ctx?._resolveTickControl(tickResult.shouldContinue ? "continue" : "completed", ingestResult.stopReason) ?? { status: tickResult.shouldContinue ? "continue" : "completed" };
+                shouldContinue = remainingDecision.status === "continue";
                 // Get actual model ID: prefer response model, then metadata.model, then metadata.id
                 const actualModelId = modelOutput?.model || model?.metadata?.model || model?.metadata?.id || "unknown";
                 this.emitEvent({
@@ -1666,6 +1686,10 @@ export class SessionImpl extends EventEmitter {
                 timestamp: timestamp(),
             });
         }
+        catch (e) {
+            executionError = e instanceof Error ? e : new Error(String(e));
+            throw e;
+        }
         finally {
             this._executionComplete = true;
             // Ensure queued messages are cleared even on error/abort paths
@@ -1684,6 +1708,10 @@ export class SessionImpl extends EventEmitter {
                 executionId,
                 stopReason,
                 aborted: this._isAborted,
+                // Include error details for non-abort failures (abort is intentional, not an error)
+                error: executionError && !this._isAborted
+                    ? { message: executionError.message, name: executionError.name }
+                    : undefined,
                 usage,
                 output: output ?? null,
                 newTimelineEntries: this._timeline.slice(executionStartTimelineIndex),
@@ -1727,6 +1755,11 @@ export class SessionImpl extends EventEmitter {
             }
             this._eventResolvers = [];
             this._status = "idle";
+            // Auto-resume if messages were queued during execution
+            if (this._queuedMessages.length > 0) {
+                const tickProps = (this._lastProps ?? {});
+                void this.render(tickProps);
+            }
         }
         return {
             response: responseText,
@@ -1965,80 +1998,117 @@ export class SessionImpl extends EventEmitter {
     async executeTools(executor, toolCalls, configTools, outputs, currentTick, timestamp) {
         const results = [];
         const executableTools = configTools.filter((t) => "run" in t);
-        for (const call of toolCalls) {
-            const startedAt = timestamp();
-            // Check if OUTPUT tool
-            const tool = executableTools.find((t) => t.metadata?.name === call.name);
-            const isOutputTool = tool && tool.metadata?.type === "output";
-            if (isOutputTool) {
-                outputs[call.name] = call.input;
-                const completedAt = timestamp();
+        // Subscribe to tool_confirmation channel to forward responses to the coordinator
+        const confirmationChannel = this.channel("tool_confirmation");
+        const coordinator = executor.getConfirmationCoordinator();
+        const unsubscribe = confirmationChannel.subscribe((event) => {
+            if (event.type === "response" && event.id) {
+                const payload = event.payload;
+                if (payload) {
+                    coordinator.resolveConfirmation(event.id, payload.approved, payload.always ?? false);
+                }
+            }
+        });
+        // Confirmation callbacks for stream event emission
+        const confirmationCallbacks = {
+            onConfirmationRequired: async (call, message, metadata) => {
                 this.emitEvent({
-                    type: "tool_result",
+                    type: "tool_confirmation_required",
                     callId: call.id,
                     name: call.name,
-                    result: call.input,
-                    isError: false,
-                    executedBy: "engine",
-                    startedAt,
-                    completedAt,
+                    input: call.input,
+                    message,
+                    metadata,
                 });
-                continue;
-            }
-            // Execute tool (optionally wrapped by execution runner)
-            try {
-                const runner = this.appOptions.runner;
-                let toolResult;
-                if (runner?.executeToolCall) {
-                    toolResult = await runner.executeToolCall(call, tool, async () => {
-                        const r = await executor.processToolWithConfirmation(call, this.ctx, executableTools);
-                        return r.result;
-                    });
-                }
-                else {
-                    const r = await executor.processToolWithConfirmation(call, this.ctx, executableTools);
-                    toolResult = r.result;
-                }
-                results.push(toolResult);
-                const completedAt = timestamp();
-                this.emitEvent({
-                    type: "tool_result",
-                    callId: toolResult.toolUseId,
-                    name: toolResult.name,
-                    result: toolResult,
-                    isError: !toolResult.success,
-                    executedBy: "engine",
-                    startedAt,
-                    completedAt,
-                });
-            }
-            catch (error) {
-                const errorResult = {
-                    id: randomUUID(),
-                    toolUseId: call.id,
-                    name: call.name,
-                    success: false,
-                    content: [
-                        {
-                            type: "text",
-                            text: `Tool execution failed: ${error instanceof Error ? error.message : String(error)}`,
-                        },
-                    ],
-                };
-                results.push(errorResult);
-                const completedAt = timestamp();
+            },
+            onConfirmationResult: async (confirmation, call) => {
                 this.emitEvent({
-                    type: "tool_result",
+                    type: "tool_confirmation_result",
                     callId: call.id,
-                    name: call.name,
-                    result: errorResult,
-                    isError: true,
-                    executedBy: "engine",
-                    startedAt,
-                    completedAt,
+                    confirmed: confirmation.confirmed,
+                    always: confirmation.always,
                 });
+            },
+        };
+        try {
+            for (const call of toolCalls) {
+                const startedAt = timestamp();
+                // Check if OUTPUT tool
+                const tool = executableTools.find((t) => t.metadata?.name === call.name);
+                const isOutputTool = tool && tool.metadata?.type === "output";
+                if (isOutputTool) {
+                    outputs[call.name] = call.input;
+                    const completedAt = timestamp();
+                    this.emitEvent({
+                        type: "tool_result",
+                        callId: call.id,
+                        name: call.name,
+                        result: call.input,
+                        isError: false,
+                        executedBy: "engine",
+                        startedAt,
+                        completedAt,
+                    });
+                    continue;
+                }
+                // Execute tool (optionally wrapped by execution runner)
+                try {
+                    const runner = this.appOptions.runner;
+                    let toolResult;
+                    if (runner?.executeToolCall) {
+                        toolResult = await runner.executeToolCall(call, tool, async () => {
+                            const r = await executor.processToolWithConfirmation(call, this.ctx, executableTools, confirmationCallbacks);
+                            return r.result;
+                        });
+                    }
+                    else {
+                        const r = await executor.processToolWithConfirmation(call, this.ctx, executableTools, confirmationCallbacks);
+                        toolResult = r.result;
+                    }
+                    results.push(toolResult);
+                    const completedAt = timestamp();
+                    this.emitEvent({
+                        type: "tool_result",
+                        callId: toolResult.toolUseId,
+                        name: toolResult.name,
+                        result: toolResult,
+                        isError: !toolResult.success,
+                        executedBy: "engine",
+                        startedAt,
+                        completedAt,
+                    });
+                }
+                catch (error) {
+                    const errorResult = {
+                        id: randomUUID(),
+                        toolUseId: call.id,
+                        name: call.name,
+                        success: false,
+                        content: [
+                            {
+                                type: "text",
+                                text: `Tool execution failed: ${error instanceof Error ? error.message : String(error)}`,
+                            },
+                        ],
+                    };
+                    results.push(errorResult);
+                    const completedAt = timestamp();
+                    this.emitEvent({
+                        type: "tool_result",
+                        callId: call.id,
+                        name: call.name,
+                        result: errorResult,
+                        isError: true,
+                        executedBy: "engine",
+                        startedAt,
+                        completedAt,
+                    });
+                }
             }
         }
+        finally {
+            unsubscribe();
+        }
         return results;
     }
     /**
@@ -2141,11 +2211,13 @@ export class SessionImpl extends EventEmitter {
             this.log.debug({ removed, remaining: this._timeline.length }, "Timeline trimmed (maxTimelineEntries)");
         }
         this._currentOutput = current;
-        // Resolve tick control
+        // Resolve tick control: continue if tool calls pending OR messages queued
         const shouldStop = response.shouldStop || false;
         const stopReason = response.stopReason?.reason;
+        const hasToolCalls = (response.toolCalls?.length ?? 0) > 0;
+        const hasPendingMessages = (this.ctx?.getQueuedMessages().length ?? 0) > 0 || this._queuedMessages.length > 0;
         return {
-            shouldContinue: !shouldStop && (response.toolCalls?.length > 0 || false),
+            shouldContinue: !shouldStop && (hasToolCalls || hasPendingMessages),
             stopReason,
             timeline: current.timeline,
         };