@oomol-lab/open-flow 0.1.0-beta.80 → 0.1.0-beta.81

package/dist/common/control-requests.js

@@ -15393,6 +15393,21 @@ function applyFlowChanges(content, operations) {
 	});
 }
 //#endregion
+//#region src/connector/common/actionContract.ts
+/** These rules also apply to existing Revision snapshots without a catalog lookup. */
+var connectorActionContracts = { "leina.send_notification": {
+	inputConstraints: [{
+		handle: "leinaId",
+		jsonSchema: {
+			type: "string",
+			pattern: "\\S"
+		},
+		code: "leina.robot-required",
+		message: "Select a Leina robot or bind its identifier to an input source."
+	}],
+	pendingMessageInput: "message"
+} };
+//#endregion
 //#region src/flow/common/edgeChanges.ts
 function connect(content, edge) {
 	const selected = content.document.graph;
@@ -15403,11 +15418,12 @@ function connect(content, edge) {
 	}];
 	const source = selected.nodes[edge.source];
 	const target = selected.nodes[edge.target];
-	if (edge.sourceHandle == "pending" && (source?.kind == "approval" || source?.kind == "wait") && target?.kind == "task" && "executor" in target.task && target.task.executor.kind == "connector" && target.task.executor.action == "leina.send_notification" && (target.inputs.message == null || target.inputs.message.kind == "unset")) changes.push({
+	const messageInput = target?.kind == "task" && "executor" in target.task && target.task.executor.kind == "connector" ? connectorActionContracts[target.task.executor.action]?.pendingMessageInput : void 0;
+	if (edge.sourceHandle == "pending" && (source?.kind == "approval" || source?.kind == "wait") && target?.kind == "task" && messageInput != null && (target.inputs[messageInput] == null || target.inputs[messageInput]?.kind == "unset")) changes.push({
 		kind: "graph.node.input.set",
 		nodeId: edge.target,
-		handle: "message",
-		before: target.inputs.message,
+		handle: messageInput,
+		before: target.inputs[messageInput],
 		value: {
 			kind: "sources",
 			sources: [{

package/dist/common/flow-authoring.js

@@ -57,6 +57,21 @@ function dequal(foo, bar) {
 	return foo !== foo && bar !== bar;
 }
 //#endregion
+//#region src/connector/common/actionContract.ts
+/** These rules also apply to existing Revision snapshots without a catalog lookup. */
+var connectorActionContracts = { "leina.send_notification": {
+	inputConstraints: [{
+		handle: "leinaId",
+		jsonSchema: {
+			type: "string",
+			pattern: "\\S"
+		},
+		code: "leina.robot-required",
+		message: "Select a Leina robot or bind its identifier to an input source."
+	}],
+	pendingMessageInput: "message"
+} };
+//#endregion
 //#region src/flow/common/edgeChanges.ts
 function connect(content, edge) {
 	const selected = content.document.graph;
@@ -67,11 +82,12 @@ function connect(content, edge) {
 	}];
 	const source = selected.nodes[edge.source];
 	const target = selected.nodes[edge.target];
-	if (edge.sourceHandle == "pending" && (source?.kind == "approval" || source?.kind == "wait") && target?.kind == "task" && "executor" in target.task && target.task.executor.kind == "connector" && target.task.executor.action == "leina.send_notification" && (target.inputs.message == null || target.inputs.message.kind == "unset")) changes.push({
+	const messageInput = target?.kind == "task" && "executor" in target.task && target.task.executor.kind == "connector" ? connectorActionContracts[target.task.executor.action]?.pendingMessageInput : void 0;
+	if (edge.sourceHandle == "pending" && (source?.kind == "approval" || source?.kind == "wait") && target?.kind == "task" && messageInput != null && (target.inputs[messageInput] == null || target.inputs[messageInput]?.kind == "unset")) changes.push({
 		kind: "graph.node.input.set",
 		nodeId: edge.target,
-		handle: "message",
-		before: target.inputs.message,
+		handle: messageInput,
+		before: target.inputs[messageInput],
 		value: {
 			kind: "sources",
 			sources: [{

package/dist/common/flow-semantics.js

@@ -22,6 +22,21 @@ function dequal(foo, bar) {
 	return foo !== foo && bar !== bar;
 }
 //#endregion
+//#region src/connector/common/actionContract.ts
+/** These rules also apply to existing Revision snapshots without a catalog lookup. */
+var connectorActionContracts = { "leina.send_notification": {
+	inputConstraints: [{
+		handle: "leinaId",
+		jsonSchema: {
+			type: "string",
+			pattern: "\\S"
+		},
+		code: "leina.robot-required",
+		message: "Select a Leina robot or bind its identifier to an input source."
+	}],
+	pendingMessageInput: "message"
+} };
+//#endregion
 //#region ../../node_modules/.bun/@cfworker+json-schema@4.1.1/node_modules/@cfworker/json-schema/dist/esm/deep-compare-strict.js
 function deepCompareStrict(a, b) {
 	const typeofa = typeof a;
@@ -25089,15 +25104,17 @@ async function validateFlow(revision, engine) {
 			message,
 			path: `/document/graph/nodes/${nodeId}/task/executor`
 		});
-		if (task.executor.kind == "connector" && task.executor.action == "leina.send_notification") {
-			const mapping = node.inputs.leinaId;
-			const value = inputValue(mapping, nodeInputPorts(node).leinaId?.value);
-			if ((mapping?.kind != "sources" || mapping.sources.length == 0) && (typeof value != "string" || value.trim().length == 0)) checked.diagnostics.push({
-				code: "leina.robot-required",
+		if (task.executor.kind == "connector") for (const constraint of connectorActionContracts[task.executor.action]?.inputConstraints ?? []) {
+			const mapping = node.inputs[constraint.handle];
+			if (mapping?.kind == "sources" && mapping.sources.length > 0) continue;
+			const value = inputValue(mapping, nodeInputPorts(node)[constraint.handle]?.value);
+			if (value !== void 0 && matchesSchema(value, constraint.jsonSchema)) continue;
+			checked.diagnostics.push({
+				code: constraint.code,
 				column: 0,
 				line: 1,
-				message: "Select a Leina robot or bind its identifier to an input source.",
-				path: `/document/graph/nodes/${nodeId}/inputs/leinaId`
+				message: constraint.message,
+				path: `/document/graph/nodes/${nodeId}/inputs/${constraint.handle}`
 			});
 		}
 		if (task.executor.kind == "connector" && task.executor.action.length == 0) checked.diagnostics.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oomol-lab/open-flow",
-  "version": "0.1.0-beta.80",
+  "version": "0.1.0-beta.81",
   "description": "TypeScript contracts and Browser runtime for Open Flow.",
   "license": "SEE LICENSE IN LICENSE",
   "repository": {

package/src/connector/common/actionContract.ts

@@ -0,0 +1,26 @@
+import type { JsonValue } from '../../types/index.ts'
+
+interface ConnectorActionContract {
+  readonly inputConstraints?: readonly {
+    readonly handle: string
+    readonly jsonSchema: JsonValue
+    readonly code: string
+    readonly message: string
+  }[]
+  readonly pendingMessageInput?: string
+}
+
+/** These rules also apply to existing Revision snapshots without a catalog lookup. */
+export const connectorActionContracts: Readonly<Record<string, ConnectorActionContract | undefined>> = {
+  'leina.send_notification': {
+    inputConstraints: [
+      {
+        handle: 'leinaId',
+        jsonSchema: { type: 'string', pattern: '\\S' },
+        code: 'leina.robot-required',
+        message: 'Select a Leina robot or bind its identifier to an input source.',
+      },
+    ],
+    pendingMessageInput: 'message',
+  },
+}

package/src/flow/common/edgeChanges.ts

@@ -1,6 +1,7 @@
 import type { ChangeOperation, GraphEdge, RevisionContent } from './change.ts'
 
 import { dequal } from 'dequal/lite'
+import { connectorActionContracts } from '../../connector/common/actionContract.ts'
 
 export function connect(content: RevisionContent, edge: GraphEdge): readonly ChangeOperation[] {
   const selected = content.document.graph
@@ -8,20 +9,22 @@ export function connect(content: RevisionContent, edge: GraphEdge): readonly Cha
   const changes: ChangeOperation[] = [{ edge, kind: 'graph.edge.connect' }]
   const source = selected.nodes[edge.source]
   const target = selected.nodes[edge.target]
+  const messageInput =
+    target?.kind == 'task' && 'executor' in target.task && target.task.executor.kind == 'connector'
+      ? connectorActionContracts[target.task.executor.action]?.pendingMessageInput
+      : undefined
   if (
     edge.sourceHandle == 'pending' &&
     (source?.kind == 'approval' || source?.kind == 'wait') &&
     target?.kind == 'task' &&
-    'executor' in target.task &&
-    target.task.executor.kind == 'connector' &&
-    target.task.executor.action == 'leina.send_notification' &&
-    (target.inputs.message == null || target.inputs.message.kind == 'unset')
+    messageInput != null &&
+    (target.inputs[messageInput] == null || target.inputs[messageInput]?.kind == 'unset')
   ) {
     changes.push({
       kind: 'graph.node.input.set',
       nodeId: edge.target,
-      handle: 'message',
-      before: target.inputs.message,
+      handle: messageInput,
+      before: target.inputs[messageInput],
       value: { kind: 'sources', sources: [{ kind: 'node', nodeId: edge.source, output: 'pending', field: 'message' }] },
     })
   }

package/src/flow/common/semantics.ts

@@ -1,4 +1,5 @@
 import { dequal } from 'dequal/lite'
+import { connectorActionContracts } from '../../connector/common/actionContract.ts'
 import { decisionTaskIssues } from '../../decision/common/decision.ts'
 import { httpRequestIssues, httpAuthHandles, httpRequestTask, httpRequestUrl } from '../../http/common/httpRequest.ts'
 import { openApiIssues, authHandles } from '../../openapi/common/openapi.ts'
@@ -22,7 +23,7 @@ import { canonicalJsonBytes, canonicalModule, canonicalRevisionGraph, digestByte
 import { nodeInputPorts, validateFlowGraph } from './graph.ts'
 import { inputValue } from './inputValue.ts'
 import { compareDiagnostics, validateModuleGraph } from './modules.ts'
-import { hasRetiredRef } from './schema.ts'
+import { hasRetiredRef, matchesSchema } from './schema.ts'
 export { availableOutputs, graphOrder, nodeInputPorts } from './graph.ts'
 export { validateModules } from './modules.ts'
 export { matchesSchema, schemaValidationErrors, variableInputCompatible } from './schema.ts'
@@ -349,16 +350,18 @@ export async function validateFlow(revision: RevisionContent, engine: EngineCont
     for (const message of agentConfigIssues(task)) {
       checked.diagnostics.push({ code: 'agent.config-invalid', column: 0, line: 1, message, path: `/document/graph/nodes/${nodeId}/task/executor` })
     }
-    if (task.executor.kind == 'connector' && task.executor.action == 'leina.send_notification') {
-      const mapping = node.inputs.leinaId
-      const value = inputValue(mapping, nodeInputPorts(node).leinaId?.value)
-      if ((mapping?.kind != 'sources' || mapping.sources.length == 0) && (typeof value != 'string' || value.trim().length == 0)) {
+    if (task.executor.kind == 'connector') {
+      for (const constraint of connectorActionContracts[task.executor.action]?.inputConstraints ?? []) {
+        const mapping = node.inputs[constraint.handle]
+        if (mapping?.kind == 'sources' && mapping.sources.length > 0) continue
+        const value = inputValue(mapping, nodeInputPorts(node)[constraint.handle]?.value)
+        if (value !== undefined && matchesSchema(value, constraint.jsonSchema)) continue
         checked.diagnostics.push({
-          code: 'leina.robot-required',
+          code: constraint.code,
           column: 0,
           line: 1,
-          message: 'Select a Leina robot or bind its identifier to an input source.',
-          path: `/document/graph/nodes/${nodeId}/inputs/leinaId`,
+          message: constraint.message,
+          path: `/document/graph/nodes/${nodeId}/inputs/${constraint.handle}`,
         })
       }
     }