@quintinshaw/pi-dynamic-workflows 1.3.0 → 1.4.0

package/README.md

@@ -133,7 +133,8 @@ Scripts run inside a Node `vm` sandbox. Intentionally unavailable: `Date.now()`,
 - **Structured output** — JSON-Schema-validated subagent results
 - **Real token & cost accounting** — read from each subagent's SDK session (input / output / total / cost), with a character estimate only as fallback when a provider reports no usage; `budget` gates on the real total
 - **Real per-agent / per-phase model routing** — `opts.model` and `meta.phases[].model` actually select the model (resolved against your authed model registry), with graceful fallback
-- **`/workflows` command** — list, inspect, stop, pause, and remove background runs; runs started with `background: true` are reachable from the command
+- **`/workflows` command** — list, inspect, stop, pause, **resume**, and remove background runs; runs started with `background: true` are reachable from the command
+- **Resume** — each agent result is journaled by a deterministic call index; resuming replays the unchanged prefix from cache (no re-run, no tokens) and runs only new or edited calls live
 - **Safety limits** — 1000-agent cap (`maxAgents`), per-agent timeout (`agentTimeoutMs`), recoverable-vs-fatal error classification
 - **Live progress + token/cost display**, `Esc` to abort
 - **Log persistence** to `.pi/workflows/runs/`
@@ -142,7 +143,6 @@ Scripts run inside a Node `vm` sandbox. Intentionally unavailable: `Date.now()`,
 
 Tracked toward closer parity with Claude Code dynamic workflows:
 
-- **Resume** — journaled results, replay the unchanged prefix, run the rest live
 - **Worktree isolation** for parallel edits, and **bundled `/deep-research`**
 - **Saved workflows** as `/<name>` slash commands
 

package/dist/run-persistence.d.ts

@@ -33,6 +33,12 @@ export interface PersistedRunState {
         output: number;
         total: number;
     };
