@webmcp-auto-ui/agent 2.5.36 → 2.5.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webmcp-auto-ui/agent",
-  "version": "2.5.36",
+  "version": "2.5.38",
   "description": "LLM agent loop + remote/WASM/local providers + MCP wrapper",
   "license": "AGPL-3.0-or-later",
   "type": "module",

package/src/autoui-server.ts

@@ -54,6 +54,40 @@ When the user wants to browse, search, or pick a recipe — for example "show me
 Call widget_display({name: "recipe-browser", params: {recipes: [...], layout: "list"}}). The widget emits a bubbling 'widget:interact' CustomEvent with detail={action:"pick", payload: recipe} when the user clicks Pick.
 `;
 
+// Inline recipe for tool-browser (real vanilla widget)
+const toolBrowserRecipe = `---
+widget: tool-browser
+description: Interactive tool browser with search/filters/preview. Use when the user wants to browse, search, or pick a tool from connected servers.
+group: rich
+schema:
+  type: object
+  required:
+    - tools
+  properties:
+    tools:
+      type: array
+      description: List of BrowsableTool objects (name, description, server, inputSchema, ...).
+      items:
+        type: object
+    filters:
+      type: object
+      description: Initial filters
+      properties:
+        q:
+          type: string
+    layout:
+      type: string
+      enum: [list, grid]
+      description: Default layout (default list)
+---
+
+## When to use
+When the user wants to browse, search, or pick a tool — for example "show me the available tools".
+
+## How to use
+Call widget_display({name: "tool-browser", params: {tools: [...]}}). The widget emits a bubbling 'widget:interact' CustomEvent on user actions.
+`;
+
 // ---------------------------------------------------------------------------
 // Inline recipes (frontmatter + body)
 // ---------------------------------------------------------------------------
@@ -306,24 +340,37 @@ schema:
     title:
       type: string
     columns:
+      description: Column definitions. Also accepts plain strings ["A","B"]. Alias "headers" is also accepted.
       type: array
       items:
-        type: object
-        required:
-          - key
-          - label
-        properties:
-          key:
-            type: string
-          label:
-            type: string
-          align:
-            type: string
-            enum: [left, center, right]
+        oneOf:
+          - type: string
+          - type: object
+            required:
+              - key
+              - label
+            properties:
+              key:
+                type: string
+              label:
+                type: string
+              align:
+                type: string
+                enum: [left, center, right]
+    headers:
+      description: Alias for columns. Accepts plain strings ["A","B"] or full column objects.
+      type: array
+      items:
+        oneOf:
+          - type: string
+          - type: object
     rows:
+      description: Array of row objects OR array of arrays (positionally mapped to columns/headers keys).
       type: array
       items:
-        type: object
+        oneOf:
+          - type: object
+          - type: array
 ---
 
 ## When to use
@@ -331,6 +378,7 @@ Display structured data in a table with column sorting.
 
 ## How to use
 Call widget_display({name: "data-table", params: {columns: [{key:"name",label:"Nom"}], rows: [{name:"Alice"}]}}).
+Rows can also be arrays: {headers:["name","age"], rows:[["Alice",30],["Bob",25]]}.
 `,
 
   // ── timeline ─────────────────────────────────────────────────────────────
@@ -545,8 +593,6 @@ schema:
       type: array
       items:
         type: object
-        required:
-          - values
         properties:
           label:
             type: string
@@ -554,6 +600,9 @@ schema:
             type: array
             items:
               type: number
+          value:
+            type: number
+            description: Scalar shorthand — treated as values:[value]. Use for single-point series.
           color:
             type: string
 ---
@@ -563,6 +612,7 @@ Pour des graphiques multi-series (barres, lignes, aires, camembert, donut).
 
 ## How to use
 Call widget_display({name: "chart-rich", params: {type: "bar", labels: ["Q1","Q2"], data: [{label:"Ventes", values:[10,20]}]}}).
