@riddledc/riddle-proof 0.7.152 → 0.7.154

package/dist/cli.cjs

@@ -6856,12 +6856,14 @@ async function pollRiddleJob(config, jobId, options = {}) {
   const attempts = Math.max(1, Math.floor(options.attempts ?? (options.wait ? 300 : 1)));
   const intervalMs = Math.max(0, Math.floor(options.intervalMs ?? 2e3));
   const progressEveryMs = Math.max(0, Math.floor(options.progressEveryMs ?? 1e4));
+  const unsubmittedTimeoutMs = Math.max(0, Math.floor(options.unsubmittedTimeoutMs ?? 0));
   const startedAt = Date.now();
   let job = null;
   let lastSnapshot = null;
   let lastProgressAt = 0;
   let lastProgressKey = "";
   let preSubmissionElapsedMs = 0;
+  let unsubmittedTimedOut = false;
   for (let index = 0; index < attempts; index += 1) {
     job = await riddleRequestJson(config, `/v1/jobs/${jobId}`);
     const observedAt = Date.now();
@@ -6892,7 +6894,11 @@ async function pollRiddleJob(config, jobId, options = {}) {
         await options.onProgress(lastSnapshot);
       }
     }
+    unsubmittedTimedOut = Boolean(
+      options.wait && unsubmittedTimeoutMs > 0 && lastSnapshot.running_without_submission && !lastSnapshot.created_at && !lastSnapshot.submitted_at && preSubmissionElapsedMs >= unsubmittedTimeoutMs
+    );
     if (lastSnapshot.terminal) break;
+    if (unsubmittedTimedOut) break;
     if (index + 1 < attempts) {
       await new Promise((resolve) => setTimeout(resolve, intervalMs));
     }
@@ -6917,6 +6923,8 @@ async function pollRiddleJob(config, jobId, options = {}) {
         ...snapshot,
         timed_out: timedOut,
         interval_ms: intervalMs,
+        unsubmitted_timeout: unsubmittedTimedOut || void 0,
+        unsubmitted_timeout_ms: unsubmittedTimedOut ? unsubmittedTimeoutMs : void 0,
         message: pollMessage(snapshot, timedOut)
       }
     };
@@ -7429,6 +7437,8 @@ function profileSetupWindowCallReceipts(results) {
     };
     if (result.returned !== void 0) receipt.returned = result.returned;
     if (result.expected_return !== void 0) receipt.expected_return = result.expected_return;
+    const returnSummary = profileSetupReturnSummary(result);
+    if (returnSummary.length) receipt.return_summary = returnSummary;
     return receipt;
   });
 }
@@ -7444,6 +7454,40 @@ function profileSetupWindowEvalReceipts(results) {
     };
     if (result.returned !== void 0) receipt.returned = result.returned;
     if (result.expected_return !== void 0) receipt.expected_return = result.expected_return;
+    const returnSummary = profileSetupReturnSummary(result);
+    if (returnSummary.length) receipt.return_summary = returnSummary;
+    return receipt;
+  });
+}
+function profileSetupReturnSummaryFields(result) {
+  const input = result.return_summary_fields;
+  if (!Array.isArray(input)) return [];
+  const fields = [];
+  for (const item of input) {
+    if (typeof item === "string") {
+      const path8 = item.trim();
+      if (path8) fields.push({ path: path8 });
+      continue;
+    }
+    if (!isRecord(item)) continue;
+    const path7 = stringValue2(item.path) ?? stringValue2(item.key) ?? stringValue2(item.json_path) ?? stringValue2(item.jsonPath);
+    if (!path7) continue;
+    const label = stringValue2(item.label) ?? stringValue2(item.name) ?? stringValue2(item.title);
+    fields.push(label ? { path: path7, label } : { path: path7 });
+  }
+  return fields;
+}
+function profileSetupReturnSummary(result) {
+  if (result.returned === void 0) return [];
+  return profileSetupReturnSummaryFields(result).map((field) => {
+    const resolved = resolveJsonPath(result.returned, field.path);
+    const receipt = {
+      label: field.label || field.path,
+      path: field.path,
+      exists: resolved.exists
+    };
+    if (resolved.exists) receipt.value = toJsonValue(resolved.value);
+    if (resolved.error) receipt.reason = resolved.error;
     return receipt;
   });
 }
