@oomol-lab/open-flow 0.1.0-beta.73 → 0.1.0-beta.74

package/dist/{browser → common}/flow-change.js

@@ -8844,7 +8844,8 @@ var waitAutoContinueDraftSchema = discriminatedUnion("kind", [strictObject({
 	at: string(),
 	timezone: string().optional()
 })]);
-discriminatedUnion("kind", [waitAutoContinueDraftSchema.options[0].extend({ durationMs: number().int().positive().max(Number.MAX_SAFE_INTEGER) }), waitAutoContinueDraftSchema.options[1].extend({
+/** Static business configuration; the deployment owns the allowed wait lifetime. */
+var waitAutoContinueSchema = discriminatedUnion("kind", [waitAutoContinueDraftSchema.options[0].extend({ durationMs: number().int().positive().max(Number.MAX_SAFE_INTEGER) }), waitAutoContinueDraftSchema.options[1].extend({
 	at: datetime({ offset: true }),
 	timezone: string().refine(isTimeZone, "Select a valid IANA timezone.").optional()
 })]);
@@ -8877,7 +8878,7 @@ var webhookResponseTimeout = {
 }).jsonSchema;
 //#endregion
 //#region src/flow/common/changeSchema.ts
-var currentFlowModelVersion = 10;
+var currentFlowModelVersion = 11;
 var text = string();
 var actionConnection = text.describe("Account selection: omit while unconfigured; use an account ID to select it; use \"\" to explicitly defer configuration. Deferred Actions fail if called; deferred Agent tools are excluded from the callable tool set. Not supported by Triggers.");
 var json = json$1();
@@ -8917,7 +8918,7 @@ var ports = {
 	inputs: array(union([input, group])),
 	outputs: array(union([port, group]))
 };
-var capability = union([
+var connectorCapabilitySchema = union([
 	strictObject({
 		kind: literal("connector"),
 		action: text,
@@ -8949,6 +8950,15 @@ var capability = union([
 		})).optional()
 	})
 ]);
+var workflowCapabilitySchema = strictObject({
+	kind: literal("workflow"),
+	name: text,
+	flowId: text,
+	revisionId: text,
+	inputs: array(port),
+	outputs: array(port).nullable()
+});
+var capability = union([connectorCapabilitySchema, workflowCapabilitySchema]);
 var inline = object({
 	...ports,
 	name: text,
@@ -8963,6 +8973,20 @@ var agentValue = union([object({
 	input: text
 })]);
 var agentInput = union([agentValue, object({ kind: literal("model") })]);
+var agentToolFields = {
+	id: text,
+	name: text,
+	description: text,
+	approval: boolean(),
+	inputs: array(input.extend({ source: agentInput }))
+};
+var connectorAgentToolSchema = object({
+	...agentToolFields,
+	kind: literal("connector").optional(),
+	action: text,
+	connectionId: actionConnection.optional()
+});
+var workflowAgentToolSchema = workflowCapabilitySchema.extend(agentToolFields);
 var decisionQuestion = discriminatedUnion("type", [
 	strictObject({
 		name: text,
@@ -9031,15 +9055,7 @@ var managedFields = object({
 			model: text,
 			prompt: text,
 			maxRounds: number(),
-			tools: array(object({
-				id: text,
-				name: text,
-				description: text,
-				action: text,
-				connectionId: actionConnection.optional(),
-				approval: boolean(),
-				inputs: array(input.extend({ source: agentInput }))
-			})),
+			tools: array(union([workflowAgentToolSchema, connectorAgentToolSchema])),
 			notification: object({
 				action: text,
 				connectionId: actionConnection.optional(),
@@ -9265,10 +9281,26 @@ var node = union([
 		})
 	})
 ]);
-strictObject(condition), strictObject(wait), strictObject(webhook), managedFields.shape.executor.options[0].omit({ kind: true }).strict(), managedFields.shape.executor.options[1].omit({ kind: true }).strict(), managedFields.shape.executor.options[2].omit({ kind: true }).strict(), managedFields.shape.executor.options[3].omit({ kind: true }).strict(), managedFields.shape.executor.options[4].omit({
-	kind: true,
-	notification: true
-}).strict();
+/** Configuration schemas shared by the node authoring boundary. */
+var authoringDefinitionSchemas = {
+	input,
+	port,
+	ports,
+	condition: strictObject(condition),
+	wait: strictObject(wait),
+	waitAutoContinue: waitAutoContinueSchema,
+	webhook: strictObject(webhook),
+	schedule: triggerScheduleSchema,
+	capabilities: array(capability),
+	connector: managedFields.shape.executor.options[0].omit({ kind: true }).strict(),
+	openapi: managedFields.shape.executor.options[1].omit({ kind: true }).strict(),
+	decision: managedFields.shape.executor.options[2].omit({ kind: true }).strict(),
+	llm: managedFields.shape.executor.options[3].omit({ kind: true }).strict(),
+	agent: managedFields.shape.executor.options[4].omit({
+		kind: true,
+		notification: true
+	}).strict()
+};
 var edge = object({
 	source: text,
 	target: text,
@@ -9304,7 +9336,8 @@ var revision = object({
 		literal(7),
 		literal(8),
 		literal(9),
-		literal(10)
+		literal(10),
+		literal(11)
 	]),
 	document,
 	modules: record$1(text, module)
@@ -9529,6 +9562,7 @@ function changeOperationsSchema(kind) {
 	return toJSONSchema(schema, { io: "input" });
 }
 function checkModelVersion(content) {
+	if (content.modelVersion < 11 && Object.values(content.document.graph.nodes).some((candidateNode) => candidateNode.kind == "task" && ("moduleId" in candidateNode.task ? candidateNode.task.capabilities?.some((item) => item.kind == "workflow") : candidateNode.task.executor.kind == "agent" && candidateNode.task.executor.tools.some((item) => item.kind == "workflow")))) throw new TypeError("Workflow tools require Flow model version 11.");
 	if (content.modelVersion < 10 && Object.values(content.document.graph.nodes).some((candidateNode) => candidateNode.kind == "webhook" && (candidateNode.options?.responseBody != null || candidateNode.options?.responseStatusCodeOutput != null || candidateNode.options?.responseHeadersSource != null || candidateNode.options?.responseHeaderOutputs != null))) throw new TypeError("Dynamic Webhook responses require Flow model version 10.");
 	if (content.modelVersion < 9 && Object.values(content.document.graph.nodes).some((candidateNode) => "retry" in candidateNode && candidateNode.retry != null)) throw new TypeError("Node retries require Flow model version 9.");
 	if (content.modelVersion < 9 && Object.values(content.document.graph.nodes).some((candidateNode) => {
@@ -9648,6 +9682,24 @@ function validVariableName(value) {
 function portsByHandle(ports) {
 	return Object.fromEntries(ports.flatMap((port) => "handle" in port ? [[port.handle, port]] : []));
 }
+var workflowToolNamePattern = /^[A-Za-z][A-Za-z0-9_-]{0,63}$/;
+function workflowToolNameIssue(name, otherNames = []) {
+	if (!workflowToolNamePattern.test(name)) return "invalid";
+	for (const other of otherNames) if (other == name) return "duplicate";
+}
+function decodeTaskCapabilities(value) {
+	if (!Array.isArray(value)) throw new TypeError("Task capabilities must be an array.");
+	const parsed = authoringDefinitionSchemas.capabilities.parse(value);
+	const connectors = decodeConnectorCapabilities(parsed.filter((item) => item.kind == "connector"));
+	const names = /* @__PURE__ */ new Set();
+	for (const item of parsed) {
+		if (item.kind != "workflow") continue;
+		if (workflowToolNameIssue(item.name, names)) throw new TypeError("Workflow tool names must be unique provider-compatible names.");
+		names.add(item.name);
+	}
+	let connectorIndex = 0;
+	return parsed.map((item) => item.kind == "connector" ? connectors[connectorIndex++] : item);
+}
 function decodeConnectorCapabilities(value) {
 	if (!Array.isArray(value)) throw new TypeError("Connector capabilities must be an array.");
 	if (value.length == 0) return [];
@@ -9780,10 +9832,10 @@ function upgradeRevisionContent(content) {
 function upgradeDecodedRevisionContent(content) {
 	const graph = content.document.graph;
 	const hasManual = Object.values(graph.nodes).some((node) => node.kind == "manual");
-	if (!hasManual && content.modelVersion == 10) return content;
+	if (!hasManual && content.modelVersion == 11) return content;
 	return {
 		...content,
-		modelVersion: 10,
+		modelVersion: 11,
 		document: {
 			...content.document,
 			graph: hasManual ? {
@@ -9830,7 +9882,7 @@ function invalid(message) {
 	throw new FlowChangeError(message);
 }
 function applyFlowChanges(content, operations) {
-	const source = content.modelVersion != 10 || Object.values(content.document.graph.nodes).some((node) => node.kind == "manual") ? decodeRevisionContent(content) : content;
+	const source = content.modelVersion != 11 || Object.values(content.document.graph.nodes).some((node) => node.kind == "manual") ? decodeRevisionContent(content) : content;
 	const document = { ...source.document };
 	const modules = { ...source.modules };
 	for (const operation of operations) switch (operation.kind) {
@@ -9944,7 +9996,7 @@ function applyFlowChanges(content, operations) {
 			const graph = document.graph;
 			if (!dequal(graph.nodes[operation.nodeId], operation.before)) invalid("The Node changed before this operation was applied.");
 			if (operation.node.kind != operation.before.kind) invalid("Replacing a Node cannot change its kind.");
-			if (operation.node.kind == "task" && "moduleId" in operation.node.task && operation.node.task.capabilities !== void 0) decodeConnectorCapabilities(operation.node.task.capabilities);
+			if (operation.node.kind == "task" && "moduleId" in operation.node.task && operation.node.task.capabilities !== void 0) decodeTaskCapabilities(operation.node.task.capabilities);
 			const name = normalizeNodeName(operation.node.name ?? "");
 			const issue = nodeNameIssue(graph, operation.nodeId, name);
 			if (issue != null) invalid(`Node name is ${issue}.`);
@@ -9966,7 +10018,7 @@ function applyFlowChanges(content, operations) {
 			if (graph.nodes[operation.nodeId] != null) invalid("A Node with this ID already exists in the target graph.");
 			if (operation.node.kind == "error" && Object.values(graph.nodes).some((node) => node.kind == "error")) invalid("A graph can contain only one Flow Error node.");
 			if ((operation.node.kind == "manual" || operation.node.kind == "start") && Object.values(graph.nodes).some((node) => node.kind == "manual" || node.kind == "start")) invalid("A graph can contain only one Start Trigger.");
-			if (operation.node.kind == "task" && "moduleId" in operation.node.task && operation.node.task.capabilities !== void 0) decodeConnectorCapabilities(operation.node.task.capabilities);
+			if (operation.node.kind == "task" && "moduleId" in operation.node.task && operation.node.task.capabilities !== void 0) decodeTaskCapabilities(operation.node.task.capabilities);
 			if (operation.node.name == null) invalid("A Node name cannot be empty.");
 			if (operation.node.kind == "outputs" && Object.values(graph.nodes).some((node) => node.kind == "outputs")) invalid("A graph can contain only one Outputs node.");
 			const name = normalizeNodeName(operation.node.name);
@@ -10065,7 +10117,7 @@ function applyFlowChanges(content, operations) {
 			if (!dequal(node.task.capabilities, operation.before)) invalid("The inline Task capabilities changed before this operation was applied.");
 			const task = { ...node.task };
 			if (operation.value === void 0) delete task.capabilities;
-			else task.capabilities = decodeConnectorCapabilities(operation.value);
+			else task.capabilities = decodeTaskCapabilities(operation.value);
 			Object.assign(document, { graph: {
 				...graph,
 				nodes: {
@@ -10278,9 +10330,9 @@ function applyFlowChanges(content, operations) {
 	assertOpenApiAuthBindings(document);
 	return upgradeDecodedRevisionContent({
 		document,
-		modelVersion: 10,
+		modelVersion: 11,
 		modules
 	});
 }
 //#endregion
-export { FlowChangeError, applyFlowChanges, changeOperationsSchema, currentFlowModelVersion, decodeChangeOperations, decodeConnectorCapabilities, fixedInputValue, inputValue, inputValues, isSchemaKeyword, isTriggerNode, nextNodeName, nodeErrorSchema, nodeNameIssue, nodeSystemOutputPorts, normalizeNodeName, portsByHandle, resourceNameIssue, resourceNameMaxLength, supportsNodeErrorHandling, supportsNodeRetry, upgradeManualTrigger, upgradeRevisionContent, validVariableName };
+export { FlowChangeError, applyFlowChanges, changeOperationsSchema, currentFlowModelVersion, decodeChangeOperations, decodeConnectorCapabilities, decodeTaskCapabilities, fixedInputValue, inputValue, inputValues, isSchemaKeyword, isTriggerNode, nextNodeName, nodeErrorSchema, nodeNameIssue, nodeSystemOutputPorts, normalizeNodeName, portsByHandle, resourceNameIssue, resourceNameMaxLength, supportsNodeErrorHandling, supportsNodeRetry, upgradeManualTrigger, upgradeRevisionContent, validVariableName, workflowToolNameIssue, workflowToolNamePattern };

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

@@ -1,4 +1,4 @@
-import type { FlowDocument, RevisionContent } from '../browser/flow-change.js';
+import type { FlowDocument, RevisionContent } from './flow-change.js';
 export interface ConnectionUsage {
     readonly providerId: string;
     readonly connectionId?: string;

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

@@ -1,7 +1,7 @@
 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, upgradeWorkflowInterfaceDocument } from '../browser/flow-change-schema.js';
+export { decodeFlowDocument, decodeRevisionContent, upgradeWorkflowInterfaceDocument } from './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>;

package/dist/common/flow-encoding.js

@@ -8678,7 +8678,7 @@ var ports = {
 	inputs: array(union([input, group])),
 	outputs: array(union([port, group]))
 };
-var capability = union([
+var connectorCapabilitySchema = union([
 	strictObject({
 		kind: literal("connector"),
 		action: text,
@@ -8710,6 +8710,15 @@ var capability = union([
 		})).optional()
 	})
 ]);
+var workflowCapabilitySchema = strictObject({
+	kind: literal("workflow"),
+	name: text,
+	flowId: text,
+	revisionId: text,
+	inputs: array(port),
+	outputs: array(port).nullable()
+});
+var capability = union([connectorCapabilitySchema, workflowCapabilitySchema]);
 var inline = object({
 	...ports,
 	name: text,
@@ -8724,6 +8733,20 @@ var agentValue = union([object({
 	input: text
 })]);
 var agentInput = union([agentValue, object({ kind: literal("model") })]);
+var agentToolFields = {
+	id: text,
+	name: text,
+	description: text,
+	approval: boolean(),
+	inputs: array(input.extend({ source: agentInput }))
+};
+var connectorAgentToolSchema = object({
+	...agentToolFields,
+	kind: literal("connector").optional(),
+	action: text,
+	connectionId: actionConnection.optional()
+});
+var workflowAgentToolSchema = workflowCapabilitySchema.extend(agentToolFields);
 var decisionQuestion = discriminatedUnion("type", [
 	strictObject({
 		name: text,
@@ -8792,15 +8815,7 @@ var managedFields = object({
 			model: text,
 			prompt: text,
 			maxRounds: number(),
-			tools: array(object({
-				id: text,
-				name: text,
-				description: text,
-				action: text,
-				connectionId: actionConnection.optional(),
-				approval: boolean(),
-				inputs: array(input.extend({ source: agentInput }))
-			})),
+			tools: array(union([workflowAgentToolSchema, connectorAgentToolSchema])),
 			notification: object({
 				action: text,
 				connectionId: actionConnection.optional(),
@@ -9065,7 +9080,8 @@ var revision = object({
 		literal(7),
 		literal(8),
 		literal(9),
-		literal(10)
+		literal(10),
+		literal(11)
 	]),
 	document,
 	modules: record$1(text, module)
@@ -9320,14 +9336,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 > 10) throw new TypeError("The Flow model is newer than this package.");
+	if (typeof envelopeSource.modelVersion == "number" && envelopeSource.modelVersion > 11) 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);
 	sourceDocument = record(normalizeDocument(sourceDocument));
 	const bindings = record(sourceDocument.bindings);
 	const sourceGraph = repairGraph(sourceDocument.graph, bindings);
 	return decodeRevisionContent({
-		modelVersion: 10,
+		modelVersion: 11,
 		document: {
 			bindings: repairedEntries(sourceDocument.bindings, binding),
 			graph: sourceGraph
@@ -9529,6 +9545,7 @@ array(union([...new Map(Object.entries(shapes).map(([kind, shape]) => [kind, sha
 	...shape
 })])).values()])).min(1);
 function checkModelVersion(content) {
+	if (content.modelVersion < 11 && Object.values(content.document.graph.nodes).some((candidateNode) => candidateNode.kind == "task" && ("moduleId" in candidateNode.task ? candidateNode.task.capabilities?.some((item) => item.kind == "workflow") : candidateNode.task.executor.kind == "agent" && candidateNode.task.executor.tools.some((item) => item.kind == "workflow")))) throw new TypeError("Workflow tools require Flow model version 11.");
 	if (content.modelVersion < 10 && Object.values(content.document.graph.nodes).some((candidateNode) => candidateNode.kind == "webhook" && (candidateNode.options?.responseBody != null || candidateNode.options?.responseStatusCodeOutput != null || candidateNode.options?.responseHeadersSource != null || candidateNode.options?.responseHeaderOutputs != null))) throw new TypeError("Dynamic Webhook responses require Flow model version 10.");
 	if (content.modelVersion < 9 && Object.values(content.document.graph.nodes).some((candidateNode) => "retry" in candidateNode && candidateNode.retry != null)) throw new TypeError("Node retries require Flow model version 9.");
 	if (content.modelVersion < 9 && Object.values(content.document.graph.nodes).some((candidateNode) => {
@@ -9584,10 +9601,10 @@ function upgradeRevisionContent(content) {
 function upgradeDecodedRevisionContent(content) {
 	const graph = content.document.graph;
 	const hasManual = Object.values(graph.nodes).some((node) => node.kind == "manual");
-	if (!hasManual && content.modelVersion == 10) return content;
+	if (!hasManual && content.modelVersion == 11) return content;
 	return {
 		...content,
-		modelVersion: 10,
+		modelVersion: 11,
 		document: {
 			...content.document,
 			graph: hasManual ? {
@@ -9663,6 +9680,7 @@ function clearNodeConnections(graph, connectionId) {
 				return [id, node];
 			}
 			const capabilities = node.task.capabilities?.map((capability) => {
+				if (capability.kind == "workflow") return capability;
 				if (!("mode" in capability)) {
 					if ("action" in capability) {
 						const { connectionId: selected, ...rest } = capability;
@@ -10158,7 +10176,7 @@ function revisionRepairKind(bytes) {
 		return;
 	}
 	const source = value;
-	return typeof source.modelVersion == "number" && source.modelVersion < 10 ? "upgrade" : "repair";
+	return typeof source.modelVersion == "number" && source.modelVersion < 11 ? "upgrade" : "repair";
 }
 function repairRevision(bytes) {
 	return repairRevisionEnvelope(revisionValue(bytes));

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

@@ -1,4 +1,4 @@
-import type { GraphNode, PortDefinition } from '../browser/flow-change.js';
+import type { GraphNode, PortDefinition } from './flow-change.js';
 export type NodeErrorData = {
     readonly code: string;
     readonly message: string;

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

@@ -1,4 +1,4 @@
-import type { Graph, GraphNode, InputPortDefinition, NodeSource, PortDefinition, RevisionContent, SchemaMismatch } from '../browser/flow-change.js';
+import type { Graph, GraphNode, InputPortDefinition, NodeSource, PortDefinition, RevisionContent, SchemaMismatch } from './flow-change.js';
 import type { Diagnostic } from './flow-semantics.js';
 export declare function isResolutionNode(node: GraphNode | undefined): node is Extract<GraphNode, {
     readonly kind: 'approval' | 'wait';

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

@@ -1,5 +1,5 @@
 import type { EngineContract } from './engine-contract.js';
-import type { RevisionContent } from '../browser/flow-change.js';
+import type { RevisionContent } from './flow-change.js';
 import type { Diagnostic } from './flow-semantics.js';
 interface ImportReference {
     readonly column: number;

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

@@ -1,4 +1,4 @@
-import type { JsonValue } from '../browser/flow-change.js';
+import type { JsonValue } from './flow-change.js';
 export declare const promptReferencePattern: RegExp;
 export declare function renderPrompt(template: string, input: Readonly<Record<string, JsonValue>>): string;
 export declare function renamePromptInput(template: string, before: string, after: string): string;

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

@@ -1,4 +1,4 @@
-import type { GraphNode } from '../browser/flow-change.js';
+import type { GraphNode } from './flow-change.js';
 import { z } from 'zod';
 export interface RetryConfiguration {
     readonly maxRetries: number;

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

@@ -3,7 +3,7 @@ export { connectionUsage, removeConnectionUsage } from './flow-connectionUsage.j
 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, InputMapping, JsonValue, Port, RevisionContent, SchemaMismatch } from '../browser/flow-change.js';
+import type { ConnectorActionCapability, ConnectorCapability, Graph, InputMapping, JsonValue, Port, RevisionContent, SchemaMismatch } from './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';