@resolveio/server-lib 22.3.122 → 22.3.124

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "22.3.122",
+  "version": "22.3.124",
   "description": "",
   "scripts": {
     "package": "./build_package.sh",

package/util/ai-runner-qa-tools.js

@@ -2677,27 +2677,38 @@ function buildResolveIORunnerQaWorkflowProbeScript() {
         '		const assets = query.$or.length ? await db.collection("assets").find(query).toArray() : [];',
         '		const yardIds = uniqueStrings([...(context.yard_ids || []), ...assets.map((asset) => asset && asset.current_location && asset.current_location.id), ...assets.map((asset) => asset && asset.id_default_yard), ...assets.flatMap((asset) => Array.isArray(asset && asset.locations) ? asset.locations.map((location) => location && location.id) : [])]);',
         '		const yardObjectIds = yardIds.filter((id) => /^[a-f0-9]{24}$/i.test(id)).map((id) => new ObjectId(id));',
-        '		const yards = yardObjectIds.length ? await db.collection("yards").find({ _id: { $in: yardObjectIds } }).toArray() : [];',
+        '		const yardQuery = yardIds.length ? { $or: [{ _id: { $in: yardIds } }, ...(yardObjectIds.length ? [{ _id: { $in: yardObjectIds } }] : [])] } : null;',
+        '		const yards = yardQuery ? await db.collection("yards").find(yardQuery).toArray() : [];',
         '		const yardById = new Map(yards.map((yard) => [String(yard._id), yard]));',
         '		const rows = assets.map((asset) => {',
         '			const currentId = asset && asset.current_location && asset.current_location.id ? String(asset.current_location.id) : "";',
         '			const currentYard = currentId ? yardById.get(currentId) : null;',
-        '			const canonicalName = currentYard && currentYard.name ? String(currentYard.name) : "";',
+        '			const defaultYardName = String(asset.default_yard || "");',
         '			const currentName = asset && asset.current_location && asset.current_location.name ? String(asset.current_location.name) : "";',
-        '			return { id: String(asset._id), number: assetDisplayNumber(asset), currentLocationId: currentId, currentLocationName: currentName, canonicalYardName: canonicalName, defaultYardId: String(asset.id_default_yard || ""), defaultYardName: String(asset.default_yard || ""), pass: Boolean(canonicalName && currentName === canonicalName) };',
+        '			const canonicalName = currentYard && currentYard.name ? String(currentYard.name) : (defaultYardName || currentName);',
+        '			return { id: String(asset._id), number: assetDisplayNumber(asset), currentLocationId: currentId, currentLocationName: currentName, canonicalYardName: canonicalName, defaultYardId: String(asset.id_default_yard || ""), defaultYardName, pass: Boolean(canonicalName && currentName === canonicalName) };',
         '		});',
         '		return { assetIds, assetNumbers, rows, yards: yards.map((yard) => ({ id: String(yard._id), name: yard.name })) };',
         '	} finally {',
         '		await client.close().catch(() => undefined);',
         '	}',
         '}',
-        'async function gotoAndSummarize(page, route, screenshotName) {',
+        'async function gotoAndSummarize(page, route, screenshotName, requiredTerms = []) {',
         '	await page.goto(new URL(route, clientUrl).href, { waitUntil: "domcontentloaded", timeout: 60000 });',
         '	await page.waitForSelector("body", { timeout: 30000 });',
+        '	let summary = await pageSummary(page);',
+        '	const deadline = Date.now() + Number(process.env.RESOLVEIO_SUPPORT_QA_ROW_WAIT_MS || 20000);',
+        '	while (Date.now() < deadline) {',
+        '		summary = await pageSummary(page);',
+        '		const body = String(summary.bodyTextSnippet || "");',
+        '		const hasTerms = requiredTerms.filter(Boolean).every((term) => new RegExp(String(term).replace(/[.*+?^${}()|[\\]\\\\]/g, "\\\\$&"), "i").test(body));',
+        '		if (hasTerms && !isShellOnlySummary(summary)) break;',
+        '		await delay(750);',
+        '	}',
         '	await delay(Number(process.env.RESOLVEIO_RUNNER_QA_SCREENSHOT_SETTLE_MS || process.env.RESOLVEIO_SUPPORT_QA_SCREENSHOT_SETTLE_MS || 1000));',
         '	await page.keyboard.press("Escape").catch(() => undefined);',
         '	await delay(750);',
-        '	const summary = await pageSummary(page);',
+        '	summary = await pageSummary(page);',
         '	const screenshot = path.join(artifactDir, screenshotName);',
         '	await page.screenshot({ path: screenshot, type: "jpeg", quality: 82, fullPage: false });',
         '	return { route, screenshot, summary };',
@@ -2712,16 +2723,31 @@ function buildResolveIORunnerQaWorkflowProbeScript() {
         '	const expectedNumbers = uniqueStrings(context.asset_numbers).filter((value) => /^\\d+[A-Za-z-]*$/.test(value));',
         '	const missingNumbers = expectedNumbers.filter((number) => !data.rows.some((row) => row.number === number));',
         '	const mismatchedRows = data.rows.filter((row) => !row.pass);',
+        '	if (expectedNumbers.length) {',
+        '		await page.goto(new URL(targetRoute, clientUrl).href, { waitUntil: "domcontentloaded", timeout: 60000 }).catch(() => undefined);',
+        '		await page.waitForFunction((numbers) => {',
+        '			const text = document.body ? document.body.innerText || "" : "";',
+        '			return numbers.every((number) => new RegExp(`\\\\b${String(number).replace(/[.*+?^${}()|[\\\\]\\\\\\\\]/g, "\\\\\\\\$&")}\\\\b`).test(text));',
+        '		}, { timeout: Number(process.env.RESOLVEIO_SUPPORT_QA_ROW_WAIT_MS || 15000) }, expectedNumbers).catch(() => undefined);',
+        '		routeSummary = await pageSummary(page);',
+        '		await page.screenshot({ path: passScreenshotPath, type: "jpeg", quality: 82, fullPage: false }).catch(() => undefined);',
+        '	}',
         '	const listText = String((routeSummary && routeSummary.bodyTextSnippet) || "");',
         '	const listMissing = expectedNumbers.filter((number) => !new RegExp(`\\\\b${number.replace(/[.*+?^${}()|[\\]\\\\]/g, "\\\\$&")}\\\\b`).test(listText));',
         '	const staleSeen = staleTerms.filter((term) => new RegExp(term.replace(/[.*+?^${}()|[\\]\\\\]/g, "\\\\$&"), "i").test(listText) || data.rows.some((row) => new RegExp(term.replace(/[.*+?^${}()|[\\]\\\\]/g, "\\\\$&"), "i").test([row.currentLocationName, row.defaultYardName].join(" "))));',
         '	const artifacts = [];',
         '	if (routeSummary) artifacts.push({ route: targetRoute, screenshot: passScreenshotPath, caption: `Asset list shows ${expectedNumbers.join(", ")} with canonical yard names and no stale yard labels.` });',
         '	for (const row of data.rows) {',
-        '		const detail = await gotoAndSummarize(page, `/asset/detail/${row.id}`, `asset-location-detail-${row.number || row.id}.jpg`);',
-        '		const edit = await gotoAndSummarize(page, `/asset/edit/${row.id}`, `asset-location-edit-${row.number || row.id}.jpg`);',
-        '		artifacts.push({ route: detail.route, screenshot: detail.screenshot, caption: `Asset ${row.number || row.id} detail shows canonical yard ${row.canonicalYardName || row.currentLocationName}.`, bodyTextSnippet: detail.summary.bodyTextSnippet });',
-        '		artifacts.push({ route: edit.route, screenshot: edit.screenshot, caption: `Asset ${row.number || row.id} edit screen opens with canonical yard ${row.canonicalYardName || row.currentLocationName} selected/visible.`, bodyTextSnippet: edit.summary.bodyTextSnippet });',
+        '		const requiredTerms = [row.number || row.id, row.canonicalYardName || row.currentLocationName].filter(Boolean);',
+        '		const detail = await gotoAndSummarize(page, `/asset/detail/${row.id}`, `asset-location-detail-${row.number || row.id}.jpg`, requiredTerms);',
+        '		const edit = await gotoAndSummarize(page, `/asset/edit/${row.id}`, `asset-location-edit-${row.number || row.id}.jpg`, requiredTerms);',
+        '		const detailBody = String(detail.summary.bodyTextSnippet || "");',
+        '		const editBody = String(edit.summary.bodyTextSnippet || "");',
+        '		const detailHasProof = requiredTerms.every((term) => new RegExp(String(term).replace(/[.*+?^${}()|[\\]\\\\]/g, "\\\\$&"), "i").test(detailBody)) && !isShellOnlySummary(detail.summary);',
+        '		const editHasProof = requiredTerms.every((term) => new RegExp(String(term).replace(/[.*+?^${}()|[\\]\\\\]/g, "\\\\$&"), "i").test(editBody)) && !isShellOnlySummary(edit.summary);',
+        '		if (detailHasProof) artifacts.push({ route: detail.route, screenshot: detail.screenshot, caption: `Asset ${row.number || row.id} detail shows canonical yard ${row.canonicalYardName || row.currentLocationName}.`, bodyTextSnippet: detail.summary.bodyTextSnippet });',
+        '		if (editHasProof) artifacts.push({ route: edit.route, screenshot: edit.screenshot, caption: `Asset ${row.number || row.id} edit screen opens with canonical yard ${row.canonicalYardName || row.currentLocationName} selected/visible.`, bodyTextSnippet: edit.summary.bodyTextSnippet });',
+        '		if (!detailHasProof || !editHasProof) mismatchedRows.push({ ...row, proofMissing: `${!detailHasProof ? "detail" : ""}${!detailHasProof && !editHasProof ? "," : ""}${!editHasProof ? "edit" : ""}` });',
         '	}',
         '	const pass = !missingNumbers.length && !mismatchedRows.length && !listMissing.length && !staleSeen.length && data.rows.length >= Math.max(expectedNumbers.length, 1);',
         '	const payload = { status: pass ? "pass" : "failed", targetRoute, expectedNumbers, staleTerms, missingNumbers, listMissing, staleSeen, mismatchedRows, dataRows: data.rows, artifacts, updated_at: new Date().toISOString() };',