@mcp-abap-adt/llm-agent 2.2.1 → 2.4.0

package/dist/index.d.ts

@@ -14,5 +14,30 @@ export { type DeepSeekConfig, DeepSeekProvider, } from './llm-providers/deepseek
 export { type OpenAIConfig, OpenAIProvider } from './llm-providers/openai.js';
 export { type SapCoreAIConfig, SapCoreAIProvider, } from './llm-providers/sap-core-ai.js';
 export { type MCPClientConfig, MCPClientWrapper, type TransportType, } from './mcp/client.js';
+export { NoopToolCache } from './smart-agent/cache/noop-tool-cache.js';
+export { ToolCache } from './smart-agent/cache/tool-cache.js';
+export type { IToolCache } from './smart-agent/cache/types.js';
+export { ConfigWatcher, type ConfigWatcherOptions, type HotReloadableConfig, } from './smart-agent/config/config-watcher.js';
+export { HealthChecker, type HealthCheckerDeps, } from './smart-agent/health/health-checker.js';
+export type { CircuitBreakerStatus, HealthComponentStatus, HealthStatus, } from './smart-agent/health/types.js';
+export { type CounterSnapshot, type HistogramSnapshot, InMemoryMetrics, type MetricsSnapshot, } from './smart-agent/metrics/in-memory-metrics.js';
+export { NoopMetrics } from './smart-agent/metrics/noop-metrics.js';
+export type { ICounter, IHistogram, IMetrics, } from './smart-agent/metrics/types.js';
+export { QdrantRag, type QdrantRagConfig, } from './smart-agent/rag/qdrant-rag.js';
+export { type IQueryExpander, LlmQueryExpander, NoopQueryExpander, } from './smart-agent/rag/query-expander.js';
+export { LlmReranker } from './smart-agent/reranker/llm-reranker.js';
+export { NoopReranker } from './smart-agent/reranker/noop-reranker.js';
+export type { IReranker } from './smart-agent/reranker/types.js';
+export { CircuitBreaker, type CircuitBreakerConfig, type CircuitState, } from './smart-agent/resilience/circuit-breaker.js';
+export { CircuitBreakerEmbedder } from './smart-agent/resilience/circuit-breaker-embedder.js';
+export { CircuitBreakerLlm } from './smart-agent/resilience/circuit-breaker-llm.js';
+export { FallbackRag } from './smart-agent/resilience/fallback-rag.js';
+export { NoopSessionManager } from './smart-agent/session/noop-session-manager.js';
+export { SessionManager } from './smart-agent/session/session-manager.js';
+export type { ISessionManager } from './smart-agent/session/types.js';
+export { NoopTracer } from './smart-agent/tracer/noop-tracer.js';
+export type { ISpan, ITracer, SpanOptions, SpanStatus, } from './smart-agent/tracer/types.js';
+export { NoopValidator } from './smart-agent/validator/noop-validator.js';
+export type { IOutputValidator, ValidationResult, } from './smart-agent/validator/types.js';
 export type { AgentResponse, LLMProviderConfig, LLMResponse, Message, ToolCall, ToolResult, } from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,KAAK,EAAE,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EACL,cAAc,EACd,KAAK,oBAAoB,GAC1B,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EACL,aAAa,EACb,KAAK,mBAAmB,GACzB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,WAAW,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EACL,gBAAgB,EAChB,KAAK,sBAAsB,GAC5B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,cAAc,EACd,KAAK,oBAAoB,GAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,KAAK,eAAe,EACpB,iBAAiB,GAClB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EACL,KAAK,cAAc,EACnB,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,YAAY,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAG9E,OAAO,EACL,KAAK,eAAe,EACpB,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AAGxC,OAAO,EACL,KAAK,eAAe,EACpB,gBAAgB,EAChB,KAAK,aAAa,GACnB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,OAAO,EACP,QAAQ,EACR,UAAU,GACX,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -21,4 +21,28 @@ export { OpenAIProvider } from './llm-providers/openai.js';
 export { SapCoreAIProvider, } from './llm-providers/sap-core-ai.js';
 // MCP Client
 export { MCPClientWrapper, } from './mcp/client.js';
