@riddledc/riddle-proof 0.4.2 → 0.4.4

package/dist/{chunk-7DED7LM3.js → chunk-75XY5SVT.js}

@@ -5,7 +5,7 @@ import {
   createRunStatusSnapshot,
   normalizeRunParams,
   setRunStatus
-} from "./chunk-3XJJ4JOB.js";
+} from "./chunk-SIQG3N6F.js";
 import {
   applyTerminalMetadata,
   compactRecord,
@@ -13,7 +13,7 @@ import {
   nonEmptyString,
   normalizeTerminalMetadata,
   recordValue
-} from "./chunk-5DC6YXN4.js";
+} from "./chunk-TMMKRKY5.js";
 
 // src/engine-harness.ts
 import { execFileSync } from "child_process";
@@ -127,10 +127,12 @@ function stageFromCheckpoint(result) {
   if (checkpoint.startsWith("implement_")) return "implement";
   if (checkpoint.startsWith("verify_")) return "verify";
   if (checkpoint.startsWith("ship_")) return "ship";
+  if (checkpoint.startsWith("pr_sync_")) return "notify";
   if (checkpoint.includes("capture")) return "prove";
   return "setup";
 }
 function stageFromWorkflowParams(params) {
+  if (params.action === "sync") return "notify";
   const stage = nonEmptyString(params.advance_stage);
   if (stage) return stage;
   if (params.ship_after_verify) return "ship";
@@ -437,6 +439,21 @@ async function routeCheckpoint(request, state, result, agent, input) {
       terminal: terminalResult(state, "shipped", result, result.summary || "Riddle Proof shipped.")
     };
   }
+  if (checkpoint.startsWith("pr_sync_")) {
+    const fullState = context.fullRiddleState || {};
+    const prState = recordValue(result.pr_state) || recordValue(result.prState) || recordValue(fullState.pr_state) || {};
+    const prStatus = nonEmptyString(prState.status);
+    const status = prStatus === "merged" ? "completed" : prStatus === "open" ? "shipped" : result.ok === false ? "blocked" : "completed";
+    return {
+      terminal: terminalResult(
+        state,
+        status,
+        result,
+        result.summary || "Riddle Proof PR lifecycle sync completed.",
+        { pr_sync: true }
+      )
+    };
+  }
   if (checkpoint === "verify_ship_ready") {
     const shipMode = effectiveShipMode(request, input.config);
     if (shipMode === "ship") {

package/dist/{chunk-CL2FOOXX.js → chunk-PM5Q26Q6.js}

@@ -3,10 +3,10 @@ import {
   appendStageHeartbeat,
   createRunState,
   setRunStatus
-} from "./chunk-3XJJ4JOB.js";
+} from "./chunk-SIQG3N6F.js";
 import {
   createRunResult
-} from "./chunk-5DC6YXN4.js";
+} from "./chunk-TMMKRKY5.js";
 
 // src/runner.ts
 function errorDetails(error) {

package/dist/{chunk-3XJJ4JOB.js → chunk-SIQG3N6F.js}

@@ -2,7 +2,7 @@ import {
   compactRecord,
   nonEmptyString,
   recordValue
-} from "./chunk-5DC6YXN4.js";
+} from "./chunk-TMMKRKY5.js";
 
 // src/state.ts
 var RIDDLE_PROOF_RUN_STATE_VERSION = "riddle-proof.run-state.v1";
@@ -20,6 +20,36 @@ function elapsedMs(start, end) {
   if (!Number.isFinite(startMs) || !Number.isFinite(endMs)) return void 0;
   return Math.max(0, endMs - startMs);
 }
