@riddledc/riddle-proof 0.8.35 → 0.8.37

package/dist/cli.cjs

@@ -7438,10 +7438,68 @@ function previewDeployResultFromRecord(input) {
 function canRecoverPreviewPublish(error) {
   return error instanceof RiddleApiError && PREVIEW_PUBLISH_RECOVERY_STATUSES.has(error.status);
 }
+function summarizePreviewDirectory(directory) {
+  const stack = [directory];
+  let fileCount = 0;
+  let totalBytes = 0;
+  while (stack.length) {
+    const current = stack.pop();
+    for (const entry of (0, import_node_fs5.readdirSync)(current, { withFileTypes: true })) {
+      const fullPath = import_node_path5.default.join(current, entry.name);
+      if (entry.isDirectory()) {
+        stack.push(fullPath);
+        continue;
+      }
+      if (!entry.isFile()) continue;
+      const stat = (0, import_node_fs5.statSync)(fullPath);
+      fileCount += 1;
+      totalBytes += stat.size;
+    }
+  }
+  return { file_count: fileCount, total_bytes: totalBytes };
+}
+function previewProgressEmitter(config, base) {
+  return async (snapshot) => {
+    if (!config.onPreviewProgress) return;
+    await config.onPreviewProgress({
+      label: base.label,
+      framework: base.framework,
+      directory: base.directory,
+      elapsed_ms: Math.max(0, Date.now() - base.startedAt),
+      warnings: base.warnings?.length ? base.warnings : void 0,
+      ...snapshot
+    });
+  };
+}
 async function waitForPublishedPreview(config, input) {
+  await input.emitProgress?.({
+    stage: "publish_recovering",
+    id: input.id,
+    file_count: input.localSummary?.file_count,
+    total_bytes: input.localSummary?.total_bytes,
+    publish_error: input.publishError.message,
+    message: `publish returned ${input.publishError.status}; polling preview status`
+  });
   for (let attempt = 1; attempt <= PREVIEW_PUBLISH_RECOVERY_ATTEMPTS; attempt += 1) {
     const status = await riddleRequestJson(config, `/v1/preview/${input.id}`);
+    await input.emitProgress?.({
+      stage: "checking_status",
+      id: input.id,
+      attempt,
+      attempts: PREVIEW_PUBLISH_RECOVERY_ATTEMPTS,
+      status: typeof status.status === "string" ? status.status : null,
+      preview_url: typeof status.preview_url === "string" ? status.preview_url : void 0,
+      file_count: typeof status.file_count === "number" ? status.file_count : input.localSummary?.file_count,
+      total_bytes: typeof status.total_bytes === "number" ? status.total_bytes : input.localSummary?.total_bytes
+    });
     if (String(status.status || "") === "ready" && String(status.preview_url || "").trim()) {
+      await input.emitProgress?.({
+        stage: "ready",
+        id: input.id,
+        preview_url: String(status.preview_url),
+        file_count: typeof status.file_count === "number" ? status.file_count : input.localSummary?.file_count,
+        total_bytes: typeof status.total_bytes === "number" ? status.total_bytes : input.localSummary?.total_bytes
+      });
       return previewDeployResultFromRecord({
         record: status,
         id: input.id,
@@ -7463,7 +7521,17 @@ async function deployRiddlePreview(config, directory, label, framework = "static
   if (!directory?.trim()) throw new Error("directory is required");
   if (!label?.trim()) throw new Error("label is required");
   if (framework !== "spa" && framework !== "static") throw new Error("framework must be spa or static");
+  const startedAt = Date.now();
   const warnings = collectRiddlePreviewDeployWarnings(directory, framework);
+  const emitProgress = previewProgressEmitter(config, { label, framework, directory, startedAt, warnings });
+  await emitProgress({ stage: "validating", message: "checking preview input directory" });
+  const localSummary = summarizePreviewDirectory(directory);
+  await emitProgress({
+    stage: "creating",
+    file_count: localSummary.file_count,
+    total_bytes: localSummary.total_bytes,
+    message: "creating preview upload target"
+  });
   const created = await riddleRequestJson(config, "/v1/preview", {
     method: "POST",
     body: JSON.stringify({ framework, label })
@@ -7471,10 +7539,42 @@ async function deployRiddlePreview(config, directory, label, framework = "static
   const id = String(created.id || "");
   const uploadUrl = String(created.upload_url || "");
   if (!id || !uploadUrl) throw new Error("Riddle preview create response was missing id or upload_url.");
+  await emitProgress({
+    stage: "created",
+    id,
+    file_count: localSummary.file_count,
+    total_bytes: localSummary.total_bytes,
+    message: "preview upload target created"
+  });
   const scratch = (0, import_node_fs5.mkdtempSync)(import_node_path5.default.join((0, import_node_os2.tmpdir)(), "riddle-preview-upload-"));
   const tarball = import_node_path5.default.join(scratch, `${id}.tar.gz`);
+  let tarballBytes = 0;
   try {
+    await emitProgress({
+      stage: "archiving",
+      id,
+      file_count: localSummary.file_count,
+      total_bytes: localSummary.total_bytes,
+      message: "creating preview archive"
+    });
     (0, import_node_child_process4.execFileSync)("tar", ["czf", tarball, "-C", directory, "."], { stdio: "pipe" });
+    tarballBytes = (0, import_node_fs5.statSync)(tarball).size;
+    await emitProgress({
+      stage: "archived",
+      id,
+      file_count: localSummary.file_count,
+      total_bytes: localSummary.total_bytes,
+      tarball_bytes: tarballBytes,
+      message: "preview archive created"
+    });
+    await emitProgress({
+      stage: "uploading",
+      id,
+      file_count: localSummary.file_count,
+      total_bytes: localSummary.total_bytes,
+      tarball_bytes: tarballBytes,
+      message: "uploading preview archive"
+    });
     const upload = await fetchFor(config)(uploadUrl, {
       method: "PUT",
       headers: { "Content-Type": "application/gzip" },
@@ -7483,14 +7583,37 @@ async function deployRiddlePreview(config, directory, label, framework = "static
     if (!upload.ok) {
       throw new RiddleApiError(uploadUrl, upload.status, await upload.text());
     }
+    await emitProgress({
+      stage: "uploaded",
+      id,
+      file_count: localSummary.file_count,
+      total_bytes: localSummary.total_bytes,
+      tarball_bytes: tarballBytes,
+      message: "preview archive uploaded"
+    });
   } finally {
     (0, import_node_fs5.rmSync)(scratch, { recursive: true, force: true });
   }
   const expiresAt = typeof created.expires_at === "string" ? created.expires_at : void 0;
   try {
+    await emitProgress({
+      stage: "publishing",
+      id,
+      file_count: localSummary.file_count,
+      total_bytes: localSummary.total_bytes,
+      tarball_bytes: tarballBytes || void 0,
+      message: "publishing preview"
+    });
     const published = await riddleRequestJson(config, `/v1/preview/${id}/publish`, {
       method: "POST"
     });
+    await emitProgress({
+      stage: "ready",
+      id,
+      preview_url: String(published.preview_url || ""),
+      file_count: typeof published.file_count === "number" ? published.file_count : localSummary.file_count,
+      total_bytes: typeof published.total_bytes === "number" ? published.total_bytes : localSummary.total_bytes
+    });
     return previewDeployResultFromRecord({ record: published, id, label, framework, expiresAt, warnings });
   } catch (error) {
     if (!canRecoverPreviewPublish(error)) throw error;
@@ -7500,7 +7623,9 @@ async function deployRiddlePreview(config, directory, label, framework = "static
       framework,
       expiresAt,
       publishError: error,
-      warnings
+      warnings,
+      localSummary,
+      emitProgress
     });
   }
 }
@@ -9147,6 +9272,8 @@ function normalizeSetupAction(input, index) {
     expect_changed: booleanValue(valueFromOwn(input, "expect_changed", "expectChanged", "should_change", "shouldChange", "changed")),
     until_path: untilPath,
     until_expected_value: hasUntilExpectedValue ? toJsonValue(valueFromOwn(input, "until_expected_value", "untilExpectedValue", "until_expected", "untilExpected", "until_value", "untilValue", "expected_value", "expectedValue", "expected")) : void 0,
+    expected_path: stringFromOwn(input, "expected_path", "expectedPath", "expected_terminal_path", "expectedTerminalPath"),
+    expected_url: stringFromOwn(input, "expected_url", "expectedUrl", "expected_terminal_url", "expectedTerminalUrl"),
     max_calls: maxCalls,
     tap_burst_size: tapBurstSize,
     settle_ms: settleMs,
@@ -11488,6 +11615,80 @@ function routePathMatches(observed, expected, targetUrl) {
   if (normalizedObserved === normalizedExpected) return true;
   return normalizedObserved === normalizeRoutePath(mountedExpectedRoutePath(targetUrl, expected));
 }
+function setupActionExpectedRoute(action) {
+  const expectedUrl = typeof action.expected_url === "string" && action.expected_url.trim()
+    ? action.expected_url.trim()
+    : typeof action.expectedUrl === "string" && action.expectedUrl.trim()
+      ? action.expectedUrl.trim()
+      : "";
+  const expectedPath = typeof action.expected_path === "string" && action.expected_path.trim()
+    ? action.expected_path.trim()
+    : typeof action.expectedPath === "string" && action.expectedPath.trim()
+      ? action.expectedPath.trim()
+      : "";
+  if (!expectedUrl && !expectedPath) return null;
+  return { expected_url: expectedUrl || undefined, expected_path: expectedPath || undefined };
+}
+function setupUrlMatchesExpectedRoute(href, expected) {
+  if (!expected) return true;
+  let observedUrl;
+  try {
+    observedUrl = new URL(href, targetUrl);
+  } catch {
+    return false;
+  }
+  if (expected.expected_url) {
+    let expectedUrl;
+    try {
+      expectedUrl = new URL(expected.expected_url, targetUrl);
+    } catch {
+      return false;
+    }
+    return observedUrl.href === expectedUrl.href;
+  }
+  const expectedPath = expected.expected_path || "/";
+  if (/[?#]/.test(expectedPath)) {
+    const observedRoute = observedUrl.pathname + observedUrl.search + observedUrl.hash;
+    const normalizedObservedRoute = observedRoute === "/" ? "/" : observedRoute.replace(/\/+(?=[?#]|$)/, "");
+    const normalizedExpectedRoute = expectedPath === "/" ? "/" : expectedPath.replace(/\/+(?=[?#]|$)/, "");
+    return normalizedObservedRoute === normalizedExpectedRoute;
+  }
+  return routePathMatches(observedUrl.pathname, expectedPath, targetUrl);
+}
+function setupObservedRouteEvidence(expected, waitError) {
+  let observedUrl = page.url();
+  let observedPath = "";
+  let observedRoute = "";
+  try {
+    const url = new URL(observedUrl, targetUrl);
+    observedUrl = url.href;
+    observedPath = url.pathname;
+    observedRoute = url.pathname + url.search + url.hash;
+  } catch {
+    observedPath = "";
+    observedRoute = "";
+  }
+  return {
+    expected_url: expected && expected.expected_url || undefined,
+    expected_path: expected && expected.expected_path || undefined,
+    observed_url: observedUrl,
+    observed_path: observedPath,
+    observed_route: observedRoute,
+    route_matched: setupUrlMatchesExpectedRoute(observedUrl, expected),
+    route_wait_error: waitError ? String(waitError && waitError.message ? waitError.message : waitError).slice(0, 1000) : undefined,
+  };
+}
+async function waitForSetupActionRoute(action, timeout) {
+  const expected = setupActionExpectedRoute(action);
+  if (!expected) return null;
+  let waitError;
+  try {
+    await page.waitForURL((url) => setupUrlMatchesExpectedRoute(url.href, expected), { timeout: Math.min(timeout, 20000) });
+  } catch (error) {
+    waitError = error;
+  }
+  return setupObservedRouteEvidence(expected, waitError);
+}
 function routeOk(route, targetUrl) {
   return Boolean(route && (route.matched || routePathMatches(route.observed, route.expected_path, targetUrl)) && !route.error && (route.http_status == null || route.http_status < 400));
 }
@@ -14381,11 +14582,22 @@ async function executeSetupAction(action, ordinal, viewport) {
       const prepared = await resolveSetupTapTarget(action, base, scope, timeout);
       if (prepared.result) return prepared.result;
       await dispatchSetupTapPoint(prepared.target.point, prepared.target.pointerType, prepared.target.durationMs);
+      const routeEvidence = await waitForSetupActionRoute(action, timeout);
+      if (routeEvidence && !routeEvidence.route_matched) {
+        return {
+          ...base,
+          ...setupScopeEvidence(scope),
+          ...setupTapTargetEvidence(prepared.target),
+          ...routeEvidence,
+          reason: "expected_route_not_reached",
+        };
+      }
       return {
         ...base,
         ...setupScopeEvidence(scope),
         ok: true,
         ...setupTapTargetEvidence(prepared.target),
+        ...routeEvidence,
       };
     }
     if (type === "tap_until") {
@@ -15246,6 +15458,26 @@ async function executeSetupAction(action, ordinal, viewport) {
           : { x: box.x + box.width / 2, y: box.y + box.height / 2 };
         if (clickCount > 1) await page.mouse.click(fallbackPoint.x, fallbackPoint.y, { clickCount });
         else await page.mouse.click(fallbackPoint.x, fallbackPoint.y);
+        const routeEvidence = await waitForSetupActionRoute(action, timeout);
+        if (routeEvidence && !routeEvidence.route_matched) {
+          return {
+            ...base,
+            ...setupScopeEvidence(scope),
+            count,
+            target_index: targetIndex,
+            text: matchedText,
+            force: action.force === true || undefined,
+            fallback_to_tap: true,
+            input_dispatch: "playwright_mouse",
+            click_error: String(error && error.message ? error.message : error).slice(0, 1000),
+            click_count: clickCount > 1 ? clickCount : undefined,
+            coordinate_mode: mode,
+            x: position ? fromX : undefined,
+            y: position ? fromY : undefined,
+            ...routeEvidence,
+            reason: "expected_route_not_reached",
+          };
+        }
         return {
           ...base,
           ...setupScopeEvidence(scope),
@@ -15261,6 +15493,24 @@ async function executeSetupAction(action, ordinal, viewport) {
           coordinate_mode: mode,
           x: position ? fromX : undefined,
           y: position ? fromY : undefined,
+          ...routeEvidence,
+        };
+      }
+      const routeEvidence = await waitForSetupActionRoute(action, timeout);
+      if (routeEvidence && !routeEvidence.route_matched) {
+        return {
+          ...base,
+          ...setupScopeEvidence(scope),
+          count,
+          target_index: targetIndex,
+          text: matchedText,
+          force: action.force === true || undefined,
+          click_count: clickCount > 1 ? clickCount : undefined,
+          coordinate_mode: mode,
+          x: position ? fromX : undefined,
+          y: position ? fromY : undefined,
+          ...routeEvidence,
+          reason: "expected_route_not_reached",
         };
       }
       return {
@@ -15275,6 +15525,7 @@ async function executeSetupAction(action, ordinal, viewport) {
         coordinate_mode: mode,
         x: position ? fromX : undefined,
         y: position ? fromY : undefined,
+        ...routeEvidence,
       };
     }
     if (type === "fill" || type === "set_input_value") {
@@ -17232,7 +17483,7 @@ function usage() {
     "  riddle-proof-loop regression-pack run [--pack oc-flow-regression|--pack-file <file>] [--local-core true|false; default true] [--hosted-riddle true|false; default false] [--format json|markdown|compact-json; default json] [--output <dir>|--output-dir <dir>]",
     "  riddle-proof-loop profile-body-assertions --artifact <file|url|-> --candidates-json <file|json|-> [--required-json <file|json|->] [--format json|body-contains]",
     "  riddle-proof-loop profile-http-status-preflight --profile <file|json|-> --url <base-url> [--format json|summary]",
-    "  riddle-proof-loop riddle-preview-deploy <build-dir> <label> [--framework spa|static]",
+    "  riddle-proof-loop riddle-preview-deploy <build-dir> <label> [--framework spa|static] [--quiet]",
     "  riddle-proof-loop riddle-server-preview <directory> --script-file <file> [--path /route] [--wait-for-selector selector]",
     "  riddle-proof-loop riddle-run-script --url <url> --script-file <file> [--viewport 1280x720] [--strict true|false]",
     "  riddle-proof-loop riddle-poll <job-id> [--wait] [--attempts n] [--quiet]",
@@ -18001,6 +18252,18 @@ function formatPollDuration(ms) {
   const remainder = seconds % 60;
   return minutes > 0 ? `${minutes}m${String(remainder).padStart(2, "0")}s` : `${seconds}s`;
 }
+function formatByteCount(bytes) {
+  if (typeof bytes !== "number" || !Number.isFinite(bytes)) return "n/a";
+  if (bytes < 1024) return `${bytes}B`;
+  const units = ["KB", "MB", "GB", "TB"];
+  let value = bytes / 1024;
+  let unitIndex = 0;
+  while (value >= 1024 && unitIndex < units.length - 1) {
+    value /= 1024;
+    unitIndex += 1;
+  }
+  return `${value >= 10 ? value.toFixed(0) : value.toFixed(1)}${units[unitIndex]}`;
+}
 function riddlePollProgressLine(snapshot) {
   const submittedAt = snapshot.submitted_at || "not-submitted";
   const queuePart = snapshot.running_without_submission ? ` waiting_for_submit=${formatPollDuration(snapshot.pre_submission_elapsed_ms)}${snapshot.queue_elapsed_ms !== null ? ` queued_for=${formatPollDuration(snapshot.queue_elapsed_ms)}` : ""}` : snapshot.queue_elapsed_ms !== null ? ` queue=${formatPollDuration(snapshot.queue_elapsed_ms)}` : "";
@@ -18014,6 +18277,18 @@ function riddlePollProgressLine(snapshot) {
     `submitted_at=${submittedAt}${queuePart}${terminalPart}`
   ].join(" ");
 }
+function riddlePreviewProgressLine(snapshot) {
+  const idPart = snapshot.id ? ` id=${snapshot.id}` : "";
+  const statusPart = snapshot.status ? ` status=${snapshot.status}` : "";
+  const attemptPart = snapshot.attempt && snapshot.attempts ? ` attempt=${snapshot.attempt}/${snapshot.attempts}` : "";
+  const previewPart = snapshot.preview_url ? ` url=${snapshot.preview_url}` : "";
+  const filePart = typeof snapshot.file_count === "number" ? ` files=${snapshot.file_count}` : "";
+  const totalPart = typeof snapshot.total_bytes === "number" ? ` bytes=${formatByteCount(snapshot.total_bytes)}` : "";
+  const archivePart = typeof snapshot.tarball_bytes === "number" ? ` archive=${formatByteCount(snapshot.tarball_bytes)}` : "";
+  const recoveryPart = snapshot.publish_error ? ` publish_error=${JSON.stringify(snapshot.publish_error)}` : "";
+  const messagePart = snapshot.message ? ` ${snapshot.message}` : "";
+  return `[riddle-preview] ${snapshot.stage}${idPart}${statusPart}${attemptPart} elapsed=${formatPollDuration(snapshot.elapsed_ms)} label=${snapshot.label} framework=${snapshot.framework}${filePart}${totalPart}${archivePart}${previewPart}${recoveryPart}${messagePart}`;
+}
 function readJsonValue(value, label) {
   if (!value) throw new Error(`${label} is required.`);
   const raw = value === "-" ? readStdin() : (0, import_node_fs6.existsSync)(value) ? (0, import_node_fs6.readFileSync)(value, "utf-8") : value;
@@ -21689,7 +21964,14 @@ async function main() {
   if (command === "riddle-preview-deploy") {
     const buildDir = positional[1];
     const label = positional[2];
-    const result = await createRiddleApiClient(riddleClientConfig(options)).deployPreview(buildDir, label, previewFrameworkOption(options));
+    const clientConfig = riddleClientConfig(options);
+    if (options.quiet !== true) {
+      clientConfig.onPreviewProgress = (snapshot) => {
+        process.stderr.write(`${riddlePreviewProgressLine(snapshot)}
+`);
+      };
+    }
+    const result = await createRiddleApiClient(clientConfig).deployPreview(buildDir, label, previewFrameworkOption(options));
     for (const warning of result.warnings ?? []) {
       process.stderr.write(`Warning: ${warning}
 `);

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import "./chunk-UGHN77PS.js";
-import "./chunk-PEWAIEER.js";
-import "./chunk-TWTEUS7R.js";
+import "./chunk-F4HKK2YH.js";
+import "./chunk-Z2LCVROU.js";
+import "./chunk-DI2XNGEZ.js";
 import "./chunk-ZREWMTFA.js";
 import "./chunk-ZQWVXQKJ.js";
 import "./chunk-RDPG554T.js";