+Single-point shorthand: data: [{label:"A", value:5}, {label:"B", value:8}].
 `,
 
   // ── cards ────────────────────────────────────────────────────────────────
@@ -571,13 +621,30 @@ widget: cards
 description: Card grid (results, records, entities).
 schema:
   type: object
-  required:
-    - cards
   properties:
     title:
       type: string
     cards:
       type: array
+      description: List of cards (alias: items)
+      items:
+        type: object
+        required:
+          - title
+        properties:
+          title:
+            type: string
+          description:
+            type: string
+          subtitle:
+            type: string
+          tags:
+            type: array
+            items:
+              type: string
+    items:
+      type: array
+      description: Alias for cards — use either cards or items
       items:
         type: object
         required:
@@ -773,12 +840,11 @@ Call widget_display({name: "carousel", params: {slides: [{src: "https://...", ti
   // ── stat-card ────────────────────────────────────────────────────────────
   `---
 widget: stat-card
-description: Enriched KPI with unit, delta, and colored variant (success/warning/error/info).
+description: >
+  Enriched KPI card with unit, delta, icon, and colored variant.
+  Supports single card OR a grid of N cards via the "items" array.
 schema:
   type: object
-  required:
-    - label
-    - value
   properties:
     label:
       type: string
@@ -787,6 +853,11 @@ schema:
     unit:
       type: string
       description: Unite affichee apres la valeur (ex "%", "km")
+    icon:
+      type: string
+      description: >
+        Emoji, unicode symbol, or keyword (e.g. "fire", "trending-up", "star").
+        Unknown keywords fall back silently to ℹ.
     delta:
       type: string
       description: Variation affichee (ex "+12%")
@@ -798,13 +869,47 @@ schema:
     variant:
       type: string
       enum: [default, success, warning, error, info]
+    items:
+      type: array
+      description: >
+        Grid mode: pass an array of stat items to render N cards side by side.
+        When present, top-level label/value/icon are ignored.
+      items:
+        type: object
+        required:
+          - label
+          - value
+        properties:
+          label:
+            type: string
+          value:
+            type: string
+          unit:
+            type: string
+          icon:
+            type: string
+          delta:
+            type: string
+          trend:
+            type: string
+            enum: [up, down, flat]
+          previousValue:
+            type: string
+          variant:
+            type: string
+            enum: [default, success, warning, error, info]
 ---
 
 ## When to use
-Pour un KPI enrichi avec delta, unite et variante de couleur.
+Pour un KPI enrichi avec delta, unite, icone et variante de couleur.
+Pour plusieurs KPIs cote a cote, utiliser le champ "items".
 
 ## How to use
