@osolmaz/pi-workflows 0.12.0 → 0.12.1

package/dist/extension/index.js

@@ -6,7 +6,7 @@ import { projectControllerStorePath, SqliteControllerStore, } from "../controlle
 import { compositionMetadata } from "../workflows/composition.js";
 import { humanDecisionChannelRequest } from "../workflows/decision-presentation.js";
 import { WorkflowEngine } from "../workflows/engine.js";
-import { ClaimLostError, errorMessage, isClaimLostError, TimeoutError, } from "../workflows/errors.js";
+import { BuiltinWorkflowRevisionChangedError, ClaimLostError, errorMessage, isClaimLostError, TimeoutError, } from "../workflows/errors.js";
 import { HumanDecisionStore, createHumanDecisionAttemptId, validateHumanDecisionResponse, } from "../workflows/human-decision.js";
 import { discoverWorkflows, resolveWorkflowRef } from "../workflows/loader.js";
 import { migrateLegacyWorkflowSources } from "../workflows/migrate-sources.js";
@@ -55,10 +55,8 @@ function humanDecisionRequest(value) {
     const schema = value !== null && typeof value === "object"
         ? value.schema
         : undefined;
-    if (schema !== "pi-workflows.human-decision-request.v1" &&
-        schema !== "pi-workflows.human-decision-request.v2") {
+    if (schema !== "pi-workflows.human-decision-request.v1")
         return null;
-    }
     return value;
 }
 function definitionDigest(snapshot) {
@@ -70,6 +68,20 @@ function launchSourceIdentity(workflow, root) {
         mounted: compositionMetadata(workflow)?.sources ?? [],
     };
 }
