@amodalai/runtime 0.1.26 → 0.2.0

package/dist/src/routes/chat-stream.js

@@ -1,55 +1,73 @@
 /**
  * @license
- * Copyright 2025 Amodal Labs, Inc.
+ * Copyright 2026 Amodal Labs, Inc.
  * SPDX-License-Identifier: MIT
  */
+/**
+ * Streaming chat route.
+ *
+ * Accepts POST to /chat and /chat/stream, resolves a session via the
+ * standalone session manager, runs the message through the agent loop,
+ * and streams SSE events to the client.
+ */
 import { Router } from 'express';
 import { ChatRequestSchema, SSEEventType } from '../types.js';
 import { validate } from '../middleware/request-validation.js';
 import { getAuthContext } from '../middleware/auth.js';
-import { streamMessage } from '../session/session-runner.js';
+import { resolveSession } from './session-resolver.js';
+import { adaptOnUsage, asyncHandler, fireDrainHooks, UNKNOWN_TOOL_NAME } from './route-helpers.js';
+// ---------------------------------------------------------------------------
+// Router
+// ---------------------------------------------------------------------------
 export function createChatStreamRouter(options) {
     const router = Router();
     // Mount on both /chat and /chat/stream so the SPA always gets SSE
-    router.post(['/chat', '/chat/stream'], validate(ChatRequestSchema), 
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises -- TODO: wrap async route handler
-    async (req, res, next) => {
+    router.post(['/chat', '/chat/stream'], validate(ChatRequestSchema), asyncHandler(async (req, res, next) => {
         try {
-            const { message, session_id, role, session_type, deploy_id } = req.body;
-            let session;
-            if (session_id) {
-                session = options.sessionManager.get(session_id);
-                if (!session) {
-                    // Try hydrating from stored conversation history
-                    const auth = getAuthContext(res);
-                    session = await options.sessionManager.hydrate(session_id, role, auth, session_type);
-                }
-                if (!session) {
-                    // History not found — create fresh session
-                    const auth = getAuthContext(res);
-                    session = await options.sessionManager.create(role, auth, session_type, undefined, deploy_id);
-                }
-            }
-            else {
-                const auth = getAuthContext(res);
-                session = await options.sessionManager.create(role, auth, session_type, undefined, deploy_id);
-            }
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- validated by Zod middleware
+            const body = req.body;
+            const auth = getAuthContext(res);
+            const { session, toolContextFactory } = await resolveSession(body.session_id, {
+                sessionManager: options.sessionManager,
+                bundleResolver: options.bundleResolver,
+                shared: options.shared,
+                role: body.role,
+                sessionType: body.session_type,
+                deployId: body.deploy_id,
+                auth,
+            });
             // Set up SSE headers (use setHeader to preserve CORS headers from middleware)
             res.setHeader('Content-Type', 'text/event-stream');
             res.setHeader('Cache-Control', 'no-cache');
             res.setHeader('Connection', 'keep-alive');
             res.flushHeaders();
             const controller = new AbortController();
-            // Abort on client disconnect
             res.on('close', () => controller.abort());
-            // Build per-request hooks with auth context
-            const hooks = options.createStreamHooks?.(getAuthContext(res));
-            const stream = streamMessage(session, message, controller.signal, hooks, options.sessionManager);
+            const hooks = options.createStreamHooks?.(auth);
+            const stream = options.sessionManager.runMessage(session.id, body.message, {
+                signal: controller.signal,
+                buildToolContext: toolContextFactory,
+                onUsage: adaptOnUsage(hooks, session),
+            });
+            // Track tool calls for audit log
+            const toolNames = new Map();
+            const toolCalls = [];
             for await (const event of stream) {
                 if (controller.signal.aborted)
                     break;
                 res.write(`data: ${JSON.stringify(event)}\n\n`);
+                if (event.type === SSEEventType.ToolCallStart) {
+                    toolNames.set(event.tool_id, event.tool_name);
+                }
+                else if (event.type === SSEEventType.ToolCallResult) {
+                    toolCalls.push({
+                        tool_name: toolNames.get(event.tool_id) ?? UNKNOWN_TOOL_NAME,
+                        tool_id: event.tool_id,
+                        status: event.status,
+                    });
+                }
             }
+            await fireDrainHooks(options.sessionManager, hooks, { session, toolCalls });
             res.end();
         }
         catch (err) {
@@ -67,7 +85,7 @@ export function createChatStreamRouter(options) {
                 next(err);
             }
         }
-    });
+    }));
     return router;
 }
 //# sourceMappingURL=chat-stream.js.map