+    /** Cached agent results for resume, keyed by deterministic call index. */
+    journal?: Array<{
+        index: number;
+        hash: string;
+        result: unknown;
+    }>;
 }
 export interface RunPersistence {
     /** Save current run state. */

package/dist/workflow-manager.d.ts

@@ -5,7 +5,7 @@ import { EventEmitter } from "node:events";
 import type { WorkflowSnapshot } from "./display.js";
 import { WorkflowError } from "./errors.js";
 import { type PersistedRunState, type RunPersistence, type RunStatus } from "./run-persistence.js";
-import { type WorkflowRunResult } from "./workflow.js";
+import { type JournalEntry, type WorkflowRunResult } from "./workflow.js";
 export interface ManagedRun {
     runId: string;
     status: RunStatus;
@@ -14,6 +14,11 @@ export interface ManagedRun {
     error?: WorkflowError;
     controller: AbortController;
     startedAt: Date;
+    /** The real script, kept so the run can be resumed. */
+    script: string;
+    args?: unknown;
+    /** Accumulated agent results for resume (deterministic call index -> result). */
+    journal: JournalEntry[];
 }
 export interface WorkflowManagerOptions {
     cwd?: string;
@@ -44,7 +49,8 @@ export declare class WorkflowManager extends EventEmitter {
      */
     pause(runId: string): boolean;
     /**
-     * Resume a paused workflow.
+     * Resume an interrupted run: replay journaled results for the unchanged prefix
+     * and run the rest live. Returns false if there is nothing resumable.
      */
     resume(runId: string): Promise<boolean>;
     /**

package/dist/workflow-manager.js

@@ -40,6 +40,9 @@ export class WorkflowManager extends EventEmitter {
             },
             controller,
             startedAt: new Date(),
+            script,
+            args,
+            journal: [],
         };
         this.runs.set(runId, managed);
         // Persist initial state
@@ -82,17 +85,28 @@ export class WorkflowManager extends EventEmitter {
             },
             controller,
             startedAt: new Date(),
+            script,
+            args,
+            journal: [],
         };
         this.runs.set(runId, managed);
         return this.executeRun(managed, script, args);
     }
-    async executeRun(managed, script, args) {
+    async executeRun(managed, script, args, resumeJournal) {
         try {
             const result = await runWorkflow(script, {
                 cwd: this.cwd,
                 args,
                 signal: managed.controller.signal,
                 concurrency: this.concurrency,
+                resumeJournal,
+                resumeFromRunId: resumeJournal ? managed.runId : undefined,
+                onAgentJournal: (entry) => {
+                    // Append (crash-safe-ish): keep the latest entry per index, then persist.
+                    managed.journal = managed.journal.filter((e) => e.index !== entry.index);
+                    managed.journal.push(entry);
+                    this.persistRun(managed);
+                },
                 onLog: (message) => {
                     managed.snapshot.logs.push(message);
                     this.emit("log", { runId: managed.runId, message });
@@ -152,7 +166,11 @@ export class WorkflowManager extends EventEmitter {
         this.persistence.save({
             runId: managed.runId,
             workflowName: managed.snapshot.name,
-            script: "", // Don't persist script for security
+            // Persist the real script + journal so the run can be resumed. Runs live
+            // under .pi/workflows/runs/ — protect via directory permissions, not blanking.
+            script: managed.script,
+            args: managed.args,
+            journal: managed.journal,
             status: managed.status,
             phases: managed.snapshot.phases,
             currentPhase: managed.snapshot.currentPhase,
@@ -183,15 +201,41 @@ export class WorkflowManager extends EventEmitter {
         return true;
     }
     /**
-     * Resume a paused workflow.
+     * Resume an interrupted run: replay journaled results for the unchanged prefix
+     * and run the rest live. Returns false if there is nothing resumable.
      */
     async resume(runId) {
+        const active = this.runs.get(runId);
+        if (active?.status === "running")
+            return false; // already running
         const persisted = this.persistence.load(runId);
-        if (persisted?.status !== "paused")
+        if (!persisted?.script || persisted.status === "completed")
             return false;
-        // For now, resume creates a fresh run with completed agents' results cached
-        // Full resume would require re-executing the script with cached results
+        const controller = new AbortController();
+        const managed = {
+            runId,
+            status: "running",
+            snapshot: {
+                name: persisted.workflowName,
+                phases: persisted.phases ?? [],
+                logs: persisted.logs ?? [],
+                agents: [],
+                agentCount: 0,
+                runningCount: 0,
+                doneCount: 0,
+                errorCount: 0,
+            },
+            controller,
+            startedAt: new Date(),
+            script: persisted.script,
+            args: persisted.args,
+            journal: persisted.journal ?? [],
+        };
+        this.runs.set(runId, managed);
+        const resumeJournal = new Map((persisted.journal ?? []).map((e) => [e.index, e]));
         this.emit("resumed", { runId });
+        // Run in the background; executeRun records status/errors on the managed run.
+        void this.executeRun(managed, persisted.script, persisted.args, resumeJournal).catch(() => { });
         return true;
     }
     /**

package/dist/workflow.d.ts

@@ -11,6 +11,13 @@ export interface WorkflowMeta {
     whenToUse?: string;
     phases?: WorkflowMetaPhase[];
 }
+/** One cached agent() result, keyed by its deterministic call index. */
+export interface JournalEntry {
+    index: number;
+    /** sha256 of the call's identity (prompt + model + phase + agentType + schema). */
+    hash: string;
+    result: unknown;
+}
 export interface WorkflowRunOptions extends WorkflowAgentOptions {
     args?: unknown;
     agent?: Pick<WorkflowAgent, "run">;
@@ -25,6 +32,12 @@ export interface WorkflowRunOptions extends WorkflowAgentOptions {
     persistLogs?: boolean;
     /** Run ID for persistence. Auto-generated if not provided. */
     runId?: string;
+    /** Resume: cached agent results keyed by deterministic call index. */
+    resumeJournal?: Map<number, JournalEntry>;
+    /** Resume: the run being resumed (informational; enables resume mode). */
+    resumeFromRunId?: string;
+    /** Called after each live agent completes so the caller can persist the journal. */
+    onAgentJournal?: (entry: JournalEntry) => void;
     onLog?: (message: string) => void;
     onPhase?: (title: string) => void;
     onAgentStart?: (event: {

package/dist/workflow.js

@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 import vm from "node:vm";
 import { parse } from "acorn";
 import { WorkflowAgent } from "./agent.js";
@@ -25,6 +26,7 @@ export async function runWorkflow(script, options = {}) {
         logs: [],
         phases: [],
         agentCount: 0,
+        callSeq: 0,
         spent: 0,
         tokenUsage: { input: 0, output: 0, total: 0, cost: 0 },
     };
@@ -67,6 +69,20 @@ export async function runWorkflow(script, options = {}) {
         const requestedLabel = agentOptions.label?.trim();
         // Precedence: explicit agentOptions.model > phase model (meta.phases[].model).
         const modelSpec = agentOptions.model ?? resolveModelForPhase(assignedPhase, routingConfig);
+        // Deterministic resume key: assigned at lexical call time, before the limiter,
+        // so parallel()/pipeline() fan-out is reproducible for a fixed script.
+        const callIndex = state.callSeq++;
+        const callHash = hashAgentCall(prompt, modelSpec, assignedPhase, agentOptions);
+        // Resume: replay a cached result for an unchanged call (matching hash), without
+        // consuming a concurrency slot, tokens, or a real subagent run.
+        const cached = options.resumeJournal?.get(callIndex);
+        if (cached && cached.hash === callHash) {
+            state.agentCount++;
+            const label = requestedLabel || defaultAgentLabel(assignedPhase, state.agentCount);
+            options.onAgentStart?.({ label, phase: assignedPhase, prompt, model: modelSpec });
+            options.onAgentEnd?.({ label, phase: assignedPhase, result: cached.result, tokens: 0 });
+            return cached.result;
+        }
         return limiter(async () => {
             state.agentCount++;
             const label = requestedLabel || defaultAgentLabel(assignedPhase, state.agentCount);
@@ -101,6 +117,7 @@ export async function runWorkflow(script, options = {}) {
                 }), timeout, `Agent "${label}" timed out after ${timeout}ms`);
                 throwIfAborted();
                 const tokens = recordTokens(result);
+                options.onAgentJournal?.({ index: callIndex, hash: callHash, result });
                 options.onAgentEnd?.({ label, phase: assignedPhase, result, tokens });
                 return result;
             }
@@ -348,6 +365,17 @@ function createLimiter(limit) {
 function defaultAgentLabel(phase, index) {
     return phase ? `${phase} agent ${index}` : `agent ${index}`;
 }
+/** Stable identity hash for an agent() call — a cache miss on resume when anything changes. */
+function hashAgentCall(prompt, model, phase, options) {
+    const identity = JSON.stringify({
+        prompt,
+        model: model ?? null,
+        phase: phase ?? null,
+        agentType: options.agentType ?? null,
+        schema: options.schema ?? null,
+    });
+    return createHash("sha256").update(identity).digest("hex");
+}
 function buildAgentInstructions(phase, options) {
     const lines = [];
     if (phase)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintinshaw/pi-dynamic-workflows",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Claude-Code-style dynamic workflow orchestration for Pi.",
   "type": "module",
   "main": "./dist/index.js",

package/src/run-persistence.ts

@@ -40,6 +40,8 @@ export interface PersistedRunState {
     output: number;
     total: number;
   };
+  /** Cached agent results for resume, keyed by deterministic call index. */
+  journal?: Array<{ index: number; hash: string; result: unknown }>;
 }
 
 export interface RunPersistence {

package/src/workflow-manager.ts

@@ -12,7 +12,7 @@ import {
   type RunPersistence,
   type RunStatus,
 } from "./run-persistence.js";
-import { parseWorkflowScript, runWorkflow, type WorkflowRunResult } from "./workflow.js";
+import { type JournalEntry, parseWorkflowScript, runWorkflow, type WorkflowRunResult } from "./workflow.js";
 
 export interface ManagedRun {
   runId: string;
@@ -22,6 +22,11 @@ export interface ManagedRun {
   error?: WorkflowError;
   controller: AbortController;
   startedAt: Date;
+  /** The real script, kept so the run can be resumed. */
+  script: string;
+  args?: unknown;
+  /** Accumulated agent results for resume (deterministic call index -> result). */
+  journal: JournalEntry[];
 }
 
 export interface WorkflowManagerOptions {
@@ -67,6 +72,9 @@ export class WorkflowManager extends EventEmitter {
       },
       controller,
       startedAt: new Date(),
+      script,
+      args,
+      journal: [],
     };
 
     this.runs.set(runId, managed);
@@ -115,19 +123,35 @@ export class WorkflowManager extends EventEmitter {
       },
       controller,
       startedAt: new Date(),
+      script,
+      args,
+      journal: [],
     };
 
     this.runs.set(runId, managed);
     return this.executeRun(managed, script, args);
   }
 
-  private async executeRun(managed: ManagedRun, script: string, args?: unknown): Promise<WorkflowRunResult> {
+  private async executeRun(
+    managed: ManagedRun,
+    script: string,
+    args?: unknown,
+    resumeJournal?: Map<number, JournalEntry>,
+  ): Promise<WorkflowRunResult> {
     try {
       const result = await runWorkflow(script, {
         cwd: this.cwd,
         args,
         signal: managed.controller.signal,
         concurrency: this.concurrency,
+        resumeJournal,
+        resumeFromRunId: resumeJournal ? managed.runId : undefined,
+        onAgentJournal: (entry) => {
+          // Append (crash-safe-ish): keep the latest entry per index, then persist.
+          managed.journal = managed.journal.filter((e) => e.index !== entry.index);
+          managed.journal.push(entry);
+          this.persistRun(managed);
+        },
         onLog: (message) => {
           managed.snapshot.logs.push(message);
           this.emit("log", { runId: managed.runId, message });
@@ -197,7 +221,11 @@ export class WorkflowManager extends EventEmitter {
     this.persistence.save({
       runId: managed.runId,
       workflowName: managed.snapshot.name,
-      script: "", // Don't persist script for security
+      // Persist the real script + journal so the run can be resumed. Runs live
+      // under .pi/workflows/runs/ — protect via directory permissions, not blanking.
+      script: managed.script,
+      args: managed.args,
+      journal: managed.journal,
       status: managed.status,
       phases: managed.snapshot.phases,
       currentPhase: managed.snapshot.currentPhase,
@@ -230,15 +258,42 @@ export class WorkflowManager extends EventEmitter {
   }
 
   /**
-   * Resume a paused workflow.
+   * Resume an interrupted run: replay journaled results for the unchanged prefix
+   * and run the rest live. Returns false if there is nothing resumable.
    */
   async resume(runId: string): Promise<boolean> {
+    const active = this.runs.get(runId);
+    if (active?.status === "running") return false; // already running
+
     const persisted = this.persistence.load(runId);
-    if (persisted?.status !== "paused") return false;
+    if (!persisted?.script || persisted.status === "completed") return false;
+
+    const controller = new AbortController();
+    const managed: ManagedRun = {
+      runId,
+      status: "running",
+      snapshot: {
+        name: persisted.workflowName,
+        phases: persisted.phases ?? [],
+        logs: persisted.logs ?? [],
+        agents: [],
+        agentCount: 0,
+        runningCount: 0,
+        doneCount: 0,
+        errorCount: 0,
+      },
+      controller,
+      startedAt: new Date(),
+      script: persisted.script,
+      args: persisted.args,
+      journal: persisted.journal ?? [],
+    };
+    this.runs.set(runId, managed);
 
-    // For now, resume creates a fresh run with completed agents' results cached
-    // Full resume would require re-executing the script with cached results
+    const resumeJournal = new Map((persisted.journal ?? []).map((e) => [e.index, e] as const));
     this.emit("resumed", { runId });
+    // Run in the background; executeRun records status/errors on the managed run.
+    void this.executeRun(managed, persisted.script, persisted.args, resumeJournal).catch(() => {});
     return true;
   }
 

package/src/workflow.ts

@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 import vm from "node:vm";
 import type { Node } from "acorn";
 import { parse } from "acorn";
@@ -22,6 +23,14 @@ export interface WorkflowMeta {
   phases?: WorkflowMetaPhase[];
 }
 
+/** One cached agent() result, keyed by its deterministic call index. */
+export interface JournalEntry {
+  index: number;
+  /** sha256 of the call's identity (prompt + model + phase + agentType + schema). */
+  hash: string;
+  result: unknown;
+}
+
 export interface WorkflowRunOptions extends WorkflowAgentOptions {
   args?: unknown;
   agent?: Pick<WorkflowAgent, "run">;
@@ -36,6 +45,12 @@ export interface WorkflowRunOptions extends WorkflowAgentOptions {
   persistLogs?: boolean;
   /** Run ID for persistence. Auto-generated if not provided. */
   runId?: string;
+  /** Resume: cached agent results keyed by deterministic call index. */
+  resumeJournal?: Map<number, JournalEntry>;
+  /** Resume: the run being resumed (informational; enables resume mode). */
+  resumeFromRunId?: string;
+  /** Called after each live agent completes so the caller can persist the journal. */
+  onAgentJournal?: (entry: JournalEntry) => void;
   onLog?: (message: string) => void;
   onPhase?: (title: string) => void;
   onAgentStart?: (event: { label: string; phase?: string; prompt: string; model?: string }) => void;
@@ -75,6 +90,8 @@ interface RuntimeState {
   logs: string[];
   phases: string[];
   agentCount: number;
+  /** Monotonic, assigned at lexical agent() call time — the stable resume key. */
+  callSeq: number;
   spent: number;
   tokenUsage: {
     input: number;
@@ -112,6 +129,7 @@ export async function runWorkflow<T = unknown>(
     logs: [],
     phases: [],
     agentCount: 0,
+    callSeq: 0,
     spent: 0,
     tokenUsage: { input: 0, output: 0, total: 0, cost: 0 },
   };
@@ -170,6 +188,22 @@ export async function runWorkflow<T = unknown>(
     // Precedence: explicit agentOptions.model > phase model (meta.phases[].model).
     const modelSpec = agentOptions.model ?? resolveModelForPhase(assignedPhase, routingConfig);
 
+    // Deterministic resume key: assigned at lexical call time, before the limiter,
+    // so parallel()/pipeline() fan-out is reproducible for a fixed script.
+    const callIndex = state.callSeq++;
+    const callHash = hashAgentCall(prompt, modelSpec, assignedPhase, agentOptions);
+
+    // Resume: replay a cached result for an unchanged call (matching hash), without
+    // consuming a concurrency slot, tokens, or a real subagent run.
+    const cached = options.resumeJournal?.get(callIndex);
+    if (cached && cached.hash === callHash) {
+      state.agentCount++;
+      const label = requestedLabel || defaultAgentLabel(assignedPhase, state.agentCount);
+      options.onAgentStart?.({ label, phase: assignedPhase, prompt, model: modelSpec });
+      options.onAgentEnd?.({ label, phase: assignedPhase, result: cached.result, tokens: 0 });
+      return cached.result;
+    }
+
     return limiter(async () => {
       state.agentCount++;
       const label = requestedLabel || defaultAgentLabel(assignedPhase, state.agentCount);
@@ -214,6 +248,7 @@ export async function runWorkflow<T = unknown>(
         throwIfAborted();
 
         const tokens = recordTokens(result);
+        options.onAgentJournal?.({ index: callIndex, hash: callHash, result });
         options.onAgentEnd?.({ label, phase: assignedPhase, result, tokens });
         return result;
       } catch (error) {
@@ -481,6 +516,23 @@ function defaultAgentLabel(phase: string | undefined, index: number): string {
   return phase ? `${phase} agent ${index}` : `agent ${index}`;
 }
 
+/** Stable identity hash for an agent() call — a cache miss on resume when anything changes. */
+function hashAgentCall(
+  prompt: string,
+  model: string | undefined,
+  phase: string | undefined,
+  options: AgentOptions,
+): string {
+  const identity = JSON.stringify({
+    prompt,
+    model: model ?? null,
+    phase: phase ?? null,
+    agentType: options.agentType ?? null,
+    schema: options.schema ?? null,
+  });
+  return createHash("sha256").update(identity).digest("hex");
+}
+
 function buildAgentInstructions(phase: string | undefined, options: AgentOptions): string | undefined {
   const lines = [];
   if (phase) lines.push(`Workflow phase: ${phase}`);