@shakecodeslikecray/whiterose 1.0.5 → 1.0.6

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { readFileSync, existsSync, mkdirSync, writeFileSync, readdirSync, statSync, rmSync, mkdtempSync, realpathSync } from 'fs';
+import { readFileSync, existsSync, mkdirSync, writeFileSync, rmSync, readdirSync, statSync, mkdtempSync, realpathSync } from 'fs';
 import { join, dirname, isAbsolute, resolve, basename, relative } from 'path';
 import chalk3 from 'chalk';
 import * as readline from 'readline';
@@ -2253,6 +2253,7 @@ var CoreScanner = class {
    */
   async quickScan(context) {
     const cwd = process.cwd();
+    this.passErrors = [];
     this.report(`
 \u2550\u2550\u2550\u2550 QUICK SCAN \u2550\u2550\u2550\u2550`);
     this.report(`  Provider: ${this.executor.name}`);
@@ -2266,7 +2267,9 @@ var CoreScanner = class {
       this.report(`  Found ${bugs.length} bugs`);
       return bugs;
     } catch (error) {
-      this.report(`  Error: ${error.message}`);
+      const errorMsg = error.message || String(error);
+      this.report(`  Error: ${errorMsg}`);
+      this.passErrors.push({ passName: "quick-scan", error: errorMsg });
       return [];
     }
   }
@@ -2311,11 +2314,41 @@ var CoreScanner = class {
         }
       }
     } else {
-      const jsonObjectMatch = output.match(/\{[\s\S]*\}/);
-      if (jsonObjectMatch) {
-        try {
-          parsed = JSON.parse(jsonObjectMatch[0]);
-        } catch {
+      const firstBrace = output.indexOf("{");
+      if (firstBrace !== -1) {
+        const substring = output.slice(firstBrace);
+        let depth = 0;
+        let inString = false;
+        let escape = false;
+        for (let i = 0; i < substring.length; i++) {
+          const char = substring[i];
+          if (escape) {
+            escape = false;
+            continue;
+          }
+          if (char === "\\" && inString) {
+            escape = true;
+            continue;
+          }
+          if (char === '"') {
+            inString = !inString;
+            continue;
+          }
+          if (inString) continue;
+          if (char === "{") {
+            depth++;
+          } else if (char === "}") {
+            depth--;
+            if (depth === 0) {
+              const candidate = substring.slice(0, i + 1);
+              try {
+                parsed = JSON.parse(candidate);
+                break;
+              } catch {
+                depth = 1;
+              }
+            }
+          }
         }
       }
     }
@@ -3343,6 +3376,9 @@ async function initCommand(options) {
   }
   const writeSpinner = p3.spinner();
   writeSpinner.start("Creating configuration...");
+  const whiteroseExistedBefore = existsSync(whiterosePath);
+  const gitignorePath = join(cwd, ".gitignore");
+  const originalGitignore = existsSync(gitignorePath) ? readFileSync(gitignorePath, "utf-8") : null;
   try {
     mkdirSync(join(whiterosePath, "cache"), { recursive: true });
     mkdirSync(join(whiterosePath, "reports"), { recursive: true });
@@ -3378,29 +3414,37 @@ async function initCommand(options) {
         markdownPath: "BUGS.md"
       }
     };
-    writeFileSync(join(whiterosePath, "config.yml"), YAML.stringify(config), "utf-8");
-    writeFileSync(
-      join(whiterosePath, "cache", "understanding.json"),
-      JSON.stringify(understanding, null, 2),
-      "utf-8"
-    );
     const intentDoc = generateIntentDocument(understanding);
+    const configContent = YAML.stringify(config);
+    const understandingContent = JSON.stringify(understanding, null, 2);
+    const hashesContent = JSON.stringify({ version: "1", fileHashes: [], lastFullScan: null }, null, 2);
+    writeFileSync(join(whiterosePath, "config.yml"), configContent, "utf-8");
+    writeFileSync(join(whiterosePath, "cache", "understanding.json"), understandingContent, "utf-8");
     writeFileSync(join(whiterosePath, "intent.md"), intentDoc, "utf-8");
-    writeFileSync(
-      join(whiterosePath, "cache", "file-hashes.json"),
-      JSON.stringify({ version: "1", fileHashes: [], lastFullScan: null }, null, 2),
-      "utf-8"
-    );
-    const gitignorePath = join(cwd, ".gitignore");
-    if (existsSync(gitignorePath)) {
-      const gitignore = await import('fs').then((fs) => fs.readFileSync(gitignorePath, "utf-8"));
-      if (!gitignore.includes(".whiterose/cache")) {
-        writeFileSync(gitignorePath, gitignore + "\n# whiterose cache\n.whiterose/cache/\n", "utf-8");
-      }
+    writeFileSync(join(whiterosePath, "cache", "file-hashes.json"), hashesContent, "utf-8");
+    if (originalGitignore !== null && !originalGitignore.includes(".whiterose/cache")) {
+      writeFileSync(gitignorePath, originalGitignore + "\n# whiterose cache\n.whiterose/cache/\n", "utf-8");
     }
     writeSpinner.stop("Configuration created");
   } catch (error) {
     writeSpinner.stop("Failed to create configuration");
+    if (!whiteroseExistedBefore && existsSync(whiterosePath)) {
+      try {
+        rmSync(whiterosePath, { recursive: true, force: true });
+        p3.log.info("Rolled back: removed .whiterose directory");
+      } catch {
+      }
+    }
+    if (originalGitignore !== null && existsSync(gitignorePath)) {
+      try {
+        const currentGitignore = readFileSync(gitignorePath, "utf-8");
+        if (currentGitignore !== originalGitignore) {
+          writeFileSync(gitignorePath, originalGitignore, "utf-8");
+          p3.log.info("Rolled back: restored .gitignore");
+        }
+      } catch {
+      }
+    }
     p3.log.error(String(error));
     process.exit(1);
   }
@@ -5163,7 +5207,19 @@ async function scanCommand(paths, options) {
     try {
       config = await loadConfig(cwd);
       understanding = await loadUnderstanding(cwd);
-    } catch {
+    } catch (err) {
+      const errorMessage = err instanceof Error ? err.message : String(err);
+      if (!isQuiet) {
+        p3.log.warn(`Failed to load config: ${errorMessage}`);
+        p3.log.info('Continuing with default settings. Run "whiterose init" to fix.');
+      } else if (options.ci) {
+        console.error(JSON.stringify({
+          error: "Config parse error",
+          message: errorMessage,
+          hint: 'Fix config.yml or run "whiterose init" to regenerate'
+        }));
+        process.exit(1);
+      }
     }
   }
   if (!understanding) {
@@ -5282,6 +5338,16 @@ async function scanCommand(paths, options) {
       }
       const totalTime = Math.floor((Date.now() - analysisStartTime) / 1e3);
       llmSpinner.stop(`Found ${bugs.length} potential bugs (${totalTime}s)`);
+      if (scanner.hasPassErrors()) {
+        const errors = scanner.getPassErrors();
+        p3.log.warn(`${errors.length} analysis pass(es) failed:`);
+        for (const err of errors.slice(0, 5)) {
+          console.log(chalk3.yellow(`  - ${err.passName}: ${err.error}`));
+        }
+        if (errors.length > 5) {
+          console.log(chalk3.yellow(`  ... and ${errors.length - 5} more`));
+        }
+      }
     } catch (error) {
       llmSpinner.stop("Analysis failed");
       p3.log.error(String(error));
@@ -5304,6 +5370,16 @@ async function scanCommand(paths, options) {
         config
       });
     }
+    if (options.ci && scanner.hasPassErrors()) {
+      const errors = scanner.getPassErrors();
+      if (bugs.length === 0) {
+        console.error(JSON.stringify({
+          error: "Analysis failed",
+          passErrors: errors
+        }));
+        process.exit(1);
+      }
+    }
   }
   if (!isQuickScan) {
     if (!isQuiet) {
@@ -5324,7 +5400,14 @@ async function scanCommand(paths, options) {
       try {
         const crossFileBugs = await analyzeCrossFile(cwd);
         bugs.push(...crossFileBugs);
-      } catch {
+      } catch (err) {
+        if (options.ci) {
+          console.error(JSON.stringify({
+            error: "Cross-file analysis failed",
+            message: err instanceof Error ? err.message : String(err)
+          }));
+          process.exit(1);
+        }
       }
     }
   }
@@ -5347,7 +5430,14 @@ async function scanCommand(paths, options) {
       try {
         const contractBugs = await analyzeContracts(cwd);
         bugs.push(...contractBugs);
-      } catch {
+      } catch (err) {
+        if (options.ci) {
+          console.error(JSON.stringify({
+            error: "Contract analysis failed",
+            message: err instanceof Error ? err.message : String(err)
+          }));
+          process.exit(1);
+        }
       }
     }
   }
@@ -5357,7 +5447,14 @@ async function scanCommand(paths, options) {
       if (intentBugs.length > 0) {
         bugs.push(...intentBugs);
       }
-    } catch {
+    } catch (err) {
+      if (options.ci) {
+        console.error(JSON.stringify({
+          error: "Intent validation failed",
+          message: err instanceof Error ? err.message : String(err)
+        }));
+        process.exit(1);
+      }
     }
   }
   const confidenceOrder = { high: 3, medium: 2, low: 1 };