@kapeta/local-cluster-service 0.74.0 → 0.74.2

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.74.2](https://github.com/kapetacom/local-cluster-service/compare/v0.74.1...v0.74.2) (2024-09-27)
+
+
+### Bug Fixes
+
+* add more bail checkpoints for aborted request ([1f4823c](https://github.com/kapetacom/local-cluster-service/commit/1f4823c648d21f3ea8c8f8f2ead156d1e43c7252))
+* define conversationIds for pages as early as possible ([7b020a5](https://github.com/kapetacom/local-cluster-service/commit/7b020a52ddeba60329989dafda62abc8d3565039))
+
+## [0.74.1](https://github.com/kapetacom/local-cluster-service/compare/v0.74.0...v0.74.1) (2024-09-27)
+
+
+### Bug Fixes
+
+* adding system id to all calls ([b3e978f](https://github.com/kapetacom/local-cluster-service/commit/b3e978ffb74fe0ab1a46006412e52c63fe49eff8))
+
 # [0.74.0](https://github.com/kapetacom/local-cluster-service/compare/v0.73.0...v0.74.0) (2024-09-26)
 
 

package/dist/cjs/src/storm/PageGenerator.js

@@ -37,6 +37,7 @@ const node_events_1 = require("node:events");
 const p_queue_1 = __importDefault(require("p-queue"));
 const page_utils_1 = require("./page-utils");
 const mimetypes = __importStar(require("mime-types"));
+const node_crypto_1 = require("node:crypto");
 class PageQueue extends node_events_1.EventEmitter {
     queue;
     eventQueue;
@@ -166,6 +167,8 @@ class PageQueue extends node_events_1.EventEmitter {
                         }
                         this.pages.set(normalizedPath, reference.description);
                         initialPrompts.push({
+                            conversationId: (0, node_crypto_1.randomUUID)(),
+                            id: (0, node_crypto_1.randomUUID)(),
                             name: reference.name,
                             title: reference.title,
                             path: normalizedPath,
@@ -193,20 +196,21 @@ class PageQueue extends node_events_1.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);
                 });
@@ -240,8 +244,9 @@ class PageQueue extends node_events_1.EventEmitter {
             console.warn('Skipping image reference of type %s for url %s', mimeType, prompt.url);
             return;
         }
+        const client = new stormClient_1.StormClient(this.systemId);
         this.images.set(prompt.url, prompt.description);
-        const result = await stormClient_1.stormClient.createImage(`Create an image for the url "${prompt.url}" with this description: ${prompt.description}`.trim());
+        const result = await client.createImage(`Create an image for the url "${prompt.url}" with this description: ${prompt.description}`.trim());
         let imageEvent = null;
         result.on('data', (event) => {
             if (event.type === 'IMAGE') {
@@ -256,7 +261,8 @@ class PageQueue extends node_events_1.EventEmitter {
         this.emit('image', imageEvent, prompt);
     }
     async generate(prompt, conversationId) {
-        const screenStream = await stormClient_1.stormClient.createUIPage(prompt, conversationId);
+        const client = new stormClient_1.StormClient(this.systemId);
+        const screenStream = await client.createUIPage(prompt, conversationId);
         let pageEvent = null;
         screenStream.on('data', (event) => {
             if (event.type === 'PAGE') {
@@ -273,7 +279,8 @@ class PageQueue extends node_events_1.EventEmitter {
         await this.processPageEventWithReferences(pageEvent);
     }
     async resolveReferences(content) {
-        const referenceStream = await stormClient_1.stormClient.classifyUIReferences(content);
+        const client = new stormClient_1.StormClient(this.systemId);
+        const referenceStream = await client.classifyUIReferences(content);
         const references = [];
         referenceStream.on('data', (referenceData) => {
             if (referenceData.type !== 'REF_CLASSIFICATION') {

package/dist/cjs/src/storm/codegen.js

@@ -311,9 +311,10 @@ class StormCodegen {
             permissions: '0644',
         });
         const uiEvents = [];
+        const stormClient = new stormClient_1.StormClient(this.uiSystemId);
         // generate screens
         if (uiTemplates.length) {
-            const screenStream = await stormClient_1.stormClient.listScreens({
+            const screenStream = await stormClient.listScreens({
                 events: filteredEvents,
                 templates: uiTemplates,
                 context: relevantFiles,
@@ -346,7 +347,7 @@ class StormCodegen {
                     context: relevantFiles.concat([getScreenEventsFile()]),
                     prompt: this.userPrompt,
                 };
-                const uiStream = await stormClient_1.stormClient.createUIImplementation(payload);
+                const uiStream = await stormClient.createUIImplementation(payload);
                 uiStream.on('data', (evt) => {
                     const uiFile = this.handleUiOutput(blockUri, block.aiName, evt);
                     if (uiFile != undefined) {
@@ -374,13 +375,13 @@ class StormCodegen {
         });
         allFiles.push(...screenFilesConverted);
         let webRouters = allFiles.filter((file) => file.type === codegen_1.AIFileTypes.WEB_ROUTER);
-        webRouters = await this.processTemplates(blockUri, block.aiName, stormClient_1.stormClient.generateCode.bind(stormClient_1.stormClient), webRouters, screenFilesConverted.concat([getScreenEventsFile()]));
+        webRouters = await this.processTemplates(blockUri, block.aiName, stormClient.generateCode.bind(stormClient), webRouters, screenFilesConverted.concat([getScreenEventsFile()]));
         // Gather the context files for implementation. These will be all be passed to the AI
         const contextFiles = relevantFiles.filter((file) => ![codegen_1.AIFileTypes.SERVICE, codegen_1.AIFileTypes.WEB_SCREEN, codegen_1.AIFileTypes.WEB_ROUTER].includes(file.type));
         // Send the service and UI templates to the AI. These will be sent one-by-one in addition to the context files
         let serviceFiles = allFiles.filter((file) => file.type === codegen_1.AIFileTypes.SERVICE);
         if (serviceFiles.length > 0) {
-            serviceFiles = await this.processTemplates(blockUri, block.aiName, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
+            serviceFiles = await this.processTemplates(blockUri, block.aiName, stormClient.createServiceImplementation.bind(stormClient), serviceFiles, contextFiles);
         }
         if (this.isAborted()) {
             return;
@@ -510,7 +511,8 @@ class StormCodegen {
         }
     }
     async classifyErrors(errors, basePath) {
-        const errorStream = await stormClient_1.stormClient.createErrorClassification(errors, []);
+        const stormClient = new stormClient_1.StormClient(this.uiSystemId);
+        const errorStream = await stormClient.createErrorClassification(errors, []);
         const fixes = new Map();
         this.out.on('aborted', () => {
             errorStream.abort();
@@ -547,7 +549,8 @@ class StormCodegen {
                 error: error,
                 projectFiles: allFiles.map((f) => f.filename),
             };
-            const detailsStream = await stormClient_1.stormClient.createErrorDetails(JSON.stringify(request), []);
+            const stormClient = new stormClient_1.StormClient(this.uiSystemId);
+            const detailsStream = await stormClient.createErrorDetails(JSON.stringify(request), []);
             detailsStream.on('data', (evt) => {
                 if (evt.type === 'ERROR_DETAILS') {
                     resolve(evt.payload.files);
@@ -611,7 +614,8 @@ class StormCodegen {
     async codeFix(blockUri, blockName, fix, history) {
         return new Promise(async (resolve, reject) => {
             try {
-                const fixStream = await stormClient_1.stormClient.createCodeFix(fix, history, this.conversationId);
+                const stormClient = new stormClient_1.StormClient(this.uiSystemId);
+                const fixStream = await stormClient.createCodeFix(fix, history, this.conversationId);
                 let resolved = false;
                 fixStream.on('data', (evt) => {
                     if (this.handleFileEvents(blockUri, blockName, evt)) {

package/dist/cjs/src/storm/events.d.ts

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

package/dist/cjs/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/cjs/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/cjs/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/cjs/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/cjs/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/cjs/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/dist/esm/src/storm/PageGenerator.js

@@ -37,6 +37,7 @@ const node_events_1 = require("node:events");
 const p_queue_1 = __importDefault(require("p-queue"));
 const page_utils_1 = require("./page-utils");
 const mimetypes = __importStar(require("mime-types"));
+const node_crypto_1 = require("node:crypto");
 class PageQueue extends node_events_1.EventEmitter {
     queue;
     eventQueue;
@@ -166,6 +167,8 @@ class PageQueue extends node_events_1.EventEmitter {
                         }
                         this.pages.set(normalizedPath, reference.description);
                         initialPrompts.push({
+                            conversationId: (0, node_crypto_1.randomUUID)(),
+                            id: (0, node_crypto_1.randomUUID)(),
                             name: reference.name,
                             title: reference.title,
                             path: normalizedPath,
@@ -193,20 +196,21 @@ class PageQueue extends node_events_1.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);
                 });
@@ -240,8 +244,9 @@ class PageQueue extends node_events_1.EventEmitter {
             console.warn('Skipping image reference of type %s for url %s', mimeType, prompt.url);
             return;
         }
+        const client = new stormClient_1.StormClient(this.systemId);
         this.images.set(prompt.url, prompt.description);
-        const result = await stormClient_1.stormClient.createImage(`Create an image for the url "${prompt.url}" with this description: ${prompt.description}`.trim());
+        const result = await client.createImage(`Create an image for the url "${prompt.url}" with this description: ${prompt.description}`.trim());
         let imageEvent = null;
         result.on('data', (event) => {
             if (event.type === 'IMAGE') {
@@ -256,7 +261,8 @@ class PageQueue extends node_events_1.EventEmitter {
         this.emit('image', imageEvent, prompt);
     }
     async generate(prompt, conversationId) {
-        const screenStream = await stormClient_1.stormClient.createUIPage(prompt, conversationId);
+        const client = new stormClient_1.StormClient(this.systemId);
+        const screenStream = await client.createUIPage(prompt, conversationId);
         let pageEvent = null;
         screenStream.on('data', (event) => {
             if (event.type === 'PAGE') {
@@ -273,7 +279,8 @@ class PageQueue extends node_events_1.EventEmitter {
         await this.processPageEventWithReferences(pageEvent);
     }
     async resolveReferences(content) {
-        const referenceStream = await stormClient_1.stormClient.classifyUIReferences(content);
+        const client = new stormClient_1.StormClient(this.systemId);
+        const referenceStream = await client.classifyUIReferences(content);
         const references = [];
         referenceStream.on('data', (referenceData) => {
             if (referenceData.type !== 'REF_CLASSIFICATION') {

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

@@ -311,9 +311,10 @@ class StormCodegen {
             permissions: '0644',
         });
         const uiEvents = [];
+        const stormClient = new stormClient_1.StormClient(this.uiSystemId);
         // generate screens
         if (uiTemplates.length) {
-            const screenStream = await stormClient_1.stormClient.listScreens({
+            const screenStream = await stormClient.listScreens({
                 events: filteredEvents,
                 templates: uiTemplates,
                 context: relevantFiles,
@@ -346,7 +347,7 @@ class StormCodegen {
                     context: relevantFiles.concat([getScreenEventsFile()]),
                     prompt: this.userPrompt,
                 };
-                const uiStream = await stormClient_1.stormClient.createUIImplementation(payload);
+                const uiStream = await stormClient.createUIImplementation(payload);
                 uiStream.on('data', (evt) => {
                     const uiFile = this.handleUiOutput(blockUri, block.aiName, evt);
                     if (uiFile != undefined) {
@@ -374,13 +375,13 @@ class StormCodegen {
         });
         allFiles.push(...screenFilesConverted);
         let webRouters = allFiles.filter((file) => file.type === codegen_1.AIFileTypes.WEB_ROUTER);
-        webRouters = await this.processTemplates(blockUri, block.aiName, stormClient_1.stormClient.generateCode.bind(stormClient_1.stormClient), webRouters, screenFilesConverted.concat([getScreenEventsFile()]));
+        webRouters = await this.processTemplates(blockUri, block.aiName, stormClient.generateCode.bind(stormClient), webRouters, screenFilesConverted.concat([getScreenEventsFile()]));
         // Gather the context files for implementation. These will be all be passed to the AI
         const contextFiles = relevantFiles.filter((file) => ![codegen_1.AIFileTypes.SERVICE, codegen_1.AIFileTypes.WEB_SCREEN, codegen_1.AIFileTypes.WEB_ROUTER].includes(file.type));
         // Send the service and UI templates to the AI. These will be sent one-by-one in addition to the context files
         let serviceFiles = allFiles.filter((file) => file.type === codegen_1.AIFileTypes.SERVICE);
         if (serviceFiles.length > 0) {
-            serviceFiles = await this.processTemplates(blockUri, block.aiName, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
+            serviceFiles = await this.processTemplates(blockUri, block.aiName, stormClient.createServiceImplementation.bind(stormClient), serviceFiles, contextFiles);
         }
         if (this.isAborted()) {
             return;
@@ -510,7 +511,8 @@ class StormCodegen {
         }
     }
     async classifyErrors(errors, basePath) {
-        const errorStream = await stormClient_1.stormClient.createErrorClassification(errors, []);
+        const stormClient = new stormClient_1.StormClient(this.uiSystemId);
+        const errorStream = await stormClient.createErrorClassification(errors, []);
         const fixes = new Map();
         this.out.on('aborted', () => {
             errorStream.abort();
@@ -547,7 +549,8 @@ class StormCodegen {
                 error: error,
                 projectFiles: allFiles.map((f) => f.filename),
             };
-            const detailsStream = await stormClient_1.stormClient.createErrorDetails(JSON.stringify(request), []);
+            const stormClient = new stormClient_1.StormClient(this.uiSystemId);
+            const detailsStream = await stormClient.createErrorDetails(JSON.stringify(request), []);
             detailsStream.on('data', (evt) => {
                 if (evt.type === 'ERROR_DETAILS') {
                     resolve(evt.payload.files);
@@ -611,7 +614,8 @@ class StormCodegen {
     async codeFix(blockUri, blockName, fix, history) {
         return new Promise(async (resolve, reject) => {
             try {
-                const fixStream = await stormClient_1.stormClient.createCodeFix(fix, history, this.conversationId);
+                const stormClient = new stormClient_1.StormClient(this.uiSystemId);
+                const fixStream = await stormClient.createCodeFix(fix, history, this.conversationId);
                 let resolved = false;
                 fixStream.on('data', (evt) => {
                     if (this.handleFileEvents(blockUri, blockName, evt)) {

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

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