@kapeta/local-cluster-service 0.74.0 → 0.74.2

package/dist/esm/src/storm/routes.js

@@ -117,8 +117,10 @@ router.post('/ui/create-system/:handle/:systemId', async (req, res) => {
     res.set(stormClient_1.ConversationIdHeader, systemId);
     sendEvent(res, (0, event_parser_1.createPhaseStartEvent)(events_1.StormEventPhaseType.IMPLEMENT_APIS));
     const pagesFromDisk = (0, utils_1.readFilesAndContent)(srcDir);
-    const pagesWithImplementation = await stormClient_1.stormClient.replaceMockWithAPICall({
+    const client = new stormClient_1.StormClient(systemId);
+    const pagesWithImplementation = await client.replaceMockWithAPICall({
         pages: pagesFromDisk,
+        systemId: systemId,
     });
     await (0, utils_1.copyDirectory)(srcDir, destDir, (fileName, content) => {
         // find the page from result1 and write the content to the file
@@ -131,7 +133,7 @@ router.post('/ui/create-system/:handle/:systemId', async (req, res) => {
     const pageContents = pagesWithImplementation.map((page) => {
         return page.content;
     });
-    const prompt = await stormClient_1.stormClient.generatePrompt(pageContents);
+    const prompt = await client.generatePrompt(pageContents);
     sendEvent(res, (0, event_parser_1.createPhaseEndEvent)(events_1.StormEventPhaseType.COMPOSE_SYSTEM_PROMPT));
     req.query.systemId = systemId;
     const promptRequest = {
@@ -149,10 +151,12 @@ router.post('/ui/create-system-simple/:handle/:systemId', async (req, res) => {
     //res.set('Access-Control-Expose-Headers', ConversationIdHeader);
     //res.set(ConversationIdHeader, systemId);
     //sendEvent(res, createPhaseStartEvent(StormEventPhaseType.IMPLEMENT_APIS));
+    const client = new stormClient_1.StormClient(systemId);
     try {
         const pagesFromDisk = (0, utils_1.readFilesAndContent)(srcDir);
-        const pagesWithImplementation = await stormClient_1.stormClient.replaceMockWithAPICall({
+        const pagesWithImplementation = await client.replaceMockWithAPICall({
             pages: pagesFromDisk,
+            systemId: systemId,
         });
         //sendEvent(res, createPhaseEndEvent(StormEventPhaseType.IMPLEMENT_APIS));
         //sendEvent(res, createPhaseStartEvent(StormEventPhaseType.COMPOSE_SYSTEM));
@@ -165,7 +169,7 @@ router.post('/ui/create-system-simple/:handle/:systemId', async (req, res) => {
             }
             return page;
         });
-        const systemUrl = await stormClient_1.stormClient.createSimpleBackend(handle, systemId, { pages: allFiles });
+        const systemUrl = await client.createSimpleBackend(handle, systemId, { pages: allFiles });
         //sendEvent(res, {type: 'SYSTEM_READY', created: Math.floor(Date.now() / 1000), reason: 'System Ready', payload: { systemUrl: systemUrl }});
         //sendEvent(res, createPhaseEndEvent(StormEventPhaseType.COMPOSE_SYSTEM));
         //sendDone(res);
@@ -250,7 +254,8 @@ router.post('/:handle/ui/iterative', async (req, res) => {
     try {
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
-        const landingPagesStream = await stormClient_1.stormClient.createUILandingPages(aiRequest, conversationId);
+        const client = new stormClient_1.StormClient(conversationId); //todo is this correct we are using the landing page getConversationId down below as well
+        const landingPagesStream = await client.createUILandingPages(aiRequest, conversationId);
         onRequestAborted(req, res, () => {
             landingPagesStream.abort();
         });
@@ -339,8 +344,9 @@ router.post('/:handle/ui', async (req, res) => {
     try {
         const outerConversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()] || (0, crypto_1.randomUUID)();
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
+        const stormClient = new stormClient_1.StormClient(outerConversationId);
         // Get user journeys
-        const userJourneysStream = await stormClient_1.stormClient.createUIUserJourneys(aiRequest, outerConversationId);
+        const userJourneysStream = await stormClient.createUIUserJourneys(aiRequest, outerConversationId);
         onRequestAborted(req, res, () => {
             userJourneysStream.abort();
         });
@@ -351,11 +357,11 @@ router.post('/:handle/ui', async (req, res) => {
         let systemPrompt = aiRequest.prompt;
         userJourneysStream.on('data', (data) => {
             try {
-                sendEvent(res, data);
                 if (data.type === 'PROMPT_IMPROVE') {
                     systemPrompt = data.payload.prompt;
                 }
                 if (data.type !== 'USER_JOURNEY') {
+                    sendEvent(res, data);
                     return;
                 }
                 if (userJourneysStream.isAborted()) {
@@ -363,9 +369,11 @@ router.post('/:handle/ui', async (req, res) => {
                 }
                 data.payload.screens.forEach((screen) => {
                     if (!uniqueUserJourneyScreens[screen.name]) {
+                        screen.conversationId = (0, crypto_1.randomUUID)();
                         uniqueUserJourneyScreens[screen.name] = screen;
                     }
                 });
+                sendEvent(res, data);
             }
             catch (e) {
                 console.error('Failed to process event', e);
@@ -378,7 +386,7 @@ router.post('/:handle/ui', async (req, res) => {
         });
         let theme = '';
         try {
-            const themeStream = await stormClient_1.stormClient.createTheme(aiRequest, outerConversationId);
+            const themeStream = await stormClient.createTheme(aiRequest, outerConversationId);
             onRequestAborted(req, res, () => {
                 themeStream.abort();
             });
@@ -416,8 +424,11 @@ router.post('/:handle/ui', async (req, res) => {
             });
         }
         await waitForStormStream(userJourneysStream);
+        if (req.socket.closed) {
+            return;
+        }
         // Get the UI shells
-        const shellsStream = await stormClient_1.stormClient.createUIShells({
+        const shellsStream = await stormClient.createUIShells({
             theme: theme || undefined,
             pages: Object.values(uniqueUserJourneyScreens).map((screen) => ({
                 name: screen.name,
@@ -450,6 +461,9 @@ router.post('/:handle/ui', async (req, res) => {
             sendError(error, res);
         });
         await waitForStormStream(shellsStream);
+        if (req.socket.closed) {
+            return;
+        }
         UI_SERVERS[outerConversationId] = new UIServer_1.UIServer(outerConversationId);
         await UI_SERVERS[outerConversationId].start();
         sendEvent(res, {
@@ -464,7 +478,7 @@ router.post('/:handle/ui', async (req, res) => {
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
-        queue.on('page', (screenData) => sendPageEvent(outerConversationId, screenData, res));
+        queue.on('page', (pageEvent) => sendPageEvent(outerConversationId, pageEvent, res));
         queue.on('event', (event) => {
             if (event.type === 'FILE_CHUNK') {
                 return;
@@ -487,7 +501,7 @@ router.post('/:handle/ui', async (req, res) => {
                 filename: screen.filename,
                 storage_prefix: outerConversationId + '_',
                 theme,
-            })
+            }, screen.conversationId)
                 .catch((e) => {
                 console.error('Failed to generate page for screen %s', screen.name, e);
                 sendError(e, res);
@@ -574,7 +588,8 @@ router.post('/ui/vote', async (req, res) => {
     const aiRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, vote, mainConversationId } = aiRequest;
     try {
-        await stormClient_1.stormClient.voteUIPage(topic, conversationId, vote, mainConversationId);
+        const stormClient = new stormClient_1.StormClient(mainConversationId);
+        await stormClient.voteUIPage(topic, conversationId, vote, mainConversationId);
     }
     catch (e) {
         res.status(500).send({ error: e.message });
@@ -585,7 +600,8 @@ router.post('/ui/get-vote', async (req, res) => {
     const aiRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, mainConversationId } = aiRequest;
     try {
-        const vote = await stormClient_1.stormClient.getVoteUIPage(topic, conversationId, mainConversationId);
+        const stormClient = new stormClient_1.StormClient(mainConversationId);
+        const vote = await stormClient.getVoteUIPage(topic, conversationId, mainConversationId);
         res.send({ vote });
     }
     catch (e) {
@@ -609,7 +625,8 @@ async function handleAll(req, res) {
         const eventParser = new event_parser_1.StormEventParser(stormOptions);
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
-        const metaStream = await stormClient_1.stormClient.createMetadata(aiRequest, conversationId);
+        const stormClient = new stormClient_1.StormClient(systemId);
+        const metaStream = await stormClient.createMetadata(aiRequest, conversationId);
         onRequestAborted(req, res, () => {
             metaStream.abort();
         });

package/dist/esm/src/storm/stormClient.d.ts

@@ -4,6 +4,7 @@ import { ConversationItem, CreateSimpleBackendRequest, HTMLPage, ImplementAPICli
 import { Page, StormEventPageUrl } from './events';
 export declare const STORM_ID = "storm";
 export declare const ConversationIdHeader = "Conversation-Id";
+export declare const SystemIdHeader = "System-Id";
 export interface UIShellsPrompt {
     theme?: string;
     pages: {
@@ -55,9 +56,10 @@ export interface BasePromptRequest {
     prompt: string;
     skipImprovement?: boolean;
 }
-declare class StormClient {
+export declare class StormClient {
     private readonly _baseUrl;
-    constructor();
+    private readonly _systemId;
+    constructor(systemId?: string);
     private createOptions;
     private send;
     createMetadata(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;
@@ -88,5 +90,3 @@ declare class StormClient {
     downloadSystem(handle: string, conversationId: string): Promise<Buffer>;
     uploadSystem(handle: string, conversationId: string, buffer: Buffer): Promise<Response>;
 }
-export declare const stormClient: StormClient;
-export {};

package/dist/esm/src/storm/stormClient.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stormClient = exports.ConversationIdHeader = exports.STORM_ID = void 0;
+exports.StormClient = exports.SystemIdHeader = exports.ConversationIdHeader = exports.STORM_ID = void 0;
 /**
  * Copyright 2023 Kapeta Inc.
  * SPDX-License-Identifier: BUSL-1.1
@@ -17,10 +17,13 @@ const fetch_retry_1 = __importDefault(require("fetch-retry"));
 const fetchWithRetries = (0, fetch_retry_1.default)(global.fetch, { retries: 5, retryDelay: 10 });
 exports.STORM_ID = 'storm';
 exports.ConversationIdHeader = 'Conversation-Id';
+exports.SystemIdHeader = 'System-Id';
 class StormClient {
     _baseUrl;
-    constructor() {
+    _systemId;
+    constructor(systemId) {
         this._baseUrl = (0, utils_1.getRemoteUrl)('ai-service', 'https://ai.kapeta.com');
+        this._systemId = systemId || "";
     }
     async createOptions(path, method, body) {
         const url = `${this._baseUrl}${path}`;
@@ -35,6 +38,9 @@ class StormClient {
         if (body.conversationId) {
             headers[exports.ConversationIdHeader] = body.conversationId;
         }
+        if (this._systemId) {
+            headers[exports.SystemIdHeader] = this._systemId;
+        }
         return {
             url,
             method: method,
@@ -103,6 +109,7 @@ class StormClient {
     createUIShells(prompt, conversationId) {
         return this.send('/v2/ui/shells', {
             prompt: JSON.stringify(prompt),
+            conversationId: conversationId,
         });
     }
     createUILandingPages(prompt, conversationId) {
@@ -138,6 +145,9 @@ class StormClient {
         const response = await fetch(u, {
             method: 'POST',
             body: JSON.stringify(prompt.pages),
+            headers: {
+                'systemId': prompt.systemId,
+            },
         });
         return (await response.json());
     }
@@ -252,4 +262,4 @@ class StormClient {
         return response;
     }
 }
-exports.stormClient = new StormClient();
+exports.StormClient = StormClient;

package/dist/esm/src/storm/stream.d.ts

@@ -35,6 +35,7 @@ export interface ConversationItem {
 }
 export interface StormContextRequest<T = string> {
     conversationId?: string;
+    systemId?: string;
     history?: ConversationItem[];
     prompt: T;
 }
@@ -78,6 +79,7 @@ export declare enum HTMLPageEncoding {
 }
 export interface ImplementAPIClients {
     pages: HTMLPage[];
+    systemId: string;
 }
 export interface HTMLPage {
     fileName: string;

package/dist/esm/src/stormService.d.ts

@@ -13,8 +13,8 @@ export declare class StormService {
     saveConversation(conversationId: string, events: StormEvent[]): Promise<void>;
     appendConversation(conversationId: string, events: StormEvent[]): Promise<void>;
     deleteConversation(conversationId: string): Promise<void>;
-    uploadConversation(handle: string, conversationId: string): Promise<void>;
-    installProjectById(handle: string, conversationId: string): Promise<void>;
+    uploadConversation(handle: string, systemId: string): Promise<void>;
+    installProjectById(handle: string, systemId: string): Promise<void>;
 }
 declare const _default: StormService;
 export default _default;

package/dist/esm/src/stormService.js

@@ -119,8 +119,8 @@ class StormService {
             await promises_1.default.rm(conversationDir, { recursive: true, force: true });
         }
     }
-    async uploadConversation(handle, conversationId) {
-        const tarballFile = this.getConversationTarball(conversationId);
+    async uploadConversation(handle, systemId) {
+        const tarballFile = this.getConversationTarball(systemId);
         const destDir = path_1.default.dirname(tarballFile);
         const tarballName = path_1.default.basename(tarballFile);
         await tar.create({
@@ -129,12 +129,14 @@ class StormService {
             gzip: true,
             filter: (entry) => !entry.includes(tarballName),
         }, ['.']);
-        await stormClient_1.stormClient.uploadSystem(handle, conversationId, await promises_1.default.readFile(tarballFile));
+        const stormClient = new stormClient_1.StormClient(systemId);
+        await stormClient.uploadSystem(handle, systemId, await promises_1.default.readFile(tarballFile));
     }
-    async installProjectById(handle, conversationId) {
-        const tarballFile = this.getConversationTarball(conversationId);
+    async installProjectById(handle, systemId) {
+        const tarballFile = this.getConversationTarball(systemId);
         const destDir = path_1.default.dirname(tarballFile);
-        const buffer = await stormClient_1.stormClient.downloadSystem(handle, conversationId);
+        const stormClient = new stormClient_1.StormClient(systemId);
+        const buffer = await stormClient.downloadSystem(handle, systemId);
         await promises_1.default.mkdir(destDir, { recursive: true });
         await promises_1.default.writeFile(tarballFile, buffer);
         await tar.extract({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.74.0",
+    "version": "0.74.2",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

package/src/storm/PageGenerator.ts

@@ -4,13 +4,14 @@
  */
 
 import uuid from 'node-uuid';
-import { stormClient, UIPagePrompt } from './stormClient';
+import { StormClient, UIPagePrompt } from './stormClient';
 import { ReferenceClassification, StormEvent, StormEventPage, StormImage, UIShell } from './events';
 import { EventEmitter } from 'node:events';
 import PQueue from 'p-queue';
 
 import { hasPageOnDisk, normalizePath, writeImageToDisk } from './page-utils';
 import * as mimetypes from 'mime-types';
+import { randomUUID } from 'node:crypto';
 
 export interface ImagePrompt {
     name: string;
@@ -22,7 +23,10 @@ export interface ImagePrompt {
     content: string;
 }
 
-type InitialPrompt = Omit<UIPagePrompt, 'shell_page'> & { shellType?: 'public' | 'admin' | 'user' };
+type InitialPrompt = Omit<UIPagePrompt, 'shell_page'> & {
+    shellType?: 'public' | 'admin' | 'user';
+};
+type PagePrompt = InitialPrompt & { conversationId: string; id: string };
 
 export class PageQueue extends EventEmitter {
     private readonly queue: PQueue;
@@ -149,7 +153,7 @@ export class PageQueue extends EventEmitter {
                     new RegExp(`^${path.replaceAll('/*', '/[^/]+')}$`).test(url)
                 );
             };
-            const initialPrompts: InitialPrompt[] = [];
+            const initialPrompts: PagePrompt[] = [];
             const resourcePromises = references.map(async (reference) => {
                 if (
                     reference.url.startsWith('#') ||
@@ -185,6 +189,8 @@ export class PageQueue extends EventEmitter {
                         this.pages.set(normalizedPath, reference.description);
 
                         initialPrompts.push({
+                            conversationId: randomUUID(),
+                            id: randomUUID(),
                             name: reference.name,
                             title: reference.title,
                             path: normalizedPath,
@@ -215,20 +221,21 @@ export class PageQueue extends EventEmitter {
                         reason: 'reference',
                         created: Date.now(),
                         payload: {
+                            id: prompt.id,
+                            conversationId: prompt.conversationId,
                             name: prompt.name,
                             title: prompt.title,
                             filename: prompt.filename,
                             method: 'GET',
                             path: prompt.path,
                             prompt: prompt.description,
-                            conversationId: '',
                             content: '',
                             description: prompt.description,
                         },
                     });
                 }
                 // Trigger but don't wait for the "bonus" pages
-                this.addPrompt(prompt).catch((err) => {
+                this.addPrompt(prompt, prompt.conversationId).catch((err) => {
                     console.error('Failed to generate page reference', prompt.name, err);
                     this.emit('error', err);
                 });
@@ -265,8 +272,9 @@ export class PageQueue extends EventEmitter {
             return;
         }
 
+        const client = new StormClient(this.systemId);
         this.images.set(prompt.url, prompt.description);
-        const result = await stormClient.createImage(
+        const result = await client.createImage(
             `Create an image for the url "${prompt.url}" with this description: ${prompt.description}`.trim()
         );
 
@@ -287,7 +295,8 @@ export class PageQueue extends EventEmitter {
     }
 
     public async generate(prompt: UIPagePrompt, conversationId: string) {
-        const screenStream = await stormClient.createUIPage(prompt, conversationId);
+        const client = new StormClient(this.systemId);
+        const screenStream = await client.createUIPage(prompt, conversationId);
         let pageEvent: StormEventPage | null = null;
         screenStream.on('data', (event: StormEvent) => {
             if (event.type === 'PAGE') {
@@ -306,7 +315,8 @@ export class PageQueue extends EventEmitter {
     }
 
     private async resolveReferences(content: string): Promise<ReferenceClassification[]> {
-        const referenceStream = await stormClient.classifyUIReferences(content);
+        const client = new StormClient(this.systemId);
+        const referenceStream = await client.classifyUIReferences(content);
 
         const references: ReferenceClassification[] = [];
 

package/src/storm/codegen.ts

@@ -17,7 +17,7 @@ import {
 
 import { BlockDefinition } from '@kapeta/schemas';
 import { codeGeneratorManager } from '../codeGeneratorManager';
-import { STORM_ID, stormClient } from './stormClient';
+import { STORM_ID, StormClient } from './stormClient';
 import {
     StormEvent,
     StormEventBlockStatusType,
@@ -371,6 +371,7 @@ export class StormCodegen {
         });
         const uiEvents = [];
 
+        const stormClient = new StormClient(this.uiSystemId);
         // generate screens
         if (uiTemplates.length) {
             const screenStream = await stormClient.listScreens({
@@ -663,6 +664,7 @@ export class StormCodegen {
     }
 
     private async classifyErrors(errors: string, basePath: string): Promise<Map<string, ErrorClassification[]>> {
+        const stormClient = new StormClient(this.uiSystemId);
         const errorStream = await stormClient.createErrorClassification(errors, []);
         const fixes = new Map<string, ErrorClassification[]>();
 
@@ -711,7 +713,7 @@ export class StormCodegen {
                 error: error,
                 projectFiles: allFiles.map((f) => f.filename),
             };
-
+            const stormClient = new StormClient(this.uiSystemId);
             const detailsStream = await stormClient.createErrorDetails(JSON.stringify(request), []);
             detailsStream.on('data', (evt) => {
                 if (evt.type === 'ERROR_DETAILS') {
@@ -799,6 +801,7 @@ export class StormCodegen {
     ): Promise<StormEventErrorDetailsFile> {
         return new Promise<StormEventErrorDetailsFile>(async (resolve, reject) => {
             try {
+                const stormClient = new StormClient(this.uiSystemId);
                 const fixStream = await stormClient.createCodeFix(fix, history, this.conversationId);
                 let resolved = false;
                 fixStream.on('data', (evt) => {

package/src/storm/events.ts

@@ -347,6 +347,7 @@ export interface StormEventPhases {
 }
 
 export interface Page {
+    id: string;
     name: string;
     filename: string;
     title: string;
@@ -394,6 +395,7 @@ export interface UserJourneyScreen {
     path: string;
     method: string;
     nextScreens: string[];
+    conversationId?: string;
 }
 
 export interface UserJourney {

package/src/storm/routes.ts

@@ -21,12 +21,12 @@ import {
 
 import {
     ConversationIdHeader,
-    stormClient,
     UIPagePrompt,
     UIPageEditRequest,
     BasePromptRequest,
     UIPageVoteRequest,
     UIPageGetVoteRequest,
+    StormClient,
 } from './stormClient';
 import { StormEvent, StormEventPage, StormEventPhaseType, UserJourneyScreen } from './events';
 
@@ -162,8 +162,10 @@ router.post('/ui/create-system/:handle/:systemId', async (req: KapetaBodyRequest
     sendEvent(res, createPhaseStartEvent(StormEventPhaseType.IMPLEMENT_APIS));
 
     const pagesFromDisk = readFilesAndContent(srcDir);
-    const pagesWithImplementation = await stormClient.replaceMockWithAPICall({
+    const client = new StormClient(systemId)
+    const pagesWithImplementation = await client.replaceMockWithAPICall({
         pages: pagesFromDisk,
+        systemId: systemId,
     });
 
     await copyDirectory(srcDir, destDir, (fileName, content) => {
@@ -181,7 +183,7 @@ router.post('/ui/create-system/:handle/:systemId', async (req: KapetaBodyRequest
         return page.content;
     });
 
-    const prompt = await stormClient.generatePrompt(pageContents);
+    const prompt = await client.generatePrompt(pageContents);
 
     sendEvent(res, createPhaseEndEvent(StormEventPhaseType.COMPOSE_SYSTEM_PROMPT));
 
@@ -204,11 +206,12 @@ router.post('/ui/create-system-simple/:handle/:systemId', async (req: KapetaBody
     //res.set(ConversationIdHeader, systemId);
 
     //sendEvent(res, createPhaseStartEvent(StormEventPhaseType.IMPLEMENT_APIS));
-
+    const client = new StormClient(systemId);
     try {
         const pagesFromDisk = readFilesAndContent(srcDir);
-        const pagesWithImplementation = await stormClient.replaceMockWithAPICall({
+        const pagesWithImplementation = await client.replaceMockWithAPICall({
             pages: pagesFromDisk,
+            systemId: systemId,
         });
 
         //sendEvent(res, createPhaseEndEvent(StormEventPhaseType.IMPLEMENT_APIS));
@@ -227,7 +230,7 @@ router.post('/ui/create-system-simple/:handle/:systemId', async (req: KapetaBody
             return page;
         });
 
-        const systemUrl = await stormClient.createSimpleBackend(handle, systemId, { pages: allFiles });
+        const systemUrl = await client.createSimpleBackend(handle, systemId, { pages: allFiles });
         //sendEvent(res, {type: 'SYSTEM_READY', created: Math.floor(Date.now() / 1000), reason: 'System Ready', payload: { systemUrl: systemUrl }});
 
         //sendEvent(res, createPhaseEndEvent(StormEventPhaseType.COMPOSE_SYSTEM));
@@ -328,8 +331,8 @@ router.post('/:handle/ui/iterative', async (req: KapetaBodyRequest, res: Respons
         const conversationId = req.headers[ConversationIdHeader.toLowerCase()] as string | undefined;
 
         const aiRequest: BasePromptRequest = JSON.parse(req.stringBody ?? '{}');
-
-        const landingPagesStream = await stormClient.createUILandingPages(aiRequest, conversationId);
+        const client = new StormClient(conversationId); //todo is this correct we are using the landing page getConversationId down below as well
+        const landingPagesStream = await client.createUILandingPages(aiRequest, conversationId);
 
         onRequestAborted(req, res, () => {
             landingPagesStream.abort();
@@ -437,7 +440,7 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
             (req.headers[ConversationIdHeader.toLowerCase()] as string | undefined) || randomUUID();
 
         const aiRequest: BasePromptRequest = JSON.parse(req.stringBody ?? '{}');
-
+        const stormClient = new StormClient(outerConversationId);
         // Get user journeys
         const userJourneysStream = await stormClient.createUIUserJourneys(aiRequest, outerConversationId);
 
@@ -455,11 +458,11 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
 
         userJourneysStream.on('data', (data: StormEvent) => {
             try {
-                sendEvent(res, data);
                 if (data.type === 'PROMPT_IMPROVE') {
                     systemPrompt = data.payload.prompt;
                 }
                 if (data.type !== 'USER_JOURNEY') {
+                    sendEvent(res, data);
                     return;
                 }
 
@@ -469,9 +472,12 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
 
                 data.payload.screens.forEach((screen) => {
                     if (!uniqueUserJourneyScreens[screen.name]) {
+                        screen.conversationId = randomUUID();
                         uniqueUserJourneyScreens[screen.name] = screen;
                     }
                 });
+
+                sendEvent(res, data);
             } catch (e) {
                 console.error('Failed to process event', e);
             }
@@ -525,6 +531,10 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
 
         await waitForStormStream(userJourneysStream);
 
+        if (req.socket.closed) {
+            return;
+        }
+
         // Get the UI shells
         const shellsStream = await stormClient.createUIShells(
             {
@@ -571,6 +581,10 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
 
         await waitForStormStream(shellsStream);
 
+        if (req.socket.closed) {
+            return;
+        }
+
         UI_SERVERS[outerConversationId] = new UIServer(outerConversationId);
         await UI_SERVERS[outerConversationId].start();
 
@@ -588,7 +602,7 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
             queue.cancel();
         });
 
-        queue.on('page', (screenData: StormEventPage) => sendPageEvent(outerConversationId, screenData, res));
+        queue.on('page', (pageEvent: StormEventPage) => sendPageEvent(outerConversationId, pageEvent, res));
 
         queue.on('event', (event: StormEvent) => {
             if (event.type === 'FILE_CHUNK') {
@@ -604,17 +618,20 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
 
         for (const screen of Object.values(uniqueUserJourneyScreens)) {
             queue
-                .addPrompt({
-                    prompt: screen.requirements,
-                    method: screen.method,
-                    path: screen.path,
-                    description: screen.requirements,
-                    name: screen.name,
-                    title: screen.title,
-                    filename: screen.filename,
-                    storage_prefix: outerConversationId + '_',
-                    theme,
-                })
+                .addPrompt(
+                    {
+                        prompt: screen.requirements,
+                        method: screen.method,
+                        path: screen.path,
+                        description: screen.requirements,
+                        name: screen.name,
+                        title: screen.title,
+                        filename: screen.filename,
+                        storage_prefix: outerConversationId + '_',
+                        theme,
+                    },
+                    screen.conversationId
+                )
                 .catch((e) => {
                     console.error('Failed to generate page for screen %s', screen.name, e);
                     sendError(e as any, res);
@@ -719,6 +736,7 @@ router.post('/ui/vote', async (req: KapetaBodyRequest, res: Response) => {
     const aiRequest: UIPageVoteRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, vote, mainConversationId } = aiRequest;
     try {
+        const stormClient = new StormClient(mainConversationId);
         await stormClient.voteUIPage(topic, conversationId, vote, mainConversationId);
     } catch (e: any) {
         res.status(500).send({ error: e.message });
@@ -730,6 +748,7 @@ router.post('/ui/get-vote', async (req: KapetaBodyRequest, res: Response) => {
     const aiRequest: UIPageGetVoteRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, mainConversationId } = aiRequest;
     try {
+        const stormClient = new StormClient(mainConversationId);
         const vote = await stormClient.getVoteUIPage(topic, conversationId, mainConversationId);
         res.send({ vote });
     } catch (e: any) {
@@ -761,6 +780,7 @@ async function handleAll(req: KapetaBodyRequest, res: Response) {
         const conversationId = req.headers[ConversationIdHeader.toLowerCase()] as string | undefined;
 
         const aiRequest: BasePromptRequest = JSON.parse(req.stringBody ?? '{}');
+        const stormClient = new StormClient(systemId);
         const metaStream = await stormClient.createMetadata(aiRequest, conversationId);
 
         onRequestAborted(req, res, () => {