fix web sentinel dashboard verify fallback

2026-07-02 08:25:36 +00:00
parent 47b2145adb
commit f89e88133c
2 changed files with 255 additions and 2 deletions
@@ -681,7 +681,9 @@ export function probeSentinelDashboardBrowser(state: SentinelCicdState, options:
  const result = job.result;
  const transport = record(job.transport);
  const remote = record(transport.remote);
-  const page = parseDashboardBrowserPayload(typeof remote.stdoutTail === "string" ? remote.stdoutTail : "");
+  const browserPage = parseDashboardBrowserPayload(typeof remote.stdoutTail === "string" ? remote.stdoutTail : "");
+  const serviceApi = dashboardPageNeedsServiceApiFallback(browserPage) ? probeSentinelDashboardServiceApi(state, options, browserPage) : null;
+  const page = applyDashboardServiceApiFallback(browserPage, serviceApi);
  const artifacts = Array.isArray(transport.artifacts) ? transport.artifacts.map(record).map(compactDashboardArtifact) : [];
  const screenshot = artifacts.find((artifact) => typeof artifact.localPath === "string" && String(artifact.localPath).endsWith(".png")) ?? null;
  const browserOk = page?.ok === true;
@@ -699,6 +701,7 @@ export function probeSentinelDashboardBrowser(state: SentinelCicdState, options:
    route,
    viewport: options.viewport,
    page,
+    serviceApi,
    screenshot,
    artifacts,
    artifactCount: artifacts.length,
@@ -1129,6 +1132,241 @@ function parseDashboardBrowserPayload(textValue: string): Record<string, unknown
  }
 }

