@wingman-ai/gateway 0.2.2 → 0.2.3

package/dist/cli/core/agentInvoker.cjs

@@ -24,26 +24,35 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    resolveExternalOutputMount: ()=>resolveExternalOutputMount,
-    toWorkspaceAliasVirtualPath: ()=>toWorkspaceAliasVirtualPath,
+    resolveToolRetryMiddlewareSettings: ()=>resolveToolRetryMiddlewareSettings,
+    resolveSummarizationMiddlewareSettings: ()=>resolveSummarizationMiddlewareSettings,
     OUTPUT_VIRTUAL_PATH: ()=>OUTPUT_VIRTUAL_PATH,
-    WORKDIR_VIRTUAL_PATH: ()=>WORKDIR_VIRTUAL_PATH,
-    AgentInvoker: ()=>AgentInvoker,
+    resolveExecutionWorkspace: ()=>resolveExecutionWorkspace,
     buildUserContent: ()=>buildUserContent,
-    resolveExecutionWorkspace: ()=>resolveExecutionWorkspace
+    toWorkspaceAliasVirtualPath: ()=>toWorkspaceAliasVirtualPath,
+    chunkHasAssistantText: ()=>chunkHasAssistantText,
+    resolveModelRetryMiddlewareSettings: ()=>resolveModelRetryMiddlewareSettings,
+    AgentInvoker: ()=>AgentInvoker,
+    detectToolEventContext: ()=>detectToolEventContext,
+    WORKDIR_VIRTUAL_PATH: ()=>WORKDIR_VIRTUAL_PATH,
+    configureDeepAgentSummarizationMiddleware: ()=>configureDeepAgentSummarizationMiddleware,
+    resolveExternalOutputMount: ()=>resolveExternalOutputMount,
+    resolveHumanInTheLoopSettings: ()=>resolveHumanInTheLoopSettings,
+    selectStreamingFallbackText: ()=>selectStreamingFallbackText
 });
-const external_deepagents_namespaceObject = require("deepagents");
 const external_node_fs_namespaceObject = require("node:fs");
 const external_node_path_namespaceObject = require("node:path");
+const external_deepagents_namespaceObject = require("deepagents");
+const external_langchain_namespaceObject = require("langchain");
 const external_uuid_namespaceObject = require("uuid");
-const agentLoader_cjs_namespaceObject = require("../../agent/config/agentLoader.cjs");
-const loader_cjs_namespaceObject = require("../config/loader.cjs");
+const mcpClientManager_cjs_namespaceObject = require("../../agent/config/mcpClientManager.cjs");
 const additional_messages_cjs_namespaceObject = require("../../agent/middleware/additional-messages.cjs");
-const hooks_cjs_namespaceObject = require("../../agent/middleware/hooks.cjs");
 const merger_cjs_namespaceObject = require("../../agent/middleware/hooks/merger.cjs");
+const hooks_cjs_namespaceObject = require("../../agent/middleware/hooks.cjs");
 const media_compat_cjs_namespaceObject = require("../../agent/middleware/media-compat.cjs");
-const mcpClientManager_cjs_namespaceObject = require("../../agent/config/mcpClientManager.cjs");
 const uiRegistry_cjs_namespaceObject = require("../../agent/uiRegistry.cjs");
+const agentLoader_cjs_namespaceObject = require("../../agent/config/agentLoader.cjs");
+const loader_cjs_namespaceObject = require("../config/loader.cjs");
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -56,6 +65,7 @@ function _define_property(obj, key, value) {
 }
 const WORKDIR_VIRTUAL_PATH = "/workdir/";
 const OUTPUT_VIRTUAL_PATH = "/output/";
+const DEFAULT_DEEPAGENT_MODEL = "claude-sonnet-4-5-20250929";
 const isPathWithinRoot = (targetPath, rootPath)=>{
     const normalizedTarget = (0, external_node_path_namespaceObject.normalize)(targetPath);
     const normalizedRoot = (0, external_node_path_namespaceObject.normalize)(rootPath);
@@ -88,6 +98,101 @@ const resolveExternalOutputMount = (workspace, workdir, defaultOutputDir)=>{
         absolutePath: null
     };
 };
