@sudobility/testomniac_runner_service 0.1.136 → 0.1.138

package/dist/analyzer/page-analyzer/index.js

@@ -424,20 +424,43 @@ export class PageAnalyzer {
             currentTestInteractionId: contextForFullPass.currentTestInteractionId,
             currentPageStateId: contextForFullPass.currentPageStateId,
         });
-        await generateRenderTestInteractions(this, contextForFullPass);
-        await generateFormTestInteractions(this, contextForFullPass);
-        // Login test generation: detect login forms in context and generate
-        // login-specific tests if the page appears to be a login page
+        // Collect all standard generator outputs (they return data, no API calls)
+        const outputs = [];
+        outputs.push(await generateRenderTestInteractions(this, contextForFullPass));
+        outputs.push(await generateFormTestInteractions(this, contextForFullPass));
+        // Login test generation: calls API directly (dependency chains)
         if (contextForFullPass.loginDetection?.isLoginPage) {
             await generateLoginTestInteractions(this, contextForFullPass, contextForFullPass.loginDetection, contextForFullPass.loginConfig);
         }
-        await generateSemanticJourneyTestInteractions(this, contextForFullPass);
-        await generateE2ETestInteractions(this, contextForFullPass);
-        await generateDialogLifecycleTestInteractions(this, contextForFullPass);
-        await generateScaffoldTestInteractions(this, contextForFullPass);
-        await generateContentTestInteractions(this, contextForFullPass);
-        await generateKeyboardAndDisclosureTestInteractions(this, contextForFullPass);
-        await generateVariantTestInteractions(this, contextForFullPass);
+        outputs.push(await generateSemanticJourneyTestInteractions(this, contextForFullPass));
+        outputs.push(await generateE2ETestInteractions(this, contextForFullPass));
+        outputs.push(await generateDialogLifecycleTestInteractions(this, contextForFullPass));
+        outputs.push(await generateScaffoldTestInteractions(this, contextForFullPass));
+        outputs.push(await generateContentTestInteractions(this, contextForFullPass));
+        outputs.push(await generateKeyboardAndDisclosureTestInteractions(this, contextForFullPass));
+        outputs.push(await generateVariantTestInteractions(this, contextForFullPass));
+        // Batch all collected generator outputs in one API call
+        const allCreates = outputs.flatMap(o => o.creates);
+        const allReconciles = outputs.flatMap(o => o.reconciles);
+        if (allCreates.length > 0 || allReconciles.length > 0) {
+            const batchResult = await contextForFullPass.api.generateAllSurfaceInteractions({
+                runnerId: contextForFullPass.runnerId,
+                testEnvironmentId: contextForFullPass.testEnvironmentId,
+                sizeClass: contextForFullPass.sizeClass,
+                testSurfaceBundleId: contextForFullPass.bundleRun.testSurfaceBundleId,
+                testSurfaceBundleRunId: contextForFullPass.bundleRun.id,
+                surfaces: allCreates,
+                reconcileOnly: allReconciles,
+            });
+            // Emit events for all created surfaces
+            for (const item of batchResult.results) {
+                contextForFullPass.events.onTestSurfaceCreated({
+                    surfaceId: item.surface.id,
+                    title: item.surface.title,
+                });
+            }
+        }
+        // Navigation calls API directly (no surface creation, no reconcile)
         await generateNavigationTestInteractions(this, contextForFullPass);
     }
     async reconcileGeneratedSurfaceElements(context, params) {
@@ -705,19 +728,20 @@ export class PageAnalyzer {
             .join("||");
     }
     async ensureTargetPageState(context) {
-        const scaffoldIdsBySelector = await this.ensureScaffolds(context);
-        for (const item of context.actionableItems) {
-            if (!item.selector)
-                continue;
-            const scaffoldSelector = context.scaffoldSelectorByItemSelector[item.selector] ?? null;
-            if (!scaffoldSelector)
-                continue;
-            const scaffoldId = scaffoldIdsBySelector.get(scaffoldSelector);
-            if (scaffoldId) {
-                item.scaffoldId = scaffoldId;
-            }
-        }
+        // Fast path: page state already known — just link scaffolds
         if (context.currentPageStateId > 0) {
+            const scaffoldIdsBySelector = await this.ensureScaffolds(context);
+            for (const item of context.actionableItems) {
+                if (!item.selector)
+                    continue;
+                const scaffoldSelector = context.scaffoldSelectorByItemSelector[item.selector] ?? null;
+                if (!scaffoldSelector)
+                    continue;
+                const scaffoldId = scaffoldIdsBySelector.get(scaffoldSelector);
+                if (scaffoldId) {
+                    item.scaffoldId = scaffoldId;
+                }
+            }
             if (scaffoldIdsBySelector.size > 0) {
                 await context.api.linkPageStateScaffolds(context.currentPageStateId, Array.from(new Set(scaffoldIdsBySelector.values())));
             }
@@ -728,78 +752,58 @@ export class PageAnalyzer {
             await this.ensureStoredForms(context.currentPageStateId, context);
             return context.currentPageStateId;
         }
+        // Combined endpoint: scaffolds + match + create in one round-trip
         const hashes = await computeHashes(context.html, context.actionableItems);
-        const existing = await context.api.findMatchingPageState(context.pageId, hashes, context.sizeClass);
-        if (existing) {
-            if (scaffoldIdsBySelector.size > 0) {
-                await context.api.linkPageStateScaffolds(existing.id, Array.from(new Set(scaffoldIdsBySelector.values())));
-            }
-            context.events.onPageStateCreated({
-                pageStateId: existing.id,
-                pageId: context.pageId,
-            });
-            await this.ensureStoredForms(existing.id, context);
-            return existing.id;
-        }
-        // Fallback: match by content minus scaffolds (e.g., cookie banner
-        // presence/absence should not create a different page state)
+        let fixedBodyHash;
         if (context.scaffolds.length > 0) {
             const body = getBody(context.html);
             const { contentBody } = getContentBody(body, context.scaffolds);
-            const contentBodyHash = await sha256(normalizeHtml(contentBody));
-            const existingByContent = await context.api.findMatchingPageStateByContentBody(context.pageId, contentBodyHash, context.sizeClass);
-            if (existingByContent) {
-                if (scaffoldIdsBySelector.size > 0) {
-                    await context.api.linkPageStateScaffolds(existingByContent.id, Array.from(new Set(scaffoldIdsBySelector.values())));
-                }
-                context.events.onPageStateCreated({
-                    pageStateId: existingByContent.id,
-                    pageId: context.pageId,
-                });
-                await this.ensureStoredForms(existingByContent.id, context);
-                return existingByContent.id;
-            }
+            fixedBodyHash = await sha256(normalizeHtml(contentBody));
         }
-        const contentHash = createHash("sha256").update(context.html).digest("hex");
-        const contentElement = await context.api.findOrCreateHtmlElement(context.html, contentHash);
-        await context.api.insertActionableItems(contentElement.id, context.actionableItems);
-        const pageState = await context.api.createPageState({
-            pageId: context.pageId,
+        const result = await context.api.ensurePageStateCombined({
+            pageId: context.pageId > 0 ? context.pageId : undefined,
+            relativePath: context.pageId === 0 ? context.currentPath : undefined,
+            runnerId: context.runnerId,
+            testEnvironmentId: context.testEnvironmentId,
             sizeClass: context.sizeClass,
-            hashes,
-            contentText: htmlToMarkdown(context.html).slice(0, 5000),
-            contentHtmlElementId: contentElement.id,
             screenshotPath: context.screenshotPath,
+            html: context.html,
+            contentText: htmlToMarkdown(context.html).slice(0, 5000),
+            hashes,
+            fixedBodyHash,
+            actionableItems: context.actionableItems,
+            scaffolds: context.scaffolds.map(scaffold => ({
+                type: scaffold.type,
+                html: scaffold.outerHtml,
+                hash: scaffold.hash,
+                selector: scaffold.selector,
+            })),
+            scaffoldSelectorByItemSelector: context.scaffoldSelectorByItemSelector,
         });
-        // Store content-body hash (HTML minus scaffolds) for fallback matching
-        if (context.scaffolds.length > 0) {
-            const body = getBody(context.html);
-            const { contentBody } = getContentBody(body, context.scaffolds);
-            const contentBodyHash = await sha256(normalizeHtml(contentBody));
-            try {
-                await context.api.updatePageStateDecomposedHashes(pageState.id, {
-                    fixedBodyHash: contentBodyHash,
-                    scaffoldsHash: "",
-                    patternsHash: "",
-                });
-            }
-            catch (err) {
-                // Best effort — decomposed hashes are optional
-                logAnalyzer("decomposed-hashes:failed", {
-                    pageStateId: pageState.id,
-                    error: err instanceof Error ? err.message : String(err),
-                });
+        // Part A: server resolved the page — update context
+        if (result.pageId && context.pageId === 0) {
+            context.pageId = result.pageId;
+            context.pageRequiresLogin = result.requiresLogin;
+        }
+        // Map scaffold IDs back to in-memory actionable items for generators
+        for (const item of context.actionableItems) {
+            if (!item.selector)
+                continue;
+            const scaffoldSelector = context.scaffoldSelectorByItemSelector[item.selector] ?? null;
+            if (!scaffoldSelector)
+                continue;
+            const scaffoldId = result.scaffoldIdsBySelector[scaffoldSelector];
+            if (scaffoldId) {
+                item.scaffoldId = scaffoldId;
             }
         }
+        // Scaffold screenshots are now updated server-side in ensure-page-state
         context.events.onPageStateCreated({
-            pageStateId: pageState.id,
-            pageId: context.pageId,
+            pageStateId: result.pageStateId,
+            pageId: result.pageId ?? context.pageId,
         });
-        if (scaffoldIdsBySelector.size > 0) {
-            await context.api.linkPageStateScaffolds(pageState.id, Array.from(new Set(scaffoldIdsBySelector.values())));
-        }
-        await this.ensureStoredForms(pageState.id, context);
-        return pageState.id;
+        await this.ensureStoredForms(result.pageStateId, context);
+        return result.pageStateId;
     }
     async ensureScaffolds(context) {
         const scaffoldIdsBySelector = new Map();