@osolmaz/pi-workflows 0.13.2 → 0.13.3

package/dist/builtins/plan-change.workflow.d.ts

@@ -59,7 +59,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                 readonly from: "finish";
                 readonly validate: (value: unknown) => import("./plain-summary.workflow.js").PlainSummaryResult;
             };
-        }, import("../workflows/types.js").WorkflowIncludeMap> & {
+        }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
             nodes: {
                 readonly summarize: import("../workflows/types.js").AssistantAgentNodeDefinition;
                 readonly finish: import("../workflows/types.js").ComputeNodeDefinition;
@@ -77,7 +77,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                 readonly from: "finish";
                 readonly validate: (value: unknown) => import("./plain-summary.workflow.js").PlainSummaryResult;
             };
-        }, import("../workflows/types.js").WorkflowIncludeMap> & {
+        }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
             nodes: {
                 readonly summarize: import("../workflows/types.js").AssistantAgentNodeDefinition;
                 readonly finish: import("../workflows/types.js").ComputeNodeDefinition;
@@ -90,7 +90,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                 };
             };
         }>;
-    }> & {
+    }, unknown> & {
         nodes: {
             readonly captureIntent: import("../workflows/types.js").SubmittedAgentNodeDefinition;
             readonly frame: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -107,7 +107,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                     readonly from: "finish";
                     readonly validate: (value: unknown) => import("./plain-summary.workflow.js").PlainSummaryResult;
                 };
-            }, import("../workflows/types.js").WorkflowIncludeMap> & {
+            }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                 nodes: {
                     readonly summarize: import("../workflows/types.js").AssistantAgentNodeDefinition;
                     readonly finish: import("../workflows/types.js").ComputeNodeDefinition;
@@ -125,7 +125,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                     readonly from: "finish";
                     readonly validate: (value: unknown) => import("./plain-summary.workflow.js").PlainSummaryResult;
                 };
-            }, import("../workflows/types.js").WorkflowIncludeMap> & {
+            }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                 nodes: {
                     readonly summarize: import("../workflows/types.js").AssistantAgentNodeDefinition;
                     readonly finish: import("../workflows/types.js").ComputeNodeDefinition;
@@ -180,7 +180,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                     evidence: string[];
                 };
             };
-        }, import("../workflows/types.js").WorkflowIncludeMap> & {
+        }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
             nodes: {
                 readonly inspect: import("../workflows/types.js").FunctionActionNodeDefinition;
                 readonly propose: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -220,7 +220,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                 readonly from: "blocked";
                 readonly validate: (value: unknown) => import("./change-verification.workflow.js").ChangeVerificationResult;
             };
-        }, import("../workflows/types.js").WorkflowIncludeMap> & {
+        }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
             nodes: {
                 readonly selectChecks: import("../workflows/types.js").ComputeNodeDefinition;
                 readonly planChecks: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -246,7 +246,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                 };
             };
         }>;
-    }> & {
+    }, unknown> & {
         nodes: {
             readonly prepare: import("../workflows/types.js").ComputeNodeDefinition;
             readonly locatePlan: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -277,7 +277,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                         evidence: string[];
                     };
                 };
-            }, import("../workflows/types.js").WorkflowIncludeMap> & {
+            }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                 nodes: {
                     readonly inspect: import("../workflows/types.js").FunctionActionNodeDefinition;
                     readonly propose: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -317,7 +317,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                     readonly from: "blocked";
                     readonly validate: (value: unknown) => import("./change-verification.workflow.js").ChangeVerificationResult;
                 };
-            }, import("../workflows/types.js").WorkflowIncludeMap> & {
+            }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                 nodes: {
                     readonly selectChecks: import("../workflows/types.js").ComputeNodeDefinition;
                     readonly planChecks: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -368,7 +368,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
             readonly from: "replan";
             readonly validate: (value: unknown) => import("./plan-approval.workflow.js").PlanApprovalReplan;
         };
-    }, import("../workflows/types.js").WorkflowIncludeMap> & {
+    }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
         nodes: {
             readonly routePolicy: import("../workflows/types.js").ComputeNodeDefinition;
             readonly approve: import("../workflows/types.js").WorkflowNodeCommon & {
@@ -412,7 +412,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
             };
         };
     }>;
