@oomol-lab/open-flow 0.1.0-beta.3 → 0.1.0-beta.5

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

@@ -5,6 +5,7 @@ export interface ControlApiConformanceHarness {
 }
 export interface ControlApiConformanceCase {
     readonly name: string;
+    readonly runtime?: true;
     verify(harness: ControlApiConformanceHarness): Promise<void>;
 }
 export declare const controlApiConformanceCases: readonly ControlApiConformanceCase[];

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

@@ -62,17 +62,18 @@ function d(e, t, n) {
 async function f(e, t, n) {
 	return c(await d(e, t, n), 201, "Create Flow");
 }
-function p(e, t, n, r) {
+function p(e, t, n, r, i = `change-${crypto.randomUUID()}`) {
 	return u(e, `/v1/flows/${encodeURIComponent(t)}/draft/changes`, {
 		body: JSON.stringify({
 			expectedRevisionId: n,
 			operations: r,
 			version: 1
 		}),
+		headers: { "idempotency-key": i },
 		method: "POST"
 	});
 }
-function m(e, t, n, r = "marker") {
+function m(e, t, n, r = "marker", i) {
 	return p(e, t, n, [{
 		kind: "graph.node.create",
 		node: {
@@ -88,7 +89,7 @@ function m(e, t, n, r = "marker") {
 		},
 		nodeId: r,
 		target: { kind: "flow" }
-	}]);
+	}], i);
 }
 function h(e, t) {
 	return s(a(e.revision, `${t} revision`).revisionId, `${t} revisionId`);
@@ -197,24 +198,25 @@ var b = [
 	{
 		name: "commits immutable Draft Revisions for one Flow",
 		async verify(e) {
-			let t = await f(e, "Draft flow", "draft-flow"), n = s(t.flowId, "Draft Flow flowId"), r = s(t.draftRevisionId, "Draft Flow revisionId"), o = await c(await m(e, n, r), 200, "Change Draft"), d = h(o, "Changed Draft");
-			i(a(o.revision, "Changed Draft revision").parentRevisionId, r, "Changed Draft parent"), await l(await p(e, n, d, [{
-				kind: "graph.node.replace",
-				node: {
-					concurrency: 1,
-					inputs: {},
-					kind: "value",
-					values: [{
-						handle: "ready",
-						jsonSchema: { type: "boolean" },
-						nullable: !1,
-						value: !0
-					}]
-				},
+			let t = await f(e, "Draft flow", "draft-flow"), n = s(t.flowId, "Draft Flow flowId"), r = s(t.draftRevisionId, "Draft Flow revisionId"), o = await c(await m(e, n, r, "marker", "draft-change"), 200, "Change Draft"), d = h(o, "Changed Draft");
+			i(a(o.revision, "Changed Draft revision").parentRevisionId, r, "Changed Draft parent"), i(await c(await m(e, n, r, "marker", "draft-change"), 200, "Replay Draft change"), o, "Replayed Draft change"), await l(await m(e, n, r, "another-marker", "draft-change"), 409, "flow.conflict", "Conflicting Draft change replay"), await l(await p(e, n, d, [{
+				before: [{
+					handle: "ready",
+					jsonSchema: { type: "boolean" },
+					nullable: !1,
+					value: !0
+				}],
+				kind: "graph.node.values.set",
 				nodeId: "marker",
-				target: { kind: "flow" }
+				target: { kind: "flow" },
+				value: [{
+					handle: "ready",
+					jsonSchema: { type: "boolean" },
+					nullable: !1,
+					value: !0
+				}]
 			}]), 400, "flow.invalid", "No-op Draft change"), await l(await m(e, n, r, "stale"), 412, "flow.revision-conflict", "Stale Draft change"), i(a(a(a(a((await c(await u(e, `/v1/flows/${n}/revisions/${r}`), 200, "Read old Revision")).content, "Old content").document, "Old document").graph, "Old graph").nodes, "Old nodes"), {}, "Old Revision nodes"), i((await c(await u(e, `/v1/flows/${n}/draft`), 200, "Read Draft")).revisionId, d, "Draft revisionId");
-			let g = await c(await u(e, `/v1/flows/${n}/draft/sync?fromRevisionId=${r}`), 200, "Sync Draft");
+			let g = await c(await u(e, `/v1/flows/${n}/draft/sync`), 200, "Sync Draft");
 			i(g.kind, "snapshot", "Draft sync kind"), i(a(g.draft, "Draft snapshot").revisionId, d, "Draft snapshot revisionId");
 		}
 	},
@@ -290,6 +292,65 @@ var b = [
 			}), 200, "Cancel second Draft Run")).status, "canceled", "Second canceled Run status");
 		}
 	},
+	{
+		name: "pauses, resolves, resumes, and cancels waiting Draft Runs",
+		runtime: !0,
+		async verify(e) {
+			let t = await f(e, "Wait flow", "wait-flow"), d = s(t.flowId, "Wait Flow flowId"), m = `/v1/flows/${d}/revisions/${h(await c(await p(e, d, s(t.draftRevisionId, "Wait Flow revisionId"), [{
+				kind: "graph.node.create",
+				node: {
+					actions: ["approve", "reject"],
+					concurrency: 1,
+					inputs: { value: {
+						kind: "value",
+						value: { request: 1 }
+					} },
+					kind: "wait",
+					prompt: "Approve request 1?"
+				},
+				nodeId: "approval",
+				target: { kind: "flow" }
+			}]), 200, "Create Wait"), "Wait Revision")}/runs`, g = async (t, r) => c(await u(e, m, {
+				body: JSON.stringify({
+					engineContract: n,
+					inputs: {},
+					version: 1
+				}),
+				headers: { "idempotency-key": t },
+				method: "POST"
+			}), 202, r), _ = await g("wait-run", "Create Wait Run"), v = s(_.runId, "Wait Run runId"), y = _;
+			for (let t = 0; y.status != "waiting" && t < 200; t += 1) await new Promise((e) => setTimeout(e, 10)), y = await c(await u(e, `/v1/runs/${v}`), 200, "Read Wait Run");
+			i(y.status, "waiting", "Wait Run status");
+			let b = a(y.waiting, "Active Wait");
+			i(b.actions, ["approve", "reject"], "Wait actions"), i(b.nodeId, "approval", "Wait node"), i(b.prompt, "Approve request 1?", "Wait prompt"), s(b.expiresAt, "Wait expiry"), s(b.waitingSince, "Wait start");
+			let x = s(b.waitId, "Wait id");
+			i(o((await c(await u(e, `/v1/flows/${d}/runs?status=waiting`), 200, "List waiting Runs")).runs, "Waiting Runs").map((e) => a(e, "Waiting Run").runId), [v], "Waiting Run list");
+			let S = await c(await u(e, `/v1/runs/${v}/events`), 200, "Read waiting Run events");
+			i(S.done, !1, "Waiting events done"), o(S.events, "Waiting events").some((e) => a(e, "Waiting event").kind == "run.waiting") || r("Waiting Run must contain run.waiting."), await l(await u(e, `/v1/runs/${v}/result`), 409, "run.not-terminal", "Read waiting Run result");
+			let C = `/v1/runs/${v}/waits/${x}/resolve`, w = (t) => u(e, C, {
+				body: JSON.stringify({
+					action: t,
+					version: 1
+				}),
+				method: "POST"
+			});
+			await l(await w("continue"), 400, "run.invalid", "Reject unsupported Wait action");
+			let T = await c(await w("approve"), 200, "Approve Wait");
+			i(T.action, "approve", "Approved action"), i(T.resolutionAccepted, !0, "Approved resolution"), i(T.status, "queued", "Resolved Run status"), s(T.resolvedAt, "Wait resolution time");
+			let E = await c(await w("reject"), 200, "Reject resolved Wait");
+			i(E.action, "approve", "Winning action"), i(E.resolutionAccepted, !1, "Competing resolution");
+			for (let t = 0; y.status != "completed" && t < 200; t += 1) await new Promise((e) => setTimeout(e, 10)), y = await c(await u(e, `/v1/runs/${v}`), 200, "Read resumed Run");
+			i(y.status, "completed", "Resumed Run status"), i(y.waiting, void 0, "Completed Wait projection");
+			let D = await c(await w("approve"), 200, "Replay approved Wait");
+			i(D.resolutionAccepted, !0, "Replayed resolution"), i(D.status, "completed", "Replayed terminal status"), i(o((await c(await u(e, `/v1/runs/${v}/events`), 200, "Read resumed Run events")).events, "Completed events").filter((e) => a(e, "Completed event").kind == "run.resolved").length, 1, "Resolved event count");
+			let O = await g("wait-run-cancel", "Create cancelable Wait Run"), k = s(O.runId, "Cancelable Wait Run id"), A = O;
+			for (let t = 0; A.status != "waiting" && t < 200; t += 1) await new Promise((e) => setTimeout(e, 10)), A = await c(await u(e, `/v1/runs/${k}`), 200, "Read cancelable Wait Run");
+			i(A.status, "waiting", "Cancelable Wait status"), i((await c(await u(e, `/v1/runs/${k}/cancel`, {
+				body: JSON.stringify({ version: 1 }),
+				method: "POST"
+			}), 200, "Cancel waiting Run")).status, "canceled", "Canceled waiting Run status");
+		}
+	},
 	{
 		name: "rejects invalid and missing Flow control targets",
 		async verify(e) {

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

@@ -27,6 +27,7 @@ export declare const controlErrorCode: {
     readonly runNotFound: 'run.not-found';
     readonly runNotTerminal: 'run.not-terminal';
     readonly runOverloaded: 'run.overloaded';
+    readonly runWaitNotFound: 'run.wait-not-found';
     readonly triggerKeyInvalid: 'trigger-key.invalid';
     readonly triggerKeyNotFound: 'trigger-key.not-found';
     readonly triggerNotFound: 'trigger.not-found';
@@ -120,6 +121,9 @@ export declare const controlErrorMetadata: {
     readonly "run.overloaded": {
         readonly status: 429;
     };
+    readonly "run.wait-not-found": {
+        readonly status: 404;
+    };
     readonly "trigger-key.invalid": {
         readonly status: 409;
     };

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

@@ -1,6 +1,6 @@
 import type { RunStatus } from './run-lifecycle.js';
-import type { ChangeOperation, InputPortDefinition, JsonValue, PortDefinition, RevisionContent, TriggerKeySnapshot } from '../browser/flow-change.js';
-export type { JsonValue, TriggerKeySnapshot } from '../browser/flow-change.js';
+import type { ChangeOperation, InputPortDefinition, JsonValue, PortDefinition, RevisionContent, TriggerKeySnapshot, WaitAction } from '../browser/flow-change.js';
+export type { JsonValue, TriggerKeySnapshot, WaitAction } from '../browser/flow-change.js';
 export type { RunStatus } from './run-lifecycle.js';
 export { controlErrorCode, controlErrorMetadata, type ControlErrorCode } from './control-api-errors.js';
 export type { FlowCatalogEvent, FlowChangeEvent } from './flow-notifications.js';
@@ -83,6 +83,7 @@ export interface ConnectorAction {
     readonly authenticated: boolean;
     readonly defaultConnection?: ConnectorConnection;
     readonly description: string;
+    readonly homepageUrl?: string;
     readonly icon?: string;
     readonly inputs: Readonly<Record<string, InputPortDefinition>>;
     readonly name: string;
@@ -91,6 +92,7 @@ export interface ConnectorAction {
     readonly serviceName: string;
 }
 export interface ConnectorProvider {
+    readonly homepageUrl?: string;
     readonly icon?: string;
     readonly serviceId: string;
     readonly serviceName: string;
@@ -112,18 +114,11 @@ export interface DraftChange {
     readonly revision: RevisionMetadata;
     readonly version: 1;
 }
-export type DraftSync = {
-    readonly kind: 'changes';
-    readonly revisions: readonly {
-        readonly operations: readonly ChangeOperation[];
-        readonly revision: RevisionMetadata;
-    }[];
-    readonly version: 1;
-} | {
+export interface DraftSync {
     readonly draft: Draft;
     readonly kind: 'snapshot';
     readonly version: 1;
-};
+}
 export interface Publication {
     readonly actorId: string;
     readonly closureDigest: string;
@@ -220,6 +215,14 @@ interface RunDetailsBase extends Run {
     readonly eventsExpiresAt?: string;
     readonly modelVersion: number;
     readonly revisionDigest: string;
+    readonly waiting?: {
+        readonly actions: readonly ['continue'] | readonly ['approve', 'reject'];
+        readonly expiresAt: string;
+        readonly nodeId: string;
+        readonly prompt: string;
+        readonly waitId: string;
+        readonly waitingSince: string;
+    };
 }
 export type DraftRun = RunDetailsBase & {
     readonly source: 'draft';
@@ -241,7 +244,7 @@ export interface RunPage {
     readonly runs: readonly Run[];
     readonly version: 1;
 }
-export type RunEventKind = 'node.artifact' | 'node.completed' | 'node.failed' | 'node.log' | 'node.output' | 'node.progress' | 'node.started' | 'run.canceled' | 'run.completed' | 'run.events-truncated' | 'run.failed' | 'run.indeterminate' | 'run.progress' | 'run.queued' | 'run.started';
+export type RunEventKind = 'node.artifact' | 'node.completed' | 'node.failed' | 'node.log' | 'node.output' | 'node.progress' | 'node.started' | 'run.canceled' | 'run.completed' | 'run.events-truncated' | 'run.failed' | 'run.indeterminate' | 'run.progress' | 'run.queued' | 'run.resolved' | 'run.started' | 'run.waiting';
 export interface RunEvent {
     readonly createdAt: string;
     readonly kind: RunEventKind;
@@ -329,7 +332,7 @@ export declare class ControlClient {
     resumeFlowTrigger(flowId: string, triggerNodeId: string): Promise<TriggerBinding>;
     testFlowPollTrigger(flowId: string, triggerNodeId: string): Promise<PollTriggerTestResult>;
     getDraft(flowId: string): Promise<Draft>;
-    syncDraft(flowId: string, fromRevisionId?: string): Promise<DraftSync>;
+    syncDraft(flowId: string): Promise<DraftSync>;
     getRevision(flowId: string, revisionId: string): Promise<Draft>;
     listConnectorProviders(signal?: AbortSignal, flowId?: string): Promise<readonly ConnectorProvider[]>;
     listConnectorActions(serviceId?: string, signal?: AbortSignal, flowId?: string): Promise<readonly ConnectorAction[]>;
@@ -337,7 +340,7 @@ export declare class ControlClient {
     getConnectorAction(actionId: string, signal?: AbortSignal, flowId?: string): Promise<ConnectorAction>;
     listConnectorConnections(serviceId: string, signal?: AbortSignal, flowId?: string): Promise<readonly ConnectorConnection[]>;
     createConnectorConnectionPage(serviceId: string, flowId?: string): Promise<string>;
-    changeDraft(flowId: string, expectedRevisionId: string, operations: readonly ChangeOperation[]): Promise<DraftChange>;
+    changeDraft(flowId: string, expectedRevisionId: string, operations: readonly ChangeOperation[], changeId?: string): Promise<DraftChange>;
     checkFlow(flowId: string, revisionId: string): Promise<FlowCheck>;
     getLive(flowId: string): Promise<Live>;
     listPublications(flowId: string, options?: {
@@ -362,6 +365,15 @@ export declare class ControlClient {
     }): Promise<RunEvents>;
     getRunResult(runId: string): Promise<RunResult>;
     cancelRun(runId: string): Promise<RunCancellation>;
+    resolveRunWait(runId: string, waitId: string, action: WaitAction): Promise<{
+        readonly action: WaitAction | null;
+        readonly resolutionAccepted: boolean;
+        readonly resolvedAt: string | null;
+        readonly runId: string;
+        readonly status: RunStatus;
+        readonly version: 1;
+        readonly waitId: string;
+    }>;
     private connectorActions;
     protected request<Value = unknown>(path: string, init?: RequestInit): Promise<Value>;
 }