package/dist/src/routes/chat-stream.js.map

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

package/dist/src/routes/chat.d.ts

@@ -1,14 +1,23 @@
 /**
  * @license
- * Copyright 2025 Amodal Labs, Inc.
+ * Copyright 2026 Amodal Labs, Inc.
  * SPDX-License-Identifier: MIT
  */
+/**
+ * Non-streaming chat route.
+ *
+ * Accepts POST to /chat/sync, resolves a session, runs the message through
+ * the agent loop, collects all events, and returns a JSON ChatResponse.
+ */
 import { Router } from 'express';
 import type { AuthContext } from '../middleware/auth.js';
-import type { SessionManager } from '../session/session-manager.js';
-import { type StreamHooks } from '../session/session-runner.js';
+import type { StandaloneSessionManager } from '../session/manager.js';
+import type { StreamHooks } from '../session/stream-hooks.js';
+import type { BundleResolver, SharedResources } from './session-resolver.js';
 export interface ChatRouterOptions {
-    sessionManager: SessionManager;
+    sessionManager: StandaloneSessionManager;
+    bundleResolver: BundleResolver;
+    shared: SharedResources;
     /** Factory that builds per-request stream hooks from the auth context */
     createStreamHooks?: (auth?: AuthContext) => StreamHooks;
 }

package/dist/src/routes/chat.js

@@ -1,43 +1,80 @@
 /**
  * @license
- * Copyright 2025 Amodal Labs, Inc.
+ * Copyright 2026 Amodal Labs, Inc.
  * SPDX-License-Identifier: MIT
  */
+/**
+ * Non-streaming chat route.
+ *
+ * Accepts POST to /chat/sync, resolves a session, runs the message through
+ * the agent loop, collects all events, and returns a JSON ChatResponse.
+ */
 import { Router } from 'express';
-import { ChatRequestSchema } from '../types.js';
+import { ChatRequestSchema, SSEEventType } from '../types.js';
 import { validate } from '../middleware/request-validation.js';
-import { AppError } from '../middleware/error-handler.js';
 import { getAuthContext } from '../middleware/auth.js';
