@dusted/anqst 1.5.0 → 1.6.0

package/dist/src/emit.js

@@ -13,7 +13,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const typescript_1 = __importDefault(require("typescript"));
 const pngjs_1 = require("pngjs");
 const layout_1 = require("./layout");
-const structured_top_level_codecs_1 = require("./structured-top-level-codecs");
+const boundary_codecs_1 = require("./boundary-codecs");
 function stripAnQstType(typeText) {
     return typeText
         .replace(/\bAnQst\.Type\.stringArray\b/g, "string[]")
@@ -83,6 +83,99 @@ function isNumberLikeUnionTypeNode(node) {
         return false;
     });
 }
+function collectFiniteStringLiteralsTypeNode(node) {
+    const values = [];
+    for (const part of node.types) {
+        if (!typescript_1.default.isLiteralTypeNode(part) || !typescript_1.default.isStringLiteral(part.literal))
+            return null;
+        values.push(part.literal.text);
+    }
+    return values;
+}
+function collectFiniteBooleanLiteralsTypeNode(node) {
+    const values = [];
+    for (const part of node.types) {
+        if (!typescript_1.default.isLiteralTypeNode(part))
+            return null;
+        if (part.literal.kind === typescript_1.default.SyntaxKind.TrueKeyword) {
+            values.push(true);
+            continue;
+        }
+        if (part.literal.kind === typescript_1.default.SyntaxKind.FalseKeyword) {
+            values.push(false);
+            continue;
+        }
+        return null;
+    }
+    return values;
+}
+function collectFiniteNumberLiteralsTypeNode(node) {
+    const values = [];
+    for (const part of node.types) {
+        if (!typescript_1.default.isLiteralTypeNode(part) || !typescript_1.default.isNumericLiteral(part.literal))
+            return null;
+        values.push(Number(part.literal.text));
+    }
+    return values;
+}
+function finiteDomainSymbolForCpp(value) {
+    if (typeof value === "boolean")
+        return value ? "True" : "False";
+    if (typeof value === "number") {
+        const text = Number.isInteger(value) ? `${value}` : `${value}`.replace(/\./g, "_");
+        return sanitizeIdentifier(`Value_${text.replace(/-/g, "neg_")}`);
+    }
+    const direct = sanitizeIdentifier(value.trim());
+    return direct.length > 0 ? direct : "Value";
+}
+function buildCppFiniteDomain(primitive, values) {
+    const seen = new Set();
+    const variants = [];
+    for (const value of values) {
+        const key = `${typeof value}:${String(value)}`;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        variants.push({
+            code: variants.length,
+            symbolicName: finiteDomainSymbolForCpp(value),
+            value
+        });
+    }
+    return { primitive, variants };
+}
+function collectFiniteDomainFromTypeNode(typeNode) {
+    if (typescript_1.default.isParenthesizedTypeNode(typeNode)) {
+        return collectFiniteDomainFromTypeNode(typeNode.type);
+    }
+    if (typescript_1.default.isLiteralTypeNode(typeNode)) {
+        if (typescript_1.default.isStringLiteral(typeNode.literal)) {
+            return buildCppFiniteDomain("string", [typeNode.literal.text]);
+        }
+        if (typescript_1.default.isNumericLiteral(typeNode.literal)) {
+            return buildCppFiniteDomain("number", [Number(typeNode.literal.text)]);
+        }
+        if (typeNode.literal.kind === typescript_1.default.SyntaxKind.TrueKeyword || typeNode.literal.kind === typescript_1.default.SyntaxKind.FalseKeyword) {
+            return buildCppFiniteDomain("boolean", [typeNode.literal.kind === typescript_1.default.SyntaxKind.TrueKeyword]);
+        }
+        return null;
+    }
+    if (!typescript_1.default.isUnionTypeNode(typeNode))
+        return null;
+    const filtered = filterNullishUnionTypeNodes(typeNode.types);
+    if (filtered.length !== typeNode.types.length)
+        return null;
+    const finiteStrings = collectFiniteStringLiteralsTypeNode(typeNode);
+    if (finiteStrings)
+        return buildCppFiniteDomain("string", finiteStrings);
+    const finiteBooleans = collectFiniteBooleanLiteralsTypeNode(typeNode);
+    if (finiteBooleans)
+        return buildCppFiniteDomain("boolean", finiteBooleans);
+    const finiteNumbers = collectFiniteNumberLiteralsTypeNode(typeNode);
+    if (finiteNumbers)
+        return buildCppFiniteDomain("number", finiteNumbers);
+    return null;
+}
 function mapTsTypeToCpp(typeText) {
     const raw = typeText.trim();
     if (/\bAnQst\.Type\.qint64\b/.test(raw))
@@ -179,6 +272,57 @@ function callbackName(memberName) {
 function pascalCase(value) {
     return value.length === 0 ? value : `${value.charAt(0).toUpperCase()}${value.slice(1)}`;
 }
+function sanitizeIdentifier(value) {
+    const trimmed = value.replace(/[^A-Za-z0-9_]+/g, "_").replace(/_+/g, "_").replace(/^_+|_+$/g, "");
+    const withFallback = trimmed.length > 0 ? trimmed : "Codec";
+    return /^[0-9]/.test(withFallback) ? `T_${withFallback}` : withFallback;
+}
+/** Qualify generated struct/enum names in public widget headers so TUs that include multiple widgets
+ *  (each with `using namespace WidgetName`) do not get ambiguous unqualified types (e.g. two `Magic`). */
+const CPP_WIDGET_HEADER_PRIMITIVES = new Set([
+    "void",
+    "bool",
+    "double",
+    "float",
+    "QString",
+    "QByteArray",
+    "QVariantMap",
+    "QStringList",
+    "qint64",
+    "quint64",
+    "qint32",
+    "quint32",
+    "qint16",
+    "quint16",
+    "qint8",
+    "quint8",
+    "int8_t",
+    "uint8_t",
+    "int16_t",
+    "uint16_t",
+    "int32_t",
+    "uint32_t"
+]);
+function qualifyCppTypeForWidgetHeaderPublicApi(widgetName, cppType) {
+    const trimmed = cppType.trim();
+    const listInner = /^QList<(.+)>$/.exec(trimmed);
+    if (listInner) {
+        return `QList<${qualifyCppTypeForWidgetHeaderPublicApi(widgetName, listInner[1])}>`;
+    }
+    if (trimmed.includes("::")) {
+        return trimmed;
+    }
+    if (CPP_WIDGET_HEADER_PRIMITIVES.has(trimmed)) {
+        return trimmed;
+    }
+    if (trimmed.startsWith("std::")) {
+        return trimmed;
+    }
+    if (/^(qint|quint)[0-9]{1,2}$/.test(trimmed)) {
+        return trimmed;
+    }
+    return `${widgetName}::${trimmed}`;
+}
 function variantToCppExpression(cppType, expr) {
     if (cppType === "QString")
         return `${expr}.toString()`;
@@ -471,6 +615,7 @@ class CppTypeNormalizer {
         this.allKnownNames = new Set();
         this.usedNames = new Set();
         this.syntheticNameByKey = new Map();
+        this.finiteDomainNameByKey = new Map();
         for (const decl of collectStructDecls(spec)) {
             this.allKnownNames.add(decl.name);
             this.usedNames.add(decl.name);
@@ -494,9 +639,11 @@ class CppTypeNormalizer {
         const order = this.topologicalOrder();
         const orderedDecls = order.map((name) => this.declMap.get(name)).filter((x) => !!x);
         const structNames = orderedDecls.filter((d) => d.kind === "struct").map((d) => d.name);
+        const metatypeNames = orderedDecls.filter((d) => d.kind === "struct" || d.kind === "enum").map((d) => d.name);
         return {
             orderedDecls,
             structNames,
+            metatypeNames,
             mapTypeText: (typeText, nameHintParts) => this.mapTypeText(typeText, nameHintParts)
         };
     }
@@ -514,7 +661,19 @@ class CppTypeNormalizer {
                     optional: !!member.questionToken
                 });
             }
-            return { name, kind: "struct", fields, aliasType: null, deps, isUnionAlias: false };
+            return { name, kind: "struct", fields, aliasType: null, deps, isUnionAlias: false, finiteDomain: null };
+        }
+        const finiteDomain = collectFiniteDomainFromTypeNode(node.type);
+        if (finiteDomain) {
+            return {
+                name,
+                kind: "enum",
+                fields: [],
+                aliasType: null,
+                deps: new Set(),
+                isUnionAlias: false,
+                finiteDomain
+            };
         }
         const deps = new Set();
         const aliasType = this.mapTypeNode(node.type, [name], deps);
@@ -524,13 +683,18 @@ class CppTypeNormalizer {
             fields: [],
             aliasType,
             deps,
-            isUnionAlias: node.type.getText().includes("|")
+            isUnionAlias: node.type.getText().includes("|"),
+            finiteDomain: null
         };
     }
     mapTypeNode(typeNode, nameHintParts, deps) {
         if (typescript_1.default.isParenthesizedTypeNode(typeNode)) {
             return this.mapTypeNode(typeNode.type, nameHintParts, deps);
         }
+        const finiteDomain = collectFiniteDomainFromTypeNode(typeNode);
+        if (finiteDomain) {
+            return this.ensureFiniteDomainType(finiteDomain, nameHintParts, deps);
+        }
         if (typescript_1.default.isUnionTypeNode(typeNode)) {
             const filtered = filterNullishUnionTypeNodes(typeNode.types);
             if (filtered.length === 1) {
@@ -587,6 +751,34 @@ class CppTypeNormalizer {
         this.collectKnownTypeDeps(mapped, deps);
         return mapped;
     }
+    ensureFiniteDomainType(domain, nameHintParts, deps) {
+        const baseName = this.makeSyntheticBaseName(nameHintParts);
+        const domainKey = `${baseName}::finite::${domain.primitive}::${domain.variants.map((variant) => `${variant.symbolicName}=${String(variant.value)}`).join("|")}`;
+        const existingName = this.finiteDomainNameByKey.get(domainKey);
+        if (existingName) {
+            deps.add(existingName);
+            return existingName;
+        }
+        const synthesizedName = this.allocateUniqueName(baseName);
+        this.finiteDomainNameByKey.set(domainKey, synthesizedName);
+        if (this.declMap.has(synthesizedName)) {
+            deps.add(synthesizedName);
+            return synthesizedName;
+        }
+        this.allKnownNames.add(synthesizedName);
+        this.declMap.set(synthesizedName, {
+            name: synthesizedName,
+            kind: "enum",
+            fields: [],
+            aliasType: null,
+            deps: new Set(),
+            isUnionAlias: false,
+            finiteDomain: domain
+        });
+        this.seedOrder.push(synthesizedName);
+        deps.add(synthesizedName);
+        return synthesizedName;
+    }
     ensureSyntheticStruct(typeNode, nameHintParts, deps) {
         const baseName = this.makeSyntheticBaseName(nameHintParts);
         const syntheticKey = `${baseName}::${typeNode.getText()}`;
@@ -620,7 +812,8 @@ class CppTypeNormalizer {
             fields,
             aliasType: null,
             deps: localDeps,
-            isUnionAlias: false
+            isUnionAlias: false,
+            finiteDomain: null
         });
         this.seedOrder.push(synthesizedName);
         deps.add(synthesizedName);
@@ -682,6 +875,17 @@ class CppTypeNormalizer {
     }
 }
 function renderCppDecl(decl) {
+    if (decl.kind === "enum") {
+        const variants = decl.finiteDomain?.variants ?? [];
+        const underlyingType = variants.length <= 0xff ? "std::uint8_t" : variants.length <= 0xffff ? "std::uint16_t" : "std::uint32_t";
+        const lines = [];
+        lines.push(`enum class ${decl.name} : ${underlyingType} {`);
+        for (const variant of variants) {
+            lines.push(`    ${variant.symbolicName} = ${variant.code},`);
+        }
+        lines.push("};");
+        return lines.join("\n");
+    }
     if (decl.kind === "alias") {
         if (decl.isUnionAlias && decl.aliasType === "QString") {
             return `using ${decl.name} = QString; // union mapped conservatively`;
@@ -737,6 +941,146 @@ function collectDragDropMimeConstants(spec) {
     }
     return constants;
 }
+function createCarrierSummary(counts, singleKinds = [], mayBlob = false, mustBlob = false) {
+    return {
+        counts: new Set(counts),
+        singleKinds: new Set(singleKinds),
+        mayBlob,
+        mustBlob
+    };
+}
+function addOptionalAbsence(summary) {
+    const counts = new Set(summary.counts);
+    counts.add(0);
+    return {
+        counts,
+        singleKinds: new Set(summary.singleKinds),
+        mayBlob: summary.mayBlob,
+        mustBlob: summary.mustBlob
+    };
+}
+function saturatingItemCountAdd(left, right) {
+    if (left === 2 || right === 2)
+        return 2;
+    const total = left + right;
+    return total >= 2 ? 2 : total;
+}
+function mergeCarrierSummaries(left, right) {
+    const counts = new Set();
+    const singleKinds = new Set();
+    for (const leftCount of left.counts) {
+        for (const rightCount of right.counts) {
+            const total = saturatingItemCountAdd(leftCount, rightCount);
+            counts.add(total);
+            if (total !== 1)
+                continue;
+            if (leftCount === 1 && rightCount === 0) {
+                for (const kind of left.singleKinds)
+                    singleKinds.add(kind);
+            }
+            if (leftCount === 0 && rightCount === 1) {
+                for (const kind of right.singleKinds)
+                    singleKinds.add(kind);
+            }
+        }
+    }
+    return {
+        counts,
+        singleKinds,
+        mayBlob: left.mayBlob || right.mayBlob,
+        mustBlob: left.mustBlob || right.mustBlob
+    };
+}
+function summarizePlanCarrier(node) {
+    switch (node.nodeKind) {
+        case "leaf":
+            if (node.blobEntryId)
+                return createCarrierSummary([0], [], true, true);
+            if (node.itemEntryId) {
+                return createCarrierSummary([1], [node.leaf.region === "dynamic" ? "object" : "string"]);
+            }
+            return createCarrierSummary([0]);
+        case "named":
+            return summarizePlanCarrier(node.target);
+        case "finite-domain":
+            if (node.blobEntryId)
+                return createCarrierSummary([0], [], true, true);
+            if (node.itemEntryId)
+                return createCarrierSummary([1], ["string"]);
+            return createCarrierSummary([0]);
+        case "array": {
+            if (node.extentStrategy === "blob-tail") {
+                return createCarrierSummary([0], [], true, false);
+            }
+            const elementSummary = summarizePlanCarrier(node.element);
+            const counts = new Set([0]);
+            const singleKinds = new Set();
+            if (elementSummary.counts.has(1)) {
+                counts.add(1);
+                for (const kind of elementSummary.singleKinds)
+                    singleKinds.add(kind);
+            }
+            if (elementSummary.counts.has(1) || elementSummary.counts.has(2)) {
+                counts.add(2);
+            }
+            return {
+                counts,
+                singleKinds,
+                mayBlob: true,
+                mustBlob: true
+            };
+        }
+        case "struct": {
+            let summary = createCarrierSummary([0]);
+            for (const field of node.fields) {
+                let fieldSummary = summarizePlanCarrier(field.node);
+                if (field.optional) {
+                    fieldSummary = addOptionalAbsence(fieldSummary);
+                }
+                if (field.presenceStrategy) {
+                    fieldSummary = {
+                        counts: new Set(fieldSummary.counts),
+                        singleKinds: new Set(fieldSummary.singleKinds),
+                        mayBlob: true,
+                        mustBlob: true
+                    };
+                }
+                summary = mergeCarrierSummaries(summary, fieldSummary);
+            }
+            return summary;
+        }
+    }
+}
+function inferDragDropCarrierKinds(plan) {
+    const summary = summarizePlanCarrier(plan.root);
+    const carriers = new Set();
+    const addNoBlobCarriers = () => {
+        if (summary.counts.has(0))
+            carriers.add("array");
+        if (summary.counts.has(1)) {
+            for (const kind of summary.singleKinds)
+                carriers.add(kind);
+        }
+        if (summary.counts.has(2))
+            carriers.add("array");
+    };
+    if (summary.mustBlob) {
+        if (summary.counts.has(0))
+            carriers.add("string");
+        if (summary.counts.has(1) || summary.counts.has(2))
+            carriers.add("array");
+    }
+    else {
+        addNoBlobCarriers();
+        if (summary.mayBlob) {
+            if (summary.counts.has(0))
+                carriers.add("string");
+            if (summary.counts.has(1) || summary.counts.has(2))
+                carriers.add("array");
+        }
+    }
+    return ["string", "array", "object"].filter((kind) => carriers.has(kind));
+}
 function collectDragDropPayloadHelpers(spec, cppTypes, cppCodecCatalog) {
     const seen = new Set();
     const helpers = [];
@@ -748,21 +1092,96 @@ function collectDragDropPayloadHelpers(spec, cppTypes, cppCodecCatalog) {
             if (seen.has(typeName))
                 continue;
             seen.add(typeName);
-            const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+            const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
             if (!payloadSite)
                 continue;
+            const plan = cppCodecCatalog.plansByCodecId.get(payloadSite.codecId);
+            if (!plan)
+                continue;
             helpers.push({
                 typeName,
                 cppType: cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]),
-                codecId: payloadSite.codecId
+                codecId: payloadSite.codecId,
+                carriers: inferDragDropCarrierKinds(plan)
+            });
+        }
+    }
+    return helpers;
+}
+function collectTsDragDropPayloadHelpers(spec, codecCatalog) {
+    const seen = new Set();
+    const helpers = [];
+    for (const service of spec.services) {
+        for (const member of service.members) {
+            if ((member.kind !== "DropTarget" && member.kind !== "HoverTarget") || !member.payloadTypeText)
+                continue;
+            const typeName = member.payloadTypeText.replace(/\s/g, "");
+            if (seen.has(typeName))
+                continue;
+            seen.add(typeName);
+            const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
+            if (!payloadSite)
+                continue;
+            const plan = codecCatalog.plansByCodecId.get(payloadSite.codecId);
+            if (!plan)
+                continue;
+            helpers.push({
+                typeName,
+                tsType: mapTypeTextToTs(member.payloadTypeText),
+                codecId: payloadSite.codecId,
+                carriers: inferDragDropCarrierKinds(plan)
             });
         }
     }
     return helpers;
 }
+function renderTsDragDropPayloadHelpers(spec, codecCatalog) {
+    const helpers = collectTsDragDropPayloadHelpers(spec, codecCatalog);
+    return helpers
+        .map((helper) => {
+        const lines = [
+            `function decodeDragDropPayload_${helper.typeName}(rawPayload: unknown): ${helper.tsType} {`,
+            `  if (typeof rawPayload !== "string") {`,
+            `    throw new Error("Drag/drop payload must be tagged text.");`,
+            `  }`,
+            `  if (rawPayload.length === 0) {`,
+            `    throw new Error("Drag/drop payload is empty.");`,
+            `  }`,
+            `  const transportTag = rawPayload[0];`,
+            `  const payloadText = rawPayload.slice(1);`
+        ];
+        if (helper.carriers.includes("string")) {
+            lines.push(`  if (transportTag === "S") {`);
+            lines.push(`    return decode${helper.codecId}(payloadText);`);
+            lines.push(`  }`);
+        }
+        if (helper.carriers.includes("array")) {
+            lines.push(`  if (transportTag === "A") {`);
+            lines.push(`    const parsed = JSON.parse(payloadText) as unknown;`);
+            lines.push(`    if (!Array.isArray(parsed)) {`);
+            lines.push(`      throw new Error("Drag/drop payload must be a JSON array.");`);
+            lines.push(`    }`);
+            lines.push(`    return decode${helper.codecId}(parsed);`);
+            lines.push(`  }`);
+        }
+        if (helper.carriers.includes("object")) {
+            lines.push(`  if (transportTag === "O") {`);
+            lines.push(`    const parsed = JSON.parse(payloadText) as unknown;`);
+            lines.push(`    if (parsed === null || Array.isArray(parsed) || typeof parsed !== "object") {`);
+            lines.push(`      throw new Error("Drag/drop payload must be a JSON object.");`);
+            lines.push(`    }`);
+            lines.push(`    return decode${helper.codecId}(parsed);`);
+            lines.push(`  }`);
+        }
+        lines.push(`  throw new Error(\`Drag/drop payload has an unknown transport tag: \${transportTag}\`);`);
+        lines.push(`}`);
+        return lines.join("\n");
+    })
+        .join("\n\n");
+}
 function renderTypesHeader(spec, cppTypes) {
     const decls = cppTypes.orderedDecls.map(renderCppDecl).join("\n\n");
-    const metatypes = cppTypes.structNames
+    const metatypes = cppTypes.metatypeNames
         .flatMap((name) => [
         `Q_DECLARE_METATYPE(${spec.widgetName}::${name})`,
         `Q_DECLARE_METATYPE(QList<${spec.widgetName}::${name}>)`
@@ -794,14 +1213,12 @@ ${metatypes}
 }
 function renderWidgetUmbrellaHeader(spec) {
     return `#pragma once
-// Built by <AnQst_version>
 #include "${spec.widgetName}Widget.h"
 #include "${spec.widgetName}Types.h"
 `;
 }
-function renderWidgetHeader(spec, cppTypes) {
+function renderWidgetHeader(spec, cppTypes, cppCodecCatalog) {
     const widgetClassName = `${spec.widgetName}Widget`;
-    const cppCodecCatalog = (0, structured_top_level_codecs_1.buildStructuredCodecCatalog)(spec);
     const dragDropPayloadHelpers = collectDragDropPayloadHelpers(spec, cppTypes, cppCodecCatalog);
     const callbackAliases = [];
     const publicMethods = [];
@@ -812,34 +1229,44 @@ function renderWidgetHeader(spec, cppTypes) {
     const properties = [];
     const fields = [];
     const publicSlots = [];
-    const dragDropHelperMethods = dragDropPayloadHelpers.flatMap((helper) => [
-        `static QByteArray encodeDragDropPayload_${helper.typeName}(const ${helper.cppType}& payload);`,
-        `static std::optional<${helper.cppType}> decodeDragDropPayload_${helper.typeName}(const QByteArray& rawPayload);`
-    ]);
-    const bindings = [];
+    const dragDropHelperMethods = dragDropPayloadHelpers.flatMap((helper) => {
+        const qPayload = qualifyCppTypeForWidgetHeaderPublicApi(spec.widgetName, helper.cppType);
+        return [
+            `static QByteArray encodeDragDropPayload_${helper.typeName}(const ${qPayload}& payload);`,
+            `static std::optional<${qPayload}> decodeDragDropPayload_${helper.typeName}(const QByteArray& rawPayload);`
+        ];
+    });
+    const qType = (t) => qualifyCppTypeForWidgetHeaderPublicApi(spec.widgetName, t);
     for (const service of spec.services) {
         for (const member of service.members) {
-            bindings.push({ service: service.name, member: member.name, kind: member.kind });
             const memberPascal = pascalCase(member.name);
             if (member.kind === "Call" && member.payloadTypeText) {
-                const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-                const args = member.parameters.map((p) => `const ${cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name])}& ${p.name}`).join(", ");
+                const cppType = qType(cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]));
+                const args = member.parameters
+                    .map((p) => `const ${qType(cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name]))}& ${p.name}`)
+                    .join(", ");
                 callbackAliases.push(`using ${memberPascal}Handler = std::function<${cppType}(${args})>;`);
                 handleMethods.push(`    void ${member.name}(const ${memberPascal}Handler& handler) const;`);
                 callSetterMethods.push(`void set${memberPascal}CallHandler(const ${memberPascal}Handler& handler);`);
                 fields.push(`${memberPascal}Handler m_${member.name}Handler;`);
             }
             else if (member.kind === "Emitter") {
-                const args = member.parameters.map((p) => `const ${cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name])}& ${p.name}`).join(", ");
+                const args = member.parameters
+                    .map((p) => `const ${qType(cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name]))}& ${p.name}`)
+                    .join(", ");
                 signals.push(`void ${member.name}(${args});`);
             }
             else if (member.kind === "Slot") {
-                const ret = member.payloadTypeText ? cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]) : "void";
-                const args = member.parameters.map((p) => `${cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name])} ${p.name}`).join(", ");
+                const ret = member.payloadTypeText
+                    ? qType(cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]))
+                    : "void";
+                const args = member.parameters
+                    .map((p) => `${qType(cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name]))} ${p.name}`)
+                    .join(", ");
                 slotMethods.push(`${ret} slot_${member.name}(${args});`);
             }
             else if ((member.kind === "Input" || member.kind === "Output") && member.payloadTypeText) {
-                const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
+                const cppType = qType(cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]));
                 const cap = member.name.charAt(0).toUpperCase() + member.name.slice(1);
                 properties.push(`Q_PROPERTY(${cppType} ${member.name} READ ${member.name} WRITE set${cap} NOTIFY ${member.name}Changed)`);
                 publicMethods.push(`${cppType} ${member.name}() const;`);
@@ -856,11 +1283,11 @@ function renderWidgetHeader(spec, cppTypes) {
                 }
             }
             else if (member.kind === "DropTarget" && member.payloadTypeText) {
-                const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
+                const cppType = qType(cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]));
                 signals.push(`void ${member.name}(const ${cppType}& payload, double x, double y);`);
             }
             else if (member.kind === "HoverTarget" && member.payloadTypeText) {
-                const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
+                const cppType = qType(cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]));
                 signals.push(`void ${member.name}(const ${cppType}& payload, double x, double y);`);
                 signals.push(`void ${member.name}Left();`);
             }
