@ngockhoale/ukit 3.4.29 → 3.4.30

package/template_project/.claude/ukit/index/cleanup-task-worktree.mjs

@@ -167,7 +167,7 @@ const APPROVAL_KEYS = [
   'schemaVersion', 'taskId', 'receiptSha256', 'verdict', 'executorModel',
   'reviewerModel', 'reviewedResultTree',
 ];
-const TASK_TOKEN = /^TASK-C97-\d{3}$/;
+const TASK_TOKEN = /^TASK-(?:[A-Z]\d{1,3}-)?\d{3,4}$/;
 const OID = /^[0-9a-f]{40}$/;
 
 function readJson(p, taskId, label) {

package/template_project/.claude/ukit/index/impact-context.mjs

@@ -34,30 +34,85 @@ async function main() {
     return;
   }
 
-  await ensureFreshIndex(rootDir);
-
-  const impact = resolveImpactContext
-    ? await resolveImpactContext({ rootDir, changedFiles, changedSymbols })
-    : {
-        changedFiles,
-        changedSymbols,
-        riskLabels: [],
-        callees: [],
-        callers: [],
-        importers: [],
-        mirrorCounterparts: [],
-        relatedTests: [],
-        recommendedTestFiles: [],
-      };
+  let impact = null;
+  try {
+    await ensureFreshIndex(rootDir);
+    impact = resolveImpactContext
+      ? await resolveImpactContext({ rootDir, changedFiles, changedSymbols })
+      : {
+          changedFiles,
+          changedSymbols,
+          riskLabels: [],
+          callees: [],
+          callers: [],
+          importers: [],
+          mirrorCounterparts: [],
+          relatedTests: [],
+          recommendedTestFiles: [],
+        };
+  } catch (error) {
+    // Index missing, rebuild failed, or lock timed out — answer from source
+    // with a bounded search instead of exiting 1.
+    const answered = await runFallbackSearch(rootDir, changedFiles, changedSymbols);
+    if (!answered) {
+      throw error;
+    }
+    return;
+  }
 
   printCompact(impact);
 
+  if ((impact.unverifiedImpact ?? []).length > 0) {
+    console.log(`unverified-impact: ${impact.unverifiedImpact.slice(0, CALLER_CAP).join(', ')}`);
+    console.log('note: name-only matches without import proof — verify before acting');
+  }
+  const truncated = impact.truncated ?? {};
+  const truncatedParts = Object.entries(truncated).filter(([, count]) => count > 0).map(([key, count]) => `${key}:+${count}`);
+  if (truncatedParts.length > 0) {
+    console.log(`truncated: ${truncatedParts.join(', ')}`);
+  }
+
   if (formatImpactConfidenceSummary) {
     console.log('');
     console.log(formatImpactConfidenceSummary(impact));
   }
 }
 
+// Bounded source search over the changed file basenames and symbol names.
+// Returns true when it produced output; false when the fallback itself is
+// unavailable so the original index error can surface.
+async function runFallbackSearch(rootDir, changedFiles, changedSymbols) {
+  if (typeof indexCore.boundedSourceSearch !== 'function') {
+    return false;
+  }
+  const queries = [
+    ...changedFiles.map((filePath) => String(filePath).split('/').pop().replace(/\.[^.]+$/, '')),
+    ...changedSymbols,
+  ].filter(Boolean).slice(0, 4);
+  try {
+    console.log('source: fallback-search');
+    let printed = 0;
+    for (const searchQuery of queries) {
+      const rows = await indexCore.boundedSourceSearch({ rootDir, query: searchQuery, limit: 5 });
+      console.log(`[ukit:impact:fallback] ${rows.length} source matches for: ${searchQuery}`);
+      for (const row of rows) {
+        console.log(`  ${row.filePath}${row.line ? `:${row.line}` : ''}`);
+      }
+      if (rows.truncated?.length) {
+        console.log(`[ukit:impact:fallback] search truncated (${rows.truncated.join(',')}) — NOT exhaustive`);
+      }
+      printed += rows.length;
+    }
+    if (printed === 0) {
+      console.log('[ukit:impact:fallback] no source matches — verify changed files manually');
+    }
+    return true;
+  } catch (fallbackError) {
+    console.error(`fallback-search failed: ${fallbackError && fallbackError.message ? fallbackError.message : fallbackError}`);
+    return false;
+  }
+}
+
 async function ensureFreshIndex(rootDir) {
   if (typeof indexCore.ensureIndexFresh === 'function') {
     return indexCore.ensureIndexFresh({ rootDir });

package/template_project/.claude/ukit/index/land-worktree.mjs

@@ -168,8 +168,8 @@ function readScope() {
   }
   if (parsed.schemaVersion !== 1) refuse(parsed.taskId, 'invalid-scope', 'schemaVersion must be 1');
   const { taskId, baseCommit, sourceRoot, destinationRoot, sourceHead, destinationHead, targetPaths } = parsed;
-  if (typeof taskId !== 'string' || !/^TASK-C97-\d{3}$/.test(taskId)) {
-    refuse(taskId, 'invalid-scope', 'taskId must be an exact TASK-C97-009-style token');
+  if (typeof taskId !== 'string' || !/^TASK-(?:[A-Z]\d{1,3}-)?\d{3,4}$/.test(taskId)) {
+    refuse(taskId, 'invalid-scope', 'taskId must be an exact TASK-001 or TASK-C97-009 style token');
   }
   for (const [k, v] of Object.entries({ baseCommit, sourceRoot, destinationRoot, sourceHead, destinationHead })) {
     if (typeof v !== 'string' || v.length === 0) refuse(taskId, 'invalid-scope', `${k} must be a nonempty string`);