@riddledc/riddle-proof 0.7.155 → 0.7.157

package/dist/cli.cjs

@@ -14858,7 +14858,7 @@ function runProfileSplitViewportsOption(options) {
   return optionBoolean(options, "splitViewports") ?? false;
 }
 var DEFAULT_PROFILE_UNSUBMITTED_RETRY_TIMEOUT_MS = 9e4;
-var DEFAULT_PROFILE_UNSUBMITTED_RETRIES = 1;
+var DEFAULT_PROFILE_UNSUBMITTED_RETRIES = 2;
 function optionNumber(options, ...keys) {
   for (const key of keys) {
     const value = optionString(options, key);
@@ -15948,45 +15948,55 @@ function riddleArtifactsPayloadStatus(payload) {
 }
 async function recoverProfileResultFromRiddleArtifacts(profile, input) {
   if (input.poll.poll?.timed_out !== true) return void 0;
-  let artifactPayload;
-  try {
-    artifactPayload = await input.client.requestJson(`/v1/jobs/${input.jobId}/artifacts`);
-  } catch {
-    return void 0;
-  }
-  const artifacts = collectRiddleProfileArtifactRefs(artifactPayload);
-  if (!artifacts.length) return void 0;
-  const artifactStatus = riddleArtifactsPayloadStatus(artifactPayload);
-  const terminal = artifactStatus ? isTerminalRiddleJobStatus(artifactStatus) : true;
-  const recoveredPoll = input.poll.poll ? {
-    ...input.poll.poll,
-    status: artifactStatus ?? input.poll.poll.status,
-    terminal
-  } : void 0;
-  const artifactResult = await profileResultFromRiddleArtifacts(profile, artifacts, [artifactPayload, input.poll.job]);
-  if (artifactResult) {
-    return withRiddleMetadata(artifactResult, {
-      job_id: input.jobId,
-      status: artifactStatus ?? input.poll.status,
-      terminal,
-      poll: recoveredPoll,
-      artifacts,
-      artifactRecovery: true
-    });
+  const attempts = Math.max(1, Math.floor(input.attempts ?? 3));
+  const intervalMs = Math.max(0, Math.floor(input.intervalMs ?? 0));
+  for (let attempt = 0; attempt < attempts; attempt += 1) {
+    let artifactPayload;
+    try {
+      artifactPayload = await input.client.requestJson(`/v1/jobs/${input.jobId}/artifacts`);
+    } catch {
+      artifactPayload = {};
+    }
+    const artifacts = collectRiddleProfileArtifactRefs(artifactPayload);
+    if (artifacts.length) {
+      const artifactStatus = riddleArtifactsPayloadStatus(artifactPayload);
+      const terminal = artifactStatus ? isTerminalRiddleJobStatus(artifactStatus) : true;
+      const recoveredPoll = input.poll.poll ? {
+        ...input.poll.poll,
+        status: artifactStatus ?? input.poll.poll.status,
+        terminal
+      } : void 0;
+      const artifactResult = await profileResultFromRiddleArtifacts(profile, artifacts, [artifactPayload, input.poll.job]);
+      if (artifactResult) {
+        return withRiddleMetadata(artifactResult, {
+          job_id: input.jobId,
+          status: artifactStatus ?? input.poll.status,
+          terminal,
+          poll: recoveredPoll,
+          artifacts,
+          artifactRecovery: true
+        });
+      }
+      if (terminal) {
+        return createRiddleProofProfileInsufficientResult({
+          profile,
+          runner: input.runner,
+          error: `Riddle job ${input.jobId} timed out in status ${input.poll.status || "unknown"}, but artifacts were recovered without a proof result.`,
+          riddle: {
+            ...riddleMetadataFromPoll(input.jobId, input.poll),
+            status: artifactStatus ?? input.poll.status,
+            terminal,
+            artifact_recovery: true
+          },
+          artifacts
+        });
+      }
+    }
+    if (attempt + 1 < attempts && intervalMs > 0) {
+      await new Promise((resolve) => setTimeout(resolve, intervalMs));
+    }
   }
-  if (!terminal) return void 0;
-  return createRiddleProofProfileInsufficientResult({
-    profile,
-    runner: input.runner,
-    error: `Riddle job ${input.jobId} timed out in status ${input.poll.status || "unknown"}, but artifacts were recovered without a proof result.`,
-    riddle: {
-      ...riddleMetadataFromPoll(input.jobId, input.poll),
-      status: artifactStatus ?? input.poll.status,
-      terminal,
-      artifact_recovery: true
-    },
-    artifacts
-  });
+  return void 0;
 }
 function riddleMetadataFromPoll(jobId, poll) {
   return {
@@ -16215,6 +16225,17 @@ async function runSingleRiddleProfileForCli(profile, options, input) {
     }
     poll = await client.pollJob(jobId, pollOptions);
     if (attempt < retryLimit && shouldRetryUnsubmittedRiddleJob(poll)) {
+      const recoveredResult = await recoverProfileResultFromRiddleArtifacts(profile, {
+        client,
+        runner,
+        jobId,
+        poll,
+        attempts: 3,
+        intervalMs: Math.min(2e3, Math.max(0, poll.poll?.interval_ms ?? 0))
+      });
+      if (recoveredResult) {
+        return recoveredResult;
+      }
       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}
@@ -16234,7 +16255,9 @@ async function runSingleRiddleProfileForCli(profile, options, input) {
       client,
       runner,
       jobId,
-      poll
+      poll,
+      attempts: 3,
+      intervalMs: Math.min(2e3, Math.max(0, poll.poll?.interval_ms ?? 0))
     });
     if (recoveredResult) {
       return withRiddleMetadata(recoveredResult, { retryCount, staleJobIds });

package/dist/cli.js

@@ -109,7 +109,7 @@ function runProfileSplitViewportsOption(options) {
   return optionBoolean(options, "splitViewports") ?? false;
 }
 var DEFAULT_PROFILE_UNSUBMITTED_RETRY_TIMEOUT_MS = 9e4;
-var DEFAULT_PROFILE_UNSUBMITTED_RETRIES = 1;
+var DEFAULT_PROFILE_UNSUBMITTED_RETRIES = 2;
 function optionNumber(options, ...keys) {
   for (const key of keys) {
     const value = optionString(options, key);
@@ -1199,45 +1199,55 @@ function riddleArtifactsPayloadStatus(payload) {
 }
 async function recoverProfileResultFromRiddleArtifacts(profile, input) {
   if (input.poll.poll?.timed_out !== true) return void 0;
-  let artifactPayload;
-  try {
-    artifactPayload = await input.client.requestJson(`/v1/jobs/${input.jobId}/artifacts`);
-  } catch {
-    return void 0;
-  }
-  const artifacts = collectRiddleProfileArtifactRefs(artifactPayload);
-  if (!artifacts.length) return void 0;
-  const artifactStatus = riddleArtifactsPayloadStatus(artifactPayload);
-  const terminal = artifactStatus ? isTerminalRiddleJobStatus(artifactStatus) : true;
-  const recoveredPoll = input.poll.poll ? {
-    ...input.poll.poll,
-    status: artifactStatus ?? input.poll.poll.status,
-    terminal
-  } : void 0;
-  const artifactResult = await profileResultFromRiddleArtifacts(profile, artifacts, [artifactPayload, input.poll.job]);
-  if (artifactResult) {
-    return withRiddleMetadata(artifactResult, {
-      job_id: input.jobId,
-      status: artifactStatus ?? input.poll.status,
-      terminal,
-      poll: recoveredPoll,
-      artifacts,
-      artifactRecovery: true
-    });
+  const attempts = Math.max(1, Math.floor(input.attempts ?? 3));
+  const intervalMs = Math.max(0, Math.floor(input.intervalMs ?? 0));
+  for (let attempt = 0; attempt < attempts; attempt += 1) {
+    let artifactPayload;
+    try {
+      artifactPayload = await input.client.requestJson(`/v1/jobs/${input.jobId}/artifacts`);
+    } catch {
+      artifactPayload = {};
+    }
+    const artifacts = collectRiddleProfileArtifactRefs(artifactPayload);
+    if (artifacts.length) {
+      const artifactStatus = riddleArtifactsPayloadStatus(artifactPayload);
+      const terminal = artifactStatus ? isTerminalRiddleJobStatus(artifactStatus) : true;
+      const recoveredPoll = input.poll.poll ? {
+        ...input.poll.poll,
+        status: artifactStatus ?? input.poll.poll.status,
+        terminal
+      } : void 0;
+      const artifactResult = await profileResultFromRiddleArtifacts(profile, artifacts, [artifactPayload, input.poll.job]);
+      if (artifactResult) {
+        return withRiddleMetadata(artifactResult, {
+          job_id: input.jobId,
+          status: artifactStatus ?? input.poll.status,
+          terminal,
+          poll: recoveredPoll,
+          artifacts,
+          artifactRecovery: true
+        });
+      }
+      if (terminal) {
+        return createRiddleProofProfileInsufficientResult({
+          profile,
+          runner: input.runner,
+          error: `Riddle job ${input.jobId} timed out in status ${input.poll.status || "unknown"}, but artifacts were recovered without a proof result.`,
+          riddle: {
+            ...riddleMetadataFromPoll(input.jobId, input.poll),
+            status: artifactStatus ?? input.poll.status,
+            terminal,
+            artifact_recovery: true
+          },
+          artifacts
+        });
+      }
+    }
+    if (attempt + 1 < attempts && intervalMs > 0) {
+      await new Promise((resolve) => setTimeout(resolve, intervalMs));
+    }
   }
-  if (!terminal) return void 0;
-  return createRiddleProofProfileInsufficientResult({
-    profile,
-    runner: input.runner,
-    error: `Riddle job ${input.jobId} timed out in status ${input.poll.status || "unknown"}, but artifacts were recovered without a proof result.`,
-    riddle: {
-      ...riddleMetadataFromPoll(input.jobId, input.poll),
-      status: artifactStatus ?? input.poll.status,
-      terminal,
-      artifact_recovery: true
-    },
-    artifacts
-  });
+  return void 0;
 }
 function riddleMetadataFromPoll(jobId, poll) {
   return {
@@ -1466,6 +1476,17 @@ async function runSingleRiddleProfileForCli(profile, options, input) {
     }
     poll = await client.pollJob(jobId, pollOptions);
     if (attempt < retryLimit && shouldRetryUnsubmittedRiddleJob(poll)) {
+      const recoveredResult = await recoverProfileResultFromRiddleArtifacts(profile, {
+        client,
+        runner,
+        jobId,
+        poll,
+        attempts: 3,
+        intervalMs: Math.min(2e3, Math.max(0, poll.poll?.interval_ms ?? 0))
+      });
+      if (recoveredResult) {
+        return recoveredResult;
+      }
       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}
@@ -1485,7 +1506,9 @@ async function runSingleRiddleProfileForCli(profile, options, input) {
       client,
       runner,
       jobId,
-      poll
+      poll,
+      attempts: 3,
+      intervalMs: Math.min(2e3, Math.max(0, poll.poll?.interval_ms ?? 0))
     });
     if (recoveredResult) {
       return withRiddleMetadata(recoveredResult, { retryCount, staleJobIds });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riddledc/riddle-proof",
-  "version": "0.7.155",
+  "version": "0.7.157",
   "description": "Reusable Riddle Proof contracts and helpers for evidence-backed agent changes.",
   "license": "MIT",
   "author": "RiddleDC",