@@ -7632,6 +7676,37 @@ function normalizeSetupActionArgs(input, index) {
   }
   return argsInput.map(toJsonValue);
 }
+function normalizeReturnSummaryFields(input, index) {
+  const fieldsInput = valueFromOwn(
+    input,
+    "return_summary_fields",
+    "returnSummaryFields",
+    "summary_fields",
+    "summaryFields",
+    "receipt_fields",
+    "receiptFields",
+    "return_receipt_fields",
+    "returnReceiptFields"
+  );
+  if (fieldsInput === void 0) return void 0;
+  if (!Array.isArray(fieldsInput)) {
+    throw new Error(`target.setup_actions[${index}].return_summary_fields must be an array.`);
+  }
+  return fieldsInput.map((field, fieldIndex) => {
+    if (typeof field === "string") {
+      const path8 = field.trim();
+      if (!path8) throw new Error(`target.setup_actions[${index}].return_summary_fields[${fieldIndex}] requires path.`);
+      return { path: path8 };
+    }
+    if (!isRecord(field)) {
+      throw new Error(`target.setup_actions[${index}].return_summary_fields[${fieldIndex}] must be a string path or object.`);
+    }
+    const path7 = stringFromOwn(field, "path", "key", "json_path", "jsonPath");
+    if (!path7) throw new Error(`target.setup_actions[${index}].return_summary_fields[${fieldIndex}] requires path.`);
+    const label = stringFromOwn(field, "label", "name", "title");
+    return label ? { path: path7, label } : { path: path7 };
+  });
+}
 function normalizeSetupActionRepeat(input, index) {
   const repeat = numberValue(valueFromOwn(input, "repeat", "repeat_count", "repeatCount", "times"));
   if (repeat === void 0) return void 0;
@@ -7853,6 +7928,7 @@ function normalizeSetupAction(input, index) {
     expect_return: hasExpectedReturn ? toJsonValue(valueFromOwn(input, "expect_return", "expectReturn", "expected_return", "expectedReturn")) : void 0,
     store_return_to: storeReturnTo,
     capture_return: captureReturn,
+    return_summary_fields: normalizeReturnSummaryFields(input, index),
     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,
     max_calls: maxCalls,
@@ -10875,6 +10951,8 @@ function profileSetupWindowCallReceipts(results) {
       };
       if (result.returned !== undefined) receipt.returned = result.returned;
       if (result.expected_return !== undefined) receipt.expected_return = result.expected_return;
+      const returnSummary = profileSetupReturnSummary(result);
+      if (returnSummary.length) receipt.return_summary = returnSummary;
       return receipt;
     });
 }
@@ -10892,9 +10970,43 @@ function profileSetupWindowEvalReceipts(results) {
       };
       if (result.returned !== undefined) receipt.returned = result.returned;
       if (result.expected_return !== undefined) receipt.expected_return = result.expected_return;
+      const returnSummary = profileSetupReturnSummary(result);
+      if (returnSummary.length) receipt.return_summary = returnSummary;
       return receipt;
     });
 }
