@riddledc/riddle-proof 0.5.2 → 0.5.4

package/dist/proof-run-engine.d.cts

@@ -262,7 +262,7 @@ declare function executeWorkflow(params: WorkflowParams, pluginConfig: any, reso
     blocking?: boolean;
     details?: Record<string, unknown>;
     ok: boolean;
-    action: "setup" | "recon" | "author" | "implement" | "verify" | "ship" | "run";
+    action: "ship" | "setup" | "recon" | "author" | "implement" | "verify" | "run";
     state_path: string;
     stage: any;
     summary: string;
@@ -342,7 +342,7 @@ declare function executeWorkflow(params: WorkflowParams, pluginConfig: any, reso
     continueWithStage?: WorkflowStage | null;
     blocking?: boolean;
     details?: Record<string, unknown>;
-    action: "setup" | "recon" | "author" | "implement" | "verify" | "ship" | "run";
+    action: "ship" | "setup" | "recon" | "author" | "implement" | "verify" | "run";
     state_path: string;
     stage: any;
     checkpoint: string;
@@ -589,7 +589,7 @@ declare function executeWorkflow(params: WorkflowParams, pluginConfig: any, reso
     error?: undefined;
 } | {
     ok: boolean;
-    action: "setup" | "recon" | "author" | "implement" | "verify" | "ship" | "run";
+    action: "ship" | "setup" | "recon" | "author" | "implement" | "verify" | "run";
     state_path: string;
     stage: any;
     summary: string;

package/dist/proof-run-engine.d.ts

@@ -262,7 +262,7 @@ declare function executeWorkflow(params: WorkflowParams, pluginConfig: any, reso
     blocking?: boolean;
     details?: Record<string, unknown>;
     ok: boolean;
-    action: "setup" | "recon" | "author" | "implement" | "verify" | "ship" | "run";
+    action: "ship" | "setup" | "recon" | "author" | "implement" | "verify" | "run";
     state_path: string;
     stage: any;
     summary: string;
@@ -342,7 +342,7 @@ declare function executeWorkflow(params: WorkflowParams, pluginConfig: any, reso
     continueWithStage?: WorkflowStage | null;
     blocking?: boolean;
     details?: Record<string, unknown>;
-    action: "setup" | "recon" | "author" | "implement" | "verify" | "ship" | "run";
+    action: "ship" | "setup" | "recon" | "author" | "implement" | "verify" | "run";
     state_path: string;
     stage: any;
     checkpoint: string;
@@ -589,7 +589,7 @@ declare function executeWorkflow(params: WorkflowParams, pluginConfig: any, reso
     error?: undefined;
 } | {
     ok: boolean;
-    action: "setup" | "recon" | "author" | "implement" | "verify" | "ship" | "run";
+    action: "ship" | "setup" | "recon" | "author" | "implement" | "verify" | "run";
     state_path: string;
     stage: any;
     summary: string;

package/dist/proof-run-engine.js

@@ -95,6 +95,88 @@ function updateState(statePath, mutate) {
   writeState(statePath, state);
   return state;
 }
+var RUNTIME_EVENT_LIMIT = 100;
+function nowIso() {
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+function appendRuntimeEventToState(state, event) {
+  const events = Array.isArray(state.runtime_events) ? state.runtime_events : [];
+  state.runtime_events = [...events, event].slice(-RUNTIME_EVENT_LIMIT);
+  state.runtime_updated_at = event.ts;
+}
+function beginRuntimeStep(statePath, action, step, workflowPath) {
+  const timer = {
+    startedAt: nowIso(),
+    startedMs: Date.now()
+  };
+  updateState(statePath, (state) => {
+    const current = {
+      step,
+      action,
+      status: "running",
+      started_at: timer.startedAt,
+      workflow_file: path.basename(workflowPath)
+    };
+    state.current_runtime_step = current;
+    appendRuntimeEventToState(state, {
+      ts: timer.startedAt,
+      kind: "workflow.step.started",
+      step,
+      action,
+      summary: `Started ${step} workflow step.`,
+      details: {
+        workflow_file: path.basename(workflowPath)
+      }
+    });
+  });
+  return timer;
+}
+function finishRuntimeStep(statePath, action, result, timer) {
+  const finishedAt = nowIso();
+  const durationMs = Date.now() - timer.startedMs;
+  const summary = result.haltedForApproval ? `${result.step} halted for approval.` : result.ok ? `Finished ${result.step} workflow step.` : `${result.step} workflow step failed.`;
+  updateState(statePath, (state) => {
+    const completed = {
+      step: result.step,
+      action,
+      status: result.haltedForApproval ? "approval_required" : result.ok ? "completed" : "failed",
+      started_at: timer.startedAt,
+      finished_at: finishedAt,
+      duration_ms: durationMs,
+      ok: result.ok,
+      halted_for_approval: result.haltedForApproval || false,
+      auto_approved: result.autoApproved || false,
+      error: result.error || null
+    };
+    state.current_runtime_step = null;
+    state.last_runtime_step = completed;
+    appendRuntimeEventToState(state, {
+      ts: finishedAt,
+      kind: "workflow.step.finished",
+      step: result.step,
+      action,
+      summary,
+      details: completed
+    });
+  });
+  return {
+    ...result,
+    started_at: timer.startedAt,
+    finished_at: finishedAt,
+    duration_ms: durationMs
+  };
+}
+function executedStep(res, extra = {}) {
+  const output = {
+    step: res.step,
+    ok: res.ok,
+    haltedForApproval: res.haltedForApproval || false,
+    autoApproved: res.autoApproved || false,
+    ...extra
+  };
+  if (typeof res.duration_ms === "number") output.duration_ms = res.duration_ms;
+  return output;
+}
 function hasSupervisorProofAssessment(state) {
   const proofAssessment = state?.proof_assessment || {};
   const source = String(proofAssessment?.source || state?.proof_assessment_source || "").trim().toLowerCase();
@@ -557,53 +639,74 @@ async function executeWorkflow(params, pluginConfig, resolvedConfig) {
   const lobsterPrefix = process.env.RIDDLE_PROOF_LOBSTER_SCRIPT ? [process.env.RIDDLE_PROOF_LOBSTER_SCRIPT] : [];
   const runOne = (step) => {
     const args = step === "setup" ? buildSetupArgs(params, config) : {};
+    const stepWorkflowFile = workflowFile(config.riddleProofDir, step);
+    const timer = beginRuntimeStep(config.statePath, action, step, stepWorkflowFile);
     let output;
     try {
       output = JSON.parse(
-        execFileSync(lobsterCommand, [...lobsterPrefix, "run", "--file", workflowFile(config.riddleProofDir, step), "--args-json", JSON.stringify(args)], {
+        execFileSync(lobsterCommand, [...lobsterPrefix, "run", "--file", stepWorkflowFile, "--args-json", JSON.stringify(args)], {
           encoding: "utf-8",
           env
         })
       );
     } catch (error) {
-      return {
+      return finishRuntimeStep(config.statePath, action, {
         ok: false,
         step,
         error: error?.message || String(error),
         stdout: String(error?.stdout || ""),
         stderr: String(error?.stderr || "")
-      };
+      }, timer);
     }
     if (output?.status === "needs_approval") {
       if (!params.auto_approve) {
-        return {
+        return finishRuntimeStep(config.statePath, action, {
           ok: false,
           haltedForApproval: true,
           step,
           approval: output.requiresApproval || null,
           raw: output
-        };
+        }, timer);
       }
       const token = output?.requiresApproval?.resumeToken;
-      if (!token) throw new Error(`${step} requested approval without a resume token.`);
-      const resumed = JSON.parse(
-        execFileSync(lobsterCommand, [...lobsterPrefix, "resume", "--token", token, "--approve", "yes"], {
-          encoding: "utf-8",
-          env
-        })
-      );
-      return {
+      if (!token) {
+        return finishRuntimeStep(config.statePath, action, {
+          ok: false,
+          step,
+          error: `${step} requested approval without a resume token.`,
+          raw: output
+        }, timer);
+      }
+      let resumed;
+      try {
+        resumed = JSON.parse(
+          execFileSync(lobsterCommand, [...lobsterPrefix, "resume", "--token", token, "--approve", "yes"], {
+            encoding: "utf-8",
+            env
+          })
+        );
+      } catch (error) {
+        return finishRuntimeStep(config.statePath, action, {
+          ok: false,
+          step,
+          autoApproved: true,
+          error: error?.message || String(error),
+          stdout: String(error?.stdout || ""),
+          stderr: String(error?.stderr || "")
+        }, timer);
+      }
+      return finishRuntimeStep(config.statePath, action, {
         ok: resumed?.ok !== false,
         step,
         autoApproved: true,
         raw: resumed
-      };
+      }, timer);
     }
-    return {
+    return finishRuntimeStep(config.statePath, action, {
       ok: output?.ok !== false,
       step,
       raw: output
-    };
+    }, timer);
   };
   let effectiveAdvanceStage = params.advance_stage || null;
   const recordAttempt = (stage, status, summary, extra = {}) => {
@@ -729,7 +832,7 @@ async function executeWorkflow(params, pluginConfig, resolvedConfig) {
     let state = readState(config.statePath);
     if (!state || !state.workspace_ready || params.advance_stage === "setup") {
       const setupRes = runOne("setup");
-      executed.push({ step: "setup", ok: setupRes.ok, haltedForApproval: setupRes.haltedForApproval || false, autoApproved: setupRes.autoApproved || false });
+      executed.push(executedStep(setupRes));
       if (!setupRes.ok || setupRes.haltedForApproval) {
         return failedRun("setup", setupRes.haltedForApproval ? "setup halted for approval" : "setup failed", setupRes, {
           checkpoint: "setup_blocked"
@@ -939,7 +1042,7 @@ async function executeWorkflow(params, pluginConfig, resolvedConfig) {
     }
     if (!state?.recon_results || state?.stage === "setup" || state?.stage === "preflight" || ["needs_agent_decision", "needs_supervisor_judgment"].includes(state?.recon_status || "") || requestedStage === "recon") {
       const reconRes = runOne("recon");
-      executed.push({ step: "recon", ok: reconRes.ok, haltedForApproval: reconRes.haltedForApproval || false, autoApproved: reconRes.autoApproved || false });
+      executed.push(executedStep(reconRes));
       if (!reconRes.ok || reconRes.haltedForApproval) {
         return failedRun("recon", reconRes.haltedForApproval ? "recon halted for approval" : "recon failed", reconRes, {
           checkpoint: "recon_failed",
@@ -987,7 +1090,7 @@ async function executeWorkflow(params, pluginConfig, resolvedConfig) {
     state = readState(config.statePath);
     if (!authorReady(state) || effectiveAdvanceStage === "author") {
       const authorRes = runOne("author");
-      executed.push({ step: "author", ok: authorRes.ok, haltedForApproval: authorRes.haltedForApproval || false, autoApproved: authorRes.autoApproved || false });
+      executed.push(executedStep(authorRes));
       if (!authorRes.ok || authorRes.haltedForApproval) {
         return failedRun("author", authorRes.haltedForApproval ? "author halted for approval" : "author failed", authorRes, {
           checkpoint: "author_failed",
@@ -1102,7 +1205,7 @@ async function executeWorkflow(params, pluginConfig, resolvedConfig) {
     }
     if (effectiveAdvanceStage === "implement") {
       const implementRes = runOne("implement");
-      executed.push({ step: "implement", ok: implementRes.ok, haltedForApproval: implementRes.haltedForApproval || false, autoApproved: implementRes.autoApproved || false });
+      executed.push(executedStep(implementRes));
       if (implementRes.haltedForApproval) {
         return failedRun("implement", "implement halted for approval", implementRes, {
           checkpoint: "implement_blocked",
@@ -1192,7 +1295,7 @@ ${implementRes.stderr || ""}`;
       let verifyRes = { ok: true, step: "verify", reusedEvidence: canReuseVerifyEvidence };
       if (!canReuseVerifyEvidence) {
         verifyRes = runOne("verify");
-        executed.push({ step: "verify", ok: verifyRes.ok, haltedForApproval: verifyRes.haltedForApproval || false, autoApproved: verifyRes.autoApproved || false });
+        executed.push(executedStep(verifyRes));
         if (!verifyRes.ok || verifyRes.haltedForApproval) {
           return failedRun("verify", verifyRes.haltedForApproval ? "verify halted for approval" : "verify failed", verifyRes, {
             checkpoint: "verify_failed",
@@ -1201,7 +1304,7 @@ ${implementRes.stderr || ""}`;
           });
         }
       } else {
-        executed.push({ step: "verify", ok: true, reusedEvidence: true, haltedForApproval: false, autoApproved: false });
+        executed.push(executedStep(verifyRes, { reusedEvidence: true }));
       }
       state = readState(config.statePath);
       const verifyStatus = state?.verify_status || ((state?.after_cdn || "").trim() ? "evidence_captured" : "capture_incomplete");
@@ -1338,7 +1441,7 @@ ${implementRes.stderr || ""}`;
           details: { ...verifyDetails, shipGate }
         });
         const shipRes = runOne("ship");
-        executed.push({ step: "ship", ok: shipRes.ok, haltedForApproval: shipRes.haltedForApproval || false, autoApproved: shipRes.autoApproved || false });
+        executed.push(executedStep(shipRes));
         if (!shipRes.ok || shipRes.haltedForApproval) {
           const shipNextAction = shipRes?.error && String(shipRes.error).includes("temporary proof branch") ? "product bug: ship resolved a temporary proof branch; resolve the PR head branch before retrying ship" : "inspect the ship error, confirm the PR head branch and verified commit, then retry ship";
           return failedRun("ship", shipRes.haltedForApproval ? "ship halted for approval" : "ship failed", shipRes, {
@@ -1517,7 +1620,7 @@ ${implementRes.stderr || ""}`;
         return shipGateBlocked(state, executed, { shipAssessment: shipAssessment.raw });
       }
       const shipRes = runOne("ship");
-      executed.push({ step: "ship", ok: shipRes.ok, haltedForApproval: shipRes.haltedForApproval || false, autoApproved: shipRes.autoApproved || false });
+      executed.push(executedStep(shipRes));
       if (!shipRes.ok || shipRes.haltedForApproval) {
         return failedRun("ship", shipRes.haltedForApproval ? "ship halted for approval" : "ship failed", shipRes, {
           checkpoint: "ship_failed",

package/lib/workspace-core.mjs

@@ -318,6 +318,11 @@ function writeDepsManifest(projectDir, fingerprint, installCmd) {
   writeFileSync(manifestPath, JSON.stringify({ fingerprint, install_cmd: installCmd }, null, 2));
 }
 
+function dependencyInstallTimeoutMs() {
+  const parsed = Number.parseInt(process.env.RIDDLE_PROOF_INSTALL_TIMEOUT_MS || "", 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : 600000;
+}
+
 export function ensureDeps({ projectDir, reuseFrom = "" } = {}) {
   const fingerprint = computeDependencyFingerprint(projectDir);
   if (!fingerprint) return "no_package_json";
@@ -341,7 +346,7 @@ export function ensureDeps({ projectDir, reuseFrom = "" } = {}) {
 
   const installCmd = detectInstallCommand(projectDir);
   if (!installCmd) return "no_install_command";
-  const installResult = runSafe(`${installCmd} 2>&1 | tail -5`, projectDir, 300000);
+  const installResult = runSafe(`${installCmd} 2>&1 | tail -5`, projectDir, dependencyInstallTimeoutMs());
   if (!installResult.ok) {
     throw new Error(`dependency install failed in ${projectDir}: ${installResult.output.slice(0, 300)}`);
   }

package/package.json

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

package/runtime/lib/preflight.py

@@ -239,6 +239,19 @@ if missing:
     print('MISSING: ' + ', '.join(missing))
 print('=' * 50)
 
+# The TypeScript harness writes runtime observability fields before Lobster
+# starts. Preflight initializes the main state file, so preserve those fields
+# rather than making status polling go blind during setup.
+if os.path.exists(STATE_FILE):
+    try:
+        with open(STATE_FILE) as existing_state_file:
+            existing_state = json.load(existing_state_file)
+    except Exception:
+        existing_state = {}
+    for runtime_key in ('current_runtime_step', 'last_runtime_step', 'runtime_events', 'runtime_updated_at'):
+        if runtime_key in existing_state:
+            s[runtime_key] = existing_state[runtime_key]
+
 save_state(s)
 
 if missing:

package/runtime/lib/setup.py

@@ -6,7 +6,7 @@ workspace root by default:
   <workspace>/.riddle-proof-worktrees/riddle-proof-<run_id>-after
 """
 
-import json, subprocess as sp, os, sys, shutil
+import json, subprocess as sp, os, sys, shutil, time
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 from util import load_state, save_state, git, shell_quote
 
@@ -37,6 +37,15 @@ SKILLS_ROOT = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__fil
 WORKSPACE_CORE = os.path.join(SKILLS_ROOT, 'lib', 'workspace-core.mjs')
 
 
+def dependency_timeout_seconds():
+    raw = os.environ.get('RIDDLE_PROOF_INSTALL_TIMEOUT_MS', '').strip()
+    try:
+        millis = int(raw)
+    except Exception:
+        millis = 600000
+    return max(660, int((millis + 999) / 1000) + 30)
+
+
 def workspace_core(command, payload, timeout=180):
     if not os.path.exists(WORKSPACE_CORE):
         raise SystemExit('workspace core helper missing: ' + WORKSPACE_CORE)
@@ -64,10 +73,64 @@ def ensure_deps(project_dir, reuse_from=''):
     payload = {'projectDir': project_dir}
     if reuse_from:
         payload['reuseFrom'] = reuse_from
-    result = workspace_core('ensure-deps', payload, timeout=300)
+    result = workspace_core('ensure-deps', payload, timeout=dependency_timeout_seconds())
     return result.get('status', '')
 
 
+def record_setup_phase(phase, status='running', summary=''):
+    global s
+    ts = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())
+    try:
+        current = load_state()
+    except Exception:
+        current = dict(s)
+    runtime_step = current.get('current_runtime_step') if isinstance(current.get('current_runtime_step'), dict) else {}
+    if not runtime_step:
+        runtime_step = {
+            'step': 'setup',
+            'action': 'run',
+            'status': 'running',
+            'started_at': ts,
+            'workflow_file': 'riddle-proof-setup.lobster',
+        }
+    runtime_step['phase'] = phase
+    runtime_step['phase_status'] = status
+    if status == 'running':
+        runtime_step['phase_started_at'] = ts
+        runtime_step.pop('phase_finished_at', None)
+    else:
+        runtime_step['phase_finished_at'] = ts
+    if summary:
+        runtime_step['summary'] = summary
+    current['current_runtime_step'] = runtime_step
+    events = current.get('runtime_events') if isinstance(current.get('runtime_events'), list) else []
+    events.append({
+        'ts': ts,
+        'kind': 'workflow.phase.' + ('started' if status == 'running' else 'finished'),
+        'step': 'setup',
+        'phase': phase,
+        'summary': summary or (phase + ' ' + status),
+        'details': {'status': status},
+    })
+    current['runtime_events'] = events[-100:]
+    current['runtime_updated_at'] = ts
+    save_state(current)
+    for key in ('current_runtime_step', 'runtime_events', 'runtime_updated_at'):
+        if key in current:
+            s[key] = current[key]
+
+
+def ensure_deps_phase(phase, project_dir, reuse_from='', summary=''):
+    record_setup_phase(phase, 'running', summary)
+    try:
+        status = ensure_deps(project_dir, reuse_from=reuse_from)
+    except BaseException as exc:
+        record_setup_phase(phase, 'failed', str(exc)[:300])
+        raise
+    record_setup_phase(phase, 'completed', status or 'no dependency install needed')
+    return status
+
+
 def resolve_worktree_root(repo_dir):
     configured = (s.get('worktree_root') or os.environ.get('RIDDLE_PROOF_WORKTREE_ROOT') or '').strip()
     if configured:
@@ -339,16 +402,16 @@ apply_repo_profile(AFTER_DIR)
 save_state(s)
 
 reuse_source = repo_dir if os.path.exists(os.path.join(repo_dir, 'package.json')) else ''
-shared_status = ensure_deps(reuse_source) if reuse_source else ''
+shared_status = ensure_deps_phase('shared_deps', reuse_source, summary='Ensuring shared repository dependencies.') if reuse_source else ''
 if shared_status:
     print('Shared deps status: ' + shared_status)
 
 before_dep_status = ''
 if reference in ('before', 'both'):
-    before_dep_status = ensure_deps(BEFORE_DIR, reuse_from=reuse_source)
+    before_dep_status = ensure_deps_phase('before_deps', BEFORE_DIR, reuse_from=reuse_source, summary='Ensuring before-worktree dependencies.')
     print('Before deps status: ' + before_dep_status)
 
-after_dep_status = ensure_deps(AFTER_DIR, reuse_from=reuse_source)
+after_dep_status = ensure_deps_phase('after_deps', AFTER_DIR, reuse_from=reuse_source, summary='Ensuring after-worktree dependencies.')
 print('After deps status: ' + after_dep_status)
 
 # Patch Next.js config in after worktree if needed