mobbdev 1.1.21 → 1.1.23

package/dist/args/commands/upload_ai_blame.d.mts

@@ -8,13 +8,12 @@ declare enum AiBlameInferenceType {
 }
 
 type SanitizationCounts = {
-    pii: {
+    detections: {
         total: number;
         high: number;
         medium: number;
         low: number;
     };
-    secrets: number;
 };
 
 declare const PromptItemZ: z.ZodObject<{
@@ -190,9 +189,11 @@ type UploadAiBlameOptions = {
     model?: string[];
     toolName?: string[];
     blameType?: AiBlameInferenceType[];
+    sessionId?: string[];
     'ai-response-at'?: string[];
     'tool-name'?: string[];
     'blame-type'?: AiBlameInferenceType[];
+    'session-id'?: string[];
 };
 declare function uploadAiBlameBuilder(args: Yargs.Argv<unknown>): Yargs.Argv<UploadAiBlameOptions>;
 type UploadAiBlameResult = {
@@ -208,6 +209,7 @@ declare function uploadAiBlameHandlerFromExtension(args: {
     tool: string;
     responseTime: string;
     blameType?: AiBlameInferenceType;
+    sessionId?: string;
 }): Promise<UploadAiBlameResult>;
 declare function uploadAiBlameHandler(args: UploadAiBlameOptions, exitOnError?: boolean): Promise<void>;
 

package/dist/args/commands/upload_ai_blame.mjs

@@ -79,7 +79,7 @@ var init_FileUtils = __esm({
 import fs4 from "fs";
 import ignore from "ignore";
 import * as path5 from "path";
-import { simpleGit } from "simple-git";
+import { simpleGit as simpleGit2 } from "simple-git";
 var init_GitService = __esm({
   "src/features/analysis/scm/services/GitService.ts"() {
     "use strict";
@@ -2375,6 +2375,9 @@ if (!semver.satisfies(process.version, packageJson.engines.node)) {
   process.exit(1);
 }
 
+// src/utils/gitUtils.ts
+import simpleGit from "simple-git";
+
 // src/utils/index.ts
 var sleep = (ms = 2e3) => new Promise((r) => setTimeout(r, ms));
 var CliError = class extends Error {
@@ -5290,8 +5293,6 @@ async function uploadFile({
 
 // src/utils/sanitize-sensitive-data.ts
 import { OpenRedaction } from "@openredaction/openredaction";
-import { spawn } from "child_process";
-import { installGitleaks } from "gitleaks-secret-scanner/lib/installer.js";
 var openRedaction = new OpenRedaction({
   patterns: [
     // Core Personal Data
@@ -5379,63 +5380,6 @@ var openRedaction = new OpenRedaction({
     "CLIENT_ID"
   ]
 });
-var gitleaksBinaryPath = null;
-async function initializeGitleaks() {
-  try {
-    gitleaksBinaryPath = await installGitleaks({ version: "8.27.2" });
-    return gitleaksBinaryPath;
-  } catch {
-    return null;
-  }
-}
-var gitleaksInitPromise = initializeGitleaks();
-async function detectSecretsWithGitleaks(text) {
-  const secrets = /* @__PURE__ */ new Set();
-  const binaryPath = gitleaksBinaryPath || await gitleaksInitPromise;
-  if (!binaryPath) {
-    return secrets;
-  }
-  return new Promise((resolve) => {
-    const gitleaks = spawn(
-      binaryPath,
-      [
-        "detect",
-        "--pipe",
-        "--no-banner",
-        "--exit-code",
-        "0",
-        "--report-format",
-        "json"
-      ],
-      {
-        stdio: ["pipe", "pipe", "ignore"]
-      }
-    );
-    let output = "";
-    gitleaks.stdout.on("data", (data) => {
-      output += data.toString();
-    });
-    gitleaks.on("close", () => {
-      try {
-        const findings = JSON.parse(output);
-        if (Array.isArray(findings)) {
-          for (const finding of findings) {
-            if (finding.Secret) {
-              secrets.add(finding.Secret);
-            }
-          }
-        }
-      } catch {
-      }
-      resolve(secrets);
-    });
-    gitleaks.on("error", () => {
-      resolve(secrets);
-    });
-    gitleaks.stdin.write(text);
-    gitleaks.stdin.end();
-  });
-}
 function maskString(str, showStart = 2, showEnd = 2) {
   if (str.length <= showStart + showEnd) {
     return "*".repeat(str.length);
@@ -5444,8 +5388,7 @@ function maskString(str, showStart = 2, showEnd = 2) {
 }
 async function sanitizeDataWithCounts(obj) {
   const counts = {
-    pii: { total: 0, high: 0, medium: 0, low: 0 },
-    secrets: 0
+    detections: { total: 0, high: 0, medium: 0, low: 0 }
   };
   const sanitizeString = async (str) => {
     let result = str;
@@ -5457,20 +5400,14 @@ async function sanitizeDataWithCounts(obj) {
         ...piiDetections.low
       ];
       for (const detection of allDetections) {
-        counts.pii.total++;
-        if (detection.severity === "high") counts.pii.high++;
-        else if (detection.severity === "medium") counts.pii.medium++;
-        else if (detection.severity === "low") counts.pii.low++;
+        counts.detections.total++;
+        if (detection.severity === "high") counts.detections.high++;
+        else if (detection.severity === "medium") counts.detections.medium++;
+        else if (detection.severity === "low") counts.detections.low++;
         const masked = maskString(detection.value);
         result = result.replaceAll(detection.value, masked);
       }
     }
-    const secrets = await detectSecretsWithGitleaks(result);
-    counts.secrets += secrets.size;
-    for (const secret of secrets) {
-      const masked = maskString(secret);
-      result = result.replaceAll(secret, masked);
-    }
     return result;
   };
   const sanitizeRecursive = async (data) => {
@@ -5581,7 +5518,8 @@ async function uploadAiBlameHandlerFromExtension(args) {
     model: [],
     toolName: [],
     aiResponseAt: [],
-    blameType: []
+    blameType: [],
+    sessionId: []
   };
   let promptsCounts;
   let inferenceCounts;
@@ -5614,6 +5552,9 @@ async function uploadAiBlameHandlerFromExtension(args) {
       uploadArgs.toolName.push(args.tool);
       uploadArgs.aiResponseAt.push(args.responseTime);
       uploadArgs.blameType.push(args.blameType || "CHAT" /* Chat */);
+      if (args.sessionId) {
+        uploadArgs.sessionId.push(args.sessionId);
+      }
       await uploadAiBlameHandler(uploadArgs, false);
     });
   });
@@ -5631,6 +5572,7 @@ async function uploadAiBlameHandler(args, exitOnError = true) {
   const tools = args.toolName || args["tool-name"] || [];
   const responseTimes = args.aiResponseAt || args["ai-response-at"] || [];
   const blameTypes = args.blameType || args["blame-type"] || [];
+  const sessionIds = args.sessionId || args["session-id"] || [];
   if (prompts.length !== inferences.length) {
     const errorMsg = "prompt and inference must have the same number of entries";
     console.error(chalk3.red(errorMsg));
@@ -5666,14 +5608,18 @@ async function uploadAiBlameHandler(args, exitOnError = true) {
       toolName: tools[i],
       blameType: blameTypes[i] || "CHAT" /* Chat */,
       computerName,
-      userName
+      userName,
+      sessionId: sessionIds[i]
     });
   }
   const authenticatedClient = await getAuthenticatedGQLClient({
     isSkipPrompts: true
   });
+  const initSessions = sessions.map(
+    ({ sessionId: _sessionId, ...rest }) => rest
+  );
   const sanitizedSessions = await sanitizeData(
-    sessions
+    initSessions
   );
   const initRes = await authenticatedClient.uploadAIBlameInferencesInitRaw({
     sessions: sanitizedSessions
@@ -5719,7 +5665,8 @@ async function uploadAiBlameHandler(args, exitOnError = true) {
       toolName: s.toolName,
       blameType: s.blameType,
       computerName: s.computerName,
-      userName: s.userName
+      userName: s.userName,
+      sessionId: s.sessionId
     };
   });
   const sanitizedFinalizeSessions = await sanitizeData(

package/dist/index.mjs

@@ -9863,6 +9863,7 @@ var utils_exports = {};
 __export(utils_exports, {
   CliError: () => CliError,
   Spinner: () => Spinner,
+  createGitWithLogging: () => createGitWithLogging,
   getDirName: () => getDirName,
   getModuleRootDir: () => getModuleRootDir,
   getTopLevelDirName: () => getTopLevelDirName,
@@ -9990,6 +9991,53 @@ if (!semver.satisfies(process.version, packageJson.engines.node)) {
   process.exit(1);
 }
 
+// src/utils/gitUtils.ts
+import simpleGit2 from "simple-git";
+var defaultLogger = {
+  info: (data, msg) => {
+    if (msg) {
+      const sanitizedMsg = String(msg).replace(/\n|\r/g, "");
+      console.log(`[GIT] ${sanitizedMsg}`, data);
+    } else {
+      console.log("[GIT]", data);
+    }
+  }
+};
+function createGitWithLogging(dirName, logger2 = defaultLogger) {
+  return simpleGit2(dirName, {
+    maxConcurrentProcesses: 6
+  }).outputHandler((bin, stdout2, stderr2) => {
+    const callID = Math.random();
+    logger2.info({ callID, bin }, "Start git CLI call");
+    const errChunks = [];
+    const outChunks = [];
+    let isStdoutClosed = false;
+    let isStderrClosed = false;
+    stderr2.on("data", (data) => errChunks.push(data.toString("utf8")));
+    stdout2.on("data", (data) => outChunks.push(data.toString("utf8")));
+    function logData() {
+      if (!isStderrClosed || !isStdoutClosed) {
+        return;
+      }
+      const logObj = {
+        callID,
+        bin,
+        err: `${errChunks.join("").slice(0, 200)}...`,
+        out: `${outChunks.join("").slice(0, 200)}...`
+      };
+      logger2.info(logObj, "git log output");
+    }
+    stderr2.on("close", () => {
+      isStderrClosed = true;
+      logData();
+    });
+    stdout2.on("close", () => {
+      isStdoutClosed = true;
+      logData();
+    });
+  });
+}
+
 // src/utils/index.ts
 var sleep = (ms = 2e3) => new Promise((r) => setTimeout(r, ms));
 var CliError = class extends Error {
@@ -12159,7 +12207,7 @@ import AdmZip from "adm-zip";
 import Debug13 from "debug";
 import { globby } from "globby";
 import { isBinary as isBinary2 } from "istextorbinary";
-import { simpleGit as simpleGit2 } from "simple-git";
+import { simpleGit as simpleGit3 } from "simple-git";
 import { parseStringPromise } from "xml2js";
 import { z as z28 } from "zod";
 var debug14 = Debug13("mobbdev:pack");
@@ -12187,7 +12235,7 @@ async function pack(srcDirPath, vulnFiles, isIncludeAllFiles = false) {
   debug14("pack folder %s", srcDirPath);
   let git = void 0;
   try {
-    git = simpleGit2({
+    git = simpleGit3({
       baseDir: srcDirPath,
       maxConcurrentProcesses: 1,
       trimmed: true
@@ -13579,8 +13627,6 @@ import z31 from "zod";
 
 // src/utils/sanitize-sensitive-data.ts
 import { OpenRedaction } from "@openredaction/openredaction";
-import { spawn } from "child_process";
-import { installGitleaks } from "gitleaks-secret-scanner/lib/installer.js";
 var openRedaction = new OpenRedaction({
   patterns: [
     // Core Personal Data
@@ -13668,63 +13714,6 @@ var openRedaction = new OpenRedaction({
     "CLIENT_ID"
   ]
 });
-var gitleaksBinaryPath = null;
-async function initializeGitleaks() {
-  try {
-    gitleaksBinaryPath = await installGitleaks({ version: "8.27.2" });
-    return gitleaksBinaryPath;
-  } catch {
-    return null;
-  }
-}
-var gitleaksInitPromise = initializeGitleaks();
-async function detectSecretsWithGitleaks(text) {
-  const secrets = /* @__PURE__ */ new Set();
-  const binaryPath = gitleaksBinaryPath || await gitleaksInitPromise;
-  if (!binaryPath) {
-    return secrets;
-  }
-  return new Promise((resolve) => {
-    const gitleaks = spawn(
-      binaryPath,
-      [
-        "detect",
-        "--pipe",
-        "--no-banner",
-        "--exit-code",
-        "0",
-        "--report-format",
-        "json"
-      ],
-      {
-        stdio: ["pipe", "pipe", "ignore"]
-      }
-    );
-    let output = "";
-    gitleaks.stdout.on("data", (data) => {
-      output += data.toString();
-    });
-    gitleaks.on("close", () => {
-      try {
-        const findings = JSON.parse(output);
-        if (Array.isArray(findings)) {
-          for (const finding of findings) {
-            if (finding.Secret) {
-              secrets.add(finding.Secret);
-            }
-          }
-        }
-      } catch {
-      }
-      resolve(secrets);
-    });
-    gitleaks.on("error", () => {
-      resolve(secrets);
-    });
-    gitleaks.stdin.write(text);
-    gitleaks.stdin.end();
-  });
-}
 function maskString(str, showStart = 2, showEnd = 2) {
   if (str.length <= showStart + showEnd) {
     return "*".repeat(str.length);
@@ -13733,8 +13722,7 @@ function maskString(str, showStart = 2, showEnd = 2) {
 }
 async function sanitizeDataWithCounts(obj) {
   const counts = {
-    pii: { total: 0, high: 0, medium: 0, low: 0 },
-    secrets: 0
+    detections: { total: 0, high: 0, medium: 0, low: 0 }
   };
   const sanitizeString = async (str) => {
     let result = str;
@@ -13746,20 +13734,14 @@ async function sanitizeDataWithCounts(obj) {
         ...piiDetections.low
       ];
       for (const detection of allDetections) {
-        counts.pii.total++;
-        if (detection.severity === "high") counts.pii.high++;
-        else if (detection.severity === "medium") counts.pii.medium++;
-        else if (detection.severity === "low") counts.pii.low++;
+        counts.detections.total++;
+        if (detection.severity === "high") counts.detections.high++;
+        else if (detection.severity === "medium") counts.detections.medium++;
+        else if (detection.severity === "low") counts.detections.low++;
         const masked = maskString(detection.value);
         result = result.replaceAll(detection.value, masked);
       }
     }
-    const secrets = await detectSecretsWithGitleaks(result);
-    counts.secrets += secrets.size;
-    for (const secret of secrets) {
-      const masked = maskString(secret);
-      result = result.replaceAll(secret, masked);
-    }
     return result;
   };
   const sanitizeRecursive = async (data) => {
@@ -13870,7 +13852,8 @@ async function uploadAiBlameHandlerFromExtension(args) {
     model: [],
     toolName: [],
     aiResponseAt: [],
-    blameType: []
+    blameType: [],
+    sessionId: []
   };
   let promptsCounts;
   let inferenceCounts;
@@ -13903,6 +13886,9 @@ async function uploadAiBlameHandlerFromExtension(args) {
       uploadArgs.toolName.push(args.tool);
       uploadArgs.aiResponseAt.push(args.responseTime);
       uploadArgs.blameType.push(args.blameType || "CHAT" /* Chat */);
+      if (args.sessionId) {
+        uploadArgs.sessionId.push(args.sessionId);
+      }
       await uploadAiBlameHandler(uploadArgs, false);
     });
   });
@@ -13920,6 +13906,7 @@ async function uploadAiBlameHandler(args, exitOnError = true) {
   const tools = args.toolName || args["tool-name"] || [];
   const responseTimes = args.aiResponseAt || args["ai-response-at"] || [];
   const blameTypes = args.blameType || args["blame-type"] || [];
+  const sessionIds = args.sessionId || args["session-id"] || [];
   if (prompts.length !== inferences.length) {
     const errorMsg = "prompt and inference must have the same number of entries";
     console.error(chalk9.red(errorMsg));
@@ -13955,14 +13942,18 @@ async function uploadAiBlameHandler(args, exitOnError = true) {
       toolName: tools[i],
       blameType: blameTypes[i] || "CHAT" /* Chat */,
       computerName,
-      userName
+      userName,
+      sessionId: sessionIds[i]
     });
   }
   const authenticatedClient = await getAuthenticatedGQLClient({
     isSkipPrompts: true
   });
+  const initSessions = sessions.map(
+    ({ sessionId: _sessionId, ...rest }) => rest
+  );
   const sanitizedSessions = await sanitizeData(
-    sessions
+    initSessions
   );
   const initRes = await authenticatedClient.uploadAIBlameInferencesInitRaw({
     sessions: sanitizedSessions
@@ -14008,7 +13999,8 @@ async function uploadAiBlameHandler(args, exitOnError = true) {
       toolName: s.toolName,
       blameType: s.blameType,
       computerName: s.computerName,
-      userName: s.userName
+      userName: s.userName,
+      sessionId: s.sessionId
     };
   });
   const sanitizedFinalizeSessions = await sanitizeData(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobbdev",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "description": "Automated secure code remediation tool",
   "repository": "git+https://github.com/mobb-dev/bugsy.git",
   "main": "dist/index.mjs",
@@ -68,7 +68,6 @@
     "debug": "4.4.3",
     "dotenv": "16.6.1",
     "extract-zip": "2.0.1",
-    "gitleaks-secret-scanner": "1.2.2",
     "globby": "14.1.0",
     "graphql": "16.12.0",
     "graphql-request": "6.1.0",