-Call widget_display({name: "stat-card", params: {label: "Uptime", value: "99.9", unit: "%", trend: "up", variant: "success"}}).
+Single card:
+Call widget_display({name: "stat-card", params: {label: "Uptime", value: "99.9", unit: "%", trend: "up", variant: "success", icon: "🟢"}}).
+
+Grid of cards:
+Call widget_display({name: "stat-card", params: {items: [{label: "CPU", value: "42", unit: "%", icon: "💻", variant: "info"}, {label: "RAM", value: "8", unit: "GB", icon: "🗄", variant: "warning"}]}}).
 `,
 
   // ── grid-data ────────────────────────────────────────────────────────────
@@ -893,6 +998,78 @@ Pour des visualisations custom, animations, ou prototypes interactifs en JS pur.
 
 ## How to use
 Call widget_display({name: "js-sandbox", params: {code: "document.getElementById('root').innerHTML = '<h1>Hello</h1>'"}}).
+`,
+
+  // ── map ─────────────────────────────────────────────────────────────────
+  `---
+widget: map
+description: Interactive geospatial map (MapLibre GL, light theme) with markers and/or GeoJSON overlay. Auto-fits view to data via Turf bbox.
+group: rich
+schema:
+  type: object
+  properties:
+    markers:
+      type: array
+      description: Points to display as map markers. Aliases tolerated per marker — \`lng\` accepted for \`lon\`, \`popup\` accepted for \`label\`.
+      items:
+        type: object
+        required:
+          - lat
+        properties:
+          lat:
+            type: number
+          lon:
+            type: number
+            description: Longitude. Alias \`lng\` also accepted.
+          label:
+            type: string
+            description: Popup text shown when the marker is clicked. Alias \`popup\` also accepted.
+          color:
+            type: string
+            description: CSS color for the marker pin (defaults to blue).
+    geojson:
+      type: object
+      description: GeoJSON Feature or FeatureCollection rendered as fill/line/circle layers.
+    center:
+      description: "Initial center. Either \`[lon, lat]\` array (MapLibre/Turf convention) OR object \`{lat, lon}\` / \`{lat, lng}\`. If omitted, computed from data via Turf bbox."
+    zoom:
+      type: number
+      description: Initial zoom. If omitted, derived by fitting the bbox of the data.
+    height:
+      type: string
+      description: CSS height of the map container (default "400px").
+    cluster:
+      type: boolean
+      description: When true, group nearby markers into clusters (MapLibre native clustering, clusterRadius 50). Click a cluster to zoom in.
+    tileLayers:
+      type: array
+      description: Raster tile overlays drawn on top of the base style (e.g. NASA GIBS imagery).
+      items:
+        type: object
+        required:
+          - url
+        properties:
+          name:
+            type: string
+            description: Optional human-readable layer name.
+          url:
+            type: string
+            description: Tile URL template with \`{z}/{x}/{y}\` placeholders.
+          opacity:
+            type: number
+            description: Layer opacity 0..1 (default 1).
+  required: []
+---
+
+## When to use
+Pour visualiser des donnees geospatiales : positions, itineraires, polygones (zones, regions). Choisir cette carte pour points + popups + overlays GeoJSON sur fond clair (Carto Positron).
+
+## How to use
+Call widget_display({name: "map", params: {markers: [{lat: 48.85, lon: 2.35, label: "Paris"}]}}).
+
+## Common mistakes
+- Coordonnees au format [lon, lat] (PAS [lat, lon]) pour le champ \`center\` et pour les Point GeoJSON — convention Turf/MapLibre.
+- Ne PAS fournir un \`zoom\` sans \`center\` si tu veux l'auto-fit : laisse les deux vides pour que la vue s'adapte automatiquement aux donnees.
 `,
 
 `---
@@ -930,6 +1107,7 @@ Call widget_display({name: "chat-input", params: {placeholder: "Your reply..."}}
 const _NOTEBOOK_RECIPE_SOURCES: string[] = [
   notebookRecipe as string,
   recipeBrowserRecipe,
+  toolBrowserRecipe,
 ];
 export const NATIVE_WIDGET_NAMES = [...RECIPES, ..._NOTEBOOK_RECIPE_SOURCES].map(r => {
   const match = r.match(/widget:\s*(\S+)/);
@@ -955,6 +1133,9 @@ autoui.registerWidget(notebookRecipe as string, renderNotebook as any);
 // Recipe browser — resolved by WidgetRenderer as <auto-recipe-browser> custom element
 autoui.registerWidget(recipeBrowserRecipe, undefined);
 
+// Tool browser — resolved by WidgetRenderer as <auto-tool-browser> custom element
+autoui.registerWidget(toolBrowserRecipe, undefined);
+
 // Register flow recipes (multi-step procedures) from the global recipe registry
 // that declare this server (autoui) in their frontmatter.
 for (const [key, rawMd] of Object.entries(RAW_RECIPES)) {

package/src/discovery-cache.ts

@@ -6,6 +6,7 @@
 
 import type { ProviderTool } from './types.js';
 import type { PipelineTrace } from './pipeline-trace.js';
+import { sanitizeServerName } from './tool-layers.js';
 
 /** Tool names that are resolved locally from cache — hidden from user-facing browsers. */
 export const DISCOVERY_TOOL_NAMES = new Set(['list_recipes', 'search_recipes', 'get_recipe', 'list_tools', 'search_tools']);
@@ -30,14 +31,21 @@ export interface ServerCache {
 export class DiscoveryCache {
   private servers = new Map<string, ServerCache>();
 
+  /** Normalize a server prefix so register/lookup share the same key shape
+   *  regardless of casing, spaces, or other artifacts. Mirrors the
+   *  sanitization applied to tool name prefixes by tool-layers. */
+  private norm(serverPrefix: string): string {
+    return sanitizeServerName(serverPrefix);
+  }
+
   /** Register a server's recipes and tools */
   register(serverPrefix: string, data: ServerCache): void {
-    this.servers.set(serverPrefix, data);
+    this.servers.set(this.norm(serverPrefix), data);
   }
 
   /** Check if we have cached data for a server prefix */
   has(serverPrefix: string): boolean {
-    return this.servers.has(serverPrefix);
+    return this.servers.has(this.norm(serverPrefix));
   }
 
   /** Clear all cached data */
@@ -45,7 +53,7 @@ export class DiscoveryCache {
     this.servers.clear();
   }
 
-  /** All registered server prefixes */
+  /** All registered server prefixes (normalized) */
   serverPrefixes(): string[] {
     return [...this.servers.keys()];
   }
@@ -70,22 +78,22 @@ export class DiscoveryCache {
 
   /** Recipe count for a specific server */
   recipeCount(serverPrefix: string): number {
-    return this.servers.get(serverPrefix)?.recipes.length ?? 0;
+    return this.servers.get(this.norm(serverPrefix))?.recipes.length ?? 0;
   }
 
   /** Get the cached recipes for a specific server prefix. */
   recipesFor(serverPrefix: string): CachedRecipe[] {
-    return this.servers.get(serverPrefix)?.recipes ?? [];
+    return this.servers.get(this.norm(serverPrefix))?.recipes ?? [];
   }
 
   /** Tool count for a specific server */
   toolCount(serverPrefix: string): number {
-    return this.servers.get(serverPrefix)?.tools.length ?? 0;
+    return this.servers.get(this.norm(serverPrefix))?.tools.length ?? 0;
   }
 
   /** Tool count excluding discovery tools (hidden from user-facing browsers) */
   browsableToolCount(serverPrefix: string): number {
-    const tools = this.servers.get(serverPrefix)?.tools ?? [];
+    const tools = this.servers.get(this.norm(serverPrefix))?.tools ?? [];
     return tools.filter(t => !DISCOVERY_TOOL_NAMES.has(t.name)).length;
   }
 
@@ -103,7 +111,7 @@ export class DiscoveryCache {
     params: Record<string, unknown>,
     trace?: PipelineTrace,
   ): string | null {
-    const cache = this.servers.get(serverPrefix);
+    const cache = this.servers.get(this.norm(serverPrefix));
     if (!cache) return null;
 
     switch (realToolName) {

package/src/index.ts

@@ -32,7 +32,7 @@ export { GemmaProvider } from './providers/gemma.js';
 export type { GemmaProviderOptions, GemmaStatus } from './providers/gemma.js';
 
 // Agent loop
-export { runAgentLoop, toProviderTools, fromMcpTools, trimConversationHistory } from './loop.js';
+export { runAgentLoop, toProviderTools, fromMcpTools, trimConversationHistory, pruneOrphanToolResults } from './loop.js';
 export { buildSystemPrompt, buildSystemPromptWithAliases } from './prompts/index.js';
 export type { SystemPromptResult } from './prompts/index.js';
 export type { AgentLoopOptions } from './loop.js';
@@ -41,7 +41,7 @@ export type { AgentLoopOptions } from './loop.js';
 export { autoui, NATIVE_WIDGET_NAMES } from './autoui-server.js';
 
 // Tool layers
-export { buildToolsFromLayers, buildDiscoveryTools, buildDiscoveryToolsWithAliases, activateServerTools, resolveCanonicalTools, toolAliasMap, flattenPathMaps, buildDiscoveryCache } from './tool-layers.js';
+export { buildToolsFromLayers, buildDiscoveryTools, buildDiscoveryToolsWithAliases, activateServerTools, resolveCanonicalTools, toolAliasMap, flattenPathMaps, buildDiscoveryCache, sanitizeServerName } from './tool-layers.js';
 export type { ToolLayer, McpLayer, WebMcpLayer, DiscoveryToolsResult, SchemaTransformOptions, BuildToolsResult, ProviderKind } from './tool-layers.js';
 
 // Discovery cache
@@ -88,7 +88,7 @@ export {
 } from './ort-version.js';
 
 // Trace observer — live visual trace for runAgentLoop
-export { createTraceObserver, type TraceObserver, type TraceObserverContext, type RoundTripDetail } from './trace-observer.js';
+export { createTraceObserver, type TraceObserver, type TraceObserverContext, type RoundTripDetail, type WidgetLineage } from './trace-observer.js';
 
 // Nano-RAG — context compaction
 export { ContextRAG, type ContextRAGOptions } from './nano-rag/mod.js';

package/src/loop.ts

@@ -12,6 +12,7 @@ import type { ToolLayer, SchemaTransformOptions } from './tool-layers.js';
 import { buildToolsFromLayers, buildDiscoveryToolsWithAliases, activateServerTools, toProviderTools, sanitizeServerName } from './tool-layers.js';
 import { buildSystemPromptWithAliases } from './prompts/index.js';
 import type { DiscoveryCache } from './discovery-cache.js';
+import { DISCOVERY_TOOL_NAMES } from './discovery-cache.js';
 import { unflattenParams, validateJsonSchema } from '@webmcp-auto-ui/core';
 import type { JsonSchema } from '@webmcp-auto-ui/core';
 import { autoRepairParams } from './auto-repair.js';
@@ -22,12 +23,6 @@ export { buildSystemPrompt } from './prompts/index.js';
 
 const MAX_RESULT_LEN = 10_000;
 
-/** Tool names (after prefix strip) that indicate discovery/exploration */
-const DISCOVERY_TOOL_NAMES = new Set([
-  'search_recipes', 'get_recipe', 'list_recipes', 'list_tables', 'describe_table',
-  'get_json_schemas', 'get_typescript_types', 'recall',
-]);
-
 function isDiscoveryTool(prefixedName: string): boolean {
   const match = prefixedName.match(/^.+?_(data|ui)_(.+)$/);
   if (!match) return false;
@@ -275,6 +270,10 @@ export async function runAgentLoop(
       }
     }
 
+    // Defensive: strip any orphan tool_result blocks before sending — strict
+    // providers (Anthropic) reject these with a 400.
+    pruneOrphanToolResults(messages);
+
     callbacks.onLLMRequest?.(messages, iterationTools);
     const t0 = performance.now();
     let streamingText = '';
@@ -360,14 +359,28 @@ export async function runAgentLoop(
         }
 
         // ── Intercept list_tools / search_tools (local pseudo-tools) ──
-        // These are read-only discovery operations — do NOT activate the server.
+        // The agent inspecting a server's tools is a strong signal of intent to use them.
+        // Activate the server now so the next iteration can invoke its data tools directly,
+        // matching the system-prompt promise that "list_tools → use it directly in STEP 3".
         if (toolMatch && (toolMatch[3] === 'list_tools' || toolMatch[3] === 'search_tools')) {
           const [, serverName, token, pseudoTool] = toolMatch;
           const protocol = tokenToProtocol(token);
           const layer = (options.layers ?? []).find(l => sanitizeServerName(l.serverName) === serverName && l.protocol === protocol);
           if (!layer) {
             result = 'Error: server not found';
-          } else if (pseudoTool === 'list_tools') {
+          } else {
+            const serverKey = `${serverName}_${token}`;
+            if (!activatedServers.has(serverKey)) {
+              try {
+                const act = activateServerTools(activeTools, layer, schemaOptions, trace);
+                activeTools = act.tools;
+                for (const [k, v] of act.pathMaps) localPathMaps.set(k, v);
+                activatedServers.add(serverKey);
+              } catch (e) {
+                trace.push('activate', name, `activation failed for ${serverKey}: ${e instanceof Error ? e.message : String(e)}`, 'error');
+              }
+            }
+          if (pseudoTool === 'list_tools') {
             const tools = layer.tools.map(t => ({ name: t.name, description: t.description, inputSchema: (t as any).inputSchema }));
             result = JSON.stringify(tools, null, 2);
           } else {
@@ -384,6 +397,7 @@ export async function runAgentLoop(
               result = JSON.stringify(tools, null, 2);
             }
           }
+          }
         } else {
         // ── Normal tool dispatch — activate server on first contact ──
 
@@ -456,10 +470,18 @@ export async function runAgentLoop(
             if (!client) {
               result = `Error: no MCP client available for tool ${name}`;
             } else {
-              const mcpResult = await client.callTool(realToolName, toolInput);
-              const textContent = mcpResult.content?.find((c: { type: string }) => c.type === 'text') as { text?: string } | undefined;
-              const rawResult = textContent?.text ?? JSON.stringify(mcpResult);
-              result = truncateResults ? truncateResult(rawResult, maxResultLength) : rawResult;
+              const mcpLayer = (options.layers ?? []).find(
+                l => sanitizeServerName(l.serverName) === serverName && l.protocol === 'mcp'
+              ) as { serverUrl?: string } | undefined;
+              const serverUrl = mcpLayer?.serverUrl;
+              if (!serverUrl) {
+                result = `Error: no serverUrl resolved for tool "${name}" (server "${serverName}"). Pass serverUrl on the matching ToolLayer.`;
+              } else {
+                const mcpResult = await (client as unknown as { callToolOn: (u: string, n: string, a: unknown) => Promise<{ content?: { type: string; text?: string }[] }> }).callToolOn(serverUrl, realToolName, toolInput);
+                const textContent = mcpResult.content?.find((c: { type: string }) => c.type === 'text') as { text?: string } | undefined;
+                const rawResult = textContent?.text ?? JSON.stringify(mcpResult);
+                result = truncateResults ? truncateResult(rawResult, maxResultLength) : rawResult;
+              }
             }
           } else if (protocol === 'webmcp') {
             // Intercept recall BEFORE hitting executeTool — use the local resultBuffer directly
@@ -539,6 +561,15 @@ export async function runAgentLoop(
                             const c = messages[i].content;
                             if (Array.isArray(c) && c.length === 0) messages.splice(i, 1);
                           }
+                          // Also drop pending tool_results in the current iteration whose
+                          // tool_use was just stripped from the assistant turn — otherwise
+                          // they become orphans when pushed at the end of the loop.
+                          for (let j = toolResults.length - 1; j >= 0; j--) {
+                            const b = toolResults[j];
+                            if (b.type === 'tool_result' && strippedIds.has((b as { tool_use_id: string }).tool_use_id)) {
+                              toolResults.splice(j, 1);
+                            }
+                          }
                         }
                         hasRendered = false;
                       }
@@ -663,18 +694,39 @@ export function trimConversationHistory(history: ChatMessage[], maxTokens: numbe
 
   // Remove orphaned tool_result blocks anywhere in history — strict providers
   // (Anthropic, etc.) reject tool_result blocks whose tool_use_id does not
-  // correspond to an earlier assistant tool_use. Head-only pruning misses
-  // internal orphans caused by mid-history trims.
+  // correspond to an earlier assistant tool_use.
+  pruneOrphanToolResults(trimmed);
+
+  // Ensure the first non-system message is role=user (API requirement)
+  while (trimmed.length > 0) {
+    const firstNonSystem = trimmed.findIndex(m => m.role !== 'system');
+    if (firstNonSystem >= 0 && trimmed[firstNonSystem].role === 'assistant') {
+      trimmed.splice(firstNonSystem, 1);
+    } else {
+      break;
+    }
+  }
+
+  return trimmed;
+}
+
+/**
+ * Strip orphan tool_result blocks (whose tool_use_id has no matching tool_use
+ * in any preceding assistant message) and drop user messages that become
+ * empty as a result. Mutates `messages` in place.
+ *
+ * Strict providers (Anthropic API) reject orphans with a 400. This guard
+ * runs immediately before each provider call.
+ */
+export function pruneOrphanToolResults(messages: ChatMessage[]): void {
   const validToolUseIds = new Set<string>();
-  for (let i = 0; i < trimmed.length; i++) {
-    const msg = trimmed[i];
-    // Collect tool_use ids from assistant messages seen so far
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
     if (msg.role === 'assistant' && Array.isArray(msg.content)) {
       for (const b of msg.content as any[]) {
         if (b?.type === 'tool_use' && typeof b.id === 'string') validToolUseIds.add(b.id);
       }
     }
-    // Filter out orphan tool_result blocks in user messages
     if (msg.role === 'user' && Array.isArray(msg.content)) {
       msg.content = (msg.content as any[]).filter(b => {
         if (b?.type !== 'tool_result') return true;
@@ -682,21 +734,8 @@ export function trimConversationHistory(history: ChatMessage[], maxTokens: numbe
       }) as any;
     }
   }
-  // Drop user messages that became empty after orphan-pruning
-  for (let i = trimmed.length - 1; i >= 0; i--) {
-    const c = trimmed[i].content;
-    if (Array.isArray(c) && c.length === 0) trimmed.splice(i, 1);
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const c = messages[i].content;
+    if (Array.isArray(c) && c.length === 0) messages.splice(i, 1);
   }
-
-  // Ensure the first non-system message is role=user (API requirement)
-  while (trimmed.length > 0) {
-    const firstNonSystem = trimmed.findIndex(m => m.role !== 'system');
-    if (firstNonSystem >= 0 && trimmed[firstNonSystem].role === 'assistant') {
-      trimmed.splice(firstNonSystem, 1);
-    } else {
-      break;
-    }
-  }
-
-  return trimmed;
 }

package/src/tool-layers.ts

@@ -261,10 +261,9 @@ export function toProviderTools(tools: McpToolDef[], schemaOptions?: SchemaTrans
         }
       }
     }
-    const schemaObj = schema as Record<string, unknown>;
-    // Ensure root schema has additionalProperties for strict mode
+    let schemaObj = schema as Record<string, unknown>;
     if (schemaObj.type === 'object' && !('additionalProperties' in schemaObj)) {
-      schemaObj.additionalProperties = false;
+      schemaObj = { ...schemaObj, additionalProperties: false };
     }
     return {
       name: t.name,

package/src/trace-observer.ts

@@ -42,6 +42,19 @@ export interface RoundTripDetail {
   originRecipe?: string;
 }
 
+/** Lineage of a widget mount: tool_calls in the same iteration that produced it. */
+export interface WidgetLineage {
+  widgetType: string;
+  widgetParams: Record<string, unknown>;
+  toolCalls: Array<{
+    serverName: string;
+    toolName: string;
+    args: Record<string, unknown>;
+    resultPreview?: string;
+  }>;
+  originRecipe?: string;
+}
+
 export interface TraceObserver {
   /** Partial AgentCallbacks to merge into runAgentLoop callbacks. */
   callbacks: Partial<AgentCallbacks>;
@@ -57,6 +70,8 @@ export interface TraceObserver {
   getLoadedRecipes: () => Map<string, string>;
   /** Current recipe context: name of the most recently loaded recipe via get_recipe, or undefined. */
   getCurrentRecipeContext: () => string | undefined;
+  /** Resolve the chain of tool_calls in the same iteration that produced a widget. */
+  getWidgetLineage: (blockIdOrTraceNodeId: string) => WidgetLineage | null;
 }
 
 type NodeKind =
@@ -552,11 +567,12 @@ export function createTraceObserver(ctx: TraceObserverContext): TraceObserver {
       scheduleFlush();
     },
 
-    onWidget: (type: string, _data: Record<string, unknown>, serverName?: string): void => {
+    onWidget: (type: string, data: Record<string, unknown>, serverName?: string): void => {
       const node = addNode('widget', `${serverName ?? '?'}/${type}`, {
         iterationId: currentIterationId,
         type,
         serverName,
+        data,
       });
       const parent = lastToolCallId ?? currentLlmRespId;
       if (parent) {
@@ -654,5 +670,66 @@ export function createTraceObserver(ctx: TraceObserverContext): TraceObserver {
     getCurrentRecipeContext(): string | undefined {
       return currentRecipeContext;
     },
+    getWidgetLineage(blockIdOrTraceNodeId: string): WidgetLineage | null {
+      let widgetNode = nodes.find(
+        (n) => n.kind === 'widget' && n.id === blockIdOrTraceNodeId,
+      );
+      if (!widgetNode) {
+        widgetNode = nodes.find((n) => {
+          if (n.kind !== 'widget') return false;
+          for (const v of Object.values(n.meta)) {
+            if (v === blockIdOrTraceNodeId) return true;
+            if (v && typeof v === 'object') {
+              for (const vv of Object.values(v as Record<string, unknown>)) {
+                if (vv === blockIdOrTraceNodeId) return true;
+              }
+            }
+          }
+          return false;
+        });
+      }
+      if (!widgetNode) return null;
+      const iter = iterationAncestor(widgetNode);
+      if (!iter) {
+        return {
+          widgetType: (widgetNode.meta.type as string) ?? '',
+          widgetParams: ((widgetNode.meta.data as Record<string, unknown>) ?? {}) as Record<string, unknown>,
+          toolCalls: [],
+        };
+      }
+      const callNodes = nodes
+        .filter(
+          (n) =>
+            n.kind === 'tool_call' &&
+            n.meta.iterationId === iter.id &&
+            n.startMs <= widgetNode!.startMs,
+        )
+        .sort((a, b) => a.startMs - b.startMs);
+      const toolCalls: WidgetLineage['toolCalls'] = [];
+      let originRecipe: string | undefined;
+      for (const c of callNodes) {
+        const detail = nodeDetails.get(c.id);
+        const toolName = detail?.toolName ?? '';
+        const serverName = (c.meta.serverName as string | undefined)
+          ?? (toolName.includes('_') ? toolName.split('_')[0]! : '');
+        const args = ((c.meta.args as Record<string, unknown>) ?? {}) as Record<string, unknown>;
+        let resultPreview: string | undefined;
+        if (detail?.toolResult !== undefined) {
+          resultPreview = detail.toolResult.slice(0, 4096);
+        }
+        toolCalls.push({ serverName, toolName, args, resultPreview });
+        if (toolName === 'get_recipe' || toolName.endsWith('_get_recipe')) {
+          const r = (args.recipe_name ?? args.name ?? args.id) as unknown;
+          if (typeof r === 'string') originRecipe = r;
+        }
+      }
+      const lineage: WidgetLineage = {
+        widgetType: (widgetNode.meta.type as string) ?? '',
+        widgetParams: ((widgetNode.meta.data as Record<string, unknown>) ?? {}) as Record<string, unknown>,
+        toolCalls,
+      };
+      if (originRecipe) lineage.originRecipe = originRecipe;
+      return lineage;
+    },
   };
 }