+const resolveSummarizationMiddlewareSettings = (config)=>{
+    if (!config.summarization?.enabled) return null;
+    return {
+        maxTokensBeforeSummary: config.summarization.maxTokensBeforeSummary,
+        messagesToKeep: config.summarization.messagesToKeep
+    };
+};
+const resolveModelRetryMiddlewareSettings = (config)=>{
+    if (!config.modelRetry?.enabled) return null;
+    return {
+        maxRetries: config.modelRetry.maxRetries,
+        backoffFactor: config.modelRetry.backoffFactor,
+        initialDelayMs: config.modelRetry.initialDelayMs,
+        maxDelayMs: config.modelRetry.maxDelayMs,
+        jitter: config.modelRetry.jitter,
+        onFailure: config.modelRetry.onFailure
+    };
+};
+const resolveToolRetryMiddlewareSettings = (config)=>{
+    if (!config.toolRetry?.enabled) return null;
+    return {
+        maxRetries: config.toolRetry.maxRetries,
+        backoffFactor: config.toolRetry.backoffFactor,
+        initialDelayMs: config.toolRetry.initialDelayMs,
+        maxDelayMs: config.toolRetry.maxDelayMs,
+        jitter: config.toolRetry.jitter,
+        onFailure: config.toolRetry.onFailure,
+        ...config.toolRetry.tools && config.toolRetry.tools.length > 0 ? {
+            tools: config.toolRetry.tools
+        } : {}
+    };
+};
+const resolveHumanInTheLoopSettings = (config)=>{
+    if (!config.humanInTheLoop?.enabled) return null;
+    const interruptOn = config.humanInTheLoop.interruptOn || {};
+    if (0 === Object.keys(interruptOn).length) return null;
+    return {
+        interruptOn
+    };
+};
+const configureDeepAgentSummarizationMiddleware = (agent, settings, model)=>{
+    const middleware = agent?.options?.middleware;
+    if (!Array.isArray(middleware)) return;
+    const index = middleware.findIndex((entry)=>entry?.name === "SummarizationMiddleware");
+    if (index < 0) return;
+    if (!settings) return void middleware.splice(index, 1);
+    middleware[index] = (0, external_langchain_namespaceObject.summarizationMiddleware)({
+        model: model || DEFAULT_DEEPAGENT_MODEL,
+        trigger: {
+            tokens: settings.maxTokensBeforeSummary
+        },
+        keep: {
+            messages: settings.messagesToKeep
+        }
+    });
+};
+const detectToolEventContext = (chunk)=>{
+    if (!chunk || "object" != typeof chunk || Array.isArray(chunk)) return null;
+    const eventChunk = chunk;
+    if ("on_tool_start" !== eventChunk.event && "on_tool_end" !== eventChunk.event) return null;
+    const toolName = "string" == typeof eventChunk.name && eventChunk.name.trim() ? eventChunk.name.trim() : "unknown";
+    return {
+        event: eventChunk.event,
+        toolName
+    };
+};
+const chunkHasAssistantText = (chunk)=>{
+    if (!chunk || "object" != typeof chunk || Array.isArray(chunk)) return false;
+    const eventChunk = chunk;
+    const eventName = "string" == typeof eventChunk.event ? eventChunk.event : void 0;
+    if ("on_chat_model_stream" === eventName) {
+        const data = eventChunk.data && "object" == typeof eventChunk.data ? eventChunk.data : null;
+        const messageChunk = data?.chunk || data?.message;
+        const content = messageChunk?.content;
+        if ("string" == typeof content) return content.length > 0;
+        if (Array.isArray(content)) return content.some((part)=>part && "object" == typeof part && "text" === part.type && "string" == typeof part.text && part.text.length > 0);
+    }
+    if ("on_llm_stream" === eventName) {
+        const data = eventChunk.data && "object" == typeof eventChunk.data ? eventChunk.data : null;
+        const llmChunk = data?.chunk && "object" == typeof data.chunk ? data.chunk : null;
+        return "string" == typeof llmChunk?.text && llmChunk.text.length > 0;
+    }
+    return false;
+};
+const selectStreamingFallbackText = (sessionMessages, invocationStartedAt, windowMs = 1000)=>{
+    for(let i = sessionMessages.length - 1; i >= 0; i -= 1){
+        const message = sessionMessages[i];
+        if (!message || "object" != typeof message) continue;
+        if ("assistant" === message.role) {
+            if ("number" == typeof message.createdAt && !(message.createdAt < invocationStartedAt - windowMs)) {
+                if ("string" == typeof message.content && message.content.trim()) return message.content;
+            }
+        }
+    }
+};
 class AgentInvoker {
     findAllAgents() {
         const agentConfigs = this.loader.loadAllAgentConfigs();
@@ -97,7 +202,11 @@ class AgentInvoker {
         return await this.loader.loadAgent(name);
     }
     async invokeAgent(agentName, prompt, sessionId, attachments, options) {
+        const invocationStartedAt = Date.now();
         let cancellationHandled = false;
+        let activeToolName = null;
+        let lastToolName = null;
+        let sawAssistantText = false;
         const isCancelled = ()=>options?.signal?.aborted === true;
         try {
             const executionWorkspace = resolveExecutionWorkspace(this.workspace, this.workdir);
@@ -147,6 +256,29 @@ class AgentInvoker {
                     skillsDirectory
                 })
             ];
+            const summarizationSettings = resolveSummarizationMiddlewareSettings(this.wingmanConfig);
+            const modelRetrySettings = resolveModelRetryMiddlewareSettings(this.wingmanConfig);
+            if (modelRetrySettings) middleware.push((0, external_langchain_namespaceObject.modelRetryMiddleware)({
+                maxRetries: modelRetrySettings.maxRetries,
+                backoffFactor: modelRetrySettings.backoffFactor,
+                initialDelayMs: modelRetrySettings.initialDelayMs,
+                maxDelayMs: modelRetrySettings.maxDelayMs,
+                jitter: modelRetrySettings.jitter,
+                onFailure: modelRetrySettings.onFailure
+            }));
+            const toolRetrySettings = resolveToolRetryMiddlewareSettings(this.wingmanConfig);
+            if (toolRetrySettings) middleware.push((0, external_langchain_namespaceObject.toolRetryMiddleware)({
+                maxRetries: toolRetrySettings.maxRetries,
+                backoffFactor: toolRetrySettings.backoffFactor,
+                initialDelayMs: toolRetrySettings.initialDelayMs,
+                maxDelayMs: toolRetrySettings.maxDelayMs,
+                jitter: toolRetrySettings.jitter,
+                onFailure: toolRetrySettings.onFailure,
+                ...toolRetrySettings.tools ? {
+                    tools: toolRetrySettings.tools
+                } : {}
+            }));
+            const hitlSettings = resolveHumanInTheLoopSettings(this.wingmanConfig);
             if (mergedHooks) {
                 this.logger.debug(`Adding hooks middleware with ${mergedHooks.PreToolUse?.length || 0} PreToolUse hooks, ${mergedHooks.PostToolUse?.length || 0} PostToolUse hooks, and ${mergedHooks.Stop?.length || 0} Stop hooks`);
                 middleware.push((0, hooks_cjs_namespaceObject.createHooksMiddleware)(mergedHooks, executionWorkspace, hookSessionId, this.logger));
@@ -193,10 +325,12 @@ class AgentInvoker {
                         virtualMode: true
                     }), backendOverrides),
                 middleware: middleware,
+                interruptOn: hitlSettings?.interruptOn,
                 skills: skillsSources,
                 subagents: targetAgent.subagents || [],
                 checkpointer: checkpointer
             });
