mobbdev 1.0.126 → 1.0.128

package/dist/index.mjs

@@ -41,7 +41,7 @@ var init_configs = __esm({
     MCP_API_KEY_HEADER_NAME = "x-mobb-key";
     MCP_LOGIN_MAX_WAIT = 2 * 60 * 1e3;
     MCP_LOGIN_CHECK_DELAY = 2 * 1e3;
-    MCP_VUL_REPORT_DIGEST_TIMEOUT_MS = 5 * 60 * 1e3;
+    MCP_VUL_REPORT_DIGEST_TIMEOUT_MS = 30 * 60 * 1e3;
     MCP_MAX_FILE_SIZE = MAX_UPLOAD_FILE_SIZE_MB * 1024 * 1024;
     MCP_PERIODIC_CHECK_INTERVAL = 15 * 60 * 1e3;
     MCP_DEFAULT_MAX_FILES_TO_SCAN = 10;
@@ -564,46 +564,29 @@ var init_FileUtils = __esm({
       }
       // Process directory at repository root level with special handling for excluded root directories
       static async processRootDirectory(dir, excludedRootDirectories) {
-        try {
-          await fsPromises.access(dir, fs2.constants.R_OK);
-        } catch {
+        const visitedDirs = /* @__PURE__ */ new Set();
+        return this.processDirectory(
+          dir,
+          dir,
+          excludedRootDirectories,
+          0,
+          visitedDirs,
+          true
+        );
+      }
+      // Process directories with tracking to prevent circular symlink recursion
+      static async processDirectory(dir, rootDir, excludedRootDirectories = [], depth = 0, visitedDirs = /* @__PURE__ */ new Set(), isRootLevel = false) {
+        if (depth > 20) {
           return [];
         }
-        const items = await fsPromises.readdir(dir);
-        const results = [];
-        const filePromises = [];
-        for (const item of items) {
-          const fullPath = path.join(dir, item);
-          try {
-            await fsPromises.access(fullPath, fs2.constants.R_OK);
-            const stat = await fsPromises.stat(fullPath);
-            if (stat.isDirectory()) {
-              if (excludedRootDirectories.includes(item)) {
-                continue;
-              }
-              filePromises.push(this.processSubdirectory(fullPath, dir, 1));
-            } else {
-              results.push({
-                name: item,
-                fullPath,
-                relativePath: item,
-                time: stat.mtime.getTime(),
-                isFile: true
-              });
-            }
-          } catch {
-            continue;
+        let canonicalPath;
+        try {
+          canonicalPath = await fsPromises.realpath(dir);
+          if (visitedDirs.has(canonicalPath)) {
+            return [];
           }
-        }
-        const subdirResults = await Promise.all(filePromises);
-        for (const subdirResult of subdirResults) {
-          results.push(...subdirResult);
-        }
-        return results;
-      }
-      // Process subdirectories without applying root exclusions
-      static async processSubdirectory(dir, rootDir, depth) {
-        if (depth > 20) {
+          visitedDirs.add(canonicalPath);
+        } catch {
           return [];
         }
         try {
@@ -620,8 +603,11 @@ var init_FileUtils = __esm({
             await fsPromises.access(fullPath, fs2.constants.R_OK);
             const stat = await fsPromises.stat(fullPath);
             if (stat.isDirectory()) {
+              if (isRootLevel && excludedRootDirectories.includes(item)) {
+                continue;
+              }
               filePromises.push(
-                this.processSubdirectory(fullPath, rootDir, depth + 1)
+                this.processDirectory(fullPath, rootDir, [], depth + 1, visitedDirs)
               );
             } else {
               results.push({
@@ -700,25 +686,27 @@ var init_GitService = __esm({
         this.log = log2 || noopLog;
         this.git = simpleGit(repositoryPath, { binary: "git" });
         this.repositoryPath = repositoryPath;
-        this.log("Git service initialized", "debug", { repositoryPath });
+        this.log("[GitService] Git service initialized", "debug", {
+          repositoryPath
+        });
       }
       /**
        * Validates that the path is a valid git repository
        */
       async validateRepository() {
-        this.log("Validating git repository", "debug");
+        this.log("[GitService] Validating git repository", "debug");
         try {
           const isRepo = await this.git.checkIsRepo();
           if (!isRepo) {
-            const error = "Path is not a valid git repository";
+            const error = "[GitService] Path is not a valid git repository";
             this.log(error, "error");
             return { isValid: false, error };
           }
-          this.log("Git repository validation successful", "debug");
+          this.log("[GitService] Git repository validation successful", "debug");
           return { isValid: true };
         } catch (error) {
           const errorMessage = `Failed to verify git repository: ${error.message}`;
-          this.log(errorMessage, "error", { error });
+          this.log(`[GitService] ${errorMessage}`, "error", { error });
           return { isValid: false, error: errorMessage };
         }
       }
@@ -726,7 +714,7 @@ var init_GitService = __esm({
        * Gets the current git status and returns changed files
        */
       async getChangedFiles() {
-        this.log("Getting git status", "debug");
+        this.log("[GitService] Getting git status", "debug");
         try {
           const status = await this.git.status();
           const gitRoot = await this.git.revparse(["--show-toplevel"]);
@@ -750,7 +738,7 @@ var init_GitService = __esm({
               path2.join(gitRoot, gitRelativePath)
             );
           });
-          this.log("Git status retrieved", "info", {
+          this.log("[GitService] Git status retrieved", "info", {
             fileCount: files.length,
             files: files.slice(0, 10),
             // Log first 10 files to avoid spam
@@ -763,7 +751,7 @@ var init_GitService = __esm({
           return { files, deletedFiles, status };
         } catch (error) {
           const errorMessage = `Failed to get git status: ${error.message}`;
-          this.log(errorMessage, "error", { error });
+          this.log(`[GitService] ${errorMessage}`, "error", { error });
           throw new Error(errorMessage);
         }
       }
@@ -771,7 +759,7 @@ var init_GitService = __esm({
        * Gets git repository information including remote URL, current commit hash, and branch name
        */
       async getGitInfo() {
-        this.log("Getting git repository information", "debug");
+        this.log("[GitService] Getting git repository information", "debug");
         try {
           const [repoUrl, hash, reference] = await Promise.all([
             this.git.getConfig("remote.origin.url"),
@@ -788,7 +776,7 @@ var init_GitService = __esm({
               "https://github.com/"
             );
           }
-          this.log("Git repository information retrieved", "debug", {
+          this.log("[GitService] Git repository information retrieved", "debug", {
             repoUrl: normalizedRepoUrl,
             hash,
             reference
@@ -800,7 +788,7 @@ var init_GitService = __esm({
           };
         } catch (error) {
           const errorMessage = `Failed to get git repository information: ${error.message}`;
-          this.log(errorMessage, "error", { error });
+          this.log(`[GitService] ${errorMessage}`, "error", { error });
           throw new Error(errorMessage);
         }
       }
@@ -808,7 +796,7 @@ var init_GitService = __esm({
        * Validates if a branch name is valid according to git's rules
        */
       async isValidBranchName(branchName) {
-        this.log("Validating branch name", "debug", { branchName });
+        this.log("[GitService] Validating branch name", "debug", { branchName });
         try {
           const result = await this.git.raw([
             "check-ref-format",
@@ -816,13 +804,16 @@ var init_GitService = __esm({
             branchName
           ]);
           const isValid = Boolean(result);
-          this.log("Branch name validation result", "debug", {
+          this.log("[GitService] Branch name validation result", "debug", {
             branchName,
             isValid
           });
           return isValid;
         } catch (error) {
-          this.log("Branch name validation failed", "debug", { branchName, error });
+          this.log("[GitService] Branch name validation failed", "debug", {
+            branchName,
+            error
+          });
           return false;
         }
       }
@@ -830,14 +821,14 @@ var init_GitService = __esm({
        * Gets the current branch name
        */
       async getCurrentBranch() {
-        this.log("Getting current branch name", "debug");
+        this.log("[GitService] Getting current branch name", "debug");
         try {
           const branch = await this.git.revparse(["--abbrev-ref", "HEAD"]);
-          this.log("Current branch retrieved", "debug", { branch });
+          this.log("[GitService] Current branch retrieved", "debug", { branch });
           return branch;
         } catch (error) {
           const errorMessage = `Failed to get current branch: ${error.message}`;
-          this.log(errorMessage, "error", { error });
+          this.log(`[GitService] ${errorMessage}`, "error", { error });
           throw new Error(errorMessage);
         }
       }
@@ -845,14 +836,14 @@ var init_GitService = __esm({
        * Gets the current commit hash
        */
       async getCurrentCommitHash() {
-        this.log("Getting current commit hash", "debug");
+        this.log("[GitService] Getting current commit hash", "debug");
         try {
           const hash = await this.git.revparse(["HEAD"]);
-          this.log("Current commit hash retrieved", "debug", { hash });
+          this.log("[GitService] Current commit hash retrieved", "debug", { hash });
           return hash;
         } catch (error) {
           const errorMessage = `Failed to get current commit hash: ${error.message}`;
-          this.log(errorMessage, "error", { error });
+          this.log(`[GitService] ${errorMessage}`, "error", { error });
           throw new Error(errorMessage);
         }
       }
@@ -860,20 +851,24 @@ var init_GitService = __esm({
        * Gets both the current commit hash and current branch name
        */
       async getCurrentCommitAndBranch() {
-        this.log("Getting current commit hash and branch", "debug");
+        this.log("[GitService] Getting current commit hash and branch", "debug");
         try {
           const [hash, branch] = await Promise.all([
             this.git.revparse(["HEAD"]),
             this.git.revparse(["--abbrev-ref", "HEAD"])
           ]);
-          this.log("Current commit hash and branch retrieved", "debug", {
-            hash,
-            branch
-          });
+          this.log(
+            "[GitService] Current commit hash and branch retrieved",
+            "debug",
+            {
+              hash,
+              branch
+            }
+          );
           return { hash, branch };
         } catch (error) {
           const errorMessage = `Failed to get current commit hash and branch: ${error.message}`;
-          this.log(errorMessage, "error", { error });
+          this.log(`[GitService] ${errorMessage}`, "error", { error });
           return { hash: "", branch: "" };
         }
       }
@@ -881,7 +876,7 @@ var init_GitService = __esm({
        * Gets the remote repository URL
        */
       async getRemoteUrl() {
-        this.log("Getting remote repository URL", "debug");
+        this.log("[GitService] Getting remote repository URL", "debug");
         try {
           const remoteUrl = await this.git.getConfig("remote.origin.url");
           const url = remoteUrl.value || "";
@@ -895,13 +890,13 @@ var init_GitService = __esm({
               "https://github.com/"
             );
           }
-          this.log("Remote repository URL retrieved", "debug", {
+          this.log("[GitService] Remote repository URL retrieved", "debug", {
             url: normalizedUrl
           });
           return normalizedUrl;
         } catch (error) {
           const errorMessage = `Failed to get remote repository URL: ${error.message}`;
-          this.log(errorMessage, "error", { error });
+          this.log(`[GitService] ${errorMessage}`, "error", { error });
           throw new Error(errorMessage);
         }
       }
@@ -912,7 +907,7 @@ var init_GitService = __esm({
         maxFiles = MCP_DEFAULT_MAX_FILES_TO_SCAN
       }) {
         this.log(
-          `Getting the ${maxFiles} most recently changed files, starting with current changes`,
+          `[GitService] Getting the ${maxFiles} most recently changed files, starting with current changes`,
           "debug"
         );
         try {
@@ -933,10 +928,14 @@ var init_GitService = __esm({
               fileSet.add(file);
             }
           }
-          this.log(`Added ${fileSet.size} files from current changes`, "debug", {
-            filesFromCurrentChanges: fileSet.size,
-            currentChangesTotal: currentChanges.files.length
-          });
+          this.log(
+            `[GitService] Added ${fileSet.size} files from current changes`,
+            "debug",
+            {
+              filesFromCurrentChanges: fileSet.size,
+              currentChangesTotal: currentChanges.files.length
+            }
+          );
           const logResult = await this.git.log({
             maxCount: maxFiles * 5,
             // 5 times the max files to scan to ensure we find enough files
@@ -978,7 +977,7 @@ var init_GitService = __esm({
                     path2.join(gitRoot, gitRelativePath)
                   );
                 }
-                this.log(`Considering file: ${adjustedPath}`, "debug");
+                this.log(`[GitService] Considering file: ${adjustedPath}`, "debug");
                 if (!fileSet.has(adjustedPath) && await FileUtils.shouldPackFile(
                   path2.join(gitRoot, gitRelativePath)
                 ) && !adjustedPath.startsWith("..")) {
@@ -986,13 +985,17 @@ var init_GitService = __esm({
                 }
               }
             } catch (showError) {
-              this.log(`Could not get files for commit ${commit.hash}`, "debug", {
-                error: showError
-              });
+              this.log(
+                `[GitService] Could not get files for commit ${commit.hash}`,
+                "debug",
+                {
+                  error: showError
+                }
+              );
             }
           }
           const files = Array.from(fileSet);
-          this.log("Recently changed files retrieved", "info", {
+          this.log("[GitService] Recently changed files retrieved", "info", {
             fileCount: files.length,
             commitsProcessed,
             totalCommitsAvailable: logResult.all.length,
@@ -1008,7 +1011,7 @@ var init_GitService = __esm({
           };
         } catch (error) {
           const errorMessage = `Failed to get recently changed files: ${error.message}`;
-          this.log(errorMessage, "error", { error });
+          this.log(`[GitService] ${errorMessage}`, "error", { error });
           throw new Error(errorMessage);
         }
       }
@@ -1066,7 +1069,7 @@ var init_GitService = __esm({
        * Gets all remote repository URLs (equivalent to 'git remote -v')
        */
       async getRepoUrls() {
-        this.log("Getting all remote repository URLs", "debug");
+        this.log("[GitService] Getting all remote repository URLs", "debug");
         try {
           const remotes = await this.git.remote(["-v"]);
           if (!remotes) {
@@ -1088,13 +1091,13 @@ var init_GitService = __esm({
               remote.push = normalizedUrl;
             }
           });
-          this.log("Remote repository URLs retrieved", "debug", {
+          this.log("[GitService] Remote repository URLs retrieved", "debug", {
             remotes: remoteMap
           });
           return remoteMap;
         } catch (error) {
           const errorMessage = `Failed to get remote repository URLs: ${error.message}`;
-          this.log(errorMessage, "error", { error });
+          this.log(`[GitService] ${errorMessage}`, "error", { error });
           throw new Error(errorMessage);
         }
       }
@@ -1103,7 +1106,7 @@ var init_GitService = __esm({
        * @returns The contents of the .gitignore file as a string, or null if the file doesn't exist
        */
       async getGitignoreContent() {
-        this.log("Getting .gitignore contents", "debug");
+        this.log("[GitService] Getting .gitignore contents", "debug");
         try {
           let combinedContent = "";
           const localGitignorePath = path2.join(this.repositoryPath, ".gitignore");
@@ -1124,20 +1127,23 @@ ${rootContent}`;
             }
           } catch (rootErr) {
             this.log(
-              "Unable to resolve git root while reading .gitignore",
+              "[GitService] Unable to resolve git root while reading .gitignore",
               "debug",
               { error: rootErr }
             );
           }
           if (combinedContent.trim() === "") {
-            this.log(".gitignore file not found", "debug");
+            this.log("[GitService] .gitignore file not found", "debug");
             return null;
           }
-          this.log(".gitignore contents retrieved successfully", "debug");
+          this.log(
+            "[GitService] .gitignore contents retrieved successfully",
+            "debug"
+          );
           return combinedContent.trimEnd();
         } catch (error) {
           const errorMessage = `Failed to get .gitignore contents: ${error.message}`;
-          this.log(errorMessage, "error", { error });
+          this.log(`[GitService] ${errorMessage}`, "error", { error });
           return null;
         }
       }
@@ -2106,7 +2112,7 @@ var DigestVulnerabilityReportDocument = `
 }
     `;
 var SubmitVulnerabilityReportDocument = `
-    mutation SubmitVulnerabilityReport($fixReportId: String!, $repoUrl: String!, $reference: String!, $projectId: String!, $scanSource: String!, $sha: String, $experimentalEnabled: Boolean, $vulnerabilityReportFileName: String, $pullRequest: Int, $isFullScan: Boolean) {
+    mutation SubmitVulnerabilityReport($fixReportId: String!, $repoUrl: String!, $reference: String!, $projectId: String!, $scanSource: String!, $sha: String, $experimentalEnabled: Boolean, $vulnerabilityReportFileName: String, $pullRequest: Int, $isFullScan: Boolean, $scanContext: String!, $fileCount: Int) {
   submitVulnerabilityReport(
     fixReportId: $fixReportId
     repoUrl: $repoUrl
@@ -2118,6 +2124,8 @@ var SubmitVulnerabilityReportDocument = `
     projectId: $projectId
     vulnerabilityReportFileName: $vulnerabilityReportFileName
     scanSource: $scanSource
+    scanContext: $scanContext
+    fileCount: $fileCount
   ) {
     __typename
     ... on VulnerabilityReport {
@@ -2260,14 +2268,14 @@ var GetReportFixesDocument = `
 var GetLatestReportByRepoUrlDocument = `
     query GetLatestReportByRepoUrl($repoUrl: String!, $filters: fix_bool_exp = {}, $limit: Int!, $offset: Int!, $currentUserEmail: String!) {
   fixReport(
-    where: {_and: [{repo: {originalUrl: {_eq: $repoUrl}}}, {state: {_eq: Finished}}, {vulnerabilityReport: {_or: [{vendor: {_is_null: true}}, {vendor: {_nin: [semgrep, opengrep]}}]}}]}
+    where: {_and: [{repo: {originalUrl: {_eq: $repoUrl}}}, {state: {_eq: Finished}}, {vulnerabilityReport: {scanSource: {_neq: MCP}}}]}
     order_by: {createdOn: desc}
     limit: 1
   ) {
     ...FixReportSummaryFields
   }
   expiredReport: fixReport(
-    where: {_and: [{repo: {originalUrl: {_eq: $repoUrl}}}, {state: {_eq: Expired}}, {_or: [{vulnerabilityReport: {vendor: {_is_null: true}}}, {vulnerabilityReport: {vendor: {_nin: [semgrep, opengrep]}}}]}]}
+    where: {_and: [{repo: {originalUrl: {_eq: $repoUrl}}}, {state: {_eq: Expired}}, {vulnerabilityReport: {scanSource: {_neq: MCP}}}]}
     order_by: {createdOn: desc}
     limit: 1
   ) {
@@ -4564,9 +4572,7 @@ var FixRatingZ = z7.object({
   })
 });
 var IssueSharedStateZ = z7.object({
-  id: z7.string().uuid(),
   isArchived: z7.boolean(),
-  ticketIntegrationId: z7.string().uuid().nullable(),
   ticketIntegrations: z7.array(
     z7.object({
       url: z7.string()
@@ -4623,9 +4629,7 @@ var FixPartsForFixScreenZ = FixQueryZ.merge(
   z7.object({
     vulnerabilityReportIssues: z7.array(
       z7.object({
-        vendorIssueId: z7.string(),
         issueType: z7.string(),
-        issueLanguage: z7.string(),
         sharedState: IssueSharedStateZ
       })
     )
@@ -4640,7 +4644,6 @@ import { z as z8 } from "zod";
 var FixPageFixReportZ = z8.object({
   id: z8.string().uuid(),
   analysisUrl: z8.string(),
-  expirationOn: z8.string(),
   createdOn: z8.string(),
   state: z8.nativeEnum(Fix_Report_State_Enum),
   repo: z8.object({
@@ -4651,48 +4654,12 @@ var FixPageFixReportZ = z8.object({
     isKnownBranch: z8.boolean().nullable()
   }),
   vulnerabilityReport: z8.object({
+    id: z8.string().uuid(),
     vendor: z8.nativeEnum(Vulnerability_Report_Vendor_Enum),
-    vendorReportId: z8.string().uuid().nullable(),
     projectId: z8.string().uuid(),
     project: z8.object({
       organizationId: z8.string().uuid()
-    }),
-    file: z8.object({
-      id: z8.string().uuid(),
-      path: z8.string()
-    }),
-    pending: z8.object({
-      aggregate: z8.object({
-        count: z8.number()
-      })
-    }),
-    supported: z8.object({
-      aggregate: z8.object({
-        count: z8.number()
-      })
-    }),
-    all: z8.object({
-      aggregate: z8.object({
-        count: z8.number()
-      })
-    }),
-    fixable: z8.object({
-      aggregate: z8.object({
-        count: z8.number()
-      })
-    }),
-    errors: z8.object({
-      aggregate: z8.object({
-        count: z8.number()
-      })
-    }),
-    vulnerabilityReportIssues: z8.object({
-      extraData: z8.object({
-        missing_files: z8.string().array().nullish(),
-        large_files: z8.string().array().nullish(),
-        error_files: z8.string().array().nullish()
-      })
-    }).array()
+    })
   })
 });
 
@@ -9176,6 +9143,13 @@ var mobbCliCommand = {
   convertToSarif: "convert-to-sarif",
   mcp: "mcp"
 };
+var ScanContext = {
+  FULL_SCAN: "FULL_SCAN",
+  BACKGROUND_PERIODIC: "BACKGROUND_PERIODIC",
+  BACKGROUND_INITIAL: "BACKGROUND_INITIAL",
+  USER_REQUEST: "USER_REQUEST",
+  BUGSY: "BUGSY"
+};
 
 // src/args/yargs.ts
 import chalk10 from "chalk";
@@ -10358,7 +10332,8 @@ var GQLClient = class {
       pullRequest,
       sha: sha || "",
       experimentalEnabled: !!experimentalEnabled,
-      scanSource: params.scanSource
+      scanSource: params.scanSource,
+      scanContext: ScanContext.BUGSY
     });
   }
   async getFixReportState(fixReportId) {
@@ -11268,7 +11243,8 @@ async function _scan(params, { skipPrompts = false } = {}) {
       sha,
       experimentalEnabled: !!experimentalEnabled,
       pullRequest: params.pullRequest,
-      scanSource: _getScanSource(command, ci)
+      scanSource: _getScanSource(command, ci),
+      scanContext: ScanContext.BUGSY
     }
   });
   if (sendReportRes.submitVulnerabilityReport.__typename !== "VulnerabilityReport") {
@@ -11429,7 +11405,8 @@ async function _scan(params, { skipPrompts = false } = {}) {
           sha: commitHash || gitInfo.hash || "0123456789abcdef",
           scanSource: _getScanSource(command, ci),
           pullRequest: params.pullRequest,
-          experimentalEnabled: !!experimentalEnabled
+          experimentalEnabled: !!experimentalEnabled,
+          scanContext: ScanContext.BUGSY
         }
       });
       if (command === "review") {
@@ -11636,6 +11613,7 @@ async function analyze({
   mobbProjectName,
   organizationId,
   autoPr,
+  createOnePr,
   commitDirectly,
   pullRequest
 }, { skipPrompts = false } = {}) {
@@ -11654,7 +11632,8 @@ async function analyze({
       command: "analyze",
       autoPr,
       commitDirectly,
-      pullRequest
+      pullRequest,
+      createOnePr
     },
     { skipPrompts }
   );
@@ -12109,7 +12088,9 @@ var McpGQLClient = class {
     __publicField(this, "apiUrl");
     this._auth = args;
     this.apiUrl = process.env["API_URL"] || MCP_DEFAULT_API_URL;
-    logDebug(`creating graphql client with api url ${this.apiUrl}`, { args });
+    logDebug(`[GraphQL] Creating graphql client with api url ${this.apiUrl}`, {
+      args
+    });
     this.client = new GraphQLClient2(this.apiUrl, {
       headers: args.type === "apiKey" ? { [MCP_API_KEY_HEADER_NAME]: args.apiKey || "" } : {
         Authorization: `Bearer ${args.token}`
@@ -12139,15 +12120,15 @@ var McpGQLClient = class {
   }
   async isApiEndpointReachable() {
     try {
-      logDebug("GraphQL: Calling Me query for API connection verification");
+      logDebug("[GraphQL] Calling Me query for API connection verification");
       const result = await this.getUserInfo();
-      logDebug("GraphQL: Me query successful", { result });
+      logDebug("[GraphQL] Me query successful", { result });
       return true;
     } catch (e) {
       const error = e;
-      logDebug(`API connection verification failed`, { error });
+      logDebug(`[GraphQL] API connection verification failed`, { error });
       if (error?.toString().includes("FetchError")) {
-        logError("API connection verification failed", { error });
+        logError("[GraphQL] API connection verification failed", { error });
         return false;
       }
     }
@@ -12172,14 +12153,14 @@ var McpGQLClient = class {
   }
   async uploadS3BucketInfo() {
     try {
-      logDebug("GraphQL: Calling uploadS3BucketInfo mutation");
+      logDebug("[GraphQL] Calling uploadS3BucketInfo mutation");
       const result = await this.clientSdk.uploadS3BucketInfo({
         fileName: "report.json"
       });
-      logDebug("GraphQL: uploadS3BucketInfo successful", { result });
+      logDebug("[GraphQL] uploadS3BucketInfo successful", { result });
       return result;
     } catch (e) {
-      logError("GraphQL: uploadS3BucketInfo failed", {
+      logError("[GraphQL] uploadS3BucketInfo failed", {
         error: e,
         ...this.getErrorContext()
       });
@@ -12188,17 +12169,17 @@ var McpGQLClient = class {
   }
   async getAnalysis(analysisId) {
     try {
-      logDebug("GraphQL: Calling getAnalysis query", { analysisId });
+      logDebug("[GraphQL] Calling getAnalysis query", { analysisId });
       const res = await this.clientSdk.getAnalysis({
         analysisId
       });
-      logDebug("GraphQL: getAnalysis successful", { result: res });
+      logDebug("[GraphQL] getAnalysis successful", { result: res });
       if (!res.analysis) {
         throw new Error(`Analysis not found: ${analysisId}`);
       }
       return res.analysis;
     } catch (e) {
-      logError("GraphQL: getAnalysis failed", {
+      logError("[GraphQL] getAnalysis failed", {
         error: e,
         analysisId,
         ...this.getErrorContext()
@@ -12208,14 +12189,14 @@ var McpGQLClient = class {
   }
   async submitVulnerabilityReport(variables) {
     try {
-      logDebug("GraphQL: Calling SubmitVulnerabilityReport mutation", {
+      logDebug("[GraphQL] Calling SubmitVulnerabilityReport mutation", {
         variables
       });
       const result = await this.clientSdk.SubmitVulnerabilityReport(variables);
-      logDebug("GraphQL: SubmitVulnerabilityReport successful", { result });
+      logDebug("[GraphQL] SubmitVulnerabilityReport successful", { result });
       return result;
     } catch (e) {
-      logError("GraphQL: SubmitVulnerabilityReport failed", {
+      logError("[GraphQL] SubmitVulnerabilityReport failed", {
         error: e,
         variables,
         ...this.getErrorContext()
@@ -12297,14 +12278,14 @@ var McpGQLClient = class {
       }
       const shortEmailHash = crypto3.createHash("sha256").update(userEmail).digest("hex").slice(0, 8).toUpperCase();
       const projectName = `MCP Scans ${shortEmailHash}`;
-      logDebug("GraphQL: Calling getLastOrgAndNamedProject query", {
+      logDebug("[GraphQL] Calling getLastOrgAndNamedProject query", {
         projectName
       });
       const orgAndProjectRes = await this.clientSdk.getLastOrgAndNamedProject({
         email: userEmail,
         projectName
       });
-      logDebug("GraphQL: getLastOrgAndNamedProject successful", {
+      logDebug("[GraphQL] getLastOrgAndNamedProject successful", {
         result: orgAndProjectRes
       });
       if (!orgAndProjectRes.user?.[0]?.userOrganizationsAndUserOrganizationRoles?.[0]?.organization?.id) {
@@ -12315,13 +12296,13 @@ var McpGQLClient = class {
       const organization = orgAndProjectRes.user?.[0]?.userOrganizationsAndUserOrganizationRoles?.[0]?.organization;
       const projectId = organization?.projects?.[0]?.id;
       if (projectId) {
-        logDebug("GraphQL: Found existing project", {
+        logDebug("[GraphQL] Found existing project", {
           projectId,
           projectName
         });
         return projectId;
       }
-      logDebug("GraphQL: Project not found, creating new project", {
+      logDebug("[GraphQL] Project not found, creating new project", {
         organizationId: organization.id,
         projectName
       });
@@ -12329,10 +12310,10 @@ var McpGQLClient = class {
         organizationId: organization.id,
         projectName
       });
-      logDebug("GraphQL: CreateProject successful", { result: createdProject });
+      logDebug("[GraphQL] CreateProject successful", { result: createdProject });
       return createdProject.createProject.projectId;
     } catch (e) {
-      logError("GraphQL: getProjectId failed", {
+      logError("[GraphQL] getProjectId failed", {
         error: e,
         ...this.getErrorContext()
       });
@@ -12348,14 +12329,14 @@ var McpGQLClient = class {
     return this.currentUser;
   }
   async validateUserToken() {
-    logDebug("validating user token");
+    logDebug("[GraphQL] Validating user token");
     try {
       await this.clientSdk.CreateCommunityUser();
       const info = await this.getUserInfo();
-      logDebug("user token validated successfully");
+      logDebug("[GraphQL] User token validated successfully");
       return info?.email || true;
     } catch (e) {
-      logError("user token validation failed");
+      logError("[GraphQL] User token validation failed");
       return false;
     }
   }
@@ -12367,12 +12348,12 @@ var McpGQLClient = class {
       });
       const loginId = res.insert_cli_login_one?.id || "";
       if (!loginId) {
-        logError("create cli login failed - no login ID returned");
+        logError("[GraphQL] Create cli login failed - no login ID returned");
         return "";
       }
       return loginId;
     } catch (e) {
-      logError("create cli login failed", { error: e });
+      logError("[GraphQL] Create cli login failed", { error: e });
       return "";
     }
   }
@@ -12384,7 +12365,7 @@ var McpGQLClient = class {
       });
       return res?.cli_login_by_pk?.encryptedApiToken || null;
     } catch (e) {
-      logError("get encrypted api token failed", { error: e });
+      logError("[GraphQL] Get encrypted api token failed", { error: e });
       return null;
     }
   }
@@ -12410,12 +12391,12 @@ var McpGQLClient = class {
         fixIds,
         source: "MCP" /* Mcp */
       });
-      logDebug("GraphQL: updateFixesDownloadStatus successful", {
+      logDebug("[GraphQL] updateFixesDownloadStatus successful", {
         result: resUpdate,
         fixIds
       });
     } else {
-      logDebug("GraphQL: No fixes found to update download status");
+      logDebug("[GraphQL] No fixes found to update download status");
     }
   }
   async getLatestReportByRepoUrl({
@@ -12424,7 +12405,7 @@ var McpGQLClient = class {
     offset = 0
   }) {
     try {
-      logDebug("GraphQL: Calling GetLatestReportByRepoUrl query", {
+      logDebug("[GraphQL] Calling GetLatestReportByRepoUrl query", {
         repoUrl,
         limit,
         offset
@@ -12436,7 +12417,7 @@ var McpGQLClient = class {
           currentUserEmail = `%${userInfo.email}%`;
         }
       } catch (err) {
-        logDebug("Failed to get user email, using default pattern", {
+        logDebug("[GraphQL] Failed to get user email, using default pattern", {
           error: err
         });
       }
@@ -12446,7 +12427,7 @@ var McpGQLClient = class {
         offset,
         currentUserEmail
       });
-      logDebug("GraphQL: GetLatestReportByRepoUrl successful", {
+      logDebug("[GraphQL] GetLatestReportByRepoUrl successful", {
         result: res,
         reportCount: res.fixReport?.length || 0
       });
@@ -12461,7 +12442,7 @@ var McpGQLClient = class {
         expiredReport: res.expiredReport?.[0] || null
       };
     } catch (e) {
-      logError("GraphQL: GetLatestReportByRepoUrl failed", {
+      logError("[GraphQL] GetLatestReportByRepoUrl failed", {
         error: e,
         repoUrl,
         ...this.getErrorContext()
@@ -12484,7 +12465,7 @@ var McpGQLClient = class {
       filters["severityText"] = { _in: severity };
     }
     try {
-      logDebug("GraphQL: Calling GetReportFixes query", {
+      logDebug("[GraphQL] Calling GetReportFixes query", {
         reportId,
         limit,
         offset,
@@ -12499,7 +12480,7 @@ var McpGQLClient = class {
           currentUserEmail = `%${userInfo.email}%`;
         }
       } catch (err) {
-        logDebug("Failed to get user email, using default pattern", {
+        logDebug("[GraphQL] Failed to get user email, using default pattern", {
           error: err
         });
       }
@@ -12510,7 +12491,7 @@ var McpGQLClient = class {
         filters,
         currentUserEmail
       });
-      logDebug("GraphQL: GetReportFixes successful", {
+      logDebug("[GraphQL] GetReportFixes successful", {
         result: res,
         fixCount: res.fixReport?.[0]?.fixes?.length || 0,
         totalCount: res.fixReport?.[0]?.filteredFixesCount?.aggregate?.count || 0
@@ -12527,7 +12508,7 @@ var McpGQLClient = class {
         expiredReport: res.expiredReport?.[0] || null
       };
     } catch (e) {
-      logError("GraphQL: GetReportFixes failed", {
+      logError("[GraphQL] GetReportFixes failed", {
         error: e,
         reportId,
         ...this.getErrorContext()
@@ -12539,18 +12520,20 @@ var McpGQLClient = class {
 async function createAuthenticatedMcpGQLClient({
   isBackgoundCall = false
 } = {}) {
-  logDebug("getting config", { apiToken: configStore.get("apiToken") });
+  logDebug("[GraphQL] Getting config", {
+    apiToken: configStore.get("apiToken")
+  });
   const initialClient = new McpGQLClient({
     apiKey: process.env["MOBB_API_KEY"] || process.env["API_KEY"] || // fallback for backward compatibility
     configStore.get("apiToken") || "",
     type: "apiKey"
   });
   const isApiEndpointReachable = await initialClient.isApiEndpointReachable();
-  logDebug("API connection status", { isApiEndpointReachable });
+  logDebug("[GraphQL] API connection status", { isApiEndpointReachable });
   if (!isApiEndpointReachable) {
     throw new ApiConnectionError("Error: failed to reach Mobb GraphQL endpoint");
   }
-  logDebug("validating user token");
+  logDebug("[GraphQL] Validating user token");
   const userVerify = await initialClient.validateUserToken();
   if (userVerify) {
     return initialClient;
@@ -13331,82 +13314,128 @@ var getLocalFiles = async ({
   path: path13,
   maxFileSize = MCP_MAX_FILE_SIZE,
   maxFiles,
-  isAllFilesScan
+  isAllFilesScan,
+  scanContext
 }) => {
-  const resolvedRepoPath = await fs11.realpath(path13);
-  const gitService = new GitService(resolvedRepoPath, log);
-  const gitValidation = await gitService.validateRepository();
-  let files = [];
-  if (!gitValidation.isValid || isAllFilesScan) {
-    logDebug(
-      "Git repository validation failed, using all files in the repository",
-      {
-        path: path13
-      }
-    );
-    files = await FileUtils.getLastChangedFiles({
-      dir: path13,
-      maxFileSize,
-      maxFiles,
-      isAllFilesScan
+  logDebug(`[${scanContext}] Starting getLocalFiles`, {
+    path: path13,
+    maxFileSize,
+    maxFiles,
+    isAllFilesScan
+  });
+  try {
+    const resolvedRepoPath = await fs11.realpath(path13);
+    logDebug(`[${scanContext}] Resolved repository path`, {
+      resolvedRepoPath,
+      originalPath: path13
     });
-    logDebug("Found files in the repository", {
-      files,
-      fileCount: files.length
+    const gitService = new GitService(resolvedRepoPath, log);
+    const gitValidation = await gitService.validateRepository();
+    logDebug(`[${scanContext}] Git repository validation result`, {
+      isValid: gitValidation.isValid,
+      error: gitValidation.error,
+      isAllFilesScan
     });
-  } else {
-    logDebug("maxFiles", {
-      maxFiles
-    });
-    const gitResult = await gitService.getChangedFiles();
-    files = gitResult.files;
-    if (files.length === 0 || maxFiles) {
-      const recentResult = await gitService.getRecentlyChangedFiles({
-        maxFiles
-      });
-      files = recentResult.files;
-      logDebug(
-        "No changes found, using recently changed files from git history",
-        {
-          files,
-          fileCount: files.length,
-          commitsChecked: recentResult.commitCount
-        }
-      );
+    let files = [];
+    if (!gitValidation.isValid || isAllFilesScan) {
+      try {
+        files = await FileUtils.getLastChangedFiles({
+          dir: path13,
+          maxFileSize,
+          maxFiles,
+          isAllFilesScan
+        });
+        logDebug(`[${scanContext}] Found files in the repository`, {
+          fileCount: files.length
+        });
+      } catch (error) {
+        logError(`${scanContext}Error getting last changed files`, {
+          error: error instanceof Error ? error.message : String(error),
+          stack: error instanceof Error ? error.stack : void 0
+        });
+        throw error;
+      }
     } else {
-      logDebug("Found changed files in the git repository", {
-        files,
-        fileCount: files.length
-      });
-    }
-  }
-  files = files.filter(
-    (file) => FileUtils.shouldPackFile(
-      nodePath.resolve(resolvedRepoPath, file),
-      maxFileSize
-    )
-  );
-  const filesWithStats = await Promise.all(
-    files.map(async (file) => {
-      const absoluteFilePath = nodePath.resolve(resolvedRepoPath, file);
-      const relativePath = nodePath.relative(resolvedRepoPath, absoluteFilePath);
-      let fileStat;
       try {
-        fileStat = await fs11.stat(absoluteFilePath);
-      } catch (e) {
-        logDebug("File not found", {
-          file
+        const gitResult = await gitService.getChangedFiles();
+        files = gitResult.files;
+        if (files.length === 0 || maxFiles) {
+          logDebug(
+            `[${scanContext}] No changes found or maxFiles specified, getting recently changed files`,
+            { maxFiles }
+          );
+          const recentResult = await gitService.getRecentlyChangedFiles({
+            maxFiles
+          });
+          files = recentResult.files;
+          logDebug(
+            `[${scanContext}] Using recently changed files from git history`,
+            {
+              fileCount: files.length,
+              commitsChecked: recentResult.commitCount
+            }
+          );
+        } else {
+          logDebug(
+            `[${scanContext}] Found changed files in the git repository`,
+            {
+              fileCount: files.length
+            }
+          );
+        }
+      } catch (error) {
+        logError(`${scanContext}Error getting files from git`, {
+          error: error instanceof Error ? error.message : String(error),
+          stack: error instanceof Error ? error.stack : void 0
         });
+        throw error;
       }
-      return {
-        filename: nodePath.basename(absoluteFilePath),
-        relativePath,
-        fullPath: absoluteFilePath,
-        lastEdited: fileStat?.mtime.getTime() ?? 0
-      };
-    })
-  );
-  return filesWithStats.filter((file) => file.lastEdited > 0);
+    }
+    files = files.filter((file) => {
+      const fullPath = nodePath.resolve(resolvedRepoPath, file);
+      const isPackable = FileUtils.shouldPackFile(fullPath, maxFileSize);
+      return isPackable;
+    });
+    const filesWithStats = await Promise.all(
+      files.map(async (file) => {
+        const absoluteFilePath = nodePath.resolve(resolvedRepoPath, file);
+        const relativePath = nodePath.relative(
+          resolvedRepoPath,
+          absoluteFilePath
+        );
+        try {
+          const fileStat = await fs11.stat(absoluteFilePath);
+          return {
+            filename: nodePath.basename(absoluteFilePath),
+            relativePath,
+            fullPath: absoluteFilePath,
+            lastEdited: fileStat.mtime.getTime()
+          };
+        } catch (e) {
+          logError(`[${scanContext}] Error getting file stats`, {
+            file,
+            absoluteFilePath,
+            error: e instanceof Error ? e.message : String(e)
+          });
+          return {
+            filename: nodePath.basename(absoluteFilePath),
+            relativePath,
+            fullPath: absoluteFilePath,
+            lastEdited: 0
+          };
+        }
+      })
+    );
+    const result = filesWithStats.filter((file) => file.lastEdited > 0);
+    return result;
+  } catch (error) {
+    logError(`${scanContext}Unexpected error in getLocalFiles`, {
+      error: error instanceof Error ? error.message : String(error),
+      stack: error instanceof Error ? error.stack : void 0,
+      path: path13
+    });
+    throw error;
+  }
 };
 
 // src/mcp/services/ScanFiles.ts
@@ -13427,7 +13456,7 @@ var FileOperations = class {
    * @returns ZIP archive as a Buffer with metadata
    */
   async createSourceCodeArchive(fileList, repositoryPath, maxFileSize) {
-    logDebug("FilePacking: packing files");
+    logDebug("[FileOperations] Packing files");
     const zip = new AdmZip2();
     let packedFilesCount = 0;
     const resolvedRepoPath = path12.resolve(repositoryPath);
@@ -13436,13 +13465,13 @@ var FileOperations = class {
       const resolvedFilePath = path12.resolve(absoluteFilepath);
       if (!resolvedFilePath.startsWith(resolvedRepoPath)) {
         logDebug(
-          `Skipping ${filepath} due to potential path traversal security risk`
+          `[FileOperations] Skipping ${filepath} due to potential path traversal security risk`
         );
         continue;
       }
       if (!FileUtils.shouldPackFile(absoluteFilepath, maxFileSize)) {
         logDebug(
-          `Excluding ${filepath} - file is too large, binary, or matches exclusion rules`
+          `[FileOperations] Excluding ${filepath} - file is too large, binary, or matches exclusion rules`
         );
         continue;
       }
@@ -13459,7 +13488,7 @@ var FileOperations = class {
       totalSize: archiveBuffer.length
     };
     logInfo(
-      `Files packed successfully ${packedFilesCount} files, ${result.totalSize} bytes`
+      `[FileOperations] Files packed successfully ${packedFilesCount} files, ${result.totalSize} bytes`
     );
     return result;
   }
@@ -13476,14 +13505,18 @@ var FileOperations = class {
       const absoluteFilepath = path12.join(repositoryPath, filepath);
       const resolvedFilePath = path12.resolve(absoluteFilepath);
       if (!resolvedFilePath.startsWith(resolvedRepoPath)) {
-        logDebug(`Rejecting ${filepath} - path traversal attempt detected`);
+        logDebug(
+          `[FileOperations] Rejecting ${filepath} - path traversal attempt detected`
+        );
         continue;
       }
       try {
         await fs12.promises.access(absoluteFilepath, fs12.constants.R_OK);
         validatedPaths.push(filepath);
       } catch (error) {
-        logDebug(`Skipping ${filepath} - file is not accessible: ${error}`);
+        logDebug(
+          `[FileOperations] Skipping ${filepath} - file is not accessible: ${error}`
+        );
       }
     }
     return validatedPaths;
@@ -13505,7 +13538,9 @@ var FileOperations = class {
           content
         });
       } catch (error) {
-        logError(`Failed to read file ${absolutePath}: ${error}`);
+        logError(
+          `[FileOperations] Failed to read file ${absolutePath}: ${error}`
+        );
       }
     }
     return fileDataArray;
@@ -13520,7 +13555,9 @@ var FileOperations = class {
     try {
       return await fs12.promises.readFile(absoluteFilepath);
     } catch (fsError) {
-      logError(`Failed to read ${relativeFilepath} from filesystem: ${fsError}`);
+      logError(
+        `[FileOperations] Failed to read ${relativeFilepath} from filesystem: ${fsError}`
+      );
       return null;
     }
   }
@@ -13562,7 +13599,8 @@ var scanFiles = async ({
     repoUrl: repoUrl || "",
     branchName: branch || "no-branch",
     sha: "0123456789abcdef",
-    scanContext
+    scanContext,
+    fileCount: packingResult.packedFilesCount
   });
   return {
     fixReportId,
@@ -13635,7 +13673,8 @@ var executeSecurityScan = async ({
   repoUrl,
   branchName,
   sha,
-  scanContext
+  scanContext,
+  fileCount
 }) => {
   if (!gqlClient) {
     throw new GqlClientError();
@@ -13648,7 +13687,9 @@ var executeSecurityScan = async ({
     reference: branchName,
     scanSource: "MCP" /* Mcp */,
     isFullScan: !!isAllDetectionRulesScan,
-    sha
+    sha,
+    scanContext,
+    fileCount
   };
   logInfo(`[${scanContext}] Submitting vulnerability report`);
   logDebug(`[${scanContext}] Submit vulnerability report variables`, {
@@ -13677,11 +13718,64 @@ var executeSecurityScan = async ({
       scanContext
     });
   } catch (error) {
-    logError(`[${scanContext}] Security analysis failed or timed out`, {
-      error,
-      analysisId
+    const errorObj = error;
+    const errorDetails = {
+      message: errorObj.message || "No error message",
+      name: errorObj.name || "Unknown error type",
+      stack: errorObj.stack,
+      analysisId,
+      timeoutMs: MCP_VUL_REPORT_DIGEST_TIMEOUT_MS,
+      isTimeoutError: errorObj.message?.includes("Timeout expired"),
+      // Safely extract additional properties from the error object
+      ...Object.getOwnPropertyNames(errorObj).filter(
+        (prop) => prop !== "message" && prop !== "name" && prop !== "stack"
+      ).reduce(
+        (acc, prop) => ({
+          ...acc,
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          [prop]: errorObj[prop]
+        }),
+        {}
+      )
+    };
+    logError(
+      `[${scanContext}] Security analysis failed or timed out`,
+      errorDetails
+    );
+    logDebug(`[${scanContext}] Security scan failure context`, {
+      fixReportId,
+      projectId,
+      repoUrl,
+      branchName,
+      isAllDetectionRulesScan,
+      fileCount,
+      scanSource: "MCP" /* Mcp */,
+      subscriptionParams: { analysisId },
+      expectedCallbackState: "Finished" /* Finished */,
+      subscriptionTimeout: {
+        configuredTimeoutMs: MCP_VUL_REPORT_DIGEST_TIMEOUT_MS,
+        isTimeoutError: errorObj.message?.includes("Timeout expired")
+      }
     });
-    throw new ScanError(`Security analysis failed: ${error.message}`);
+    try {
+      const analysis = await gqlClient.getAnalysis(analysisId);
+      if (analysis) {
+        logDebug(`[${scanContext}] Current analysis state at error time`, {
+          analysisId,
+          state: analysis.state,
+          failReason: analysis.failReason || "No failure reason provided",
+          // The createdAt field doesn't exist in the analysis type, include other useful properties
+          analysisObjectId: analysis.id
+        });
+      }
+    } catch (analysisError) {
+      logDebug(`[${scanContext}] Failed to get analysis state`, {
+        analysisError: analysisError.message
+      });
+    }
+    throw new ScanError(
+      `Security analysis failed: ${error.message || "Unknown error"}`
+    );
   }
   logDebug(`[${scanContext}] Security scan completed successfully`, {
     fixReportId,
@@ -13760,7 +13854,8 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
       );
       const files = await getLocalFiles({
         path: path13,
-        isAllFilesScan
+        isAllFilesScan,
+        scanContext
       });
       logDebug(`[${scanContext}] Active files`, { files });
       const filesToScan = files.filter((file) => {
@@ -13801,14 +13896,14 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
       logInfo(
         `[${scanContext}] Security fixes retrieved, total: ${fixes?.fixes?.length || 0}, new: ${newFixes?.length || 0}`
       );
-      this.updateFreshFixesCache(newFixes || [], filesToScan);
+      this.updateFreshFixesCache(newFixes || [], filesToScan, scanContext);
       this.updateFilesScanTimestamps(filesToScan);
       this.isInitialScanComplete = true;
     } catch (error) {
       const errorMessage = error.message;
       if (errorMessage.includes("Authentication failed") || errorMessage.includes("access-denied") || errorMessage.includes("Authentication hook unauthorized")) {
         logError(
-          "Periodic scan skipped due to authentication failure. Please re-authenticate by running a manual scan.",
+          `[${scanContext}] Periodic scan skipped due to authentication failure. Please re-authenticate by running a manual scan.`,
           {
             error: errorMessage
           }
@@ -13816,20 +13911,28 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
         return;
       }
       if (errorMessage.includes("ReportInitializationError")) {
-        logError("Periodic scan failed during report initialization", {
-          error: errorMessage
-        });
+        logError(
+          `[${scanContext}] Periodic scan failed during report initialization`,
+          {
+            error: errorMessage
+          }
+        );
         return;
       }
-      logError("Unexpected error during periodic security scan", { error });
+      logError(
+        `[${scanContext}] Unexpected error during periodic security scan`,
+        { error }
+      );
       throw error;
     }
   }
-  updateFreshFixesCache(newFixes, filesToScan) {
-    this.freshFixes = this.freshFixes.filter((fix) => !this.isFixFromOldScan(fix, filesToScan)).concat(newFixes).sort((a, b) => {
+  updateFreshFixesCache(newFixes, filesToScan, scanContext) {
+    this.freshFixes = this.freshFixes.filter((fix) => !this.isFixFromOldScan(fix, filesToScan, scanContext)).concat(newFixes).sort((a, b) => {
       return (b.severityValue ?? 0) - (a.severityValue ?? 0);
     });
-    logInfo(`Fresh fixes cache updated, total: ${this.freshFixes.length}`);
+    logInfo(
+      `[${scanContext}] Fresh fixes cache updated, total: ${this.freshFixes.length}`
+    );
   }
   updateFilesScanTimestamps(filesToScan) {
     filesToScan.forEach((file) => {
@@ -13841,13 +13944,13 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
       (reportedFix) => reportedFix.sharedState?.id === fix.sharedState?.id
     );
   }
-  isFixFromOldScan(fix, filesToScan) {
+  isFixFromOldScan(fix, filesToScan, scanContext) {
     const patch = fix.patchAndQuestions?.__typename === "FixData" ? fix.patchAndQuestions.patch : void 0;
     const fixFile = extractPathFromPatch(patch);
     if (!fixFile) {
       return false;
     }
-    logDebug("Checking if fix is from old scan", {
+    logDebug(`[${scanContext}] Checking if fix is from old scan`, {
       fixFile,
       filesToScan,
       isFromOldScan: filesToScan.some((file) => file.relativePath === fixFile)
@@ -13855,14 +13958,17 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
     return filesToScan.some((file) => file.relativePath === fixFile);
   }
   async getFreshFixes({ path: path13 }) {
+    const scanContext = ScanContext.USER_REQUEST;
+    logDebug(`[${scanContext}] Getting fresh fixes`, { path: path13 });
     if (this.path !== path13) {
       this.path = path13;
       this.reset();
+      logInfo(`[${scanContext}] Reset service state for new path`, { path: path13 });
     }
     this.gqlClient = await createAuthenticatedMcpGQLClient();
     this.triggerScan({ path: path13, gqlClient: this.gqlClient });
     if (this.freshFixes.length > 0) {
-      return this.generateFreshFixesResponse();
+      return this.generateFreshFixesResponse(scanContext);
     }
     if (!this.isInitialScanComplete) {
       return initialScanInProgressPrompt;
@@ -13881,21 +13987,27 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
     }
   }
   startPeriodicScanning(path13) {
-    logDebug("Starting periodic scan for new security vulnerabilities", {
-      path: path13
-    });
+    const scanContext = ScanContext.BACKGROUND_PERIODIC;
+    logDebug(
+      `[${scanContext}] Starting periodic scan for new security vulnerabilities`,
+      {
+        path: path13
+      }
+    );
     this.intervalId = setInterval(() => {
-      logDebug("Triggering periodic security scan", { path: path13 });
+      logDebug(`[${scanContext}] Triggering periodic security scan`, { path: path13 });
       this.scanForSecurityVulnerabilities({
         path: path13,
-        scanContext: "BACKGROUND_PERIODIC"
+        scanContext
       }).catch((error) => {
-        logError("Error during periodic security scan", { error });
+        logError(`[${scanContext}] Error during periodic security scan`, {
+          error
+        });
       });
     }, MCP_PERIODIC_CHECK_INTERVAL);
   }
   async executeInitialFullScan(path13) {
-    const scanContext = "FULL_SCAN";
+    const scanContext = ScanContext.FULL_SCAN;
     logDebug(`[${scanContext}] Triggering initial full security scan`, { path: path13 });
     logDebug(`[${scanContext}] Full scan paths scanned`, {
       fullScanPathsScanned: this.fullScanPathsScanned
@@ -13915,7 +14027,7 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
         path: path13,
         isAllFilesScan: true,
         isAllDetectionRulesScan: true,
-        scanContext: "FULL_SCAN"
+        scanContext: ScanContext.FULL_SCAN
       });
       if (!this.fullScanPathsScanned.includes(path13)) {
         this.fullScanPathsScanned.push(path13);
@@ -13923,25 +14035,31 @@ var _CheckForNewAvailableFixesService = class _CheckForNewAvailableFixesService
       }
       logInfo(`[${scanContext}] Full scan completed`, { path: path13 });
     } catch (error) {
-      logError("Error during initial full security scan", { error });
+      logError(`[${scanContext}] Error during initial full security scan`, {
+        error
+      });
     }
   }
   executeInitialScan(path13) {
-    const scanContext = "BACKGROUND_INITIAL";
+    const scanContext = ScanContext.BACKGROUND_INITIAL;
     logDebug(`[${scanContext}] Triggering initial security scan`, { path: path13 });
     this.scanForSecurityVulnerabilities({
       path: path13,
-      scanContext: "BACKGROUND_INITIAL"
+      scanContext: ScanContext.BACKGROUND_INITIAL
     }).catch((error) => {
       logError(`[${scanContext}] Error during initial security scan`, { error });
     });
   }
-  generateFreshFixesResponse() {
+  generateFreshFixesResponse(scanContext = ScanContext.USER_REQUEST) {
     const freshFixes = this.freshFixes.splice(0, MCP_DEFAULT_LIMIT);
     if (freshFixes.length > 0) {
+      logInfo(
+        `[${scanContext}] Reporting ${freshFixes.length} fresh fixes to user`
+      );
       this.reportedFixes.push(...freshFixes);
       return freshFixesPrompt({ fixes: freshFixes, limit: MCP_DEFAULT_LIMIT });
     }
+    logInfo(`[${scanContext}] No fresh fixes to report`);
     return noFreshFixesPrompt;
   }
 };
@@ -14245,7 +14363,7 @@ var _ScanAndFixVulnerabilitiesService = class _ScanAndFixVulnerabilitiesService
           fileList,
           repositoryPath,
           gqlClient: this.gqlClient,
-          scanContext: "SCAN_AND_FIX_TOOL"
+          scanContext: ScanContext.USER_REQUEST
         });
         fixReportId = scanResult.fixReportId;
       } else {
@@ -14417,7 +14535,8 @@ Example payload:
     const files = await getLocalFiles({
       path: path13,
       maxFileSize: MCP_MAX_FILE_SIZE,
-      maxFiles: args.maxFiles
+      maxFiles: args.maxFiles,
+      scanContext: ScanContext.USER_REQUEST
     });
     logDebug("Files", { files });
     if (files.length === 0) {