@dereekb/dbx-components-mcp 14.17.0 → 14.18.0

package/dbx-components-mcp.js

@@ -10,7 +10,7 @@ var __export = (target, all) => {
 // packages/dbx-components-mcp/package.json
 var package_default = {
   name: "@dereekb/dbx-components-mcp",
-  version: "14.17.0",
+  version: "14.18.0",
   sideEffects: false,
   type: "module",
   bin: {
@@ -22,8 +22,8 @@ var package_default = {
     "ts-morph": "^21.0.0"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "14.17.0",
-    "@dereekb/util": "14.17.0"
+    "@dereekb/dbx-cli": "14.18.0",
+    "@dereekb/util": "14.18.0"
   }
 };
 
@@ -29882,8 +29882,135 @@ function readJsDocSummary(node) {
   return result;
 }
 
+// packages/dbx-cli/manifest-extract/src/lib/extract-handler-map.ts
+import { Node as Node24, Project as Project9 } from "ts-morph";
+var CALL_MODEL_HANDLER_MAP_PATH = "src/app/function/model/crud.functions.ts";
+var VERB_TOKENS = [
+  { token: "Create", verb: "create" },
+  { token: "Read", verb: "read" },
+  { token: "Update", verb: "update" },
+  { token: "Delete", verb: "delete" },
+  { token: "Query", verb: "query" },
+  { token: "Invoke", verb: "invoke" }
+];
+var SPECIFIER_HANDLER_CALLEE = "onCallSpecifierHandler";
+var UNRESOLVED_HANDLER_NAME = "(unresolved)";
+function extractCallModelHandlerMapFromSourceFile(sourceFile) {
+  const verbsFound = [];
+  const cells = [];
+  const opaque = [];
+  for (const stmt of sourceFile.getVariableStatements()) {
+    for (const decl of stmt.getDeclarations()) {
+      const verb = matchVerbFromConstName(decl.getName());
+      const initializer = verb ? decl.getInitializer() : void 0;
+      if (verb && initializer) {
+        const mapLiteral = unwrapOuterExpressions(initializer);
+        if (Node24.isObjectLiteralExpression(mapLiteral)) {
+          verbsFound.push(verb);
+          collectVerbMap({ verb, mapLiteral, cells, opaque });
+        } else {
+          opaque.push({ verb, reason: "verb_map_not_literal", line: decl.getStartLineNumber() });
+        }
+      }
+    }
+  }
+  return { verbsFound, cells, opaque };
+}
+function matchVerbFromConstName(name) {
+  let result;
+  for (const { token, verb } of VERB_TOKENS) {
+    if (name.endsWith(`${token}ModelMap`) || name.endsWith(`_${token.toUpperCase()}_MODEL_MAP`)) {
+      result = verb;
+      break;
+    }
+  }
+  return result;
+}
+function collectVerbMap(input) {
+  const { verb, mapLiteral, cells, opaque } = input;
+  for (const prop of mapLiteral.getProperties()) {
+    const line = prop.getStartLineNumber();
+    const model = Node24.isPropertyAssignment(prop) ? readPropertyKey(prop) : void 0;
+    const value = Node24.isPropertyAssignment(prop) ? prop.getInitializer() : void 0;
+    if (Node24.isShorthandPropertyAssignment(prop)) {
+      const name = prop.getName();
+      cells.push({ model: name, verb, handlerName: name, line, reference: prop.getNameNode() });
+    } else if (model !== void 0 && value !== void 0) {
+      collectModelHandler({ verb, model, value, line, cells, opaque });
+    } else {
+      opaque.push({ verb, reason: "verb_map_member", line });
+    }
+  }
+}
+function collectModelHandler(input) {
+  const { verb, model, value, line, cells, opaque } = input;
+  const handler = unwrapOuterExpressions(value);
+  if (Node24.isCallExpression(handler) && handler.getExpression().getText().endsWith(SPECIFIER_HANDLER_CALLEE)) {
+    const firstArg = handler.getArguments().at(0);
+    const config = firstArg ? unwrapOuterExpressions(firstArg) : void 0;
+    if (config && Node24.isObjectLiteralExpression(config)) {
+      collectSpecifierMap({ verb, model, config, line, cells, opaque });
+    } else {
+      opaque.push({ verb, model, reason: "specifier_config_not_literal", line });
+    }
+  } else {
+    const handlerName = readBareHandlerName(handler);
+    if (handlerName) {
+      cells.push({ model, verb, handlerName, line, reference: handler });
+    }
+    if (!Node24.isIdentifier(handler)) {
+      opaque.push({ verb, model, reason: "model_handler_expression", line });
+    }
+  }
+}
+function collectSpecifierMap(input) {
+  const { verb, model, config, line, cells, opaque } = input;
+  for (const prop of config.getProperties()) {
+    const specifier = Node24.isPropertyAssignment(prop) ? readPropertyKey(prop) : void 0;
+    const value = Node24.isPropertyAssignment(prop) ? prop.getInitializer() : void 0;
+    if (Node24.isShorthandPropertyAssignment(prop)) {
+      const name = prop.getName();
+      cells.push({ model, verb, specifier: name, handlerName: name, line, reference: prop.getNameNode() });
+    } else if (specifier !== void 0 && value !== void 0) {
+      const handler = unwrapOuterExpressions(value);
+      cells.push({ model, verb, specifier, handlerName: readBareHandlerName(handler) ?? UNRESOLVED_HANDLER_NAME, line, reference: handler });
+    } else {
+      opaque.push({ verb, model, reason: "specifier_config_member", line: prop.getStartLineNumber() });
+    }
+  }
+}
+function readPropertyKey(prop) {
+  const nameNode = prop.getNameNode();
+  let result;
+  if (Node24.isStringLiteral(nameNode) || Node24.isNoSubstitutionTemplateLiteral(nameNode)) {
+    result = nameNode.getLiteralValue();
+  } else if (!Node24.isComputedPropertyName(nameNode)) {
+    result = nameNode.getText();
+  }
+  return result;
+}
+function readBareHandlerName(node) {
+  let result;
+  if (Node24.isIdentifier(node)) {
+    result = node.getText();
+  } else {
+    const text = node.getText().split(/\s|\(/)[0];
+    if (/^[A-Za-z_]\w*$/.test(text)) {
+      result = text;
+    }
+  }
+  return result;
+}
+function unwrapOuterExpressions(node) {
+  let current = node;
+  while (Node24.isAsExpression(current) || Node24.isSatisfiesExpression(current) || Node24.isTypeAssertion(current) || Node24.isParenthesizedExpression(current) || Node24.isNonNullExpression(current)) {
+    current = current.getExpression();
+  }
+  return current;
+}
+
 // packages/dbx-cli/manifest-extract/src/lib/extract-models.ts
-import { Node as Node24, SyntaxKind as SyntaxKind10, Project as Project9 } from "ts-morph";
+import { Node as Node25, SyntaxKind as SyntaxKind10, Project as Project10 } from "ts-morph";
 var READ_LEVEL_VALUES2 = /* @__PURE__ */ new Set(["system", "owner", "admin-only", "permissions"]);
 var SERVICE_FACTORY_TAG = "dbxModelServiceFactory";
 var MCP_TOOL_NAME_SEGMENT_TAG = "dbxModelMcpToolNameSegment";
@@ -29907,7 +30034,7 @@ var FIELDS_LITERAL_KEY = "fields";
 var OBJECT_FIELD_KEY = "objectField";
 var FIRESTORE_FIELD_KEY = "firestoreField";
 function extractModelsFromSource(input) {
-  const project = new Project9({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project10({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sourceFile = project.createSourceFile(input.name, input.text, { overwrite: true });
   const identities = readIdentities(sourceFile);
   const interfaces = readInterfaces(sourceFile);
@@ -29925,7 +30052,7 @@ function readIdentities(sourceFile) {
     if (!statement.isExported()) continue;
     for (const decl of statement.getDeclarations()) {
       const initializer = decl.getInitializer();
-      if (initializer && Node24.isCallExpression(initializer)) {
+      if (initializer && Node25.isCallExpression(initializer)) {
         if (initializer.getExpression().getText() !== IDENTITY_FN) continue;
         const parsed = parseFirestoreModelIdentityArgs(initializer.getArguments());
         if (parsed) {
@@ -29971,12 +30098,12 @@ function parseDeclaredIdentityType(typeNode) {
 function readNamedTypeNode(typeNode) {
   let result;
   if (typeNode) {
-    if (Node24.isImportTypeNode(typeNode)) {
+    if (Node25.isImportTypeNode(typeNode)) {
       const qualifier = typeNode.getQualifier();
       if (qualifier) {
         result = { typeName: qualifier.getText().split(".").pop() ?? "", args: typeNode.getTypeArguments() };
       }
-    } else if (Node24.isTypeReference(typeNode)) {
+    } else if (Node25.isTypeReference(typeNode)) {
       result = { typeName: typeNode.getTypeName().getText().split(".").pop() ?? "", args: typeNode.getTypeArguments() };
     }
   }
@@ -29984,9 +30111,9 @@ function readNamedTypeNode(typeNode) {
 }
 function readLiteralTypeText(node) {
   let result;
-  if (node && Node24.isLiteralTypeNode(node)) {
+  if (node && Node25.isLiteralTypeNode(node)) {
     const literal = node.getLiteral();
-    if (Node24.isStringLiteral(literal)) {
+    if (Node25.isStringLiteral(literal)) {
       result = literal.getLiteralText();
     }
   }
@@ -30148,22 +30275,22 @@ function readSingleItemCollections(sourceFile) {
 }
 function readCalleeName(call) {
   const expression = call.getExpression();
-  return Node24.isPropertyAccessExpression(expression) ? expression.getName() : expression.getText();
+  return Node25.isPropertyAccessExpression(expression) ? expression.getName() : expression.getText();
 }
 function buildSingleItemCollection(call, root) {
   let result;
   const args = call.getArguments();
   if (args.length > 0) {
     const config = args[0];
-    if (Node24.isObjectLiteralExpression(config)) {
+    if (Node25.isObjectLiteralExpression(config)) {
       const identityNode = readPropertyValue(config, MODEL_IDENTITY_KEY);
-      if (identityNode && Node24.isIdentifier(identityNode)) {
+      if (identityNode && Node25.isIdentifier(identityNode)) {
         const identifierNode = readPropertyValue(config, SINGLE_ITEM_IDENTIFIER_KEY);
         result = {
           identityConst: identityNode.getText(),
           root,
           documentId: readStringLiteralText(identifierNode),
-          documentIdConstRef: identifierNode && Node24.isIdentifier(identifierNode) ? identifierNode.getText() : void 0,
+          documentIdConstRef: identifierNode && Node25.isIdentifier(identifierNode) ? identifierNode.getText() : void 0,
           explicitIdentifier: config.getProperty(SINGLE_ITEM_IDENTIFIER_KEY) !== void 0,
           line: call.getStartLineNumber()
         };
@@ -30187,10 +30314,10 @@ function readStringConstants(sourceFile) {
 }
 function readStringLiteralText(node) {
   let current = node;
-  while (current !== void 0 && Node24.isAsExpression(current)) {
+  while (current !== void 0 && Node25.isAsExpression(current)) {
     current = current.getExpression();
   }
-  return current !== void 0 && (Node24.isStringLiteral(current) || Node24.isNoSubstitutionTemplateLiteral(current)) ? current.getLiteralText() : void 0;
+  return current !== void 0 && (Node25.isStringLiteral(current) || Node25.isNoSubstitutionTemplateLiteral(current)) ? current.getLiteralText() : void 0;
 }
 function readConverters(sourceFile) {
   const out = [];
@@ -30198,7 +30325,7 @@ function readConverters(sourceFile) {
     if (!statement.isExported()) continue;
     for (const decl of statement.getDeclarations()) {
       const initializer = decl.getInitializer();
-      if (!initializer || !Node24.isCallExpression(initializer)) continue;
+      if (!initializer || !Node25.isCallExpression(initializer)) continue;
       const factory = initializer.getExpression().getText();
       if (!isConverterFactoryName(factory)) continue;
       const interfaceName = readGenericInterfaceName(initializer);
@@ -30232,13 +30359,13 @@ function readConverterFields2(call) {
   let result;
   if (args.length > 0) {
     const config = args[0];
-    if (Node24.isObjectLiteralExpression(config)) {
+    if (Node25.isObjectLiteralExpression(config)) {
       let fieldsLiteral;
       if (fnName === SNAPSHOT_FN) {
         fieldsLiteral = readObjectProperty(config, FIELDS_LITERAL_KEY);
       } else {
         const objectField = readPropertyValue(config, OBJECT_FIELD_KEY);
-        if (objectField && Node24.isObjectLiteralExpression(objectField)) {
+        if (objectField && Node25.isObjectLiteralExpression(objectField)) {
           fieldsLiteral = readObjectProperty(objectField, FIELDS_LITERAL_KEY);
         }
       }
@@ -30252,7 +30379,7 @@ function readConverterFields2(call) {
 function readFieldEntries2(fields) {
   const out = [];
   for (const property of fields.getProperties()) {
-    if (Node24.isPropertyAssignment(property)) {
+    if (Node25.isPropertyAssignment(property)) {
       const initializer = property.getInitializer();
       const converterText = initializer ? initializer.getText().replaceAll(/\s+/g, " ").trim() : "";
       const nested = initializer ? readNestedFromExpression(initializer) : void 0;
@@ -30263,7 +30390,7 @@ function readFieldEntries2(fields) {
         nestedConverterInline: nested?.inline,
         nestedIsArray: nested?.isArray
       });
-    } else if (Node24.isShorthandPropertyAssignment(property)) {
+    } else if (Node25.isShorthandPropertyAssignment(property)) {
       const name = property.getName();
       out.push({ key: name, converter: name });
     }
@@ -30272,7 +30399,7 @@ function readFieldEntries2(fields) {
 }
 function readNestedFromExpression(expr) {
   let result;
-  if (Node24.isCallExpression(expr)) {
+  if (Node25.isCallExpression(expr)) {
     const fnName = expr.getExpression().getText();
     if (fnName === SUB_OBJECT_FN || fnName === OBJECT_ARRAY_FN) {
       result = readNestedConverterCall(expr, fnName);
@@ -30285,7 +30412,7 @@ function readNestedConverterCall(call, fnName) {
   const args = call.getArguments();
   if (args.length > 0) {
     const config = args[0];
-    if (Node24.isObjectLiteralExpression(config)) {
+    if (Node25.isObjectLiteralExpression(config)) {
       const valueNode = readPropertyValue(config, OBJECT_FIELD_KEY) ?? readPropertyValue(config, FIRESTORE_FIELD_KEY);
       if (valueNode) {
         result = buildNestedConverterMatch({ objectField: valueNode, call, fnName });
@@ -30298,9 +30425,9 @@ function buildNestedConverterMatch(input) {
   const { objectField, call, fnName } = input;
   const isArray = fnName === OBJECT_ARRAY_FN;
   let result;
-  if (Node24.isIdentifier(objectField)) {
+  if (Node25.isIdentifier(objectField)) {
     result = { ref: objectField.getText(), isArray };
-  } else if (Node24.isObjectLiteralExpression(objectField)) {
+  } else if (Node25.isObjectLiteralExpression(objectField)) {
     const fieldsLiteral = readObjectProperty(objectField, FIELDS_LITERAL_KEY);
     if (fieldsLiteral) {
       result = {
@@ -30314,7 +30441,7 @@ function buildNestedConverterMatch(input) {
         isArray
       };
     }
-  } else if (Node24.isCallExpression(objectField)) {
+  } else if (Node25.isCallExpression(objectField)) {
     const nested = readNestedFromExpression(objectField);
     if (nested) {
       result = { ...nested, isArray };
@@ -30325,16 +30452,16 @@ function buildNestedConverterMatch(input) {
 function readPropertyValue(literal, key) {
   const property = literal.getProperty(key);
   let result;
-  if (property && Node24.isPropertyAssignment(property)) {
+  if (property && Node25.isPropertyAssignment(property)) {
     result = property.getInitializer();
-  } else if (property && Node24.isShorthandPropertyAssignment(property)) {
+  } else if (property && Node25.isShorthandPropertyAssignment(property)) {
     result = property.getNameNode();
   }
   return result;
 }
 function readObjectProperty(literal, key) {
   const value = readPropertyValue(literal, key);
-  return value && Node24.isObjectLiteralExpression(value) ? value : void 0;
+  return value && Node25.isObjectLiteralExpression(value) ? value : void 0;
 }
 function readEnums(sourceFile) {
   const out = [];
@@ -30528,13 +30655,12 @@ async function extractDeclaredEntries(roots) {
 
 // packages/dbx-cli/validate/src/lib/model-api-validate-app/extract-handlers.ts
 import { join as join10 } from "node:path";
-import { Node as Node27 } from "ts-morph";
 
 // packages/dbx-cli/validate/src/lib/_core/_validate/ast.ts
 import { posix as posix2 } from "node:path";
 import {
-  Node as Node25,
-  Project as Project10,
+  Node as Node26,
+  Project as Project11,
   SyntaxKind as SyntaxKind11,
   VariableDeclarationKind
 } from "ts-morph";
@@ -30543,7 +30669,7 @@ var API_VIRTUAL_PREFIX = "__api__/";
 var DEREEKB_MODULE_PREFIX = "@dereekb/";
 // @__NO_SIDE_EFFECTS__
 function buildInMemoryProject(input) {
-  const project = new Project10({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project11({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const componentSources = [];
   const apiSources = [];
   for (const file of input.component.files) {
@@ -30563,35 +30689,35 @@ function componentRelPath(sourceFile) {
 }
 function unwrapAsExpressions(node) {
   let current = node;
-  while (current && Node25.isAsExpression(current)) {
+  while (current && Node26.isAsExpression(current)) {
     current = current.getExpression();
   }
   return current;
 }
-function unwrapOuterExpressions(node) {
+function unwrapOuterExpressions2(node) {
   let current = node;
-  while (current && (Node25.isAsExpression(current) || Node25.isSatisfiesExpression(current) || Node25.isTypeAssertion(current) || Node25.isParenthesizedExpression(current) || Node25.isNonNullExpression(current))) {
+  while (current && (Node26.isAsExpression(current) || Node26.isSatisfiesExpression(current) || Node26.isTypeAssertion(current) || Node26.isParenthesizedExpression(current) || Node26.isNonNullExpression(current))) {
     current = current.getExpression();
   }
   return current;
 }
 function asObjectLiteral(node) {
   const inner = unwrapAsExpressions(node);
-  if (inner && Node25.isObjectLiteralExpression(inner)) {
+  if (inner && Node26.isObjectLiteralExpression(inner)) {
     return inner;
   }
   return void 0;
 }
 function asArrayLiteral(node) {
   const inner = unwrapAsExpressions(node);
-  if (inner && Node25.isArrayLiteralExpression(inner)) {
+  if (inner && Node26.isArrayLiteralExpression(inner)) {
     return inner;
   }
   return void 0;
 }
 function readStringLiteralInitializer(decl) {
   const initializer = unwrapAsExpressions(decl.getInitializer());
-  if (initializer && Node25.isStringLiteral(initializer)) {
+  if (initializer && Node26.isStringLiteral(initializer)) {
     return initializer.getLiteralText();
   }
   return void 0;
@@ -30603,10 +30729,10 @@ function typeAnnotationText(node) {
 function getPropertyInitializer(obj, name) {
   const prop = obj.getProperty(name);
   if (!prop) return void 0;
-  if (Node25.isPropertyAssignment(prop)) {
+  if (Node26.isPropertyAssignment(prop)) {
     return prop.getInitializer();
   }
-  if (Node25.isShorthandPropertyAssignment(prop)) {
+  if (Node26.isShorthandPropertyAssignment(prop)) {
     return prop.getNameNode();
   }
   return void 0;
@@ -30624,28 +30750,28 @@ function readStaticProperty(obj, name) {
   return result;
 }
 function readStaticPropertyName(property) {
-  const nameNode = Node25.isSpreadAssignment(property) ? void 0 : property.getNameNode();
+  const nameNode = Node26.isSpreadAssignment(property) ? void 0 : property.getNameNode();
   let result;
-  if (nameNode && Node25.isIdentifier(nameNode)) {
+  if (nameNode && Node26.isIdentifier(nameNode)) {
     result = nameNode.getText();
-  } else if (nameNode && (Node25.isStringLiteral(nameNode) || Node25.isNoSubstitutionTemplateLiteral(nameNode) || Node25.isNumericLiteral(nameNode))) {
+  } else if (nameNode && (Node26.isStringLiteral(nameNode) || Node26.isNoSubstitutionTemplateLiteral(nameNode) || Node26.isNumericLiteral(nameNode))) {
     result = nameNode.getLiteralText();
   }
   return result;
 }
 function readStaticPropertyValue(property) {
   let result = { kind: "unknown" };
-  if (Node25.isPropertyAssignment(property)) {
+  if (Node26.isPropertyAssignment(property)) {
     const value = property.getInitializer();
     result = value ? { kind: "found", value } : { kind: "unknown" };
-  } else if (Node25.isShorthandPropertyAssignment(property)) {
+  } else if (Node26.isShorthandPropertyAssignment(property)) {
     result = { kind: "found", value: property.getNameNode() };
   }
   return result;
 }
 function readStringProperty2(obj, name) {
   const init = unwrapAsExpressions(getPropertyInitializer(obj, name));
-  if (init && Node25.isStringLiteral(init)) {
+  if (init && Node26.isStringLiteral(init)) {
     return init.getLiteralText();
   }
   return void 0;
@@ -30662,20 +30788,20 @@ function readBooleanProperty2(obj, name) {
 }
 function readIdentifierProperty(obj, name) {
   const init = unwrapAsExpressions(getPropertyInitializer(obj, name));
-  if (init && Node25.isIdentifier(init)) {
+  if (init && Node26.isIdentifier(init)) {
     return init.getText();
   }
   return void 0;
 }
 function findReturnExpression(fn) {
-  if (!Node25.isArrowFunction(fn) && !Node25.isFunctionDeclaration(fn) && !Node25.isFunctionExpression(fn)) {
+  if (!Node26.isArrowFunction(fn) && !Node26.isFunctionDeclaration(fn) && !Node26.isFunctionExpression(fn)) {
     return void 0;
   }
   const body = fn.getBody();
   if (!body) return void 0;
-  if (Node25.isBlock(body)) {
+  if (Node26.isBlock(body)) {
     for (const stmt of body.getStatements()) {
-      if (Node25.isReturnStatement(stmt)) {
+      if (Node26.isReturnStatement(stmt)) {
         return stmt.getExpression();
       }
     }
@@ -30685,9 +30811,9 @@ function findReturnExpression(fn) {
 }
 function findSoleReturnExpression(fn) {
   let result;
-  if (Node25.isArrowFunction(fn) || Node25.isFunctionDeclaration(fn) || Node25.isFunctionExpression(fn)) {
+  if (Node26.isArrowFunction(fn) || Node26.isFunctionDeclaration(fn) || Node26.isFunctionExpression(fn)) {
     const body = fn.getBody();
-    if (Node25.isBlock(body)) {
+    if (Node26.isBlock(body)) {
       const returns = body.getDescendantsOfKind(SyntaxKind11.ReturnStatement).filter((x) => functionScopeOf(x) === fn);
       result = returns.length === 1 && returns[0].getParent() === body ? returns[0].getExpression() : void 0;
     } else {
@@ -30710,9 +30836,9 @@ function findLocalVariable(sf, name) {
 function resolveObjectLiteralArgument(node, sf) {
   const inner = unwrapAsExpressions(node);
   let result;
-  if (inner && Node25.isObjectLiteralExpression(inner)) {
+  if (inner && Node26.isObjectLiteralExpression(inner)) {
     result = inner;
-  } else if (inner && Node25.isIdentifier(inner)) {
+  } else if (inner && Node26.isIdentifier(inner)) {
     result = asObjectLiteral(findLocalVariable(sf, inner.getText())?.getInitializer());
   }
   return result;
@@ -30720,9 +30846,9 @@ function resolveObjectLiteralArgument(node, sf) {
 function resolveArrayLiteralProperty(obj, name, sf) {
   const init = unwrapAsExpressions(getPropertyInitializer(obj, name));
   let result;
-  if (init && Node25.isArrayLiteralExpression(init)) {
+  if (init && Node26.isArrayLiteralExpression(init)) {
     result = init;
-  } else if (init && Node25.isIdentifier(init)) {
+  } else if (init && Node26.isIdentifier(init)) {
     result = asArrayLiteral(findLocalVariable(sf, init.getText())?.getInitializer());
   }
   return result;
@@ -30731,7 +30857,7 @@ function sourceSideOf(sf) {
   return sf.getFilePath().startsWith(`/${COMPONENT_VIRTUAL_PREFIX}`) ? "component" : "api";
 }
 function collectTypeofReferences(node, out) {
-  if (Node25.isTypeQuery(node)) {
+  if (Node26.isTypeQuery(node)) {
     out.push(node.getExprName().getText());
     return;
   }
@@ -30767,14 +30893,14 @@ function readImportedReference(node, imports) {
   const inner = unwrapAsExpressions(node);
   const target = inner ? followLocalConstReference(inner, imports.bindingsByFilePath.get(inner.getSourceFile().getFilePath()), 0) : void 0;
   let result;
-  if (target && Node25.isIdentifier(target)) {
+  if (target && Node26.isIdentifier(target)) {
     const local = target.getText();
     const declaration = target.getSourceFile().getImportDeclarations().find((imp) => !imp.isTypeOnly() && findNamedValueImport(imp, local));
     const specifier = declaration ? findNamedValueImport(declaration, local) : void 0;
     if (declaration && specifier && !isDeclaredValueName(target.getSourceFile(), local)) {
       result = { name: specifier.getName(), moduleSpecifier: declaration.getModuleSpecifierValue(), text: local };
     }
-  } else if (target && Node25.isPropertyAccessExpression(target) && Node25.isIdentifier(target.getExpression())) {
+  } else if (target && Node26.isPropertyAccessExpression(target) && Node26.isIdentifier(target.getExpression())) {
     const ns = target.getExpression().getText();
     const declaration = target.getSourceFile().getImportDeclarations().find((imp) => !imp.isTypeOnly() && imp.getNamespaceImport()?.getText() === ns);
     if (declaration && !isDeclaredValueName(target.getSourceFile(), ns)) {
@@ -30793,27 +30919,27 @@ var MAX_LOCAL_CONST_HOPS = 4;
 function isValueDeclarationName(identifier) {
   const parent = identifier.getParent();
   let result;
-  if (Node25.isModuleDeclaration(parent)) {
+  if (Node26.isModuleDeclaration(parent)) {
     result = true;
   } else {
-    const isNamed = Node25.isVariableDeclaration(parent) || Node25.isParameterDeclaration(parent) || Node25.isBindingElement(parent) || Node25.isFunctionDeclaration(parent) || Node25.isFunctionExpression(parent) || Node25.isClassDeclaration(parent) || Node25.isClassExpression(parent) || Node25.isEnumDeclaration(parent);
+    const isNamed = Node26.isVariableDeclaration(parent) || Node26.isParameterDeclaration(parent) || Node26.isBindingElement(parent) || Node26.isFunctionDeclaration(parent) || Node26.isFunctionExpression(parent) || Node26.isClassDeclaration(parent) || Node26.isClassExpression(parent) || Node26.isEnumDeclaration(parent);
     result = isNamed && parent.getNameNode() === identifier;
   }
   return result;
 }
 function isTypeDeclarationName(identifier) {
   const parent = identifier.getParent();
-  const isNamed = Node25.isTypeParameterDeclaration(parent) || Node25.isTypeAliasDeclaration(parent) || Node25.isInterfaceDeclaration(parent);
+  const isNamed = Node26.isTypeParameterDeclaration(parent) || Node26.isTypeAliasDeclaration(parent) || Node26.isInterfaceDeclaration(parent);
   return isNamed && parent.getNameNode() === identifier;
 }
 function isImportedName(identifier) {
   const parent = identifier.getParent();
   let result = false;
-  if (Node25.isImportSpecifier(parent)) {
+  if (Node26.isImportSpecifier(parent)) {
     result = (parent.getAliasNode() ?? parent.getNameNode()) === identifier;
-  } else if (Node25.isImportClause(parent)) {
+  } else if (Node26.isImportClause(parent)) {
     result = parent.getDefaultImport() === identifier;
-  } else if (Node25.isNamespaceImport(parent) || Node25.isImportEqualsDeclaration(parent)) {
+  } else if (Node26.isNamespaceImport(parent) || Node26.isImportEqualsDeclaration(parent)) {
     result = parent.getNameNode() === identifier;
   }
   return result;
@@ -30821,15 +30947,15 @@ function isImportedName(identifier) {
 function lexicalScopeOf(statement) {
   const holder = statement.getParent();
   let result;
-  if (Node25.isCaseClause(holder) || Node25.isDefaultClause(holder)) {
+  if (Node26.isCaseClause(holder) || Node26.isDefaultClause(holder)) {
     result = holder.getParentOrThrow();
-  } else if (Node25.isBlock(holder) || Node25.isSourceFile(holder) || Node25.isModuleBlock(holder)) {
+  } else if (Node26.isBlock(holder) || Node26.isSourceFile(holder) || Node26.isModuleBlock(holder)) {
     result = holder;
   }
   return result;
 }
 function functionScopeOf(node) {
-  return node.getFirstAncestor((x) => Node25.isFunctionLikeDeclaration(x) || Node25.isFunctionExpression(x)) ?? node.getSourceFile();
+  return node.getFirstAncestor((x) => Node26.isFunctionLikeDeclaration(x) || Node26.isFunctionExpression(x)) ?? node.getSourceFile();
 }
 function isWithinScope(node, scope) {
   return scope.getPos() <= node.getPos() && node.getEnd() <= scope.getEnd();
@@ -30837,25 +30963,25 @@ function isWithinScope(node, scope) {
 function isNamespaceExport(statement) {
   const block = statement.getParent();
   const namespace = block?.getParent();
-  return Node25.isModuleBlock(block) && Node25.isModuleDeclaration(namespace) && (Node25.isExportable(statement) && statement.hasExportKeyword() || namespace.isAmbient());
+  return Node26.isModuleBlock(block) && Node26.isModuleDeclaration(namespace) && (Node26.isExportable(statement) && statement.hasExportKeyword() || namespace.isAmbient());
 }
 function blockingScopeOf(identifier) {
   const declaration = identifier.getParentOrThrow();
   let result;
-  if (Node25.isParameterDeclaration(declaration)) {
+  if (Node26.isParameterDeclaration(declaration)) {
     result = declaration.getParentOrThrow();
-  } else if (Node25.isFunctionExpression(declaration) || Node25.isClassExpression(declaration)) {
+  } else if (Node26.isFunctionExpression(declaration) || Node26.isClassExpression(declaration)) {
     result = declaration;
   } else {
     const ancestors2 = declaration.getAncestors();
-    result = ancestors2.find((x, i) => Node25.isFunctionLikeDeclaration(x) || Node25.isFunctionExpression(x) || Node25.isModuleBlock(x) && !isNamespaceExport(i === 0 ? declaration : ancestors2[i - 1])) ?? declaration.getSourceFile();
+    result = ancestors2.find((x, i) => Node26.isFunctionLikeDeclaration(x) || Node26.isFunctionExpression(x) || Node26.isModuleBlock(x) && !isNamespaceExport(i === 0 ? declaration : ancestors2[i - 1])) ?? declaration.getSourceFile();
   }
   return result;
 }
 function readHeldReference(decl) {
   const initializer = unwrapAsExpressions(decl.getInitializer());
   let result;
-  if (Node25.isIdentifier(initializer) || Node25.isPropertyAccessExpression(initializer) && Node25.isIdentifier(initializer.getExpression())) {
+  if (Node26.isIdentifier(initializer) || Node26.isPropertyAccessExpression(initializer) && Node26.isIdentifier(initializer.getExpression())) {
     result = initializer;
   }
   return result;
@@ -30865,7 +30991,7 @@ function readConstBinding(decl) {
   const scope = statement?.getDeclarationKind() === VariableDeclarationKind.Const && !isNamespaceExport(statement) ? lexicalScopeOf(statement) : void 0;
   const reference = readHeldReference(decl);
   let result;
-  if (scope && Node25.isIdentifier(decl.getNameNode()) && reference) {
+  if (scope && Node26.isIdentifier(decl.getNameNode()) && reference) {
     result = { scope, reference };
   }
   return result;
@@ -30936,13 +31062,13 @@ function readLocalValueBindings(sf) {
     } else if (statement) {
       scope = lexicalScopeOf(statement);
     }
-    if (scope && Node25.isIdentifier(decl.getNameNode())) {
+    if (scope && Node26.isIdentifier(decl.getNameNode())) {
       add(decl.getName(), decl, scope);
     }
   }
   for (const { name, declaration } of readModuleValueDeclarations(sf)) {
     add(name, declaration, sf);
-    for (const overload of Node25.isFunctionDeclaration(declaration) ? declaration.getOverloads() : []) {
+    for (const overload of Node26.isFunctionDeclaration(declaration) ? declaration.getOverloads() : []) {
       declarations.add(overload);
     }
   }
@@ -30994,18 +31120,18 @@ function readCalleeName2(call, imports) {
   const bindings = imports.bindingsByFilePath.get(call.getSourceFile().getFilePath());
   const target = followLocalConstReference(call.getExpression(), bindings, 0);
   let result;
-  if (Node25.isIdentifier(target)) {
+  if (Node26.isIdentifier(target)) {
     result = findVisibleBinding(target, bindings, "value")?.exportedName ?? target.getText();
-  } else if (Node25.isPropertyAccessExpression(target)) {
+  } else if (Node26.isPropertyAccessExpression(target)) {
     const ns = target.getExpression();
-    if (Node25.isIdentifier(ns) && findVisibleBinding(ns, bindings, "value")?.namespace) {
+    if (Node26.isIdentifier(ns) && findVisibleBinding(ns, bindings, "value")?.namespace) {
       result = target.getName();
     }
   }
   return result;
 }
 function followLocalConstReference(node, bindings, hops) {
-  const reference = Node25.isIdentifier(node) && hops < MAX_LOCAL_CONST_HOPS ? findVisibleBinding(node, bindings, "value")?.reference : void 0;
+  const reference = Node26.isIdentifier(node) && hops < MAX_LOCAL_CONST_HOPS ? findVisibleBinding(node, bindings, "value")?.reference : void 0;
   return reference ? followLocalConstReference(reference, bindings, hops + 1) : node;
 }
 function findVisibleBinding(identifier, bindings, space) {
@@ -31023,11 +31149,11 @@ function resolveLocalValue(reference, imports) {
   let result;
   if (visible.length > 1) {
     result = { kind: "ambiguous" };
-  } else if (Node25.isVariableDeclaration(declaration)) {
+  } else if (Node26.isVariableDeclaration(declaration)) {
     result = { kind: "variable", declaration };
-  } else if (Node25.isFunctionDeclaration(declaration)) {
+  } else if (Node26.isFunctionDeclaration(declaration)) {
     result = { kind: "function", declaration };
-  } else if (Node25.isImportSpecifier(declaration) || Node25.isImportClause(declaration)) {
+  } else if (Node26.isImportSpecifier(declaration) || Node26.isImportClause(declaration)) {
     result = { kind: "import", declaration };
   } else {
     result = { kind: "none" };
@@ -31035,29 +31161,29 @@ function resolveLocalValue(reference, imports) {
   return result;
 }
 function resolveLocalObjectLiteral(node, imports) {
-  const inner = unwrapOuterExpressions(node);
+  const inner = unwrapOuterExpressions2(node);
   let result;
-  if (inner && Node25.isObjectLiteralExpression(inner)) {
+  if (inner && Node26.isObjectLiteralExpression(inner)) {
     result = inner;
-  } else if (inner && Node25.isIdentifier(inner)) {
+  } else if (inner && Node26.isIdentifier(inner)) {
     const binding = resolveLocalVariable(inner, imports);
     if (binding.kind === "variable" && binding.declaration.getVariableStatement()?.getDeclarationKind() === VariableDeclarationKind.Const) {
-      const initializer = unwrapOuterExpressions(binding.declaration.getInitializer());
-      result = initializer && Node25.isObjectLiteralExpression(initializer) ? initializer : void 0;
+      const initializer = unwrapOuterExpressions2(binding.declaration.getInitializer());
+      result = initializer && Node26.isObjectLiteralExpression(initializer) ? initializer : void 0;
     }
   }
   return result;
 }
 function readTypeReferenceName(node, imports) {
   let result;
-  if (node && Node25.isTypeReference(node)) {
+  if (node && Node26.isTypeReference(node)) {
     const bindings = imports.bindingsByFilePath.get(node.getSourceFile().getFilePath());
     const typeName = node.getTypeName();
-    if (Node25.isIdentifier(typeName)) {
+    if (Node26.isIdentifier(typeName)) {
       result = findVisibleBinding(typeName, bindings, "type")?.exportedName ?? typeName.getText();
     } else {
       const left = typeName.getLeft();
-      if (Node25.isIdentifier(left) && findVisibleBinding(left, bindings, "type")?.namespace) {
+      if (Node26.isIdentifier(left) && findVisibleBinding(left, bindings, "type")?.namespace) {
         result = typeName.getRight().getText();
       }
     }
@@ -31066,14 +31192,14 @@ function readTypeReferenceName(node, imports) {
 }
 var ARRAY_TYPE_NAMES = /* @__PURE__ */ new Set(["Array", "ReadonlyArray"]);
 function readArrayElementTypeNode(node) {
-  const inner = node && Node25.isTypeOperatorTypeNode(node) && node.getOperator() === SyntaxKind11.ReadonlyKeyword ? node.getTypeNode() : node;
+  const inner = node && Node26.isTypeOperatorTypeNode(node) && node.getOperator() === SyntaxKind11.ReadonlyKeyword ? node.getTypeNode() : node;
   let result;
-  if (inner && Node25.isArrayTypeNode(inner)) {
+  if (inner && Node26.isArrayTypeNode(inner)) {
     result = inner.getElementTypeNode();
-  } else if (inner && Node25.isTypeReference(inner)) {
+  } else if (inner && Node26.isTypeReference(inner)) {
     const typeName = inner.getTypeName();
     const typeArguments = inner.getTypeArguments();
-    if (Node25.isIdentifier(typeName) && ARRAY_TYPE_NAMES.has(typeName.getText()) && typeArguments.length === 1) {
+    if (Node26.isIdentifier(typeName) && ARRAY_TYPE_NAMES.has(typeName.getText()) && typeArguments.length === 1) {
       result = typeArguments[0];
     }
   }
@@ -31102,7 +31228,7 @@ function readOwnExportedDeclarations(sf) {
     }
   }
   for (const stmt of sf.getVariableStatements()) {
-    for (const decl of stmt.getDeclarations().filter((x) => Node25.isIdentifier(x.getNameNode()))) {
+    for (const decl of stmt.getDeclarations().filter((x) => Node26.isIdentifier(x.getNameNode()))) {
       locals.set(decl.getName(), decl);
       if (stmt.hasExportKeyword()) {
         exportedLocals.set(decl.getName(), decl.getName());
@@ -31212,7 +31338,7 @@ function isCollectableTsFile(entry) {
 }
 
 // packages/dbx-cli/validate/src/lib/model-api-validate-app/extract-handler-mcp.ts
-import { Node as Node26, SyntaxKind as SyntaxKind12, VariableDeclarationKind as VariableDeclarationKind2 } from "ts-morph";
+import { Node as Node27, SyntaxKind as SyntaxKind12, VariableDeclarationKind as VariableDeclarationKind2 } from "ts-morph";
 var API_DETAILS_FACTORY_NAME = "withApiDetails";
 var MAX_HANDLER_HOPS = 4;
 var MAX_REASON_SNIPPET_LENGTH = 60;
@@ -31229,7 +31355,7 @@ function buildHandlerMcpReadOnlyContext(input) {
   return result;
 }
 function readHandlerMcpReadOnly(reference, context) {
-  const followed = followHandlerReference(unwrapOuterExpressions(reference), context, 0);
+  const followed = followHandlerReference(unwrapOuterExpressions2(reference), context, 0);
   return followed.kind === "declaration" ? readDeclarationMcpReadOnly(followed.declaration, context) : followed.status;
 }
 function unresolved(reason, declarationSource) {
@@ -31249,7 +31375,7 @@ function followHandlerReference(reference, context, hops) {
   let result;
   if (hops > MAX_HANDLER_HOPS) {
     result = stopAt(unresolved(`the scan stopped after ${MAX_HANDLER_HOPS} alias / import / re-export hops`));
-  } else if (Node26.isIdentifier(reference)) {
+  } else if (Node27.isIdentifier(reference)) {
     context.ensure(reference.getSourceFile());
     const binding = resolveLocalValue(reference, context.imports);
     const name = reference.getText();
@@ -31276,11 +31402,11 @@ function followHandlerReference(reference, context, hops) {
   return result;
 }
 function followVariableDeclaration(declaration, context, hops) {
-  const initializer = unwrapOuterExpressions(declaration.getInitializer());
+  const initializer = unwrapOuterExpressions2(declaration.getInitializer());
   let result;
   if (declaration.getVariableStatement()?.getDeclarationKind() !== VariableDeclarationKind2.Const) {
     result = stopAt(unresolved(`\`${declaration.getName()}\` is not declared with \`const\``, citeDeclaration(declaration, context)));
-  } else if (initializer && Node26.isIdentifier(initializer)) {
+  } else if (initializer && Node27.isIdentifier(initializer)) {
     result = followHandlerReference(initializer, context, hops + 1);
   } else {
     result = { kind: "declaration", declaration };
@@ -31290,7 +31416,7 @@ function followVariableDeclaration(declaration, context, hops) {
 function followImport(binding, context, hops) {
   const importDeclaration = binding.getFirstAncestorByKindOrThrow(SyntaxKind12.ImportDeclaration);
   const moduleSpecifier = importDeclaration.getModuleSpecifierValue();
-  const exportedName = Node26.isImportSpecifier(binding) ? binding.getName() : "default";
+  const exportedName = Node27.isImportSpecifier(binding) ? binding.getName() : "default";
   let result;
   if (isDereekbModuleSpecifier(moduleSpecifier)) {
     result = stopAt(unresolved(`imported from \`${moduleSpecifier}\``));
@@ -31323,7 +31449,7 @@ function followExport(input, context) {
     result = stopAt(unresolved(`the scan stopped after ${MAX_HANDLER_HOPS} alias / import / re-export hops`));
   } else if (own === void 0) {
     result = followReExport(input, context);
-  } else if (Node26.isFunctionDeclaration(own)) {
+  } else if (Node27.isFunctionDeclaration(own)) {
     result = stopAt({ kind: "noApiDetails", declarationSource: citeDeclaration(own, context) });
   } else {
     result = followVariableDeclaration(own, context, hops);
@@ -31381,13 +31507,13 @@ function followStarExports(input, starExports, context) {
 }
 function readDeclarationMcpReadOnly(declaration, context) {
   const declarationSource = citeDeclaration(declaration, context);
-  const initializer = unwrapOuterExpressions(declaration.getInitializer());
+  const initializer = unwrapOuterExpressions2(declaration.getInitializer());
   let result;
   if (initializer === void 0) {
     result = unresolved(`\`${declaration.getName()}\` has no initializer`, declarationSource);
-  } else if (Node26.isArrowFunction(initializer) || Node26.isFunctionExpression(initializer)) {
+  } else if (Node27.isArrowFunction(initializer) || Node27.isFunctionExpression(initializer)) {
     result = { kind: "noApiDetails", declarationSource };
-  } else if (Node26.isCallExpression(initializer)) {
+  } else if (Node27.isCallExpression(initializer)) {
     context.ensure(initializer.getSourceFile());
     const callee = readCalleeName2(initializer, context.imports);
     if (callee === API_DETAILS_FACTORY_NAME) {
@@ -31427,7 +31553,7 @@ function readMcpBlockReadOnly(mcpBlock, declarationSource) {
   return result;
 }
 function readBooleanLiteral(node) {
-  const kind = unwrapOuterExpressions(node).getKind();
+  const kind = unwrapOuterExpressions2(node).getKind();
   let result;
   if (kind === SyntaxKind12.TrueKeyword) {
     result = true;
@@ -31437,8 +31563,8 @@ function readBooleanLiteral(node) {
   return result;
 }
 function isUndefinedValue(node) {
-  const inner = unwrapOuterExpressions(node);
-  return Node26.isIdentifier(inner) && inner.getText() === "undefined" || Node26.isVoidExpression(inner);
+  const inner = unwrapOuterExpressions2(node);
+  return Node27.isIdentifier(inner) && inner.getText() === "undefined" || Node27.isVoidExpression(inner);
 }
 
 // packages/dbx-cli/validate/src/lib/model-api-validate-app/mcp-read-only.ts
@@ -31468,30 +31594,21 @@ function checkHandlerMcpReadOnly(handler) {
 }
 
 // packages/dbx-cli/validate/src/lib/model-api-validate-app/extract-handlers.ts
-var HANDLER_MAP_REL = "src/app/function/model/crud.functions.ts";
 var FUNCTION_DIR_REL = "src/app/function";
-var VERB_TOKENS = [
-  { token: "Create", verb: "create" },
-  { token: "Read", verb: "read" },
-  { token: "Update", verb: "update" },
-  { token: "Delete", verb: "delete" },
-  { token: "Query", verb: "query" },
-  { token: "Invoke", verb: "invoke" }
-];
 async function extractHandlerEntries(apiAbs, apiDir) {
   const files = await collectTsFiles(join10(apiAbs, FUNCTION_DIR_REL), apiAbs);
   return extractHandlerEntriesFromFiles({ files, apiAbs, apiDir });
 }
 function extractHandlerEntriesFromFiles(input) {
   const { files, apiAbs, apiDir } = input;
-  const fullPath = join10(apiAbs, HANDLER_MAP_REL);
+  const fullPath = join10(apiAbs, CALL_MODEL_HANDLER_MAP_PATH);
   const { apiSources } = buildInMemoryProject({ component: { files: [] }, api: { files } });
-  const sourceFile = apiSources.find((x) => apiRelPath(x) === HANDLER_MAP_REL);
+  const sourceFile = apiSources.find((x) => apiRelPath(x) === CALL_MODEL_HANDLER_MAP_PATH);
   let result;
   if (sourceFile === void 0) {
-    result = { path: fullPath, status: { kind: "missing", path: HANDLER_MAP_REL }, entries: [] };
+    result = { path: fullPath, status: { kind: "missing", path: CALL_MODEL_HANDLER_MAP_PATH }, entries: [] };
   } else {
-    const { handlers, verbsFound } = collectHandlerMap(sourceFile, `${apiDir}/${HANDLER_MAP_REL}`);
+    const { handlers, verbsFound } = collectHandlerMap(sourceFile, `${apiDir}/${CALL_MODEL_HANDLER_MAP_PATH}`);
     const context = buildHandlerMcpReadOnlyContext({ sources: apiSources, apiDir });
     const entries = handlers.map(({ entry, reference }) => isMcpReadOnlyInferredVerb(entry.verb) ? entry : { ...entry, mcpReadOnly: readHandlerMcpReadOnly(reference, context) });
     result = { path: fullPath, status: { kind: "ok", verbsFound }, entries };
@@ -31499,75 +31616,10 @@ function extractHandlerEntriesFromFiles(input) {
   return result;
 }
 function collectHandlerMap(sourceFile, sourceFileRel) {
-  const handlers = [];
-  const verbsFound = [];
-  for (const stmt of sourceFile.getVariableStatements()) {
-    for (const decl of stmt.getDeclarations()) {
-      const name = decl.getName();
-      const verb = matchVerbFromConstName(name);
-      if (!verb) continue;
-      const initializer = decl.getInitializer();
-      if (!initializer || !Node27.isObjectLiteralExpression(initializer)) continue;
-      verbsFound.push(verb);
-      collectVerbMap({ verb, mapLiteral: initializer, sourceFileRel, handlers });
-    }
-  }
+  const { cells, verbsFound } = extractCallModelHandlerMapFromSourceFile(sourceFile);
+  const handlers = cells.map(({ reference, ...cell }) => ({ entry: { model: cell.model, verb: cell.verb, specifier: cell.specifier, handlerName: cell.handlerName, sourceFile: sourceFileRel, line: cell.line }, reference }));
   return { handlers, verbsFound };
 }
-function matchVerbFromConstName(name) {
-  for (const { token, verb } of VERB_TOKENS) {
-    if (name.endsWith(`${token}ModelMap`) || name.endsWith(`_${token.toUpperCase()}_MODEL_MAP`)) {
-      return verb;
-    }
-  }
-  return void 0;
-}
-function collectVerbMap(input) {
-  const { verb, mapLiteral, sourceFileRel, handlers } = input;
-  for (const prop of mapLiteral.getProperties()) {
-    if (!Node27.isPropertyAssignment(prop)) continue;
-    const model = prop.getName();
-    const value = prop.getInitializer();
-    if (!value) continue;
-    const line = prop.getStartLineNumber();
-    const specifierMap = readSpecifierHandler(value);
-    if (specifierMap) {
-      for (const [specifier, { handlerName: handlerName2, reference }] of specifierMap) {
-        handlers.push({ entry: { model, verb, specifier, handlerName: handlerName2, sourceFile: sourceFileRel, line }, reference });
-      }
-      continue;
-    }
-    const handlerName = readBareHandlerName(value);
-    if (handlerName) {
-      handlers.push({ entry: { model, verb, specifier: void 0, handlerName, sourceFile: sourceFileRel, line }, reference: unwrapOuterExpressions(value) });
-    }
-  }
-}
-function readSpecifierHandler(node) {
-  if (!Node27.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 (!Node27.isObjectLiteralExpression(firstArg)) return void 0;
-  const out = /* @__PURE__ */ new Map();
-  for (const prop of firstArg.getProperties()) {
-    if (Node27.isPropertyAssignment(prop)) {
-      const value = prop.getInitializerOrThrow();
-      out.set(prop.getName(), { handlerName: readBareHandlerName(value) ?? "(unresolved)", reference: unwrapOuterExpressions(value) });
-    } else if (Node27.isShorthandPropertyAssignment(prop)) {
-      out.set(prop.getName(), { handlerName: prop.getName(), reference: prop.getNameNode() });
-    }
-  }
-  return out;
-}
-function readBareHandlerName(node) {
-  if (Node27.isIdentifier(node)) return node.getText();
-  const text = node.getText().split(/\s|\(/)[0];
-  if (/^[A-Za-z_]\w*$/.test(text)) return text;
-  return void 0;
-}
 
 // packages/dbx-cli/validate/src/lib/model-api-validate-app/naming.ts
 function expectedHandlerNames(model, verb, specifier) {
@@ -32166,7 +32218,7 @@ __export(dbx_asset_validate_app_exports, {
 });
 
 // packages/dbx-cli/validate/src/lib/dbx-asset-validate-app/extract.ts
-import { Node as Node28, Project as Project11 } from "ts-morph";
+import { Node as Node28, Project as Project12 } from "ts-morph";
 var ASSETS_RELPATH = "src/lib/assets.ts";
 var BARREL_RELPATH = "src/lib/index.ts";
 var LOCAL_ASSET_BUILDER = "localAsset";
@@ -32178,7 +32230,7 @@ var KNOWN_FLUENT_BUILDERS = /* @__PURE__ */ new Set([ASSET_FOLDER_BUILDER, REMOT
 var ASSET_PATH_REF_ARRAY_TYPE = "AssetPathRef[]";
 var BARREL_RE_EXPORT_RE = /export\s*\*\s*from\s*['"]\.\/assets['"]/;
 function extractAppAssets(inspection) {
-  const project = new Project11({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project12({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sources = [];
   let assetsFileExists = false;
   let barrelText;
@@ -34381,10 +34433,10 @@ function collectHandlersArrayElements(options) {
 }
 function consumeHandlersArrayElement(el, options) {
   if (Node32.isSpreadElement(el)) {
-    consumeHandlersSpreadElement({ ...options, inner: unwrapOuterExpressions(el.getExpression()) });
+    consumeHandlersSpreadElement({ ...options, inner: unwrapOuterExpressions2(el.getExpression()) });
     return;
   }
-  const inner = unwrapOuterExpressions(el);
+  const inner = unwrapOuterExpressions2(el);
   if (noteUpstreamHandlerCall(inner, options)) return;
   const identifier = readHandlerEntryIdentifier(inner);
   if (identifier === void 0) {
@@ -34422,7 +34474,7 @@ function consumeHandlersSpreadElement(options) {
   collectHandlerBindingsFromIdentifier({ identifier, index, trustedExternal, imports, resolved: resolvedBindings, unresolved: unresolvedBindings, reachedUpstreamHandlerCalls, reachedTaskHandlerEntries, opaqueHandlerValues, outcomes });
 }
 function collectHandlerBindingsFromValue(options) {
-  const inner = unwrapOuterExpressions(options.node);
+  const inner = unwrapOuterExpressions2(options.node);
   let result = false;
   if (inner) {
     if (Node32.isCallExpression(inner)) {
@@ -34493,7 +34545,7 @@ function tryResolveLocalHandlerBinding(options) {
   } else if (resolution.kind === "variable") {
     const { declaration } = resolution;
     const walk4 = () => {
-      const init = unwrapOuterExpressions(declaration.getInitializer());
+      const init = unwrapOuterExpressions2(declaration.getInitializer());
       let walked;
       if (isHandlerConfigLeafDecl(declaration, imports)) {
         resolved.push(declaration.getName());
@@ -34514,7 +34566,7 @@ function tryResolveLocalHandlerBinding(options) {
   return result;
 }
 function isHandlerConfigLeafDecl(decl, imports) {
-  const declInit = unwrapOuterExpressions(decl.getInitializer());
+  const declInit = unwrapOuterExpressions2(decl.getInitializer());
   return readTypeReferenceName(decl.getTypeNode(), imports) === NOTIF_TASK_SERVICE_HANDLER_CONFIG && declInit !== void 0 && Node32.isObjectLiteralExpression(declInit);
 }
 function tryResolveFunctionHandlerBinding(options) {
@@ -36615,14 +36667,14 @@ async function tryReadSystemSource(path) {
 }
 
 // packages/dbx-cli/validate/src/lib/system-m-validate-folder/extract.ts
-import { Node as Node34, Project as Project12 } from "ts-morph";
+import { Node as Node34, Project as Project13 } from "ts-morph";
 var TYPE_CONSTANT_SUFFIX = "_SYSTEM_STATE_TYPE";
 var DATA_INTERFACE_SUFFIX = "SystemData";
 var CONVERTER_CONFIG_TYPE = "SystemStateStoredDataFieldConverterConfig";
 var CONVERTER_MAP_TYPE = "SystemStateStoredDataConverterMap";
 var SYSTEM_STATE_STORED_DATA = "SystemStateStoredData";
 function extractSystemFile(name, text) {
-  const project = new Project12({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project13({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sourceFile = project.createSourceFile(name, text, { overwrite: true });
   const typeConstants = findTypeConstants(sourceFile);
   const dataInterfaces = findDataInterfaces2(sourceFile);
@@ -37452,7 +37504,7 @@ function toPosix2(p) {
 }
 
 // packages/dbx-cli/model-test/src/lib/test/extract.ts
-import { Node as Node35, Project as Project13, SyntaxKind as SyntaxKind18 } from "ts-morph";
+import { Node as Node35, Project as Project14, SyntaxKind as SyntaxKind18 } from "ts-morph";
 var SPEC_FILE_VIRTUAL_PATH = "__spec__/spec.ts";
 var FIXTURE_CONTEXT_SUFFIX = "Context";
 var FIXTURE_FACTORY_SUFFIX = "ContextFactory";
@@ -37465,7 +37517,7 @@ function isItName(name) {
 }
 function extractSpecTreeFromText(input) {
   const { text, specPath } = input;
-  const project = new Project13({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project14({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sourceFile = project.createSourceFile(SPEC_FILE_VIRTUAL_PATH, text, { overwrite: true });
   const { prefix, prefixSource, knownFixtureNames } = resolvePrefixAndFixtures(sourceFile, input);
   const helpers = collectHelpers(sourceFile);
@@ -37799,7 +37851,7 @@ import { readFile as readFile14 } from "node:fs/promises";
 import { join as join15 } from "node:path";
 
 // packages/dbx-cli/model-test/src/lib/fixture/extract.ts
-import { Node as Node36, Project as Project14, SyntaxKind as SyntaxKind19 } from "ts-morph";
+import { Node as Node36, Project as Project15, SyntaxKind as SyntaxKind19 } from "ts-morph";
 
 // packages/dbx-cli/model-test/src/lib/fixture/archetype.ts
 function classifyFixtureArchetype(input) {
@@ -37872,7 +37924,7 @@ var BASE_CONTEXT_FIXTURE_BASE = "FirebaseAdminNestTestContextFixture";
 var MODEL_FACTORY_NAME = "modelTestContextFactory";
 function extractAppFixturesFromText(input) {
   const { text, fixturePath } = input;
-  const project = new Project14({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project15({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sourceFile = project.createSourceFile(FIXTURE_FILE_VIRTUAL_PATH, text, { overwrite: true });
   const prefix = detectPrefix(sourceFile);
   const fixtureClasses = /* @__PURE__ */ new Map();
@@ -39552,7 +39604,7 @@ function topLevelColonIndex(text) {
 // packages/dbx-cli/validate/src/lib/model-list-component/extract.ts
 import { readdir as readdir9, readFile as readFile17, stat as stat13 } from "node:fs/promises";
 import { basename as basename8, join as join17, relative as relative15, sep as sep11 } from "node:path";
-import { Node as Node37, Project as Project15 } from "ts-morph";
+import { Node as Node37, Project as Project16 } from "ts-morph";
 var MODEL_SUBPATH2 = "src/lib/model";
 var MODEL_SUBPATH_PREFIX = `${MODEL_SUBPATH2}/`;
 var RESERVED_NAMES = RESERVED_MODEL_FOLDERS.map((r) => r.name);
@@ -39581,7 +39633,7 @@ async function extractComponentModels(componentAbs) {
     skipReservedFolders: RESERVED_NAMES
   });
   const richByFolder = groupRichByFolder(richResult.models);
-  const fallbackProject = new Project15({ useInMemoryFileSystem: true });
+  const fallbackProject = new Project16({ useInMemoryFileSystem: true });
   const models = [];
   const unidentified = [];
   for (const folder of targetFolders) {
@@ -39986,7 +40038,7 @@ import { join as join20, relative as relative18, sep as sep14 } from "node:path"
 // packages/dbx-cli/validate/src/lib/model-api-lookup/extract-actions.ts
 import { readFile as readFile19 } from "node:fs/promises";
 import { join as join19, relative as relative17, sep as sep13 } from "node:path";
-import { Project as Project16, SyntaxKind as SyntaxKind20 } from "ts-morph";
+import { Project as Project17, SyntaxKind as SyntaxKind20 } from "ts-morph";
 var ACTION_SERVER_SUFFIX = ".action.server.ts";
 var COMMON_MODEL_SUBPATH = "src/app/common/model";
 async function buildActionLookup(apiAbs) {
@@ -39997,7 +40049,7 @@ async function buildActionLookup(apiAbs) {
   if (files.length === 0) {
     return { methodsByParams, factoriesByParams, filesScanned: 0 };
   }
-  const project = new Project16({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project17({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   for (const filePath of files) {
     const text = await readFile19(filePath, "utf8");
     const sourceFile = project.createSourceFile(filePath, text, { overwrite: true });
@@ -40317,7 +40369,7 @@ __export(server_actions_list_app_exports, {
 // packages/dbx-cli/validate/src/lib/server-actions-list-app/extract.ts
 import { readdir as readdir10, readFile as readFile21 } from "node:fs/promises";
 import { dirname as dirname18, join as join21, relative as relative19, sep as sep15 } from "node:path";
-import { Node as Node38, Project as Project17 } from "ts-morph";
+import { Node as Node38, 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";
@@ -40327,7 +40379,7 @@ async function extractServerActions(apiAbs, apiRel) {
   if (actionFiles.length === 0) {
     return { modelRoot, entries: [], fixtureStatus: "ok" };
   }
-  const project = new Project17({ useInMemoryFileSystem: true });
+  const project = new Project18({ useInMemoryFileSystem: true });
   const commonBarrelExports = await readCommonBarrelExports(apiAbs);
   const fixtureCoverageMap = /* @__PURE__ */ new Map();
   let fixtureStatus = "ok";
@@ -40415,7 +40467,7 @@ async function safeRead(path) {
   return result;
 }
 function inspectModuleText(input) {
-  const project = new Project17({ useInMemoryFileSystem: true });
+  const project = new Project18({ useInMemoryFileSystem: true });
   const sourceFile = project.createSourceFile("module.ts", input.text, { overwrite: true });
   let providedByModule = false;
   let exportedByModule = false;
@@ -40458,7 +40510,7 @@ async function readCommonBarrelExports(apiAbs) {
   const path = join21(apiAbs, COMMON_BARREL_REL);
   const text = await safeRead(path);
   if (text === void 0) return /* @__PURE__ */ new Set();
-  const project = new Project17({ useInMemoryFileSystem: true });
+  const project = new Project18({ useInMemoryFileSystem: true });
   const sourceFile = project.createSourceFile(path, text, { overwrite: true });
   const exported = /* @__PURE__ */ new Set();
   for (const decl of sourceFile.getExportDeclarations()) {
@@ -41638,7 +41690,7 @@ async function readFileIfExists2(absPath) {
 }
 
 // packages/dbx-cli/validate/src/lib/dbx-color-template-list-app/extract.ts
-import { Node as Node39, Project as Project18, SyntaxKind as SyntaxKind21 } from "ts-morph";
+import { Node as Node39, Project as Project19, SyntaxKind as SyntaxKind21 } from "ts-morph";
 var PROVIDE_FN_NAME = "provideDbxStyleService";
 var COLOR_SERVICE_CONFIG_PROP = "dbxColorServiceConfig";
 var TEMPLATES_PROP = "templates";
@@ -41646,7 +41698,7 @@ var KEY_PROP = "key";
 var CONFIG_PROP = "config";
 var KNOWN_CONFIG_PROPS = /* @__PURE__ */ new Set(["template", "color", "contrast", "tone", "tonal"]);
 function extractColorTemplates(inspection) {
-  const project = new Project18({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project19({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const ctx = { warnings: [], templates: [], provideCallLocation: void 0 };
   const sources = [];
   for (const file of inspection.files) {
@@ -41883,12 +41935,12 @@ __export(dbx_color_smell_check_exports, {
 });
 
 // packages/dbx-cli/validate/src/lib/dbx-color-smell-check/extract.ts
-import { Node as Node40, Project as Project19, SyntaxKind as SyntaxKind22 } from "ts-morph";
+import { Node as Node40, Project as Project20, SyntaxKind as SyntaxKind22 } from "ts-morph";
 var COLOR_INPUT_NAMES = /* @__PURE__ */ new Set(["color", "dbxColor", "dbxTextColor"]);
 var COLOR_TYPE_NAMES = /* @__PURE__ */ new Set(["DbxColorConfig", "DbxColorInput", "Maybe<DbxColorInput>", "Maybe<DbxColorConfig>"]);
 var KNOWN_CONFIG_KEYS = /* @__PURE__ */ new Set(["template", "color", "contrast", "tone", "tonal"]);
 function extractTsLiterals(filePath, text) {
-  const project = new Project19({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project20({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sf = project.createSourceFile(filePath, text, { overwrite: true });
   const out = [];
   for (const obj of sf.getDescendantsOfKind(SyntaxKind22.ObjectLiteralExpression)) {
@@ -45813,7 +45865,7 @@ var MODEL_FIXTURE_SCAFFOLD_TOOL = { definition: TOOL7, run: run6 };
 // packages/dbx-components-mcp/src/tools/model-fixture-forward.tool.ts
 import { join as join24, resolve as resolve45 } from "node:path";
 import { type as type63 } from "arktype";
-import { Project as Project20 } from "ts-morph";
+import { Project as Project21 } from "ts-morph";
 var ForwardArgsType = type63({
   apiDir: "string",
   model: "string",
@@ -45899,7 +45951,7 @@ function toErrorMessage(err) {
   return err instanceof Error ? err.message : String(err);
 }
 async function applyForwardersToFile(absolutePath, fixtureClassName, rendered) {
-  const project = new Project20({ skipAddingFilesFromTsConfig: true });
+  const project = new Project21({ skipAddingFilesFromTsConfig: true });
   let result;
   let sourceFile;
   try {
@@ -52404,7 +52456,7 @@ function createSearchModelSnapshotFieldTool(config) {
 import { glob, readFile as readFile27 } from "node:fs/promises";
 import { resolve as resolve57 } from "node:path";
 import { type as type87 } from "arktype";
-import { Node as Node41, Project as Project21 } from "ts-morph";
+import { Node as Node41, Project as Project22 } from "ts-morph";
 var ListAppArgsType4 = type87({
   componentDir: "string",
   "apiDir?": "string",
@@ -52501,7 +52553,7 @@ async function collectFiles(rootAbs, globs) {
 }
 async function buildListAppReport(input) {
   const { componentDir, componentAbs, apiDir, apiAbs, registry } = input;
-  const project = new Project21({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project22({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const componentFiles = await collectFiles(componentAbs, COMPONENT_MODEL_GLOBS);
   for (const rel of componentFiles) {
     const abs = resolve57(componentAbs, rel);