-import { runMessage } from '../session/session-runner.js';
+import { resolveSession } from './session-resolver.js';
+import { adaptOnUsage, asyncHandler, fireDrainHooks, UNKNOWN_TOOL_NAME } from './route-helpers.js';
+// ---------------------------------------------------------------------------
+// Router
+// ---------------------------------------------------------------------------
 export function createChatRouter(options) {
     const router = Router();
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises -- TODO: wrap async route handler
-    router.post('/chat', validate(ChatRequestSchema), async (req, res, next) => {
+    router.post('/chat/sync', validate(ChatRequestSchema), asyncHandler(async (req, res, next) => {
         try {
-            const { message, session_id, role, deploy_id } = req.body;
-            // Get or create session
-            let session;
-            if (session_id) {
-                session = options.sessionManager.get(session_id);
-                if (!session) {
-                    throw new AppError(404, 'SESSION_NOT_FOUND', `Session ${session_id} not found`);
-                }
-            }
-            else {
-                const auth = getAuthContext(res);
-                session = await options.sessionManager.create(role, auth, undefined, undefined, deploy_id);
-            }
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- validated by Zod middleware
+            const body = req.body;
+            const auth = getAuthContext(res);
+            const { session, toolContextFactory } = await resolveSession(body.session_id, {
+                sessionManager: options.sessionManager,
+                bundleResolver: options.bundleResolver,
+                shared: options.shared,
+                role: body.role,
+                sessionType: body.session_type,
+                deployId: body.deploy_id,
+                auth,
+            });
             const controller = new AbortController();
-            // Abort on client disconnect
             res.on('close', () => controller.abort());
-            const hooks = options.createStreamHooks?.(getAuthContext(res));
-            const result = await runMessage(session, message, controller.signal, hooks);
+            const hooks = options.createStreamHooks?.(auth);
+            const stream = options.sessionManager.runMessage(session.id, body.message, {
+                signal: controller.signal,
+                buildToolContext: toolContextFactory,
+                onUsage: adaptOnUsage(hooks, session),
+            });
+            let responseText = '';
+            const toolNames = new Map();
+            const toolCalls = [];
+            for await (const event of stream) {
+                if (controller.signal.aborted)
+                    break;
+                if (event.type === SSEEventType.TextDelta) {
+                    responseText += event.content;
+                }
+                else if (event.type === SSEEventType.ToolCallStart) {
+                    toolNames.set(event.tool_id, event.tool_name);
+                }
+                else if (event.type === SSEEventType.ToolCallResult) {
+                    toolCalls.push({
+                        tool_name: toolNames.get(event.tool_id) ?? UNKNOWN_TOOL_NAME,
+                        tool_id: event.tool_id,
+                        status: event.status,
+                        error: event.error,
+                    });
+                }
+            }
+            await fireDrainHooks(options.sessionManager, hooks, { session, toolCalls });
+            const result = {
+                session_id: session.id,
+                response: responseText,
+                tool_calls: toolCalls,
+            };
             res.json(result);
         }
         catch (err) {
             next(err);
         }
-    });
+    }));
     return router;
 }
 //# sourceMappingURL=chat.js.map

package/dist/src/routes/chat.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../src/routes/chat.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAAE,UAAU,EAAoB,MAAM,8BAA8B,CAAC;AAQ5E,MAAM,UAAU,gBAAgB,CAAC,OAA0B;IACzD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;IAExB,oGAAoG;IACpG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACzE,IAAI,CAAC;YACH,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;YAE1D,wBAAwB;YACxB,IAAI,OAAO,CAAC;YACZ,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACjD,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,IAAI,QAAQ,CAAC,GAAG,EAAE,mBAAmB,EAAE,WAAW,UAAU,YAAY,CAAC,CAAC;gBAClF,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;gBACjC,OAAO,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YAC7F,CAAC;YAED,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YAEzC,6BAA6B;YAC7B,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;YAE1C,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC5E,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,CAAC;QACZ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../src/routes/chat.ts"],"names":[],"mappings":"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"}

package/dist/src/routes/health.d.ts

@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: MIT
  */
 import { Router } from 'express';
-import type { SessionManager } from '../session/session-manager.js';
 export interface HealthRouterOptions {
-    sessionManager: SessionManager;
+    sessionManager: {
+        size: number;
+    };
     version?: string;
     startedAt: number;
 }

package/dist/src/routes/health.js.map

