@ngockhoale/ukit 1.4.0 → 1.4.2

package/src/index/gitHooks.js

@@ -1,6 +1,8 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
+import { escapeRegExp } from '../core/fileOps.js';
+
 const HOOK_NAMES = ['post-commit', 'post-merge', 'post-checkout'];
 const BEGIN = '# UKit index auto-refresh (begin)';
 const END = '# UKit index auto-refresh (end)';
@@ -17,12 +19,13 @@ export async function installIndexRefreshHooks({ projectRoot }) {
     const existing = await readTextOrEmpty(hookPath);
     const base = existing || '#!/bin/sh\n';
 
-    if (hasManagedBlock(base)) {
+    if (hasCompleteManagedBlock(base)) {
       unchanged += 1;
       continue;
     }
 
-    const next = `${base.trimEnd()}\n\n${buildManagedBlock()}\n`;
+    const cleanedBase = removeManagedBlockFragments(base);
+    const next = `${cleanedBase.trimEnd()}\n\n${buildManagedBlock()}\n`;
     await fs.writeFile(hookPath, next, { mode: 0o755 });
     await fs.chmod(hookPath, 0o755);
     installed += 1;
@@ -45,7 +48,7 @@ export async function removeIndexRefreshHooks({ projectRoot }) {
   for (const hookName of HOOK_NAMES) {
     const hookPath = path.join(hooksDir, hookName);
     const existing = await readTextOrEmpty(hookPath);
-    if (!existing || !hasManagedBlock(existing)) {
+    if (!existing || !hasCompleteManagedBlock(existing)) {
       unchanged += 1;
       continue;
     }
@@ -75,8 +78,10 @@ function buildManagedBlock() {
   ].join('\n');
 }
 
-function hasManagedBlock(content) {
-  return content.includes(BEGIN) && content.includes(END);
+function hasCompleteManagedBlock(content) {
+  const beginIndex = content.indexOf(BEGIN);
+  const endIndex = content.indexOf(END, beginIndex + BEGIN.length);
+  return beginIndex >= 0 && endIndex > beginIndex;
 }
 
 function removeManagedBlock(content) {
@@ -84,8 +89,28 @@ function removeManagedBlock(content) {
   return content.replace(pattern, '').replace(/\n{3,}/g, '\n\n');
 }
 
-function escapeRegExp(input) {
-  return input.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+function removeManagedBlockFragments(content) {
+  const lines = content.split('\n');
+  const kept = [];
+  let skipping = false;
+
+  for (const line of lines) {
+    if (line === BEGIN) {
+      skipping = true;
+      continue;
+    }
+
+    if (line === END) {
+      skipping = false;
+      continue;
+    }
+
+    if (!skipping) {
+      kept.push(line);
+    }
+  }
+
+  return kept.join('\n').replace(/\n{3,}/g, '\n\n');
 }
 
 async function ensureHooksDir(hooksDir) {

package/src/index/impactContext.js

@@ -38,6 +38,17 @@ function unique(values = []) {
   return [...new Set(values.filter(Boolean))];
 }
 
+function dedupeCallers(callers = []) {
+  const byKey = new Map();
+  for (const caller of callers) {
+    const key = `${caller.filePath}\0${caller.symbol}`;
+    if (!byKey.has(key)) {
+      byKey.set(key, caller);
+    }
+  }
+  return [...byKey.values()];
+}
+
 function resolveImportTarget(fromFilePath, specifier) {
   const from = normalizePath(fromFilePath);
   const to = String(specifier ?? '').trim();
@@ -119,10 +130,7 @@ export async function resolveImpactContext({
         continue;
       }
 
-      if (
-        changedFileSet.has(normalizePath(record.filePath))
-        && changedSymbolSet.has(record.symbol)
-      ) {
+      if (changedFileSet.has(normalizePath(record.filePath))) {
         continue;
       }
 
@@ -161,13 +169,15 @@ export async function resolveImpactContext({
     ...risk.riskLabels.flatMap((label) => RISK_TEST_RECOMMENDATIONS[label] ?? []),
   ]);
 
+  const dedupedCallers = dedupeCallers(callers).slice(0, budget.maxCallers);
+
   return {
     changedFiles: normalizedChangedFiles,
     changedSymbols: normalizedChangedSymbols,
     riskLabels: risk.riskLabels,
     requiresImpactCheck: risk.requiresImpactCheck,
     callees: unique(callees.map((item) => JSON.stringify(item))).map((value) => JSON.parse(value)).slice(0, budget.maxCallees),
-    callers: unique(callers.map((item) => JSON.stringify(item))).map((value) => JSON.parse(value)).slice(0, budget.maxCallers),
+    callers: dedupedCallers,
     importers: unique(importers).slice(0, budget.maxImporters),
     dependencies: unique(dependencies).slice(0, budget.maxImporters),
     mirrorCounterparts,
@@ -175,7 +185,7 @@ export async function resolveImpactContext({
     recommendedTestFiles,
     explanations: {
       callees: changedRecords.map((record) => `${record.filePath}:${record.symbol}`),
-      callers: callers.map((entry) => `${entry.filePath}:${entry.symbol}`),
+      callers: dedupedCallers.map((entry) => `${entry.filePath}:${entry.symbol}`),
       importers,
       relatedTests,
       mirrorCounterparts: mirrorCounterparts.map((entry) => `${entry.source} -> ${entry.filePath}`),

package/src/index/importResolution.js

@@ -27,6 +27,17 @@ const DEFAULT_ALIAS_RULES = [
 ];
 const ALIAS_CONTEXT_CACHE = new Map();
 const ROOT_ALIAS_CONFIG_FILES = ['tsconfig.json', 'jsconfig.json'];
+const MAX_CACHE_ENTRIES = 100;
+
+function setBoundedCacheEntry(map, key, value, maxEntries = MAX_CACHE_ENTRIES) {
+  if (map.has(key)) {
+    map.delete(key);
+  }
+  map.set(key, value);
+  while (map.size > maxEntries) {
+    map.delete(map.keys().next().value);
+  }
+}
 
 export async function loadImportAliasContext({ rootDir }) {
   const loaded = await loadImportAliasContextState({ rootDir });
@@ -49,7 +60,7 @@ export async function loadImportAliasContextState({ rootDir }) {
       ALIAS_CONTEXT_CACHE.delete(absoluteRoot);
       throw error;
     });
-  ALIAS_CONTEXT_CACHE.set(absoluteRoot, contextPromise);
+  setBoundedCacheEntry(ALIAS_CONTEXT_CACHE, absoluteRoot, contextPromise);
 
   return contextPromise;
 }
@@ -225,9 +236,9 @@ async function loadAliasConfig(configPath, visited = new Set(), tracker = null)
 
   let inherited = null;
   const extendsValue = typeof parsed?.extends === 'string' ? parsed.extends.trim() : '';
-  if (extendsValue && (extendsValue.startsWith('.') || extendsValue.startsWith('/'))) {
-    const inheritedPath = resolveExtendedConfigPath(configDir, extendsValue);
-    inherited = await loadAliasConfig(inheritedPath, visited, tracker);
+  if (extendsValue) {
+    const inheritedPath = await resolveExtendedConfigPath(configDir, extendsValue);
+    inherited = inheritedPath ? await loadAliasConfig(inheritedPath, visited, tracker) : null;
   }
 
   const inheritedRules = inherited?.pathRules ?? [];
@@ -279,11 +290,48 @@ function buildBaseUrlDirs({ rootDir, compilerOptions }) {
   return [path.resolve(rootDir, baseUrl)];
 }
 
-function resolveExtendedConfigPath(configDir, extendsValue) {
+async function resolveExtendedConfigPath(configDir, extendsValue) {
   const withExtension = extendsValue.endsWith('.json')
     ? extendsValue
     : `${extendsValue}.json`;
-  return path.resolve(configDir, withExtension);
+  if (withExtension.startsWith('.') || withExtension.startsWith('/')) {
+    return path.resolve(configDir, withExtension);
+  }
+
+  const parts = withExtension.split('/').filter(Boolean);
+  if (parts.length === 0) {
+    return null;
+  }
+
+  const packageName = withExtension.startsWith('@')
+    ? parts.slice(0, 2).join('/')
+    : parts[0];
+  const packageRest = parts.slice(packageName.startsWith('@') ? 2 : 1).join('/');
+  const packageRoot = await findNodeModulePackageRoot(configDir, packageName);
+  if (!packageRoot) {
+    return null;
+  }
+
+  return path.join(packageRoot, packageRest || 'tsconfig.json');
+}
+
+async function findNodeModulePackageRoot(startDir, packageName) {
+  let currentDir = path.resolve(startDir);
+  while (true) {
+    const candidate = path.join(currentDir, 'node_modules', packageName);
+    try {
+      const stat = await fs.stat(candidate);
+      if (stat.isDirectory()) {
+        return candidate;
+      }
+    } catch {}
+
+    const parentDir = path.dirname(currentDir);
+    if (parentDir === currentDir) {
+      return null;
+    }
+    currentDir = parentDir;
+  }
 }
 
 async function isAliasSnapshotValid(snapshot = []) {
@@ -319,18 +367,16 @@ function isSameSnapshotEntry(current, previous) {
 
 function parseJsonc(raw) {
   const withoutBom = raw.replace(/^\uFEFF/, '');
-  const withoutBlockComments = withoutBom.replace(/\/\*[\s\S]*?\*\//g, '');
-  const withoutLineComments = stripLineComments(withoutBlockComments);
-  const withoutTrailingCommas = withoutLineComments.replace(/,\s*([}\]])/g, '$1');
+  const withoutComments = stripJsoncComments(withoutBom);
+  const withoutTrailingCommas = stripJsoncTrailingCommas(withoutComments);
 
   return JSON.parse(withoutTrailingCommas);
 }
 
-function stripLineComments(raw) {
+function stripJsoncComments(raw) {
   let result = '';
   let inString = false;
-  let stringQuote = '';
-  let isEscaped = false;
+  let escaped = false;
 
   for (let index = 0; index < raw.length; index += 1) {
     const char = raw[index];
@@ -338,31 +384,28 @@ function stripLineComments(raw) {
 
     if (inString) {
       result += char;
-      if (isEscaped) {
-        isEscaped = false;
-      } else if (char === '\\') {
-        isEscaped = true;
-      } else if (char === stringQuote) {
-        inString = false;
-        stringQuote = '';
-      }
+      if (escaped) escaped = false;
+      else if (char === '\\') escaped = true;
+      else if (char === '"') inString = false;
       continue;
     }
 
-    if (char === '"' || char === '\'') {
+    if (char === '"') {
       inString = true;
-      stringQuote = char;
       result += char;
       continue;
     }
 
     if (char === '/' && nextChar === '/') {
-      while (index < raw.length && raw[index] !== '\n') {
-        index += 1;
-      }
-      if (index < raw.length) {
-        result += '\n';
-      }
+      while (index < raw.length && raw[index] !== '\n') index += 1;
+      if (index < raw.length) result += '\n';
+      continue;
+    }
+
+    if (char === '/' && nextChar === '*') {
+      index += 2;
+      while (index < raw.length && !(raw[index] === '*' && raw[index + 1] === '/')) index += 1;
+      index += 1;
       continue;
     }
 
@@ -372,6 +415,40 @@ function stripLineComments(raw) {
   return result;
 }
 
+function stripJsoncTrailingCommas(raw) {
+  let result = '';
+  let inString = false;
+  let escaped = false;
+
+  for (let index = 0; index < raw.length; index += 1) {
+    const char = raw[index];
+
+    if (inString) {
+      result += char;
+      if (escaped) escaped = false;
+      else if (char === '\\') escaped = true;
+      else if (char === '"') inString = false;
+      continue;
+    }
+
+    if (char === '"') {
+      inString = true;
+      result += char;
+      continue;
+    }
+
+    if (char === ',') {
+      let nextIndex = index + 1;
+      while (/\s/.test(raw[nextIndex] ?? '')) nextIndex += 1;
+      if (raw[nextIndex] === '}' || raw[nextIndex] === ']') continue;
+    }
+
+    result += char;
+  }
+
+  return result;
+}
+
 function dedupe(values) {
   return [...new Set(values)];
 }

package/src/index/paths.js

@@ -26,3 +26,32 @@ export function getArtifactPath(rootDir, artifactName) {
 export function normalizeRelative(rootDir, absolutePath) {
   return path.relative(rootDir, absolutePath).replace(/\\/g, '/');
 }
+
+export function isLikelyTestFilePath(filePath) {
+  const lower = filePath.toLowerCase();
+  return (
+    lower.startsWith('__tests__/')
+    || lower.startsWith('test/')
+    || lower.startsWith('tests/')
+    || lower.startsWith('spec/')
+    || lower.startsWith('specs/')
+    || lower.includes('/__tests__/')
+    || lower.includes('/test/')
+    || lower.includes('/spec/')
+    || lower.includes('/specs/')
+    || lower.endsWith('.test.js')
+    || lower.endsWith('.test.ts')
+    || lower.endsWith('.test.vue')
+    || lower.endsWith('.test.tsx')
+    || lower.endsWith('.test.jsx')
+    || lower.endsWith('.test.mjs')
+    || lower.endsWith('.test.cjs')
+    || lower.endsWith('.spec.js')
+    || lower.endsWith('.spec.ts')
+    || lower.endsWith('.spec.vue')
+    || lower.endsWith('.spec.tsx')
+    || lower.endsWith('.spec.jsx')
+    || lower.endsWith('.spec.mjs')
+    || lower.endsWith('.spec.cjs')
+  );
+}

package/src/index/queryIndex.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { getArtifactPath, getIndexDir, INDEX_ARTIFACTS } from './paths.js';
+import { getArtifactPath, getIndexDir, INDEX_ARTIFACTS, isLikelyTestFilePath } from './paths.js';
 import { importsNeedAliasContext, loadImportAliasContext, resolveImportSpecifier } from './importResolution.js';
 import { buildSearchDescriptor } from './languageTools.js';
 
@@ -10,8 +10,19 @@ const QUERY_SEARCH_BUNDLE_CACHE = new Map();
 const QUERY_SUPPORT_BUNDLE_CACHE = new Map();
 const QUERY_RESULT_CACHE = new Map();
 const ANALOG_RESULT_CACHE = new Map();
+const MAX_CACHE_ENTRIES = 100;
 const MAX_IMPORTER_HOPS = 2;
 
+function setBoundedCacheEntry(map, key, value, maxEntries = MAX_CACHE_ENTRIES) {
+  if (map.has(key)) {
+    map.delete(key);
+  }
+  map.set(key, value);
+  while (map.size > maxEntries) {
+    map.delete(map.keys().next().value);
+  }
+}
+
 export async function queryCodeIndex({ rootDir = process.cwd(), query, limit = 5 } = {}) {
   if (!query || !query.trim()) {
     return [];
@@ -115,7 +126,7 @@ export async function queryCodeIndex({ rootDir = process.cwd(), query, limit = 5
     throw error;
   });
 
-  QUERY_RESULT_CACHE.set(queryCacheKey, queryPromise);
+  setBoundedCacheEntry(QUERY_RESULT_CACHE, queryCacheKey, queryPromise);
   return queryPromise;
 }
 
@@ -123,7 +134,8 @@ async function readArtifact(rootDir, artifactName) {
   const artifactPath = getArtifactPath(path.resolve(rootDir), artifactName);
 
   if (!ARTIFACT_CACHE.has(artifactPath)) {
-    ARTIFACT_CACHE.set(
+    setBoundedCacheEntry(
+      ARTIFACT_CACHE,
       artifactPath,
       fs.readFile(artifactPath, 'utf8')
         .then((content) => {
@@ -148,7 +160,8 @@ async function loadQuerySearchBundle(rootDir) {
   const absoluteRoot = path.resolve(rootDir);
 
   if (!QUERY_SEARCH_BUNDLE_CACHE.has(absoluteRoot)) {
-    QUERY_SEARCH_BUNDLE_CACHE.set(
+    setBoundedCacheEntry(
+      QUERY_SEARCH_BUNDLE_CACHE,
       absoluteRoot,
       Promise.all([
         readArtifact(absoluteRoot, INDEX_ARTIFACTS.files),
@@ -177,7 +190,8 @@ async function loadQuerySupportBundle(rootDir) {
   const absoluteRoot = path.resolve(rootDir);
 
   if (!QUERY_SUPPORT_BUNDLE_CACHE.has(absoluteRoot)) {
-    QUERY_SUPPORT_BUNDLE_CACHE.set(
+    setBoundedCacheEntry(
+      QUERY_SUPPORT_BUNDLE_CACHE,
       absoluteRoot,
       loadQuerySearchBundle(absoluteRoot)
         .then(({ files }) => Promise.all([
@@ -517,35 +531,6 @@ function buildResolvedImportGraphs(rootDir, imports, indexedFileSet, importAlias
   };
 }
 
-function isLikelyTestFilePath(filePath) {
-  const lower = filePath.toLowerCase();
-  return (
-    lower.startsWith('__tests__/')
-    || lower.startsWith('test/')
-    || lower.startsWith('tests/')
-    || lower.startsWith('spec/')
-    || lower.startsWith('specs/')
-    || lower.includes('/__tests__/')
-    || lower.includes('/test/')
-    || lower.includes('/spec/')
-    || lower.includes('/specs/')
-    || lower.endsWith('.test.js')
-    || lower.endsWith('.test.ts')
-    || lower.endsWith('.test.tsx')
-    || lower.endsWith('.test.jsx')
-    || lower.endsWith('.test.vue')
-    || lower.endsWith('.test.mjs')
-    || lower.endsWith('.test.cjs')
-    || lower.endsWith('.spec.js')
-    || lower.endsWith('.spec.ts')
-    || lower.endsWith('.spec.tsx')
-    || lower.endsWith('.spec.jsx')
-    || lower.endsWith('.spec.vue')
-    || lower.endsWith('.spec.mjs')
-    || lower.endsWith('.spec.cjs')
-  );
-}
-
 // ── Index V2: Analog Query ──
 
 export async function queryAnalog({ rootDir = process.cwd(), filePath, limit = 5 } = {}) {
@@ -577,7 +562,7 @@ export async function queryAnalog({ rootDir = process.cwd(), filePath, limit = 5
       throw error;
     });
 
-  ANALOG_RESULT_CACHE.set(analogCacheKey, analogPromise);
+  setBoundedCacheEntry(ANALOG_RESULT_CACHE, analogCacheKey, analogPromise);
   return analogPromise;
 }
 

package/src/index/relatedTests.js

@@ -12,6 +12,17 @@ const RELATED_TEST_RELATION_TYPES = [
 ];
 const RELATED_TEST_ARTIFACT_CACHE = new Map();
 const RELATED_TEST_LOOKUP_CACHE = new Map();
+const MAX_CACHE_ENTRIES = 100;
+
+function setBoundedCacheEntry(map, key, value, maxEntries = MAX_CACHE_ENTRIES) {
+  if (map.has(key)) {
+    map.delete(key);
+  }
+  map.set(key, value);
+  while (map.size > maxEntries) {
+    map.delete(map.keys().next().value);
+  }
+}
 
 export async function inferRelatedTests({
   rootDir = process.cwd(),
@@ -48,7 +59,8 @@ export async function loadRelatedTestArtifacts({
 
   if (!analogsArtifact && !relationsArtifact) {
     if (!RELATED_TEST_LOOKUP_CACHE.has(absoluteRoot)) {
-      RELATED_TEST_LOOKUP_CACHE.set(
+      setBoundedCacheEntry(
+        RELATED_TEST_LOOKUP_CACHE,
         absoluteRoot,
         Promise.all([
           readArtifact(absoluteRoot, INDEX_ARTIFACTS.analogs),
@@ -193,7 +205,8 @@ async function readArtifact(rootDir, artifactName) {
   const artifactPath = getArtifactPath(path.resolve(rootDir), artifactName);
 
   if (!RELATED_TEST_ARTIFACT_CACHE.has(artifactPath)) {
-    RELATED_TEST_ARTIFACT_CACHE.set(
+    setBoundedCacheEntry(
+      RELATED_TEST_ARTIFACT_CACHE,
       artifactPath,
       fs.readFile(artifactPath, 'utf8')
         .then((content) => JSON.parse(content))

package/src/index/routeCatalog.js

@@ -66,7 +66,7 @@ export const ROUTE_CATALOG = [
   {
     id: 'postgres',
     path: '.claude/skills/postgres/SKILL.md',
-    order: 4,
+    order: 4.5,
     signals: [
       { type: 'prompt', regex: /\b(sql|postgres|postgresql|migration|schema|table|view|index|trigger|function|stored procedure|materialized view|query plan|explain)\b/i, score: 5 },
       { type: 'command', regex: /\b(psql|prisma|drizzle|knex|sequelize|typeorm)\b/i, score: 4 },