mobbdev 1.1.33 → 1.1.35

package/dist/index.mjs

@@ -717,12 +717,71 @@ var init_FileUtils = __esm({
 // src/features/analysis/scm/services/GitService.ts
 var GitService_exports = {};
 __export(GitService_exports, {
-  GitService: () => GitService
+  GitService: () => GitService,
+  isGitHubUrl: () => isGitHubUrl,
+  normalizeGitUrl: () => normalizeGitUrl
 });
 import fs2 from "fs";
 import ignore from "ignore";
 import * as path2 from "path";
 import { simpleGit } from "simple-git";
+function normalizeGitUrl(url) {
+  let normalizedUrl = url;
+  if (normalizedUrl.endsWith(".git")) {
+    normalizedUrl = normalizedUrl.slice(0, -".git".length);
+  }
+  const sshToHttpsMappings = [
+    // GitHub
+    { pattern: "git@github.com:", replacement: "https://github.com/" },
+    // GitLab
+    { pattern: "git@gitlab.com:", replacement: "https://gitlab.com/" },
+    // Bitbucket
+    { pattern: "git@bitbucket.org:", replacement: "https://bitbucket.org/" },
+    // Azure DevOps (SSH format)
+    {
+      pattern: "git@ssh.dev.azure.com:",
+      replacement: "https://dev.azure.com/"
+    },
+    // Azure DevOps (alternative SSH format)
+    {
+      pattern: /git@([^:]+):v3\/([^/]+)\/([^/]+)\/([^/]+)/,
+      replacement: "https://$1/$2/_git/$4"
+    }
+  ];
+  for (const mapping of sshToHttpsMappings) {
+    if (typeof mapping.pattern === "string") {
+      if (normalizedUrl.startsWith(mapping.pattern)) {
+        normalizedUrl = normalizedUrl.replace(
+          mapping.pattern,
+          mapping.replacement
+        );
+        break;
+      }
+    } else {
+      const match = normalizedUrl.match(mapping.pattern);
+      if (match) {
+        normalizedUrl = normalizedUrl.replace(
+          mapping.pattern,
+          mapping.replacement
+        );
+        break;
+      }
+    }
+  }
+  if (normalizedUrl.startsWith("https://") || normalizedUrl.startsWith("http://")) {
+    normalizedUrl = normalizedUrl.replace(/^(https?:\/\/)([^@/]+@)/, "$1");
+  }
+  return normalizedUrl;
+}
+function isGitHubUrl(normalizedUrl) {
+  try {
+    const url = new URL(normalizedUrl);
+    const host = url.host.toLowerCase();
+    return host === "github.com" || host.endsWith(".github.com");
+  } catch {
+    return false;
+  }
+}
 var MAX_COMMIT_DIFF_SIZE_BYTES, GitService;
 var init_GitService = __esm({
   "src/features/analysis/scm/services/GitService.ts"() {
@@ -843,7 +902,7 @@ var init_GitService = __esm({
             this.git.revparse(["HEAD"]),
             this.git.revparse(["--abbrev-ref", "HEAD"])
           ]);
-          const normalizedRepoUrl = repoUrl.value ? this.normalizeGitUrl(repoUrl.value) : "";
+          const normalizedRepoUrl = repoUrl.value ? normalizeGitUrl(repoUrl.value) : "";
           this.log("[GitService] Git repository information retrieved", "debug", {
             repoUrl: normalizedRepoUrl,
             hash,
@@ -941,23 +1000,14 @@ var init_GitService = __esm({
         }
       }
       /**
-       * Gets the remote repository URL
+       * Gets the remote repository URL (origin)
        */
       async getRemoteUrl() {
         this.log("[GitService] Getting remote repository URL", "debug");
         try {
           const remoteUrl = await this.git.getConfig("remote.origin.url");
           const url = remoteUrl.value || "";
-          let normalizedUrl = url;
-          if (normalizedUrl.endsWith(".git")) {
-            normalizedUrl = normalizedUrl.slice(0, -".git".length);
-          }
-          if (normalizedUrl.startsWith("git@github.com:")) {
-            normalizedUrl = normalizedUrl.replace(
-              "git@github.com:",
-              "https://github.com/"
-            );
-          }
+          const normalizedUrl = normalizeGitUrl(url);
           this.log("[GitService] Remote repository URL retrieved", "debug", {
             url: normalizedUrl
           });
@@ -1091,95 +1141,6 @@ var init_GitService = __esm({
           throw new Error(errorMessage);
         }
       }
-      /**
-       * Normalizes a Git URL to HTTPS format for various Git hosting platforms
-       * @param url The Git URL to normalize
-       * @returns The normalized HTTPS URL
-       */
-      normalizeGitUrl(url) {
-        let normalizedUrl = url;
-        if (normalizedUrl.endsWith(".git")) {
-          normalizedUrl = normalizedUrl.slice(0, -".git".length);
-        }
-        const sshToHttpsMappings = [
-          // GitHub
-          { pattern: "git@github.com:", replacement: "https://github.com/" },
-          // GitLab
-          { pattern: "git@gitlab.com:", replacement: "https://gitlab.com/" },
-          // Bitbucket
-          { pattern: "git@bitbucket.org:", replacement: "https://bitbucket.org/" },
-          // Azure DevOps (SSH format)
-          {
-            pattern: "git@ssh.dev.azure.com:",
-            replacement: "https://dev.azure.com/"
-          },
-          // Azure DevOps (alternative SSH format)
-          {
-            pattern: /git@([^:]+):v3\/([^/]+)\/([^/]+)\/([^/]+)/,
-            replacement: "https://$1/$2/_git/$4"
-          }
-        ];
-        for (const mapping of sshToHttpsMappings) {
-          if (typeof mapping.pattern === "string") {
-            if (normalizedUrl.startsWith(mapping.pattern)) {
-              normalizedUrl = normalizedUrl.replace(
-                mapping.pattern,
-                mapping.replacement
-              );
-              break;
-            }
-          } else {
-            const match = normalizedUrl.match(mapping.pattern);
-            if (match) {
-              normalizedUrl = normalizedUrl.replace(
-                mapping.pattern,
-                mapping.replacement
-              );
-              break;
-            }
-          }
-        }
-        if (normalizedUrl.startsWith("https://") || normalizedUrl.startsWith("http://")) {
-          normalizedUrl = normalizedUrl.replace(/^(https?:\/\/)([^@/]+@)/, "$1");
-        }
-        return normalizedUrl;
-      }
-      /**
-       * Gets all remote repository URLs (equivalent to 'git remote -v')
-       */
-      async getRepoUrls() {
-        this.log("[GitService] Getting all remote repository URLs", "debug");
-        try {
-          const remotes = await this.git.remote(["-v"]);
-          if (!remotes) {
-            return {};
-          }
-          const remoteMap = {};
-          remotes.split("\n").forEach((line) => {
-            if (!line.trim()) return;
-            const [remoteName, url, type2] = line.split(/\s+/);
-            if (!remoteName || !url || !type2) return;
-            if (!remoteMap[remoteName]) {
-              remoteMap[remoteName] = { fetch: "", push: "" };
-            }
-            const normalizedUrl = this.normalizeGitUrl(url);
-            const remote = remoteMap[remoteName];
-            if (type2 === "(fetch)") {
-              remote.fetch = normalizedUrl;
-            } else if (type2 === "(push)") {
-              remote.push = normalizedUrl;
-            }
-          });
-          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(`[GitService] ${errorMessage}`, "error", { error });
-          throw new Error(errorMessage);
-        }
-      }
       /**
        * Fetches the contents of the .gitignore file from the repository
        * @returns The contents of the .gitignore file as a string, or null if the file doesn't exist
@@ -2237,9 +2198,10 @@ var GetPromptSummaryDocument = `
         goal
         developersPlan
         aiImplementationDetails
-        importantInstructionsAndPushbacks
-        frictionScore {
-          score
+        developersPushbacks
+        importantInstructionsAndDecisions
+        backAndForthLevel {
+          level
           justification
         }
       }
@@ -13853,6 +13815,7 @@ import path11 from "path";
 import chalk9 from "chalk";
 import { withFile } from "tmp-promise";
 import z31 from "zod";
+init_GitService();
 
 // src/utils/computerName.ts
 import { execSync } from "child_process";
@@ -14124,6 +14087,19 @@ var PromptItemZ = z31.object({
   }).optional()
 });
 var PromptItemArrayZ = z31.array(PromptItemZ);
+async function getRepositoryUrl() {
+  try {
+    const gitService = new GitService(process.cwd());
+    const isRepo = await gitService.isGitRepository();
+    if (!isRepo) {
+      return null;
+    }
+    const remoteUrl = await gitService.getRemoteUrl();
+    return isGitHubUrl(remoteUrl) ? remoteUrl : null;
+  } catch {
+    return null;
+  }
+}
 function getSystemInfo() {
   let userName;
   try {
@@ -14220,7 +14196,8 @@ async function uploadAiBlameHandlerFromExtension(args) {
         args: uploadArgs,
         exitOnError: false,
         apiUrl: args.apiUrl,
-        webAppUrl: args.webAppUrl
+        webAppUrl: args.webAppUrl,
+        repositoryUrl: args.repositoryUrl
       });
     });
   });
@@ -14256,6 +14233,7 @@ async function uploadAiBlameHandler(options) {
   }
   const nowIso = (/* @__PURE__ */ new Date()).toISOString();
   const { computerName, userName } = getSystemInfo();
+  const repositoryUrl = options.repositoryUrl !== void 0 ? options.repositoryUrl : await getRepositoryUrl();
   const sessions = [];
   for (let i = 0; i < prompts.length; i++) {
     const promptPath = String(prompts[i]);
@@ -14282,7 +14260,8 @@ async function uploadAiBlameHandler(options) {
       blameType: blameTypes[i] || "CHAT" /* Chat */,
       computerName,
       userName,
-      sessionId: sessionIds[i]
+      sessionId: sessionIds[i],
+      repositoryUrl
     });
   }
   const authenticatedClient = await getAuthenticatedGQLClient({
@@ -14338,7 +14317,8 @@ async function uploadAiBlameHandler(options) {
       blameType: s.blameType,
       computerName: s.computerName,
       userName: s.userName,
-      sessionId: s.sessionId
+      sessionId: s.sessionId,
+      repositoryUrl: s.repositoryUrl
     };
   });
   try {
@@ -22445,11 +22425,7 @@ Call this tool instead of ${MCP_TOOL_SCAN_AND_FIX_VULNERABILITIES} when you only
     if (!gitValidation.isValid) {
       throw new Error(`Invalid git repository: ${gitValidation.error}`);
     }
-    const repoUrls = await gitService.getRepoUrls();
-    if (Object.keys(repoUrls).length > 0 && !repoUrls["origin"]) {
-      throw new Error("Repository must have an origin remote");
-    }
-    const originUrl = repoUrls["origin"]?.fetch;
+    const originUrl = await gitService.getRemoteUrl();
     if (!originUrl) {
       throw new Error("No origin URL found for the repository");
     }

package/package.json

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