dsh-code-index 0.9.0 → 0.10.0

package/dist/index.js

@@ -6,10 +6,12 @@ import path4 from "path";
 import { readFile } from "fs/promises";
 import { createRequire } from "module";
 import path from "path";
+import { fileURLToPath } from "url";
 import { Language, Parser, Query } from "web-tree-sitter";
 var require2 = createRequire(import.meta.url);
 var WASM_DIR = path.dirname(require2.resolve("tree-sitter-wasms/out/tree-sitter-typescript.wasm"));
 var GRAMMAR_NAMES = {
+  arkts: "tree-sitter-arkts",
   typescript: "tree-sitter-typescript",
   javascript: "tree-sitter-javascript",
   python: "tree-sitter-python",
@@ -20,6 +22,7 @@ var GRAMMAR_NAMES = {
   c: "tree-sitter-c"
 };
 var EXT_TO_LANG = {
+  ".ets": "arkts",
   ".ts": "typescript",
   ".tsx": "typescript",
   ".mts": "typescript",
@@ -51,6 +54,19 @@ function languageForFile(filePath) {
   return EXT_TO_LANG[ext] ?? null;
 }
 var QUERIES = {
+  arkts: `
+    (struct_declaration) @class
+    (function_declaration) @function
+    (generator_function_declaration) @function
+    (method_definition) @method
+    (class_declaration) @class
+    (abstract_class_declaration) @class
+    (interface_declaration) @interface
+    (type_alias_declaration) @type
+    (enum_declaration) @enum
+    (variable_declarator) @variable
+    (public_field_definition) @field
+  `,
   typescript: `
     (function_declaration) @function
     (generator_function_declaration) @function
@@ -132,6 +148,7 @@ var CAPTURE_KINDS = {
   module: { kind: "module" }
 };
 var IMPORT_QUERIES = {
+  arkts: `(import_statement) @import (export_statement) @reexport`,
   typescript: `
     (import_statement) @import
     (export_statement) @reexport
@@ -163,6 +180,12 @@ var IMPORT_QUERIES = {
   `
 };
 var CALL_QUERIES = {
+  arkts: `
+    (call_expression function: (identifier) @call)
+    (call_expression function: (member_expression property: (property_identifier) @call))
+    (arkui_component_expression function: (identifier) @call)
+    (new_expression constructor: (identifier) @call)
+  `,
   typescript: `
     (call_expression function: (identifier) @call)
     (call_expression function: (member_expression property: (property_identifier) @call))
@@ -201,6 +224,7 @@ var CALL_QUERIES = {
   `
 };
 var CALLABLE_NODES = {
+  arkts: /* @__PURE__ */ new Set(["function_declaration", "generator_function_declaration", "method_definition", "function_expression", "arrow_function"]),
   typescript: /* @__PURE__ */ new Set([
     "function_declaration",
     "generator_function_declaration",
@@ -239,7 +263,7 @@ function getLanguage(id) {
   let entry = languageCache.get(id);
   if (!entry) {
     entry = getParser().then(async () => {
-      const grammarPath = path.join(WASM_DIR, `${GRAMMAR_NAMES[id]}.wasm`);
+      const grammarPath = id === "arkts" ? fileURLToPath(new URL("../grammars/tree-sitter-arkts.wasm", import.meta.url)) : path.join(WASM_DIR, `${GRAMMAR_NAMES[id]}.wasm`);
       const bytes = await readFile(grammarPath);
       const lang = await Language.load(bytes);
       new Query(lang, QUERIES[id]).delete();
@@ -264,6 +288,7 @@ async function extractAll(code, id, file = "") {
   const tree = parser.parse(code);
   if (!tree) throw new Error(`tree-sitter parse returned null for a ${id} source`);
   try {
+    const diagnostic = parseDiagnostic(tree.rootNode);
     const drafts = [];
     const symbolQuery = new Query(lang, QUERIES[id]);
     try {
@@ -272,6 +297,7 @@ async function extractAll(code, id, file = "") {
         const def = CAPTURE_KINDS[cap.name];
         if (!def) continue;
         const node = cap.node;
+        if (id === "arkts" && !reliableArktsNode(node)) continue;
         if (def.kind === "variable" && !isModuleLevelVariable(id, node)) continue;
         const name2 = nameOf(id, node);
         if (!name2) continue;
@@ -279,10 +305,11 @@ async function extractAll(code, id, file = "") {
           symbol: {
             name: name2,
             kind: kindFor(id, node, def.kind),
-            line: node.startPosition.row + 1,
+            line: id === "arkts" ? arktsDeclarationStart(node) : node.startPosition.row + 1,
             endLine: node.endPosition.row + 1,
             exported: isExported(id, node),
-            signature: signatureFor(id, node)
+            signature: signatureFor(id, node),
+            ...id === "arkts" ? { decorators: arktsDecorators(node) } : {}
           },
           node
         });
@@ -298,6 +325,7 @@ async function extractAll(code, id, file = "") {
     const importQuery = new Query(lang, IMPORT_QUERIES[id]);
     try {
       for (const cap of importQuery.captures(tree.rootNode)) {
+        if (id === "arkts" && !reliableArktsNode(cap.node)) continue;
         for (const info of importInfoFor(id, cap.node)) importDetails.push(info);
       }
     } finally {
@@ -309,6 +337,7 @@ async function extractAll(code, id, file = "") {
     try {
       const seen = /* @__PURE__ */ new Set();
       for (const cap of callQuery.captures(tree.rootNode)) {
+        if (id === "arkts" && (!reliableArktsNode(cap.node) || isArkuiModifier(cap.node) || isArktsMetadataCall(cap.node))) continue;
         const name2 = cap.node.text.trim();
         if (!name2) continue;
         const line = cap.node.startPosition.row + 1;
@@ -318,7 +347,14 @@ async function extractAll(code, id, file = "") {
         const key = `${from}|${name2}|${line}`;
         if (seen.has(key)) continue;
         seen.add(key);
-        calls.push({ name: name2, line, from, fromId, qualifier: qualifierOf(cap.node) });
+        calls.push({
+          name: name2,
+          line,
+          from,
+          fromId,
+          qualifier: qualifierOf(cap.node),
+          ...id === "arkts" && isArkuiCall(cap.node) ? { context: "arkui" } : {}
+        });
       }
     } finally {
       callQuery.delete();
@@ -327,11 +363,85 @@ async function extractAll(code, id, file = "") {
     symbols.sort(
       (a, b) => a.line - b.line || a.endLine - b.endLine || a.kind.localeCompare(b.kind) || a.name.localeCompare(b.name)
     );
-    return { symbols, imports, importDetails, calls };
+    if (diagnostic.status === "partial" && !symbols.length && !importDetails.length) diagnostic.status = "failed";
+    return { symbols, imports, importDetails, calls, diagnostic };
   } finally {
     tree.delete();
   }
 }
+function parseDiagnostic(root) {
+  const diagnostic = { status: root.hasError ? "partial" : "parsed", errorCount: 0, missingCount: 0, issues: [] };
+  if (!root.hasError) return diagnostic;
+  const stack = [root];
+  while (stack.length) {
+    const node = stack.pop();
+    if (node.type === "ERROR" || node.isMissing) {
+      if (node.isMissing) diagnostic.missingCount++;
+      else diagnostic.errorCount++;
+      if (diagnostic.issues.length < 3) diagnostic.issues.push({ kind: node.isMissing ? "MISSING" : "ERROR", line: node.startPosition.row + 1 });
+    }
+    for (let i = node.childCount - 1; i >= 0; i--) {
+      const child = node.child(i);
+      if (child) stack.push(child);
+    }
+  }
+  return diagnostic;
+}
+function reliableArktsNode(node) {
+  if (node.hasError) return false;
+  for (let parent = node.parent; parent; parent = parent.parent) {
+    if (parent.type === "ERROR") return false;
+    if (["struct_declaration", "class_declaration", "function_declaration", "method_definition"].includes(parent.type) && parent.hasError) return false;
+  }
+  return true;
+}
+function arktsDecoratorNodes(node) {
+  const nodes = node.namedChildren.filter((child) => child?.type === "decorator");
+  for (let prev = node.previousNamedSibling; prev?.type === "decorator"; prev = prev.previousNamedSibling) nodes.unshift(prev);
+  if (node.parent?.type === "export_statement") {
+    nodes.unshift(...node.parent.namedChildren.filter((child) => child?.type === "decorator"));
+  }
+  return [...new Map(nodes.map((decorator) => [decorator.id, decorator])).values()];
+}
+function arktsDecorators(node) {
+  return arktsDecoratorNodes(node).map((decorator) => collapseSpace(decorator.text));
+}
+function arktsDeclarationStart(node) {
+  return Math.min(node.startPosition.row, ...arktsDecoratorNodes(node).map((decorator) => decorator.startPosition.row)) + 1;
+}
+function isArkuiCall(node) {
+  if (node.parent?.type === "arkui_component_expression") return true;
+  if (node.parent?.type !== "call_expression") return false;
+  if (!/^[A-Z]/.test(node.text)) return false;
+  for (let parent = node.parent; parent; parent = parent.parent) {
+    if (parent.type === "arkui_children") return true;
+    if (parent.type === "arrow_function" || parent.type === "function_expression") return false;
+    if (parent.type === "method_definition" || parent.type === "function_declaration") {
+      return parent.type === "method_definition" && nameOf("arkts", parent) === "build" && parent.parent?.type === "struct_body" || arktsDecorators(parent).some((text) => /^@Builder\b/.test(text));
+    }
+  }
+  return false;
+}
+function isArkuiModifier(node) {
+  if (node.parent?.type !== "member_expression") return false;
+  let receiver = node.parent.childForFieldName("object");
+  while (receiver?.type === "call_expression") {
+    const callee = receiver.childForFieldName("function");
+    if (callee?.type === "identifier") return isArkuiCall(callee);
+    if (callee?.type !== "member_expression") return false;
+    receiver = callee.childForFieldName("object");
+  }
+  return receiver?.type === "arkui_component_expression" || receiver?.type === "leading_dot_expression";
+}
+function isArktsMetadataCall(node) {
+  for (let parent = node.parent; parent; parent = parent.parent) {
+    if (parent.type === "decorator") return true;
+    if (parent.type === "arguments") return false;
+    if (parent.type === "leading_dot_expression") return true;
+    if (CALLABLE_NODES.arkts.has(parent.type)) return false;
+  }
+  return false;
+}
 function dedupeDrafts(drafts) {
   const sorted = [...drafts].sort(
     (a, b) => a.symbol.line - b.symbol.line || a.node.startIndex - b.node.startIndex
@@ -882,6 +992,10 @@ function signatureFor(id, node) {
 }
 function rawSignature(id, node) {
   const name2 = nameOf(id, node);
+  if (id === "arkts" && node.type === "struct_declaration") return `struct ${name2}`;
+  if (id === "arkts" && node.type === "public_field_definition") {
+    return `${name2}${collapseSpace(node.childForFieldName("type")?.text ?? "")}`;
+  }
   const params = node.childForFieldName?.("parameters") ?? node.namedChildren.find(
     (c) => c?.type === "formal_parameters" || c?.type === "method_parameters" || c?.type === "parameters" || c?.type === "parameter_list"
   );
@@ -939,7 +1053,7 @@ function isExported(id, node) {
   }
   for (let parent = node.parent; parent; parent = parent.parent) {
     if (parent.type === "export_statement") return true;
-    if (parent.type === "statement_block" || parent.type === "class_body") return false;
+    if (parent.type === "statement_block" || parent.type === "class_body" || parent.type === "struct_body") return false;
     if (parent.type === "program") return false;
   }
   return false;
@@ -1030,6 +1144,7 @@ var DEFAULT_EXCLUDED_DIRS = [
   ".dsh-code-index"
 ];
 var SUPPORTED_EXTS = /* @__PURE__ */ new Set([
+  ".ets",
   ".ts",
   ".tsx",
   ".mts",
@@ -1056,32 +1171,38 @@ var SUPPORTED_EXTS = /* @__PURE__ */ new Set([
   ".inl",
   ".c"
 ]);
-function isGitIgnoredPath(root, relativePath, cache = /* @__PURE__ */ new Map()) {
-  const rel = relativePath.replace(/\\/g, "/").replace(/^\.\//, "");
+function ignoredByGitLayers(layers, relativePath, isDirectory) {
+  let ignored = false;
+  for (const { base, matcher } of layers) {
+    const scoped = base ? path2.posix.relative(base, relativePath) : relativePath;
+    if (!scoped || scoped === ".." || scoped.startsWith("../")) continue;
+    const result = matcher.test(isDirectory ? `${scoped.replace(/\/$/, "")}/` : scoped);
+    if (result.ignored || result.unignored) ignored = result.ignored;
+  }
+  return ignored;
+}
+function isGitIgnoredPath(root, relativePath, cache = /* @__PURE__ */ new Map(), isDirectory = relativePath.endsWith("/")) {
+  const rel = relativePath.replace(/\\/g, "/").replace(/^\.\//, "").replace(/\/$/, "");
   if (!rel) return false;
-  const parentParts = rel.split("/").slice(0, -1);
-  for (let depth = 0; depth <= parentParts.length; depth += 1) {
-    const base = parentParts.slice(0, depth).join("/");
+  const parts = rel.split("/");
+  const layers = [];
+  for (let depth = 0; depth < parts.length; depth += 1) {
+    const base = parts.slice(0, depth).join("/");
     const ignoreFile = path2.join(root, base, ".gitignore");
-    let fileStat;
     try {
-      fileStat = statSync(ignoreFile);
-    } catch {
-      continue;
-    }
-    const previous = cache.get(ignoreFile);
-    let matcher = previous?.matcher;
-    if (!previous || previous.mtimeMs !== fileStat.mtimeMs || previous.size !== fileStat.size) {
-      try {
+      const fileStat = statSync(ignoreFile);
+      const previous = cache.get(ignoreFile);
+      let matcher = previous?.matcher;
+      if (!previous || previous.mtimeMs !== fileStat.mtimeMs || previous.size !== fileStat.size) {
         matcher = ignore().add(readFileSync(ignoreFile, "utf8"));
         cache.set(ignoreFile, { mtimeMs: fileStat.mtimeMs, size: fileStat.size, matcher });
-      } catch {
-        cache.delete(ignoreFile);
-        continue;
       }
+      if (matcher) layers.push({ base, matcher });
+    } catch {
+      cache.delete(ignoreFile);
     }
-    const scoped = base ? path2.posix.relative(base, rel) : rel;
-    if (matcher?.ignores(scoped)) return true;
+    const probe = parts.slice(0, depth + 1).join("/");
+    if (ignoredByGitLayers(layers, probe, depth < parts.length - 1 || isDirectory)) return true;
   }
   return false;
 }
@@ -1097,10 +1218,6 @@ async function scanRepo(root, options = {}) {
       layers = [...inherited, { base: relDir, matcher: ignore().add(rules) }];
     } catch {
     }
-    const ignoredByGit = (relativePath) => layers.some(({ base, matcher }) => {
-      const scoped = base ? path2.posix.relative(base, relativePath) : relativePath;
-      return scoped !== ".." && !scoped.startsWith("../") && matcher.ignores(scoped);
-    });
     let entries;
     try {
       entries = await readdir(absDir, { withFileTypes: true });
@@ -1112,8 +1229,8 @@ async function scanRepo(root, options = {}) {
       const rel = relDir ? `${relDir}/${entry.name}` : entry.name;
       if (entry.isDirectory()) {
         if (excluded.has(entry.name)) continue;
-        if (!ignoredByGit(rel)) queue.push([abs, rel, layers]);
-      } else if (entry.isFile() && !ignoredByGit(rel) && SUPPORTED_EXTS.has(path2.extname(entry.name).toLowerCase())) {
+        if (!ignoredByGitLayers(layers, rel, true)) queue.push([abs, rel, layers]);
+      } else if (entry.isFile() && !ignoredByGitLayers(layers, rel, false) && SUPPORTED_EXTS.has(path2.extname(entry.name).toLowerCase())) {
         try {
           const st = await stat(abs);
           results.push({ abs, rel, mtimeMs: st.mtimeMs });
@@ -1132,7 +1249,7 @@ import path3 from "path";
 import { createHash, randomUUID } from "crypto";
 
 // src/types.ts
-var REPO_INDEX_SCHEMA_VERSION = 2;
+var REPO_INDEX_SCHEMA_VERSION = 3;
 function symbolCount(index) {
   return index.files.reduce((n, f) => n + f.symbols.length, 0);
 }
@@ -1196,7 +1313,7 @@ async function buildIndex(root, options = {}, previous = null, forcePaths = /* @
       batch.map(async (f) => {
         const lang = languageForFile(f.abs);
         if (!lang) return null;
-        if (prevMtime.get(f.rel) === f.mtimeMs && !forcePaths.has(f.rel) && !forcePaths.has("*")) {
+        if (prevMtime.get(f.rel) === f.mtimeMs && prevByPath.get(f.rel)?.diagnostic?.status !== "failed" && !forcePaths.has(f.rel) && !forcePaths.has("*")) {
           const cached = prevByPath.get(f.rel);
           return {
             ...cached,
@@ -1208,9 +1325,33 @@ async function buildIndex(root, options = {}, previous = null, forcePaths = /* @
         try {
           code = await readFile4(f.abs, "utf8");
         } catch {
-          return null;
+          return {
+            path: f.rel,
+            lang,
+            mtimeMs: f.mtimeMs,
+            symbols: [],
+            imports: [],
+            importDetails: [],
+            calls: [],
+            diagnostic: { status: "failed", errorCount: 0, missingCount: 0, issues: [], reason: "source-unavailable" }
+          };
+        }
+        let extracted;
+        try {
+          extracted = await extractAll(code, lang, f.rel);
+        } catch {
+          return {
+            path: f.rel,
+            lang,
+            mtimeMs: f.mtimeMs,
+            symbols: [],
+            imports: [],
+            importDetails: [],
+            calls: [],
+            diagnostic: { status: "failed", errorCount: 0, missingCount: 0, issues: [], reason: "parser-failed" }
+          };
         }
-        const { symbols, imports, importDetails, calls } = await extractAll(code, lang, f.rel);
+        const { symbols, imports, importDetails, calls, diagnostic } = extracted;
         return {
           path: f.rel,
           lang,
@@ -1218,7 +1359,8 @@ async function buildIndex(root, options = {}, previous = null, forcePaths = /* @
           symbols: symbols.map((s) => ({ ...s, file: f.rel })),
           imports,
           importDetails,
-          calls
+          calls,
+          diagnostic
         };
       })
     );
@@ -1266,11 +1408,12 @@ function indexesEqual(left, right) {
       return false;
     }
     if (file.symbols.length !== other.symbols.length) return false;
+    if (JSON.stringify(file.diagnostic) !== JSON.stringify(other.diagnostic)) return false;
     if (!callsEqual(file.calls, other.calls)) return false;
     if (!importsEqual(file.importDetails, other.importDetails)) return false;
     return file.symbols.every((symbol, symbolIndex) => {
       const candidate = other.symbols[symbolIndex];
-      return candidate !== void 0 && symbol.id === candidate.id && symbol.name === candidate.name && symbol.kind === candidate.kind && symbol.file === candidate.file && symbol.line === candidate.line && symbol.endLine === candidate.endLine && symbol.exported === candidate.exported && symbol.signature === candidate.signature && symbol.ordinal === candidate.ordinal && scopesEqual(symbol.scope, candidate.scope);
+      return candidate !== void 0 && symbol.id === candidate.id && symbol.name === candidate.name && symbol.kind === candidate.kind && symbol.file === candidate.file && symbol.line === candidate.line && symbol.endLine === candidate.endLine && symbol.exported === candidate.exported && symbol.signature === candidate.signature && symbol.ordinal === candidate.ordinal && JSON.stringify(symbol.decorators) === JSON.stringify(candidate.decorators) && scopesEqual(symbol.scope, candidate.scope);
     });
   });
 }
@@ -1302,7 +1445,7 @@ function callsEqual(left, right) {
   if (a.length !== b.length) return false;
   return a.every((call, index) => {
     const other = b[index];
-    return other !== void 0 && call.name === other.name && call.line === other.line && call.from === other.from && call.fromId === other.fromId && call.qualifier === other.qualifier;
+    return other !== void 0 && call.name === other.name && call.line === other.line && call.from === other.from && call.fromId === other.fromId && call.qualifier === other.qualifier && call.context === other.context;
   });
 }
 async function findRepoRoot(startDir, maxLevels = 12) {
@@ -1320,6 +1463,21 @@ async function findRepoRoot(startDir, maxLevels = 12) {
   return null;
 }
 
+// src/integrity.ts
+function indexIntegrityWarnings(index) {
+  const affected = index.files.filter((file) => file.diagnostic && file.diagnostic.status !== "parsed");
+  if (!affected.length) return [];
+  const partial = affected.filter((file) => file.diagnostic.status === "partial").length;
+  return [
+    `index incomplete: ${partial} partial, ${affected.length - partial} failed; inspect code_index`,
+    ...affected.slice(0, 3).map((file) => {
+      const diagnostic = file.diagnostic;
+      const location = diagnostic.issues[0]?.line;
+      return `${file.path.slice(0, 100)}${location ? `:${location}` : ""}: ${diagnostic.status} (${diagnostic.reason ?? `${diagnostic.errorCount} ERROR, ${diagnostic.missingCount} MISSING`})`;
+    })
+  ];
+}
+
 // src/repomap.ts
 import path5 from "path";
 var KIND_WEIGHT = {
@@ -1334,7 +1492,7 @@ var KIND_WEIGHT = {
   import: 0.05,
   module: 0.3
 };
-var TEST_PATH_RE = /(^|\/)(tests?|__tests__)(\/|$)|\.(?:spec|test)\.[cm]?[jt]sx?$|(^|\/)(?:test_[^/]+\.py|[^/]+_test\.(?:py|go))$/;
+var TEST_PATH_RE = /(^|\/)(tests?|__tests__)(\/|$)|\.(?:spec|test)\.(?:[cm]?[jt]sx?|ets)$|(^|\/)(?:test_[^/]+\.py|[^/]+_test\.(?:py|go))$/;
 function scoreFile(file) {
   let score = 0;
   for (const sym of file.symbols) {
@@ -1426,6 +1584,7 @@ function referencePageRank(files, density) {
 }
 function resolveImportDetailed(spec, fromPath, fileSet) {
   if (!spec) return { target: null, suffixSkipped: false };
+  if (/^@(ohos|kit)\./.test(spec)) return { target: null, suffixSkipped: false };
   if (spec.startsWith("./") || spec.startsWith("../")) {
     const base = path5.posix.normalize(path5.posix.join(path5.posix.dirname(fromPath), spec));
     return { target: candidateFor(base, fileSet), suffixSkipped: false };
@@ -1442,11 +1601,13 @@ function resolveImport(spec, fromPath, fileSet) {
 }
 function candidateFor(base, fileSet) {
   if (fileSet.has(base)) return base;
+  if (fileSet.has(`${base}.ets`) && [...SUPPORTED_EXTS].some((ext) => ext !== ".ets" && fileSet.has(`${base}${ext}`))) return null;
   for (const ext of SUPPORTED_EXTS) {
     if (fileSet.has(`${base}${ext}`)) return `${base}${ext}`;
   }
   const aliased = tsSourceForJsSpecifier(base, fileSet);
   if (aliased) return aliased;
+  if (fileSet.has(`${base}/index.ets`) && [...SUPPORTED_EXTS].some((ext) => ext !== ".ets" && fileSet.has(`${base}/index${ext}`))) return null;
   for (const ext of SUPPORTED_EXTS) {
     if (fileSet.has(`${base}/index${ext}`)) return `${base}/index${ext}`;
     if (fileSet.has(`${base}/__init__${ext}`)) return `${base}/__init__${ext}`;
@@ -1512,20 +1673,31 @@ function symbolRefs(index, symbol, limit = 200) {
   const defs = table.get(symbol) ?? [];
   const callers = [];
   const calleeFirstLine = /* @__PURE__ */ new Map();
+  const arktsTargets = /* @__PURE__ */ new Map();
+  const graph = index.files.some((file) => file.lang === "arkts") ? buildReferenceGraph(index) : null;
+  const arktsEdgesBySite = /* @__PURE__ */ new Map();
+  if (graph) for (const edge of [...graph.outgoing.values()].flat().concat(graph.moduleLevelEdges)) {
+    const key = `${edge.callSite.file}\0${edge.callSite.line}\0${edge.name}\0${edge.sourceId}`;
+    const rows = arktsEdgesBySite.get(key) ?? [];
+    rows.push(edge);
+    arktsEdgesBySite.set(key, rows);
+  }
   for (const file of index.files) {
     for (const call of file.calls ?? []) {
-      if (call.name === symbol) {
+      const resolved = file.lang === "arkts" && graph ? (arktsEdgesBySite.get(`${file.path}\0${call.line}\0${call.name}\0${call.fromId}`) ?? []).map((edge) => graph.symbolsById.get(edge.targetId)) : null;
+      if (resolved ? resolved.some((target) => target.name === symbol) : call.name === symbol) {
         callers.push({ file: file.path, line: call.line, from: call.from });
       }
       if (call.from === symbol && !calleeFirstLine.has(call.name)) {
         calleeFirstLine.set(call.name, call.line);
       }
+      if (call.from === symbol) arktsTargets.set(call.name, dedupeSymbols([...arktsTargets.get(call.name) ?? [], ...resolved ?? table.get(call.name) ?? []]));
     }
   }
   callers.sort(
     (a, b) => a.file.localeCompare(b.file) || a.line - b.line || a.from.localeCompare(b.from)
   );
-  const callees = [...calleeFirstLine.entries()].map(([name2, line]) => ({ name: name2, line, targets: table.get(name2) ?? [] })).sort((a, b) => a.line - b.line || a.name.localeCompare(b.name));
+  const callees = [...calleeFirstLine.entries()].map(([name2, line]) => ({ name: name2, line, targets: arktsTargets.get(name2) ?? table.get(name2) ?? [] })).sort((a, b) => a.line - b.line || a.name.localeCompare(b.name));
   return {
     defs,
     callers: callers.slice(0, limit),
@@ -1572,7 +1744,7 @@ function resolveCallTargetsFor(fileSet, file, call, symbolsByName, symbolsByFile
   const qualified = call.qualifier !== null;
   const imports = (file.importDetails ?? []).filter((info) => info.kind !== "reexport");
   if (!qualified) {
-    const locals = named.filter((s) => s.file === file.path && lexicallyVisible(s, call));
+    const locals = named.filter((s) => s.file === file.path && lexicallyVisible(s, call) && (call.context !== "arkui" || s.signature.startsWith("struct ") || s.decorators?.some((text) => /^@Builder\b/.test(text))));
     if (locals.length > 0) {
       const unique2 = locals.length === 1;
       const owned = unique2 && isStructuralOwner(call, locals[0]);
@@ -1602,7 +1774,7 @@ function resolveCallTargetsFor(fileSet, file, call, symbolsByName, symbolsByFile
         }
         if (!isExplicitBinding(binding)) continue;
         for (const def of symbolsByName.get(binding.imported) ?? []) {
-          if (def.file === target) bound.push(def);
+          if (def.file === target && (file.lang !== "arkts" && !target.endsWith(".ets") || def.exported && def.scope.length === 0)) bound.push(def);
         }
       }
     }
@@ -1610,6 +1782,7 @@ function resolveCallTargetsFor(fileSet, file, call, symbolsByName, symbolsByFile
       const label = bound.length === 1 && directBinding && !defaultBinding ? "exact" : "import-scoped";
       return toEdges(bound, call, file.path, "explicit-import-binding", label, maxCandidates);
     }
+    if (call.context === "arkui") return [];
     const resolvedModules = /* @__PURE__ */ new Set();
     for (const info of imports) {
       const target = resolveImport(info.specifier, file.path, fileSet);
@@ -1824,7 +1997,7 @@ function findCycles(index) {
   return components;
 }
 var ENTRY_RE = /(^|\/)(index|main|cli|app|server|mod|lib|__init__)\.[A-Za-z0-9]+$|(^|\/)(bin|cmd|scripts)\/|\.config\.[A-Za-z0-9]+$/;
-var TEST_RE = /(^|\/)(tests?|__tests__)(\/|$)|\.(?:spec|test)\.[cm]?[jt]sx?$|(^|\/)(?:test_[^/]+\.py|[^/]+_test\.(?:py|go))$/;
+var TEST_RE = /(^|\/)(tests?|__tests__)(\/|$)|\.(?:spec|test)\.(?:[cm]?[jt]sx?|ets)$|(^|\/)(?:test_[^/]+\.py|[^/]+_test\.(?:py|go))$/;
 function findOrphanModules(index) {
   const { nodes, edges } = buildModuleGraph(index);
   const incoming = /* @__PURE__ */ new Map();
@@ -2136,7 +2309,7 @@ var LABEL_STRENGTH = {
 };
 var ENTRY_KINDS = /* @__PURE__ */ new Set(["function", "method", "class"]);
 var ENTRY_FILE_RE = /(^|\/)(main|index|cli|server|app)\.[^./]+$/;
-var TEST_RE2 = /(^|\/)(tests?|__tests__)(\/|$)|\.(?:spec|test)\.[cm]?[jt]sx?$|(^|\/)(?:test_[^/]+\.py|[^/]+_test\.(?:py|go))$/;
+var TEST_RE2 = /(^|\/)(tests?|__tests__)(\/|$)|\.(?:spec|test)\.(?:[cm]?[jt]sx?|ets)$|(^|\/)(?:test_[^/]+\.py|[^/]+_test\.(?:py|go))$/;
 function changeContextInputFromArgs(args, root) {
   const hasDiff = typeof args.diff === "string" && args.diff.trim().length > 0;
   const hasFiles = Array.isArray(args.files) && args.files.length > 0;
@@ -2186,7 +2359,7 @@ async function buildChangeContext(index, input, options = {}) {
   const fileSet = new Set(filesByPath.keys());
   const incomingCount = /* @__PURE__ */ new Map();
   for (const [id, edges] of graph.incoming) incomingCount.set(id, edges.length);
-  const warnings = [];
+  const warnings = indexIntegrityWarnings(index);
   const changedByKey = /* @__PURE__ */ new Map();
   const unmapped = [];
   const changedFiles = /* @__PURE__ */ new Set();
@@ -2263,6 +2436,7 @@ async function buildChangeContext(index, input, options = {}) {
         const lang = languageForFile(filePath);
         if (!lang) return null;
         const extracted = await extractAll(content, lang, filePath);
+        if (extracted.diagnostic.status !== "parsed") warnings.push(`base ${filePath.slice(0, 100)}: ${extracted.diagnostic.status} parse; change mapping incomplete`);
         return extracted.symbols;
       })();
       baseSymbolsCache.set(filePath, pending);
@@ -2928,7 +3102,7 @@ async function selectContextPack(index, context, budgetChars, maxFiles = 12) {
   const graph = buildReferenceGraph(index);
   const candidates = [];
   const seen = /* @__PURE__ */ new Set();
-  const gaps = [];
+  const gaps = [...context.warnings];
   const unavailable = /* @__PURE__ */ new Set();
   const source = async (symbol, kind, reason, extra = {}, focus) => {
     const side = extra.side ?? "current";
@@ -3044,7 +3218,7 @@ async function selectContextPack(index, context, budgetChars, maxFiles = 12) {
     task: context.task.slice(0, 120),
     route: context.route.kind,
     items: [],
-    gaps: ["budget omitted some evidence"],
+    gaps: context.warnings.some((warning) => warning.startsWith("index incomplete:")) ? ["index incomplete; inspect code_index"] : ["budget omitted some evidence"],
     budget: { budgetChars, usedChars: 0, packChars: 0, truncated: context.task.length > 120 }
   };
   const fits = () => {
@@ -3053,7 +3227,10 @@ async function selectContextPack(index, context, budgetChars, maxFiles = 12) {
   };
   if (!fits()) {
     pack.task = "";
-    pack.gaps = [];
+    fits();
+  }
+  if (!fits()) {
+    pack.gaps = pack.gaps.filter((gap) => gap.startsWith("index incomplete"));
     fits();
   }
   if (!fits()) throw new Error("budget too small for repository identity");
@@ -3073,7 +3250,7 @@ async function selectContextPack(index, context, budgetChars, maxFiles = 12) {
     }
     if (!added) pack.budget.truncated = true;
   }
-  if (!pack.budget.truncated) pack.gaps = [];
+  if (!pack.budget.truncated) pack.gaps = pack.gaps.filter((gap) => gap.startsWith("index incomplete"));
   for (const item of pack.items) if (item.file && unavailable.has(`${item.side}:${item.file}`)) {
     gaps.push(`source unavailable or changed after indexing: ${item.file} (${item.side})`);
   }
@@ -3091,7 +3268,7 @@ async function selectContextPack(index, context, budgetChars, maxFiles = 12) {
 }
 
 // src/context.ts
-var TEST_PATH_RE2 = /(^|\/)(tests?|__tests__)(\/|$)|\.(?:spec|test)\.[cm]?[jt]sx?$|(^|\/)(?:test_[^/]+\.py|[^/]+_test\.(?:py|go))$/i;
+var TEST_PATH_RE2 = /(^|\/)(tests?|__tests__)(\/|$)|\.(?:spec|test)\.(?:[cm]?[jt]sx?|ets)$|(^|\/)(?:test_[^/]+\.py|[^/]+_test\.(?:py|go))$/i;
 var FILE_TOKEN_RE = /[A-Za-z0-9_./\\-]+\.[A-Za-z0-9]+/g;
 var CODE_TOKEN_RE = /[A-Za-z_$][A-Za-z0-9_$]*(?:\.[A-Za-z_$][A-Za-z0-9_$]*)?/g;
 var STOP_WORDS = /* @__PURE__ */ new Set(
@@ -3357,7 +3534,7 @@ async function buildTaskContext(index, task, options = {}) {
   const maxSymbols = clamp2(options.maxSymbols, 1, 50, 10);
   const route = routeTask(task, index);
   let changeContext = null;
-  const warnings = [];
+  const warnings = indexIntegrityWarnings(index);
   if (route.includeChangeContext) {
     try {
       changeContext = await buildChangeContext(index, {
@@ -3645,9 +3822,9 @@ var RepoContextManager = class {
   attachWatcher(context) {
     if (!this.options.watch) return;
     const options = this.options.indexOptions();
-    const ignored = (absolute) => {
+    const ignored = (absolute, stats) => {
       const rel = path9.relative(context.root, absolute);
-      return rel === ".." || rel.startsWith(`..${path9.sep}`) || path9.isAbsolute(rel) || ignoredRelativePath(rel, options) || isGitIgnoredPath(context.root, rel, context.ignoreMatcherCache);
+      return rel === ".." || rel.startsWith(`..${path9.sep}`) || path9.isAbsolute(rel) || ignoredRelativePath(rel, options) || stats !== void 0 && isGitIgnoredPath(context.root, rel, context.ignoreMatcherCache, stats.isDirectory());
     };
     const watcher = chokidar.watch(context.root, {
       ignored,
@@ -3784,7 +3961,8 @@ var tools = [
           `files indexed: ${index.files.length}`,
           `symbols: ${total}`,
           `languages: ${[...langs].join(", ")}`,
-          index.files.length === 0 ? "no supported files found" : "index up to date"
+          index.files.length === 0 ? "no supported files found" : "index up to date",
+          ...indexIntegrityWarnings(index)
         ].join("\n");
       } catch (error) {
         return `code_index: ${error.message ?? String(error)}`;
@@ -4322,6 +4500,7 @@ export {
   findCycles,
   findOrphanModules,
   findRepoRoot,
+  indexIntegrityWarnings,
   inject,
   languageForFile,
   loadIndex,