@@ -1 +1 @@
-{"version":3,"file":"health.js","sourceRoot":"","sources":["../../../src/routes/health.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AASjC,MAAM,UAAU,kBAAkB,CAAC,OAA4B;IAC7D,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;IAExB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAClC,GAAG,CAAC,IAAI,CAAC;YACP,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,SAAS;YACzC,eAAe,EAAE,OAAO,CAAC,cAAc,CAAC,IAAI;SAC7C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACnC,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,SAAS;SACtC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"health.js","sourceRoot":"","sources":["../../../src/routes/health.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAOjC,MAAM,UAAU,kBAAkB,CAAC,OAA4B;IAC7D,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;IAExB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAClC,GAAG,CAAC,IAAI,CAAC;YACP,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,SAAS;YACzC,eAAe,EAAE,OAAO,CAAC,cAAc,CAAC,IAAI;SAC7C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACnC,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,SAAS;SACtC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/src/routes/route-helpers.d.ts

@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright 2026 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+/**
+ * Shared helpers for chat route handlers.
+ *
+ * Deduplicates post-drain hook logic and session persistence across
+ * chat-stream, ai-stream, and chat routes.
+ */
+import type { Request, Response, NextFunction, RequestHandler } from 'express';
+import type { StandaloneSessionManager } from '../session/manager.js';
+import type { Session, TurnUsage } from '../session/types.js';
+import type { StreamHooks } from '../session/stream-hooks.js';
+/**
+ * Wrap an async Express handler so rejected promises propagate to the error
+ * middleware instead of hanging the request.
+ *
+ * Express doesn't await async handlers — if one throws, the request hangs
+ * forever. This wrapper catches the rejection and passes it to `next()`.
+ */
+export declare function asyncHandler(fn: (req: Request, res: Response, next: NextFunction) => Promise<void> | Promise<Response>): RequestHandler;
+/** Fallback name for tools where the ToolCallStart event was missed. */
+export declare const UNKNOWN_TOOL_NAME = "unknown";
+/** Audit event name emitted after a message completes. */
+export declare const AUDIT_SESSION_COMPLETED = "session_completed";
+interface DrainContext {
+    session: Session;
+    toolCalls: Array<{
+        tool_name: string;
+        tool_id: string;
+        status: string;
+    }>;
+}
+/**
+ * Adapt the old `onUsageReport` hook to the new `TurnUsage` callback
+ * expected by `StandaloneSessionManager.runMessage`.
+ */
+export declare function adaptOnUsage(hooks: StreamHooks | undefined, session: Session): ((usage: TurnUsage) => void) | undefined;
+/**
+ * Fire post-drain hooks and persist the session.
+ *
+ * Called after the runMessage generator is fully consumed. Handles:
+ * - Explicit session persistence (belt-and-suspenders with runMessage's internal persist)
+ * - Audit log hook with tool call summary
+ * - Session persist hook for hosted-mode analytics
+ */
+export declare function fireDrainHooks(sessionManager: StandaloneSessionManager, hooks: StreamHooks | undefined, ctx: DrainContext): Promise<void>;
+export {};

package/dist/src/routes/route-helpers.js

@@ -0,0 +1,80 @@
+/**
+ * @license
+ * Copyright 2026 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+// ---------------------------------------------------------------------------
+// Async handler wrapper
+// ---------------------------------------------------------------------------
+/**
+ * Wrap an async Express handler so rejected promises propagate to the error
+ * middleware instead of hanging the request.
+ *
+ * Express doesn't await async handlers — if one throws, the request hangs
+ * forever. This wrapper catches the rejection and passes it to `next()`.
+ */
+export function asyncHandler(fn) {
+    return (req, res, next) => {
+        Promise.resolve(fn(req, res, next)).catch(next);
+    };
+}
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+/** Fallback name for tools where the ToolCallStart event was missed. */
+export const UNKNOWN_TOOL_NAME = 'unknown';
+/** Audit event name emitted after a message completes. */
+export const AUDIT_SESSION_COMPLETED = 'session_completed';
+/**
+ * Adapt the old `onUsageReport` hook to the new `TurnUsage` callback
+ * expected by `StandaloneSessionManager.runMessage`.
+ */
+export function adaptOnUsage(hooks, session) {
+    if (!hooks?.onUsageReport)
+        return undefined;
+    return (usage) => {
+        hooks.onUsageReport?.({
+            model: session.model,
+            taskAgentRuns: 0,
+            tokens: {
+                inputTokens: usage.inputTokens,
+                outputTokens: usage.outputTokens,
+                cachedTokens: usage.cachedInputTokens,
+            },
+        });
+    };
+}
+/**
+ * Fire post-drain hooks and persist the session.
+ *
+ * Called after the runMessage generator is fully consumed. Handles:
+ * - Explicit session persistence (belt-and-suspenders with runMessage's internal persist)
+ * - Audit log hook with tool call summary
+ * - Session persist hook for hosted-mode analytics
+ */
+export async function fireDrainHooks(sessionManager, hooks, ctx) {
+    const { session, toolCalls } = ctx;
+    // Persist session explicitly — runMessage persists internally when a store
+    // is configured, but the route also needs to persist when the generator is
+    // aborted mid-stream (the generator's post-loop code doesn't run on abort).
+    await sessionManager.persist(session);
+    if (hooks?.onAuditLog) {
+        hooks.onAuditLog({
+            event: AUDIT_SESSION_COMPLETED,
+            resource_name: session.id,
+            details: {
+                session_id: session.id,
+                tool_calls: toolCalls,
+                model: session.model,
+                provider: session.providerName,
+            },
+        });
+    }
+    if (hooks?.onSessionPersist) {
+        hooks.onSessionPersist(session.id, [], 'completed', {
+            model: session.model,
+            provider: session.providerName,
+        });
+    }
+}
+//# sourceMappingURL=route-helpers.js.map

package/dist/src/routes/route-helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-helpers.js","sourceRoot":"","sources":["../../../src/routes/route-helpers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAcH,8EAA8E;AAC9E,wBAAwB;AACxB,8EAA8E;AAE9E;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAC1B,EAA0F;IAE1F,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACxB,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,YAAY;AACZ,8EAA8E;AAE9E,wEAAwE;AACxE,MAAM,CAAC,MAAM,iBAAiB,GAAG,SAAS,CAAC;AAE3C,0DAA0D;AAC1D,MAAM,CAAC,MAAM,uBAAuB,GAAG,mBAAmB,CAAC;AAW3D;;;GAGG;AACH,MAAM,UAAU,YAAY,CAC1B,KAA8B,EAC9B,OAAgB;IAEhB,IAAI,CAAC,KAAK,EAAE,aAAa;QAAE,OAAO,SAAS,CAAC;IAC5C,OAAO,CAAC,KAAgB,EAAE,EAAE;QAC1B,KAAK,CAAC,aAAa,EAAE,CAAC;YACpB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,aAAa,EAAE,CAAC;YAChB,MAAM,EAAE;gBACN,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,YAAY,EAAE,KAAK,CAAC,iBAAiB;aACtC;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,cAAwC,EACxC,KAA8B,EAC9B,GAAiB;IAEjB,MAAM,EAAC,OAAO,EAAE,SAAS,EAAC,GAAG,GAAG,CAAC;IAEjC,2EAA2E;IAC3E,2EAA2E;IAC3E,4EAA4E;IAC5E,MAAM,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEtC,IAAI,KAAK,EAAE,UAAU,EAAE,CAAC;QACtB,KAAK,CAAC,UAAU,CAAC;YACf,KAAK,EAAE,uBAAuB;YAC9B,aAAa,EAAE,OAAO,CAAC,EAAE;YACzB,OAAO,EAAE;gBACP,UAAU,EAAE,OAAO,CAAC,EAAE;gBACtB,UAAU,EAAE,SAAS;gBACrB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,QAAQ,EAAE,OAAO,CAAC,YAAY;aAC/B;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,KAAK,EAAE,gBAAgB,EAAE,CAAC;QAC5B,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE;YAClD,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,OAAO,CAAC,YAAY;SAC/B,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/dist/src/routes/session-resolver.d.ts

@@ -0,0 +1,72 @@
+/**
+ * @license
+ * Copyright 2026 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+/**
+ * Session Resolver.
+ *
+ * Shared session resolution logic for all chat routes. Extracts bundle
+ * resolution, session lookup/resume/create into a single function so
+ * chat-stream, ai-stream, and chat routes share the same flow.
+ */
+import type { AgentBundle, CustomToolExecutor, StoreBackend } from '@amodalai/types';
+import type { McpManager, FieldScrubber } from '@amodalai/core';
+import type { StandaloneSessionManager } from '../session/manager.js';
+import type { Session } from '../session/types.js';
+import type { ToolContext } from '../tools/types.js';
+import type { SessionType } from '../session/session-builder.js';
+import type { AuthContext } from '../middleware/auth.js';
+import type { Logger } from '../logger.js';
+/** How the route resolves an AgentBundle for a given request. */
+export interface BundleResolver {
+    /** Static bundle for local dev (used when no deploy_id is provided). */
+    staticBundle?: AgentBundle;
+    /** Dynamic bundle provider for hosted mode (keyed by deploy_id + auth token). */
+    bundleProvider?: (deployId: string, token?: string) => Promise<AgentBundle | null>;
+}
+/** Shared resources injected once at server startup. */
+export interface SharedResources {
+    storeBackend: StoreBackend | null;
+    mcpManager: McpManager | null;
+    logger: Logger;
+    toolExecutor?: CustomToolExecutor;
+    fieldScrubber?: FieldScrubber;
+}
+/** Result of session resolution — includes the tool context factory for wiring into runMessage. */
+export interface ResolvedSession {
+    session: Session;
+    toolContextFactory: (callId: string) => ToolContext;
+}
+/** Options for resolving a session. */
+export interface ResolveSessionOptions {
+    sessionManager: StandaloneSessionManager;
+    bundleResolver: BundleResolver;
+    shared: SharedResources;
+    role?: string;
+    sessionType?: SessionType;
+    deployId?: string;
+    auth?: AuthContext;
+}
+/**
+ * Resolve an AgentBundle from the bundle resolver.
+ *
+ * Prefers the dynamic bundleProvider when a deploy_id is available (hosted
+ * mode). Falls back to the static bundle (local dev).
+ */
+export declare function resolveBundle(resolver: BundleResolver, deployId?: string, token?: string): Promise<AgentBundle | null>;
+/**
+ * Resolve (lookup, resume, or create) a session for a chat request.
+ *
+ * Flow:
+ * 1. If session_id: try in-memory get → try resume from store → fall through
+ * 2. Create new session from resolved bundle
+ * 3. Throws SessionError if no bundle is available
+ *
+ * Bundle is resolved once and reused across resume and create paths to
+ * avoid redundant bundleProvider calls in hosted mode.
+ *
+ * For in-memory sessions, the cached `toolContextFactory` from session
+ * creation is reused — no redundant buildSessionComponents call.
+ */
+export declare function resolveSession(sessionId: string | undefined, opts: ResolveSessionOptions): Promise<ResolvedSession>;

package/dist/src/routes/session-resolver.js

@@ -0,0 +1,123 @@
+/**
+ * @license
+ * Copyright 2026 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+import { buildSessionComponents } from '../session/session-builder.js';
+import { SessionError } from '../errors.js';
+import { LOCAL_APP_ID } from '../constants.js';
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+const DEFAULT_TENANT_ID = LOCAL_APP_ID;
+const DEFAULT_USER_ID = 'anonymous';
+// ---------------------------------------------------------------------------
+// Bundle resolution
+// ---------------------------------------------------------------------------
+/**
+ * Resolve an AgentBundle from the bundle resolver.
+ *
+ * Prefers the dynamic bundleProvider when a deploy_id is available (hosted
+ * mode). Falls back to the static bundle (local dev).
+ */
+export async function resolveBundle(resolver, deployId, token) {
+    if (deployId && resolver.bundleProvider) {
+        return resolver.bundleProvider(deployId, token);
+    }
+    return resolver.staticBundle ?? null;
+}
+// ---------------------------------------------------------------------------
+// Internal: build components + wire factory
+// ---------------------------------------------------------------------------
+function buildComponents(bundle, shared, opts) {
+    return buildSessionComponents({
+        bundle,
+        storeBackend: shared.storeBackend,
+        mcpManager: shared.mcpManager,
+        logger: shared.logger,
+        toolExecutor: shared.toolExecutor,
+        fieldScrubber: shared.fieldScrubber,
+        sessionType: opts.sessionType,
+        userRoles: opts.userRoles,
+        sessionId: opts.sessionId,
+        tenantId: opts.tenantId,
+    });
+}
+// ---------------------------------------------------------------------------
+// Session resolution
+// ---------------------------------------------------------------------------
+/**
+ * Resolve (lookup, resume, or create) a session for a chat request.
+ *
+ * Flow:
+ * 1. If session_id: try in-memory get → try resume from store → fall through
+ * 2. Create new session from resolved bundle
+ * 3. Throws SessionError if no bundle is available
+ *
+ * Bundle is resolved once and reused across resume and create paths to
+ * avoid redundant bundleProvider calls in hosted mode.
+ *
+ * For in-memory sessions, the cached `toolContextFactory` from session
+ * creation is reused — no redundant buildSessionComponents call.
+ */
+export async function resolveSession(sessionId, opts) {
+    const { sessionManager, bundleResolver, shared, auth } = opts;
+    const tenantId = auth?.orgId ?? DEFAULT_TENANT_ID;
+    const userId = auth?.actor ?? DEFAULT_USER_ID;
+    const userRoles = opts.role ? [opts.role] : [];
+    // 1. In-memory lookup (existing live session)
+    if (sessionId) {
+        const existing = sessionManager.get(sessionId);
+        if (existing && existing.toolContextFactory) {
+            return { session: existing, toolContextFactory: existing.toolContextFactory };
+        }
+    }
+    // Resolve bundle once — shared between resume and create paths
+    const bundle = await resolveBundle(bundleResolver, opts.deployId, auth?.token);
+    // 2. Resume from store (with dedup handled by StandaloneSessionManager)
+    if (sessionId && bundle) {
+        const components = buildComponents(bundle, shared, {
+            sessionType: opts.sessionType,
+            userRoles,
+            sessionId,
+            tenantId,
+        });
+        const resumed = await sessionManager.resume(sessionId, {
+            tenantId,
+            userId,
+            provider: components.provider,
+            toolRegistry: components.toolRegistry,
+            permissionChecker: components.permissionChecker,
+            systemPrompt: components.systemPrompt,
+            userRoles: components.userRoles,
+            toolContextFactory: components.toolContextFactory,
+        });
+        if (resumed) {
+            return { session: resumed, toolContextFactory: components.toolContextFactory };
+        }
+    }
+    // 3. Create new session
+    if (!bundle) {
+        throw new SessionError('No bundle available — provide a deploy_id or configure a static bundle', {
+            sessionId: sessionId ?? 'new',
+            context: { operation: 'resolveSession', deployId: opts.deployId },
+        });
+    }
+    const components = buildComponents(bundle, shared, {
+        sessionType: opts.sessionType,
+        userRoles,
+        tenantId,
+    });
+    const session = sessionManager.create({
+        tenantId,
+        userId,
+        provider: components.provider,
+        toolRegistry: components.toolRegistry,
+        permissionChecker: components.permissionChecker,
+        systemPrompt: components.systemPrompt,
+        userRoles: components.userRoles,
+        toolContextFactory: components.toolContextFactory,
+    });
+    return { session, toolContextFactory: components.toolContextFactory };
+}
+//# sourceMappingURL=session-resolver.js.map

package/dist/src/routes/session-resolver.js.map

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

package/dist/src/routes/session-resolver.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2026 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+export {};