@dereekb/dbx-cli 13.14.0 → 13.16.0

package/firebase-api-manifest/main.js

@@ -284,29 +284,20 @@ function findFunctionsClassName(sourceFile) {
   return result;
 }
 function inferGroupName(sourceFile) {
+  return findTypeAliasStem(sourceFile, "ModelCrudFunctionsConfig") ?? findTypeAliasStem(sourceFile, "FunctionTypeMap");
+}
+function findTypeAliasStem(sourceFile, ending) {
   let result;
   for (const alias of sourceFile.getTypeAliases()) {
     const name = alias.getName();
-    if (name.endsWith("ModelCrudFunctionsConfig")) {
-      const stem = name.slice(0, -"ModelCrudFunctionsConfig".length);
+    if (name.endsWith(ending)) {
+      const stem = name.slice(0, -ending.length);
       if (stem.length > 0) {
         result = stem;
         break;
       }
     }
   }
-  if (result === void 0) {
-    for (const alias of sourceFile.getTypeAliases()) {
-      const name = alias.getName();
-      if (name.endsWith("FunctionTypeMap")) {
-        const stem = name.slice(0, -"FunctionTypeMap".length);
-        if (stem.length > 0) {
-          result = stem;
-          break;
-        }
-      }
-    }
-  }
   return result;
 }
 function isNullLiteralType(node) {
@@ -402,44 +393,44 @@ function typeNodeName(node) {
   return result;
 }
 function readTypeDocs(sourceFile, typeName) {
-  let result;
   const interfaceDecl = sourceFile.getInterface(typeName);
+  let result;
   if (interfaceDecl) {
-    const typeDescription = readJsDocSummary(interfaceDecl);
-    const hasApiParamsTag = hasJsDocFlag(interfaceDecl, "dbxModelApiParams");
-    const fields = [];
-    for (const property of interfaceDecl.getProperties()) {
-      const fieldName = property.getName();
-      const description = readJsDocSummary(property);
-      const typeNode = property.getTypeNode();
-      const typeText = typeNode?.getText().trim() ?? "";
-      const adminOnly = hasJsDocFlag(property, "dbxModelApiAdminOnly");
-      const field = {
-        name: fieldName,
-        typeText,
-        ...description ? { description } : {},
-        ...adminOnly ? { accessLevel: "adminOnly" } : {}
-      };
-      fields.push(field);
-    }
-    if (typeDescription || fields.length > 0 || hasApiParamsTag) {
-      result = {
-        ...typeDescription ? { typeDescription } : {},
-        ...fields.length > 0 ? { fields } : {},
-        hasApiParamsTag
-      };
-    }
+    result = readInterfaceTypeDocs(interfaceDecl);
   } else {
     const typeAlias = sourceFile.getTypeAlias(typeName);
-    if (typeAlias) {
-      const typeDescription = readJsDocSummary(typeAlias);
-      if (typeDescription) {
-        result = { typeDescription };
-      }
-    }
+    result = typeAlias ? readTypeAliasDocs(typeAlias) : void 0;
+  }
+  return result;
+}
+function readInterfaceTypeDocs(interfaceDecl) {
+  const typeDescription = readJsDocSummary(interfaceDecl);
+  const hasApiParamsTag = hasJsDocFlag(interfaceDecl, "dbxModelApiParams");
+  const fields = interfaceDecl.getProperties().map((property) => readInterfaceField(property));
+  let result;
+  if (typeDescription || fields.length > 0 || hasApiParamsTag) {
+    result = {
+      ...typeDescription ? { typeDescription } : {},
+      ...fields.length > 0 ? { fields } : {},
+      hasApiParamsTag
+    };
   }
   return result;
 }
+function readInterfaceField(property) {
+  const description = readJsDocSummary(property);
+  const adminOnly = hasJsDocFlag(property, "dbxModelApiAdminOnly");
+  return {
+    name: property.getName(),
+    typeText: property.getTypeNode()?.getText().trim() ?? "",
+    ...description ? { description } : {},
+    ...adminOnly ? { accessLevel: "adminOnly" } : {}
+  };
+}
+function readTypeAliasDocs(typeAlias) {
+  const typeDescription = readJsDocSummary(typeAlias);
+  return typeDescription ? { typeDescription } : void 0;
+}
 function hasJsDocFlag(node, tagName) {
   let result = false;
   for (const doc of node.getJsDocs()) {
@@ -468,8 +459,8 @@ function readJsDocTagValue(node, tagName) {
 function readJsDocSummary(node) {
   let result;
   const docs = node.getJsDocs();
-  if (docs.length > 0) {
-    const last = docs[docs.length - 1];
+  const last = docs.at(-1);
+  if (last) {
     const description = last.getDescription().trim();
     if (description.length > 0) {
       result = description;
@@ -762,38 +753,48 @@ function readNestedFromExpression(expr) {
   if (Node3.isCallExpression(expr)) {
     const fnName = expr.getExpression().getText();
     if (fnName === SUB_OBJECT_FN || fnName === OBJECT_ARRAY_FN) {
-      const args = expr.getArguments();
-      if (args.length > 0) {
-        const config = args[0];
-        if (Node3.isObjectLiteralExpression(config)) {
-          const objectField = readPropertyValue(config, OBJECT_FIELD_KEY);
-          if (objectField) {
-            const isArray = fnName === OBJECT_ARRAY_FN;
-            if (Node3.isIdentifier(objectField)) {
-              result = { ref: objectField.getText(), isArray };
-            } else if (Node3.isObjectLiteralExpression(objectField)) {
-              const fieldsLiteral = readObjectProperty(objectField, FIELDS_LITERAL_KEY);
-              if (fieldsLiteral) {
-                const inlineFields = readFieldEntries(fieldsLiteral);
-                result = {
-                  inline: {
-                    converterConst: void 0,
-                    factory: fnName,
-                    interfaceName: readGenericInterfaceName(expr),
-                    fields: inlineFields,
-                    line: expr.getStartLineNumber()
-                  },
-                  isArray
-                };
-              }
-            }
-          }
-        }
+      result = readNestedConverterCall(expr, fnName);
+    }
+  }
+  return result;
+}
+function readNestedConverterCall(call, fnName) {
+  let result;
+  const args = call.getArguments();
+  if (args.length > 0) {
+    const config = args[0];
+    if (Node3.isObjectLiteralExpression(config)) {
+      const objectField = readPropertyValue(config, OBJECT_FIELD_KEY);
+      if (objectField) {
+        result = buildNestedConverterMatch({ objectField, call, fnName });
       }
     }
   }
   return result;
 }
+function buildNestedConverterMatch(input) {
+  const { objectField, call, fnName } = input;
+  const isArray = fnName === OBJECT_ARRAY_FN;
+  let result;
+  if (Node3.isIdentifier(objectField)) {
+    result = { ref: objectField.getText(), isArray };
+  } else if (Node3.isObjectLiteralExpression(objectField)) {
+    const fieldsLiteral = readObjectProperty(objectField, FIELDS_LITERAL_KEY);
+    if (fieldsLiteral) {
+      result = {
+        inline: {
+          converterConst: void 0,
+          factory: fnName,
+          interfaceName: readGenericInterfaceName(call),
+          fields: readFieldEntries(fieldsLiteral),
+          line: call.getStartLineNumber()
+        },
+        isArray
+      };
+    }
+  }
+  return result;
+}
 function readPropertyValue(literal, key) {
   const property = literal.getProperty(key);
   let result;
@@ -1086,28 +1087,32 @@ function buildEntryForIdentity(input) {
           depth: 0,
           visitedConverters: /* @__PURE__ */ new Set()
         });
-        const modelGroup = registries.groupByModelName.get(modelName);
-        const serviceFactory = registries.serviceFactoryByModelType.get(identity.modelType);
-        result = {
-          modelType: identity.modelType,
-          modelName,
-          ...modelGroup ? { modelGroup } : {},
-          identityConst: identity.identityConst,
-          collectionPrefix: identity.collectionPrefix,
-          ...identity.parentIdentityConst ? { parentIdentityConst: identity.parentIdentityConst } : {},
-          ...iface.description ? { description: iface.description } : {},
-          sourcePackage: source.sourcePackage,
-          sourceFile: source.sourceFile,
-          fields,
-          ...iface.mcpToolNameSegment ? { mcpToolNameSegment: iface.mcpToolNameSegment } : {},
-          ...iface.dbxModelRead ? { read: iface.dbxModelRead } : {},
-          ...serviceFactory ? { serviceFactory } : {}
-        };
+        result = buildManifestEntry({ identity, modelName, collectionPrefix: identity.collectionPrefix, iface, fields, source, registries });
       }
     }
   }
   return result;
 }
+function buildManifestEntry(input) {
+  const { identity, modelName, collectionPrefix, iface, fields, source, registries } = input;
+  const modelGroup = registries.groupByModelName.get(modelName);
+  const serviceFactory = registries.serviceFactoryByModelType.get(identity.modelType);
+  return {
+    modelType: identity.modelType,
+    modelName,
+    ...modelGroup ? { modelGroup } : {},
+    identityConst: identity.identityConst,
+    collectionPrefix,
+    ...identity.parentIdentityConst ? { parentIdentityConst: identity.parentIdentityConst } : {},
+    ...iface.description ? { description: iface.description } : {},
+    sourcePackage: source.sourcePackage,
+    sourceFile: source.sourceFile,
+    fields,
+    ...iface.mcpToolNameSegment ? { mcpToolNameSegment: iface.mcpToolNameSegment } : {},
+    ...iface.dbxModelRead ? { read: iface.dbxModelRead } : {},
+    ...serviceFactory ? { serviceFactory } : {}
+  };
+}
 function findConverterForInterface(extraction, interfaceName) {
   return extraction.converters.find((c) => c.interfaceName === interfaceName);
 }
@@ -1158,21 +1163,10 @@ function buildField(input) {
   return out;
 }
 function resolveNestedFields(input) {
-  const { field } = input;
   let result;
   if (input.depth < MAX_NESTED_DEPTH) {
-    let nestedConverter;
-    let aborted = false;
-    if (field.nestedConverterInline) {
-      nestedConverter = field.nestedConverterInline;
-    } else if (field.nestedConverterRef) {
-      if (input.visitedConverters.has(field.nestedConverterRef)) {
-        aborted = true;
-      } else {
-        nestedConverter = input.converterRegistry.get(field.nestedConverterRef);
-      }
-    }
-    if (!aborted && nestedConverter) {
+    const nestedConverter = selectNestedConverter(input);
+    if (nestedConverter) {
       const nextVisited = new Set(input.visitedConverters);
       if (nestedConverter.converterConst) nextVisited.add(nestedConverter.converterConst);
       const nestedIface = nestedConverter.interfaceName ? input.interfaceRegistry.get(nestedConverter.interfaceName) : void 0;
@@ -1185,11 +1179,21 @@ function resolveNestedFields(input) {
         depth: input.depth + 1,
         visitedConverters: nextVisited
       });
-      result = { fields, isArray: field.nestedIsArray ?? false };
+      result = { fields, isArray: input.field.nestedIsArray ?? false };
     }
   }
   return result;
 }
+function selectNestedConverter(input) {
+  const { field } = input;
+  let result;
+  if (field.nestedConverterInline) {
+    result = field.nestedConverterInline;
+  } else if (field.nestedConverterRef && !input.visitedConverters.has(field.nestedConverterRef)) {
+    result = input.converterRegistry.get(field.nestedConverterRef);
+  }
+  return result;
+}
 function collectAncestors(iface, registry) {
   const out = [];
   const visited = /* @__PURE__ */ new Set([iface.name]);
@@ -1261,31 +1265,42 @@ function findIdentifierInBarrelChain(filePath, identifier, visited) {
   let result = false;
   if (!visited.has(filePath)) {
     visited.add(filePath);
-    let text;
-    try {
-      text = readFileSync5(filePath, "utf8");
-    } catch {
-      text = void 0;
-    }
+    const text = readFileTextSafe(filePath);
     if (text !== void 0) {
-      for (const pattern of EXPORT_DECL_PATTERNS) {
-        const re = new RegExp(pattern.source.replace("IDENT", escapeRegExp(identifier)));
-        if (re.test(text)) {
-          result = true;
-          break;
-        }
-      }
-      if (!result) {
-        const dir = dirname2(filePath);
-        for (const reExportTarget of collectReExportTargets(text)) {
-          const resolved = resolveReExport(dir, reExportTarget);
-          if (!resolved) continue;
-          if (findIdentifierInBarrelChain(resolved, identifier, visited)) {
-            result = true;
-            break;
-          }
-        }
-      }
+      result = barrelTextDeclaresIdentifier(text, identifier) || reExportChainHasIdentifier({ fromFile: filePath, text, identifier, visited });
+    }
+  }
+  return result;
+}
+function readFileTextSafe(filePath) {
+  let text;
+  try {
+    text = readFileSync5(filePath, "utf8");
+  } catch {
+    text = void 0;
+  }
+  return text;
+}
+function barrelTextDeclaresIdentifier(text, identifier) {
+  let result = false;
+  for (const pattern of EXPORT_DECL_PATTERNS) {
+    const re = new RegExp(pattern.source.replace("IDENT", escapeRegExp(identifier)));
+    if (re.test(text)) {
+      result = true;
+      break;
+    }
+  }
+  return result;
+}
+function reExportChainHasIdentifier(input) {
+  const { fromFile, text, identifier, visited } = input;
+  let result = false;
+  const dir = dirname2(fromFile);
+  for (const reExportTarget of collectReExportTargets(text)) {
+    const resolved = resolveReExport(dir, reExportTarget);
+    if (resolved && findIdentifierInBarrelChain(resolved, identifier, visited)) {
+      result = true;
+      break;
     }
   }
   return result;
@@ -1402,7 +1417,7 @@ function renderEntry({ entry, validatorName }) {
     entry.mcpResultTypeDescription ? `mcpResultTypeDescription: ${JSON.stringify(entry.mcpResultTypeDescription)}` : void 0,
     entry.mcpResultFields && entry.mcpResultFields.length > 0 ? `mcpResultFields: ${renderDocFields(entry.mcpResultFields)}` : void 0
   ];
-  return `  { ${fields.filter((v) => Boolean(v)).join(", ")} }`;
+  return `  { ${fields.filter(Boolean).join(", ")} }`;
 }
 function renderDocFields(fields) {
   const items = fields.map((field) => {
@@ -1432,7 +1447,7 @@ function renderModelEntry(entry, emitConverters) {
     entry.read ? `read: ${JSON.stringify(entry.read)}` : void 0,
     entry.serviceFactory ? `serviceFactory: { exportName: ${JSON.stringify(entry.serviceFactory.exportName)}, sourceFile: ${JSON.stringify(entry.serviceFactory.sourceFile)} }` : void 0
   ];
-  return `  { ${fields.filter((v) => Boolean(v)).join(", ")} }`;
+  return `  { ${fields.filter(Boolean).join(", ")} }`;
 }
 function renderModelFields(fields, emitConverters) {
   let result;
@@ -1458,7 +1473,7 @@ function renderModelField(field, emitConverters) {
     field.nestedFields ? `nestedFields: ${renderModelFields(field.nestedFields, emitConverters)}` : void 0,
     field.nestedFields ? `nestedIsArray: ${nestedIsArrayLiteral}` : void 0
   ];
-  return `{ ${parts.filter((v) => Boolean(v)).join(", ")} }`;
+  return `{ ${parts.filter(Boolean).join(", ")} }`;
 }
 
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/main.ts

package/firebase-api-manifest/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@dereekb/dbx-cli-firebase-api-manifest",
-  "version": "13.14.0",
+  "version": "13.16.0",
   "private": true,
   "type": "module",
   "devDependencies": {
     "ts-morph": "^21.0.0"
   },
   "peerDependencies": {
-    "@dereekb/dbx-cli": "13.14.0",
-    "@dereekb/util": "13.14.0",
+    "@dereekb/dbx-cli": "13.16.0",
+    "@dereekb/util": "13.16.0",
     "prettier": "3.8.3"
   }
 }

package/generate-firestore-indexes/main.js

@@ -5,14 +5,14 @@ const require = __createRequire(import.meta.url);
 // packages/dbx-cli/generate-firestore-indexes/package.json
 var package_default = {
   name: "@dereekb/dbx-cli-generate-firestore-indexes",
-  version: "13.14.0",
+  version: "13.16.0",
   private: true,
   type: "module",
   devDependencies: {
     eslint: "10.4.0"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "13.14.0"
+    "@dereekb/dbx-cli": "13.16.0"
   }
 };
 
@@ -2109,38 +2109,51 @@ function parseArgv(argv) {
   return { component, output, check, json, help, error };
 }
 async function readExistingIndexes(input) {
+  const text = await readExistingIndexesText(input);
+  let result2;
+  if (text !== void 0) {
+    result2 = parseExistingIndexesJson(text, input.outputAbs, input.stderr);
+  }
+  return result2;
+}
+async function readExistingIndexesText(input) {
   const { outputAbs, readFile, stderr } = input;
-  let text = null;
-  let readFailed = false;
+  let text;
   try {
     text = await readFile(outputAbs);
   } catch (err) {
-    readFailed = true;
     const code = err.code;
     if (code !== "ENOENT") {
       stderr(`generate-firestore-indexes: could not read existing ${outputAbs}: ${err instanceof Error ? err.message : String(err)}`);
     }
+    text = void 0;
   }
+  return text;
+}
+function parseExistingIndexesJson(text, outputAbs, stderr) {
   let result2;
-  if (!readFailed && text !== null) {
-    let parsed;
-    let parseFailed = false;
-    try {
-      parsed = JSON.parse(text);
-    } catch (err) {
-      parseFailed = true;
-      stderr(`generate-firestore-indexes: existing ${outputAbs} is not valid JSON: ${err instanceof Error ? err.message : String(err)}`);
-    }
-    if (!parseFailed) {
-      if (parsed === null || typeof parsed !== "object") {
-        stderr(`generate-firestore-indexes: existing ${outputAbs} top-level value is not an object`);
-      } else {
-        const raw = parsed;
-        const indexes = Array.isArray(raw.indexes) ? raw.indexes : [];
-        const fieldOverrides = Array.isArray(raw.fieldOverrides) ? raw.fieldOverrides : [];
-        result2 = { indexes, fieldOverrides };
-      }
-    }
+  let parsed;
+  let parseFailed = false;
+  try {
+    parsed = JSON.parse(text);
+  } catch (err) {
+    parseFailed = true;
+    stderr(`generate-firestore-indexes: existing ${outputAbs} is not valid JSON: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  if (!parseFailed) {
+    result2 = coerceFirestoreIndexesJson(parsed, outputAbs, stderr);
+  }
+  return result2;
+}
+function coerceFirestoreIndexesJson(parsed, outputAbs, stderr) {
+  let result2;
+  if (parsed === null || typeof parsed !== "object") {
+    stderr(`generate-firestore-indexes: existing ${outputAbs} top-level value is not an object`);
+  } else {
+    const raw = parsed;
+    const indexes = Array.isArray(raw.indexes) ? raw.indexes : [];
+    const fieldOverrides = Array.isArray(raw.fieldOverrides) ? raw.fieldOverrides : [];
+    result2 = { indexes, fieldOverrides };
   }
   return result2;
 }

package/generate-firestore-indexes/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dereekb/dbx-cli-generate-firestore-indexes",
-  "version": "13.14.0",
+  "version": "13.16.0",
   "private": true,
   "type": "module",
   "devDependencies": {
     "eslint": "10.4.0"
   },
   "peerDependencies": {
-    "@dereekb/dbx-cli": "13.14.0"
+    "@dereekb/dbx-cli": "13.16.0"
   }
 }

package/generate-mcp-manifest/main.js

@@ -725,9 +725,7 @@ var EMPTY_ROLE_CONST_RESOLUTION = { roles: [], unresolved: [] };
 function resolveRoleConstByName(name, ctx) {
   let result;
   const scalar = ctx.knownRoles.get(name);
-  if (scalar !== void 0) {
-    result = { roles: [scalar], unresolved: [] };
-  } else {
+  if (scalar === void 0) {
     const arrayExpr = ctx.localArrayRoles.get(name);
     if (arrayExpr === void 0) {
       result = { roles: [], unresolved: [name] };
@@ -738,6 +736,8 @@ function resolveRoleConstByName(name, ctx) {
       nextSeen.add(name);
       result = resolveRoleArrayLiteral(arrayExpr, { ...ctx, seen: nextSeen });
     }
+  } else {
+    result = { roles: [scalar], unresolved: [] };
   }
   return result;
 }
@@ -1015,53 +1015,65 @@ function renderMcpManifest(input, now = /* @__PURE__ */ new Date()) {
   const warnings = [];
   const errors = [];
   const seenNames = /* @__PURE__ */ new Map();
+  const segments = buildSegmentMap(input.modelManifest);
+  const toolEntries = input.apiManifest.filter((entry) => entry.verb !== "standalone");
+  const nameCounts = countToolNames(toolEntries, segments);
+  for (const entry of toolEntries) {
+    registerToolEntry({ entry, segments, nameCounts, tools, seenNames, warnings, errors });
+  }
+  const models = input.modelManifest != null && input.modelManifest.length > 0 ? input.modelManifest.map(projectModelEntry) : void 0;
+  const auth = input.auth == null ? void 0 : projectAuthSection(input.auth.registry, input.auth.app);
+  const base = { version: MCP_MANIFEST_VERSION, generatedAt: now.toISOString(), tools };
+  const manifest = {
+    ...base,
+    ...models == null ? {} : { models },
+    ...auth == null ? {} : { auth }
+  };
+  return { manifest, warnings, errors };
+}
+function buildSegmentMap(modelManifest) {
   const segments = /* @__PURE__ */ new Map();
-  if (input.modelManifest != null) {
-    for (const model of input.modelManifest) {
+  if (modelManifest != null) {
+    for (const model of modelManifest) {
       if (model.mcpToolNameSegment != null && model.mcpToolNameSegment.length > 0) {
         segments.set(model.modelType, model.mcpToolNameSegment);
       }
     }
   }
-  const toolEntries = input.apiManifest.filter((entry) => entry.verb !== "standalone");
+  return segments;
+}
+function countToolNames(toolEntries, segments) {
   const nameCounts = /* @__PURE__ */ new Map();
   for (const entry of toolEntries) {
     const segment = segments.get(entry.model) ?? entry.model;
     const baseName = buildMcpToolName(segment, entry.verb, entry.specifier);
     nameCounts.set(baseName, (nameCounts.get(baseName) ?? 0) + 1);
   }
-  for (const entry of toolEntries) {
-    const key = mcpManifestKey(entry.model, entry.verb, entry.specifier);
-    tools[key] = buildToolEntry(entry);
-    const segment = segments.get(entry.model) ?? entry.model;
-    const baseName = buildMcpToolName(segment, entry.verb, entry.specifier);
-    const clashes = (nameCounts.get(baseName) ?? 0) > 1;
-    const toolName = clashes ? buildDisambiguatedMcpToolName(segment, entry.verb, entry.specifier) : baseName;
-    if (toolName !== baseName) {
-      warnings.push(`Tool name "${baseName}" is produced by more than one entry; re-derived as "${toolName}" (${key}) with the abbreviated call type to disambiguate.`);
-    }
-    const validation = validateMcpToolName(toolName);
-    if (validation.level === "error") {
-      errors.push(`Tool name "${toolName}" is ${validation.length} chars, over the ${MCP_TOOL_NAME_MAX_LENGTH}-char MCP cap (${key}). Shorten the model/specifier, set a per-model mcpToolNameSegment, or hide the tool.`);
-    } else if (validation.level === "warn") {
-      warnings.push(`Tool name "${toolName}" is ${validation.length} chars, over the ${MCP_TOOL_NAME_WARN_LENGTH}-char soft limit (${key}).`);
-    }
-    const priorKey = seenNames.get(toolName);
-    if (priorKey != null) {
-      warnings.push(`Tool name "${toolName}" is still produced by more than one entry (${priorKey} and ${key}) after disambiguation; one shadows the other unless hidden or renamed at runtime.`);
-    } else {
-      seenNames.set(toolName, key);
-    }
+  return nameCounts;
+}
+function registerToolEntry(input) {
+  const { entry, segments, nameCounts, tools, seenNames, warnings, errors } = input;
+  const key = mcpManifestKey(entry.model, entry.verb, entry.specifier);
+  tools[key] = buildToolEntry(entry);
+  const segment = segments.get(entry.model) ?? entry.model;
+  const baseName = buildMcpToolName(segment, entry.verb, entry.specifier);
+  const clashes = (nameCounts.get(baseName) ?? 0) > 1;
+  const toolName = clashes ? buildDisambiguatedMcpToolName(segment, entry.verb, entry.specifier) : baseName;
+  if (toolName !== baseName) {
+    warnings.push(`Tool name "${baseName}" is produced by more than one entry; re-derived as "${toolName}" (${key}) with the abbreviated call type to disambiguate.`);
+  }
+  const validation = validateMcpToolName(toolName);
+  if (validation.level === "error") {
+    errors.push(`Tool name "${toolName}" is ${validation.length} chars, over the ${MCP_TOOL_NAME_MAX_LENGTH}-char MCP cap (${key}). Shorten the model/specifier, set a per-model mcpToolNameSegment, or hide the tool.`);
+  } else if (validation.level === "warn") {
+    warnings.push(`Tool name "${toolName}" is ${validation.length} chars, over the ${MCP_TOOL_NAME_WARN_LENGTH}-char soft limit (${key}).`);
+  }
+  const priorKey = seenNames.get(toolName);
+  if (priorKey == null) {
+    seenNames.set(toolName, key);
+  } else {
+    warnings.push(`Tool name "${toolName}" is still produced by more than one entry (${priorKey} and ${key}) after disambiguation; one shadows the other unless hidden or renamed at runtime.`);
   }
-  const models = input.modelManifest != null && input.modelManifest.length > 0 ? input.modelManifest.map(projectModelEntry) : void 0;
-  const auth = input.auth == null ? void 0 : projectAuthSection(input.auth.registry, input.auth.app);
-  const base = { version: MCP_MANIFEST_VERSION, generatedAt: now.toISOString(), tools };
-  const manifest = {
-    ...base,
-    ...models == null ? {} : { models },
-    ...auth == null ? {} : { auth }
-  };
-  return { manifest, warnings, errors };
 }
 function projectAuthSection(registry, appSlug) {
   const primary = registry.findApp(appSlug);

package/generate-mcp-manifest/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dereekb/dbx-cli-generate-mcp-manifest",
-  "version": "13.14.0",
+  "version": "13.16.0",
   "private": true,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "13.14.0",
-    "@dereekb/model": "13.14.0",
+    "@dereekb/dbx-cli": "13.16.0",
+    "@dereekb/model": "13.16.0",
     "arktype": "^2.2.0",
     "jiti": "2.6.1"
   }