@dereekb/dbx-components-mcp 13.10.0 → 13.10.2

package/dbx-components-mcp.js

@@ -5,10 +5,10 @@ const require = __createRequire(import.meta.url);
 // packages/dbx-components-mcp/package.json
 var package_default = {
   name: "@dereekb/dbx-components-mcp",
-  version: "13.10.0",
+  version: "13.10.2",
   type: "module",
   bin: {
-    "dbx-components-mcp": "./dbx-components-mcp.js"
+    "dbx-components-mcp": "dbx-components-mcp.js"
   },
   dependencies: {
     "@modelcontextprotocol/sdk": "^1.0.0",
@@ -799,10 +799,10 @@ var defaultGlobber = async (input) => {
   }
   return matches;
 };
-async function loadPackageName(packagePath, readFile6) {
+async function loadPackageName(packagePath, readFile8) {
   let raw = null;
   try {
-    raw = await readFile6(packagePath);
+    raw = await readFile8(packagePath);
   } catch {
     raw = null;
   }
@@ -862,15 +862,15 @@ function globToRegex(pattern) {
 var DEFAULT_READ_FILE = defaultReadFile;
 var DEFAULT_GLOBBER = defaultGlobber;
 async function buildForgeFieldsManifest(input) {
-  const { projectRoot, generator, readFile: readFile6 = DEFAULT_READ_FILE, globber = DEFAULT_GLOBBER, now = () => /* @__PURE__ */ new Date() } = input;
+  const { projectRoot, generator, readFile: readFile8 = DEFAULT_READ_FILE, globber = DEFAULT_GLOBBER, now = () => /* @__PURE__ */ new Date() } = input;
   const configPath = resolve(projectRoot, FORGE_FIELDS_SCAN_CONFIG_FILENAME);
   const packagePath = resolve(projectRoot, "package.json");
-  const configOutcome = await loadScanConfig(configPath, readFile6);
+  const configOutcome = await loadScanConfig(configPath, readFile8);
   if (configOutcome.kind !== "ok") {
     return configOutcome.outcome;
   }
   const scanSection = configOutcome.section;
-  const packageOutcome = await loadPackageName(packagePath, readFile6);
+  const packageOutcome = await loadPackageName(packagePath, readFile8);
   if (packageOutcome.kind !== "ok") {
     return packageOutcome.outcome;
   }
@@ -883,7 +883,7 @@ async function buildForgeFieldsManifest(input) {
   const project = new Project({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   for (const relPath of filePaths) {
     const absolute = resolve(projectRoot, relPath);
-    const text = await readFile6(absolute);
+    const text = await readFile8(absolute);
     project.createSourceFile(absolute, text, { overwrite: true });
   }
   const extractResult = extractForgeFieldEntries({ project });
@@ -914,10 +914,10 @@ async function buildForgeFieldsManifest(input) {
   }
   return outcome;
 }
-async function loadScanConfig(configPath, readFile6) {
+async function loadScanConfig(configPath, readFile8) {
   let raw = null;
   try {
-    raw = await readFile6(configPath);
+    raw = await readFile8(configPath);
   } catch {
     raw = null;
   }
@@ -983,7 +983,7 @@ import { resolve as resolve2 } from "node:path";
 var DEFAULT_READ_FILE2 = (path) => nodeReadFile2(path, "utf-8");
 var DEFAULT_WRITE_FILE = (path, data) => nodeWriteFile(path, data, "utf-8");
 async function runScanCliBase(input, config) {
-  const { argv, cwd, generator, readFile: readFile6 = DEFAULT_READ_FILE2, writeFile = DEFAULT_WRITE_FILE, globber, now, log = console.log, errorLog = console.error } = input;
+  const { argv, cwd, generator, readFile: readFile8 = DEFAULT_READ_FILE2, writeFile: writeFile2 = DEFAULT_WRITE_FILE, globber, now, log = console.log, errorLog = console.error } = input;
   let result;
   const args = parseScanArgs(argv);
   if (args.kind === "parse-error") {
@@ -999,8 +999,8 @@ async function runScanCliBase(input, config) {
     result = { exitCode: 2 };
   } else {
     const projectRoot = resolve2(cwd, args.project);
-    const outcome = await config.buildManifest({ projectRoot, generator, readFile: readFile6, globber, now });
-    result = await handleOutcome({ outcome, args, projectArg: args.project, readFile: readFile6, writeFile, log, errorLog, config });
+    const outcome = await config.buildManifest({ projectRoot, generator, readFile: readFile8, globber, now });
+    result = await handleOutcome({ outcome, args, projectArg: args.project, readFile: readFile8, writeFile: writeFile2, log, errorLog, config });
   }
   return result;
 }
@@ -1054,7 +1054,7 @@ function parseScanArgs(argv) {
   return result;
 }
 async function handleOutcome(input) {
-  const { outcome, args, projectArg, readFile: readFile6, writeFile, log, errorLog, config } = input;
+  const { outcome, args, projectArg, readFile: readFile8, writeFile: writeFile2, log, errorLog, config } = input;
   let result;
   if (outcome.kind === "success") {
     const finalOutPath = args.out === void 0 ? outcome.outPath : resolve2(outcome.outPath, "..", args.out);
@@ -1062,7 +1062,7 @@ async function handleOutcome(input) {
     if (args.check) {
       let existing = null;
       try {
-        existing = await readFile6(finalOutPath);
+        existing = await readFile8(finalOutPath);
       } catch {
         existing = null;
       }
@@ -1076,7 +1076,7 @@ async function handleOutcome(input) {
         result = { exitCode: 1 };
       }
     } else {
-      await writeFile(finalOutPath, serialized);
+      await writeFile2(finalOutPath, serialized);
       log(`Wrote manifest: ${finalOutPath} (${outcome.manifest.entries.length} entries, ${outcome.scannedFileCount} files scanned)`);
       for (const warning of outcome.extractWarnings) {
         errorLog(`extract-warning: ${config.formatExtractWarning(warning)}`);
@@ -1334,8 +1334,8 @@ function parseExampleTag(text) {
   let result;
   if (fenceMatch) {
     const caption = fenceMatch[1].trim();
-    const code10 = fenceMatch[2];
-    result = caption.length > 0 ? { caption, code: code10 } : { code: code10 };
+    const code11 = fenceMatch[2];
+    result = caption.length > 0 ? { caption, code: code11 } : { code: code11 };
   } else {
     const standaloneFence = /^```[a-zA-Z]*\n([\s\S]*?)\n```\s*$/.exec(trimmed);
     if (standaloneFence) {
@@ -1542,15 +1542,15 @@ var SCAN_CONFIG_FILENAME = "dbx-mcp.scan.json";
 var DEFAULT_READ_FILE3 = defaultReadFile;
 var DEFAULT_GLOBBER2 = defaultGlobber;
 async function buildManifest(input) {
-  const { projectRoot, generator, readFile: readFile6 = DEFAULT_READ_FILE3, globber = DEFAULT_GLOBBER2, now = () => /* @__PURE__ */ new Date() } = input;
+  const { projectRoot, generator, readFile: readFile8 = DEFAULT_READ_FILE3, globber = DEFAULT_GLOBBER2, now = () => /* @__PURE__ */ new Date() } = input;
   const configPath = resolve3(projectRoot, SCAN_CONFIG_FILENAME);
   const packagePath = resolve3(projectRoot, "package.json");
-  const configOutcome = await loadScanConfig2(configPath, readFile6);
+  const configOutcome = await loadScanConfig2(configPath, readFile8);
   if (configOutcome.kind !== "ok") {
     return configOutcome.outcome;
   }
   const scanConfig = configOutcome.config;
-  const packageOutcome = await loadPackageName(packagePath, readFile6);
+  const packageOutcome = await loadPackageName(packagePath, readFile8);
   if (packageOutcome.kind !== "ok") {
     return packageOutcome.outcome;
   }
@@ -1563,7 +1563,7 @@ async function buildManifest(input) {
   const project = new Project2({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   for (const relPath of filePaths) {
     const absolute = resolve3(projectRoot, relPath);
-    const text = await readFile6(absolute);
+    const text = await readFile8(absolute);
     project.createSourceFile(absolute, text, { overwrite: true });
   }
   const extracted = extractEntries({ project });
@@ -1592,10 +1592,10 @@ async function buildManifest(input) {
   }
   return outcome;
 }
-async function loadScanConfig2(configPath, readFile6) {
+async function loadScanConfig2(configPath, readFile8) {
   let raw = null;
   try {
-    raw = await readFile6(configPath);
+    raw = await readFile8(configPath);
   } catch {
     raw = null;
   }
@@ -1667,7 +1667,7 @@ var USAGE2 = [
 var DEFAULT_READ_FILE4 = (path) => nodeReadFile3(path, "utf-8");
 var DEFAULT_WRITE_FILE2 = (path, data) => nodeWriteFile2(path, data, "utf-8");
 async function runScanCli(input) {
-  const { argv, cwd, generator, readFile: readFile6 = DEFAULT_READ_FILE4, writeFile = DEFAULT_WRITE_FILE2, globber, now, log = console.log, errorLog = console.error } = input;
+  const { argv, cwd, generator, readFile: readFile8 = DEFAULT_READ_FILE4, writeFile: writeFile2 = DEFAULT_WRITE_FILE2, globber, now, log = console.log, errorLog = console.error } = input;
   let result;
   const args = parseArgs(argv);
   if (args.kind === "parse-error") {
@@ -1683,8 +1683,8 @@ async function runScanCli(input) {
     result = { exitCode: 2 };
   } else {
     const projectRoot = resolve4(cwd, args.project);
-    const outcome = await buildManifest({ projectRoot, generator, readFile: readFile6, globber, now });
-    result = await handleOutcome2({ outcome, args, projectArg: args.project, readFile: readFile6, writeFile, log, errorLog });
+    const outcome = await buildManifest({ projectRoot, generator, readFile: readFile8, globber, now });
+    result = await handleOutcome2({ outcome, args, projectArg: args.project, readFile: readFile8, writeFile: writeFile2, log, errorLog });
   }
   return result;
 }
@@ -1738,24 +1738,24 @@ function parseArgs(argv) {
   return result;
 }
 async function handleSuccessOutcome(input) {
-  const { outcome, args, projectArg, readFile: readFile6, writeFile, log, errorLog } = input;
+  const { outcome, args, projectArg, readFile: readFile8, writeFile: writeFile2, log, errorLog } = input;
   const finalOutPath = args.out === void 0 ? outcome.outPath : resolve4(outcome.outPath, "..", args.out);
   const serialized = serializeManifest(outcome.manifest);
   let result;
   if (args.check) {
-    result = await checkManifest({ finalOutPath, serialized, outcome, projectArg, readFile: readFile6, log, errorLog });
+    result = await checkManifest({ finalOutPath, serialized, outcome, projectArg, readFile: readFile8, log, errorLog });
   } else {
-    await writeFile(finalOutPath, serialized);
+    await writeFile2(finalOutPath, serialized);
     log(`Wrote manifest: ${finalOutPath} (${outcome.manifest.entries.length} entries, ${outcome.scannedFileCount} files scanned)`);
     result = { exitCode: 0 };
   }
   return result;
 }
 async function checkManifest(input) {
-  const { finalOutPath, serialized, outcome, projectArg, readFile: readFile6, log, errorLog } = input;
+  const { finalOutPath, serialized, outcome, projectArg, readFile: readFile8, log, errorLog } = input;
   let existing;
   try {
-    existing = await readFile6(finalOutPath);
+    existing = await readFile8(finalOutPath);
   } catch {
     existing = null;
   }
@@ -1950,13 +1950,13 @@ function parseDecoratorInput(property) {
     }
   }
   const required = requiredFromDecorator ?? !property.hasQuestionToken();
-  const type43 = property.getTypeNode()?.getText() ?? "unknown";
+  const type48 = property.getTypeNode()?.getText() ?? "unknown";
   const initializer = property.getInitializer();
   const defaultValue = initializer === void 0 ? void 0 : initializer.getText();
   return {
     propertyName,
     alias: alias ?? propertyName,
-    type: type43,
+    type: type48,
     required,
     description: readPropertyDescription(property),
     ...defaultValue === void 0 ? {} : { defaultValue }
@@ -2022,22 +2022,22 @@ function parseDecoratorOutput(property) {
     alias = decoratorArg.getLiteralText();
   }
   const initializer = property.getInitializer();
-  let type43 = "unknown";
+  let type48 = "unknown";
   if (initializer !== void 0 && Node4.isNewExpression(initializer)) {
     const typeArgs = initializer.getTypeArguments();
     if (typeArgs.length > 0) {
-      type43 = typeArgs[0].getText();
+      type48 = typeArgs[0].getText();
     }
   } else {
     const explicit = property.getTypeNode()?.getText();
     if (explicit !== void 0) {
-      type43 = explicit;
+      type48 = explicit;
     }
   }
   return {
     propertyName,
     name: alias ?? propertyName,
-    type: type43,
+    type: type48,
     description: readPropertyDescription(property)
   };
 }
@@ -2052,7 +2052,7 @@ function parseSignalOutput(property) {
   }
   const propertyName = property.getName();
   const typeArgs = initializer.getTypeArguments();
-  const type43 = typeArgs.length > 0 ? typeArgs[0].getText() : "void";
+  const type48 = typeArgs.length > 0 ? typeArgs[0].getText() : "void";
   const args = initializer.getArguments();
   let alias;
   if (args.length > 0 && Node4.isObjectLiteralExpression(args[0])) {
@@ -2061,7 +2061,7 @@ function parseSignalOutput(property) {
   return {
     propertyName,
     name: alias ?? propertyName,
-    type: type43,
+    type: type48,
     description: readPropertyDescription(property)
   };
 }
@@ -2448,15 +2448,15 @@ var UI_COMPONENTS_SCAN_CONFIG_FILENAME = "dbx-mcp.scan.json";
 var DEFAULT_READ_FILE5 = defaultReadFile;
 var DEFAULT_GLOBBER3 = defaultGlobber;
 async function buildUiComponentsManifest(input) {
-  const { projectRoot, generator, readFile: readFile6 = DEFAULT_READ_FILE5, globber = DEFAULT_GLOBBER3, now = () => /* @__PURE__ */ new Date() } = input;
+  const { projectRoot, generator, readFile: readFile8 = DEFAULT_READ_FILE5, globber = DEFAULT_GLOBBER3, now = () => /* @__PURE__ */ new Date() } = input;
   const configPath = resolve5(projectRoot, UI_COMPONENTS_SCAN_CONFIG_FILENAME);
   const packagePath = resolve5(projectRoot, "package.json");
-  const configOutcome = await loadScanConfig3(configPath, readFile6);
+  const configOutcome = await loadScanConfig3(configPath, readFile8);
   if (configOutcome.kind !== "ok") {
     return configOutcome.outcome;
   }
   const scanSection = configOutcome.section;
-  const packageOutcome = await loadPackageName(packagePath, readFile6);
+  const packageOutcome = await loadPackageName(packagePath, readFile8);
   if (packageOutcome.kind !== "ok") {
     return packageOutcome.outcome;
   }
@@ -2469,7 +2469,7 @@ async function buildUiComponentsManifest(input) {
   const project = new Project3({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   for (const relPath of filePaths) {
     const absolute = resolve5(projectRoot, relPath);
-    const text = await readFile6(absolute);
+    const text = await readFile8(absolute);
     project.createSourceFile(absolute, text, { overwrite: true });
   }
   const extractResult = extractUiEntries({ project });
@@ -2500,10 +2500,10 @@ async function buildUiComponentsManifest(input) {
   }
   return outcome;
 }
-async function loadScanConfig3(configPath, readFile6) {
+async function loadScanConfig3(configPath, readFile8) {
   let raw = null;
   try {
-    raw = await readFile6(configPath);
+    raw = await readFile8(configPath);
   } catch {
     raw = null;
   }
@@ -2642,11 +2642,11 @@ var DbxMcpConfig = type13({
 var CONFIG_FILENAME = "dbx-mcp.config.json";
 var DEFAULT_READ_FILE6 = (path) => nodeReadFile4(path, "utf-8");
 async function findAndLoadConfig(input) {
-  const { cwd, readFile: readFile6 = DEFAULT_READ_FILE6 } = input;
+  const { cwd, readFile: readFile8 = DEFAULT_READ_FILE6 } = input;
   const configPath = resolve6(cwd, CONFIG_FILENAME);
   let raw = null;
   try {
-    raw = await readFile6(configPath);
+    raw = await readFile8(configPath);
   } catch {
     raw = null;
   }
@@ -2911,10 +2911,10 @@ import { readFile as nodeReadFile5 } from "node:fs/promises";
 import { type as type16 } from "arktype";
 var DEFAULT_READ_FILE7 = (path) => nodeReadFile5(path, "utf-8");
 var SUPPORTED_VERSION = 1;
-async function loadFromSource(source, readFile6, schema) {
+async function loadFromSource(source, readFile8, schema) {
   let raw = null;
   try {
-    raw = await readFile6(source.path);
+    raw = await readFile8(source.path);
   } catch {
     raw = null;
   }
@@ -2971,12 +2971,12 @@ function warningSortKey(warning) {
   return key;
 }
 async function loadManifestsBase(input, config) {
-  const { sources, readFile: readFile6 = DEFAULT_READ_FILE7 } = input;
+  const { sources, readFile: readFile8 = DEFAULT_READ_FILE7 } = input;
   const { name, schema, extractIndexValue, buildEntryKey } = config;
   const successes = [];
   const warnings = [];
   for (const source of sources) {
-    const outcome = await loadFromSource(source, readFile6, schema);
+    const outcome = await loadFromSource(source, readFile8, schema);
     if (outcome.kind === "success") {
       successes.push({ source, manifest: outcome.manifest });
     } else if (isStrictSource(source)) {
@@ -3080,9 +3080,9 @@ var DEFAULT_BUNDLED_PATHS = () => {
   return DEFAULT_BUNDLED_FILENAMES.map((name) => resolve7(packageRoot, "generated", name));
 };
 async function loadActionRegistry(input) {
-  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS, readFile: readFile6 } = input;
+  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS, readFile: readFile8 } = input;
   const bundledSources = bundledManifestPaths().map((path) => ({ origin: "bundled", path }));
-  const configResult = await findAndLoadConfig({ cwd, readFile: readFile6 });
+  const configResult = await findAndLoadConfig({ cwd, readFile: readFile8 });
   const externalSources = [];
   if (configResult.config !== null && configResult.configPath !== null) {
     const baseDir = dirname(configResult.configPath);
@@ -3096,7 +3096,7 @@ async function loadActionRegistry(input) {
   let loaderWarnings = [];
   const sources = [...bundledSources, ...externalSources];
   if (sources.length > 0) {
-    const loaded = await loadActionManifests({ sources, readFile: readFile6 });
+    const loaded = await loadActionManifests({ sources, readFile: readFile8 });
     registry = createActionRegistry(loaded);
     loaderWarnings = loaded.warnings;
   }
@@ -3296,9 +3296,9 @@ var DEFAULT_BUNDLED_PATHS2 = () => {
   return DEFAULT_BUNDLED_FILENAMES2.map((name) => resolve8(packageRoot, "generated", name));
 };
 async function loadFilterRegistry(input) {
-  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS2, readFile: readFile6 } = input;
+  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS2, readFile: readFile8 } = input;
   const bundledSources = bundledManifestPaths().map((path) => ({ origin: "bundled", path }));
-  const configResult = await findAndLoadConfig({ cwd, readFile: readFile6 });
+  const configResult = await findAndLoadConfig({ cwd, readFile: readFile8 });
   const externalSources = [];
   if (configResult.config !== null && configResult.configPath !== null) {
     const baseDir = dirname2(configResult.configPath);
@@ -3312,7 +3312,7 @@ async function loadFilterRegistry(input) {
   let loaderWarnings = [];
   const sources = [...bundledSources, ...externalSources];
   if (sources.length > 0) {
-    const loaded = await loadFilterManifests({ sources, readFile: readFile6 });
+    const loaded = await loadFilterManifests({ sources, readFile: readFile8 });
     registry = createFilterRegistry(loaded);
     loaderWarnings = loaded.warnings;
   }
@@ -3543,9 +3543,9 @@ var DEFAULT_BUNDLED_PATHS3 = () => {
   return DEFAULT_BUNDLED_FILENAMES3.map((name) => resolve9(packageRoot, "generated", name));
 };
 async function loadForgeFieldRegistry(input) {
-  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS3, readFile: readFile6 } = input;
+  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS3, readFile: readFile8 } = input;
   const bundledSources = bundledManifestPaths().map((path) => ({ origin: "bundled", path }));
-  const configResult = await findAndLoadConfig({ cwd, readFile: readFile6 });
+  const configResult = await findAndLoadConfig({ cwd, readFile: readFile8 });
   const externalSources = [];
   if (configResult.config !== null && configResult.configPath !== null) {
     const baseDir = dirname3(configResult.configPath);
@@ -3559,7 +3559,7 @@ async function loadForgeFieldRegistry(input) {
   let loaderWarnings = [];
   const sources = [...bundledSources, ...externalSources];
   if (sources.length > 0) {
-    const loaded = await loadForgeFieldManifests({ sources, readFile: readFile6 });
+    const loaded = await loadForgeFieldManifests({ sources, readFile: readFile8 });
     registry = createForgeFieldRegistry(loaded);
     loaderWarnings = loaded.warnings;
   }
@@ -3725,9 +3725,9 @@ var DEFAULT_BUNDLED_PATHS4 = () => {
   return DEFAULT_BUNDLED_FILENAMES4.map((name) => resolve10(packageRoot, "generated", name));
 };
 async function loadPipeRegistry(input) {
-  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS4, readFile: readFile6 } = input;
+  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS4, readFile: readFile8 } = input;
   const bundledSources = bundledManifestPaths().map((path) => ({ origin: "bundled", path }));
-  const configResult = await findAndLoadConfig({ cwd, readFile: readFile6 });
+  const configResult = await findAndLoadConfig({ cwd, readFile: readFile8 });
   const externalSources = [];
   if (configResult.config !== null && configResult.configPath !== null) {
     const baseDir = dirname4(configResult.configPath);
@@ -3741,7 +3741,7 @@ async function loadPipeRegistry(input) {
   let loaderWarnings = [];
   const sources = [...bundledSources, ...externalSources];
   if (sources.length > 0) {
-    const loaded = await loadPipeManifests({ sources, readFile: readFile6 });
+    const loaded = await loadPipeManifests({ sources, readFile: readFile8 });
     registry = createPipeRegistry(loaded);
     loaderWarnings = loaded.warnings;
   }
@@ -3845,10 +3845,10 @@ function isCoreTopic(topic) {
 // packages/dbx-components-mcp/src/manifest/loader.ts
 var DEFAULT_READ_FILE8 = (path) => nodeReadFile6(path, "utf-8");
 var SUPPORTED_VERSION2 = 1;
-async function loadFromSource2(source, readFile6) {
+async function loadFromSource2(source, readFile8) {
   let raw = null;
   try {
-    raw = await readFile6(source.path);
+    raw = await readFile8(source.path);
   } catch {
   }
   let result;
@@ -3935,11 +3935,11 @@ function warningSortKey2(warning) {
   return key;
 }
 async function loadSemanticTypeManifests(input) {
-  const { sources, readFile: readFile6 = DEFAULT_READ_FILE8 } = input;
+  const { sources, readFile: readFile8 = DEFAULT_READ_FILE8 } = input;
   const successes = [];
   const warnings = [];
   for (const source of sources) {
-    const outcome = await loadFromSource2(source, readFile6);
+    const outcome = await loadFromSource2(source, readFile8);
     if (outcome.kind === "success") {
       successes.push({ source, manifest: outcome.manifest });
     } else if (isStrictSource2(source)) {
@@ -4036,9 +4036,9 @@ var DEFAULT_BUNDLED_PATHS5 = () => {
   return DEFAULT_BUNDLED_FILENAMES5.map((name) => resolve11(packageRoot, "generated", name));
 };
 async function loadSemanticTypeRegistry(input) {
-  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS5, readFile: readFile6 } = input;
+  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS5, readFile: readFile8 } = input;
   const bundledSources = bundledManifestPaths().map((path) => ({ origin: "bundled", path }));
-  const configResult = await findAndLoadConfig({ cwd, readFile: readFile6 });
+  const configResult = await findAndLoadConfig({ cwd, readFile: readFile8 });
   const externalSources = [];
   if (configResult.config !== null && configResult.configPath !== null) {
     const baseDir = dirname5(configResult.configPath);
@@ -4052,7 +4052,7 @@ async function loadSemanticTypeRegistry(input) {
   let loaderWarnings = [];
   const sources = [...bundledSources, ...externalSources];
   if (sources.length > 0) {
-    const loaded = await loadSemanticTypeManifests({ sources, readFile: readFile6 });
+    const loaded = await loadSemanticTypeManifests({ sources, readFile: readFile8 });
     registry = createSemanticTypeRegistry(loaded);
     loaderWarnings = loaded.warnings;
   }
@@ -4197,9 +4197,9 @@ var DEFAULT_BUNDLED_PATHS6 = () => {
   return DEFAULT_BUNDLED_FILENAMES6.map((name) => resolve12(packageRoot, "generated", name));
 };
 async function loadUiComponentRegistry(input) {
-  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS6, readFile: readFile6 } = input;
+  const { cwd, bundledManifestPaths = DEFAULT_BUNDLED_PATHS6, readFile: readFile8 } = input;
   const bundledSources = bundledManifestPaths().map((path) => ({ origin: "bundled", path }));
-  const configResult = await findAndLoadConfig({ cwd, readFile: readFile6 });
+  const configResult = await findAndLoadConfig({ cwd, readFile: readFile8 });
   const externalSources = [];
   if (configResult.config !== null && configResult.configPath !== null) {
     const baseDir = dirname6(configResult.configPath);
@@ -4213,7 +4213,7 @@ async function loadUiComponentRegistry(input) {
   let loaderWarnings = [];
   const sources = [...bundledSources, ...externalSources];
   if (sources.length > 0) {
-    const loaded = await loadUiComponentManifests({ sources, readFile: readFile6 });
+    const loaded = await loadUiComponentManifests({ sources, readFile: readFile8 });
     registry = createUiComponentRegistry(loaded);
     loaderWarnings = loaded.warnings;
   }
@@ -4227,12 +4227,6 @@ async function loadUiComponentRegistry(input) {
   return result;
 }
 
-// packages/dbx-components-mcp/src/resources/form-fields.resource.ts
-import { ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
-
-// packages/dbx-components-mcp/src/registry/form-fields.ts
-var FORM_TIER_ORDER = ["field-factory", "field-derivative", "composite-builder", "template-builder", "primitive"];
-
 // packages/dbx-components-mcp/generated/firebase-models.generated.ts
 var FIREBASE_MODELS = [
   {
@@ -4301,7 +4295,8 @@ var FIREBASE_MODELS = [
     ],
     enums: [],
     detectionHints: ["m", "r", "w"],
-    modelGroup: "Notification"
+    modelGroup: "Notification",
+    collectionKind: "root"
   },
   {
     name: "NotificationSummary",
@@ -4377,7 +4372,8 @@ var FIREBASE_MODELS = [
     ],
     enums: [],
     detectionHints: ["m", "n", "lat", "rat"],
-    modelGroup: "Notification"
+    modelGroup: "Notification",
+    collectionKind: "root"
   },
   {
     name: "NotificationUser",
@@ -4443,7 +4439,8 @@ var FIREBASE_MODELS = [
     ],
     enums: [],
     detectionHints: ["b", "x", "dc", "gc", "bc", "ns"],
-    modelGroup: "Notification"
+    modelGroup: "Notification",
+    collectionKind: "root"
   },
   {
     name: "OidcEntry",
@@ -4519,7 +4516,8 @@ var FIREBASE_MODELS = [
     ],
     enums: [],
     detectionHints: ["type", "payload", "grantId", "userCode", "consumed", "expiresAt"],
-    modelGroup: "OidcModel"
+    modelGroup: "OidcModel",
+    collectionKind: "root"
   },
   {
     name: "StorageFile",
@@ -4776,7 +4774,8 @@ var FIREBASE_MODELS = [
       }
     ],
     detectionHints: ["bucketId", "pathString", "n", "ct", "fs", "ps", "pn", "pat", "pcat", "uby", "p", "pg", "sdat", "g", "gs"],
-    modelGroup: "StorageFile"
+    modelGroup: "StorageFile",
+    collectionKind: "root"
   },
   {
     name: "StorageFileGroup",
@@ -4868,7 +4867,8 @@ var FIREBASE_MODELS = [
     ],
     enums: [],
     detectionHints: ["f", "z", "zsf", "zat", "re", "c"],
-    modelGroup: "StorageFile"
+    modelGroup: "StorageFile",
+    collectionKind: "root"
   },
   {
     name: "SystemState",
@@ -4888,7 +4888,8 @@ var FIREBASE_MODELS = [
     ],
     enums: [],
     detectionHints: ["data"],
-    modelGroup: "SystemState"
+    modelGroup: "SystemState",
+    collectionKind: "root"
   },
   {
     name: "Notification",
@@ -5168,7 +5169,8 @@ var FIREBASE_MODELS = [
     ],
     detectionHints: ["st", "rf", "ts", "es", "ps", "ns", "n", "r", "ois", "ots", "sat", "a", "at", "tsr", "esr", "tpr", "ut"],
     parentIdentityConst: "notificationBoxIdentity",
-    modelGroup: "Notification"
+    modelGroup: "Notification",
+    collectionKind: "sub-collection"
   },
   {
     name: "NotificationWeek",
@@ -5197,10 +5199,17 @@ var FIREBASE_MODELS = [
     enums: [],
     detectionHints: ["w", "n"],
     parentIdentityConst: "notificationBoxIdentity",
-    modelGroup: "Notification"
+    modelGroup: "Notification",
+    collectionKind: "sub-collection"
   }
 ];
 
+// packages/dbx-components-mcp/src/resources/form-fields.resource.ts
+import { ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
+
+// packages/dbx-components-mcp/src/registry/form-fields.ts
+var FORM_TIER_ORDER = ["field-factory", "field-derivative", "composite-builder", "template-builder", "primitive"];
+
 // packages/dbx-components-mcp/src/registry/index.ts
 function getFirebaseModels() {
   return FIREBASE_MODELS;
@@ -6317,7 +6326,11 @@ function formatConfigTable(field) {
     const rows = keys.map((key) => {
       const prop = field.config[key];
       const required = prop.required ? "\u2713" : "";
-      const defaultCell = prop.default === void 0 ? "" : `\`${typeof prop.default === "string" ? prop.default : JSON.stringify(prop.default)}\``;
+      let defaultCell = "";
+      if (prop.default !== void 0) {
+        const defaultText = typeof prop.default === "string" ? prop.default : JSON.stringify(prop.default);
+        defaultCell = `\`${defaultText}\``;
+      }
       const desc = prop.description.replaceAll("|", String.raw`\|`);
       const escapedType = prop.type.replaceAll("|", String.raw`\|`);
       return `| \`${prop.name}\` | \`${escapedType}\` | ${required} | ${defaultCell} | ${desc} |`;
@@ -6487,7 +6500,7 @@ function createLookupFormTool(config) {
     }
     return lines.join("\n").trimEnd();
   }
-  function run(rawArgs) {
+  function run5(rawArgs) {
     let args;
     try {
       args = parseLookupFormArgs(rawArgs);
@@ -6516,7 +6529,7 @@ function createLookupFormTool(config) {
   }
   const tool = {
     definition: DBX_FORM_LOOKUP_TOOL,
-    run
+    run: run5
   };
   return tool;
 }
@@ -6705,7 +6718,7 @@ function formatSearchResults(input) {
 }
 function createSearchFormTool(config) {
   const { registry } = config;
-  function run(rawArgs) {
+  function run5(rawArgs) {
     return runSearchTool(
       {
         entries: registry.all,
@@ -6721,7 +6734,7 @@ function createSearchFormTool(config) {
   }
   const tool = {
     definition: DBX_FORM_SEARCH_TOOL,
-    run
+    run: run5
   };
   return tool;
 }
@@ -7244,7 +7257,7 @@ function renderScaffold(specs, valueTypeName, wrapInSection) {
 }
 function createFormScaffoldTool(config) {
   const { registry } = config;
-  function run(rawArgs) {
+  function run5(rawArgs) {
     let args;
     try {
       args = parseScaffoldArgs(rawArgs);
@@ -7263,7 +7276,7 @@ function createFormScaffoldTool(config) {
       return toolError(lines.join("\n"));
     }
     const specs = parsed;
-    const code10 = renderScaffold(specs, args.valueTypeName, args.wrapInSection);
+    const code11 = renderScaffold(specs, args.valueTypeName, args.wrapInSection);
     const slugList = specs.map((s) => s.slug).join(", ");
     const preamble = `# Scaffold
 
@@ -7271,14 +7284,14 @@ Generated from \`${slugList}\` (${specs.length} field${specs.length === 1 ? "" :
     const text = `${preamble}
 
 \`\`\`ts
-${code10}
+${code11}
 \`\`\``;
     const result = { content: [{ type: "text", text }] };
     return result;
   }
   const tool = {
     definition: DBX_FORM_SCAFFOLD_TOOL,
-    run
+    run: run5
   };
   return tool;
 }
@@ -7539,7 +7552,7 @@ function formatNotFound3(normalized, candidates) {
 }
 function createLookupUiTool(input) {
   const { registry } = input;
-  const run = (rawArgs) => {
+  const run5 = (rawArgs) => {
     let args;
     try {
       args = parseLookupUiArgs(rawArgs);
@@ -7566,7 +7579,7 @@ function createLookupUiTool(input) {
     const result = { content: [{ type: "text", text }] };
     return result;
   };
-  return { definition: DBX_UI_LOOKUP_TOOL, run };
+  return { definition: DBX_UI_LOOKUP_TOOL, run: run5 };
 }
 
 // packages/dbx-components-mcp/src/tools/search-ui.tool.ts
@@ -7748,7 +7761,7 @@ function formatSearchResults2(options) {
 }
 function createSearchUiTool(input) {
   const { registry } = input;
-  const run = (rawArgs) => {
+  const run5 = (rawArgs) => {
     let args;
     try {
       args = parseSearchUiArgs(rawArgs);
@@ -7763,7 +7776,7 @@ function createSearchUiTool(input) {
     const result = { content: [{ type: "text", text }] };
     return result;
   };
-  return { definition: DBX_UI_SEARCH_TOOL, run };
+  return { definition: DBX_UI_SEARCH_TOOL, run: run5 };
 }
 
 // packages/dbx-components-mcp/src/tools/ui-examples.tool.ts
@@ -8952,7 +8965,7 @@ var FolderValidateArgsType = type29({
 });
 function createFolderValidateTool(config) {
   const { definition, inspectFolder: inspectFolder3, validate, format } = config;
-  async function run(rawArgs) {
+  async function run5(rawArgs) {
     const parsed = FolderValidateArgsType(rawArgs);
     if (parsed instanceof type29.errors) {
       return toolError(`Invalid arguments: ${parsed.summary}`);
@@ -8992,7 +9005,7 @@ function createFolderValidateTool(config) {
     };
     return toolResult;
   }
-  const tool = { definition, run };
+  const tool = { definition, run: run5 };
   return tool;
 }
 var SourceValidateArgsType = type29({
@@ -9002,7 +9015,7 @@ var SourceValidateArgsType = type29({
 });
 function createSourceValidateTool(config) {
   const { definition, validate, format } = config;
-  async function run(rawArgs) {
+  async function run5(rawArgs) {
     const parsed = SourceValidateArgsType(rawArgs);
     if (parsed instanceof type29.errors) {
       return toolError(`Invalid arguments: ${parsed.summary}`);
@@ -9029,7 +9042,7 @@ function createSourceValidateTool(config) {
     };
     return toolResult;
   }
-  const tool = { definition, run };
+  const tool = { definition, run: run5 };
   return tool;
 }
 var TwoSideValidateArgsType = type29({
@@ -9056,7 +9069,7 @@ function resolveTwoSideInput(parsed) {
 }
 function createTwoSideValidateTool(config) {
   const { definition, inspectAndValidate, format } = config;
-  async function run(rawArgs) {
+  async function run5(rawArgs) {
     const parsed = TwoSideValidateArgsType(rawArgs);
     if (parsed instanceof type29.errors) {
       return toolError(`Invalid arguments: ${parsed.summary}`);
@@ -9073,7 +9086,7 @@ function createTwoSideValidateTool(config) {
     };
     return toolResult;
   }
-  const tool = { definition, run };
+  const tool = { definition, run: run5 };
   return tool;
 }
 var ListAppArgsType = type29({
@@ -9083,7 +9096,7 @@ var ListAppArgsType = type29({
 });
 function createListAppTool(config) {
   const { definition, inspectAndList, formatMarkdown, formatJson } = config;
-  async function run(rawArgs) {
+  async function run5(rawArgs) {
     const parsed = ListAppArgsType(rawArgs);
     if (parsed instanceof type29.errors) {
       return toolError(`Invalid arguments: ${parsed.summary}`);
@@ -9097,7 +9110,7 @@ function createListAppTool(config) {
     const toolResult = { content: [{ type: "text", text }] };
     return toolResult;
   }
-  const tool = { definition, run };
+  const tool = { definition, run: run5 };
   return tool;
 }
 
@@ -9290,6 +9303,7 @@ function extractModel(sourceFile, identity) {
   const collectionFnName = variant === "root" ? `${camelName}FirestoreCollection` : `${camelName}FirestoreCollectionFactory`;
   const collectionFn = findFunction(sourceFile, collectionFnName);
   const collectionGroupFn = variant === "subcollection" ? findFunction(sourceFile, `${camelName}FirestoreCollectionGroup`) : void 0;
+  const factoryCallKind = detectFactoryCallKind(sourceFile, collectionFnName);
   const extractedIdentity = {
     constName: identity.constName,
     exported: identity.exported,
@@ -9314,10 +9328,38 @@ function extractModel(sourceFile, identity) {
     collectionFactoryType,
     collectionGroupType,
     collectionFn,
-    collectionGroupFn
+    collectionGroupFn,
+    factoryCallKind
   };
   return result;
 }
+function detectFactoryCallKind(sourceFile, factoryFnName) {
+  const fn = sourceFile.getFunction(factoryFnName);
+  if (!fn) {
+    return void 0;
+  }
+  const calls = fn.getDescendantsOfKind(SyntaxKind3.CallExpression);
+  for (const call of calls) {
+    const expr = call.getExpression();
+    if (!Node6.isPropertyAccessExpression(expr)) {
+      continue;
+    }
+    const name = expr.getName();
+    if (name === "firestoreCollection") {
+      return "root";
+    }
+    if (name === "rootSingleItemFirestoreCollection") {
+      return "root-singleton";
+    }
+    if (name === "firestoreCollectionWithParent") {
+      return "sub-collection";
+    }
+    if (name === "singleItemFirestoreCollection") {
+      return "singleton-sub";
+    }
+  }
+  return void 0;
+}
 function deriveCamelName(constName) {
   const suffix = "Identity";
   return constName.endsWith(suffix) ? constName.slice(0, -suffix.length) : constName;
@@ -9784,21 +9826,37 @@ function checkCollectionType(file, model, violations) {
     return;
   }
   const typeText = model.collectionType.typeText ?? "";
-  if (model.variant === "root") {
-    const expected2 = `FirestoreCollection<${model.name}, ${model.name}Document>`;
-    if (typeText.replaceAll(/\s+/g, "") !== expected2.replaceAll(/\s+/g, "")) {
-      pushViolation(violations, {
-        code: "MODEL_COLLECTION_TYPE_WRONG_GENERIC",
-        message: `Type alias \`${model.name}FirestoreCollection\` must equal \`${expected2}\` (found \`${typeText || "<none>"}\`).`,
-        file: file.name,
-        line: model.collectionType.line,
-        model: model.name
-      });
-    }
+  const allowedKinds = model.variant === "root" ? ["root", "root-singleton"] : ["sub-collection", "singleton-sub"];
+  const aliasKind = detectAliasKind(typeText);
+  const factoryKind = model.factoryCallKind;
+  if (aliasKind && factoryKind && aliasKind !== factoryKind) {
+    pushViolation(violations, {
+      code: "MODEL_COLLECTION_FACTORY_TYPE_MISMATCH",
+      message: `Type alias \`${model.name}FirestoreCollection\` is \`${COLLECTION_TYPE_NAME[aliasKind]}\` but factory \`${expectedCollectionFnName(model)}\` calls \`firestoreContext.${COLLECTION_FACTORY_FN_NAME[factoryKind]}({...})\`. Type alias and factory body must declare the same collection kind (\`${aliasKind}\` vs \`${factoryKind}\`).`,
+      file: file.name,
+      line: model.collectionType.line,
+      model: model.name
+    });
     return;
   }
-  const parentPascal = pascalCase2(deriveCamelName2(model.identity.parentIdentityRef ?? ""));
-  const expected = `SingleItemFirestoreCollection<${model.name}, ${parentPascal}, ${model.name}Document, ${parentPascal}Document>`;
+  const isAllowed = (k) => k === void 0 || allowedKinds.includes(k);
+  if (!isAllowed(aliasKind) || !isAllowed(factoryKind)) {
+    const offender = !isAllowed(aliasKind) ? aliasKind : factoryKind;
+    const offenderSite = !isAllowed(aliasKind) ? "type alias" : "factory body";
+    const variantLabel = model.variant === "root" ? "root (no parent identity)" : "subcollection (parent identity declared)";
+    const allowedList = allowedKinds.map((k) => `\`${k}\``).join(", ");
+    pushViolation(violations, {
+      code: "MODEL_COLLECTION_FACTORY_TYPE_MISMATCH",
+      message: `Model \`${model.name}\` is a ${variantLabel} but its collection ${offenderSite} is \`${offender}\`. Allowed kinds for this variant: ${allowedList}.`,
+      file: file.name,
+      line: model.collectionType.line,
+      model: model.name
+    });
+    return;
+  }
+  const defaultKind = model.variant === "root" ? "root" : "singleton-sub";
+  const expectedKind = aliasKind ?? factoryKind ?? defaultKind;
+  const expected = expectedCollectionTypeText(expectedKind, model);
   if (typeText.replaceAll(/\s+/g, "") !== expected.replaceAll(/\s+/g, "")) {
     pushViolation(violations, {
       code: "MODEL_COLLECTION_TYPE_WRONG_GENERIC",
@@ -9809,6 +9867,45 @@ function checkCollectionType(file, model, violations) {
     });
   }
 }
+var COLLECTION_TYPE_NAME = {
+  root: "FirestoreCollection",
+  "root-singleton": "RootSingleItemFirestoreCollection",
+  "sub-collection": "FirestoreCollectionWithParent",
+  "singleton-sub": "SingleItemFirestoreCollection"
+};
+var COLLECTION_FACTORY_FN_NAME = {
+  root: "firestoreCollection",
+  "root-singleton": "rootSingleItemFirestoreCollection",
+  "sub-collection": "firestoreCollectionWithParent",
+  "singleton-sub": "singleItemFirestoreCollection"
+};
+function detectAliasKind(typeText) {
+  const normalized = typeText.replaceAll(/\s+/g, "");
+  if (normalized.startsWith("RootSingleItemFirestoreCollection<")) {
+    return "root-singleton";
+  }
+  if (normalized.startsWith("SingleItemFirestoreCollection<")) {
+    return "singleton-sub";
+  }
+  if (normalized.startsWith("FirestoreCollectionWithParent<")) {
+    return "sub-collection";
+  }
+  if (normalized.startsWith("FirestoreCollection<")) {
+    return "root";
+  }
+  return void 0;
+}
+function expectedCollectionTypeText(kind, model) {
+  const ctor = COLLECTION_TYPE_NAME[kind];
+  if (kind === "root" || kind === "root-singleton") {
+    return `${ctor}<${model.name}, ${model.name}Document>`;
+  }
+  const parentPascal = pascalCase2(deriveCamelName2(model.identity.parentIdentityRef ?? ""));
+  return `${ctor}<${model.name}, ${parentPascal}, ${model.name}Document, ${parentPascal}Document>`;
+}
+function expectedCollectionFnName(model) {
+  return model.variant === "root" ? `${model.camelName}FirestoreCollection` : `${model.camelName}FirestoreCollectionFactory`;
+}
 function checkCollectionFn(file, model, violations) {
   if (model.collectionFn) {
     return;
@@ -11011,11 +11108,11 @@ function checkReadonlyFields(file, violations) {
   }
 }
 function checkInterfaceReadonly(options) {
-  const { file, decl, code: code10, violations } = options;
+  const { file, decl, code: code11, violations } = options;
   for (const field of decl.fields) {
     if (field.readonly) continue;
     pushViolation2(violations, {
-      code: code10,
+      code: code11,
       severity: "warning",
       message: `Field \`${field.name}\` on \`${decl.name}\` should be declared \`readonly\`.`,
       file: file.name,
@@ -11347,8 +11444,8 @@ async function inspectFolder(path) {
       status = "not-directory";
     }
   } catch (err) {
-    const code10 = err.code;
-    if (code10 === "ENOENT" || code10 === "ENOTDIR") {
+    const code11 = err.code;
+    if (code11 === "ENOENT" || code11 === "ENOTDIR") {
       status = "not-found";
     } else {
       throw err;
@@ -11915,140 +12012,1700 @@ function systemStateAccessorBody(args) {
   if (args.functionsClass !== void 0) {
     lines.push(`  readonly ${functionsFieldName(args.functionsClass)} = inject(${args.functionsClass});`, "");
   }
-  lines.push(`  constructor() {`, `    super(${typeConst});`, `  }`);
-  const crudLines = renderCrudLines(args, "this.systemStateDocumentStore");
-  if (crudLines.length > 0) {
-    lines.push("", ...crudLines);
+  lines.push(`  constructor() {`, `    super(${typeConst});`, `  }`);
+  const crudLines = renderCrudLines(args, "this.systemStateDocumentStore");
+  if (crudLines.length > 0) {
+    lines.push("", ...crudLines);
+  }
+  lines.push(`}`);
+  return { path: `${args.fileBaseName}.store.accessor.ts`, body: lines.join("\n") };
+}
+function documentDirectiveBody(args) {
+  const docType = `${args.modelName}Document`;
+  const storeClass = `${args.modelName}DocumentStore`;
+  const directiveClass = `${args.appPrefixPascal}${args.modelName}DocumentStoreDirective`;
+  const selector = `[${args.appPrefixCamel}${args.modelName}Document]`;
+  const lines = [
+    `import { Directive, inject } from '@angular/core';`,
+    `import { DbxFirebaseDocumentStoreDirective, provideDbxFirebaseDocumentStoreDirective } from '@dereekb/dbx-firebase';`,
+    `import { type ${args.modelName}, type ${docType} } from '${args.firebasePackage}';`,
+    `import { ${storeClass} } from './${args.fileBaseName}.document.store';`,
+    "",
+    `@Directive({`,
+    `  selector: '${selector}',`,
+    `  providers: provideDbxFirebaseDocumentStoreDirective(${directiveClass}, ${storeClass}),`,
+    `  standalone: true`,
+    `})`,
+    `export class ${directiveClass} extends DbxFirebaseDocumentStoreDirective<${args.modelName}, ${docType}, ${storeClass}> {`,
+    `  constructor() {`,
+    `    super(inject(${storeClass}));`,
+    `  }`,
+    `}`
+  ];
+  return { path: `${args.fileBaseName}.document.store.directive.ts`, body: lines.join("\n") };
+}
+function collectionDirectiveBody(args) {
+  const docType = `${args.modelName}Document`;
+  const storeClass = `${args.modelName}CollectionStore`;
+  const directiveClass = `${args.appPrefixPascal}${args.modelName}CollectionStoreDirective`;
+  const selector = `[${args.appPrefixCamel}${args.modelName}Collection]`;
+  const lines = [
+    `import { Directive, inject } from '@angular/core';`,
+    `import { DbxFirebaseCollectionStoreDirective, provideDbxFirebaseCollectionStoreDirective } from '@dereekb/dbx-firebase';`,
+    `import { type ${args.modelName}, type ${docType} } from '${args.firebasePackage}';`,
+    `import { ${storeClass} } from './${args.fileBaseName}.collection.store';`,
+    "",
+    `@Directive({`,
+    `  selector: '${selector}',`,
+    `  providers: provideDbxFirebaseCollectionStoreDirective(${directiveClass}, ${storeClass}),`,
+    `  standalone: true`,
+    `})`,
+    `export class ${directiveClass} extends DbxFirebaseCollectionStoreDirective<${args.modelName}, ${docType}, ${storeClass}> {`,
+    `  constructor() {`,
+    `    super(inject(${storeClass}));`,
+    `  }`,
+    `}`
+  ];
+  return { path: `${args.fileBaseName}.collection.store.directive.ts`, body: lines.join("\n") };
+}
+function buildBlocks(args) {
+  const blocks = [];
+  if (args.shape === "system-state") {
+    blocks.push(systemStateAccessorBody(args));
+  } else {
+    for (const surface of args.surfaces) {
+      if (surface === "document") {
+        if (args.shape === "sub-collection" || args.shape === "singleton-sub") {
+          blocks.push(subDocumentStoreBody(args));
+        } else {
+          blocks.push(rootDocumentStoreBody(args));
+        }
+        if (args.profile.emitsDirectives) {
+          blocks.push(documentDirectiveBody(args));
+        }
+      } else {
+        if (args.shape === "sub-collection") {
+          blocks.push(subCollectionStoreBody(args));
+        } else {
+          blocks.push(rootCollectionStoreBody(args));
+        }
+        if (args.profile.emitsDirectives) {
+          blocks.push(collectionDirectiveBody(args));
+        }
+      }
+    }
+  }
+  return blocks;
+}
+function formatScaffold(args) {
+  const blocks = buildBlocks(args);
+  const surfaceLabel = args.shape === "system-state" ? "accessor" : args.surfaces.join(" + ");
+  const functionsLabel = args.functionsClass ?? "none";
+  const crudLabel = args.crudFunctions.length > 0 ? args.crudFunctions.map((c) => `${c.name} (${c.kind})`).join(", ") : "none";
+  const parentLabel = args.parentModel === void 0 ? "n/a" : args.parentModel.name;
+  const lines = [`# ${args.modelName} store scaffold`, "", `Shape: \`${args.shape}\` \xB7 Surfaces: ${surfaceLabel} \xB7 Parent: ${parentLabel} \xB7 Functions: ${functionsLabel} \xB7 Crud: ${crudLabel}`, "", `Drop into \`<app>/src/lib/modules/${args.fileBaseName.replaceAll(".", "/")}/store/\`.`, ""];
+  for (const block of blocks) {
+    lines.push(`## \`${block.path}\``, "", "```ts", block.body, "```", "");
+  }
+  lines.push("## Notes", "", "- Each store is `@Injectable()` with no `providedIn` \u2014 wire it in the consuming feature module / route providers, alongside its directive (when present).");
+  if (args.shape === "sub-collection" || args.shape === "singleton-sub") {
+    lines.push(`- The \`${args.parentModel?.name}DocumentStore\` parent is injected with \`{ optional: true }\` so the store works both as a standalone and as a child of a parent's document directive.`);
+  }
+  if (args.shape === "system-state") {
+    lines.push(`- The accessor wraps a shared \`SystemStateDocumentStore\` keyed by \`${args.systemStateTypeConst}\`. CRUD function helpers reference \`this.systemStateDocumentStore\` (not \`this\`).`);
+  }
+  if (args.crudFunctions.length > 0) {
+    lines.push(`- ${args.crudFunctions.length} CRUD helper line${args.crudFunctions.length === 1 ? "" : "s"} wired through \`firebaseDocumentStore{Create,Update,Crud}Function\`.`);
+  }
+  lines.push('- \u2192 See `dbx_model_lookup topic="shapes"` for the full store-shape taxonomy.', "- \u2192 Skill: `dbx__guide__angular-stores`.");
+  return lines.join("\n");
+}
+function runModelStoreScaffold(rawArgs) {
+  let args;
+  try {
+    args = parseArgs2(rawArgs);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return toolError(message);
+  }
+  const text = formatScaffold(args);
+  const result = { content: [{ type: "text", text }] };
+  return result;
+}
+var modelStoreScaffoldTool = {
+  definition: DBX_MODEL_STORE_SCAFFOLD_TOOL,
+  run: runModelStoreScaffold
+};
+
+// packages/dbx-components-mcp/src/tools/model-fixture-list-app.tool.ts
+import { resolve as resolve15 } from "node:path";
+import { type as type31 } from "arktype";
+
+// packages/dbx-components-mcp/src/tools/model-fixture-shared/archetype.ts
+function classifyFixtureArchetype(input) {
+  const { factory, params } = input;
+  const subCollection = isSubCollection(factory);
+  let archetype;
+  if (subCollection) {
+    archetype = factory?.hasCollectionForDocument ? "sub-collection-traversal" : "sub-collection";
+  } else if (paramsHasFixtureDependencies(params)) {
+    archetype = "top-level-with-deps";
+  } else {
+    archetype = "top-level-simple";
+  }
+  return archetype;
+}
+function isSubCollection(factory) {
+  if (factory === void 0) return false;
+  return factory.hasParamsGetCollection || factory.hasCollectionForDocument;
+}
+function paramsHasFixtureDependencies(params) {
+  if (params === void 0) return false;
+  for (const field of params.fields) {
+    if (field.fixtureModel !== void 0) return true;
+  }
+  return false;
+}
+
+// packages/dbx-components-mcp/src/tools/model-fixture-shared/extract.ts
+import { Node as Node8, Project as Project6, SyntaxKind as SyntaxKind5 } from "ts-morph";
+var FIXTURE_SUFFIX = "TestContextFixture";
+var INSTANCE_SUFFIX = "TestContextInstance";
+var PARAMS_SUFFIX = "TestContextParams";
+var FIXTURE_FILE_VIRTUAL_PATH = "__fixture__/fixture.ts";
+var BASE_CONTEXT_FIXTURE_BASE = "FirebaseAdminNestTestContextFixture";
+var MODEL_FACTORY_NAME = "modelTestContextFactory";
+function extractAppFixturesFromText(input) {
+  const { text, fixturePath } = input;
+  const project = new Project6({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const sourceFile = project.createSourceFile(FIXTURE_FILE_VIRTUAL_PATH, text, { overwrite: true });
+  const prefix = detectPrefix(sourceFile);
+  const fixtureClasses = /* @__PURE__ */ new Map();
+  const instanceClasses = /* @__PURE__ */ new Map();
+  const unrecognized = [];
+  collectClasses(sourceFile, prefix, { fixtures: fixtureClasses, instances: instanceClasses, unrecognized });
+  const paramsTypes = collectParamsTypes(sourceFile, prefix);
+  const factoriesByModel = collectFactories(sourceFile, prefix);
+  const singletonsByFactory = collectSingletonsByFactory(sourceFile);
+  const entries = [];
+  const seenModels = /* @__PURE__ */ new Set();
+  const sortedModels = collectAllModels(fixtureClasses, instanceClasses);
+  for (const model of sortedModels) {
+    if (seenModels.has(model)) continue;
+    seenModels.add(model);
+    const fixtureClass = fixtureClasses.get(model);
+    const instanceClass = instanceClasses.get(model);
+    if (fixtureClass === void 0 || instanceClass === void 0) {
+      continue;
+    }
+    const params = paramsTypes.get(model);
+    const factory = factoriesByModel.get(model);
+    if (factory?.factoryName) {
+      const singleton = singletonsByFactory.get(factory.factoryName);
+      if (singleton !== void 0) {
+        Object.assign(factory, { singletonName: singleton });
+      }
+    }
+    const archetype = classifyFixtureArchetype({ factory, params });
+    const fixtureMethods = readClassMethods(fixtureClass);
+    const instanceMethods = readClassMethods(instanceClass);
+    const entry = {
+      model,
+      prefix: prefix ?? "",
+      archetype,
+      fixtureClassName: fixtureClass.getName() ?? "",
+      instanceClassName: instanceClass.getName() ?? "",
+      paramsTypeName: params?.name ?? `${prefix ?? ""}${model}${PARAMS_SUFFIX}`,
+      factoryName: factory?.factoryName,
+      singletonName: factory?.singletonName,
+      fixtureExtendsGenerics: readExtendsGenerics(fixtureClass),
+      instanceExtendsGenerics: readExtendsGenerics(instanceClass),
+      fixtureMethods,
+      instanceMethods,
+      params,
+      factory,
+      fixtureLine: fixtureClass.getStartLineNumber(),
+      fixtureEndLine: fixtureClass.getEndLineNumber(),
+      instanceLine: instanceClass.getStartLineNumber(),
+      instanceEndLine: instanceClass.getEndLineNumber()
+    };
+    entries.push(entry);
+  }
+  const identityImports = collectIdentityImports(sourceFile);
+  const result = {
+    fixturePath,
+    prefix,
+    entries,
+    unrecognizedClassNames: unrecognized,
+    identityImports
+  };
+  return result;
+}
+function detectPrefix(sourceFile) {
+  for (const cls of sourceFile.getClasses()) {
+    const name = cls.getName();
+    if (!name) continue;
+    if (!name.endsWith("ContextFixture")) continue;
+    if (name.endsWith(FIXTURE_SUFFIX)) continue;
+    if (!extendsByName(cls, BASE_CONTEXT_FIXTURE_BASE)) continue;
+    return name.slice(0, name.length - "ContextFixture".length);
+  }
+  return void 0;
+}
+function extendsByName(cls, baseName) {
+  const extendsClause = cls.getExtends();
+  if (!extendsClause) return false;
+  const expr = extendsClause.getExpression();
+  if (Node8.isIdentifier(expr)) {
+    return expr.getText() === baseName;
+  }
+  return extendsClause.getText().startsWith(baseName);
+}
+function collectClasses(sourceFile, prefix, buckets) {
+  for (const cls of sourceFile.getClasses()) {
+    const name = cls.getName();
+    if (!name) continue;
+    const fixtureModel = bareModel(name, FIXTURE_SUFFIX, prefix);
+    if (fixtureModel !== void 0) {
+      buckets.fixtures.set(fixtureModel, cls);
+      continue;
+    }
+    const instanceModel = bareModel(name, INSTANCE_SUFFIX, prefix);
+    if (instanceModel !== void 0) {
+      buckets.instances.set(instanceModel, cls);
+      continue;
+    }
+    if (name.endsWith(FIXTURE_SUFFIX) || name.endsWith(INSTANCE_SUFFIX)) {
+      buckets.unrecognized.push(name);
+    }
+  }
+}
+function bareModel(className, suffix, prefix) {
+  if (!className.endsWith(suffix)) return void 0;
+  const trimmed = className.slice(0, className.length - suffix.length);
+  if (prefix === void 0 || prefix === "") {
+    return trimmed.length > 0 ? trimmed : void 0;
+  }
+  if (!trimmed.startsWith(prefix)) return void 0;
+  const model = trimmed.slice(prefix.length);
+  return model.length > 0 ? model : void 0;
+}
+function collectParamsTypes(sourceFile, prefix) {
+  const out = /* @__PURE__ */ new Map();
+  for (const i of sourceFile.getInterfaces()) {
+    const name = i.getName();
+    const model = bareModel(name, PARAMS_SUFFIX, prefix);
+    if (model === void 0) continue;
+    out.set(model, readParamsInterface(i, model, prefix));
+  }
+  for (const a of sourceFile.getTypeAliases()) {
+    const name = a.getName();
+    const model = bareModel(name, PARAMS_SUFFIX, prefix);
+    if (model === void 0) continue;
+    out.set(model, readParamsAlias(a, model));
+  }
+  return out;
+}
+function readParamsInterface(i, _model, prefix) {
+  const extendsClauses = i.getExtends().map((e) => e.getText());
+  const partialExtends = extendsClauses.find((t) => t.startsWith("Partial<"));
+  const extendsPartial = partialExtends !== void 0;
+  const modelName = partialExtends ? partialExtends.slice("Partial<".length, -1).trim() : void 0;
+  const fields = [];
+  for (const prop of i.getProperties()) {
+    const propName = prop.getName();
+    const typeNode = prop.getTypeNode();
+    const typeText = typeNode ? typeNode.getText() : "";
+    const optional = prop.hasQuestionToken();
+    const fixtureModel = resolveFixtureFieldModel(typeText, prefix);
+    const isArray = /\bArrayOrValue\b|\[\]\s*$|\bArray</.test(typeText);
+    const field = {
+      name: propName,
+      typeText,
+      optional,
+      fixtureModel,
+      array: isArray
+    };
+    fields.push(field);
+  }
+  const result = {
+    name: i.getName(),
+    kind: "interface",
+    extendsPartial,
+    aliasOfPartial: false,
+    modelName,
+    fields,
+    line: i.getStartLineNumber()
+  };
+  return result;
+}
+function readParamsAlias(a, _model) {
+  const typeText = a.getTypeNode()?.getText() ?? "";
+  const aliasOfPartial = typeText.startsWith("Partial<");
+  const modelName = aliasOfPartial ? typeText.slice("Partial<".length, -1).trim() : void 0;
+  const result = {
+    name: a.getName(),
+    kind: "alias",
+    extendsPartial: false,
+    aliasOfPartial,
+    modelName,
+    fields: [],
+    line: a.getStartLineNumber()
+  };
+  return result;
+}
+function resolveFixtureFieldModel(typeText, prefix) {
+  const match = typeText.match(/([A-Z]\w*)TestContextFixture/);
+  if (!match) return void 0;
+  const before = match[1];
+  if (prefix === void 0 || prefix === "") return before;
+  if (!before.startsWith(prefix)) return void 0;
+  const model = before.slice(prefix.length);
+  return model.length > 0 ? model : void 0;
+}
+function collectFactories(sourceFile, prefix) {
+  const out = /* @__PURE__ */ new Map();
+  for (const stmt of sourceFile.getVariableStatements()) {
+    for (const decl of stmt.getDeclarations()) {
+      const factory = readModelTestContextFactory(decl, prefix);
+      if (!factory) continue;
+      const model = factoryNameToModel(factory.factoryName, prefix);
+      if (model === void 0) continue;
+      out.set(model, factory);
+    }
+  }
+  return out;
+}
+function readModelTestContextFactory(decl, _prefix) {
+  const initializer = decl.getInitializer();
+  if (!initializer) return void 0;
+  let bodyExpr;
+  if (Node8.isArrowFunction(initializer) || Node8.isFunctionExpression(initializer)) {
+    bodyExpr = readSingleReturnExpression(initializer);
+  } else {
+    bodyExpr = initializer;
+  }
+  if (!bodyExpr || !Node8.isCallExpression(bodyExpr)) return void 0;
+  const callee = bodyExpr.getExpression();
+  if (!Node8.isIdentifier(callee) || callee.getText() !== MODEL_FACTORY_NAME) return void 0;
+  const generics = bodyExpr.getTypeArguments().map((t) => t.getText());
+  const args = bodyExpr.getArguments();
+  let hasParamsGetCollection = false;
+  let hasCollectionForDocument = false;
+  let hasInitDocument = false;
+  let parentFixtureFieldFromGetCollection;
+  if (args.length > 0) {
+    const first = args[0];
+    if (Node8.isObjectLiteralExpression(first)) {
+      const getCollection = first.getProperty("getCollection");
+      if (getCollection && Node8.isPropertyAssignment(getCollection)) {
+        const fnInit = getCollection.getInitializer();
+        const arity = readArrowParameterCount(fnInit);
+        if (arity >= 2) {
+          hasParamsGetCollection = true;
+          parentFixtureFieldFromGetCollection = readParamsAccessFieldName(fnInit);
+        }
+      }
+      if (first.getProperty("collectionForDocument") !== void 0) {
+        hasCollectionForDocument = true;
+      }
+      if (first.getProperty("initDocument") !== void 0) {
+        hasInitDocument = true;
+      }
+    }
+  }
+  const result = {
+    factoryName: decl.getName(),
+    genericArgs: generics,
+    hasParamsGetCollection,
+    hasCollectionForDocument,
+    hasInitDocument,
+    parentFixtureFieldFromGetCollection,
+    line: decl.getStartLineNumber()
+  };
+  return result;
+}
+function readSingleReturnExpression(fn) {
+  const body = fn.getBody();
+  if (!body) return void 0;
+  if (Node8.isBlock(body)) {
+    for (const stmt of body.getStatements()) {
+      if (Node8.isReturnStatement(stmt)) {
+        return stmt.getExpression();
+      }
+    }
+    return void 0;
+  }
+  return body;
+}
+function readArrowParameterCount(fn) {
+  if (!fn) return 0;
+  if (Node8.isArrowFunction(fn) || Node8.isFunctionExpression(fn) || Node8.isFunctionDeclaration(fn) || Node8.isMethodDeclaration(fn)) {
+    return fn.getParameters().length;
+  }
+  return 0;
+}
+function readParamsAccessFieldName(fn) {
+  if (!fn) return void 0;
+  if (!Node8.isArrowFunction(fn) && !Node8.isFunctionExpression(fn)) return void 0;
+  const body = fn.getBody();
+  if (!body) return void 0;
+  for (const access2 of body.getDescendantsOfKind(SyntaxKind5.PropertyAccessExpression)) {
+    const expr = access2.getExpression();
+    if (Node8.isIdentifier(expr) && expr.getText() === "params") {
+      return access2.getName();
+    }
+  }
+  return void 0;
+}
+function factoryNameToModel(factoryName, prefix) {
+  const suffix = "ContextFactory";
+  if (!factoryName.endsWith(suffix)) return void 0;
+  const head = factoryName.slice(0, factoryName.length - suffix.length);
+  if (prefix === void 0 || prefix === "") {
+    if (head.length === 0) return void 0;
+    return head.charAt(0).toUpperCase() + head.slice(1);
+  }
+  const factoryPrefixCandidates = factoryPrefixesFromWorkspacePrefix(prefix);
+  for (const factoryPrefix of factoryPrefixCandidates) {
+    if (head.startsWith(factoryPrefix)) {
+      const remainder = head.slice(factoryPrefix.length);
+      if (remainder.length === 0) continue;
+      return remainder.charAt(0).toUpperCase() + remainder.slice(1);
+    }
+  }
+  return void 0;
+}
+function factoryPrefixesFromWorkspacePrefix(prefix) {
+  const lower = prefix.charAt(0).toLowerCase() + prefix.slice(1);
+  const apiSuffix = "Api";
+  if (prefix.endsWith(apiSuffix)) {
+    const trimmed = prefix.slice(0, prefix.length - apiSuffix.length);
+    if (trimmed.length > 0) {
+      const lowerTrimmed = trimmed.charAt(0).toLowerCase() + trimmed.slice(1);
+      return [lower, lowerTrimmed];
+    }
+  }
+  return [lower];
+}
+function collectSingletonsByFactory(sourceFile) {
+  const out = /* @__PURE__ */ new Map();
+  for (const stmt of sourceFile.getVariableStatements()) {
+    for (const decl of stmt.getDeclarations()) {
+      const init = decl.getInitializer();
+      if (!init || !Node8.isCallExpression(init)) continue;
+      const callee = init.getExpression();
+      if (!Node8.isIdentifier(callee)) continue;
+      out.set(callee.getText(), decl.getName());
+    }
+  }
+  return out;
+}
+function collectAllModels(fixtures, instances) {
+  const all = /* @__PURE__ */ new Set();
+  for (const k of fixtures.keys()) all.add(k);
+  for (const k of instances.keys()) all.add(k);
+  const list = [...all];
+  list.sort((a, b) => {
+    const aLine = (fixtures.get(a) ?? instances.get(a))?.getStartLineNumber() ?? 0;
+    const bLine = (fixtures.get(b) ?? instances.get(b))?.getStartLineNumber() ?? 0;
+    return aLine - bLine;
+  });
+  return list;
+}
+function readClassMethods(cls) {
+  const out = [];
+  for (const m of cls.getMethods()) {
+    out.push(readMethod(m));
+  }
+  return out;
+}
+function readMethod(m) {
+  const visibility = readVisibility(m);
+  const isAsync = m.isAsync();
+  const isStatic = m.isStatic();
+  const params = m.getParameters().map((p) => p.getText()).join(", ");
+  const returnTypeNode = m.getReturnTypeNode();
+  const returnTypeText = returnTypeNode ? returnTypeNode.getText() : void 0;
+  const result = {
+    name: m.getName(),
+    isStatic,
+    isAsync,
+    visibility,
+    parameterText: params,
+    returnTypeText,
+    line: m.getStartLineNumber(),
+    endLine: m.getEndLineNumber()
+  };
+  return result;
+}
+function readVisibility(m) {
+  if (m.hasModifier(SyntaxKind5.PrivateKeyword)) return "private";
+  if (m.hasModifier(SyntaxKind5.ProtectedKeyword)) return "protected";
+  return "public";
+}
+function readExtendsGenerics(cls) {
+  const ext = cls.getExtends();
+  if (!ext) return [];
+  return ext.getTypeArguments().map((t) => t.getText());
+}
+function collectIdentityImports(sourceFile) {
+  const out = /* @__PURE__ */ new Set();
+  for (const imp of sourceFile.getImportDeclarations()) {
+    for (const named of imp.getNamedImports()) {
+      const name = named.getNameNode().getText();
+      if (name.endsWith("Identity")) {
+        out.add(name);
+      }
+    }
+  }
+  const list = [...out];
+  list.sort();
+  return list;
+}
+
+// packages/dbx-components-mcp/src/tools/model-fixture-shared/inspect.ts
+import { readFile as readFile2 } from "node:fs/promises";
+import { join } from "node:path";
+var FIXTURE_RELATIVE_PATH = "src/test/fixture.ts";
+async function inspectAppFixtures(apiAbs, apiRel) {
+  const absolutePath = join(apiAbs, FIXTURE_RELATIVE_PATH);
+  const relativePath = `${apiRel}/${FIXTURE_RELATIVE_PATH}`;
+  const text = await readFile2(absolutePath, "utf8");
+  return extractAppFixturesFromText({ text, fixturePath: relativePath });
+}
+
+// packages/dbx-components-mcp/src/tools/model-fixture-shared/validate.ts
+function validateAppFixtures(extraction, options = {}) {
+  const diagnostics = [];
+  for (const entry of extraction.entries) {
+    pushTripletCompletenessDiagnostics(entry, diagnostics);
+    pushForwardingDiagnostics(entry, diagnostics);
+    pushGenericAlignmentDiagnostics(entry, diagnostics);
+    pushArchetypeConsistencyDiagnostics(entry, diagnostics);
+    pushParentFieldNamingDiagnostics(entry, options.registry, diagnostics);
+    pushRegistryDiagnostics(entry, options.registry, diagnostics);
+  }
+  pushOrphanFixtureDiagnostics(extraction, diagnostics);
+  pushModelsWithoutFixtureDiagnostics(extraction, options.registry, diagnostics);
+  let errorCount = 0;
+  let warningCount = 0;
+  for (const d of diagnostics) {
+    if (d.severity === "error") errorCount += 1;
+    else warningCount += 1;
+  }
+  return {
+    fixturePath: extraction.fixturePath,
+    diagnostics,
+    errorCount,
+    warningCount
+  };
+}
+function pushTripletCompletenessDiagnostics(entry, out) {
+  if (!entry.factoryName) {
+    out.push({
+      code: "triplet-incomplete",
+      severity: "error",
+      model: entry.model,
+      message: `Model \`${entry.model}\` has Fixture/Instance classes but no \`modelTestContextFactory\` registration.`,
+      line: entry.fixtureLine
+    });
+  }
+  if (entry.factoryName && !entry.singletonName) {
+    out.push({
+      code: "triplet-incomplete",
+      severity: "warning",
+      model: entry.model,
+      message: `Factory \`${entry.factoryName}\` has no exported singleton (e.g. \`export const ${decapitalize(entry.prefix)}${entry.model}Context = ${entry.factoryName}();\`).`,
+      line: entry.factory?.line
+    });
+  }
+  if (!entry.params) {
+    out.push({
+      code: "triplet-incomplete",
+      severity: "warning",
+      model: entry.model,
+      message: `Model \`${entry.model}\` has no \`${entry.prefix}${entry.model}TestContextParams\` interface or alias.`,
+      line: entry.fixtureLine
+    });
+  }
+}
+function pushForwardingDiagnostics(entry, out) {
+  const fixtureByName = new Map(entry.fixtureMethods.map((m) => [m.name, m]));
+  for (const instanceMethod of entry.instanceMethods) {
+    if (instanceMethod.visibility !== "public") continue;
+    const fixtureMethod = fixtureByName.get(instanceMethod.name);
+    if (!fixtureMethod) {
+      out.push({
+        code: "forwarder-missing",
+        severity: "warning",
+        model: entry.model,
+        message: `Fixture \`${entry.fixtureClassName}\` is missing a forwarder for instance method \`${instanceMethod.name}\`.`,
+        line: instanceMethod.line
+      });
+      continue;
+    }
+    if (!signaturesMatch(fixtureMethod, instanceMethod)) {
+      out.push({
+        code: "forwarder-divergent",
+        severity: "warning",
+        model: entry.model,
+        message: `Fixture forwarder \`${fixtureMethod.name}\` signature differs from the instance method.`,
+        line: fixtureMethod.line
+      });
+    }
+  }
+}
+function pushGenericAlignmentDiagnostics(entry, out) {
+  const fixGenerics = entry.fixtureExtendsGenerics;
+  const instGenerics = entry.instanceExtendsGenerics;
+  const factoryGenerics = entry.factory?.genericArgs ?? [];
+  const fixModel = fixGenerics[0];
+  const fixDoc = fixGenerics[1];
+  const instModel = instGenerics[0];
+  const instDoc = instGenerics[1];
+  const factoryModel = factoryGenerics[0];
+  const factoryDoc = factoryGenerics[1];
+  if (fixModel !== void 0 && instModel !== void 0 && fixModel !== instModel) {
+    out.push({
+      code: "generics-misaligned",
+      severity: "error",
+      model: entry.model,
+      message: `Model generic differs between Fixture (\`${fixModel}\`) and Instance (\`${instModel}\`).`,
+      line: entry.fixtureLine
+    });
+  }
+  if (fixDoc !== void 0 && instDoc !== void 0 && fixDoc !== instDoc) {
+    out.push({
+      code: "generics-misaligned",
+      severity: "error",
+      model: entry.model,
+      message: `Document generic differs between Fixture (\`${fixDoc}\`) and Instance (\`${instDoc}\`).`,
+      line: entry.fixtureLine
+    });
+  }
+  if (factoryModel !== void 0 && fixModel !== void 0 && factoryModel !== fixModel) {
+    out.push({
+      code: "generics-misaligned",
+      severity: "error",
+      model: entry.model,
+      message: `Model generic differs between factory (\`${factoryModel}\`) and Fixture (\`${fixModel}\`).`,
+      line: entry.factory?.line
+    });
+  }
+  if (factoryDoc !== void 0 && fixDoc !== void 0 && factoryDoc !== fixDoc) {
+    out.push({
+      code: "generics-misaligned",
+      severity: "error",
+      model: entry.model,
+      message: `Document generic differs between factory (\`${factoryDoc}\`) and Fixture (\`${fixDoc}\`).`,
+      line: entry.factory?.line
+    });
+  }
+}
+function pushArchetypeConsistencyDiagnostics(entry, out) {
+  if (!entry.factory) return;
+  const archetype = entry.archetype;
+  if (archetype === "sub-collection" || archetype === "sub-collection-traversal") {
+    const accessedField = entry.factory.parentFixtureFieldFromGetCollection;
+    if (accessedField !== void 0) {
+      const present = entry.params?.fields.some((f) => f.name === accessedField && f.fixtureModel !== void 0);
+      if (!present) {
+        out.push({
+          code: "archetype-inconsistent",
+          severity: "error",
+          model: entry.model,
+          message: `\`getCollection\` reads \`params.${accessedField}\` but the Params interface has no fixture-typed \`${accessedField}\` field.`,
+          line: entry.factory.line
+        });
+      }
+    }
+  }
+}
+function pushParentFieldNamingDiagnostics(entry, registry, out) {
+  if (!registry) return;
+  if (!entry.params) return;
+  for (const field of entry.params.fields) {
+    if (field.fixtureModel === void 0) continue;
+    const expected = lookupCollectionPrefix(registry, field.fixtureModel);
+    if (expected === void 0) continue;
+    if (field.name !== expected) {
+      out.push({
+        code: "params-field-naming",
+        severity: "warning",
+        model: entry.model,
+        message: `Params field \`${field.name}: ${field.typeText}\` should be named \`${expected}\` to match \`${field.fixtureModel}\`'s firestoreModelIdentity short alias.`,
+        line: entry.params.line
+      });
+    }
+  }
+}
+function pushRegistryDiagnostics(entry, registry, out) {
+  if (!registry) return;
+  const known = registry.entries.find((m) => m.name === entry.model);
+  if (!known) {
+    out.push({
+      code: "model-not-in-registry",
+      severity: "warning",
+      model: entry.model,
+      message: `Model \`${entry.model}\` has a fixture but isn't in the supplied model registry.`,
+      line: entry.fixtureLine
+    });
+  }
+}
+function pushOrphanFixtureDiagnostics(extraction, out) {
+  for (const name of extraction.unrecognizedClassNames) {
+    out.push({
+      code: "triplet-incomplete",
+      severity: "warning",
+      message: `Class \`${name}\` ends in TestContextFixture/Instance but doesn't fit the \`<Prefix><Model><Suffix>\` convention.`
+    });
+  }
+}
+function pushModelsWithoutFixtureDiagnostics(extraction, registry, out) {
+  if (!registry) return;
+  const have = new Set(extraction.entries.map((e) => e.model));
+  for (const m of registry.entries) {
+    if (have.has(m.name)) continue;
+    out.push({
+      code: "model-without-fixture",
+      severity: "warning",
+      model: m.name,
+      message: `Model \`${m.name}\` is in the registry but \`${extraction.fixturePath}\` doesn't declare a fixture for it.`
+    });
+  }
+}
+function signaturesMatch(a, b) {
+  if (a.parameterText.replace(/\s+/g, "") !== b.parameterText.replace(/\s+/g, "")) return false;
+  if (a.isAsync !== b.isAsync) return false;
+  return true;
+}
+function decapitalize(s) {
+  if (s.length === 0) return s;
+  return s.charAt(0).toLowerCase() + s.slice(1);
+}
+function lookupCollectionPrefix(registry, modelName) {
+  const entry = registry.entries.find((m) => m.name === modelName);
+  return entry?.collectionPrefix;
+}
+
+// packages/dbx-components-mcp/src/tools/model-fixture-shared/format.json.ts
+function formatListAsJson(extraction) {
+  return stringify({
+    fixturePath: extraction.fixturePath,
+    prefix: extraction.prefix,
+    identityImports: extraction.identityImports,
+    unrecognizedClassNames: extraction.unrecognizedClassNames,
+    entries: extraction.entries.map((e) => summarizeEntry(e))
+  });
+}
+function formatLookupAsJson(extraction, entry) {
+  return stringify({
+    fixturePath: extraction.fixturePath,
+    prefix: extraction.prefix,
+    entry: summarizeEntry(entry, true)
+  });
+}
+function formatValidationAsJson(result) {
+  return stringify({
+    fixturePath: result.fixturePath,
+    errorCount: result.errorCount,
+    warningCount: result.warningCount,
+    diagnostics: result.diagnostics
+  });
+}
+function summarizeEntry(entry, full = false) {
+  const summary = {
+    model: entry.model,
+    prefix: entry.prefix,
+    archetype: entry.archetype,
+    fixtureClassName: entry.fixtureClassName,
+    instanceClassName: entry.instanceClassName,
+    paramsTypeName: entry.paramsTypeName,
+    factoryName: entry.factoryName,
+    singletonName: entry.singletonName,
+    fixtureLine: entry.fixtureLine,
+    fixtureEndLine: entry.fixtureEndLine,
+    instanceLine: entry.instanceLine,
+    instanceEndLine: entry.instanceEndLine,
+    fixtureMethodNames: entry.fixtureMethods.map((m) => m.name),
+    instanceMethodNames: entry.instanceMethods.map((m) => m.name)
+  };
+  if (full) {
+    summary.fixtureExtendsGenerics = entry.fixtureExtendsGenerics;
+    summary.instanceExtendsGenerics = entry.instanceExtendsGenerics;
+    summary.factory = entry.factory;
+    summary.params = entry.params;
+    summary.fixtureMethods = entry.fixtureMethods;
+    summary.instanceMethods = entry.instanceMethods;
+  }
+  return summary;
+}
+function stringify(value) {
+  return JSON.stringify(value, null, 2);
+}
+
+// packages/dbx-components-mcp/src/tools/model-fixture-shared/format.markdown.ts
+function formatListAsMarkdown(extraction) {
+  const lines = [];
+  lines.push(`# App fixtures \u2014 ${extraction.fixturePath}`);
+  lines.push("");
+  lines.push(`Detected workspace prefix: \`${extraction.prefix ?? "(none)"}\``);
+  lines.push(`Identity imports: ${extraction.identityImports.length === 0 ? "_None._" : extraction.identityImports.map((s) => "`" + s + "`").join(", ")}`);
+  lines.push("");
+  lines.push(`## Fixtures (${extraction.entries.length})`);
+  if (extraction.entries.length === 0) {
+    lines.push("", "_No model fixtures found._");
+  } else {
+    lines.push("");
+    lines.push("| Model | Archetype | Fixture | Instance | Params | Factory | Singleton | Methods (F/I) | Lines |");
+    lines.push("|---|---|---|---|---|---|---|---|---|");
+    for (const e of extraction.entries) {
+      lines.push("| " + [e.model, e.archetype, code3(e.fixtureClassName), code3(e.instanceClassName), code3(e.paramsTypeName), code3(e.factoryName ?? "\u2014"), code3(e.singletonName ?? "\u2014"), `${e.fixtureMethods.length}/${e.instanceMethods.length}`, `${e.fixtureLine}-${e.instanceEndLine}`].join(" | ") + " |");
+    }
+  }
+  if (extraction.unrecognizedClassNames.length > 0) {
+    lines.push("", `## Unrecognized classes (${extraction.unrecognizedClassNames.length})`);
+    for (const name of extraction.unrecognizedClassNames) {
+      lines.push("", `- \`${name}\``);
+    }
+  }
+  return lines.join("\n");
+}
+function formatLookupAsMarkdown(extraction, entry) {
+  const lines = [];
+  appendLookupHeader(lines, extraction, entry);
+  appendLookupTriplet(lines, entry);
+  appendLookupGenerics(lines, entry);
+  appendLookupFactoryCallbacks(lines, entry);
+  appendLookupParams(lines, entry);
+  lines.push("", `## Methods \u2014 Fixture (${entry.fixtureMethods.length})`);
+  appendMethodTable(lines, entry.fixtureMethods);
+  lines.push("", `## Methods \u2014 Instance (${entry.instanceMethods.length})`);
+  appendMethodTable(lines, entry.instanceMethods);
+  lines.push("", "## Forwarding");
+  appendForwardingTable(lines, entry);
+  return lines.join("\n");
+}
+function appendLookupHeader(lines, extraction, entry) {
+  lines.push(`# Fixture: \`${entry.prefix}${entry.model}\``, "", `Source: \`${extraction.fixturePath}\``, `Archetype: \`${entry.archetype}\``, "");
+}
+function appendLookupTriplet(lines, entry) {
+  lines.push("## Triplet", "", `- Fixture: \`${entry.fixtureClassName}\` (lines ${entry.fixtureLine}-${entry.fixtureEndLine})`, `- Instance: \`${entry.instanceClassName}\` (lines ${entry.instanceLine}-${entry.instanceEndLine})`, `- Params: \`${entry.paramsTypeName}\``, `- Factory: \`${entry.factoryName ?? "\u2014"}\``, `- Singleton: \`${entry.singletonName ?? "\u2014"}\``);
+}
+function appendLookupGenerics(lines, entry) {
+  if (entry.fixtureExtendsGenerics.length > 0) {
+    lines.push("", `Fixture generics: \`${entry.fixtureExtendsGenerics.join(", ")}\``);
+  }
+  if (entry.instanceExtendsGenerics.length > 0) {
+    lines.push(`Instance generics: \`${entry.instanceExtendsGenerics.join(", ")}\``);
+  }
+  if (entry.factory && entry.factory.genericArgs.length > 0) {
+    lines.push(`Factory generics: \`${entry.factory.genericArgs.join(", ")}\``);
+  }
+}
+function appendLookupFactoryCallbacks(lines, entry) {
+  if (!entry.factory) return;
+  const flags = [];
+  flags.push(`getCollection: ${entry.factory.hasParamsGetCollection ? "`(fi, params) => \u2026`" : "`(fi) => \u2026`"}`);
+  if (entry.factory.hasCollectionForDocument) flags.push("`collectionForDocument` present");
+  if (entry.factory.hasInitDocument) flags.push("`initDocument` present");
+  lines.push(`Factory callbacks: ${flags.join(", ")}`);
+  if (entry.factory.parentFixtureFieldFromGetCollection) {
+    lines.push(`Parent fixture field used in \`getCollection\`: \`params.${entry.factory.parentFixtureFieldFromGetCollection}\``);
+  }
+}
+function appendLookupParams(lines, entry) {
+  if (!entry.params) return;
+  lines.push("", "## Params", "", `- Kind: ${entry.params.kind}`);
+  if (entry.params.extendsPartial) lines.push(`- Extends \`Partial<${entry.params.modelName ?? "?"}>\``);
+  if (entry.params.aliasOfPartial) lines.push(`- Alias of \`Partial<${entry.params.modelName ?? "?"}>\``);
+  if (entry.params.fields.length === 0) return;
+  lines.push("", "| Field | Type | Optional | Fixture dependency |", "|---|---|---|---|");
+  for (const field of entry.params.fields) {
+    lines.push("| " + [code3(field.name), code3(field.typeText), field.optional ? "yes" : "no", field.fixtureModel ? code3(field.fixtureModel) : "\u2014"].join(" | ") + " |");
+  }
+}
+function formatValidationAsMarkdown(result) {
+  const lines = [];
+  lines.push(`# Fixture validation \u2014 ${result.fixturePath}`);
+  lines.push("");
+  lines.push(`Errors: ${result.errorCount}`);
+  lines.push(`Warnings: ${result.warningCount}`);
+  if (result.diagnostics.length === 0) {
+    lines.push("", "_No diagnostics._");
+    return lines.join("\n");
+  }
+  lines.push("", "## Diagnostics");
+  for (const d of result.diagnostics) {
+    const linePart = d.line !== void 0 ? ` (line ${d.line})` : "";
+    const modelPart = d.model !== void 0 ? ` [${d.model}]` : "";
+    lines.push("", `- **${d.severity.toUpperCase()}** \`${d.code}\`${modelPart}${linePart}: ${d.message}`);
+  }
+  return lines.join("\n");
+}
+function appendMethodTable(lines, methods) {
+  if (methods.length === 0) {
+    lines.push("", "_None._");
+    return;
+  }
+  lines.push("", "| Method | Async | Returns | Line |");
+  lines.push("|---|---|---|---|");
+  for (const m of methods) {
+    lines.push("| " + [code3(m.name + "(" + m.parameterText + ")"), m.isAsync ? "yes" : "no", code3(m.returnTypeText ?? "\u2014"), String(m.line)].join(" | ") + " |");
+  }
+}
+function appendForwardingTable(lines, entry) {
+  if (entry.instanceMethods.length === 0) {
+    lines.push("", "_No instance methods to forward._");
+    return;
+  }
+  const fixtureByName = new Map(entry.fixtureMethods.map((m) => [m.name, m]));
+  lines.push("", "| Instance method | Forwarded? |");
+  lines.push("|---|---|");
+  for (const m of entry.instanceMethods) {
+    const fixtureMethod = fixtureByName.get(m.name);
+    let status;
+    if (!fixtureMethod) {
+      status = "missing";
+    } else if (fixtureMethod.parameterText.replace(/\s+/g, "") !== m.parameterText.replace(/\s+/g, "")) {
+      status = "forwarded \u2014 signature drifts";
+    } else {
+      status = "forwarded";
+    }
+    lines.push("| " + [code3(m.name), status].join(" | ") + " |");
+  }
+}
+function code3(s) {
+  return "`" + s + "`";
+}
+
+// packages/dbx-components-mcp/src/tools/model-fixture-shared/scaffold.ts
+function renderFixtureScaffold(extraction, input) {
+  const prefix = input.prefix;
+  const factoryPrefix = input.factoryNamePrefix ?? defaultFactoryPrefix(prefix);
+  const paramsTypeName = `${prefix}${input.model}TestContextParams`;
+  const fixtureClassName = `${prefix}${input.model}TestContextFixture`;
+  const instanceClassName = `${prefix}${input.model}TestContextInstance`;
+  const factoryName = `${factoryPrefix}${input.model}ContextFactory`;
+  const singletonName = `${factoryPrefix}${input.model}Context`;
+  const modelDocumentTypeName = input.modelDocumentTypeName ?? `${input.model}Document`;
+  const collectionGenericArg = input.collectionGenericArg;
+  const todos = [];
+  const paramsLines = renderParamsBlock(input, paramsTypeName, todos);
+  const instanceBlock = renderInstanceBlock({ prefix, instanceClassName, modelDocumentTypeName, model: input.model, todos });
+  const fixtureBlock = renderFixtureBlock({ prefix, fixtureClassName, instanceClassName, modelDocumentTypeName, model: input.model, todos });
+  const factoryBlock = renderFactoryBlock({
+    prefix,
+    factoryName,
+    fixtureClassName,
+    instanceClassName,
+    paramsTypeName,
+    archetype: input.archetype,
+    model: input.model,
+    modelDocumentTypeName,
+    collectionGenericArg,
+    parentFixture: input.parentFixture,
+    parentFixtureField: input.parentFixtureField,
+    withInitDocument: input.withInitDocument === true,
+    todos
+  });
+  const singletonBlock = `export const ${singletonName} = ${factoryName}();`;
+  const snippet = [`// MARK: ${input.model}`, paramsLines.join("\n"), "", instanceBlock, "", fixtureBlock, "", factoryBlock, "", singletonBlock, ""].join("\n");
+  const inserted = [
+    { kind: "params", name: paramsTypeName },
+    { kind: "instance", name: instanceClassName },
+    { kind: "fixture", name: fixtureClassName },
+    { kind: "factory", name: factoryName },
+    { kind: "singleton", name: singletonName }
+  ];
+  if (!extraction.fixturePath) {
+    todos.push("Confirm fixture path was parsed.");
+  }
+  todos.push(`Add named imports for \`${input.model}\` and \`${modelDocumentTypeName}\` if not already present.`);
+  if (collectionGenericArg) {
+    todos.push(`Add named import for \`${collectionGenericArg}\`.`);
+  }
+  if (input.archetype === "sub-collection" || input.archetype === "sub-collection-traversal") {
+    todos.push("Wire `getCollection` to the correct collection factory accessor on `<prefix>FirestoreCollections`.");
+  }
+  todos.push("Replace TODOs in `makeRef` and instance methods with real logic.");
+  return {
+    snippet,
+    todos,
+    inserted,
+    paramsTypeName,
+    fixtureClassName,
+    instanceClassName,
+    factoryName,
+    singletonName
+  };
+}
+function defaultFactoryPrefix(prefix) {
+  if (prefix.length === 0) return "app";
+  const apiSuffix = "Api";
+  if (prefix.endsWith(apiSuffix)) {
+    const trimmed = prefix.slice(0, prefix.length - apiSuffix.length);
+    if (trimmed.length === 0) return "app";
+    return trimmed.charAt(0).toLowerCase() + trimmed.slice(1);
+  }
+  return prefix.charAt(0).toLowerCase() + prefix.slice(1);
+}
+function renderParamsBlock(input, paramsTypeName, todos) {
+  const lines = [];
+  const isSimplePartial = input.archetype === "top-level-simple" && (!input.paramsDependsOn || input.paramsDependsOn.length === 0);
+  if (isSimplePartial) {
+    lines.push(`export type ${paramsTypeName} = Partial<${input.model}>;`);
+    return lines;
+  }
+  const extendsClause = input.archetype === "top-level-simple" || input.archetype === "top-level-with-deps" ? ` extends Partial<${input.model}>` : "";
+  lines.push(`export interface ${paramsTypeName}${extendsClause} {`);
+  if (input.archetype === "sub-collection" || input.archetype === "sub-collection-traversal") {
+    if (input.parentFixture) {
+      const field = input.parentFixtureField ?? defaultParentFieldName(input.parentFixture);
+      lines.push(`  readonly ${field}: ${input.prefix}${input.parentFixture}TestContextFixture;`);
+    } else {
+      todos.push("Add the required parent fixture field on the Params interface.");
+    }
+  }
+  for (const dep of input.paramsDependsOn ?? []) {
+    const optional = dep.optional ? "?" : "";
+    const baseType = `${input.prefix}${dep.fixtureModel}TestContextFixture`;
+    const typeText = dep.array ? `Maybe<ArrayOrValue<${baseType}>>` : baseType;
+    lines.push(`  readonly ${dep.field}${optional}: ${typeText};`);
+  }
+  lines.push("}");
+  return lines;
+}
+function renderInstanceBlock(input) {
+  input.todos.push(`Add instance methods to \`${input.instanceClassName}\`.`);
+  return [`export class ${input.instanceClassName}<F extends FirebaseAdminFunctionTestContextInstance = FirebaseAdminFunctionTestContextInstance> extends ModelTestContextInstance<${input.model}, ${input.modelDocumentTypeName}, ${input.prefix}FunctionContextFixtureInstance<F>> {`, "  // TODO: implement instance-side methods (these own the real logic).", "}"].join("\n");
+}
+function renderFixtureBlock(input) {
+  input.todos.push(`Add forwarder methods to \`${input.fixtureClassName}\` after defining instance methods.`);
+  return [`export class ${input.fixtureClassName}<F extends FirebaseAdminFunctionTestContextInstance = FirebaseAdminFunctionTestContextInstance> extends ModelTestContextFixture<${input.model}, ${input.modelDocumentTypeName}, ${input.prefix}FunctionContextFixtureInstance<F>, ${input.prefix}FunctionContextFixture<F>, ${input.instanceClassName}<F>> {`, "  // TODO: forward instance methods. Run `dbx_model_fixture_forward` after adding instance methods.", "}"].join("\n");
+}
+function renderFactoryBlock(input) {
+  const generics = renderFactoryGenerics(input);
+  const callbacks = renderFactoryCallbacks(input);
+  const lines = [];
+  lines.push(`export const ${input.factoryName} = () =>`);
+  lines.push(`  modelTestContextFactory<`);
+  for (let i = 0; i < generics.length; i += 1) {
+    const isLast = i === generics.length - 1;
+    lines.push(`    ${generics[i]}${isLast ? "" : ","}`);
+  }
+  lines.push("  >({");
+  for (let i = 0; i < callbacks.length; i += 1) {
+    const isLast = i === callbacks.length - 1;
+    lines.push(`    ${callbacks[i]}${isLast ? "" : ","}`);
+  }
+  lines.push("  });");
+  return lines.join("\n");
+}
+function renderFactoryGenerics(input) {
+  const baseGenerics = [input.model, input.modelDocumentTypeName, input.paramsTypeName, `${input.prefix}FunctionContextFixtureInstance<FirebaseAdminFunctionTestContextInstance>`, `${input.prefix}FunctionContextFixture<FirebaseAdminFunctionTestContextInstance>`, `${input.instanceClassName}<FirebaseAdminFunctionTestContextInstance>`, `${input.fixtureClassName}<FirebaseAdminFunctionTestContextInstance>`];
+  if (input.collectionGenericArg) {
+    return [...baseGenerics, input.collectionGenericArg];
+  }
+  if (input.archetype === "sub-collection" || input.archetype === "sub-collection-traversal") {
+    return [...baseGenerics, `${input.model}FirestoreCollection`];
+  }
+  return baseGenerics;
+}
+function renderFactoryCallbacks(input) {
+  const callbacks = [];
+  callbacks.push(`makeFixture: (f) => new ${input.fixtureClassName}(f)`);
+  if (input.archetype === "sub-collection" || input.archetype === "sub-collection-traversal") {
+    const field = input.parentFixtureField ?? (input.parentFixture ? defaultParentFieldName(input.parentFixture) : "parent");
+    callbacks.push(`getCollection: (fi, params) => fi.${defaultCollectionsAccessor(input.prefix)}.${camelInitial(input.model)}CollectionFactory(params.${field}.document)`);
+    if (input.archetype === "sub-collection-traversal") {
+      callbacks.push(`collectionForDocument: (fi, doc) => fi.${defaultCollectionsAccessor(input.prefix)}.${camelInitial(input.model)}Collection`);
+      input.todos.push("Verify `collectionForDocument` resolves to the correct collection accessor.");
+    }
+  } else {
+    callbacks.push(`getCollection: (fi) => fi.${defaultCollectionsAccessor(input.prefix)}.${camelInitial(input.model)}Collection`);
+  }
+  callbacks.push(`makeInstance: (delegate, ref, testInstance) => new ${input.instanceClassName}(delegate, ref, testInstance)`);
+  callbacks.push(`makeRef: async (collection, params, _p) => {
+      // TODO: choose the correct ref strategy (auto id vs deterministic id).
+      return collection.documentAccessor().newDocument().documentRef;
+    }`);
+  if (input.withInitDocument) {
+    callbacks.push(`initDocument: async (instance, params) => {
+      // TODO: seed the new document with sensible defaults from \`params\`.
+    }`);
+  }
+  return callbacks;
+}
+function defaultCollectionsAccessor(prefix) {
+  const base = prefix.length > 0 ? prefix.charAt(0).toLowerCase() + prefix.slice(1) : "app";
+  if (base.endsWith("Api")) {
+    return `${base.slice(0, -3)}FirestoreCollections`;
+  }
+  return `${base}FirestoreCollections`;
+}
+function camelInitial(name) {
+  if (name.length === 0) return name;
+  return name.charAt(0).toLowerCase() + name.slice(1);
+}
+function defaultParentFieldName(parentModel) {
+  const acronym = parentModel.match(/[A-Z]/g);
+  if (!acronym || acronym.length === 0) return parentModel.toLowerCase();
+  return acronym.join("").toLowerCase();
+}
+
+// packages/dbx-components-mcp/src/tools/model-fixture-shared/forward.ts
+function renderForwarders(input) {
+  const { entry, methods } = input;
+  const fixtureNames = new Set(entry.fixtureMethods.map((m) => m.name));
+  const wanted = methods ? new Set(methods) : void 0;
+  const added = [];
+  const skipped = [];
+  const missing = [];
+  const instanceByName = new Map(entry.instanceMethods.map((m) => [m.name, m]));
+  if (wanted) {
+    for (const name of wanted) {
+      if (!instanceByName.has(name)) {
+        missing.push(name);
+      }
+    }
+  }
+  for (const m of entry.instanceMethods) {
+    if (m.visibility !== "public") continue;
+    if (wanted && !wanted.has(m.name)) continue;
+    if (fixtureNames.has(m.name)) {
+      skipped.push(m.name);
+      continue;
+    }
+    added.push(renderOne(m));
+  }
+  return {
+    added,
+    skippedAlreadyForwarded: skipped,
+    missingFromInstance: missing
+  };
+}
+function renderOne(m) {
+  const asyncKw = m.isAsync ? "async " : "";
+  const returnType = m.returnTypeText ? `: ${m.returnTypeText}` : "";
+  const args = parameterCallText(m.parameterText);
+  const body = `return this.instance.${m.name}(${args});`;
+  const source = `  ${asyncKw}${m.name}(${m.parameterText})${returnType} {
+    ${body}
+  }`;
+  return { method: m.name, source };
+}
+function parameterCallText(parameterText) {
+  if (parameterText.trim().length === 0) return "";
+  const params = splitParameters(parameterText);
+  const out = [];
+  for (const raw of params) {
+    const trimmed = raw.trim();
+    if (trimmed.length === 0) continue;
+    const isRest = trimmed.startsWith("...");
+    const stripped = isRest ? trimmed.slice(3) : trimmed;
+    const equalsIdx = stripped.indexOf("=");
+    const beforeEq = equalsIdx === -1 ? stripped : stripped.slice(0, equalsIdx);
+    const colonIdx = topLevelColonIndex(beforeEq);
+    const head = colonIdx === -1 ? beforeEq : beforeEq.slice(0, colonIdx);
+    const cleaned = head.replace(/\?$/, "").trim();
+    const name = cleaned.replace(/^public\s+|^private\s+|^protected\s+|^readonly\s+/, "").trim();
+    if (name.length === 0) continue;
+    out.push(isRest ? `...${name}` : name);
+  }
+  return out.join(", ");
+}
+function splitParameters(text) {
+  const out = [];
+  let depth = 0;
+  let start = 0;
+  for (let i = 0; i < text.length; i += 1) {
+    const ch = text[i];
+    if (ch === "<" || ch === "(" || ch === "[" || ch === "{") depth += 1;
+    else if (ch === ">" || ch === ")" || ch === "]" || ch === "}") depth -= 1;
+    else if (ch === "," && depth === 0) {
+      out.push(text.slice(start, i));
+      start = i + 1;
+    }
+  }
+  out.push(text.slice(start));
+  return out;
+}
+function topLevelColonIndex(text) {
+  let depth = 0;
+  let index = 0;
+  for (const ch of text) {
+    if (ch === "<" || ch === "(" || ch === "[" || ch === "{") depth += 1;
+    else if (ch === ">" || ch === ")" || ch === "]" || ch === "}") depth -= 1;
+    else if (ch === ":" && depth === 0) return index;
+    index += 1;
+  }
+  return -1;
+}
+
+// packages/dbx-components-mcp/src/tools/model-fixture-list-app.tool.ts
+var ListArgsType = type31({
+  apiDir: "string",
+  "format?": "'markdown' | 'json'"
+});
+var TOOL = {
+  name: "dbx_model_fixture_list_app",
+  description: [
+    "List every `<Prefix><Model>TestContext{Fixture,Instance,Params}` triplet declared in a downstream API app's `src/test/fixture.ts`.",
+    "",
+    "Each row reports the model name, archetype (`top-level-simple` / `top-level-with-deps` / `sub-collection` / `sub-collection-traversal`), Fixture and Instance class names, Params type, factory + singleton, fixture/instance method counts, and start/end lines.",
+    "",
+    "Provide:",
+    "- `apiDir`: relative path to the API app (e.g. `apps/demo-api`).",
+    "- `format` (optional): `markdown` (default) or `json`.",
+    "",
+    "Paths escaping the server cwd are rejected."
+  ].join("\n"),
+  inputSchema: {
+    type: "object",
+    properties: {
+      apiDir: { type: "string", description: "Relative path to the API app (e.g. `apps/demo-api`)." },
+      format: { type: "string", enum: ["markdown", "json"], description: "Output format. Defaults to markdown." }
+    },
+    required: ["apiDir"]
+  }
+};
+async function run(rawArgs) {
+  const parsed = ListArgsType(rawArgs);
+  if (parsed instanceof type31.errors) {
+    return toolError(`Invalid arguments: ${parsed.summary}`);
+  }
+  const cwd = process.cwd();
+  try {
+    ensurePathInsideCwd(parsed.apiDir, cwd);
+  } catch (err) {
+    return toolError(err instanceof Error ? err.message : String(err));
+  }
+  const apiAbs = resolve15(cwd, parsed.apiDir);
+  let extraction;
+  try {
+    extraction = await inspectAppFixtures(apiAbs, parsed.apiDir);
+  } catch (err) {
+    return toolError(`Failed to read fixture file: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  const text = parsed.format === "json" ? formatListAsJson(extraction) : formatListAsMarkdown(extraction);
+  const result = { content: [{ type: "text", text }] };
+  return result;
+}
+var modelFixtureListAppTool = { definition: TOOL, run };
+
+// packages/dbx-components-mcp/src/tools/model-fixture-lookup.tool.ts
+import { resolve as resolve16 } from "node:path";
+import { type as type32 } from "arktype";
+var LookupArgsType = type32({
+  apiDir: "string",
+  model: "string",
+  "format?": "'markdown' | 'json'"
+});
+var TOOL2 = {
+  name: "dbx_model_fixture_lookup",
+  description: [
+    "Look up one fixture/instance triplet declared in `<apiDir>/src/test/fixture.ts`. Returns the archetype, generic args, Params shape with dependency edges, factory + singleton names, and full method tables for both Fixture and Instance with forwarding status.",
+    "",
+    "Provide:",
+    "- `apiDir`: relative path to the API app (e.g. `apps/demo-api`).",
+    "- `model`: bare model name with the workspace prefix stripped (e.g. `StorageFile`, `Profile`).",
+    "- `format` (optional): `markdown` (default) or `json`."
+  ].join("\n"),
+  inputSchema: {
+    type: "object",
+    properties: {
+      apiDir: { type: "string", description: "Relative path to the API app." },
+      model: { type: "string", description: "Bare model name (e.g. `StorageFile`)." },
+      format: { type: "string", enum: ["markdown", "json"], description: "Output format. Defaults to markdown." }
+    },
+    required: ["apiDir", "model"]
+  }
+};
+async function run2(rawArgs) {
+  const parsed = LookupArgsType(rawArgs);
+  if (parsed instanceof type32.errors) {
+    return toolError(`Invalid arguments: ${parsed.summary}`);
+  }
+  const cwd = process.cwd();
+  try {
+    ensurePathInsideCwd(parsed.apiDir, cwd);
+  } catch (err) {
+    return toolError(err instanceof Error ? err.message : String(err));
+  }
+  const apiAbs = resolve16(cwd, parsed.apiDir);
+  let extraction;
+  try {
+    extraction = await inspectAppFixtures(apiAbs, parsed.apiDir);
+  } catch (err) {
+    return toolError(`Failed to read fixture file: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  const entry = extraction.entries.find((e) => e.model === parsed.model);
+  if (!entry) {
+    const known = extraction.entries.map((e) => e.model).join(", ") || "(none)";
+    return toolError(`Model \`${parsed.model}\` not found in \`${extraction.fixturePath}\`. Known: ${known}.`);
+  }
+  const text = parsed.format === "json" ? formatLookupAsJson(extraction, entry) : formatLookupAsMarkdown(extraction, entry);
+  const result = { content: [{ type: "text", text }] };
+  return result;
+}
+var modelFixtureLookupTool = { definition: TOOL2, run: run2 };
+
+// packages/dbx-components-mcp/src/tools/model-fixture-validate-app.tool.ts
+import { resolve as resolve17 } from "node:path";
+import { type as type33 } from "arktype";
+var ValidateArgsType = type33({
+  apiDir: "string",
+  "format?": "'markdown' | 'json'"
+});
+var TOOL3 = {
+  name: "dbx_model_fixture_validate_app",
+  description: [
+    "Validate every `<Prefix><Model>TestContext{Fixture,Instance,Params}` triplet in a downstream API app's `src/test/fixture.ts`.",
+    "",
+    "Diagnostics emitted:",
+    "- `forwarder-missing` / `forwarder-divergent`: every public Instance method must have a Fixture forwarder with a matching signature.",
+    "- `triplet-incomplete`: Fixture, Instance, Params, factory, and singleton must all be present per model.",
+    "- `generics-misaligned`: Model and Document generics must agree across Fixture, Instance, and factory call.",
+    "- `archetype-inconsistent`: sub-collection wiring requires a matching parent fixture field on the Params type.",
+    "- `params-field-naming`: parent fixture field names must equal the parent model's firestoreModelIdentity short alias (when a model registry is configured).",
+    "- `model-not-in-registry` / `model-without-fixture`: registry cross-reference (when a model registry is configured).",
+    "",
+    "Provide:",
+    "- `apiDir`: relative path to the API app.",
+    "- `format` (optional): `markdown` (default) or `json`."
+  ].join("\n"),
+  inputSchema: {
+    type: "object",
+    properties: {
+      apiDir: { type: "string", description: "Relative path to the API app." },
+      format: { type: "string", enum: ["markdown", "json"], description: "Output format. Defaults to markdown." }
+    },
+    required: ["apiDir"]
+  }
+};
+function createModelFixtureValidateAppTool(config = {}) {
+  async function run5(rawArgs) {
+    const parsed = ValidateArgsType(rawArgs);
+    if (parsed instanceof type33.errors) {
+      return toolError(`Invalid arguments: ${parsed.summary}`);
+    }
+    const cwd = process.cwd();
+    try {
+      ensurePathInsideCwd(parsed.apiDir, cwd);
+    } catch (err) {
+      return toolError(err instanceof Error ? err.message : String(err));
+    }
+    const apiAbs = resolve17(cwd, parsed.apiDir);
+    let extraction;
+    try {
+      extraction = await inspectAppFixtures(apiAbs, parsed.apiDir);
+    } catch (err) {
+      return toolError(`Failed to read fixture file: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    const registry = config.getRegistry ? config.getRegistry() : void 0;
+    const result = validateAppFixtures(extraction, { registry });
+    const text = parsed.format === "json" ? formatValidationAsJson(result) : formatValidationAsMarkdown(result);
+    const toolResult = {
+      content: [{ type: "text", text }],
+      isError: result.errorCount > 0
+    };
+    return toolResult;
+  }
+  return { definition: TOOL3, run: run5 };
+}
+
+// packages/dbx-components-mcp/src/tools/model-fixture-scaffold.tool.ts
+import { readFile as readFile3, writeFile } from "node:fs/promises";
+import { join as join2, resolve as resolve18 } from "node:path";
+import { type as type34 } from "arktype";
+var ScaffoldArgsType3 = type34({
+  apiDir: "string",
+  model: "string",
+  archetype: "'top-level-simple' | 'top-level-with-deps' | 'sub-collection' | 'sub-collection-traversal'",
+  "prefix?": "string",
+  "parentFixture?": "string",
+  "parentFixtureField?": "string",
+  "paramsDependsOn?": type34({
+    field: "string",
+    fixtureModel: "string",
+    "optional?": "boolean",
+    "array?": "boolean"
+  }).array(),
+  "withInitDocument?": "boolean",
+  "collectionGenericArg?": "string",
+  "modelDocumentTypeName?": "string",
+  "factoryNamePrefix?": "string"
+});
+var TOOL4 = {
+  name: "dbx_model_fixture_scaffold",
+  description: [
+    "Scaffold a new fixture/instance triplet directly into `<apiDir>/src/test/fixture.ts`. The tool appends a single block containing the Params interface (or `Partial<Model>` alias), Instance class, Fixture class, `modelTestContextFactory(...)` registration, and exported singleton. Every customizable callback body is left as a `TODO`.",
+    "",
+    "Refuses to mutate when any of the named entities already exist \u2014 review the conflict list and either rename or delete the existing entries before retrying.",
+    "",
+    "Use the four archetypes to control the factory dialect:",
+    "- `top-level-simple`: 7 generics, single-arg `getCollection`, `Partial<Model>` Params alias.",
+    "- `top-level-with-deps`: same shape but Params extends `Partial<Model>` and adds the listed fixture dependencies.",
+    "- `sub-collection`: 8 generics, two-arg `getCollection(fi, params)` reading the parent fixture's document. Pass `parentFixture` to drive the parent ref.",
+    "- `sub-collection-traversal`: same as `sub-collection` plus a `collectionForDocument` skeleton.",
+    "",
+    "When `parentFixture` is supplied without `parentFixtureField`, the field name defaults to lowercased initials of the parent model name (`SchoolGroup` \u2192 `sg`). Pass `parentFixtureField` to override.",
+    "",
+    "Returns a structured summary of the inserted entities and a TODO checklist for follow-up edits."
+  ].join("\n"),
+  inputSchema: {
+    type: "object",
+    properties: {
+      apiDir: { type: "string", description: "Relative path to the API app." },
+      model: { type: "string", description: "Bare model name (e.g. `Widget`)." },
+      archetype: { type: "string", enum: ["top-level-simple", "top-level-with-deps", "sub-collection", "sub-collection-traversal"], description: "Archetype that drives the factory shape." },
+      prefix: { type: "string", description: "Workspace prefix override (e.g. `DemoApi`). Defaults to the prefix detected in the fixture file." },
+      parentFixture: { type: "string", description: "Bare model name of the parent fixture for sub-collection archetypes." },
+      parentFixtureField: { type: "string", description: "Override for the Params field that holds the parent fixture (defaults to lowercased initials of `parentFixture`, e.g. `sg`)." },
+      paramsDependsOn: {
+        type: "array",
+        description: "Additional fixture refs to add to the Params interface.",
+        items: {
+          type: "object",
+          properties: {
+            field: { type: "string", description: "Params field name (e.g. `u`)." },
+            fixtureModel: { type: "string", description: "Bare fixture model name (e.g. `AuthorizedUser`)." },
+            optional: { type: "boolean", description: "When true the field is optional." },
+            array: { type: "boolean", description: "When true the field type is wrapped in `Maybe<ArrayOrValue<...>>`." }
+          },
+          required: ["field", "fixtureModel"]
+        }
+      },
+      withInitDocument: { type: "boolean", description: "When true an `initDocument` callback skeleton is emitted." },
+      collectionGenericArg: { type: "string", description: "Explicit collection generic for 8-generic factories (e.g. `WidgetFirestoreCollection`)." },
+      modelDocumentTypeName: { type: "string", description: "Override for the Document type name (defaults to `<Model>Document`)." },
+      factoryNamePrefix: { type: "string", description: "Override for the factory name prefix (defaults to lowerCamel of the workspace prefix sans `Api` suffix)." }
+    },
+    required: ["apiDir", "model", "archetype"]
+  }
+};
+async function run3(rawArgs) {
+  const parsed = ScaffoldArgsType3(rawArgs);
+  if (parsed instanceof type34.errors) {
+    return toolError(`Invalid arguments: ${parsed.summary}`);
+  }
+  const cwd = process.cwd();
+  try {
+    ensurePathInsideCwd(parsed.apiDir, cwd);
+  } catch (err) {
+    return toolError(err instanceof Error ? err.message : String(err));
+  }
+  const apiAbs = resolve18(cwd, parsed.apiDir);
+  let extraction;
+  try {
+    extraction = await inspectAppFixtures(apiAbs, parsed.apiDir);
+  } catch (err) {
+    return toolError(`Failed to read fixture file: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  const prefix = parsed.prefix ?? extraction.prefix;
+  if (!prefix) {
+    return toolError("Could not detect a workspace prefix from the fixture file. Pass `prefix` explicitly (e.g. `DemoApi`).");
+  }
+  if ((parsed.archetype === "sub-collection" || parsed.archetype === "sub-collection-traversal") && !parsed.parentFixture) {
+    return toolError(`Archetype \`${parsed.archetype}\` requires \`parentFixture\` (the bare parent model name).`);
+  }
+  const paramsDependsOn = (parsed.paramsDependsOn ?? []).map((d) => {
+    const dependency = {
+      field: d.field,
+      fixtureModel: d.fixtureModel,
+      optional: d.optional,
+      array: d.array
+    };
+    return dependency;
+  });
+  const rendered = renderFixtureScaffold(extraction, {
+    model: parsed.model,
+    prefix,
+    archetype: parsed.archetype,
+    parentFixture: parsed.parentFixture,
+    parentFixtureField: parsed.parentFixtureField,
+    paramsDependsOn,
+    withInitDocument: parsed.withInitDocument,
+    collectionGenericArg: parsed.collectionGenericArg,
+    modelDocumentTypeName: parsed.modelDocumentTypeName,
+    factoryNamePrefix: parsed.factoryNamePrefix
+  });
+  const conflicts = collectConflicts(extraction, rendered);
+  if (conflicts.length > 0) {
+    return toolError(["Refusing to scaffold \u2014 the following names already exist in `" + extraction.fixturePath + "`:", "", ...conflicts.map((c) => "- `" + c + "`"), "", "Rename, delete, or pick a different model name and retry."].join("\n"));
+  }
+  const absolutePath = join2(apiAbs, FIXTURE_RELATIVE_PATH);
+  let original;
+  try {
+    original = await readFile3(absolutePath, "utf8");
+  } catch (err) {
+    return toolError(`Failed to read fixture file: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  const newline = original.endsWith("\n") ? "" : "\n";
+  const updated = `${original}${newline}
+${rendered.snippet}`;
+  try {
+    await writeFile(absolutePath, updated, "utf8");
+  } catch (err) {
+    return toolError(`Failed to write fixture file: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  const reExtraction = extractAppFixturesFromText({ text: updated, fixturePath: extraction.fixturePath });
+  const newEntry = reExtraction.entries.find((e) => e.fixtureClassName === rendered.fixtureClassName);
+  const lines = [];
+  lines.push(`# Scaffolded \`${rendered.fixtureClassName}\``);
+  lines.push("");
+  lines.push(`File: \`${extraction.fixturePath}\``);
+  lines.push(`Archetype: \`${parsed.archetype}\``);
+  lines.push("");
+  lines.push("## Inserted");
+  for (const ins of rendered.inserted) {
+    lines.push(`- ${ins.kind}: \`${ins.name}\``);
+  }
+  if (newEntry) {
+    lines.push("", `Fixture lines: ${newEntry.fixtureLine}-${newEntry.fixtureEndLine}`);
+    lines.push(`Instance lines: ${newEntry.instanceLine}-${newEntry.instanceEndLine}`);
   }
-  lines.push(`}`);
-  return { path: `${args.fileBaseName}.store.accessor.ts`, body: lines.join("\n") };
-}
-function documentDirectiveBody(args) {
-  const docType = `${args.modelName}Document`;
-  const storeClass = `${args.modelName}DocumentStore`;
-  const directiveClass = `${args.appPrefixPascal}${args.modelName}DocumentStoreDirective`;
-  const selector = `[${args.appPrefixCamel}${args.modelName}Document]`;
-  const lines = [
-    `import { Directive, inject } from '@angular/core';`,
-    `import { DbxFirebaseDocumentStoreDirective, provideDbxFirebaseDocumentStoreDirective } from '@dereekb/dbx-firebase';`,
-    `import { type ${args.modelName}, type ${docType} } from '${args.firebasePackage}';`,
-    `import { ${storeClass} } from './${args.fileBaseName}.document.store';`,
-    "",
-    `@Directive({`,
-    `  selector: '${selector}',`,
-    `  providers: provideDbxFirebaseDocumentStoreDirective(${directiveClass}, ${storeClass}),`,
-    `  standalone: true`,
-    `})`,
-    `export class ${directiveClass} extends DbxFirebaseDocumentStoreDirective<${args.modelName}, ${docType}, ${storeClass}> {`,
-    `  constructor() {`,
-    `    super(inject(${storeClass}));`,
-    `  }`,
-    `}`
-  ];
-  return { path: `${args.fileBaseName}.document.store.directive.ts`, body: lines.join("\n") };
+  lines.push("", "## Follow-up TODOs");
+  for (const todo of rendered.todos) {
+    lines.push(`- [ ] ${todo}`);
+  }
+  const result = { content: [{ type: "text", text: lines.join("\n") }] };
+  return result;
 }
-function collectionDirectiveBody(args) {
-  const docType = `${args.modelName}Document`;
-  const storeClass = `${args.modelName}CollectionStore`;
-  const directiveClass = `${args.appPrefixPascal}${args.modelName}CollectionStoreDirective`;
-  const selector = `[${args.appPrefixCamel}${args.modelName}Collection]`;
-  const lines = [
-    `import { Directive, inject } from '@angular/core';`,
-    `import { DbxFirebaseCollectionStoreDirective, provideDbxFirebaseCollectionStoreDirective } from '@dereekb/dbx-firebase';`,
-    `import { type ${args.modelName}, type ${docType} } from '${args.firebasePackage}';`,
-    `import { ${storeClass} } from './${args.fileBaseName}.collection.store';`,
-    "",
-    `@Directive({`,
-    `  selector: '${selector}',`,
-    `  providers: provideDbxFirebaseCollectionStoreDirective(${directiveClass}, ${storeClass}),`,
-    `  standalone: true`,
-    `})`,
-    `export class ${directiveClass} extends DbxFirebaseCollectionStoreDirective<${args.modelName}, ${docType}, ${storeClass}> {`,
-    `  constructor() {`,
-    `    super(inject(${storeClass}));`,
-    `  }`,
-    `}`
-  ];
-  return { path: `${args.fileBaseName}.collection.store.directive.ts`, body: lines.join("\n") };
+function collectConflicts(extraction, rendered) {
+  const out = [];
+  for (const e of extraction.entries) {
+    if (e.fixtureClassName === rendered.fixtureClassName) out.push(rendered.fixtureClassName);
+    if (e.instanceClassName === rendered.instanceClassName) out.push(rendered.instanceClassName);
+    if (e.paramsTypeName === rendered.paramsTypeName) out.push(rendered.paramsTypeName);
+    if (e.factoryName === rendered.factoryName) out.push(rendered.factoryName);
+    if (e.singletonName === rendered.singletonName) out.push(rendered.singletonName);
+  }
+  return [...new Set(out)];
 }
-function buildBlocks(args) {
-  const blocks = [];
-  if (args.shape === "system-state") {
-    blocks.push(systemStateAccessorBody(args));
-  } else {
-    for (const surface of args.surfaces) {
-      if (surface === "document") {
-        if (args.shape === "sub-collection" || args.shape === "singleton-sub") {
-          blocks.push(subDocumentStoreBody(args));
-        } else {
-          blocks.push(rootDocumentStoreBody(args));
-        }
-        if (args.profile.emitsDirectives) {
-          blocks.push(documentDirectiveBody(args));
-        }
-      } else {
-        if (args.shape === "sub-collection") {
-          blocks.push(subCollectionStoreBody(args));
-        } else {
-          blocks.push(rootCollectionStoreBody(args));
-        }
-        if (args.profile.emitsDirectives) {
-          blocks.push(collectionDirectiveBody(args));
-        }
+var modelFixtureScaffoldTool = { definition: TOOL4, run: run3 };
+
+// packages/dbx-components-mcp/src/tools/model-fixture-forward.tool.ts
+import { join as join3, resolve as resolve19 } from "node:path";
+import { type as type35 } from "arktype";
+import { Project as Project7 } from "ts-morph";
+var ForwardArgsType = type35({
+  apiDir: "string",
+  model: "string",
+  "methods?": "string[]"
+});
+var TOOL5 = {
+  name: "dbx_model_fixture_forward",
+  description: ["Insert the missing Fixture forwarder methods for one model in `<apiDir>/src/test/fixture.ts`. Every public Instance method that lacks a Fixture method gains a thin wrapper:", "", "```ts", "async <name>(<paramText>): <returnType> {", "  return this.instance.<name>(<args>);", "}", "```", "", "Existing forwarders are left untouched (idempotent). Pass `methods` to limit the run to specific method names; omit to forward everything that's missing."].join("\n"),
+  inputSchema: {
+    type: "object",
+    properties: {
+      apiDir: { type: "string", description: "Relative path to the API app." },
+      model: { type: "string", description: "Bare model name (e.g. `StorageFile`)." },
+      methods: {
+        type: "array",
+        items: { type: "string" },
+        description: "Optional whitelist of instance method names to forward."
       }
-    }
+    },
+    required: ["apiDir", "model"]
   }
-  return blocks;
-}
-function formatScaffold(args) {
-  const blocks = buildBlocks(args);
-  const surfaceLabel = args.shape === "system-state" ? "accessor" : args.surfaces.join(" + ");
-  const functionsLabel = args.functionsClass ?? "none";
-  const crudLabel = args.crudFunctions.length > 0 ? args.crudFunctions.map((c) => `${c.name} (${c.kind})`).join(", ") : "none";
-  const parentLabel = args.parentModel === void 0 ? "n/a" : args.parentModel.name;
-  const lines = [`# ${args.modelName} store scaffold`, "", `Shape: \`${args.shape}\` \xB7 Surfaces: ${surfaceLabel} \xB7 Parent: ${parentLabel} \xB7 Functions: ${functionsLabel} \xB7 Crud: ${crudLabel}`, "", `Drop into \`<app>/src/lib/modules/${args.fileBaseName.replaceAll(".", "/")}/store/\`.`, ""];
-  for (const block of blocks) {
-    lines.push(`## \`${block.path}\``, "", "```ts", block.body, "```", "");
+};
+async function run4(rawArgs) {
+  const parsed = ForwardArgsType(rawArgs);
+  if (parsed instanceof type35.errors) {
+    return toolError(`Invalid arguments: ${parsed.summary}`);
   }
-  lines.push("## Notes", "", "- Each store is `@Injectable()` with no `providedIn` \u2014 wire it in the consuming feature module / route providers, alongside its directive (when present).");
-  if (args.shape === "sub-collection" || args.shape === "singleton-sub") {
-    lines.push(`- The \`${args.parentModel?.name}DocumentStore\` parent is injected with \`{ optional: true }\` so the store works both as a standalone and as a child of a parent's document directive.`);
+  const cwd = process.cwd();
+  try {
+    ensurePathInsideCwd(parsed.apiDir, cwd);
+  } catch (err) {
+    return toolError(toErrorMessage(err));
   }
-  if (args.shape === "system-state") {
-    lines.push(`- The accessor wraps a shared \`SystemStateDocumentStore\` keyed by \`${args.systemStateTypeConst}\`. CRUD function helpers reference \`this.systemStateDocumentStore\` (not \`this\`).`);
+  const apiAbs = resolve19(cwd, parsed.apiDir);
+  let extraction;
+  try {
+    extraction = await inspectAppFixtures(apiAbs, parsed.apiDir);
+  } catch (err) {
+    return toolError(`Failed to read fixture file: ${toErrorMessage(err)}`);
   }
-  if (args.crudFunctions.length > 0) {
-    lines.push(`- ${args.crudFunctions.length} CRUD helper line${args.crudFunctions.length === 1 ? "" : "s"} wired through \`firebaseDocumentStore{Create,Update,Crud}Function\`.`);
+  const entry = extraction.entries.find((e) => e.model === parsed.model);
+  if (!entry) {
+    const known = extraction.entries.map((e) => e.model).join(", ") || "(none)";
+    return toolError(`Model \`${parsed.model}\` not found in \`${extraction.fixturePath}\`. Known: ${known}.`);
   }
-  lines.push('- \u2192 See `dbx_model_lookup topic="shapes"` for the full store-shape taxonomy.', "- \u2192 Skill: `dbx__guide__angular-stores`.");
-  return lines.join("\n");
+  const rendered = renderForwarders({ entry, methods: parsed.methods });
+  if (rendered.added.length === 0) {
+    return { content: [{ type: "text", text: renderNoOpReport(extraction.fixturePath, entry.fixtureClassName, rendered) }] };
+  }
+  const absolutePath = join3(apiAbs, FIXTURE_RELATIVE_PATH);
+  const writeError = await applyForwardersToFile(absolutePath, entry.fixtureClassName, rendered);
+  if (writeError) {
+    return toolError(writeError);
+  }
+  return { content: [{ type: "text", text: renderSuccessReport(extraction.fixturePath, entry.fixtureClassName, rendered) }] };
 }
-function runModelStoreScaffold(rawArgs) {
-  let args;
+function toErrorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+async function applyForwardersToFile(absolutePath, fixtureClassName, rendered) {
+  const project = new Project7({ skipAddingFilesFromTsConfig: true });
+  let sourceFile;
   try {
-    args = parseArgs2(rawArgs);
+    sourceFile = project.addSourceFileAtPath(absolutePath);
   } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    return toolError(message);
+    return `Failed to load fixture file: ${toErrorMessage(err)}`;
   }
-  const text = formatScaffold(args);
-  const result = { content: [{ type: "text", text }] };
-  return result;
+  const fixtureClass = sourceFile.getClass(fixtureClassName);
+  if (!fixtureClass) {
+    return `Could not locate class \`${fixtureClassName}\` for in-place edit. The fixture file may have been modified since parsing.`;
+  }
+  for (const forwarder of rendered.added) {
+    fixtureClass.insertText(fixtureClass.getEnd() - 1, "\n" + forwarder.source + "\n");
+  }
+  sourceFile.formatText({ ensureNewLineAtEndOfFile: true });
+  try {
+    await sourceFile.save();
+  } catch (err) {
+    return `Failed to write fixture file: ${toErrorMessage(err)}`;
+  }
+  return void 0;
 }
-var modelStoreScaffoldTool = {
-  definition: DBX_MODEL_STORE_SCAFFOLD_TOOL,
-  run: runModelStoreScaffold
-};
+function renderNoOpReport(fixturePath, fixtureClassName, rendered) {
+  const lines = [`# No forwarders to add for \`${fixtureClassName}\``, "", `File: \`${fixturePath}\``];
+  appendListSection(lines, "## Already forwarded", rendered.skippedAlreadyForwarded);
+  appendListSection(lines, "## Whitelisted methods missing from Instance", rendered.missingFromInstance);
+  return lines.join("\n");
+}
+function renderSuccessReport(fixturePath, fixtureClassName, rendered) {
+  const lines = [`# Forwarded ${rendered.added.length} method${rendered.added.length === 1 ? "" : "s"} to \`${fixtureClassName}\``, "", `File: \`${fixturePath}\``, "", "## Added"];
+  for (const f of rendered.added) {
+    lines.push(`- \`${f.method}\``);
+  }
+  appendListSection(lines, "## Skipped (already forwarded)", rendered.skippedAlreadyForwarded);
+  appendListSection(lines, "## Whitelisted methods missing from Instance", rendered.missingFromInstance);
+  return lines.join("\n");
+}
+function appendListSection(lines, heading, names) {
+  if (names.length === 0) return;
+  lines.push("", heading);
+  for (const name of names) {
+    lines.push(`- \`${name}\``);
+  }
+}
+var modelFixtureForwardTool = { definition: TOOL5, run: run4 };
 
 // packages/dbx-components-mcp/src/tools/storagefile-m-validate-app/extract.ts
-import { Node as Node9, SyntaxKind as SyntaxKind6 } from "ts-morph";
+import { Node as Node10, SyntaxKind as SyntaxKind7 } from "ts-morph";
 
 // packages/dbx-components-mcp/src/tools/_validate/ast.ts
-import { Node as Node8, Project as Project6, SyntaxKind as SyntaxKind5 } from "ts-morph";
+import { Node as Node9, Project as Project8, SyntaxKind as SyntaxKind6 } from "ts-morph";
 var COMPONENT_VIRTUAL_PREFIX = "__component__/";
 var API_VIRTUAL_PREFIX = "__api__/";
 function buildInMemoryProject(input) {
-  const project = new Project6({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project8({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const componentSources = [];
   const apiSources = [];
   for (const file of input.component.files) {
@@ -12068,28 +13725,28 @@ function componentRelPath(sourceFile) {
 }
 function unwrapAsExpressions(node) {
   let current = node;
-  while (current && Node8.isAsExpression(current)) {
+  while (current && Node9.isAsExpression(current)) {
     current = current.getExpression();
   }
   return current;
 }
 function asObjectLiteral(node) {
   const inner = unwrapAsExpressions(node);
-  if (inner && Node8.isObjectLiteralExpression(inner)) {
+  if (inner && Node9.isObjectLiteralExpression(inner)) {
     return inner;
   }
   return void 0;
 }
 function asArrayLiteral(node) {
   const inner = unwrapAsExpressions(node);
-  if (inner && Node8.isArrayLiteralExpression(inner)) {
+  if (inner && Node9.isArrayLiteralExpression(inner)) {
     return inner;
   }
   return void 0;
 }
 function readStringLiteralInitializer(decl) {
   const initializer = unwrapAsExpressions(decl.getInitializer());
-  if (initializer && Node8.isStringLiteral(initializer)) {
+  if (initializer && Node9.isStringLiteral(initializer)) {
     return initializer.getLiteralText();
   }
   return void 0;
@@ -12101,37 +13758,37 @@ function typeAnnotationText(node) {
 function getPropertyInitializer(obj, name) {
   const prop = obj.getProperty(name);
   if (!prop) return void 0;
-  if (Node8.isPropertyAssignment(prop)) {
+  if (Node9.isPropertyAssignment(prop)) {
     return prop.getInitializer();
   }
-  if (Node8.isShorthandPropertyAssignment(prop)) {
+  if (Node9.isShorthandPropertyAssignment(prop)) {
     return prop.getNameNode();
   }
   return void 0;
 }
 function readStringProperty2(obj, name) {
   const init = unwrapAsExpressions(getPropertyInitializer(obj, name));
-  if (init && Node8.isStringLiteral(init)) {
+  if (init && Node9.isStringLiteral(init)) {
     return init.getLiteralText();
   }
   return void 0;
 }
 function readIdentifierProperty(obj, name) {
   const init = unwrapAsExpressions(getPropertyInitializer(obj, name));
-  if (init && Node8.isIdentifier(init)) {
+  if (init && Node9.isIdentifier(init)) {
     return init.getText();
   }
   return void 0;
 }
 function findReturnExpression(fn) {
-  if (!Node8.isArrowFunction(fn) && !Node8.isFunctionDeclaration(fn) && !Node8.isFunctionExpression(fn)) {
+  if (!Node9.isArrowFunction(fn) && !Node9.isFunctionDeclaration(fn) && !Node9.isFunctionExpression(fn)) {
     return void 0;
   }
   const body = fn.getBody();
   if (!body) return void 0;
-  if (Node8.isBlock(body)) {
+  if (Node9.isBlock(body)) {
     for (const stmt of body.getStatements()) {
-      if (Node8.isReturnStatement(stmt)) {
+      if (Node9.isReturnStatement(stmt)) {
         return stmt.getExpression();
       }
     }
@@ -12145,17 +13802,17 @@ function findLocalVariable(sf, name) {
       if (decl.getName() === name) return decl;
     }
   }
-  for (const decl of sf.getDescendantsOfKind(SyntaxKind5.VariableDeclaration)) {
+  for (const decl of sf.getDescendantsOfKind(SyntaxKind6.VariableDeclaration)) {
     if (decl.getName() === name) return decl;
   }
   return void 0;
 }
 function collectTypeofReferences(node, out) {
-  if (Node8.isTypeQuery(node)) {
+  if (Node9.isTypeQuery(node)) {
     out.push(node.getExprName().getText());
     return;
   }
-  for (const tq of node.getDescendantsOfKind(SyntaxKind5.TypeQuery)) {
+  for (const tq of node.getDescendantsOfKind(SyntaxKind6.TypeQuery)) {
     out.push(tq.getExprName().getText());
   }
 }
@@ -12308,7 +13965,7 @@ function filterMaybeArrayFunction(filterFn) {
   return ((values) => {
     let result;
     if (values != null) {
-      result = values.filter(filterFn);
+      result = values.filter((v, i, arr) => filterFn(v, i, arr));
     } else {
       result = [];
     }
@@ -12419,7 +14076,7 @@ function booleanKeyArrayUtility(readKey) {
     removeByKey
   };
 }
-var BooleanStringKeyArrayUtility = booleanKeyArrayUtility((x) => x ? x : void 0);
+var BooleanStringKeyArrayUtility = booleanKeyArrayUtility((x) => x || void 0);
 
 // packages/util/src/lib/set/set.selection.ts
 function isSelectedDecisionFunctionFactory(config) {
@@ -12453,8 +14110,8 @@ function getFunctionType(x) {
   return typeof x === "function" ? x.prototype ? Object.getOwnPropertyDescriptor(x, "prototype")?.writable ? "function" : "class" : x.constructor.name === "AsyncFunction" ? "function" : "arrow" : null;
 }
 function isNonClassFunction(x) {
-  const type43 = getFunctionType(x);
-  return type43 != null && type43 !== "class";
+  const type48 = getFunctionType(x);
+  return type48 != null && type48 !== "class";
 }
 
 // packages/util/src/lib/getter/getter.ts
@@ -12531,9 +14188,9 @@ function asNumber(input) {
 }
 
 // packages/util/src/lib/number/round.ts
-function roundingFunction(type43) {
+function roundingFunction(type48) {
   let fn;
-  switch (type43) {
+  switch (type48) {
     case "floor":
       fn = Math.floor;
       break;
@@ -12771,7 +14428,7 @@ function filterKeyValueTuplesFunction(filter) {
   if (filter != null) {
     const filterFn = filterKeyValueTupleFunction(filter);
     result = (obj) => {
-      return allKeyValueTuples(obj).filter(filterFn);
+      return allKeyValueTuples(obj).filter((kv, i) => filterFn(kv, i));
     };
   } else {
     result = allKeyValueTuples;
@@ -12786,9 +14443,9 @@ function filterKeyValueTuplesInputToFilter(input) {
 }
 function filterKeyValueTupleFunction(inputFilter) {
   const filter = filterKeyValueTuplesInputToFilter(inputFilter);
-  const { valueFilter: type43 = 1 /* UNDEFINED */, invertFilter: inverseFilter = false, keysFilter } = filter;
+  const { valueFilter: type48 = 1 /* UNDEFINED */, invertFilter: inverseFilter = false, keysFilter } = filter;
   let filterFn;
-  switch (type43) {
+  switch (type48) {
     case 1 /* UNDEFINED */:
       filterFn = ([, x]) => x !== void 0;
       break;
@@ -13047,7 +14704,7 @@ var NUMBER_STRING_DENCODER_64_DIGITS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcd
 var NUMBER_STRING_DENCODER_64_DEFAULT_NEGATIVE_PREFIX = "!";
 function numberStringDencoder(config) {
   const { negativePrefix, digits } = config;
-  const type43 = negativePrefix ? "integer" : "positive_integer";
+  const type48 = negativePrefix ? "integer" : "positive_integer";
   const log2OfDigits = Math.min(6, Math.floor(Math.log2(digits.length)));
   const bitDepth = Math.pow(2, log2OfDigits);
   const bitMask = bitDepth - 1;
@@ -13084,7 +14741,7 @@ function numberStringDencoder(config) {
     return result;
   }
   return {
-    type: type43,
+    type: type48,
     digits,
     bitDepth,
     negativePrefix,
@@ -13155,9 +14812,9 @@ function readableStreamToStringFunction(encoding) {
 var readableStreamToBase64 = readableStreamToStringFunction("base64");
 function readableStreamToBuffer(stream) {
   const chunks = [];
-  return new Promise((resolve17, reject) => {
+  return new Promise((resolve22, reject) => {
     stream.on("data", (chunk) => chunks.push(Buffer.from(chunk)));
-    stream.on("end", () => resolve17(Buffer.concat(chunks)));
+    stream.on("end", () => resolve22(Buffer.concat(chunks)));
     stream.on("error", reject);
   });
 }
@@ -13580,7 +15237,7 @@ function extractUploadInitializerEntries(sources) {
   const out = [];
   for (const sf of sources) {
     const rel = apiRelPath(sf);
-    for (const decl of sf.getDescendantsOfKind(SyntaxKind6.VariableDeclaration)) {
+    for (const decl of sf.getDescendantsOfKind(SyntaxKind7.VariableDeclaration)) {
       const typeText = typeAnnotationText(decl);
       if (typeText !== UPLOAD_SERVICE_INITIALIZER_TYPE) continue;
       const obj = asObjectLiteral(decl.getInitializer());
@@ -13610,7 +15267,7 @@ function buildApiFunctionIndex(sources) {
       for (const decl of stmt.getDeclarations()) {
         const initializer = unwrapAsExpressions(decl.getInitializer());
         if (!initializer) continue;
-        if (Node9.isArrowFunction(initializer) || Node9.isFunctionExpression(initializer)) {
+        if (Node10.isArrowFunction(initializer) || Node10.isFunctionExpression(initializer)) {
           map.set(decl.getName(), { node: initializer, sourceFile: sf });
         }
       }
@@ -13623,34 +15280,34 @@ function collectInitializerBindingsFromValue(options) {
   const { node, sf, index, resolved, unresolved, visited } = options;
   const inner = unwrapAsExpressions(node);
   if (!inner) return false;
-  if (Node9.isArrayLiteralExpression(inner)) {
+  if (Node10.isArrayLiteralExpression(inner)) {
     for (const el of inner.getElements()) {
-      if (Node9.isSpreadElement(el)) {
+      if (Node10.isSpreadElement(el)) {
         const spreadInner = el.getExpression();
-        if (Node9.isIdentifier(spreadInner)) {
+        if (Node10.isIdentifier(spreadInner)) {
           collectInitializerBindingsFromIdentifier({ name: spreadInner.getText(), sf, index, resolved, unresolved, visited });
-        } else if (Node9.isCallExpression(spreadInner)) {
+        } else if (Node10.isCallExpression(spreadInner)) {
           const callee = spreadInner.getExpression();
-          if (Node9.isIdentifier(callee)) {
+          if (Node10.isIdentifier(callee)) {
             collectInitializerBindingsFromIdentifier({ name: callee.getText(), sf, index, resolved, unresolved, visited });
           }
         }
         continue;
       }
       const elementInner = unwrapAsExpressions(el);
-      if (elementInner && Node9.isIdentifier(elementInner)) {
+      if (elementInner && Node10.isIdentifier(elementInner)) {
         resolved.push(elementInner.getText());
       }
     }
     return true;
   }
-  if (Node9.isCallExpression(inner)) {
+  if (Node10.isCallExpression(inner)) {
     const callee = inner.getExpression();
-    if (Node9.isIdentifier(callee)) {
+    if (Node10.isIdentifier(callee)) {
       return collectInitializerBindingsFromIdentifier({ name: callee.getText(), sf, index, resolved, unresolved, visited });
     }
   }
-  if (Node9.isIdentifier(inner)) {
+  if (Node10.isIdentifier(inner)) {
     return collectInitializerBindingsFromIdentifier({ name: inner.getText(), sf, index, resolved, unresolved, visited });
   }
   return false;
@@ -13689,15 +15346,15 @@ function collectUploadInitializerArray(options) {
   const { initializerArr, sf, index, direct, spreads, resolved, unresolved } = options;
   const visited = /* @__PURE__ */ new Set();
   for (const el of initializerArr.getElements()) {
-    if (Node9.isSpreadElement(el)) {
+    if (Node10.isSpreadElement(el)) {
       const inner2 = el.getExpression();
-      if (Node9.isIdentifier(inner2)) {
+      if (Node10.isIdentifier(inner2)) {
         const name = inner2.getText();
         spreads.push(name);
         collectInitializerBindingsFromIdentifier({ name, sf, index, resolved, unresolved, visited });
-      } else if (Node9.isCallExpression(inner2)) {
+      } else if (Node10.isCallExpression(inner2)) {
         const callee = inner2.getExpression();
-        if (Node9.isIdentifier(callee)) {
+        if (Node10.isIdentifier(callee)) {
           const name = callee.getText();
           spreads.push(name);
           collectInitializerBindingsFromIdentifier({ name, sf, index, resolved, unresolved, visited });
@@ -13706,7 +15363,7 @@ function collectUploadInitializerArray(options) {
       continue;
     }
     const inner = unwrapAsExpressions(el);
-    if (inner && Node9.isIdentifier(inner)) {
+    if (inner && Node10.isIdentifier(inner)) {
       const name = inner.getText();
       direct.push(name);
       resolved.push(name);
@@ -13717,9 +15374,9 @@ function extractUploadServiceCalls(sources, index) {
   const out = [];
   for (const sf of sources) {
     const rel = apiRelPath(sf);
-    for (const call of sf.getDescendantsOfKind(SyntaxKind6.CallExpression)) {
+    for (const call of sf.getDescendantsOfKind(SyntaxKind7.CallExpression)) {
       const expr = call.getExpression();
-      if (!Node9.isIdentifier(expr) || expr.getText() !== UPLOAD_SERVICE_FACTORY) continue;
+      if (!Node10.isIdentifier(expr) || expr.getText() !== UPLOAD_SERVICE_FACTORY) continue;
       const args = call.getArguments();
       const first = args[0] ? resolveObjectArg(args[0], sf) : void 0;
       if (!first) continue;
@@ -13747,12 +15404,12 @@ function extractUploadServiceCalls(sources, index) {
 function resolveObjectArg(node, sf) {
   const inner = unwrapAsExpressions(node);
   if (!inner) return void 0;
-  if (Node9.isObjectLiteralExpression(inner)) return inner;
-  if (Node9.isIdentifier(inner)) {
+  if (Node10.isObjectLiteralExpression(inner)) return inner;
+  if (Node10.isIdentifier(inner)) {
     const declNode = findLocalVariable(sf, inner.getText());
     if (declNode) {
       const declInit = unwrapAsExpressions(declNode.getInitializer());
-      if (declInit && Node9.isObjectLiteralExpression(declInit)) {
+      if (declInit && Node10.isObjectLiteralExpression(declInit)) {
         return declInit;
       }
     }
@@ -13762,12 +15419,12 @@ function resolveObjectArg(node, sf) {
 function resolveArrayFromProperty(obj, name, sf) {
   const init = unwrapAsExpressions(getPropertyInitializer(obj, name));
   if (!init) return void 0;
-  if (Node9.isArrayLiteralExpression(init)) return init;
-  if (Node9.isIdentifier(init)) {
+  if (Node10.isArrayLiteralExpression(init)) return init;
+  if (Node10.isIdentifier(init)) {
     const declNode = findLocalVariable(sf, init.getText());
     if (declNode) {
       const declInit = unwrapAsExpressions(declNode.getInitializer());
-      if (declInit && Node9.isArrayLiteralExpression(declInit)) {
+      if (declInit && Node10.isArrayLiteralExpression(declInit)) {
         return declInit;
       }
     }
@@ -13778,11 +15435,11 @@ function enclosingFactoryName(node) {
   let current = node.getParent();
   let result;
   while (current) {
-    if (Node9.isFunctionDeclaration(current)) {
+    if (Node10.isFunctionDeclaration(current)) {
       result = current.getName() ?? void 0;
       break;
     }
-    if (Node9.isVariableDeclaration(current)) {
+    if (Node10.isVariableDeclaration(current)) {
       result = current.getName();
       break;
     }
@@ -13794,7 +15451,7 @@ function extractUploadServiceWirings(sources) {
   const out = [];
   for (const sf of sources) {
     const rel = apiRelPath(sf);
-    for (const obj of sf.getDescendantsOfKind(SyntaxKind6.ObjectLiteralExpression)) {
+    for (const obj of sf.getDescendantsOfKind(SyntaxKind7.ObjectLiteralExpression)) {
       const provideIdent = readIdentifierProperty(obj, "provide");
       if (provideIdent !== UPLOAD_SERVICE_PROVIDE_TOKEN) continue;
       const useFactory = readIdentifierProperty(obj, "useFactory");
@@ -13807,7 +15464,7 @@ function extractProcessingConfigs(sources) {
   const out = [];
   for (const sf of sources) {
     const rel = apiRelPath(sf);
-    for (const decl of sf.getDescendantsOfKind(SyntaxKind6.VariableDeclaration)) {
+    for (const decl of sf.getDescendantsOfKind(SyntaxKind7.VariableDeclaration)) {
       const config = extractProcessingConfigFromDecl(decl, rel);
       if (config) {
         out.push(config);
@@ -13836,10 +15493,10 @@ function extractProcessingConfigFromDecl(decl, rel) {
 function readFlowSubtasks(obj) {
   const flowInit = unwrapAsExpressions(getPropertyInitializer(obj, "flow"));
   const subtasks = [];
-  if (flowInit && Node9.isArrayLiteralExpression(flowInit)) {
+  if (flowInit && Node10.isArrayLiteralExpression(flowInit)) {
     for (const el of flowInit.getElements()) {
       const inner = unwrapAsExpressions(el);
-      if (inner && Node9.isObjectLiteralExpression(inner)) {
+      if (inner && Node10.isObjectLiteralExpression(inner)) {
         const subtask = readIdentifierProperty(inner, "subtask");
         if (subtask) subtasks.push(subtask);
       }
@@ -13851,9 +15508,9 @@ function extractProcessingHandlerCalls(sources) {
   const out = [];
   for (const sf of sources) {
     const rel = apiRelPath(sf);
-    for (const call of sf.getDescendantsOfKind(SyntaxKind6.CallExpression)) {
+    for (const call of sf.getDescendantsOfKind(SyntaxKind7.CallExpression)) {
       const expr = call.getExpression();
-      if (!Node9.isIdentifier(expr) || expr.getText() !== PROCESSING_HANDLER_FACTORY) continue;
+      if (!Node10.isIdentifier(expr) || expr.getText() !== PROCESSING_HANDLER_FACTORY) continue;
       const args = call.getArguments();
       const first = args[0] ? resolveObjectArg(args[0], sf) : void 0;
       if (!first) continue;
@@ -13874,7 +15531,7 @@ function extractProcessingHandlerCalls(sources) {
 }
 function collectProcessorArrayElements(processorsArr, direct, spreads) {
   for (const el of processorsArr.getElements()) {
-    if (Node9.isSpreadElement(el)) {
+    if (Node10.isSpreadElement(el)) {
       addProcessorIdentifierName(el.getExpression(), spreads);
       continue;
     }
@@ -13886,13 +15543,13 @@ function collectProcessorArrayElements(processorsArr, direct, spreads) {
 }
 function addProcessorIdentifierName(node, bucket) {
   if (!node) return;
-  if (Node9.isIdentifier(node)) {
+  if (Node10.isIdentifier(node)) {
     bucket.push(node.getText());
     return;
   }
-  if (Node9.isCallExpression(node)) {
+  if (Node10.isCallExpression(node)) {
     const callee = node.getExpression();
-    if (Node9.isIdentifier(callee)) {
+    if (Node10.isIdentifier(callee)) {
       bucket.push(callee.getText());
     }
   }
@@ -13934,7 +15591,7 @@ function runRules4(inspection, extracted) {
     violations,
     codes: IO_VIOLATION_CODES,
     messages: IO_VIOLATION_MESSAGES,
-    build: (code10, message, side) => buildIoViolation(code10, message, side)
+    build: (code11, message, side) => buildIoViolation(code11, message, side)
   });
   if (!proceed) {
     return violations;
@@ -14166,18 +15823,18 @@ function checkDuplicates(extracted, violations) {
   flagDuplicates({ entries: extracted.fileTypeIdentifierConstants.map(toCodeRef), code: "STORAGEFILE_FILE_TYPE_IDENTIFIER_DUPLICATE", label: "`UploadedFileTypeIdentifier`", violations });
 }
 function toCodeRef(entry) {
-  const code10 = "purposeCode" in entry ? entry.purposeCode : entry.typeCode;
-  return { symbolName: entry.symbolName, code: code10, sourceFile: entry.sourceFile };
+  const code11 = "purposeCode" in entry ? entry.purposeCode : entry.typeCode;
+  return { symbolName: entry.symbolName, code: code11, sourceFile: entry.sourceFile };
 }
 function flagDuplicates(options) {
-  const { entries, code: code10, label, violations } = options;
+  const { entries, code: code11, label, violations } = options;
   const seen = /* @__PURE__ */ new Map();
   for (const entry of entries) {
     if (!entry.code) continue;
     const previous = seen.get(entry.code);
     if (previous) {
       pushViolation4(violations, {
-        code: code10,
+        code: code11,
         severity: "warning",
         message: `${label} value \`'${entry.code}'\` is shared by \`${previous}\` and \`${entry.symbolName}\`. Choose unique string literals.`,
         side: "component",
@@ -14227,9 +15884,9 @@ function pushViolation4(buffer, violation) {
   };
   buffer.push(filled);
 }
-function buildIoViolation(code10, message, side) {
+function buildIoViolation(code11, message, side) {
   const result = {
-    code: code10,
+    code: code11,
     severity: "error",
     message,
     side,
@@ -14245,8 +15902,8 @@ function formatResult4(result) {
 }
 
 // packages/dbx-components-mcp/src/tools/_validate/inspect.ts
-import { readdir as readdir2, readFile as readFile2, stat as stat3 } from "node:fs/promises";
-import { join, relative as relative4, sep as sep2 } from "node:path";
+import { readdir as readdir2, readFile as readFile4, stat as stat3 } from "node:fs/promises";
+import { join as join4, relative as relative4, sep as sep2 } from "node:path";
 async function inspectSide(rootDir, subpaths) {
   const rootStatus = await readRootStatus(rootDir);
   if (rootStatus !== void 0) {
@@ -14256,7 +15913,7 @@ async function inspectSide(rootDir, subpaths) {
   const presentFolders = [];
   const collectedFiles = [];
   for (const sub of subpaths) {
-    const absFolder = join(rootDir, sub);
+    const absFolder = join4(rootDir, sub);
     const folderPresent = await isDirectory(absFolder);
     if (!folderPresent) continue;
     presentFolders.push(sub);
@@ -14275,8 +15932,8 @@ async function readRootStatus(rootDir) {
     const stats = await stat3(rootDir);
     return stats.isDirectory() ? void 0 : "dir-not-found";
   } catch (err) {
-    const code10 = err.code;
-    if (code10 === "ENOENT" || code10 === "ENOTDIR") {
+    const code11 = err.code;
+    if (code11 === "ENOENT" || code11 === "ENOTDIR") {
       return "dir-not-found";
     }
     throw err;
@@ -14302,7 +15959,7 @@ async function collectTsFiles(absFolder, rootDir) {
       continue;
     }
     for (const entry of entries) {
-      const full = join(current, entry.name);
+      const full = join4(current, entry.name);
       if (entry.isDirectory()) {
         stack.push(full);
         continue;
@@ -14311,7 +15968,7 @@ async function collectTsFiles(absFolder, rootDir) {
       if (!entry.name.endsWith(".ts")) continue;
       if (entry.name.endsWith(".spec.ts")) continue;
       if (entry.name.endsWith(".d.ts")) continue;
-      const text = await readFile2(full, "utf8");
+      const text = await readFile4(full, "utf8");
       const rel = relative4(rootDir, full).split(sep2).join("/");
       out.push({ relPath: rel, text });
     }
@@ -14483,7 +16140,7 @@ function formatReportAsJson(report) {
 // packages/dbx-components-mcp/src/tools/storagefile-m-list-app/format.markdown.ts
 function formatReportAsMarkdown(report) {
   const basename4 = report.componentDir.split("/").pop() ?? report.componentDir;
-  const uploadServiceFactoryText = report.uploadServiceFactoryName ? code3(report.uploadServiceFactoryName) : "_Not defined._";
+  const uploadServiceFactoryText = report.uploadServiceFactoryName ? code4(report.uploadServiceFactoryName) : "_Not defined._";
   const lines = [`# App storagefiles \u2014 ${basename4}`, "", `Component: \`${report.componentDir}\``, `API: \`${report.apiDir}\``, "", `Upload service factory: ${uploadServiceFactoryText}`, `Wired via \`StorageFileInitializeFromUploadService\` provider: ${formatBool(report.uploadServiceWiredInApi)}`, `Processing handler call present: ${formatBool(report.processingHandlerWiredInApi)}`, "", `## Purposes (${report.purposes.length})`];
   if (report.purposes.length === 0) {
     lines.push("", "_None found._");
@@ -14499,15 +16156,15 @@ function formatPurposeBlock(p) {
   const heading = p.purposeCode ? `### ${p.purposeCode} \u2014 \`${p.purposeSymbolName}\`` : `### \`${p.purposeSymbolName}\``;
   parts.push(heading);
   if (p.fileTypeIdentifierCode) {
-    const codePart = p.fileTypeIdentifier ? ` (` + code3(`'${p.fileTypeIdentifier}'`) + `)` : "";
+    const codePart = p.fileTypeIdentifier ? ` (` + code4(`'${p.fileTypeIdentifier}'`) + `)` : "";
     parts.push(`- Uploaded file type identifier: \`${p.fileTypeIdentifierCode}\`${codePart}`);
   } else {
     parts.push(`- Uploaded file type identifier: _Missing._`);
   }
-  const groupIdsText = p.fileGroupIdsFunctionName ? code3(p.fileGroupIdsFunctionName) : "_Missing._";
+  const groupIdsText = p.fileGroupIdsFunctionName ? code4(p.fileGroupIdsFunctionName) : "_Missing._";
   parts.push(`- Group-ids helper: ${groupIdsText}`);
   if (p.subtasks.length > 0) {
-    const subtasksText = p.subtasks.map((s) => code3(s)).join(", ");
+    const subtasksText = p.subtasks.map((s) => code4(s)).join(", ");
     parts.push(`- Processing subtasks: ${subtasksText}`);
   }
   const uploadInitSuffix = p.uploadInitializerSourceFile ? ` _(${p.uploadInitializerSourceFile})_` : "";
@@ -14518,7 +16175,7 @@ function formatPurposeBlock(p) {
 function formatBool(value) {
   return value ? "yes" : "no";
 }
-function code3(value) {
+function code4(value) {
   return "`" + value + "`";
 }
 
@@ -14564,8 +16221,8 @@ var storageFileMListAppTool = createListAppTool({
 });
 
 // packages/dbx-components-mcp/src/tools/validate-two-side-folder.ts
-import { readdir as readdir3, readFile as readFile3, stat as stat4 } from "node:fs/promises";
-import { join as join2 } from "node:path";
+import { readdir as readdir3, readFile as readFile5, stat as stat4 } from "node:fs/promises";
+import { join as join5 } from "node:path";
 var REEXPORT_PATTERN = /^\s*export\s+\*\s+from\s+['"]\.\/([^'"\n]+)['"]\s*;?\s*$/gm;
 function createTwoSideFolderValidator(config) {
   async function inspect(input) {
@@ -14609,7 +16266,7 @@ async function inspectSide2(input) {
   let indexSource;
   const rootStatOk = await isExistingDirectory(rootDir);
   if (rootStatOk) {
-    const absFolder = join2(rootDir, subPath);
+    const absFolder = join5(rootDir, subPath);
     const folderStatOk = await isExistingDirectory(absFolder);
     if (folderStatOk) {
       const folder = await readFolder(absFolder, indexFile);
@@ -14638,8 +16295,8 @@ async function isExistingDirectory(path) {
     const stats = await stat4(path);
     return stats.isDirectory();
   } catch (err) {
-    const code10 = err.code;
-    if (code10 !== "ENOENT" && code10 !== "ENOTDIR") {
+    const code11 = err.code;
+    if (code11 !== "ENOENT" && code11 !== "ENOTDIR") {
       throw err;
     }
     return false;
@@ -14661,7 +16318,7 @@ async function readFolder(absFolder, indexFile) {
   let indexSource;
   if (collectedFiles.includes(indexFile)) {
     try {
-      indexSource = await readFile3(join2(absFolder, indexFile), "utf8");
+      indexSource = await readFile5(join5(absFolder, indexFile), "utf8");
     } catch {
       indexSource = void 0;
     }
@@ -14880,7 +16537,7 @@ var storageFileMValidateFolderTool = createTwoSideValidateTool({
 });
 
 // packages/dbx-components-mcp/src/tools/notification-m-validate-app/extract.ts
-import { Node as Node10, SyntaxKind as SyntaxKind7 } from "ts-morph";
+import { Node as Node11, SyntaxKind as SyntaxKind8 } from "ts-morph";
 var NOTIF_TEMPLATE_TYPE = "NotificationTemplateType";
 var NOTIF_TEMPLATE_TYPE_INFO = "NotificationTemplateTypeInfo";
 var NOTIF_TEMPLATE_TYPE_INFO_ARRAY = "NotificationTemplateTypeInfo[]";
@@ -15001,7 +16658,7 @@ function extractTemplateInfoAggregates(sources) {
         const ids = [];
         for (const el of arr.getElements()) {
           const inner = unwrapAsExpressions(el);
-          if (inner && Node10.isIdentifier(inner)) {
+          if (inner && Node11.isIdentifier(inner)) {
             ids.push(inner.getText());
           }
         }
@@ -15047,7 +16704,7 @@ function extractTaskAllTypesAggregates(sources) {
         const ids = [];
         for (const el of arr.getElements()) {
           const inner = unwrapAsExpressions(el);
-          if (inner && Node10.isIdentifier(inner)) {
+          if (inner && Node11.isIdentifier(inner)) {
             ids.push(inner.getText());
           }
         }
@@ -15075,14 +16732,14 @@ function extractTaskCheckpointAliases(sources) {
   return out;
 }
 function collectStringLiterals(node, out) {
-  if (Node10.isLiteralTypeNode(node)) {
+  if (Node11.isLiteralTypeNode(node)) {
     const lit = node.getLiteral();
-    if (Node10.isStringLiteral(lit)) {
+    if (Node11.isStringLiteral(lit)) {
       out.push(lit.getLiteralText());
     }
     return;
   }
-  if (Node10.isUnionTypeNode(node)) {
+  if (Node11.isUnionTypeNode(node)) {
     for (const child of node.getTypeNodes()) {
       collectStringLiterals(child, out);
     }
@@ -15136,7 +16793,7 @@ function extractTemplateInfoRecord(sources, index) {
 }
 function tryReadTemplateInfoRecord(decl, rel, index) {
   const initializer = unwrapAsExpressions(decl.getInitializer());
-  if (!initializer || !Node10.isCallExpression(initializer)) return void 0;
+  if (!initializer || !Node11.isCallExpression(initializer)) return void 0;
   if (initializer.getExpression().getText() !== TEMPLATE_INFO_RECORD_FACTORY) return void 0;
   const args = initializer.getArguments();
   const arr = args[0] ? asArrayLiteral(args[0]) : void 0;
@@ -15157,15 +16814,15 @@ function tryReadTemplateInfoRecord(decl, rel, index) {
 }
 function classifyInfoRecordArrayElements(arr, direct, spreads) {
   for (const el of arr.getElements()) {
-    if (Node10.isSpreadElement(el)) {
+    if (Node11.isSpreadElement(el)) {
       const inner2 = el.getExpression();
-      if (Node10.isIdentifier(inner2)) {
+      if (Node11.isIdentifier(inner2)) {
         spreads.push(inner2.getText());
       }
       continue;
     }
     const inner = unwrapAsExpressions(el);
-    if (inner && Node10.isIdentifier(inner)) {
+    if (inner && Node11.isIdentifier(inner)) {
       direct.push(inner.getText());
     }
   }
@@ -15186,13 +16843,13 @@ function resolveTemplateInfoSpreads(direct, spreads, index) {
 function extractTemplateInfoRecordWiring(sources) {
   for (const sf of sources) {
     const rel = apiRelPath(sf);
-    for (const call of sf.getDescendantsOfKind(SyntaxKind7.CallExpression)) {
+    for (const call of sf.getDescendantsOfKind(SyntaxKind8.CallExpression)) {
       if (call.getExpression().getText() !== TEMPLATE_INFO_RECORD_SERVICE) continue;
       const args = call.getArguments();
       const first = args[0];
       if (!first) continue;
       const inner = unwrapAsExpressions(first);
-      if (!inner || !Node10.isIdentifier(inner)) continue;
+      if (!inner || !Node11.isIdentifier(inner)) continue;
       const result = {
         recordIdentifier: inner.getText(),
         sourceFile: rel
@@ -15205,7 +16862,7 @@ function extractTemplateInfoRecordWiring(sources) {
 function extractTemplateConfigsArrayWiring(sources) {
   for (const sf of sources) {
     const rel = apiRelPath(sf);
-    for (const obj of sf.getDescendantsOfKind(SyntaxKind7.ObjectLiteralExpression)) {
+    for (const obj of sf.getDescendantsOfKind(SyntaxKind8.ObjectLiteralExpression)) {
       const provideIdent = readIdentifierProperty(obj, "provide");
       if (provideIdent !== TEMPLATE_CONFIGS_ARRAY_TOKEN) continue;
       const useFactoryIdent = readIdentifierProperty(obj, "useFactory");
@@ -15230,7 +16887,7 @@ function buildApiFunctionIndex2(sources) {
       for (const decl of stmt.getDeclarations()) {
         const initializer = unwrapAsExpressions(decl.getInitializer());
         if (!initializer) continue;
-        if (Node10.isArrowFunction(initializer) || Node10.isFunctionExpression(initializer)) {
+        if (Node11.isArrowFunction(initializer) || Node11.isFunctionExpression(initializer)) {
           map.set(decl.getName(), { node: initializer, sourceFile: sf, relPath: rel });
         }
       }
@@ -15266,11 +16923,11 @@ function extractTemplateConfigsArrayFactory(sources, index) {
     const arr = returnExpr ? asArrayLiteral(returnExpr) : void 0;
     if (arr) {
       for (const el of arr.getElements()) {
-        if (Node10.isSpreadElement(el)) {
+        if (Node11.isSpreadElement(el)) {
           const inner2 = el.getExpression();
-          if (Node10.isCallExpression(inner2)) {
+          if (Node11.isCallExpression(inner2)) {
             const callee = inner2.getExpression();
-            if (Node10.isIdentifier(callee)) {
+            if (Node11.isIdentifier(callee)) {
               const callName = callee.getText();
               spreadCalls.push(callName);
               if (!index.functionsByName.has(callName)) {
@@ -15281,9 +16938,9 @@ function extractTemplateConfigsArrayFactory(sources, index) {
           continue;
         }
         const inner = unwrapAsExpressions(el);
-        if (inner && Node10.isCallExpression(inner)) {
+        if (inner && Node11.isCallExpression(inner)) {
           const callee = inner.getExpression();
-          if (Node10.isIdentifier(callee)) {
+          if (Node11.isIdentifier(callee)) {
             directCalls.push(callee.getText());
           }
         }
@@ -15332,11 +16989,11 @@ function collectFromArrayEntryFactory(name, out, index) {
   const arr = asArrayLiteral(returnExpr);
   if (!arr) return;
   for (const el of arr.getElements()) {
-    if (Node10.isSpreadElement(el)) {
+    if (Node11.isSpreadElement(el)) {
       const inner2 = el.getExpression();
-      if (Node10.isCallExpression(inner2)) {
+      if (Node11.isCallExpression(inner2)) {
         const callee = inner2.getExpression();
-        if (Node10.isIdentifier(callee)) {
+        if (Node11.isIdentifier(callee)) {
           collectFromArrayEntryFactory(callee.getText(), out, index);
         }
       }
@@ -15344,9 +17001,9 @@ function collectFromArrayEntryFactory(name, out, index) {
     }
     const inner = unwrapAsExpressions(el);
     if (!inner) continue;
-    if (Node10.isCallExpression(inner)) {
+    if (Node11.isCallExpression(inner)) {
       const callee = inner.getExpression();
-      if (Node10.isIdentifier(callee)) {
+      if (Node11.isIdentifier(callee)) {
         collectFromSingleEntryFactory(callee.getText(), out, index);
       }
       continue;
@@ -15364,9 +17021,9 @@ function extractTaskServiceCalls(sources, index, trustedExternal) {
   const out = [];
   for (const sf of sources) {
     const rel = apiRelPath(sf);
-    for (const call of sf.getDescendantsOfKind(SyntaxKind7.CallExpression)) {
+    for (const call of sf.getDescendantsOfKind(SyntaxKind8.CallExpression)) {
       const expr = call.getExpression();
-      if (!Node10.isIdentifier(expr) || expr.getText() !== TASK_SERVICE_FACTORY) continue;
+      if (!Node11.isIdentifier(expr) || expr.getText() !== TASK_SERVICE_FACTORY) continue;
       const args = call.getArguments();
       const first = args[0] ? asObjectLiteral(args[0]) : void 0;
       if (!first) continue;
@@ -15392,13 +17049,13 @@ function collectValidateArrayElements(validateArr) {
   const spreads = [];
   if (!validateArr) return { ids, spreads };
   for (const el of validateArr.getElements()) {
-    if (Node10.isSpreadElement(el)) {
+    if (Node11.isSpreadElement(el)) {
       const inner2 = el.getExpression();
-      if (Node10.isIdentifier(inner2)) spreads.push(inner2.getText());
+      if (Node11.isIdentifier(inner2)) spreads.push(inner2.getText());
       continue;
     }
     const inner = unwrapAsExpressions(el);
-    if (inner && Node10.isIdentifier(inner)) ids.push(inner.getText());
+    if (inner && Node11.isIdentifier(inner)) ids.push(inner.getText());
   }
   return { ids, spreads };
 }
@@ -15411,17 +17068,17 @@ function collectHandlersArrayElements(options) {
   if (!handlersArr) return { handlerTypes, unresolvedSpreads, resolvedBindings, unresolvedBindings };
   const visited = /* @__PURE__ */ new Set();
   for (const el of handlersArr.getElements()) {
-    if (Node10.isSpreadElement(el)) {
+    if (Node11.isSpreadElement(el)) {
       consumeHandlersSpreadElement({ inner: el.getExpression(), sf, index, trustedExternal, unresolvedSpreads, resolvedBindings, unresolvedBindings, visited });
       continue;
     }
     const inner = unwrapAsExpressions(el);
     if (!inner) continue;
-    if (Node10.isIdentifier(inner)) {
+    if (Node11.isIdentifier(inner)) {
       collectHandlerBindingsFromIdentifier({ name: inner.getText(), sf, index, trustedExternal, resolved: resolvedBindings, unresolved: unresolvedBindings, visited });
-    } else if (Node10.isCallExpression(inner)) {
+    } else if (Node11.isCallExpression(inner)) {
       const callee = inner.getExpression();
-      if (Node10.isIdentifier(callee)) {
+      if (Node11.isIdentifier(callee)) {
         collectHandlerBindingsFromIdentifier({ name: callee.getText(), sf, index, trustedExternal, resolved: resolvedBindings, unresolved: unresolvedBindings, visited });
       }
     }
@@ -15430,16 +17087,16 @@ function collectHandlersArrayElements(options) {
 }
 function consumeHandlersSpreadElement(options) {
   const { inner, sf, index, trustedExternal, unresolvedSpreads, resolvedBindings, unresolvedBindings, visited } = options;
-  if (Node10.isCallExpression(inner)) {
+  if (Node11.isCallExpression(inner)) {
     const callee = inner.getExpression();
-    if (Node10.isIdentifier(callee)) {
+    if (Node11.isIdentifier(callee)) {
       const name = callee.getText();
       unresolvedSpreads.push(name);
       collectHandlerBindingsFromIdentifier({ name, sf, index, trustedExternal, resolved: resolvedBindings, unresolved: unresolvedBindings, visited });
     }
     return;
   }
-  if (Node10.isIdentifier(inner)) {
+  if (Node11.isIdentifier(inner)) {
     const name = inner.getText();
     unresolvedSpreads.push(name);
     collectHandlerBindingsFromIdentifier({ name, sf, index, trustedExternal, resolved: resolvedBindings, unresolved: unresolvedBindings, visited });
@@ -15449,13 +17106,13 @@ function collectHandlerBindingsFromValue(options) {
   const { node, sf, index, trustedExternal, resolved, unresolved, visited } = options;
   const inner = unwrapAsExpressions(node);
   if (!inner) return false;
-  if (Node10.isCallExpression(inner)) {
+  if (Node11.isCallExpression(inner)) {
     const callee = inner.getExpression();
-    if (Node10.isIdentifier(callee)) {
+    if (Node11.isIdentifier(callee)) {
       return collectHandlerBindingsFromIdentifier({ name: callee.getText(), sf, index, trustedExternal, resolved, unresolved, visited });
     }
   }
-  if (Node10.isIdentifier(inner)) {
+  if (Node11.isIdentifier(inner)) {
     return collectHandlerBindingsFromIdentifier({ name: inner.getText(), sf, index, trustedExternal, resolved, unresolved, visited });
   }
   return false;
@@ -15472,7 +17129,7 @@ function collectHandlerBindingsFromIdentifier(options) {
       const typeText = typeNode ? typeNode.getText() : void 0;
       const isHandlerConfigTyped = typeText !== void 0 && (typeText === NOTIF_TASK_SERVICE_HANDLER_CONFIG || typeText.startsWith(`${NOTIF_TASK_SERVICE_HANDLER_CONFIG}<`));
       const declInit = unwrapAsExpressions(localDecl.getInitializer());
-      const isObjectLit = declInit !== void 0 && Node10.isObjectLiteralExpression(declInit);
+      const isObjectLit = declInit !== void 0 && Node11.isObjectLiteralExpression(declInit);
       if (isHandlerConfigTyped && isObjectLit) {
         resolved.push(localDecl.getName());
         resolvedAny = true;
@@ -15503,12 +17160,12 @@ function collectHandlerBindingsFromIdentifier(options) {
 function resolveArrayFromProperty2(obj, name, sf) {
   const init = unwrapAsExpressions(getPropertyInitializer(obj, name));
   if (!init) return void 0;
-  if (Node10.isArrayLiteralExpression(init)) return init;
-  if (Node10.isIdentifier(init)) {
+  if (Node11.isArrayLiteralExpression(init)) return init;
+  if (Node11.isIdentifier(init)) {
     const declNode = findLocalVariable(sf, init.getText());
     if (declNode) {
       const declInit = unwrapAsExpressions(declNode.getInitializer());
-      if (declInit && Node10.isArrayLiteralExpression(declInit)) {
+      if (declInit && Node11.isArrayLiteralExpression(declInit)) {
         return declInit;
       }
     }
@@ -15529,12 +17186,12 @@ function extractTaskHandlerEntries(sources) {
     if (!typeIdent) return;
     const flowInit = unwrapAsExpressions(getPropertyInitializer(obj, "flow"));
     let flowCount;
-    if (flowInit && Node10.isArrayLiteralExpression(flowInit)) {
+    if (flowInit && Node11.isArrayLiteralExpression(flowInit)) {
       flowCount = flowInit.getElements().length;
     }
     let dataArg;
     let checkpointArg;
-    if (Node10.isTypeReference(typeNode)) {
+    if (Node11.isTypeReference(typeNode)) {
       const tArgs = typeNode.getTypeArguments();
       if (tArgs.length >= 1) dataArg = tArgs[0].getText();
       if (tArgs.length >= 2) checkpointArg = tArgs[1].getText();
@@ -15554,7 +17211,7 @@ function extractTaskHandlerEntries(sources) {
   };
   for (const sf of sources) {
     const rel = apiRelPath(sf);
-    for (const decl of sf.getDescendantsOfKind(SyntaxKind7.VariableDeclaration)) {
+    for (const decl of sf.getDescendantsOfKind(SyntaxKind8.VariableDeclaration)) {
       collectFromVariable(decl, rel);
     }
   }
@@ -15579,7 +17236,7 @@ function runRules6(inspection, extracted) {
     violations,
     codes: IO_VIOLATION_CODES2,
     messages: IO_VIOLATION_MESSAGES2,
-    build: (code10, message, side) => buildIoViolation2(code10, message, side)
+    build: (code11, message, side) => buildIoViolation2(code11, message, side)
   });
   if (!proceed) {
     return violations;
@@ -15932,14 +17589,14 @@ function flagUnusedInfoAggregates(extracted, violations) {
     }
   }
 }
-function flagDuplicates2(entries, code10, violations) {
+function flagDuplicates2(entries, code11, violations) {
   const seen = /* @__PURE__ */ new Map();
   for (const entry of entries) {
     if (!entry.typeCode) continue;
     const previous = seen.get(entry.typeCode);
     if (previous) {
       pushViolation6(violations, {
-        code: code10,
+        code: code11,
         severity: "warning",
         message: `Type code \`'${entry.typeCode}'\` is shared by \`${previous}\` and \`${entry.symbolName}\`. Runtime aggregators reject duplicates \u2014 change one of the string literals.`,
         side: "component",
@@ -15973,9 +17630,9 @@ function pushViolation6(buffer, violation) {
   };
   buffer.push(filled);
 }
-function buildIoViolation2(code10, message, side) {
+function buildIoViolation2(code11, message, side) {
   const result = {
-    code: code10,
+    code: code11,
     severity: "error",
     message,
     side,
@@ -16175,8 +17832,8 @@ function formatReportAsJson2(report) {
 // packages/dbx-components-mcp/src/tools/notification-m-list-app/format.markdown.ts
 function formatReportAsMarkdown2(report) {
   const basename4 = report.componentDir.split("/").pop() ?? report.componentDir;
-  const aggregatorRecordText = report.aggregatorRecordName ? code4(report.aggregatorRecordName) : "_Not defined._";
-  const templateConfigsFactoryText = report.templateConfigsArrayFactoryName ? code4(report.templateConfigsArrayFactoryName) : "_Not defined._";
+  const aggregatorRecordText = report.aggregatorRecordName ? code5(report.aggregatorRecordName) : "_Not defined._";
+  const templateConfigsFactoryText = report.templateConfigsArrayFactoryName ? code5(report.templateConfigsArrayFactoryName) : "_Not defined._";
   const lines = [
     `# App notifications \u2014 ${basename4}`,
     "",
@@ -16216,8 +17873,8 @@ function formatTemplateBlock(t) {
   if (t.description) parts.push(`- Description: ${t.description}`);
   if (t.notificationMIdentity) parts.push(`- Notification model: \`${t.notificationMIdentity}\``);
   if (t.targetModelIdentity) parts.push(`- Target model: \`${t.targetModelIdentity}\``);
-  const infoText = t.infoSymbolName ? code4(t.infoSymbolName) : "_Missing._";
-  const factorySuffix = t.factoryFunctionName ? ` (${code4(t.factoryFunctionName)})` : "";
+  const infoText = t.infoSymbolName ? code5(t.infoSymbolName) : "_Missing._";
+  const factorySuffix = t.factoryFunctionName ? ` (${code5(t.factoryFunctionName)})` : "";
   parts.push(`- Info object: ${infoText}`, `- In info record: ${formatBool2(t.inInfoRecord)}`, `- Has factory: ${formatBool2(t.hasFactory)}${factorySuffix}`, `- Source: \`${t.sourceFile}\``);
   return parts.join("\n");
 }
@@ -16227,7 +17884,7 @@ function formatTaskBlock(t) {
   parts.push(heading);
   if (t.dataInterfaceName) parts.push(`- Data interface: \`${t.dataInterfaceName}\``);
   if (t.checkpoints.length > 0) {
-    const checkpointsText = t.checkpoints.map((c) => code4(c)).join(", ");
+    const checkpointsText = t.checkpoints.map((c) => code5(c)).join(", ");
     parts.push(`- Checkpoints: ${checkpointsText}`);
   }
   let handlerSuffix = "";
@@ -16241,7 +17898,7 @@ function formatTaskBlock(t) {
 function formatBool2(value) {
   return value ? "yes" : "no";
 }
-function code4(value) {
+function code5(value) {
   return "`" + value + "`";
 }
 
@@ -16383,8 +18040,8 @@ function formatResult8(result) {
 }
 
 // packages/dbx-components-mcp/src/tools/system-m-validate-folder/inspect.ts
-import { readdir as readdir4, readFile as readFile4, stat as stat5 } from "node:fs/promises";
-import { basename as basename3, join as join3 } from "node:path";
+import { readdir as readdir4, readFile as readFile6, stat as stat5 } from "node:fs/promises";
+import { basename as basename3, join as join6 } from "node:path";
 async function inspectFolder2(path) {
   const name = basename3(path);
   let status;
@@ -16404,7 +18061,7 @@ async function inspectFolder2(path) {
       files = collected;
       if (collected.includes("system.ts")) {
         try {
-          systemSource = await readFile4(join3(path, "system.ts"), "utf8");
+          systemSource = await readFile6(join6(path, "system.ts"), "utf8");
         } catch {
           systemSource = void 0;
         }
@@ -16413,8 +18070,8 @@ async function inspectFolder2(path) {
       status = "not-directory";
     }
   } catch (err) {
-    const code10 = err.code;
-    if (code10 === "ENOENT" || code10 === "ENOTDIR") {
+    const code11 = err.code;
+    if (code11 === "ENOENT" || code11 === "ENOTDIR") {
       status = "not-found";
     } else {
       throw err;
@@ -16425,14 +18082,14 @@ async function inspectFolder2(path) {
 }
 
 // packages/dbx-components-mcp/src/tools/system-m-validate-folder/extract.ts
-import { Node as Node11, Project as Project7 } from "ts-morph";
+import { Node as Node12, Project as Project9 } 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 Project7({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project9({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sourceFile = project.createSourceFile(name, text, { overwrite: true });
   const typeConstants = findTypeConstants(sourceFile);
   const dataInterfaces = findDataInterfaces2(sourceFile);
@@ -16489,7 +18146,7 @@ function findDataInterfaces2(sourceFile) {
   return out;
 }
 function extendsSystemStateStoredData(iface) {
-  if (!Node11.isInterfaceDeclaration(iface)) return false;
+  if (!Node12.isInterfaceDeclaration(iface)) return false;
   for (const clause of iface.getExtends()) {
     const text = clause.getText();
     if (text === SYSTEM_STATE_STORED_DATA || text.startsWith(`${SYSTEM_STATE_STORED_DATA}<`) || text === `${SYSTEM_STATE_STORED_DATA}, ${SYSTEM_STATE_STORED_DATA}`) {
@@ -16509,14 +18166,14 @@ function findConverters(sourceFile) {
     for (const decl of stmt.getDeclarations()) {
       const typeNode = decl.getTypeNode();
       if (!typeNode) continue;
-      if (!Node11.isTypeReference(typeNode)) continue;
+      if (!Node12.isTypeReference(typeNode)) continue;
       const typeName = typeNode.getTypeName().getText();
       if (typeName !== CONVERTER_CONFIG_TYPE) continue;
       const typeArgs = typeNode.getTypeArguments();
       let dataTypeArgument;
       if (typeArgs.length >= 1) {
         const arg = typeArgs[0];
-        if (Node11.isTypeReference(arg)) {
+        if (Node12.isTypeReference(arg)) {
           dataTypeArgument = arg.getTypeName().getText();
         } else {
           dataTypeArgument = arg.getText();
@@ -16563,19 +18220,19 @@ function collectConverterMapKeys(decl) {
   if (!obj) return [];
   const out = [];
   for (const prop of obj.getProperties()) {
-    if (!Node11.isPropertyAssignment(prop)) continue;
+    if (!Node12.isPropertyAssignment(prop)) continue;
     const nameNode = prop.getNameNode();
     const line = prop.getStartLineNumber();
-    if (Node11.isComputedPropertyName(nameNode)) {
+    if (Node12.isComputedPropertyName(nameNode)) {
       const inner = nameNode.getExpression();
       out.push({ raw: inner.getText(), kind: "identifier", line });
       continue;
     }
-    if (Node11.isStringLiteral(nameNode)) {
+    if (Node12.isStringLiteral(nameNode)) {
       out.push({ raw: nameNode.getLiteralText(), kind: "string", line });
       continue;
     }
-    if (Node11.isIdentifier(nameNode)) {
+    if (Node12.isIdentifier(nameNode)) {
       out.push({ raw: nameNode.getText(), kind: "string", line });
       continue;
     }
@@ -16585,10 +18242,10 @@ function collectConverterMapKeys(decl) {
 }
 function unwrapObjectLiteral(node) {
   let current = node;
-  while (current && Node11.isAsExpression(current)) {
+  while (current && Node12.isAsExpression(current)) {
     current = current.getExpression();
   }
-  if (current && Node11.isObjectLiteralExpression(current)) {
+  if (current && Node12.isObjectLiteralExpression(current)) {
     return current;
   }
   return void 0;
@@ -16622,10 +18279,10 @@ function findLastTopLevelExportLine(sourceFile) {
   return last;
 }
 function isExportedTopLevel(stmt) {
-  if (Node11.isVariableStatement(stmt) || Node11.isFunctionDeclaration(stmt) || Node11.isClassDeclaration(stmt) || Node11.isInterfaceDeclaration(stmt) || Node11.isTypeAliasDeclaration(stmt) || Node11.isEnumDeclaration(stmt)) {
+  if (Node12.isVariableStatement(stmt) || Node12.isFunctionDeclaration(stmt) || Node12.isClassDeclaration(stmt) || Node12.isInterfaceDeclaration(stmt) || Node12.isTypeAliasDeclaration(stmt) || Node12.isEnumDeclaration(stmt)) {
     return stmt.isExported();
   }
-  if (Node11.isExportDeclaration(stmt) || Node11.isExportAssignment(stmt)) {
+  if (Node12.isExportDeclaration(stmt) || Node12.isExportAssignment(stmt)) {
     return true;
   }
   return false;
@@ -16935,7 +18592,7 @@ var systemMValidateFolderTool = createFolderValidateTool({
 });
 
 // packages/dbx-components-mcp/src/tools/lookup-action.tool.ts
-import { type as type31 } from "arktype";
+import { type as type36 } from "arktype";
 var DBX_ACTION_LOOKUP_TOOL = {
   name: "dbx_action_lookup",
   description: [
@@ -16968,13 +18625,13 @@ var DBX_ACTION_LOOKUP_TOOL = {
     required: ["topic"]
   }
 };
-var LookupActionArgsType = type31({
+var LookupActionArgsType = type36({
   topic: "string",
   "depth?": "'brief' | 'full'"
 });
 function parseLookupActionArgs(raw) {
   const parsed = LookupActionArgsType(raw);
-  if (parsed instanceof type31.errors) {
+  if (parsed instanceof type36.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const result = {
@@ -17098,7 +18755,7 @@ function formatDirectiveEntry(entry, depth) {
     }
     lines.push("## State interaction", "", formatStateInteraction(entry), "", "## Example", "", "```html", entry.example, "```");
     if (entry.skillRefs.length > 0) {
-      const skillsText = entry.skillRefs.map((s) => code5(s)).join(", ");
+      const skillsText = entry.skillRefs.map((s) => code6(s)).join(", ");
       lines.push("", `\u2192 Skills: ${skillsText}`);
     }
   } else {
@@ -17132,7 +18789,7 @@ function formatStoreEntry(entry, depth) {
     }
     lines.push("## Example", "", "```ts", entry.example, "```");
     if (entry.skillRefs.length > 0) {
-      const skillsText = entry.skillRefs.map((s) => code5(s)).join(", ");
+      const skillsText = entry.skillRefs.map((s) => code6(s)).join(", ");
       lines.push("", `\u2192 Skills: ${skillsText}`);
     }
   } else {
@@ -17157,7 +18814,7 @@ function formatStateDiagram(entry) {
 function formatStateEntry(entry, depth) {
   const lines = [`# DbxActionState.${entry.stateValue}`, "", entry.description, "", bullet("enum value", `\`'${entry.literal}'\``), bullet("slug", `\`${entry.slug}\``), "", "## Transitions", "", "```", formatStateDiagram(entry), "```"];
   if (depth === "full" && entry.skillRefs.length > 0) {
-    const skillsText = entry.skillRefs.map((s) => code5(s)).join(", ");
+    const skillsText = entry.skillRefs.map((s) => code6(s)).join(", ");
     lines.push("", `\u2192 Skills: ${skillsText}`);
   }
   return lines.join("\n");
@@ -17236,12 +18893,12 @@ function formatNotFound6(normalized, candidates) {
   }
   return lines.join("\n");
 }
-function code5(value) {
+function code6(value) {
   return "`" + value + "`";
 }
 function createLookupActionTool(input) {
   const { registry } = input;
-  const run = (rawArgs) => {
+  const run5 = (rawArgs) => {
     let args;
     try {
       args = parseLookupActionArgs(rawArgs);
@@ -17268,11 +18925,11 @@ function createLookupActionTool(input) {
     const result = { content: [{ type: "text", text }] };
     return result;
   };
-  return { definition: DBX_ACTION_LOOKUP_TOOL, run };
+  return { definition: DBX_ACTION_LOOKUP_TOOL, run: run5 };
 }
 
 // packages/dbx-components-mcp/src/tools/action-examples.tool.ts
-import { type as type32 } from "arktype";
+import { type as type37 } from "arktype";
 
 // packages/dbx-components-mcp/src/tools/data/patterns/actions/action.auto-trigger-on-modify.pattern.ts
 var ACTION_PATTERN_AUTO_TRIGGER_ON_MODIFY = {
@@ -17632,13 +19289,13 @@ var DBX_ACTION_EXAMPLES_TOOL = {
     required: ["pattern"]
   }
 };
-var ActionExamplesArgsType = type32({
+var ActionExamplesArgsType = type37({
   pattern: "string",
   "depth?": "'minimal' | 'brief' | 'full'"
 });
 function parseActionExamplesArgs(raw) {
   const parsed = ActionExamplesArgsType(raw);
-  if (parsed instanceof type32.errors) {
+  if (parsed instanceof type37.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const result = {
@@ -17650,7 +19307,7 @@ function parseActionExamplesArgs(raw) {
 function formatPatternCatalog3() {
   const lines = [`# Action example patterns (${ACTION_EXAMPLE_PATTERNS.length})`, "", 'Call `dbx_action_examples pattern="<slug>"` for a full example.', ""];
   for (const pattern of ACTION_EXAMPLE_PATTERNS) {
-    const usesText = pattern.usesActionSlugs.map((s) => code6(s)).join(", ");
+    const usesText = pattern.usesActionSlugs.map((s) => code7(s)).join(", ");
     lines.push(`## ${pattern.name}`, "", `- **slug:** \`${pattern.slug}\``, `- **summary:** ${pattern.summary}`, `- **uses:** ${usesText}`, "");
   }
   return lines.join("\n").trimEnd();
@@ -17658,7 +19315,7 @@ function formatPatternCatalog3() {
 function formatPattern3(pattern, depth) {
   const snippet = pattern.snippets[depth];
   const fence = depth === "full" ? "ts" : "html";
-  const usesText = pattern.usesActionSlugs.map((s) => code6(s)).join(", ");
+  const usesText = pattern.usesActionSlugs.map((s) => code7(s)).join(", ");
   const sections = [`# ${pattern.name}`, "", pattern.summary, "", `**slug:** \`${pattern.slug}\` \xB7 **depth:** \`${depth}\` \xB7 **uses:** ${usesText}`, "", "```" + fence, snippet, "```"];
   if (pattern.notes && depth === "full") {
     sections.push("", "## Notes", "", pattern.notes);
@@ -17669,10 +19326,10 @@ function formatPattern3(pattern, depth) {
   return sections.join("\n");
 }
 function formatNotFound7(slug) {
-  const available = ACTION_EXAMPLE_PATTERNS.map((p) => code6(p.slug)).join(", ");
+  const available = ACTION_EXAMPLE_PATTERNS.map((p) => code7(p.slug)).join(", ");
   return [`No action example pattern matched \`${slug}\`.`, "", `Available patterns: ${available}.`, "", 'Call `dbx_action_examples pattern="list"` for summaries.'].join("\n");
 }
-function code6(value) {
+function code7(value) {
   return "`" + value + "`";
 }
 function runActionExamples(rawArgs) {
@@ -17700,7 +19357,7 @@ var actionExamplesTool = {
 };
 
 // packages/dbx-components-mcp/src/tools/action-scaffold.tool.ts
-import { type as type33 } from "arktype";
+import { type as type38 } from "arktype";
 var TRIGGER_VALUES = ["button", "form", "auto-modify"];
 var SUCCESS_FEEDBACK_VALUES = ["snackbar", "redirect", "none"];
 var CONTEXT_PROVIDER_VALUES = ["inline", "parent", "host-component"];
@@ -17734,7 +19391,7 @@ var DBX_ACTION_SCAFFOLD_TOOL = {
     required: ["use_case", "trigger", "value_type"]
   }
 };
-var ScaffoldArgsType3 = type33({
+var ScaffoldArgsType4 = type38({
   use_case: "string",
   trigger: "'button' | 'form' | 'auto-modify'",
   "confirm?": "boolean",
@@ -17744,8 +19401,8 @@ var ScaffoldArgsType3 = type33({
   "result_type?": "string"
 });
 function parseScaffoldArgs2(raw) {
-  const parsed = ScaffoldArgsType3(raw);
-  if (parsed instanceof type33.errors) {
+  const parsed = ScaffoldArgsType4(raw);
+  if (parsed instanceof type38.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const useCase = parsed.use_case.trim();
@@ -17951,16 +19608,16 @@ var actionScaffoldTool = {
 };
 
 // packages/dbx-components-mcp/src/tools/route-tree.tool.ts
-import { type as type34 } from "arktype";
+import { type as type39 } from "arktype";
 
 // packages/dbx-components-mcp/src/tools/route/load-sources.ts
-import { glob as fsGlob3, readFile as readFile5, stat as stat6 } from "node:fs/promises";
-import { dirname as dirname7, isAbsolute as isAbsolute7, resolve as resolve15, sep as sep3 } from "node:path";
+import { glob as fsGlob3, readFile as readFile7, stat as stat6 } from "node:fs/promises";
+import { dirname as dirname7, isAbsolute as isAbsolute7, resolve as resolve20, sep as sep3 } from "node:path";
 
 // packages/dbx-components-mcp/src/tools/route/extract.ts
-import { Node as Node12, Project as Project8, SyntaxKind as SyntaxKind8 } from "ts-morph";
+import { Node as Node13, Project as Project10, SyntaxKind as SyntaxKind9 } from "ts-morph";
 function extractFile3(source) {
-  const project = new Project8({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  const project = new Project10({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sourceFile = project.createSourceFile(source.name, source.text, { overwrite: true });
   const issues = [];
   const objectLiteralsByName = collectStateConsts(sourceFile);
@@ -17973,9 +19630,9 @@ function extractFile3(source) {
   }
   for (const arrayLit of findStateArrayLiterals(sourceFile)) {
     for (const element of arrayLit.getElements()) {
-      if (Node12.isObjectLiteralExpression(element)) {
+      if (Node13.isObjectLiteralExpression(element)) {
         addNode({ file: source.name, literal: element, fallbackConstName: void 0, into: collected, issues });
-      } else if (Node12.isIdentifier(element)) {
+      } else if (Node13.isIdentifier(element)) {
         const ref = objectLiteralsByName.get(element.getText());
         if (ref) {
           addNode({ file: source.name, literal: ref.literal, fallbackConstName: element.getText(), into: collected, issues });
@@ -17996,7 +19653,7 @@ function collectStateConsts(sourceFile) {
   for (const stmt of sourceFile.getVariableStatements()) {
     for (const decl of stmt.getDeclarations()) {
       const initializer = decl.getInitializer();
-      if (!initializer || !Node12.isObjectLiteralExpression(initializer)) {
+      if (!initializer || !Node13.isObjectLiteralExpression(initializer)) {
         continue;
       }
       const typeNode = decl.getTypeNode();
@@ -18011,12 +19668,12 @@ function findStateArrayLiterals(sourceFile) {
   for (const stmt of sourceFile.getVariableStatements()) {
     for (const decl of stmt.getDeclarations()) {
       const initializer = decl.getInitializer();
-      if (initializer && Node12.isArrayLiteralExpression(initializer) && declarationIsStateArray(stmt, decl.getName(), initializer)) {
+      if (initializer && Node13.isArrayLiteralExpression(initializer) && declarationIsStateArray(stmt, decl.getName(), initializer)) {
         arrays.push(initializer);
       }
     }
   }
-  for (const call of sourceFile.getDescendantsOfKind(SyntaxKind8.CallExpression)) {
+  for (const call of sourceFile.getDescendantsOfKind(SyntaxKind9.CallExpression)) {
     const expr = call.getExpression();
     const exprText = expr.getText();
     const isProvide = exprText === "provideStates";
@@ -18025,17 +19682,17 @@ function findStateArrayLiterals(sourceFile) {
       continue;
     }
     for (const arg of call.getArguments()) {
-      if (!Node12.isObjectLiteralExpression(arg)) {
+      if (!Node13.isObjectLiteralExpression(arg)) {
         continue;
       }
       const statesProp = arg.getProperty("states");
-      if (!statesProp || !Node12.isPropertyAssignment(statesProp)) {
+      if (!statesProp || !Node13.isPropertyAssignment(statesProp)) {
         continue;
       }
       const initializer = statesProp.getInitializer();
-      if (initializer && Node12.isArrayLiteralExpression(initializer)) {
+      if (initializer && Node13.isArrayLiteralExpression(initializer)) {
         arrays.push(initializer);
-      } else if (initializer && Node12.isIdentifier(initializer)) {
+      } else if (initializer && Node13.isIdentifier(initializer)) {
         const referenced = findArrayLiteralForIdentifier(sourceFile, initializer);
         if (referenced) {
           arrays.push(referenced);
@@ -18052,10 +19709,10 @@ function declarationIsStateArray(stmt, name, literal) {
     return true;
   }
   for (const element of literal.getElements()) {
-    if (Node12.isObjectLiteralExpression(element) && hasStringNameProperty(element)) {
+    if (Node13.isObjectLiteralExpression(element) && hasStringNameProperty(element)) {
       return true;
     }
-    if (Node12.isIdentifier(element)) {
+    if (Node13.isIdentifier(element)) {
       return true;
     }
   }
@@ -18063,11 +19720,11 @@ function declarationIsStateArray(stmt, name, literal) {
 }
 function hasStringNameProperty(literal) {
   const nameProp = literal.getProperty("name");
-  if (!nameProp || !Node12.isPropertyAssignment(nameProp)) {
+  if (!nameProp || !Node13.isPropertyAssignment(nameProp)) {
     return false;
   }
   const initializer = nameProp.getInitializer();
-  return initializer !== void 0 && (Node12.isStringLiteral(initializer) || Node12.isNoSubstitutionTemplateLiteral(initializer));
+  return initializer !== void 0 && (Node13.isStringLiteral(initializer) || Node13.isNoSubstitutionTemplateLiteral(initializer));
 }
 function findArrayLiteralForIdentifier(sourceFile, identifier) {
   const name = identifier.getText();
@@ -18077,7 +19734,7 @@ function findArrayLiteralForIdentifier(sourceFile, identifier) {
         continue;
       }
       const initializer = decl.getInitializer();
-      if (initializer && Node12.isArrayLiteralExpression(initializer)) {
+      if (initializer && Node13.isArrayLiteralExpression(initializer)) {
         return initializer;
       }
     }
@@ -18127,64 +19784,64 @@ function addNode(options) {
 }
 function stringPropertyValue(literal, key) {
   const prop = literal.getProperty(key);
-  if (!prop || !Node12.isPropertyAssignment(prop)) {
+  if (!prop || !Node13.isPropertyAssignment(prop)) {
     return void 0;
   }
   const initializer = prop.getInitializer();
   if (!initializer) {
     return void 0;
   }
-  if (Node12.isStringLiteral(initializer) || Node12.isNoSubstitutionTemplateLiteral(initializer)) {
+  if (Node13.isStringLiteral(initializer) || Node13.isNoSubstitutionTemplateLiteral(initializer)) {
     return initializer.getLiteralText();
   }
   return void 0;
 }
 function booleanPropertyValue(literal, key) {
   const prop = literal.getProperty(key);
-  if (!prop || !Node12.isPropertyAssignment(prop)) {
+  if (!prop || !Node13.isPropertyAssignment(prop)) {
     return void 0;
   }
   const initializer = prop.getInitializer();
   if (!initializer) {
     return void 0;
   }
-  if (initializer.getKind() === SyntaxKind8.TrueKeyword) {
+  if (initializer.getKind() === SyntaxKind9.TrueKeyword) {
     return true;
   }
-  if (initializer.getKind() === SyntaxKind8.FalseKeyword) {
+  if (initializer.getKind() === SyntaxKind9.FalseKeyword) {
     return false;
   }
   return void 0;
 }
 function identifierPropertyValue(literal, key) {
   const prop = literal.getProperty(key);
-  if (!prop || !Node12.isPropertyAssignment(prop)) {
+  if (!prop || !Node13.isPropertyAssignment(prop)) {
     return void 0;
   }
   const initializer = prop.getInitializer();
   if (!initializer) {
     return void 0;
   }
-  if (Node12.isIdentifier(initializer)) {
+  if (Node13.isIdentifier(initializer)) {
     return initializer.getText();
   }
-  if (Node12.isPropertyAccessExpression(initializer)) {
+  if (Node13.isPropertyAccessExpression(initializer)) {
     return initializer.getText();
   }
   return void 0;
 }
 function objectPropertyKeys(literal, key) {
   const prop = literal.getProperty(key);
-  if (!prop || !Node12.isPropertyAssignment(prop)) {
+  if (!prop || !Node13.isPropertyAssignment(prop)) {
     return [];
   }
   const initializer = prop.getInitializer();
-  if (!initializer || !Node12.isObjectLiteralExpression(initializer)) {
+  if (!initializer || !Node13.isObjectLiteralExpression(initializer)) {
     return [];
   }
   const out = [];
   for (const member of initializer.getProperties()) {
-    if (Node12.isPropertyAssignment(member) || Node12.isShorthandPropertyAssignment(member) || Node12.isMethodDeclaration(member)) {
+    if (Node13.isPropertyAssignment(member) || Node13.isShorthandPropertyAssignment(member) || Node13.isMethodDeclaration(member)) {
       const nameNode = member.getNameNode();
       if (nameNode) {
         out.push(nameNode.getText());
@@ -18195,7 +19852,7 @@ function objectPropertyKeys(literal, key) {
 }
 function collectResolveKeys(literal) {
   const prop = literal.getProperty("resolve");
-  if (!prop || !Node12.isPropertyAssignment(prop)) {
+  if (!prop || !Node13.isPropertyAssignment(prop)) {
     return [];
   }
   const initializer = prop.getInitializer();
@@ -18203,22 +19860,22 @@ function collectResolveKeys(literal) {
     return [];
   }
   const keys = [];
-  if (Node12.isObjectLiteralExpression(initializer)) {
+  if (Node13.isObjectLiteralExpression(initializer)) {
     for (const member of initializer.getProperties()) {
-      if (Node12.isPropertyAssignment(member) || Node12.isShorthandPropertyAssignment(member) || Node12.isMethodDeclaration(member)) {
+      if (Node13.isPropertyAssignment(member) || Node13.isShorthandPropertyAssignment(member) || Node13.isMethodDeclaration(member)) {
         const nameNode = member.getNameNode();
         if (nameNode) {
           keys.push(nameNode.getText());
         }
       }
     }
-  } else if (Node12.isArrayLiteralExpression(initializer)) {
+  } else if (Node13.isArrayLiteralExpression(initializer)) {
     for (const element of initializer.getElements()) {
-      if (Node12.isObjectLiteralExpression(element)) {
+      if (Node13.isObjectLiteralExpression(element)) {
         const tokenProp = element.getProperty("token");
-        if (tokenProp && Node12.isPropertyAssignment(tokenProp)) {
+        if (tokenProp && Node13.isPropertyAssignment(tokenProp)) {
           const tokenInit = tokenProp.getInitializer();
-          if (tokenInit && (Node12.isStringLiteral(tokenInit) || Node12.isIdentifier(tokenInit))) {
+          if (tokenInit && (Node13.isStringLiteral(tokenInit) || Node13.isIdentifier(tokenInit))) {
             keys.push(tokenInit.getText().replaceAll(/^['"]|['"]$/g, ""));
           }
         }
@@ -18270,7 +19927,7 @@ function computeRelativeSpecifiers(source) {
 // packages/dbx-components-mcp/src/tools/route/load-sources.ts
 var TRY_EXTENSIONS = [".ts", ".tsx", "/index.ts", "/index.tsx"];
 async function loadRouteSources(args) {
-  const cwdResolved = args.cwd ? resolve15(process.cwd(), args.cwd) : process.cwd();
+  const cwdResolved = args.cwd ? resolve20(process.cwd(), args.cwd) : process.cwd();
   guardCwdInsideServer(args.cwd, cwdResolved);
   const collected = /* @__PURE__ */ new Map();
   if (args.sources) {
@@ -18342,21 +19999,21 @@ async function loadOne(relative5, cwd, into) {
   if (into.has(relative5)) {
     return;
   }
-  const absolute = resolve15(cwd, relative5);
+  const absolute = resolve20(cwd, relative5);
   const cwdPrefix = cwd.endsWith(sep3) ? cwd : cwd + sep3;
   if (!absolute.startsWith(cwdPrefix) && absolute !== cwd) {
     throw new Error(`Path \`${relative5}\` resolves outside the server cwd and is not allowed.`);
   }
-  const text = await readFile5(absolute, "utf8");
+  const text = await readFile7(absolute, "utf8");
   into.set(relative5, { name: relative5, text });
 }
 async function resolveRelativeImport(fromFile, specifier, cwd) {
   if (!specifier.startsWith(".")) {
     return void 0;
   }
-  const fromAbsolute = isAbsolute7(fromFile) ? fromFile : resolve15(cwd, fromFile);
+  const fromAbsolute = isAbsolute7(fromFile) ? fromFile : resolve20(cwd, fromFile);
   const fromDir = dirname7(fromAbsolute);
-  const baseAbsolute = resolve15(fromDir, specifier);
+  const baseAbsolute = resolve20(fromDir, specifier);
   const cwdPrefix = cwd.endsWith(sep3) ? cwd : cwd + sep3;
   for (const ext of TRY_EXTENSIONS) {
     const candidateAbsolute = baseAbsolute + ext;
@@ -18367,7 +20024,7 @@ async function resolveRelativeImport(fromFile, specifier, cwd) {
     if (!exists) {
       continue;
     }
-    const text = await readFile5(candidateAbsolute, "utf8");
+    const text = await readFile7(candidateAbsolute, "utf8");
     const relativeName = candidateAbsolute.startsWith(cwdPrefix) ? candidateAbsolute.slice(cwdPrefix.length) : candidateAbsolute;
     const result = { name: relativeName, text };
     return result;
@@ -18735,8 +20392,8 @@ var DBX_ROUTE_TREE_TOOL = {
     }
   }
 };
-var TreeArgsType = type34({
-  "sources?": type34({ name: "string", text: "string" }).array(),
+var TreeArgsType = type39({
+  "sources?": type39({ name: "string", text: "string" }).array(),
   "paths?": "string[]",
   "glob?": "string",
   "format?": "'markdown' | 'json' | 'flat'",
@@ -18745,7 +20402,7 @@ var TreeArgsType = type34({
 });
 function parseArgs3(raw) {
   const parsed = TreeArgsType(raw);
-  if (parsed instanceof type34.errors) {
+  if (parsed instanceof type39.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const result = {
@@ -18795,7 +20452,7 @@ var routeTreeTool = {
 };
 
 // packages/dbx-components-mcp/src/tools/route-lookup.tool.ts
-import { type as type35 } from "arktype";
+import { type as type40 } from "arktype";
 var DBX_ROUTE_LOOKUP_TOOL = {
   name: "dbx_route_lookup",
   description: ["Look up a single UIRouter state by name, full URL, or component class name. Returns the state's URL, component, parent chain, params, resolves, siblings, and children.", "", "Provide at least one of `sources` / `paths` / `glob` to point the tool at the source set, plus a `topic`.", "", "Resolution order: exact state name \u2192 URL path \u2192 component class name \u2192 fuzzy substring (returns up to 5 candidates)."].join("\n"),
@@ -18820,17 +20477,17 @@ var DBX_ROUTE_LOOKUP_TOOL = {
     required: ["topic"]
   }
 };
-var LookupArgsType = type35({
+var LookupArgsType2 = type40({
   topic: "string",
-  "sources?": type35({ name: "string", text: "string" }).array(),
+  "sources?": type40({ name: "string", text: "string" }).array(),
   "paths?": "string[]",
   "glob?": "string",
   "depth?": "'brief' | 'full'",
   "cwd?": "string"
 });
 function parseArgs4(raw) {
-  const parsed = LookupArgsType(raw);
-  if (parsed instanceof type35.errors) {
+  const parsed = LookupArgsType2(raw);
+  if (parsed instanceof type40.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const result = {
@@ -18900,8 +20557,8 @@ function fuzzyCandidates3(query, byName) {
   return scored.slice(0, 5).map((s) => s.node);
 }
 function formatSingle(node, depth, via) {
-  const urlText = node.fullUrl === void 0 ? "_no url_" : code7(node.fullUrl);
-  const componentText = node.data.component === void 0 ? "_no component_" : code7(node.data.component);
+  const urlText = node.fullUrl === void 0 ? "_no url_" : code8(node.fullUrl);
+  const componentText = node.data.component === void 0 ? "_no component_" : code8(node.data.component);
   const lines = [`# ${node.data.name}`, "", `Matched via ${via}.`, "", `- **URL:** ${urlText}`, `- **Component:** ${componentText}`, `- **Defined in:** \`${node.data.file}:${node.data.line}\``];
   if (node.data.redirectTo) {
     lines.push(`- **Redirects to:** \`${node.data.redirectTo}\``);
@@ -18925,7 +20582,7 @@ function formatSingle(node, depth, via) {
 }
 function appendParentChainSection(lines, node) {
   const chain = ancestors(node);
-  const chainLine = chain.map((c) => code7(c.data.name)).join(" \u2192 ");
+  const chainLine = chain.map((c) => code8(c.data.name)).join(" \u2192 ");
   lines.push("", "## Parent chain", chainLine.length > 0 ? chainLine : "_root_");
 }
 function appendKeyListSection(lines, title, keys) {
@@ -18945,8 +20602,8 @@ function appendRelatedNodesSection(lines, title, nodes) {
     return;
   }
   for (const child of nodes) {
-    const urlPart = child.fullUrl === void 0 ? "" : code7(child.fullUrl);
-    const componentPart = child.data.component ? ` \u2192 ${code7(child.data.component)}` : "";
+    const urlPart = child.fullUrl === void 0 ? "" : code8(child.fullUrl);
+    const componentPart = child.data.component ? ` \u2192 ${code8(child.data.component)}` : "";
     lines.push(`- \`${child.data.name}\` ${urlPart}${componentPart}`);
   }
 }
@@ -18962,8 +20619,8 @@ function ancestors(node) {
 function formatGroup2(title, nodes) {
   const lines = [`# ${title}`, "", `${nodes.length} match(es).`, ""];
   for (const node of nodes) {
-    const urlPart = node.fullUrl === void 0 ? "" : code7(node.fullUrl);
-    const componentPart = node.data.component ? ` \u2192 ${code7(node.data.component)}` : "";
+    const urlPart = node.fullUrl === void 0 ? "" : code8(node.fullUrl);
+    const componentPart = node.data.component ? ` \u2192 ${code8(node.data.component)}` : "";
     lines.push(`- \`${node.data.name}\` ${urlPart}${componentPart} _(${node.data.file}:${node.data.line})_`);
   }
   return lines.join("\n");
@@ -18973,8 +20630,8 @@ function formatNotFound8(query, candidates) {
   if (candidates.length > 0) {
     lines.push("Did you mean one of these?", "");
     for (const node of candidates) {
-      const urlPart = node.fullUrl === void 0 ? "" : code7(node.fullUrl);
-      const componentPart = node.data.component ? ` \u2192 ${code7(node.data.component)}` : "";
+      const urlPart = node.fullUrl === void 0 ? "" : code8(node.fullUrl);
+      const componentPart = node.data.component ? ` \u2192 ${code8(node.data.component)}` : "";
       lines.push(`- \`${node.data.name}\` ${urlPart}${componentPart}`);
     }
   } else {
@@ -18982,7 +20639,7 @@ function formatNotFound8(query, candidates) {
   }
   return lines.join("\n");
 }
-function code7(value) {
+function code8(value) {
   return "`" + value + "`";
 }
 async function runRouteLookup(rawArgs) {
@@ -19023,7 +20680,7 @@ var routeLookupTool = {
 };
 
 // packages/dbx-components-mcp/src/tools/route-search.tool.ts
-import { type as type36 } from "arktype";
+import { type as type41 } from "arktype";
 var DBX_ROUTE_SEARCH_TOOL = {
   name: "dbx_route_search",
   description: ["Search the UIRouter state tree of a dbx-components app. Matches against state names, full URLs, component class names, resolve keys, and source-file paths. Returns the top 10 results with state name, URL, component, and source location.", "", "Provide at least one of `sources` / `paths` / `glob` plus a `query`. `scope` narrows to a single axis (`name`, `url`, `component`, `resolve`)."].join("\n"),
@@ -19047,9 +20704,9 @@ var DBX_ROUTE_SEARCH_TOOL = {
     required: ["query"]
   }
 };
-var SearchArgsType = type36({
+var SearchArgsType = type41({
   query: "string",
-  "sources?": type36({ name: "string", text: "string" }).array(),
+  "sources?": type41({ name: "string", text: "string" }).array(),
   "paths?": "string[]",
   "glob?": "string",
   "scope?": "'name' | 'url' | 'component' | 'resolve' | 'all'",
@@ -19057,7 +20714,7 @@ var SearchArgsType = type36({
 });
 function parseArgs5(raw) {
   const parsed = SearchArgsType(raw);
-  if (parsed instanceof type36.errors) {
+  if (parsed instanceof type41.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const result = {
@@ -19150,14 +20807,14 @@ var routeSearchTool = {
 };
 
 // packages/dbx-components-mcp/src/tools/_lookup.factory.ts
-import { type as type37 } from "arktype";
-var LOOKUP_ARGS_TYPE = type37({
+import { type as type42 } from "arktype";
+var LOOKUP_ARGS_TYPE = type42({
   topic: "string",
   "depth?": "'brief' | 'full'"
 });
 function parseLookupArgs(raw) {
   const parsed = LOOKUP_ARGS_TYPE(raw);
-  if (parsed instanceof type37.errors) {
+  if (parsed instanceof type42.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const result = {
@@ -19306,11 +20963,11 @@ function formatEntry2(entry, depth) {
     const fence = entry.kind === "pattern" ? "ts" : "html";
     lines.push("## Example", "", "```" + fence, entry.example, "```");
     if (entry.relatedSlugs.length > 0) {
-      const relatedText = entry.relatedSlugs.map((s) => code8(s)).join(", ");
+      const relatedText = entry.relatedSlugs.map((s) => code9(s)).join(", ");
       lines.push("", `\u2192 Related: ${relatedText}`);
     }
     if (entry.skillRefs.length > 0) {
-      const skillsText = entry.skillRefs.map((s) => code8(s)).join(", ");
+      const skillsText = entry.skillRefs.map((s) => code9(s)).join(", ");
       lines.push("", `\u2192 Skills: ${skillsText}`);
     }
   } else {
@@ -19339,7 +20996,7 @@ function formatNotFound9(normalized, candidates) {
   }
   return lines.join("\n");
 }
-function code8(value) {
+function code9(value) {
   return "`" + value + "`";
 }
 function createLookupFilterTool(input) {
@@ -19359,7 +21016,7 @@ function createLookupFilterTool(input) {
 }
 
 // packages/dbx-components-mcp/src/tools/filter-scaffold.tool.ts
-import { type as type38 } from "arktype";
+import { type as type43 } from "arktype";
 var DBX_FILTER_SCAFFOLD_TOOL = {
   name: "dbx_filter_scaffold",
   description: [
@@ -19384,15 +21041,15 @@ var DBX_FILTER_SCAFFOLD_TOOL = {
     required: ["model_name", "filter_type"]
   }
 };
-var ScaffoldArgsType4 = type38({
+var ScaffoldArgsType5 = type43({
   model_name: "string",
   filter_type: "string",
   "preset_keys?": "string[]",
   "uses_collection_store?": "boolean"
 });
 function parseArgs6(raw) {
-  const parsed = ScaffoldArgsType4(raw);
-  if (parsed instanceof type38.errors) {
+  const parsed = ScaffoldArgsType5(raw);
+  if (parsed instanceof type43.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const modelName = parsed.model_name.trim();
@@ -19575,11 +21232,11 @@ function formatEntry3(entry, depth) {
     }
     lines.push("## Example", "", "```html", entry.example, "```");
     if (entry.relatedSlugs.length > 0) {
-      const relatedText = entry.relatedSlugs.map((s) => code9(s)).join(", ");
+      const relatedText = entry.relatedSlugs.map((s) => code10(s)).join(", ");
       lines.push("", `\u2192 Related: ${relatedText}`);
     }
     if (entry.skillRefs.length > 0) {
-      const skillsText = entry.skillRefs.map((s) => code9(s)).join(", ");
+      const skillsText = entry.skillRefs.map((s) => code10(s)).join(", ");
       lines.push("", `\u2192 Skills: ${skillsText}`);
     }
   } else {
@@ -19611,7 +21268,7 @@ function formatNotFound10(normalized, candidates) {
   }
   return lines.join("\n");
 }
-function code9(value) {
+function code10(value) {
   return "`" + value + "`";
 }
 function createLookupPipeTool(input) {
@@ -19632,8 +21289,8 @@ function createLookupPipeTool(input) {
 
 // packages/dbx-components-mcp/src/tools/artifact-scaffold.tool.ts
 import { access } from "node:fs/promises";
-import { resolve as resolve16, sep as sep4 } from "node:path";
-import { type as type39 } from "arktype";
+import { resolve as resolve21, sep as sep4 } from "node:path";
+import { type as type44 } from "arktype";
 
 // packages/dbx-components-mcp/src/tools/artifact-scaffold/templates.ts
 function splitWords(input) {
@@ -20181,7 +21838,7 @@ var DBX_ARTIFACT_SCAFFOLD_TOOL = {
     required: ["artifact", "name", "componentDir", "apiDir"]
   }
 };
-var ScaffoldArtifactArgsType = type39({
+var ScaffoldArtifactArgsType = type44({
   artifact: ARTIFACT_KIND_LITERAL_UNION,
   name: "string",
   componentDir: "string",
@@ -20194,7 +21851,7 @@ var ScaffoldArtifactArgsType = type39({
 });
 function parseArgs7(raw) {
   const parsed = ScaffoldArtifactArgsType(raw);
-  if (parsed instanceof type39.errors) {
+  if (parsed instanceof type44.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const result = {
@@ -20207,7 +21864,7 @@ function parseArgs7(raw) {
   return result;
 }
 function ensureInsideCwd(relativePath, cwd) {
-  const absolute = resolve16(cwd, relativePath);
+  const absolute = resolve21(cwd, relativePath);
   const cwdPrefix = cwd.endsWith(sep4) ? cwd : cwd + sep4;
   if (!absolute.startsWith(cwdPrefix) && absolute !== cwd) {
     throw new Error(`Path \`${relativePath}\` resolves outside the server cwd and is not allowed.`);
@@ -20247,7 +21904,7 @@ async function runArtifactScaffold(rawArgs) {
     const message = err instanceof Error ? err.message : String(err);
     return toolError(`Scaffold failed: ${message}`);
   }
-  const checked = await applyIdempotency(raw, (relativePath) => fileExists2(resolve16(cwd, relativePath)));
+  const checked = await applyIdempotency(raw, (relativePath) => fileExists2(resolve21(cwd, relativePath)));
   const text = formatResult9(checked);
   const result = {
     content: [{ type: "text", text }]
@@ -20260,7 +21917,7 @@ var artifactScaffoldTool = {
 };
 
 // packages/dbx-components-mcp/src/tools/artifact-file-convention.tool.ts
-import { type as type40 } from "arktype";
+import { type as type45 } from "arktype";
 
 // packages/dbx-components-mcp/src/tools/artifact-file-convention/spec.ts
 var FIRESTORE_MODEL = {
@@ -20696,7 +22353,7 @@ var DBX_ARTIFACT_FILE_CONVENTION_TOOL = {
     required: ["artifact"]
   }
 };
-var FileConventionArgsType = type40({
+var FileConventionArgsType = type45({
   artifact: ARTIFACT_KIND_LITERAL_UNION2,
   "componentDir?": "string",
   "apiDir?": "string",
@@ -20704,7 +22361,7 @@ var FileConventionArgsType = type40({
 });
 function parseArgs8(raw) {
   const parsed = FileConventionArgsType(raw);
-  if (parsed instanceof type40.errors) {
+  if (parsed instanceof type45.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const result = {
@@ -20737,7 +22394,7 @@ var artifactFileConventionTool = {
 };
 
 // packages/dbx-components-mcp/src/tools/lookup-semantic-type.tool.ts
-import { type as type41 } from "arktype";
+import { type as type46 } from "arktype";
 
 // packages/dbx-components-mcp/src/tools/semantic-type-lookup.formatter.ts
 function formatSemanticTypeEntry(entry, depth) {
@@ -20918,13 +22575,13 @@ var DBX_SEMANTIC_TYPE_LOOKUP_TOOL = {
     required: ["name"]
   }
 };
-var LookupSemanticTypeArgsType = type41({
+var LookupSemanticTypeArgsType = type46({
   name: "string",
   "depth?": "'brief' | 'full'"
 });
 function parseLookupArgs2(raw) {
   const parsed = LookupSemanticTypeArgsType(raw);
-  if (parsed instanceof type41.errors) {
+  if (parsed instanceof type46.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const result = {
@@ -20935,7 +22592,7 @@ function parseLookupArgs2(raw) {
 }
 function createSemanticTypeLookupTool(config) {
   const { registry } = config;
-  function run(rawArgs) {
+  function run5(rawArgs) {
     let args;
     let result;
     try {
@@ -20971,7 +22628,7 @@ function createSemanticTypeLookupTool(config) {
   }
   const tool = {
     definition: DBX_SEMANTIC_TYPE_LOOKUP_TOOL,
-    run
+    run: run5
   };
   return tool;
 }
@@ -20986,7 +22643,7 @@ function formatNotFound11(name, registry) {
 }
 
 // packages/dbx-components-mcp/src/tools/search-semantic-type.tool.ts
-import { type as type42 } from "arktype";
+import { type as type47 } from "arktype";
 var DEFAULT_LIMIT4 = 25;
 var MAX_LIMIT4 = 100;
 var DBX_SEMANTIC_TYPE_SEARCH_TOOL = {
@@ -21019,7 +22676,7 @@ var DBX_SEMANTIC_TYPE_SEARCH_TOOL = {
     }
   }
 };
-var SearchSemanticTypeArgsType = type42({
+var SearchSemanticTypeArgsType = type47({
   "topic?": "string",
   "baseType?": "string",
   "package?": "string",
@@ -21028,7 +22685,7 @@ var SearchSemanticTypeArgsType = type42({
 });
 function parseSearchArgs2(raw) {
   const parsed = SearchSemanticTypeArgsType(raw);
-  if (parsed instanceof type42.errors) {
+  if (parsed instanceof type47.errors) {
     throw new TypeError(`Invalid arguments: ${parsed.summary}`);
   }
   const rawLimit = parsed.limit ?? DEFAULT_LIMIT4;
@@ -21054,7 +22711,7 @@ function nonEmpty(value) {
 }
 function createSemanticTypeSearchTool(config) {
   const { registry } = config;
-  function run(rawArgs) {
+  function run5(rawArgs) {
     let args;
     let result;
     try {
@@ -21079,7 +22736,7 @@ function createSemanticTypeSearchTool(config) {
   }
   const tool = {
     definition: DBX_SEMANTIC_TYPE_SEARCH_TOOL,
-    run
+    run: run5
   };
   return tool;
 }
@@ -21153,6 +22810,10 @@ var DBX_TOOLS = [
   modelValidateApiTool,
   modelValidateFolderTool,
   modelStoreScaffoldTool,
+  modelFixtureListAppTool,
+  modelFixtureLookupTool,
+  modelFixtureScaffoldTool,
+  modelFixtureForwardTool,
   // storagefile_m (model extension)
   storageFileMValidateAppTool,
   storageFileMListAppTool,
@@ -21179,6 +22840,7 @@ var DBX_TOOLS = [
 function registerTools(server, options = {}) {
   const underlyingServer = server.server;
   const tools = [...DBX_TOOLS];
+  tools.push(createModelFixtureValidateAppTool({ getRegistry: () => options.fixtureModelRegistry }));
   if (options.forgeFieldRegistry !== void 0) {
     tools.push(createLookupFormTool({ registry: options.forgeFieldRegistry }), createSearchFormTool({ registry: options.forgeFieldRegistry }), createFormScaffoldTool({ registry: options.forgeFieldRegistry }));
   }
@@ -21228,6 +22890,7 @@ Tool clusters (each exposes lookup, search, examples, and/or scaffold/validate):
 
 Model-extension validators (walk a downstream app to verify wiring):
 - storagefile_m, notification_m, system_m \u2014 *_validate_app, *_list_app, *_validate_folder
+- model_fixture \u2014 list/lookup/validate/scaffold/forward an app's \`src/test/fixture.ts\` (TestContextFixture/Instance triplets)
 
 Resource URIs are namespaced by domain:
 - dbx://form/fields[/{slug}|/produces/{produces}|/tier/{tier}|/array-output/{arrayOutput}]
@@ -21350,8 +23013,11 @@ async function createServer(options = {}) {
       filterRegistry = void 0;
     }
   }
+  const fixtureModelRegistry = {
+    entries: FIREBASE_MODELS.map((m) => ({ name: m.name, modelType: m.modelType, collectionPrefix: m.collectionPrefix }))
+  };
   registerResources(server, { semanticTypeRegistry: registry, forgeFieldRegistry: forgeRegistry, pipeRegistry, uiComponentRegistry: uiRegistry, actionRegistry, filterRegistry });
-  registerTools(server, { semanticTypeRegistry: registry, forgeFieldRegistry: forgeRegistry, pipeRegistry, uiComponentRegistry: uiRegistry, actionRegistry, filterRegistry });
+  registerTools(server, { semanticTypeRegistry: registry, forgeFieldRegistry: forgeRegistry, pipeRegistry, uiComponentRegistry: uiRegistry, actionRegistry, filterRegistry, fixtureModelRegistry });
   return server;
 }
 async function runStdioServer() {