+export { NoopToolCache } from './smart-agent/cache/noop-tool-cache.js';
+export { ToolCache } from './smart-agent/cache/tool-cache.js';
+// Config
+export { ConfigWatcher, } from './smart-agent/config/config-watcher.js';
+export { HealthChecker, } from './smart-agent/health/health-checker.js';
+export { InMemoryMetrics, } from './smart-agent/metrics/in-memory-metrics.js';
+export { NoopMetrics } from './smart-agent/metrics/noop-metrics.js';
+// Qdrant RAG
+export { QdrantRag, } from './smart-agent/rag/qdrant-rag.js';
+// Query Expander
+export { LlmQueryExpander, NoopQueryExpander, } from './smart-agent/rag/query-expander.js';
+// Reranker
+export { LlmReranker } from './smart-agent/reranker/llm-reranker.js';
+export { NoopReranker } from './smart-agent/reranker/noop-reranker.js';
+// Resilience
+export { CircuitBreaker, } from './smart-agent/resilience/circuit-breaker.js';
+export { CircuitBreakerEmbedder } from './smart-agent/resilience/circuit-breaker-embedder.js';
+export { CircuitBreakerLlm } from './smart-agent/resilience/circuit-breaker-llm.js';
+export { FallbackRag } from './smart-agent/resilience/fallback-rag.js';
+export { NoopSessionManager } from './smart-agent/session/noop-session-manager.js';
+export { SessionManager } from './smart-agent/session/session-manager.js';
+// Tracer
+export { NoopTracer } from './smart-agent/tracer/noop-tracer.js';
+export { NoopValidator } from './smart-agent/validator/noop-validator.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,iEAAiE;AACjE,OAAO,EAAE,KAAK,EAAoB,MAAM,YAAY,CAAC;AACrD,OAAO,EACL,cAAc,GAEf,MAAM,6BAA6B,CAAC;AACrC,0CAA0C;AAC1C,OAAO,EAAE,SAAS,EAAwB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EACL,aAAa,GAEd,MAAM,4BAA4B,CAAC;AACpC,8DAA8D;AAC9D,mFAAmF;AACnF,OAAO,EAAE,WAAW,EAA0B,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EACL,gBAAgB,GAEjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,cAAc,GAEf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,iBAAiB,GAClB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,eAAe,EAAoB,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAEL,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAqB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC9E,gBAAgB;AAChB,2DAA2D;AAC3D,OAAO,EAEL,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AAExC,aAAa;AACb,OAAO,EAEL,gBAAgB,GAEjB,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,iEAAiE;AACjE,OAAO,EAAE,KAAK,EAAoB,MAAM,YAAY,CAAC;AACrD,OAAO,EACL,cAAc,GAEf,MAAM,6BAA6B,CAAC;AACrC,0CAA0C;AAC1C,OAAO,EAAE,SAAS,EAAwB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EACL,aAAa,GAEd,MAAM,4BAA4B,CAAC;AACpC,8DAA8D;AAC9D,mFAAmF;AACnF,OAAO,EAAE,WAAW,EAA0B,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EACL,gBAAgB,GAEjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,cAAc,GAEf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,iBAAiB,GAClB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,eAAe,EAAoB,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAEL,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAqB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC9E,gBAAgB;AAChB,2DAA2D;AAC3D,OAAO,EAEL,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AAExC,aAAa;AACb,OAAO,EAEL,gBAAgB,GAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAG9D,SAAS;AACT,OAAO,EACL,aAAa,GAGd,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,aAAa,GAEd,MAAM,wCAAwC,CAAC;AAOhD,OAAO,EAGL,eAAe,GAEhB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAOpE,aAAa;AACb,OAAO,EACL,SAAS,GAEV,MAAM,iCAAiC,CAAC;AACzC,iBAAiB;AACjB,OAAO,EAEL,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,qCAAqC,CAAC;AAC7C,WAAW;AACX,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,aAAa;AACb,OAAO,EACL,cAAc,GAGf,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,iDAAiD,CAAC;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAG1E,SAAS;AACT,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAOjE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC"}