+function profileSetupReturnSummaryFields(result) {
+  const input = result && result.return_summary_fields;
+  if (!Array.isArray(input)) return [];
+  const fields = [];
+  for (const item of input) {
+    if (typeof item === "string") {
+      const path = item.trim();
+      if (path) fields.push({ path });
+      continue;
+    }
+    if (!item || typeof item !== "object" || Array.isArray(item)) continue;
+    const path = String(item.path || item.key || item.json_path || item.jsonPath || "").trim();
+    if (!path) continue;
+    const label = String(item.label || item.name || item.title || "").trim();
+    fields.push(label ? { path, label } : { path });
+  }
+  return fields;
+}
+function profileSetupReturnSummary(result) {
+  if (!result || result.returned === undefined) return [];
+  return profileSetupReturnSummaryFields(result).map((field) => {
+    const resolved = resolveJsonProbePath(result.returned, field.path);
+    const receipt = {
+      label: field.label || field.path,
+      path: field.path,
+      exists: Boolean(resolved.exists),
+    };
+    if (resolved.exists) receipt.value = setupJsonValue(resolved.value);
+    if (resolved.error) receipt.reason = resolved.error;
+    return receipt;
+  });
+}
 function profileSetupRangeValueReceipts(results) {
   return (results || [])
     .filter((result) => result && profileSetupResultAction(result) === "set_range_value")
@@ -12629,6 +12741,7 @@ async function executeSetupAction(action, ordinal, viewport) {
       const script = String(action.script || action.code || action.source || action.body || "");
       const args = Array.isArray(action.args) ? action.args : [];
       const storeReturnTo = String(action.store_return_to || action.storeReturnTo || action.save_return_to || action.saveReturnTo || action.assign_return_to || action.assignReturnTo || action.return_state_path || action.returnStatePath || "").trim();
+      const returnSummaryFields = Array.isArray(action.return_summary_fields) ? action.return_summary_fields : [];
       if (!script.trim()) return { ...base, reason: "missing_script" };
       const scope = await setupActionScope(action, timeout);
       if (!scope.ok) return setupScopeFailure(base, scope);
@@ -12658,6 +12771,7 @@ async function executeSetupAction(action, ordinal, viewport) {
         return_captured: captureReturn,
         expected_return: hasExpectation ? setupJsonValue(expected) : undefined,
         return_stored_to: result.return_stored_to || storeReturnTo || undefined,
+        return_summary_fields: returnSummaryFields.length ? setupJsonValue(returnSummaryFields) : undefined,
         reason: result.ok ? (expectationMet ? undefined : "unexpected_return_value") : result.reason,
         store_reason: result.store_reason || undefined,
         error: result.error || undefined,
@@ -12667,6 +12781,7 @@ async function executeSetupAction(action, ordinal, viewport) {
       const path = String(action.path || action.function_path || action.functionPath || "");
       const args = Array.isArray(action.args) ? action.args : [];
       const storeReturnTo = String(action.store_return_to || action.storeReturnTo || action.save_return_to || action.saveReturnTo || action.assign_return_to || action.assignReturnTo || action.return_state_path || action.returnStatePath || "").trim();
+      const returnSummaryFields = Array.isArray(action.return_summary_fields) ? action.return_summary_fields : [];
       if (!path) return { ...base, path, reason: "missing_path" };
       const scope = await setupActionScope(action, timeout);
       if (!scope.ok) return setupScopeFailure(base, scope);
@@ -12696,6 +12811,7 @@ async function executeSetupAction(action, ordinal, viewport) {
         return_captured: captureReturn,
         expected_return: hasExpectation ? setupJsonValue(expected) : undefined,
         return_stored_to: result.return_stored_to || storeReturnTo || undefined,
+        return_summary_fields: returnSummaryFields.length ? setupJsonValue(returnSummaryFields) : undefined,
         reason: result.ok ? (expectationMet ? undefined : "unexpected_return_value") : result.reason,
         store_reason: result.store_reason || undefined,
         error: result.error || undefined,
@@ -14741,6 +14857,8 @@ function runProfileStrictOption(options) {
 function runProfileSplitViewportsOption(options) {
   return optionBoolean(options, "splitViewports") ?? false;
 }
+var DEFAULT_PROFILE_UNSUBMITTED_RETRY_TIMEOUT_MS = 9e4;
+var DEFAULT_PROFILE_UNSUBMITTED_RETRIES = 1;
 function optionNumber(options, ...keys) {
   for (const key of keys) {
     const value = optionString(options, key);
@@ -14748,6 +14866,11 @@ function optionNumber(options, ...keys) {
   }
   return void 0;
 }
+function optionInteger(options, fallback, ...keys) {
+  const value = optionNumber(options, ...keys);
+  if (value === void 0 || !Number.isFinite(value)) return fallback;
+  return Math.floor(value);
+}
 function profileOutputDirOption(options) {
   return optionString(options, "output") ?? optionString(options, "outputDir");
 }
@@ -15065,6 +15188,8 @@ function profileRiddleJobMarkdown(result) {
   const submittedAt = cliString(riddle.submitted_at);
   const completedAt = cliString(riddle.completed_at);
   const artifactRecovery = riddle.artifact_recovery === true;
+  const retryCount = cliFiniteNumber(riddle.retry_count);
+  const staleJobIds = Array.isArray(riddle.stale_job_ids) ? riddle.stale_job_ids.map((value) => cliString(value)).filter((value) => Boolean(value)) : [];
   const parts = [
     mode ? `mode ${markdownInlineCode(mode)}` : "",
     jobCount === void 0 ? "" : `jobs ${jobCount}`,
@@ -15084,6 +15209,9 @@ function profileRiddleJobMarkdown(result) {
   if (artifactRecovery) {
     lines.push("- artifact recovery: used artifacts endpoint after non-terminal poll");
   }
+  if (retryCount !== void 0 && retryCount > 0) {
+    lines.push(`- retry recovery: replaced ${retryCount} unsubmitted job${retryCount === 1 ? "" : "s"}${staleJobIds.length ? ` (${staleJobIds.map((value) => markdownInlineCode(value)).join(", ")})` : ""}`);
+  }
   const splitJobs = Array.isArray(riddle.split_jobs) ? riddle.split_jobs.map(cliRecord).filter((job) => Boolean(job)) : [];
   for (const job of splitJobs.slice(0, 12)) {
     const viewport = cliString(job.viewport) || "viewport";
@@ -15093,6 +15221,7 @@ function profileRiddleJobMarkdown(result) {
     const splitElapsedMs = cliFiniteNumber(job.elapsed_ms);
     const splitPreSubmissionElapsedMs = cliFiniteNumber(job.pre_submission_elapsed_ms);
     const splitArtifactRecovery = job.artifact_recovery === true;
+    const splitRetryCount = cliFiniteNumber(job.retry_count);
     lines.push(
       `- ${viewport}: ${[
         splitJobId ? `job ${markdownInlineCode(splitJobId)}` : "",
@@ -15100,6 +15229,7 @@ function profileRiddleJobMarkdown(result) {
         splitTerminal === void 0 ? "" : `terminal ${splitTerminal ? "true" : "false"}`,
         splitElapsedMs === void 0 ? "" : `elapsed ${formatPollDuration(splitElapsedMs)}`,
         splitPreSubmissionElapsedMs === void 0 || splitPreSubmissionElapsedMs < 1e3 ? "" : `pre-submit ${formatPollDuration(splitPreSubmissionElapsedMs)}`,
+        splitRetryCount === void 0 || splitRetryCount <= 0 ? "" : `retries ${splitRetryCount}`,
         splitArtifactRecovery ? "artifact recovery" : ""
       ].filter(Boolean).join(", ") || "job metadata unavailable"}`
     );
@@ -15254,6 +15384,15 @@ function cliValueLabel(value) {
     return String(value);
   }
 }
+function cliReturnSummaryLabel(value) {
+  if (!Array.isArray(value)) return void 0;
+  const parts = value.map(cliRecord).filter((item) => Boolean(item)).map((item) => {
+    const label = cliString(item.label) || cliString(item.path) || "value";
+    const observed = item.exists === false ? "missing" : cliValueLabel(item.value);
+    return `${label}=${observed ?? "null"}`;
+  }).filter(Boolean);
+  return parts.length ? parts.join(", ") : void 0;
+}
 function cliStringArray(value) {
   return Array.isArray(value) ? value.filter((entry) => typeof entry === "string" && Boolean(entry.trim())) : [];
 }
@@ -15428,10 +15567,11 @@ function profileSetupSummaryMarkdown(result) {
     const storedTo = cliString(receipt.return_stored_to);
     const returned = cliValueLabel(receipt.returned);
     const expected = cliValueLabel(receipt.expected_return);
+    const returnSummary = cliReturnSummaryLabel(receipt.return_summary);
     const captured = receipt.return_captured === true ? "captured" : receipt.return_captured === false ? "not captured" : "capture unknown";
     const ok = receipt.ok === false ? "failed" : "ok";
     const reason = cliString(receipt.reason);
-    lines.push(`- ${name} window_call: ${ok}, ${markdownInlineCode(path7)}${storedTo ? `, stored ${markdownInlineCode(storedTo)}` : ""}, return ${captured}${expected === void 0 ? "" : `, expected ${markdownInlineCode(expected, 80)}`}${returned === void 0 ? "" : `, returned ${markdownInlineCode(returned, 80)}`}${reason ? `, reason ${markdownInlineCode(reason, 100)}` : ""}`);
+    lines.push(`- ${name} window_call: ${ok}, ${markdownInlineCode(path7)}${storedTo ? `, stored ${markdownInlineCode(storedTo)}` : ""}, return ${captured}${expected === void 0 ? "" : `, expected ${markdownInlineCode(expected, 80)}`}${returnSummary ? `, summary ${markdownInlineCode(returnSummary, 140)}` : ""}${returned === void 0 ? "" : `, returned ${markdownInlineCode(returned, 80)}`}${reason ? `, reason ${markdownInlineCode(reason, 100)}` : ""}`);
   }
   if (windowCallDetails.length > 12) lines.push(`- ${windowCallDetails.length - 12} additional window_call receipt(s) omitted.`);
   const windowEvalDetails = viewports.flatMap((viewport) => {
@@ -15444,10 +15584,11 @@ function profileSetupSummaryMarkdown(result) {
     const storedTo = cliString(receipt.return_stored_to);
     const returned = cliValueLabel(receipt.returned);
     const expected = cliValueLabel(receipt.expected_return);
+    const returnSummary = cliReturnSummaryLabel(receipt.return_summary);
     const captured = receipt.return_captured === true ? "captured" : receipt.return_captured === false ? "not captured" : "capture unknown";
     const ok = receipt.ok === false ? "failed" : "ok";
     const reason = cliString(receipt.reason);
-    lines.push(`- ${name} window_eval: ${ok}${scriptLength === void 0 ? "" : `, script ${scriptLength} chars`}${storedTo ? `, stored ${markdownInlineCode(storedTo)}` : ""}, return ${captured}${expected === void 0 ? "" : `, expected ${markdownInlineCode(expected, 80)}`}${returned === void 0 ? "" : `, returned ${markdownInlineCode(returned, 80)}`}${reason ? `, reason ${markdownInlineCode(reason, 100)}` : ""}`);
+    lines.push(`- ${name} window_eval: ${ok}${scriptLength === void 0 ? "" : `, script ${scriptLength} chars`}${storedTo ? `, stored ${markdownInlineCode(storedTo)}` : ""}, return ${captured}${expected === void 0 ? "" : `, expected ${markdownInlineCode(expected, 80)}`}${returnSummary ? `, summary ${markdownInlineCode(returnSummary, 140)}` : ""}${returned === void 0 ? "" : `, returned ${markdownInlineCode(returned, 80)}`}${reason ? `, reason ${markdownInlineCode(reason, 100)}` : ""}`);
   }
   if (windowEvalDetails.length > 12) lines.push(`- ${windowEvalDetails.length - 12} additional window_eval receipt(s) omitted.`);
   const windowCallUntilDetails = viewports.flatMap((viewport) => {
@@ -15739,6 +15880,7 @@ async function profileResultFromRiddleArtifacts(profile, artifacts, fallbackInpu
 }
 function withRiddleMetadata(result, input) {
   const poll = input.poll;
+  const staleJobIds = input.staleJobIds?.filter(Boolean);
   return {
     ...result,
     riddle: {
@@ -15755,6 +15897,8 @@ function withRiddleMetadata(result, input) {
       attempt: poll?.attempt ?? result.riddle?.attempt,
       attempts: poll?.attempts ?? result.riddle?.attempts,
       timed_out: poll?.timed_out ?? result.riddle?.timed_out,
+      retry_count: input.retryCount ?? result.riddle?.retry_count,
+      stale_job_ids: staleJobIds?.length ? staleJobIds : result.riddle?.stale_job_ids,
       artifact_recovery: input.artifactRecovery ?? result.riddle?.artifact_recovery
     },
     artifacts: {
@@ -15825,6 +15969,40 @@ function riddleMetadataFromPoll(jobId, poll) {
     timed_out: poll.poll?.timed_out
   };
 }
+function profileUnsubmittedRetryTimeoutMs(options) {
+  return Math.max(0, optionInteger(
+    options,
+    DEFAULT_PROFILE_UNSUBMITTED_RETRY_TIMEOUT_MS,
+    "unsubmittedTimeoutMs",
+    "unsubmittedJobTimeoutMs",
+    "submitTimeoutMs"
+  ));
+}
+function profileUnsubmittedRetryLimit(options) {
+  return Math.max(0, optionInteger(
+    options,
+    DEFAULT_PROFILE_UNSUBMITTED_RETRIES,
+    "unsubmittedRetries",
+    "unsubmittedJobRetries",
+    "submitRetries"
+  ));
+}
+function shouldRetryUnsubmittedRiddleJob(poll) {
+  return poll.terminal !== true && poll.poll?.unsubmitted_timeout === true && !poll.poll.created_at && !poll.poll.submitted_at;
+}
+function riddlePollOptionsForProfile(options) {
+  return {
+    wait: true,
+    attempts: optionNumber(options, "pollAttempts", "attempts"),
+    intervalMs: optionNumber(options, "intervalMs"),
+    progressEveryMs: optionNumber(options, "progressEveryMs"),
+    unsubmittedTimeoutMs: profileUnsubmittedRetryTimeoutMs(options),
+    onProgress: options.quiet !== true ? (snapshot) => {
+      process.stderr.write(`${riddlePollProgressLine(snapshot)}
+`);
+    } : void 0
+  };
+}
 function profileForSplitViewport(profile, viewport) {
   return {
     ...profile,
@@ -15872,6 +16050,8 @@ function splitViewportRiddleMetadata(childRuns) {
     attempt: result.riddle?.attempt,
     attempts: result.riddle?.attempts,
     timed_out: result.riddle?.timed_out,
+    retry_count: result.riddle?.retry_count,
+    stale_job_ids: result.riddle?.stale_job_ids,
     artifact_recovery: result.riddle?.artifact_recovery
   }));
   return {
@@ -15883,6 +16063,8 @@ function splitViewportRiddleMetadata(childRuns) {
     queue_elapsed_ms: sumDefinedNumbers(splitJobs.map((job) => job.queue_elapsed_ms)),
     pre_submission_elapsed_ms: sumDefinedNumbers(splitJobs.map((job) => job.pre_submission_elapsed_ms)),
     elapsed_ms: sumDefinedNumbers(splitJobs.map((job) => job.elapsed_ms)),
+    retry_count: splitJobs.reduce((sum, job) => sum + (typeof job.retry_count === "number" && Number.isFinite(job.retry_count) ? job.retry_count : 0), 0),
+    stale_job_ids: splitJobs.flatMap((job) => Array.isArray(job.stale_job_ids) ? job.stale_job_ids : []),
     split_jobs: splitJobs
   };
 }
@@ -15970,37 +16152,48 @@ async function runSingleRiddleProfileForCli(profile, options, input) {
   const { client, runner } = input;
   const targetUrl = resolveRiddleProofProfileTargetUrl(profile);
   let created;
-  try {
-    created = await client.runScript({
-      url: targetUrl,
-      script: buildRiddleProofProfileScript(profile),
-      viewport: profile.target.viewports[0],
-      timeoutSec: resolveRiddleProofProfileTimeoutSec(
-        profile,
-        optionString(options, "timeout") ? Number(optionString(options, "timeout")) : void 0
-      ),
-      strict: runProfileStrictOption(options),
-      sync: options.sync === true ? true : void 0
-    });
-  } catch (error) {
-    return createRiddleProofProfileEnvironmentBlockedResult({ profile, runner, error });
+  let poll;
+  let jobId = "";
+  const staleJobIds = [];
+  const retryLimit = profileUnsubmittedRetryLimit(options);
+  const pollOptions = riddlePollOptionsForProfile(options);
+  for (let attempt = 0; attempt <= retryLimit; attempt += 1) {
+    try {
+      created = await client.runScript({
+        url: targetUrl,
+        script: buildRiddleProofProfileScript(profile),
+        viewport: profile.target.viewports[0],
+        timeoutSec: resolveRiddleProofProfileTimeoutSec(
+          profile,
+          optionString(options, "timeout") ? Number(optionString(options, "timeout")) : void 0
+        ),
+        strict: runProfileStrictOption(options),
+        sync: options.sync === true ? true : void 0
+      });
+    } catch (error) {
+      return createRiddleProofProfileEnvironmentBlockedResult({ profile, runner, error });
+    }
+    jobId = typeof created.job_id === "string" ? created.job_id : typeof created.id === "string" ? created.id : "";
+    if (!jobId) {
+      const directResult = extractRiddleProofProfileResult(created);
+      return directResult ? withRiddleMetadata(directResult, { artifacts: collectRiddleProfileArtifactRefs(created) }) : createRiddleProofProfileInsufficientResult({ profile, runner, error: "Riddle run response was missing job_id.", artifacts: collectRiddleProfileArtifactRefs(created) });
+    }
+    poll = await client.pollJob(jobId, pollOptions);
+    if (attempt < retryLimit && shouldRetryUnsubmittedRiddleJob(poll)) {
+      staleJobIds.push(jobId);
+      if (options.quiet !== true) {
+        process.stderr.write(`[riddle-poll] ${jobId} stayed unsubmitted for ${formatPollDuration(poll.poll?.pre_submission_elapsed_ms)}; retrying hosted run ${attempt + 1}/${retryLimit}
+`);
+      }
+      continue;
+    }
+    break;
   }
-  const jobId = typeof created.job_id === "string" ? created.job_id : typeof created.id === "string" ? created.id : "";
-  if (!jobId) {
-    const directResult = extractRiddleProofProfileResult(created);
-    return directResult ? withRiddleMetadata(directResult, { artifacts: collectRiddleProfileArtifactRefs(created) }) : createRiddleProofProfileInsufficientResult({ profile, runner, error: "Riddle run response was missing job_id.", artifacts: collectRiddleProfileArtifactRefs(created) });
+  if (!poll) {
+    return createRiddleProofProfileEnvironmentBlockedResult({ profile, runner, error: "Riddle job polling did not produce a result." });
   }
-  const poll = await client.pollJob(jobId, {
-    wait: true,
-    attempts: optionNumber(options, "pollAttempts", "attempts"),
-    intervalMs: optionNumber(options, "intervalMs"),
-    progressEveryMs: optionNumber(options, "progressEveryMs"),
-    onProgress: options.quiet !== true ? (snapshot) => {
-      process.stderr.write(`${riddlePollProgressLine(snapshot)}
-`);
-    } : void 0
-  });
   const artifacts = collectRiddleProfileArtifactRefs(poll.artifacts);
+  const retryCount = staleJobIds.length || void 0;
   if (!poll.ok || !poll.terminal) {
     const recoveredResult = await recoverProfileResultFromRiddleArtifacts(profile, {
       client,
@@ -16008,12 +16201,18 @@ async function runSingleRiddleProfileForCli(profile, options, input) {
       jobId,
       poll
     });
-    if (recoveredResult) return recoveredResult;
+    if (recoveredResult) {
+      return withRiddleMetadata(recoveredResult, { retryCount, staleJobIds });
+    }
     return createRiddleProofProfileEnvironmentBlockedResult({
       profile,
       runner,
       error: `Riddle job ${jobId} ended with status ${poll.status || "unknown"}.`,
-      riddle: riddleMetadataFromPoll(jobId, poll),
+      riddle: {
+        ...riddleMetadataFromPoll(jobId, poll),
+        retry_count: retryCount,
+        stale_job_ids: staleJobIds.length ? staleJobIds : void 0
+      },
       artifacts
     });
   }
@@ -16031,7 +16230,9 @@ async function runSingleRiddleProfileForCli(profile, options, input) {
     status: poll.status,
     terminal: poll.terminal,
     poll: poll.poll,
-    artifacts
+    artifacts,
+    retryCount,
+    staleJobIds
   });
 }
 async function runSplitViewportProfileForCli(profile, options, input) {