@oomol-lab/open-flow 0.1.0-beta.23 → 0.1.0-beta.26

package/dist/common/control-api-conformance.js

@@ -4613,12 +4613,7 @@ var z = E(), B = Ws(), nc = A(z), rc = j({
 	defaultOutput: z.optional()
 }, _c = {
 	actions: M([hs([F("continue")]), hs([F("approve"), F("reject")])]),
-	prompt: z,
-	notification: j({
-		inputs: lc,
-		messageHandle: z,
-		taskId: z
-	}).optional()
+	prompt: z
 }, vc = {
 	inputsDef: A(V),
 	options: j({
@@ -4711,7 +4706,7 @@ var z = E(), B = Ws(), nc = A(z), rc = j({
 		taskId: z,
 		additionalInputs: A(V).optional()
 	}),
-	j({
+	cs({
 		...Cc,
 		kind: F("wait"),
 		input: V,
@@ -5042,7 +5037,12 @@ function zc(e) {
 				progress: Bc(i.progress)
 			}
 		};
-		case "run.waiting": return {
+		case "run.waiting": return Array.isArray(i.waitIds) ? {
+			...r,
+			kind: a,
+			payload: { waitIds: i.waitIds.map((e) => R(e)) }
+		} : L();
+		case "wait.created": return {
 			...r,
 			kind: a,
 			payload: {
@@ -5173,7 +5173,7 @@ function Bc(e) {
 }
 //#endregion
 //#region src/control/common/conformance.ts
-var U = "open-flow-engine/v2";
+var U = "open-flow-engine/v4";
 function W(e) {
 	throw Error(e);
 }
@@ -5700,15 +5700,15 @@ var Yc = [
 				headers: { "idempotency-key": t },
 				method: "POST"
 			}), 202, n), a = await i("wait-run", "Create Wait Run"), o = J(a.runId, "Wait Run runId"), s = a;
-			for (let t = 0; s.status != "waiting" && t < 200; t += 1) await new Promise((e) => setTimeout(e, 10)), s = await Y(await Z(e, `/v1/runs/${o}`), 200, "Read Wait Run");
-			G(s.status, "waiting", "Wait Run status");
-			let c = K(s.waiting, "Active Wait");
+			for (let t = 0; q(s.waits, "Waits").length == 0 && t < 200; t += 1) await new Promise((e) => setTimeout(e, 10)), s = await Y(await Z(e, `/v1/runs/${o}`), 200, "Read Wait Run");
+			G(s.status, "running", "Wait Run status");
+			let c = K(q(s.waits, "Waits")[0], "Active Wait");
 			G(c.actions, ["approve", "reject"], "Wait actions"), G(c.nodeId, "approval", "Wait node"), G(c.prompt, "Approve request 1?", "Wait prompt"), J(c.expiresAt, "Wait expiry"), J(c.waitingSince, "Wait start");
 			let l = J(c.waitId, "Wait id");
-			G(q((await Y(await Z(e, `/v1/flows/${n}/runs?status=waiting`), 200, "List waiting Runs")).runs, "Waiting Runs").map((e) => K(e, "Waiting Run").runId), [o], "Waiting Run list");
+			G(q((await Y(await Z(e, `/v1/flows/${n}/runs?pendingWait=true`), 200, "List waiting Runs")).runs, "Waiting Runs").map((e) => K(e, "Waiting Run").runId), [o], "Waiting Run list");
 			let u = await Y(await Z(e, `/v1/runs/${o}/events`), 200, "Read waiting Run events");
 			for (let e of q(u.events, "Run events")) zc(e);
-			G(u.done, !1, "Waiting events done"), q(u.events, "Waiting events").some((e) => K(e, "Waiting event").kind == "run.waiting") || W("Waiting Run must contain run.waiting."), await X(await Z(e, `/v1/runs/${o}/result`), 409, "run.not-terminal", "Read waiting Run result");
+			G(u.done, !1, "Waiting events done"), q(u.events, "Waiting events").some((e) => K(e, "Waiting event").kind == "wait.created") || W("Waiting Run must contain wait.created."), await X(await Z(e, `/v1/runs/${o}/result`), 409, "run.not-terminal", "Read waiting Run result");
 			let d = `/v1/runs/${o}/waits/${l}/resolve`, f = (t) => Z(e, d, {
 				body: JSON.stringify({
 					action: t,
@@ -5718,19 +5718,19 @@ var Yc = [
 			});
 			await X(await f("continue"), 400, "run.invalid", "Reject unsupported Wait action");
 			let p = await Y(await f("approve"), 200, "Approve Wait");
-			G(p.action, "approve", "Approved action"), G(p.resolutionAccepted, !0, "Approved resolution"), G(p.status, "queued", "Resolved Run status"), J(p.resolvedAt, "Wait resolution time");
+			G(p.action, "approve", "Approved action"), G(p.resolutionAccepted, !0, "Approved resolution"), G(p.status, "running", "Resolved Run status"), J(p.resolvedAt, "Wait resolution time");
 			let m = await Y(await f("reject"), 200, "Reject resolved Wait");
 			G(m.action, "approve", "Winning action"), G(m.resolutionAccepted, !1, "Competing resolution");
 			for (let t = 0; s.status != "completed" && t < 200; t += 1) await new Promise((e) => setTimeout(e, 10)), s = await Y(await Z(e, `/v1/runs/${o}`), 200, "Read resumed Run");
-			G(s.status, "completed", "Resumed Run status"), G(s.waiting, void 0, "Completed Wait projection");
+			G(s.status, "completed", "Resumed Run status"), G(s.waits, [], "Completed Wait projection");
 			let ee = await Y(await f("approve"), 200, "Replay approved Wait");
 			G(ee.resolutionAccepted, !0, "Replayed resolution"), G(ee.status, "completed", "Replayed terminal status");
 			let te = await Y(await Z(e, `/v1/runs/${o}/events`), 200, "Read resumed Run events");
 			for (let e of q(te.events, "Run events")) zc(e);
 			G(q(te.events, "Completed events").filter((e) => K(e, "Completed event").kind == "run.resolved").length, 1, "Resolved event count");
 			let ne = await i("wait-run-cancel", "Create cancelable Wait Run"), re = J(ne.runId, "Cancelable Wait Run id"), ie = ne;
-			for (let t = 0; ie.status != "waiting" && t < 200; t += 1) await new Promise((e) => setTimeout(e, 10)), ie = await Y(await Z(e, `/v1/runs/${re}`), 200, "Read cancelable Wait Run");
-			G(ie.status, "waiting", "Cancelable Wait status"), G((await Y(await Z(e, `/v1/runs/${re}/cancel`, {
+			for (let t = 0; q(ie.waits, "Waits").length == 0 && t < 200; t += 1) await new Promise((e) => setTimeout(e, 10)), ie = await Y(await Z(e, `/v1/runs/${re}`), 200, "Read cancelable Wait Run");
+			G(ie.status, "running", "Cancelable Wait status"), G((await Y(await Z(e, `/v1/runs/${re}/cancel`, {
 				body: JSON.stringify({ version: 1 }),
 				method: "POST"
 			}), 200, "Cancel waiting Run")).status, "canceled", "Canceled waiting Run status");

package/dist/common/control-api.d.ts

@@ -1,3 +1,4 @@
+import type { SchemaMismatch } from '../browser/flow-change.js';
 import type { CreateEventSource, UpdateEventSource, EventSource } from './event-sources.js';
 export { decodeEventSource, decodeEventSources, type CreateEventSource, type UpdateEventSource, type EventSource } from './event-sources.js';
 import type { TriggerCatalogCache } from './trigger-catalog.js';
@@ -205,6 +206,7 @@ export interface Diagnostic {
     readonly column: number;
     readonly line: number;
     readonly message: string;
+    readonly mismatch?: SchemaMismatch;
     readonly path: string;
     readonly values?: Readonly<Record<string, string | number>>;
 }
@@ -244,27 +246,23 @@ export interface Run {
     readonly status: RunStatus;
     readonly version: 1;
 }
-type RunDetailsBase = Omit<Run, 'status'> & {
+export interface RunWait {
+    readonly actions: readonly ['continue'] | readonly ['approve', 'reject'];
+    readonly expiresAt: string;
+    readonly nodeId: string;
+    readonly prompt: string;
+    readonly waitId: string;
+    readonly waitingSince: string;
+}
+type RunDetailsBase = Run & {
     readonly closureDigest: string;
     readonly engineContract: string;
     readonly engineDigest: string;
     readonly eventsExpiresAt?: string;
     readonly modelVersion: number;
     readonly revisionDigest: string;
-} & ({
-    readonly status: Exclude<RunStatus, 'waiting'>;
-    readonly waiting?: never;
-} | {
-    readonly status: 'waiting';
-    readonly waiting: {
-        readonly actions: readonly ['continue'] | readonly ['approve', 'reject'];
-        readonly expiresAt: string;
-        readonly nodeId: string;
-        readonly prompt: string;
-        readonly waitId: string;
-        readonly waitingSince: string;
-    };
-});
+    readonly waits: readonly RunWait[];
+};
 export type DraftRun = RunDetailsBase & {
     readonly source: 'draft';
 };
@@ -342,6 +340,7 @@ export declare function decodeRunEvent(value: unknown): {
         readonly flowId?: undefined;
         readonly scopeId?: undefined;
         readonly progress?: undefined;
+        readonly waitIds?: undefined;
         readonly expiresAt?: undefined;
         readonly nodeId?: undefined;
         readonly waitingSince?: undefined;
@@ -359,6 +358,7 @@ export declare function decodeRunEvent(value: unknown): {
         readonly scopeId: string;
         readonly parentScopeId?: string | undefined;
         readonly progress?: undefined;
+        readonly waitIds?: undefined;
         readonly expiresAt?: undefined;
         readonly nodeId?: undefined;
         readonly waitingSince?: undefined;
@@ -375,6 +375,7 @@ export declare function decodeRunEvent(value: unknown): {
         readonly flowId: string;
         readonly scopeId: string;
         readonly progress: number;
+        readonly waitIds?: undefined;
         readonly expiresAt?: undefined;
         readonly nodeId?: undefined;
         readonly waitingSince?: undefined;
@@ -391,6 +392,24 @@ export declare function decodeRunEvent(value: unknown): {
         readonly flowId?: undefined;
         readonly scopeId?: undefined;
         readonly progress?: undefined;
+        readonly waitIds: string[];
+        readonly expiresAt?: undefined;
+        readonly nodeId?: undefined;
+        readonly waitingSince?: undefined;
+        readonly action?: undefined;
+        readonly resolvedAt?: undefined;
+        readonly waitId?: undefined;
+        readonly result?: undefined;
+    };
+} | {
+    readonly createdAt: string;
+    readonly sequence: number;
+    readonly kind: "wait.created";
+    readonly payload: {
+        readonly flowId?: undefined;
+        readonly scopeId?: undefined;
+        readonly progress?: undefined;
+        readonly waitIds?: undefined;
         readonly expiresAt: string;
         readonly nodeId: string;
         readonly waitId: string;
@@ -407,6 +426,7 @@ export declare function decodeRunEvent(value: unknown): {
         readonly flowId?: undefined;
         readonly scopeId?: undefined;
         readonly progress?: undefined;
+        readonly waitIds?: undefined;
         readonly expiresAt?: undefined;
         readonly nodeId?: undefined;
         readonly waitingSince?: undefined;
@@ -423,6 +443,7 @@ export declare function decodeRunEvent(value: unknown): {
         readonly flowId?: undefined;
         readonly scopeId?: undefined;
         readonly progress?: undefined;
+        readonly waitIds?: undefined;
         readonly expiresAt?: undefined;
         readonly nodeId?: undefined;
         readonly waitingSince?: undefined;
@@ -444,6 +465,7 @@ export declare function decodeRunEvent(value: unknown): {
     readonly kind: "node.started";
     readonly payload: {
         readonly progress?: undefined;
+        readonly waitIds?: undefined;
         readonly expiresAt?: undefined;
         readonly waitingSince?: undefined;
         readonly action?: undefined;
@@ -464,6 +486,7 @@ export declare function decodeRunEvent(value: unknown): {
     readonly kind: "node.completed";
     readonly payload: {
         readonly progress?: undefined;
+        readonly waitIds?: undefined;
         readonly expiresAt?: undefined;
         readonly waitingSince?: undefined;
         readonly action?: undefined;
@@ -484,6 +507,7 @@ export declare function decodeRunEvent(value: unknown): {
     readonly kind: "node.failed";
     readonly payload: {
         readonly progress?: undefined;
+        readonly waitIds?: undefined;
         readonly expiresAt?: undefined;
         readonly waitingSince?: undefined;
         readonly action?: undefined;
@@ -505,6 +529,7 @@ export declare function decodeRunEvent(value: unknown): {
     readonly kind: "node.log";
     readonly payload: {
         readonly progress?: undefined;
+        readonly waitIds?: undefined;
         readonly expiresAt?: undefined;
         readonly waitingSince?: undefined;
         readonly action?: undefined;
@@ -523,6 +548,7 @@ export declare function decodeRunEvent(value: unknown): {
     readonly sequence: number;
     readonly kind: "node.progress";
     readonly payload: {
+        readonly waitIds?: undefined;
         readonly expiresAt?: undefined;
         readonly waitingSince?: undefined;
         readonly action?: undefined;
@@ -541,6 +567,7 @@ export declare function decodeRunEvent(value: unknown): {
     readonly kind: "node.artifact";
     readonly payload: {
         readonly progress?: undefined;
+        readonly waitIds?: undefined;
         readonly expiresAt?: undefined;
         readonly waitingSince?: undefined;
         readonly action?: undefined;
@@ -652,6 +679,7 @@ export declare class ControlClient {
         readonly cursor?: string;
         readonly limit?: number;
         readonly status?: RunStatus;
+        readonly pendingWait?: boolean;
     }): Promise<RunPage>;
     getRunEvents(runId: string, options?: {
         readonly after?: number;