@oomol-lab/open-flow 0.1.0-beta.90 → 0.1.0-beta.91

package/package.json

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

package/src/control/common/authoringTools.ts

@@ -99,7 +99,7 @@ export async function prepareAgentTools(
         name: tool.name,
         description: tool.description,
         approval: tool.approval,
-        inputs: preparedTool.inputs.map((port) => Object.assign({}, port, { source: tool.inputs?.[port.handle] ?? port.source })),
+        inputs: preparedTool.inputs.map(({ value: _value, ...port }) => Object.assign({}, port, { source: tool.inputs?.[port.handle] ?? port.source })),
       })
       continue
     }
@@ -116,7 +116,9 @@ export async function prepareAgentTools(
       ...settings,
       id: old?.id ?? id(),
       action: definition?.actionId ?? tool.action,
-      inputs: ports.map((port) => (sources != null && Object.hasOwn(sources, port.handle) ? Object.assign({}, port, { source: sources[port.handle]! }) : port)),
+      inputs: ports.map(({ value: _value, ...port }) =>
+        sources != null && Object.hasOwn(sources, port.handle) ? Object.assign({}, port, { source: sources[port.handle]! }) : port,
+      ),
     })
   }
   return prepared

package/src/flow/common/schemaComparer.ts

@@ -1,5 +1,7 @@
+import type { Schema as JsonSchema } from '@cfworker/json-schema'
 import type { ExtendsSchema, SubsetCompare } from '../../json-schema-subset/index.ts'
 
+import { Validator } from '@cfworker/json-schema'
 import { isString, toPlainObject } from '@wopjs/cast'
 import { CompiledKind, getKind, isCompiledSchema } from '../../json-schema-subset/compiler/index.ts'
 import { ExpressionSingleResult, makeSubsetCompare } from '../../json-schema-subset/index.ts'
@@ -72,12 +74,20 @@ class SingleSelectSchema extends SpecialSchema<SingleSelectSchemaValue> {
 
   public constructor(id: number, value: unknown, context?: unknown) {
     if (!SingleSelectSchema.isMatch(value)) throw new TypeError('Invalid single-select schema.')
-    super(id, value, context)
+    const validator = new Validator(structuredClone(value) as JsonSchema, '7')
+    super(id, { enum: value.enum.filter((item) => validator.validate(item).valid) }, context)
   }
 
   protected compareImpl(other: unknown): readonly ExpressionSingleResult[] {
+    if (this.value.enum.length == 0) {
+      const empty = other instanceof SingleSelectSchema ? other.value.enum.length == 0 : isCompiledSchema(other) && getKind(other) === CompiledKind.Never
+      return [empty ? ExpressionSingleResult.Equals : ExpressionSingleResult.ContainedBy]
+    }
     if (isStringLikeSchema(other)) {
-      return [ExpressionSingleResult.ContainedBy]
+      const validator = new Validator(structuredClone(other) as JsonSchema, '7')
+      const accepted = this.value.enum.filter((item) => validator.validate(item).valid).length
+      if (accepted == this.value.enum.length) return [ExpressionSingleResult.ContainedBy]
+      return [accepted == 0 ? ExpressionSingleResult.Rejection : ExpressionSingleResult.Intersection]
     }
 
     if (other instanceof SingleSelectSchema) {

package/src/json-schema-subset/checker/equals.ts

@@ -84,6 +84,9 @@ export function schemaEqualsChecker<E>(extendsContext: ExtendsContext): (schema1
     if (typeof value1 !== typeof value2) {
       return false
     }
+    if (extendsContext.isExtendsSchema(value1) || extendsContext.isExtendsSchema(value2)) {
+      return extendsContext.equals(value1, value2)
+    }
     if (isCompiledSchema<E>(value1) && isCompiledSchema<E>(value2)) {
       return isCompiledSchemaEquals(value1, value2)
     }

package/src/trigger/providers/catalog.generated.json

@@ -3640,7 +3640,15 @@
       "type": "integration"
     },
     "callback": {
-      "headers": ["x-shopify-api-version", "x-shopify-event-id", "x-shopify-shop-domain", "x-shopify-topic", "x-shopify-triggered-at", "x-shopify-webhook-id"],
+      "headers": [
+        "x-shopify-api-version",
+        "x-shopify-event-id",
+        "x-shopify-hmac-sha256",
+        "x-shopify-shop-domain",
+        "x-shopify-topic",
+        "x-shopify-triggered-at",
+        "x-shopify-webhook-id"
+      ],
       "query": ["open_flow_callback"]
     },
     "options": false

package/src/workflow/common/workflow.ts

@@ -189,9 +189,10 @@ export function workflowAgentTool(id: string, name: string, target: WorkflowCont
     id,
     description: previous?.description ?? target.name,
     approval: previous?.approval ?? false,
-    inputs: capability.inputs.map((port) =>
-      Object.assign({}, port, { source: previous?.inputs.find((old) => old.handle == port.handle)?.source ?? { kind: 'model' as const } }),
-    ),
+    inputs: capability.inputs.map((input) => {
+      const { value: _value, ...port } = input as typeof input & { value?: unknown }
+      return Object.assign({}, port, { source: previous?.inputs.find((old) => old.handle == port.handle)?.source ?? { kind: 'model' as const } })
+    }),
   }
 }