@agentuity/runtime 0.0.69 → 0.0.71

package/dist/workbench.js

@@ -1,7 +1,9 @@
 import { z } from 'zod';
+import { s } from '@agentuity/schema';
 import { timingSafeEqual } from 'node:crypto';
 import { getAgents, createAgentMiddleware } from './agent';
 import { createRouter } from './router';
+import { privateContext } from './_server';
 export const createWorkbenchExecutionRoute = () => {
     const authHeader = process.env.AGENTUITY_WORKBENCH_APIKEY
         ? `Bearer ${process.env.AGENTUITY_WORKBENCH_APIKEY}`
@@ -34,10 +36,10 @@ export const createWorkbenchExecutionRoute = () => {
                 return ctx.json({ error: 'Invalid JSON in request body' }, { status: 400 });
             }
             // Get agents registry and find the agent
-            const agents = getAgents();
+            const allAgents = getAgents();
             let agentObj;
             let agentName;
-            for (const [name, agent] of agents) {
+            for (const [name, agent] of allAgents) {
                 if (agent.metadata.id === agentId) {
                     agentObj = agent;
                     agentName = name;
@@ -47,34 +49,23 @@ export const createWorkbenchExecutionRoute = () => {
             if (!agentObj || !agentName) {
                 return ctx.text('Agent not found', { status: 404 });
             }
-            // Validate input if schema exists
-            let validatedInput = input;
-            if (agentObj.inputSchema) {
-                const inputResult = await agentObj.inputSchema['~standard'].validate(input);
-                if (inputResult.issues) {
-                    return ctx.json({
-                        error: 'Validation failed',
-                        issues: inputResult.issues,
-                    }, { status: 400 });
-                }
-                validatedInput = inputResult.value;
-                console.log('✅ [Workbench] Input validation passed');
-            }
-            else {
-                console.log('ℹ️ [Workbench] No input schema, skipping validation');
-            }
-            // Get agent runner from context.var.agent (should be available via middleware)
-            const agentRunner = ctx.var.agent[agentName];
-            if (!agentRunner) {
-                return ctx.text('Agent runner not found', { status: 404 });
+            // Track agent ID for telemetry (otelMiddleware sets up agentIds)
+            const _ctx = privateContext(ctx);
+            if (agentObj.metadata?.id) {
+                _ctx.var.agentIds.add(agentObj.metadata.id);
+                _ctx.var.agentIds.add(agentObj.metadata.agentId);
             }
-            // Execute the agent
+            // Execute the agent handler directly
+            // The agentMiddleware has already set up the AsyncLocalStorage context
+            // so the handler can access it via getAgentContext()
             let result;
             if (agentObj.inputSchema) {
-                result = await agentRunner.run(validatedInput);
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                result = await agentObj.handler(input);
             }
             else {
-                result = await agentRunner.run();
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                result = await agentObj.handler();
             }
             // Handle cases where result might be undefined/null
             if (result === undefined || result === null) {
@@ -125,6 +116,25 @@ export const createWorkbenchRouter = () => {
     router.post('/_agentuity/workbench/execute', createWorkbenchExecutionRoute());
     return router;
 };
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const toJSONSchema = (schema) => {
+    // Check if it's an Agentuity schema via StandardSchemaV1 vendor
+    if (schema?.['~standard']?.vendor === 'agentuity') {
+        return s.toJSONSchema(schema);
+    }
+    // Check if it's a Zod schema
+    if (schema?._def?.typeName) {
+        try {
+            return z.toJSONSchema(schema);
+        }
+        catch {
+            return {};
+        }
+    }
+    // TODO: this is going to only work for zod schema for now. need a way to handle others
+    // Unknown schema type
+    return {};
+};
 export const createWorkbenchMetadataRoute = () => {
     const authHeader = process.env.AGENTUITY_WORKBENCH_APIKEY
         ? `Bearer ${process.env.AGENTUITY_WORKBENCH_APIKEY}`
@@ -146,20 +156,19 @@ export const createWorkbenchMetadataRoute = () => {
             }
         }
         const schemas = { agents: {} };
-        // TODO: this is going to only work for zod schema for now. need a way to handle others
         for (const [, agent] of agents) {
-            schemas.agents[agent.metadata.identifier] = {
+            schemas.agents[agent.metadata.id] = {
                 schema: {
                     input: agent.inputSchema
                         ? {
                             code: agent.metadata.inputSchemaCode || undefined,
-                            json: z.toJSONSchema(agent.inputSchema),
+                            json: toJSONSchema(agent.inputSchema),
                         }
                         : undefined,
                     output: agent.outputSchema
                         ? {
                             code: agent.metadata.outputSchemaCode || undefined,
-                            json: z.toJSONSchema(agent.outputSchema),
+                            json: toJSONSchema(agent.outputSchema),
                         }
                         : undefined,
                 },

package/dist/workbench.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agentuity/runtime",
-	"version": "0.0.69",
+	"version": "0.0.71",
 	"license": "Apache-2.0",
 	"author": "Agentuity employees and contributors",
 	"type": "module",
@@ -22,11 +22,13 @@
 		"clean": "rm -rf dist",
 		"build": "bunx tsc --build --force",
 		"typecheck": "bunx tsc --noEmit",
+		"typecheck:tests": "bunx tsc --noEmit --project tsconfig.test.json",
 		"prepublishOnly": "bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@agentuity/core": "0.0.69",
-		"@agentuity/server": "0.0.69",
+		"@agentuity/core": "0.0.71",
+		"@agentuity/schema": "0.0.71",
+		"@agentuity/server": "0.0.71",
 		"@opentelemetry/api": "^1.9.0",
 		"@opentelemetry/api-logs": "^0.207.0",
 		"@opentelemetry/auto-instrumentations-node": "^0.66.0",
@@ -44,16 +46,15 @@
 		"@opentelemetry/semantic-conventions": "^1.37.0",
 		"@traceloop/ai-semantic-conventions": "0.21.0",
 		"@traceloop/node-server-sdk": "0.21.1",
+		"hono": "^4.7.13",
 		"zod": "^4.1.12",
 		"mailparser": "^3.7.1",
 		"@types/mailparser": "^3.4.6",
 		"ws": "^8.18.0",
 		"@types/ws": "^8.5.13"
 	},
-	"peerDependencies": {
-		"hono": "^4.10.3"
-	},
 	"devDependencies": {
+		"@agentuity/test-utils": "0.0.71",
 		"@types/bun": "latest",
 		"@types/react": "^19.2.2",
 		"@types/react-dom": "^19.2.2",

package/src/_config.ts

@@ -115,3 +115,22 @@ export function getEnvironment(): string {
 export function isAuthenticated(): boolean {
 	return !!process.env.AGENTUITY_SDK_KEY;
 }
+
+/**
+ * Symbol for accessing internal runtime state.
+ * Defined here to avoid circular dependency.
+ */
+export const AGENT_RUNTIME = Symbol('AGENT_RUNTIME');
+
+/**
+ * Symbol for accessing internal agent from AgentRunner.
+ * @internal
+ */
+export const INTERNAL_AGENT = Symbol('INTERNAL_AGENT');
+
+/**
+ * Symbol for tracking the current executing agent (for telemetry).
+ * Not exposed on public AgentContext interface.
+ * @internal
+ */
+export const CURRENT_AGENT = Symbol('CURRENT_AGENT');

package/src/_context.ts

@@ -4,11 +4,11 @@ import type { Tracer } from '@opentelemetry/api';
 import {
 	StructuredError,
 	type KeyValueStorage,
-	type ObjectStorage,
 	type StreamStorage,
 	type VectorStorage,
 } from '@agentuity/core';
-import type { AgentContext, AgentName, AgentRegistry, AgentRunner } from './agent';
+import type { AgentContext, AgentRegistry, AgentRunner, AgentRuntimeState } from './agent';
+import { AGENT_RUNTIME, CURRENT_AGENT } from './_config';
 import type { Logger } from './logger';
 import type WaitUntilHandler from './_waituntil';
 import { registerServices } from './_services';
@@ -16,18 +16,11 @@ import type { Thread, Session } from './session';
 
 export interface RequestAgentContextArgs<
 	TAgentMap extends AgentRegistry = AgentRegistry,
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	TCurrent extends AgentRunner<any, any, any> | undefined = AgentRunner<any, any, any> | undefined,
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	TParent extends AgentRunner<any, any, any> | undefined = AgentRunner<any, any, any> | undefined,
 	TConfig = unknown,
 	TAppState = Record<string, never>,
 > {
 	sessionId: string;
 	agent: TAgentMap;
-	current: TCurrent;
-	parent: TParent;
-	agentName: AgentName;
 	logger: Logger;
 	tracer: Tracer;
 	session: Session;
@@ -35,27 +28,20 @@ export interface RequestAgentContextArgs<
 	handler: WaitUntilHandler;
 	config: TConfig;
 	app: TAppState;
+	runtime: AgentRuntimeState;
 }
 
 export class RequestAgentContext<
 	TAgentMap extends AgentRegistry = AgentRegistry,
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	TCurrent extends AgentRunner<any, any, any> | undefined = AgentRunner<any, any, any> | undefined,
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	TParent extends AgentRunner<any, any, any> | undefined = AgentRunner<any, any, any> | undefined,
 	TConfig = unknown,
 	TAppState = Record<string, never>,
-> implements AgentContext<TAgentMap, TCurrent, TParent, TConfig, TAppState>
+> implements AgentContext<TAgentMap, TConfig, TAppState>
 {
 	agent: TAgentMap;
-	current: TCurrent;
-	parent: TParent;
-	agentName: AgentName;
 	logger: Logger;
 	sessionId: string;
 	tracer: Tracer;
 	kv!: KeyValueStorage;
-	objectstore!: ObjectStorage;
 	stream!: StreamStorage;
 	vector!: VectorStorage;
 	state: Map<string, unknown>;
@@ -63,13 +49,11 @@ export class RequestAgentContext<
 	thread: Thread;
 	config: TConfig;
 	app: TAppState;
+	[AGENT_RUNTIME]: AgentRuntimeState;
 	private handler: WaitUntilHandler;
 
-	constructor(args: RequestAgentContextArgs<TAgentMap, TCurrent, TParent, TConfig, TAppState>) {
+	constructor(args: RequestAgentContextArgs<TAgentMap, TConfig, TAppState>) {
 		this.agent = args.agent;
-		this.current = args.current;
-		this.parent = args.parent;
-		this.agentName = args.agentName;
 		this.logger = args.logger;
 		this.sessionId = args.sessionId;
 		this.tracer = args.tracer;
@@ -77,6 +61,7 @@ export class RequestAgentContext<
 		this.session = args.session;
 		this.config = args.config;
 		this.app = args.app;
+		this[AGENT_RUNTIME] = args.runtime;
 		this.state = new Map<string, unknown>();
 		this.handler = args.handler;
 		registerServices(this, false); // agents already populated via args.agent
@@ -88,7 +73,7 @@ export class RequestAgentContext<
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const agentAsyncLocalStorage = new AsyncLocalStorage<AgentContext<any, any, any, any, any>>();
+const agentAsyncLocalStorage = new AsyncLocalStorage<AgentContext<any, any, any>>();
 const httpAsyncLocalStorage = new AsyncLocalStorage<HonoContext>();
 
 export const inAgentContext = (): boolean => {
@@ -107,7 +92,7 @@ const AgentContextNotAvailableError = StructuredError(
 );
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const getAgentContext = (): AgentContext<any, any, any, any, any> => {
+export const getAgentContext = (): AgentContext<any, any, any> => {
 	const context = agentAsyncLocalStorage.getStore();
 	if (!context) {
 		throw new AgentContextNotAvailableError();
@@ -131,20 +116,29 @@ export const getHTTPContext = (): HonoContext => {
 export const getAgentAsyncLocalStorage = () => agentAsyncLocalStorage;
 export const getHTTPAsyncLocalStorage = () => httpAsyncLocalStorage;
 
-export const runInAgentContext = <
-	TAgentMap extends AgentRegistry = AgentRegistry,
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	TCurrent extends AgentRunner<any, any, any> | undefined = AgentRunner<any, any, any> | undefined,
+/**
+ * Get the current executing agent's metadata (for internal telemetry use only).
+ * Returns undefined if not in an agent context or no agent is executing.
+ * @internal
+ */
+export const getCurrentAgentMetadata = (): AgentRunner['metadata'] | undefined => {
+	const context = agentAsyncLocalStorage.getStore();
+	if (!context) return undefined;
+	// Access internal symbol property
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	TParent extends AgentRunner<any, any, any> | undefined = AgentRunner<any, any, any> | undefined,
+	return (context as any)[CURRENT_AGENT]?.metadata;
+};
+
+export const setupRequestAgentContext = <
+	TAgentMap extends AgentRegistry = AgentRegistry,
 	TConfig = unknown,
 	TAppState = Record<string, never>,
 >(
 	ctxObject: Record<string, unknown>,
-	args: RequestAgentContextArgs<TAgentMap, TCurrent, TParent, TConfig, TAppState>,
+	args: RequestAgentContextArgs<TAgentMap, TConfig, TAppState>,
 	next: () => Promise<void>
 ) => {
-	const ctx = new RequestAgentContext<TAgentMap, TCurrent, TParent, TConfig, TAppState>(args);
+	const ctx = new RequestAgentContext<TAgentMap, TConfig, TAppState>(args);
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	const _ctx = ctx as any;
 	Object.getOwnPropertyNames(ctx).forEach((k) => {

package/src/_server.ts

@@ -26,7 +26,8 @@ import { register } from './otel/config';
 import type { Logger } from './logger';
 import { isIdle } from './_idle';
 import * as runtimeConfig from './_config';
-import { inAgentContext, getAgentContext, runInHTTPContext } from './_context';
+import { inAgentContext, runInHTTPContext } from './_context';
+import { runAgentShutdowns, createAgentMiddleware } from './agent';
 import {
 	createServices,
 	getThreadProvider,
@@ -35,7 +36,7 @@ import {
 } from './_services';
 import { generateId } from './session';
 import WaitUntilHandler from './_waituntil';
-import registerTokenProcessor, { TOKENS_HEADER } from './_tokens';
+import registerTokenProcessor, { TOKENS_HEADER, DURATION_HEADER } from './_tokens';
 
 const SESSION_HEADER = 'x-session-id';
 
@@ -107,12 +108,14 @@ function registerAgentuitySpanProcessor() {
 				'@agentuity/environment': environment,
 			};
 			if (inAgentContext()) {
-				const agentCtx = getAgentContext();
-				if (agentCtx.current?.metadata) {
-					attrs['@agentuity/agentId'] = agentCtx.current.metadata.id;
-					attrs['@agentuity/agentInstanceId'] = agentCtx.current.metadata.agentId;
-					attrs['@agentuity/agentDescription'] = agentCtx.current.metadata.description;
-					attrs['@agentuity/agentName'] = agentCtx.current.metadata.name;
+				// eslint-disable-next-line @typescript-eslint/no-require-imports
+				const { getCurrentAgentMetadata } = require('./_context');
+				const current = getCurrentAgentMetadata();
+				if (current) {
+					attrs['@agentuity/agentId'] = current.id;
+					attrs['@agentuity/agentInstanceId'] = current.agentId;
+					attrs['@agentuity/agentDescription'] = current.description;
+					attrs['@agentuity/agentName'] = current.name;
 				}
 			}
 			span.setAttributes(attrs);
@@ -239,6 +242,13 @@ export const createServer = async <TAppState>(
 
 		await runInHTTPContext(c, next);
 
+		// Calculate and add duration header for all HTTP requests (not WebSocket)
+		if (!isWebSocket) {
+			const endTime = performance.now();
+			const duration = ((endTime - started) / 1000).toFixed(1); // Duration in seconds
+			c.header(DURATION_HEADER, `${duration}s`);
+		}
+
 		// Don't log completion for websocket upgrades - they stay open
 		if (!skipLogging && !isWebSocket) {
 			otel.logger.debug(
@@ -264,7 +274,13 @@ export const createServer = async <TAppState>(
 				'X-Requested-With',
 			],
 			allowMethods: ['POST', 'GET', 'OPTIONS', 'HEAD', 'PUT', 'DELETE', 'PATCH'],
-			exposeHeaders: ['Content-Length', TOKENS_HEADER, SESSION_HEADER, 'x-deployment'],
+			exposeHeaders: [
+				'Content-Length',
+				TOKENS_HEADER,
+				DURATION_HEADER,
+				SESSION_HEADER,
+				'x-deployment',
+			],
 			maxAge: 600,
 			credentials: true,
 			...(config?.cors ?? {}), // allow the app config to override
@@ -294,9 +310,14 @@ export const createServer = async <TAppState>(
 			}
 			const file = Bun.file(routeMappingPath);
 			if (!(await file.exists())) {
-				c.var.logger.fatal('error loading %s. this is a build issue!', routeMappingPath);
+				c.var.logger.warn(
+					'Route mapping file not found at %s. Route tracking will be disabled.',
+					routeMappingPath
+				);
+				routeMapping = {}; // Empty mapping, no route tracking
+			} else {
+				routeMapping = (await file.json()) as Record<string, string>;
 			}
-			routeMapping = (await file.json()) as Record<string, string>;
 		}
 		const matches = matchedRoutes(c).filter(
 			(m) => m.method !== 'ALL' && (m.path.startsWith('/api') || m.path.startsWith('/agent/'))
@@ -316,16 +337,8 @@ export const createServer = async <TAppState>(
 		return next();
 	});
 
-	router.use('/agent/*', routePathMapper);
 	router.use('/api/*', routePathMapper);
 
-	// Attach services and agent registry to context for API routes
-	router.use('/api/*', async (c, next) => {
-		const { createAgentMiddleware } = await import('./agent');
-		// Use a null agent name to just populate the agent registry without setting current agent
-		return createAgentMiddleware('')(c, next);
-	});
-
 	// set the trigger for specific types
 	for (const trigger of ['sms', 'email', 'cron'] as const) {
 		const middleware = createMiddleware(async (c, next) => {
@@ -334,11 +347,26 @@ export const createServer = async <TAppState>(
 			await next();
 		});
 		router.use(`/api/${trigger}/*`, middleware);
-		router.use(`/agent/${trigger}/*`, middleware);
 	}
 
+	// otelMiddleware must run before createAgentMiddleware to set session/thread
 	router.use('/api/*', otelMiddleware);
-	router.use('/agent/*', otelMiddleware);
+
+	// Attach services and agent registry to context for API routes
+	router.use('/api/*', async (c, next) => {
+		// Use a null agent name to just populate the agent registry without setting current agent
+		return createAgentMiddleware('')(c, next);
+	});
+
+	// Apply otelMiddleware to workbench routes for full telemetry and session tracking
+	if (config?.services?.workbench) {
+		// otelMiddleware must run before createAgentMiddleware to set session/thread
+		router.use('/_agentuity/workbench/*', otelMiddleware);
+		router.use('/_agentuity/workbench/*', async (c, next) => {
+			// Use a null agent name to just populate the agent registry without setting current agent
+			return createAgentMiddleware('')(c, next);
+		});
+	}
 
 	const shutdown = async () => {
 		if (isShutdown) {
@@ -370,7 +398,6 @@ export const createServer = async <TAppState>(
 			otel.logger.debug('no more pending connections');
 
 			// Run agent shutdowns first
-			const { runAgentShutdowns } = await import('./agent');
 			await runAgentShutdowns(globalAppState);
 
 			// Run app shutdown if provided

package/src/_services.ts

@@ -1,12 +1,10 @@
 import { context, SpanKind, SpanStatusCode, trace } from '@opentelemetry/api';
 import {
 	KeyValueStorageService,
-	ObjectStorageService,
 	StreamStorageService,
 	VectorStorageService,
 	type FetchAdapter,
 	type KeyValueStorage,
-	type ObjectStorage,
 	type StreamStorage,
 	type VectorStorage,
 	type ListStreamsResponse,
@@ -32,6 +30,7 @@ import {
 } from './services/evalrun';
 import { injectTraceContextToHeaders } from './otel/http';
 import { getTracer } from './_server';
+import { populateAgentsRegistry } from './agent.js';
 import { getSDKVersion, isAuthenticated, isProduction } from './_config';
 import type { AppConfig } from './app';
 import {
@@ -42,7 +41,6 @@ import {
 } from './session';
 import {
 	LocalKeyValueStorage,
-	LocalObjectStorage,
 	LocalStreamStorage,
 	LocalVectorStorage,
 	getLocalDB,
@@ -58,7 +56,6 @@ const serviceUrls = getServiceUrls(process.env.AGENTUITY_REGION ?? 'usc');
 const kvBaseUrl = serviceUrls.keyvalue;
 const streamBaseUrl = serviceUrls.stream;
 const vectorBaseUrl = serviceUrls.vector;
-const objectBaseUrl = serviceUrls.objectstore;
 const catalystBaseUrl = serviceUrls.catalyst;
 
 let adapter: FetchAdapter;
@@ -157,22 +154,6 @@ const createFetchAdapter = (logger: Logger) =>
 						}
 						break;
 					}
-					case 'agentuity.objectstore.get': {
-						if (result.response.status === 404) {
-							span?.addEvent('miss');
-						} else if (result.response.ok) {
-							span?.addEvent('hit');
-						}
-						break;
-					}
-					case 'agentuity.objectstore.delete': {
-						if (result.response.status === 404) {
-							span?.addEvent('not_found', { deleted: false });
-						} else if (result.response.ok) {
-							span?.addEvent('deleted', { deleted: true });
-						}
-						break;
-					}
 				}
 			},
 		},
@@ -180,7 +161,6 @@ const createFetchAdapter = (logger: Logger) =>
 	);
 
 let kv: KeyValueStorage;
-let objectStore: ObjectStorage;
 let stream: StreamStorage;
 let vector: VectorStorage;
 let session: SessionProvider;
@@ -217,7 +197,6 @@ export function createServices(logger: Logger, config?: AppConfig<any>, serverUr
 		logger.info('Using local services (development only)');
 
 		kv = config?.services?.keyvalue || new LocalKeyValueStorage(db, projectPath);
-		objectStore = config?.services?.object || new LocalObjectStorage(db, projectPath, serverUrl);
 		stream = config?.services?.stream || new LocalStreamStorage(db, projectPath, serverUrl);
 		vector = config?.services?.vector || new LocalVectorStorage(db, projectPath);
 		session = config?.services?.session || new DefaultSessionProvider();
@@ -245,7 +224,6 @@ export function createServices(logger: Logger, config?: AppConfig<any>, serverUr
 
 	// At this point we must be authenticated (since !authenticated would trigger local services above)
 	kv = config?.services?.keyvalue || new KeyValueStorageService(kvBaseUrl, adapter);
-	objectStore = config?.services?.object || new ObjectStorageService(objectBaseUrl, adapter);
 	stream = config?.services?.stream || new StreamStorageService(streamBaseUrl, adapter);
 	vector = config?.services?.vector || new VectorStorageService(vectorBaseUrl, adapter);
 	session = config?.services?.session || new DefaultSessionProvider();
@@ -304,11 +282,6 @@ export function registerServices(o: any, includeAgents = false) {
 		enumerable: false,
 		configurable: false,
 	});
-	Object.defineProperty(o, 'objectstore', {
-		get: () => objectStore,
-		enumerable: false,
-		configurable: false,
-	});
 	Object.defineProperty(o, 'stream', {
 		get: () => stream,
 		enumerable: false,
@@ -328,9 +301,7 @@ export function registerServices(o: any, includeAgents = false) {
 		Object.defineProperty(o, 'agent', {
 			get: () => {
 				if (!cachedRegistry) {
-					// Lazy-load to avoid circular dependency
-					// eslint-disable-next-line @typescript-eslint/no-require-imports
-					const { populateAgentsRegistry } = require('./agent');
+					// ESM-friendly: populateAgentsRegistry is imported statically
 					cachedRegistry = populateAgentsRegistry(o);
 				}
 				return cachedRegistry;

package/src/_tokens.ts

@@ -6,6 +6,7 @@ import { SpanAttributes } from '@traceloop/ai-semantic-conventions';
 import { addSpanProcessor } from './_server';
 
 export const TOKENS_HEADER = 'x-agentuity-tokens';
+export const DURATION_HEADER = 'x-agentuity-duration';
 
 const AI_SDK_SPAN_NAME = 'ai.generateText';
 const AI_SDK_MODEL_NAME = 'ai.model.id';

package/src/_validation.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { StandardSchemaV1 } from '@agentuity/core';
+import type { StandardSchemaV1, InferInput, InferOutput } from '@agentuity/core';
 
 /**
  * Schema definition for routes that can have input (POST, PUT, PATCH, DELETE).
@@ -50,9 +50,7 @@ export type GetRouteSchema<
  *
  * @template T - Schema type
  */
-export type InferSchemaInput<T> = T extends StandardSchemaV1
-	? StandardSchemaV1.InferInput<T>
-	: undefined;
+export type InferSchemaInput<T> = T extends StandardSchemaV1 ? InferInput<T> : undefined;
 
 /**
  * Infer the output type from a StandardSchema.
@@ -60,9 +58,7 @@ export type InferSchemaInput<T> = T extends StandardSchemaV1
  *
  * @template T - Schema type
  */
-export type InferSchemaOutput<T> = T extends StandardSchemaV1
-	? StandardSchemaV1.InferOutput<T>
-	: undefined;
+export type InferSchemaOutput<T> = T extends StandardSchemaV1 ? InferOutput<T> : undefined;
 
 /**
  * Extract input schema from RouteSchema or GetRouteSchema.