@copilotkit/shared 1.84.2-canary.1793809041 → 1.84.2-canary.openbot-intel-fixes
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/a2ui-catalog-schema.cjs +14 -5
- package/dist/a2ui-catalog-schema.cjs.map +1 -1
- package/dist/a2ui-catalog-schema.d.cts +4 -2
- package/dist/a2ui-catalog-schema.d.cts.map +1 -1
- package/dist/a2ui-catalog-schema.d.mts +4 -2
- package/dist/a2ui-catalog-schema.d.mts.map +1 -1
- package/dist/a2ui-catalog-schema.mjs +14 -5
- package/dist/a2ui-catalog-schema.mjs.map +1 -1
- package/dist/event-transforms/open-generative-ui-middleware.cjs +7 -6
- package/dist/event-transforms/open-generative-ui-middleware.cjs.map +1 -1
- package/dist/event-transforms/open-generative-ui-middleware.d.cts.map +1 -1
- package/dist/event-transforms/open-generative-ui-middleware.d.mts.map +1 -1
- package/dist/event-transforms/open-generative-ui-middleware.mjs +7 -6
- package/dist/event-transforms/open-generative-ui-middleware.mjs.map +1 -1
- package/dist/generative-ui/catalog/catalog-export.cjs +329 -0
- package/dist/generative-ui/catalog/catalog-export.cjs.map +1 -0
- package/dist/generative-ui/catalog/catalog-export.d.cts +92 -0
- package/dist/generative-ui/catalog/catalog-export.d.cts.map +1 -0
- package/dist/generative-ui/catalog/catalog-export.d.mts +92 -0
- package/dist/generative-ui/catalog/catalog-export.d.mts.map +1 -0
- package/dist/generative-ui/catalog/catalog-export.mjs +328 -0
- package/dist/generative-ui/catalog/catalog-export.mjs.map +1 -0
- package/dist/generative-ui/catalog/catalog.cjs +314 -0
- package/dist/generative-ui/catalog/catalog.cjs.map +1 -0
- package/dist/generative-ui/catalog/catalog.d.cts +407 -0
- package/dist/generative-ui/catalog/catalog.d.cts.map +1 -0
- package/dist/generative-ui/catalog/catalog.d.mts +407 -0
- package/dist/generative-ui/catalog/catalog.d.mts.map +1 -0
- package/dist/generative-ui/catalog/catalog.mjs +311 -0
- package/dist/generative-ui/catalog/catalog.mjs.map +1 -0
- package/dist/generative-ui/catalog/errors.cjs +13 -0
- package/dist/generative-ui/catalog/errors.cjs.map +1 -0
- package/dist/generative-ui/catalog/errors.d.cts +46 -0
- package/dist/generative-ui/catalog/errors.d.cts.map +1 -0
- package/dist/generative-ui/catalog/errors.d.mts +46 -0
- package/dist/generative-ui/catalog/errors.d.mts.map +1 -0
- package/dist/generative-ui/catalog/errors.mjs +12 -0
- package/dist/generative-ui/catalog/errors.mjs.map +1 -0
- package/dist/generative-ui/catalog/index.d.mts +6 -0
- package/dist/generative-ui/catalog/json-schema.cjs +19 -0
- package/dist/generative-ui/catalog/json-schema.cjs.map +1 -0
- package/dist/generative-ui/catalog/json-schema.d.cts +13 -0
- package/dist/generative-ui/catalog/json-schema.d.cts.map +1 -0
- package/dist/generative-ui/catalog/json-schema.d.mts +13 -0
- package/dist/generative-ui/catalog/json-schema.d.mts.map +1 -0
- package/dist/generative-ui/catalog/json-schema.mjs +18 -0
- package/dist/generative-ui/catalog/json-schema.mjs.map +1 -0
- package/dist/generative-ui/catalog/refs.cjs +20 -0
- package/dist/generative-ui/catalog/refs.cjs.map +1 -0
- package/dist/generative-ui/catalog/refs.d.cts +54 -0
- package/dist/generative-ui/catalog/refs.d.cts.map +1 -0
- package/dist/generative-ui/catalog/refs.d.mts +54 -0
- package/dist/generative-ui/catalog/refs.d.mts.map +1 -0
- package/dist/generative-ui/catalog/refs.mjs +18 -0
- package/dist/generative-ui/catalog/refs.mjs.map +1 -0
- package/dist/generative-ui/catalog/schema.cjs +74 -0
- package/dist/generative-ui/catalog/schema.cjs.map +1 -0
- package/dist/generative-ui/catalog/schema.d.cts +43 -0
- package/dist/generative-ui/catalog/schema.d.cts.map +1 -0
- package/dist/generative-ui/catalog/schema.d.mts +43 -0
- package/dist/generative-ui/catalog/schema.d.mts.map +1 -0
- package/dist/generative-ui/catalog/schema.mjs +68 -0
- package/dist/generative-ui/catalog/schema.mjs.map +1 -0
- package/dist/generative-ui/index.cjs +247 -0
- package/dist/generative-ui/index.d.cts +33 -0
- package/dist/generative-ui/index.d.mts +35 -0
- package/dist/generative-ui/index.mjs +34 -0
- package/dist/generative-ui/is-record.cjs +6 -1
- package/dist/generative-ui/is-record.cjs.map +1 -1
- package/dist/generative-ui/is-record.d.cts +6 -0
- package/dist/generative-ui/is-record.d.cts.map +1 -0
- package/dist/generative-ui/is-record.d.mts +6 -0
- package/dist/generative-ui/is-record.d.mts.map +1 -0
- package/dist/generative-ui/is-record.mjs +6 -2
- package/dist/generative-ui/is-record.mjs.map +1 -1
- package/dist/generative-ui/standard/chart.cjs +56 -0
- package/dist/generative-ui/standard/chart.cjs.map +1 -0
- package/dist/generative-ui/standard/chart.d.cts +142 -0
- package/dist/generative-ui/standard/chart.d.cts.map +1 -0
- package/dist/generative-ui/standard/chart.d.mts +142 -0
- package/dist/generative-ui/standard/chart.d.mts.map +1 -0
- package/dist/generative-ui/standard/chart.mjs +54 -0
- package/dist/generative-ui/standard/chart.mjs.map +1 -0
- package/dist/generative-ui/standard/checks.cjs +74 -0
- package/dist/generative-ui/standard/checks.cjs.map +1 -0
- package/dist/generative-ui/standard/checks.d.cts +74 -0
- package/dist/generative-ui/standard/checks.d.cts.map +1 -0
- package/dist/generative-ui/standard/checks.d.mts +74 -0
- package/dist/generative-ui/standard/checks.d.mts.map +1 -0
- package/dist/generative-ui/standard/checks.mjs +71 -0
- package/dist/generative-ui/standard/checks.mjs.map +1 -0
- package/dist/generative-ui/standard/components.cjs +23 -0
- package/dist/generative-ui/standard/components.cjs.map +1 -0
- package/dist/generative-ui/standard/components.d.cts +24 -0
- package/dist/generative-ui/standard/components.d.cts.map +1 -0
- package/dist/generative-ui/standard/components.d.mts +24 -0
- package/dist/generative-ui/standard/components.d.mts.map +1 -0
- package/dist/generative-ui/standard/components.mjs +22 -0
- package/dist/generative-ui/standard/components.mjs.map +1 -0
- package/dist/generative-ui/standard/composites.cjs +143 -0
- package/dist/generative-ui/standard/composites.cjs.map +1 -0
- package/dist/generative-ui/standard/composites.d.cts +500 -0
- package/dist/generative-ui/standard/composites.d.cts.map +1 -0
- package/dist/generative-ui/standard/composites.d.mts +500 -0
- package/dist/generative-ui/standard/composites.d.mts.map +1 -0
- package/dist/generative-ui/standard/composites.mjs +132 -0
- package/dist/generative-ui/standard/composites.mjs.map +1 -0
- package/dist/generative-ui/standard/data.cjs +176 -0
- package/dist/generative-ui/standard/data.cjs.map +1 -0
- package/dist/generative-ui/standard/data.d.cts +745 -0
- package/dist/generative-ui/standard/data.d.cts.map +1 -0
- package/dist/generative-ui/standard/data.d.mts +745 -0
- package/dist/generative-ui/standard/data.d.mts.map +1 -0
- package/dist/generative-ui/standard/data.mjs +167 -0
- package/dist/generative-ui/standard/data.mjs.map +1 -0
- package/dist/generative-ui/standard/declarations.cjs +40 -0
- package/dist/generative-ui/standard/declarations.cjs.map +1 -0
- package/dist/generative-ui/standard/declarations.d.cts +4604 -0
- package/dist/generative-ui/standard/declarations.d.cts.map +1 -0
- package/dist/generative-ui/standard/declarations.d.mts +4605 -0
- package/dist/generative-ui/standard/declarations.d.mts.map +1 -0
- package/dist/generative-ui/standard/declarations.mjs +39 -0
- package/dist/generative-ui/standard/declarations.mjs.map +1 -0
- package/dist/generative-ui/standard/feedback.cjs +97 -0
- package/dist/generative-ui/standard/feedback.cjs.map +1 -0
- package/dist/generative-ui/standard/feedback.d.cts +227 -0
- package/dist/generative-ui/standard/feedback.d.cts.map +1 -0
- package/dist/generative-ui/standard/feedback.d.mts +227 -0
- package/dist/generative-ui/standard/feedback.d.mts.map +1 -0
- package/dist/generative-ui/standard/feedback.mjs +90 -0
- package/dist/generative-ui/standard/feedback.mjs.map +1 -0
- package/dist/generative-ui/standard/index.d.mts +16 -0
- package/dist/generative-ui/standard/inputs.cjs +333 -0
- package/dist/generative-ui/standard/inputs.cjs.map +1 -0
- package/dist/generative-ui/standard/inputs.d.cts +2658 -0
- package/dist/generative-ui/standard/inputs.d.cts.map +1 -0
- package/dist/generative-ui/standard/inputs.d.mts +2658 -0
- package/dist/generative-ui/standard/inputs.d.mts.map +1 -0
- package/dist/generative-ui/standard/inputs.mjs +318 -0
- package/dist/generative-ui/standard/inputs.mjs.map +1 -0
- package/dist/generative-ui/standard/layout.cjs +289 -0
- package/dist/generative-ui/standard/layout.cjs.map +1 -0
- package/dist/generative-ui/standard/layout.d.cts +2854 -0
- package/dist/generative-ui/standard/layout.d.cts.map +1 -0
- package/dist/generative-ui/standard/layout.d.mts +2854 -0
- package/dist/generative-ui/standard/layout.d.mts.map +1 -0
- package/dist/generative-ui/standard/layout.mjs +269 -0
- package/dist/generative-ui/standard/layout.mjs.map +1 -0
- package/dist/generative-ui/standard/map.cjs +27 -0
- package/dist/generative-ui/standard/map.cjs.map +1 -0
- package/dist/generative-ui/standard/map.d.cts +93 -0
- package/dist/generative-ui/standard/map.d.cts.map +1 -0
- package/dist/generative-ui/standard/map.d.mts +93 -0
- package/dist/generative-ui/standard/map.d.mts.map +1 -0
- package/dist/generative-ui/standard/map.mjs +25 -0
- package/dist/generative-ui/standard/map.mjs.map +1 -0
- package/dist/generative-ui/standard/media.cjs +215 -0
- package/dist/generative-ui/standard/media.cjs.map +1 -0
- package/dist/generative-ui/standard/media.d.cts +968 -0
- package/dist/generative-ui/standard/media.d.cts.map +1 -0
- package/dist/generative-ui/standard/media.d.mts +968 -0
- package/dist/generative-ui/standard/media.d.mts.map +1 -0
- package/dist/generative-ui/standard/media.mjs +205 -0
- package/dist/generative-ui/standard/media.mjs.map +1 -0
- package/dist/generative-ui/standard/parameter-order.cjs +231 -0
- package/dist/generative-ui/standard/parameter-order.cjs.map +1 -0
- package/dist/generative-ui/standard/parameter-order.d.cts +84 -0
- package/dist/generative-ui/standard/parameter-order.d.cts.map +1 -0
- package/dist/generative-ui/standard/parameter-order.d.mts +84 -0
- package/dist/generative-ui/standard/parameter-order.d.mts.map +1 -0
- package/dist/generative-ui/standard/parameter-order.mjs +230 -0
- package/dist/generative-ui/standard/parameter-order.mjs.map +1 -0
- package/dist/generative-ui/standard/styles.cjs +62 -0
- package/dist/generative-ui/standard/styles.cjs.map +1 -0
- package/dist/generative-ui/standard/styles.d.cts +17 -0
- package/dist/generative-ui/standard/styles.d.cts.map +1 -0
- package/dist/generative-ui/standard/styles.d.mts +17 -0
- package/dist/generative-ui/standard/styles.d.mts.map +1 -0
- package/dist/generative-ui/standard/styles.mjs +60 -0
- package/dist/generative-ui/standard/styles.mjs.map +1 -0
- package/dist/generative-ui/standard/text.cjs +226 -0
- package/dist/generative-ui/standard/text.cjs.map +1 -0
- package/dist/generative-ui/standard/text.d.cts +687 -0
- package/dist/generative-ui/standard/text.d.cts.map +1 -0
- package/dist/generative-ui/standard/text.d.mts +687 -0
- package/dist/generative-ui/standard/text.d.mts.map +1 -0
- package/dist/generative-ui/standard/text.mjs +209 -0
- package/dist/generative-ui/standard/text.mjs.map +1 -0
- package/dist/generative-ui/standard/theme.cjs +115 -0
- package/dist/generative-ui/standard/theme.cjs.map +1 -0
- package/dist/generative-ui/standard/theme.d.cts +60 -0
- package/dist/generative-ui/standard/theme.d.cts.map +1 -0
- package/dist/generative-ui/standard/theme.d.mts +60 -0
- package/dist/generative-ui/standard/theme.d.mts.map +1 -0
- package/dist/generative-ui/standard/theme.mjs +112 -0
- package/dist/generative-ui/standard/theme.mjs.map +1 -0
- package/dist/generative-ui/standard/tokens.cjs +336 -0
- package/dist/generative-ui/standard/tokens.cjs.map +1 -0
- package/dist/generative-ui/standard/tokens.d.cts +76 -0
- package/dist/generative-ui/standard/tokens.d.cts.map +1 -0
- package/dist/generative-ui/standard/tokens.d.mts +76 -0
- package/dist/generative-ui/standard/tokens.d.mts.map +1 -0
- package/dist/generative-ui/standard/tokens.mjs +305 -0
- package/dist/generative-ui/standard/tokens.mjs.map +1 -0
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +10 -10
- package/dist/index.d.mts +10 -10
- package/dist/index.mjs.map +1 -1
- package/dist/index.umd.js +16 -7
- package/dist/index.umd.js.map +1 -1
- package/dist/package.cjs +1 -1
- package/dist/package.mjs +1 -1
- package/package.json +7 -3
- package/src/__tests__/a2ui-catalog-schema.test.ts +26 -0
- package/src/a2ui-catalog-schema.ts +14 -5
- package/src/event-transforms/open-generative-ui-middleware.ts +19 -10
- package/src/generative-ui/base.ts +9 -0
- package/src/generative-ui/catalog/catalog-export.ts +478 -0
- package/src/generative-ui/catalog/catalog.ts +1166 -0
- package/src/generative-ui/catalog/errors.ts +102 -0
- package/src/generative-ui/catalog/index.ts +6 -0
- package/src/generative-ui/catalog/json-schema.ts +23 -0
- package/src/generative-ui/catalog/refs.ts +86 -0
- package/src/generative-ui/catalog/schema.ts +107 -0
- package/src/generative-ui/index.ts +7 -0
- package/src/generative-ui/is-record.ts +6 -1
- package/src/generative-ui/standard/__tests__/theme.test.ts +61 -0
- package/src/generative-ui/standard/__tests__/tokens.test.ts +139 -0
- package/src/generative-ui/standard/chart.ts +79 -0
- package/src/generative-ui/standard/checks.ts +98 -0
- package/src/generative-ui/standard/components.ts +35 -0
- package/src/generative-ui/standard/composites.ts +158 -0
- package/src/generative-ui/standard/data.ts +213 -0
- package/src/generative-ui/standard/declarations.ts +57 -0
- package/src/generative-ui/standard/feedback.ts +105 -0
- package/src/generative-ui/standard/index.ts +19 -0
- package/src/generative-ui/standard/inputs.ts +423 -0
- package/src/generative-ui/standard/layout.ts +312 -0
- package/src/generative-ui/standard/map.ts +32 -0
- package/src/generative-ui/standard/media.ts +265 -0
- package/src/generative-ui/standard/parameter-order.ts +155 -0
- package/src/generative-ui/standard/styles.ts +79 -0
- package/src/generative-ui/standard/text.ts +210 -0
- package/src/generative-ui/standard/theme.ts +198 -0
- package/src/generative-ui/standard/tokens.ts +317 -0
- package/src/index.ts +1 -1
- package/tsdown.config.ts +1 -0
package/README.md
CHANGED
|
@@ -122,7 +122,7 @@ const modifiedConfig = copilotKitCustomizeConfig(config, {
|
|
|
122
122
|
},
|
|
123
123
|
],
|
|
124
124
|
});
|
|
125
|
-
const response = await ChatOpenAI({ model: "gpt-
|
|
125
|
+
const response = await ChatOpenAI({ model: "gpt-6-luna" }).invoke(
|
|
126
126
|
messages,
|
|
127
127
|
modifiedConfig,
|
|
128
128
|
);
|
|
@@ -27,8 +27,10 @@ const A2UI_BASIC_CATALOG_ID = "https://a2ui.org/specification/v0_9/basic_catalog
|
|
|
27
27
|
*
|
|
28
28
|
* - Reused Zod schemas are inlined rather than emitted as local `$ref`s, which
|
|
29
29
|
* would dangle once properties move under `allOf[1]`.
|
|
30
|
-
* - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream
|
|
31
|
-
*
|
|
30
|
+
* - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream.
|
|
31
|
+
* Upstream writes a common type as a local `#/$defs/<Name>` ref, which an
|
|
32
|
+
* inline catalog without `$defs` leaves dangling; here it is always
|
|
33
|
+
* `common_types.json#/$defs/<Name>`, and the shape it replaced is kept once under
|
|
32
34
|
* `"common_types.json": { "$defs": { <Name>: ... } }`. Every
|
|
33
35
|
* `common_types.json#/$defs/<Name>` ref therefore resolves within the
|
|
34
36
|
* payload, both for agents that only see it as prompt text and for SDKs
|
|
@@ -182,7 +184,14 @@ const SUBSCHEMA_MAP_KEYWORDS = [
|
|
|
182
184
|
"$defs",
|
|
183
185
|
"definitions"
|
|
184
186
|
];
|
|
185
|
-
|
|
187
|
+
/**
|
|
188
|
+
* A reference to a whole common type, in `common_types.json` or local. From
|
|
189
|
+
* `@a2ui/web_core` 0.15 the v0.9 common types mark themselves with local
|
|
190
|
+
* `REF:#/$defs/<Name>` refs, the layout of a bundled catalog document; both
|
|
191
|
+
* forms name the same type, which this payload writes as
|
|
192
|
+
* `common_types.json#/$defs/<Name>`.
|
|
193
|
+
*/
|
|
194
|
+
const COMMON_TYPE_REF = /^(?:common_types\.json)?#\/\$defs\/([^/]+)$/;
|
|
186
195
|
function isObject(value) {
|
|
187
196
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
188
197
|
}
|
|
@@ -227,11 +236,11 @@ function resolveRefMarker(node, commonTypes) {
|
|
|
227
236
|
const marker = parseRefMarker(node.description);
|
|
228
237
|
if (!marker) return node;
|
|
229
238
|
const { description: _marker, ...shape } = node;
|
|
239
|
+
const name = COMMON_TYPE_REF.exec(marker.ref)?.[1];
|
|
230
240
|
const ref = {
|
|
231
|
-
$ref: marker.ref
|
|
241
|
+
$ref: name === void 0 ? marker.ref : `common_types.json#/$defs/${name}`,
|
|
232
242
|
...marker.description ? { description: marker.description } : {}
|
|
233
243
|
};
|
|
234
|
-
const name = COMMON_TYPE_REF.exec(marker.ref)?.[1];
|
|
235
244
|
if (name !== void 0) {
|
|
236
245
|
const known = commonTypes[name];
|
|
237
246
|
if (known === void 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"a2ui-catalog-schema.cjs","names":["ignoreOverride"],"sources":["../src/a2ui-catalog-schema.ts"],"sourcesContent":["import { ignoreOverride, zodToJsonSchema } from \"zod-to-json-schema\";\n\n/**\n * Context description used to identify the A2UI component schema in\n * RunAgentInput.context. Must match the constant in @ag-ui/a2ui-middleware so\n * the middleware can overwrite a frontend-provided schema with a server-side one.\n */\nexport const A2UI_SCHEMA_CONTEXT_DESCRIPTION =\n \"A2UI Component Schema — available components for generating UI surfaces. Use these component names and properties when creating A2UI operations.\";\n\n/** Id of the A2UI v0.9 basic catalog. */\nexport const A2UI_BASIC_CATALOG_ID =\n \"https://a2ui.org/specification/v0_9/basic_catalog.json\";\n\ntype JsonSchema = Record<string, unknown>;\n\n/**\n * The parts of an `@a2ui/web_core` v0.9 `Catalog` that the serializers read.\n * Typed structurally so this module does not depend on web_core, and so the\n * minimal catalog-shaped objects some apps pass in still work.\n */\nexport interface A2UICatalogSchemaSource {\n readonly id: string;\n readonly components: ReadonlyMap<string, { readonly schema: unknown }>;\n /** A `ReadonlyMap` on a real `Catalog`; anything else is tolerated. */\n readonly functions?: unknown;\n readonly themeSchema?: unknown;\n}\n\n/** One entry of {@link A2UIInlineCatalogSchema.functions}. */\nexport interface A2UIFunctionSchema {\n name: string;\n description?: string;\n returnType: string;\n parameters: JsonSchema;\n}\n\n/**\n * A2UI v0.9 inline catalog, the shape of `InlineCatalog` in\n * `@a2ui/web_core/v0_9`, sent to the agent as the component schema.\n */\nexport interface A2UIInlineCatalogSchema {\n catalogId: string;\n components: Record<string, JsonSchema>;\n functions?: A2UIFunctionSchema[];\n theme?: Record<string, JsonSchema>;\n /**\n * One copy of each common type the schemas reference, so every\n * `common_types.json#/$defs/<Name>` ref resolves within this payload.\n */\n \"common_types.json\"?: { $defs: A2UICommonTypes };\n}\n\n/** Common type shapes keyed by their `common_types.json` `$defs` name. */\nexport type A2UICommonTypes = Record<string, JsonSchema>;\n\n/**\n * Serialize a catalog's Zod schemas in the A2UI v0.9 inline catalog format.\n *\n * Each component composes `ComponentCommon` with its own properties, matching\n * the flat wire format the agent must produce:\n *\n * { \"Column\": { \"allOf\": [\n * { \"$ref\": \"common_types.json#/$defs/ComponentCommon\" },\n * { \"properties\": { \"component\": {\"const\":\"Column\"}, \"gap\": ..., \"children\": ... },\n * \"required\": [\"component\"] }\n * ]}}\n *\n * This follows `getClientCapabilities` in `@a2ui/web_core` with these\n * deliberate differences:\n *\n * - Reused Zod schemas are inlined rather than emitted as local `$ref`s, which\n * would dangle once properties move under `allOf[1]`.\n * - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream, but\n * the shape it replaced is kept once under\n * `\"common_types.json\": { \"$defs\": { <Name>: ... } }`. Every\n * `common_types.json#/$defs/<Name>` ref therefore resolves within the\n * payload, both for agents that only see it as prompt text and for SDKs\n * (such as Google's A2UI SDK used by ADK) that read the `$ref`. Each type is\n * stated once rather than at every use site, which keeps the payload small.\n * A use whose shape differs from the stored one keeps its shape inline next\n * to the `$ref`, so the agent never sees a looser type than the client\n * accepts.\n * - A `REF:` marker on a schema's root only sets its description; replacing\n * the root would drop every property.\n * - A component's root `.describe()` is kept as the component `description`.\n * - Function parameters drop `$schema` and the description already given on\n * the function itself, to keep the prompt small.\n */\nexport function extractA2UICatalogSchemas(\n catalog: A2UICatalogSchemaSource,\n): A2UIInlineCatalogSchema {\n // Null prototypes, so a component or type named `__proto__` is kept as an\n // entry.\n const components: Record<string, JsonSchema> = Object.create(null);\n const commonTypes: A2UICommonTypes = Object.create(null);\n\n for (const [name, component] of catalog.components) {\n const schema = serializeA2UISchema(component.schema, commonTypes);\n const properties = (schema.properties ?? {}) as Record<string, JsonSchema>;\n const required = (schema.required ?? []) as string[];\n\n components[name] = {\n ...(typeof schema.description === \"string\"\n ? { description: schema.description }\n : {}),\n allOf: [\n { $ref: \"common_types.json#/$defs/ComponentCommon\" },\n {\n properties: { component: { const: name }, ...properties },\n required: [\"component\", ...required],\n },\n ],\n };\n }\n\n const functions = catalogFunctions(catalog.functions).map((fn) => {\n const { description, ...parameters } = serializeA2UISchema(\n fn.schema,\n commonTypes,\n );\n return {\n name: fn.name,\n ...(typeof description === \"string\" ? { description } : {}),\n returnType: fn.returnType ?? \"any\",\n parameters,\n };\n });\n\n const theme = catalog.themeSchema\n ? (serializeA2UISchema(catalog.themeSchema, commonTypes).properties as\n | Record<string, JsonSchema>\n | undefined)\n : undefined;\n\n return {\n catalogId: catalog.id,\n components,\n ...(functions.length > 0 ? { functions } : {}),\n ...(theme ? { theme } : {}),\n ...(Object.keys(commonTypes).length > 0\n ? { \"common_types.json\": { $defs: commonTypes } }\n : {}),\n };\n}\n\n/**\n * Build a context string describing the catalog's id and the components it\n * adds beyond the basic catalog.\n *\n * Schemas are serialized as in {@link extractA2UICatalogSchemas}, with the\n * common types they reference listed once after the components.\n *\n * When `options.includeSchema` is `false`, custom components are listed by name\n * only and their JSON schemas are omitted.\n */\nexport function buildA2UICatalogContextValue(\n catalog: A2UICatalogSchemaSource,\n basicComponentNames: ReadonlySet<string>,\n options?: { includeSchema?: boolean },\n): string {\n const lines: string[] = [\"Available A2UI catalog:\"];\n\n if (catalog.id === A2UI_BASIC_CATALOG_ID) {\n lines.push(`- ${catalog.id} (basic catalog)`);\n return lines.join(\"\\n\");\n }\n\n const isSuperset = [...basicComponentNames].every((name) =>\n catalog.components.has(name),\n );\n\n lines.push(`- ${catalog.id}`);\n if (isSuperset) {\n lines.push(\n \" Extends the basic catalog with all standard components plus:\",\n );\n } else {\n lines.push(\" Custom catalog (does NOT include all basic components).\");\n lines.push(\" Custom components:\");\n }\n\n const commonTypes: A2UICommonTypes = Object.create(null);\n\n for (const [name, component] of catalog.components) {\n if (basicComponentNames.has(name)) continue;\n if (options?.includeSchema === false) {\n lines.push(` - ${name}`);\n continue;\n }\n lines.push(` - ${name}:`);\n lines.push(indented(serializeA2UISchema(component.schema, commonTypes)));\n }\n\n if (Object.keys(commonTypes).length > 0) {\n lines.push(\" Common types referenced above (common_types.json#/$defs):\");\n lines.push(indented(commonTypes));\n }\n\n return lines.join(\"\\n\");\n}\n\n/** JSON for the catalog context value, indented under a list item. */\nfunction indented(value: unknown): string {\n return ` ${JSON.stringify(value, null, 2).split(\"\\n\").join(\"\\n \")}`;\n}\n\n/** Raw zod-to-json-schema output per Zod schema, stored as JSON text. */\nconst serializedSchemas = new WeakMap<object, string>();\n\n/**\n * zod-to-json-schema's own parameter type. Casting to it (rather than to\n * `ZodTypeAny`) avoids a TS2589 \"excessively deep\" instantiation.\n */\ntype ZodSchemaArg = Parameters<typeof zodToJsonSchema>[0];\n\n/**\n * Convert one A2UI Zod schema to JSON Schema 2019-09, inlining reused schemas\n * and resolving `REF:` markers (see {@link extractA2UICatalogSchemas}). The\n * shapes behind `common_types.json` refs are recorded in `commonTypes`; pass\n * the same map for every schema of one payload.\n *\n * The raw conversion is cached per schema object as JSON text, and every call\n * parses a fresh copy. The JSON round-trip, unlike structuredClone, never\n * throws on values such as a function or a Vue reactive proxy in a\n * `.default()`, and yields exactly what the agent receives.\n */\nexport function serializeA2UISchema(\n schema: unknown,\n commonTypes: A2UICommonTypes = Object.create(null),\n): JsonSchema {\n const key = typeof schema === \"object\" && schema !== null ? schema : null;\n let serialized = key ? serializedSchemas.get(key) : undefined;\n if (serialized === undefined) {\n const jsonSchema = zodToJsonSchema(schema as ZodSchemaArg, {\n target: \"jsonSchema2019-09\",\n $refStrategy: \"none\",\n // With \"none\", zod-to-json-schema already turns a recursive reference\n // into `{}` (any), but logs a warning every time it does. Return `{}`\n // here directly so re-serializing a recursive catalog stays quiet.\n override: (_def, refs, seen, forceResolution) =>\n seen &&\n !forceResolution &&\n seen.path.length < refs.currentPath.length &&\n seen.path.every((part, i) => refs.currentPath[i] === part)\n ? {}\n : ignoreOverride,\n }) as JsonSchema;\n delete jsonSchema.$schema;\n serialized = JSON.stringify(jsonSchema);\n if (key) serializedSchemas.set(key, serialized);\n }\n\n const root = JSON.parse(serialized) as JsonSchema;\n const marker = parseRefMarker(root.description);\n if (marker) {\n delete root.description;\n if (marker.description) root.description = marker.description;\n }\n return resolveSubschemas(root, commonTypes);\n}\n\n/** Keywords whose value is a subschema, or an array of subschemas. */\nconst SUBSCHEMA_KEYWORDS = [\n \"items\",\n \"additionalItems\",\n \"additionalProperties\",\n \"unevaluatedItems\",\n \"unevaluatedProperties\",\n \"contains\",\n \"propertyNames\",\n \"not\",\n \"if\",\n \"then\",\n \"else\",\n \"allOf\",\n \"anyOf\",\n \"oneOf\",\n \"prefixItems\",\n];\n/** Keywords whose value maps names to subschemas. */\nconst SUBSCHEMA_MAP_KEYWORDS = [\n \"properties\",\n \"patternProperties\",\n \"dependentSchemas\",\n \"$defs\",\n \"definitions\",\n];\n\nconst COMMON_TYPE_REF = /^common_types\\.json#\\/\\$defs\\/([^/]+)$/;\n\nfunction isObject(value: unknown): value is JsonSchema {\n return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\n/**\n * Split a `REF:<ref>|<description>` marker at its first `|`, so a description\n * containing `|` is kept whole. The convention comes from\n * `MessageProcessor.processRefs` in `@a2ui/web_core`.\n */\nfunction parseRefMarker(\n description: unknown,\n): { ref: string; description?: string } | undefined {\n if (typeof description !== \"string\" || !description.startsWith(\"REF:\")) {\n return undefined;\n }\n const body = description.slice(4);\n const separator = body.indexOf(\"|\");\n return separator === -1\n ? { ref: body }\n : { ref: body.slice(0, separator), description: body.slice(separator + 1) };\n}\n\n/**\n * Resolve `REF:` markers in a schema's subschemas, innermost first, so a\n * stored common type refers to the types it contains by bare `$ref` too.\n *\n * Only schema-valued keywords are traversed, so literal values under\n * `default`, `const`, `enum` or `examples` are never rewritten.\n */\nfunction resolveSubschemas(\n node: JsonSchema,\n commonTypes: A2UICommonTypes,\n): JsonSchema {\n const resolve = (value: unknown): unknown =>\n Array.isArray(value)\n ? value.map(resolve)\n : isObject(value)\n ? resolveRefMarker(resolveSubschemas(value, commonTypes), commonTypes)\n : value;\n\n const out: JsonSchema = { ...node };\n for (const keyword of SUBSCHEMA_KEYWORDS) {\n if (keyword in out) out[keyword] = resolve(out[keyword]);\n }\n for (const keyword of SUBSCHEMA_MAP_KEYWORDS) {\n const map = out[keyword];\n if (isObject(map)) {\n out[keyword] = Object.fromEntries(\n Object.entries(map).map(([name, child]) => [name, resolve(child)]),\n );\n }\n }\n return out;\n}\n\n/**\n * Turn a node carrying a `REF:` marker into a bare `$ref`, recording the\n * shape it replaced under its `common_types.json` name. A shape that differs\n * from the one already recorded, or a ref outside `common_types.json`, stays\n * inline next to the `$ref`.\n */\nfunction resolveRefMarker(\n node: JsonSchema,\n commonTypes: A2UICommonTypes,\n): JsonSchema {\n const marker = parseRefMarker(node.description);\n if (!marker) return node;\n\n const { description: _marker, ...shape } = node;\n const ref: JsonSchema = {\n $ref: marker.ref,\n ...(marker.description ? { description: marker.description } : {}),\n };\n const name = COMMON_TYPE_REF.exec(marker.ref)?.[1];\n if (name !== undefined) {\n const known = commonTypes[name];\n if (known === undefined) {\n commonTypes[name] = shape;\n return ref;\n }\n if (JSON.stringify(known) === JSON.stringify(shape)) return ref;\n }\n return { ...ref, ...shape };\n}\n\ninterface CatalogFunction {\n name: string;\n returnType?: string;\n schema: unknown;\n}\n\n/**\n * Read a catalog's functions, tolerating catalog-shaped objects whose\n * `functions` is missing, a plain object or an array, and skipping entries\n * without a name or schema.\n */\nfunction catalogFunctions(functions: unknown): CatalogFunction[] {\n if (typeof functions !== \"object\" || functions === null) return [];\n const entries =\n functions instanceof Map\n ? [...functions.values()]\n : Array.isArray(functions)\n ? functions\n : Object.values(functions);\n return entries.filter(\n (fn): fn is CatalogFunction =>\n typeof fn === \"object\" &&\n fn !== null &&\n typeof fn.name === \"string\" &&\n typeof fn.schema === \"object\" &&\n fn.schema !== null,\n );\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"a2ui-catalog-schema.cjs","names":["ignoreOverride"],"sources":["../src/a2ui-catalog-schema.ts"],"sourcesContent":["import { ignoreOverride, zodToJsonSchema } from \"zod-to-json-schema\";\n\n/**\n * Context description used to identify the A2UI component schema in\n * RunAgentInput.context. Must match the constant in @ag-ui/a2ui-middleware so\n * the middleware can overwrite a frontend-provided schema with a server-side one.\n */\nexport const A2UI_SCHEMA_CONTEXT_DESCRIPTION =\n \"A2UI Component Schema — available components for generating UI surfaces. Use these component names and properties when creating A2UI operations.\";\n\n/** Id of the A2UI v0.9 basic catalog. */\nexport const A2UI_BASIC_CATALOG_ID =\n \"https://a2ui.org/specification/v0_9/basic_catalog.json\";\n\ntype JsonSchema = Record<string, unknown>;\n\n/**\n * The parts of an `@a2ui/web_core` v0.9 `Catalog` that the serializers read.\n * Typed structurally so this module does not depend on web_core, and so the\n * minimal catalog-shaped objects some apps pass in still work.\n */\nexport interface A2UICatalogSchemaSource {\n readonly id: string;\n readonly components: ReadonlyMap<string, { readonly schema: unknown }>;\n /** A `ReadonlyMap` on a real `Catalog`; anything else is tolerated. */\n readonly functions?: unknown;\n readonly themeSchema?: unknown;\n}\n\n/** One entry of {@link A2UIInlineCatalogSchema.functions}. */\nexport interface A2UIFunctionSchema {\n name: string;\n description?: string;\n returnType: string;\n parameters: JsonSchema;\n}\n\n/**\n * A2UI v0.9 inline catalog, the shape of `InlineCatalog` in\n * `@a2ui/web_core/v0_9`, sent to the agent as the component schema.\n */\nexport interface A2UIInlineCatalogSchema {\n catalogId: string;\n components: Record<string, JsonSchema>;\n functions?: A2UIFunctionSchema[];\n theme?: Record<string, JsonSchema>;\n /**\n * One copy of each common type the schemas reference, so every\n * `common_types.json#/$defs/<Name>` ref resolves within this payload.\n */\n \"common_types.json\"?: { $defs: A2UICommonTypes };\n}\n\n/** Common type shapes keyed by their `common_types.json` `$defs` name. */\nexport type A2UICommonTypes = Record<string, JsonSchema>;\n\n/**\n * Serialize a catalog's Zod schemas in the A2UI v0.9 inline catalog format.\n *\n * Each component composes `ComponentCommon` with its own properties, matching\n * the flat wire format the agent must produce:\n *\n * { \"Column\": { \"allOf\": [\n * { \"$ref\": \"common_types.json#/$defs/ComponentCommon\" },\n * { \"properties\": { \"component\": {\"const\":\"Column\"}, \"gap\": ..., \"children\": ... },\n * \"required\": [\"component\"] }\n * ]}}\n *\n * This follows `getClientCapabilities` in `@a2ui/web_core` with these\n * deliberate differences:\n *\n * - Reused Zod schemas are inlined rather than emitted as local `$ref`s, which\n * would dangle once properties move under `allOf[1]`.\n * - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream.\n * Upstream writes a common type as a local `#/$defs/<Name>` ref, which an\n * inline catalog without `$defs` leaves dangling; here it is always\n * `common_types.json#/$defs/<Name>`, and the shape it replaced is kept once under\n * `\"common_types.json\": { \"$defs\": { <Name>: ... } }`. Every\n * `common_types.json#/$defs/<Name>` ref therefore resolves within the\n * payload, both for agents that only see it as prompt text and for SDKs\n * (such as Google's A2UI SDK used by ADK) that read the `$ref`. Each type is\n * stated once rather than at every use site, which keeps the payload small.\n * A use whose shape differs from the stored one keeps its shape inline next\n * to the `$ref`, so the agent never sees a looser type than the client\n * accepts.\n * - A `REF:` marker on a schema's root only sets its description; replacing\n * the root would drop every property.\n * - A component's root `.describe()` is kept as the component `description`.\n * - Function parameters drop `$schema` and the description already given on\n * the function itself, to keep the prompt small.\n */\nexport function extractA2UICatalogSchemas(\n catalog: A2UICatalogSchemaSource,\n): A2UIInlineCatalogSchema {\n // Null prototypes, so a component or type named `__proto__` is kept as an\n // entry.\n const components: Record<string, JsonSchema> = Object.create(null);\n const commonTypes: A2UICommonTypes = Object.create(null);\n\n for (const [name, component] of catalog.components) {\n const schema = serializeA2UISchema(component.schema, commonTypes);\n const properties = (schema.properties ?? {}) as Record<string, JsonSchema>;\n const required = (schema.required ?? []) as string[];\n\n components[name] = {\n ...(typeof schema.description === \"string\"\n ? { description: schema.description }\n : {}),\n allOf: [\n { $ref: \"common_types.json#/$defs/ComponentCommon\" },\n {\n properties: { component: { const: name }, ...properties },\n required: [\"component\", ...required],\n },\n ],\n };\n }\n\n const functions = catalogFunctions(catalog.functions).map((fn) => {\n const { description, ...parameters } = serializeA2UISchema(\n fn.schema,\n commonTypes,\n );\n return {\n name: fn.name,\n ...(typeof description === \"string\" ? { description } : {}),\n returnType: fn.returnType ?? \"any\",\n parameters,\n };\n });\n\n const theme = catalog.themeSchema\n ? (serializeA2UISchema(catalog.themeSchema, commonTypes).properties as\n | Record<string, JsonSchema>\n | undefined)\n : undefined;\n\n return {\n catalogId: catalog.id,\n components,\n ...(functions.length > 0 ? { functions } : {}),\n ...(theme ? { theme } : {}),\n ...(Object.keys(commonTypes).length > 0\n ? { \"common_types.json\": { $defs: commonTypes } }\n : {}),\n };\n}\n\n/**\n * Build a context string describing the catalog's id and the components it\n * adds beyond the basic catalog.\n *\n * Schemas are serialized as in {@link extractA2UICatalogSchemas}, with the\n * common types they reference listed once after the components.\n *\n * When `options.includeSchema` is `false`, custom components are listed by name\n * only and their JSON schemas are omitted.\n */\nexport function buildA2UICatalogContextValue(\n catalog: A2UICatalogSchemaSource,\n basicComponentNames: ReadonlySet<string>,\n options?: { includeSchema?: boolean },\n): string {\n const lines: string[] = [\"Available A2UI catalog:\"];\n\n if (catalog.id === A2UI_BASIC_CATALOG_ID) {\n lines.push(`- ${catalog.id} (basic catalog)`);\n return lines.join(\"\\n\");\n }\n\n const isSuperset = [...basicComponentNames].every((name) =>\n catalog.components.has(name),\n );\n\n lines.push(`- ${catalog.id}`);\n if (isSuperset) {\n lines.push(\n \" Extends the basic catalog with all standard components plus:\",\n );\n } else {\n lines.push(\" Custom catalog (does NOT include all basic components).\");\n lines.push(\" Custom components:\");\n }\n\n const commonTypes: A2UICommonTypes = Object.create(null);\n\n for (const [name, component] of catalog.components) {\n if (basicComponentNames.has(name)) continue;\n if (options?.includeSchema === false) {\n lines.push(` - ${name}`);\n continue;\n }\n lines.push(` - ${name}:`);\n lines.push(indented(serializeA2UISchema(component.schema, commonTypes)));\n }\n\n if (Object.keys(commonTypes).length > 0) {\n lines.push(\" Common types referenced above (common_types.json#/$defs):\");\n lines.push(indented(commonTypes));\n }\n\n return lines.join(\"\\n\");\n}\n\n/** JSON for the catalog context value, indented under a list item. */\nfunction indented(value: unknown): string {\n return ` ${JSON.stringify(value, null, 2).split(\"\\n\").join(\"\\n \")}`;\n}\n\n/** Raw zod-to-json-schema output per Zod schema, stored as JSON text. */\nconst serializedSchemas = new WeakMap<object, string>();\n\n/**\n * zod-to-json-schema's own parameter type. Casting to it (rather than to\n * `ZodTypeAny`) avoids a TS2589 \"excessively deep\" instantiation.\n */\ntype ZodSchemaArg = Parameters<typeof zodToJsonSchema>[0];\n\n/**\n * Convert one A2UI Zod schema to JSON Schema 2019-09, inlining reused schemas\n * and resolving `REF:` markers (see {@link extractA2UICatalogSchemas}). The\n * shapes behind `common_types.json` refs are recorded in `commonTypes`; pass\n * the same map for every schema of one payload.\n *\n * The raw conversion is cached per schema object as JSON text, and every call\n * parses a fresh copy. The JSON round-trip, unlike structuredClone, never\n * throws on values such as a function or a Vue reactive proxy in a\n * `.default()`, and yields exactly what the agent receives.\n */\nexport function serializeA2UISchema(\n schema: unknown,\n commonTypes: A2UICommonTypes = Object.create(null),\n): JsonSchema {\n const key = typeof schema === \"object\" && schema !== null ? schema : null;\n let serialized = key ? serializedSchemas.get(key) : undefined;\n if (serialized === undefined) {\n const jsonSchema = zodToJsonSchema(schema as ZodSchemaArg, {\n target: \"jsonSchema2019-09\",\n $refStrategy: \"none\",\n // With \"none\", zod-to-json-schema already turns a recursive reference\n // into `{}` (any), but logs a warning every time it does. Return `{}`\n // here directly so re-serializing a recursive catalog stays quiet.\n override: (_def, refs, seen, forceResolution) =>\n seen &&\n !forceResolution &&\n seen.path.length < refs.currentPath.length &&\n seen.path.every((part, i) => refs.currentPath[i] === part)\n ? {}\n : ignoreOverride,\n }) as JsonSchema;\n delete jsonSchema.$schema;\n serialized = JSON.stringify(jsonSchema);\n if (key) serializedSchemas.set(key, serialized);\n }\n\n const root = JSON.parse(serialized) as JsonSchema;\n const marker = parseRefMarker(root.description);\n if (marker) {\n delete root.description;\n if (marker.description) root.description = marker.description;\n }\n return resolveSubschemas(root, commonTypes);\n}\n\n/** Keywords whose value is a subschema, or an array of subschemas. */\nconst SUBSCHEMA_KEYWORDS = [\n \"items\",\n \"additionalItems\",\n \"additionalProperties\",\n \"unevaluatedItems\",\n \"unevaluatedProperties\",\n \"contains\",\n \"propertyNames\",\n \"not\",\n \"if\",\n \"then\",\n \"else\",\n \"allOf\",\n \"anyOf\",\n \"oneOf\",\n \"prefixItems\",\n];\n/** Keywords whose value maps names to subschemas. */\nconst SUBSCHEMA_MAP_KEYWORDS = [\n \"properties\",\n \"patternProperties\",\n \"dependentSchemas\",\n \"$defs\",\n \"definitions\",\n];\n\n/**\n * A reference to a whole common type, in `common_types.json` or local. From\n * `@a2ui/web_core` 0.15 the v0.9 common types mark themselves with local\n * `REF:#/$defs/<Name>` refs, the layout of a bundled catalog document; both\n * forms name the same type, which this payload writes as\n * `common_types.json#/$defs/<Name>`.\n */\nconst COMMON_TYPE_REF = /^(?:common_types\\.json)?#\\/\\$defs\\/([^/]+)$/;\n\nfunction isObject(value: unknown): value is JsonSchema {\n return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\n/**\n * Split a `REF:<ref>|<description>` marker at its first `|`, so a description\n * containing `|` is kept whole. The convention comes from\n * `MessageProcessor.processRefs` in `@a2ui/web_core`.\n */\nfunction parseRefMarker(\n description: unknown,\n): { ref: string; description?: string } | undefined {\n if (typeof description !== \"string\" || !description.startsWith(\"REF:\")) {\n return undefined;\n }\n const body = description.slice(4);\n const separator = body.indexOf(\"|\");\n return separator === -1\n ? { ref: body }\n : { ref: body.slice(0, separator), description: body.slice(separator + 1) };\n}\n\n/**\n * Resolve `REF:` markers in a schema's subschemas, innermost first, so a\n * stored common type refers to the types it contains by bare `$ref` too.\n *\n * Only schema-valued keywords are traversed, so literal values under\n * `default`, `const`, `enum` or `examples` are never rewritten.\n */\nfunction resolveSubschemas(\n node: JsonSchema,\n commonTypes: A2UICommonTypes,\n): JsonSchema {\n const resolve = (value: unknown): unknown =>\n Array.isArray(value)\n ? value.map(resolve)\n : isObject(value)\n ? resolveRefMarker(resolveSubschemas(value, commonTypes), commonTypes)\n : value;\n\n const out: JsonSchema = { ...node };\n for (const keyword of SUBSCHEMA_KEYWORDS) {\n if (keyword in out) out[keyword] = resolve(out[keyword]);\n }\n for (const keyword of SUBSCHEMA_MAP_KEYWORDS) {\n const map = out[keyword];\n if (isObject(map)) {\n out[keyword] = Object.fromEntries(\n Object.entries(map).map(([name, child]) => [name, resolve(child)]),\n );\n }\n }\n return out;\n}\n\n/**\n * Turn a node carrying a `REF:` marker into a bare `$ref`, recording the\n * shape it replaced under its `common_types.json` name. A shape that differs\n * from the one already recorded, or a ref outside `common_types.json`, stays\n * inline next to the `$ref`.\n */\nfunction resolveRefMarker(\n node: JsonSchema,\n commonTypes: A2UICommonTypes,\n): JsonSchema {\n const marker = parseRefMarker(node.description);\n if (!marker) return node;\n\n const { description: _marker, ...shape } = node;\n const name = COMMON_TYPE_REF.exec(marker.ref)?.[1];\n const ref: JsonSchema = {\n $ref: name === undefined ? marker.ref : `common_types.json#/$defs/${name}`,\n ...(marker.description ? { description: marker.description } : {}),\n };\n if (name !== undefined) {\n const known = commonTypes[name];\n if (known === undefined) {\n commonTypes[name] = shape;\n return ref;\n }\n if (JSON.stringify(known) === JSON.stringify(shape)) return ref;\n }\n return { ...ref, ...shape };\n}\n\ninterface CatalogFunction {\n name: string;\n returnType?: string;\n schema: unknown;\n}\n\n/**\n * Read a catalog's functions, tolerating catalog-shaped objects whose\n * `functions` is missing, a plain object or an array, and skipping entries\n * without a name or schema.\n */\nfunction catalogFunctions(functions: unknown): CatalogFunction[] {\n if (typeof functions !== \"object\" || functions === null) return [];\n const entries =\n functions instanceof Map\n ? [...functions.values()]\n : Array.isArray(functions)\n ? functions\n : Object.values(functions);\n return entries.filter(\n (fn): fn is CatalogFunction =>\n typeof fn === \"object\" &&\n fn !== null &&\n typeof fn.name === \"string\" &&\n typeof fn.schema === \"object\" &&\n fn.schema !== null,\n );\n}\n"],"mappings":"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"}
|
|
@@ -65,8 +65,10 @@ type A2UICommonTypes = Record<string, JsonSchema>;
|
|
|
65
65
|
*
|
|
66
66
|
* - Reused Zod schemas are inlined rather than emitted as local `$ref`s, which
|
|
67
67
|
* would dangle once properties move under `allOf[1]`.
|
|
68
|
-
* - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream
|
|
69
|
-
*
|
|
68
|
+
* - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream.
|
|
69
|
+
* Upstream writes a common type as a local `#/$defs/<Name>` ref, which an
|
|
70
|
+
* inline catalog without `$defs` leaves dangling; here it is always
|
|
71
|
+
* `common_types.json#/$defs/<Name>`, and the shape it replaced is kept once under
|
|
70
72
|
* `"common_types.json": { "$defs": { <Name>: ... } }`. Every
|
|
71
73
|
* `common_types.json#/$defs/<Name>` ref therefore resolves within the
|
|
72
74
|
* payload, both for agents that only see it as prompt text and for SDKs
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"a2ui-catalog-schema.d.cts","names":[],"sources":["../src/a2ui-catalog-schema.ts"],"mappings":";;AAOA;;;;cAAa,+BAAA;AAIb;AAAA,cAAa,qBAAA;AAAA,KAGR,UAAA,GAAa,MAAA;;;AAFyC;;;UAS1C,uBAAA;EAAA,SACN,EAAA;EAAA,SACA,UAAA,EAAY,WAAA;IAAA,SAA+B,MAAA;EAAA;EAApB;EAAA,SAEvB,SAAA;EAAA,SACA,WAAA;AAAA;;UAIM,kBAAA;EACf,IAAA;EACA,WAAA;EACA,UAAA;EACA,UAAA,EAAY,UAAA;AAAA;;;;;UAOG,uBAAA;EACf,SAAA;EACA,UAAA,EAAY,MAAA,SAAe,UAAA;EAC3B,SAAA,GAAY,kBAAA;EACZ,KAAA,GAAQ,MAAA,SAAe,UAAA;EAJR;;;;EASf,mBAAA;IAAwB,KAAA,EAAO,eAAA;EAAA;AAAA;;KAIrB,eAAA,GAAkB,MAAA,SAAe,UAAA;;;;;;;;;;;;;;;;AAA7C;;;;;
|
|
1
|
+
{"version":3,"file":"a2ui-catalog-schema.d.cts","names":[],"sources":["../src/a2ui-catalog-schema.ts"],"mappings":";;AAOA;;;;cAAa,+BAAA;AAIb;AAAA,cAAa,qBAAA;AAAA,KAGR,UAAA,GAAa,MAAA;;;AAFyC;;;UAS1C,uBAAA;EAAA,SACN,EAAA;EAAA,SACA,UAAA,EAAY,WAAA;IAAA,SAA+B,MAAA;EAAA;EAApB;EAAA,SAEvB,SAAA;EAAA,SACA,WAAA;AAAA;;UAIM,kBAAA;EACf,IAAA;EACA,WAAA;EACA,UAAA;EACA,UAAA,EAAY,UAAA;AAAA;;;;;UAOG,uBAAA;EACf,SAAA;EACA,UAAA,EAAY,MAAA,SAAe,UAAA;EAC3B,SAAA,GAAY,kBAAA;EACZ,KAAA,GAAQ,MAAA,SAAe,UAAA;EAJR;;;;EASf,mBAAA;IAAwB,KAAA,EAAO,eAAA;EAAA;AAAA;;KAIrB,eAAA,GAAkB,MAAA,SAAe,UAAA;;;;;;;;;;;;;;;;AAA7C;;;;;AAqCA;;;;;;;;;AAmEA;;;;;;iBAnEgB,yBAAA,CACd,OAAA,EAAS,uBAAA,GACR,uBAAA;;;;;;AAwIH;;;;;iBAvEgB,4BAAA,CACd,OAAA,EAAS,uBAAA,EACT,mBAAA,EAAqB,WAAA,UACrB,OAAA;EAAY,aAAA;AAAA;;;;;;;;;;;;iBAoEE,mBAAA,CACd,MAAA,WACA,WAAA,GAAa,eAAA,GACZ,UAAA"}
|
|
@@ -65,8 +65,10 @@ type A2UICommonTypes = Record<string, JsonSchema>;
|
|
|
65
65
|
*
|
|
66
66
|
* - Reused Zod schemas are inlined rather than emitted as local `$ref`s, which
|
|
67
67
|
* would dangle once properties move under `allOf[1]`.
|
|
68
|
-
* - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream
|
|
69
|
-
*
|
|
68
|
+
* - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream.
|
|
69
|
+
* Upstream writes a common type as a local `#/$defs/<Name>` ref, which an
|
|
70
|
+
* inline catalog without `$defs` leaves dangling; here it is always
|
|
71
|
+
* `common_types.json#/$defs/<Name>`, and the shape it replaced is kept once under
|
|
70
72
|
* `"common_types.json": { "$defs": { <Name>: ... } }`. Every
|
|
71
73
|
* `common_types.json#/$defs/<Name>` ref therefore resolves within the
|
|
72
74
|
* payload, both for agents that only see it as prompt text and for SDKs
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"a2ui-catalog-schema.d.mts","names":[],"sources":["../src/a2ui-catalog-schema.ts"],"mappings":";;AAOA;;;;cAAa,+BAAA;AAIb;AAAA,cAAa,qBAAA;AAAA,KAGR,UAAA,GAAa,MAAA;;;AAFyC;;;UAS1C,uBAAA;EAAA,SACN,EAAA;EAAA,SACA,UAAA,EAAY,WAAA;IAAA,SAA+B,MAAA;EAAA;EAApB;EAAA,SAEvB,SAAA;EAAA,SACA,WAAA;AAAA;;UAIM,kBAAA;EACf,IAAA;EACA,WAAA;EACA,UAAA;EACA,UAAA,EAAY,UAAA;AAAA;;;;;UAOG,uBAAA;EACf,SAAA;EACA,UAAA,EAAY,MAAA,SAAe,UAAA;EAC3B,SAAA,GAAY,kBAAA;EACZ,KAAA,GAAQ,MAAA,SAAe,UAAA;EAJR;;;;EASf,mBAAA;IAAwB,KAAA,EAAO,eAAA;EAAA;AAAA;;KAIrB,eAAA,GAAkB,MAAA,SAAe,UAAA;;;;;;;;;;;;;;;;AAA7C;;;;;
|
|
1
|
+
{"version":3,"file":"a2ui-catalog-schema.d.mts","names":[],"sources":["../src/a2ui-catalog-schema.ts"],"mappings":";;AAOA;;;;cAAa,+BAAA;AAIb;AAAA,cAAa,qBAAA;AAAA,KAGR,UAAA,GAAa,MAAA;;;AAFyC;;;UAS1C,uBAAA;EAAA,SACN,EAAA;EAAA,SACA,UAAA,EAAY,WAAA;IAAA,SAA+B,MAAA;EAAA;EAApB;EAAA,SAEvB,SAAA;EAAA,SACA,WAAA;AAAA;;UAIM,kBAAA;EACf,IAAA;EACA,WAAA;EACA,UAAA;EACA,UAAA,EAAY,UAAA;AAAA;;;;;UAOG,uBAAA;EACf,SAAA;EACA,UAAA,EAAY,MAAA,SAAe,UAAA;EAC3B,SAAA,GAAY,kBAAA;EACZ,KAAA,GAAQ,MAAA,SAAe,UAAA;EAJR;;;;EASf,mBAAA;IAAwB,KAAA,EAAO,eAAA;EAAA;AAAA;;KAIrB,eAAA,GAAkB,MAAA,SAAe,UAAA;;;;;;;;;;;;;;;;AAA7C;;;;;AAqCA;;;;;;;;;AAmEA;;;;;;iBAnEgB,yBAAA,CACd,OAAA,EAAS,uBAAA,GACR,uBAAA;;;;;;AAwIH;;;;;iBAvEgB,4BAAA,CACd,OAAA,EAAS,uBAAA,EACT,mBAAA,EAAqB,WAAA,UACrB,OAAA;EAAY,aAAA;AAAA;;;;;;;;;;;;iBAoEE,mBAAA,CACd,MAAA,WACA,WAAA,GAAa,eAAA,GACZ,UAAA"}
|
|
@@ -26,8 +26,10 @@ const A2UI_BASIC_CATALOG_ID = "https://a2ui.org/specification/v0_9/basic_catalog
|
|
|
26
26
|
*
|
|
27
27
|
* - Reused Zod schemas are inlined rather than emitted as local `$ref`s, which
|
|
28
28
|
* would dangle once properties move under `allOf[1]`.
|
|
29
|
-
* - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream
|
|
30
|
-
*
|
|
29
|
+
* - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream.
|
|
30
|
+
* Upstream writes a common type as a local `#/$defs/<Name>` ref, which an
|
|
31
|
+
* inline catalog without `$defs` leaves dangling; here it is always
|
|
32
|
+
* `common_types.json#/$defs/<Name>`, and the shape it replaced is kept once under
|
|
31
33
|
* `"common_types.json": { "$defs": { <Name>: ... } }`. Every
|
|
32
34
|
* `common_types.json#/$defs/<Name>` ref therefore resolves within the
|
|
33
35
|
* payload, both for agents that only see it as prompt text and for SDKs
|
|
@@ -181,7 +183,14 @@ const SUBSCHEMA_MAP_KEYWORDS = [
|
|
|
181
183
|
"$defs",
|
|
182
184
|
"definitions"
|
|
183
185
|
];
|
|
184
|
-
|
|
186
|
+
/**
|
|
187
|
+
* A reference to a whole common type, in `common_types.json` or local. From
|
|
188
|
+
* `@a2ui/web_core` 0.15 the v0.9 common types mark themselves with local
|
|
189
|
+
* `REF:#/$defs/<Name>` refs, the layout of a bundled catalog document; both
|
|
190
|
+
* forms name the same type, which this payload writes as
|
|
191
|
+
* `common_types.json#/$defs/<Name>`.
|
|
192
|
+
*/
|
|
193
|
+
const COMMON_TYPE_REF = /^(?:common_types\.json)?#\/\$defs\/([^/]+)$/;
|
|
185
194
|
function isObject(value) {
|
|
186
195
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
187
196
|
}
|
|
@@ -226,11 +235,11 @@ function resolveRefMarker(node, commonTypes) {
|
|
|
226
235
|
const marker = parseRefMarker(node.description);
|
|
227
236
|
if (!marker) return node;
|
|
228
237
|
const { description: _marker, ...shape } = node;
|
|
238
|
+
const name = COMMON_TYPE_REF.exec(marker.ref)?.[1];
|
|
229
239
|
const ref = {
|
|
230
|
-
$ref: marker.ref
|
|
240
|
+
$ref: name === void 0 ? marker.ref : `common_types.json#/$defs/${name}`,
|
|
231
241
|
...marker.description ? { description: marker.description } : {}
|
|
232
242
|
};
|
|
233
|
-
const name = COMMON_TYPE_REF.exec(marker.ref)?.[1];
|
|
234
243
|
if (name !== void 0) {
|
|
235
244
|
const known = commonTypes[name];
|
|
236
245
|
if (known === void 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"a2ui-catalog-schema.mjs","names":[],"sources":["../src/a2ui-catalog-schema.ts"],"sourcesContent":["import { ignoreOverride, zodToJsonSchema } from \"zod-to-json-schema\";\n\n/**\n * Context description used to identify the A2UI component schema in\n * RunAgentInput.context. Must match the constant in @ag-ui/a2ui-middleware so\n * the middleware can overwrite a frontend-provided schema with a server-side one.\n */\nexport const A2UI_SCHEMA_CONTEXT_DESCRIPTION =\n \"A2UI Component Schema — available components for generating UI surfaces. Use these component names and properties when creating A2UI operations.\";\n\n/** Id of the A2UI v0.9 basic catalog. */\nexport const A2UI_BASIC_CATALOG_ID =\n \"https://a2ui.org/specification/v0_9/basic_catalog.json\";\n\ntype JsonSchema = Record<string, unknown>;\n\n/**\n * The parts of an `@a2ui/web_core` v0.9 `Catalog` that the serializers read.\n * Typed structurally so this module does not depend on web_core, and so the\n * minimal catalog-shaped objects some apps pass in still work.\n */\nexport interface A2UICatalogSchemaSource {\n readonly id: string;\n readonly components: ReadonlyMap<string, { readonly schema: unknown }>;\n /** A `ReadonlyMap` on a real `Catalog`; anything else is tolerated. */\n readonly functions?: unknown;\n readonly themeSchema?: unknown;\n}\n\n/** One entry of {@link A2UIInlineCatalogSchema.functions}. */\nexport interface A2UIFunctionSchema {\n name: string;\n description?: string;\n returnType: string;\n parameters: JsonSchema;\n}\n\n/**\n * A2UI v0.9 inline catalog, the shape of `InlineCatalog` in\n * `@a2ui/web_core/v0_9`, sent to the agent as the component schema.\n */\nexport interface A2UIInlineCatalogSchema {\n catalogId: string;\n components: Record<string, JsonSchema>;\n functions?: A2UIFunctionSchema[];\n theme?: Record<string, JsonSchema>;\n /**\n * One copy of each common type the schemas reference, so every\n * `common_types.json#/$defs/<Name>` ref resolves within this payload.\n */\n \"common_types.json\"?: { $defs: A2UICommonTypes };\n}\n\n/** Common type shapes keyed by their `common_types.json` `$defs` name. */\nexport type A2UICommonTypes = Record<string, JsonSchema>;\n\n/**\n * Serialize a catalog's Zod schemas in the A2UI v0.9 inline catalog format.\n *\n * Each component composes `ComponentCommon` with its own properties, matching\n * the flat wire format the agent must produce:\n *\n * { \"Column\": { \"allOf\": [\n * { \"$ref\": \"common_types.json#/$defs/ComponentCommon\" },\n * { \"properties\": { \"component\": {\"const\":\"Column\"}, \"gap\": ..., \"children\": ... },\n * \"required\": [\"component\"] }\n * ]}}\n *\n * This follows `getClientCapabilities` in `@a2ui/web_core` with these\n * deliberate differences:\n *\n * - Reused Zod schemas are inlined rather than emitted as local `$ref`s, which\n * would dangle once properties move under `allOf[1]`.\n * - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream, but\n * the shape it replaced is kept once under\n * `\"common_types.json\": { \"$defs\": { <Name>: ... } }`. Every\n * `common_types.json#/$defs/<Name>` ref therefore resolves within the\n * payload, both for agents that only see it as prompt text and for SDKs\n * (such as Google's A2UI SDK used by ADK) that read the `$ref`. Each type is\n * stated once rather than at every use site, which keeps the payload small.\n * A use whose shape differs from the stored one keeps its shape inline next\n * to the `$ref`, so the agent never sees a looser type than the client\n * accepts.\n * - A `REF:` marker on a schema's root only sets its description; replacing\n * the root would drop every property.\n * - A component's root `.describe()` is kept as the component `description`.\n * - Function parameters drop `$schema` and the description already given on\n * the function itself, to keep the prompt small.\n */\nexport function extractA2UICatalogSchemas(\n catalog: A2UICatalogSchemaSource,\n): A2UIInlineCatalogSchema {\n // Null prototypes, so a component or type named `__proto__` is kept as an\n // entry.\n const components: Record<string, JsonSchema> = Object.create(null);\n const commonTypes: A2UICommonTypes = Object.create(null);\n\n for (const [name, component] of catalog.components) {\n const schema = serializeA2UISchema(component.schema, commonTypes);\n const properties = (schema.properties ?? {}) as Record<string, JsonSchema>;\n const required = (schema.required ?? []) as string[];\n\n components[name] = {\n ...(typeof schema.description === \"string\"\n ? { description: schema.description }\n : {}),\n allOf: [\n { $ref: \"common_types.json#/$defs/ComponentCommon\" },\n {\n properties: { component: { const: name }, ...properties },\n required: [\"component\", ...required],\n },\n ],\n };\n }\n\n const functions = catalogFunctions(catalog.functions).map((fn) => {\n const { description, ...parameters } = serializeA2UISchema(\n fn.schema,\n commonTypes,\n );\n return {\n name: fn.name,\n ...(typeof description === \"string\" ? { description } : {}),\n returnType: fn.returnType ?? \"any\",\n parameters,\n };\n });\n\n const theme = catalog.themeSchema\n ? (serializeA2UISchema(catalog.themeSchema, commonTypes).properties as\n | Record<string, JsonSchema>\n | undefined)\n : undefined;\n\n return {\n catalogId: catalog.id,\n components,\n ...(functions.length > 0 ? { functions } : {}),\n ...(theme ? { theme } : {}),\n ...(Object.keys(commonTypes).length > 0\n ? { \"common_types.json\": { $defs: commonTypes } }\n : {}),\n };\n}\n\n/**\n * Build a context string describing the catalog's id and the components it\n * adds beyond the basic catalog.\n *\n * Schemas are serialized as in {@link extractA2UICatalogSchemas}, with the\n * common types they reference listed once after the components.\n *\n * When `options.includeSchema` is `false`, custom components are listed by name\n * only and their JSON schemas are omitted.\n */\nexport function buildA2UICatalogContextValue(\n catalog: A2UICatalogSchemaSource,\n basicComponentNames: ReadonlySet<string>,\n options?: { includeSchema?: boolean },\n): string {\n const lines: string[] = [\"Available A2UI catalog:\"];\n\n if (catalog.id === A2UI_BASIC_CATALOG_ID) {\n lines.push(`- ${catalog.id} (basic catalog)`);\n return lines.join(\"\\n\");\n }\n\n const isSuperset = [...basicComponentNames].every((name) =>\n catalog.components.has(name),\n );\n\n lines.push(`- ${catalog.id}`);\n if (isSuperset) {\n lines.push(\n \" Extends the basic catalog with all standard components plus:\",\n );\n } else {\n lines.push(\" Custom catalog (does NOT include all basic components).\");\n lines.push(\" Custom components:\");\n }\n\n const commonTypes: A2UICommonTypes = Object.create(null);\n\n for (const [name, component] of catalog.components) {\n if (basicComponentNames.has(name)) continue;\n if (options?.includeSchema === false) {\n lines.push(` - ${name}`);\n continue;\n }\n lines.push(` - ${name}:`);\n lines.push(indented(serializeA2UISchema(component.schema, commonTypes)));\n }\n\n if (Object.keys(commonTypes).length > 0) {\n lines.push(\" Common types referenced above (common_types.json#/$defs):\");\n lines.push(indented(commonTypes));\n }\n\n return lines.join(\"\\n\");\n}\n\n/** JSON for the catalog context value, indented under a list item. */\nfunction indented(value: unknown): string {\n return ` ${JSON.stringify(value, null, 2).split(\"\\n\").join(\"\\n \")}`;\n}\n\n/** Raw zod-to-json-schema output per Zod schema, stored as JSON text. */\nconst serializedSchemas = new WeakMap<object, string>();\n\n/**\n * zod-to-json-schema's own parameter type. Casting to it (rather than to\n * `ZodTypeAny`) avoids a TS2589 \"excessively deep\" instantiation.\n */\ntype ZodSchemaArg = Parameters<typeof zodToJsonSchema>[0];\n\n/**\n * Convert one A2UI Zod schema to JSON Schema 2019-09, inlining reused schemas\n * and resolving `REF:` markers (see {@link extractA2UICatalogSchemas}). The\n * shapes behind `common_types.json` refs are recorded in `commonTypes`; pass\n * the same map for every schema of one payload.\n *\n * The raw conversion is cached per schema object as JSON text, and every call\n * parses a fresh copy. The JSON round-trip, unlike structuredClone, never\n * throws on values such as a function or a Vue reactive proxy in a\n * `.default()`, and yields exactly what the agent receives.\n */\nexport function serializeA2UISchema(\n schema: unknown,\n commonTypes: A2UICommonTypes = Object.create(null),\n): JsonSchema {\n const key = typeof schema === \"object\" && schema !== null ? schema : null;\n let serialized = key ? serializedSchemas.get(key) : undefined;\n if (serialized === undefined) {\n const jsonSchema = zodToJsonSchema(schema as ZodSchemaArg, {\n target: \"jsonSchema2019-09\",\n $refStrategy: \"none\",\n // With \"none\", zod-to-json-schema already turns a recursive reference\n // into `{}` (any), but logs a warning every time it does. Return `{}`\n // here directly so re-serializing a recursive catalog stays quiet.\n override: (_def, refs, seen, forceResolution) =>\n seen &&\n !forceResolution &&\n seen.path.length < refs.currentPath.length &&\n seen.path.every((part, i) => refs.currentPath[i] === part)\n ? {}\n : ignoreOverride,\n }) as JsonSchema;\n delete jsonSchema.$schema;\n serialized = JSON.stringify(jsonSchema);\n if (key) serializedSchemas.set(key, serialized);\n }\n\n const root = JSON.parse(serialized) as JsonSchema;\n const marker = parseRefMarker(root.description);\n if (marker) {\n delete root.description;\n if (marker.description) root.description = marker.description;\n }\n return resolveSubschemas(root, commonTypes);\n}\n\n/** Keywords whose value is a subschema, or an array of subschemas. */\nconst SUBSCHEMA_KEYWORDS = [\n \"items\",\n \"additionalItems\",\n \"additionalProperties\",\n \"unevaluatedItems\",\n \"unevaluatedProperties\",\n \"contains\",\n \"propertyNames\",\n \"not\",\n \"if\",\n \"then\",\n \"else\",\n \"allOf\",\n \"anyOf\",\n \"oneOf\",\n \"prefixItems\",\n];\n/** Keywords whose value maps names to subschemas. */\nconst SUBSCHEMA_MAP_KEYWORDS = [\n \"properties\",\n \"patternProperties\",\n \"dependentSchemas\",\n \"$defs\",\n \"definitions\",\n];\n\nconst COMMON_TYPE_REF = /^common_types\\.json#\\/\\$defs\\/([^/]+)$/;\n\nfunction isObject(value: unknown): value is JsonSchema {\n return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\n/**\n * Split a `REF:<ref>|<description>` marker at its first `|`, so a description\n * containing `|` is kept whole. The convention comes from\n * `MessageProcessor.processRefs` in `@a2ui/web_core`.\n */\nfunction parseRefMarker(\n description: unknown,\n): { ref: string; description?: string } | undefined {\n if (typeof description !== \"string\" || !description.startsWith(\"REF:\")) {\n return undefined;\n }\n const body = description.slice(4);\n const separator = body.indexOf(\"|\");\n return separator === -1\n ? { ref: body }\n : { ref: body.slice(0, separator), description: body.slice(separator + 1) };\n}\n\n/**\n * Resolve `REF:` markers in a schema's subschemas, innermost first, so a\n * stored common type refers to the types it contains by bare `$ref` too.\n *\n * Only schema-valued keywords are traversed, so literal values under\n * `default`, `const`, `enum` or `examples` are never rewritten.\n */\nfunction resolveSubschemas(\n node: JsonSchema,\n commonTypes: A2UICommonTypes,\n): JsonSchema {\n const resolve = (value: unknown): unknown =>\n Array.isArray(value)\n ? value.map(resolve)\n : isObject(value)\n ? resolveRefMarker(resolveSubschemas(value, commonTypes), commonTypes)\n : value;\n\n const out: JsonSchema = { ...node };\n for (const keyword of SUBSCHEMA_KEYWORDS) {\n if (keyword in out) out[keyword] = resolve(out[keyword]);\n }\n for (const keyword of SUBSCHEMA_MAP_KEYWORDS) {\n const map = out[keyword];\n if (isObject(map)) {\n out[keyword] = Object.fromEntries(\n Object.entries(map).map(([name, child]) => [name, resolve(child)]),\n );\n }\n }\n return out;\n}\n\n/**\n * Turn a node carrying a `REF:` marker into a bare `$ref`, recording the\n * shape it replaced under its `common_types.json` name. A shape that differs\n * from the one already recorded, or a ref outside `common_types.json`, stays\n * inline next to the `$ref`.\n */\nfunction resolveRefMarker(\n node: JsonSchema,\n commonTypes: A2UICommonTypes,\n): JsonSchema {\n const marker = parseRefMarker(node.description);\n if (!marker) return node;\n\n const { description: _marker, ...shape } = node;\n const ref: JsonSchema = {\n $ref: marker.ref,\n ...(marker.description ? { description: marker.description } : {}),\n };\n const name = COMMON_TYPE_REF.exec(marker.ref)?.[1];\n if (name !== undefined) {\n const known = commonTypes[name];\n if (known === undefined) {\n commonTypes[name] = shape;\n return ref;\n }\n if (JSON.stringify(known) === JSON.stringify(shape)) return ref;\n }\n return { ...ref, ...shape };\n}\n\ninterface CatalogFunction {\n name: string;\n returnType?: string;\n schema: unknown;\n}\n\n/**\n * Read a catalog's functions, tolerating catalog-shaped objects whose\n * `functions` is missing, a plain object or an array, and skipping entries\n * without a name or schema.\n */\nfunction catalogFunctions(functions: unknown): CatalogFunction[] {\n if (typeof functions !== \"object\" || functions === null) return [];\n const entries =\n functions instanceof Map\n ? [...functions.values()]\n : Array.isArray(functions)\n ? functions\n : Object.values(functions);\n return entries.filter(\n (fn): fn is CatalogFunction =>\n typeof fn === \"object\" &&\n fn !== null &&\n typeof fn.name === \"string\" &&\n typeof fn.schema === \"object\" &&\n fn.schema !== null,\n );\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"a2ui-catalog-schema.mjs","names":[],"sources":["../src/a2ui-catalog-schema.ts"],"sourcesContent":["import { ignoreOverride, zodToJsonSchema } from \"zod-to-json-schema\";\n\n/**\n * Context description used to identify the A2UI component schema in\n * RunAgentInput.context. Must match the constant in @ag-ui/a2ui-middleware so\n * the middleware can overwrite a frontend-provided schema with a server-side one.\n */\nexport const A2UI_SCHEMA_CONTEXT_DESCRIPTION =\n \"A2UI Component Schema — available components for generating UI surfaces. Use these component names and properties when creating A2UI operations.\";\n\n/** Id of the A2UI v0.9 basic catalog. */\nexport const A2UI_BASIC_CATALOG_ID =\n \"https://a2ui.org/specification/v0_9/basic_catalog.json\";\n\ntype JsonSchema = Record<string, unknown>;\n\n/**\n * The parts of an `@a2ui/web_core` v0.9 `Catalog` that the serializers read.\n * Typed structurally so this module does not depend on web_core, and so the\n * minimal catalog-shaped objects some apps pass in still work.\n */\nexport interface A2UICatalogSchemaSource {\n readonly id: string;\n readonly components: ReadonlyMap<string, { readonly schema: unknown }>;\n /** A `ReadonlyMap` on a real `Catalog`; anything else is tolerated. */\n readonly functions?: unknown;\n readonly themeSchema?: unknown;\n}\n\n/** One entry of {@link A2UIInlineCatalogSchema.functions}. */\nexport interface A2UIFunctionSchema {\n name: string;\n description?: string;\n returnType: string;\n parameters: JsonSchema;\n}\n\n/**\n * A2UI v0.9 inline catalog, the shape of `InlineCatalog` in\n * `@a2ui/web_core/v0_9`, sent to the agent as the component schema.\n */\nexport interface A2UIInlineCatalogSchema {\n catalogId: string;\n components: Record<string, JsonSchema>;\n functions?: A2UIFunctionSchema[];\n theme?: Record<string, JsonSchema>;\n /**\n * One copy of each common type the schemas reference, so every\n * `common_types.json#/$defs/<Name>` ref resolves within this payload.\n */\n \"common_types.json\"?: { $defs: A2UICommonTypes };\n}\n\n/** Common type shapes keyed by their `common_types.json` `$defs` name. */\nexport type A2UICommonTypes = Record<string, JsonSchema>;\n\n/**\n * Serialize a catalog's Zod schemas in the A2UI v0.9 inline catalog format.\n *\n * Each component composes `ComponentCommon` with its own properties, matching\n * the flat wire format the agent must produce:\n *\n * { \"Column\": { \"allOf\": [\n * { \"$ref\": \"common_types.json#/$defs/ComponentCommon\" },\n * { \"properties\": { \"component\": {\"const\":\"Column\"}, \"gap\": ..., \"children\": ... },\n * \"required\": [\"component\"] }\n * ]}}\n *\n * This follows `getClientCapabilities` in `@a2ui/web_core` with these\n * deliberate differences:\n *\n * - Reused Zod schemas are inlined rather than emitted as local `$ref`s, which\n * would dangle once properties move under `allOf[1]`.\n * - A `REF:<ref>|<description>` marker becomes a bare `$ref`, as upstream.\n * Upstream writes a common type as a local `#/$defs/<Name>` ref, which an\n * inline catalog without `$defs` leaves dangling; here it is always\n * `common_types.json#/$defs/<Name>`, and the shape it replaced is kept once under\n * `\"common_types.json\": { \"$defs\": { <Name>: ... } }`. Every\n * `common_types.json#/$defs/<Name>` ref therefore resolves within the\n * payload, both for agents that only see it as prompt text and for SDKs\n * (such as Google's A2UI SDK used by ADK) that read the `$ref`. Each type is\n * stated once rather than at every use site, which keeps the payload small.\n * A use whose shape differs from the stored one keeps its shape inline next\n * to the `$ref`, so the agent never sees a looser type than the client\n * accepts.\n * - A `REF:` marker on a schema's root only sets its description; replacing\n * the root would drop every property.\n * - A component's root `.describe()` is kept as the component `description`.\n * - Function parameters drop `$schema` and the description already given on\n * the function itself, to keep the prompt small.\n */\nexport function extractA2UICatalogSchemas(\n catalog: A2UICatalogSchemaSource,\n): A2UIInlineCatalogSchema {\n // Null prototypes, so a component or type named `__proto__` is kept as an\n // entry.\n const components: Record<string, JsonSchema> = Object.create(null);\n const commonTypes: A2UICommonTypes = Object.create(null);\n\n for (const [name, component] of catalog.components) {\n const schema = serializeA2UISchema(component.schema, commonTypes);\n const properties = (schema.properties ?? {}) as Record<string, JsonSchema>;\n const required = (schema.required ?? []) as string[];\n\n components[name] = {\n ...(typeof schema.description === \"string\"\n ? { description: schema.description }\n : {}),\n allOf: [\n { $ref: \"common_types.json#/$defs/ComponentCommon\" },\n {\n properties: { component: { const: name }, ...properties },\n required: [\"component\", ...required],\n },\n ],\n };\n }\n\n const functions = catalogFunctions(catalog.functions).map((fn) => {\n const { description, ...parameters } = serializeA2UISchema(\n fn.schema,\n commonTypes,\n );\n return {\n name: fn.name,\n ...(typeof description === \"string\" ? { description } : {}),\n returnType: fn.returnType ?? \"any\",\n parameters,\n };\n });\n\n const theme = catalog.themeSchema\n ? (serializeA2UISchema(catalog.themeSchema, commonTypes).properties as\n | Record<string, JsonSchema>\n | undefined)\n : undefined;\n\n return {\n catalogId: catalog.id,\n components,\n ...(functions.length > 0 ? { functions } : {}),\n ...(theme ? { theme } : {}),\n ...(Object.keys(commonTypes).length > 0\n ? { \"common_types.json\": { $defs: commonTypes } }\n : {}),\n };\n}\n\n/**\n * Build a context string describing the catalog's id and the components it\n * adds beyond the basic catalog.\n *\n * Schemas are serialized as in {@link extractA2UICatalogSchemas}, with the\n * common types they reference listed once after the components.\n *\n * When `options.includeSchema` is `false`, custom components are listed by name\n * only and their JSON schemas are omitted.\n */\nexport function buildA2UICatalogContextValue(\n catalog: A2UICatalogSchemaSource,\n basicComponentNames: ReadonlySet<string>,\n options?: { includeSchema?: boolean },\n): string {\n const lines: string[] = [\"Available A2UI catalog:\"];\n\n if (catalog.id === A2UI_BASIC_CATALOG_ID) {\n lines.push(`- ${catalog.id} (basic catalog)`);\n return lines.join(\"\\n\");\n }\n\n const isSuperset = [...basicComponentNames].every((name) =>\n catalog.components.has(name),\n );\n\n lines.push(`- ${catalog.id}`);\n if (isSuperset) {\n lines.push(\n \" Extends the basic catalog with all standard components plus:\",\n );\n } else {\n lines.push(\" Custom catalog (does NOT include all basic components).\");\n lines.push(\" Custom components:\");\n }\n\n const commonTypes: A2UICommonTypes = Object.create(null);\n\n for (const [name, component] of catalog.components) {\n if (basicComponentNames.has(name)) continue;\n if (options?.includeSchema === false) {\n lines.push(` - ${name}`);\n continue;\n }\n lines.push(` - ${name}:`);\n lines.push(indented(serializeA2UISchema(component.schema, commonTypes)));\n }\n\n if (Object.keys(commonTypes).length > 0) {\n lines.push(\" Common types referenced above (common_types.json#/$defs):\");\n lines.push(indented(commonTypes));\n }\n\n return lines.join(\"\\n\");\n}\n\n/** JSON for the catalog context value, indented under a list item. */\nfunction indented(value: unknown): string {\n return ` ${JSON.stringify(value, null, 2).split(\"\\n\").join(\"\\n \")}`;\n}\n\n/** Raw zod-to-json-schema output per Zod schema, stored as JSON text. */\nconst serializedSchemas = new WeakMap<object, string>();\n\n/**\n * zod-to-json-schema's own parameter type. Casting to it (rather than to\n * `ZodTypeAny`) avoids a TS2589 \"excessively deep\" instantiation.\n */\ntype ZodSchemaArg = Parameters<typeof zodToJsonSchema>[0];\n\n/**\n * Convert one A2UI Zod schema to JSON Schema 2019-09, inlining reused schemas\n * and resolving `REF:` markers (see {@link extractA2UICatalogSchemas}). The\n * shapes behind `common_types.json` refs are recorded in `commonTypes`; pass\n * the same map for every schema of one payload.\n *\n * The raw conversion is cached per schema object as JSON text, and every call\n * parses a fresh copy. The JSON round-trip, unlike structuredClone, never\n * throws on values such as a function or a Vue reactive proxy in a\n * `.default()`, and yields exactly what the agent receives.\n */\nexport function serializeA2UISchema(\n schema: unknown,\n commonTypes: A2UICommonTypes = Object.create(null),\n): JsonSchema {\n const key = typeof schema === \"object\" && schema !== null ? schema : null;\n let serialized = key ? serializedSchemas.get(key) : undefined;\n if (serialized === undefined) {\n const jsonSchema = zodToJsonSchema(schema as ZodSchemaArg, {\n target: \"jsonSchema2019-09\",\n $refStrategy: \"none\",\n // With \"none\", zod-to-json-schema already turns a recursive reference\n // into `{}` (any), but logs a warning every time it does. Return `{}`\n // here directly so re-serializing a recursive catalog stays quiet.\n override: (_def, refs, seen, forceResolution) =>\n seen &&\n !forceResolution &&\n seen.path.length < refs.currentPath.length &&\n seen.path.every((part, i) => refs.currentPath[i] === part)\n ? {}\n : ignoreOverride,\n }) as JsonSchema;\n delete jsonSchema.$schema;\n serialized = JSON.stringify(jsonSchema);\n if (key) serializedSchemas.set(key, serialized);\n }\n\n const root = JSON.parse(serialized) as JsonSchema;\n const marker = parseRefMarker(root.description);\n if (marker) {\n delete root.description;\n if (marker.description) root.description = marker.description;\n }\n return resolveSubschemas(root, commonTypes);\n}\n\n/** Keywords whose value is a subschema, or an array of subschemas. */\nconst SUBSCHEMA_KEYWORDS = [\n \"items\",\n \"additionalItems\",\n \"additionalProperties\",\n \"unevaluatedItems\",\n \"unevaluatedProperties\",\n \"contains\",\n \"propertyNames\",\n \"not\",\n \"if\",\n \"then\",\n \"else\",\n \"allOf\",\n \"anyOf\",\n \"oneOf\",\n \"prefixItems\",\n];\n/** Keywords whose value maps names to subschemas. */\nconst SUBSCHEMA_MAP_KEYWORDS = [\n \"properties\",\n \"patternProperties\",\n \"dependentSchemas\",\n \"$defs\",\n \"definitions\",\n];\n\n/**\n * A reference to a whole common type, in `common_types.json` or local. From\n * `@a2ui/web_core` 0.15 the v0.9 common types mark themselves with local\n * `REF:#/$defs/<Name>` refs, the layout of a bundled catalog document; both\n * forms name the same type, which this payload writes as\n * `common_types.json#/$defs/<Name>`.\n */\nconst COMMON_TYPE_REF = /^(?:common_types\\.json)?#\\/\\$defs\\/([^/]+)$/;\n\nfunction isObject(value: unknown): value is JsonSchema {\n return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\n/**\n * Split a `REF:<ref>|<description>` marker at its first `|`, so a description\n * containing `|` is kept whole. The convention comes from\n * `MessageProcessor.processRefs` in `@a2ui/web_core`.\n */\nfunction parseRefMarker(\n description: unknown,\n): { ref: string; description?: string } | undefined {\n if (typeof description !== \"string\" || !description.startsWith(\"REF:\")) {\n return undefined;\n }\n const body = description.slice(4);\n const separator = body.indexOf(\"|\");\n return separator === -1\n ? { ref: body }\n : { ref: body.slice(0, separator), description: body.slice(separator + 1) };\n}\n\n/**\n * Resolve `REF:` markers in a schema's subschemas, innermost first, so a\n * stored common type refers to the types it contains by bare `$ref` too.\n *\n * Only schema-valued keywords are traversed, so literal values under\n * `default`, `const`, `enum` or `examples` are never rewritten.\n */\nfunction resolveSubschemas(\n node: JsonSchema,\n commonTypes: A2UICommonTypes,\n): JsonSchema {\n const resolve = (value: unknown): unknown =>\n Array.isArray(value)\n ? value.map(resolve)\n : isObject(value)\n ? resolveRefMarker(resolveSubschemas(value, commonTypes), commonTypes)\n : value;\n\n const out: JsonSchema = { ...node };\n for (const keyword of SUBSCHEMA_KEYWORDS) {\n if (keyword in out) out[keyword] = resolve(out[keyword]);\n }\n for (const keyword of SUBSCHEMA_MAP_KEYWORDS) {\n const map = out[keyword];\n if (isObject(map)) {\n out[keyword] = Object.fromEntries(\n Object.entries(map).map(([name, child]) => [name, resolve(child)]),\n );\n }\n }\n return out;\n}\n\n/**\n * Turn a node carrying a `REF:` marker into a bare `$ref`, recording the\n * shape it replaced under its `common_types.json` name. A shape that differs\n * from the one already recorded, or a ref outside `common_types.json`, stays\n * inline next to the `$ref`.\n */\nfunction resolveRefMarker(\n node: JsonSchema,\n commonTypes: A2UICommonTypes,\n): JsonSchema {\n const marker = parseRefMarker(node.description);\n if (!marker) return node;\n\n const { description: _marker, ...shape } = node;\n const name = COMMON_TYPE_REF.exec(marker.ref)?.[1];\n const ref: JsonSchema = {\n $ref: name === undefined ? marker.ref : `common_types.json#/$defs/${name}`,\n ...(marker.description ? { description: marker.description } : {}),\n };\n if (name !== undefined) {\n const known = commonTypes[name];\n if (known === undefined) {\n commonTypes[name] = shape;\n return ref;\n }\n if (JSON.stringify(known) === JSON.stringify(shape)) return ref;\n }\n return { ...ref, ...shape };\n}\n\ninterface CatalogFunction {\n name: string;\n returnType?: string;\n schema: unknown;\n}\n\n/**\n * Read a catalog's functions, tolerating catalog-shaped objects whose\n * `functions` is missing, a plain object or an array, and skipping entries\n * without a name or schema.\n */\nfunction catalogFunctions(functions: unknown): CatalogFunction[] {\n if (typeof functions !== \"object\" || functions === null) return [];\n const entries =\n functions instanceof Map\n ? [...functions.values()]\n : Array.isArray(functions)\n ? functions\n : Object.values(functions);\n return entries.filter(\n (fn): fn is CatalogFunction =>\n typeof fn === \"object\" &&\n fn !== null &&\n typeof fn.name === \"string\" &&\n typeof fn.schema === \"object\" &&\n fn.schema !== null,\n );\n}\n"],"mappings":"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"}
|
|
@@ -183,7 +183,7 @@ var ArgsParser = class {
|
|
|
183
183
|
};
|
|
184
184
|
var OpenGenerativeUIMiddleware = class extends _ag_ui_client.Middleware {
|
|
185
185
|
run(input, next) {
|
|
186
|
-
return this.processStream(this.
|
|
186
|
+
return this.processStream(this.runNextWithState(input, next));
|
|
187
187
|
}
|
|
188
188
|
processStream(source) {
|
|
189
189
|
return new rxjs.Observable((subscriber) => {
|
|
@@ -201,13 +201,14 @@ var OpenGenerativeUIMiddleware = class extends _ag_ui_client.Middleware {
|
|
|
201
201
|
}
|
|
202
202
|
};
|
|
203
203
|
const subscription = source.subscribe({
|
|
204
|
-
next: (
|
|
204
|
+
next: (eventWithState) => {
|
|
205
|
+
const event = eventWithState.event;
|
|
205
206
|
if (heldRunFinished) {
|
|
206
|
-
subscriber.next(heldRunFinished);
|
|
207
|
+
subscriber.next(heldRunFinished.event);
|
|
207
208
|
heldRunFinished = null;
|
|
208
209
|
}
|
|
209
210
|
if (event.type === _ag_ui_client.EventType.RUN_FINISHED) {
|
|
210
|
-
heldRunFinished =
|
|
211
|
+
heldRunFinished = eventWithState;
|
|
211
212
|
return;
|
|
212
213
|
}
|
|
213
214
|
if (event.type === _ag_ui_client.EventType.TOOL_CALL_START) {
|
|
@@ -257,7 +258,7 @@ var OpenGenerativeUIMiddleware = class extends _ag_ui_client.Middleware {
|
|
|
257
258
|
for (const [, events] of heldToolCallEvents) for (const event of events) subscriber.next(event);
|
|
258
259
|
heldToolCallEvents.clear();
|
|
259
260
|
if (heldRunFinished) {
|
|
260
|
-
subscriber.next(heldRunFinished);
|
|
261
|
+
subscriber.next(heldRunFinished.event);
|
|
261
262
|
heldRunFinished = null;
|
|
262
263
|
}
|
|
263
264
|
subscriber.error(err);
|
|
@@ -267,7 +268,7 @@ var OpenGenerativeUIMiddleware = class extends _ag_ui_client.Middleware {
|
|
|
267
268
|
flushHeldEvents(toolCallId);
|
|
268
269
|
});
|
|
269
270
|
if (heldRunFinished) {
|
|
270
|
-
subscriber.next(heldRunFinished);
|
|
271
|
+
subscriber.next(heldRunFinished.event);
|
|
271
272
|
heldRunFinished = null;
|
|
272
273
|
}
|
|
273
274
|
activeParsers.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-generative-ui-middleware.cjs","names":["EventType","Middleware","Observable"],"sources":["../../src/event-transforms/open-generative-ui-middleware.ts"],"sourcesContent":["import type {\n RunAgentInput,\n AbstractAgent,\n BaseEvent,\n ToolCallStartEvent,\n ToolCallArgsEvent,\n ActivitySnapshotEventProps,\n ActivityDeltaEvent,\n} from \"@ag-ui/client\";\nimport { Middleware, EventType } from \"@ag-ui/client\";\nimport { Observable } from \"rxjs\";\nimport clarinet from \"clarinet\";\n\nconst TOOL_NAME = \"generateSandboxedUi\";\nconst ACTIVITY_TYPE = \"open-generative-ui\";\n\n/**\n * Parsed parameters from the generateSandboxedUi tool call.\n */\nexport interface GenerateSandboxedUIParams {\n initialHeight?: number;\n placeholderMessages?: string[];\n css?: string;\n html?: string;\n jsFunctions?: string;\n jsExpressions?: string[];\n}\n\n/**\n * Callback invoked by ArgsParser whenever a parameter (or array item) finishes parsing.\n */\nexport type OnParamEvent = (event: BaseEvent) => void;\n\n/**\n * Tracks incremental JSON parsing state for a single tool call's arguments.\n * Emits activity events via the onEvent callback as parameters complete.\n */\nexport class ArgsParser {\n private parser: ReturnType<typeof clarinet.parser> & {\n error?: Error | null;\n textNode?: string;\n };\n private currentKey: string | null = null;\n private depth = 0;\n private currentArrayKey: string | null = null;\n private snapshotEmitted = false;\n\n // Streaming html state — reads parser.textNode to emit incremental chunks\n private streamingHtmlKey = false;\n private htmlEmittedLength = 0;\n private htmlArrayEmitted = false;\n\n public readonly params: GenerateSandboxedUIParams = {};\n public readonly messageId: string;\n private readonly onEvent: OnParamEvent;\n\n constructor(toolCallId: string, onEvent: OnParamEvent) {\n this.messageId = `${toolCallId}-activity`;\n this.onEvent = onEvent;\n this.parser = clarinet.parser();\n\n this.parser.onopenobject = (key: string | undefined) => {\n this.depth++;\n if (key !== undefined && this.depth === 1) {\n this.currentKey = key;\n this.initHtmlStreaming(key);\n }\n };\n\n this.parser.onkey = (key: string) => {\n if (this.depth === 1) {\n this.currentKey = key;\n this.initHtmlStreaming(key);\n }\n };\n\n this.parser.onvalue = (value: string | boolean | number | null) => {\n if (this.depth === 1 && this.currentKey) {\n if (this.currentArrayKey) {\n const strValue = String(value);\n if (this.currentArrayKey === \"jsExpressions\") {\n if (!this.params.jsExpressions) this.params.jsExpressions = [];\n this.params.jsExpressions.push(strValue);\n } else if (this.currentArrayKey === \"placeholderMessages\") {\n if (!this.params.placeholderMessages)\n this.params.placeholderMessages = [];\n this.params.placeholderMessages.push(strValue);\n }\n this.emitArrayItemDelta(this.currentArrayKey, strValue);\n } else if (this.streamingHtmlKey) {\n // HTML string completed — flush any remaining content immediately + htmlComplete\n const fullHtml = value != null ? String(value) : \"\";\n this.params.html = fullHtml || undefined;\n this.emitPendingHtml(fullHtml);\n this.emitParamDelta(\"htmlComplete\", true);\n this.streamingHtmlKey = false;\n } else {\n this.setParam(this.currentKey, value);\n }\n }\n };\n\n this.parser.onopenarray = () => {\n if (this.depth === 1 && this.currentKey) {\n const key = this.currentKey;\n if (key === \"jsExpressions\" || key === \"placeholderMessages\") {\n this.currentArrayKey = key;\n if (key === \"jsExpressions\") this.params.jsExpressions = [];\n else this.params.placeholderMessages = [];\n // Emit a delta to create the array in the activity content.\n // Subsequent \"add\" ops with path \"/<key>/-\" append to this array.\n this.emitParamDelta(key, []);\n }\n }\n };\n\n this.parser.onclosearray = () => {\n if (this.depth === 1) {\n if (this.currentArrayKey === \"jsExpressions\") {\n this.emitParamDelta(\"jsExpressionsComplete\", true);\n }\n this.currentArrayKey = null;\n }\n };\n\n this.parser.oncloseobject = () => {\n this.depth--;\n };\n\n this.parser.onerror = (err: Error) => {\n console.warn(\n \"[OpenGenerativeUI] JSON parse error in streaming args, resuming:\",\n err?.message ?? err,\n );\n // Reset error state so parsing can continue with the next chunk\n this.parser.error = null;\n this.parser.resume();\n };\n }\n\n write(chunk: string): void {\n this.parser.write(chunk);\n this.flushHtmlChunks();\n }\n\n private initHtmlStreaming(key: string): void {\n if (key === \"html\") {\n this.streamingHtmlKey = true;\n this.htmlEmittedLength = 0;\n this.htmlArrayEmitted = false;\n }\n }\n\n /**\n * Read clarinet's internal textNode buffer to emit html chunks incrementally.\n * Called after every write() so partial string content is emitted as it streams in.\n */\n private flushHtmlChunks(): void {\n if (!this.streamingHtmlKey) return;\n const textNode = this.parser.textNode;\n if (typeof textNode !== \"string\") return;\n if (textNode.length === this.htmlEmittedLength) return;\n\n this.emitPendingHtml(textNode);\n }\n\n /**\n * Emit accumulated html content since the last emission.\n * Called by flushHtmlChunks and directly when html completes.\n */\n private emitPendingHtml(textNode: string): void {\n const newContent = textNode.slice(this.htmlEmittedLength);\n if (newContent.length === 0) return;\n\n if (!this.htmlArrayEmitted) {\n this.htmlArrayEmitted = true;\n this.emitParamDelta(\"html\", []);\n }\n this.emitArrayItemDelta(\"html\", newContent);\n this.htmlEmittedLength = textNode.length;\n }\n\n private setParam(key: string, value: string | boolean | number | null): void {\n switch (key) {\n case \"initialHeight\":\n this.params.initialHeight =\n typeof value === \"number\" ? value : undefined;\n if (this.snapshotEmitted) {\n // Snapshot already went out (another param parsed first) — deliver\n // the height as a delta instead.\n this.emitParamDelta(\"initialHeight\", this.params.initialHeight);\n } else {\n this.emitSnapshot();\n }\n break;\n case \"css\":\n this.params.css = value != null ? String(value) : undefined;\n this.emitParamDelta(\"css\", this.params.css);\n this.emitParamDelta(\"cssComplete\", true);\n break;\n case \"jsFunctions\":\n this.params.jsFunctions = value != null ? String(value) : undefined;\n this.emitParamDelta(\"jsFunctions\", this.params.jsFunctions);\n this.emitParamDelta(\"jsFunctionsComplete\", true);\n break;\n }\n }\n\n private emitSnapshot(): void {\n if (this.snapshotEmitted) return;\n this.snapshotEmitted = true;\n\n const event = {\n type: EventType.ACTIVITY_SNAPSHOT,\n messageId: this.messageId,\n activityType: ACTIVITY_TYPE,\n content: { initialHeight: this.params.initialHeight, generating: true },\n } satisfies ActivitySnapshotEventProps;\n this.onEvent(event);\n }\n\n private emitParamDelta(key: string, value: unknown): void {\n // A JSON Patch \"add\" requires a value; emitting one without it (e.g. when\n // the LLM sends a null/empty jsFunctions or css) makes fast-json-patch\n // reject the whole patch client-side with OPERATION_VALUE_REQUIRED and\n // drops it. Skip the delta when there's nothing to add.\n if (value === undefined) return;\n // The activity message must exist before any delta can be applied —\n // the client silently drops ACTIVITY_DELTA events whose messageId has\n // no prior ACTIVITY_SNAPSHOT. The LLM controls the key order of the\n // streamed args, so the snapshot cannot wait for initialHeight.\n this.emitSnapshot();\n const event: ActivityDeltaEvent = {\n type: EventType.ACTIVITY_DELTA,\n messageId: this.messageId,\n activityType: ACTIVITY_TYPE,\n patch: [{ op: \"add\", path: `/${key}`, value }],\n };\n this.onEvent(event);\n }\n\n private emitArrayItemDelta(arrayKey: string, value: string): void {\n this.emitSnapshot();\n const event: ActivityDeltaEvent = {\n type: EventType.ACTIVITY_DELTA,\n messageId: this.messageId,\n activityType: ACTIVITY_TYPE,\n patch: [{ op: \"add\", path: `/${arrayKey}/-`, value }],\n };\n this.onEvent(event);\n }\n}\n\nexport class OpenGenerativeUIMiddleware extends Middleware {\n run(input: RunAgentInput, next: AbstractAgent): Observable<BaseEvent> {\n // Only the events are read, so `runNext`: `runNextWithState` copies the\n // messages and state on every event for a consumer that never looks.\n return this.processStream(this.runNext(input, next));\n }\n\n private processStream(source: Observable<BaseEvent>): Observable<BaseEvent> {\n return new Observable<BaseEvent>((subscriber) => {\n let heldRunFinished: BaseEvent | null = null;\n // Track active generateSandboxedUi tool call IDs → their streaming parser\n const activeParsers = new Map<string, ArgsParser>();\n // Hold genui tool call events until the first activity event is emitted\n const heldToolCallEvents = new Map<string, BaseEvent[]>();\n const flushedToolCalls = new Set<string>();\n\n const flushHeldEvents = (toolCallId: string) => {\n if (flushedToolCalls.has(toolCallId)) return;\n flushedToolCalls.add(toolCallId);\n const held = heldToolCallEvents.get(toolCallId);\n if (held) {\n for (const e of held) {\n subscriber.next(e);\n }\n heldToolCallEvents.delete(toolCallId);\n }\n };\n\n const subscription = source.subscribe({\n next: (event) => {\n if (heldRunFinished) {\n subscriber.next(heldRunFinished);\n heldRunFinished = null;\n }\n\n if (event.type === EventType.RUN_FINISHED) {\n heldRunFinished = event;\n return;\n }\n\n // Hold TOOL_CALL_START for genui until the first activity event\n if (event.type === EventType.TOOL_CALL_START) {\n const startEvent = event as ToolCallStartEvent;\n if (startEvent.toolCallName === TOOL_NAME) {\n heldToolCallEvents.set(startEvent.toolCallId, [event]);\n activeParsers.set(\n startEvent.toolCallId,\n new ArgsParser(startEvent.toolCallId, (activityEvent) => {\n subscriber.next(activityEvent);\n flushHeldEvents(startEvent.toolCallId);\n }),\n );\n return;\n }\n }\n\n // Hold or emit TOOL_CALL_ARGS for genui tool calls\n if (event.type === EventType.TOOL_CALL_ARGS) {\n const argsEvent = event as ToolCallArgsEvent;\n const parser = activeParsers.get(argsEvent.toolCallId);\n if (parser) {\n if (!flushedToolCalls.has(argsEvent.toolCallId)) {\n heldToolCallEvents.get(argsEvent.toolCallId)!.push(event);\n } else {\n subscriber.next(event);\n }\n parser.write(argsEvent.delta);\n return;\n }\n }\n\n // Hold or emit TOOL_CALL_END for genui tool calls\n if (event.type === EventType.TOOL_CALL_END) {\n const endEvent = event as { toolCallId: string } & BaseEvent;\n const parser = activeParsers.get(endEvent.toolCallId);\n if (parser) {\n // Mark generation complete\n const completeEvent: ActivityDeltaEvent = {\n type: EventType.ACTIVITY_DELTA,\n messageId: parser.messageId,\n activityType: ACTIVITY_TYPE,\n patch: [{ op: \"add\", path: \"/generating\", value: false }],\n };\n subscriber.next(completeEvent);\n\n if (!flushedToolCalls.has(endEvent.toolCallId)) {\n heldToolCallEvents.get(endEvent.toolCallId)!.push(event);\n } else {\n subscriber.next(event);\n }\n return;\n }\n }\n\n subscriber.next(event);\n },\n error: (err) => {\n // Flush any held tool call events so downstream sees them before the error\n for (const [, events] of heldToolCallEvents) {\n for (const event of events) {\n subscriber.next(event);\n }\n }\n heldToolCallEvents.clear();\n\n if (heldRunFinished) {\n subscriber.next(heldRunFinished);\n heldRunFinished = null;\n }\n subscriber.error(err);\n },\n complete: () => {\n // Flush any remaining held tool call events (e.g. parser never emitted)\n heldToolCallEvents.forEach((_, toolCallId) => {\n flushHeldEvents(toolCallId);\n });\n\n if (heldRunFinished) {\n subscriber.next(heldRunFinished);\n heldRunFinished = null;\n }\n activeParsers.clear();\n subscriber.complete();\n },\n });\n\n return () => subscription.unsubscribe();\n });\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"open-generative-ui-middleware.cjs","names":["EventType","Middleware","Observable"],"sources":["../../src/event-transforms/open-generative-ui-middleware.ts"],"sourcesContent":["import type {\n RunAgentInput,\n AbstractAgent,\n BaseEvent,\n ToolCallStartEvent,\n ToolCallArgsEvent,\n ActivitySnapshotEventProps,\n ActivityDeltaEvent,\n} from \"@ag-ui/client\";\nimport { Middleware, EventType } from \"@ag-ui/client\";\nimport { Observable } from \"rxjs\";\nimport clarinet from \"clarinet\";\n\nconst TOOL_NAME = \"generateSandboxedUi\";\nconst ACTIVITY_TYPE = \"open-generative-ui\";\n\n/**\n * Parsed parameters from the generateSandboxedUi tool call.\n */\nexport interface GenerateSandboxedUIParams {\n initialHeight?: number;\n placeholderMessages?: string[];\n css?: string;\n html?: string;\n jsFunctions?: string;\n jsExpressions?: string[];\n}\n\n/**\n * Callback invoked by ArgsParser whenever a parameter (or array item) finishes parsing.\n */\nexport type OnParamEvent = (event: BaseEvent) => void;\n\n/**\n * Tracks incremental JSON parsing state for a single tool call's arguments.\n * Emits activity events via the onEvent callback as parameters complete.\n */\nexport class ArgsParser {\n private parser: ReturnType<typeof clarinet.parser> & {\n error?: Error | null;\n textNode?: string;\n };\n private currentKey: string | null = null;\n private depth = 0;\n private currentArrayKey: string | null = null;\n private snapshotEmitted = false;\n\n // Streaming html state — reads parser.textNode to emit incremental chunks\n private streamingHtmlKey = false;\n private htmlEmittedLength = 0;\n private htmlArrayEmitted = false;\n\n public readonly params: GenerateSandboxedUIParams = {};\n public readonly messageId: string;\n private readonly onEvent: OnParamEvent;\n\n constructor(toolCallId: string, onEvent: OnParamEvent) {\n this.messageId = `${toolCallId}-activity`;\n this.onEvent = onEvent;\n this.parser = clarinet.parser();\n\n this.parser.onopenobject = (key: string | undefined) => {\n this.depth++;\n if (key !== undefined && this.depth === 1) {\n this.currentKey = key;\n this.initHtmlStreaming(key);\n }\n };\n\n this.parser.onkey = (key: string) => {\n if (this.depth === 1) {\n this.currentKey = key;\n this.initHtmlStreaming(key);\n }\n };\n\n this.parser.onvalue = (value: string | boolean | number | null) => {\n if (this.depth === 1 && this.currentKey) {\n if (this.currentArrayKey) {\n const strValue = String(value);\n if (this.currentArrayKey === \"jsExpressions\") {\n if (!this.params.jsExpressions) this.params.jsExpressions = [];\n this.params.jsExpressions.push(strValue);\n } else if (this.currentArrayKey === \"placeholderMessages\") {\n if (!this.params.placeholderMessages)\n this.params.placeholderMessages = [];\n this.params.placeholderMessages.push(strValue);\n }\n this.emitArrayItemDelta(this.currentArrayKey, strValue);\n } else if (this.streamingHtmlKey) {\n // HTML string completed — flush any remaining content immediately + htmlComplete\n const fullHtml = value != null ? String(value) : \"\";\n this.params.html = fullHtml || undefined;\n this.emitPendingHtml(fullHtml);\n this.emitParamDelta(\"htmlComplete\", true);\n this.streamingHtmlKey = false;\n } else {\n this.setParam(this.currentKey, value);\n }\n }\n };\n\n this.parser.onopenarray = () => {\n if (this.depth === 1 && this.currentKey) {\n const key = this.currentKey;\n if (key === \"jsExpressions\" || key === \"placeholderMessages\") {\n this.currentArrayKey = key;\n if (key === \"jsExpressions\") this.params.jsExpressions = [];\n else this.params.placeholderMessages = [];\n // Emit a delta to create the array in the activity content.\n // Subsequent \"add\" ops with path \"/<key>/-\" append to this array.\n this.emitParamDelta(key, []);\n }\n }\n };\n\n this.parser.onclosearray = () => {\n if (this.depth === 1) {\n if (this.currentArrayKey === \"jsExpressions\") {\n this.emitParamDelta(\"jsExpressionsComplete\", true);\n }\n this.currentArrayKey = null;\n }\n };\n\n this.parser.oncloseobject = () => {\n this.depth--;\n };\n\n this.parser.onerror = (err: Error) => {\n console.warn(\n \"[OpenGenerativeUI] JSON parse error in streaming args, resuming:\",\n err?.message ?? err,\n );\n // Reset error state so parsing can continue with the next chunk\n this.parser.error = null;\n this.parser.resume();\n };\n }\n\n write(chunk: string): void {\n this.parser.write(chunk);\n this.flushHtmlChunks();\n }\n\n private initHtmlStreaming(key: string): void {\n if (key === \"html\") {\n this.streamingHtmlKey = true;\n this.htmlEmittedLength = 0;\n this.htmlArrayEmitted = false;\n }\n }\n\n /**\n * Read clarinet's internal textNode buffer to emit html chunks incrementally.\n * Called after every write() so partial string content is emitted as it streams in.\n */\n private flushHtmlChunks(): void {\n if (!this.streamingHtmlKey) return;\n const textNode = this.parser.textNode;\n if (typeof textNode !== \"string\") return;\n if (textNode.length === this.htmlEmittedLength) return;\n\n this.emitPendingHtml(textNode);\n }\n\n /**\n * Emit accumulated html content since the last emission.\n * Called by flushHtmlChunks and directly when html completes.\n */\n private emitPendingHtml(textNode: string): void {\n const newContent = textNode.slice(this.htmlEmittedLength);\n if (newContent.length === 0) return;\n\n if (!this.htmlArrayEmitted) {\n this.htmlArrayEmitted = true;\n this.emitParamDelta(\"html\", []);\n }\n this.emitArrayItemDelta(\"html\", newContent);\n this.htmlEmittedLength = textNode.length;\n }\n\n private setParam(key: string, value: string | boolean | number | null): void {\n switch (key) {\n case \"initialHeight\":\n this.params.initialHeight =\n typeof value === \"number\" ? value : undefined;\n if (this.snapshotEmitted) {\n // Snapshot already went out (another param parsed first) — deliver\n // the height as a delta instead.\n this.emitParamDelta(\"initialHeight\", this.params.initialHeight);\n } else {\n this.emitSnapshot();\n }\n break;\n case \"css\":\n this.params.css = value != null ? String(value) : undefined;\n this.emitParamDelta(\"css\", this.params.css);\n this.emitParamDelta(\"cssComplete\", true);\n break;\n case \"jsFunctions\":\n this.params.jsFunctions = value != null ? String(value) : undefined;\n this.emitParamDelta(\"jsFunctions\", this.params.jsFunctions);\n this.emitParamDelta(\"jsFunctionsComplete\", true);\n break;\n }\n }\n\n private emitSnapshot(): void {\n if (this.snapshotEmitted) return;\n this.snapshotEmitted = true;\n\n const event = {\n type: EventType.ACTIVITY_SNAPSHOT,\n messageId: this.messageId,\n activityType: ACTIVITY_TYPE,\n content: { initialHeight: this.params.initialHeight, generating: true },\n } satisfies ActivitySnapshotEventProps;\n this.onEvent(event);\n }\n\n private emitParamDelta(key: string, value: unknown): void {\n // A JSON Patch \"add\" requires a value; emitting one without it (e.g. when\n // the LLM sends a null/empty jsFunctions or css) makes fast-json-patch\n // reject the whole patch client-side with OPERATION_VALUE_REQUIRED and\n // drops it. Skip the delta when there's nothing to add.\n if (value === undefined) return;\n // The activity message must exist before any delta can be applied —\n // the client silently drops ACTIVITY_DELTA events whose messageId has\n // no prior ACTIVITY_SNAPSHOT. The LLM controls the key order of the\n // streamed args, so the snapshot cannot wait for initialHeight.\n this.emitSnapshot();\n const event: ActivityDeltaEvent = {\n type: EventType.ACTIVITY_DELTA,\n messageId: this.messageId,\n activityType: ACTIVITY_TYPE,\n patch: [{ op: \"add\", path: `/${key}`, value }],\n };\n this.onEvent(event);\n }\n\n private emitArrayItemDelta(arrayKey: string, value: string): void {\n this.emitSnapshot();\n const event: ActivityDeltaEvent = {\n type: EventType.ACTIVITY_DELTA,\n messageId: this.messageId,\n activityType: ACTIVITY_TYPE,\n patch: [{ op: \"add\", path: `/${arrayKey}/-`, value }],\n };\n this.onEvent(event);\n }\n}\n\n/**\n * Extract EventWithState type from Middleware.runNextWithState return type\n */\ntype ExtractObservableType<T> = T extends Observable<infer U> ? U : never;\ntype RunNextWithStateReturn = ReturnType<Middleware[\"runNextWithState\"]>;\ntype EventWithState = ExtractObservableType<RunNextWithStateReturn>;\n\nexport class OpenGenerativeUIMiddleware extends Middleware {\n run(input: RunAgentInput, next: AbstractAgent): Observable<BaseEvent> {\n return this.processStream(this.runNextWithState(input, next));\n }\n\n private processStream(\n source: Observable<EventWithState>,\n ): Observable<BaseEvent> {\n return new Observable<BaseEvent>((subscriber) => {\n let heldRunFinished: EventWithState | null = null;\n // Track active generateSandboxedUi tool call IDs → their streaming parser\n const activeParsers = new Map<string, ArgsParser>();\n // Hold genui tool call events until the first activity event is emitted\n const heldToolCallEvents = new Map<string, BaseEvent[]>();\n const flushedToolCalls = new Set<string>();\n\n const flushHeldEvents = (toolCallId: string) => {\n if (flushedToolCalls.has(toolCallId)) return;\n flushedToolCalls.add(toolCallId);\n const held = heldToolCallEvents.get(toolCallId);\n if (held) {\n for (const e of held) {\n subscriber.next(e);\n }\n heldToolCallEvents.delete(toolCallId);\n }\n };\n\n const subscription = source.subscribe({\n next: (eventWithState) => {\n const event = eventWithState.event;\n\n if (heldRunFinished) {\n subscriber.next(heldRunFinished.event);\n heldRunFinished = null;\n }\n\n if (event.type === EventType.RUN_FINISHED) {\n heldRunFinished = eventWithState;\n return;\n }\n\n // Hold TOOL_CALL_START for genui until the first activity event\n if (event.type === EventType.TOOL_CALL_START) {\n const startEvent = event as ToolCallStartEvent;\n if (startEvent.toolCallName === TOOL_NAME) {\n heldToolCallEvents.set(startEvent.toolCallId, [event]);\n activeParsers.set(\n startEvent.toolCallId,\n new ArgsParser(startEvent.toolCallId, (activityEvent) => {\n subscriber.next(activityEvent);\n flushHeldEvents(startEvent.toolCallId);\n }),\n );\n return;\n }\n }\n\n // Hold or emit TOOL_CALL_ARGS for genui tool calls\n if (event.type === EventType.TOOL_CALL_ARGS) {\n const argsEvent = event as ToolCallArgsEvent;\n const parser = activeParsers.get(argsEvent.toolCallId);\n if (parser) {\n if (!flushedToolCalls.has(argsEvent.toolCallId)) {\n heldToolCallEvents.get(argsEvent.toolCallId)!.push(event);\n } else {\n subscriber.next(event);\n }\n parser.write(argsEvent.delta);\n return;\n }\n }\n\n // Hold or emit TOOL_CALL_END for genui tool calls\n if (event.type === EventType.TOOL_CALL_END) {\n const endEvent = event as { toolCallId: string } & BaseEvent;\n const parser = activeParsers.get(endEvent.toolCallId);\n if (parser) {\n // Mark generation complete\n const completeEvent: ActivityDeltaEvent = {\n type: EventType.ACTIVITY_DELTA,\n messageId: parser.messageId,\n activityType: ACTIVITY_TYPE,\n patch: [{ op: \"add\", path: \"/generating\", value: false }],\n };\n subscriber.next(completeEvent);\n\n if (!flushedToolCalls.has(endEvent.toolCallId)) {\n heldToolCallEvents.get(endEvent.toolCallId)!.push(event);\n } else {\n subscriber.next(event);\n }\n return;\n }\n }\n\n subscriber.next(event);\n },\n error: (err) => {\n // Flush any held tool call events so downstream sees them before the error\n for (const [, events] of heldToolCallEvents) {\n for (const event of events) {\n subscriber.next(event);\n }\n }\n heldToolCallEvents.clear();\n\n if (heldRunFinished) {\n subscriber.next(heldRunFinished.event);\n heldRunFinished = null;\n }\n subscriber.error(err);\n },\n complete: () => {\n // Flush any remaining held tool call events (e.g. parser never emitted)\n heldToolCallEvents.forEach((_, toolCallId) => {\n flushHeldEvents(toolCallId);\n });\n\n if (heldRunFinished) {\n subscriber.next(heldRunFinished.event);\n heldRunFinished = null;\n }\n activeParsers.clear();\n subscriber.complete();\n },\n });\n\n return () => subscription.unsubscribe();\n });\n }\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-generative-ui-middleware.d.cts","names":[],"sources":["../../src/event-transforms/open-generative-ui-middleware.ts"],"mappings":";;;;;AAmBA;;UAAiB,yBAAA;EACf,aAAA;EACA,mBAAA;EACA,GAAA;EACA,IAAA;EACA,WAAA;EACA,aAAA;AAAA;;;AAMF;KAAY,YAAA,IAAgB,KAAA,EAAO,SAAA;;;;AAMnC;cAAa,UAAA;EAAA,QACH,MAAA;EAAA,QAIA,UAAA;EAAA,QACA,KAAA;EAAA,QACA,eAAA;EAAA,QACA,eAAA;EAAA,QAGA,gBAAA;EAAA,QACA,iBAAA;EAAA,QACA,gBAAA;EAAA,SAEQ,MAAA,EAAQ,yBAAA;EAAA,SACR,SAAA;EAAA,iBACC,OAAA;cAEL,UAAA,UAAoB,OAAA,EAAS,YAAA;EAoFzC,KAAA,CAAM,KAAA;EAAA,QAKE,iBAAA;;;;;UAYA,eAAA;EAjBF;;;;EAAA,QA8BE,eAAA;EAAA,QAYA,QAAA;EAAA,QA0BA,YAAA;EAAA,QAaA,cAAA;EAAA,QAoBA,kBAAA;AAAA;AAAA,
|
|
1
|
+
{"version":3,"file":"open-generative-ui-middleware.d.cts","names":[],"sources":["../../src/event-transforms/open-generative-ui-middleware.ts"],"mappings":";;;;;AAmBA;;UAAiB,yBAAA;EACf,aAAA;EACA,mBAAA;EACA,GAAA;EACA,IAAA;EACA,WAAA;EACA,aAAA;AAAA;;;AAMF;KAAY,YAAA,IAAgB,KAAA,EAAO,SAAA;;;;AAMnC;cAAa,UAAA;EAAA,QACH,MAAA;EAAA,QAIA,UAAA;EAAA,QACA,KAAA;EAAA,QACA,eAAA;EAAA,QACA,eAAA;EAAA,QAGA,gBAAA;EAAA,QACA,iBAAA;EAAA,QACA,gBAAA;EAAA,SAEQ,MAAA,EAAQ,yBAAA;EAAA,SACR,SAAA;EAAA,iBACC,OAAA;cAEL,UAAA,UAAoB,OAAA,EAAS,YAAA;EAoFzC,KAAA,CAAM,KAAA;EAAA,QAKE,iBAAA;;;;;UAYA,eAAA;EAjBF;;;;EAAA,QA8BE,eAAA;EAAA,QAYA,QAAA;EAAA,QA0BA,YAAA;EAAA,QAaA,cAAA;EAAA,QAoBA,kBAAA;AAAA;AAAA,cAmBG,0BAAA,SAAmC,UAAA;EAC9C,GAAA,CAAI,KAAA,EAAO,aAAA,EAAe,IAAA,EAAM,aAAA,GAAgB,UAAA,CAAW,SAAA;EAAA,QAInD,aAAA;AAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-generative-ui-middleware.d.mts","names":[],"sources":["../../src/event-transforms/open-generative-ui-middleware.ts"],"mappings":";;;;;AAmBA;;UAAiB,yBAAA;EACf,aAAA;EACA,mBAAA;EACA,GAAA;EACA,IAAA;EACA,WAAA;EACA,aAAA;AAAA;;;AAMF;KAAY,YAAA,IAAgB,KAAA,EAAO,SAAA;;;;AAMnC;cAAa,UAAA;EAAA,QACH,MAAA;EAAA,QAIA,UAAA;EAAA,QACA,KAAA;EAAA,QACA,eAAA;EAAA,QACA,eAAA;EAAA,QAGA,gBAAA;EAAA,QACA,iBAAA;EAAA,QACA,gBAAA;EAAA,SAEQ,MAAA,EAAQ,yBAAA;EAAA,SACR,SAAA;EAAA,iBACC,OAAA;cAEL,UAAA,UAAoB,OAAA,EAAS,YAAA;EAoFzC,KAAA,CAAM,KAAA;EAAA,QAKE,iBAAA;;;;;UAYA,eAAA;EAjBF;;;;EAAA,QA8BE,eAAA;EAAA,QAYA,QAAA;EAAA,QA0BA,YAAA;EAAA,QAaA,cAAA;EAAA,QAoBA,kBAAA;AAAA;AAAA,
|
|
1
|
+
{"version":3,"file":"open-generative-ui-middleware.d.mts","names":[],"sources":["../../src/event-transforms/open-generative-ui-middleware.ts"],"mappings":";;;;;AAmBA;;UAAiB,yBAAA;EACf,aAAA;EACA,mBAAA;EACA,GAAA;EACA,IAAA;EACA,WAAA;EACA,aAAA;AAAA;;;AAMF;KAAY,YAAA,IAAgB,KAAA,EAAO,SAAA;;;;AAMnC;cAAa,UAAA;EAAA,QACH,MAAA;EAAA,QAIA,UAAA;EAAA,QACA,KAAA;EAAA,QACA,eAAA;EAAA,QACA,eAAA;EAAA,QAGA,gBAAA;EAAA,QACA,iBAAA;EAAA,QACA,gBAAA;EAAA,SAEQ,MAAA,EAAQ,yBAAA;EAAA,SACR,SAAA;EAAA,iBACC,OAAA;cAEL,UAAA,UAAoB,OAAA,EAAS,YAAA;EAoFzC,KAAA,CAAM,KAAA;EAAA,QAKE,iBAAA;;;;;UAYA,eAAA;EAjBF;;;;EAAA,QA8BE,eAAA;EAAA,QAYA,QAAA;EAAA,QA0BA,YAAA;EAAA,QAaA,cAAA;EAAA,QAoBA,kBAAA;AAAA;AAAA,cAmBG,0BAAA,SAAmC,UAAA;EAC9C,GAAA,CAAI,KAAA,EAAO,aAAA,EAAe,IAAA,EAAM,aAAA,GAAgB,UAAA,CAAW,SAAA;EAAA,QAInD,aAAA;AAAA"}
|
|
@@ -181,7 +181,7 @@ var ArgsParser = class {
|
|
|
181
181
|
};
|
|
182
182
|
var OpenGenerativeUIMiddleware = class extends Middleware {
|
|
183
183
|
run(input, next) {
|
|
184
|
-
return this.processStream(this.
|
|
184
|
+
return this.processStream(this.runNextWithState(input, next));
|
|
185
185
|
}
|
|
186
186
|
processStream(source) {
|
|
187
187
|
return new Observable((subscriber) => {
|
|
@@ -199,13 +199,14 @@ var OpenGenerativeUIMiddleware = class extends Middleware {
|
|
|
199
199
|
}
|
|
200
200
|
};
|
|
201
201
|
const subscription = source.subscribe({
|
|
202
|
-
next: (
|
|
202
|
+
next: (eventWithState) => {
|
|
203
|
+
const event = eventWithState.event;
|
|
203
204
|
if (heldRunFinished) {
|
|
204
|
-
subscriber.next(heldRunFinished);
|
|
205
|
+
subscriber.next(heldRunFinished.event);
|
|
205
206
|
heldRunFinished = null;
|
|
206
207
|
}
|
|
207
208
|
if (event.type === EventType.RUN_FINISHED) {
|
|
208
|
-
heldRunFinished =
|
|
209
|
+
heldRunFinished = eventWithState;
|
|
209
210
|
return;
|
|
210
211
|
}
|
|
211
212
|
if (event.type === EventType.TOOL_CALL_START) {
|
|
@@ -255,7 +256,7 @@ var OpenGenerativeUIMiddleware = class extends Middleware {
|
|
|
255
256
|
for (const [, events] of heldToolCallEvents) for (const event of events) subscriber.next(event);
|
|
256
257
|
heldToolCallEvents.clear();
|
|
257
258
|
if (heldRunFinished) {
|
|
258
|
-
subscriber.next(heldRunFinished);
|
|
259
|
+
subscriber.next(heldRunFinished.event);
|
|
259
260
|
heldRunFinished = null;
|
|
260
261
|
}
|
|
261
262
|
subscriber.error(err);
|
|
@@ -265,7 +266,7 @@ var OpenGenerativeUIMiddleware = class extends Middleware {
|
|
|
265
266
|
flushHeldEvents(toolCallId);
|
|
266
267
|
});
|
|
267
268
|
if (heldRunFinished) {
|
|
268
|
-
subscriber.next(heldRunFinished);
|
|
269
|
+
subscriber.next(heldRunFinished.event);
|
|
269
270
|
heldRunFinished = null;
|
|
270
271
|
}
|
|
271
272
|
activeParsers.clear();
|