-}> & {
+}, unknown> & {
     nodes: {
         readonly start: import("../workflows/types.js").ComputeNodeDefinition;
         readonly assessPlan: import("../workflows/types.js").ComputeNodeDefinition;
@@ -436,7 +436,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                     readonly from: "finish";
                     readonly validate: (value: unknown) => import("./plain-summary.workflow.js").PlainSummaryResult;
                 };
-            }, import("../workflows/types.js").WorkflowIncludeMap> & {
+            }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                 nodes: {
                     readonly summarize: import("../workflows/types.js").AssistantAgentNodeDefinition;
                     readonly finish: import("../workflows/types.js").ComputeNodeDefinition;
@@ -454,7 +454,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                     readonly from: "finish";
                     readonly validate: (value: unknown) => import("./plain-summary.workflow.js").PlainSummaryResult;
                 };
-            }, import("../workflows/types.js").WorkflowIncludeMap> & {
+            }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                 nodes: {
                     readonly summarize: import("../workflows/types.js").AssistantAgentNodeDefinition;
                     readonly finish: import("../workflows/types.js").ComputeNodeDefinition;
@@ -467,7 +467,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                     };
                 };
             }>;
-        }> & {
+        }, unknown> & {
             nodes: {
                 readonly captureIntent: import("../workflows/types.js").SubmittedAgentNodeDefinition;
                 readonly frame: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -484,7 +484,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                         readonly from: "finish";
                         readonly validate: (value: unknown) => import("./plain-summary.workflow.js").PlainSummaryResult;
                     };
-                }, import("../workflows/types.js").WorkflowIncludeMap> & {
+                }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                     nodes: {
                         readonly summarize: import("../workflows/types.js").AssistantAgentNodeDefinition;
                         readonly finish: import("../workflows/types.js").ComputeNodeDefinition;
@@ -502,7 +502,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                         readonly from: "finish";
                         readonly validate: (value: unknown) => import("./plain-summary.workflow.js").PlainSummaryResult;
                     };
-                }, import("../workflows/types.js").WorkflowIncludeMap> & {
+                }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                     nodes: {
                         readonly summarize: import("../workflows/types.js").AssistantAgentNodeDefinition;
                         readonly finish: import("../workflows/types.js").ComputeNodeDefinition;
@@ -557,7 +557,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                         evidence: string[];
                     };
                 };
-            }, import("../workflows/types.js").WorkflowIncludeMap> & {
+            }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                 nodes: {
                     readonly inspect: import("../workflows/types.js").FunctionActionNodeDefinition;
                     readonly propose: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -597,7 +597,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                     readonly from: "blocked";
                     readonly validate: (value: unknown) => import("./change-verification.workflow.js").ChangeVerificationResult;
                 };
-            }, import("../workflows/types.js").WorkflowIncludeMap> & {
+            }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                 nodes: {
                     readonly selectChecks: import("../workflows/types.js").ComputeNodeDefinition;
                     readonly planChecks: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -623,7 +623,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                     };
                 };
             }>;
-        }> & {
+        }, unknown> & {
             nodes: {
                 readonly prepare: import("../workflows/types.js").ComputeNodeDefinition;
                 readonly locatePlan: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -654,7 +654,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                             evidence: string[];
                         };
                     };
-                }, import("../workflows/types.js").WorkflowIncludeMap> & {
+                }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                     nodes: {
                         readonly inspect: import("../workflows/types.js").FunctionActionNodeDefinition;
                         readonly propose: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -694,7 +694,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                         readonly from: "blocked";
                         readonly validate: (value: unknown) => import("./change-verification.workflow.js").ChangeVerificationResult;
                     };
-                }, import("../workflows/types.js").WorkflowIncludeMap> & {
+                }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
                     nodes: {
                         readonly selectChecks: import("../workflows/types.js").ComputeNodeDefinition;
                         readonly planChecks: import("../workflows/types.js").SubmittedAgentNodeDefinition;
@@ -745,7 +745,7 @@ export declare const planChangeWorkflow: import("../workflows/types.js").Workflo
                 readonly from: "replan";
                 readonly validate: (value: unknown) => import("./plan-approval.workflow.js").PlanApprovalReplan;
             };
-        }, import("../workflows/types.js").WorkflowIncludeMap> & {
+        }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
             nodes: {
                 readonly routePolicy: import("../workflows/types.js").ComputeNodeDefinition;
                 readonly approve: import("../workflows/types.js").WorkflowNodeCommon & {

package/dist/builtins/sanity-check.workflow.d.ts

@@ -80,7 +80,7 @@ export declare const sanityCheckWorkflow: import("../workflows/types.js").Workfl
             readonly from: "finish";
             readonly validate: (value: unknown) => import("./plain-summary.workflow.js").PlainSummaryResult;
         };
-    }, import("../workflows/types.js").WorkflowIncludeMap> & {
+    }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
         nodes: {
             readonly summarize: import("../workflows/types.js").AssistantAgentNodeDefinition;
             readonly finish: import("../workflows/types.js").ComputeNodeDefinition;
@@ -93,7 +93,7 @@ export declare const sanityCheckWorkflow: import("../workflows/types.js").Workfl
             };
         };
     }>;
