@dereekb/dbx-cli 13.13.0 → 13.15.0

package/manifest-extract/index.cjs.js

@@ -57,6 +57,11 @@ var SUPPORTED_VERBS = new Set([
     'query',
     'invoke'
 ]);
+/**
+ * JSDoc tag (without leading `@`) on a CRUD leaf naming the interface that a handler's
+ * `mapSuccessfulResult` produces for MCP. When present, the MCP manifest output schema is
+ * synthesized from this type instead of the raw result type.
+ */ var DBX_MODEL_API_MCP_RESULT_MARKER = 'dbxModelApiMcpResult';
 /**
  * Walks a `<model>.api.ts` source and returns one {@link CrudEntry} per
  * callable leaf (CRUD or standalone). Best-effort: malformed configs return
@@ -136,6 +141,7 @@ function extractCrudEntries(source) {
                                     valueNode: verbValueNode,
                                     entries: entries,
                                     fallbackDescription: readJsDocSummary(verbMember),
+                                    fallbackMcpResultTypeName: readJsDocTagValue(verbMember, DBX_MODEL_API_MCP_RESULT_MARKER),
                                     resolveTypeDocs: resolveTypeDocs
                                 });
                             }
@@ -187,6 +193,8 @@ function extractCrudEntries(source) {
                     var tuple = valueNode1 ? readTupleParamsResult(valueNode1) : undefined;
                     var paramsDocs = resolveTypeDocs(tuple === null || tuple === void 0 ? void 0 : tuple.params);
                     var resultDocs = resolveTypeDocs(tuple === null || tuple === void 0 ? void 0 : tuple.result);
+                    var mcpResultTypeName = readJsDocTagValue(member1, DBX_MODEL_API_MCP_RESULT_MARKER);
+                    var mcpResultDocs = resolveTypeDocs(mcpResultTypeName);
                     entries.push({
                         model: key,
                         verb: 'standalone',
@@ -199,7 +207,10 @@ function extractCrudEntries(source) {
                         paramsFields: paramsDocs === null || paramsDocs === void 0 ? void 0 : paramsDocs.fields,
                         paramsHasApiParamsTag: paramsDocs === null || paramsDocs === void 0 ? void 0 : paramsDocs.hasApiParamsTag,
                         resultTypeDescription: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.typeDescription,
-                        resultFields: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.fields
+                        resultFields: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.fields,
+                        mcpResultTypeName: mcpResultTypeName,
+                        mcpResultTypeDescription: mcpResultDocs === null || mcpResultDocs === void 0 ? void 0 : mcpResultDocs.typeDescription,
+                        mcpResultFields: mcpResultDocs === null || mcpResultDocs === void 0 ? void 0 : mcpResultDocs.fields
                     });
                 }
             } catch (err) {
@@ -355,7 +366,7 @@ function isNullLiteralType(node) {
 }
 function collectVerbEntries(input) {
     var _readTupleParamsResult;
-    var modelName = input.modelName, verb = input.verb, valueNode = input.valueNode, entries = input.entries, fallbackDescription = input.fallbackDescription, resolveTypeDocs = input.resolveTypeDocs;
+    var modelName = input.modelName, verb = input.verb, valueNode = input.valueNode, entries = input.entries, fallbackDescription = input.fallbackDescription, fallbackMcpResultTypeName = input.fallbackMcpResultTypeName, resolveTypeDocs = input.resolveTypeDocs;
     if (tsMorph.Node.isTypeLiteral(valueNode)) {
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
@@ -370,6 +381,8 @@ function collectVerbEntries(input) {
                 var leaf = leafNode ? (_readTupleParamsResult1 = readTupleParamsResult(leafNode)) !== null && _readTupleParamsResult1 !== void 0 ? _readTupleParamsResult1 : readBareParams(leafNode) : undefined;
                 var paramsDocs = resolveTypeDocs(leaf === null || leaf === void 0 ? void 0 : leaf.params);
                 var resultDocs = resolveTypeDocs(leaf === null || leaf === void 0 ? void 0 : leaf.result);
+                var mcpResultTypeName = readJsDocTagValue(specMember, DBX_MODEL_API_MCP_RESULT_MARKER);
+                var mcpResultDocs = resolveTypeDocs(mcpResultTypeName);
                 entries.push({
                     model: modelName,
                     verb: verb,
@@ -382,7 +395,10 @@ function collectVerbEntries(input) {
                     paramsFields: paramsDocs === null || paramsDocs === void 0 ? void 0 : paramsDocs.fields,
                     paramsHasApiParamsTag: paramsDocs === null || paramsDocs === void 0 ? void 0 : paramsDocs.hasApiParamsTag,
                     resultTypeDescription: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.typeDescription,
-                    resultFields: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.fields
+                    resultFields: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.fields,
+                    mcpResultTypeName: mcpResultTypeName,
+                    mcpResultTypeDescription: mcpResultDocs === null || mcpResultDocs === void 0 ? void 0 : mcpResultDocs.typeDescription,
+                    mcpResultFields: mcpResultDocs === null || mcpResultDocs === void 0 ? void 0 : mcpResultDocs.fields
                 });
             }
         } catch (err) {
@@ -404,6 +420,7 @@ function collectVerbEntries(input) {
     var leaf1 = (_readTupleParamsResult = readTupleParamsResult(valueNode)) !== null && _readTupleParamsResult !== void 0 ? _readTupleParamsResult : readBareParams(valueNode);
     var paramsDocs1 = resolveTypeDocs(leaf1 === null || leaf1 === void 0 ? void 0 : leaf1.params);
     var resultDocs1 = resolveTypeDocs(leaf1 === null || leaf1 === void 0 ? void 0 : leaf1.result);
+    var mcpResultDocs1 = resolveTypeDocs(fallbackMcpResultTypeName);
     entries.push({
         model: modelName,
         verb: verb,
@@ -416,7 +433,10 @@ function collectVerbEntries(input) {
         paramsFields: paramsDocs1 === null || paramsDocs1 === void 0 ? void 0 : paramsDocs1.fields,
         paramsHasApiParamsTag: paramsDocs1 === null || paramsDocs1 === void 0 ? void 0 : paramsDocs1.hasApiParamsTag,
         resultTypeDescription: resultDocs1 === null || resultDocs1 === void 0 ? void 0 : resultDocs1.typeDescription,
-        resultFields: resultDocs1 === null || resultDocs1 === void 0 ? void 0 : resultDocs1.fields
+        resultFields: resultDocs1 === null || resultDocs1 === void 0 ? void 0 : resultDocs1.fields,
+        mcpResultTypeName: fallbackMcpResultTypeName,
+        mcpResultTypeDescription: mcpResultDocs1 === null || mcpResultDocs1 === void 0 ? void 0 : mcpResultDocs1.typeDescription,
+        mcpResultFields: mcpResultDocs1 === null || mcpResultDocs1 === void 0 ? void 0 : mcpResultDocs1.fields
     });
 }
 function readTupleParamsResult(node) {
@@ -569,6 +589,64 @@ function readTypeDocs(sourceFile, typeName) {
     }
     return result;
 }
+/**
+ * Reads the value token of a JSDoc tag (e.g. the `Foo` in `@dbxModelApiMcpResult Foo`).
+ *
+ * Used for value-carrying tags like `@dbxModelApiMcpResult` where the first token after the tag
+ * name names a type. Returns the first whitespace-delimited token of the tag's comment text.
+ *
+ * @param node - Any JSDocable ts-morph node (property signature, etc.).
+ * @param tagName - Tag name without the leading `@` (e.g. `'dbxModelApiMcpResult'`).
+ * @returns The first token of the tag's value, or `undefined` when the tag is absent or empty.
+ */ function readJsDocTagValue(node, tagName) {
+    var result;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = node.getJsDocs()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var doc = _step.value;
+            var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+            try {
+                for(var _iterator1 = doc.getTags()[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                    var tag = _step1.value;
+                    if (tag.getTagName() === tagName) {
+                        var _tag_getCommentText;
+                        var token = (_tag_getCommentText = tag.getCommentText()) === null || _tag_getCommentText === void 0 ? void 0 : _tag_getCommentText.trim().split(/\s+/)[0];
+                        if (token) {
+                            result = token;
+                        }
+                    }
+                }
+            } catch (err) {
+                _didIteratorError1 = true;
+                _iteratorError1 = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                        _iterator1.return();
+                    }
+                } finally{
+                    if (_didIteratorError1) {
+                        throw _iteratorError1;
+                    }
+                }
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return result;
+}
 function readJsDocSummary(node) {
     var result;
     var docs = node.getJsDocs();
@@ -617,7 +695,9 @@ var READ_LEVEL_VALUES = new Set([
     'permissions'
 ]);
 var SERVICE_FACTORY_TAG = 'dbxModelServiceFactory';
+var MCP_TOOL_NAME_SEGMENT_TAG = 'dbxModelMcpToolNameSegment';
 var MODEL_TYPE_VALUE_PATTERN = /^[a-z][A-Za-z0-9_$]*$/;
+var TOOL_NAME_SEGMENT_PATTERN = /^[A-Za-z][A-Za-z0-9_$]*$/;
 /**
  * TS utility/structural wrappers that don't change the field surface for
  * inheritance walks — `Partial<T>`, `Required<T>`, `Readonly<T>`,
@@ -803,6 +883,7 @@ function buildInterface(decl) {
     var jsDocs = decl.getJsDocs();
     var hasDbxModelTag = jsDocsHaveTag(jsDocs, 'dbxModel');
     var dbxModelRead = readDbxModelReadTag(jsDocs);
+    var mcpToolNameSegment = readMcpToolNameSegmentTag(jsDocs);
     var extendsNames = decl.getExtends().map(resolveExtendsName);
     var props = [];
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
@@ -847,8 +928,61 @@ function buildInterface(decl) {
         props: props
     }, dbxModelRead === undefined ? {} : {
         dbxModelRead: dbxModelRead
+    }, mcpToolNameSegment === undefined ? {} : {
+        mcpToolNameSegment: mcpToolNameSegment
     });
 }
+function readMcpToolNameSegmentTag(jsDocs) {
+    var result;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = jsDocs[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var doc = _step.value;
+            var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+            try {
+                for(var _iterator1 = doc.getTags()[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                    var tag = _step1.value;
+                    var _tag_getCommentText;
+                    if (tag.getTagName() !== MCP_TOOL_NAME_SEGMENT_TAG) continue;
+                    if (result !== undefined) continue;
+                    var raw = (_tag_getCommentText = tag.getCommentText()) === null || _tag_getCommentText === void 0 ? void 0 : _tag_getCommentText.trim();
+                    if (raw === undefined || raw.length === 0) continue;
+                    var firstToken = raw.split(/\s+/)[0];
+                    if (TOOL_NAME_SEGMENT_PATTERN.test(firstToken)) {
+                        result = firstToken;
+                    }
+                }
+            } catch (err) {
+                _didIteratorError1 = true;
+                _iteratorError1 = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                        _iterator1.return();
+                    }
+                } finally{
+                    if (_didIteratorError1) {
+                        throw _iteratorError1;
+                    }
+                }
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return result;
+}
 function readDbxModelReadTag(jsDocs) {
     var result;
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;

package/manifest-extract/index.esm.js

@@ -55,6 +55,11 @@ var SUPPORTED_VERBS = new Set([
     'query',
     'invoke'
 ]);
+/**
+ * JSDoc tag (without leading `@`) on a CRUD leaf naming the interface that a handler's
+ * `mapSuccessfulResult` produces for MCP. When present, the MCP manifest output schema is
+ * synthesized from this type instead of the raw result type.
+ */ var DBX_MODEL_API_MCP_RESULT_MARKER = 'dbxModelApiMcpResult';
 /**
  * Walks a `<model>.api.ts` source and returns one {@link CrudEntry} per
  * callable leaf (CRUD or standalone). Best-effort: malformed configs return
@@ -134,6 +139,7 @@ function extractCrudEntries(source) {
                                     valueNode: verbValueNode,
                                     entries: entries,
                                     fallbackDescription: readJsDocSummary(verbMember),
+                                    fallbackMcpResultTypeName: readJsDocTagValue(verbMember, DBX_MODEL_API_MCP_RESULT_MARKER),
                                     resolveTypeDocs: resolveTypeDocs
                                 });
                             }
@@ -185,6 +191,8 @@ function extractCrudEntries(source) {
                     var tuple = valueNode1 ? readTupleParamsResult(valueNode1) : undefined;
                     var paramsDocs = resolveTypeDocs(tuple === null || tuple === void 0 ? void 0 : tuple.params);
                     var resultDocs = resolveTypeDocs(tuple === null || tuple === void 0 ? void 0 : tuple.result);
+                    var mcpResultTypeName = readJsDocTagValue(member1, DBX_MODEL_API_MCP_RESULT_MARKER);
+                    var mcpResultDocs = resolveTypeDocs(mcpResultTypeName);
                     entries.push({
                         model: key,
                         verb: 'standalone',
@@ -197,7 +205,10 @@ function extractCrudEntries(source) {
                         paramsFields: paramsDocs === null || paramsDocs === void 0 ? void 0 : paramsDocs.fields,
                         paramsHasApiParamsTag: paramsDocs === null || paramsDocs === void 0 ? void 0 : paramsDocs.hasApiParamsTag,
                         resultTypeDescription: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.typeDescription,
-                        resultFields: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.fields
+                        resultFields: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.fields,
+                        mcpResultTypeName: mcpResultTypeName,
+                        mcpResultTypeDescription: mcpResultDocs === null || mcpResultDocs === void 0 ? void 0 : mcpResultDocs.typeDescription,
+                        mcpResultFields: mcpResultDocs === null || mcpResultDocs === void 0 ? void 0 : mcpResultDocs.fields
                     });
                 }
             } catch (err) {
@@ -353,7 +364,7 @@ function isNullLiteralType(node) {
 }
 function collectVerbEntries(input) {
     var _readTupleParamsResult;
-    var modelName = input.modelName, verb = input.verb, valueNode = input.valueNode, entries = input.entries, fallbackDescription = input.fallbackDescription, resolveTypeDocs = input.resolveTypeDocs;
+    var modelName = input.modelName, verb = input.verb, valueNode = input.valueNode, entries = input.entries, fallbackDescription = input.fallbackDescription, fallbackMcpResultTypeName = input.fallbackMcpResultTypeName, resolveTypeDocs = input.resolveTypeDocs;
     if (Node.isTypeLiteral(valueNode)) {
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
@@ -368,6 +379,8 @@ function collectVerbEntries(input) {
                 var leaf = leafNode ? (_readTupleParamsResult1 = readTupleParamsResult(leafNode)) !== null && _readTupleParamsResult1 !== void 0 ? _readTupleParamsResult1 : readBareParams(leafNode) : undefined;
                 var paramsDocs = resolveTypeDocs(leaf === null || leaf === void 0 ? void 0 : leaf.params);
                 var resultDocs = resolveTypeDocs(leaf === null || leaf === void 0 ? void 0 : leaf.result);
+                var mcpResultTypeName = readJsDocTagValue(specMember, DBX_MODEL_API_MCP_RESULT_MARKER);
+                var mcpResultDocs = resolveTypeDocs(mcpResultTypeName);
                 entries.push({
                     model: modelName,
                     verb: verb,
@@ -380,7 +393,10 @@ function collectVerbEntries(input) {
                     paramsFields: paramsDocs === null || paramsDocs === void 0 ? void 0 : paramsDocs.fields,
                     paramsHasApiParamsTag: paramsDocs === null || paramsDocs === void 0 ? void 0 : paramsDocs.hasApiParamsTag,
                     resultTypeDescription: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.typeDescription,
-                    resultFields: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.fields
+                    resultFields: resultDocs === null || resultDocs === void 0 ? void 0 : resultDocs.fields,
+                    mcpResultTypeName: mcpResultTypeName,
+                    mcpResultTypeDescription: mcpResultDocs === null || mcpResultDocs === void 0 ? void 0 : mcpResultDocs.typeDescription,
+                    mcpResultFields: mcpResultDocs === null || mcpResultDocs === void 0 ? void 0 : mcpResultDocs.fields
                 });
             }
         } catch (err) {
@@ -402,6 +418,7 @@ function collectVerbEntries(input) {
     var leaf1 = (_readTupleParamsResult = readTupleParamsResult(valueNode)) !== null && _readTupleParamsResult !== void 0 ? _readTupleParamsResult : readBareParams(valueNode);
     var paramsDocs1 = resolveTypeDocs(leaf1 === null || leaf1 === void 0 ? void 0 : leaf1.params);
     var resultDocs1 = resolveTypeDocs(leaf1 === null || leaf1 === void 0 ? void 0 : leaf1.result);
+    var mcpResultDocs1 = resolveTypeDocs(fallbackMcpResultTypeName);
     entries.push({
         model: modelName,
         verb: verb,
@@ -414,7 +431,10 @@ function collectVerbEntries(input) {
         paramsFields: paramsDocs1 === null || paramsDocs1 === void 0 ? void 0 : paramsDocs1.fields,
         paramsHasApiParamsTag: paramsDocs1 === null || paramsDocs1 === void 0 ? void 0 : paramsDocs1.hasApiParamsTag,
         resultTypeDescription: resultDocs1 === null || resultDocs1 === void 0 ? void 0 : resultDocs1.typeDescription,
-        resultFields: resultDocs1 === null || resultDocs1 === void 0 ? void 0 : resultDocs1.fields
+        resultFields: resultDocs1 === null || resultDocs1 === void 0 ? void 0 : resultDocs1.fields,
+        mcpResultTypeName: fallbackMcpResultTypeName,
+        mcpResultTypeDescription: mcpResultDocs1 === null || mcpResultDocs1 === void 0 ? void 0 : mcpResultDocs1.typeDescription,
+        mcpResultFields: mcpResultDocs1 === null || mcpResultDocs1 === void 0 ? void 0 : mcpResultDocs1.fields
     });
 }
 function readTupleParamsResult(node) {
@@ -567,6 +587,64 @@ function readTypeDocs(sourceFile, typeName) {
     }
     return result;
 }
+/**
+ * Reads the value token of a JSDoc tag (e.g. the `Foo` in `@dbxModelApiMcpResult Foo`).
+ *
+ * Used for value-carrying tags like `@dbxModelApiMcpResult` where the first token after the tag
+ * name names a type. Returns the first whitespace-delimited token of the tag's comment text.
+ *
+ * @param node - Any JSDocable ts-morph node (property signature, etc.).
+ * @param tagName - Tag name without the leading `@` (e.g. `'dbxModelApiMcpResult'`).
+ * @returns The first token of the tag's value, or `undefined` when the tag is absent or empty.
+ */ function readJsDocTagValue(node, tagName) {
+    var result;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = node.getJsDocs()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var doc = _step.value;
+            var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+            try {
+                for(var _iterator1 = doc.getTags()[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                    var tag = _step1.value;
+                    if (tag.getTagName() === tagName) {
+                        var _tag_getCommentText;
+                        var token = (_tag_getCommentText = tag.getCommentText()) === null || _tag_getCommentText === void 0 ? void 0 : _tag_getCommentText.trim().split(/\s+/)[0];
+                        if (token) {
+                            result = token;
+                        }
+                    }
+                }
+            } catch (err) {
+                _didIteratorError1 = true;
+                _iteratorError1 = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                        _iterator1.return();
+                    }
+                } finally{
+                    if (_didIteratorError1) {
+                        throw _iteratorError1;
+                    }
+                }
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return result;
+}
 function readJsDocSummary(node) {
     var result;
     var docs = node.getJsDocs();
@@ -615,7 +693,9 @@ var READ_LEVEL_VALUES = new Set([
     'permissions'
 ]);
 var SERVICE_FACTORY_TAG = 'dbxModelServiceFactory';
+var MCP_TOOL_NAME_SEGMENT_TAG = 'dbxModelMcpToolNameSegment';
 var MODEL_TYPE_VALUE_PATTERN = /^[a-z][A-Za-z0-9_$]*$/;
+var TOOL_NAME_SEGMENT_PATTERN = /^[A-Za-z][A-Za-z0-9_$]*$/;
 /**
  * TS utility/structural wrappers that don't change the field surface for
  * inheritance walks — `Partial<T>`, `Required<T>`, `Readonly<T>`,
@@ -801,6 +881,7 @@ function buildInterface(decl) {
     var jsDocs = decl.getJsDocs();
     var hasDbxModelTag = jsDocsHaveTag(jsDocs, 'dbxModel');
     var dbxModelRead = readDbxModelReadTag(jsDocs);
+    var mcpToolNameSegment = readMcpToolNameSegmentTag(jsDocs);
     var extendsNames = decl.getExtends().map(resolveExtendsName);
     var props = [];
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
@@ -845,8 +926,61 @@ function buildInterface(decl) {
         props: props
     }, dbxModelRead === undefined ? {} : {
         dbxModelRead: dbxModelRead
+    }, mcpToolNameSegment === undefined ? {} : {
+        mcpToolNameSegment: mcpToolNameSegment
     });
 }
+function readMcpToolNameSegmentTag(jsDocs) {
+    var result;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = jsDocs[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var doc = _step.value;
+            var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+            try {
+                for(var _iterator1 = doc.getTags()[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                    var tag = _step1.value;
+                    var _tag_getCommentText;
+                    if (tag.getTagName() !== MCP_TOOL_NAME_SEGMENT_TAG) continue;
+                    if (result !== undefined) continue;
+                    var raw = (_tag_getCommentText = tag.getCommentText()) === null || _tag_getCommentText === void 0 ? void 0 : _tag_getCommentText.trim();
+                    if (raw === undefined || raw.length === 0) continue;
+                    var firstToken = raw.split(/\s+/)[0];
+                    if (TOOL_NAME_SEGMENT_PATTERN.test(firstToken)) {
+                        result = firstToken;
+                    }
+                }
+            } catch (err) {
+                _didIteratorError1 = true;
+                _iteratorError1 = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                        _iterator1.return();
+                    }
+                } finally{
+                    if (_didIteratorError1) {
+                        throw _iteratorError1;
+                    }
+                }
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return result;
+}
 function readDbxModelReadTag(jsDocs) {
     var result;
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;

package/manifest-extract/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dereekb/dbx-cli/manifest-extract",
-  "version": "13.13.0",
+  "version": "13.15.0",
   "sideEffects": false,
   "peerDependencies": {
     "ts-morph": "^21.0.0"
   },
   "devDependencies": {
-    "@dereekb/firebase": "13.13.0"
+    "@dereekb/firebase": "13.15.0"
   },
   "exports": {
     "./package.json": "./package.json",

package/manifest-extract/src/lib/types.d.ts

@@ -77,6 +77,20 @@ export interface CrudEntry {
      * Per-field JSDocs read from the result interface's properties.
      */
     readonly resultFields?: readonly CrudEntryDocField[];
+    /**
+     * Name of the MCP-mapped result interface declared via the `@dbxModelApiMcpResult <TypeName>`
+     * JSDoc tag on the leaf. Present only when a handler remaps its success result for MCP; the
+     * MCP manifest output schema is synthesized from this type instead of the raw result.
+     */
+    readonly mcpResultTypeName?: string;
+    /**
+     * JSDoc summary on the MCP-mapped result interface itself (resolved from `mcpResultTypeName`).
+     */
+    readonly mcpResultTypeDescription?: string;
+    /**
+     * Per-field JSDocs read from the MCP-mapped result interface's properties.
+     */
+    readonly mcpResultFields?: readonly CrudEntryDocField[];
 }
 export interface CrudExtraction {
     /**
@@ -142,6 +156,11 @@ export interface ModelExtractionInterface {
      * / `permissions`). Absent when the interface omits the tag or declares an invalid value.
      */
     readonly dbxModelRead?: 'system' | 'owner' | 'admin-only' | 'permissions';
+    /**
+     * Per-model MCP tool-name segment from `@dbxModelMcpToolNameSegment <segment>`. Replaces the model
+     * type in generated tool names (e.g. the collection prefix). Absent when the tag is omitted or invalid.
+     */
+    readonly mcpToolNameSegment?: string;
 }
 /**
  * One field inside a converter's `fields` map.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-cli",
-  "version": "13.13.0",
+  "version": "13.15.0",
   "type": "module",
   "sideEffects": false,
   "bin": {
@@ -28,12 +28,21 @@
       "import": "./manifest-extract/index.cjs.mjs",
       "default": "./manifest-extract/index.cjs.js"
     },
+    "./model-test": {
+      "module": "./model-test/index.esm.js",
+      "types": "./model-test/index.d.ts",
+      "import": "./model-test/index.cjs.mjs",
+      "default": "./model-test/index.cjs.js"
+    },
     "./test": {
       "module": "./test/index.esm.js",
       "types": "./test/index.d.ts",
       "import": "./test/index.cjs.mjs",
       "default": "./test/index.cjs.js"
     },
+    "./validate": {
+      "default": "./validate/index.js"
+    },
     "./package.json": "./package.json",
     ".": {
       "import": "./index.esm.js",
@@ -41,11 +50,11 @@
     }
   },
   "peerDependencies": {
-    "@dereekb/date": "13.13.0",
-    "@dereekb/firebase": "13.13.0",
-    "@dereekb/model": "13.13.0",
-    "@dereekb/nestjs": "13.13.0",
-    "@dereekb/util": "13.13.0",
+    "@dereekb/date": "13.15.0",
+    "@dereekb/firebase": "13.15.0",
+    "@dereekb/model": "13.15.0",
+    "@dereekb/nestjs": "13.15.0",
+    "@dereekb/util": "13.15.0",
     "@nestjs/common": "^11.1.19",
     "arktype": "^2.2.0",
     "jiti": "2.6.1",