+            configureDeepAgentSummarizationMiddleware(standaloneAgent, summarizationSettings, targetAgent.model);
             this.logger.debug("Agent created, sending message");
             const userContent = buildUserContent(prompt, attachments, targetAgent.model);
             if (this.sessionManager && sessionId) {
@@ -217,6 +351,13 @@ class AgentInvoker {
                     signal: options?.signal
                 });
                 for await (const chunk of stream){
+                    if (!sawAssistantText && chunkHasAssistantText(chunk)) sawAssistantText = true;
+                    const toolEvent = detectToolEventContext(chunk);
+                    if (toolEvent) {
+                        lastToolName = toolEvent.toolName;
+                        if ("on_tool_start" === toolEvent.event) activeToolName = toolEvent.toolName;
+                        else if (activeToolName === toolEvent.toolName) activeToolName = null;
+                    }
                     if (isCancelled()) {
                         cancellationHandled = true;
                         this.logger.info("Agent invocation cancelled");
@@ -237,8 +378,27 @@ class AgentInvoker {
                     };
                 }
                 this.logger.info("Agent streaming completed successfully");
+                let fallbackText;
+                if (!sawAssistantText && this.sessionManager && sessionId) try {
+                    const sessionMessages = await this.sessionManager.listMessages(sessionId);
+                    fallbackText = selectStreamingFallbackText(sessionMessages, invocationStartedAt);
+                } catch (stateError) {
+                    this.logger.debug("Failed to derive streaming fallback text from session state", stateError);
+                }
+                if (!sawAssistantText && !fallbackText) {
+                    const emptyResponseMessage = "Model completed without a response. Check provider logs for request errors.";
+                    this.logger.warn(emptyResponseMessage);
+                    this.outputManager.emitAgentError(emptyResponseMessage);
+                    return {
+                        blocked: true,
+                        reason: "empty_stream_response"
+                    };
+                }
                 this.outputManager.emitAgentComplete({
-                    streaming: true
+                    streaming: true,
+                    ...fallbackText ? {
+                        fallbackText
+                    } : {}
                 });
                 return {
                     streaming: true
@@ -286,8 +446,10 @@ class AgentInvoker {
                     cancelled: true
                 };
             }
-            this.logger.error(`Agent invocation failed: ${error instanceof Error ? error.message : String(error)}`);
-            this.outputManager.emitAgentError(error);
+            this.logger.error(`Agent invocation failed: ${error instanceof Error ? error.message : String(error)}${activeToolName ? ` (while running tool "${activeToolName}")` : lastToolName ? ` (last tool: "${lastToolName}")` : ""}`);
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            const errorWithToolContext = activeToolName ? `${errorMessage} (while running tool "${activeToolName}")` : lastToolName ? `${errorMessage} (last tool: "${lastToolName}")` : errorMessage;
+            this.outputManager.emitAgentError(errorWithToolContext);
             throw error;
         } finally{
             if (this.mcpManager) {
@@ -516,16 +678,32 @@ exports.AgentInvoker = __webpack_exports__.AgentInvoker;
 exports.OUTPUT_VIRTUAL_PATH = __webpack_exports__.OUTPUT_VIRTUAL_PATH;
 exports.WORKDIR_VIRTUAL_PATH = __webpack_exports__.WORKDIR_VIRTUAL_PATH;
 exports.buildUserContent = __webpack_exports__.buildUserContent;
+exports.chunkHasAssistantText = __webpack_exports__.chunkHasAssistantText;
+exports.configureDeepAgentSummarizationMiddleware = __webpack_exports__.configureDeepAgentSummarizationMiddleware;
+exports.detectToolEventContext = __webpack_exports__.detectToolEventContext;
 exports.resolveExecutionWorkspace = __webpack_exports__.resolveExecutionWorkspace;
 exports.resolveExternalOutputMount = __webpack_exports__.resolveExternalOutputMount;
+exports.resolveHumanInTheLoopSettings = __webpack_exports__.resolveHumanInTheLoopSettings;
+exports.resolveModelRetryMiddlewareSettings = __webpack_exports__.resolveModelRetryMiddlewareSettings;
+exports.resolveSummarizationMiddlewareSettings = __webpack_exports__.resolveSummarizationMiddlewareSettings;
+exports.resolveToolRetryMiddlewareSettings = __webpack_exports__.resolveToolRetryMiddlewareSettings;
+exports.selectStreamingFallbackText = __webpack_exports__.selectStreamingFallbackText;
 exports.toWorkspaceAliasVirtualPath = __webpack_exports__.toWorkspaceAliasVirtualPath;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "AgentInvoker",
     "OUTPUT_VIRTUAL_PATH",
     "WORKDIR_VIRTUAL_PATH",
     "buildUserContent",
+    "chunkHasAssistantText",
+    "configureDeepAgentSummarizationMiddleware",
+    "detectToolEventContext",
     "resolveExecutionWorkspace",
     "resolveExternalOutputMount",
+    "resolveHumanInTheLoopSettings",
+    "resolveModelRetryMiddlewareSettings",
+    "resolveSummarizationMiddlewareSettings",
+    "resolveToolRetryMiddlewareSettings",
+    "selectStreamingFallbackText",
     "toWorkspaceAliasVirtualPath"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cli/core/agentInvoker.d.ts

@@ -1,8 +1,9 @@
-import type { OutputManager } from "./outputManager.js";
-import type { Logger } from "../../logger.js";
 import type { WingmanAgentConfig } from "@/agent/config/agentConfig.js";
 import type { WingmanAgent } from "@/types/agents.js";
-import { SessionManager } from "./sessionManager.js";
+import type { Logger } from "../../logger.js";
+import type { WingmanConfigType } from "../config/schema.js";
+import type { OutputManager } from "./outputManager.js";
+import type { SessionManager } from "./sessionManager.js";
 export interface AgentInvokerOptions {
     workspace?: string;
     configDir?: string;
@@ -79,9 +80,47 @@ export type ExternalOutputMount = {
     virtualPath: string | null;
     absolutePath: string | null;
 };
+export type SummarizationMiddlewareSettings = {
+    maxTokensBeforeSummary: number;
+    messagesToKeep: number;
+};
+export type ModelRetryMiddlewareSettings = {
+    maxRetries: number;
+    backoffFactor: number;
+    initialDelayMs: number;
+    maxDelayMs: number;
+    jitter: boolean;
+    onFailure: "continue" | "error";
+};
+export type ToolRetryMiddlewareSettings = ModelRetryMiddlewareSettings & {
+    tools?: string[];
+};
+export type HumanInTheLoopSettings = {
+    interruptOn: Record<string, boolean | {
+        allowedDecisions: Array<"approve" | "edit" | "reject">;
+        description?: string;
+        argsSchema?: Record<string, any>;
+    }>;
+};
 export declare const resolveExecutionWorkspace: (workspace: string, workdir?: string | null) => string;
 export declare const toWorkspaceAliasVirtualPath: (absolutePath: string) => string | null;
 export declare const resolveExternalOutputMount: (workspace: string, workdir?: string | null, defaultOutputDir?: string | null) => ExternalOutputMount;
+export declare const resolveSummarizationMiddlewareSettings: (config: WingmanConfigType) => SummarizationMiddlewareSettings | null;
+export declare const resolveModelRetryMiddlewareSettings: (config: WingmanConfigType) => ModelRetryMiddlewareSettings | null;
+export declare const resolveToolRetryMiddlewareSettings: (config: WingmanConfigType) => ToolRetryMiddlewareSettings | null;
+export declare const resolveHumanInTheLoopSettings: (config: WingmanConfigType) => HumanInTheLoopSettings | null;
+export declare const configureDeepAgentSummarizationMiddleware: (agent: any, settings: SummarizationMiddlewareSettings | null, model?: any) => void;
+type ToolEventContext = {
+    event: "on_tool_start" | "on_tool_end";
+    toolName: string;
+};
+export declare const detectToolEventContext: (chunk: unknown) => ToolEventContext | null;
+export declare const chunkHasAssistantText: (chunk: unknown) => boolean;
+export declare const selectStreamingFallbackText: (sessionMessages: Array<{
+    role?: unknown;
+    createdAt?: unknown;
+    content?: unknown;
+}>, invocationStartedAt: number, windowMs?: number) => string | undefined;
 export declare class AgentInvoker {
     private loader;
     private outputManager;

package/dist/cli/core/agentInvoker.js

@@ -1,15 +1,16 @@
-import { CompositeBackend, FilesystemBackend, createDeepAgent } from "deepagents";
 import { existsSync } from "node:fs";
 import { isAbsolute, join, normalize, sep } from "node:path";
+import { CompositeBackend, FilesystemBackend, createDeepAgent } from "deepagents";
+import { modelRetryMiddleware, summarizationMiddleware, toolRetryMiddleware } from "langchain";
 import { v4 } from "uuid";
-import { AgentLoader } from "../../agent/config/agentLoader.js";
-import { WingmanConfigLoader } from "../config/loader.js";
+import { MCPClientManager } from "../../agent/config/mcpClientManager.js";
 import { additionalMessageMiddleware } from "../../agent/middleware/additional-messages.js";
-import { createHooksMiddleware } from "../../agent/middleware/hooks.js";
 import { mergeHooks } from "../../agent/middleware/hooks/merger.js";
+import { createHooksMiddleware } from "../../agent/middleware/hooks.js";
 import { mediaCompatibilityMiddleware } from "../../agent/middleware/media-compat.js";
-import { MCPClientManager } from "../../agent/config/mcpClientManager.js";
 import { getBundledSkillsPath } from "../../agent/uiRegistry.js";
+import { AgentLoader } from "../../agent/config/agentLoader.js";
+import { WingmanConfigLoader } from "../config/loader.js";
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -22,6 +23,7 @@ function _define_property(obj, key, value) {
 }
 const WORKDIR_VIRTUAL_PATH = "/workdir/";
 const OUTPUT_VIRTUAL_PATH = "/output/";
+const DEFAULT_DEEPAGENT_MODEL = "claude-sonnet-4-5-20250929";
 const isPathWithinRoot = (targetPath, rootPath)=>{
     const normalizedTarget = normalize(targetPath);
     const normalizedRoot = normalize(rootPath);
@@ -54,6 +56,101 @@ const resolveExternalOutputMount = (workspace, workdir, defaultOutputDir)=>{
         absolutePath: null
     };
 };
+const resolveSummarizationMiddlewareSettings = (config)=>{
+    if (!config.summarization?.enabled) return null;
+    return {
+        maxTokensBeforeSummary: config.summarization.maxTokensBeforeSummary,
+        messagesToKeep: config.summarization.messagesToKeep
+    };
+};
+const resolveModelRetryMiddlewareSettings = (config)=>{
+    if (!config.modelRetry?.enabled) return null;
+    return {
+        maxRetries: config.modelRetry.maxRetries,
+        backoffFactor: config.modelRetry.backoffFactor,
+        initialDelayMs: config.modelRetry.initialDelayMs,
+        maxDelayMs: config.modelRetry.maxDelayMs,
+        jitter: config.modelRetry.jitter,
+        onFailure: config.modelRetry.onFailure
+    };
+};
+const resolveToolRetryMiddlewareSettings = (config)=>{
+    if (!config.toolRetry?.enabled) return null;
+    return {
+        maxRetries: config.toolRetry.maxRetries,
+        backoffFactor: config.toolRetry.backoffFactor,
+        initialDelayMs: config.toolRetry.initialDelayMs,
+        maxDelayMs: config.toolRetry.maxDelayMs,
+        jitter: config.toolRetry.jitter,
+        onFailure: config.toolRetry.onFailure,
+        ...config.toolRetry.tools && config.toolRetry.tools.length > 0 ? {
+            tools: config.toolRetry.tools
+        } : {}
+    };
+};
+const resolveHumanInTheLoopSettings = (config)=>{
+    if (!config.humanInTheLoop?.enabled) return null;
+    const interruptOn = config.humanInTheLoop.interruptOn || {};
+    if (0 === Object.keys(interruptOn).length) return null;
+    return {
+        interruptOn
+    };
+};
+const configureDeepAgentSummarizationMiddleware = (agent, settings, model)=>{
+    const middleware = agent?.options?.middleware;
+    if (!Array.isArray(middleware)) return;
+    const index = middleware.findIndex((entry)=>entry?.name === "SummarizationMiddleware");
+    if (index < 0) return;
+    if (!settings) return void middleware.splice(index, 1);
+    middleware[index] = summarizationMiddleware({
+        model: model || DEFAULT_DEEPAGENT_MODEL,
+        trigger: {
+            tokens: settings.maxTokensBeforeSummary
+        },
+        keep: {
+            messages: settings.messagesToKeep
+        }
+    });
+};
+const detectToolEventContext = (chunk)=>{
+    if (!chunk || "object" != typeof chunk || Array.isArray(chunk)) return null;
+    const eventChunk = chunk;
+    if ("on_tool_start" !== eventChunk.event && "on_tool_end" !== eventChunk.event) return null;
+    const toolName = "string" == typeof eventChunk.name && eventChunk.name.trim() ? eventChunk.name.trim() : "unknown";
+    return {
+        event: eventChunk.event,
+        toolName
+    };
+};
+const chunkHasAssistantText = (chunk)=>{
+    if (!chunk || "object" != typeof chunk || Array.isArray(chunk)) return false;
+    const eventChunk = chunk;
+    const eventName = "string" == typeof eventChunk.event ? eventChunk.event : void 0;
+    if ("on_chat_model_stream" === eventName) {
+        const data = eventChunk.data && "object" == typeof eventChunk.data ? eventChunk.data : null;
+        const messageChunk = data?.chunk || data?.message;
+        const content = messageChunk?.content;
+        if ("string" == typeof content) return content.length > 0;
+        if (Array.isArray(content)) return content.some((part)=>part && "object" == typeof part && "text" === part.type && "string" == typeof part.text && part.text.length > 0);
+    }
+    if ("on_llm_stream" === eventName) {
+        const data = eventChunk.data && "object" == typeof eventChunk.data ? eventChunk.data : null;
+        const llmChunk = data?.chunk && "object" == typeof data.chunk ? data.chunk : null;
+        return "string" == typeof llmChunk?.text && llmChunk.text.length > 0;
+    }
+    return false;
+};
+const selectStreamingFallbackText = (sessionMessages, invocationStartedAt, windowMs = 1000)=>{
+    for(let i = sessionMessages.length - 1; i >= 0; i -= 1){
+        const message = sessionMessages[i];
+        if (!message || "object" != typeof message) continue;
+        if ("assistant" === message.role) {
+            if ("number" == typeof message.createdAt && !(message.createdAt < invocationStartedAt - windowMs)) {
+                if ("string" == typeof message.content && message.content.trim()) return message.content;
+            }
+        }
+    }
+};
 class AgentInvoker {
     findAllAgents() {
         const agentConfigs = this.loader.loadAllAgentConfigs();
@@ -63,7 +160,11 @@ class AgentInvoker {
         return await this.loader.loadAgent(name);
     }
     async invokeAgent(agentName, prompt, sessionId, attachments, options) {
+        const invocationStartedAt = Date.now();
         let cancellationHandled = false;
+        let activeToolName = null;
+        let lastToolName = null;
+        let sawAssistantText = false;
         const isCancelled = ()=>options?.signal?.aborted === true;
         try {
             const executionWorkspace = resolveExecutionWorkspace(this.workspace, this.workdir);
@@ -113,6 +214,29 @@ class AgentInvoker {
                     skillsDirectory
                 })
             ];
+            const summarizationSettings = resolveSummarizationMiddlewareSettings(this.wingmanConfig);
+            const modelRetrySettings = resolveModelRetryMiddlewareSettings(this.wingmanConfig);
+            if (modelRetrySettings) middleware.push(modelRetryMiddleware({
+                maxRetries: modelRetrySettings.maxRetries,
+                backoffFactor: modelRetrySettings.backoffFactor,
+                initialDelayMs: modelRetrySettings.initialDelayMs,
+                maxDelayMs: modelRetrySettings.maxDelayMs,
+                jitter: modelRetrySettings.jitter,
+                onFailure: modelRetrySettings.onFailure
+            }));
+            const toolRetrySettings = resolveToolRetryMiddlewareSettings(this.wingmanConfig);
+            if (toolRetrySettings) middleware.push(toolRetryMiddleware({
+                maxRetries: toolRetrySettings.maxRetries,
+                backoffFactor: toolRetrySettings.backoffFactor,
+                initialDelayMs: toolRetrySettings.initialDelayMs,
+                maxDelayMs: toolRetrySettings.maxDelayMs,
+                jitter: toolRetrySettings.jitter,
+                onFailure: toolRetrySettings.onFailure,
+                ...toolRetrySettings.tools ? {
+                    tools: toolRetrySettings.tools
+                } : {}
+            }));
+            const hitlSettings = resolveHumanInTheLoopSettings(this.wingmanConfig);
             if (mergedHooks) {
                 this.logger.debug(`Adding hooks middleware with ${mergedHooks.PreToolUse?.length || 0} PreToolUse hooks, ${mergedHooks.PostToolUse?.length || 0} PostToolUse hooks, and ${mergedHooks.Stop?.length || 0} Stop hooks`);
                 middleware.push(createHooksMiddleware(mergedHooks, executionWorkspace, hookSessionId, this.logger));
@@ -159,10 +283,12 @@ class AgentInvoker {
                         virtualMode: true
                     }), backendOverrides),
                 middleware: middleware,
+                interruptOn: hitlSettings?.interruptOn,
                 skills: skillsSources,
                 subagents: targetAgent.subagents || [],
                 checkpointer: checkpointer
             });
+            configureDeepAgentSummarizationMiddleware(standaloneAgent, summarizationSettings, targetAgent.model);
             this.logger.debug("Agent created, sending message");
             const userContent = buildUserContent(prompt, attachments, targetAgent.model);
             if (this.sessionManager && sessionId) {
@@ -183,6 +309,13 @@ class AgentInvoker {
                     signal: options?.signal
                 });
                 for await (const chunk of stream){
+                    if (!sawAssistantText && chunkHasAssistantText(chunk)) sawAssistantText = true;
+                    const toolEvent = detectToolEventContext(chunk);
+                    if (toolEvent) {
+                        lastToolName = toolEvent.toolName;
+                        if ("on_tool_start" === toolEvent.event) activeToolName = toolEvent.toolName;
+                        else if (activeToolName === toolEvent.toolName) activeToolName = null;
+                    }
                     if (isCancelled()) {
                         cancellationHandled = true;
                         this.logger.info("Agent invocation cancelled");
@@ -203,8 +336,27 @@ class AgentInvoker {
                     };
                 }
                 this.logger.info("Agent streaming completed successfully");
+                let fallbackText;
+                if (!sawAssistantText && this.sessionManager && sessionId) try {
+                    const sessionMessages = await this.sessionManager.listMessages(sessionId);
+                    fallbackText = selectStreamingFallbackText(sessionMessages, invocationStartedAt);
+                } catch (stateError) {
+                    this.logger.debug("Failed to derive streaming fallback text from session state", stateError);
+                }
+                if (!sawAssistantText && !fallbackText) {
+                    const emptyResponseMessage = "Model completed without a response. Check provider logs for request errors.";
+                    this.logger.warn(emptyResponseMessage);
+                    this.outputManager.emitAgentError(emptyResponseMessage);
+                    return {
+                        blocked: true,
+                        reason: "empty_stream_response"
+                    };
+                }
                 this.outputManager.emitAgentComplete({
-                    streaming: true
+                    streaming: true,
+                    ...fallbackText ? {
+                        fallbackText
+                    } : {}
                 });
                 return {
                     streaming: true
@@ -252,8 +404,10 @@ class AgentInvoker {
                     cancelled: true
                 };
             }
-            this.logger.error(`Agent invocation failed: ${error instanceof Error ? error.message : String(error)}`);
-            this.outputManager.emitAgentError(error);
+            this.logger.error(`Agent invocation failed: ${error instanceof Error ? error.message : String(error)}${activeToolName ? ` (while running tool "${activeToolName}")` : lastToolName ? ` (last tool: "${lastToolName}")` : ""}`);
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            const errorWithToolContext = activeToolName ? `${errorMessage} (while running tool "${activeToolName}")` : lastToolName ? `${errorMessage} (last tool: "${lastToolName}")` : errorMessage;
+            this.outputManager.emitAgentError(errorWithToolContext);
             throw error;
         } finally{
             if (this.mcpManager) {
@@ -478,4 +632,4 @@ function buildAttachmentPreview(attachments) {
     if (hasImage) return "[image]";
     return "";
 }
-export { AgentInvoker, OUTPUT_VIRTUAL_PATH, WORKDIR_VIRTUAL_PATH, buildUserContent, resolveExecutionWorkspace, resolveExternalOutputMount, toWorkspaceAliasVirtualPath };
+export { AgentInvoker, OUTPUT_VIRTUAL_PATH, WORKDIR_VIRTUAL_PATH, buildUserContent, chunkHasAssistantText, configureDeepAgentSummarizationMiddleware, detectToolEventContext, resolveExecutionWorkspace, resolveExternalOutputMount, resolveHumanInTheLoopSettings, resolveModelRetryMiddlewareSettings, resolveSummarizationMiddlewareSettings, resolveToolRetryMiddlewareSettings, selectStreamingFallbackText, toWorkspaceAliasVirtualPath };

package/dist/cli/core/sessionManager.cjs

@@ -68,6 +68,8 @@ class SessionManager {
 
       CREATE INDEX IF NOT EXISTS idx_sessions_updated ON sessions(updated_at DESC);
       CREATE INDEX IF NOT EXISTS idx_sessions_agent ON sessions(agent_name);
+      CREATE INDEX IF NOT EXISTS idx_sessions_status_updated ON sessions(status, updated_at DESC);
+      CREATE INDEX IF NOT EXISTS idx_sessions_status_agent_updated ON sessions(status, agent_name, updated_at DESC);
     `);
     }
     createSession(agentName, name) {
@@ -407,13 +409,38 @@ function extractContentBlocks(entry) {
 }
 function extractMessageContent(entry, blocks = []) {
     if (!entry || "object" != typeof entry) return "";
-    if ("string" == typeof entry.content) return entry.content;
-    if ("string" == typeof entry?.kwargs?.content) return entry.kwargs.content;
-    if ("string" == typeof entry?.additional_kwargs?.content) return entry.additional_kwargs.content;
-    if ("string" == typeof entry?.data?.content) return entry.data.content;
-    if (blocks.length > 0) return blocks.filter((block)=>block && "text" === block.type && block.text).map((block)=>block.text).join("");
+    const candidates = [
+        entry.content,
+        entry?.kwargs?.content,
+        entry?.additional_kwargs?.content,
+        entry?.data?.content
+    ];
+    for (const candidate of candidates){
+        const extracted = extractTextContent(candidate);
+        if (extracted) return extracted;
+    }
+    if (blocks.length > 0) return extractTextContent(blocks);
+    return "";
+}
+function extractTextContent(value, depth = 0) {
+    if (depth > 5 || null == value) return "";
+    if ("string" == typeof value) return value;
+    if (Array.isArray(value)) return value.map((entry)=>extractTextContent(entry, depth + 1)).filter((entry)=>entry.length > 0).join("");
+    if ("object" != typeof value) return "";
+    const record = value;
+    if ("string" == typeof record.text) return record.text;
+    if (record.text && "object" == typeof record.text && "string" == typeof record.text.value) return record.text.value;
+    if ("string" == typeof record.output_text) return record.output_text;
+    if ("string" == typeof record.input_text) return record.input_text;
+    if ("string" == typeof record.value && isTextLikeContentType(record.type)) return record.value;
+    if ("content" in record) return extractTextContent(record.content, depth + 1);
     return "";
 }
+function isTextLikeContentType(type) {
+    if ("string" != typeof type) return false;
+    const normalized = type.toLowerCase();
+    return "text" === normalized || "input_text" === normalized || "output_text" === normalized || "text_delta" === normalized;
+}
 function isToolMessage(entry) {
     if (!entry || "object" != typeof entry) return false;
     const role = entry.role || entry?.kwargs?.role || entry?.additional_kwargs?.role;