@unerr-ai/unerr 0.1.8 → 0.1.9

package/dist/cli.js

@@ -10780,6 +10780,7 @@ var init_protocol = __esm({
 var registry_exports = {};
 __export(registry_exports, {
   addRepo: () => addRepo,
+  clearNeedsInputKey: () => clearNeedsInputKey,
   deriveLabel: () => deriveLabel,
   detectChildConflicts: () => detectChildConflicts,
   detectParentConflict: () => detectParentConflict,
@@ -10950,6 +10951,13 @@ function writeNeedsInput(repoPath, signals) {
 `
   );
 }
+function clearNeedsInputKey(repoPath, key) {
+  const existing = readNeedsInput(repoPath);
+  if (existing.length === 0) return;
+  const remaining = existing.filter((s) => s.key !== key);
+  if (remaining.length === existing.length) return;
+  writeNeedsInput(repoPath, remaining);
+}
 function buildSettings(partial) {
   const s = {};
   for (const [k, v] of Object.entries(partial)) {
@@ -11037,6 +11045,7 @@ async function enrichWithScip(files, projectRoot, existingEdges, entities, optio
     const outputDir = join29(projectRoot, ".unerr", "scip");
     const binaryPath = binaryInfo.path ?? binaryInfo.binaryName;
     let extraArgs;
+    let javaPlan = null;
     if (language === "typescript") {
       if (!existsSync25(join29(projectRoot, "tsconfig.json")) && !existsSync25(join29(projectRoot, "jsconfig.json"))) {
         log6.info(
@@ -11046,9 +11055,12 @@ async function enrichWithScip(files, projectRoot, existingEdges, entities, optio
       }
     }
     if (language === "java") {
-      const buildToolResult = await resolveJavaBuildTool(projectRoot, options);
-      if (buildToolResult) {
-        extraArgs = buildToolResult.extraArgs;
+      javaPlan = await resolveJavaBuildTool(projectRoot, options);
+      if (!javaPlan) {
+        log6.info(
+          "SCIP skipping java: no recognized build tool (Maven/Gradle/Bazel/Sbt) detected"
+        );
+        continue;
       }
     }
     if (language === "cpp") {
@@ -11065,7 +11077,13 @@ async function enrichWithScip(files, projectRoot, existingEdges, entities, optio
     log6.info(
       `SCIP enrichment: ${language} (${binaryInfo.bundled ? "bundled" : "external"}: ${binaryInfo.binaryName})`
     );
-    const runResult = await runScipIndexer({
+    const runResult = language === "java" && javaPlan ? await runJavaScipWithCascade({
+      binaryPath,
+      projectRoot,
+      outputDir,
+      timeoutMs: 3e4,
+      plan: javaPlan
+    }) : await runScipIndexer({
       language,
       binaryPath,
       projectRoot,
@@ -11226,29 +11244,106 @@ async function resolveJavaBuildTool(projectRoot, _options) {
   const stored = getStoredBuildTool(projectRoot);
   if (stored && detected.includes(stored)) {
     log6.info(`Java build tool: ${stored} (from config)`);
-    return { tool: stored, extraArgs: [`--build-tool=${stored}`] };
+    return {
+      primary: stored,
+      alternatives: [],
+      reason: "from config",
+      ambiguous: false,
+      fromConfig: true
+    };
   }
   const choice = chooseBuildTool(detected, projectRoot);
   if (!choice) return null;
-  storeBuildTool(projectRoot, choice.tool);
   if (choice.ambiguous) {
-    const signal = {
-      type: "needs_input",
-      key: "javaBuildTool",
-      auto: choice.tool,
-      alternatives: choice.alternatives,
-      reason: choice.reason
-    };
-    writeNeedsInput(projectRoot, [signal]);
     log6.info(
-      `Java build tool: ${choice.tool} (auto: ${choice.reason}). Override: unerr pm config . --java-build-tool=<tool>`
+      `Java build tool: ${choice.tool} (auto: ${choice.reason}; fallbacks: ${choice.alternatives.join(", ")})`
     );
   } else {
     log6.info(`Java build tool: ${choice.tool} (${choice.reason})`);
   }
   return {
-    tool: choice.tool,
-    extraArgs: [`--build-tool=${choice.tool}`]
+    primary: choice.tool,
+    alternatives: choice.alternatives,
+    reason: choice.reason,
+    ambiguous: choice.ambiguous,
+    fromConfig: false
+  };
+}
+function parseScipJavaBuildToolMismatch(error) {
+  if (!error) return [];
+  const match = error.match(
+    /Automatically detected the build tool\(s\) ([^.]+?) but none of them match/i
+  );
+  if (!match?.[1]) return [];
+  const known = new Set(JAVA_BUILD_TOOLS);
+  return match[1].split(/[,\s]+/).map((s) => s.trim()).filter((s) => known.has(s));
+}
+async function runJavaScipWithCascade(opts) {
+  const candidates = [
+    opts.plan.primary,
+    ...opts.plan.alternatives
+  ];
+  const attempted = [];
+  let lastResult = null;
+  for (let i = 0; i < candidates.length; i++) {
+    const tool = candidates[i];
+    attempted.push(tool);
+    if (i === 0) {
+      log6.info(`scip-java attempting --build-tool=${tool}`);
+    } else {
+      log6.info(
+        `scip-java retrying --build-tool=${tool} (fallback #${i}, after ${attempted.slice(0, -1).join(" \u2192 ")})`
+      );
+    }
+    const result = await runScipIndexer({
+      language: "java",
+      binaryPath: opts.binaryPath,
+      projectRoot: opts.projectRoot,
+      outputDir: opts.outputDir,
+      timeoutMs: opts.timeoutMs,
+      extraArgs: [`--build-tool=${tool}`]
+    });
+    lastResult = result;
+    if (result.success) {
+      storeBuildTool(opts.projectRoot, tool);
+      clearNeedsInputKey(opts.projectRoot, "javaBuildTool");
+      if (attempted.length > 1) {
+        log6.info(
+          `scip-java cascade resolved: ${tool} (${attempted.join(" \u2192 ")})`
+        );
+      }
+      return result;
+    }
+    const detectedByScip = parseScipJavaBuildToolMismatch(result.error);
+    if (detectedByScip.length === 0) {
+      return result;
+    }
+    const detectedSet = new Set(detectedByScip);
+    const remaining = candidates.slice(i + 1).filter((t) => detectedSet.has(t) && !attempted.includes(t));
+    if (remaining.length === 0) {
+      log6.warn(
+        `scip-java cascade exhausted: tried ${attempted.join(" \u2192 ")}; scip-java detected ${detectedByScip.join(", ")} but no viable fallback remains`
+      );
+      const signal = {
+        type: "needs_input",
+        key: "javaBuildTool",
+        auto: opts.plan.primary,
+        alternatives: opts.plan.alternatives,
+        reason: `cascade exhausted (tried ${attempted.join(" \u2192 ")}); override with unerr pm config <repo> --java-build-tool=<tool>`
+      };
+      writeNeedsInput(opts.projectRoot, [signal]);
+      return result;
+    }
+    candidates.splice(i + 1, candidates.length - i - 1, ...remaining);
+    log6.warn(
+      `scip-java rejected --build-tool=${tool} (scip-java detected: ${detectedByScip.join(", ")}); cascading to ${candidates[i + 1]}`
+    );
+  }
+  return lastResult ?? {
+    success: false,
+    outputPath: null,
+    durationMs: 0,
+    error: "no Java build tool candidates available"
   };
 }
 function resolveCompileCommandsJson(projectRoot) {
@@ -11333,6 +11428,7 @@ var init_orchestrator = __esm({
     init_downloader();
     init_merger();
     init_runner();
+    init_protocol();
     init_registry();
     log6 = createModuleLogger("scip-orchestrator");
     BUILD_TOOL_FILES = {
@@ -14874,7 +14970,7 @@ function installFileLogger(opts) {
     bytesWritten = statSync9(filePath).size;
   } catch {
   }
-  const linePrefix = usePrefix ? `[pid=${process.pid} sid=${getOrCreateSid()}] ` : "";
+  const idSuffix = usePrefix ? ` pid=${process.pid} sid=${getOrCreateSid()}] ` : "";
   const original = process.stderr.write;
   const bound = original.bind(process.stderr);
   const wrapped = ((chunk, ...rest) => {
@@ -14882,6 +14978,7 @@ function installFileLogger(opts) {
     try {
       const text2 = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf-8");
       const clean = stripAnsi2(text2);
+      const linePrefix = usePrefix ? `[${(/* @__PURE__ */ new Date()).toISOString()}${idSuffix}` : "";
       const out = usePrefix ? prefixLines(clean, linePrefix) : clean;
       appendFileSync5(filePath, out);
       bytesWritten += out.length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unerr-ai/unerr",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Local-first code intelligence CLI for unerr",
   "type": "module",
   "bin": {