@dereekb/dbx-components-mcp 13.11.5 → 13.11.7

package/dbx-components-mcp.js

@@ -5,7 +5,7 @@ const require = __createRequire(import.meta.url);
 // packages/dbx-components-mcp/package.json
 var package_default = {
   name: "@dereekb/dbx-components-mcp",
-  version: "13.11.5",
+  version: "13.11.7",
   type: "module",
   bin: {
     "dbx-components-mcp": "dbx-components-mcp.js"
@@ -20,20 +20,20 @@ var package_default = {
     "@angular/core": "21.2.11",
     "@angular/forms": "21.2.11",
     "@angular/material": "^21.2.9",
-    "@dereekb/dbx-cli": "13.11.5",
-    "@dereekb/dbx-core": "13.11.5",
-    "@dereekb/dbx-firebase": "13.11.5",
-    "@dereekb/dbx-form": "13.11.5",
-    "@dereekb/dbx-web": "13.11.5",
-    "@dereekb/firebase": "13.11.5",
-    "@dereekb/firebase-server": "13.11.5",
-    "@dereekb/rxjs": "13.11.5",
-    "@dereekb/util": "13.11.5",
+    "@dereekb/dbx-cli": "13.11.7",
+    "@dereekb/dbx-core": "13.11.7",
+    "@dereekb/dbx-firebase": "13.11.7",
+    "@dereekb/dbx-form": "13.11.7",
+    "@dereekb/dbx-web": "13.11.7",
+    "@dereekb/firebase": "13.11.7",
+    "@dereekb/firebase-server": "13.11.7",
+    "@dereekb/rxjs": "13.11.7",
+    "@dereekb/util": "13.11.7",
     "@uirouter/angular": "21.0.0",
     rxjs: "^7.8.2"
   },
   devDependencies: {
-    "@dereekb/model": "13.11.5"
+    "@dereekb/model": "13.11.7"
   }
 };
 
@@ -8239,9 +8239,11 @@ function readFieldEntries(fields) {
 }
 
 // packages/dbx-components-mcp/src/scan/extract-models/find-enums.ts
-import { Node as Node8, SyntaxKind as SyntaxKind3 } from "ts-morph";
+import { Node as Node9, SyntaxKind as SyntaxKind3 } from "ts-morph";
 
 // packages/dbx-components-mcp/src/scan/extract-models/find-interfaces.ts
+import { Node as Node8 } from "ts-morph";
+var PASSTHROUGH_TYPE_WRAPPERS = /* @__PURE__ */ new Set(["Partial", "Required", "Readonly", "NonNullable", "MaybeMap", "Pick", "Omit"]);
 function findInterfaces(sf) {
   const out = [];
   for (const decl of sf.getInterfaces()) {
@@ -8253,7 +8255,7 @@ function findInterfaces(sf) {
 function buildInterface(decl) {
   const tags = readInterfaceTags(decl.getJsDocs());
   const description = readDescription(decl.getJsDocs());
-  const extendsNames = decl.getExtends().map((e) => e.getExpression().getText());
+  const extendsNames = decl.getExtends().map(resolveExtendsName);
   const props = [];
   for (const prop of decl.getProperties()) {
     const propJsDocs = prop.getJsDocs();
@@ -8277,6 +8279,39 @@ function buildInterface(decl) {
     props
   };
 }
+function resolveExtendsName(expr) {
+  const head = expr.getExpression().getText();
+  let result = head;
+  if (PASSTHROUGH_TYPE_WRAPPERS.has(head)) {
+    const typeArgs = expr.getTypeArguments();
+    if (typeArgs.length > 0) {
+      const peeled = peelTypeNode(typeArgs[0]);
+      if (peeled !== void 0) {
+        result = peeled;
+      }
+    }
+  }
+  return result;
+}
+function peelTypeNode(node) {
+  let current = node;
+  while (Node8.isParenthesizedTypeNode(current)) {
+    current = current.getTypeNode();
+  }
+  let result;
+  if (Node8.isTypeReference(current)) {
+    const name = current.getTypeName().getText();
+    if (PASSTHROUGH_TYPE_WRAPPERS.has(name)) {
+      const inner = current.getTypeArguments();
+      if (inner.length > 0) {
+        result = peelTypeNode(inner[0]);
+      }
+    } else {
+      result = name;
+    }
+  }
+  return result;
+}
 function readInterfaceTags(jsDocs) {
   let dbxModel = false;
   for (const jsDoc of jsDocs) {
@@ -8354,14 +8389,14 @@ function buildEnum(decl) {
     if (initializer === void 0) {
       value = auto;
       auto = value + 1;
-    } else if (Node8.isStringLiteral(initializer) || Node8.isNoSubstitutionTemplateLiteral(initializer)) {
+    } else if (Node9.isStringLiteral(initializer) || Node9.isNoSubstitutionTemplateLiteral(initializer)) {
       value = initializer.getLiteralText();
-    } else if (Node8.isNumericLiteral(initializer)) {
+    } else if (Node9.isNumericLiteral(initializer)) {
       value = Number(initializer.getLiteralText());
       auto = value + 1;
-    } else if (Node8.isPrefixUnaryExpression(initializer)) {
+    } else if (Node9.isPrefixUnaryExpression(initializer)) {
       const inner = initializer.getOperand();
-      if (Node8.isNumericLiteral(inner)) {
+      if (Node9.isNumericLiteral(inner)) {
         const raw = Number(inner.getLiteralText());
         value = initializer.getOperatorToken() === SyntaxKind3.MinusToken ? -raw : raw;
         auto = value + 1;
@@ -8381,7 +8416,7 @@ function buildEnum(decl) {
 }
 
 // packages/dbx-components-mcp/src/scan/extract-models/find-identities.ts
-import { Node as Node9 } from "ts-morph";
+import { Node as Node10 } from "ts-morph";
 var FUNCTION_NAME2 = "firestoreModelIdentity";
 function findIdentities(sf) {
   const out = [];
@@ -8389,7 +8424,7 @@ function findIdentities(sf) {
     if (!statement.isExported()) continue;
     for (const decl of statement.getDeclarations()) {
       const initializer = decl.getInitializer();
-      if (!initializer || !Node9.isCallExpression(initializer)) continue;
+      if (!initializer || !Node10.isCallExpression(initializer)) continue;
       if (initializer.getExpression().getText() !== FUNCTION_NAME2) continue;
       const parsed = parseIdentityCall(initializer.getArguments());
       if (parsed) {
@@ -8426,14 +8461,14 @@ function parseIdentityCall(args) {
 }
 function stringLiteralValue(node) {
   let result;
-  if (Node9.isStringLiteral(node) || Node9.isNoSubstitutionTemplateLiteral(node)) {
+  if (Node10.isStringLiteral(node) || Node10.isNoSubstitutionTemplateLiteral(node)) {
     result = node.getLiteralText();
   }
   return result;
 }
 function identifierName(node) {
   let result;
-  if (Node9.isIdentifier(node)) {
+  if (Node10.isIdentifier(node)) {
     result = node.getText();
   }
   return result;
@@ -14244,7 +14279,15 @@ function createListAppTool(config) {
 }
 
 // packages/dbx-components-mcp/src/tools/model-validate/extract.ts
-import { Node as Node10, Project as Project4, SyntaxKind as SyntaxKind4 } from "ts-morph";
+import { Node as Node11, Project as Project4, SyntaxKind as SyntaxKind4 } from "ts-morph";
+
+// packages/dbx-components-mcp/src/tools/model-validate/types.ts
+var MAX_FIELD_NAME_LENGTH = 5;
+var ROOT_MODEL_ORDER = ["identity", "interface", "rolesType", "documentClass", "converter", "referenceFn", "collectionType", "collectionFn"];
+var SUBCOLLECTION_MODEL_ORDER = ["identity", "interface", "rolesType", "documentClass", "converter", "referenceFn", "collectionType", "collectionFactoryType", "collectionFn", "referenceGroupFn", "collectionGroupType", "collectionGroupFn"];
+var SUB_OBJECT_FACTORY_NAMES = ["firestoreSubObject", "firestoreObjectArray", "firestoreMap"];
+
+// packages/dbx-components-mcp/src/tools/model-validate/extract.ts
 function extractFile(source) {
   const project = new Project4({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sourceFile = project.createSourceFile(source.name, source.text, { overwrite: true });
@@ -14254,16 +14297,56 @@ function extractFile(source) {
   const firstModelLine = identities.length > 0 ? Math.min(...identities.map((i) => i.line)) : void 0;
   const models = identities.map((identity) => extractModel(sourceFile, identity));
   const dataInterfaces = findDataInterfaces(sourceFile, groupInterface);
+  const subObjectCalls = findSubObjectFactoryCalls(sourceFile);
   const result = {
     name: source.name,
     groupInterface,
     groupTypes,
     firstModelLine,
     models,
-    dataInterfaces
+    dataInterfaces,
+    subObjectCalls
   };
   return result;
 }
+function findSubObjectFactoryCalls(sourceFile) {
+  const out = [];
+  const factorySet = new Set(SUB_OBJECT_FACTORY_NAMES);
+  for (const call of sourceFile.getDescendantsOfKind(SyntaxKind4.CallExpression)) {
+    const expr = call.getExpression();
+    if (!Node11.isIdentifier(expr)) {
+      continue;
+    }
+    const factoryName = expr.getText();
+    if (!factorySet.has(factoryName)) {
+      continue;
+    }
+    const typeArgs = call.getTypeArguments();
+    if (typeArgs.length === 0) {
+      continue;
+    }
+    const typeArgName = readTypeReferenceIdentifier(typeArgs[0]);
+    if (!typeArgName) {
+      continue;
+    }
+    out.push({
+      factoryName,
+      typeArgName,
+      line: call.getStartLineNumber()
+    });
+  }
+  return out;
+}
+function readTypeReferenceIdentifier(typeNode) {
+  if (!Node11.isTypeReference(typeNode)) {
+    return void 0;
+  }
+  const nameNode = typeNode.getTypeName();
+  if (!Node11.isIdentifier(nameNode)) {
+    return void 0;
+  }
+  return nameNode.getText();
+}
 function findDataInterfaces(sourceFile, groupInterface) {
   const out = [];
   const groupName = groupInterface?.name;
@@ -14274,7 +14357,8 @@ function findDataInterfaces(sourceFile, groupInterface) {
     }
     const fields = extractInterfaceFields(iface);
     const dbxModelTag = readDbxModelTag(iface.getJsDocs());
-    out.push({ name, line: iface.getStartLineNumber(), dbxModelTag, fields });
+    const dbxModelSubObjectTag = readDbxModelSubObjectTag(iface.getJsDocs());
+    out.push({ name, line: iface.getStartLineNumber(), dbxModelTag, dbxModelSubObjectTag, fields });
   }
   return out;
 }
@@ -14344,6 +14428,17 @@ function readDbxModelTag(jsDocs) {
   }
   return result;
 }
+function readDbxModelSubObjectTag(jsDocs) {
+  let result = false;
+  for (const jsDoc of jsDocs) {
+    for (const tag of jsDoc.getTags()) {
+      if (tag.getTagName() === "dbxModelSubObject") {
+        result = true;
+      }
+    }
+  }
+  return result;
+}
 function readDbxModelVariableTag(jsDocs) {
   let result;
   for (const jsDoc of jsDocs) {
@@ -14383,7 +14478,7 @@ function extractIdentityRefs(alias) {
   if (!typeNode) {
     return refs;
   }
-  if (Node10.isTypeQuery(typeNode)) {
+  if (Node11.isTypeQuery(typeNode)) {
     refs.push(typeNode.getExprName().getText());
   }
   const typeofNodes = typeNode.getDescendantsOfKind(SyntaxKind4.TypeQuery);
@@ -14397,7 +14492,7 @@ function findIdentities2(sourceFile) {
   for (const statement of sourceFile.getVariableStatements()) {
     for (const decl of statement.getDeclarations()) {
       const initializer = decl.getInitializer();
-      if (!initializer || !Node10.isCallExpression(initializer)) {
+      if (!initializer || !Node11.isCallExpression(initializer)) {
         continue;
       }
       if (initializer.getExpression().getText() !== "firestoreModelIdentity") {
@@ -14433,7 +14528,7 @@ function parseIdentityArgs(args) {
   }
   if (args.length === 3) {
     const [parentNode, nameNode, prefixNode] = args;
-    const parentRef = Node10.isIdentifier(parentNode) ? parentNode.getText() : void 0;
+    const parentRef = Node11.isIdentifier(parentNode) ? parentNode.getText() : void 0;
     const result2 = {
       parentIdentityRef: parentRef,
       collectionName: stringLiteralValue2(nameNode),
@@ -14448,7 +14543,7 @@ function stringLiteralValue2(node) {
   if (!node) {
     return void 0;
   }
-  if (Node10.isStringLiteral(node) || Node10.isNoSubstitutionTemplateLiteral(node)) {
+  if (Node11.isStringLiteral(node) || Node11.isNoSubstitutionTemplateLiteral(node)) {
     return node.getLiteralText();
   }
   return void 0;
@@ -14509,7 +14604,7 @@ function detectFactoryCallKind(sourceFile, factoryFnName) {
   const calls = fn.getDescendantsOfKind(SyntaxKind4.CallExpression);
   for (const call of calls) {
     const expr = call.getExpression();
-    if (!Node10.isPropertyAccessExpression(expr)) {
+    if (!Node11.isPropertyAccessExpression(expr)) {
       continue;
     }
     const name = expr.getName();
@@ -15100,6 +15195,16 @@ var RULE_CATALOG = [
     whenItDoesNotApply: "When the rename was intentional (rare \u2014 usually a copy-paste).",
     canonicalFix: "Update the getter body to return the matching identity constant."
   },
+  {
+    code: "MODEL_FIELD_LONG_NAME_EQUALS_NAME",
+    source: "dbx_model_validate",
+    severity: "warning",
+    title: "A persisted field's `@dbxModelVariable <longName>` tag value matches the field's short name verbatim, defeating the tag's purpose (the long name should be the field's unabbreviated camelCase variable name)",
+    whatItFlags: "A persisted field's `@dbxModelVariable <longName>` tag value matches the field's short name verbatim, defeating the tag's purpose (the long name should be the field's unabbreviated camelCase variable name).",
+    whenItApplies: "Every field on a `@dbxModel` interface or on a `@dbxModelSubObject`-tagged embedded sub-object interface where `@dbxModelVariable` is present and its value equals the field's name (e.g. field `h` tagged `@dbxModelVariable h`, field `ub` tagged `@dbxModelVariable ub`). The tag must always carry the unabbreviated form so the catalog and decoder surface a meaningful long name.",
+    whenItDoesNotApply: "Fields whose name is already the unabbreviated camelCase form (e.g. `name`, `email`, `id`, `at`) \u2014 add those to `dbx-mcp.config.json` `modelValidate.ignoredFieldNames` to silence the warning workspace-wide.",
+    canonicalFix: "Replace the tag value with the field's unabbreviated camelCase variable name (e.g. `@dbxModelVariable h` \u2192 `@dbxModelVariable hours`, `@dbxModelVariable ub` \u2192 `@dbxModelVariable usedBudget`). To exempt fields whose long name legitimately equals the short name, add them to `modelValidate.ignoredFieldNames`."
+  },
   {
     code: "MODEL_FIELD_MISSING_JSDOC",
     source: "dbx_model_validate",
@@ -15116,8 +15221,8 @@ var RULE_CATALOG = [
     severity: "warning",
     title: "A persisted field is missing its `@dbxModelVariable <name>` JSDoc tag",
     whatItFlags: "A persisted field is missing its `@dbxModelVariable <name>` JSDoc tag.",
-    whenItApplies: "Every field on a `@dbxModel` interface \u2014 the tag carries the human-readable long name the catalog and decoder use when surfacing the field to operators. The long name is the variable name the field would have unabbreviated, written in camelCase (e.g. `uid` \u2192 `userUid`, `n` \u2192 `name`, `crAt` \u2192 `createdAt`).",
-    whenItDoesNotApply: "Fields on embedded sub-object interfaces (no `@dbxModel` parent) and fields the project deliberately leaves untagged (rare).",
+    whenItApplies: "Every field on a `@dbxModel` interface or on a `@dbxModelSubObject`-tagged embedded sub-object interface \u2014 the tag carries the human-readable long name the catalog and decoder use when surfacing the field to operators. The long name is the variable name the field would have unabbreviated, written in camelCase (e.g. `uid` \u2192 `userUid`, `n` \u2192 `name`, `crAt` \u2192 `createdAt`).",
+    whenItDoesNotApply: "Fields on embedded sub-object interfaces that are not tagged with `@dbxModelSubObject` (the tag is opt-in) and fields the project deliberately leaves untagged (rare).",
     canonicalFix: "Append `@dbxModelVariable <longName>` to the field's JSDoc block, where `<longName>` is the field's unabbreviated camelCase variable name."
   },
   {
@@ -15304,6 +15409,32 @@ var RULE_CATALOG = [
     whenItDoesNotApply: "When intentionally module-private.",
     canonicalFix: "Add `export` to the alias."
   },
+  {
+    code: "MODEL_SUBOBJECT_NOT_TAGGED",
+    source: "dbx_model_validate",
+    severity: "warning",
+    title: "An interface is referenced as the first generic type-argument of a sub-object factory call (`firestoreSubObject<T>(...)`, `firestoreObjectArray<T>(...)`, or `firestoreMap<T>(...)`) but its declaration carries neither `@dbxModel` nor `@dbxModelSubObject`. The interface therefore opts out of the workspace's `@dbxModelVariable` long-name conventions even though its fields are persisted to Firestore",
+    whatItFlags: "An interface is referenced as the first generic type-argument of a sub-object factory call (`firestoreSubObject<T>(...)`, `firestoreObjectArray<T>(...)`, or `firestoreMap<T>(...)`) but its declaration carries neither `@dbxModel` nor `@dbxModelSubObject`. The interface therefore opts out of the workspace's `@dbxModelVariable` long-name conventions even though its fields are persisted to Firestore.",
+    whenItApplies: "Any interface declared in the validated source set that is the type-arg of at least one sub-object factory call and lacks both `@dbxModel` and `@dbxModelSubObject`. The warning is emitted once per interface (de-duplicated across all call sites) and anchored at the interface declaration line. Unresolved type-args \u2014 interfaces declared outside the validated source set, generic parameters, inline types \u2014 are silently skipped to avoid false positives.",
+    whenItDoesNotApply: "Interfaces already tagged with `@dbxModel` (top-level models) or `@dbxModelSubObject` (embedded sub-objects), and interfaces referenced only from outside the supplied source set (different package, etc.).",
+    canonicalFix: "Add `@dbxModelSubObject` to the interface's JSDoc block so its fields are subject to `@dbxModelVariable` long-name checks. If the interface is actually a top-level Firestore model, declare a matching `firestoreModelIdentity` and tag it `@dbxModel` instead.",
+    seeAlso: [
+      {
+        kind: "artifact",
+        target: "firestore-model"
+      }
+    ]
+  },
+  {
+    code: "MODEL_SUBOBJECT_TAG_CONFLICT",
+    source: "dbx_model_validate",
+    severity: "error",
+    title: "An interface declaration carries both `@dbxModel` and `@dbxModelSubObject` JSDoc tags. The two tags model mutually exclusive concepts \u2014 `@dbxModel` marks a top-level Firestore model registered in the catalog via `firestoreModelIdentity`, while `@dbxModelSubObject` marks an embedded sub-object interface persisted only as part of a parent model's converter \u2014 so an interface must carry at most one",
+    whatItFlags: "An interface declaration carries both `@dbxModel` and `@dbxModelSubObject` JSDoc tags. The two tags model mutually exclusive concepts \u2014 `@dbxModel` marks a top-level Firestore model registered in the catalog via `firestoreModelIdentity`, while `@dbxModelSubObject` marks an embedded sub-object interface persisted only as part of a parent model's converter \u2014 so an interface must carry at most one.",
+    whenItApplies: "Any interface JSDoc block where both `@dbxModel` and `@dbxModelSubObject` are present.",
+    whenItDoesNotApply: "Interfaces carrying only one of the two tags (or neither).",
+    canonicalFix: "Remove whichever tag does not describe the interface. If the interface has a matching `firestoreModelIdentity` call, keep `@dbxModel`; if it is only embedded inside another model via `firestoreSubObject<T>()`, keep `@dbxModelSubObject`."
+  },
   {
     code: "SUB_MISSING_COLLECTION_FACTORY_FN",
     source: "dbx_model_validate",
@@ -16930,15 +17061,11 @@ function formatSeeAlso(ref) {
   return `Doc: ${ref.target}${tail}`;
 }
 
-// packages/dbx-components-mcp/src/tools/model-validate/types.ts
-var MAX_FIELD_NAME_LENGTH = 5;
-var ROOT_MODEL_ORDER = ["identity", "interface", "rolesType", "documentClass", "converter", "referenceFn", "collectionType", "collectionFn"];
-var SUBCOLLECTION_MODEL_ORDER = ["identity", "interface", "rolesType", "documentClass", "converter", "referenceFn", "collectionType", "collectionFactoryType", "collectionFn", "referenceGroupFn", "collectionGroupType", "collectionGroupFn"];
-
 // packages/dbx-components-mcp/src/tools/model-validate/rules.ts
-function runRules(file, options) {
+function runRules(file, options, context) {
   const violations = [];
   if (file.models.length === 0) {
+    checkSubObjectFactoryCallSites(file, violations, context);
     return violations;
   }
   checkFileLevel(file, violations);
@@ -16951,6 +17078,8 @@ function runRules(file, options) {
     checkDeclarationOrder(file, model, violations);
   }
   checkFieldNameLengths(file, violations, options);
+  checkSubObjectInterfaceTags(file, violations);
+  checkSubObjectFactoryCallSites(file, violations, context);
   return violations;
 }
 function checkFieldNameLengths(file, violations, options) {
@@ -16974,9 +17103,10 @@ function checkFieldNameLengths(file, violations, options) {
       });
     }
   }
-  checkFieldJsDocs(file, violations);
+  checkFieldJsDocs(file, violations, options);
 }
-function checkFieldJsDocs(file, violations) {
+function checkFieldJsDocs(file, violations, options) {
+  const ignored = options?.ignoredFieldNames;
   for (const iface of file.dataInterfaces) {
     for (const field of iface.fields) {
       if (!field.jsDocFirstLine) {
@@ -16989,7 +17119,8 @@ function checkFieldJsDocs(file, violations) {
           model: iface.name
         });
       }
-      if (iface.dbxModelTag && field.dbxModelVariableTag === void 0) {
+      const fieldRulesApply = iface.dbxModelTag || iface.dbxModelSubObjectTag;
+      if (fieldRulesApply && field.dbxModelVariableTag === void 0) {
         pushViolation(violations, {
           code: "MODEL_FIELD_MISSING_VARIABLE_TAG",
           severity: "warning",
@@ -16999,7 +17130,60 @@ function checkFieldJsDocs(file, violations) {
           model: iface.name
         });
       }
+      if (fieldRulesApply && field.dbxModelVariableTag !== void 0 && field.dbxModelVariableTag === field.name && !ignored?.has(field.name)) {
+        pushViolation(violations, {
+          code: "MODEL_FIELD_LONG_NAME_EQUALS_NAME",
+          severity: "warning",
+          message: `Field \`${field.name}\` in interface \`${iface.name}\` has \`@dbxModelVariable ${field.dbxModelVariableTag}\` matching its short name. The long name should be the field's unabbreviated camelCase variable name (e.g. \`h\` \u2192 \`hours\`, \`ub\` \u2192 \`usedBudget\`). If the short name is already the unabbreviated form, add \`${field.name}\` to \`modelValidate.ignoredFieldNames\` in \`dbx-mcp.config.json\`.`,
+          file: file.name,
+          line: field.line,
+          model: iface.name
+        });
+      }
+    }
+  }
+}
+function checkSubObjectInterfaceTags(file, violations) {
+  for (const iface of file.dataInterfaces) {
+    if (iface.dbxModelTag && iface.dbxModelSubObjectTag) {
+      pushViolation(violations, {
+        code: "MODEL_SUBOBJECT_TAG_CONFLICT",
+        message: `Interface \`${iface.name}\` carries both \`@dbxModel\` and \`@dbxModelSubObject\`. Use only \`@dbxModel\` for top-level Firestore models; use \`@dbxModelSubObject\` only for embedded sub-objects without a \`firestoreModelIdentity\`.`,
+        file: file.name,
+        line: iface.line,
+        model: iface.name
+      });
+    }
+  }
+}
+function checkSubObjectFactoryCallSites(file, violations, context) {
+  if (!context) {
+    return;
+  }
+  if (file.subObjectCalls.length === 0) {
+    return;
+  }
+  for (const call of file.subObjectCalls) {
+    const entry = context.interfacesByName.get(call.typeArgName);
+    if (!entry) {
+      continue;
+    }
+    const { iface, file: declFile } = entry;
+    if (iface.dbxModelTag || iface.dbxModelSubObjectTag) {
+      continue;
+    }
+    if (context.emittedSubObjectInterfaces.has(call.typeArgName)) {
+      continue;
     }
+    context.emittedSubObjectInterfaces.add(call.typeArgName);
+    pushViolation(violations, {
+      code: "MODEL_SUBOBJECT_NOT_TAGGED",
+      severity: "warning",
+      message: `Interface \`${iface.name}\` is referenced by \`${call.factoryName}<${iface.name}>(...)\` at ${file.name}:${call.line} but carries neither \`@dbxModel\` nor \`@dbxModelSubObject\`. Tag the interface with \`@dbxModelSubObject\` so its persisted fields are subject to the same \`@dbxModelVariable\` long-name checks as a top-level model.`,
+      file: declFile,
+      line: iface.line,
+      model: iface.name
+    });
   }
 }
 function checkFileLevel(file, violations) {
@@ -17703,10 +17887,15 @@ function validateFirebaseModelSources(sources, options) {
   let modelsChecked = 0;
   let errorCount = 0;
   let warningCount = 0;
+  const extracteds = [];
   for (const source of sources) {
     const extracted = extractFile(source);
+    extracteds.push(extracted);
     modelsChecked += extracted.models.length;
-    const fileViolations = runRules(extracted, options);
+  }
+  const context = buildCrossFileRuleContext(extracteds);
+  for (const extracted of extracteds) {
+    const fileViolations = runRules(extracted, options, context);
     for (const v of fileViolations) {
       violations.push(v);
       if (v.severity === "error") {
@@ -17725,6 +17914,22 @@ function validateFirebaseModelSources(sources, options) {
   };
   return result;
 }
+function buildCrossFileRuleContext(extracteds) {
+  const interfacesByName = /* @__PURE__ */ new Map();
+  for (const file of extracteds) {
+    for (const iface of file.dataInterfaces) {
+      if (interfacesByName.has(iface.name)) {
+        continue;
+      }
+      interfacesByName.set(iface.name, { file: file.name, iface });
+    }
+  }
+  const context = {
+    interfacesByName,
+    emittedSubObjectInterfaces: /* @__PURE__ */ new Set()
+  };
+  return context;
+}
 
 // packages/dbx-components-mcp/src/tools/model-validate.tool.ts
 var DBX_MODEL_VALIDATE_TOOL = {
@@ -17779,7 +17984,7 @@ var modelValidateTool = /* @__PURE__ */ createModelValidateTool();
 var runModelValidate = modelValidateTool.run;
 
 // packages/dbx-components-mcp/src/tools/model-validate-api/extract.ts
-import { Node as Node11, Project as Project5, SyntaxKind as SyntaxKind5 } from "ts-morph";
+import { Node as Node12, Project as Project5, SyntaxKind as SyntaxKind5 } from "ts-morph";
 function extractFile2(source) {
   const project = new Project5({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sourceFile = project.createSourceFile(source.name, source.text, { overwrite: true });
@@ -17945,7 +18150,7 @@ function findCrudConfigType(sourceFile) {
       continue;
     }
     const typeNode = alias.getTypeNode();
-    const summary = typeNode && Node11.isTypeLiteral(typeNode) ? summarizeCrudConfigType(typeNode) : { keys: [], nonNullKeys: [], bareLeafParamsNames: [] };
+    const summary = typeNode && Node12.isTypeLiteral(typeNode) ? summarizeCrudConfigType(typeNode) : { keys: [], nonNullKeys: [], bareLeafParamsNames: [] };
     const result = {
       name: alias.getName(),
       exported: alias.isExported(),
@@ -17959,14 +18164,14 @@ function findCrudConfigType(sourceFile) {
   return void 0;
 }
 function summarizeCrudConfigType(typeLiteral) {
-  if (!Node11.isTypeLiteral(typeLiteral)) {
+  if (!Node12.isTypeLiteral(typeLiteral)) {
     return { keys: [], nonNullKeys: [], bareLeafParamsNames: [] };
   }
   const keys = [];
   const nonNullKeys = [];
   const bareLeafParamsNames = [];
   for (const member of typeLiteral.getMembers()) {
-    if (!Node11.isPropertySignature(member)) {
+    if (!Node12.isPropertySignature(member)) {
       continue;
     }
     const name = member.getName();
@@ -17984,18 +18189,18 @@ function summarizeCrudConfigType(typeLiteral) {
   return { keys, nonNullKeys, bareLeafParamsNames };
 }
 function isNullLiteralType(node) {
-  if (Node11.isLiteralTypeNode(node)) {
+  if (Node12.isLiteralTypeNode(node)) {
     const literal = node.getLiteral();
-    if (Node11.isNullLiteral(literal)) {
+    if (Node12.isNullLiteral(literal)) {
       return true;
     }
   }
   return false;
 }
 function collectBareParamsLeaves(node, out) {
-  if (Node11.isTypeLiteral(node)) {
+  if (Node12.isTypeLiteral(node)) {
     for (const member of node.getMembers()) {
-      if (!Node11.isPropertySignature(member)) {
+      if (!Node12.isPropertySignature(member)) {
         continue;
       }
       const valueNode = member.getTypeNode();
@@ -18005,10 +18210,10 @@ function collectBareParamsLeaves(node, out) {
     }
     return;
   }
-  if (Node11.isTupleTypeNode(node)) {
+  if (Node12.isTupleTypeNode(node)) {
     return;
   }
-  if (Node11.isTypeReference(node)) {
+  if (Node12.isTypeReference(node)) {
     const name = node.getTypeName().getText();
     if (name.endsWith("Params")) {
       out.push(name);
@@ -18025,12 +18230,12 @@ function findCrudConfigConst(sourceFile) {
       const typeNode = decl.getTypeNode();
       const initializer = decl.getInitializer();
       const runtimeKeys = [];
-      if (initializer && Node11.isAsExpression(initializer)) {
+      if (initializer && Node12.isAsExpression(initializer)) {
         const inner = initializer.getExpression();
-        if (Node11.isObjectLiteralExpression(inner)) {
+        if (Node12.isObjectLiteralExpression(inner)) {
           runtimeKeys.push(...collectObjectLiteralKeys(inner));
         }
-      } else if (initializer && Node11.isObjectLiteralExpression(initializer)) {
+      } else if (initializer && Node12.isObjectLiteralExpression(initializer)) {
         runtimeKeys.push(...collectObjectLiteralKeys(initializer));
       }
       const result = {
@@ -18048,7 +18253,7 @@ function findCrudConfigConst(sourceFile) {
 function collectObjectLiteralKeys(obj) {
   const out = [];
   for (const prop of obj.getProperties()) {
-    if (Node11.isPropertyAssignment(prop) || Node11.isShorthandPropertyAssignment(prop)) {
+    if (Node12.isPropertyAssignment(prop) || Node12.isShorthandPropertyAssignment(prop)) {
       out.push(prop.getName());
     }
   }
@@ -18064,7 +18269,7 @@ function findFunctionMap(sourceFile) {
       const initializer = decl.getInitializer();
       let callsFactory = false;
       const factoryArgs = [];
-      if (initializer && Node11.isCallExpression(initializer)) {
+      if (initializer && Node12.isCallExpression(initializer)) {
         const exprText = initializer.getExpression().getText();
         if (exprText === "callModelFirebaseFunctionMapFactory") {
           callsFactory = true;
@@ -18202,18 +18407,18 @@ function extractCastTargetName(node) {
     return void 0;
   }
   let current = node;
-  while (current && Node11.isAsExpression(current)) {
+  while (current && Node12.isAsExpression(current)) {
     const typeNode = current.getTypeNode();
     if (!typeNode) {
       break;
     }
-    if (Node11.isTypeReference(typeNode)) {
+    if (Node12.isTypeReference(typeNode)) {
       const refName = typeNode.getTypeName().getText();
       if (refName === "Type") {
         const args = typeNode.getTypeArguments();
         if (args.length === 1) {
           const arg = args[0];
-          if (Node11.isTypeReference(arg)) {
+          if (Node12.isTypeReference(arg)) {
             return arg.getTypeName().getText();
           }
           return arg.getText();
@@ -18232,7 +18437,7 @@ function extractValidatorProperties(initializer) {
   }
   const out = [];
   for (const prop of obj.getProperties()) {
-    if (!Node11.isPropertyAssignment(prop)) {
+    if (!Node12.isPropertyAssignment(prop)) {
       continue;
     }
     const propAssignment = prop;
@@ -18242,7 +18447,7 @@ function extractValidatorProperties(initializer) {
     const clean = optional ? stripped.slice(0, -1) : stripped;
     const valueNode = propAssignment.getInitializer();
     let hasClearable = false;
-    if (valueNode && Node11.isCallExpression(valueNode)) {
+    if (valueNode && Node12.isCallExpression(valueNode)) {
       const exprText = valueNode.getExpression().getText();
       if (exprText === "clearable") {
         hasClearable = true;
@@ -18254,25 +18459,25 @@ function extractValidatorProperties(initializer) {
 }
 function findArktypeObjectLiteral(initializer) {
   let current = initializer;
-  while (current && Node11.isAsExpression(current)) {
+  while (current && Node12.isAsExpression(current)) {
     current = current.getExpression();
   }
-  if (!current || !Node11.isCallExpression(current)) {
+  if (!current || !Node12.isCallExpression(current)) {
     return void 0;
   }
   const expr = current.getExpression();
-  if (Node11.isIdentifier(expr) && expr.getText() === "type") {
+  if (Node12.isIdentifier(expr) && expr.getText() === "type") {
     const args = current.getArguments();
     const arg = args[0];
-    if (arg && Node11.isObjectLiteralExpression(arg)) {
+    if (arg && Node12.isObjectLiteralExpression(arg)) {
       return arg;
     }
     return void 0;
   }
-  if (Node11.isPropertyAccessExpression(expr) && expr.getName() === "merge") {
+  if (Node12.isPropertyAccessExpression(expr) && expr.getName() === "merge") {
     const args = current.getArguments();
     const arg = args[0];
-    if (arg && Node11.isObjectLiteralExpression(arg)) {
+    if (arg && Node12.isObjectLiteralExpression(arg)) {
       return arg;
     }
   }
@@ -18957,7 +19162,7 @@ import { readdir as readdir2, readFile as readFile4, stat as stat4 } from "node:
 import { join as join4, relative as relative4, sep as sep5 } from "node:path";
 
 // packages/dbx-cli/manifest-extract/src/lib/extract-crud.ts
-import { Node as Node12, Project as Project6 } from "ts-morph";
+import { Node as Node13, Project as Project6 } from "ts-morph";
 var SUPPORTED_VERBS = /* @__PURE__ */ new Set(["create", "read", "update", "delete", "query"]);
 function extractCrudEntries(source) {
   const project = new Project6({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
@@ -18983,9 +19188,9 @@ function extractCrudEntries(source) {
   };
   if (crudConfigType) {
     const literal = crudConfigType.getTypeNode();
-    if (literal && Node12.isTypeLiteral(literal)) {
+    if (literal && Node13.isTypeLiteral(literal)) {
       for (const member of literal.getMembers()) {
-        if (!Node12.isPropertySignature(member)) {
+        if (!Node13.isPropertySignature(member)) {
           continue;
         }
         const modelName = member.getName();
@@ -18997,9 +19202,9 @@ function extractCrudEntries(source) {
         if (isNullLiteralType2(valueNode)) {
           continue;
         }
-        if (Node12.isTypeLiteral(valueNode)) {
+        if (Node13.isTypeLiteral(valueNode)) {
           for (const verbMember of valueNode.getMembers()) {
-            if (!Node12.isPropertySignature(verbMember)) {
+            if (!Node13.isPropertySignature(verbMember)) {
               continue;
             }
             const verbName = verbMember.getName();
@@ -19020,9 +19225,9 @@ function extractCrudEntries(source) {
   const functionTypeMap = findTypeAliasByEnding(sourceFile, "FunctionTypeMap");
   if (functionTypeMap) {
     const literal = functionTypeMap.getTypeNode();
-    if (literal && Node12.isTypeLiteral(literal)) {
+    if (literal && Node13.isTypeLiteral(literal)) {
       for (const member of literal.getMembers()) {
-        if (!Node12.isPropertySignature(member)) {
+        if (!Node13.isPropertySignature(member)) {
           continue;
         }
         const key = member.getName();
@@ -19090,9 +19295,9 @@ function inferGroupName2(sourceFile) {
   return void 0;
 }
 function isNullLiteralType2(node) {
-  if (Node12.isLiteralTypeNode(node)) {
+  if (Node13.isLiteralTypeNode(node)) {
     const literal = node.getLiteral();
-    if (Node12.isNullLiteral(literal)) {
+    if (Node13.isNullLiteral(literal)) {
       return true;
     }
   }
@@ -19100,9 +19305,9 @@ function isNullLiteralType2(node) {
 }
 function collectVerbEntries(input) {
   const { modelName, verb, valueNode, entries, fallbackDescription, resolveTypeDocs } = input;
-  if (Node12.isTypeLiteral(valueNode)) {
+  if (Node13.isTypeLiteral(valueNode)) {
     for (const specMember of valueNode.getMembers()) {
-      if (!Node12.isPropertySignature(specMember)) {
+      if (!Node13.isPropertySignature(specMember)) {
         continue;
       }
       const specifier = specMember.getName();
@@ -19144,7 +19349,7 @@ function collectVerbEntries(input) {
   });
 }
 function readTupleParamsResult(node) {
-  if (!Node12.isTupleTypeNode(node)) {
+  if (!Node13.isTupleTypeNode(node)) {
     return void 0;
   }
   const elements = node.getElements();
@@ -19163,7 +19368,7 @@ function readBareParams(node) {
   return { params, result: void 0 };
 }
 function typeNodeName(node) {
-  if (Node12.isTypeReference(node)) {
+  if (Node13.isTypeReference(node)) {
     return node.getTypeName().getText();
   }
   const text = node.getText().trim();
@@ -20002,7 +20207,7 @@ async function collectApiFiles2(rootAbs) {
 // packages/dbx-components-mcp/src/tools/model-api-validate-app/extract-handlers.ts
 import { readFile as readFile8 } from "node:fs/promises";
 import { join as join8 } from "node:path";
-import { Node as Node13, Project as Project8 } from "ts-morph";
+import { Node as Node14, Project as Project8 } from "ts-morph";
 var HANDLER_MAP_REL = "src/app/function/model/crud.functions.ts";
 var VERB_TOKENS = [
   { token: "Create", verb: "create" },
@@ -20030,7 +20235,7 @@ async function extractHandlerEntries(apiAbs, apiDir) {
       const verb = matchVerbFromConstName(name);
       if (!verb) continue;
       const initializer = decl.getInitializer();
-      if (!initializer || !Node13.isObjectLiteralExpression(initializer)) continue;
+      if (!initializer || !Node14.isObjectLiteralExpression(initializer)) continue;
       verbsFound.push(verb);
       collectVerbMap({ verb, mapLiteral: initializer, sourceFileRel, entries });
     }
@@ -20048,7 +20253,7 @@ function matchVerbFromConstName(name) {
 function collectVerbMap(input) {
   const { verb, mapLiteral, sourceFileRel, entries } = input;
   for (const prop of mapLiteral.getProperties()) {
-    if (!Node13.isPropertyAssignment(prop)) continue;
+    if (!Node14.isPropertyAssignment(prop)) continue;
     const model = prop.getName();
     const value = prop.getInitializer();
     if (!value) continue;
@@ -20067,25 +20272,25 @@ function collectVerbMap(input) {
   }
 }
 function readSpecifierHandler(node) {
-  if (!Node13.isCallExpression(node)) return void 0;
+  if (!Node14.isCallExpression(node)) return void 0;
   const expr = node.getExpression();
   if (!expr.getText().endsWith("onCallSpecifierHandler")) return void 0;
   const args = node.getArguments();
   if (args.length === 0) return void 0;
   const firstArg = args[0];
-  if (!Node13.isObjectLiteralExpression(firstArg)) return void 0;
+  if (!Node14.isObjectLiteralExpression(firstArg)) return void 0;
   const out = /* @__PURE__ */ new Map();
   for (const prop of firstArg.getProperties()) {
-    if (!Node13.isPropertyAssignment(prop) && !Node13.isShorthandPropertyAssignment(prop)) continue;
+    if (!Node14.isPropertyAssignment(prop) && !Node14.isShorthandPropertyAssignment(prop)) continue;
     const specifier = prop.getName();
-    const handlerName = readBareHandlerName(Node13.isPropertyAssignment(prop) ? prop.getInitializerOrThrow() : prop) ?? "(unresolved)";
+    const handlerName = readBareHandlerName(Node14.isPropertyAssignment(prop) ? prop.getInitializerOrThrow() : prop) ?? "(unresolved)";
     out.set(specifier, handlerName);
   }
   return out;
 }
 function readBareHandlerName(node) {
-  if (Node13.isIdentifier(node)) return node.getText();
-  if (Node13.isShorthandPropertyAssignment(node)) return node.getName();
+  if (Node14.isIdentifier(node)) return node.getText();
+  if (Node14.isShorthandPropertyAssignment(node)) return node.getName();
   const text = node.getText().split(/\s|\(/)[0];
   if (/^[A-Za-z_]\w*$/.test(text)) return text;
   return void 0;
@@ -21287,7 +21492,7 @@ function paramsHasFixtureDependencies(params) {
 }
 
 // packages/dbx-components-mcp/src/tools/model-fixture-shared/extract.ts
-import { Node as Node14, Project as Project9, SyntaxKind as SyntaxKind7 } from "ts-morph";
+import { Node as Node15, Project as Project9, SyntaxKind as SyntaxKind7 } from "ts-morph";
 
 // packages/dbx-components-mcp/src/tools/model-fixture-shared/framework-fixtures.ts
 var KNOWN_NON_MODEL_FIXTURE_FAMILIES = [
@@ -21399,7 +21604,7 @@ function extendsByName(cls, baseName) {
   const extendsClause = cls.getExtends();
   if (!extendsClause) return false;
   const expr = extendsClause.getExpression();
-  if (Node14.isIdentifier(expr)) {
+  if (Node15.isIdentifier(expr)) {
     return expr.getText() === baseName;
   }
   return extendsClause.getText().startsWith(baseName);
@@ -21527,14 +21732,14 @@ function readContextFactory(decl) {
   const initializer = decl.getInitializer();
   if (!initializer) return void 0;
   let bodyExpr;
-  if (Node14.isArrowFunction(initializer) || Node14.isFunctionExpression(initializer)) {
+  if (Node15.isArrowFunction(initializer) || Node15.isFunctionExpression(initializer)) {
     bodyExpr = readSingleReturnExpression(initializer);
   } else {
     bodyExpr = initializer;
   }
-  if (!bodyExpr || !Node14.isCallExpression(bodyExpr)) return void 0;
+  if (!bodyExpr || !Node15.isCallExpression(bodyExpr)) return void 0;
   const callee = bodyExpr.getExpression();
-  if (!Node14.isIdentifier(callee)) return void 0;
+  if (!Node15.isIdentifier(callee)) return void 0;
   const calleeName = callee.getText();
   let family;
   if (calleeName !== MODEL_FACTORY_NAME) {
@@ -21549,9 +21754,9 @@ function readContextFactory(decl) {
   let parentFixtureFieldFromGetCollection;
   if (args.length > 0) {
     const first = args[0];
-    if (Node14.isObjectLiteralExpression(first)) {
+    if (Node15.isObjectLiteralExpression(first)) {
       const getCollection = first.getProperty("getCollection");
-      if (getCollection && Node14.isPropertyAssignment(getCollection)) {
+      if (getCollection && Node15.isPropertyAssignment(getCollection)) {
         const fnInit = getCollection.getInitializer();
         const arity = readArrowParameterCount(fnInit);
         if (arity >= 2) {
@@ -21602,7 +21807,7 @@ function familyFromExtends(cls) {
   if (!ext) return void 0;
   const expr = ext.getExpression();
   let baseName;
-  if (Node14.isIdentifier(expr)) {
+  if (Node15.isIdentifier(expr)) {
     baseName = expr.getText();
   } else {
     const text = ext.getText();
@@ -21615,9 +21820,9 @@ function familyFromExtends(cls) {
 function readSingleReturnExpression(fn) {
   const body = fn.getBody();
   if (!body) return void 0;
-  if (Node14.isBlock(body)) {
+  if (Node15.isBlock(body)) {
     for (const stmt of body.getStatements()) {
-      if (Node14.isReturnStatement(stmt)) {
+      if (Node15.isReturnStatement(stmt)) {
         return stmt.getExpression();
       }
     }
@@ -21627,19 +21832,19 @@ function readSingleReturnExpression(fn) {
 }
 function readArrowParameterCount(fn) {
   if (!fn) return 0;
-  if (Node14.isArrowFunction(fn) || Node14.isFunctionExpression(fn) || Node14.isFunctionDeclaration(fn) || Node14.isMethodDeclaration(fn)) {
+  if (Node15.isArrowFunction(fn) || Node15.isFunctionExpression(fn) || Node15.isFunctionDeclaration(fn) || Node15.isMethodDeclaration(fn)) {
     return fn.getParameters().length;
   }
   return 0;
 }
 function readParamsAccessFieldName(fn) {
   if (!fn) return void 0;
-  if (!Node14.isArrowFunction(fn) && !Node14.isFunctionExpression(fn)) return void 0;
+  if (!Node15.isArrowFunction(fn) && !Node15.isFunctionExpression(fn)) return void 0;
   const body = fn.getBody();
   if (!body) return void 0;
   for (const access2 of body.getDescendantsOfKind(SyntaxKind7.PropertyAccessExpression)) {
     const expr = access2.getExpression();
-    if (Node14.isIdentifier(expr) && expr.getText() === "params") {
+    if (Node15.isIdentifier(expr) && expr.getText() === "params") {
       return access2.getName();
     }
   }
@@ -21680,9 +21885,9 @@ function collectSingletonsByFactory(sourceFile) {
   for (const stmt of sourceFile.getVariableStatements()) {
     for (const decl of stmt.getDeclarations()) {
       const init = decl.getInitializer();
-      if (!init || !Node14.isCallExpression(init)) continue;
+      if (!init || !Node15.isCallExpression(init)) continue;
       const callee = init.getExpression();
-      if (!Node14.isIdentifier(callee)) continue;
+      if (!Node15.isIdentifier(callee)) continue;
       out.set(callee.getText(), decl.getName());
     }
   }
@@ -22930,7 +23135,7 @@ import { resolve as resolve32 } from "node:path";
 import { type as type47 } from "arktype";
 
 // packages/dbx-components-mcp/src/tools/model-test-shared/extract.ts
-import { Node as Node15, Project as Project11, SyntaxKind as SyntaxKind8 } from "ts-morph";
+import { Node as Node16, Project as Project11, SyntaxKind as SyntaxKind8 } from "ts-morph";
 var SPEC_FILE_VIRTUAL_PATH = "__spec__/spec.ts";
 var FIXTURE_CONTEXT_SUFFIX = "Context";
 var FIXTURE_FACTORY_SUFFIX = "ContextFactory";
@@ -22951,9 +23156,9 @@ function extractSpecTreeFromText(input) {
   const counts = { describe: 0, it: 0, fixture: 0 };
   const rootChildren = [];
   for (const stmt of sourceFile.getStatements()) {
-    if (!Node15.isExpressionStatement(stmt)) continue;
+    if (!Node16.isExpressionStatement(stmt)) continue;
     const expr = stmt.getExpression();
-    if (!Node15.isCallExpression(expr)) continue;
+    if (!Node16.isCallExpression(expr)) continue;
     const node = walkCall(expr, { prefix, knownFixtureNames, helperNames, counts });
     if (node !== void 0) {
       rootChildren.push(node);
@@ -23119,7 +23324,7 @@ function fixtureNode(input) {
   const { call, calleeName, ctx, line, endLine } = input;
   const args = call.getArguments();
   const argsObject = args[0];
-  const parentVars = Node15.isObjectLiteralExpression(argsObject) ? readParentVars(argsObject) : [];
+  const parentVars = Node16.isObjectLiteralExpression(argsObject) ? readParentVars(argsObject) : [];
   const callback = findCallback(call);
   const varName = callback === void 0 ? void 0 : readCallbackVarName(callback);
   const model = stripFixturePrefix(calleeName, ctx.prefix);
@@ -23157,11 +23362,11 @@ function stripFixturePrefix(name, prefix) {
 }
 function readTitle(arg) {
   if (arg === void 0) return { title: void 0, titleIsTemplate: false };
-  if (Node15.isStringLiteral(arg) || Node15.isNoSubstitutionTemplateLiteral(arg)) {
+  if (Node16.isStringLiteral(arg) || Node16.isNoSubstitutionTemplateLiteral(arg)) {
     const result2 = { title: arg.getLiteralText(), titleIsTemplate: false };
     return result2;
   }
-  if (Node15.isTemplateExpression(arg)) {
+  if (Node16.isTemplateExpression(arg)) {
     const result2 = { title: arg.getText(), titleIsTemplate: true };
     return result2;
   }
@@ -23172,7 +23377,7 @@ function findCallback(call) {
   const args = call.getArguments();
   for (let i = args.length - 1; i >= 0; i--) {
     const a = args[i];
-    if (Node15.isArrowFunction(a) || Node15.isFunctionExpression(a)) {
+    if (Node16.isArrowFunction(a) || Node16.isFunctionExpression(a)) {
       return a;
     }
   }
@@ -23183,7 +23388,7 @@ function readCallbackVarName(callback) {
   if (params.length === 0) return void 0;
   const first = params[0];
   const nameNode = first.getNameNode();
-  if (Node15.isIdentifier(nameNode)) {
+  if (Node16.isIdentifier(nameNode)) {
     return nameNode.getText();
   }
   return void 0;
@@ -23191,13 +23396,13 @@ function readCallbackVarName(callback) {
 function readParentVars(obj) {
   const out = [];
   for (const prop of obj.getProperties()) {
-    if (Node15.isShorthandPropertyAssignment(prop)) {
+    if (Node16.isShorthandPropertyAssignment(prop)) {
       out.push(prop.getName());
       continue;
     }
-    if (Node15.isPropertyAssignment(prop)) {
+    if (Node16.isPropertyAssignment(prop)) {
       const init = prop.getInitializer();
-      if (init !== void 0 && Node15.isIdentifier(init)) {
+      if (init !== void 0 && Node16.isIdentifier(init)) {
         out.push(init.getText());
       }
     }
@@ -23206,10 +23411,10 @@ function readParentVars(obj) {
 }
 function walkCallbackBody(callback, ctx) {
   const body = callback.getBody();
-  if (Node15.isBlock(body)) {
+  if (Node16.isBlock(body)) {
     return walkBlock(body, ctx);
   }
-  if (Node15.isCallExpression(body)) {
+  if (Node16.isCallExpression(body)) {
     const child = walkCall(body, ctx);
     return child === void 0 ? [] : [child];
   }
@@ -23218,9 +23423,9 @@ function walkCallbackBody(callback, ctx) {
 function walkBlock(block, ctx) {
   const children = [];
   for (const stmt of block.getStatements()) {
-    if (!Node15.isExpressionStatement(stmt)) continue;
+    if (!Node16.isExpressionStatement(stmt)) continue;
     const expr = stmt.getExpression();
-    if (!Node15.isCallExpression(expr)) continue;
+    if (!Node16.isCallExpression(expr)) continue;
     const child = walkCall(expr, ctx);
     if (child !== void 0) {
       children.push(child);
@@ -23230,7 +23435,7 @@ function walkBlock(block, ctx) {
 }
 function getCalleeName(call) {
   const expr = call.getExpression();
-  if (Node15.isIdentifier(expr)) return expr.getText();
+  if (Node16.isIdentifier(expr)) return expr.getText();
   return void 0;
 }
 function collectHelpers(sourceFile) {
@@ -23246,7 +23451,7 @@ function collectHelpers(sourceFile) {
     for (const decl of v.getDeclarations()) {
       const init = decl.getInitializer();
       if (init === void 0) continue;
-      if (!Node15.isArrowFunction(init) && !Node15.isFunctionExpression(init)) continue;
+      if (!Node16.isArrowFunction(init) && !Node16.isFunctionExpression(init)) continue;
       const usage = scanForDescribeOrIt(init);
       if (!usage.emitsDescribe && !usage.emitsIt) continue;
       out.push({ name: decl.getName(), line: decl.getStartLineNumber(), endLine: decl.getEndLineNumber(), emitsDescribe: usage.emitsDescribe, emitsIt: usage.emitsIt });
@@ -23260,7 +23465,7 @@ function scanForDescribeOrIt(node) {
     if (descendant.getKind() !== SyntaxKind8.CallExpression) return;
     const call = descendant;
     const expr = call.getExpression();
-    if (!Node15.isIdentifier(expr)) return;
+    if (!Node16.isIdentifier(expr)) return;
     const name = expr.getText();
     if (DESCRIBE_NAMES.has(name)) usage.emitsDescribe = true;
     if (isItName(name)) usage.emitsIt = true;
@@ -24033,10 +24238,10 @@ var modelHierarchyTool = {
 };
 
 // packages/dbx-components-mcp/src/tools/storagefile-m-validate-app/extract.ts
-import { Node as Node17, SyntaxKind as SyntaxKind10 } from "ts-morph";
+import { Node as Node18, SyntaxKind as SyntaxKind10 } from "ts-morph";
 
 // packages/dbx-components-mcp/src/tools/_validate/ast.ts
-import { Node as Node16, Project as Project12, SyntaxKind as SyntaxKind9 } from "ts-morph";
+import { Node as Node17, Project as Project12, SyntaxKind as SyntaxKind9 } from "ts-morph";
 var COMPONENT_VIRTUAL_PREFIX = "__component__/";
 var API_VIRTUAL_PREFIX = "__api__/";
 // @__NO_SIDE_EFFECTS__
@@ -24061,28 +24266,28 @@ function componentRelPath(sourceFile) {
 }
 function unwrapAsExpressions(node) {
   let current = node;
-  while (current && Node16.isAsExpression(current)) {
+  while (current && Node17.isAsExpression(current)) {
     current = current.getExpression();
   }
   return current;
 }
 function asObjectLiteral(node) {
   const inner = unwrapAsExpressions(node);
-  if (inner && Node16.isObjectLiteralExpression(inner)) {
+  if (inner && Node17.isObjectLiteralExpression(inner)) {
     return inner;
   }
   return void 0;
 }
 function asArrayLiteral(node) {
   const inner = unwrapAsExpressions(node);
-  if (inner && Node16.isArrayLiteralExpression(inner)) {
+  if (inner && Node17.isArrayLiteralExpression(inner)) {
     return inner;
   }
   return void 0;
 }
 function readStringLiteralInitializer(decl) {
   const initializer = unwrapAsExpressions(decl.getInitializer());
-  if (initializer && Node16.isStringLiteral(initializer)) {
+  if (initializer && Node17.isStringLiteral(initializer)) {
     return initializer.getLiteralText();
   }
   return void 0;
@@ -24094,37 +24299,37 @@ function typeAnnotationText(node) {
 function getPropertyInitializer(obj, name) {
   const prop = obj.getProperty(name);
   if (!prop) return void 0;
-  if (Node16.isPropertyAssignment(prop)) {
+  if (Node17.isPropertyAssignment(prop)) {
     return prop.getInitializer();
   }
-  if (Node16.isShorthandPropertyAssignment(prop)) {
+  if (Node17.isShorthandPropertyAssignment(prop)) {
     return prop.getNameNode();
   }
   return void 0;
 }
 function readStringProperty2(obj, name) {
   const init = unwrapAsExpressions(getPropertyInitializer(obj, name));
-  if (init && Node16.isStringLiteral(init)) {
+  if (init && Node17.isStringLiteral(init)) {
     return init.getLiteralText();
   }
   return void 0;
 }
 function readIdentifierProperty(obj, name) {
   const init = unwrapAsExpressions(getPropertyInitializer(obj, name));
-  if (init && Node16.isIdentifier(init)) {
+  if (init && Node17.isIdentifier(init)) {
     return init.getText();
   }
   return void 0;
 }
 function findReturnExpression(fn) {
-  if (!Node16.isArrowFunction(fn) && !Node16.isFunctionDeclaration(fn) && !Node16.isFunctionExpression(fn)) {
+  if (!Node17.isArrowFunction(fn) && !Node17.isFunctionDeclaration(fn) && !Node17.isFunctionExpression(fn)) {
     return void 0;
   }
   const body = fn.getBody();
   if (!body) return void 0;
-  if (Node16.isBlock(body)) {
+  if (Node17.isBlock(body)) {
     for (const stmt of body.getStatements()) {
-      if (Node16.isReturnStatement(stmt)) {
+      if (Node17.isReturnStatement(stmt)) {
         return stmt.getExpression();
       }
     }
@@ -24144,7 +24349,7 @@ function findLocalVariable(sf, name) {
   return void 0;
 }
 function collectTypeofReferences(node, out) {
-  if (Node16.isTypeQuery(node)) {
+  if (Node17.isTypeQuery(node)) {
     out.push(node.getExprName().getText());
     return;
   }
@@ -24346,7 +24551,7 @@ function buildApiFunctionIndex(sources) {
       for (const decl of stmt.getDeclarations()) {
         const initializer = unwrapAsExpressions(decl.getInitializer());
         if (!initializer) continue;
-        if (Node17.isArrowFunction(initializer) || Node17.isFunctionExpression(initializer)) {
+        if (Node18.isArrowFunction(initializer) || Node18.isFunctionExpression(initializer)) {
           map.set(decl.getName(), { node: initializer, sourceFile: sf });
         }
       }
@@ -24359,34 +24564,34 @@ function collectInitializerBindingsFromValue(options) {
   const { node, sf, index, resolved, unresolved, visited } = options;
   const inner = unwrapAsExpressions(node);
   if (!inner) return false;
-  if (Node17.isArrayLiteralExpression(inner)) {
+  if (Node18.isArrayLiteralExpression(inner)) {
     for (const el of inner.getElements()) {
-      if (Node17.isSpreadElement(el)) {
+      if (Node18.isSpreadElement(el)) {
         const spreadInner = el.getExpression();
-        if (Node17.isIdentifier(spreadInner)) {
+        if (Node18.isIdentifier(spreadInner)) {
           collectInitializerBindingsFromIdentifier({ name: spreadInner.getText(), sf, index, resolved, unresolved, visited });
-        } else if (Node17.isCallExpression(spreadInner)) {
+        } else if (Node18.isCallExpression(spreadInner)) {
           const callee = spreadInner.getExpression();
-          if (Node17.isIdentifier(callee)) {
+          if (Node18.isIdentifier(callee)) {
             collectInitializerBindingsFromIdentifier({ name: callee.getText(), sf, index, resolved, unresolved, visited });
           }
         }
         continue;
       }
       const elementInner = unwrapAsExpressions(el);
-      if (elementInner && Node17.isIdentifier(elementInner)) {
+      if (elementInner && Node18.isIdentifier(elementInner)) {
         resolved.push(elementInner.getText());
       }
     }
     return true;
   }
-  if (Node17.isCallExpression(inner)) {
+  if (Node18.isCallExpression(inner)) {
     const callee = inner.getExpression();
-    if (Node17.isIdentifier(callee)) {
+    if (Node18.isIdentifier(callee)) {
       return collectInitializerBindingsFromIdentifier({ name: callee.getText(), sf, index, resolved, unresolved, visited });
     }
   }
-  if (Node17.isIdentifier(inner)) {
+  if (Node18.isIdentifier(inner)) {
     return collectInitializerBindingsFromIdentifier({ name: inner.getText(), sf, index, resolved, unresolved, visited });
   }
   return false;
@@ -24425,15 +24630,15 @@ function collectUploadInitializerArray(options) {
   const { initializerArr, sf, index, direct, spreads, resolved, unresolved } = options;
   const visited = /* @__PURE__ */ new Set();
   for (const el of initializerArr.getElements()) {
-    if (Node17.isSpreadElement(el)) {
+    if (Node18.isSpreadElement(el)) {
       const inner2 = el.getExpression();
-      if (Node17.isIdentifier(inner2)) {
+      if (Node18.isIdentifier(inner2)) {
         const name = inner2.getText();
         spreads.push(name);
         collectInitializerBindingsFromIdentifier({ name, sf, index, resolved, unresolved, visited });
-      } else if (Node17.isCallExpression(inner2)) {
+      } else if (Node18.isCallExpression(inner2)) {
         const callee = inner2.getExpression();
-        if (Node17.isIdentifier(callee)) {
+        if (Node18.isIdentifier(callee)) {
           const name = callee.getText();
           spreads.push(name);
           collectInitializerBindingsFromIdentifier({ name, sf, index, resolved, unresolved, visited });
@@ -24442,7 +24647,7 @@ function collectUploadInitializerArray(options) {
       continue;
     }
     const inner = unwrapAsExpressions(el);
-    if (inner && Node17.isIdentifier(inner)) {
+    if (inner && Node18.isIdentifier(inner)) {
       const name = inner.getText();
       direct.push(name);
       resolved.push(name);
@@ -24455,7 +24660,7 @@ function extractUploadServiceCalls(sources, index) {
     const rel = apiRelPath(sf);
     for (const call of sf.getDescendantsOfKind(SyntaxKind10.CallExpression)) {
       const expr = call.getExpression();
-      if (!Node17.isIdentifier(expr) || expr.getText() !== UPLOAD_SERVICE_FACTORY) continue;
+      if (!Node18.isIdentifier(expr) || expr.getText() !== UPLOAD_SERVICE_FACTORY) continue;
       const args = call.getArguments();
       const first = args[0] ? resolveObjectArg(args[0], sf) : void 0;
       if (!first) continue;
@@ -24483,12 +24688,12 @@ function extractUploadServiceCalls(sources, index) {
 function resolveObjectArg(node, sf) {
   const inner = unwrapAsExpressions(node);
   if (!inner) return void 0;
-  if (Node17.isObjectLiteralExpression(inner)) return inner;
-  if (Node17.isIdentifier(inner)) {
+  if (Node18.isObjectLiteralExpression(inner)) return inner;
+  if (Node18.isIdentifier(inner)) {
     const declNode = findLocalVariable(sf, inner.getText());
     if (declNode) {
       const declInit = unwrapAsExpressions(declNode.getInitializer());
-      if (declInit && Node17.isObjectLiteralExpression(declInit)) {
+      if (declInit && Node18.isObjectLiteralExpression(declInit)) {
         return declInit;
       }
     }
@@ -24498,12 +24703,12 @@ function resolveObjectArg(node, sf) {
 function resolveArrayFromProperty(obj, name, sf) {
   const init = unwrapAsExpressions(getPropertyInitializer(obj, name));
   if (!init) return void 0;
-  if (Node17.isArrayLiteralExpression(init)) return init;
-  if (Node17.isIdentifier(init)) {
+  if (Node18.isArrayLiteralExpression(init)) return init;
+  if (Node18.isIdentifier(init)) {
     const declNode = findLocalVariable(sf, init.getText());
     if (declNode) {
       const declInit = unwrapAsExpressions(declNode.getInitializer());
-      if (declInit && Node17.isArrayLiteralExpression(declInit)) {
+      if (declInit && Node18.isArrayLiteralExpression(declInit)) {
         return declInit;
       }
     }
@@ -24514,11 +24719,11 @@ function enclosingFactoryName(node) {
   let current = node.getParent();
   let result;
   while (current) {
-    if (Node17.isFunctionDeclaration(current)) {
+    if (Node18.isFunctionDeclaration(current)) {
       result = current.getName() ?? void 0;
       break;
     }
-    if (Node17.isVariableDeclaration(current)) {
+    if (Node18.isVariableDeclaration(current)) {
       result = current.getName();
       break;
     }
@@ -24572,10 +24777,10 @@ function extractProcessingConfigFromDecl(decl, rel) {
 function readFlowSubtasks(obj) {
   const flowInit = unwrapAsExpressions(getPropertyInitializer(obj, "flow"));
   const subtasks = [];
-  if (flowInit && Node17.isArrayLiteralExpression(flowInit)) {
+  if (flowInit && Node18.isArrayLiteralExpression(flowInit)) {
     for (const el of flowInit.getElements()) {
       const inner = unwrapAsExpressions(el);
-      if (inner && Node17.isObjectLiteralExpression(inner)) {
+      if (inner && Node18.isObjectLiteralExpression(inner)) {
         const subtask = readIdentifierProperty(inner, "subtask");
         if (subtask) subtasks.push(subtask);
       }
@@ -24589,7 +24794,7 @@ function extractProcessingHandlerCalls(sources) {
     const rel = apiRelPath(sf);
     for (const call of sf.getDescendantsOfKind(SyntaxKind10.CallExpression)) {
       const expr = call.getExpression();
-      if (!Node17.isIdentifier(expr) || expr.getText() !== PROCESSING_HANDLER_FACTORY) continue;
+      if (!Node18.isIdentifier(expr) || expr.getText() !== PROCESSING_HANDLER_FACTORY) continue;
       const args = call.getArguments();
       const first = args[0] ? resolveObjectArg(args[0], sf) : void 0;
       if (!first) continue;
@@ -24610,7 +24815,7 @@ function extractProcessingHandlerCalls(sources) {
 }
 function collectProcessorArrayElements(processorsArr, direct, spreads) {
   for (const el of processorsArr.getElements()) {
-    if (Node17.isSpreadElement(el)) {
+    if (Node18.isSpreadElement(el)) {
       addProcessorIdentifierName(el.getExpression(), spreads);
       continue;
     }
@@ -24622,13 +24827,13 @@ function collectProcessorArrayElements(processorsArr, direct, spreads) {
 }
 function addProcessorIdentifierName(node, bucket) {
   if (!node) return;
-  if (Node17.isIdentifier(node)) {
+  if (Node18.isIdentifier(node)) {
     bucket.push(node.getText());
     return;
   }
-  if (Node17.isCallExpression(node)) {
+  if (Node18.isCallExpression(node)) {
     const callee = node.getExpression();
-    if (Node17.isIdentifier(callee)) {
+    if (Node18.isIdentifier(callee)) {
       bucket.push(callee.getText());
     }
   }
@@ -25620,7 +25825,7 @@ var storageFileMValidateFolderTool = createTwoSideValidateTool({
 });
 
 // packages/dbx-components-mcp/src/tools/notification-m-validate-app/extract.ts
-import { Node as Node18, SyntaxKind as SyntaxKind11 } from "ts-morph";
+import { Node as Node19, SyntaxKind as SyntaxKind11 } from "ts-morph";
 var NOTIF_TEMPLATE_TYPE = "NotificationTemplateType";
 var NOTIF_TEMPLATE_TYPE_INFO = "NotificationTemplateTypeInfo";
 var NOTIF_TEMPLATE_TYPE_INFO_ARRAY = "NotificationTemplateTypeInfo[]";
@@ -25741,7 +25946,7 @@ function extractTemplateInfoAggregates(sources) {
         const ids = [];
         for (const el of arr.getElements()) {
           const inner = unwrapAsExpressions(el);
-          if (inner && Node18.isIdentifier(inner)) {
+          if (inner && Node19.isIdentifier(inner)) {
             ids.push(inner.getText());
           }
         }
@@ -25787,7 +25992,7 @@ function extractTaskAllTypesAggregates(sources) {
         const ids = [];
         for (const el of arr.getElements()) {
           const inner = unwrapAsExpressions(el);
-          if (inner && Node18.isIdentifier(inner)) {
+          if (inner && Node19.isIdentifier(inner)) {
             ids.push(inner.getText());
           }
         }
@@ -25815,14 +26020,14 @@ function extractTaskCheckpointAliases(sources) {
   return out;
 }
 function collectStringLiterals(node, out) {
-  if (Node18.isLiteralTypeNode(node)) {
+  if (Node19.isLiteralTypeNode(node)) {
     const lit = node.getLiteral();
-    if (Node18.isStringLiteral(lit)) {
+    if (Node19.isStringLiteral(lit)) {
       out.push(lit.getLiteralText());
     }
     return;
   }
-  if (Node18.isUnionTypeNode(node)) {
+  if (Node19.isUnionTypeNode(node)) {
     for (const child of node.getTypeNodes()) {
       collectStringLiterals(child, out);
     }
@@ -25876,7 +26081,7 @@ function extractTemplateInfoRecord(sources, index) {
 }
 function tryReadTemplateInfoRecord(decl, rel, index) {
   const initializer = unwrapAsExpressions(decl.getInitializer());
-  if (!initializer || !Node18.isCallExpression(initializer)) return void 0;
+  if (!initializer || !Node19.isCallExpression(initializer)) return void 0;
   if (initializer.getExpression().getText() !== TEMPLATE_INFO_RECORD_FACTORY) return void 0;
   const args = initializer.getArguments();
   const arr = args[0] ? asArrayLiteral(args[0]) : void 0;
@@ -25897,15 +26102,15 @@ function tryReadTemplateInfoRecord(decl, rel, index) {
 }
 function classifyInfoRecordArrayElements(arr, direct, spreads) {
   for (const el of arr.getElements()) {
-    if (Node18.isSpreadElement(el)) {
+    if (Node19.isSpreadElement(el)) {
       const inner2 = el.getExpression();
-      if (Node18.isIdentifier(inner2)) {
+      if (Node19.isIdentifier(inner2)) {
         spreads.push(inner2.getText());
       }
       continue;
     }
     const inner = unwrapAsExpressions(el);
-    if (inner && Node18.isIdentifier(inner)) {
+    if (inner && Node19.isIdentifier(inner)) {
       direct.push(inner.getText());
     }
   }
@@ -25932,7 +26137,7 @@ function extractTemplateInfoRecordWiring(sources) {
       const first = args[0];
       if (!first) continue;
       const inner = unwrapAsExpressions(first);
-      if (!inner || !Node18.isIdentifier(inner)) continue;
+      if (!inner || !Node19.isIdentifier(inner)) continue;
       const result = {
         recordIdentifier: inner.getText(),
         sourceFile: rel
@@ -25970,7 +26175,7 @@ function buildApiFunctionIndex2(sources) {
       for (const decl of stmt.getDeclarations()) {
         const initializer = unwrapAsExpressions(decl.getInitializer());
         if (!initializer) continue;
-        if (Node18.isArrowFunction(initializer) || Node18.isFunctionExpression(initializer)) {
+        if (Node19.isArrowFunction(initializer) || Node19.isFunctionExpression(initializer)) {
           map.set(decl.getName(), { node: initializer, sourceFile: sf, relPath: rel });
         }
       }
@@ -26006,11 +26211,11 @@ function extractTemplateConfigsArrayFactory(sources, index) {
     const arr = returnExpr ? asArrayLiteral(returnExpr) : void 0;
     if (arr) {
       for (const el of arr.getElements()) {
-        if (Node18.isSpreadElement(el)) {
+        if (Node19.isSpreadElement(el)) {
           const inner2 = el.getExpression();
-          if (Node18.isCallExpression(inner2)) {
+          if (Node19.isCallExpression(inner2)) {
             const callee = inner2.getExpression();
-            if (Node18.isIdentifier(callee)) {
+            if (Node19.isIdentifier(callee)) {
               const callName = callee.getText();
               spreadCalls.push(callName);
               if (!index.functionsByName.has(callName)) {
@@ -26021,9 +26226,9 @@ function extractTemplateConfigsArrayFactory(sources, index) {
           continue;
         }
         const inner = unwrapAsExpressions(el);
-        if (inner && Node18.isCallExpression(inner)) {
+        if (inner && Node19.isCallExpression(inner)) {
           const callee = inner.getExpression();
-          if (Node18.isIdentifier(callee)) {
+          if (Node19.isIdentifier(callee)) {
             directCalls.push(callee.getText());
           }
         }
@@ -26072,11 +26277,11 @@ function collectFromArrayEntryFactory(name, out, index) {
   const arr = asArrayLiteral(returnExpr);
   if (!arr) return;
   for (const el of arr.getElements()) {
-    if (Node18.isSpreadElement(el)) {
+    if (Node19.isSpreadElement(el)) {
       const inner2 = el.getExpression();
-      if (Node18.isCallExpression(inner2)) {
+      if (Node19.isCallExpression(inner2)) {
         const callee = inner2.getExpression();
-        if (Node18.isIdentifier(callee)) {
+        if (Node19.isIdentifier(callee)) {
           collectFromArrayEntryFactory(callee.getText(), out, index);
         }
       }
@@ -26084,9 +26289,9 @@ function collectFromArrayEntryFactory(name, out, index) {
     }
     const inner = unwrapAsExpressions(el);
     if (!inner) continue;
-    if (Node18.isCallExpression(inner)) {
+    if (Node19.isCallExpression(inner)) {
       const callee = inner.getExpression();
-      if (Node18.isIdentifier(callee)) {
+      if (Node19.isIdentifier(callee)) {
         collectFromSingleEntryFactory(callee.getText(), out, index);
       }
       continue;
@@ -26106,7 +26311,7 @@ function extractTaskServiceCalls(sources, index, trustedExternal) {
     const rel = apiRelPath(sf);
     for (const call of sf.getDescendantsOfKind(SyntaxKind11.CallExpression)) {
       const expr = call.getExpression();
-      if (!Node18.isIdentifier(expr) || expr.getText() !== TASK_SERVICE_FACTORY) continue;
+      if (!Node19.isIdentifier(expr) || expr.getText() !== TASK_SERVICE_FACTORY) continue;
       const args = call.getArguments();
       const first = args[0] ? asObjectLiteral(args[0]) : void 0;
       if (!first) continue;
@@ -26132,13 +26337,13 @@ function collectValidateArrayElements(validateArr) {
   const spreads = [];
   if (!validateArr) return { ids, spreads };
   for (const el of validateArr.getElements()) {
-    if (Node18.isSpreadElement(el)) {
+    if (Node19.isSpreadElement(el)) {
       const inner2 = el.getExpression();
-      if (Node18.isIdentifier(inner2)) spreads.push(inner2.getText());
+      if (Node19.isIdentifier(inner2)) spreads.push(inner2.getText());
       continue;
     }
     const inner = unwrapAsExpressions(el);
-    if (inner && Node18.isIdentifier(inner)) ids.push(inner.getText());
+    if (inner && Node19.isIdentifier(inner)) ids.push(inner.getText());
   }
   return { ids, spreads };
 }
@@ -26151,17 +26356,17 @@ function collectHandlersArrayElements(options) {
   if (!handlersArr) return { handlerTypes, unresolvedSpreads, resolvedBindings, unresolvedBindings };
   const visited = /* @__PURE__ */ new Set();
   for (const el of handlersArr.getElements()) {
-    if (Node18.isSpreadElement(el)) {
+    if (Node19.isSpreadElement(el)) {
       consumeHandlersSpreadElement({ inner: el.getExpression(), sf, index, trustedExternal, unresolvedSpreads, resolvedBindings, unresolvedBindings, visited });
       continue;
     }
     const inner = unwrapAsExpressions(el);
     if (!inner) continue;
-    if (Node18.isIdentifier(inner)) {
+    if (Node19.isIdentifier(inner)) {
       collectHandlerBindingsFromIdentifier({ name: inner.getText(), sf, index, trustedExternal, resolved: resolvedBindings, unresolved: unresolvedBindings, visited });
-    } else if (Node18.isCallExpression(inner)) {
+    } else if (Node19.isCallExpression(inner)) {
       const callee = inner.getExpression();
-      if (Node18.isIdentifier(callee)) {
+      if (Node19.isIdentifier(callee)) {
         collectHandlerBindingsFromIdentifier({ name: callee.getText(), sf, index, trustedExternal, resolved: resolvedBindings, unresolved: unresolvedBindings, visited });
       }
     }
@@ -26170,16 +26375,16 @@ function collectHandlersArrayElements(options) {
 }
 function consumeHandlersSpreadElement(options) {
   const { inner, sf, index, trustedExternal, unresolvedSpreads, resolvedBindings, unresolvedBindings, visited } = options;
-  if (Node18.isCallExpression(inner)) {
+  if (Node19.isCallExpression(inner)) {
     const callee = inner.getExpression();
-    if (Node18.isIdentifier(callee)) {
+    if (Node19.isIdentifier(callee)) {
       const name = callee.getText();
       unresolvedSpreads.push(name);
       collectHandlerBindingsFromIdentifier({ name, sf, index, trustedExternal, resolved: resolvedBindings, unresolved: unresolvedBindings, visited });
     }
     return;
   }
-  if (Node18.isIdentifier(inner)) {
+  if (Node19.isIdentifier(inner)) {
     const name = inner.getText();
     unresolvedSpreads.push(name);
     collectHandlerBindingsFromIdentifier({ name, sf, index, trustedExternal, resolved: resolvedBindings, unresolved: unresolvedBindings, visited });
@@ -26189,15 +26394,31 @@ function collectHandlerBindingsFromValue(options) {
   const { node, sf, index, trustedExternal, resolved, unresolved, visited } = options;
   const inner = unwrapAsExpressions(node);
   if (!inner) return false;
-  if (Node18.isCallExpression(inner)) {
+  if (Node19.isCallExpression(inner)) {
     const callee = inner.getExpression();
-    if (Node18.isIdentifier(callee)) {
+    if (Node19.isIdentifier(callee)) {
       return collectHandlerBindingsFromIdentifier({ name: callee.getText(), sf, index, trustedExternal, resolved, unresolved, visited });
     }
+    return false;
   }
-  if (Node18.isIdentifier(inner)) {
+  if (Node19.isIdentifier(inner)) {
     return collectHandlerBindingsFromIdentifier({ name: inner.getText(), sf, index, trustedExternal, resolved, unresolved, visited });
   }
+  if (Node19.isArrayLiteralExpression(inner)) {
+    let any = false;
+    for (const el of inner.getElements()) {
+      if (Node19.isSpreadElement(el)) {
+        if (collectHandlerBindingsFromValue({ node: el.getExpression(), sf, index, trustedExternal, resolved, unresolved, visited })) {
+          any = true;
+        }
+        continue;
+      }
+      if (collectHandlerBindingsFromValue({ node: el, sf, index, trustedExternal, resolved, unresolved, visited })) {
+        any = true;
+      }
+    }
+    return any;
+  }
   return false;
 }
 function collectHandlerBindingsFromIdentifier(options) {
@@ -26212,7 +26433,7 @@ function collectHandlerBindingsFromIdentifier(options) {
       const typeText = typeNode ? typeNode.getText() : void 0;
       const isHandlerConfigTyped = typeText !== void 0 && (typeText === NOTIF_TASK_SERVICE_HANDLER_CONFIG || typeText.startsWith(`${NOTIF_TASK_SERVICE_HANDLER_CONFIG}<`));
       const declInit = unwrapAsExpressions(localDecl.getInitializer());
-      const isObjectLit = declInit !== void 0 && Node18.isObjectLiteralExpression(declInit);
+      const isObjectLit = declInit !== void 0 && Node19.isObjectLiteralExpression(declInit);
       if (isHandlerConfigTyped && isObjectLit) {
         resolved.push(localDecl.getName());
         resolvedAny = true;
@@ -26243,12 +26464,12 @@ function collectHandlerBindingsFromIdentifier(options) {
 function resolveArrayFromProperty2(obj, name, sf) {
   const init = unwrapAsExpressions(getPropertyInitializer(obj, name));
   if (!init) return void 0;
-  if (Node18.isArrayLiteralExpression(init)) return init;
-  if (Node18.isIdentifier(init)) {
+  if (Node19.isArrayLiteralExpression(init)) return init;
+  if (Node19.isIdentifier(init)) {
     const declNode = findLocalVariable(sf, init.getText());
     if (declNode) {
       const declInit = unwrapAsExpressions(declNode.getInitializer());
-      if (declInit && Node18.isArrayLiteralExpression(declInit)) {
+      if (declInit && Node19.isArrayLiteralExpression(declInit)) {
         return declInit;
       }
     }
@@ -26269,12 +26490,12 @@ function extractTaskHandlerEntries(sources) {
     if (!typeIdent) return;
     const flowInit = unwrapAsExpressions(getPropertyInitializer(obj, "flow"));
     let flowCount;
-    if (flowInit && Node18.isArrayLiteralExpression(flowInit)) {
+    if (flowInit && Node19.isArrayLiteralExpression(flowInit)) {
       flowCount = flowInit.getElements().length;
     }
     let dataArg;
     let checkpointArg;
-    if (Node18.isTypeReference(typeNode)) {
+    if (Node19.isTypeReference(typeNode)) {
       const tArgs = typeNode.getTypeArguments();
       if (tArgs.length >= 1) dataArg = tArgs[0].getText();
       if (tArgs.length >= 2) checkpointArg = tArgs[1].getText();
@@ -27167,7 +27388,7 @@ async function inspectFolder2(path) {
 }
 
 // packages/dbx-components-mcp/src/tools/system-m-validate-folder/extract.ts
-import { Node as Node19, Project as Project13 } from "ts-morph";
+import { Node as Node20, Project as Project13 } from "ts-morph";
 var TYPE_CONSTANT_SUFFIX = "_SYSTEM_STATE_TYPE";
 var DATA_INTERFACE_SUFFIX = "SystemData";
 var CONVERTER_CONFIG_TYPE = "SystemStateStoredDataFieldConverterConfig";
@@ -27231,7 +27452,7 @@ function findDataInterfaces2(sourceFile) {
   return out;
 }
 function extendsSystemStateStoredData(iface) {
-  if (!Node19.isInterfaceDeclaration(iface)) return false;
+  if (!Node20.isInterfaceDeclaration(iface)) return false;
   for (const clause of iface.getExtends()) {
     const text = clause.getText();
     if (text === SYSTEM_STATE_STORED_DATA || text.startsWith(`${SYSTEM_STATE_STORED_DATA}<`) || text === `${SYSTEM_STATE_STORED_DATA}, ${SYSTEM_STATE_STORED_DATA}`) {
@@ -27251,14 +27472,14 @@ function findConverters2(sourceFile) {
     for (const decl of stmt.getDeclarations()) {
       const typeNode = decl.getTypeNode();
       if (!typeNode) continue;
-      if (!Node19.isTypeReference(typeNode)) continue;
+      if (!Node20.isTypeReference(typeNode)) continue;
       const typeName = typeNode.getTypeName().getText();
       if (typeName !== CONVERTER_CONFIG_TYPE) continue;
       const typeArgs = typeNode.getTypeArguments();
       let dataTypeArgument;
       if (typeArgs.length >= 1) {
         const arg = typeArgs[0];
-        if (Node19.isTypeReference(arg)) {
+        if (Node20.isTypeReference(arg)) {
           dataTypeArgument = arg.getTypeName().getText();
         } else {
           dataTypeArgument = arg.getText();
@@ -27305,19 +27526,19 @@ function collectConverterMapKeys(decl) {
   if (!obj) return [];
   const out = [];
   for (const prop of obj.getProperties()) {
-    if (!Node19.isPropertyAssignment(prop)) continue;
+    if (!Node20.isPropertyAssignment(prop)) continue;
     const nameNode = prop.getNameNode();
     const line = prop.getStartLineNumber();
-    if (Node19.isComputedPropertyName(nameNode)) {
+    if (Node20.isComputedPropertyName(nameNode)) {
       const inner = nameNode.getExpression();
       out.push({ raw: inner.getText(), kind: "identifier", line });
       continue;
     }
-    if (Node19.isStringLiteral(nameNode)) {
+    if (Node20.isStringLiteral(nameNode)) {
       out.push({ raw: nameNode.getLiteralText(), kind: "string", line });
       continue;
     }
-    if (Node19.isIdentifier(nameNode)) {
+    if (Node20.isIdentifier(nameNode)) {
       out.push({ raw: nameNode.getText(), kind: "string", line });
       continue;
     }
@@ -27327,10 +27548,10 @@ function collectConverterMapKeys(decl) {
 }
 function unwrapObjectLiteral(node) {
   let current = node;
-  while (current && Node19.isAsExpression(current)) {
+  while (current && Node20.isAsExpression(current)) {
     current = current.getExpression();
   }
-  if (current && Node19.isObjectLiteralExpression(current)) {
+  if (current && Node20.isObjectLiteralExpression(current)) {
     return current;
   }
   return void 0;
@@ -27364,10 +27585,10 @@ function findLastTopLevelExportLine(sourceFile) {
   return last;
 }
 function isExportedTopLevel(stmt) {
-  if (Node19.isVariableStatement(stmt) || Node19.isFunctionDeclaration(stmt) || Node19.isClassDeclaration(stmt) || Node19.isInterfaceDeclaration(stmt) || Node19.isTypeAliasDeclaration(stmt) || Node19.isEnumDeclaration(stmt)) {
+  if (Node20.isVariableStatement(stmt) || Node20.isFunctionDeclaration(stmt) || Node20.isClassDeclaration(stmt) || Node20.isInterfaceDeclaration(stmt) || Node20.isTypeAliasDeclaration(stmt) || Node20.isEnumDeclaration(stmt)) {
     return stmt.isExported();
   }
-  if (Node19.isExportDeclaration(stmt) || Node19.isExportAssignment(stmt)) {
+  if (Node20.isExportDeclaration(stmt) || Node20.isExportAssignment(stmt)) {
     return true;
   }
   return false;
@@ -27678,7 +27899,7 @@ var systemMValidateFolderTool = createFolderValidateTool({
 });
 
 // packages/dbx-components-mcp/src/tools/dbx-asset-validate-app/extract.ts
-import { Node as Node20, Project as Project14 } from "ts-morph";
+import { Node as Node21, Project as Project14 } from "ts-morph";
 var ASSETS_RELPATH = "src/lib/assets.ts";
 var BARREL_RELPATH = "src/lib/index.ts";
 var LOCAL_ASSET_BUILDER = "localAsset";
@@ -27737,11 +27958,11 @@ function extractFromAssetsSource(ctx, sf) {
       const initializer = unwrapAsExpressions(decl.getInitializer());
       if (!initializer) continue;
       const site = { isExported, symbolName: decl.getName(), line: decl.getStartLineNumber(), rel };
-      if (Node20.isCallExpression(initializer)) {
+      if (Node21.isCallExpression(initializer)) {
         handleCallInitializer(ctx, site, initializer);
         continue;
       }
-      if (isExported && Node20.isArrayLiteralExpression(initializer) && typeAnnotationText(decl) === ASSET_PATH_REF_ARRAY_TYPE) {
+      if (isExported && Node21.isArrayLiteralExpression(initializer) && typeAnnotationText(decl) === ASSET_PATH_REF_ARRAY_TYPE) {
         ctx.aggregatorExports.push({ symbolName: site.symbolName, memberNames: collectArrayIdentifiers(initializer.getElements()), sourceFile: rel, line: site.line });
       }
     }
@@ -27751,7 +27972,7 @@ function collectArrayIdentifiers(elements) {
   const out = [];
   for (const el of elements) {
     const inner = unwrapAsExpressions(el);
-    if (inner && Node20.isIdentifier(inner)) {
+    if (inner && Node21.isIdentifier(inner)) {
       out.push(inner.getText());
     }
   }
@@ -27759,11 +27980,11 @@ function collectArrayIdentifiers(elements) {
 }
 function handleCallInitializer(ctx, site, callExpr) {
   const callee = callExpr.getExpression();
-  if (Node20.isIdentifier(callee)) {
+  if (Node21.isIdentifier(callee)) {
     handleIdentifierCallee({ ctx, site, callExpr, calleeName: callee.getText() });
     return;
   }
-  if (Node20.isPropertyAccessExpression(callee)) {
+  if (Node21.isPropertyAccessExpression(callee)) {
     handleFluentMemberCall(ctx, site, callExpr);
   }
 }
@@ -27821,9 +28042,9 @@ function handleRemoteBaseBuilder(ctx, site, arg) {
 }
 function handleFluentMemberCall(ctx, site, callExpr) {
   const callee = callExpr.getExpression();
-  if (!Node20.isPropertyAccessExpression(callee)) return;
+  if (!Node21.isPropertyAccessExpression(callee)) return;
   const identNode = callee.getExpression();
-  if (!Node20.isIdentifier(identNode)) return;
+  if (!Node21.isIdentifier(identNode)) return;
   const memberName = callee.getName();
   if (memberName !== "asset" && memberName !== "assets") return;
   const builderName = identNode.getText();
@@ -27848,7 +28069,7 @@ function handleFluentMemberCall(ctx, site, callExpr) {
     return;
   }
   const arrayInner = unwrapAsExpressions(args[0]);
-  if (!arrayInner || !Node20.isArrayLiteralExpression(arrayInner)) return;
+  if (!arrayInner || !Node21.isArrayLiteralExpression(arrayInner)) return;
   const resolvedPaths = collectFluentArrayPaths({ elements: arrayInner.getElements(), sourceType, folder, remoteBase });
   if (site.isExported) {
     ctx.assetConstants.push({ symbolName: site.symbolName, sourceType, helper, resolved: void 0, resolvedPaths, sourceFile: site.rel, line: site.line });
@@ -27858,7 +28079,7 @@ function collectFluentArrayPaths(input) {
   const out = [];
   for (const el of input.elements) {
     const inner = unwrapAsExpressions(el);
-    if (inner && Node20.isStringLiteral(inner)) {
+    if (inner && Node21.isStringLiteral(inner)) {
       const joined = joinFluent({ sourceType: input.sourceType, folder: input.folder, remoteBase: input.remoteBase, child: inner.getLiteralText() });
       if (joined !== void 0) out.push(joined);
     }
@@ -27891,7 +28112,7 @@ function readStringArg(call) {
 }
 function readStringArgFromNode(node) {
   const inner = unwrapAsExpressions(node);
-  if (inner && Node20.isStringLiteral(inner)) {
+  if (inner && Node21.isStringLiteral(inner)) {
     return inner.getLiteralText();
   }
   return void 0;
@@ -29260,6 +29481,83 @@ export class EditProfilePageComponent {
   notes: "`dbxActionForm` lives in `@dereekb/dbx-form` \u2014 it is the value provider in this composition. The form's `dbxFormSource` seeds the initial value and the form's modification status feeds `isModified` on the action store."
 };
 
+// packages/dbx-components-mcp/src/tools/data/patterns/actions/action.form-with-secondary.pattern.ts
+var ACTION_PATTERN_FORM_WITH_SECONDARY = {
+  slug: "form-with-secondary",
+  name: "Form submit with secondary action button",
+  summary: "Outer `dbxAction` + `dbxActionForm` drives a primary (Approve) button; a nested `<ng-container dbxAction>` with `dbxActionValue` provides an independent secondary (Deny / Cancel) button that fires a void handler.",
+  usesActionSlugs: ["action", "handler", "value", "button", "error-handler"],
+  snippets: {
+    minimal: `<div dbxAction [dbxActionHandler]="handleApprove">
+  <my-form dbxActionForm></my-form>
+  <dbx-button text="Approve" dbxActionButton></dbx-button>
+  <ng-container dbxAction dbxActionValue [dbxActionHandler]="handleDeny">
+    <dbx-button text="Deny" dbxActionButton></dbx-button>
+  </ng-container>
+</div>`,
+    brief: `<div dbxAction dbxActionSnackbarError [dbxActionHandler]="handleApprove">
+  <my-form dbxActionForm [dbxFormSource]="data$"></my-form>
+  <dbx-button [raised]="true" text="Approve" color="primary" dbxActionButton></dbx-button>
+  <dbx-button-spacer></dbx-button-spacer>
+  <ng-container dbxAction dbxActionSnackbarError dbxActionValue [dbxActionHandler]="handleDeny">
+    <dbx-button [flat]="true" text="Deny" color="warn" dbxActionButton></dbx-button>
+  </ng-container>
+</div>`,
+    full: `import { Component, signal } from '@angular/core';
+import { type WorkUsingContext } from '@dereekb/rxjs';
+
+type ConsentDecision = { readonly outcome: 'approved'; readonly value: ConsentFormValue } | { readonly outcome: 'denied' };
+
+@Component({
+  selector: 'app-consent-page',
+  template: \`
+    <!-- Outer context: form-driven Approve -->
+    <div dbxAction dbxActionSnackbarError [dbxActionHandler]="handleApprove">
+      <my-consent-form dbxActionForm [dbxFormSource]="defaults$"></my-consent-form>
+
+      <div class="dbx-pt3">
+        <dbx-button [raised]="true" text="Approve" color="primary" dbxActionButton></dbx-button>
+        <dbx-button-spacer></dbx-button-spacer>
+
+        <!-- Nested context: void Deny. dbxActionValue with no input -->
+        <!-- supplies the empty payload that lets the button fire. -->
+        <ng-container dbxAction dbxActionSnackbarError dbxActionValue [dbxActionHandler]="handleDeny">
+          <dbx-button [flat]="true" text="Deny" color="warn" dbxActionButton></dbx-button>
+        </ng-container>
+      </div>
+    </div>
+
+    @let decision = lastDecisionSignal();
+    @if (decision) {
+      <div class="dbx-pt3">
+        @if (decision.outcome === 'approved') {
+          <span>Approved with: <strong>{{ decision.value | json }}</strong></span>
+        } @else {
+          <span>Denied.</span>
+        }
+      </div>
+    }
+  \`,
+  standalone: true
+})
+export class ConsentPageComponent {
+  readonly defaults$ = this.store.defaults$;
+  readonly lastDecisionSignal = signal<ConsentDecision | undefined>(undefined);
+
+  readonly handleApprove: WorkUsingContext<ConsentFormValue, ConsentResult> = (value, context) => {
+    this.lastDecisionSignal.set({ outcome: 'approved', value });
+    context.startWorkingWithLoadingStateObservable(this.store.approve(value));
+  };
+
+  readonly handleDeny: WorkUsingContext<void, ConsentResult> = (_, context) => {
+    this.lastDecisionSignal.set({ outcome: 'denied' });
+    context.startWorkingWithLoadingStateObservable(this.store.deny());
+  };
+}`
+  },
+  notes: 'Two non-obvious mechanics: (1) Each `dbxAction` creates its own `ActionContextStore`. `dbxActionButton` and other child directives inject the **nearest ancestor** store via Angular DI, so the inner button picks up the inner context \u2014 not the outer. (2) `dbxActionValue` with no input emits the empty-string sentinel, which `filterMaybe()` lets through, so `readyValue("")` fires immediately when the secondary button triggers; that satisfies `dbxActionButton` without needing a form on the secondary path. Each context can carry its own `dbxActionSnackbarError` so success/error feedback stays scoped per button. This is the canonical OIDC consent shape used in `@dereekb/dbx-firebase` (`oauth.consent.view.component.ts`).'
+};
+
 // packages/dbx-components-mcp/src/tools/data/patterns/actions/action.provide-context-up.pattern.ts
 var ACTION_PATTERN_PROVIDE_CONTEXT_UP = {
   slug: "provide-context-up",
@@ -29369,7 +29667,7 @@ export class TagEditorComponent {
 };
 
 // packages/dbx-components-mcp/src/tools/data/patterns/action-patterns.ts
-var ACTION_EXAMPLE_PATTERNS = [ACTION_PATTERN_BUTTON_CONFIRM_DELETE, ACTION_PATTERN_FORM_SUBMIT, ACTION_PATTERN_AUTO_TRIGGER_ON_MODIFY, ACTION_PATTERN_DISABLED_BY_KEY, ACTION_PATTERN_VALUE_GETTER_ON_TRIGGER, ACTION_PATTERN_PROVIDE_CONTEXT_UP];
+var ACTION_EXAMPLE_PATTERNS = [ACTION_PATTERN_BUTTON_CONFIRM_DELETE, ACTION_PATTERN_FORM_SUBMIT, ACTION_PATTERN_FORM_WITH_SECONDARY, ACTION_PATTERN_AUTO_TRIGGER_ON_MODIFY, ACTION_PATTERN_DISABLED_BY_KEY, ACTION_PATTERN_VALUE_GETTER_ON_TRIGGER, ACTION_PATTERN_PROVIDE_CONTEXT_UP];
 function getActionExamplePattern(slug) {
   const lowered = slug.trim().toLowerCase();
   return ACTION_EXAMPLE_PATTERNS.find((p) => p.slug === lowered);
@@ -29729,7 +30027,7 @@ import { glob as fsGlob5, readFile as readFile18, stat as stat14 } from "node:fs
 import { dirname as dirname13, isAbsolute as isAbsolute13, resolve as resolve34, sep as sep12 } from "node:path";
 
 // packages/dbx-components-mcp/src/tools/route/extract.ts
-import { Node as Node21, Project as Project15, SyntaxKind as SyntaxKind12 } from "ts-morph";
+import { Node as Node22, Project as Project15, SyntaxKind as SyntaxKind12 } from "ts-morph";
 function extractFile3(source) {
   const project = new Project15({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sourceFile = project.createSourceFile(source.name, source.text, { overwrite: true });
@@ -29744,9 +30042,9 @@ function extractFile3(source) {
   }
   for (const arrayLit of findStateArrayLiterals(sourceFile)) {
     for (const element of arrayLit.getElements()) {
-      if (Node21.isObjectLiteralExpression(element)) {
+      if (Node22.isObjectLiteralExpression(element)) {
         addNode({ file: source.name, literal: element, fallbackConstName: void 0, into: collected, issues });
-      } else if (Node21.isIdentifier(element)) {
+      } else if (Node22.isIdentifier(element)) {
         const ref = objectLiteralsByName.get(element.getText());
         if (ref) {
           addNode({ file: source.name, literal: ref.literal, fallbackConstName: element.getText(), into: collected, issues });
@@ -29767,7 +30065,7 @@ function collectStateConsts(sourceFile) {
   for (const stmt of sourceFile.getVariableStatements()) {
     for (const decl of stmt.getDeclarations()) {
       const initializer = decl.getInitializer();
-      if (!initializer || !Node21.isObjectLiteralExpression(initializer)) {
+      if (!initializer || !Node22.isObjectLiteralExpression(initializer)) {
         continue;
       }
       const typeNode = decl.getTypeNode();
@@ -29782,7 +30080,7 @@ function findStateArrayLiterals(sourceFile) {
   for (const stmt of sourceFile.getVariableStatements()) {
     for (const decl of stmt.getDeclarations()) {
       const initializer = decl.getInitializer();
-      if (initializer && Node21.isArrayLiteralExpression(initializer) && declarationIsStateArray(stmt, decl.getName(), initializer)) {
+      if (initializer && Node22.isArrayLiteralExpression(initializer) && declarationIsStateArray(stmt, decl.getName(), initializer)) {
         arrays.push(initializer);
       }
     }
@@ -29796,17 +30094,17 @@ function findStateArrayLiterals(sourceFile) {
       continue;
     }
     for (const arg of call.getArguments()) {
-      if (!Node21.isObjectLiteralExpression(arg)) {
+      if (!Node22.isObjectLiteralExpression(arg)) {
         continue;
       }
       const statesProp = arg.getProperty("states");
-      if (!statesProp || !Node21.isPropertyAssignment(statesProp)) {
+      if (!statesProp || !Node22.isPropertyAssignment(statesProp)) {
         continue;
       }
       const initializer = statesProp.getInitializer();
-      if (initializer && Node21.isArrayLiteralExpression(initializer)) {
+      if (initializer && Node22.isArrayLiteralExpression(initializer)) {
         arrays.push(initializer);
-      } else if (initializer && Node21.isIdentifier(initializer)) {
+      } else if (initializer && Node22.isIdentifier(initializer)) {
         const referenced = findArrayLiteralForIdentifier(sourceFile, initializer);
         if (referenced) {
           arrays.push(referenced);
@@ -29823,10 +30121,10 @@ function declarationIsStateArray(stmt, name, literal) {
     return true;
   }
   for (const element of literal.getElements()) {
-    if (Node21.isObjectLiteralExpression(element) && hasStringNameProperty(element)) {
+    if (Node22.isObjectLiteralExpression(element) && hasStringNameProperty(element)) {
       return true;
     }
-    if (Node21.isIdentifier(element)) {
+    if (Node22.isIdentifier(element)) {
       return true;
     }
   }
@@ -29834,11 +30132,11 @@ function declarationIsStateArray(stmt, name, literal) {
 }
 function hasStringNameProperty(literal) {
   const nameProp = literal.getProperty("name");
-  if (!nameProp || !Node21.isPropertyAssignment(nameProp)) {
+  if (!nameProp || !Node22.isPropertyAssignment(nameProp)) {
     return false;
   }
   const initializer = nameProp.getInitializer();
-  return initializer !== void 0 && (Node21.isStringLiteral(initializer) || Node21.isNoSubstitutionTemplateLiteral(initializer));
+  return initializer !== void 0 && (Node22.isStringLiteral(initializer) || Node22.isNoSubstitutionTemplateLiteral(initializer));
 }
 function findArrayLiteralForIdentifier(sourceFile, identifier) {
   const name = identifier.getText();
@@ -29848,7 +30146,7 @@ function findArrayLiteralForIdentifier(sourceFile, identifier) {
         continue;
       }
       const initializer = decl.getInitializer();
-      if (initializer && Node21.isArrayLiteralExpression(initializer)) {
+      if (initializer && Node22.isArrayLiteralExpression(initializer)) {
         return initializer;
       }
     }
@@ -29898,21 +30196,21 @@ function addNode(options) {
 }
 function stringPropertyValue(literal, key) {
   const prop = literal.getProperty(key);
-  if (!prop || !Node21.isPropertyAssignment(prop)) {
+  if (!prop || !Node22.isPropertyAssignment(prop)) {
     return void 0;
   }
   const initializer = prop.getInitializer();
   if (!initializer) {
     return void 0;
   }
-  if (Node21.isStringLiteral(initializer) || Node21.isNoSubstitutionTemplateLiteral(initializer)) {
+  if (Node22.isStringLiteral(initializer) || Node22.isNoSubstitutionTemplateLiteral(initializer)) {
     return initializer.getLiteralText();
   }
   return void 0;
 }
 function booleanPropertyValue(literal, key) {
   const prop = literal.getProperty(key);
-  if (!prop || !Node21.isPropertyAssignment(prop)) {
+  if (!prop || !Node22.isPropertyAssignment(prop)) {
     return void 0;
   }
   const initializer = prop.getInitializer();
@@ -29929,33 +30227,33 @@ function booleanPropertyValue(literal, key) {
 }
 function identifierPropertyValue(literal, key) {
   const prop = literal.getProperty(key);
-  if (!prop || !Node21.isPropertyAssignment(prop)) {
+  if (!prop || !Node22.isPropertyAssignment(prop)) {
     return void 0;
   }
   const initializer = prop.getInitializer();
   if (!initializer) {
     return void 0;
   }
-  if (Node21.isIdentifier(initializer)) {
+  if (Node22.isIdentifier(initializer)) {
     return initializer.getText();
   }
-  if (Node21.isPropertyAccessExpression(initializer)) {
+  if (Node22.isPropertyAccessExpression(initializer)) {
     return initializer.getText();
   }
   return void 0;
 }
 function objectPropertyKeys(literal, key) {
   const prop = literal.getProperty(key);
-  if (!prop || !Node21.isPropertyAssignment(prop)) {
+  if (!prop || !Node22.isPropertyAssignment(prop)) {
     return [];
   }
   const initializer = prop.getInitializer();
-  if (!initializer || !Node21.isObjectLiteralExpression(initializer)) {
+  if (!initializer || !Node22.isObjectLiteralExpression(initializer)) {
     return [];
   }
   const out = [];
   for (const member of initializer.getProperties()) {
-    if (Node21.isPropertyAssignment(member) || Node21.isShorthandPropertyAssignment(member) || Node21.isMethodDeclaration(member)) {
+    if (Node22.isPropertyAssignment(member) || Node22.isShorthandPropertyAssignment(member) || Node22.isMethodDeclaration(member)) {
       const nameNode = member.getNameNode();
       if (nameNode) {
         out.push(nameNode.getText());
@@ -29966,7 +30264,7 @@ function objectPropertyKeys(literal, key) {
 }
 function collectResolveKeys(literal) {
   const prop = literal.getProperty("resolve");
-  if (!prop || !Node21.isPropertyAssignment(prop)) {
+  if (!prop || !Node22.isPropertyAssignment(prop)) {
     return [];
   }
   const initializer = prop.getInitializer();
@@ -29974,22 +30272,22 @@ function collectResolveKeys(literal) {
     return [];
   }
   const keys = [];
-  if (Node21.isObjectLiteralExpression(initializer)) {
+  if (Node22.isObjectLiteralExpression(initializer)) {
     for (const member of initializer.getProperties()) {
-      if (Node21.isPropertyAssignment(member) || Node21.isShorthandPropertyAssignment(member) || Node21.isMethodDeclaration(member)) {
+      if (Node22.isPropertyAssignment(member) || Node22.isShorthandPropertyAssignment(member) || Node22.isMethodDeclaration(member)) {
         const nameNode = member.getNameNode();
         if (nameNode) {
           keys.push(nameNode.getText());
         }
       }
     }
-  } else if (Node21.isArrayLiteralExpression(initializer)) {
+  } else if (Node22.isArrayLiteralExpression(initializer)) {
     for (const element of initializer.getElements()) {
-      if (Node21.isObjectLiteralExpression(element)) {
+      if (Node22.isObjectLiteralExpression(element)) {
         const tokenProp = element.getProperty("token");
-        if (tokenProp && Node21.isPropertyAssignment(tokenProp)) {
+        if (tokenProp && Node22.isPropertyAssignment(tokenProp)) {
           const tokenInit = tokenProp.getInitializer();
-          if (tokenInit && (Node21.isStringLiteral(tokenInit) || Node21.isIdentifier(tokenInit))) {
+          if (tokenInit && (Node22.isStringLiteral(tokenInit) || Node22.isIdentifier(tokenInit))) {
             keys.push(tokenInit.getText().replaceAll(/^['"]|['"]$/g, ""));
           }
         }
@@ -32058,7 +32356,7 @@ function createSearchModelSnapshotFieldTool(config) {
 import { glob, readFile as readFile19 } from "node:fs/promises";
 import { resolve as resolve35 } from "node:path";
 import { type as type59 } from "arktype";
-import { Node as Node22, Project as Project16 } from "ts-morph";
+import { Node as Node23, Project as Project16 } from "ts-morph";
 var ListAppArgsType2 = type59({
   componentDir: "string",
   "apiDir?": "string",
@@ -32188,7 +32486,7 @@ async function buildListAppReport(input) {
 function findSnapshotConverterCalls(sourceFile) {
   const out = [];
   sourceFile.forEachDescendant((node) => {
-    if (Node22.isCallExpression(node)) {
+    if (Node23.isCallExpression(node)) {
       const expr = node.getExpression();
       const exprText = expr.getText();
       const head = exprText.replace(/<[^>]*>$/, "");
@@ -32203,17 +32501,17 @@ function readFieldsObject(call) {
   const args = call.getArguments();
   if (args.length === 0) return void 0;
   const first = args[0];
-  if (!Node22.isObjectLiteralExpression(first)) return void 0;
+  if (!Node23.isObjectLiteralExpression(first)) return void 0;
   const fieldsProp = first.getProperty("fields");
-  if (fieldsProp === void 0 || !Node22.isPropertyAssignment(fieldsProp)) return void 0;
+  if (fieldsProp === void 0 || !Node23.isPropertyAssignment(fieldsProp)) return void 0;
   const initializer = fieldsProp.getInitializer();
-  if (initializer === void 0 || !Node22.isObjectLiteralExpression(initializer)) return void 0;
+  if (initializer === void 0 || !Node23.isObjectLiteralExpression(initializer)) return void 0;
   return initializer;
 }
 function resolveModelName(call) {
   let current = call.getParent();
   while (current !== void 0) {
-    if (Node22.isVariableDeclaration(current)) {
+    if (Node23.isVariableDeclaration(current)) {
       return current.getName();
     }
     current = current.getParent();
@@ -32223,10 +32521,10 @@ function resolveModelName(call) {
 function extractFieldUsages(fieldsObj, registry) {
   const out = [];
   for (const property of fieldsObj.getProperties()) {
-    if (!Node22.isPropertyAssignment(property) && !Node22.isShorthandPropertyAssignment(property)) continue;
+    if (!Node23.isPropertyAssignment(property) && !Node23.isShorthandPropertyAssignment(property)) continue;
     const fieldName = property.getName();
     let converterText;
-    if (Node22.isShorthandPropertyAssignment(property)) {
+    if (Node23.isShorthandPropertyAssignment(property)) {
       converterText = property.getName();
     } else {
       const initializer = property.getInitializer();
@@ -33749,7 +34047,7 @@ import { type as type64 } from "arktype";
 // packages/dbx-components-mcp/src/tools/model-list-component/extract.ts
 import { readdir as readdir12, readFile as readFile20, stat as stat16 } from "node:fs/promises";
 import { basename as basename6, join as join19, relative as relative11, sep as sep14 } from "node:path";
-import { Node as Node23, Project as Project17 } from "ts-morph";
+import { Node as Node24, Project as Project17 } from "ts-morph";
 var MODEL_SUBPATH3 = "src/lib/model";
 var MODEL_SUBPATH_PREFIX = `${MODEL_SUBPATH3}/`;
 var RESERVED_NAMES = RESERVED_MODEL_FOLDERS.map((r) => r.name);
@@ -33890,7 +34188,7 @@ function findIdentityIn(sourceFile) {
   for (const statement of sourceFile.getVariableStatements()) {
     for (const decl of statement.getDeclarations()) {
       const initializer = decl.getInitializer();
-      if (!initializer || !Node23.isCallExpression(initializer)) continue;
+      if (!initializer || !Node24.isCallExpression(initializer)) continue;
       if (initializer.getExpression().getText() !== "firestoreModelIdentity") continue;
       const args = initializer.getArguments();
       const parsed = parseIdentityArgs2(args);
@@ -33910,13 +34208,13 @@ function parseIdentityArgs2(args) {
     return { parentIdentityRef: void 0, collectionName: stringLiteralValue3(args[0]), collectionPrefix: stringLiteralValue3(args[1]) };
   }
   if (args.length === 3) {
-    const parent = Node23.isIdentifier(args[0]) ? args[0].getText() : void 0;
+    const parent = Node24.isIdentifier(args[0]) ? args[0].getText() : void 0;
     return { parentIdentityRef: parent, collectionName: stringLiteralValue3(args[1]), collectionPrefix: stringLiteralValue3(args[2]) };
   }
   return { parentIdentityRef: void 0, collectionName: void 0, collectionPrefix: void 0 };
 }
 function stringLiteralValue3(node) {
-  if (Node23.isStringLiteral(node) || Node23.isNoSubstitutionTemplateLiteral(node)) {
+  if (Node24.isStringLiteral(node) || Node24.isNoSubstitutionTemplateLiteral(node)) {
     return node.getLiteralText();
   }
   return void 0;
@@ -34078,7 +34376,7 @@ import { type as type65 } from "arktype";
 // packages/dbx-components-mcp/src/tools/server-actions-list-app/extract.ts
 import { readdir as readdir13, readFile as readFile21, stat as stat17 } from "node:fs/promises";
 import { dirname as dirname14, join as join20, relative as relative12, sep as sep15 } from "node:path";
-import { Node as Node24, Project as Project18 } from "ts-morph";
+import { Node as Node25, Project as Project18 } from "ts-morph";
 var ACTION_SERVER_SUFFIX2 = ".action.server.ts";
 var COMMON_MODEL_SUBPATH2 = "src/app/common/model";
 var COMMON_BARREL_REL = "src/app/common/index.ts";
@@ -34215,7 +34513,7 @@ function inspectModuleText(input) {
     for (const decorator of cls.getDecorators()) {
       if (decorator.getName() !== "Module") continue;
       const args = decorator.getArguments();
-      if (args.length === 0 || !Node24.isObjectLiteralExpression(args[0])) continue;
+      if (args.length === 0 || !Node25.isObjectLiteralExpression(args[0])) continue;
       const obj = args[0];
       providedByModule ||= moduleArrayContains(obj, "providers", input.className);
       exportedByModule ||= moduleArrayContains(obj, "exports", input.className);
@@ -34225,16 +34523,16 @@ function inspectModuleText(input) {
 }
 function moduleArrayContains(decoratorArg, propertyName, className) {
   const property = decoratorArg.getProperty(propertyName);
-  if (!property || !Node24.isPropertyAssignment(property)) return false;
+  if (!property || !Node25.isPropertyAssignment(property)) return false;
   const initializer = property.getInitializer();
-  if (!initializer || !Node24.isArrayLiteralExpression(initializer)) return false;
+  if (!initializer || !Node25.isArrayLiteralExpression(initializer)) return false;
   for (const element of initializer.getElements()) {
-    if (Node24.isIdentifier(element) && element.getText() === className) return true;
-    if (Node24.isObjectLiteralExpression(element)) {
+    if (Node25.isIdentifier(element) && element.getText() === className) return true;
+    if (Node25.isObjectLiteralExpression(element)) {
       const provideProp = element.getProperty("provide");
-      if (provideProp && Node24.isPropertyAssignment(provideProp)) {
+      if (provideProp && Node25.isPropertyAssignment(provideProp)) {
         const provideInit = provideProp.getInitializer();
-        if (provideInit && Node24.isIdentifier(provideInit) && provideInit.getText() === className) return true;
+        if (provideInit && Node25.isIdentifier(provideInit) && provideInit.getText() === className) return true;
       }
     }
   }
@@ -34288,11 +34586,11 @@ function collectInterfaceGetters(sourceFile) {
   const out = /* @__PURE__ */ new Map();
   for (const iface of sourceFile.getInterfaces()) {
     for (const member of iface.getMembers()) {
-      if (Node24.isGetAccessorDeclaration(member)) {
+      if (Node25.isGetAccessorDeclaration(member)) {
         out.set(member.getName(), iface.getName());
         continue;
       }
-      if (Node24.isPropertySignature(member)) {
+      if (Node25.isPropertySignature(member)) {
         out.set(member.getName(), iface.getName());
       }
     }
@@ -34304,7 +34602,7 @@ function collectClassGetters(sourceFile) {
   for (const cls of sourceFile.getClasses()) {
     const set = /* @__PURE__ */ new Set();
     for (const member of cls.getMembers()) {
-      if (Node24.isGetAccessorDeclaration(member)) set.add(member.getName());
+      if (Node25.isGetAccessorDeclaration(member)) set.add(member.getName());
     }
     if (set.size > 0) out.set(cls.getName() ?? "<anon>", set);
   }
@@ -34816,7 +35114,7 @@ import { resolve as resolve43 } from "node:path";
 import { type as type67 } from "arktype";
 
 // packages/dbx-components-mcp/src/scan/actions-extract.ts
-import { Node as Node25, SyntaxKind as SyntaxKind13 } from "ts-morph";
+import { Node as Node26, SyntaxKind as SyntaxKind13 } from "ts-morph";
 var ACTION_MARKER = "dbxAction";
 var ACTION_SLUG_TAG = "dbxActionSlug";
 var ACTION_ROLE_TAG = "dbxActionRole";
@@ -35024,7 +35322,7 @@ function filterStates(values) {
 }
 function readEnumMemberLiteral(member) {
   const initializer = member.getInitializer();
-  if (initializer !== void 0 && (Node25.isStringLiteral(initializer) || Node25.isNoSubstitutionTemplateLiteral(initializer))) {
+  if (initializer !== void 0 && (Node26.isStringLiteral(initializer) || Node26.isNoSubstitutionTemplateLiteral(initializer))) {
     return initializer.getLiteralText();
   }
   return member.getName();
@@ -35644,7 +35942,7 @@ import { resolve as resolve45 } from "node:path";
 import { type as type71 } from "arktype";
 
 // packages/dbx-components-mcp/src/scan/pipes-extract.ts
-import { Node as Node26 } from "ts-morph";
+import { Node as Node27 } from "ts-morph";
 var PIPE_MARKER = "dbxPipe";
 var PIPE_SLUG_TAG = "dbxPipeSlug";
 var PIPE_CATEGORY_TAG = "dbxPipeCategory";
@@ -35837,7 +36135,7 @@ function readPipeDecoratorConfig(decorator) {
     return void 0;
   }
   const firstArg = args[0];
-  if (!Node26.isObjectLiteralExpression(firstArg)) {
+  if (!Node27.isObjectLiteralExpression(firstArg)) {
     return void 0;
   }
   const name = readStringProperty(firstArg, "name");
@@ -35850,7 +36148,7 @@ function readPipeDecoratorConfig(decorator) {
 }
 function readBooleanProperty(obj, propName) {
   const prop = obj.getProperty(propName);
-  if (prop === void 0 || !Node26.isPropertyAssignment(prop)) {
+  if (prop === void 0 || !Node27.isPropertyAssignment(prop)) {
     return void 0;
   }
   const initializer = prop.getInitializer();