@zqagent/core 0.3.16 → 0.3.25

package/dist/index.d.cts

@@ -519,6 +519,13 @@ type SymbolKind = "class" | "interface" | "struct" | "enum" | "record" | "trait"
 interface SymbolNode {
     name: string;
     kind: SymbolKind;
+    /**
+     * 声明起始行（1 起始）。渲染成 `Name:12`，模型可直接 `read_file start_line=12`，
+     * 省掉先 grep 一行号的那一轮 —— 一轮工具调用要重发整个上下文，比这几个字符贵得多。
+     */
+    line?: number;
+    /** 声明结束行；与 {@link line} 相同时渲染层只写一个行号 */
+    endLine?: number;
 }
 /** 单文件的索引结果 */
 interface FileSymbols {
@@ -532,6 +539,14 @@ interface FileSymbols {
      * 比目录结构可靠，用于渲染分组；取不到则缺省。
      */
     pkg?: string;
+    /**
+     * 再导出语句数（`export * from "./x"` / `export { a } from "./x"`）。
+     *
+     * barrel 文件（`index.ts` 只有再导出）提取不到任何符号，但它往往是**全仓
+     * 被 import 最多的文件**，是「该从哪个包入口开始」的最佳答案。没有这个计数，
+     * 索引器会把它连同其它 0 符号文件一起丢掉，包入口在结构图里彻底不可见。
+     */
+    reexports?: number;
     /** 该文件由哪个提取器处理（诊断用） */
     via: "tree-sitter" | "regex" | "path-only";
 }
@@ -546,7 +561,7 @@ interface RepoMapCache {
     scan: {
         /** 枚举到的文件总数（可能远大于 indexed） */
         files: number;
-        /** 实际提取了符号的文件数（受 MAX_FILES 封顶） */
+        /** 进地图的文件数（有声明 / 纯 barrel / 入口；受 MAX_FILES 封顶） */
         indexed: number;
         /** 是否因上限被截断 */
         truncated: boolean;
@@ -591,9 +606,14 @@ interface RepoMap {
     root: string;
     scale: Scale;
     scan: RepoMapCache["scan"];
-    /** 已排序的文件（score 降序） */
+    /** 已排序的文件（score 降序），与 {@link files} 的键集完全一致 */
     ranked: RankedFile[];
-    /** path → 索引结果 */
+    /**
+     * path → 索引结果，**只含进地图的文件**：有顶层声明、纯 barrel、或模块入口。
+     *
+     * 解析成功但三者都不满足的文件（例如只有顶层调用的脚本）不在这里 —— 它们在
+     * 结构图里只能占一行而不提供任何定位信息。索引磁盘缓存仍保留它们以支持增量。
+     */
     files: Record<string, FileSymbols>;
     shape?: ProjectShape;
 }
@@ -608,7 +628,8 @@ interface RepoMap {
  *
  * token 上的取舍（都按"能否帮模型少走一轮"来判断）：
  *   - 目录路径只写一次（分组标题），不在每行重复
- *   - 符号只写名字，不写 kind、不写行号
+ *   - 符号写「名字 + 行号」，不写 kind：行号能省掉先 grep 定位的那一轮，
+ *     kind 省不了任何一次工具调用
  *   - 不画树形符号（`├──` 每行要花 4-8 个 token）
  */
 

package/dist/index.d.ts

@@ -519,6 +519,13 @@ type SymbolKind = "class" | "interface" | "struct" | "enum" | "record" | "trait"
 interface SymbolNode {
     name: string;
     kind: SymbolKind;
+    /**
+     * 声明起始行（1 起始）。渲染成 `Name:12`，模型可直接 `read_file start_line=12`，
+     * 省掉先 grep 一行号的那一轮 —— 一轮工具调用要重发整个上下文，比这几个字符贵得多。
+     */
+    line?: number;
+    /** 声明结束行；与 {@link line} 相同时渲染层只写一个行号 */
+    endLine?: number;
 }
 /** 单文件的索引结果 */
 interface FileSymbols {
@@ -532,6 +539,14 @@ interface FileSymbols {
      * 比目录结构可靠，用于渲染分组；取不到则缺省。
      */
     pkg?: string;
+    /**
+     * 再导出语句数（`export * from "./x"` / `export { a } from "./x"`）。
+     *
+     * barrel 文件（`index.ts` 只有再导出）提取不到任何符号，但它往往是**全仓
+     * 被 import 最多的文件**，是「该从哪个包入口开始」的最佳答案。没有这个计数，
+     * 索引器会把它连同其它 0 符号文件一起丢掉，包入口在结构图里彻底不可见。
+     */
+    reexports?: number;
     /** 该文件由哪个提取器处理（诊断用） */
     via: "tree-sitter" | "regex" | "path-only";
 }
@@ -546,7 +561,7 @@ interface RepoMapCache {
     scan: {
         /** 枚举到的文件总数（可能远大于 indexed） */
         files: number;
-        /** 实际提取了符号的文件数（受 MAX_FILES 封顶） */
+        /** 进地图的文件数（有声明 / 纯 barrel / 入口；受 MAX_FILES 封顶） */
         indexed: number;
         /** 是否因上限被截断 */
         truncated: boolean;
@@ -591,9 +606,14 @@ interface RepoMap {
     root: string;
     scale: Scale;
     scan: RepoMapCache["scan"];
-    /** 已排序的文件（score 降序） */
+    /** 已排序的文件（score 降序），与 {@link files} 的键集完全一致 */
     ranked: RankedFile[];
-    /** path → 索引结果 */
+    /**
+     * path → 索引结果，**只含进地图的文件**：有顶层声明、纯 barrel、或模块入口。
+     *
+     * 解析成功但三者都不满足的文件（例如只有顶层调用的脚本）不在这里 —— 它们在
+     * 结构图里只能占一行而不提供任何定位信息。索引磁盘缓存仍保留它们以支持增量。
+     */
     files: Record<string, FileSymbols>;
     shape?: ProjectShape;
 }
@@ -608,7 +628,8 @@ interface RepoMap {
  *
  * token 上的取舍（都按"能否帮模型少走一轮"来判断）：
  *   - 目录路径只写一次（分组标题），不在每行重复
- *   - 符号只写名字，不写 kind、不写行号
+ *   - 符号写「名字 + 行号」，不写 kind：行号能省掉先 grep 定位的那一轮，
+ *     kind 省不了任何一次工具调用
  *   - 不画树形符号（`├──` 每行要花 4-8 个 token）
  */
 

package/dist/index.js

@@ -8733,6 +8733,9 @@ function nameOf(node) {
   if (typeNode?.text) return typeNode.text.split("<")[0].trim();
   return null;
 }
+function spanOf(node) {
+  return { line: node.startPosition.row + 1, endLine: node.endPosition.row + 1 };
+}
 var MAX_COLLECT = 200;
 var VARIABLE_DECLARATIONS = /* @__PURE__ */ new Set(["lexical_declaration", "variable_declaration"]);
 var MODULE_CONTAINERS = /* @__PURE__ */ new Set([
@@ -8770,7 +8773,12 @@ function collectVariables(node, out, exported) {
     if (!nameNode || nameNode.type !== "identifier") continue;
     const isFn = isFunctionValue(decl);
     if (!isFn && !exported) continue;
-    out.push({ name: nameNode.text, kind: isFn ? "function" : "const", exported });
+    out.push({
+      name: nameNode.text,
+      kind: isFn ? "function" : "const",
+      exported,
+      ...spanOf(decl)
+    });
   }
 }
 function collect(node, ruleTypes, out, max, depth, exported = false, lang = "", inModule = false) {
@@ -8786,7 +8794,12 @@ function collect(node, ruleTypes, out, max, depth, exported = false, lang = "",
       const name = nameOf(child);
       const usable = name && !name.includes("\n") && name.length <= 80;
       if (usable) {
-        out.push({ name, kind, exported: isExport || isPublicDeclaration(child, lang, name) });
+        out.push({
+          name,
+          kind,
+          exported: isExport || isPublicDeclaration(child, lang, name),
+          ...spanOf(child)
+        });
         if (RECORD_AND_DESCEND.has(child.type) && depth < MAX_DEPTH) {
           collect(child, ruleTypes, out, max, depth + 1, isExport, lang, MODULE_CONTAINERS.has(child.type));
         }
@@ -8801,7 +8814,8 @@ function collect(node, ruleTypes, out, max, depth, exported = false, lang = "",
         out.push({
           name: nameNode.text,
           kind: "type",
-          exported: isPublicDeclaration(spec, lang, nameNode.text)
+          exported: isPublicDeclaration(spec, lang, nameNode.text),
+          ...spanOf(spec)
         });
       }
       continue;
@@ -8830,10 +8844,13 @@ function prioritizeSymbols(symbols, maxSymbols) {
     seen.add(s.name);
     return true;
   });
-  if (unique.length <= maxSymbols) return unique.map(({ name, kind }) => ({ name, kind }));
-  const exported = unique.filter((s) => s.exported);
-  const inner = unique.filter((s) => !s.exported);
-  return [...exported, ...inner].slice(0, maxSymbols).map(({ name, kind }) => ({ name, kind }));
+  const trimmed = unique.length <= maxSymbols ? unique : [...unique.filter((s) => s.exported), ...unique.filter((s) => !s.exported)].slice(
+    0,
+    maxSymbols
+  );
+  return trimmed.map(
+    (s) => s.line === void 0 ? { name: s.name, kind: s.kind } : { name: s.name, kind: s.kind, line: s.line, endLine: s.endLine }
+  );
 }
 function packageOf(tree, packageNode) {
   if (!packageNode) return void 0;
@@ -8844,6 +8861,14 @@ function packageOf(tree, packageNode) {
   }
   return void 0;
 }
+function countReexports(tree) {
+  let n = 0;
+  for (const child of tree.rootNode.children) {
+    if (child.type !== "export_statement") continue;
+    if (child.childForFieldName("source")) n += 1;
+  }
+  return n;
+}
 async function extractWithTreeSitter(langId, bytes, source, maxSymbols) {
   const rule = TS_RULES[langId];
   if (!rule) return null;
@@ -8867,7 +8892,8 @@ async function extractWithTreeSitter(langId, bytes, source, maxSymbols) {
     }
     return {
       symbols: prioritizeSymbols(symbols, maxSymbols),
-      pkg: packageOf(tree, rule.packageNode)
+      pkg: packageOf(tree, rule.packageNode),
+      reexports: countReexports(tree)
     };
   } catch {
     return null;
@@ -8880,6 +8906,13 @@ async function extractWithTreeSitter(langId, bytes, source, maxSymbols) {
 // src/repomap/extract/regex.ts
 init_esm_shims();
 var MAX_LINE_CHARS = 500;
+var REEXPORT_RE = /^export\s+(?:\*\s*(?:as\s+[\w$]+\s*)?|type\s*(?:\*\s*|\{[^}]*\}\s*)|\{[^}]*\}\s*)from\s+['"]/gm;
+var BLOCK_COMMENT_RE = /\/\*[\s\S]*?\*\//g;
+function countReexports2(source, langId) {
+  if (langId !== "typescript" && langId !== "tsx" && langId !== "javascript") return 0;
+  const text = source.includes("/*") ? source.replace(BLOCK_COMMENT_RE, "") : source;
+  return text.match(REEXPORT_RE)?.length ?? 0;
+}
 function stripBlockComments(line, state) {
   let out = "";
   let i = 0;
@@ -8913,7 +8946,8 @@ function extractWithRegex(langId, source, maxSymbols) {
   let pkg;
   const state = { inBlock: false };
   const lines = source.split("\n");
-  for (const raw of lines) {
+  for (let i = 0; i < lines.length; i++) {
+    const raw = lines[i];
     if (symbols.length >= maxSymbols) break;
     const stripped = stripBlockComments(raw, state);
     const line = /^\s/.test(raw) ? stripped : stripped.replace(/^\s+/, "");
@@ -8926,9 +8960,9 @@ function extractWithRegex(langId, source, maxSymbols) {
     if (!name) continue;
     if (seen.has(name)) continue;
     seen.add(name);
-    symbols.push({ name, kind: rule.kind });
+    symbols.push({ name, kind: rule.kind, line: i + 1 });
   }
-  return { symbols, pkg };
+  return { symbols, pkg, reexports: countReexports2(source, langId) };
 }
 
 // src/repomap/grammar.ts
@@ -8986,6 +9020,7 @@ function markLoaded(langId) {
   failedAt.delete(langId);
 }
 var inflight = /* @__PURE__ */ new Map();
+var readyCache = /* @__PURE__ */ new Map();
 function grammarDir() {
   const explicit = process.env.ZQAGENT_REPOMAP_GRAMMAR_DIR?.trim();
   if (explicit) return explicit;
@@ -9009,10 +9044,7 @@ function verify(spec, buf) {
   return sha256Hex(buf) === spec.sha256;
 }
 function readLocal(spec) {
-  const candidates = [cachePath(spec)];
-  const explicit = process.env.ZQAGENT_REPOMAP_GRAMMAR_DIR?.trim();
-  if (explicit) candidates.push(path14.join(explicit, `${spec.id}.wasm`));
-  for (const file of candidates) {
+  for (const file of localCandidates(spec)) {
     try {
       const buf = fs11.readFileSync(file);
       if (verify(spec, buf)) return new Uint8Array(buf);
@@ -9021,6 +9053,24 @@ function readLocal(spec) {
   }
   return null;
 }
+function localCandidates(spec) {
+  const candidates = [cachePath(spec)];
+  const explicit = process.env.ZQAGENT_REPOMAP_GRAMMAR_DIR?.trim();
+  if (explicit) candidates.push(path14.join(explicit, `${spec.id}.wasm`));
+  return candidates;
+}
+function localSignature(spec) {
+  const parts = [];
+  for (const file of localCandidates(spec)) {
+    try {
+      const st = fs11.statSync(file);
+      parts.push(`${st.mtimeMs}:${st.size}`);
+    } catch {
+      parts.push("-");
+    }
+  }
+  return parts.join("|");
+}
 async function download(spec) {
   if (offline()) return null;
   for (const build of CDN_TEMPLATES) {
@@ -9079,7 +9129,13 @@ async function loadGrammar(langId) {
 function grammarReady(langId) {
   if (resolved.get(langId)) return true;
   const spec = GRAMMARS[langId];
-  return spec ? readLocal(spec) !== null : false;
+  if (!spec) return false;
+  const sig = localSignature(spec);
+  const hit = readyCache.get(langId);
+  if (hit && hit.sig === sig) return hit.ready;
+  const ready = readLocal(spec) !== null;
+  readyCache.set(langId, { sig, ready });
+  return ready;
 }
 
 // src/repomap/extract/index.ts
@@ -9098,10 +9154,10 @@ async function extractFile(relPath, source) {
   const bytes = await loadGrammar(lang);
   if (bytes) {
     const ts = await extractWithTreeSitter(lang, bytes, source, MAX_SYMBOLS_PER_FILE);
-    if (ts) return { symbols: ts.symbols, pkg: ts.pkg, via: "tree-sitter" };
+    if (ts) return { symbols: ts.symbols, pkg: ts.pkg, reexports: ts.reexports, via: "tree-sitter" };
   }
   const re = extractWithRegex(lang, source, MAX_SYMBOLS_PER_FILE);
-  return { symbols: re.symbols, pkg: re.pkg, via: "regex" };
+  return { symbols: re.symbols, pkg: re.pkg, reexports: re.reexports, via: "regex" };
 }
 function wantsContent(relPath) {
   if (!langOf(relPath)) return false;
@@ -9288,6 +9344,10 @@ function hasLayerWord(name) {
 }
 var ENTRY_RE = /(^|\/)(main|index|program|startup|app|application|bootstrap|mod|__init__)(\.|\/)/i;
 var ENTRY_SUFFIX_RE = /(application|program|startup)\.(java|kt|cs|scala)$/i;
+function isEntryFile(relPath, sourceRoots = []) {
+  if (ENTRY_SUFFIX_RE.test(relPath)) return true;
+  return ENTRY_RE.test(relPath) && depthFromSourceRoot(relPath, sourceRoots) <= 1;
+}
 var TEST_RE = /(^|\/)(test|tests|__tests__|__mocks__|spec|specs|e2e)(\/|$)|\.(test|spec)\.[a-z]+$|test\.(java|kt|cs)$|_test\.(go|py|rb)$/i;
 var DOC_RE = /(^|\/)(docs?|examples?|samples?|demo|benchmarks?|bench|fixtures?)(\/|$)|\.(md|mdx|rst|txt|adoc)$/i;
 var GENERATED_RE = /\.(min|generated|designer)\.|_pb2?\.|\.g\.(cs|java)$|(^|\/)gen\//i;
@@ -9323,7 +9383,7 @@ function scorePath(relPath, sourceRoots) {
     score += W.sourceRoot;
   }
   const depth = depthFromSourceRoot(relPath, sourceRoots);
-  if (ENTRY_SUFFIX_RE.test(relPath) || ENTRY_RE.test(relPath) && depth <= 1) {
+  if (isEntryFile(relPath, sourceRoots)) {
     score += W.entry;
   }
   const base = relPath.slice(relPath.lastIndexOf("/") + 1).replace(/\.[^.]+$/, "");
@@ -9351,7 +9411,7 @@ function rankFiles(paths, sourceRoots, hasSymbols) {
 
 // src/repomap/types.ts
 init_esm_shims();
-var REPOMAP_CACHE_VERSION = 3;
+var REPOMAP_CACHE_VERSION = 5;
 
 // src/repomap/indexer.ts
 import { createHash as createHash2 } from "crypto";
@@ -9559,6 +9619,7 @@ async function buildRepoMap(root, opts = {}) {
             size: stat.size,
             symbols: ex.symbols,
             pkg: ex.pkg,
+            reexports: ex.reexports,
             via: ex.via
           };
         } catch {
@@ -9566,15 +9627,18 @@ async function buildRepoMap(root, opts = {}) {
       }
       await yieldToLoop();
     }
-    const withSymbols = new Set(
-      Object.entries(result).filter(([, v]) => v.symbols.length > 0).map(([k]) => k)
-    );
-    const ranked = rankFiles([...withSymbols], shape.sourceRoots);
+    const retained = {};
+    for (const [rel, v] of Object.entries(result)) {
+      if (v.symbols.length > 0 || (v.reexports ?? 0) > 0 || isEntryFile(rel, shape.sourceRoots)) {
+        retained[rel] = v;
+      }
+    }
+    const ranked = rankFiles(Object.keys(retained), shape.sourceRoots);
     const scan = {
       files: files.length,
       // 报「地图里有多少文件」而不是「本次新提取了多少」：命中缓存时
-      // 后者是 0，模型会以为结构图是空的（实测曾把 1324 个文件报成 0）
-      indexed: Object.keys(result).length,
+      // 后者为 0，模型会误判结构图为空（实测曾把 1324 个文件报成 0）
+      indexed: Object.keys(retained).length,
       truncated: enumTruncated || limit < rankedAll.length,
       elapsedMs: Date.now() - started
     };
@@ -9591,7 +9655,7 @@ async function buildRepoMap(root, opts = {}) {
         shape
       });
     }
-    return { root: absRoot, scale, scan, ranked, files: result, shape };
+    return { root: absRoot, scale, scan, ranked, files: retained, shape };
   } catch {
     return empty;
   }
@@ -9632,6 +9696,11 @@ var GENERIC_SYMBOLS = /* @__PURE__ */ new Set([
 function meaningful(symbols) {
   return symbols.filter((s) => s.name.length > 3 && !GENERIC_SYMBOLS.has(s.name));
 }
+function symbolRef(s, withRange = false) {
+  if (s.line === void 0 || s.name.includes(":")) return s.name;
+  const end = withRange && s.endLine !== void 0 && s.endLine > s.line ? `-${s.endLine}` : "";
+  return `${s.name}:${s.line}${end}`;
+}
 var GROUP_FILE_LIMIT = { small: 5, medium: 4, large: 1 };
 var BREADTH_SHARE = 0.5;
 var TAIL_RESERVE = 64;
@@ -9655,7 +9724,7 @@ function baseName(relPath) {
 function symbolsInline(symbols) {
   const kept = meaningful(symbols);
   if (kept.length === 0) return "";
-  const names = kept.slice(0, MAX_SYMBOLS_PER_LINE).map((s) => s.name);
+  const names = kept.slice(0, MAX_SYMBOLS_PER_LINE).map((s) => symbolRef(s));
   const more = kept.length > MAX_SYMBOLS_PER_LINE ? ", \u2026" : "";
   return names.join(", ") + more;
 }
@@ -9663,14 +9732,14 @@ function buildGroups(map) {
   const groups = /* @__PURE__ */ new Map();
   for (const { path: rel } of map.ranked) {
     const entry = map.files[rel];
-    if (!entry || entry.symbols.length === 0) continue;
+    if (!entry) continue;
     const label = groupLabelOf(rel, entry.pkg);
     let g = groups.get(label);
     if (!g) {
       g = { label, files: [] };
       groups.set(label, g);
     }
-    g.files.push({ path: rel, symbols: entry.symbols });
+    g.files.push({ path: rel, symbols: entry.symbols, reexports: entry.reexports });
   }
   return [...groups.values()];
 }
@@ -9681,12 +9750,20 @@ function moduleLine(mod, info) {
   return `  ${label} (${info.files} \u6587\u4EF6)${layers ? `  ${layers}` : ""}${entry}`;
 }
 function renderLarge(map, budget) {
+  const bestOfModule = /* @__PURE__ */ new Map();
+  for (const r of map.ranked) {
+    const slash = r.path.indexOf("/");
+    const mod = slash < 0 ? "." : r.path.slice(0, slash);
+    const prev = bestOfModule.get(mod);
+    if (prev === void 0 || r.score > prev) bestOfModule.set(mod, r.score);
+  }
   const perModule = /* @__PURE__ */ new Map();
   for (const rel of Object.keys(map.files)) {
     const slash = rel.indexOf("/");
     const first = slash < 0 ? "." : rel.slice(0, slash);
     const bucket = perModule.get(first) ?? {
       files: 0,
+      best: bestOfModule.get(first) ?? Number.NEGATIVE_INFINITY,
       layers: /* @__PURE__ */ new Set(),
       entryDepth: Number.POSITIVE_INFINITY
     };
@@ -9706,7 +9783,9 @@ function renderLarge(map, budget) {
     }
     perModule.set(first, bucket);
   }
-  const sorted = [...perModule.entries()].sort((a, b) => b[1].files - a[1].files);
+  const sorted = [...perModule.entries()].sort(
+    (a, b) => b[1].best - a[1].best || b[1].files - a[1].files || a[0].localeCompare(b[0])
+  );
   const lines = [];
   const lineBudget = Math.max(200, budget - TAIL_RESERVE);
   let used = 0;
@@ -9728,8 +9807,13 @@ function renderLarge(map, budget) {
   return lines.join("\n");
 }
 function fileLine(f) {
-  const sym = symbolsInline(f.symbols);
-  return `  ${baseName(f.path)}${sym ? `: ${sym}` : ""}`;
+  const name = baseName(f.path);
+  if (f.symbols.length > 0) {
+    const sym = symbolsInline(f.symbols);
+    return `  ${name}${sym ? `: ${sym}` : ""}`;
+  }
+  if (f.reexports) return `  ${name}: (\u518D\u5BFC\u51FA ${f.reexports})`;
+  return `  ${name}: (\u5165\u53E3)`;
 }
 function renderDetailed(map, budget) {
   const limit = GROUP_FILE_LIMIT[map.scale === "medium" ? "medium" : "small"];
@@ -9764,23 +9848,36 @@ function renderDetailed(map, budget) {
   const out = [];
   for (const b of blocks) out.push(b.header, ...b.lines);
   const omitted = map.ranked.length - shownFiles;
-  if (omitted > 0) out.push(`\u2026 \u53E6\u6709 ${omitted} \u4E2A\u6587\u4EF6\u672A\u5217\u51FA\uFF0C\u7528 repo_map \u5DE5\u5177\u67E5\u770B`);
+  if (omitted > 0) out.push(`\u2026 \u53E6\u6709 ${omitted} \u4E2A\u6587\u4EF6\u672A\u5217\u51FA\uFF0C\u7528 repo_map \u5DE5\u5177\u6309\u76EE\u5F55\u67E5\u770B`);
   return out.join("\n");
 }
+function shapeLine(shape) {
+  if (!shape) return "";
+  const parts = [];
+  const kinds = shape.kinds.filter((k) => k !== "npm" || !shape.kinds.includes("npm-workspace"));
+  if (kinds.length) parts.push(kinds.slice(0, 3).join(" \xB7 "));
+  if (shape.modules.length > 1) parts.push(`${shape.modules.length} \u6A21\u5757`);
+  const roots = [...new Set(shape.sourceRoots)].sort((a, b) => a.split("/").length - b.split("/").length || a.localeCompare(b)).slice(0, 3);
+  if (roots.length) parts.push(`\u6E90\u7801\u6839 ${roots.join(", ")}`);
+  return parts.length ? `\u9879\u76EE\u5F62\u6001: ${parts.join(" \xB7 ")}` : "";
+}
 function renderRepoMap(map) {
   if (map.ranked.length === 0 && !map.shape) return "";
   const budget = renderBudget(map.scale);
-  const head = map.scale === "large" ? "\u4EE3\u7801\u7ED3\u6784\uFF08\u81EA\u52A8\u6458\u8981 \xB7 \u5927\u578B\u9879\u76EE\uFF1B\u6309\u6A21\u5757\u4E0B\u94BB\u7528 repo_map \u5DE5\u5177\uFF09" : "\u4EE3\u7801\u7ED3\u6784\uFF08\u81EA\u52A8\u751F\u6210\uFF1B\u66F4\u7EC6\u7684\u89C6\u56FE\u7528 repo_map \u5DE5\u5177\uFF09";
+  const title = map.scale === "large" ? "\u4EE3\u7801\u7ED3\u6784\uFF08\u81EA\u52A8\u6458\u8981 \xB7 \u5927\u578B\u9879\u76EE\uFF1B\u6309\u6A21\u5757\u4E0B\u94BB\u7528 repo_map \u5DE5\u5177\uFF09" : "\u4EE3\u7801\u7ED3\u6784\uFF08\u81EA\u52A8\u751F\u6210\uFF1B\u7B26\u53F7\u540E\u7684\u6570\u5B57\u662F\u884C\u53F7\uFF1B\u66F4\u7EC6\u7684\u89C6\u56FE\u7528 repo_map \u5DE5\u5177\uFF09";
+  const shape = shapeLine(map.shape);
+  const head = shape ? `${title}
+${shape}` : title;
   const bodyBudget = Math.max(200, budget - head.length - 1);
   const body = map.scale === "large" ? renderLarge(map, bodyBudget) : renderDetailed(map, bodyBudget);
-  if (!body.trim()) return "";
+  if (!body.trim()) return shape;
   const text = `${head}
 ${body}`;
   if (text.length <= budget) return text;
   return cutAtLine(text, budget);
 }
 function cutAtLine(text, budget) {
-  const marker = "\n\u2026\uFF08\u7ED3\u6784\u56FE\u5DF2\u622A\u65AD\uFF0C\u7528 repo_map \u5DE5\u5177\u67E5\u770B\uFF09";
+  const marker = "\n\u2026\uFF08\u7ED3\u6784\u56FE\u5DF2\u622A\u65AD\uFF0C\u7528 repo_map \u5DE5\u5177\u6309\u76EE\u5F55\u67E5\u770B\uFF09";
   const room = budget - marker.length;
   if (room <= 0) return marker.slice(1);
   const cut = text.slice(0, room);
@@ -9890,10 +9987,12 @@ function attachRepoMap(engine, opts) {
     const original = spec.func;
     engine.registry.register(
       async (args, ctx) => {
-        const out = await original(args, ctx);
-        invalidateRepoMap(workspace);
-        schedule();
-        return out;
+        try {
+          return await original(args, ctx);
+        } finally {
+          invalidateRepoMap(workspace);
+          schedule();
+        }
       },
       spec.metadata,
       spec.schema,
@@ -13088,17 +13187,26 @@ function registerSearchTool(registry, workspace) {
 // src/tools/repoMap.ts
 init_esm_shims();
 var MAX_CHARS = 16e3;
+function filesUnder(map, prefix) {
+  const keys = Object.keys(map.files);
+  if (!prefix) return keys;
+  if (prefix === ".") return keys.filter((rel) => !rel.includes("/"));
+  return keys.filter((rel) => rel === prefix || rel.startsWith(`${prefix}/`));
+}
 function renderSubset(map, prefix, maxFiles) {
   const order = new Map(map.ranked.map((r, i) => [r.path, i]));
-  const under = Object.keys(map.files).filter((rel) => !prefix || rel === prefix || rel.startsWith(`${prefix}/`)).sort((a, b) => (order.get(a) ?? Infinity) - (order.get(b) ?? Infinity));
+  const under = filesUnder(map, prefix).sort(
+    (a, b) => (order.get(a) ?? Infinity) - (order.get(b) ?? Infinity)
+  );
   const matched = under.slice(0, maxFiles);
   if (matched.length === 0) return null;
   const entries = [];
   let used = 0;
   for (const rel of matched) {
     const f = map.files[rel];
-    const sym = f.symbols.slice(0, 8).map((s) => s.name).join(", ");
-    const line = `${rel}${sym ? `: ${sym}` : ""}`;
+    const sym = f.symbols.slice(0, 8).map((s) => symbolRef(s, true)).join(", ");
+    const body = f.symbols.length > 0 ? sym : f.reexports ? `(\u518D\u5BFC\u51FA ${f.reexports})` : "(\u5165\u53E3)";
+    const line = `${rel}: ${body}`;
     if (used + line.length + 1 > MAX_CHARS) break;
     entries.push(line);
     used += line.length + 1;
@@ -13130,18 +13238,20 @@ function registerRepoMapTool(registry, workspace) {
         if (sub) return sub;
         return { error: `\u6CA1\u6709\u5339\u914D\u7684\u76EE\u5F55\uFF1A${path31}` };
       }
-      const groups = buildGroups(map).slice(0, 40).map((g) => ({
-        label: g.label,
-        files: g.files.length,
-        path: g.files[0]?.path.split("/").slice(0, -1).join("/") || "."
-      }));
+      const groups = buildGroups(map).slice(0, 40).map((g) => {
+        const dir = g.files[0]?.path.split("/").slice(0, -1).join("/") || ".";
+        return {
+          label: g.label,
+          files: filesUnder(map, dir).length,
+          ...dir === g.label ? {} : { path: dir }
+        };
+      });
       return {
         scale: map.scale,
         files: map.scan.files,
         indexed: map.scan.indexed,
         groups,
-        map: renderRepoMap(map),
-        hint: '\u7528 path \u53C2\u6570\u53EF\u53EA\u770B\u67D0\u4E2A\u6A21\u5757/\u76EE\u5F55\uFF08\u53D6 groups[].path\uFF09\uFF0C\u4F8B\u5982 path="packages/core/src"'
+        hint: '\u7ED3\u6784\u56FE\u5DF2\u5728\u7CFB\u7EDF\u63D0\u793A\u8BCD\u91CC\uFF0C\u8FD9\u91CC\u53EA\u7ED9\u5168\u5C40\u5206\u7EC4\uFF08files \u542B\u5B50\u76EE\u5F55\uFF09\u3002\u7528 path \u53C2\u6570\u6309\u76EE\u5F55\u4E0B\u94BB\uFF1A\u5206\u7EC4\u6807\u9898\u662F\u5305\u540D\u65F6\u7528 groups[].path\uFF0C\u5426\u5219\u76F4\u63A5\u7528 label\uFF0C\u4F8B\u5982 path="packages/core/src"'
       };
     },
     { category: "search", riskLevel: "low", capabilities: ["repo_map"], requiresApproval: false },