-}> & {
+}, unknown> & {
     nodes: {
         readonly prepare: import("../workflows/types.js").ComputeNodeDefinition;
         readonly collectEvidence: import("../workflows/types.js").FunctionActionNodeDefinition;
@@ -108,7 +108,7 @@ export declare const sanityCheckWorkflow: import("../workflows/types.js").Workfl
                 readonly from: "finish";
                 readonly validate: (value: unknown) => import("./plain-summary.workflow.js").PlainSummaryResult;
             };
-        }, import("../workflows/types.js").WorkflowIncludeMap> & {
+        }, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
             nodes: {
                 readonly summarize: import("../workflows/types.js").AssistantAgentNodeDefinition;
                 readonly finish: import("../workflows/types.js").ComputeNodeDefinition;

package/dist/builtins/workspace-preparation.workflow.d.ts

@@ -52,7 +52,7 @@ export declare const workspacePreparationWorkflow: import("../workflows/types.js
         readonly from: "blocked";
         readonly validate: (value: unknown) => WorkspaceInspection;
     };
-}, import("../workflows/types.js").WorkflowIncludeMap> & {
+}, import("../workflows/types.js").WorkflowIncludeMap, unknown> & {
     nodes: {
         readonly inspect: import("../workflows/types.js").FunctionActionNodeDefinition;
         readonly propose: import("../workflows/types.js").SubmittedAgentNodeDefinition;

package/dist/controllers/index.d.ts

@@ -9,5 +9,5 @@ export { SqliteControllerStore, type RunEventRecord, type WorkflowNotificationRe
 export { type ControllerStore, type EffectReservation, type QueueItem, type QueueRequeueOptions, type WorkflowRecordUpdate, type WorkflowReservation, } from "./store.js";
 export { controllerFileStem, controllerSearchDirs, discoverControllers, loadControllerFile, loadDiscoveredControllers, type DiscoveredController, } from "./loader.js";
 export { WorkflowEngineScheduler, type ResolvedChildWorkflow, type WorkflowEngineSchedulerOptions, } from "./workflow-engine-scheduler.js";
-export { ControllerWorkflowCoordinator, type ControllerWorkflowScheduler, type WorkflowSchedulerRequest, type WorkflowSchedulerResult, } from "./workflows.js";
-export type { AnyControllerDefinition, ChildWorkflowRecord, ChildWorkflowReference, ChildWorkflowRequest, ChildWorkflowState, ControllerCondition, ControllerConditionInput, ControllerConditionStatus, ControllerDefinition, ControllerEffects, ControllerEvent, ControllerQueueClaim, ControllerResource, ControllerResourceRef, ControllerResourceStatus, ControllerStatusPatch, ControllerWorkflows, EffectApplication, EffectDefinition, EffectObservation, EffectRecord, EffectState, JsonObject, JsonPrimitive, JsonValue, MaybePromise, ReconcileContext, ReconcileResult, } from "./types.js";
+export { ControllerWorkflowCoordinator, type ControllerWorkflowControlRequest, type ControllerWorkflowScheduler, type WorkflowSchedulerRequest, type WorkflowSchedulerResult, } from "./workflows.js";
+export type { AnyControllerDefinition, ChildWorkflowRecord, ChildWorkflowReference, ChildWorkflowRequest, ChildWorkflowState, ControllerCondition, ControllerConditionInput, ControllerConditionStatus, ControllerDefinition, ControllerEffects, ControllerFollowUpResult, ControllerQueueFollowUpRequest, ControllerRemoveFollowUpRequest, ControllerSettingsChangeRequest, ControllerSettingsChangeResult, ControllerEvent, ControllerQueueClaim, ControllerResource, ControllerResourceRef, ControllerResourceStatus, ControllerStatusPatch, ControllerWorkflows, EffectApplication, EffectDefinition, EffectObservation, EffectRecord, EffectState, JsonObject, JsonPrimitive, JsonValue, MaybePromise, ReconcileContext, ReconcileResult, } from "./types.js";

package/dist/controllers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,0BAA0B,EAC1B,qBAAqB,EACrB,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAiC,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EACL,qBAAqB,GAItB,MAAM,aAAa,CAAC;AACrB,OAAO,EAON,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,GAE1B,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,uBAAuB,GAGxB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,6BAA6B,GAI9B,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,0BAA0B,EAC1B,qBAAqB,EACrB,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAiC,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EACL,qBAAqB,GAItB,MAAM,aAAa,CAAC;AACrB,OAAO,EAON,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,GAE1B,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,uBAAuB,GAGxB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,6BAA6B,GAK9B,MAAM,gBAAgB,CAAC"}

package/dist/controllers/sqlite.js

@@ -534,8 +534,6 @@ export class SqliteControllerStore {
             const resourceId = resourceIdFor("run", options.runId);
             const definitionHash = this.state.putJson(options.definitionSnapshot, now);
             const queuedSource = queuedWorkflowSource(options.workflowSource);
-            const sourceHash = this.state.putJson(queuedSource.root, now);
-            const mountedSourcesHash = queuedSource.mounted.length === 0 ? null : this.state.putJson(queuedSource.mounted, now);
             const inputHash = this.state.putJson(options.input ?? null, now);
             const launchHash = this.state.putJson(options.launchOptions ?? {}, now);
             this.state.connection
@@ -551,15 +549,14 @@ export class SqliteControllerStore {
             this.state.connection
                 .prepare("INSERT INTO leases(resource_id, generation) VALUES (?, 0)")
                 .run(resourceId);
-            const source = sourceParts(options.workflowSourceRef, options.definitionDigest);
             this.state.connection
                 .prepare(`INSERT INTO runs(
              run_id, resource_id, project_id, parent_run_id, definition_digest,
-             workflow_ref, workflow_source_hash, launch_options_hash,
-             source_type, source_ref, source_revision, status, paused,
-             input_hash, workflow_sources_hash, created_at, updated_at
-           ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'queued', 0, ?, ?, ?, ?)`)
-                .run(options.runId, resourceId, this.requireProjectId(), options.parentRunId ?? null, definitionDigest, options.workflowSourceRef, sourceHash, launchHash, source.type, source.ref, source.revision, inputHash, mountedSourcesHash, now, now);
+             workflow_ref, launch_options_hash, status, paused,
+             input_hash, created_at, updated_at
+           ) VALUES (?, ?, ?, ?, ?, ?, ?, 'queued', 0, ?, ?, ?)`)
+                .run(options.runId, resourceId, this.requireProjectId(), options.parentRunId ?? null, definitionDigest, options.workflowSourceRef, launchHash, inputHash, now, now);
+            insertQueuedRunSources(this.state, options.runId, queuedSource);
             this.state.connection
                 .prepare(`INSERT INTO run_bindings(run_id, origin_session_id, execution_mode, created_at)
            VALUES (?, ?, 'interactive', ?)`)
@@ -1284,10 +1281,7 @@ export class SqliteControllerStore {
             runId: row.runId,
             workflowName: row.workflowName,
             workflowSourceRef: row.workflowRef,
-            workflowSource: {
-                root: this.state.readJson(row.workflowSourceHash),
-                mounted: row.workflowSourcesHash === null ? [] : this.state.readJson(row.workflowSourcesHash),
-            },
+            workflowSource: readQueuedRunSources(this.state, row),
             initialized: row.runStatus !== "queued",
             definitionDigest: `sha256:${row.definitionDigest.toString("hex")}`,
             input: this.state.readJson(row.inputHash),
@@ -1433,8 +1427,6 @@ export class SqliteControllerStore {
             this.state.connection
                 .prepare(`UPDATE runs
            SET status = ?, paused = 0, status_detail = NULL, error_hash = ?,
-               current_node = NULL, current_attempt_id = NULL,
-               current_node_started_at = NULL, waiting_on = NULL,
                updated_at = ?, finished_at = ?
            WHERE run_id = ?`)
                 .run(status, errorHash, now, now, runId);
@@ -1631,9 +1623,8 @@ function workflowSelect(clause) {
 function workflowRunSelect(clause) {
     return `SELECT r.run_id AS runId, r.resource_id AS resourceId,
     d.workflow_name AS workflowName, r.workflow_ref AS workflowRef, r.status AS runStatus,
-    r.workflow_source_hash AS workflowSourceHash,
-    r.workflow_sources_hash AS workflowSourcesHash,
-    r.definition_digest AS definitionDigest, r.input_hash AS inputHash,
+    r.definition_digest AS definitionDigest, d.definition_hash AS definitionHash,
+    r.input_hash AS inputHash,
     r.launch_options_hash AS launchOptionsHash,
     q.status, q.available_at AS availableAt, q.affinity_runner_id AS affinityRunnerId,
     q.consecutive_errors AS consecutiveErrors, q.error_code AS errorCode,
@@ -1681,6 +1672,9 @@ function isLeaseRow(value) {
 function isRunRow(value) {
     return isRecord(value);
 }
+function isRunSourceIdentityRow(value) {
+    return isRecord(value);
+}
 function isEffectRow(value) {
     return isRecord(value);
 }
@@ -1753,18 +1747,86 @@ function digestBuffer(value) {
     return Buffer.from(hex, "hex");
 }
 function queuedWorkflowSource(value) {
-    if (isRecord(value) && (value.kind === "builtin" || value.kind === "file")) {
+    if (isWorkflowSource(value)) {
         return { root: value, mounted: [] };
     }
-    if (isRecord(value) && isRecord(value.root) && Array.isArray(value.mounted)) {
+    if (isRecord(value) &&
+        isWorkflowSource(value.root) &&
+        Array.isArray(value.mounted) &&
+        value.mounted.every(isMountedWorkflowSource)) {
         return { root: value.root, mounted: value.mounted };
     }
     throw new Error("Stored workflow source identity is invalid");
 }
-function sourceParts(ref, revision) {
-    return ref.startsWith("builtin:")
-        ? { type: "builtin", ref: ref.slice(8), revision }
-        : { type: "file", ref, revision };
+function isWorkflowSource(value) {
+    return (isRecord(value) &&
+        ((value.kind === "builtin" &&
+            typeof value.id === "string" &&
+            typeof value.revision === "string") ||
+            (value.kind === "file" && typeof value.path === "string" && typeof value.hash === "string")));
+}
+function isMountedWorkflowSource(value) {
+    return (isRecord(value) &&
+        Array.isArray(value.mountPath) &&
+        value.mountPath.every((part) => typeof part === "string") &&
+        typeof value.workflowName === "string" &&
+        isWorkflowSource(value.source));
+}
+function insertQueuedRunSources(state, runId, value) {
+    const insert = state.connection.prepare(`INSERT INTO run_sources(run_id, mount_path, source_type, source_ref, source_revision)
+     VALUES (?, ?, ?, ?, ?)`);
+    const root = queuedSourceParts(value.root);
+    insert.run(runId, "", root.type, root.ref, root.revision);
+    for (const mounted of value.mounted) {
+        const source = queuedSourceParts(mounted.source);
+        insert.run(runId, mounted.mountPath.join("/"), source.type, source.ref, source.revision);
+    }
+}
+function queuedSourceParts(source) {
+    return source.kind === "builtin"
+        ? { type: "builtin", ref: source.id, revision: source.revision }
+        : { type: "file", ref: source.path, revision: source.hash };
+}
+function readQueuedRunSources(state, run) {
+    const rows = state.connection
+        .prepare(`SELECT mount_path AS mountPath, source_type AS sourceType,
+              source_ref AS sourceRef, source_revision AS sourceRevision
+       FROM run_sources WHERE run_id = ? ORDER BY mount_path`)
+        .all(run.runId)
+        .filter(isRunSourceIdentityRow);
+    const rootRow = rows.find((row) => row.mountPath === "");
+    if (rootRow === undefined)
+        throw new Error(`Workflow run source is missing: ${run.runId}`);
+    const snapshot = state.readJson(run.definitionHash);
+    const mounts = isRecord(snapshot) &&
+        isRecord(snapshot.composition) &&
+        Array.isArray(snapshot.composition.mounts)
+        ? snapshot.composition.mounts
+        : [];
+    const names = new Map(mounts.flatMap((mount) => {
+        if (!isRecord(mount) ||
+            !Array.isArray(mount.mountPath) ||
+            !mount.mountPath.every((part) => typeof part === "string") ||
+            typeof mount.workflowName !== "string") {
+            return [];
+        }
+        return [[mount.mountPath.join("/"), mount.workflowName]];
+    }));
+    return {
+        root: rowToSource(rootRow),
+        mounted: rows
+            .filter((row) => row.mountPath !== "")
+            .map((row) => ({
+            mountPath: row.mountPath.split("/"),
+            workflowName: names.get(row.mountPath) ?? row.mountPath,
+            source: rowToSource(row),
+        })),
+    };
+}
+function rowToSource(row) {
+    return row.sourceType === "builtin"
+        ? { kind: "builtin", id: row.sourceRef, revision: row.sourceRevision }
+        : { kind: "file", path: row.sourceRef, hash: row.sourceRevision };
 }
 function effectStatus(value) {
     return value === "indeterminate" ? "ambiguous" : value;