+function dashboardPageNeedsServiceApiFallback(page: Record<string, unknown> | null): boolean {
+  if (page === null) return false;
+  const dom = record(page.dom);
+  const contract = record(dom.contract);
+  const api = record(dom.api);
+  const memorySummary = record(dom.memorySummary);
+  return contract.apiOverview !== true
+    || contract.apiRuns !== true
+    || memorySummary.contractOk !== true
+    || record(api.overview).ok !== true
+    || record(api.runs).ok !== true;
+}
+
+function probeSentinelDashboardServiceApi(state: SentinelCicdState, options: Extract<WebProbeSentinelOptions, { kind: "dashboard" }>, page: Record<string, unknown> | null): Record<string, unknown> {
+  const timeoutSeconds = Math.max(5, Math.min(options.commandTimeoutSeconds, 30));
+  const overview = callSentinelService(state, "GET", "/api/overview", null, timeoutSeconds);
+  const runs = callSentinelService(state, "GET", "/api/runs?limit=30&sort=updated", null, timeoutSeconds);
+  const overviewBody = record(overview.bodyJson);
+  const runsBody = record(runs.bodyJson);
+  const runItems = dashboardApiRuns(runsBody);
+  const latestRun = runItems[0] ?? {};
+  const latestRunId = dashboardRunId(latestRun);
+  const pageMemory = record(record(page?.dom).memorySummary);
+  const selectedRunId = options.runId
+    ?? stringAtNullable(pageMemory, "runId")
+    ?? latestRunId;
+  const detail = selectedRunId === null ? null : callSentinelService(state, "GET", `/api/runs/${encodeURIComponent(selectedRunId)}`, null, timeoutSeconds);
+  const detailBody = record(detail?.bodyJson);
+  const detailRun = record(detailBody.run);
+  const memory = record(detailBody.memory);
+  const pageSeries = Array.isArray(memory.pageSeries) ? memory.pageSeries.map(record) : [];
+  const sampleCount = numberValue(memory.sampleCount);
+  const expectedMemorySamples = pageSeries.length > 0 || sampleCount > 0;
+  const overviewMatches = state.sentinelId.length === 0 || stringAtNullable(overviewBody, "sentinelId") === state.sentinelId;
+  const runsPayloadMatches = state.sentinelId.length === 0 || stringAtNullable(runsBody, "sentinelId") === state.sentinelId;
+  const runRowsMatch = state.sentinelId.length === 0 || runItems.every((run) => stringAtNullable(run, "sentinelId") === null || stringAtNullable(run, "sentinelId") === state.sentinelId);
+  const detailOk = detail === null ? false : detail.ok === true && detailBody.ok !== false;
+  return {
+    ok: overview.ok === true
+      && runs.ok === true
+      && overviewBody.ok !== false
+      && runsBody.ok !== false
+      && Array.isArray(runItems)
+      && overviewMatches
+      && runsPayloadMatches
+      && runRowsMatch
+      && (selectedRunId === null || detailOk),
+    source: "sentinel-service-api",
+    overview: {
+      ok: overview.ok === true && overviewBody.ok !== false,
+      httpStatus: overview.httpStatus ?? null,
+      sentinelId: stringAtNullable(overviewBody, "sentinelId"),
+      latestRunId: dashboardRunId(record(overviewBody.latestRun)),
+      matches: overviewMatches,
+    },
+    runs: {
+      ok: runs.ok === true && runsBody.ok !== false && Array.isArray(runItems),
+      httpStatus: runs.httpStatus ?? null,
+      sentinelId: stringAtNullable(runsBody, "sentinelId"),
+      count: runItems.length,
+      latestRunId,
+      matches: runsPayloadMatches,
+      runRowsMatch,
+    },
+    detail: detail === null ? null : {
+      ok: detailOk,
+      httpStatus: detail.httpStatus ?? null,
+      runId: dashboardRunId(detailRun) ?? selectedRunId,
+    },
+    selectedRunId,
+    latestRun: {
+      runId: latestRunId,
+      typeCount: numberValue(latestRun.findingTypeCount ?? latestRun.findingCount ?? latestRun.finding_count),
+      durationMinutes: numberValue(latestRun.runDurationMinutes ?? latestRun.durationMinutes ?? record(latestRun.timing).durationMinutes),
+      severityKeys: Object.keys(record(latestRun.severityCounts)).sort(),
+    },
+    memory: {
+      ok: detailOk && (memory.ok !== false || !expectedMemorySamples),
+      pageCount: pageSeries.length,
+      sampleCount,
+      source: stringAtNullable(memory, "source"),
+      expectedFromApi: expectedMemorySamples,
+    },
+    valuesRedacted: true,
+  };
+}
+
+function applyDashboardServiceApiFallback(page: Record<string, unknown> | null, serviceApi: Record<string, unknown> | null): Record<string, unknown> | null {
+  if (page === null || serviceApi === null || serviceApi.ok !== true) return page;
+  const dom = { ...record(page.dom) };
+  const contract = { ...record(dom.contract) };
+  const api = { ...record(dom.api) };
+  const sentinelBoundary = { ...record(dom.sentinelBoundary) };
+  const latestRunCounts = { ...record(dom.latestRunCounts) };
+  const targetRunCounts = { ...record(dom.targetRunCounts) };
+  const requestedRunSelection = { ...record(dom.requestedRunSelection) };
+  const memorySummary = { ...record(dom.memorySummary) };
+  const serviceOverview = record(serviceApi.overview);
+  const serviceRuns = record(serviceApi.runs);
+  const serviceDetail = record(serviceApi.detail);
+  const serviceLatestRun = record(serviceApi.latestRun);
+  const serviceMemory = record(serviceApi.memory);
+  const selectedRunId = stringAtNullable(serviceApi, "selectedRunId");
+  const expectedMemory = serviceMemory.expectedFromApi === true;
+  const memoryRunId = stringAtNullable(memorySummary, "runId");
+  const memoryMatchesTarget = selectedRunId === null || memoryRunId === selectedRunId;
+  const memoryChartPresent = memorySummary.present === true;
+  const memoryPageCount = numberValue(memorySummary.pageCount);
+  const apiPageCount = numberValue(serviceMemory.pageCount);
+  const memoryContractOk = serviceDetail.ok === true
+    && (expectedMemory !== true || (memoryChartPresent && memoryMatchesTarget && memoryPageCount === apiPageCount));
+
+  api.overview = {
+    ...record(api.overview),
+    ok: true,
+    httpStatus: serviceOverview.httpStatus ?? 200,
+    source: "service-fallback",
+  };
+  api.runs = {
+    ...record(api.runs),
+    ok: true,
+    httpStatus: serviceRuns.httpStatus ?? 200,
+    source: "service-fallback",
+  };
+  api.targetDetail = {
+    ...record(api.targetDetail),
+    ok: serviceDetail.ok === true,
+    httpStatus: serviceDetail.httpStatus ?? null,
+    source: "service-fallback",
+  };
+
+  contract.apiOverview = true;
+  contract.apiRuns = true;
+  contract.runCount = Math.max(numberValue(contract.runCount), numberValue(serviceRuns.count));
+  contract.latestRunId = stringAtNullable(contract, "latestRunId") ?? stringAtNullable(serviceLatestRun, "runId");
+  contract.latestFindingTypeCount = numberValue(contract.latestFindingTypeCount || serviceLatestRun.typeCount);
+  contract.memoryContract = memoryContractOk;
+
+  const browserOverviewSentinelId = stringAtNullable(sentinelBoundary, "overviewSentinelId");
+  const browserRunsSentinelId = stringAtNullable(sentinelBoundary, "runsSentinelId");
+  const browserRunRows = numberValue(dom.runRows);
+  sentinelBoundary.overviewSentinelId = browserOverviewSentinelId ?? stringAtNullable(serviceOverview, "sentinelId");
+  sentinelBoundary.runsSentinelId = browserRunsSentinelId ?? stringAtNullable(serviceRuns, "sentinelId");
+  sentinelBoundary.overviewMatches = browserOverviewSentinelId === null ? serviceOverview.matches === true : sentinelBoundary.overviewMatches;
+  sentinelBoundary.runsPayloadMatches = browserRunsSentinelId === null ? serviceRuns.matches === true : sentinelBoundary.runsPayloadMatches;
+  sentinelBoundary.runRowsMatch = browserRunRows === 0 ? serviceRuns.runRowsMatch === true : sentinelBoundary.runRowsMatch;
+
+  latestRunCounts.runId = stringAtNullable(latestRunCounts, "runId") ?? stringAtNullable(serviceLatestRun, "runId");
+  latestRunCounts.typeCount = numberValue(latestRunCounts.typeCount || serviceLatestRun.typeCount);
+  latestRunCounts.durationMinutes = numberValue(latestRunCounts.durationMinutes || serviceLatestRun.durationMinutes);
+  latestRunCounts.severityKeys = Array.isArray(latestRunCounts.severityKeys) && latestRunCounts.severityKeys.length > 0
+    ? latestRunCounts.severityKeys
+    : Array.isArray(serviceLatestRun.severityKeys) ? serviceLatestRun.severityKeys : [];
+
+  dom.runRows = Math.max(numberValue(dom.runRows), numberValue(serviceRuns.count));
+  targetRunCounts.runId = stringAtNullable(targetRunCounts, "runId") ?? selectedRunId;
+  targetRunCounts.requestMatched = targetRunCounts.requestMatched !== false;
+  const requestedRunId = stringAtNullable(requestedRunSelection, "requestedRunId");
+  if (requestedRunId !== null && selectedRunId === requestedRunId && memoryMatchesTarget) {
+    requestedRunSelection.browserReason = requestedRunSelection.reason ?? null;
+    requestedRunSelection.ok = true;
+    requestedRunSelection.reason = "service-fallback-memory-match";
+  }
+
+  memorySummary.targetRunId = stringAtNullable(memorySummary, "targetRunId") ?? selectedRunId;
+  memorySummary.matchesTargetRun = memoryMatchesTarget;
+  memorySummary.apiOk = serviceDetail.ok === true;
+  memorySummary.apiPageCount = apiPageCount;
+  memorySummary.apiSampleCount = numberValue(serviceMemory.sampleCount);
+  memorySummary.apiSource = stringAtNullable(serviceMemory, "source");
+  memorySummary.expectedFromApi = expectedMemory;
+  memorySummary.contractOk = memoryContractOk;
+  memorySummary.status = serviceDetail.ok !== true
+    ? "api-unavailable"
+    : expectedMemory ? memoryContractOk ? "rendered" : "mismatch" : "no-samples";
+  memorySummary.source = memorySummary.source ?? "service-fallback";
+
+  dom.contract = contract;
+  dom.api = api;
+  dom.sentinelBoundary = sentinelBoundary;
+  dom.latestRunCounts = latestRunCounts;
+  dom.targetRunCounts = targetRunCounts;
+  dom.requestedRunSelection = requestedRunSelection;
+  dom.memorySummary = memorySummary;
+  dom.effectiveApiSource = "service-fallback";
+
+  const navigationOk = page.navigationError === null || (dom.shell === true && dom.ready === true);
+  const manualTrigger = record(page.manualTrigger);
+  const ok = navigationOk
+    && numberValue(page.httpStatus) >= 200
+    && numberValue(page.httpStatus) < 300
+    && dom.shell === true
+    && dom.ready === true
+    && contract.htmlShell === true
+    && contract.appReady === true
+    && contract.apiOverview === true
+    && contract.apiRuns === true
+    && sentinelBoundary.datasetMatches === true
+    && sentinelBoundary.overviewMatches === true
+    && sentinelBoundary.runsPayloadMatches === true
+    && sentinelBoundary.runRowsMatch === true
+    && sentinelBoundary.routePrefixMatches === true
+    && dom.errorVisible !== true
+    && requestedRunSelection.ok === true
+    && manualTrigger.ok === true
+    && record(dom.chartTiming).ok === true
+    && memorySummary.contractOk === true
+    && record(dom.layout).horizontalOverflow !== true
+    && numberValue(page.pageErrorCount) === 0;
+
+  return {
+    ...page,
+    ok,
+    dom,
+    effectiveApiSource: "service-fallback",
+    valuesRedacted: true,
+  };
+}
+
+function dashboardApiRuns(payload: Record<string, unknown>): Record<string, unknown>[] {
+  const runs = payload.runs;
+  if (Array.isArray(runs)) return runs.map(record);
+  const items = payload.items;
+  if (Array.isArray(items)) return items.map(record);
+  return [];
+}
+
+function dashboardRunId(value: Record<string, unknown>): string | null {
+  return stringAtNullable(value, "id") ?? stringAtNullable(value, "runId");
+}
+
+function numberValue(value: unknown): number {
+  return typeof value === "number" && Number.isFinite(value) ? value : Number.isFinite(Number(value)) ? Number(value) : 0;
+}
+
 function dashboardScreenshotName(options: Extract<WebProbeSentinelOptions, { kind: "dashboard" }>, state: SentinelCicdState): string {
  const raw = options.name ?? `sentinel-dashboard-${state.spec.nodeId.toLowerCase()}-${state.spec.lane}-${state.sentinelId}.png`;
  const safe = raw.replace(/[^A-Za-z0-9._-]+/gu, "-").slice(0, 120);
@@ -1573,6 +1811,7 @@ function renderDashboardResult(result: Record<string, unknown>): string {
  const chartTiming = record(dom.chartTiming);
  const memorySummary = record(dom.memorySummary);
  const requestedRunSelection = record(dom.requestedRunSelection);
+  const serviceApi = record(result.serviceApi);
  const manualTrigger = record(page.manualTrigger);
  const manualTriggerUi = record(dom.manualTriggerUi);
  const screenshot = record(result.screenshot);
@@ -1585,10 +1824,11 @@ function renderDashboardResult(result: Record<string, unknown>): string {
    "",
    table(["NODE", "LANE", "SENTINEL", "STATUS", "URL"], [[result.node, result.lane, result.sentinelId, result.ok === true ? "pass" : "blocked", result.publicUrl]]),
    "",
-    table(["HTTP", "SHELL", "READY", "API_OVERVIEW", "API_RUNS", "RUN_ROWS", "ERRORS", "CONSOLE_ERR", "REQ_FAIL"], [[
+    table(["HTTP", "SHELL", "READY", "API_SOURCE", "API_OVERVIEW", "API_RUNS", "RUN_ROWS", "ERRORS", "CONSOLE_ERR", "REQ_FAIL"], [[
      page.httpStatus ?? "-",
      dom.shell,
      dom.ready,
+      dom.effectiveApiSource ?? "browser",
      `${apiOverview.ok ?? "-"}/${apiOverview.httpStatus ?? "-"}`,
      `${apiRuns.ok ?? "-"}/${apiRuns.httpStatus ?? "-"}`,
      dom.runRows,
@@ -1647,6 +1887,17 @@ function renderDashboardResult(result: Record<string, unknown>): string {
      memorySummary.source ?? memorySummary.apiSource ?? "-",
    ]]),
    "",
+    Object.keys(serviceApi).length === 0
+      ? "API_FALLBACK\n-"
+      : table(["SOURCE", "OK", "RUNS", "LATEST_RUN", "SELECTED_RUN", "MEMORY_EXPECTED"], [[
+        serviceApi.source ?? "-",
+        serviceApi.ok ?? "-",
+        record(serviceApi.runs).count ?? "-",
+        record(serviceApi.runs).latestRunId ?? "-",
+        serviceApi.selectedRunId ?? "-",
+        record(serviceApi.memory).expectedFromApi ?? "-",
+      ]]),
+    "",
    table(["VIEWPORT", "DOC", "H_OVERFLOW", "OVERFLOW_COUNT"], [[
      result.viewport,
      `${record(layout.documentSize).width ?? "-"}x${record(layout.documentSize).height ?? "-"}`,