@oomol-lab/open-flow 0.1.0-beta.65 → 0.1.0-beta.66

package/dist/common/decision.js

@@ -6605,6 +6605,7 @@ var port = object({
 	nullable: boolean(),
 	handle: text
 });
+var workflowInputDefs = array(port.strict());
 var input = port.extend({ value: json.optional() });
 var group = object({
 	collapsed: boolean().optional(),
@@ -6762,6 +6763,11 @@ var managedFields = object({
 				messageHandle: text,
 				inputs: record$1(text, agentValue)
 			}).optional()
+		}),
+		strictObject({
+			kind: literal("workflow"),
+			flowId: text,
+			revisionId: text
 		})
 	])
 });
@@ -6870,6 +6876,12 @@ var base = {
 	timeoutMs: number().optional()
 };
 var node = union([
+	strictObject({
+		...base,
+		kind: literal("outputs"),
+		outputDefs: array(port.strict()),
+		outputMappings: inputs
+	}).omit({ inputs: true }),
 	object({
 		...base,
 		inputs: record$1(text, never()),
@@ -6902,6 +6914,11 @@ var node = union([
 		...trigger,
 		kind: literal("manual")
 	}),
+	strictObject({
+		...trigger,
+		kind: literal("start"),
+		inputDefs: workflowInputDefs
+	}),
 	strictObject({
 		...trigger,
 		kind: literal("error"),
@@ -6966,7 +6983,7 @@ var module = object({
 	imports: strings,
 	source: text
 });
-var document = preprocess(rejectRetiredDefinitions, object({
+var document = preprocess(normalizeDocument, object({
 	bindings: record$1(text, binding),
 	graph
 }));
@@ -6975,7 +6992,9 @@ object({
 		literal(2),
 		literal(4),
 		literal(5),
-		literal(6)
+		literal(6),
+		literal(7),
+		literal(8)
 	]),
 	document,
 	modules: record$1(text, module)
@@ -6983,13 +7002,19 @@ object({
 	kind: literal("open-flow-flow-revision"),
 	version: literal(1)
 });
-function rejectRetiredDefinitions(value) {
+function normalizeDocument(value) {
 	const candidate = record(value);
 	if (candidate.tasks !== void 0 && (candidate.tasks === null || typeof candidate.tasks !== "object" || Array.isArray(candidate.tasks) || Object.keys(candidate.tasks).length > 0)) throw new TypeError("Independent Task definitions are no longer supported.");
 	if (Object.values(record(record(candidate.graph).nodes)).some((candidateNode) => Object.hasOwn(record(candidateNode), "taskId"))) throw new TypeError("Task references are no longer supported.");
 	const subflows = candidate.subflows;
 	if (subflows !== void 0 && (subflows === null || typeof subflows !== "object" || Array.isArray(subflows) || Object.keys(subflows).length > 0)) throw new TypeError("Subflows are no longer supported.");
 	if (Object.values(record(record(candidate.graph).nodes)).some((candidateNode) => record(candidateNode).kind === "subflow")) throw new TypeError("Subflow nodes are no longer supported.");
+	if ([
+		"inputDefs",
+		"outputDefs",
+		"outputMappings"
+	].some((field) => Object.hasOwn(candidate, field))) throw new TypeError("Workflow interface configuration must belong to Start and Outputs nodes.");
+	if (Object.values(record(record(candidate.graph).nodes)).some((candidateNode) => record(candidateNode).kind == "start" && Object.hasOwn(record(candidateNode), "parameters"))) throw new TypeError("Legacy Start.parameters is unsupported; configure node.inputDefs.");
 	return value;
 }
 function record(value) {

package/dist/common/flow-encoding.d.ts

@@ -1,10 +1,12 @@
-import type { CodeModule, FlowDocument, Graph, Group, InputPort, JsonValue, ManagedTaskDefinition, Port, RevisionContent, TriggerNode } from '@oomol-lab/open-flow/flow-change';
+import type { CodeModule, FlowDocument, Graph, Group, InputMapping, InputPort, JsonValue, ManagedTaskDefinition, Port, RevisionContent, TriggerNode } from '@oomol-lab/open-flow/flow-change';
 export * from './flow-workflowFile.js';
 export { maxJsonDepth } from './flow-json.js';
-export { decodeFlowDocument, decodeRevisionContent } from '../browser/flow-change-schema.js';
+export { decodeFlowDocument, decodeRevisionContent, upgradeWorkflowInterfaceDocument } from '../browser/flow-change-schema.js';
+export { upgradeRevisionContent } from '@oomol-lab/open-flow/flow-change';
 export declare function canonicalJsonBytes(value: JsonValue): Uint8Array;
 export declare function digestBytes(bytes: Uint8Array): Promise<string>;
 export declare function canonicalPorts(value: readonly (InputPort | Port | Group)[]): JsonValue;
+export declare function canonicalInputs(value: Readonly<Record<string, InputMapping>>): JsonValue;
 export declare function canonicalGraph(value: Graph): JsonValue;
 export declare function canonicalRevisionGraph(content: RevisionContent, graph: Graph): JsonValue;
 export declare function canonicalTask(task: ManagedTaskDefinition): JsonValue;

package/dist/common/flow-encoding.js

@@ -8587,6 +8587,7 @@ var port = object({
 	nullable: boolean(),
 	handle: text
 });
+var workflowInputDefs = array(port.strict());
 var input = port.extend({ value: json.optional() });
 var group = object({
 	collapsed: boolean().optional(),
@@ -8744,6 +8745,11 @@ var managedFields = object({
 				messageHandle: text,
 				inputs: record$1(text, agentValue)
 			}).optional()
+		}),
+		strictObject({
+			kind: literal("workflow"),
+			flowId: text,
+			revisionId: text
 		})
 	])
 });
@@ -8852,6 +8858,12 @@ var base = {
 	timeoutMs: number().optional()
 };
 var node = union([
+	strictObject({
+		...base,
+		kind: literal("outputs"),
+		outputDefs: array(port.strict()),
+		outputMappings: inputs
+	}).omit({ inputs: true }),
 	object({
 		...base,
 		inputs: record$1(text, never()),
@@ -8884,6 +8896,11 @@ var node = union([
 		...trigger,
 		kind: literal("manual")
 	}),
+	strictObject({
+		...trigger,
+		kind: literal("start"),
+		inputDefs: workflowInputDefs
+	}),
 	strictObject({
 		...trigger,
 		kind: literal("error"),
@@ -8948,7 +8965,7 @@ var module = object({
 	imports: strings,
 	source: text
 });
-var document = preprocess(rejectRetiredDefinitions, object({
+var document = preprocess(normalizeDocument, object({
 	bindings: record$1(text, binding),
 	graph
 }));
@@ -8957,7 +8974,9 @@ var revision = object({
 		literal(2),
 		literal(4),
 		literal(5),
-		literal(6)
+		literal(6),
+		literal(7),
+		literal(8)
 	]),
 	document,
 	modules: record$1(text, module)
@@ -8966,15 +8985,73 @@ var envelope$1 = revision.extend({
 	kind: literal("open-flow-flow-revision"),
 	version: literal(1)
 });
-function rejectRetiredDefinitions(value) {
+function normalizeDocument(value) {
 	const candidate = record(value);
 	if (candidate.tasks !== void 0 && (candidate.tasks === null || typeof candidate.tasks !== "object" || Array.isArray(candidate.tasks) || Object.keys(candidate.tasks).length > 0)) throw new TypeError("Independent Task definitions are no longer supported.");
 	if (Object.values(record(record(candidate.graph).nodes)).some((candidateNode) => Object.hasOwn(record(candidateNode), "taskId"))) throw new TypeError("Task references are no longer supported.");
 	const subflows = candidate.subflows;
 	if (subflows !== void 0 && (subflows === null || typeof subflows !== "object" || Array.isArray(subflows) || Object.keys(subflows).length > 0)) throw new TypeError("Subflows are no longer supported.");
 	if (Object.values(record(record(candidate.graph).nodes)).some((candidateNode) => record(candidateNode).kind === "subflow")) throw new TypeError("Subflow nodes are no longer supported.");
+	if ([
+		"inputDefs",
+		"outputDefs",
+		"outputMappings"
+	].some((field) => Object.hasOwn(candidate, field))) throw new TypeError("Workflow interface configuration must belong to Start and Outputs nodes.");
+	if (Object.values(record(record(candidate.graph).nodes)).some((candidateNode) => record(candidateNode).kind == "start" && Object.hasOwn(record(candidateNode), "parameters"))) throw new TypeError("Legacy Start.parameters is unsupported; configure node.inputDefs.");
 	return value;
 }
+/** Explicit storage upgrade only. Normal reads and authoring still reject retired fields. */
+function upgradeWorkflowInterfaceDocument(value) {
+	const candidate = record(value);
+	const sourceGraph = record(candidate.graph);
+	const sourceNodes = record(sourceGraph.nodes);
+	if (!([
+		"inputDefs",
+		"outputDefs",
+		"outputMappings"
+	].some((field) => Object.hasOwn(candidate, field)) || Object.values(sourceNodes).some((entry) => {
+		const candidateNode = record(entry);
+		return candidateNode.kind == "start" && (!Object.hasOwn(candidateNode, "inputDefs") || Object.hasOwn(candidateNode, "parameters")) || candidateNode.kind == "outputs" && (!Object.hasOwn(candidateNode, "outputDefs") || !Object.hasOwn(candidateNode, "outputMappings"));
+	}))) return value;
+	if (candidate.graph !== sourceGraph || sourceGraph.nodes !== sourceNodes) throw new TypeError("Cannot migrate an invalid workflow graph.");
+	const starts = Object.values(sourceNodes).filter((entry) => record(entry).kind == "start");
+	const outputs = Object.values(sourceNodes).filter((entry) => record(entry).kind == "outputs");
+	if (starts.length > 1 || outputs.length > 1) throw new TypeError("Cannot migrate duplicate Start or Outputs nodes.");
+	const { inputDefs, outputDefs, outputMappings, ...sourceDocument } = candidate;
+	if (starts.length == 0 && inputDefs !== void 0 && workflowInputDefs.parse(inputDefs).length > 0) throw new TypeError("Cannot migrate inputDefs without a Start node.");
+	if (outputs.length == 0 && (outputDefs !== void 0 && workflowInputDefs.parse(outputDefs).length > 0 || outputMappings !== void 0 && Object.keys(inputs.parse(outputMappings)).length > 0)) throw new TypeError("Cannot migrate output configuration without an Outputs node.");
+	return {
+		...sourceDocument,
+		graph: {
+			...sourceGraph,
+			nodes: Object.fromEntries(Object.entries(sourceNodes).map(([id, nodeValue]) => {
+				const candidateNode = record(nodeValue);
+				if (candidateNode.kind == "start") {
+					const { parameters, ...rest } = candidateNode;
+					return [id, {
+						...rest,
+						inputDefs: workflowInputDefs.parse(mergeInterfaceConfiguration([
+							candidateNode.inputDefs,
+							parameters,
+							inputDefs
+						], []))
+					}];
+				}
+				if (candidateNode.kind == "outputs") return [id, {
+					...candidateNode,
+					outputDefs: workflowInputDefs.parse(mergeInterfaceConfiguration([candidateNode.outputDefs, outputDefs], [])),
+					outputMappings: inputs.parse(mergeInterfaceConfiguration([candidateNode.outputMappings, outputMappings], {}))
+				}];
+				return [id, nodeValue];
+			}))
+		}
+	};
+}
+function mergeInterfaceConfiguration(values, fallback) {
+	const present = values.filter((value) => value !== void 0);
+	if (present.some((value) => !dequal(value, present[0]))) throw new TypeError("Conflicting workflow interface configuration.");
+	return present.length == 0 ? fallback : present[0];
+}
 function record(value) {
 	return value != null && typeof value == "object" && !Array.isArray(value) ? value : {};
 }
@@ -9154,14 +9231,14 @@ function repairRevisionEnvelope(value) {
 	checkJsonDepth(value);
 	const envelopeSource = record(value);
 	if (envelopeSource.kind != "open-flow-flow-revision" || envelopeSource.version != 1) throw new TypeError("The value is not an Open Flow Revision envelope.");
-	if (typeof envelopeSource.modelVersion == "number" && envelopeSource.modelVersion > 6) throw new TypeError("The Flow model is newer than this package.");
+	if (typeof envelopeSource.modelVersion == "number" && envelopeSource.modelVersion > 8) throw new TypeError("The Flow model is newer than this package.");
 	let sourceDocument = record(envelopeSource.modelVersion == 1 || envelopeSource.modelVersion == 2 ? upgradeLegacyDocument(envelopeSource.document) : envelopeSource.document);
 	if (typeof envelopeSource.modelVersion == "number" && envelopeSource.modelVersion < 6) sourceDocument = upgradeTaskNodes(sourceDocument);
-	rejectRetiredDefinitions(sourceDocument);
+	sourceDocument = record(normalizeDocument(sourceDocument));
 	const bindings = record(sourceDocument.bindings);
 	const sourceGraph = repairGraph(sourceDocument.graph, bindings);
 	return decodeRevisionContent({
-		modelVersion: 6,
+		modelVersion: 8,
 		document: {
 			bindings: repairedEntries(sourceDocument.bindings, binding),
 			graph: sourceGraph
@@ -9349,6 +9426,8 @@ array(union([...new Map(Object.entries(shapes).map(([kind, shape]) => [kind, sha
 	...shape
 })])).values()])).min(1);
 function checkModelVersion(content) {
+	if (content.modelVersion < 8 && Object.values(content.document.graph.nodes).some((candidateNode) => candidateNode.kind == "outputs")) throw new TypeError("Workflow outputs require Flow model version 8.");
+	if (content.modelVersion < 7 && Object.values(content.document.graph.nodes).some((candidateNode) => candidateNode.kind == "start")) throw new TypeError("Start Triggers require Flow model version 7.");
 	if (content.modelVersion < 6 && Object.values(content.document.graph.nodes).some((candidateNode) => candidateNode.kind == "task" && "executor" in candidateNode.task)) throw new TypeError("Node-owned managed Tasks require Flow model version 6.");
 	if (content.modelVersion < 5 && Object.values(content.document.graph.nodes).some((itemNode) => itemNode.kind == "error")) throw new TypeError("Error workflows require Flow model version 5.");
 }
@@ -9374,6 +9453,47 @@ function clearConditionBindings(node) {
 	};
 }
 //#endregion
+//#region src/flow/common/change.ts
+function isTriggerNode(node) {
+	return [
+		"manual",
+		"start",
+		"error",
+		"webhook",
+		"cron",
+		"poll",
+		"integration"
+	].includes(node.kind);
+}
+/** Lossless upgrade of readable content. Historical content and its encoding stay unchanged. */
+function upgradeRevisionContent(content) {
+	const upgraded = upgradeDecodedRevisionContent(decodeRevisionContent(content));
+	return dequal(content, upgraded) ? content : upgraded;
+}
+function upgradeDecodedRevisionContent(content) {
+	const graph = content.document.graph;
+	const hasManual = Object.values(graph.nodes).some((node) => node.kind == "manual");
+	if (!hasManual && content.modelVersion == 8) return content;
+	return {
+		...content,
+		modelVersion: 8,
+		document: {
+			...content.document,
+			graph: hasManual ? {
+				...graph,
+				nodes: Object.fromEntries(Object.entries(graph.nodes).map(([id, node]) => [id, upgradeManualTrigger(node)]))
+			} : graph
+		}
+	};
+}
+function upgradeManualTrigger(node) {
+	return node.kind == "manual" ? {
+		...node,
+		kind: "start",
+		inputDefs: []
+	} : node;
+}
+//#endregion
 //#region src/trigger/common/config.ts
 /** Deployment-bound selections owned by the Trigger configuration contract. */
 function clearTriggerExternalConfig(key, config) {
@@ -9502,6 +9622,10 @@ function cleanWorkflowFile(value) {
 			...node,
 			inputs: Object.fromEntries(Object.entries(node.inputs).map(([key, input]) => [key, cleanInput(input)]))
 		};
+		if (node.kind == "outputs") node = {
+			...node,
+			outputMappings: Object.fromEntries(Object.entries(node.outputMappings).map(([key, input]) => [key, cleanInput(input)]))
+		};
 		if (node.kind == "condition") node = clearConditionBindings(node);
 		if (node.kind == "error" && node.sourceFlowIds != null) node = {
 			...node,
@@ -9606,16 +9730,22 @@ function canonicalOperand(operand) {
 	};
 }
 function canonicalNode(value) {
-	if (!("inputs" in value)) return canonicalTriggerNode(value);
+	if (isTriggerNode(value)) return canonicalTriggerNode(value);
 	const common = {
 		...value.description == null ? {} : { description: value.description },
 		...value.icon == null ? {} : { icon: value.icon },
-		inputs: canonicalInputs(value.inputs),
+		...value.kind == "outputs" ? {} : { inputs: canonicalInputs(value.inputs) },
 		...value.name == null ? {} : { name: value.name },
 		...value.maxExecutions == null ? {} : { maxExecutions: value.maxExecutions },
 		...value.timeoutMs == null ? {} : { timeoutMs: value.timeoutMs }
 	};
 	switch (value.kind) {
+		case "outputs": return {
+			...common,
+			kind: value.kind,
+			outputDefs: canonicalPorts(value.outputDefs),
+			outputMappings: canonicalInputs(value.outputMappings)
+		};
 		case "condition": return {
 			...common,
 			cases: value.cases.map((item) => ({
@@ -9795,6 +9925,10 @@ function canonicalTriggerNode(trigger) {
 			...trigger.sourceFlowIds == null ? {} : { sourceFlowIds: [...trigger.sourceFlowIds] }
 		};
 		case "manual": return common(trigger.kind);
+		case "start": return {
+			...common(trigger.kind),
+			inputDefs: canonicalPorts(trigger.inputDefs)
+		};
 		case "webhook": return {
 			...common(trigger.kind),
 			bodyFields: trigger.bodyFields.map((input) => ({
@@ -9886,10 +10020,10 @@ function revisionRepairKind(bytes) {
 		return;
 	}
 	const source = value;
-	return typeof source.modelVersion == "number" && source.modelVersion < 6 ? "upgrade" : "repair";
+	return typeof source.modelVersion == "number" && source.modelVersion < 8 ? "upgrade" : "repair";
 }
 function repairRevision(bytes) {
 	return repairRevisionEnvelope(revisionValue(bytes));
 }
 //#endregion
-export { canonicalDocument, canonicalGraph, canonicalJsonBytes, canonicalModule, canonicalPorts, canonicalRevisionGraph, canonicalTask, cleanWorkflowFile, decodeFlowDocument, decodeRevision, decodeRevisionContent, decodeWorkflowFile, digestBytes, encodeRevision, encodeWorkflowFile, maxJsonDepth, parseWorkflowFile, repairRevision, revisionRepairKind, triggerRuntimeJson, workflowFileName, workflowNameFromFile };
+export { canonicalDocument, canonicalGraph, canonicalInputs, canonicalJsonBytes, canonicalModule, canonicalPorts, canonicalRevisionGraph, canonicalTask, cleanWorkflowFile, decodeFlowDocument, decodeRevision, decodeRevisionContent, decodeWorkflowFile, digestBytes, encodeRevision, encodeWorkflowFile, maxJsonDepth, parseWorkflowFile, repairRevision, revisionRepairKind, triggerRuntimeJson, upgradeRevisionContent, upgradeWorkflowInterfaceDocument, workflowFileName, workflowNameFromFile };

package/dist/common/flow-graph.d.ts

@@ -54,6 +54,6 @@ export declare function checkInputSource(graph: Graph, target: string, handle: s
 export declare function checkInputSources(graph: Graph, target: string, handle: string, sources: readonly Pick<NodeSource, 'nodeId' | 'output' | 'field'>[]): InputSourcesCheck;
 /** Enumerate structurally available outputs while retaining their compatibility with one input. */
 export declare function inputSourceCandidates(graph: Graph, target: string, handle: string): Readonly<Record<string, readonly InputSourceCandidate[]>>;
-export declare function availableOutputs(graph: Graph, target: string, handle?: string): Readonly<Record<string, readonly string[]>>;
+export declare function availableOutputs(graph: Graph, target: string, handle: string | undefined): Readonly<Record<string, readonly string[]>>;
 export declare function validateFlowGraph(revision: RevisionContent): readonly Diagnostic[];
 export {};

package/dist/common/flow-semantics.d.ts

@@ -1,9 +1,9 @@
 export { renderPrompt } from './flow-promptTemplate.js';
 export { connectionUsage, removeConnectionUsage } from './flow-connectionUsage.js';
-export { matchesTriggerOutputs, triggerOutputDefinitions, triggerOutputPorts } from './trigger-contract.js';
+export { matchesTriggerOutputs, normalizeTriggerOutputs, triggerOutputDefinitions, triggerOutputPorts } from './trigger-contract.js';
 import type { EngineContract } from './engine-contract.js';
 import type { RuntimeProgram } from './runtime-contract.js';
-import type { ConnectorActionCapability, ConnectorCapability, Graph, RevisionContent, SchemaMismatch } from '../browser/flow-change.js';
+import type { ConnectorActionCapability, ConnectorCapability, Graph, InputMapping, JsonValue, Port, RevisionContent, SchemaMismatch } from '../browser/flow-change.js';
 export { availableOutputs, graphOrder, nodeInputPorts } from './flow-graph.js';
 export { validateModules } from './flow-modules.js';
 export { matchesSchema, schemaValidationErrors, variableInputCompatible } from './flow-schema.js';
@@ -18,8 +18,11 @@ export interface SemanticClosure {
 }
 export declare function flowDependencies(content: RevisionContent, triggerId?: string): SemanticClosure['dependencies'];
 export declare function flowClosure(content: RevisionContent): Promise<SemanticClosure>;
+/** Canonical semantic bytes, also used by transactional storage upgrades. */
+export declare function encodeFlowClosure(content: RevisionContent, triggerId?: string): Uint8Array;
 export declare function variableBindings(revision: RevisionContent, bindingIds: Iterable<string>): Readonly<Record<string, string>>;
 export interface FlowResourceReferences {
+    readonly calledFlowIds?: readonly string[];
     readonly variableNames: readonly string[];
     readonly connections: readonly {
         readonly providerId: string;
@@ -45,9 +48,16 @@ export interface FlowValidation {
 }
 export type FlowInputsValidation = 'invalid' | 'valid';
 export declare function validRunTrigger(revision: RevisionContent, value: unknown): boolean;
+export declare function normalizeRunTrigger(revision: RevisionContent, value: unknown): {
+    readonly nodeId: string;
+    readonly outputs: Readonly<Record<string, JsonValue>>;
+} | undefined;
 export declare function validateFlowInputs(revision: RevisionContent, value: unknown): FlowInputsValidation;
 export declare function validateFlow(revision: RevisionContent, engine: EngineContract): Promise<FlowValidation>;
 export interface PreparedFlow {
+    readonly inputDefs: readonly Port[];
+    readonly outputDefs: readonly Port[];
+    readonly outputMappings: Readonly<Record<string, InputMapping>>;
     readonly closureDigest: string;
     readonly engineContract: string;
     readonly graph: Graph;