@@ -929,13 +1356,6 @@ private:
         QVariantList args;
         QDateTime enqueuedAt;
     };
-    struct BridgeBindingRow {
-        const char* service;
-        const char* member;
-        const char* kind;
-    };
-    static const BridgeBindingRow kBridgeBindings[];
-    static constexpr int kBridgeBindingsCount = ${bindings.length};
     static QString makeBindingKey(const QString& service, const QString& member);
     void installBridgeBindings();
     bool hasEmitterListeners(const QString& service, const QString& member) const;
@@ -957,18 +1377,19 @@ ${fields.map((f) => `    ${f}`).join("\n")}
 };
 `;
 }
-function renderCppStub(spec, cppTypes) {
+function renderCppStub(spec, cppTypes, cppCodecCatalog) {
     const widgetClassName = `${spec.widgetName}Widget`;
-    const cppCodecCatalog = (0, structured_top_level_codecs_1.buildStructuredCodecCatalog)(spec);
     const dragDropPayloadHelpers = collectDragDropPayloadHelpers(spec, cppTypes, cppCodecCatalog);
-    const cppCodecHelpers = (0, structured_top_level_codecs_1.renderCppStructuredCodecHelpers)(cppCodecCatalog, (typeText, pathHintParts) => cppTypes.mapTypeText(typeText, pathHintParts)).trim();
+    const cppCodecHelpers = (0, boundary_codecs_1.renderCppBoundaryCodecHelpers)(cppCodecCatalog, (typeText, pathHintParts) => cppTypes.mapTypeText(typeText, pathHintParts)).trim();
     const lines = [];
     lines.push(`#include "include/${spec.widgetName}Widget.h"`);
+    lines.push(`#include "AnQstBase93.h"`);
     lines.push(`#include <QDebug>`);
     lines.push(`#include <QElapsedTimer>`);
     lines.push(`#include <QEventLoop>`);
     lines.push(`#include <QJsonArray>`);
     lines.push(`#include <QJsonDocument>`);
+    lines.push(`#include <QJsonObject>`);
     lines.push(`#include <QMetaType>`);
     lines.push(`#include <QTimer>`);
     lines.push(`#include <cstring>`);
