@dereekb/dbx-components-mcp 13.15.0 → 13.16.0

package/dbx-components-mcp.js

@@ -10,7 +10,7 @@ var __export = (target, all) => {
 // packages/dbx-components-mcp/package.json
 var package_default = {
   name: "@dereekb/dbx-components-mcp",
-  version: "13.15.0",
+  version: "13.16.0",
   type: "module",
   bin: {
     "dbx-components-mcp": "dbx-components-mcp.js"
@@ -21,8 +21,8 @@ var package_default = {
     "ts-morph": "^21.0.0"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "13.15.0",
-    "@dereekb/util": "13.15.0"
+    "@dereekb/dbx-cli": "13.16.0",
+    "@dereekb/util": "13.16.0"
   }
 };
 
@@ -3515,14 +3515,25 @@ function buildModelEntry(args) {
     sourcePackage: input.sourcePackage,
     sourceFile: input.sourceFile,
     fields,
-    enums: relevantEnums.map((e) => ({
-      name: e.name,
-      values: e.values.map((v) => v.description ? { name: v.name, value: v.value, description: v.description } : { name: v.name, value: v.value }),
-      ...e.description ? { description: e.description } : {}
-    })),
+    enums: relevantEnums.map((e) => buildModelEnumEntry(e)),
     detectionHints,
     ...groupName ? { modelGroup: groupName } : {},
     ...collectionKind ? { collectionKind } : {},
+    ...buildModelMarkerFlags(markers),
+    ...buildModelArchetypeFields(archetypeInfo),
+    ...compositeKey2 ? { compositeKey: compositeKey2 } : {},
+    ...iface.tags.dbxModelRead ? { read: iface.tags.dbxModelRead } : {}
+  };
+}
+function buildModelEnumEntry(e) {
+  return {
+    name: e.name,
+    values: e.values.map((v) => v.description ? { name: v.name, value: v.value, description: v.description } : { name: v.name, value: v.value }),
+    ...e.description ? { description: e.description } : {}
+  };
+}
+function buildModelMarkerFlags(markers) {
+  return {
     ...markers.userKeyedById ? { userKeyedById: true } : {},
     ...markers.hasUserUidField ? { hasUserUidField: true } : {},
     ...markers.regionKeyedById ? { regionKeyedById: true } : {},
@@ -3530,11 +3541,13 @@ function buildModelEntry(args) {
     ...markers.externalIdKeyedById ? { externalIdKeyedById: true } : {},
     ...markers.bucketKeyedById ? { bucketKeyedById: true } : {},
     ...markers.organizationalGroupRoot ? { organizationalGroupRoot: true } : {},
-    ...markers.aggregatesFromNonEmpty ? { aggregatesFrom: markers.aggregatesFrom } : {},
+    ...markers.aggregatesFromNonEmpty ? { aggregatesFrom: markers.aggregatesFrom } : {}
+  };
+}
+function buildModelArchetypeFields(archetypeInfo) {
+  return {
     ...archetypeInfo.archetypes.length > 0 ? { archetypes: archetypeInfo.archetypes } : {},
-    ...archetypeInfo.archetypeAxesBySlug ? { archetypeAxesBySlug: archetypeInfo.archetypeAxesBySlug } : {},
-    ...compositeKey2 ? { compositeKey: compositeKey2 } : {},
-    ...iface.tags.dbxModelRead ? { read: iface.tags.dbxModelRead } : {}
+    ...archetypeInfo.archetypeAxesBySlug ? { archetypeAxesBySlug: archetypeInfo.archetypeAxesBySlug } : {}
   };
 }
 function filterRelevantEnums(fields, enums) {
@@ -4070,20 +4083,22 @@ function parseCompositeKeyTagValue(value) {
     const key = token.slice(0, eq).trim();
     const v = token.slice(eq + 1).trim();
     if (key === "from") {
-      if (v === "*") {
-        fromValue = "*";
-      } else if (v.length > 0) {
-        const parts = v.split(",").map((p) => p.trim()).filter((p) => p.length > 0);
-        if (parts.includes("*")) {
-          fromValue = parts;
-        } else {
-          fromValue = parts.filter((p) => COMPOSITE_KEY_MODEL_NAME_RE.test(p));
-        }
-      }
+      const parsedFrom = parseCompositeKeyFromValue(v);
+      if (parsedFrom !== void 0) fromValue = parsedFrom;
     } else if (key === "encoding" && (v === "two-way" || v === "one-way")) encoding = v;
   }
   return { from: fromValue, encoding };
 }
+function parseCompositeKeyFromValue(v) {
+  let result;
+  if (v === "*") {
+    result = "*";
+  } else if (v.length > 0) {
+    const parts = v.split(",").map((p) => p.trim()).filter((p) => p.length > 0);
+    result = parts.includes("*") ? parts : parts.filter((p) => COMPOSITE_KEY_MODEL_NAME_RE.test(p));
+  }
+  return result;
+}
 function takeFirstTagText(current, tag) {
   if (current !== void 0) return current;
   const text = tag.getCommentText()?.trim();
@@ -7458,9 +7473,7 @@ var EMPTY_ROLE_CONST_RESOLUTION = { roles: [], unresolved: [] };
 function resolveRoleConstByName(name, ctx) {
   let result;
   const scalar = ctx.knownRoles.get(name);
-  if (scalar !== void 0) {
-    result = { roles: [scalar], unresolved: [] };
-  } else {
+  if (scalar === void 0) {
     const arrayExpr = ctx.localArrayRoles.get(name);
     if (arrayExpr === void 0) {
       result = { roles: [], unresolved: [name] };
@@ -7471,6 +7484,8 @@ function resolveRoleConstByName(name, ctx) {
       nextSeen.add(name);
       result = resolveRoleArrayLiteral(arrayExpr, { ...ctx, seen: nextSeen });
     }
+  } else {
+    result = { roles: [scalar], unresolved: [] };
   }
   return result;
 }
@@ -11561,30 +11576,37 @@ async function scanFactoryReferences(input) {
     const filePaths = await globber({ projectRoot, include, exclude: [...exclude] });
     const combinedPattern = buildCombinedRegex(Array.from(namesBySlug.values()));
     if (combinedPattern !== void 0) {
-      const sitesBySlug = /* @__PURE__ */ new Map();
-      for (const entry of entries) {
-        sitesBySlug.set(entry.slug, []);
-      }
-      for (const relPath of filePaths) {
-        const absolutePath = resolvePath2(projectRoot, relPath);
-        if (declFilePaths.has(absolutePath)) {
-          continue;
-        }
-        await scanOneFile({ absolutePath, projectRoot, readFile: readFile30, combinedPattern, namesBySlug, sitesBySlug });
-      }
+      const sitesBySlug = await collectReferenceSites({ entries, filePaths, projectRoot, declFilePaths, readFile: readFile30, combinedPattern, namesBySlug });
       for (const [slug, sites] of sitesBySlug) {
-        let specCount = 0;
-        for (const site of sites) {
-          if (site.isSpec) {
-            specCount += 1;
-          }
-        }
-        result.set(slug, { count: sites.length, productionCount: sites.length - specCount, specCount, referencedBy: sites });
+        result.set(slug, tallyReferenceSites(sites));
       }
     }
   }
   return result;
 }
+async function collectReferenceSites(input) {
+  const { entries, filePaths, projectRoot, declFilePaths, readFile: readFile30, combinedPattern, namesBySlug } = input;
+  const sitesBySlug = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    sitesBySlug.set(entry.slug, []);
+  }
+  for (const relPath of filePaths) {
+    const absolutePath = resolvePath2(projectRoot, relPath);
+    if (!declFilePaths.has(absolutePath)) {
+      await scanOneFile({ absolutePath, projectRoot, readFile: readFile30, combinedPattern, namesBySlug, sitesBySlug });
+    }
+  }
+  return sitesBySlug;
+}
+function tallyReferenceSites(sites) {
+  let specCount = 0;
+  for (const site of sites) {
+    if (site.isSpec) {
+      specCount += 1;
+    }
+  }
+  return { count: sites.length, productionCount: sites.length - specCount, specCount, referencedBy: sites };
+}
 function isSpecSubpath(subpath) {
   return subpath.endsWith(".spec.ts") || subpath.endsWith(".spec.tsx");
 }
@@ -11645,7 +11667,7 @@ function buildCombinedRegex(names) {
   return result;
 }
 function escapeRegex(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
+  return value.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
 }
 function computeLineOffsets(contents) {
   const offsets = [0];
@@ -14257,19 +14279,20 @@ function collectExternalCssUtilitySources(configResult) {
     const baseDir = dirname4(configResult.configPath);
     const cluster = configResult.config.cssUtilities;
     for (const source of cluster?.sources ?? []) {
-      const absolute = isAbsolute4(source) ? source : resolve21(baseDir, source);
-      externalSources.push({ origin: "external", path: absolute });
+      externalSources.push({ origin: "external", path: toAbsolutePath(baseDir, source) });
     }
     for (const scan of cluster?.scan ?? []) {
       const out = scan.out;
       if (typeof out === "string" && out.length > 0) {
-        const absolute = isAbsolute4(out) ? out : resolve21(baseDir, out);
-        externalSources.push({ origin: "external", path: absolute });
+        externalSources.push({ origin: "external", path: toAbsolutePath(baseDir, out) });
       }
     }
   }
   return externalSources;
 }
+function toAbsolutePath(baseDir, value) {
+  return isAbsolute4(value) ? value : resolve21(baseDir, value);
+}
 
 // packages/dbx-cli/src/lib/mcp-scan/manifest/load-dbx-docs-ui-examples-registry.ts
 import { existsSync as existsSync4 } from "node:fs";
@@ -14929,38 +14952,51 @@ function parseArgv(argv) {
   return { component, output, check, json, help, error };
 }
 async function readExistingIndexes(input) {
+  const text = await readExistingIndexesText(input);
+  let result;
+  if (text !== void 0) {
+    result = parseExistingIndexesJson(text, input.outputAbs, input.stderr);
+  }
+  return result;
+}
+async function readExistingIndexesText(input) {
   const { outputAbs, readFile: readFile30, stderr } = input;
-  let text = null;
-  let readFailed = false;
+  let text;
   try {
     text = await readFile30(outputAbs);
   } catch (err) {
-    readFailed = true;
     const code17 = err.code;
     if (code17 !== "ENOENT") {
       stderr(`generate-firestore-indexes: could not read existing ${outputAbs}: ${err instanceof Error ? err.message : String(err)}`);
     }
+    text = void 0;
   }
+  return text;
+}
+function parseExistingIndexesJson(text, outputAbs, stderr) {
   let result;
-  if (!readFailed && text !== null) {
-    let parsed;
-    let parseFailed = false;
-    try {
-      parsed = JSON.parse(text);
-    } catch (err) {
-      parseFailed = true;
-      stderr(`generate-firestore-indexes: existing ${outputAbs} is not valid JSON: ${err instanceof Error ? err.message : String(err)}`);
-    }
-    if (!parseFailed) {
-      if (parsed === null || typeof parsed !== "object") {
-        stderr(`generate-firestore-indexes: existing ${outputAbs} top-level value is not an object`);
-      } else {
-        const raw = parsed;
-        const indexes = Array.isArray(raw.indexes) ? raw.indexes : [];
-        const fieldOverrides = Array.isArray(raw.fieldOverrides) ? raw.fieldOverrides : [];
-        result = { indexes, fieldOverrides };
-      }
-    }
+  let parsed;
+  let parseFailed = false;
+  try {
+    parsed = JSON.parse(text);
+  } catch (err) {
+    parseFailed = true;
+    stderr(`generate-firestore-indexes: existing ${outputAbs} is not valid JSON: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  if (!parseFailed) {
+    result = coerceFirestoreIndexesJson(parsed, outputAbs, stderr);
+  }
+  return result;
+}
+function coerceFirestoreIndexesJson(parsed, outputAbs, stderr) {
+  let result;
+  if (parsed === null || typeof parsed !== "object") {
+    stderr(`generate-firestore-indexes: existing ${outputAbs} top-level value is not an object`);
+  } else {
+    const raw = parsed;
+    const indexes = Array.isArray(raw.indexes) ? raw.indexes : [];
+    const fieldOverrides = Array.isArray(raw.fieldOverrides) ? raw.fieldOverrides : [];
+    result = { indexes, fieldOverrides };
   }
   return result;
 }
@@ -15326,19 +15362,20 @@ function collectExternalTokenSources(configResult) {
     const baseDir = dirname11(configResult.configPath);
     const tokensCluster = configResult.config.tokens;
     for (const source of tokensCluster?.sources ?? []) {
-      const absolute = isAbsolute11(source) ? source : resolve29(baseDir, source);
-      externalSources.push({ origin: "external", path: absolute });
+      externalSources.push({ origin: "external", path: toAbsolutePath2(baseDir, source) });
     }
     for (const scan of tokensCluster?.scan ?? []) {
       const out = scan.out;
       if (typeof out === "string" && out.length > 0) {
-        const absolute = isAbsolute11(out) ? out : resolve29(baseDir, out);
-        externalSources.push({ origin: "external", path: absolute });
+        externalSources.push({ origin: "external", path: toAbsolutePath2(baseDir, out) });
       }
     }
   }
   return externalSources;
 }
+function toAbsolutePath2(baseDir, value) {
+  return isAbsolute11(value) ? value : resolve29(baseDir, value);
+}
 
 // packages/dbx-cli/src/lib/mcp-scan/manifest/load-ui-components-registry.ts
 import { existsSync as existsSync11 } from "node:fs";
@@ -24326,14 +24363,14 @@ function parseCompositeKeyTag(tag) {
     const key = token.slice(0, eq).trim();
     const v = token.slice(eq + 1).trim();
     if (key === "from") {
-      fromValue = parseCompositeKeyFromValue(v);
+      fromValue = parseCompositeKeyFromValue2(v);
     } else if (key === "encoding" && (v === "two-way" || v === "one-way")) {
       encoding = v;
     }
   }
   return { from: fromValue, encoding, line: tag.getStartLineNumber() };
 }
-function parseCompositeKeyFromValue(v) {
+function parseCompositeKeyFromValue2(v) {
   if (v === "*") return "*";
   if (v.length === 0) return [];
   const parts = v.split(",").map((p) => p.trim()).filter((p) => p.length > 0);
@@ -26928,8 +26965,8 @@ __export(model_api_validate_app_exports, {
 });
 
 // packages/dbx-cli/validate/src/lib/model-api-validate-app/extract-declarations.ts
-import { readdir as readdir4, readFile as readFile7, stat as stat7 } from "node:fs/promises";
-import { join as join7, relative as relative8, sep as sep6 } from "node:path";
+import { readFile as readFile7 } from "node:fs/promises";
+import { relative as relative8, sep as sep6 } from "node:path";
 
 // packages/dbx-cli/manifest-extract/src/lib/extract-crud.ts
 import { Node as Node22, Project as Project6 } from "ts-morph";
@@ -27056,29 +27093,20 @@ function findFunctionsClassName(sourceFile) {
   return result;
 }
 function inferGroupName2(sourceFile) {
+  return findTypeAliasStem(sourceFile, "ModelCrudFunctionsConfig") ?? findTypeAliasStem(sourceFile, "FunctionTypeMap");
+}
+function findTypeAliasStem(sourceFile, ending) {
   let result;
   for (const alias of sourceFile.getTypeAliases()) {
     const name = alias.getName();
-    if (name.endsWith("ModelCrudFunctionsConfig")) {
-      const stem = name.slice(0, -"ModelCrudFunctionsConfig".length);
+    if (name.endsWith(ending)) {
+      const stem = name.slice(0, -ending.length);
       if (stem.length > 0) {
         result = stem;
         break;
       }
     }
   }
-  if (result === void 0) {
-    for (const alias of sourceFile.getTypeAliases()) {
-      const name = alias.getName();
-      if (name.endsWith("FunctionTypeMap")) {
-        const stem = name.slice(0, -"FunctionTypeMap".length);
-        if (stem.length > 0) {
-          result = stem;
-          break;
-        }
-      }
-    }
-  }
   return result;
 }
 function isNullLiteralType2(node) {
@@ -27174,44 +27202,44 @@ function typeNodeName(node) {
   return result;
 }
 function readTypeDocs(sourceFile, typeName) {
-  let result;
   const interfaceDecl = sourceFile.getInterface(typeName);
+  let result;
   if (interfaceDecl) {
-    const typeDescription = readJsDocSummary(interfaceDecl);
-    const hasApiParamsTag = hasJsDocFlag(interfaceDecl, "dbxModelApiParams");
-    const fields = [];
-    for (const property of interfaceDecl.getProperties()) {
-      const fieldName = property.getName();
-      const description = readJsDocSummary(property);
-      const typeNode = property.getTypeNode();
-      const typeText = typeNode?.getText().trim() ?? "";
-      const adminOnly = hasJsDocFlag(property, "dbxModelApiAdminOnly");
-      const field = {
-        name: fieldName,
-        typeText,
-        ...description ? { description } : {},
-        ...adminOnly ? { accessLevel: "adminOnly" } : {}
-      };
-      fields.push(field);
-    }
-    if (typeDescription || fields.length > 0 || hasApiParamsTag) {
-      result = {
-        ...typeDescription ? { typeDescription } : {},
-        ...fields.length > 0 ? { fields } : {},
-        hasApiParamsTag
-      };
-    }
+    result = readInterfaceTypeDocs(interfaceDecl);
   } else {
     const typeAlias = sourceFile.getTypeAlias(typeName);
-    if (typeAlias) {
-      const typeDescription = readJsDocSummary(typeAlias);
-      if (typeDescription) {
-        result = { typeDescription };
-      }
-    }
+    result = typeAlias ? readTypeAliasDocs(typeAlias) : void 0;
   }
   return result;
 }
+function readInterfaceTypeDocs(interfaceDecl) {
+  const typeDescription = readJsDocSummary(interfaceDecl);
+  const hasApiParamsTag = hasJsDocFlag(interfaceDecl, "dbxModelApiParams");
+  const fields = interfaceDecl.getProperties().map((property) => readInterfaceField(property));
+  let result;
+  if (typeDescription || fields.length > 0 || hasApiParamsTag) {
+    result = {
+      ...typeDescription ? { typeDescription } : {},
+      ...fields.length > 0 ? { fields } : {},
+      hasApiParamsTag
+    };
+  }
+  return result;
+}
+function readInterfaceField(property) {
+  const description = readJsDocSummary(property);
+  const adminOnly = hasJsDocFlag(property, "dbxModelApiAdminOnly");
+  return {
+    name: property.getName(),
+    typeText: property.getTypeNode()?.getText().trim() ?? "",
+    ...description ? { description } : {},
+    ...adminOnly ? { accessLevel: "adminOnly" } : {}
+  };
+}
+function readTypeAliasDocs(typeAlias) {
+  const typeDescription = readJsDocSummary(typeAlias);
+  return typeDescription ? { typeDescription } : void 0;
+}
 function hasJsDocFlag(node, tagName) {
   let result = false;
   for (const doc of node.getJsDocs()) {
@@ -27240,8 +27268,8 @@ function readJsDocTagValue(node, tagName) {
 function readJsDocSummary(node) {
   let result;
   const docs = node.getJsDocs();
-  if (docs.length > 0) {
-    const last = docs[docs.length - 1];
+  const last = docs.at(-1);
+  if (last) {
     const description = last.getDescription().trim();
     if (description.length > 0) {
       result = description;
@@ -27250,6 +27278,59 @@ function readJsDocSummary(node) {
   return result;
 }
 
+// packages/dbx-cli/validate/src/lib/_core/collect-files.ts
+import { readdir as readdir4, stat as stat7 } from "node:fs/promises";
+import { join as join7 } from "node:path";
+var SPEC_SUFFIX2 = ".spec.ts";
+async function collectFilesWithSuffix(rootAbs, suffix) {
+  const out = [];
+  if (await isDirectoryPath(rootAbs)) {
+    const stack = [rootAbs];
+    while (stack.length > 0) {
+      const current = stack.pop();
+      const entries = await readDirEntriesSafe(current);
+      const partition = partitionDirEntries({ entries, current, suffix });
+      stack.push(...partition.dirs);
+      out.push(...partition.files);
+    }
+    out.sort((a, b) => a.localeCompare(b));
+  }
+  return out;
+}
+function partitionDirEntries(input) {
+  const { entries, current, suffix } = input;
+  const dirs = [];
+  const files = [];
+  for (const entry of entries) {
+    const full = join7(current, entry.name);
+    if (entry.isDirectory()) {
+      dirs.push(full);
+    } else if (entry.isFile() && entry.name.endsWith(suffix) && !entry.name.endsWith(SPEC_SUFFIX2)) {
+      files.push(full);
+    }
+  }
+  return { dirs, files };
+}
+async function isDirectoryPath(path) {
+  let result = false;
+  try {
+    const stats = await stat7(path);
+    result = stats.isDirectory();
+  } catch {
+    result = false;
+  }
+  return result;
+}
+async function readDirEntriesSafe(path) {
+  let result;
+  try {
+    result = await readdir4(path, { withFileTypes: true });
+  } catch {
+    result = [];
+  }
+  return result;
+}
+
 // packages/dbx-cli/validate/src/lib/model-api-validate-app/extract-declarations.ts
 var API_SUFFIX = ".api.ts";
 async function extractDeclaredEntriesFromFile(fileAbs, root) {
@@ -27276,7 +27357,7 @@ async function extractDeclaredEntries(roots) {
   const seen = /* @__PURE__ */ new Set();
   const out = [];
   for (const root of roots) {
-    const files = await collectApiFiles(root.absDir);
+    const files = await collectFilesWithSuffix(root.absDir, API_SUFFIX);
     for (const fileAbs of files) {
       if (seen.has(fileAbs)) continue;
       seen.add(fileAbs);
@@ -27286,45 +27367,6 @@ async function extractDeclaredEntries(roots) {
   }
   return out;
 }
-async function readDirSafe(path) {
-  let result;
-  try {
-    result = await readdir4(path, { withFileTypes: true });
-  } catch {
-    result = [];
-  }
-  return result;
-}
-async function collectApiFiles(rootAbs) {
-  const files = [];
-  const stack = [];
-  let isDir = false;
-  try {
-    const stats = await stat7(rootAbs);
-    isDir = stats.isDirectory();
-  } catch {
-    isDir = false;
-  }
-  if (isDir) {
-    stack.push(rootAbs);
-    while (stack.length > 0) {
-      const current = stack.pop();
-      const entries = await readDirSafe(current);
-      for (const entry of entries) {
-        const full = join7(current, entry.name);
-        if (entry.isDirectory()) {
-          stack.push(full);
-          continue;
-        }
-        if (entry.isFile() && entry.name.endsWith(API_SUFFIX) && !entry.name.endsWith(".spec.ts")) {
-          files.push(full);
-        }
-      }
-    }
-    files.sort((a, b) => a.localeCompare(b));
-  }
-  return files;
-}
 
 // packages/dbx-cli/validate/src/lib/model-api-validate-app/extract-handlers.ts
 import { readFile as readFile8 } from "node:fs/promises";
@@ -27354,23 +27396,27 @@ async function extractHandlerEntries(apiAbs, apiDir) {
   } else {
     const project = new Project7({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
     const sourceFile = project.createSourceFile(sourceFileRel, text, { overwrite: true });
-    const entries = [];
-    const verbsFound = [];
-    for (const stmt of sourceFile.getVariableStatements()) {
-      for (const decl of stmt.getDeclarations()) {
-        const name = decl.getName();
-        const verb = matchVerbFromConstName(name);
-        if (!verb) continue;
-        const initializer = decl.getInitializer();
-        if (!initializer || !Node23.isObjectLiteralExpression(initializer)) continue;
-        verbsFound.push(verb);
-        collectVerbMap({ verb, mapLiteral: initializer, sourceFileRel, entries });
-      }
-    }
+    const { entries, verbsFound } = collectHandlerMap(sourceFile, sourceFileRel);
     result = { path: fullPath, status: { kind: "ok", verbsFound }, entries };
   }
   return result;
 }
+function collectHandlerMap(sourceFile, sourceFileRel) {
+  const entries = [];
+  const verbsFound = [];
+  for (const stmt of sourceFile.getVariableStatements()) {
+    for (const decl of stmt.getDeclarations()) {
+      const name = decl.getName();
+      const verb = matchVerbFromConstName(name);
+      if (!verb) continue;
+      const initializer = decl.getInitializer();
+      if (!initializer || !Node23.isObjectLiteralExpression(initializer)) continue;
+      verbsFound.push(verb);
+      collectVerbMap({ verb, mapLiteral: initializer, sourceFileRel, entries });
+    }
+  }
+  return { entries, verbsFound };
+}
 function matchVerbFromConstName(name) {
   for (const { token, verb } of VERB_TOKENS) {
     if (name.endsWith(`${token}ModelMap`) || name.endsWith(`_${token.toUpperCase()}_MODEL_MAP`)) {
@@ -27551,6 +27597,7 @@ var TSCONFIG_BASE = "tsconfig.base.json";
 var COMPONENT_PACKAGE_JSON = "package.json";
 var SRC_LIB_SUBPATH = "src/lib";
 var DBX_COMPONENTS_BASE_SCOPE = "@dereekb/";
+var DEPENDENCY_FIELDS = ["dependencies", "devDependencies", "peerDependencies"];
 async function resolveApiSourceRoots(input) {
   const workspaceRoot = input.workspaceRoot ?? await findWorkspaceRoot(input.componentAbs);
   const componentLib = join9(input.componentAbs, SRC_LIB_SUBPATH);
@@ -27603,49 +27650,42 @@ async function resolveUpstreamRoots(input) {
   return out;
 }
 async function readComponentDereekbDeps(componentAbs) {
-  const pkgPath = join9(componentAbs, COMPONENT_PACKAGE_JSON);
-  let raw;
-  try {
-    raw = await readFile9(pkgPath, "utf8");
-  } catch {
-    raw = void 0;
-  }
-  let json;
-  if (raw !== void 0) {
-    try {
-      json = JSON.parse(raw);
-    } catch {
-      json = void 0;
-    }
-  }
+  const json = await readJsonFileSafe(join9(componentAbs, COMPONENT_PACKAGE_JSON));
   const out = /* @__PURE__ */ new Set();
   if (isRecord(json)) {
-    for (const field of ["dependencies", "devDependencies", "peerDependencies"]) {
-      const map = json[field];
-      if (!isRecord(map)) continue;
-      for (const name of Object.keys(map)) {
-        if (name.startsWith(DBX_COMPONENTS_BASE_SCOPE)) out.add(name);
-      }
+    for (const field of DEPENDENCY_FIELDS) {
+      addScopedDependencyNames(json[field], out);
     }
   }
   return [...out];
 }
-async function readTsconfigPaths(workspaceRoot) {
-  const tsconfigPath = join9(workspaceRoot, TSCONFIG_BASE);
+function addScopedDependencyNames(field, out) {
+  if (isRecord(field)) {
+    for (const name of Object.keys(field)) {
+      if (name.startsWith(DBX_COMPONENTS_BASE_SCOPE)) out.add(name);
+    }
+  }
+}
+async function readJsonFileSafe(path, preprocess) {
   let raw;
   try {
-    raw = await readFile9(tsconfigPath, "utf8");
+    raw = await readFile9(path, "utf8");
   } catch {
     raw = void 0;
   }
   let json;
   if (raw !== void 0) {
     try {
-      json = JSON.parse(stripJsonComments(raw));
+      json = JSON.parse(preprocess ? preprocess(raw) : raw);
     } catch {
       json = void 0;
     }
   }
+  return json;
+}
+async function readTsconfigPaths(workspaceRoot) {
+  const tsconfigPath = join9(workspaceRoot, TSCONFIG_BASE);
+  const json = await readJsonFileSafe(tsconfigPath, stripJsonComments);
   let result;
   if (isRecord(json) && isRecord(json.compilerOptions) && isRecord(json.compilerOptions.paths)) {
     const entries = /* @__PURE__ */ new Map();
@@ -31937,7 +31977,7 @@ async function discoverSpecFilesByGroup(config) {
   let totalSpecFiles = 0;
   let totalDriftFiles = 0;
   if (exists) {
-    const entries = await readDirSafe2(functionDirAbs);
+    const entries = await readDirSafe(functionDirAbs);
     const groupFolders = entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort();
     for (const folderName of groupFolders) {
       const groupAbs = join13(functionDirAbs, folderName);
@@ -31965,7 +32005,7 @@ async function collectSpecFiles(config) {
   const stack = [{ dirAbs: folderAbs, relativeDirName: parentFolderName }];
   while (stack.length > 0) {
     const current = stack.pop();
-    const entries = await readDirSafe2(current.dirAbs);
+    const entries = await readDirSafe(current.dirAbs);
     for (const entry of entries) {
       const fullAbs = join13(current.dirAbs, entry.name);
       if (entry.isDirectory()) {
@@ -31982,7 +32022,7 @@ async function collectSpecFiles(config) {
   collected.sort((a, b) => a.fileRel.localeCompare(b.fileRel));
   return collected;
 }
-async function readDirSafe2(path) {
+async function readDirSafe(path) {
   let result;
   try {
     result = await readdir8(path, { withFileTypes: true });
@@ -33045,7 +33085,7 @@ function resolveGroup(config) {
   const existing = new Set(catalog.groups.map((group) => group.group.toLowerCase()));
   const candidates = [model, ...parentModels].map((name) => name.toLowerCase());
   const matched = candidates.find((candidate) => existing.has(candidate));
-  return matched ?? candidates[candidates.length - 1] ?? model.toLowerCase();
+  return matched ?? candidates.at(-1) ?? model.toLowerCase();
 }
 function bucketForKind(kind) {
   let result = "other";
@@ -33532,8 +33572,7 @@ function formatHotspotsAsJson(result) {
 }
 function formatHotspotsAsMarkdown(result) {
   const lines = [];
-  lines.push(`# Model-test hotspots \u2014 \`${result.model}\` (${result.apiRel})`, "");
-  lines.push(fixtureLine(result));
+  lines.push(`# Model-test hotspots \u2014 \`${result.model}\` (${result.apiRel})`, "", fixtureLine(result));
   if (result.hotspots.length > 0) {
     appendHotspotSections(lines, result);
   } else {
@@ -34313,13 +34352,13 @@ __export(model_api_list_app_exports, {
 });
 
 // packages/dbx-cli/validate/src/lib/model-api-list-app/extract.ts
-import { readdir as readdir10, readFile as readFile17, stat as stat14 } from "node:fs/promises";
+import { readFile as readFile17 } from "node:fs/promises";
 import { join as join17, relative as relative14, sep as sep12 } from "node:path";
 var API_SUFFIX2 = ".api.ts";
 var MODEL_SUBPATH3 = "src/lib";
 async function extractApiList(input) {
   const modelRoot = join17(input.componentAbs, MODEL_SUBPATH3);
-  const apiFiles = await collectApiFiles2(modelRoot);
+  const apiFiles = await collectFilesWithSuffix(modelRoot, API_SUFFIX2);
   const entries = [];
   const files = [];
   for (const filePath of apiFiles) {
@@ -34350,45 +34389,6 @@ async function extractApiList(input) {
   }
   return { modelRoot, entries, files };
 }
-async function readDirSafe3(path) {
-  let result;
-  try {
-    result = await readdir10(path, { withFileTypes: true });
-  } catch {
-    result = [];
-  }
-  return result;
-}
-async function collectApiFiles2(root) {
-  const out = [];
-  const stack = [];
-  let isDir = false;
-  try {
-    const stats = await stat14(root);
-    isDir = stats.isDirectory();
-  } catch {
-    isDir = false;
-  }
-  if (isDir) {
-    stack.push(root);
-    while (stack.length > 0) {
-      const current = stack.pop();
-      const entries = await readDirSafe3(current);
-      for (const entry of entries) {
-        const full = join17(current, entry.name);
-        if (entry.isDirectory()) {
-          stack.push(full);
-          continue;
-        }
-        if (entry.isFile() && entry.name.endsWith(API_SUFFIX2) && !entry.name.endsWith(".spec.ts")) {
-          out.push(full);
-        }
-      }
-    }
-    out.sort((a, b) => a.localeCompare(b));
-  }
-  return out;
-}
 function countVerbs(entries) {
   const counts = { create: 0, read: 0, update: 0, delete: 0, query: 0, invoke: 0, standalone: 0 };
   for (const entry of entries) {
@@ -34497,18 +34497,18 @@ __export(model_api_lookup_exports, {
 });
 
 // packages/dbx-cli/validate/src/lib/model-api-lookup/extract.ts
-import { readdir as readdir12, readFile as readFile19, stat as stat16 } from "node:fs/promises";
+import { readFile as readFile19 } from "node:fs/promises";
 import { join as join19, relative as relative16, sep as sep14 } from "node:path";
 
 // packages/dbx-cli/validate/src/lib/model-api-lookup/extract-actions.ts
-import { readdir as readdir11, readFile as readFile18, stat as stat15 } from "node:fs/promises";
+import { readFile as readFile18 } from "node:fs/promises";
 import { join as join18, relative as relative15, sep as sep13 } from "node:path";
 import { Project as Project14, SyntaxKind as SyntaxKind14 } from "ts-morph";
 var ACTION_SERVER_SUFFIX = ".action.server.ts";
 var COMMON_MODEL_SUBPATH = "src/app/common/model";
 async function buildActionLookup(apiAbs) {
   const modelRoot = join18(apiAbs, COMMON_MODEL_SUBPATH);
-  const files = await collectActionFiles(modelRoot);
+  const files = await collectFilesWithSuffix(modelRoot, ACTION_SERVER_SUFFIX);
   const methodsByParams = /* @__PURE__ */ new Map();
   const factoriesByParams = /* @__PURE__ */ new Map();
   if (files.length === 0) {
@@ -34524,45 +34524,6 @@ async function buildActionLookup(apiAbs) {
   }
   return { methodsByParams, factoriesByParams, filesScanned: files.length };
 }
-async function readDirSafe4(path) {
-  let result;
-  try {
-    result = await readdir11(path, { withFileTypes: true });
-  } catch {
-    result = [];
-  }
-  return result;
-}
-async function collectActionFiles(root) {
-  const out = [];
-  const stack = [];
-  let isDir = false;
-  try {
-    const stats = await stat15(root);
-    isDir = stats.isDirectory();
-  } catch {
-    isDir = false;
-  }
-  if (isDir) {
-    stack.push(root);
-    while (stack.length > 0) {
-      const current = stack.pop();
-      const entries = await readDirSafe4(current);
-      for (const entry of entries) {
-        const full = join18(current, entry.name);
-        if (entry.isDirectory()) {
-          stack.push(full);
-          continue;
-        }
-        if (entry.isFile() && entry.name.endsWith(ACTION_SERVER_SUFFIX) && !entry.name.endsWith(".spec.ts")) {
-          out.push(full);
-        }
-      }
-    }
-    out.sort((a, b) => a.localeCompare(b));
-  }
-  return out;
-}
 function collectAbstractMethods(input) {
   const { sourceFile, sourceFileRel, methodsByParams } = input;
   for (const cls of sourceFile.getClasses()) {
@@ -34640,10 +34601,10 @@ function stripParamsTypeSuffix(validatorName) {
   return stem.charAt(0).toUpperCase() + stem.slice(1);
 }
 function readJsDoc(jsDocs) {
-  if (jsDocs.length === 0) {
+  const last = jsDocs.at(-1);
+  if (!last) {
     return void 0;
   }
-  const last = jsDocs[jsDocs.length - 1];
   const description = last.getDescription().trim();
   return description.length > 0 ? description : void 0;
 }
@@ -34718,8 +34679,7 @@ function mapDocFields(fields) {
 }
 async function collectApiSources(componentAbs) {
   const root = join19(componentAbs, COMPONENT_LIB_SUBPATH2);
-  const files = await listApiFiles(root);
-  files.sort((a, b) => a.localeCompare(b));
+  const files = await collectFilesWithSuffix(root, API_SUFFIX3);
   const sources = [];
   for (const fileAbs of files) {
     const text = await readFile19(fileAbs, "utf8");
@@ -34729,43 +34689,6 @@ async function collectApiSources(componentAbs) {
   }
   return sources;
 }
-async function listApiFiles(root) {
-  const files = [];
-  let isDir = false;
-  try {
-    const stats = await stat16(root);
-    isDir = stats.isDirectory();
-  } catch {
-    isDir = false;
-  }
-  if (isDir) {
-    const stack = [root];
-    while (stack.length > 0) {
-      const current = stack.pop();
-      const entries = await readDirEntries(current);
-      for (const entry of entries) {
-        const full = join19(current, entry.name);
-        if (entry.isDirectory()) {
-          stack.push(full);
-          continue;
-        }
-        if (entry.isFile() && entry.name.endsWith(API_SUFFIX3) && !entry.name.endsWith(".spec.ts")) {
-          files.push(full);
-        }
-      }
-    }
-  }
-  return files;
-}
-async function readDirEntries(dir) {
-  let result;
-  try {
-    result = await readdir12(dir, { withFileTypes: true });
-  } catch {
-    result = [];
-  }
-  return result;
-}
 function pickMatchingSource(sources, modelFilter) {
   const wanted = normalize4(modelFilter);
   for (const source of sources) {
@@ -34909,7 +34832,7 @@ __export(server_actions_list_app_exports, {
 });
 
 // packages/dbx-cli/validate/src/lib/server-actions-list-app/extract.ts
-import { readdir as readdir13, readFile as readFile20, stat as stat17 } from "node:fs/promises";
+import { readdir as readdir10, readFile as readFile20 } from "node:fs/promises";
 import { dirname as dirname15, join as join20, relative as relative17, sep as sep15 } from "node:path";
 import { Node as Node32, Project as Project15 } from "ts-morph";
 var ACTION_SERVER_SUFFIX2 = ".action.server.ts";
@@ -34917,7 +34840,7 @@ var COMMON_MODEL_SUBPATH2 = "src/app/common/model";
 var COMMON_BARREL_REL = "src/app/common/index.ts";
 async function extractServerActions(apiAbs, apiRel) {
   const modelRoot = join20(apiAbs, COMMON_MODEL_SUBPATH2);
-  const actionFiles = await collectActionFiles2(modelRoot);
+  const actionFiles = await collectFilesWithSuffix(modelRoot, ACTION_SERVER_SUFFIX2);
   if (actionFiles.length === 0) {
     return { modelRoot, entries: [], fixtureStatus: "ok" };
   }
@@ -34957,45 +34880,6 @@ async function extractServerActions(apiAbs, apiRel) {
   entries.sort((a, b) => a.className.localeCompare(b.className));
   return { modelRoot, entries, fixtureStatus };
 }
-async function readDirSafe5(path) {
-  let result;
-  try {
-    result = await readdir13(path, { withFileTypes: true });
-  } catch {
-    result = [];
-  }
-  return result;
-}
-async function collectActionFiles2(root) {
-  const out = [];
-  const stack = [];
-  let isDir = false;
-  try {
-    const stats = await stat17(root);
-    isDir = stats.isDirectory();
-  } catch {
-    isDir = false;
-  }
-  if (isDir) {
-    stack.push(root);
-    while (stack.length > 0) {
-      const current = stack.pop();
-      const entries = await readDirSafe5(current);
-      for (const entry of entries) {
-        const full = join20(current, entry.name);
-        if (entry.isDirectory()) {
-          stack.push(full);
-          continue;
-        }
-        if (entry.isFile() && entry.name.endsWith(ACTION_SERVER_SUFFIX2) && !entry.name.endsWith(".spec.ts")) {
-          out.push(full);
-        }
-      }
-    }
-    out.sort((a, b) => a.localeCompare(b));
-  }
-  return out;
-}
 function findServerActionClasses(sourceFile) {
   const out = [];
   for (const cls of sourceFile.getClasses()) {
@@ -35027,7 +34911,7 @@ async function findModuleCandidates(actionFilePath) {
   const dir = dirname15(actionFilePath);
   const out = [];
   try {
-    const entries = await readdir13(dir, { withFileTypes: true });
+    const entries = await readdir10(dir, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isFile()) continue;
       if (!entry.name.endsWith(".module.ts")) continue;
@@ -35877,14 +35761,14 @@ async function collectCandidatePaths(apiAbs) {
   return [...explicit, ...scanned];
 }
 async function scanProviderFiles(srcAbs) {
-  const { readdir: readdir16 } = await import("node:fs/promises");
+  const { readdir: readdir13 } = await import("node:fs/promises");
   const out = [];
   const stack = [srcAbs];
   while (stack.length > 0) {
     const current = stack.pop();
     let entries;
     try {
-      entries = await readdir16(current, { withFileTypes: true });
+      entries = await readdir13(current, { withFileTypes: true });
     } catch {
       continue;
     }
@@ -36277,7 +36161,7 @@ function isInColorPosition(obj) {
   return false;
 }
 function collapseSnippet(text) {
-  return text.replace(/\s+/g, " ").trim();
+  return text.replaceAll(/\s+/g, " ").trim();
 }
 var HTML_ATTR_RE = /\[(dbxColor|dbxTextColor|color)\]="([^"]+)"/g;
 function extractHtmlLiterals(filePath, text) {
@@ -36301,7 +36185,7 @@ function parseHtmlObjectValue(input) {
   if (parsed.hasTemplate) return void 0;
   if (!parsed.hasKnownField) return void 0;
   const position = positionAt(text, matchIndex);
-  const snippet = `[dbxColor]="${value}"`.replace(/\s+/g, " ").trim();
+  const snippet = `[dbxColor]="${value}"`.replaceAll(/\s+/g, " ").trim();
   const literal = {
     file: filePath,
     line: position.line,
@@ -36517,7 +36401,7 @@ function proposeTemplateKey(normalized) {
   if (normalized.color !== void 0) {
     const hex = /^#([0-9a-f]{6})$/i.exec(normalized.color);
     if (hex === null) {
-      const sanitized = normalized.color.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+      const sanitized = normalized.color.toLowerCase().replaceAll(/[^a-z0-9]+/g, "-").replaceAll(/^-+|-+$/g, "");
       if (sanitized.length > 0) result = `brand-${sanitized}`.slice(0, 40);
     } else {
       result = `brand-${hex[1].toLowerCase()}`;
@@ -39667,9 +39551,7 @@ async function run5(rawArgs) {
   const cwd = process.cwd();
   const ensureError = runEnsurePathInsideCwd(parsed.apiDir, cwd);
   let result;
-  if (ensureError !== void 0) {
-    result = toolError(ensureError);
-  } else {
+  if (ensureError === void 0) {
     const apiAbs = resolve39(cwd, parsed.apiDir);
     const inspection = await inspectFixturesSafe(apiAbs, parsed.apiDir);
     if (inspection.kind === "error") {
@@ -39682,6 +39564,8 @@ async function run5(rawArgs) {
         format: parsed.format
       });
     }
+  } else {
+    result = toolError(ensureError);
   }
   return result;
 }
@@ -43790,7 +43674,7 @@ var ACTION_SCAFFOLD_TOOL = {
 import { type as type80 } from "arktype";
 
 // packages/dbx-components-mcp/src/tools/route/load-sources.ts
-import { glob as fsGlob6, readFile as readFile23, stat as stat18 } from "node:fs/promises";
+import { glob as fsGlob6, readFile as readFile23, stat as stat14 } from "node:fs/promises";
 import { dirname as dirname16, isAbsolute as isAbsolute15, resolve as resolve51, sep as sep17 } from "node:path";
 
 // packages/dbx-components-mcp/src/tools/route/extract.ts
@@ -44244,7 +44128,7 @@ async function resolveRelativeImport(fromFile, specifier, cwd) {
 async function fileExists2(path) {
   let result;
   try {
-    const info = await stat18(path);
+    const info = await stat14(path);
     result = info.isFile();
   } catch {
     result = false;
@@ -45069,7 +44953,7 @@ var ROUTE_SEARCH_TOOL = {
 import { type as type83 } from "arktype";
 
 // packages/dbx-components-mcp/src/tools/route/resolve-url.ts
-import { readFile as readFile25, stat as stat19 } from "node:fs/promises";
+import { readFile as readFile25, stat as stat15 } from "node:fs/promises";
 import { dirname as dirname18, isAbsolute as isAbsolute16, resolve as resolve53, sep as sep19 } from "node:path";
 
 // packages/dbx-components-mcp/src/tools/route/app-port-map.ts
@@ -45547,7 +45431,7 @@ function containsImportedSymbol(importStatement, symbol) {
 async function fileExists3(path) {
   let result;
   try {
-    const info = await stat19(path);
+    const info = await stat15(path);
     result = info.isFile();
   } catch {
     result = false;
@@ -50154,7 +50038,7 @@ var EXPLAIN_RULE_TOOL = { definition: TOOL16, run: run17 };
 
 // packages/dbx-components-mcp/src/tools/app-validate.tool.ts
 import { resolve as resolve58, join as join24 } from "node:path";
-import { readdir as readdir14, readFile as readFile28, stat as stat20 } from "node:fs/promises";
+import { readdir as readdir11, readFile as readFile28, stat as stat16 } from "node:fs/promises";
 import { type as type92 } from "arktype";
 var { inspectAppStorageFiles: inspectAppStorageFiles4, validateAppStorageFiles: validateAppStorageFiles3 } = storagefile_m_validate_app_exports;
 var { inspectAppNotifications: inspectAppNotifications4, validateAppNotifications: validateAppNotifications3 } = notification_m_validate_app_exports;
@@ -50344,7 +50228,7 @@ async function runModelFolders(ctx) {
     const reservedNames = new Set(RESERVED_MODEL_FOLDERS.map((r) => r.name));
     let entries;
     try {
-      entries = await readdir14(modelRoot, { withFileTypes: true });
+      entries = await readdir11(modelRoot, { withFileTypes: true });
     } catch (err) {
       const code17 = err.code;
       if (code17 === "ENOENT" || code17 === "ENOTDIR") {
@@ -50397,7 +50281,7 @@ async function runSystemFolder(ctx) {
   try {
     let exists = true;
     try {
-      const stats = await stat20(systemPath);
+      const stats = await stat16(systemPath);
       if (!stats.isDirectory()) exists = false;
     } catch (err) {
       const code17 = err.code;
@@ -50731,7 +50615,7 @@ import { resolve as resolve63 } from "node:path";
 
 // packages/dbx-components-mcp/src/tools/mcp-config/snapshot.ts
 import { dirname as dirname19, isAbsolute as isAbsolute17, relative as relative19, resolve as resolve61 } from "node:path";
-import { stat as stat21 } from "node:fs/promises";
+import { stat as stat17 } from "node:fs/promises";
 async function buildSnapshot(input) {
   const { workspaceRoot, explicitDirs } = input;
   const configResult = await findAndLoadConfig({ cwd: workspaceRoot });
@@ -50781,7 +50665,7 @@ function clustersRegisteredInPackage(pkg, sources) {
 async function fileExists5(path) {
   let result;
   try {
-    const stats = await stat21(path);
+    const stats = await stat17(path);
     result = stats.isFile();
   } catch {
     result = false;
@@ -51344,7 +51228,7 @@ import { type as type96 } from "arktype";
 import { basename as basename10 } from "node:path";
 
 // packages/dbx-components-mcp/src/tools/log-search/discover-logs.ts
-import { readdir as readdir15, stat as stat22 } from "node:fs/promises";
+import { readdir as readdir12, stat as stat18 } from "node:fs/promises";
 import { basename as basename9, join as join25, resolve as resolve64 } from "node:path";
 var DBX_LOG_PATH_ENV_VAR = "DBX_LOG_PATH";
 function resolveLogBasePath(input) {
@@ -51397,7 +51281,7 @@ async function discoverLogs(input) {
 async function pathIsDir(absPath) {
   let isDir = false;
   try {
-    const info = await stat22(absPath);
+    const info = await stat18(absPath);
     isDir = info.isDirectory();
   } catch {
     isDir = false;
@@ -51407,7 +51291,7 @@ async function pathIsDir(absPath) {
 async function listChildDirs(absPath) {
   let dirs = [];
   try {
-    const entries = await readdir15(absPath, { withFileTypes: true });
+    const entries = await readdir12(absPath, { withFileTypes: true });
     dirs = entries.filter((e) => e.isDirectory()).map((e) => e.name).sort();
   } catch {
     dirs = [];
@@ -51438,7 +51322,7 @@ async function collectProjectLogs(input) {
 async function readMarkdownEntries(projectDir) {
   let entries = [];
   try {
-    const dirents = await readdir15(projectDir, { withFileTypes: true });
+    const dirents = await readdir12(projectDir, { withFileTypes: true });
     entries = dirents.filter((d) => (d.isFile() || d.isSymbolicLink()) && d.name.endsWith(".md")).map((d) => d.name);
   } catch {
     entries = [];
@@ -51449,7 +51333,7 @@ async function buildLogRefIfRecent(input) {
   const absolutePath = join25(input.projectDir, input.fileName);
   let info;
   try {
-    info = await stat22(absolutePath);
+    info = await stat18(absolutePath);
   } catch {
     info = void 0;
   }
@@ -51512,7 +51396,7 @@ function formatKeywordResults(header, hits) {
   return lines.join("\n").trimEnd();
 }
 function buildHeading(header) {
-  const queryPart = header.query !== void 0 ? ` \u2014 \`${header.query}\`` : "";
+  const queryPart = header.query === void 0 ? "" : ` \u2014 \`${header.query}\``;
   return `# Log search${queryPart} (mode: ${header.mode}, scope: ${header.scope}, window: ${header.windowLabel})`;
 }
 function renderEntry(entry, matchedSuffix, maxSnippetLen) {
@@ -51771,7 +51655,7 @@ function parseArgs16(input) {
   }
   const rawQuery = parsed.query?.trim();
   const query = rawQuery !== void 0 && rawQuery.length > 0 ? rawQuery : void 0;
-  const mode = parsed.mode ?? (query !== void 0 ? "fuzzy" : "list");
+  const mode = parsed.mode ?? (query === void 0 ? "list" : "fuzzy");
   const limit = clamp(parsed.limit ?? DEFAULT_LIMIT8, 1, MAX_LIMIT7);
   const days = clamp(parsed.days ?? DEFAULT_DAYS, 1, MAX_DAYS);
   const cwd = parsed.cwd ?? process.cwd();