opencode-sonarqube 1.2.6 → 1.2.8

package/dist/index.js

@@ -20229,7 +20229,9 @@ var SonarQubePlugin = async ({ client, directory, worktree }) => {
 `);
     } catch {}
   };
+  safeLog(`=== PLUGIN INIT === directory="${directory}" worktree="${worktree}"`);
   const pluginImportUrl = import.meta.url;
+  safeLog(`pluginImportUrl="${pluginImportUrl}"`);
   const resolveDirectoryFromImportUrl = () => {
     try {
       const pluginPath = decodeURIComponent(pluginImportUrl.replace("file://", ""));
@@ -20237,7 +20239,7 @@ var SonarQubePlugin = async ({ client, directory, worktree }) => {
       const nodeModulesIndex = pathParts.indexOf("node_modules");
       if (nodeModulesIndex > 0) {
         const projectPath = pathParts.slice(0, nodeModulesIndex).join("/");
-        if (projectPath && projectPath !== "/" && projectPath.length > 1) {
+        if (projectPath && projectPath !== "/" && projectPath.length > 1 && !projectPath.includes(".cache/opencode")) {
           return projectPath;
         }
       }
@@ -20245,16 +20247,24 @@ var SonarQubePlugin = async ({ client, directory, worktree }) => {
     return null;
   };
   const resolveValidDirectory = () => {
-    const fromImportUrl = resolveDirectoryFromImportUrl();
-    if (fromImportUrl)
-      return fromImportUrl;
-    if (worktree && worktree !== "/" && worktree.length > 1)
+    if (worktree && worktree !== "/" && worktree.length > 1) {
+      safeLog(`Using worktree: ${worktree}`);
       return worktree;
-    if (directory && directory !== "/" && directory.length > 1)
+    }
+    if (directory && directory !== "/" && directory.length > 1) {
+      safeLog(`Using directory: ${directory}`);
       return directory;
+    }
+    const fromImportUrl = resolveDirectoryFromImportUrl();
+    if (fromImportUrl) {
+      safeLog(`Using fromImportUrl: ${fromImportUrl}`);
+      return fromImportUrl;
+    }
     const cwd = process.cwd();
-    if (cwd && cwd !== "/" && cwd.length > 1)
+    if (cwd && cwd !== "/" && cwd.length > 1) {
+      safeLog(`Using cwd: ${cwd}`);
       return cwd;
+    }
     return process.env["HOME"] || "/Users";
   };
   const effectiveDirectory = resolveValidDirectory();
@@ -20565,25 +20575,40 @@ Fix these issues before ${operationType === "commit" ? "committing" : "pushing"}
     await showToast(`SonarQube: ${operationType} BLOCKED`, "error");
     return { block: true, message };
   };
+  const isGitCommit = (cmd) => /git\s+commit\b/.test(cmd) && !/--amend/.test(cmd);
+  const isGitPush = (cmd) => /git\s+push\b/.test(cmd);
+  const processAnalysisResult = async (analysisResult, blockingSeverity, shouldBlock, fixBeforeCommit, autoFix) => {
+    const passedCheck = analysisResult.qualityGateStatus === "OK" || !checkBlockingIssues(analysisResult.issues, blockingSeverity);
+    if (passedCheck) {
+      await showToast("SonarQube: Quality check passed!", "success");
+      return { block: false };
+    }
+    if (fixBeforeCommit && autoFix) {
+      await sendAutoFixPrompt(analysisResult);
+      return { block: shouldBlock, message: "SonarQube is fixing issues. Please wait and try again." };
+    }
+    const warningMessage = await sendBlockingMessage(analysisResult.issues, shouldBlock, autoFix);
+    return { block: shouldBlock, message: warningMessage };
+  };
   const handleGitOperationCheck = async (output, operationType) => {
     const args = output.args;
     const command = args?.command ?? "";
-    const isCommit = /git\s+commit\b/.test(command) && !/--amend/.test(command);
-    const isPush = /git\s+push\b/.test(command);
-    const isMatchingOperation = operationType === "commit" && isCommit || operationType === "push" && isPush;
-    if (!isMatchingOperation)
+    const isMatch = operationType === "commit" ? isGitCommit(command) : isGitPush(command);
+    if (!isMatch)
       return { block: false };
     await loadPluginConfig();
     const sonarConfig = pluginConfig?.["sonarqube"];
     const config2 = loadConfig(sonarConfig);
+    safeLog(`[handleGitOperationCheck] ${operationType}: level=${config2?.level}`);
     if (!config2 || config2.level === "off")
       return { block: false };
     const { analyzeBeforeCommit = true, blockCommit = false, blockPush = false } = config2;
     const { fixBeforeCommit = false, blockingSeverity = "CRITICAL", autoFix = false } = config2;
-    const shouldBlock = operationType === "commit" && blockCommit || operationType === "push" && blockPush;
+    const shouldBlock = operationType === "commit" ? blockCommit : blockPush;
     try {
       const dir = getDirectory();
       const state = await getProjectState(dir);
+      safeLog(`[handleGitOperationCheck] dir=${dir}, projectKey=${state?.projectKey ?? "NONE"}`);
       if (!state?.projectKey)
         return { block: false };
       const api2 = createSonarQubeAPI(config2, state);
@@ -20592,22 +20617,10 @@ Fix these issues before ${operationType === "commit" ? "committing" : "pushing"}
       }
       await showToast("SonarQube: Running pre-commit analysis...", "info");
       const analysisResult = await runAnalysis(config2, state, { projectKey: state.projectKey }, dir);
-      if (analysisResult.qualityGateStatus === "OK") {
-        await showToast("SonarQube: Quality check passed!", "success");
-        return { block: false };
-      }
-      const hasBlockingIssues = checkBlockingIssues(analysisResult.issues, blockingSeverity);
-      if (!hasBlockingIssues) {
-        await showToast("SonarQube: Quality check passed!", "success");
-        return { block: false };
-      }
-      if (fixBeforeCommit && autoFix) {
-        await sendAutoFixPrompt(analysisResult);
-        return { block: shouldBlock, message: "SonarQube is fixing issues. Please wait and try again." };
-      }
-      const warningMessage = await sendBlockingMessage(analysisResult.issues, shouldBlock, autoFix);
-      return { block: shouldBlock, message: warningMessage };
-    } catch {
+      safeLog(`[handleGitOperationCheck] qualityGate=${analysisResult.qualityGateStatus}`);
+      return processAnalysisResult(analysisResult, blockingSeverity, shouldBlock, fixBeforeCommit, autoFix);
+    } catch (err) {
+      safeLog(`[handleGitOperationCheck] ERROR: ${err instanceof Error ? err.message : String(err)}`);
       return { block: false };
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-sonarqube",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "OpenCode Plugin for SonarQube integration - Enterprise-level code quality from the start",
   "type": "module",
   "main": "dist/index.js",