@wispbit/local 1.0.27 → 1.0.29

package/dist/cli.js

@@ -245,7 +245,8 @@ var GetRulesResponseSchema = z2.object({
       message: z2.string(),
       prompt: z2.string(),
       severity: z2.enum(["suggestion", "violation"]),
-      schema: z2.any()
+      schema: z2.any(),
+      execution: z2.enum(["llm", "deterministic"]).optional()
     })
   )
 });
@@ -1280,6 +1281,7 @@ var WispbitRuleProvider = class {
       config: {
         message: rule.message,
         severity: rule.severity,
+        execution: rule.execution || "llm",
         steps: rule.schema
       },
       prompt: rule.prompt,
@@ -1414,6 +1416,59 @@ import * as fs2 from "fs";
 import * as path3 from "path";
 import { glob } from "glob";
 
+// src/utils/diffValidation.ts
+function isFileValidInDiff(filePath, options) {
+  const { changedFiles } = options;
+  return changedFiles.some((changedFile) => {
+    return filePath === changedFile || filePath.endsWith(changedFile) || changedFile.endsWith(filePath);
+  });
+}
+function isLineRangeValidInDiff(filePath, startLine, endLine, options) {
+  const { fileChangeMap } = options;
+  const fileChange = fileChangeMap.get(filePath);
+  if (!fileChange) {
+    return false;
+  }
+  if (fileChange.status === "added") {
+    return true;
+  }
+  if (fileChange.status === "removed") {
+    return false;
+  }
+  return isLineRangeInPatch(fileChange.patch, startLine, endLine);
+}
+function isMatchValidInDiff(match, options) {
+  return isFileValidInDiff(match.filePath, options) && isLineRangeValidInDiff(match.filePath, match.range.start.line, match.range.end.line, options);
+}
+function isLineRangeInPatch(patch, startLine, endLine) {
+  const lines = patch.split("\n");
+  let currentNewLine = 0;
+  let inHunk = false;
+  for (const line of lines) {
+    const hunkMatch = line.match(/^@@\s+-\d+(?:,\d+)?\s+\+(\d+)(?:,\d+)?\s+@@/);
+    if (hunkMatch) {
+      currentNewLine = parseInt(hunkMatch[1], 10);
+      inHunk = true;
+      continue;
+    }
+    if (!inHunk) continue;
+    if (line.startsWith("+")) {
+      if (currentNewLine >= startLine && currentNewLine <= endLine) {
+        return true;
+      }
+      currentNewLine++;
+    } else if (line.startsWith("-")) {
+      continue;
+    } else if (!line.startsWith("\\")) {
+      if (currentNewLine >= startLine && currentNewLine <= endLine) {
+        return true;
+      }
+      currentNewLine++;
+    }
+  }
+  return false;
+}
+
 // src/utils/patternMatching.ts
 import ignore from "ignore";
 function matchesAnyPattern(filePath, patterns) {
@@ -1703,30 +1758,11 @@ var FileExecutionContext = class _FileExecutionContext {
       return true;
     }
     const { filePath } = options;
-    return this.diffMode.changedFiles.some((changedFile) => {
-      return filePath === changedFile || filePath.endsWith(changedFile) || changedFile.endsWith(filePath);
+    return isFileValidInDiff(filePath, {
+      changedFiles: this.diffMode.changedFiles,
+      fileChangeMap: this.diffMode.fileChangeMap
     });
   }
-  /**
-   * Check if a specific line range should be processed
-   */
-  isLineRangeValid(options) {
-    if (this.mode === "check") {
-      return true;
-    }
-    const { filePath, startLine, endLine } = options;
-    const fileChange = this.diffMode.fileChangeMap.get(filePath);
-    if (!fileChange) {
-      return false;
-    }
-    if (fileChange.status === "added") {
-      return true;
-    }
-    if (fileChange.status === "removed") {
-      return false;
-    }
-    return this.isLineRangeInPatch({ patch: fileChange.patch, startLine, endLine });
-  }
   /**
    * Check if a match should be processed
    */
@@ -1735,46 +1771,11 @@ var FileExecutionContext = class _FileExecutionContext {
       return true;
     }
     const { match } = options;
-    return this.isFileValid({ filePath: match.filePath }) && this.isLineRangeValid({
-      filePath: match.filePath,
-      startLine: match.range.start.line,
-      endLine: match.range.end.line
+    return isMatchValidInDiff(match, {
+      changedFiles: this.diffMode.changedFiles,
+      fileChangeMap: this.diffMode.fileChangeMap
     });
   }
-  // ===== Helper Methods =====
-  /**
-   * Parse a git patch to determine if a line range intersects with changed lines
-   * Adapted from patchParser.ts logic
-   */
-  isLineRangeInPatch(options) {
-    const { patch, startLine, endLine } = options;
-    const lines = patch.split("\n");
-    let currentNewLine = 0;
-    let inHunk = false;
-    for (const line of lines) {
-      const hunkMatch = line.match(/^@@\s+-\d+(?:,\d+)?\s+\+(\d+)(?:,\d+)?\s+@@/);
-      if (hunkMatch) {
-        currentNewLine = parseInt(hunkMatch[1], 10);
-        inHunk = true;
-        continue;
-      }
-      if (!inHunk) continue;
-      if (line.startsWith("+")) {
-        if (currentNewLine >= startLine && currentNewLine <= endLine) {
-          return true;
-        }
-        currentNewLine++;
-      } else if (line.startsWith("-")) {
-        continue;
-      } else if (!line.startsWith("\\")) {
-        if (currentNewLine >= startLine && currentNewLine <= endLine) {
-          return true;
-        }
-        currentNewLine++;
-      }
-    }
-    return false;
-  }
 };
 
 // src/steps/FileFilterStep.ts
@@ -1876,6 +1877,40 @@ import path8 from "path";
 import { readFile as readFile2 } from "fs/promises";
 import path5 from "path";
 import { parse as parse2, parseAsync } from "@ast-grep/napi";
+
+// src/utils/coordinates.ts
+function matchTo0Indexed(match) {
+  return {
+    ...match,
+    range: {
+      start: {
+        line: match.range.start.line - 1,
+        column: match.range.start.column - 1
+      },
+      end: {
+        line: match.range.end.line - 1,
+        column: match.range.end.column - 1
+      }
+    }
+  };
+}
+function matchTo1Indexed(match) {
+  return {
+    ...match,
+    range: {
+      start: {
+        line: match.range.start.line + 1,
+        column: match.range.start.column + 1
+      },
+      end: {
+        line: match.range.end.line + 1,
+        column: match.range.end.column + 1
+      }
+    }
+  };
+}
+
+// src/providers/AstGrepAstProvider.ts
 var AstGrepAstProvider = class {
   environment;
   language;
@@ -1932,7 +1967,7 @@ var AstGrepAstProvider = class {
     const matches = [];
     for (const { filePath, sgNode } of sgNodes) {
       const range = sgNode.range();
-      matches.push({
+      const match0Indexed = {
         filePath,
         text: sgNode.text(),
         range: {
@@ -1948,7 +1983,8 @@ var AstGrepAstProvider = class {
         // Try to extract symbol if possible
         symbol: this.extractSymbol(sgNode),
         language: this.language
-      });
+      };
+      matches.push(matchTo1Indexed(match0Indexed));
     }
     return matches;
   }
@@ -1991,10 +2027,11 @@ var AstGrepAstProvider = class {
     const absolutePath = path5.resolve(this.environment.getWorkspaceRoot(), match.filePath);
     const content = await readFile2(absolutePath, "utf-8");
     const root = parse2(this.language, content).root();
+    const match0Indexed = matchTo0Indexed(match);
     const nodeAtPosition = this.findNodeAtPosition(
       root,
-      match.range.start.line,
-      match.range.start.column
+      match0Indexed.range.start.line,
+      match0Indexed.range.start.column
     );
     if (!nodeAtPosition) {
       return null;
@@ -2005,7 +2042,7 @@ var AstGrepAstProvider = class {
       const kindStr = typeof kindValue === "string" ? kindValue : String(kindValue);
       if (targetNodeKinds.has(kindStr)) {
         const range = current.range();
-        return {
+        const expandedMatch0Indexed = {
           filePath: match.filePath,
           text: current.text(),
           range: {
@@ -2015,6 +2052,7 @@ var AstGrepAstProvider = class {
           symbol: match.symbol,
           language: this.language
         };
+        return matchTo1Indexed(expandedMatch0Indexed);
       }
       current = current.parent();
     }
@@ -2215,13 +2253,14 @@ var ScipIntelligenceProvider = class {
   async findDefinitions(match) {
     await this.ensureIndexReady();
     if (!this.scipIndex) throw new Error("SCIP index not ready");
-    this.eventEmitter.startScipMatchLookup(this.language, match);
+    const match0Indexed = matchTo0Indexed(match);
+    this.eventEmitter.startScipMatchLookup(this.language, match0Indexed);
     const definitions = [];
     const documents = this.scipIndex.documents;
     for (const document of documents) {
-      if (document.relative_path !== match.filePath) continue;
+      if (document.relative_path !== match0Indexed.filePath) continue;
       this.eventEmitter.scipMatchLookupProgress(this.language, document);
-      const scipOcc = this.findBestOverlappingOccurrence(document.occurrences, match);
+      const scipOcc = this.findBestOverlappingOccurrence(document.occurrences, match0Indexed);
       if (scipOcc) {
         if (this.isExternalSymbol(scipOcc.symbol)) {
           continue;
@@ -2229,7 +2268,7 @@ var ScipIntelligenceProvider = class {
         this.eventEmitter.scipMatchLookupProgress(this.language, scipOcc);
         const def = await this.findDefinitionForSymbol(scipOcc.symbol, documents);
         if (def) {
-          definitions.push(def);
+          definitions.push(matchTo1Indexed(def));
         }
       }
     }
@@ -2244,17 +2283,18 @@ var ScipIntelligenceProvider = class {
     if (!this.scipIndex) {
       return [];
     }
+    const match0Indexed = matchTo0Indexed(match);
     const references = [];
     const documents = this.scipIndex.documents;
     for (const document of documents) {
-      if (document.relative_path !== match.filePath) continue;
-      const scipOcc = this.findBestOverlappingOccurrence(document.occurrences, match);
+      if (document.relative_path !== match0Indexed.filePath) continue;
+      const scipOcc = this.findBestOverlappingOccurrence(document.occurrences, match0Indexed);
       if (scipOcc) {
         if (this.isExternalSymbol(scipOcc.symbol)) {
           break;
         }
         const refs = await this.findReferencesForSymbol(scipOcc.symbol, documents);
-        references.push(...refs);
+        references.push(...refs.map((ref) => matchTo1Indexed(ref)));
         break;
       }
     }
@@ -3193,18 +3233,25 @@ var InvalidRuleFormatError = class extends Error {
 import { stripVTControlCharacters } from "node:util";
 import chalk from "chalk";
 import ora from "ora";
-var VIOLATION_COLOR = "#ff6b35";
-var SUGGESTION_COLOR = "#4a90e2";
+var VIOLATION_COLOR = "#f87171";
+var SUGGESTION_COLOR = "#60a5fa";
 var SKIPPED_COLOR = "#9b59b6";
 var BRAND_COLOR = "#fbbf24";
+var DETERMINISTIC_COLOR = "#9ca3af";
+var LLM_COLOR = "#9b59b6";
 function formatClickableRuleId(ruleId, internalId) {
   if (internalId) {
     const url = `https://app.wispbit.com/rules/${internalId}`;
-    const link = `\x1B]8;;${url}\x07${chalk.dim.underline(ruleId)}\x1B]8;;\x07`;
-    return link;
+    return `${chalk.dim.underline(ruleId)}${chalk.dim("|")}${chalk.dim.underline(url)}`;
   }
   return chalk.dim(ruleId);
 }
+function truncateMessage(message, maxWidth) {
+  if (message.length <= maxWidth) {
+    return message;
+  }
+  return message.substring(0, maxWidth - 3) + "...";
+}
 var LINE_NUMBER_BG_COLOR = "#f8f8f8";
 var LINE_NUMBER_TEXT_COLOR = "#888888";
 var loadingFrames = [
@@ -3283,9 +3330,9 @@ function printSummary(results, summary) {
       var _a;
       ruleData.matches.push({
         filePath: match.filePath,
-        line: match.range.start.line + 1,
-        column: match.range.start.column + 1,
-        endLine: match.range.end.line !== match.range.start.line ? match.range.end.line + 1 : void 0,
+        line: match.range.start.line,
+        column: match.range.start.column,
+        endLine: match.range.end.line !== match.range.start.line ? match.range.end.line : void 0,
         text: match.text
       });
       if ((_a = match.metadata) == null ? void 0 : _a.llmValidation) {
@@ -3304,9 +3351,9 @@ function printSummary(results, summary) {
     }
     let messageType;
     if (ruleData.severity === "violation") {
-      messageType = chalk.hex(VIOLATION_COLOR)(" violation".padStart(9));
+      messageType = chalk.hex(VIOLATION_COLOR)("\u25A0") + " " + chalk.hex(VIOLATION_COLOR).bold("violation".padStart(8));
     } else if (ruleData.severity === "suggestion") {
-      messageType = chalk.hex(SUGGESTION_COLOR)("suggestion".padEnd(7));
+      messageType = chalk.hex(SUGGESTION_COLOR)("\u25CF") + " " + chalk.hex(SUGGESTION_COLOR).bold("suggestion".padEnd(6));
     } else {
       messageType = chalk.hex(SKIPPED_COLOR)("   skipped".padEnd(9));
     }
@@ -3322,12 +3369,12 @@ function printSummary(results, summary) {
 `;
     } else {
       const sortedMatches = ruleData.matches.sort((a, b) => a.filePath.localeCompare(b.filePath));
-      const shouldShowCodeSnippets = sortedMatches.length < 10 && sortedMatches.some((match) => match.text && match.text.split("\n").length <= 20);
+      const shouldShowCodeSnippets = sortedMatches.length < 10 && sortedMatches.some((match) => match.text && match.text.split("\n").length <= 30);
       if (shouldShowCodeSnippets) {
         sortedMatches.forEach((match, index) => {
-          output += `  ${match.filePath}
+          if (match.text && match.text.split("\n").length <= 30) {
+            output += `  ${match.filePath}
 `;
-          if (match.text && match.text.split("\n").length <= 20) {
             const lines = match.text.split("\n");
             lines.forEach((line, lineIndex) => {
               const lineNumber = match.line + lineIndex;
@@ -3337,6 +3384,10 @@ function printSummary(results, summary) {
               output += `  ${lineNumberBox} ${chalk.dim(line)}
 `;
             });
+          } else {
+            const lineRange = match.endLine ? `(${match.line}:${match.endLine})` : `(${match.line})`;
+            output += `  ${match.filePath} ${chalk.dim(lineRange)}
+`;
           }
           if (index < sortedMatches.length - 1) {
             output += `
@@ -3384,21 +3435,29 @@ function printRulesList(rules) {
   const tableData = [];
   tableData.push([
     "",
-    `${"id".padEnd(12)} ${chalk.dim("\u2502")} ${"severity".padEnd(12)} ${chalk.dim("\u2502")} message`
+    `${"id".padEnd(12)} ${chalk.dim("\u2502")} ${"severity".padEnd(16)} ${chalk.dim("\u2502")} ${"execution".padEnd(18)} ${chalk.dim("\u2502")} message`
   ]);
+  const terminalWidth = process.stdout.columns || 120;
+  const fixedColumnsWidth = 12 + 3 + 16 + 3 + 18 + 3;
+  const messageMaxWidth = Math.max(20, terminalWidth - fixedColumnsWidth - 10);
   tableData.push([
     "",
-    `${chalk.dim("\u2500".repeat(12))} ${chalk.dim("\u253C")} ${chalk.dim("\u2500".repeat(12))} ${chalk.dim("\u253C")} ${chalk.dim("\u2500".repeat(80))}`
+    `${chalk.dim("\u2500".repeat(12))} ${chalk.dim("\u253C")} ${chalk.dim("\u2500".repeat(16))} ${chalk.dim("\u253C")} ${chalk.dim("\u2500".repeat(18))} ${chalk.dim("\u253C")} ${chalk.dim("\u2500".repeat(messageMaxWidth))}`
   ]);
   for (const rule of rules) {
-    const severityColor = rule.config.severity === "violation" ? chalk.hex(VIOLATION_COLOR) : chalk.hex(SUGGESTION_COLOR);
-    const severityText = severityColor(rule.config.severity);
+    const severityIcon = rule.config.severity === "violation" ? "\u25A0" : "\u25CF";
+    const severityColor = rule.config.severity === "violation" ? chalk.hex(VIOLATION_COLOR).bold : chalk.hex(SUGGESTION_COLOR).bold;
+    const severityIconColor = rule.config.severity === "violation" ? chalk.hex(VIOLATION_COLOR) : chalk.hex(SUGGESTION_COLOR);
+    const severityText = severityIconColor(severityIcon) + " " + severityColor(rule.config.severity);
     const ruleId = formatClickableRuleId(rule.id, rule.internalId);
+    const executionText = rule.config.execution === "llm" ? chalk.hex(LLM_COLOR)("\u25C6") + " " + chalk.hex(LLM_COLOR).bold("llm") : chalk.hex(DETERMINISTIC_COLOR)("\u25C6") + " " + chalk.hex(DETERMINISTIC_COLOR).bold("deterministic");
+    const truncatedMessage = truncateMessage(rule.config.message, messageMaxWidth);
     const idPadding = Math.max(0, 12 - rule.id.length);
-    const severityPadding = Math.max(0, 12 - rule.config.severity.length);
+    const severityPadding = Math.max(0, 16 - (rule.config.severity.length + 2));
+    const executionPadding = Math.max(0, 18 - (rule.config.execution.length + 2));
     tableData.push([
       "",
-      `${ruleId}${" ".repeat(idPadding)} ${chalk.dim("\u2502")} ${severityText}${" ".repeat(severityPadding)} ${chalk.dim("\u2502")} ${rule.config.message}`
+      `${ruleId}${" ".repeat(idPadding)} ${chalk.dim("\u2502")} ${severityText}${" ".repeat(severityPadding)} ${chalk.dim("\u2502")} ${executionText}${" ".repeat(executionPadding)} ${chalk.dim("\u2502")} ${truncatedMessage}`
     ]);
   }
   const table = textTable(tableData, {
@@ -3813,8 +3872,7 @@ async function loadApiKey() {
     return null;
   }
 }
-async function ensureConfigured() {
-  const environment = new Environment();
+async function ensureConfigured(environment) {
   let apiKey = process.env.WISPBIT_API_KEY || null;
   if (!apiKey) {
     apiKey = await loadApiKey();
@@ -3845,7 +3903,7 @@ async function ensureConfigured() {
       const repositoryUrl = await environment.getRepositoryUrl();
       console.log(
         chalk4.red(
-          `No repository in wispbit found for url: ${repositoryUrl}. If your git remote URL was recently modified, use "git remote set-url origin <new-url>" to update the remote URL.`
+          `No repository in wispbit found for url: ${repositoryUrl}. If you are passing the repository URL as a flag, make sure it is correct. If your git remote URL was recently modified, use "git remote set-url origin <new-url>" to update the remote URL.`
         )
       );
       process.exit(1);
@@ -3861,7 +3919,7 @@ async function checkForUpdates() {
       chalk4.bgHex("#b2f5ea").black.bold(` NEW VERSION AVAILABLE: ${latestCliVersion} (current: ${currentVersion}) `)
     );
     console.log(
-      chalk4.bgHex("#b2f5ea").black.bold(` Run 'pnpm install -g @wispbit/cli' to update 
+      chalk4.bgHex("#b2f5ea").black.bold(` Run 'pnpm install -g @wispbit/local' to update 
 `)
     );
   }
@@ -3909,6 +3967,7 @@ Diff examples:
   $ wispbit abc123 --include committed Compare against specific commit SHA, show only committed
 
 Global options:
+  --repo-url <url>                   Override repository URL (default: from git remote)
   -v, --version                      Show version number
   -h, --help                         Show help
 `,
@@ -3926,6 +3985,10 @@ Global options:
       include: {
         type: "string"
       },
+      // Repository URL override
+      repoUrl: {
+        type: "string"
+      },
       // Debug option
       debug: {
         type: "boolean",
@@ -3946,8 +4009,8 @@ Global options:
   }
 );
 async function executeCommand(options) {
-  const environment = new Environment();
-  const config = await ensureConfigured();
+  const environment = new Environment({ repositoryUrl: options.repoUrl });
+  const config = await ensureConfigured(environment);
   const { ruleId, json: json2, mode, filePath } = options;
   let { commitSelector, diffInclude } = options;
   if (mode === "diff") {
@@ -4113,9 +4176,9 @@ async function executeCommand(options) {
   }
   return results;
 }
-async function listRules() {
-  const config = await ensureConfigured();
-  const environment = new Environment();
+async function listRules(repoUrl) {
+  const environment = new Environment({ repositoryUrl: repoUrl });
+  const config = await ensureConfigured(environment);
   const ruleProvider = new WispbitRuleProvider(config, environment);
   const rules = await ruleProvider.loadAllRules();
   printRulesList(rules);
@@ -4131,7 +4194,8 @@ async function main() {
         json: cli.flags.json,
         debug: cli.flags.debug,
         mode: "check",
-        filePath
+        filePath,
+        repoUrl: cli.flags.repoUrl
       });
       break;
     }
@@ -4159,17 +4223,18 @@ async function main() {
         debug: cli.flags.debug,
         mode: "diff",
         diffInclude,
-        commitSelector
+        commitSelector,
+        repoUrl: cli.flags.repoUrl
       });
       break;
     }
     case "list": {
-      await listRules();
+      await listRules(cli.flags.repoUrl);
       break;
     }
     case "cache": {
       if (subcommand === "purge") {
-        const environment = new Environment();
+        const environment = new Environment({ repositoryUrl: cli.flags.repoUrl });
         const storage = new Storage(environment);
         const result = await storage.purgeCache();
         console.log(
@@ -4207,7 +4272,8 @@ ${chalk4.green("Cache purged successfully.")} Removed ${result.deletedCount} ite
         debug: cli.flags.debug,
         mode: "diff",
         diffInclude,
-        commitSelector
+        commitSelector,
+        repoUrl: cli.flags.repoUrl
       });
       break;
     }