+function normalizePrStatus(value) {
+  const status = nonEmptyString(value)?.toLowerCase();
+  if (status === "merged") return "merged";
+  if (status === "open") return "open";
+  if (status === "closed") return "closed";
+  if (status === "not_found" || status === "not-found") return "not_found";
+  if (status === "unavailable") return "unavailable";
+  return status || "unknown";
+}
+function normalizePrLifecycleState(input, checkedAt = timestamp()) {
+  const value = recordValue(input);
+  if (!value) return void 0;
+  const cleanup = recordValue(value.cleanup);
+  const mergeCommit = nonEmptyString(value.merge_commit) || nonEmptyString(value.mergeCommit) || nonEmptyString(recordValue(value.mergeCommit)?.oid);
+  return compactRecord({
+    status: normalizePrStatus(value.status || value.state),
+    pr_url: nonEmptyString(value.pr_url) || nonEmptyString(value.prUrl) || nonEmptyString(value.url),
+    pr_number: nonEmptyString(value.pr_number) || nonEmptyString(value.prNumber) || (typeof value.number === "number" ? String(value.number) : void 0),
+    repo: nonEmptyString(value.repo) || nonEmptyString(value.repository),
+    head_branch: nonEmptyString(value.head_branch) || nonEmptyString(value.headBranch) || nonEmptyString(value.headRefName),
+    base_branch: nonEmptyString(value.base_branch) || nonEmptyString(value.baseBranch) || nonEmptyString(value.baseRefName),
+    merge_commit: mergeCommit,
+    merged_at: nonEmptyString(value.merged_at) || nonEmptyString(value.mergedAt),
+    closed_at: nonEmptyString(value.closed_at) || nonEmptyString(value.closedAt),
+    checked_at: nonEmptyString(value.checked_at) || nonEmptyString(value.checkedAt) || checkedAt,
+    source: nonEmptyString(value.source),
+    next_action: nonEmptyString(value.next_action) || nonEmptyString(value.nextAction),
+    cleanup: cleanup && Object.keys(cleanup).length ? cleanup : void 0
+  });
+}
 function normalizeIntegrationContext(input, fallbackSource) {
   const value = recordValue(input);
   if (!value) {
@@ -143,6 +173,16 @@ function createRunStatusSnapshot(state, at = timestamp()) {
     state_path: state.state_path ?? null,
     worktree_path: state.worktree_path ?? null,
     branch: state.branch ?? null,
+    pr_url: state.pr_url ?? null,
+    pr_branch: state.pr_branch ?? null,
+    pr_state: state.pr_state,
+    ci_status: state.ci_status,
+    ship_commit: state.ship_commit,
+    ship_remote_head: state.ship_remote_head,
+    merge_commit: state.merge_commit,
+    merged_at: state.merged_at,
+    proof_comment_url: state.proof_comment_url,
+    cleanup_report: state.cleanup_report,
     iterations: state.iterations,
     last_checkpoint: state.last_checkpoint ?? null,
     updated_at: state.updated_at,
@@ -158,14 +198,33 @@ function setRunStatus(state, status, at = timestamp()) {
   state.updated_at = at;
   return state;
 }
+function applyPrLifecycleState(state, input, at = timestamp()) {
+  const prState = normalizePrLifecycleState(input, at);
+  if (!prState) return state;
+  state.pr_state = prState;
+  if (prState.pr_url) state.pr_url = prState.pr_url;
+  if (prState.head_branch) state.pr_branch = prState.head_branch;
+  if (prState.merge_commit) state.merge_commit = prState.merge_commit;
+  if (prState.merged_at) state.merged_at = prState.merged_at;
+  if (prState.cleanup) state.cleanup_report = prState.cleanup;
+  if (prState.status === "merged") {
+    state.finalized = true;
+    state.status = "completed";
+    state.ok = true;
+  }
+  state.updated_at = at;
+  return state;
+}
 
 export {
   RIDDLE_PROOF_RUN_STATE_VERSION,
+  normalizePrLifecycleState,
   normalizeIntegrationContext,
   normalizeRunParams,
   createRunState,
   appendRunEvent,
   appendStageHeartbeat,
   createRunStatusSnapshot,
-  setRunStatus
+  setRunStatus,
+  applyPrLifecycleState
 };

package/dist/chunk-TMMKRKY5.js

@@ -0,0 +1,219 @@
+// src/result.ts
+function isTerminalStatus(status) {
+  return status === "blocked" || status === "failed" || status === "ready_to_ship" || status === "shipped" || status === "completed";
+}
+function isSuccessfulStatus(status) {
+  return status !== "blocked" && status !== "failed";
+}
+function compactRecord(input) {
+  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0 && value !== null && value !== ""));
+}
+function nonEmptyString(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+function recordValue(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function firstNonEmptyString(...values) {
+  for (const value of values) {
+    const normalized = nonEmptyString(value);
+    if (normalized) return normalized;
+  }
+  return void 0;
+}
+function firstBoolean(...values) {
+  for (const value of values) {
+    if (typeof value === "boolean") return value;
+  }
+  return void 0;
+}
+function normalizePrStatus(value) {
+  const status = nonEmptyString(value)?.toLowerCase();
+  if (status === "merged") return "merged";
+  if (status === "open") return "open";
+  if (status === "closed") return "closed";
+  if (status === "not_found" || status === "not-found") return "not_found";
+  if (status === "unavailable") return "unavailable";
+  return status || "unknown";
+}
+function normalizePrLifecycleStateInput(input) {
+  if (!input) return void 0;
+  const cleanup = recordValue(input.cleanup);
+  const mergeCommit = nonEmptyString(input.merge_commit) || nonEmptyString(input.mergeCommit) || nonEmptyString(recordValue(input.mergeCommit)?.oid);
+  return compactRecord({
+    status: normalizePrStatus(input.status || input.state),
+    pr_url: nonEmptyString(input.pr_url) || nonEmptyString(input.prUrl) || nonEmptyString(input.url),
+    pr_number: nonEmptyString(input.pr_number) || nonEmptyString(input.prNumber) || (typeof input.number === "number" ? String(input.number) : void 0),
+    repo: nonEmptyString(input.repo) || nonEmptyString(input.repository),
+    head_branch: nonEmptyString(input.head_branch) || nonEmptyString(input.headBranch) || nonEmptyString(input.headRefName),
+    base_branch: nonEmptyString(input.base_branch) || nonEmptyString(input.baseBranch) || nonEmptyString(input.baseRefName),
+    merge_commit: mergeCommit,
+    merged_at: nonEmptyString(input.merged_at) || nonEmptyString(input.mergedAt),
+    closed_at: nonEmptyString(input.closed_at) || nonEmptyString(input.closedAt),
+    checked_at: nonEmptyString(input.checked_at) || nonEmptyString(input.checkedAt),
+    source: nonEmptyString(input.source),
+    next_action: nonEmptyString(input.next_action) || nonEmptyString(input.nextAction),
+    cleanup: cleanup && Object.keys(cleanup).length ? cleanup : void 0
+  });
+}
+function normalizeTerminalMetadata(input) {
+  const riddleState = recordValue(input.riddleState) || {};
+  const result = recordValue(input.engineResult) || {};
+  const contract = recordValue(result.checkpointContract) || {};
+  const details = recordValue(input.checkpointDetails) || recordValue(contract.details) || {};
+  const shipReport = recordValue(riddleState.ship_report) || recordValue(result.ship_report) || recordValue(result.shipReport) || recordValue(details.ship_report) || recordValue(details.shipReport) || {};
+  const markedReady = firstBoolean(
+    riddleState.marked_ready,
+    result.marked_ready,
+    result.markedReady,
+    details.marked_ready,
+    details.markedReady,
+    shipReport.marked_ready
+  );
+  const leftDraft = firstBoolean(
+    riddleState.left_draft,
+    result.left_draft,
+    result.leftDraft,
+    details.left_draft,
+    details.leftDraft,
+    shipReport.left_draft
+  );
+  const finalized = firstBoolean(riddleState.finalized, result.finalized, details.finalized);
+  const prState = normalizePrLifecycleStateInput(
+    recordValue(riddleState.pr_state) || recordValue(riddleState.prState) || recordValue(result.pr_state) || recordValue(result.prState) || recordValue(details.pr_state) || recordValue(details.prState) || recordValue(shipReport.pr_state) || recordValue(shipReport.prState)
+  );
+  const cleanupReport = recordValue(riddleState.cleanup_report) || recordValue(riddleState.cleanupReport) || recordValue(result.cleanup_report) || recordValue(result.cleanupReport) || recordValue(details.cleanup_report) || recordValue(details.cleanupReport) || recordValue(prState?.cleanup);
+  return compactRecord({
+    pr_url: firstNonEmptyString(riddleState.pr_url, result.pr_url, result.prUrl, details.pr_url, details.prUrl, shipReport.pr_url),
+    pr_branch: firstNonEmptyString(
+      riddleState.pr_branch,
+      riddleState.target_branch,
+      result.pr_branch,
+      result.prBranch,
+      details.pr_branch,
+      details.prBranch,
+      shipReport.pr_branch,
+      shipReport.branch,
+      prState?.head_branch
+    ),
+    pr_state: prState,
+    marked_ready: markedReady,
+    left_draft: leftDraft,
+    ci_status: firstNonEmptyString(riddleState.ci_status, result.ci_status, result.ciStatus, details.ci_status, details.ciStatus, shipReport.ci_status),
+    ship_commit: firstNonEmptyString(riddleState.ship_commit, result.ship_commit, result.shipCommit, details.ship_commit, details.shipCommit, shipReport.shipped_commit, shipReport.ship_commit),
+    ship_remote_head: firstNonEmptyString(riddleState.ship_remote_head, result.ship_remote_head, result.shipRemoteHead, details.ship_remote_head, details.shipRemoteHead, shipReport.ship_remote_head),
+    merge_commit: firstNonEmptyString(riddleState.merge_commit, riddleState.mergeCommit, result.merge_commit, result.mergeCommit, details.merge_commit, details.mergeCommit, prState?.merge_commit),
+    merged_at: firstNonEmptyString(riddleState.merged_at, riddleState.mergedAt, result.merged_at, result.mergedAt, details.merged_at, details.mergedAt, prState?.merged_at),
+    proof_comment_url: firstNonEmptyString(riddleState.proof_comment_url, result.proof_comment_url, result.proofCommentUrl, details.proof_comment_url, details.proofCommentUrl, shipReport.proof_comment_url),
+    before_artifact_url: firstNonEmptyString(riddleState.before_artifact_url, riddleState.before_cdn, result.before_artifact_url, result.beforeArtifactUrl, details.before_artifact_url, details.beforeArtifactUrl, shipReport.before_artifact_url),
+    prod_artifact_url: firstNonEmptyString(riddleState.prod_artifact_url, riddleState.prod_cdn, result.prod_artifact_url, result.prodArtifactUrl, details.prod_artifact_url, details.prodArtifactUrl, shipReport.prod_artifact_url),
+    after_artifact_url: firstNonEmptyString(riddleState.after_artifact_url, riddleState.after_cdn, result.after_artifact_url, result.afterArtifactUrl, details.after_artifact_url, details.afterArtifactUrl, shipReport.after_artifact_url),
+    ship_report: Object.keys(shipReport).length ? shipReport : void 0,
+    cleanup_report: cleanupReport,
+    notification: recordValue(riddleState.notification) || recordValue(riddleState.discord_notification) || recordValue(result.notification) || recordValue(result.discord_notification),
+    proof_decision: nonEmptyString(riddleState.proof_decision) || nonEmptyString(result.proof_decision),
+    merge_recommendation: nonEmptyString(riddleState.merge_recommendation) || nonEmptyString(result.merge_recommendation),
+    finalized: typeof finalized === "boolean" ? finalized : void 0
+  });
+}
+function applyTerminalMetadata(state, metadata) {
+  if (metadata.pr_state) {
+    state.pr_state = metadata.pr_state;
+    if (metadata.pr_state.pr_url) state.pr_url = metadata.pr_state.pr_url;
+    if (metadata.pr_state.head_branch) state.pr_branch = metadata.pr_state.head_branch;
+    if (metadata.pr_state.merge_commit) state.merge_commit = metadata.pr_state.merge_commit;
+    if (metadata.pr_state.merged_at) state.merged_at = metadata.pr_state.merged_at;
+    if (metadata.pr_state.cleanup) state.cleanup_report = metadata.pr_state.cleanup;
+    if (metadata.pr_state.status === "merged") state.finalized = true;
+  }
+  const prUrl = nonEmptyString(metadata.pr_url);
+  if (prUrl) state.pr_url = prUrl;
+  const prBranch = nonEmptyString(metadata.pr_branch);
+  if (prBranch) state.pr_branch = prBranch;
+  if (typeof metadata.marked_ready === "boolean") state.marked_ready = metadata.marked_ready;
+  if (typeof metadata.left_draft === "boolean") state.left_draft = metadata.left_draft;
+  const ciStatus = nonEmptyString(metadata.ci_status);
+  if (ciStatus) state.ci_status = ciStatus;
+  const shipCommit = nonEmptyString(metadata.ship_commit);
+  if (shipCommit) state.ship_commit = shipCommit;
+  const shipRemoteHead = nonEmptyString(metadata.ship_remote_head);
+  if (shipRemoteHead) state.ship_remote_head = shipRemoteHead;
+  const mergeCommit = nonEmptyString(metadata.merge_commit);
+  if (mergeCommit) state.merge_commit = mergeCommit;
+  const mergedAt = nonEmptyString(metadata.merged_at);
+  if (mergedAt) state.merged_at = mergedAt;
+  const proofCommentUrl = nonEmptyString(metadata.proof_comment_url);
+  if (proofCommentUrl) state.proof_comment_url = proofCommentUrl;
+  const beforeArtifactUrl = nonEmptyString(metadata.before_artifact_url);
+  if (beforeArtifactUrl) state.before_artifact_url = beforeArtifactUrl;
+  const prodArtifactUrl = nonEmptyString(metadata.prod_artifact_url);
+  if (prodArtifactUrl) state.prod_artifact_url = prodArtifactUrl;
+  const afterArtifactUrl = nonEmptyString(metadata.after_artifact_url);
+  if (afterArtifactUrl) state.after_artifact_url = afterArtifactUrl;
+  const shipReport = recordValue(metadata.ship_report);
+  if (shipReport) state.ship_report = shipReport;
+  const cleanupReport = recordValue(metadata.cleanup_report);
+  if (cleanupReport) state.cleanup_report = cleanupReport;
+  const notification = recordValue(metadata.notification);
+  if (notification) state.notification = notification;
+  const proofDecision = nonEmptyString(metadata.proof_decision);
+  if (proofDecision) state.proof_decision = proofDecision;
+  const mergeRecommendation = nonEmptyString(metadata.merge_recommendation);
+  if (mergeRecommendation) state.merge_recommendation = mergeRecommendation;
+  if (typeof metadata.finalized === "boolean") state.finalized = metadata.finalized;
+  return state;
+}
+function createRunResult(input) {
+  const status = input.status || input.state.status;
+  const ok = isSuccessfulStatus(status);
+  const state = input.metadata ? applyTerminalMetadata(input.state, input.metadata) : input.state;
+  state.status = status;
+  state.ok = ok;
+  return compactRecord({
+    ok,
+    status,
+    run_id: state.run_id,
+    state_path: input.state_path ?? state.state_path ?? null,
+    worktree_path: state.worktree_path ?? null,
+    branch: state.branch ?? null,
+    current_stage: state.current_stage ?? null,
+    iterations: state.iterations,
+    last_checkpoint: state.last_checkpoint ?? null,
+    last_summary: input.last_summary ?? null,
+    event_count: state.events.length,
+    pr_url: state.pr_url,
+    pr_branch: state.pr_branch,
+    pr_state: state.pr_state,
+    marked_ready: state.marked_ready,
+    left_draft: state.left_draft,
+    ci_status: state.ci_status,
+    ship_commit: state.ship_commit,
+    ship_remote_head: state.ship_remote_head,
+    merge_commit: state.merge_commit,
+    merged_at: state.merged_at,
+    proof_comment_url: state.proof_comment_url,
+    before_artifact_url: state.before_artifact_url,
+    prod_artifact_url: state.prod_artifact_url,
+    after_artifact_url: state.after_artifact_url,
+    ship_report: state.ship_report,
+    cleanup_report: state.cleanup_report,
+    notification: state.notification,
+    proof_decision: state.proof_decision,
+    merge_recommendation: state.merge_recommendation,
+    finalized: state.finalized,
+    blocker: state.blocker,
+    evidence_bundle: input.evidence_bundle,
+    raw: input.raw
+  });
+}
+
+export {
+  isTerminalStatus,
+  isSuccessfulStatus,
+  compactRecord,
+  nonEmptyString,
+  recordValue,
+  normalizeTerminalMetadata,
+  applyTerminalMetadata,
+  createRunResult
+};

package/dist/engine-harness.cjs

@@ -53,16 +53,102 @@ function nonEmptyString(value) {
 function recordValue(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
+function firstNonEmptyString(...values) {
+  for (const value of values) {
+    const normalized = nonEmptyString(value);
+    if (normalized) return normalized;
+  }
+  return void 0;
+}
+function firstBoolean(...values) {
+  for (const value of values) {
+    if (typeof value === "boolean") return value;
+  }
+  return void 0;
+}
+function normalizePrStatus(value) {
+  const status = nonEmptyString(value)?.toLowerCase();
+  if (status === "merged") return "merged";
+  if (status === "open") return "open";
+  if (status === "closed") return "closed";
+  if (status === "not_found" || status === "not-found") return "not_found";
+  if (status === "unavailable") return "unavailable";
+  return status || "unknown";
+}
+function normalizePrLifecycleStateInput(input) {
+  if (!input) return void 0;
+  const cleanup = recordValue(input.cleanup);
+  const mergeCommit = nonEmptyString(input.merge_commit) || nonEmptyString(input.mergeCommit) || nonEmptyString(recordValue(input.mergeCommit)?.oid);
+  return compactRecord({
+    status: normalizePrStatus(input.status || input.state),
+    pr_url: nonEmptyString(input.pr_url) || nonEmptyString(input.prUrl) || nonEmptyString(input.url),
+    pr_number: nonEmptyString(input.pr_number) || nonEmptyString(input.prNumber) || (typeof input.number === "number" ? String(input.number) : void 0),
+    repo: nonEmptyString(input.repo) || nonEmptyString(input.repository),
+    head_branch: nonEmptyString(input.head_branch) || nonEmptyString(input.headBranch) || nonEmptyString(input.headRefName),
+    base_branch: nonEmptyString(input.base_branch) || nonEmptyString(input.baseBranch) || nonEmptyString(input.baseRefName),
+    merge_commit: mergeCommit,
+    merged_at: nonEmptyString(input.merged_at) || nonEmptyString(input.mergedAt),
+    closed_at: nonEmptyString(input.closed_at) || nonEmptyString(input.closedAt),
+    checked_at: nonEmptyString(input.checked_at) || nonEmptyString(input.checkedAt),
+    source: nonEmptyString(input.source),
+    next_action: nonEmptyString(input.next_action) || nonEmptyString(input.nextAction),
+    cleanup: cleanup && Object.keys(cleanup).length ? cleanup : void 0
+  });
+}
 function normalizeTerminalMetadata(input) {
   const riddleState = recordValue(input.riddleState) || {};
   const result = recordValue(input.engineResult) || {};
   const contract = recordValue(result.checkpointContract) || {};
   const details = recordValue(input.checkpointDetails) || recordValue(contract.details) || {};
-  const markedReady = riddleState.marked_ready ?? result.marked_ready ?? result.markedReady ?? details.marked_ready ?? details.markedReady;
-  const finalized = riddleState.finalized ?? result.finalized ?? details.finalized;
+  const shipReport = recordValue(riddleState.ship_report) || recordValue(result.ship_report) || recordValue(result.shipReport) || recordValue(details.ship_report) || recordValue(details.shipReport) || {};
+  const markedReady = firstBoolean(
+    riddleState.marked_ready,
+    result.marked_ready,
+    result.markedReady,
+    details.marked_ready,
+    details.markedReady,
+    shipReport.marked_ready
+  );
+  const leftDraft = firstBoolean(
+    riddleState.left_draft,
+    result.left_draft,
+    result.leftDraft,
+    details.left_draft,
+    details.leftDraft,
+    shipReport.left_draft
+  );
+  const finalized = firstBoolean(riddleState.finalized, result.finalized, details.finalized);
+  const prState = normalizePrLifecycleStateInput(
+    recordValue(riddleState.pr_state) || recordValue(riddleState.prState) || recordValue(result.pr_state) || recordValue(result.prState) || recordValue(details.pr_state) || recordValue(details.prState) || recordValue(shipReport.pr_state) || recordValue(shipReport.prState)
+  );
+  const cleanupReport = recordValue(riddleState.cleanup_report) || recordValue(riddleState.cleanupReport) || recordValue(result.cleanup_report) || recordValue(result.cleanupReport) || recordValue(details.cleanup_report) || recordValue(details.cleanupReport) || recordValue(prState?.cleanup);
   return compactRecord({
-    pr_url: nonEmptyString(riddleState.pr_url) || nonEmptyString(result.pr_url) || nonEmptyString(result.prUrl) || nonEmptyString(details.pr_url) || nonEmptyString(details.prUrl),
-    marked_ready: typeof markedReady === "boolean" ? markedReady : void 0,
+    pr_url: firstNonEmptyString(riddleState.pr_url, result.pr_url, result.prUrl, details.pr_url, details.prUrl, shipReport.pr_url),
+    pr_branch: firstNonEmptyString(
+      riddleState.pr_branch,
+      riddleState.target_branch,
+      result.pr_branch,
+      result.prBranch,
+      details.pr_branch,
+      details.prBranch,
+      shipReport.pr_branch,
+      shipReport.branch,
+      prState?.head_branch
+    ),
+    pr_state: prState,
+    marked_ready: markedReady,
+    left_draft: leftDraft,
+    ci_status: firstNonEmptyString(riddleState.ci_status, result.ci_status, result.ciStatus, details.ci_status, details.ciStatus, shipReport.ci_status),
+    ship_commit: firstNonEmptyString(riddleState.ship_commit, result.ship_commit, result.shipCommit, details.ship_commit, details.shipCommit, shipReport.shipped_commit, shipReport.ship_commit),
+    ship_remote_head: firstNonEmptyString(riddleState.ship_remote_head, result.ship_remote_head, result.shipRemoteHead, details.ship_remote_head, details.shipRemoteHead, shipReport.ship_remote_head),
+    merge_commit: firstNonEmptyString(riddleState.merge_commit, riddleState.mergeCommit, result.merge_commit, result.mergeCommit, details.merge_commit, details.mergeCommit, prState?.merge_commit),
+    merged_at: firstNonEmptyString(riddleState.merged_at, riddleState.mergedAt, result.merged_at, result.mergedAt, details.merged_at, details.mergedAt, prState?.merged_at),
+    proof_comment_url: firstNonEmptyString(riddleState.proof_comment_url, result.proof_comment_url, result.proofCommentUrl, details.proof_comment_url, details.proofCommentUrl, shipReport.proof_comment_url),
+    before_artifact_url: firstNonEmptyString(riddleState.before_artifact_url, riddleState.before_cdn, result.before_artifact_url, result.beforeArtifactUrl, details.before_artifact_url, details.beforeArtifactUrl, shipReport.before_artifact_url),
+    prod_artifact_url: firstNonEmptyString(riddleState.prod_artifact_url, riddleState.prod_cdn, result.prod_artifact_url, result.prodArtifactUrl, details.prod_artifact_url, details.prodArtifactUrl, shipReport.prod_artifact_url),
+    after_artifact_url: firstNonEmptyString(riddleState.after_artifact_url, riddleState.after_cdn, result.after_artifact_url, result.afterArtifactUrl, details.after_artifact_url, details.afterArtifactUrl, shipReport.after_artifact_url),
+    ship_report: Object.keys(shipReport).length ? shipReport : void 0,
+    cleanup_report: cleanupReport,
     notification: recordValue(riddleState.notification) || recordValue(riddleState.discord_notification) || recordValue(result.notification) || recordValue(result.discord_notification),
     proof_decision: nonEmptyString(riddleState.proof_decision) || nonEmptyString(result.proof_decision),
     merge_recommendation: nonEmptyString(riddleState.merge_recommendation) || nonEmptyString(result.merge_recommendation),
@@ -70,9 +156,43 @@ function normalizeTerminalMetadata(input) {
   });
 }
 function applyTerminalMetadata(state, metadata) {
+  if (metadata.pr_state) {
+    state.pr_state = metadata.pr_state;
+    if (metadata.pr_state.pr_url) state.pr_url = metadata.pr_state.pr_url;
+    if (metadata.pr_state.head_branch) state.pr_branch = metadata.pr_state.head_branch;
+    if (metadata.pr_state.merge_commit) state.merge_commit = metadata.pr_state.merge_commit;
+    if (metadata.pr_state.merged_at) state.merged_at = metadata.pr_state.merged_at;
+    if (metadata.pr_state.cleanup) state.cleanup_report = metadata.pr_state.cleanup;
+    if (metadata.pr_state.status === "merged") state.finalized = true;
+  }
   const prUrl = nonEmptyString(metadata.pr_url);
   if (prUrl) state.pr_url = prUrl;
+  const prBranch = nonEmptyString(metadata.pr_branch);
+  if (prBranch) state.pr_branch = prBranch;
   if (typeof metadata.marked_ready === "boolean") state.marked_ready = metadata.marked_ready;
+  if (typeof metadata.left_draft === "boolean") state.left_draft = metadata.left_draft;
+  const ciStatus = nonEmptyString(metadata.ci_status);
+  if (ciStatus) state.ci_status = ciStatus;
+  const shipCommit = nonEmptyString(metadata.ship_commit);
+  if (shipCommit) state.ship_commit = shipCommit;
+  const shipRemoteHead = nonEmptyString(metadata.ship_remote_head);
+  if (shipRemoteHead) state.ship_remote_head = shipRemoteHead;
+  const mergeCommit = nonEmptyString(metadata.merge_commit);
+  if (mergeCommit) state.merge_commit = mergeCommit;
+  const mergedAt = nonEmptyString(metadata.merged_at);
+  if (mergedAt) state.merged_at = mergedAt;
+  const proofCommentUrl = nonEmptyString(metadata.proof_comment_url);
+  if (proofCommentUrl) state.proof_comment_url = proofCommentUrl;
+  const beforeArtifactUrl = nonEmptyString(metadata.before_artifact_url);
+  if (beforeArtifactUrl) state.before_artifact_url = beforeArtifactUrl;
+  const prodArtifactUrl = nonEmptyString(metadata.prod_artifact_url);
+  if (prodArtifactUrl) state.prod_artifact_url = prodArtifactUrl;
+  const afterArtifactUrl = nonEmptyString(metadata.after_artifact_url);
+  if (afterArtifactUrl) state.after_artifact_url = afterArtifactUrl;
+  const shipReport = recordValue(metadata.ship_report);
+  if (shipReport) state.ship_report = shipReport;
+  const cleanupReport = recordValue(metadata.cleanup_report);
+  if (cleanupReport) state.cleanup_report = cleanupReport;
   const notification = recordValue(metadata.notification);
   if (notification) state.notification = notification;
   const proofDecision = nonEmptyString(metadata.proof_decision);
@@ -101,7 +221,21 @@ function createRunResult(input) {
     last_summary: input.last_summary ?? null,
     event_count: state.events.length,
     pr_url: state.pr_url,
+    pr_branch: state.pr_branch,
+    pr_state: state.pr_state,
     marked_ready: state.marked_ready,
+    left_draft: state.left_draft,
+    ci_status: state.ci_status,
+    ship_commit: state.ship_commit,
+    ship_remote_head: state.ship_remote_head,
+    merge_commit: state.merge_commit,
+    merged_at: state.merged_at,
+    proof_comment_url: state.proof_comment_url,
+    before_artifact_url: state.before_artifact_url,
+    prod_artifact_url: state.prod_artifact_url,
+    after_artifact_url: state.after_artifact_url,
+    ship_report: state.ship_report,
+    cleanup_report: state.cleanup_report,
     notification: state.notification,
     proof_decision: state.proof_decision,
     merge_recommendation: state.merge_recommendation,
@@ -251,6 +385,16 @@ function createRunStatusSnapshot(state, at = timestamp()) {
     state_path: state.state_path ?? null,
     worktree_path: state.worktree_path ?? null,
     branch: state.branch ?? null,
+    pr_url: state.pr_url ?? null,
+    pr_branch: state.pr_branch ?? null,
+    pr_state: state.pr_state,
+    ci_status: state.ci_status,
+    ship_commit: state.ship_commit,
+    ship_remote_head: state.ship_remote_head,
+    merge_commit: state.merge_commit,
+    merged_at: state.merged_at,
+    proof_comment_url: state.proof_comment_url,
+    cleanup_report: state.cleanup_report,
     iterations: state.iterations,
     last_checkpoint: state.last_checkpoint ?? null,
     updated_at: state.updated_at,
@@ -368,10 +512,12 @@ function stageFromCheckpoint(result) {
   if (checkpoint.startsWith("implement_")) return "implement";
   if (checkpoint.startsWith("verify_")) return "verify";
   if (checkpoint.startsWith("ship_")) return "ship";
+  if (checkpoint.startsWith("pr_sync_")) return "notify";
   if (checkpoint.includes("capture")) return "prove";
   return "setup";
 }
 function stageFromWorkflowParams(params) {
+  if (params.action === "sync") return "notify";
   const stage = nonEmptyString(params.advance_stage);
   if (stage) return stage;
   if (params.ship_after_verify) return "ship";
@@ -678,6 +824,21 @@ async function routeCheckpoint(request, state, result, agent, input) {
       terminal: terminalResult(state, "shipped", result, result.summary || "Riddle Proof shipped.")
     };
   }
+  if (checkpoint.startsWith("pr_sync_")) {
+    const fullState = context.fullRiddleState || {};
+    const prState = recordValue(result.pr_state) || recordValue(result.prState) || recordValue(fullState.pr_state) || {};
+    const prStatus = nonEmptyString(prState.status);
+    const status = prStatus === "merged" ? "completed" : prStatus === "open" ? "shipped" : result.ok === false ? "blocked" : "completed";
+    return {
+      terminal: terminalResult(
+        state,
+        status,
+        result,
+        result.summary || "Riddle Proof PR lifecycle sync completed.",
+        { pr_sync: true }
+      )
+    };
+  }
   if (checkpoint === "verify_ship_ready") {
     const shipMode = effectiveShipMode(request, input.config);
     if (shipMode === "ship") {

package/dist/engine-harness.js

@@ -2,9 +2,9 @@ import {
   createDisabledRiddleProofAgentAdapter,
   readRiddleProofRunStatus,
   runRiddleProofEngineHarness
-} from "./chunk-7DED7LM3.js";
-import "./chunk-3XJJ4JOB.js";
-import "./chunk-5DC6YXN4.js";
+} from "./chunk-75XY5SVT.js";
+import "./chunk-SIQG3N6F.js";
+import "./chunk-TMMKRKY5.js";
 export {
   createDisabledRiddleProofAgentAdapter,
   readRiddleProofRunStatus,