+function continuationSourceChangedError(runId, previous, current) {
+    if (previous.kind === "builtin" &&
+        current.kind === "builtin" &&
+        previous.id === current.id &&
+        previous.revision !== current.revision) {
+        return new BuiltinWorkflowRevisionChangedError({
+            runId,
+            workflowId: current.id,
+            previousRevision: previous.revision,
+            currentRevision: current.revision,
+        });
+    }
+    return new Error(`Workflow source changed since run ${runId} started; revert the edit to answer its checkpoint`);
+}
 function preparedLaunchOptions(options) {
     return {
         ...(options.presentation !== undefined ? { presentation: options.presentation } : {}),
@@ -888,7 +900,7 @@ export default function piWorkflows(pi) {
             }
             if (parent.state.workflowSource !== undefined &&
                 !isDeepStrictEqual(parent.state.workflowSource, workflowSource)) {
-                throw new Error(`Workflow source changed since run ${options.parentRunId} started; revert the edit to answer its checkpoint`);
+                throw continuationSourceChangedError(options.parentRunId, parent.state.workflowSource, workflowSource);
             }
         }
         // Interactive runs are queued and claimed atomically, so this session
@@ -1633,7 +1645,7 @@ export default function piWorkflows(pi) {
             };
             const store = new HumanDecisionStore(new WorkflowRunStore().outputRoot);
             const acceptance = await store.accept(request, submission);
-            if (acceptance.status === "conflict") {
+            if (acceptance.status === "conflict" || acceptance.decision.provenance !== "human") {
                 throw new Error("That human decision was already answered differently.");
             }
             accepted = acceptance.decision;
@@ -1663,6 +1675,7 @@ export default function piWorkflows(pi) {
                 schema: "pi-workflows.human-decision-continuation.v1",
                 decisionId: request.decisionId,
                 requestDigest: request.requestDigest,
+                provenance: accepted.provenance,
                 parentRunId: waiting.parentRunId,
                 runId: continuationRunId,
                 createdAt: accepted.acceptedAt,
@@ -1775,60 +1788,76 @@ export default function piWorkflows(pi) {
             const ownedBySession = queueRecord !== undefined &&
                 (queueRecord.originSessionId === null ||
                     queueRecord.originSessionId === ctx.sessionManager.getSessionId());
-            const accepted = await store.readAccepted(request.decisionId);
-            if (accepted === null) {
+            let resolved = await store.readResolved(request.decisionId);
+            if (resolved === null) {
                 let cancellation = await store.readCancellation(request.decisionId);
-                if (cancellation === null &&
-                    request.expiresAt !== undefined &&
-                    Date.parse(request.expiresAt) <= Date.now()) {
-                    await store.cancel(request, "expired");
-                    cancellation = await store.readCancellation(request.decisionId);
+                const expired = request.expiresAt !== undefined && Date.parse(request.expiresAt) <= Date.now();
+                if (cancellation === null && expired) {
+                    if (request.defaultResponse === undefined) {
+                        await store.cancel(request, "expired");
+                        cancellation = await store.readCancellation(request.decisionId);
+                    }
+                    else {
+                        try {
+                            resolved = (await store.resolveTimeout(request)).decision;
+                        }
+                        catch {
+                            cancellation = await store.readCancellation(request.decisionId);
+                            resolved = await store.readResolved(request.decisionId);
+                        }
+                    }
                 }
                 if (cancellation !== null) {
                     await settleHumanDecisionChannels(cancellation);
                     continue;
                 }
-                if (!deliverPending || !ownedBySession)
+                if (resolved === null) {
+                    if (!deliverPending || !ownedBySession)
+                        continue;
+                    const channels = audienceChannels(decisionChannelConfig, request.audience);
+                    for (const channelId of channels) {
+                        const channel = telegramDecisionChannels.get(channelId);
+                        if (channel !== undefined)
+                            await channel.deliver(humanDecisionChannelRequest(request));
+                    }
+                    if (ctx.mode === "tui" && channels.includes("pi") && lastWaitingRunId === null) {
+                        lastWaitingRunId = request.runId;
+                        queueMicrotask(() => void promptHumanDecision(ctx, request));
+                    }
                     continue;
-                const channels = audienceChannels(decisionChannelConfig, request.audience);
-                for (const channelId of channels) {
-                    const channel = telegramDecisionChannels.get(channelId);
-                    if (channel !== undefined)
-                        await channel.deliver(humanDecisionChannelRequest(request));
-                }
-                if (ctx.mode === "tui" && channels.includes("pi") && lastWaitingRunId === null) {
-                    lastWaitingRunId = request.runId;
-                    queueMicrotask(() => void promptHumanDecision(ctx, request));
                 }
-                continue;
             }
             if (!ownedBySession)
                 continue;
+            const currentParent = await readRunBundle(runStore.runDirFor(request.runId));
+            if (currentParent === null || currentParent.state.status !== "waiting")
+                continue;
             const runId = `continuation-${request.decisionId.slice("decision-".length)}`;
             const continuation = (await store.readContinuation(request.decisionId)) ?? {
                 schema: "pi-workflows.human-decision-continuation.v1",
                 decisionId: request.decisionId,
                 requestDigest: request.requestDigest,
+                provenance: resolved.provenance,
                 parentRunId: request.runId,
                 runId,
-                createdAt: accepted.acceptedAt,
+                createdAt: resolved.acceptedAt,
             };
             await store.recordContinuation(request.decisionId, continuation);
             const existing = await readRunBundle(runStore.runDirFor(continuation.runId));
             if (existing === null && activeRun === null) {
-                if (parent.state.workflowSource === undefined)
+                if (currentParent.state.workflowSource === undefined)
                     continue;
-                const workflowRef = parent.state.workflowSource.kind === "builtin"
-                    ? `builtin:${parent.state.workflowSource.id}`
-                    : parent.state.workflowSource.path;
-                await startRun(ctx, workflowRef, parent.state.input, {
+                const workflowRef = currentParent.state.workflowSource.kind === "builtin"
+                    ? `builtin:${currentParent.state.workflowSource.id}`
+                    : currentParent.state.workflowSource.path;
+                await startRun(ctx, workflowRef, currentParent.state.input, {
                     parentRunId: request.runId,
-                    humanDecision: accepted,
+                    humanDecision: resolved,
                     runId: continuation.runId,
                     quiet: true,
                 });
             }
-            await settleHumanDecisionChannels(accepted);
+            await settleHumanDecisionChannels(resolved);
             if (activeRun !== null)
                 break;
         }
@@ -1890,7 +1919,7 @@ export default function piWorkflows(pi) {
             }
             if (parent.state.workflowSource !== undefined &&
                 !isDeepStrictEqual(parent.state.workflowSource, workflowSource)) {
-                throw new Error(`Workflow source changed since run ${options.parentRunId} started; revert the edit to answer its checkpoint`);
+                throw continuationSourceChangedError(options.parentRunId, parent.state.workflowSource, workflowSource);
             }
         }
         const snapshot = createDefinitionSnapshot(workflow);