@@ -984,7 +1405,7 @@ function renderCppStub(spec, cppTypes) {
     lines.push("namespace {");
     lines.push("void registerGeneratedMetaTypes() {");
     lines.push("    static const bool registered = []() {");
-    for (const typeName of cppTypes.structNames) {
+    for (const typeName of cppTypes.metatypeNames) {
         lines.push(`        qRegisterMetaType<${spec.widgetName}::${typeName}>("${spec.widgetName}::${typeName}");`);
         lines.push(`        qRegisterMetaType<QList<${spec.widgetName}::${typeName}>>("QList<${spec.widgetName}::${typeName}>");`);
     }
@@ -1000,20 +1421,78 @@ function renderCppStub(spec, cppTypes) {
     lines.push("");
     for (const helper of dragDropPayloadHelpers) {
         lines.push(`QByteArray ${widgetClassName}::encodeDragDropPayload_${helper.typeName}(const ${helper.cppType}& payload) {`);
-        lines.push(`    return QJsonDocument::fromVariant(anqstNormalizeWireItems(encode${helper.codecId}(payload))).toJson(QJsonDocument::Compact);`);
+        lines.push(`    const QVariant wire = encode${helper.codecId}(payload);`);
+        if (helper.carriers.includes("string")) {
+            lines.push(`    if (wire.type() == QVariant::String) {`);
+            lines.push(`        QByteArray out;`);
+            lines.push(`        out.append('S');`);
+            lines.push(`        out.append(wire.toString().toUtf8());`);
+            lines.push(`        return out;`);
+            lines.push(`    }`);
+        }
+        if (helper.carriers.includes("array")) {
+            lines.push(`    if (wire.type() == QVariant::List) {`);
+            lines.push(`        QByteArray out;`);
+            lines.push(`        out.append('A');`);
+            lines.push(`        out.append(QJsonDocument(QJsonArray::fromVariantList(wire.toList())).toJson(QJsonDocument::Compact));`);
+            lines.push(`        return out;`);
+            lines.push(`    }`);
+        }
+        if (helper.carriers.includes("object")) {
+            lines.push(`    if (wire.type() == QVariant::Map) {`);
+            lines.push(`        QByteArray out;`);
+            lines.push(`        out.append('O');`);
+            lines.push(`        out.append(QJsonDocument(QJsonObject::fromVariantMap(wire.toMap())).toJson(QJsonDocument::Compact));`);
+            lines.push(`        return out;`);
+            lines.push(`    }`);
+        }
+        lines.push(`    throw std::runtime_error("AnQst drag/drop payload codec emitted an unsupported top-level carrier.");`);
         lines.push(`}`);
         lines.push("");
         lines.push(`std::optional<${helper.cppType}> ${widgetClassName}::decodeDragDropPayload_${helper.typeName}(const QByteArray& rawPayload) {`);
-        lines.push(`    QJsonParseError parseError;`);
-        lines.push(`    const QJsonDocument document = QJsonDocument::fromJson(rawPayload, &parseError);`);
-        lines.push(`    if (parseError.error != QJsonParseError::NoError || !document.isArray()) {`);
-        lines.push(`        return std::nullopt;`);
-        lines.push(`    }`);
-        lines.push(`    try {`);
-        lines.push(`        return decode${helper.codecId}(document.array().toVariantList());`);
-        lines.push(`    } catch (...) {`);
+        lines.push(`    if (rawPayload.isEmpty()) {`);
         lines.push(`        return std::nullopt;`);
         lines.push(`    }`);
+        lines.push(`    const char transportTag = rawPayload.at(0);`);
+        lines.push(`    const QByteArray payloadBytes = rawPayload.mid(1);`);
+        if (helper.carriers.includes("string")) {
+            lines.push(`    if (transportTag == 'S') {`);
+            lines.push(`        try {`);
+            lines.push(`            return decode${helper.codecId}(QString::fromUtf8(payloadBytes));`);
+            lines.push(`        } catch (...) {`);
+            lines.push(`            return std::nullopt;`);
+            lines.push(`        }`);
+            lines.push(`    }`);
+        }
+        if (helper.carriers.includes("array")) {
+            lines.push(`    if (transportTag == 'A') {`);
+            lines.push(`        QJsonParseError parseError;`);
+            lines.push(`        const QJsonDocument document = QJsonDocument::fromJson(payloadBytes, &parseError);`);
+            lines.push(`        if (parseError.error != QJsonParseError::NoError || !document.isArray()) {`);
+            lines.push(`            return std::nullopt;`);
+            lines.push(`        }`);
+            lines.push(`        try {`);
+            lines.push(`            return decode${helper.codecId}(QVariant(document.array().toVariantList()));`);
+            lines.push(`        } catch (...) {`);
+            lines.push(`            return std::nullopt;`);
+            lines.push(`        }`);
+            lines.push(`    }`);
+        }
+        if (helper.carriers.includes("object")) {
+            lines.push(`    if (transportTag == 'O') {`);
+            lines.push(`        QJsonParseError parseError;`);
+            lines.push(`        const QJsonDocument document = QJsonDocument::fromJson(payloadBytes, &parseError);`);
+            lines.push(`        if (parseError.error != QJsonParseError::NoError || !document.isObject()) {`);
+            lines.push(`            return std::nullopt;`);
+            lines.push(`        }`);
+            lines.push(`        try {`);
+            lines.push(`            return decode${helper.codecId}(QVariant(document.object().toVariantMap()));`);
+            lines.push(`        } catch (...) {`);
+            lines.push(`            return std::nullopt;`);
+            lines.push(`        }`);
+            lines.push(`    }`);
+        }
+        lines.push(`    return std::nullopt;`);
         lines.push(`}`);
         lines.push("");
     }
@@ -1033,14 +1512,6 @@ function renderCppStub(spec, cppTypes) {
             lines.push("");
         }
     }
-    lines.push(`const ${widgetClassName}::BridgeBindingRow ${widgetClassName}::kBridgeBindings[] = {`);
-    for (const service of spec.services) {
-        for (const member of service.members) {
-            lines.push(`    {"${service.name}", "${member.name}", "${member.kind}"},`);
-        }
-    }
-    lines.push(`};`);
-    lines.push("");
     lines.push(`${widgetClassName}::${widgetClassName}(QWidget* parent) : AnQstWebHostBase(parent), handle(this) {`);
     lines.push(`    static const bool kResourcesInitialized = []() {`);
     lines.push(`        ::qInitResources_${spec.widgetName}();`);
@@ -1067,19 +1538,89 @@ function renderCppStub(spec, cppTypes) {
         for (const member of service.members) {
             if (member.kind === "DropTarget" && member.payloadTypeText) {
                 const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-                const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+                const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
+                const typeName = member.payloadTypeText.replace(/\s/g, "");
                 lines.push(`    QObject::connect(this, &AnQstWebHostBase::anQstBridge_dropReceived, this, [this](const QString& service, const QString& member, const QVariant& payload, double x, double y) {`);
                 lines.push(`        if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
-                lines.push(`            emit ${member.name}(${payloadSite ? `decode${payloadSite.codecId}(payload)` : `payload.value<${cppType}>()`}, x, y);`);
+                if (payloadSite) {
+                    lines.push(`            if (payload.type() != QVariant::String) {`);
+                    lines.push(`                emitHostError(`);
+                    lines.push(`                    QStringLiteral("DeserializationError"),`);
+                    lines.push(`                    QStringLiteral("bridge"),`);
+                    lines.push(`                    QStringLiteral("error"),`);
+                    lines.push(`                    true,`);
+                    lines.push(`                    QStringLiteral("Failed to deserialize DropTarget ${service.name}.${member.name}."),`);
+                    lines.push(`                    {`);
+                    lines.push(`                        {QStringLiteral("service"), QStringLiteral("${service.name}")},`);
+                    lines.push(`                        {QStringLiteral("member"), QStringLiteral("${member.name}")},`);
+                    lines.push(`                        {QStringLiteral("detail"), QStringLiteral("Host did not provide tagged drag/drop payload text.")},`);
+                    lines.push(`                    });`);
+                    lines.push(`                return;`);
+                    lines.push(`            }`);
+                    lines.push(`            const auto decodedPayload = decodeDragDropPayload_${typeName}(payload.toString().toUtf8());`);
+                    lines.push(`            if (!decodedPayload.has_value()) {`);
+                    lines.push(`                emitHostError(`);
+                    lines.push(`                    QStringLiteral("DeserializationError"),`);
+                    lines.push(`                    QStringLiteral("bridge"),`);
+                    lines.push(`                    QStringLiteral("error"),`);
+                    lines.push(`                    true,`);
+                    lines.push(`                    QStringLiteral("Failed to deserialize DropTarget ${service.name}.${member.name}."),`);
+                    lines.push(`                    {`);
+                    lines.push(`                        {QStringLiteral("service"), QStringLiteral("${service.name}")},`);
+                    lines.push(`                        {QStringLiteral("member"), QStringLiteral("${member.name}")},`);
+                    lines.push(`                        {QStringLiteral("detail"), QStringLiteral("Tagged drag/drop payload did not match the planned boundary carrier.")},`);
+                    lines.push(`                    });`);
+                    lines.push(`                return;`);
+                    lines.push(`            }`);
+                    lines.push(`            emit ${member.name}(*decodedPayload, x, y);`);
+                }
+                else {
+                    lines.push(`            emit ${member.name}(payload.value<${cppType}>(), x, y);`);
+                }
                 lines.push(`        }`);
                 lines.push(`    });`);
             }
             else if (member.kind === "HoverTarget" && member.payloadTypeText) {
                 const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-                const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+                const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
+                const typeName = member.payloadTypeText.replace(/\s/g, "");
                 lines.push(`    QObject::connect(this, &AnQstWebHostBase::anQstBridge_hoverUpdated, this, [this](const QString& service, const QString& member, const QVariant& payload, double x, double y) {`);
                 lines.push(`        if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
-                lines.push(`            emit ${member.name}(${payloadSite ? `decode${payloadSite.codecId}(payload)` : `payload.value<${cppType}>()`}, x, y);`);
+                if (payloadSite) {
+                    lines.push(`            if (payload.type() != QVariant::String) {`);
+                    lines.push(`                emitHostError(`);
+                    lines.push(`                    QStringLiteral("DeserializationError"),`);
+                    lines.push(`                    QStringLiteral("bridge"),`);
+                    lines.push(`                    QStringLiteral("error"),`);
+                    lines.push(`                    true,`);
+                    lines.push(`                    QStringLiteral("Failed to deserialize HoverTarget ${service.name}.${member.name}."),`);
+                    lines.push(`                    {`);
+                    lines.push(`                        {QStringLiteral("service"), QStringLiteral("${service.name}")},`);
+                    lines.push(`                        {QStringLiteral("member"), QStringLiteral("${member.name}")},`);
+                    lines.push(`                        {QStringLiteral("detail"), QStringLiteral("Host did not provide tagged drag/drop payload text.")},`);
+                    lines.push(`                    });`);
+                    lines.push(`                return;`);
+                    lines.push(`            }`);
+                    lines.push(`            const auto decodedPayload = decodeDragDropPayload_${typeName}(payload.toString().toUtf8());`);
+                    lines.push(`            if (!decodedPayload.has_value()) {`);
+                    lines.push(`                emitHostError(`);
+                    lines.push(`                    QStringLiteral("DeserializationError"),`);
+                    lines.push(`                    QStringLiteral("bridge"),`);
+                    lines.push(`                    QStringLiteral("error"),`);
+                    lines.push(`                    true,`);
+                    lines.push(`                    QStringLiteral("Failed to deserialize HoverTarget ${service.name}.${member.name}."),`);
+                    lines.push(`                    {`);
+                    lines.push(`                        {QStringLiteral("service"), QStringLiteral("${service.name}")},`);
+                    lines.push(`                        {QStringLiteral("member"), QStringLiteral("${member.name}")},`);
+                    lines.push(`                        {QStringLiteral("detail"), QStringLiteral("Tagged drag/drop payload did not match the planned boundary carrier.")},`);
+                    lines.push(`                    });`);
+                    lines.push(`                return;`);
+                    lines.push(`            }`);
+                    lines.push(`            emit ${member.name}(*decodedPayload, x, y);`);
+                }
+                else {
+                    lines.push(`            emit ${member.name}(payload.value<${cppType}>(), x, y);`);
+                }
                 lines.push(`        }`);
                 lines.push(`    });`);
                 lines.push(`    QObject::connect(this, &AnQstWebHostBase::anQstBridge_hoverLeft, this, [this](const QString& service, const QString& member) {`);
@@ -1185,12 +1726,12 @@ function renderCppStub(spec, cppTypes) {
                 continue;
             const timeoutMs = member.timeoutMs;
             const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-            const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+            const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
             lines.push(`    if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
             for (let i = 0; i < member.parameters.length; i++) {
                 const p = member.parameters[i];
                 const pType = cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name]);
-                const paramSite = (0, structured_top_level_codecs_1.getStructuredParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
+                const paramSite = (0, boundary_codecs_1.getBoundaryParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
                 lines.push(`        const ${pType} ${p.name} = ${paramSite ? `decode${paramSite.codecId}(args.value(${i}))` : variantToCppExpression(pType, `args.value(${i})`)};`);
             }
             lines.push(`        const QString requestId = QStringLiteral("call-%1").arg(++m_callRequestCounter);`);
@@ -1260,7 +1801,7 @@ function renderCppStub(spec, cppTypes) {
             for (let i = 0; i < member.parameters.length; i++) {
                 const p = member.parameters[i];
                 const pType = cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name]);
-                const paramSite = (0, structured_top_level_codecs_1.getStructuredParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
+                const paramSite = (0, boundary_codecs_1.getBoundaryParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
                 lines.push(`        const ${pType} ${p.name} = ${paramSite ? `decode${paramSite.codecId}(args.value(${i}))` : variantToCppExpression(pType, `args.value(${i})`)};`);
             }
             const argNames = member.parameters.map((p) => p.name).join(", ");
@@ -1277,7 +1818,7 @@ function renderCppStub(spec, cppTypes) {
             if (member.kind !== "Input" || !member.payloadTypeText)
                 continue;
             const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-            const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+            const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
             lines.push(`    if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
             lines.push(`        const ${cppType} typedValue = ${payloadSite ? `decode${payloadSite.codecId}(value)` : variantToCppExpression(cppType, "value")};`);
             lines.push(`        set${pascalCase(member.name)}(typedValue);`);
@@ -1299,13 +1840,13 @@ function renderCppStub(spec, cppTypes) {
             }
             if (member.kind === "Slot") {
                 const ret = member.payloadTypeText ? cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]) : "void";
-                const payloadSite = member.payloadTypeText ? (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name) : undefined;
+                const payloadSite = member.payloadTypeText ? (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name) : undefined;
                 const args = member.parameters.map((p) => `${cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name])} ${p.name}`).join(", ");
                 lines.push(`${ret} ${widgetClassName}::slot_${member.name}(${args}) {`);
                 lines.push(`    QVariantList invokeArgs;`);
                 for (const p of member.parameters) {
                     const pType = mapTsTypeToCpp(p.typeText);
-                    const paramSite = (0, structured_top_level_codecs_1.getStructuredParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
+                    const paramSite = (0, boundary_codecs_1.getBoundaryParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
                     lines.push(`    invokeArgs.push_back(${paramSite ? `encode${paramSite.codecId}(${p.name})` : cppToVariantExpression(pType, p.name)});`);
                 }
                 lines.push(`    QVariant result;`);
@@ -1330,7 +1871,7 @@ function renderCppStub(spec, cppTypes) {
             }
             else if ((member.kind === "Input" || member.kind === "Output") && member.payloadTypeText) {
                 const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-                const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+                const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
                 const cap = member.name.charAt(0).toUpperCase() + member.name.slice(1);
                 lines.push(`${cppType} ${widgetClassName}::${member.name}() const {`);
                 lines.push(`    return m_${member.name};`);
@@ -1529,7 +2070,8 @@ function renderNpmPackage(spec) {
         anqst: {
             widget: spec.widgetName,
             services: spec.services.map((s) => s.name),
-            supportsDevelopmentModeTransport: spec.supportsDevelopmentModeTransport
+            supportsDevelopmentModeTransport: spec.supportsDevelopmentModeTransport,
+            outputContractVersion: 2
         }
     }, null, 2);
 }
@@ -1558,6 +2100,19 @@ function slotHandlerReturnType(tsRet) {
     }
     return `${tsRet} | Promise<${tsRet}> | Error`;
 }
+/** Angular and vanilla: emit `readonly set` / `readonly onSlot` only when the spec provides members for that namespace. */
+function formatTsServiceSetAndOnSlotObjectLiterals(setMembers, onSlotMembers) {
+    const blocks = [];
+    if (setMembers.length > 0) {
+        blocks.push(`  readonly set = {\n${setMembers.join("\n")}\n  };`);
+    }
+    if (onSlotMembers.length > 0) {
+        blocks.push(`  readonly onSlot = {\n${onSlotMembers.join("\n")}\n  };`);
+    }
+    if (blocks.length === 0)
+        return "";
+    return `\n${blocks.join("\n")}`;
+}
 function renderTsService(spec, serviceName, codecCatalog) {
     const members = spec.services.find((s) => s.name === serviceName)?.members ?? [];
     const fieldLines = [];
@@ -1567,11 +2122,11 @@ function renderTsService(spec, serviceName, codecCatalog) {
     const constructorBodyLines = [];
     for (const m of members) {
         const args = m.parameters.map((p) => `${p.name}: ${mapTypeTextToTs(p.typeText)}`).join(", ");
-        const paramSites = m.parameters.map((p) => (0, structured_top_level_codecs_1.getStructuredParameterSite)(codecCatalog, serviceName, m.name, p.name));
+        const paramSites = m.parameters.map((p) => (0, boundary_codecs_1.getBoundaryParameterSite)(codecCatalog, serviceName, m.name, p.name));
         const encodedValueArray = paramSites.length > 0
             ? `[${m.parameters.map((p, index) => `${paramSites[index] ? `encode${paramSites[index].codecId}(${p.name})` : p.name}`).join(", ")}]`
             : "[]";
-        const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, serviceName, m.name);
+        const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, serviceName, m.name);
         if (m.kind === "Call") {
             const ret = mapTypeTextToTs(m.payloadTypeText ?? "void");
             if (payloadSite) {
@@ -1649,30 +2204,18 @@ function renderTsService(spec, serviceName, codecCatalog) {
             }
             if (m.kind === "Output") {
                 constructorBodyLines.push(`    this._bridge.onOutput("${serviceName}", "${m.name}", (value) => {`);
-                constructorBodyLines.push(`      try {`);
-                constructorBodyLines.push(`        this._${m.name}.set(${payloadSite ? `decode${payloadSite.codecId}(value)` : `value as ${tsType}`});`);
-                constructorBodyLines.push(`      } catch (error) {`);
-                constructorBodyLines.push(`        this._bridge.reportFrontendDiagnostic({`);
-                constructorBodyLines.push(`          code: "DeserializationError",`);
-                constructorBodyLines.push(`          severity: "error",`);
-                constructorBodyLines.push(`          category: "bridge",`);
-                constructorBodyLines.push(`          recoverable: true,`);
-                constructorBodyLines.push(`          message: \`Failed to deserialize Output ${serviceName}.${m.name}: \${errorMessage(error)}\`,`);
-                constructorBodyLines.push(`          service: "${serviceName}",`);
-                constructorBodyLines.push(`          member: "${m.name}",`);
-                constructorBodyLines.push(`          context: { interaction: "Output" }`);
-                constructorBodyLines.push(`        });`);
-                constructorBodyLines.push(`      }`);
+                constructorBodyLines.push(`      this._${m.name}.set(${payloadSite ? `decode${payloadSite.codecId}(value)` : `value as ${tsType}`});`);
                 constructorBodyLines.push(`    });`);
             }
         }
         if (m.kind === "DropTarget" && m.payloadTypeText) {
             const tsType = mapTypeTextToTs(m.payloadTypeText);
+            const typeName = m.payloadTypeText.replace(/\s/g, "");
             fieldLines.push(`  private readonly _${m.name} = signal<{ payload: ${tsType}; x: number; y: number } | null>(null);`);
             methodLines.push(`  ${m.name}(): { payload: ${tsType}; x: number; y: number } | null { return this._${m.name}(); }`);
             constructorBodyLines.push(`    this._bridge.onDrop("${serviceName}", "${m.name}", (payload, x, y) => {`);
             constructorBodyLines.push(`      try {`);
-            constructorBodyLines.push(`        this._${m.name}.set({ payload: ${payloadSite ? `decode${payloadSite.codecId}(payload)` : `payload as ${tsType}`}, x, y });`);
+            constructorBodyLines.push(`        this._${m.name}.set({ payload: ${payloadSite ? `decodeDragDropPayload_${typeName}(payload)` : `payload as ${tsType}`}, x, y });`);
             constructorBodyLines.push(`      } catch (error) {`);
             constructorBodyLines.push(`        this._bridge.reportFrontendDiagnostic({`);
             constructorBodyLines.push(`          code: "DeserializationError",`);
@@ -1689,11 +2232,12 @@ function renderTsService(spec, serviceName, codecCatalog) {
         }
         if (m.kind === "HoverTarget" && m.payloadTypeText) {
             const tsType = mapTypeTextToTs(m.payloadTypeText);
+            const typeName = m.payloadTypeText.replace(/\s/g, "");
             fieldLines.push(`  private readonly _${m.name} = signal<{ payload: ${tsType}; x: number; y: number } | null>(null);`);
             methodLines.push(`  ${m.name}(): { payload: ${tsType}; x: number; y: number } | null { return this._${m.name}(); }`);
             constructorBodyLines.push(`    this._bridge.onHover("${serviceName}", "${m.name}", (payload, x, y) => {`);
             constructorBodyLines.push(`      try {`);
-            constructorBodyLines.push(`        this._${m.name}.set({ payload: ${payloadSite ? `decode${payloadSite.codecId}(payload)` : `payload as ${tsType}`}, x, y });`);
+            constructorBodyLines.push(`        this._${m.name}.set({ payload: ${payloadSite ? `decodeDragDropPayload_${typeName}(payload)` : `payload as ${tsType}`}, x, y });`);
             constructorBodyLines.push(`      } catch (error) {`);
             constructorBodyLines.push(`        this._bridge.reportFrontendDiagnostic({`);
             constructorBodyLines.push(`          code: "DeserializationError",`);
@@ -1719,14 +2263,7 @@ function renderTsService(spec, serviceName, codecCatalog) {
 export class ${serviceName} {
   private readonly _bridge = inject(AnQstBridgeRuntime);
 ${fieldLines.join("\n")}
-${constructorLines.join("\n")}
-  readonly set = {
-${setMembers.join("\n")}
-  };
-  readonly onSlot = {
-${onSlotMembers.join("\n")}
-  };
-${methodLines.join("\n")}
+${constructorLines.join("\n")}${formatTsServiceSetAndOnSlotObjectLiterals(setMembers, onSlotMembers)}${methodLines.length > 0 ? `\n${methodLines.join("\n")}` : ""}
 }
 `;
 }
@@ -1769,34 +2306,40 @@ function renderTsServiceDts(spec, serviceName) {
             classMembers.push(`  ${m.name}(): { payload: ${tsType}; x: number; y: number } | null;`);
         }
     }
-    const setInterfaceDecl = setMembers.length > 0
-        ? `export interface ${setInterfaceName} {\n${setMembers.join("\n")}\n}`
-        : `export interface ${setInterfaceName} {}`;
-    const onSlotInterfaceDecl = onSlotMembers.length > 0
-        ? `export interface ${onSlotInterfaceName} {\n${onSlotMembers.join("\n")}\n}`
-        : `export interface ${onSlotInterfaceName} {}`;
-    const classMemberBlock = classMembers.length > 0 ? `\n${classMembers.join("\n")}` : "";
-    return `${setInterfaceDecl}
-
-${onSlotInterfaceDecl}
-
-export declare class ${serviceName} {
-  readonly set: ${setInterfaceName};
-  readonly onSlot: ${onSlotInterfaceName};${classMemberBlock}
+    const interfaceBlocks = [];
+    if (setMembers.length > 0) {
+        interfaceBlocks.push(`export interface ${setInterfaceName} {\n${setMembers.join("\n")}\n}`);
+    }
+    if (onSlotMembers.length > 0) {
+        interfaceBlocks.push(`export interface ${onSlotInterfaceName} {\n${onSlotMembers.join("\n")}\n}`);
+    }
+    const interfaceSection = interfaceBlocks.length > 0 ? `${interfaceBlocks.join("\n\n")}\n\n` : "";
+    const namespaceLines = [];
+    if (setMembers.length > 0) {
+        namespaceLines.push(`  readonly set: ${setInterfaceName};`);
+    }
+    if (onSlotMembers.length > 0) {
+        namespaceLines.push(`  readonly onSlot: ${onSlotInterfaceName};`);
+    }
+    const declareBodyLines = [...namespaceLines, ...classMembers];
+    return `${interfaceSection}export declare class ${serviceName} {
+${declareBodyLines.join("\n")}
 }`;
 }
-function renderTsServices(spec) {
-    const codecCatalog = (0, structured_top_level_codecs_1.buildStructuredCodecCatalog)(spec);
+function renderTsServices(spec, codecCatalog) {
     const serviceClasses = spec.services.map((s) => renderTsService(spec, s.name, codecCatalog)).join("\n");
-    const externalTypeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/services.ts`).trim();
+    const externalTypeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName, "AngularService")}/services.ts`).trim();
     const localTypeImports = renderLocalTypeImports(spec).trim();
     const typeImports = [externalTypeImports, localTypeImports].filter((s) => s.length > 0).join("\n");
     const typeImportsBlock = typeImports.length > 0 ? `${typeImports}\n\n` : "";
+    const dragDropHelperBlock = renderTsDragDropPayloadHelpers(spec, codecCatalog).trim();
+    const dragDropHelpers = dragDropHelperBlock.length > 0 ? `\n// Drag/drop payload helpers\n${dragDropHelperBlock}\n` : "";
     return `import { Injectable, inject, signal } from "@angular/core";
 ${typeImportsBlock}
 
-// Structured/top-level codec helpers
-${(0, structured_top_level_codecs_1.renderTsStructuredCodecHelpers)(codecCatalog)}
+// Boundary codec plan helpers
+${(0, boundary_codecs_1.renderTsBoundaryCodecHelpers)(codecCatalog)}
+${dragDropHelpers}
 
 type SlotHandler = (...args: unknown[]) => unknown;
 type OutputHandler = (value: unknown) => void;
@@ -2603,13 +3146,13 @@ ${serviceClasses}
 `;
 }
 function renderTsTypes(spec) {
-    const typeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/types.ts`).trim();
+    const typeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName, "AngularService")}/types.ts`).trim();
     const typeDecls = renderTypeDeclarations(spec, true).trim();
     const sections = [typeImports, typeDecls].filter((s) => s.length > 0);
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
 }
 function renderTypeServicesDts(spec) {
-    const externalTypeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/types/services.d.ts`).trim();
+    const externalTypeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName, "AngularService")}/types/services.d.ts`).trim();
     const localTypeImports = renderLocalTypeImports(spec).trim();
     const bridgeDiagnosticsDecl = `export type AnQstBridgeSeverity = "info" | "warn" | "error" | "fatal";
 
@@ -2646,7 +3189,7 @@ export declare class AnQstBridgeDiagnostics {
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
 }
 function renderTypeTypesDts(spec) {
-    const typeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/types/types.d.ts`).trim();
+    const typeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName, "AngularService")}/types/types.d.ts`).trim();
     const typeDecls = renderTypeDeclarations(spec, true).trim();
     const sections = [typeImports, typeDecls].filter((s) => s.length > 0);
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
@@ -2675,74 +3218,1244 @@ function renderJsServices() {
 function renderJsTypes() {
     return renderJsModule();
 }
-function renderNodeExpressWsPackage(spec) {
-    return JSON.stringify({
-        name: `${spec.widgetName.toLowerCase()}-node-express-ws-generated`,
-        version: "0.1.0",
-        private: true,
-        types: "types/index.d.ts",
-        main: "index.ts",
-        exports: {
-            ".": {
-                types: "./types/index.d.ts",
-                default: "./index.ts"
-            }
-        },
-        anqst: {
-            widget: spec.widgetName,
-            services: spec.services.map((s) => s.name),
-            target: "node_express_ws"
-        }
-    }, null, 2);
-}
-function nodeParamTuple(member) {
-    if (member.parameters.length === 0)
-        return "[]";
-    return `[${member.parameters.map((p) => mapTypeTextToTs(p.typeText)).join(", ")}]`;
-}
-function nodeParamArgs(member) {
-    return member.parameters.map((p) => `${p.name}: ${mapTypeTextToTs(p.typeText)}`).join(", ");
-}
-function nodeParamValues(member) {
-    if (member.parameters.length === 0)
-        return "[]";
-    return `[${member.parameters.map((p) => p.name).join(", ")}]`;
-}
-function nodeCap(value) {
-    return value.length === 0 ? value : `${value.charAt(0).toUpperCase()}${value.slice(1)}`;
-}
-function renderNodeExpressWsTypes(spec) {
-    const typeImports = renderRequiredTypeImports(spec, `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}/types/index.d.ts`).trim();
-    const typeDecls = renderTypeDeclarations(spec, true).trim();
-    const sections = [typeImports, typeDecls].filter((s) => s.length > 0);
-    return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
-}
-function renderNodeExpressWsIndex(spec) {
-    const codecCatalog = (0, structured_top_level_codecs_1.buildStructuredCodecCatalog)(spec);
-    const typeImports = renderRequiredTypeImports(spec, `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}/index.ts`);
-    const typeDecls = renderTypeDeclarations(spec, true);
-    const handlerBridgeTypeName = `${spec.widgetName}HandlerBridge`;
-    const sessionBridgeTypeName = `${spec.widgetName}SessionBridge`;
-    const handlerInterfaces = spec.services
-        .map((service) => {
-        const lines = [];
-        for (const member of service.members) {
-            const args = nodeParamArgs(member);
-            const prefixedArgs = args.length > 0 ? `, ${args}` : "";
-            if (member.kind === "Call" && member.payloadTypeText) {
-                const ret = mapTypeTextToTs(member.payloadTypeText);
-                lines.push(`  ${member.name}(bridge: ${handlerBridgeTypeName}${prefixedArgs}): ${ret} | Promise<${ret}>;`);
-            }
-            else if (member.kind === "Emitter") {
-                lines.push(`  ${member.name}(bridge: ${handlerBridgeTypeName}${prefixedArgs}): void | Promise<void>;`);
+function renderVanillaServiceTs(spec, serviceName, codecCatalog) {
+    const members = spec.services.find((s) => s.name === serviceName)?.members ?? [];
+    const fieldLines = [];
+    const methodLines = [];
+    const setMembers = [];
+    const onSlotMembers = [];
+    const constructorBodyLines = [];
+    for (const m of members) {
+        const args = m.parameters.map((p) => `${p.name}: ${mapTypeTextToTs(p.typeText)}`).join(", ");
+        const paramSites = m.parameters.map((p) => (0, boundary_codecs_1.getBoundaryParameterSite)(codecCatalog, serviceName, m.name, p.name));
+        const encodedValueArray = paramSites.length > 0
+            ? `[${m.parameters.map((p, index) => `${paramSites[index] ? `encode${paramSites[index].codecId}(${p.name})` : p.name}`).join(", ")}]`
+            : "[]";
+        const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, serviceName, m.name);
+        if (m.kind === "Call") {
+            const ret = mapTypeTextToTs(m.payloadTypeText ?? "void");
+            if (payloadSite) {
+                methodLines.push(`  async ${m.name}(${args}): Promise<${ret}> { const result = await this._bridge.call<unknown>("${serviceName}", "${m.name}", ${encodedValueArray}); return decode${payloadSite.codecId}(result); }`);
             }
-            else if (member.kind === "Input" && member.payloadTypeText) {
-                lines.push(`  ${member.name}(bridge: ${handlerBridgeTypeName}, value: ${mapTypeTextToTs(member.payloadTypeText)}): void | Promise<void>;`);
+            else {
+                methodLines.push(`  async ${m.name}(${args}): Promise<${ret}> { return this._bridge.call<${ret}>("${serviceName}", "${m.name}", ${encodedValueArray}); }`);
             }
+            continue;
         }
-        return `export interface ${service.name}NodeHandlers {\n${lines.join("\n")}\n}`;
-    })
-        .join("\n\n");
+        if (m.kind === "Emitter") {
+            methodLines.push(`  ${m.name}(${args}): void {`);
+            methodLines.push(`    let encodedArgs: unknown[];`);
+            methodLines.push(`    try {`);
+            methodLines.push(`      encodedArgs = ${encodedValueArray};`);
+            methodLines.push(`    } catch (error) {`);
+            methodLines.push(`      this._bridge.reportFrontendDiagnostic({`);
+            methodLines.push(`        code: "SerializationError",`);
+            methodLines.push(`        severity: "error",`);
+            methodLines.push(`        category: "bridge",`);
+            methodLines.push(`        recoverable: true,`);
+            methodLines.push(`        message: \`Failed to serialize Emitter ${serviceName}.${m.name}: \${errorMessage(error)}\`,`);
+            methodLines.push(`        service: "${serviceName}",`);
+            methodLines.push(`        member: "${m.name}",`);
+            methodLines.push(`        context: { interaction: "Emitter" }`);
+            methodLines.push(`      });`);
+            methodLines.push(`      return;`);
+            methodLines.push(`    }`);
+            methodLines.push(`    this._bridge.emit("${serviceName}", "${m.name}", encodedArgs);`);
+            methodLines.push(`  }`);
+            continue;
+        }
+        if (m.kind === "Slot") {
+            const ret = mapTypeTextToTs(m.payloadTypeText ?? "void");
+            const decodedArgs = m.parameters.map((p, index) => `${paramSites[index] ? `decode${paramSites[index].codecId}(wireArgs[${index}])` : `wireArgs[${index}] as ${mapTypeTextToTs(p.typeText)}`}`).join(", ");
+            onSlotMembers.push(`    ${m.name}: (handler: (${args}) => ${slotHandlerReturnType(ret)}): void => {`);
+            onSlotMembers.push(`      this._bridge.registerSlot("${serviceName}", "${m.name}", (...wireArgs: unknown[]) => {`);
+            onSlotMembers.push(`        const result = handler(${decodedArgs});`);
+            if (payloadSite) {
+                onSlotMembers.push(`        if (result instanceof Promise) return result.then((value) => value instanceof Error ? value : encode${payloadSite.codecId}(value));`);
+                onSlotMembers.push(`        return result instanceof Error ? result : encode${payloadSite.codecId}(result);`);
+            }
+            else {
+                onSlotMembers.push("        return result;");
+            }
+            onSlotMembers.push("      });");
+            onSlotMembers.push("    },");
+            continue;
+        }
+        if ((m.kind === "Input" || m.kind === "Output") && m.payloadTypeText) {
+            const tsType = mapTypeTextToTs(m.payloadTypeText);
+            fieldLines.push(`  private readonly _${m.name} = createValueCell<${tsType} | undefined>(undefined);`);
+            methodLines.push(`  ${m.name}(): ${tsType} | undefined { return this._${m.name}.get(); }`);
+            if (m.kind === "Input") {
+                setMembers.push(`    ${m.name}: (value: ${tsType}): void => {`);
+                setMembers.push(`      let encodedValue: unknown;`);
+                setMembers.push(`      try {`);
+                setMembers.push(`        encodedValue = ${payloadSite ? `encode${payloadSite.codecId}(value)` : "value"};`);
+                setMembers.push(`      } catch (error) {`);
+                setMembers.push(`        this._bridge.reportFrontendDiagnostic({`);
+                setMembers.push(`          code: "SerializationError",`);
+                setMembers.push(`          severity: "error",`);
+                setMembers.push(`          category: "bridge",`);
+                setMembers.push(`          recoverable: true,`);
+                setMembers.push(`          message: \`Failed to serialize Input ${serviceName}.${m.name}: \${errorMessage(error)}\`,`);
+                setMembers.push(`          service: "${serviceName}",`);
+                setMembers.push(`          member: "${m.name}",`);
+                setMembers.push(`          context: { interaction: "Input" }`);
+                setMembers.push(`        });`);
+                setMembers.push(`        return;`);
+                setMembers.push(`      }`);
+                setMembers.push(`      this._${m.name}.set(value);`);
+                setMembers.push(`      this._bridge.setInput("${serviceName}", "${m.name}", encodedValue);`);
+                setMembers.push("    },");
+            }
+            if (m.kind === "Output") {
+                constructorBodyLines.push(`    this._bridge.onOutput("${serviceName}", "${m.name}", (value) => {`);
+                constructorBodyLines.push(`      this._${m.name}.set(${payloadSite ? `decode${payloadSite.codecId}(value)` : `value as ${tsType}`});`);
+                constructorBodyLines.push(`    });`);
+            }
+        }
+        if (m.kind === "DropTarget" && m.payloadTypeText) {
+            const tsType = mapTypeTextToTs(m.payloadTypeText);
+            const typeName = m.payloadTypeText.replace(/\s/g, "");
+            fieldLines.push(`  private readonly _${m.name} = createValueCell<{ payload: ${tsType}; x: number; y: number } | null>(null);`);
+            methodLines.push(`  ${m.name}(): { payload: ${tsType}; x: number; y: number } | null { return this._${m.name}.get(); }`);
+            constructorBodyLines.push(`    this._bridge.onDrop("${serviceName}", "${m.name}", (payload, x, y) => {`);
+            constructorBodyLines.push(`      try {`);
+            constructorBodyLines.push(`        this._${m.name}.set({ payload: ${payloadSite ? `decodeDragDropPayload_${typeName}(payload)` : `payload as ${tsType}`}, x, y });`);
+            constructorBodyLines.push(`      } catch (error) {`);
+            constructorBodyLines.push(`        this._bridge.reportFrontendDiagnostic({`);
+            constructorBodyLines.push(`          code: "DeserializationError",`);
+            constructorBodyLines.push(`          severity: "error",`);
+            constructorBodyLines.push(`          category: "bridge",`);
+            constructorBodyLines.push(`          recoverable: true,`);
+            constructorBodyLines.push(`          message: \`Failed to deserialize DropTarget ${serviceName}.${m.name}: \${errorMessage(error)}\`,`);
+            constructorBodyLines.push(`          service: "${serviceName}",`);
+            constructorBodyLines.push(`          member: "${m.name}",`);
+            constructorBodyLines.push(`          context: { interaction: "DropTarget" }`);
+            constructorBodyLines.push(`        });`);
+            constructorBodyLines.push(`      }`);
+            constructorBodyLines.push(`    });`);
+        }
+        if (m.kind === "HoverTarget" && m.payloadTypeText) {
+            const tsType = mapTypeTextToTs(m.payloadTypeText);
+            const typeName = m.payloadTypeText.replace(/\s/g, "");
+            fieldLines.push(`  private readonly _${m.name} = createValueCell<{ payload: ${tsType}; x: number; y: number } | null>(null);`);
+            methodLines.push(`  ${m.name}(): { payload: ${tsType}; x: number; y: number } | null { return this._${m.name}.get(); }`);
+            constructorBodyLines.push(`    this._bridge.onHover("${serviceName}", "${m.name}", (payload, x, y) => {`);
+            constructorBodyLines.push(`      try {`);
+            constructorBodyLines.push(`        this._${m.name}.set({ payload: ${payloadSite ? `decodeDragDropPayload_${typeName}(payload)` : `payload as ${tsType}`}, x, y });`);
+            constructorBodyLines.push(`      } catch (error) {`);
+            constructorBodyLines.push(`        this._bridge.reportFrontendDiagnostic({`);
+            constructorBodyLines.push(`          code: "DeserializationError",`);
+            constructorBodyLines.push(`          severity: "error",`);
+            constructorBodyLines.push(`          category: "bridge",`);
+            constructorBodyLines.push(`          recoverable: true,`);
+            constructorBodyLines.push(`          message: \`Failed to deserialize HoverTarget ${serviceName}.${m.name}: \${errorMessage(error)}\`,`);
+            constructorBodyLines.push(`          service: "${serviceName}",`);
+            constructorBodyLines.push(`          member: "${m.name}",`);
+            constructorBodyLines.push(`          context: { interaction: "HoverTarget" }`);
+            constructorBodyLines.push(`        });`);
+            constructorBodyLines.push(`      }`);
+            constructorBodyLines.push(`    });`);
+            constructorBodyLines.push(`    this._bridge.onHoverLeft("${serviceName}", "${m.name}", () => this._${m.name}.set(null));`);
+        }
+    }
+    const constructorLines = [
+        "  constructor(private readonly _bridge: AnQstBridgeRuntime) {",
+        ...constructorBodyLines,
+        "  }",
+    ];
+    return `class ${serviceName} {
+${fieldLines.join("\n")}
+${constructorLines.join("\n")}${formatTsServiceSetAndOnSlotObjectLiterals(setMembers, onSlotMembers)}${methodLines.length > 0 ? `\n${methodLines.join("\n")}` : ""}
+}
+`;
+}
+function renderVanillaBrowserTs(spec, codecCatalog) {
+    const localTypeDecls = renderTypeDeclarations(spec).trim();
+    const localTypesBlock = localTypeDecls.length > 0 ? `${localTypeDecls}\n\n` : "";
+    const dragDropHelperBlock = renderTsDragDropPayloadHelpers(spec, codecCatalog).trim();
+    const dragDropHelpers = dragDropHelperBlock.length > 0 ? `\n// Drag/drop payload helpers\n${dragDropHelperBlock}\n` : "";
+    const serviceClasses = spec.services.map((s) => renderVanillaServiceTs(spec, s.name, codecCatalog)).join("\n");
+    const frontendServices = spec.services.length > 0
+        ? spec.services.map((s) => `  ${s.name}: ${s.name};`).join("\n")
+        : "";
+    const frontendServiceFactories = spec.services.length > 0
+        ? spec.services.map((s) => `      ${s.name}: new ${s.name}(bridge)`).join(",\n")
+        : "";
+    return `${localTypesBlock}// Boundary codec plan helpers
+${(0, boundary_codecs_1.renderTsBoundaryCodecHelpers)(codecCatalog)}
+${dragDropHelpers}
+
+type SlotHandler = (...args: unknown[]) => unknown;
+type OutputHandler = (value: unknown) => void;
+type SlotInvocationListener = (requestId: string, service: string, member: string, args: unknown[]) => void;
+type OutputListener = (service: string, member: string, value: unknown) => void;
+type DropListener = (service: string, member: string, payload: unknown, x: number, y: number) => void;
+type HoverListener = (service: string, member: string, payload: unknown, x: number, y: number) => void;
+type HoverLeftListener = (service: string, member: string) => void;
+type HostDiagnosticListener = (payload: unknown) => void;
+type DisconnectListener = () => void;
+
+type AnQstBridgeSeverity = "info" | "warn" | "error" | "fatal";
+type AnQstBridgeSource = "frontend" | "host";
+type AnQstBridgeTransport = "qt-webchannel" | "dev-websocket";
+type AnQstBridgeState = "starting" | "ready" | "failed" | "disconnected";
+
+interface AnQstBridgeDiagnostic {
+  code: string;
+  severity: AnQstBridgeSeverity;
+  category: string;
+  recoverable: boolean;
+  message: string;
+  timestamp: string;
+  source: AnQstBridgeSource;
+  transport?: AnQstBridgeTransport;
+  service?: string;
+  member?: string;
+  requestId?: string;
+  context?: Record<string, unknown>;
+}
+
+interface HostBridgeApi {
+  anQstBridge_call(service: string, member: string, args: unknown[], callback: (result: unknown) => void): void;
+  anQstBridge_emit(service: string, member: string, args: unknown[]): void;
+  anQstBridge_setInput(service: string, member: string, value: unknown): void;
+  anQstBridge_registerSlot(service: string, member: string): void;
+  anQstBridge_resolveSlot(requestId: string, ok: boolean, payload: unknown, error: string): void;
+  anQstBridge_outputUpdated: { connect: (cb: (service: string, member: string, value: unknown) => void) => void };
+  anQstBridge_slotInvocationRequested: {
+    connect: (cb: (requestId: string, service: string, member: string, args: unknown[]) => void) => void;
+  };
+  anQstBridge_hostDiagnostic?: { connect: (cb: (payload: unknown) => void) => void };
+  anQstBridge_dropReceived: { connect: (cb: (service: string, member: string, payload: unknown, x: number, y: number) => void) => void };
+  anQstBridge_hoverUpdated: { connect: (cb: (service: string, member: string, payload: unknown, x: number, y: number) => void) => void };
+  anQstBridge_hoverLeft: { connect: (cb: (service: string, member: string) => void) => void };
+}
+
+interface QWebChannelCtor {
+  new (
+    transport: unknown,
+    initCallback: (channel: { objects: Record<string, HostBridgeApi | undefined> }) => void
+  ): unknown;
+}
+
+interface BridgeAdapter {
+  readonly transport: AnQstBridgeTransport;
+  call<T>(service: string, member: string, args: unknown[]): Promise<T>;
+  emit(service: string, member: string, args: unknown[]): void;
+  setInput(service: string, member: string, value: unknown): void;
+  registerSlot(service: string, member: string): void;
+  resolveSlot(requestId: string, ok: boolean, payload: unknown, error: string): void;
+  onOutput(handler: OutputListener): void;
+  onSlotInvocation(handler: SlotInvocationListener): void;
+  onHostDiagnostic(handler: HostDiagnosticListener): void;
+  onDisconnected(handler: DisconnectListener): void;
+  onDrop(handler: DropListener): void;
+  onHover(handler: HoverListener): void;
+  onHoverLeft(handler: HoverLeftListener): void;
+}
+
+interface ValueCell<T> {
+  get(): T;
+  set(value: T): void;
+}
+
+function createValueCell<T>(initial: T): ValueCell<T> {
+  let current = initial;
+  return {
+    get(): T {
+      return current;
+    },
+    set(value: T): void {
+      current = value;
+    }
+  };
+}
+
+function errorMessage(error: unknown): string {
+  if (error instanceof Error && typeof error.message === "string" && error.message.length > 0) {
+    return error.message;
+  }
+  return String(error);
+}
+
+function normalizeSeverity(value: unknown): AnQstBridgeSeverity {
+  if (value === "info" || value === "warn" || value === "error" || value === "fatal") {
+    return value;
+  }
+  return "error";
+}
+
+function asRecord(value: unknown): Record<string, unknown> | undefined {
+  if (value === null || typeof value !== "object") {
+    return undefined;
+  }
+  return value as Record<string, unknown>;
+}
+
+function readString(record: Record<string, unknown> | undefined, key: string): string | undefined {
+  const value = record?.[key];
+  return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+
+function readBoolean(record: Record<string, unknown> | undefined, key: string): boolean | undefined {
+  const value = record?.[key];
+  return typeof value === "boolean" ? value : undefined;
+}
+
+function readContext(record: Record<string, unknown> | undefined): Record<string, unknown> | undefined {
+  const context = asRecord(record?.["context"]);
+  return context === undefined ? undefined : context;
+}
+
+function normalizeHostDiagnostic(payload: unknown, transport: AnQstBridgeTransport): Omit<AnQstBridgeDiagnostic, "timestamp"> {
+  const row = asRecord(payload);
+  if (row === undefined) {
+    return {
+      code: "HostDiagnosticMalformed",
+      severity: "error",
+      category: "bridge",
+      recoverable: true,
+      message: "Host emitted a malformed diagnostic payload.",
+      source: "host",
+      transport
+    };
+  }
+
+  const context = readContext(row);
+  return {
+    code: readString(row, "code") ?? "HostDiagnostic",
+    severity: normalizeSeverity(row["severity"]),
+    category: readString(row, "category") ?? "bridge",
+    recoverable: readBoolean(row, "recoverable") ?? true,
+    message: readString(row, "message") ?? "Host emitted a diagnostic payload.",
+    source: "host",
+    transport,
+    service: readString(row, "service") ?? readString(context, "service"),
+    member: readString(row, "member") ?? readString(context, "member"),
+    requestId: readString(row, "requestId") ?? readString(context, "requestId"),
+    context
+  };
+}
+
+function isBridgeCallError(value: unknown): value is {
+  code: unknown;
+  message: unknown;
+  service: unknown;
+  member: unknown;
+  requestId: unknown;
+} {
+  if (value === null || typeof value !== "object") return false;
+  const row = value as Record<string, unknown>;
+  return (
+    Object.prototype.hasOwnProperty.call(row, "code")
+    && Object.prototype.hasOwnProperty.call(row, "message")
+    && Object.prototype.hasOwnProperty.call(row, "service")
+    && Object.prototype.hasOwnProperty.call(row, "member")
+    && Object.prototype.hasOwnProperty.call(row, "requestId")
+  );
+}
+
+class QtWebChannelAdapter implements BridgeAdapter {
+  readonly transport = "qt-webchannel" as const;
+
+  private constructor(private readonly host: HostBridgeApi) {}
+
+  static async create(): Promise<QtWebChannelAdapter> {
+    const anyWindow = window as unknown as {
+      qt?: { webChannelTransport?: unknown };
+      QWebChannel?: QWebChannelCtor;
+    };
+    if (typeof anyWindow.QWebChannel !== "function" || anyWindow.qt?.webChannelTransport === undefined) {
+      throw new Error("Qt WebChannel transport is unavailable.");
+    }
+    return await new Promise<QtWebChannelAdapter>((resolve, reject) => {
+      try {
+        const QWebChannel = anyWindow.QWebChannel as QWebChannelCtor;
+        new QWebChannel(anyWindow.qt!.webChannelTransport, (channel) => {
+          try {
+            const host = channel.objects["${spec.widgetName}Bridge"];
+            if (host === undefined) {
+              reject(new Error("${spec.widgetName}Bridge bridge object is unavailable."));
+              return;
+            }
+            resolve(new QtWebChannelAdapter(host));
+          } catch (error) {
+            reject(error instanceof Error ? error : new Error(String(error)));
+          }
+        });
+      } catch (error) {
+        reject(error instanceof Error ? error : new Error(String(error)));
+      }
+    });
+  }
+
+  async call<T>(service: string, member: string, args: unknown[]): Promise<T> {
+    return new Promise<T>((resolve, reject) => {
+      this.host.anQstBridge_call(service, member, args, (result) => {
+        if (isBridgeCallError(result)) {
+          reject(result);
+          return;
+        }
+        resolve(result as T);
+      });
+    });
+  }
+
+  emit(service: string, member: string, args: unknown[]): void {
+    this.host.anQstBridge_emit(service, member, args);
+  }
+
+  setInput(service: string, member: string, value: unknown): void {
+    this.host.anQstBridge_setInput(service, member, value);
+  }
+
+  registerSlot(service: string, member: string): void {
+    this.host.anQstBridge_registerSlot(service, member);
+  }
+
+  resolveSlot(requestId: string, ok: boolean, payload: unknown, error: string): void {
+    this.host.anQstBridge_resolveSlot(requestId, ok, payload, error);
+  }
+
+  onOutput(handler: OutputListener): void {
+    this.host.anQstBridge_outputUpdated.connect(handler);
+  }
+
+  onSlotInvocation(handler: SlotInvocationListener): void {
+    this.host.anQstBridge_slotInvocationRequested.connect(handler);
+  }
+
+  onHostDiagnostic(handler: HostDiagnosticListener): void {
+    this.host.anQstBridge_hostDiagnostic?.connect(handler);
+  }
+
+  onDisconnected(_handler: DisconnectListener): void {
+    // QWebChannel does not expose a deterministic disconnect event here.
+  }
+
+  onDrop(handler: DropListener): void {
+    this.host.anQstBridge_dropReceived.connect(handler);
+  }
+
+  onHover(handler: HoverListener): void {
+    this.host.anQstBridge_hoverUpdated.connect(handler);
+  }
+
+  onHoverLeft(handler: HoverLeftListener): void {
+    this.host.anQstBridge_hoverLeft.connect(handler);
+  }
+}
+
+class WebSocketBridgeAdapter implements BridgeAdapter {
+  readonly transport = "dev-websocket" as const;
+  private readonly pending = new Map<string, {
+    service: string;
+    member: string;
+    requestId: string;
+    resolve: (result: unknown) => void;
+    reject: (error: unknown) => void;
+  }>();
+  private readonly outputListeners: OutputListener[] = [];
+  private readonly slotListeners: SlotInvocationListener[] = [];
+  private readonly hostDiagnosticListeners: HostDiagnosticListener[] = [];
+  private readonly disconnectListeners: DisconnectListener[] = [];
+  private readonly dropListeners: DropListener[] = [];
+  private readonly hoverListeners: HoverListener[] = [];
+  private readonly hoverLeftListeners: HoverLeftListener[] = [];
+  private requestCounter = 0;
+
+  private constructor(private readonly socket: WebSocket) {
+    this.socket.addEventListener("message", (event) => {
+      const raw = typeof event.data === "string" ? event.data : String(event.data);
+      const message = JSON.parse(raw) as Record<string, unknown>;
+      const type = String(message["type"] ?? "");
+      if (type === "callResult") {
+        const requestId = String(message["requestId"] ?? "");
+        const pending = this.pending.get(requestId);
+        if (pending) {
+          this.pending.delete(requestId);
+          const result = message["result"];
+          if (isBridgeCallError(result)) {
+            pending.reject(result);
+            return;
+          }
+          pending.resolve(result);
+        }
+        return;
+      }
+      if (type === "outputUpdated") {
+        const service = String(message["service"] ?? "");
+        const member = String(message["member"] ?? "");
+        for (const listener of this.outputListeners) {
+          listener(service, member, message["value"]);
+        }
+        return;
+      }
+      if (type === "slotInvocationRequested") {
+        const requestId = String(message["requestId"] ?? "");
+        const service = String(message["service"] ?? "");
+        const member = String(message["member"] ?? "");
+        const args = Array.isArray(message["args"]) ? (message["args"] as unknown[]) : [];
+        for (const listener of this.slotListeners) {
+          listener(requestId, service, member, args);
+        }
+        return;
+      }
+      if (type === "dropReceived") {
+        const service = String(message["service"] ?? "");
+        const member = String(message["member"] ?? "");
+        const x = Number(message["x"] ?? 0);
+        const y = Number(message["y"] ?? 0);
+        for (const listener of this.dropListeners) {
+          listener(service, member, message["payload"], x, y);
+        }
+        return;
+      }
+      if (type === "hoverUpdated") {
+        const service = String(message["service"] ?? "");
+        const member = String(message["member"] ?? "");
+        const x = Number(message["x"] ?? 0);
+        const y = Number(message["y"] ?? 0);
+        for (const listener of this.hoverListeners) {
+          listener(service, member, message["payload"], x, y);
+        }
+        return;
+      }
+      if (type === "hoverLeft") {
+        const service = String(message["service"] ?? "");
+        const member = String(message["member"] ?? "");
+        for (const listener of this.hoverLeftListeners) {
+          listener(service, member);
+        }
+        return;
+      }
+      if (type === "hostError") {
+        for (const listener of this.hostDiagnosticListeners) {
+          listener(message["payload"]);
+        }
+        return;
+      }
+      if (type === "widgetReattached") {
+        document.body.textContent = "Widget Reattached";
+        this.socket.close();
+      }
+    });
+    this.socket.addEventListener("close", () => {
+      for (const pending of this.pending.values()) {
+        pending.reject({
+          code: "BridgeDisconnectedError",
+          message: "Bridge disconnected before call completion.",
+          service: pending.service,
+          member: pending.member,
+          requestId: pending.requestId
+        });
+      }
+      this.pending.clear();
+      for (const listener of this.disconnectListeners) {
+        listener();
+      }
+    });
+  }
+
+  static async create(): Promise<WebSocketBridgeAdapter> {
+    const configResponse = await fetch("/anqst-dev-config.json", { cache: "no-store" });
+    if (!configResponse.ok) {
+      throw new Error("AnQst host bootstrap missing: unable to read /anqst-dev-config.json");
+    }
+    const config = (await configResponse.json()) as { wsUrl?: string; wsPath?: string };
+    let wsUrl = config.wsUrl;
+    if (!wsUrl && config.wsPath) {
+      const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
+      wsUrl = protocol + "//" + window.location.host + config.wsPath;
+    }
+    if (!wsUrl) {
+      throw new Error("AnQst host bootstrap missing: wsUrl/wsPath is unavailable.");
+    }
+    if (wsUrl.startsWith("http://")) {
+      wsUrl = "ws://" + wsUrl.slice("http://".length);
+    } else if (wsUrl.startsWith("https://")) {
+      wsUrl = "wss://" + wsUrl.slice("https://".length);
+    }
+    return await new Promise<WebSocketBridgeAdapter>((resolve, reject) => {
+      const socket = new WebSocket(wsUrl!);
+      socket.addEventListener("open", () => resolve(new WebSocketBridgeAdapter(socket)));
+      socket.addEventListener("error", () => reject(new Error("Failed to connect to AnQst WebSocket bridge.")));
+    });
+  }
+
+  async call<T>(service: string, member: string, args: unknown[]): Promise<T> {
+    const requestId = \`req-\${++this.requestCounter}\`;
+    const payload = { type: "call", requestId, service, member, args };
+    return await new Promise<T>((resolve, reject) => {
+      this.pending.set(requestId, {
+        service,
+        member,
+        requestId,
+        resolve: (value) => resolve(value as T),
+        reject
+      });
+      this.socket.send(JSON.stringify(payload));
+    });
+  }
+
+  emit(service: string, member: string, args: unknown[]): void {
+    this.socket.send(JSON.stringify({ type: "emit", service, member, args }));
+  }
+
+  setInput(service: string, member: string, value: unknown): void {
+    this.socket.send(JSON.stringify({ type: "setInput", service, member, value }));
+  }
+
+  registerSlot(service: string, member: string): void {
+    this.socket.send(JSON.stringify({ type: "registerSlot", service, member }));
+  }
+
+  resolveSlot(requestId: string, ok: boolean, payload: unknown, error: string): void {
+    this.socket.send(JSON.stringify({ type: "resolveSlot", requestId, ok, payload, error }));
+  }
+
+  onOutput(handler: OutputListener): void {
+    this.outputListeners.push(handler);
+  }
+
+  onSlotInvocation(handler: SlotInvocationListener): void {
+    this.slotListeners.push(handler);
+  }
+
+  onHostDiagnostic(handler: HostDiagnosticListener): void {
+    this.hostDiagnosticListeners.push(handler);
+  }
+
+  onDisconnected(handler: DisconnectListener): void {
+    this.disconnectListeners.push(handler);
+  }
+
+  onDrop(handler: DropListener): void {
+    this.dropListeners.push(handler);
+  }
+
+  onHover(handler: HoverListener): void {
+    this.hoverListeners.push(handler);
+  }
+
+  onHoverLeft(handler: HoverLeftListener): void {
+    this.hoverLeftListeners.push(handler);
+  }
+}
+
+class AnQstBridgeRuntime {
+  private static readonly maxDiagnostics = 50;
+  private adapter: BridgeAdapter | null = null;
+  private readonly slotHandlers = new Map<string, SlotHandler>();
+  private readonly outputHandlers = new Map<string, OutputHandler[]>();
+  private readonly dropHandlers = new Map<string, ((payload: unknown, x: number, y: number) => void)[]>();
+  private readonly hoverHandlers = new Map<string, ((payload: unknown, x: number, y: number) => void)[]>();
+  private readonly hoverLeftHandlers = new Map<string, (() => void)[]>();
+  private readonly diagnosticListeners = new Set<(diagnostic: AnQstBridgeDiagnostic) => void>();
+  private readonly _diagnostics = createValueCell<readonly AnQstBridgeDiagnostic[]>([]);
+  private readonly _state = createValueCell<AnQstBridgeState>("starting");
+  private readonly startup = this.init().catch((error) => {
+    this._state.set("failed");
+    this.reportFrontendDiagnostic({
+      code: "BridgeBootstrapError",
+      severity: "fatal",
+      category: "bridge",
+      recoverable: false,
+      message: \`Failed to initialize bridge: \${errorMessage(error)}\`
+    });
+    throw error;
+  });
+
+  diagnostics(): readonly AnQstBridgeDiagnostic[] {
+    return this._diagnostics.get();
+  }
+
+  state(): AnQstBridgeState {
+    return this._state.get();
+  }
+
+  subscribeDiagnostics(listener: (diagnostic: AnQstBridgeDiagnostic) => void): () => void {
+    this.diagnosticListeners.add(listener);
+    return () => this.diagnosticListeners.delete(listener);
+  }
+
+  async ready(): Promise<void> {
+    return this.startup;
+  }
+
+  reportFrontendDiagnostic(diagnostic: Omit<AnQstBridgeDiagnostic, "timestamp" | "source">): void {
+    this.pushDiagnostic({
+      ...diagnostic,
+      source: "frontend",
+      transport: diagnostic.transport ?? this.adapter?.transport,
+      timestamp: new Date().toISOString()
+    });
+  }
+
+  async call<T>(service: string, member: string, args: unknown[]): Promise<T> {
+    const adapter = await this.requireAdapter();
+    return adapter.call<T>(service, member, args);
+  }
+
+  emit(service: string, member: string, args: unknown[]): void {
+    this.publishNonCall("Emitter", service, member, (adapter) => adapter.emit(service, member, args));
+  }
+
+  setInput(service: string, member: string, value: unknown): void {
+    this.publishNonCall("Input", service, member, (adapter) => adapter.setInput(service, member, value));
+  }
+
+  registerSlot(service: string, member: string, handler: SlotHandler): void {
+    const key = this.key(service, member);
+    this.slotHandlers.set(key, handler);
+    if (this.adapter !== null) {
+      try {
+        this.adapter.registerSlot(service, member);
+      } catch (error) {
+        this.reportFrontendDiagnostic({
+          code: "BridgePublishError",
+          severity: "error",
+          category: "bridge",
+          recoverable: true,
+          message: \`Failed to register Slot \${service}.\${member}: \${errorMessage(error)}\`,
+          service,
+          member,
+          context: { interaction: "Slot" }
+        });
+      }
+      return;
+    }
+    this.ready()
+      .then(() => {
+        try {
+          this.requireAdapterSync().registerSlot(service, member);
+        } catch (error) {
+          this.reportFrontendDiagnostic({
+            code: "BridgePublishError",
+            severity: "error",
+            category: "bridge",
+            recoverable: true,
+            message: \`Failed to register Slot \${service}.\${member}: \${errorMessage(error)}\`,
+            service,
+            member,
+            context: { interaction: "Slot" }
+          });
+        }
+      })
+      .catch((error) => {
+        this.reportFrontendDiagnostic({
+          code: "BridgePublishError",
+          severity: "error",
+          category: "bridge",
+          recoverable: true,
+          message: \`Failed to register Slot \${service}.\${member}: \${errorMessage(error)}\`,
+          service,
+          member,
+          context: { interaction: "Slot" }
+        });
+      });
+  }
+
+  onOutput(service: string, member: string, handler: OutputHandler): void {
+    const key = this.key(service, member);
+    const existing = this.outputHandlers.get(key) ?? [];
+    existing.push(handler);
+    this.outputHandlers.set(key, existing);
+  }
+
+  onDrop(service: string, member: string, handler: (payload: unknown, x: number, y: number) => void): void {
+    const key = this.key(service, member);
+    const existing = this.dropHandlers.get(key) ?? [];
+    existing.push(handler);
+    this.dropHandlers.set(key, existing);
+  }
+
+  onHover(service: string, member: string, handler: (payload: unknown, x: number, y: number) => void): void {
+    const key = this.key(service, member);
+    const existing = this.hoverHandlers.get(key) ?? [];
+    existing.push(handler);
+    this.hoverHandlers.set(key, existing);
+  }
+
+  onHoverLeft(service: string, member: string, handler: () => void): void {
+    const key = this.key(service, member);
+    const existing = this.hoverLeftHandlers.get(key) ?? [];
+    existing.push(handler);
+    this.hoverLeftHandlers.set(key, existing);
+  }
+
+  private requireAdapterSync(): BridgeAdapter {
+    if (this.adapter === null) {
+      throw new Error("AnQst bridge is not ready.");
+    }
+    return this.adapter;
+  }
+
+  private async requireAdapter(): Promise<BridgeAdapter> {
+    await this.startup;
+    return this.requireAdapterSync();
+  }
+
+  private pushDiagnostic(diagnostic: AnQstBridgeDiagnostic): void {
+    const previous = this._diagnostics.get();
+    const trimmed = previous.length >= AnQstBridgeRuntime.maxDiagnostics
+      ? previous.slice(previous.length - (AnQstBridgeRuntime.maxDiagnostics - 1))
+      : previous;
+    const next = [...trimmed, diagnostic];
+    this._diagnostics.set(next);
+    for (const listener of this.diagnosticListeners) {
+      listener(diagnostic);
+    }
+  }
+
+  private publishNonCall(
+    interaction: "Emitter" | "Input",
+    service: string,
+    member: string,
+    publish: (adapter: BridgeAdapter) => void
+  ): void {
+    if (this.adapter !== null) {
+      try {
+        publish(this.adapter);
+      } catch (error) {
+        this.reportFrontendDiagnostic({
+          code: "BridgePublishError",
+          severity: "error",
+          category: "bridge",
+          recoverable: true,
+          message: \`Failed to publish \${interaction} \${service}.\${member}: \${errorMessage(error)}\`,
+          service,
+          member,
+          context: { interaction }
+        });
+      }
+      return;
+    }
+
+    this.ready()
+      .then(() => {
+        try {
+          publish(this.requireAdapterSync());
+        } catch (error) {
+          this.reportFrontendDiagnostic({
+            code: "BridgePublishError",
+            severity: "error",
+            category: "bridge",
+            recoverable: true,
+            message: \`Failed to publish \${interaction} \${service}.\${member}: \${errorMessage(error)}\`,
+            service,
+            member,
+            context: { interaction }
+          });
+        }
+      })
+      .catch((error) => {
+        this.reportFrontendDiagnostic({
+          code: "BridgePublishError",
+          severity: "error",
+          category: "bridge",
+          recoverable: true,
+          message: \`Failed to publish \${interaction} \${service}.\${member}: \${errorMessage(error)}\`,
+          service,
+          member,
+          context: { interaction }
+        });
+      });
+  }
+
+  private async init(): Promise<void> {
+    const anyWindow = window as unknown as { qt?: { webChannelTransport?: unknown }; QWebChannel?: QWebChannelCtor };
+    if (typeof anyWindow.QWebChannel === "function" && anyWindow.qt?.webChannelTransport !== undefined) {
+      this.adapter = await QtWebChannelAdapter.create();
+    } else {
+      this.adapter = await WebSocketBridgeAdapter.create();
+    }
+
+    const adapter = this.adapter;
+    adapter.onHostDiagnostic((payload) => {
+      this.pushDiagnostic({
+        ...normalizeHostDiagnostic(payload, adapter.transport),
+        timestamp: new Date().toISOString()
+      });
+    });
+    adapter.onDisconnected(() => {
+      this._state.set("disconnected");
+      this.reportFrontendDiagnostic({
+        code: "BridgeDisconnectedError",
+        severity: "error",
+        category: "bridge",
+        recoverable: true,
+        message: "Bridge disconnected.",
+        transport: adapter.transport
+      });
+    });
+
+    adapter.onOutput((service, member, value) => {
+      const key = this.key(service, member);
+      for (const outputHandler of this.outputHandlers.get(key) ?? []) {
+        outputHandler(value);
+      }
+    });
+    adapter.onSlotInvocation(async (requestId, service, member, args) => {
+      const key = this.key(service, member);
+      const handler = this.slotHandlers.get(key);
+      if (handler === undefined) {
+        this.reportFrontendDiagnostic({
+          code: "HandlerNotRegisteredError",
+          severity: "error",
+          category: "bridge",
+          recoverable: true,
+          message: \`No slot handler registered for \${service}.\${member}.\`,
+          service,
+          member,
+          requestId,
+          context: { interaction: "Slot" }
+        });
+        adapter.resolveSlot(requestId, false, undefined, "No slot handler registered.");
+        return;
+      }
+      try {
+        const result = await Promise.resolve(handler(...args));
+        if (result instanceof Error) {
+          this.reportFrontendDiagnostic({
+            code: "SlotRequestFailed",
+            severity: "error",
+            category: "bridge",
+            recoverable: true,
+            message: result.message.length > 0
+              ? result.message
+              : \`Slot \${service}.\${member} returned an Error.\`,
+            service,
+            member,
+            requestId,
+            context: { interaction: "Slot" }
+          });
+          adapter.resolveSlot(requestId, false, undefined, result.message);
+          return;
+        }
+        adapter.resolveSlot(requestId, true, result, "");
+      } catch (error) {
+        const message = errorMessage(error);
+        this.reportFrontendDiagnostic({
+          code: "SlotHandlerError",
+          severity: "error",
+          category: "bridge",
+          recoverable: true,
+          message: \`Slot handler \${service}.\${member} threw: \${message}\`,
+          service,
+          member,
+          requestId,
+          context: { interaction: "Slot" }
+        });
+        adapter.resolveSlot(requestId, false, undefined, message);
+      }
+    });
+    adapter.onDrop((service, member, payload, x, y) => {
+      const key = this.key(service, member);
+      for (const handler of this.dropHandlers.get(key) ?? []) {
+        handler(payload, x, y);
+      }
+    });
+    adapter.onHover((service, member, payload, x, y) => {
+      const key = this.key(service, member);
+      for (const handler of this.hoverHandlers.get(key) ?? []) {
+        handler(payload, x, y);
+      }
+    });
+    adapter.onHoverLeft((service, member) => {
+      const key = this.key(service, member);
+      for (const handler of this.hoverLeftHandlers.get(key) ?? []) {
+        handler();
+      }
+    });
+    for (const key of this.slotHandlers.keys()) {
+      const parts = key.split("::");
+      if (parts.length === 2) {
+        adapter.registerSlot(parts[0], parts[1]);
+      }
+    }
+    this._state.set("ready");
+  }
+
+  private key(service: string, member: string): string {
+    return \`\${service}::\${member}\`;
+  }
+}
+
+class AnQstBridgeDiagnostics {
+  constructor(private readonly _bridge: AnQstBridgeRuntime) {}
+
+  diagnostics(): readonly AnQstBridgeDiagnostic[] {
+    return this._bridge.diagnostics();
+  }
+
+  state(): AnQstBridgeState {
+    return this._bridge.state();
+  }
+
+  subscribe(listener: (diagnostic: AnQstBridgeDiagnostic) => void): () => void {
+    return this._bridge.subscribeDiagnostics(listener);
+  }
+}
+
+${serviceClasses}
+interface ${spec.widgetName}FrontendServices {
+${frontendServices}
+}
+
+interface ${spec.widgetName}Frontend {
+  diagnostics: AnQstBridgeDiagnostics;
+  services: ${spec.widgetName}FrontendServices;
+}
+
+async function createFrontend(): Promise<${spec.widgetName}Frontend> {
+  const bridge = new AnQstBridgeRuntime();
+  await bridge.ready();
+  return {
+    diagnostics: new AnQstBridgeDiagnostics(bridge),
+    services: {
+${frontendServiceFactories}
+    }
+  };
+}
+
+(function bootstrapAnQstGenerated(global: typeof globalThis & { AnQstGenerated?: { widgets?: Record<string, unknown> } }) {
+  const root = global.AnQstGenerated ?? (global.AnQstGenerated = {});
+  const widgets = root.widgets ?? (root.widgets = {});
+  widgets["${spec.widgetName}"] = {
+    createFrontend
+  };
+})(window as typeof globalThis & { AnQstGenerated?: { widgets?: Record<string, unknown> } });
+`;
+}
+function renderVanillaServiceDts(spec, serviceName) {
+    const members = spec.services.find((s) => s.name === serviceName)?.members ?? [];
+    const setMembers = [];
+    const onSlotMembers = [];
+    const classMembers = [];
+    const setInterfaceName = `${serviceName}Set`;
+    const onSlotInterfaceName = `${serviceName}OnSlot`;
+    for (const m of members) {
+        const args = m.parameters.map((p) => `${p.name}: ${mapTypeTextToTs(p.typeText)}`).join(", ");
+        if (m.kind === "Call") {
+            const ret = mapTypeTextToTs(m.payloadTypeText ?? "void");
+            classMembers.push(`  ${m.name}(${args}): Promise<${ret}>;`);
+            continue;
+        }
+        if (m.kind === "Emitter") {
+            classMembers.push(`  ${m.name}(${args}): void;`);
+            continue;
+        }
+        if (m.kind === "Slot") {
+            const ret = mapTypeTextToTs(m.payloadTypeText ?? "void");
+            onSlotMembers.push(`  ${m.name}(handler: (${args}) => ${slotHandlerReturnType(ret)}): void;`);
+            continue;
+        }
+        if ((m.kind === "Input" || m.kind === "Output") && m.payloadTypeText) {
+            const tsType = mapTypeTextToTs(m.payloadTypeText);
+            classMembers.push(`  ${m.name}(): ${tsType} | undefined;`);
+            if (m.kind === "Input") {
+                setMembers.push(`  ${m.name}(value: ${tsType}): void;`);
+            }
+        }
+        if (m.kind === "DropTarget" && m.payloadTypeText) {
+            const tsType = mapTypeTextToTs(m.payloadTypeText);
+            classMembers.push(`  ${m.name}(): { payload: ${tsType}; x: number; y: number } | null;`);
+        }
+        if (m.kind === "HoverTarget" && m.payloadTypeText) {
+            const tsType = mapTypeTextToTs(m.payloadTypeText);
+            classMembers.push(`  ${m.name}(): { payload: ${tsType}; x: number; y: number } | null;`);
+        }
+    }
+    const interfaceBlocks = [];
+    if (setMembers.length > 0) {
+        interfaceBlocks.push(`interface ${setInterfaceName} {\n${setMembers.join("\n")}\n}`);
+    }
+    if (onSlotMembers.length > 0) {
+        interfaceBlocks.push(`interface ${onSlotInterfaceName} {\n${onSlotMembers.join("\n")}\n}`);
+    }
+    const interfaceSection = interfaceBlocks.length > 0 ? `${interfaceBlocks.join("\n\n")}\n\n` : "";
+    const namespaceLines = [];
+    if (setMembers.length > 0) {
+        namespaceLines.push(`  readonly set: ${setInterfaceName};`);
+    }
+    if (onSlotMembers.length > 0) {
+        namespaceLines.push(`  readonly onSlot: ${onSlotInterfaceName};`);
+    }
+    const declareBodyLines = [...namespaceLines, ...classMembers];
+    return `${interfaceSection}declare class ${serviceName} {
+${declareBodyLines.join("\n")}
+}`;
+}
+function renderVanillaIndexDts(spec) {
+    const externalTypeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName, "VanillaTS")}/index.d.ts`).trim();
+    // Export widget namespace types so other packages can `import type { ... }` from this declaration file
+    // (e.g. a second widget spec that reuses structs generated for the first widget).
+    const localTypeDecls = renderTypeDeclarations(spec, true).trim();
+    const serviceDecls = spec.services.map((s) => renderVanillaServiceDts(spec, s.name)).join("\n\n");
+    const servicesShape = spec.services.length > 0
+        ? spec.services.map((s) => `  ${s.name}: ${s.name};`).join("\n")
+        : "";
+    const sections = [externalTypeImports, localTypeDecls].filter((s) => s.length > 0);
+    const prelude = sections.length > 0 ? `${sections.join("\n\n")}\n\n` : "";
+    return `export {};
+${prelude}type AnQstBridgeSeverity = "info" | "warn" | "error" | "fatal";
+
+type AnQstBridgeSource = "frontend" | "host";
+
+type AnQstBridgeTransport = "qt-webchannel" | "dev-websocket";
+
+type AnQstBridgeState = "starting" | "ready" | "failed" | "disconnected";
+
+interface AnQstBridgeDiagnostic {
+  code: string;
+  severity: AnQstBridgeSeverity;
+  category: string;
+  recoverable: boolean;
+  message: string;
+  timestamp: string;
+  source: AnQstBridgeSource;
+  transport?: AnQstBridgeTransport;
+  service?: string;
+  member?: string;
+  requestId?: string;
+  context?: Record<string, unknown>;
+}
+
+declare class AnQstBridgeDiagnostics {
+  diagnostics(): readonly AnQstBridgeDiagnostic[];
+  state(): AnQstBridgeState;
+  subscribe(listener: (diagnostic: AnQstBridgeDiagnostic) => void): () => void;
+}
+
+${serviceDecls}
+
+interface ${spec.widgetName}FrontendServices {
+${servicesShape}
+}
+
+interface ${spec.widgetName}Frontend {
+  diagnostics: AnQstBridgeDiagnostics;
+  services: ${spec.widgetName}FrontendServices;
+}
+
+interface ${spec.widgetName}Global {
+  createFrontend(): Promise<${spec.widgetName}Frontend>;
+}
+
+interface AnQstGeneratedWidgets {
+  ${spec.widgetName}: ${spec.widgetName}Global;
+}
+
+interface AnQstGeneratedRoot {
+  widgets: AnQstGeneratedWidgets;
+}
+
+declare global {
+  interface Window {
+    AnQstGenerated: AnQstGeneratedRoot;
+  }
+
+  var AnQstGenerated: AnQstGeneratedRoot;
+}
+`;
+}
+function transpileBrowserTsToJs(source) {
+    return typescript_1.default.transpileModule(source, {
+        compilerOptions: {
+            target: typescript_1.default.ScriptTarget.ES2018,
+            module: typescript_1.default.ModuleKind.None,
+            importsNotUsedAsValues: typescript_1.default.ImportsNotUsedAsValues.Remove
+        }
+    }).outputText;
+}
+function renderVanillaPackage(spec, target) {
+    const packageJson = {
+        name: `${spec.widgetName.toLowerCase()}-${target.toLowerCase()}-generated`,
+        version: "0.1.0",
+        private: true,
+        main: "index.js",
+        anqst: {
+            widget: spec.widgetName,
+            services: spec.services.map((s) => s.name),
+            target,
+            supportsDevelopmentModeTransport: spec.supportsDevelopmentModeTransport,
+            outputContractVersion: 2
+        }
+    };
+    if (target === "VanillaTS") {
+        packageJson.types = "index.d.ts";
+    }
+    return JSON.stringify(packageJson, null, 2);
+}
+function renderNodeExpressWsPackage(spec) {
+    return JSON.stringify({
+        name: `${spec.widgetName.toLowerCase()}-node-express-ws-generated`,
+        version: "0.1.0",
+        private: true,
+        types: "types/index.d.ts",
+        main: "index.ts",
+        exports: {
+            ".": {
+                types: "./types/index.d.ts",
+                default: "./index.ts"
+            }
+        },
+        anqst: {
+            widget: spec.widgetName,
+            services: spec.services.map((s) => s.name),
+            target: "node_express_ws"
+        }
+    }, null, 2);
+}
+function nodeParamTuple(member) {
+    if (member.parameters.length === 0)
+        return "[]";
+    return `[${member.parameters.map((p) => mapTypeTextToTs(p.typeText)).join(", ")}]`;
+}
+function nodeParamArgs(member) {
+    return member.parameters.map((p) => `${p.name}: ${mapTypeTextToTs(p.typeText)}`).join(", ");
+}
+function nodeParamValues(member) {
+    if (member.parameters.length === 0)
+        return "[]";
+    return `[${member.parameters.map((p) => p.name).join(", ")}]`;
+}
+function nodeCap(value) {
+    return value.length === 0 ? value : `${value.charAt(0).toUpperCase()}${value.slice(1)}`;
+}
+function renderNodeExpressWsTypes(spec) {
+    const typeImports = renderRequiredTypeImports(spec, `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}/types/index.d.ts`).trim();
+    const typeDecls = renderTypeDeclarations(spec, true).trim();
+    const sections = [typeImports, typeDecls].filter((s) => s.length > 0);
+    return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
+}
+function renderNodeExpressWsIndex(spec, codecCatalog) {
+    const typeImports = renderRequiredTypeImports(spec, `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}/index.ts`);
+    const typeDecls = renderTypeDeclarations(spec, true);
+    const handlerBridgeTypeName = `${spec.widgetName}HandlerBridge`;
+    const sessionBridgeTypeName = `${spec.widgetName}SessionBridge`;
+    const handlerInterfaces = spec.services
+        .map((service) => {
+        const lines = [];
+        for (const member of service.members) {
+            const args = nodeParamArgs(member);
+            const prefixedArgs = args.length > 0 ? `, ${args}` : "";
+            if (member.kind === "Call" && member.payloadTypeText) {
+                const ret = mapTypeTextToTs(member.payloadTypeText);
+                lines.push(`  ${member.name}(bridge: ${handlerBridgeTypeName}${prefixedArgs}): ${ret} | Promise<${ret}>;`);
+            }
+            else if (member.kind === "Emitter") {
+                lines.push(`  ${member.name}(bridge: ${handlerBridgeTypeName}${prefixedArgs}): void | Promise<void>;`);
+            }
+            else if (member.kind === "Input" && member.payloadTypeText) {
+                lines.push(`  ${member.name}(bridge: ${handlerBridgeTypeName}, value: ${mapTypeTextToTs(member.payloadTypeText)}): void | Promise<void>;`);
+            }
+        }
+        return `export interface ${service.name}NodeHandlers {\n${lines.join("\n")}\n}`;
+    })
+        .join("\n\n");
     const implementationFields = spec.services.map((service) => `  ${service.name}: ${service.name}NodeHandlers;`).join("\n");
     const slotHelpers = spec.services
         .flatMap((service) => service.members
@@ -2750,8 +4463,8 @@ function renderNodeExpressWsIndex(spec) {
         .map((member) => {
         const ret = mapTypeTextToTs(member.payloadTypeText ?? "void");
         const args = nodeParamArgs(member);
-        const paramSites = member.parameters.map((p) => (0, structured_top_level_codecs_1.getStructuredParameterSite)(codecCatalog, service.name, member.name, p.name));
-        const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, service.name, member.name);
+        const paramSites = member.parameters.map((p) => (0, boundary_codecs_1.getBoundaryParameterSite)(codecCatalog, service.name, member.name, p.name));
+        const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
         const encodedArgs = member.parameters.length > 0
             ? `[${member.parameters.map((p, index) => `${paramSites[index] ? `encode${paramSites[index].codecId}(${p.name})` : p.name}`).join(", ")}]`
             : "[]";
@@ -2765,7 +4478,7 @@ function renderNodeExpressWsIndex(spec) {
         .filter((member) => member.kind === "Output" && member.payloadTypeText)
         .map((member) => {
         const typeText = mapTypeTextToTs(member.payloadTypeText);
-        const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, service.name, member.name);
+        const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
         return `  set${service.name}_${nodeCap(member.name)}(value: ${typeText}): void {
     this.setOutputValue("${service.name}", "${member.name}", ${payloadSite ? `encode${payloadSite.codecId}(value)` : "value"});
   }`;
@@ -2820,7 +4533,7 @@ function renderNodeExpressWsIndex(spec) {
             .filter((member) => (member.kind === "Input" || member.kind === "Output") && member.payloadTypeText)
             .map((member) => {
             const typeText = mapTypeTextToTs(member.payloadTypeText);
-            const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, service.name, member.name);
+            const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
             if (member.kind === "Input") {
                 return `            ${member.name}: {\n              get: () => session.readInput("${service.name}", "${member.name}").then((value) => ${payloadSite ? `decode${payloadSite.codecId}(value)` : `value as ${typeText}`}),\n              on: (handler: (value: ${typeText}) => void) => session.onInput("${service.name}", "${member.name}", (value) => handler(${payloadSite ? `decode${payloadSite.codecId}(value)` : `value as ${typeText}`}))\n            },`;
             }
@@ -2834,8 +4547,8 @@ function renderNodeExpressWsIndex(spec) {
         .flatMap((service) => service.members
         .filter((member) => member.kind === "Call" && member.payloadTypeText)
         .map((member) => {
-        const paramSites = member.parameters.map((p) => (0, structured_top_level_codecs_1.getStructuredParameterSite)(codecCatalog, service.name, member.name, p.name));
-        const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, service.name, member.name);
+        const paramSites = member.parameters.map((p) => (0, boundary_codecs_1.getBoundaryParameterSite)(codecCatalog, service.name, member.name, p.name));
+        const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
         const decodedArgs = member.parameters.length > 0
             ? member.parameters.map((p, index) => `${paramSites[index] ? `decode${paramSites[index].codecId}(args[${index}])` : `args[${index}] as ${mapTypeTextToTs(p.typeText)}`}`).join(", ")
             : "";
@@ -2890,7 +4603,7 @@ function renderNodeExpressWsIndex(spec) {
         .flatMap((service) => service.members
         .filter((member) => member.kind === "Emitter")
         .map((member) => {
-        const paramSites = member.parameters.map((p) => (0, structured_top_level_codecs_1.getStructuredParameterSite)(codecCatalog, service.name, member.name, p.name));
+        const paramSites = member.parameters.map((p) => (0, boundary_codecs_1.getBoundaryParameterSite)(codecCatalog, service.name, member.name, p.name));
         const decodedArgs = member.parameters.length > 0
             ? member.parameters.map((p, index) => `${paramSites[index] ? `decode${paramSites[index].codecId}(args[${index}])` : `args[${index}] as ${mapTypeTextToTs(p.typeText)}`}`).join(", ")
             : "";
@@ -2935,7 +4648,7 @@ function renderNodeExpressWsIndex(spec) {
         .flatMap((service) => service.members
         .filter((member) => member.kind === "Input" && member.payloadTypeText)
         .map((member) => {
-        const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, service.name, member.name);
+        const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
         return `    if (service === "${service.name}" && member === "${member.name}") {
       const handler = implementation.${service.name}.${member.name};
       if (typeof handler !== "function") {
@@ -2976,8 +4689,8 @@ import type { WebSocket, WebSocketServer } from "ws";
 ${typeImports}
 ${typeDecls}
 
-// Structured/top-level codec helpers
-${(0, structured_top_level_codecs_1.renderTsStructuredCodecHelpers)(codecCatalog)}
+// Boundary codec plan helpers
+${(0, boundary_codecs_1.renderTsBoundaryCodecHelpers)(codecCatalog)}
 
 ${handlerInterfaces}
 
@@ -3439,7 +5152,23 @@ function renderTypeRootIndexDts(spec) {
     const typeDecls = renderTypeTypesDts(spec).trim();
     const serviceDecls = renderTypeServicesDts(spec).trim();
     const sections = [indexDecls, typeDecls, serviceDecls].filter((s) => s.length > 0);
-    return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
+    if (sections.length === 0)
+        return "";
+    const dedupedLines = [];
+    const seenImportLines = new Set();
+    for (const line of sections.join("\n\n").split("\n")) {
+        const trimmed = line.trim();
+        if (!trimmed.startsWith("import type ")) {
+            dedupedLines.push(line);
+            continue;
+        }
+        if (seenImportLines.has(trimmed))
+            continue;
+        seenImportLines.add(trimmed);
+        dedupedLines.push(line);
+    }
+    const deduped = dedupedLines.join("\n").replace(/\n{3,}/g, "\n\n");
+    return `${deduped}\n`;
 }
 function generatedCppLibraryDirName(widgetName) {
     return (0, layout_1.generatedQtWidgetDirName)(widgetName);
@@ -3447,35 +5176,59 @@ function generatedCppLibraryDirName(widgetName) {
 function generatedNodeExpressWsDirName(widgetName) {
     return (0, layout_1.generatedNodeExpressDirName)(widgetName);
 }
-function generateOutputs(spec, options = { emitQWidget: true, emitAngularService: true, emitNodeExpressWs: false }) {
-    const frontendDir = `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}`;
+function generateOutputs(spec, options = {}) {
+    const useDefaultBrowserTargets = Object.keys(options).length === 0;
+    const normalizedOptions = {
+        emitQWidget: options.emitQWidget ?? true,
+        emitAngularService: options.emitAngularService ?? true,
+        emitVanillaTS: options.emitVanillaTS ?? useDefaultBrowserTargets,
+        emitVanillaJS: options.emitVanillaJS ?? useDefaultBrowserTargets,
+        emitNodeExpressWs: options.emitNodeExpressWs ?? false
+    };
+    const angularFrontendDir = `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName, "AngularService")}`;
+    const vanillaTsFrontendDir = `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName, "VanillaTS")}`;
+    const vanillaJsFrontendDir = `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName, "VanillaJS")}`;
     const cppDir = `backend/cpp/qt/${generatedCppLibraryDirName(spec.widgetName)}`;
     const nodeDir = `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}`;
     const outputs = {};
-    if (options.emitAngularService) {
-        outputs[`${frontendDir}/package.json`] = renderNpmPackage(spec);
-        outputs[`${frontendDir}/index.ts`] = renderTsIndex();
-        outputs[`${frontendDir}/services.ts`] = renderTsServices(spec);
-        outputs[`${frontendDir}/types.ts`] = renderTsTypes(spec);
-        outputs[`${frontendDir}/index.js`] = renderJsIndex();
-        outputs[`${frontendDir}/services.js`] = renderJsServices();
-        outputs[`${frontendDir}/types.js`] = renderJsTypes();
-        outputs[`${frontendDir}/types/index.d.ts`] = renderTypeRootIndexDts(spec);
-        outputs[`${frontendDir}/types/services.d.ts`] = renderTypeServicesDts(spec);
-        outputs[`${frontendDir}/types/types.d.ts`] = renderTypeTypesDts(spec);
-    }
-    if (options.emitQWidget) {
+    const codecCatalog = (0, boundary_codecs_1.buildBoundaryCodecCatalog)(spec);
+    if (normalizedOptions.emitAngularService) {
+        outputs[`${angularFrontendDir}/package.json`] = renderNpmPackage(spec);
+        outputs[`${angularFrontendDir}/index.ts`] = renderTsIndex();
+        outputs[`${angularFrontendDir}/services.ts`] = renderTsServices(spec, codecCatalog);
+        outputs[`${angularFrontendDir}/types.ts`] = renderTsTypes(spec);
+        outputs[`${angularFrontendDir}/index.js`] = renderJsIndex();
+        outputs[`${angularFrontendDir}/services.js`] = renderJsServices();
+        outputs[`${angularFrontendDir}/types.js`] = renderJsTypes();
+        outputs[`${angularFrontendDir}/types/index.d.ts`] = renderTypeRootIndexDts(spec);
+        outputs[`${angularFrontendDir}/types/services.d.ts`] = renderTypeServicesDts(spec);
+        outputs[`${angularFrontendDir}/types/types.d.ts`] = renderTypeTypesDts(spec);
+    }
+    if (normalizedOptions.emitVanillaTS || normalizedOptions.emitVanillaJS) {
+        const vanillaBrowserTs = renderVanillaBrowserTs(spec, codecCatalog);
+        const vanillaBrowserJs = transpileBrowserTsToJs(vanillaBrowserTs);
+        if (normalizedOptions.emitVanillaTS) {
+            outputs[`${vanillaTsFrontendDir}/package.json`] = renderVanillaPackage(spec, "VanillaTS");
+            outputs[`${vanillaTsFrontendDir}/index.js`] = vanillaBrowserJs;
+            outputs[`${vanillaTsFrontendDir}/index.d.ts`] = renderVanillaIndexDts(spec);
+        }
+        if (normalizedOptions.emitVanillaJS) {
+            outputs[`${vanillaJsFrontendDir}/package.json`] = renderVanillaPackage(spec, "VanillaJS");
+            outputs[`${vanillaJsFrontendDir}/index.js`] = vanillaBrowserJs;
+        }
+    }
+    if (normalizedOptions.emitQWidget) {
         const cppTypes = buildCppTypeContext(spec);
         outputs[`${cppDir}/CMakeLists.txt`] = renderCMake(spec);
         outputs[`${cppDir}/${spec.widgetName}.qrc`] = renderEmbeddedQrc(spec.widgetName, []);
         outputs[`${cppDir}/include/${spec.widgetName}.h`] = renderWidgetUmbrellaHeader(spec);
-        outputs[`${cppDir}/include/${spec.widgetName}Widget.h`] = renderWidgetHeader(spec, cppTypes);
+        outputs[`${cppDir}/include/${spec.widgetName}Widget.h`] = renderWidgetHeader(spec, cppTypes, codecCatalog);
         outputs[`${cppDir}/include/${spec.widgetName}Types.h`] = renderTypesHeader(spec, cppTypes);
-        outputs[`${cppDir}/${spec.widgetName}.cpp`] = renderCppStub(spec, cppTypes);
+        outputs[`${cppDir}/${spec.widgetName}.cpp`] = renderCppStub(spec, cppTypes, codecCatalog);
     }
-    if (options.emitNodeExpressWs) {
+    if (normalizedOptions.emitNodeExpressWs) {
         outputs[`${nodeDir}/package.json`] = renderNodeExpressWsPackage(spec);
-        outputs[`${nodeDir}/index.ts`] = renderNodeExpressWsIndex(spec);
+        outputs[`${nodeDir}/index.ts`] = renderNodeExpressWsIndex(spec, codecCatalog);
         outputs[`${nodeDir}/types/index.d.ts`] = renderNodeExpressWsTypes(spec);
     }
     return outputs;