mobbdev 1.0.177 → 1.0.178

package/dist/index.mjs

@@ -32,7 +32,7 @@ var init_env = __esm({
 });
 
 // src/mcp/core/configs.ts
-var MCP_DEFAULT_API_URL, MCP_API_KEY_HEADER_NAME, MCP_LOGIN_MAX_WAIT, MCP_LOGIN_CHECK_DELAY, MCP_VUL_REPORT_DIGEST_TIMEOUT_MS, MCP_MAX_FILE_SIZE, MCP_PERIODIC_CHECK_INTERVAL, MCP_DEFAULT_MAX_FILES_TO_SCAN, MCP_REPORT_ID_EXPIRATION_MS, MCP_TOOLS_BROWSER_COOLDOWN_MS, MCP_DEFAULT_LIMIT, isAutoScan, MVS_AUTO_FIX_OVERRIDE, MCP_AUTO_FIX_DEBUG_MODE;
+var MCP_DEFAULT_API_URL, MCP_API_KEY_HEADER_NAME, MCP_LOGIN_MAX_WAIT, MCP_LOGIN_CHECK_DELAY, MCP_VUL_REPORT_DIGEST_TIMEOUT_MS, MCP_MAX_FILE_SIZE, MCP_PERIODIC_CHECK_INTERVAL, MCP_DEFAULT_MAX_FILES_TO_SCAN, MCP_REPORT_ID_EXPIRATION_MS, MCP_TOOLS_BROWSER_COOLDOWN_MS, MCP_DEFAULT_LIMIT, isAutoScan, MVS_AUTO_FIX_OVERRIDE, MCP_AUTO_FIX_DEBUG_MODE, MCP_PERIODIC_TRACK_INTERVAL, MCP_DEFAULT_REST_API_URL;
 var init_configs = __esm({
   "src/mcp/core/configs.ts"() {
     "use strict";
@@ -51,6 +51,8 @@ var init_configs = __esm({
     isAutoScan = process.env["AUTO_SCAN"] !== "false";
     MVS_AUTO_FIX_OVERRIDE = process.env["MVS_AUTO_FIX"];
     MCP_AUTO_FIX_DEBUG_MODE = true;
+    MCP_PERIODIC_TRACK_INTERVAL = 60 * 60 * 1e3;
+    MCP_DEFAULT_REST_API_URL = "https://api.mobb.ai/api/rest/mcp/track";
   }
 });
 
@@ -6373,7 +6375,7 @@ async function getAdoSdk(params) {
       const url = new URL(repoUrl);
       const origin2 = url.origin.toLowerCase().endsWith(".visualstudio.com") ? DEFUALT_ADO_ORIGIN : url.origin.toLowerCase();
       const params2 = `path=/&versionDescriptor[versionOptions]=0&versionDescriptor[versionType]=commit&versionDescriptor[version]=${branch}&resolveLfs=true&$format=zip&api-version=5.0&download=true`;
-      const path15 = [
+      const path16 = [
         prefixPath,
         owner,
         projectName,
@@ -6384,7 +6386,7 @@ async function getAdoSdk(params) {
         "items",
         "items"
       ].filter(Boolean).join("/");
-      return new URL(`${path15}?${params2}`, origin2).toString();
+      return new URL(`${path16}?${params2}`, origin2).toString();
     },
     async getAdoBranchList({ repoUrl }) {
       try {
@@ -7839,14 +7841,14 @@ function getGithubSdk(params = {}) {
       };
     },
     async getGithubBlameRanges(params2) {
-      const { ref, gitHubUrl, path: path15 } = params2;
+      const { ref, gitHubUrl, path: path16 } = params2;
       const { owner, repo } = parseGithubOwnerAndRepo(gitHubUrl);
       const res = await octokit.graphql(
         GET_BLAME_DOCUMENT,
         {
           owner,
           repo,
-          path: path15,
+          path: path16,
           ref
         }
       );
@@ -8153,11 +8155,11 @@ var GithubSCMLib = class extends SCMLib {
       markdownComment: comment
     });
   }
-  async getRepoBlameRanges(ref, path15) {
+  async getRepoBlameRanges(ref, path16) {
     this._validateUrl();
     return await this.githubSdk.getGithubBlameRanges({
       ref,
-      path: path15,
+      path: path16,
       gitHubUrl: this.url
     });
   }
@@ -8571,13 +8573,13 @@ function parseGitlabOwnerAndRepo(gitlabUrl) {
   const { organization, repoName, projectPath } = parsingResult;
   return { owner: organization, repo: repoName, projectPath };
 }
-async function getGitlabBlameRanges({ ref, gitlabUrl, path: path15 }, options) {
+async function getGitlabBlameRanges({ ref, gitlabUrl, path: path16 }, options) {
   const { projectPath } = parseGitlabOwnerAndRepo(gitlabUrl);
   const api2 = getGitBeaker({
     url: gitlabUrl,
     gitlabAuthToken: options?.gitlabAuthToken
   });
-  const resp = await api2.RepositoryFiles.allFileBlames(projectPath, path15, ref);
+  const resp = await api2.RepositoryFiles.allFileBlames(projectPath, path16, ref);
   let lineNumber = 1;
   return resp.filter((range) => range.lines).map((range) => {
     const oldLineNumber = lineNumber;
@@ -8753,10 +8755,10 @@ var GitlabSCMLib = class extends SCMLib {
       markdownComment: comment
     });
   }
-  async getRepoBlameRanges(ref, path15) {
+  async getRepoBlameRanges(ref, path16) {
     this._validateUrl();
     return await getGitlabBlameRanges(
-      { ref, path: path15, gitlabUrl: this.url },
+      { ref, path: path16, gitlabUrl: this.url },
       {
         url: this.url,
         gitlabAuthToken: this.accessToken
@@ -9834,7 +9836,7 @@ async function postIssueComment(params) {
     fpDescription
   } = params;
   const {
-    path: path15,
+    path: path16,
     startLine,
     vulnerabilityReportIssue: {
       vulnerabilityReportIssueTags,
@@ -9849,7 +9851,7 @@ async function postIssueComment(params) {
 Refresh the page in order to see the changes.`,
     pull_number: pullRequest,
     commit_id: commitSha,
-    path: path15,
+    path: path16,
     line: startLine
   });
   const commentId = commentRes.data.id;
@@ -9883,7 +9885,7 @@ async function postFixComment(params) {
     scanner
   } = params;
   const {
-    path: path15,
+    path: path16,
     startLine,
     vulnerabilityReportIssue: { fixId, vulnerabilityReportIssueTags, category },
     vulnerabilityReportIssueId
@@ -9901,7 +9903,7 @@ async function postFixComment(params) {
 Refresh the page in order to see the changes.`,
     pull_number: pullRequest,
     commit_id: commitSha,
-    path: path15,
+    path: path16,
     line: startLine
   });
   const commentId = commentRes.data.id;
@@ -10198,10 +10200,10 @@ async function getGitInfo(srcDirPath) {
         repoUrl: void 0
       };
     }
-    const gitInfo = await gitService.getGitInfo();
+    const gitInfo2 = await gitService.getGitInfo();
     return {
       success: true,
-      ...gitInfo
+      ...gitInfo2
     };
   } catch (e) {
     if (e instanceof Error) {
@@ -10995,8 +10997,8 @@ import path8 from "path";
 var debug15 = Debug15("mobbdev:checkmarx");
 var require2 = createRequire(import.meta.url);
 var getCheckmarxPath = () => {
-  const os3 = type();
-  const cxFileName = os3 === "Windows_NT" ? "cx.exe" : "cx";
+  const os5 = type();
+  const cxFileName = os5 === "Windows_NT" ? "cx.exe" : "cx";
   try {
     return require2.resolve(`.bin/${cxFileName}`);
   } catch (e) {
@@ -11671,7 +11673,7 @@ async function _scan(params, { skipPrompts = false } = {}) {
         text: "\u{1F4C1} Uploading Report successful!"
       });
     }
-    let gitInfo = { success: false };
+    let gitInfo2 = { success: false };
     if (reportPath) {
       const vulnFiles = await _digestReport({
         gqlClient,
@@ -11687,7 +11689,7 @@ async function _scan(params, { skipPrompts = false } = {}) {
         repoUploadInfo,
         isIncludeAllFiles: false
       });
-      gitInfo = res.gitInfo;
+      gitInfo2 = res.gitInfo;
     } else {
       const res = await _zipAndUploadRepo({
         srcPath,
@@ -11695,7 +11697,7 @@ async function _scan(params, { skipPrompts = false } = {}) {
         repoUploadInfo,
         isIncludeAllFiles: true
       });
-      gitInfo = res.gitInfo;
+      gitInfo2 = res.gitInfo;
       await _digestReport({
         gqlClient,
         fixReportId: reportUploadInfo.fixReportId,
@@ -11713,9 +11715,9 @@ async function _scan(params, { skipPrompts = false } = {}) {
         submitVulnerabilityReportVariables: {
           fixReportId: reportUploadInfo.fixReportId,
           projectId,
-          repoUrl: repo || gitInfo.repoUrl || getTopLevelDirName(srcPath),
-          reference: ref || gitInfo.reference || "no-branch",
-          sha: commitHash || gitInfo.hash || "0123456789abcdef",
+          repoUrl: repo || gitInfo2.repoUrl || getTopLevelDirName(srcPath),
+          reference: ref || gitInfo2.reference || "no-branch",
+          sha: commitHash || gitInfo2.hash || "0123456789abcdef",
           scanSource: _getScanSource(command, ci),
           pullRequest: params.pullRequest,
           experimentalEnabled: !!experimentalEnabled,
@@ -11761,11 +11763,11 @@ async function _zipAndUploadRepo({
   const srcFileStatus = await fsPromises2.lstat(srcPath);
   const zippingSpinner = createSpinner4("\u{1F4E6} Zipping repo").start();
   let zipBuffer;
-  let gitInfo = { success: false };
+  let gitInfo2 = { success: false };
   if (srcFileStatus.isFile() && path9.extname(srcPath).toLowerCase() === ".fpr") {
     zipBuffer = await repackFpr(srcPath);
   } else {
-    gitInfo = await getGitInfo(srcPath);
+    gitInfo2 = await getGitInfo(srcPath);
     zipBuffer = await pack(srcPath, vulnFiles, isIncludeAllFiles);
   }
   zippingSpinner.success({ text: "\u{1F4E6} Zipping repo successful!" });
@@ -11782,7 +11784,7 @@ async function _zipAndUploadRepo({
     throw e;
   }
   uploadRepoSpinner.success({ text: "\u{1F4C1} Uploading Repo successful!" });
-  return { gitInfo };
+  return { gitInfo: gitInfo2 };
 }
 async function _digestReport({
   gqlClient,
@@ -12283,6 +12285,29 @@ var logWarn = (message, data) => logger.log(message, "warn", data);
 var logDebug = (message, data) => logger.log(message, "debug", data);
 var log = logger.log.bind(logger);
 
+// src/mcp/services/ConfigStoreService.ts
+init_configs();
+import Configstore4 from "configstore";
+function createConfigStore(defaultValues = { apiToken: "" }) {
+  const API_URL2 = process.env["API_URL"] || MCP_DEFAULT_API_URL;
+  let domain = "";
+  try {
+    const url = new URL(API_URL2);
+    domain = url.hostname;
+  } catch (e) {
+    domain = API_URL2.replace(/^https?:\/\//, "").replace(/\/.*$/, "").replace(/:\d+$/, "");
+  }
+  const sanitizedDomain = domain.replace(/\./g, "_");
+  return new Configstore4(
+    `${packageJson.name}-${sanitizedDomain}`,
+    defaultValues
+  );
+}
+function getConfigStore() {
+  return createConfigStore();
+}
+var configStore = getConfigStore();
+
 // src/mcp/services/McpGQLClient.ts
 import crypto3 from "crypto";
 import { GraphQLClient as GraphQLClient2 } from "graphql-request";
@@ -12415,29 +12440,6 @@ var GetLatestReportByRepoUrlResponseSchema = z31.object({
   expiredReport: z31.array(ExpiredReportSchema)
 });
 
-// src/mcp/services/ConfigStoreService.ts
-init_configs();
-import Configstore4 from "configstore";
-function createConfigStore(defaultValues = { apiToken: "" }) {
-  const API_URL2 = process.env["API_URL"] || MCP_DEFAULT_API_URL;
-  let domain = "";
-  try {
-    const url = new URL(API_URL2);
-    domain = url.hostname;
-  } catch (e) {
-    domain = API_URL2.replace(/^https?:\/\//, "").replace(/\/.*$/, "").replace(/:\d+$/, "");
-  }
-  const sanitizedDomain = domain.replace(/\./g, "_");
-  return new Configstore4(
-    `${packageJson.name}-${sanitizedDomain}`,
-    defaultValues
-  );
-}
-function getConfigStore() {
-  return createConfigStore();
-}
-var configStore = getConfigStore();
-
 // src/mcp/services/McpAuthService.ts
 import crypto2 from "crypto";
 import os2 from "os";
@@ -13119,6 +13121,366 @@ async function createAuthenticatedMcpGQLClient({
   return new McpGQLClient({ apiKey: newApiToken, type: "apiKey" });
 }
 
+// src/mcp/services/McpUsageService.ts
+init_configs();
+import fetch5 from "node-fetch";
+import os4 from "os";
+import { v4 as uuidv43, v5 as uuidv5 } from "uuid";
+
+// src/mcp/core/host.ts
+import { execSync } from "child_process";
+import fs10 from "fs";
+import os3 from "os";
+import path11 from "path";
+var IDEs = ["cursor", "windsurf", "webstorm", "vscode"];
+var runCommand = (cmd) => {
+  try {
+    return execSync(cmd, { encoding: "utf8" }).trim();
+  } catch {
+    return "";
+  }
+};
+var gitInfo = {
+  name: runCommand("git config user.name"),
+  email: runCommand("git config user.email")
+};
+var getMCPConfigPath = (hostName) => {
+  const home = os3.homedir();
+  switch (hostName.toLowerCase()) {
+    case "cursor":
+      return path11.join(home, ".cursor", "mcp.json");
+    case "windsurf":
+      return path11.join(home, ".codeium", "windsurf", "mcp_config.json");
+    case "webstorm":
+      return "";
+    case "visualstudiocode":
+    case "vscode":
+      return process.platform === "win32" ? path11.join(home, "AppData", "Roaming", "Code", "User", "mcp.json") : path11.join(
+        home,
+        "Library",
+        "Application Support",
+        "Code",
+        "User",
+        "mcp.json"
+      );
+    default:
+      throw new Error(`Unknown hostName: ${hostName}`);
+  }
+};
+var readMCPConfig = (hostName) => {
+  const filePath = getMCPConfigPath(hostName);
+  if (!fs10.existsSync(filePath)) return null;
+  return JSON.parse(fs10.readFileSync(filePath, "utf8"));
+};
+var getRunningProcesses = () => {
+  try {
+    return os3.platform() === "win32" ? execSync("tasklist", { encoding: "utf8" }) : execSync("ps aux", { encoding: "utf8" });
+  } catch {
+    return "";
+  }
+};
+var knownHosts = {
+  webstorm: "WebStorm",
+  cursor: "Cursor",
+  windsurf: "Windsurf",
+  code: "Vscode"
+};
+var versionCommands = {
+  WebStorm: {
+    darwin: [
+      `grep -m1 '"version"' /Applications/WebStorm.app/Contents/Resources/product-info.json | cut -d'"' -f4`
+    ],
+    win32: []
+  },
+  Cursor: {
+    darwin: [
+      "grep -A1 CFBundleVersion /Applications/Cursor.app/Contents/Info.plist | grep '<string>' | sed -E 's/.*<string>(.*)<\\/string>.*/\\1/'",
+      "cursor --version"
+    ],
+    win32: [
+      '(Get-Item "$env:LOCALAPPDATA\\Programs\\cursor\\Cursor.exe").VersionInfo.ProductVersion'
+    ]
+  },
+  Windsurf: {
+    darwin: [
+      "grep -A1 CFBundleVersion /Applications/Windsurf.app/Contents/Info.plist | grep '<string>' | sed -E 's/.*<string>(.*)<\\/string>.*/\\1/'",
+      "windsurf --version"
+    ],
+    win32: [
+      `(Get-Item "$env:LOCALAPPDATA\\Programs\\Windsurf\\Windsurf.exe").VersionInfo.ProductVersion`
+    ]
+  },
+  Vscode: {
+    darwin: [
+      `grep -A1 CFBundleVersion "/Applications/Visual Studio Code.app/Contents/Info.plist" | grep '<string>' | sed -E 's/.*<string>(.*)<\\/string>.*/\\1/'`,
+      process.env["TERM_PROGRAM_VERSION"] || "Unknown"
+    ],
+    win32: [
+      `(Get-Item "$env:LOCALAPPDATA\\Programs\\Microsoft VS Code\\Code.exe").VersionInfo.ProductVersion`
+    ]
+  }
+};
+var getProcessInfo = (pid) => {
+  const platform = os3.platform();
+  try {
+    if (platform === "linux" || platform === "darwin") {
+      const output = execSync(`ps -o pid=,ppid=,comm= -p ${pid}`, {
+        stdio: ["pipe", "pipe", "ignore"]
+      }).toString().trim();
+      if (!output) return null;
+      const [pidStr, ppid, ...cmd] = output.trim().split(/\s+/);
+      return { pid: pidStr ?? "", ppid: ppid ?? "", cmd: cmd.join(" ") };
+    } else if (platform === "win32") {
+      const output = execSync(
+        `powershell -Command "Get-CimInstance Win32_Process -Filter 'ProcessId=${pid}' | Select-Object ProcessId,ParentProcessId,Name | Format-Table -HideTableHeaders"`,
+        { stdio: ["pipe", "pipe", "ignore"] }
+      ).toString().trim();
+      if (!output) return null;
+      const parts = output.split(/\s+/);
+      const pidStr = parts[0];
+      const ppid = parts[1];
+      const cmd = parts.slice(2).join(" ");
+      return { pid: pidStr ?? "", ppid: ppid ?? "", cmd };
+    } else {
+      logWarn(`Unsupported platform: ${platform}`);
+      return null;
+    }
+  } catch {
+    return null;
+  }
+};
+var getHostInfo = () => {
+  const runningProcesses = getRunningProcesses().toLowerCase();
+  const results = [];
+  const allConfigs = {};
+  for (const ide of IDEs) {
+    const cfg = readMCPConfig(ide);
+    if (cfg) allConfigs[ide] = cfg;
+  }
+  const servers = [];
+  for (const [ide, cfg] of Object.entries(allConfigs)) {
+    for (const [name, server] of Object.entries(
+      cfg.mcpServers || cfg.servers || {}
+    )) {
+      servers.push({
+        ide,
+        name,
+        command: server.command || "",
+        isRunning: false
+      });
+    }
+  }
+  const runningLines = runningProcesses.split("\n");
+  for (const line of runningLines) {
+    if (line.includes("mcp")) {
+      const cmdLower = line.toLowerCase();
+      const existingServer = servers.find(
+        (s) => s.command && cmdLower.includes(s.command.toLowerCase())
+      );
+      if (existingServer) {
+        existingServer.isRunning = true;
+      } else {
+        let ideName = "Unknown";
+        const foundHostKey = Object.keys(knownHosts).find(
+          (key) => cmdLower.includes(key)
+        );
+        if (foundHostKey) {
+          ideName = knownHosts[foundHostKey] || "Unknown";
+        } else {
+          const pidMatch = line.trim().split(/\s+/)[1];
+          const pid = parseInt(String(pidMatch), 10);
+          if (!isNaN(pid)) {
+            let currentPid = pid;
+            while (currentPid && currentPid !== 0) {
+              const proc = getProcessInfo(currentPid);
+              if (!proc) break;
+              const cmdProc = proc.cmd.toLowerCase();
+              const found = Object.keys(knownHosts).find(
+                (key) => cmdProc.includes(key)
+              );
+              if (found) {
+                ideName = knownHosts[found] || "Unknown";
+                break;
+              }
+              currentPid = parseInt(proc.ppid, 10);
+            }
+          }
+        }
+        servers.push({
+          ide: ideName.toLowerCase(),
+          name: "unknown",
+          command: line.trim(),
+          isRunning: true
+        });
+      }
+    }
+  }
+  for (const { ide, name, command, isRunning } of servers) {
+    const config4 = allConfigs[ide] || null;
+    const ideName = ide.charAt(0).toUpperCase() + ide.slice(1) || "Unknown";
+    let ideVersion = "Unknown";
+    const platform = os3.platform();
+    const cmds = versionCommands[ideName]?.[platform] ?? [];
+    for (const cmd of cmds) {
+      try {
+        const versionOutput = cmd.includes("grep") || cmd.includes("--version") || cmd.includes("sed") ? execSync(cmd, { stdio: ["pipe", "pipe", "ignore"] }).toString().split("\n")[0] ?? "" : cmd;
+        if (versionOutput && versionOutput !== "Unknown") {
+          ideVersion = versionOutput;
+          break;
+        }
+      } catch {
+        continue;
+      }
+    }
+    let mcpConfigObj = {};
+    if (config4) {
+      const allServers = config4.mcpServers || config4.servers || {};
+      if (name in allServers && allServers[name]) {
+        mcpConfigObj = allServers[name];
+      }
+    }
+    results.push({
+      mcpName: name || command,
+      mcpConfiguration: JSON.stringify(mcpConfigObj),
+      ideName: ideName || "Unknown",
+      ideVersion: ideVersion || "Unknown",
+      isRunning
+    });
+  }
+  return { mcps: results, user: gitInfo };
+};
+
+// src/mcp/services/McpUsageService.ts
+var McpUsageService = class {
+  constructor() {
+    __publicField(this, "configKey", "mcpUsage");
+    __publicField(this, "intervalId", null);
+    __publicField(this, "REST_API_URL", MCP_DEFAULT_REST_API_URL);
+    this.startPeriodicTracking();
+    if (process.env["API_URL"]) {
+      const url = new URL(process.env["API_URL"]);
+      const domain = `${url.protocol}//${url.host}`;
+      this.REST_API_URL = `${domain}/api/rest/mcp/track`;
+    }
+  }
+  startPeriodicTracking() {
+    const scanContext = ScanContext.BACKGROUND_PERIODIC;
+    logDebug(`[${scanContext}] Starting periodic tracking for mcps`, {});
+    this.intervalId = setInterval(async () => {
+      logDebug(`[${scanContext}] Triggering periodic security scan`, {
+        MCP_PERIODIC_TRACK_INTERVAL
+      });
+      await mcpUsageService.trackServerStart();
+    }, 1e4);
+  }
+  generateHostId() {
+    const stored = configStore.get(this.configKey);
+    if (stored?.mcpHostId) return stored.mcpHostId;
+    const interfaces = os4.networkInterfaces();
+    const macs = [];
+    for (const iface of Object.values(interfaces)) {
+      if (!iface) continue;
+      for (const net of iface) {
+        if (net.mac && net.mac !== "00:00:00:00:00:00") macs.push(net.mac);
+      }
+    }
+    const macString = macs.length ? macs.sort().join(",") : `${os4.hostname()}-${uuidv43()}`;
+    const hostId = uuidv5(macString, uuidv5.DNS);
+    logDebug("Generated new host ID", { hostId });
+    return hostId;
+  }
+  getOrganizationId() {
+    const organizationId = configStore.get("GOV-ORG-ID") || "";
+    if (organizationId) {
+      logDebug("Using stored organization ID", {
+        organizationId
+      });
+      return organizationId;
+    }
+    return "";
+  }
+  createUsageData(mcpHostId, organizationId, status) {
+    const { user, mcps } = getHostInfo();
+    return {
+      mcpHostId,
+      organizationId,
+      mcpVersion: packageJson.version,
+      mcpOsName: os4.platform(),
+      mcps: JSON.stringify(mcps),
+      status,
+      userName: user.name,
+      userEmail: user.email,
+      date: String((/* @__PURE__ */ new Date()).toISOString().split("T")[0])
+      // it's used to make sure we track the mcp usage daily
+    };
+  }
+  async trackUsage(status) {
+    try {
+      const hostId = this.generateHostId();
+      const organizationId = this.getOrganizationId();
+      if (!organizationId) {
+        logError("Cannot track MCP usage - organization ID not available");
+        return;
+      }
+      const usageData = this.createUsageData(hostId, organizationId, status);
+      const stored = configStore.get(this.configKey);
+      const hasChanges = !stored || Object.keys(usageData).some(
+        (key) => usageData[key] !== stored[key]
+      );
+      if (!hasChanges) {
+        logDebug(`Skipping ${status} usage tracking - no changes`);
+        return;
+      }
+      logDebug("Before", { usageData });
+      try {
+        const res = await fetch5(this.REST_API_URL, {
+          method: "POST",
+          headers: {
+            Accept: "application/json"
+          },
+          body: JSON.stringify({
+            organizationId,
+            mcps: usageData.mcps,
+            status,
+            osName: usageData.mcpOsName,
+            userFullName: usageData.userName,
+            userEmail: usageData.userEmail
+          })
+        });
+        const authResult = await res.json();
+        logDebug("Success usage data", { authResult });
+      } catch (err) {
+        logDebug("Error usage data", { err });
+      }
+      logDebug("Saving usage data", { usageData });
+      configStore.set(this.configKey, usageData);
+      logInfo(
+        `MCP server ${status === "ACTIVE" ? "start" : "stop"} tracked successfully`
+      );
+    } catch (error) {
+      configStore.set(this.configKey, { status: "FAILED" });
+      logError(
+        `Failed to track MCP server ${status === "ACTIVE" ? "start" : "stop"}`,
+        { error }
+      );
+    }
+  }
+  async trackServerStart() {
+    await this.trackUsage("ACTIVE");
+  }
+  async trackServerStop() {
+    await this.trackUsage("INACTIVE");
+  }
+  reset() {
+    if (!this.intervalId) {
+      return;
+    }
+    clearInterval(this.intervalId);
+    this.intervalId = null;
+  }
+};
+var mcpUsageService = new McpUsageService();
+
 // src/mcp/tools/toolNames.ts
 var MCP_TOOL_CHECK_FOR_NEW_AVAILABLE_FIXES = "check_for_new_available_fixes";
 var MCP_TOOL_FETCH_AVAILABLE_FIXES = "fetch_available_fixes";
@@ -13185,7 +13547,23 @@ var McpServer = class {
     logInfo("MCP server instance created");
     logDebug("MCP server instance config", { config: config4 });
   }
-  handleProcessSignal({
+  async trackServerUsage(action, signalOrError) {
+    try {
+      if (action === "start") {
+        await mcpUsageService.trackServerStart();
+      }
+      if (action === "stop") {
+        await mcpUsageService.trackServerStop();
+        mcpUsageService.reset();
+      }
+    } catch (usageError) {
+      logWarn(`Failed to track MCP server ${action}`, {
+        error: usageError,
+        signalOrError
+      });
+    }
+  }
+  async handleProcessSignal({
     signal,
     error
   }) {
@@ -13223,9 +13601,11 @@ var McpServer = class {
       logDebug(message, { signal });
     }
     if (signal === "SIGINT" || signal === "SIGTERM") {
+      await this.trackServerUsage("stop", signal);
       process.exit(0);
     }
     if (signal === "uncaughtException") {
+      await this.trackServerUsage("stop", signal);
       process.exit(1);
     }
   }
@@ -13243,8 +13623,8 @@ var McpServer = class {
       "warning"
     ];
     signals.forEach((signal) => {
-      const handler = (error) => {
-        this.handleProcessSignal({ signal, error });
+      const handler = async (error) => {
+        await this.handleProcessSignal({ signal, error });
       };
       this.eventHandlers.set(signal, handler);
       process.on(signal, handler);
@@ -13303,6 +13683,12 @@ var McpServer = class {
     }
   }
   async handleListToolsRequest(request) {
+    const govOrgId = configStore.get("GOV-ORG-ID") || "";
+    if (govOrgId) {
+      return {
+        tools: []
+      };
+    }
     logInfo("Received list_tools request");
     logDebug("list_tools request", {
       request: JSON.parse(JSON.stringify(request))
@@ -13390,6 +13776,7 @@ var McpServer = class {
       const transport = new StdioServerTransport();
       await this.server.connect(transport);
       logDebug("MCP server is running on stdin/stdout");
+      await this.trackServerUsage("start");
       process.stdin.resume();
       await this.createShutdownPromise();
       await this.stop();
@@ -13400,6 +13787,7 @@ var McpServer = class {
   }
   async stop() {
     logDebug("MCP server shutting down");
+    await this.trackServerUsage("stop");
     this.eventHandlers.forEach((handler, signal) => {
       process.removeListener(signal, handler);
     });
@@ -13413,8 +13801,8 @@ var McpServer = class {
 import { z as z34 } from "zod";
 
 // src/mcp/services/PathValidation.ts
-import fs10 from "fs";
-import path11 from "path";
+import fs11 from "fs";
+import path12 from "path";
 async function validatePath(inputPath) {
   logDebug("Validating MCP path", { inputPath });
   if (/^\/[a-zA-Z]:\//.test(inputPath)) {
@@ -13441,7 +13829,7 @@ async function validatePath(inputPath) {
     logError(error);
     return { isValid: false, error, path: inputPath };
   }
-  const normalizedPath = path11.normalize(inputPath);
+  const normalizedPath = path12.normalize(inputPath);
   if (normalizedPath.includes("..")) {
     const error = `Normalized path contains path traversal patterns: ${inputPath}`;
     logError(error);
@@ -13468,7 +13856,7 @@ async function validatePath(inputPath) {
   logDebug("Path validation successful", { inputPath });
   logDebug("Checking path existence", { inputPath });
   try {
-    await fs10.promises.access(inputPath);
+    await fs11.promises.access(inputPath);
     logDebug("Path exists and is accessible", { inputPath });
     return { isValid: true, path: inputPath };
   } catch (error) {
@@ -14030,26 +14418,26 @@ ${whatHappensNextSection}`;
 init_FileUtils();
 init_GitService();
 init_configs();
-import fs11 from "fs/promises";
+import fs12 from "fs/promises";
 import nodePath from "path";
 var getLocalFiles = async ({
-  path: path15,
+  path: path16,
   maxFileSize = MCP_MAX_FILE_SIZE,
   maxFiles,
   isAllFilesScan,
   scanContext
 }) => {
   logDebug(`[${scanContext}] Starting getLocalFiles`, {
-    path: path15,
+    path: path16,
     maxFileSize,
     maxFiles,
     isAllFilesScan
   });
   try {
-    const resolvedRepoPath = await fs11.realpath(path15);
+    const resolvedRepoPath = await fs12.realpath(path16);
     logDebug(`[${scanContext}] Resolved repository path`, {
       resolvedRepoPath,
-      originalPath: path15
+      originalPath: path16
     });
     const gitService = new GitService(resolvedRepoPath, log);
     const gitValidation = await gitService.validateRepository();
@@ -14062,7 +14450,7 @@ var getLocalFiles = async ({
     if (!gitValidation.isValid || isAllFilesScan) {
       try {
         files = await FileUtils.getLastChangedFiles({
-          dir: path15,
+          dir: path16,
           maxFileSize,
           maxFiles,
           isAllFilesScan
@@ -14126,7 +14514,7 @@ var getLocalFiles = async ({
           absoluteFilePath
         );
         try {
-          const fileStat = await fs11.stat(absoluteFilePath);
+          const fileStat = await fs12.stat(absoluteFilePath);
           return {
             filename: nodePath.basename(absoluteFilePath),
             relativePath,
@@ -14154,15 +14542,15 @@ var getLocalFiles = async ({
     logError(`${scanContext}Unexpected error in getLocalFiles`, {
       error: error instanceof Error ? error.message : String(error),
       stack: error instanceof Error ? error.stack : void 0,
-      path: path15
+      path: path16
     });
     throw error;
   }
 };
 
 // src/mcp/services/LocalMobbFolderService.ts
-import fs12 from "fs";
-import path12 from "path";
+import fs13 from "fs";
+import path13 from "path";
 import { z as z33 } from "zod";
 init_GitService();
 function extractPathFromPatch(patch) {
@@ -14249,19 +14637,19 @@ var LocalMobbFolderService = class {
           "[LocalMobbFolderService] Non-git repository detected, skipping .gitignore operations"
         );
       }
-      const mobbFolderPath = path12.join(
+      const mobbFolderPath = path13.join(
         this.repoPath,
         this.defaultMobbFolderName
       );
-      if (!fs12.existsSync(mobbFolderPath)) {
+      if (!fs13.existsSync(mobbFolderPath)) {
         logInfo("[LocalMobbFolderService] Creating .mobb folder", {
           mobbFolderPath
         });
-        fs12.mkdirSync(mobbFolderPath, { recursive: true });
+        fs13.mkdirSync(mobbFolderPath, { recursive: true });
       } else {
         logDebug("[LocalMobbFolderService] .mobb folder already exists");
       }
-      const stats = fs12.statSync(mobbFolderPath);
+      const stats = fs13.statSync(mobbFolderPath);
       if (!stats.isDirectory()) {
         throw new Error(`Path exists but is not a directory: ${mobbFolderPath}`);
       }
@@ -14302,13 +14690,13 @@ var LocalMobbFolderService = class {
       logDebug("[LocalMobbFolderService] Git repository validated successfully");
     } else {
       try {
-        const stats = fs12.statSync(this.repoPath);
+        const stats = fs13.statSync(this.repoPath);
         if (!stats.isDirectory()) {
           throw new Error(
             `Path exists but is not a directory: ${this.repoPath}`
           );
         }
-        fs12.accessSync(this.repoPath, fs12.constants.R_OK | fs12.constants.W_OK);
+        fs13.accessSync(this.repoPath, fs13.constants.R_OK | fs13.constants.W_OK);
         logDebug(
           "[LocalMobbFolderService] Non-git directory validated successfully"
         );
@@ -14421,8 +14809,8 @@ var LocalMobbFolderService = class {
         mobbFolderPath,
         baseFileName
       );
-      const filePath = path12.join(mobbFolderPath, uniqueFileName);
-      await fs12.promises.writeFile(filePath, patch, "utf8");
+      const filePath = path13.join(mobbFolderPath, uniqueFileName);
+      await fs13.promises.writeFile(filePath, patch, "utf8");
       logInfo("[LocalMobbFolderService] Patch saved successfully", {
         filePath,
         fileName: uniqueFileName,
@@ -14479,11 +14867,11 @@ var LocalMobbFolderService = class {
    * @returns Unique filename that doesn't conflict with existing files
    */
   getUniqueFileName(folderPath, baseFileName) {
-    const baseName = path12.parse(baseFileName).name;
-    const extension = path12.parse(baseFileName).ext;
+    const baseName = path13.parse(baseFileName).name;
+    const extension = path13.parse(baseFileName).ext;
     let uniqueFileName = baseFileName;
     let index = 1;
-    while (fs12.existsSync(path12.join(folderPath, uniqueFileName))) {
+    while (fs13.existsSync(path13.join(folderPath, uniqueFileName))) {
       uniqueFileName = `${baseName}-${index}${extension}`;
       index++;
       if (index > 1e3) {
@@ -14514,18 +14902,18 @@ var LocalMobbFolderService = class {
     logDebug("[LocalMobbFolderService] Logging patch info", { fixId: fix.id });
     try {
       const mobbFolderPath = await this.getFolder();
-      const patchInfoPath = path12.join(mobbFolderPath, "patchInfo.md");
+      const patchInfoPath = path13.join(mobbFolderPath, "patchInfo.md");
       const markdownContent = this.generateFixMarkdown(fix, savedPatchFileName);
       let existingContent = "";
-      if (fs12.existsSync(patchInfoPath)) {
-        existingContent = await fs12.promises.readFile(patchInfoPath, "utf8");
+      if (fs13.existsSync(patchInfoPath)) {
+        existingContent = await fs13.promises.readFile(patchInfoPath, "utf8");
         logDebug("[LocalMobbFolderService] Existing patchInfo.md found");
       } else {
         logDebug("[LocalMobbFolderService] Creating new patchInfo.md file");
       }
       const separator = existingContent ? "\n\n================================================================================\n\n" : "";
       const updatedContent = `${markdownContent}${separator}${existingContent}`;
-      await fs12.promises.writeFile(patchInfoPath, updatedContent, "utf8");
+      await fs13.promises.writeFile(patchInfoPath, updatedContent, "utf8");
       logInfo("[LocalMobbFolderService] Patch info logged successfully", {
         patchInfoPath,
         fixId: fix.id,
@@ -14556,7 +14944,7 @@ var LocalMobbFolderService = class {
     const timestamp = (/* @__PURE__ */ new Date()).toISOString();
     const patch = this.extractPatchFromFix(fix);
     const relativePatchedFilePath = patch ? extractPathFromPatch(patch) : null;
-    const patchedFilePath = relativePatchedFilePath ? path12.resolve(this.repoPath, relativePatchedFilePath) : null;
+    const patchedFilePath = relativePatchedFilePath ? path13.resolve(this.repoPath, relativePatchedFilePath) : null;
     const fixIdentifier = savedPatchFileName ? savedPatchFileName.replace(".patch", "") : fix.id;
     let markdown = `# Fix ${fixIdentifier}
 
@@ -14898,16 +15286,16 @@ import {
   unlinkSync,
   writeFileSync
 } from "fs";
-import fs13 from "fs/promises";
+import fs14 from "fs/promises";
 import parseDiff2 from "parse-diff";
-import path13 from "path";
+import path14 from "path";
 var PatchApplicationService = class {
   /**
    * Gets the appropriate comment syntax for a file based on its extension
    */
   static getCommentSyntax(filePath) {
-    const ext = path13.extname(filePath).toLowerCase();
-    const basename2 = path13.basename(filePath);
+    const ext = path14.extname(filePath).toLowerCase();
+    const basename2 = path14.basename(filePath);
     const commentMap = {
       // C-style languages (single line comments)
       ".js": "//",
@@ -15117,7 +15505,7 @@ var PatchApplicationService = class {
         }
       );
     }
-    const dirPath = path13.dirname(filePath);
+    const dirPath = path14.dirname(filePath);
     mkdirSync(dirPath, { recursive: true });
     writeFileSync(filePath, finalContent, "utf8");
     return filePath;
@@ -15401,9 +15789,9 @@ var PatchApplicationService = class {
         continue;
       }
       try {
-        const absolutePath = path13.resolve(repositoryPath, targetFile);
+        const absolutePath = path14.resolve(repositoryPath, targetFile);
         if (existsSync2(absolutePath)) {
-          const stats = await fs13.stat(absolutePath);
+          const stats = await fs14.stat(absolutePath);
           const fileModTime = stats.mtime.getTime();
           if (fileModTime > scanStartTime) {
             logError(
@@ -15444,7 +15832,7 @@ var PatchApplicationService = class {
     const appliedFixes = [];
     const failedFixes = [];
     const skippedFixes = [];
-    const resolvedRepoPath = await fs13.realpath(repositoryPath);
+    const resolvedRepoPath = await fs14.realpath(repositoryPath);
     logInfo(
       `[${scanContext}] Starting patch application for ${fixes.length} fixes`,
       {
@@ -15592,11 +15980,11 @@ var PatchApplicationService = class {
   }) {
     const sanitizedRepoPath = String(repositoryPath || "").replace("\0", "").replace(/^(\.\.(\/|\\))+/, "");
     const sanitizedTargetFile = String(targetFile || "").replace("\0", "").replace(/^(\.\.(\/|\\))+/, "");
-    const absoluteFilePath = path13.resolve(
+    const absoluteFilePath = path14.resolve(
       sanitizedRepoPath,
       sanitizedTargetFile
     );
-    const relativePath = path13.relative(sanitizedRepoPath, absoluteFilePath);
+    const relativePath = path14.relative(sanitizedRepoPath, absoluteFilePath);
     if (relativePath.startsWith("..")) {
       throw new Error(
         `Security violation: target file ${targetFile} resolves outside repository`
@@ -15630,7 +16018,7 @@ var PatchApplicationService = class {
       fix,
       scanContext
     });
-    appliedFiles.push(path13.relative(repositoryPath, actualPath));
+    appliedFiles.push(path14.relative(repositoryPath, actualPath));
     logDebug(`[${scanContext}] Created new file: ${relativePath}`);
   }
   /**
@@ -15678,7 +16066,7 @@ var PatchApplicationService = class {
         fix,
         scanContext
       });
-      appliedFiles.push(path13.relative(repositoryPath, actualPath));
+      appliedFiles.push(path14.relative(repositoryPath, actualPath));
       logDebug(`[${scanContext}] Modified file: ${relativePath}`);
     }
   }
@@ -15873,8 +16261,8 @@ init_configs();
 
 // src/mcp/services/FileOperations.ts
 init_FileUtils();
-import fs14 from "fs";
-import path14 from "path";
+import fs15 from "fs";
+import path15 from "path";
 import AdmZip2 from "adm-zip";
 var FileOperations = class {
   /**
@@ -15894,10 +16282,10 @@ var FileOperations = class {
     let packedFilesCount = 0;
     const packedFiles = [];
     const excludedFiles = [];
-    const resolvedRepoPath = path14.resolve(repositoryPath);
+    const resolvedRepoPath = path15.resolve(repositoryPath);
     for (const filepath of fileList) {
-      const absoluteFilepath = path14.join(repositoryPath, filepath);
-      const resolvedFilePath = path14.resolve(absoluteFilepath);
+      const absoluteFilepath = path15.join(repositoryPath, filepath);
+      const resolvedFilePath = path15.resolve(absoluteFilepath);
       if (!resolvedFilePath.startsWith(resolvedRepoPath)) {
         const reason = "potential path traversal security risk";
         logDebug(`[FileOperations] Skipping ${filepath} due to ${reason}`);
@@ -15944,11 +16332,11 @@ var FileOperations = class {
     fileList,
     repositoryPath
   }) {
-    const resolvedRepoPath = path14.resolve(repositoryPath);
+    const resolvedRepoPath = path15.resolve(repositoryPath);
     const validatedPaths = [];
     for (const filepath of fileList) {
-      const absoluteFilepath = path14.join(repositoryPath, filepath);
-      const resolvedFilePath = path14.resolve(absoluteFilepath);
+      const absoluteFilepath = path15.join(repositoryPath, filepath);
+      const resolvedFilePath = path15.resolve(absoluteFilepath);
       if (!resolvedFilePath.startsWith(resolvedRepoPath)) {
         logDebug(
           `[FileOperations] Rejecting ${filepath} - path traversal attempt detected`
@@ -15956,7 +16344,7 @@ var FileOperations = class {
         continue;
       }
       try {
-        await fs14.promises.access(absoluteFilepath, fs14.constants.R_OK);
+        await fs15.promises.access(absoluteFilepath, fs15.constants.R_OK);
         validatedPaths.push(filepath);
       } catch (error) {
         logDebug(
@@ -15975,8 +16363,8 @@ var FileOperations = class {
     const fileDataArray = [];
     for (const absolutePath of filePaths) {
       try {
-        const content = await fs14.promises.readFile(absolutePath);
-        const relativePath = path14.basename(absolutePath);
+        const content = await fs15.promises.readFile(absolutePath);
+        const relativePath = path15.basename(absolutePath);
         fileDataArray.push({
           relativePath,
           absolutePath,
@@ -16001,7 +16389,7 @@ var FileOperations = class {
     relativeFilepath
   }) {
     try {
-      return await fs14.promises.readFile(absoluteFilepath);
+      return await fs15.promises.readFile(absoluteFilepath);
     } catch (fsError) {
       logError(
         `[FileOperations] Failed to read ${relativeFilepath} from filesystem: ${fsError}`
@@ -16288,14 +16676,14 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
    * since the last scan.
    */
   async scanForSecurityVulnerabilities({
-    path: path15,
+    path: path16,
     isAllDetectionRulesScan,
     isAllFilesScan,
     scanContext
   }) {
     this.hasAuthenticationFailed = false;
     logDebug(`[${scanContext}] Scanning for new security vulnerabilities`, {
-      path: path15
+      path: path16
     });
     if (!this.gqlClient) {
       logInfo(`[${scanContext}] No GQL client found, skipping scan`);
@@ -16311,10 +16699,10 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
       }
       logDebug(
         `[${scanContext}] Connected to the API, assembling list of files to scan`,
-        { path: path15 }
+        { path: path16 }
       );
       const files = await getLocalFiles({
-        path: path15,
+        path: path16,
         isAllFilesScan,
         scanContext
       });
@@ -16339,13 +16727,13 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
       });
       const { fixReportId, projectId } = await scanFiles({
         fileList: filesToScan.map((file) => file.relativePath),
-        repositoryPath: path15,
+        repositoryPath: path16,
         gqlClient: this.gqlClient,
         isAllDetectionRulesScan,
         scanContext
       });
       logInfo(
-        `[${scanContext}] Security scan completed for ${path15} reportId: ${fixReportId} projectId: ${projectId}`
+        `[${scanContext}] Security scan completed for ${path16} reportId: ${fixReportId} projectId: ${projectId}`
       );
       if (isAllFilesScan) {
         return;
@@ -16639,13 +17027,13 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
     });
     return scannedFiles.some((file) => file.relativePath === fixFile);
   }
-  async getFreshFixes({ path: path15 }) {
+  async getFreshFixes({ path: path16 }) {
     const scanContext = ScanContext.USER_REQUEST;
-    logDebug(`[${scanContext}] Getting fresh fixes`, { path: path15 });
-    if (this.path !== path15) {
-      this.path = path15;
+    logDebug(`[${scanContext}] Getting fresh fixes`, { path: path16 });
+    if (this.path !== path16) {
+      this.path = path16;
       this.reset();
-      logInfo(`[${scanContext}] Reset service state for new path`, { path: path15 });
+      logInfo(`[${scanContext}] Reset service state for new path`, { path: path16 });
     }
     try {
       this.gqlClient = await createAuthenticatedMcpGQLClient();
@@ -16663,7 +17051,7 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
       }
       throw error;
     }
-    this.triggerScan({ path: path15, gqlClient: this.gqlClient });
+    this.triggerScan({ path: path16, gqlClient: this.gqlClient });
     let isMvsAutoFixEnabled = null;
     try {
       isMvsAutoFixEnabled = await this.gqlClient.getMvsAutoFixSettings();
@@ -16697,33 +17085,33 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
     return noFreshFixesPrompt;
   }
   triggerScan({
-    path: path15,
+    path: path16,
     gqlClient
   }) {
-    if (this.path !== path15) {
-      this.path = path15;
+    if (this.path !== path16) {
+      this.path = path16;
       this.reset();
-      logInfo(`Reset service state for new path in triggerScan`, { path: path15 });
+      logInfo(`Reset service state for new path in triggerScan`, { path: path16 });
     }
     this.gqlClient = gqlClient;
     if (!this.intervalId) {
-      this.startPeriodicScanning(path15);
-      this.executeInitialScan(path15);
-      void this.executeInitialFullScan(path15);
+      this.startPeriodicScanning(path16);
+      this.executeInitialScan(path16);
+      void this.executeInitialFullScan(path16);
     }
   }
-  startPeriodicScanning(path15) {
+  startPeriodicScanning(path16) {
     const scanContext = ScanContext.BACKGROUND_PERIODIC;
     logDebug(
       `[${scanContext}] Starting periodic scan for new security vulnerabilities`,
       {
-        path: path15
+        path: path16
       }
     );
     this.intervalId = setInterval(() => {
-      logDebug(`[${scanContext}] Triggering periodic security scan`, { path: path15 });
+      logDebug(`[${scanContext}] Triggering periodic security scan`, { path: path16 });
       this.scanForSecurityVulnerabilities({
-        path: path15,
+        path: path16,
         scanContext
       }).catch((error) => {
         logError(`[${scanContext}] Error during periodic security scan`, {
@@ -16732,45 +17120,45 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
       });
     }, MCP_PERIODIC_CHECK_INTERVAL);
   }
-  async executeInitialFullScan(path15) {
+  async executeInitialFullScan(path16) {
     const scanContext = ScanContext.FULL_SCAN;
-    logDebug(`[${scanContext}] Triggering initial full security scan`, { path: path15 });
+    logDebug(`[${scanContext}] Triggering initial full security scan`, { path: path16 });
     logDebug(`[${scanContext}] Full scan paths scanned`, {
       fullScanPathsScanned: this.fullScanPathsScanned
     });
-    if (this.fullScanPathsScanned.includes(path15)) {
+    if (this.fullScanPathsScanned.includes(path16)) {
       logDebug(`[${scanContext}] Full scan already executed for this path`, {
-        path: path15
+        path: path16
       });
       return;
     }
     configStore.set("fullScanPathsScanned", [
       ...this.fullScanPathsScanned,
-      path15
+      path16
     ]);
     try {
       await this.scanForSecurityVulnerabilities({
-        path: path15,
+        path: path16,
         isAllFilesScan: true,
         isAllDetectionRulesScan: true,
         scanContext: ScanContext.FULL_SCAN
       });
-      if (!this.fullScanPathsScanned.includes(path15)) {
-        this.fullScanPathsScanned.push(path15);
+      if (!this.fullScanPathsScanned.includes(path16)) {
+        this.fullScanPathsScanned.push(path16);
         configStore.set("fullScanPathsScanned", this.fullScanPathsScanned);
       }
-      logInfo(`[${scanContext}] Full scan completed`, { path: path15 });
+      logInfo(`[${scanContext}] Full scan completed`, { path: path16 });
     } catch (error) {
       logError(`[${scanContext}] Error during initial full security scan`, {
         error
       });
     }
   }
-  executeInitialScan(path15) {
+  executeInitialScan(path16) {
     const scanContext = ScanContext.BACKGROUND_INITIAL;
-    logDebug(`[${scanContext}] Triggering initial security scan`, { path: path15 });
+    logDebug(`[${scanContext}] Triggering initial security scan`, { path: path16 });
     this.scanForSecurityVulnerabilities({
-      path: path15,
+      path: path16,
       scanContext: ScanContext.BACKGROUND_INITIAL
     }).catch((error) => {
       logError(`[${scanContext}] Error during initial security scan`, { error });
@@ -16866,9 +17254,9 @@ Example payload:
         `Invalid path: potential security risk detected in path: ${pathValidationResult.error}`
       );
     }
-    const path15 = pathValidationResult.path;
+    const path16 = pathValidationResult.path;
     const resultText = await this.newFixesService.getFreshFixes({
-      path: path15
+      path: path16
     });
     logInfo("CheckForNewAvailableFixesTool execution completed", {
       resultText
@@ -17016,8 +17404,8 @@ Call this tool instead of ${MCP_TOOL_SCAN_AND_FIX_VULNERABILITIES} when you only
         `Invalid path: potential security risk detected in path: ${pathValidationResult.error}`
       );
     }
-    const path15 = pathValidationResult.path;
-    const gitService = new GitService(path15, log);
+    const path16 = pathValidationResult.path;
+    const gitService = new GitService(path16, log);
     const gitValidation = await gitService.validateRepository();
     if (!gitValidation.isValid) {
       throw new Error(`Invalid git repository: ${gitValidation.error}`);
@@ -17283,9 +17671,9 @@ Example payload:
         `Invalid path: potential security risk detected in path: ${pathValidationResult.error}`
       );
     }
-    const path15 = pathValidationResult.path;
+    const path16 = pathValidationResult.path;
     const files = await getLocalFiles({
-      path: path15,
+      path: path16,
       maxFileSize: MCP_MAX_FILE_SIZE,
       maxFiles: args.maxFiles,
       scanContext: ScanContext.USER_REQUEST
@@ -17304,7 +17692,7 @@ Example payload:
     try {
       const fixResult = await this.vulnerabilityFixService.processVulnerabilities({
         fileList: files.map((file) => file.relativePath),
-        repositoryPath: path15,
+        repositoryPath: path16,
         offset: args.offset,
         limit: args.limit,
         isRescan: args.rescan || !!args.maxFiles
@@ -17355,9 +17743,12 @@ function createMcpServer() {
   logInfo("MCP server created and configured");
   return server;
 }
-async function startMcpServer() {
+async function startMcpServer({
+  govOrgId = ""
+}) {
   try {
     logDebug("Initializing MCP server");
+    configStore.set("GOV-ORG-ID", govOrgId);
     const server = createMcpServer();
     await server.start();
   } catch (error) {
@@ -17368,7 +17759,7 @@ async function startMcpServer() {
 
 // src/args/commands/mcp.ts
 var mcpBuilder = (yargs2) => {
-  return yargs2.example("$0 mcp", "Launch the MCP server").option("debug", {
+  return yargs2.example("$0 mcp", "Launch the MCP server").option("gov-org-id", organizationIdOptions).option("debug", {
     alias: "d",
     type: "boolean",
     description: "Run in debug mode with communication logging",
@@ -17377,7 +17768,8 @@ var mcpBuilder = (yargs2) => {
 };
 var mcpHandler = async (_args) => {
   try {
-    await startMcpServer();
+    validateOrganizationId(_args.govOrgId);
+    await startMcpServer({ govOrgId: _args.govOrgId });
   } catch (error) {
     console.error("Failed to start MCP server:", error);
     process.exit(1);
@@ -17385,7 +17777,7 @@ var mcpHandler = async (_args) => {
 };
 
 // src/args/commands/review.ts
-import fs15 from "fs";
+import fs16 from "fs";
 import chalk9 from "chalk";
 function reviewBuilder(yargs2) {
   return yargs2.option("f", {
@@ -17422,7 +17814,7 @@ function reviewBuilder(yargs2) {
   ).help();
 }
 function validateReviewOptions(argv) {
-  if (!fs15.existsSync(argv.f)) {
+  if (!fs16.existsSync(argv.f)) {
     throw new CliError(`
 Can't access ${chalk9.bold(argv.f)}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobbdev",
-  "version": "1.0.177",
+  "version": "1.0.178",
   "description": "Automated secure code remediation tool",
   "repository": "git+https://github.com/mobb-dev/bugsy.git",
   "main": "dist/index.mjs",