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

package/dist/browser/{esm-xWDFFpGd.js → esm-CTcBY7hh.js}

@@ -1,6 +1,6 @@
 import { I as e, j as t, t as n } from "./dist-DxahK_I8.js";
 import { r } from "./dist-BKuSVKCC.js";
-import { r as i } from "./flowWorkspace-VnS8nLMT.js";
+import { r as i } from "./flowWorkspace-CPBHm14t.js";
 //#region ../../node_modules/.bun/@uiw+codemirror-themes@4.25.11/node_modules/@uiw/codemirror-themes/esm/index.js
 var a = (e) => {
 	var i = e.theme, a = e.settings, o = a === void 0 ? {} : a, s = e.styles, c = s === void 0 ? [] : s, l = { ".cm-gutters": {} }, u = {};

package/dist/browser/flow-authoring.js

@@ -629,6 +629,12 @@ function _(e, t, n) {
 		node: {
 			actions: ["continue"],
 			concurrency: 1,
+			input: {
+				handle: "value",
+				jsonSchema: {},
+				nullable: !0,
+				value: null
+			},
 			inputs: { value: {
 				kind: "value",
 				value: null

package/dist/browser/flow-change.d.ts

@@ -66,6 +66,7 @@ export interface ValueNode extends GraphNodeBase {
 export type WaitAction = 'approve' | 'continue' | 'reject';
 export interface WaitNode extends GraphNodeBase {
     readonly actions: readonly ['continue'] | readonly ['approve', 'reject'];
+    readonly input: InputPort;
     readonly kind: 'wait';
     readonly notification?: {
         readonly inputs: Readonly<Record<string, InputMapping>>;
@@ -73,6 +74,7 @@ export interface WaitNode extends GraphNodeBase {
         readonly taskId: string;
     };
     readonly prompt: string;
+    readonly timeoutMs?: never;
 }
 export type ConditionOperator = '!=' | '<' | '<=' | '==' | '>' | '>=' | 'contains' | 'endsWith' | 'hasKey' | 'hasValue' | 'isEmpty' | 'isFalse' | 'isNotEmpty' | 'isNotNull' | 'isNull' | 'isTrue' | 'notContains' | 'notHasKey' | 'notHasValue' | 'startsWith';
 export interface ConditionExpression {

package/dist/browser/{flowChanges-CeMiiZIO.js → flowChanges-BDqD_Q4G.js}

@@ -1657,7 +1657,7 @@ var tt = class {
 			value: "值",
 			valueDescription: "为下游节点提供可复用的字面量。",
 			wait: "等待",
-			waitDescription: "暂停 Run，直到 Operator 继续或审批。",
+			waitDescription: "暂停 Run，直到 Operator 继续、审批或拒绝。",
 			webhook: "Webhook",
 			webhookDescription: "通过专属 HTTP 入口接收外部事件。"
 		},
@@ -4089,7 +4089,7 @@ var tt = class {
 			value: "Значение",
 			valueDescription: "Передавать нижестоящим узлам переиспользуемые литеральные значения.",
 			wait: "Ожидание",
-			waitDescription: "Приостановить Run, пока оператор не продолжит или не одобрит его.",
+			waitDescription: "Приостановить Run, пока оператор не продолжит, не одобрит или не отклонит его.",
 			webhook: "Webhook",
 			webhookDescription: "Получать внешние события через выделенный HTTP-адрес."
 		},
@@ -5610,6 +5610,12 @@ function At(e, t, n) {
 		node: {
 			actions: ["continue"],
 			concurrency: 1,
+			input: {
+				handle: "value",
+				jsonSchema: {},
+				nullable: !0,
+				value: null
+			},
 			inputs: { value: {
 				kind: "value",
 				value: null
@@ -6351,7 +6357,7 @@ var mn = class {
 	}
 	async cancel() {
 		let e = this.#o.value.run;
-		if (!pn(e) || this.#o.value.cancelingRunId != null) return;
+		if (!pn(e) || this.#o.value.cancelingRunId != null || this.#o.value.resolvingAction != null) return;
 		let t = this.#e.begin();
 		this.#a(void 0), this.#p({ cancelingRunId: e.runId });
 		try {
@@ -6375,7 +6381,7 @@ var mn = class {
 	}
 	async resolve(e) {
 		let t = this.#o.value.run, n = t?.status == "waiting" && "waiting" in t ? t.waiting : void 0;
-		if (!(t == null || n == null || this.#o.value.resolvingAction != null || !n.actions.some((t) => t == e))) {
+		if (!(t == null || n == null || this.#o.value.cancelingRunId != null || this.#o.value.resolvingAction != null || !n.actions.some((t) => t == e))) {
 			this.#a(void 0), this.#p({ resolvingAction: e });
 			try {
 				let r = await this.#t.resolveRunWait(t.runId, n.waitId, e), i = this.#o.value.run;
@@ -10498,17 +10504,21 @@ function Ga(e) {
 				nullable: t.nullable
 			});
 			break;
-		case "wait":
-			t.set("value", {
-				defaultValue: null,
-				jsonSchema: {},
-				nullable: !0
+		case "wait": {
+			let r = e.node.input;
+			t.set(r.handle, {
+				defaultValue: r.value,
+				description: r.description,
+				jsonSchema: r.jsonSchema,
+				nullable: r.nullable
 			});
 			for (let t of e.node.actions) n.set(t, {
-				jsonSchema: {},
-				nullable: !0
+				description: r.description,
+				jsonSchema: r.jsonSchema,
+				nullable: r.nullable
 			});
 			break;
+		}
 		case "subflow": {
 			let r = e.definition;
 			for (let e of r?.inputs ?? []) t.set(e.handle, {
@@ -10588,7 +10598,9 @@ function qa(e, t, n) {
 }
 function Ja(e, t, n, r) {
 	if (t.kind != "flow" || n?.flowId != e.revision.flowId || n.revisionId != e.revision.revisionId) return { nodes: /* @__PURE__ */ new Map() };
-	let i = n.status == "queued" || n.status == "starting" || n.status == "running" || n.status == "waiting", a = /* @__PURE__ */ new Map(), o = r.find((t) => t.kind == "run.started" && t.payload.flowId == e.revision.flowId)?.payload.scopeId;
+	let i = n.status == "queued" || n.status == "starting" || n.status == "running" || n.status == "waiting", a = /* @__PURE__ */ new Map();
+	n.status == "waiting" && "waiting" in n && n.waiting != null && a.set(n.waiting.nodeId, { status: "waiting" });
+	let o = r.find((t) => t.kind == "run.started" && t.payload.flowId == e.revision.flowId)?.payload.scopeId;
 	if (typeof o != "string") return {
 		nodes: a,
 		status: i ? "running" : "idle"
@@ -10628,13 +10640,6 @@ function Ja(e, t, n, r) {
 			});
 		}
 	}
-	if (n.status == "waiting" && "waiting" in n && n.waiting != null) {
-		let e = a.get(n.waiting.nodeId);
-		a.set(n.waiting.nodeId, {
-			...e,
-			status: "waiting"
-		});
-	}
 	if (!i) for (let [e, t] of a) (t.status == "running" || t.status == "waiting") && a.set(e, {
 		...t,
 		status: "idle"
@@ -11504,7 +11509,7 @@ function Ro(e, t, n, r, i) {
 		case "code": return Tt(t, {
 			moduleId: n,
 			nodeId: n
-		}, r.name);
+		}, r.name, void 0, r.ports);
 		case "llm": return Dt(t, {
 			nodeId: n,
 			taskId: i()
@@ -11760,7 +11765,7 @@ function Jo(e, t, n, i) {
 				defaultOutput: o.defaultOutput,
 				input: o.input
 			};
-			r(e, i) || f.push({
+			(!r(o.cases, i.cases) || o.defaultOutput != i.defaultOutput || !r(o.input, i.input)) && f.push({
 				before: e,
 				kind: "graph.node.condition.set",
 				nodeId: n,
@@ -11817,22 +11822,53 @@ function Xo(e, t, n, i) {
 		target: t,
 		value: c
 	});
-	for (let [e, r] of Object.entries(a.nodes)) if (e != n && "inputs" in r) for (let [i, a] of Object.entries(r.inputs)) {
-		if (a.kind != "sources") continue;
-		let r = a.sources.filter((e) => e.kind != "node" || e.nodeId != n || l.has(e.output));
-		r.length != a.sources.length && u.push({
-			before: a,
-			handle: i,
-			kind: "graph.node.input.set",
-			nodeId: e,
-			target: t,
-			value: r.length == 0 ? void 0 : {
+	for (let [e, i] of Object.entries(a.nodes)) {
+		if (e == n || !("inputs" in i)) continue;
+		for (let [r, a] of Object.entries(i.inputs)) {
+			if (a.kind != "sources") continue;
+			let i = a.sources.filter((e) => e.kind != "node" || e.nodeId != n || l.has(e.output));
+			i.length != a.sources.length && u.push({
+				before: a,
+				handle: r,
+				kind: "graph.node.input.set",
+				nodeId: e,
+				target: t,
+				value: i.length == 0 ? void 0 : {
+					kind: "sources",
+					sources: i
+				}
+			});
+		}
+		if (i.kind != "wait" || i.notification == null) continue;
+		let a = { ...i.notification.inputs };
+		for (let [e, t] of Object.entries(a)) {
+			if (t.kind != "sources") continue;
+			let r = t.sources.filter((e) => e.kind != "node" || e.nodeId != n || l.has(e.output));
+			r.length != t.sources.length && (r.length == 0 ? delete a[e] : a[e] = {
 				kind: "sources",
 				sources: r
+			});
+		}
+		r(a, i.notification.inputs) || u.push({
+			before: {
+				actions: i.actions,
+				notification: i.notification,
+				prompt: i.prompt
+			},
+			kind: "graph.node.wait.set",
+			nodeId: e,
+			target: t,
+			value: {
+				actions: i.actions,
+				notification: {
+					...i.notification,
+					inputs: a
+				},
+				prompt: i.prompt
 			}
 		});
 	}
-	if (u.length != 0) return Io(e, D(e.revision.content, u), o.notification?.taskId == i.notification?.taskId ? void 0 : o.notification?.taskId);
+	return u.length == 0 ? [] : Io(e, D(e.revision.content, u), o.notification?.taskId == i.notification?.taskId ? void 0 : o.notification?.taskId);
 }
 function Zo(e, t, n, r) {
 	let i = e.graph({ kind: "flow" })?.nodes[t], a = Fo(n);