package/dist/smart-agent/agent.d.ts

@@ -1,4 +1,5 @@
 import type { Message } from '../types.js';
+import type { IToolCache } from './cache/types.js';
 import type { IContextAssembler } from './interfaces/assembler.js';
 import type { ISubpromptClassifier } from './interfaces/classifier.js';
 import type { ILlm } from './interfaces/llm.js';
@@ -6,7 +7,13 @@ import type { IMcpClient } from './interfaces/mcp-client.js';
 import type { IRag } from './interfaces/rag.js';
 import { type CallOptions, type LlmStreamChunk, type Result, SmartAgentError } from './interfaces/types.js';
 import type { ILogger } from './logger/index.js';
+import type { IMetrics } from './metrics/types.js';
 import type { IPromptInjectionDetector, IToolPolicy, SessionPolicy } from './policy/types.js';
+import { type IQueryExpander } from './rag/query-expander.js';
+import type { IReranker } from './reranker/types.js';
+import type { ISessionManager } from './session/types.js';
+import type { ITracer } from './tracer/types.js';
+import type { IOutputValidator } from './validator/types.js';
 export declare class OrchestratorError extends SmartAgentError {
     constructor(message: string, code?: string);
 }
@@ -22,9 +29,16 @@ export interface SmartAgentDeps {
     ragStores: SmartAgentRagStores;
     classifier: ISubpromptClassifier;
     assembler: IContextAssembler;
+    reranker?: IReranker;
+    queryExpander?: IQueryExpander;
     logger?: ILogger;
     toolPolicy?: IToolPolicy;
     injectionDetector?: IPromptInjectionDetector;
+    tracer?: ITracer;
+    metrics?: IMetrics;
+    toolCache?: IToolCache;
+    outputValidator?: IOutputValidator;
+    sessionManager?: ISessionManager;
 }
 export interface SmartAgentConfig {
     maxIterations: number;
@@ -40,6 +54,9 @@ export interface SmartAgentConfig {
     historySummaryPrompt?: string;
     historyAutoSummarizeLimit?: number;
     mode?: 'hard' | 'pass' | 'smart';
+    queryExpansionEnabled?: boolean;
+    toolResultCacheTtlMs?: number;
+    sessionTokenBudget?: number;
 }
 export type StopReason = 'stop' | 'iteration_limit' | 'tool_call_limit';
 export interface SmartAgentResponse {
@@ -55,9 +72,18 @@ export interface SmartAgentResponse {
 }
 export declare class SmartAgent {
     private readonly deps;
-    private readonly config;
+    private config;
     private readonly toolAvailabilityRegistry;
+    private readonly tracer;
+    private readonly metrics;
+    private readonly reranker;
+    private readonly queryExpander;
+    private readonly toolCache;
+    private readonly outputValidator;
+    private readonly sessionManager;
     constructor(deps: SmartAgentDeps, config: SmartAgentConfig);
+    /** Apply a partial config update at runtime (hot-reload). */
+    applyConfigUpdate(update: Partial<SmartAgentConfig>): void;
     healthCheck(options?: CallOptions): Promise<Result<{
         llm: boolean;
         rag: boolean;

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

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

package/dist/smart-agent/agent.js

@@ -1,8 +1,15 @@
 import { randomUUID } from 'node:crypto';
+import { NoopToolCache } from './cache/noop-tool-cache.js';
 import { SmartAgentError, } from './interfaces/types.js';
+import { NoopMetrics } from './metrics/noop-metrics.js';
 import { isToolContextUnavailableError, ToolAvailabilityRegistry, } from './policy/tool-availability-registry.js';
+import { NoopQueryExpander, } from './rag/query-expander.js';
+import { NoopReranker } from './reranker/noop-reranker.js';
+import { NoopSessionManager } from './session/noop-session-manager.js';
+import { NoopTracer } from './tracer/noop-tracer.js';
 import { normalizeExternalTools } from './utils/external-tools-normalizer.js';
 import { getStreamToolCallName, toToolCallDelta, } from './utils/tool-call-deltas.js';
+import { NoopValidator } from './validator/noop-validator.js';
 export class OrchestratorError extends SmartAgentError {
     constructor(message, code = 'ORCHESTRATOR_ERROR') {
         super(message, code);
@@ -31,10 +38,28 @@ export class SmartAgent {
     deps;
     config;
     toolAvailabilityRegistry;
+    tracer;
+    metrics;
+    reranker;
+    queryExpander;
+    toolCache;
+    outputValidator;
+    sessionManager;
     constructor(deps, config) {
         this.deps = deps;
         this.config = config;
         this.toolAvailabilityRegistry = new ToolAvailabilityRegistry(this.config.toolUnavailableTtlMs);
+        this.tracer = deps.tracer ?? new NoopTracer();
+        this.metrics = deps.metrics ?? new NoopMetrics();
+        this.reranker = deps.reranker ?? new NoopReranker();
+        this.queryExpander = deps.queryExpander ?? new NoopQueryExpander();
+        this.toolCache = deps.toolCache ?? new NoopToolCache();
+        this.outputValidator = deps.outputValidator ?? new NoopValidator();
+        this.sessionManager = deps.sessionManager ?? new NoopSessionManager();
+    }
+    /** Apply a partial config update at runtime (hot-reload). */
+    applyConfigUpdate(update) {
+        this.config = { ...this.config, ...update };
     }
     async healthCheck(options) {
         const results = {
@@ -99,8 +124,13 @@ export class SmartAgent {
             };
             return;
         }
+        this.metrics.requestCount.add();
+        const requestStart = Date.now();
         const traceId = options?.trace?.traceId ?? randomUUID();
-        const pipelineT0 = Date.now();
+        const rootSpan = this.tracer.startSpan('smart_agent.process', {
+            traceId,
+            attributes: { 'smart_agent.mode': this.config.mode || 'smart' },
+        });
         let timeoutCleanup;
         let opts = options;
         if (this.config.timeoutMs) {
@@ -127,15 +157,27 @@ export class SmartAgent {
                 const stream = this.deps.mainLlm.streamChat(messages, externalTools, opts);
                 for await (const chunk of stream)
                     yield chunk;
+                rootSpan.setStatus('ok');
+                rootSpan.end();
                 return;
             }
             // 1. Unified Preparation
-            const initResult = await this._preparePipeline(textOrMessages, opts, traceId, pipelineT0);
+            const initResult = await this._preparePipeline(textOrMessages, opts, rootSpan);
             if (!initResult.ok) {
+                rootSpan.setStatus('error', initResult.error.message);
+                rootSpan.end();
                 yield initResult;
                 return;
             }
-            const { subprompts, processedHistory, toolClientMap } = initResult.value;
+            let { processedHistory } = initResult.value;
+            const { subprompts, toolClientMap } = initResult.value;
+            // Token budget check — summarize if over budget
+            if (this.sessionManager.isOverBudget()) {
+                const sumResult = await this._summarizeHistory(processedHistory, opts);
+                if (sumResult.ok)
+                    processedHistory = sumResult.value;
+                this.sessionManager.reset();
+            }
             // 2. Decide context and tools for the WHOLE request
             const actions = subprompts.filter((sp) => sp.type === 'action');
             const isSapRequired = actions.some((a) => a.context === 'sap-abap') || mode === 'hard';
@@ -149,15 +191,49 @@ export class SmartAgent {
             if (isSapRequired) {
                 // Collect all action texts for RAG
                 const combinedActionText = actions.map((a) => a.text).join(' ');
-                const ragText = await this._toEnglishForRag(combinedActionText, opts);
+                let ragText = await this._toEnglishForRag(combinedActionText, opts);
+                if (this.config.queryExpansionEnabled) {
+                    const expandResult = await this.queryExpander.expand(ragText, opts);
+                    if (expandResult.ok)
+                        ragText = expandResult.value;
+                }
                 const k = this.config.ragQueryK ?? 10;
+                const ragSpan = this.tracer.startSpan('smart_agent.rag_query', {
+                    parent: rootSpan,
+                    attributes: { 'rag.k': k },
+                });
                 const [fR, fbR, sR] = await Promise.all([
                     this.deps.ragStores.facts.query(ragText, k, opts),
                     this.deps.ragStores.feedback.query(ragText, k, opts),
                     this.deps.ragStores.state.query(ragText, k, opts),
                 ]);
+                ragSpan.end();
+                this.metrics.ragQueryCount.add(1, {
+                    store: 'facts',
+                    hit: String(fR.ok && fR.value.length > 0),
+                });
+                this.metrics.ragQueryCount.add(1, {
+                    store: 'feedback',
+                    hit: String(fbR.ok && fbR.value.length > 0),
+                });
+                this.metrics.ragQueryCount.add(1, {
+                    store: 'state',
+                    hit: String(sR.ok && sR.value.length > 0),
+                });
+                // Rerank results
+                const [rerankedFacts, rerankedFeedback, rerankedState] = await Promise.all([
+                    fR.ok
+                        ? this.reranker.rerank(ragText, fR.value, opts)
+                        : Promise.resolve(fR),
+                    fbR.ok
+                        ? this.reranker.rerank(ragText, fbR.value, opts)
+                        : Promise.resolve(fbR),
+                    sR.ok
+                        ? this.reranker.rerank(ragText, sR.value, opts)
+                        : Promise.resolve(sR),
+                ]);
                 const { tools: mcpTools } = await this._listAllTools(opts);
-                const facts = fR.ok ? fR.value : [];
+                const facts = rerankedFacts.ok ? rerankedFacts.value : [];
                 const ragToolNames = new Set(facts
                     .map((r) => r.metadata.id)
                     .filter((id) => id?.startsWith('tool:'))
@@ -169,8 +245,8 @@ export class SmartAgent {
                         : [];
                 retrieved = {
                     facts,
-                    feedback: fbR.ok ? fbR.value : [],
-                    state: sR.ok ? sR.value : [],
+                    feedback: rerankedFeedback.ok ? rerankedFeedback.value : [],
+                    state: rerankedState.ok ? rerankedState.value : [],
                     tools: selectedMcpTools,
                 };
                 finalTools =
@@ -190,31 +266,59 @@ export class SmartAgent {
                 });
             }
             // 3. Assemble Context once
-            const mainAction = actions.length > 0
-                ? actions[0]
-                : subprompts.find((sp) => sp.type === 'chat') || subprompts[0];
+            const mainAction = actions.length > 1
+                ? {
+                    type: 'action',
+                    text: actions.map((a) => a.text).join('\n'),
+                    context: actions.find((a) => a.context)?.context,
+                    dependency: 'independent',
+                }
+                : actions.length === 1
+                    ? actions[0]
+                    : subprompts.find((sp) => sp.type === 'chat') || subprompts[0];
+            if (actions.length > 1) {
+                opts?.sessionLogger?.logStep('actions_merged', {
+                    count: actions.length,
+                    actions: actions.map((a) => ({
+                        text: a.text,
+                        dependency: a.dependency,
+                    })),
+                });
+            }
+            const assembleSpan = this.tracer.startSpan('smart_agent.assemble', {
+                parent: rootSpan,
+            });
             const assembleResult = await this.deps.assembler.assemble(mainAction, retrieved, processedHistory, opts);
             if (!assembleResult.ok) {
+                assembleSpan.setStatus('error', assembleResult.error.message);
+                assembleSpan.end();
+                rootSpan.setStatus('error', assembleResult.error.message);
+                rootSpan.end();
                 yield {
                     ok: false,
                     error: new OrchestratorError(assembleResult.error.message, 'ASSEMBLER_ERROR'),
                 };
                 return;
             }
+            assembleSpan.setStatus('ok');
+            assembleSpan.end();
             opts?.sessionLogger?.logStep(`final_context_assembled`, {
                 messages: assembleResult.value,
                 tools: finalTools.map((t) => t.name),
             });
             // 4. Single Streaming Loop
-            const stream = this._runStreamingToolLoop(mainAction, retrieved, assembleResult.value, toolClientMap, opts, traceId, sessionId, mode === 'hard' ? [] : externalTools, finalTools);
+            const stream = this._runStreamingToolLoop(mainAction, retrieved, assembleResult.value, toolClientMap, opts, rootSpan, sessionId, mode === 'hard' ? [] : externalTools, finalTools);
             for await (const chunk of stream)
                 yield chunk;
+            rootSpan.setStatus('ok');
         }
         finally {
+            rootSpan.end();
             timeoutCleanup?.();
+            this.metrics.requestLatency.record(Date.now() - requestStart);
         }
     }
-    async _preparePipeline(textOrMessages, opts, _traceId, _pipelineT0) {
+    async _preparePipeline(textOrMessages, opts, parentSpan) {
         opts?.sessionLogger?.logStep('client_request', { textOrMessages });
         const text = typeof textOrMessages === 'string'
             ? textOrMessages
@@ -228,31 +332,52 @@ export class SmartAgent {
             if (res.ok)
                 processedHistory = res.value;
         }
+        const classifySpan = this.tracer.startSpan('smart_agent.classify', {
+            parent: parentSpan,
+        });
         const classifyResult = await this.deps.classifier.classify(text, opts);
-        if (!classifyResult.ok)
+        if (!classifyResult.ok) {
+            classifySpan.setStatus('error', classifyResult.error.message);
+            classifySpan.end();
             return {
                 ok: false,
                 error: new OrchestratorError(classifyResult.error.message, 'CLASSIFIER_ERROR'),
             };
+        }
+        classifySpan.setStatus('ok');
+        classifySpan.end();
         opts?.sessionLogger?.logStep('classifier_response', {
             subprompts: classifyResult.value,
         });
         const subprompts = classifyResult.value;
+        for (const sp of subprompts) {
+            this.metrics.classifierIntentCount.add(1, { intent: sp.type });
+        }
         const others = subprompts.filter((sp) => sp.type === 'fact' || sp.type === 'state' || sp.type === 'feedback');
         const ragStoreMap = new Map([
             ['fact', this.deps.ragStores.facts],
             ['feedback', this.deps.ragStores.feedback],
             ['state', this.deps.ragStores.state],
         ]);
-        await Promise.allSettled(others.map(async (sp) => {
-            const s = ragStoreMap.get(sp.type);
-            if (s)
-                await s.upsert(sp.text, this._buildRagMetadata(), opts);
-        }));
+        if (others.length > 0) {
+            const upsertSpan = this.tracer.startSpan('smart_agent.rag_upsert', {
+                parent: parentSpan,
+                attributes: { 'rag.upsert_count': others.length },
+            });
+            await Promise.allSettled(others.map(async (sp) => {
+                const s = ragStoreMap.get(sp.type);
+                if (s)
+                    await s.upsert(sp.text, this._buildRagMetadata(), opts);
+            }));
+            upsertSpan.end();
+        }
         const { toolClientMap } = await this._listAllTools(opts);
         return { ok: true, value: { subprompts, processedHistory, toolClientMap } };
     }
-    async *_runStreamingToolLoop(_action, _retrieved, initialMessages, toolClientMap, opts, _traceId, sessionId, externalTools, activeTools) {
+    async *_runStreamingToolLoop(_action, _retrieved, initialMessages, toolClientMap, opts, parentSpan, sessionId, externalTools, activeTools) {
+        const toolLoopSpan = this.tracer.startSpan('smart_agent.tool_loop', {
+            parent: parentSpan,
+        });
         let toolCallCount = 0;
         let messages = initialMessages;
         const usage = { promptTokens: 0, completionTokens: 0, totalTokens: 0 };
@@ -260,10 +385,14 @@ export class SmartAgent {
         let currentTools = activeTools;
         for (let iteration = 0;; iteration++) {
             if (opts?.signal?.aborted) {
+                toolLoopSpan.setStatus('error', 'Aborted');
+                toolLoopSpan.end();
                 yield { ok: false, error: new OrchestratorError('Aborted', 'ABORTED') };
                 return;
             }
             if (iteration >= this.config.maxIterations) {
+                toolLoopSpan.addEvent('iteration_limit_reached');
+                toolLoopSpan.end();
                 yield {
                     ok: true,
                     value: { content: '', finishReason: 'length', usage },
@@ -282,12 +411,22 @@ export class SmartAgent {
                 messages,
                 tools: currentTools,
             });
+            const llmSpan = this.tracer.startSpan('smart_agent.llm_call', {
+                parent: toolLoopSpan,
+                attributes: { 'llm.iteration': iteration + 1 },
+            });
+            this.metrics.llmCallCount.add();
+            const llmCallStart = Date.now();
             const stream = this.deps.mainLlm.streamChat(messages, currentTools, opts);
             let content = '';
             let finishReason;
             const toolCallsMap = new Map();
             for await (const chunkResult of stream) {
                 if (!chunkResult.ok) {
+                    llmSpan.setStatus('error', chunkResult.error.message);
+                    llmSpan.end();
+                    toolLoopSpan.setStatus('error', chunkResult.error.message);
+                    toolLoopSpan.end();
                     yield {
                         ok: false,
                         error: new OrchestratorError(chunkResult.error.message, 'LLM_ERROR'),
@@ -335,8 +474,12 @@ export class SmartAgent {
                     usage.promptTokens += chunk.usage.promptTokens;
                     usage.completionTokens += chunk.usage.completionTokens;
                     usage.totalTokens += chunk.usage.totalTokens;
+                    this.sessionManager.addTokens(chunk.usage.totalTokens);
                 }
             }
+            llmSpan.setStatus('ok');
+            llmSpan.end();
+            this.metrics.llmCallLatency.record(Date.now() - llmCallStart);
             const toolCalls = Array.from(toolCallsMap.values()).map((tc) => {
                 let args = {};
                 try {
@@ -353,7 +496,23 @@ export class SmartAgent {
                 finishReason,
             });
             if (finishReason !== 'tool_calls' || toolCalls.length === 0) {
+                // Output validation
+                const valResult = await this.outputValidator.validate(content, { messages, tools: currentTools }, opts);
+                if (valResult.ok && !valResult.value.valid) {
+                    const correction = valResult.value.correctedContent ?? valResult.value.reason;
+                    messages = [
+                        ...messages,
+                        { role: 'assistant', content },
+                        {
+                            role: 'user',
+                            content: `Your previous response was rejected by validation: ${correction}. Please try again.`,
+                        },
+                    ];
+                    continue;
+                }
                 opts?.sessionLogger?.logStep('final_response', { content, usage });
+                toolLoopSpan.setStatus('ok');
+                toolLoopSpan.end();
                 yield {
                     ok: true,
                     value: { content: '', finishReason: finishReason || 'stop', usage },
@@ -427,6 +586,8 @@ export class SmartAgent {
                 continue;
             }
             if (validExternalCalls.length > 0) {
+                toolLoopSpan.setStatus('ok');
+                toolLoopSpan.end();
                 yield {
                     ok: true,
                     value: { content: '', finishReason: 'tool_calls', usage },
@@ -449,31 +610,66 @@ export class SmartAgent {
                         })),
                     },
                 ];
-            for (const tc of internalCalls) {
-                if (this.config.maxToolCalls !== undefined &&
-                    toolCallCount >= this.config.maxToolCalls) {
-                    yield {
-                        ok: true,
-                        value: { content: '', finishReason: 'length', usage },
-                    };
-                    return;
-                }
+            // Truncate batch to remaining budget
+            const remaining = this.config.maxToolCalls !== undefined
+                ? this.config.maxToolCalls - toolCallCount
+                : internalCalls.length;
+            if (remaining <= 0) {
+                toolLoopSpan.addEvent('tool_call_limit_reached');
+                toolLoopSpan.end();
+                yield {
+                    ok: true,
+                    value: { content: '', finishReason: 'length', usage },
+                };
+                return;
+            }
+            const batch = internalCalls.slice(0, remaining);
+            // Yield all progress messages before execution
+            for (const tc of batch) {
                 yield {
                     ok: true,
                     value: { content: `\n\n[SmartAgent: Executing ${tc.name}...]\n` },
                 };
+            }
+            // Execute all tool calls concurrently
+            const results = await Promise.all(batch.map(async (tc) => {
                 opts?.sessionLogger?.logStep(`mcp_call_${tc.name}`, {
                     arguments: tc.arguments,
                 });
                 const client = toolClientMap.get(tc.name);
                 if (!client)
-                    continue;
-                const res = await client.callTool(tc.name, tc.arguments, opts);
+                    return { tc, text: '', res: null };
+                const toolSpan = this.tracer.startSpan('smart_agent.tool_call', {
+                    parent: toolLoopSpan,
+                    attributes: { 'tool.name': tc.name },
+                });
+                const cached = this.toolCache.get(tc.name, tc.arguments);
+                const res = cached
+                    ? (() => {
+                        this.metrics.toolCacheHitCount.add();
+                        toolSpan.setAttribute('cache', 'hit');
+                        return { ok: true, value: cached };
+                    })()
+                    : await (async () => {
+                        const r = await client.callTool(tc.name, tc.arguments, opts);
+                        if (r.ok)
+                            this.toolCache.set(tc.name, tc.arguments, r.value);
+                        return r;
+                    })();
                 const text = !res.ok
                     ? res.error.message
                     : typeof res.value.content === 'string'
                         ? res.value.content
                         : JSON.stringify(res.value.content);
+                toolSpan.setStatus(res.ok ? 'ok' : 'error', res.ok ? undefined : text);
+                toolSpan.end();
+                return { tc, text, res };
+            }));
+            // Process results: update availability, metrics, messages
+            const toolMessages = [];
+            for (const { tc, text, res } of results) {
+                if (!res)
+                    continue;
                 if (!res.ok && isToolContextUnavailableError(text)) {
                     const entry = this.toolAvailabilityRegistry.block(sessionId, tc.name, text);
                     currentTools = currentTools.filter((t) => t.name !== tc.name);
@@ -482,13 +678,18 @@ export class SmartAgent {
                         blockedUntil: entry.blockedUntil,
                     });
                 }
-                opts?.sessionLogger?.logStep(`mcp_result_${tc.name}`, { result: text });
+                opts?.sessionLogger?.logStep(`mcp_result_${tc.name}`, {
+                    result: text,
+                });
                 toolCallCount++;
-                messages = [
-                    ...messages,
-                    { role: 'tool', content: text, tool_call_id: tc.id },
-                ];
+                this.metrics.toolCallCount.add();
+                toolMessages.push({
+                    role: 'tool',
+                    content: text,
+                    tool_call_id: tc.id,
+                });
             }
+            messages = [...messages, ...toolMessages];
         }
     }
     async _listAllTools(opts) {