mobbdev 1.0.205 → 1.0.207

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

@@ -2,7 +2,7 @@ import * as Yargs from 'yargs';
 import z from 'zod';
 
 declare const PromptItemZ: z.ZodObject<{
-    type: z.ZodEnum<["USER_PROMPT", "AI_RESPONSE", "TOOL_EXECUTION"]>;
+    type: z.ZodEnum<["USER_PROMPT", "AI_RESPONSE", "TOOL_EXECUTION", "AI_THINKING"]>;
     attachedFiles: z.ZodOptional<z.ZodArray<z.ZodObject<{
         relativePath: z.ZodString;
         startLine: z.ZodOptional<z.ZodNumber>;
@@ -35,18 +35,26 @@ declare const PromptItemZ: z.ZodObject<{
         name: string;
         parameters: string;
         result: string;
-        rawArguments?: string | undefined;
         accepted?: boolean | undefined;
+        rawArguments?: string | undefined;
     }, {
         name: string;
         parameters: string;
         result: string;
-        rawArguments?: string | undefined;
         accepted?: boolean | undefined;
+        rawArguments?: string | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
-    type: "USER_PROMPT" | "AI_RESPONSE" | "TOOL_EXECUTION";
+    type: "USER_PROMPT" | "AI_RESPONSE" | "TOOL_EXECUTION" | "AI_THINKING";
+    tool?: {
+        name: string;
+        parameters: string;
+        result: string;
+        accepted?: boolean | undefined;
+        rawArguments?: string | undefined;
+    } | undefined;
     date?: Date | undefined;
+    text?: string | undefined;
     attachedFiles?: {
         relativePath: string;
         startLine?: number | undefined;
@@ -55,17 +63,17 @@ declare const PromptItemZ: z.ZodObject<{
         inputCount: number;
         outputCount: number;
     } | undefined;
-    text?: string | undefined;
+}, {
+    type: "USER_PROMPT" | "AI_RESPONSE" | "TOOL_EXECUTION" | "AI_THINKING";
     tool?: {
         name: string;
         parameters: string;
         result: string;
-        rawArguments?: string | undefined;
         accepted?: boolean | undefined;
+        rawArguments?: string | undefined;
     } | undefined;
-}, {
-    type: "USER_PROMPT" | "AI_RESPONSE" | "TOOL_EXECUTION";
     date?: Date | undefined;
+    text?: string | undefined;
     attachedFiles?: {
         relativePath: string;
         startLine?: number | undefined;
@@ -74,18 +82,10 @@ declare const PromptItemZ: z.ZodObject<{
         inputCount: number;
         outputCount: number;
     } | undefined;
-    text?: string | undefined;
-    tool?: {
-        name: string;
-        parameters: string;
-        result: string;
-        rawArguments?: string | undefined;
-        accepted?: boolean | undefined;
-    } | undefined;
 }>;
 type PromptItem = z.infer<typeof PromptItemZ>;
 declare const PromptItemArrayZ: z.ZodArray<z.ZodObject<{
-    type: z.ZodEnum<["USER_PROMPT", "AI_RESPONSE", "TOOL_EXECUTION"]>;
+    type: z.ZodEnum<["USER_PROMPT", "AI_RESPONSE", "TOOL_EXECUTION", "AI_THINKING"]>;
     attachedFiles: z.ZodOptional<z.ZodArray<z.ZodObject<{
         relativePath: z.ZodString;
         startLine: z.ZodOptional<z.ZodNumber>;
@@ -118,18 +118,26 @@ declare const PromptItemArrayZ: z.ZodArray<z.ZodObject<{
         name: string;
         parameters: string;
         result: string;
-        rawArguments?: string | undefined;
         accepted?: boolean | undefined;
+        rawArguments?: string | undefined;
     }, {
         name: string;
         parameters: string;
         result: string;
-        rawArguments?: string | undefined;
         accepted?: boolean | undefined;
+        rawArguments?: string | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
-    type: "USER_PROMPT" | "AI_RESPONSE" | "TOOL_EXECUTION";
+    type: "USER_PROMPT" | "AI_RESPONSE" | "TOOL_EXECUTION" | "AI_THINKING";
+    tool?: {
+        name: string;
+        parameters: string;
+        result: string;
+        accepted?: boolean | undefined;
+        rawArguments?: string | undefined;
+    } | undefined;
     date?: Date | undefined;
+    text?: string | undefined;
     attachedFiles?: {
         relativePath: string;
         startLine?: number | undefined;
@@ -138,17 +146,17 @@ declare const PromptItemArrayZ: z.ZodArray<z.ZodObject<{
         inputCount: number;
         outputCount: number;
     } | undefined;
-    text?: string | undefined;
+}, {
+    type: "USER_PROMPT" | "AI_RESPONSE" | "TOOL_EXECUTION" | "AI_THINKING";
     tool?: {
         name: string;
         parameters: string;
         result: string;
-        rawArguments?: string | undefined;
         accepted?: boolean | undefined;
+        rawArguments?: string | undefined;
     } | undefined;
-}, {
-    type: "USER_PROMPT" | "AI_RESPONSE" | "TOOL_EXECUTION";
     date?: Date | undefined;
+    text?: string | undefined;
     attachedFiles?: {
         relativePath: string;
         startLine?: number | undefined;
@@ -157,14 +165,6 @@ declare const PromptItemArrayZ: z.ZodArray<z.ZodObject<{
         inputCount: number;
         outputCount: number;
     } | undefined;
-    text?: string | undefined;
-    tool?: {
-        name: string;
-        parameters: string;
-        result: string;
-        rawArguments?: string | undefined;
-        accepted?: boolean | undefined;
-    } | undefined;
 }>, "many">;
 type PromptItemArray = z.infer<typeof PromptItemArrayZ>;
 type UploadAiBlameOptions = {

package/dist/args/commands/upload_ai_blame.mjs

@@ -5563,7 +5563,7 @@ async function createAuthenticatedMcpGQLClient({
 
 // src/args/commands/upload_ai_blame.ts
 var PromptItemZ = z27.object({
-  type: z27.enum(["USER_PROMPT", "AI_RESPONSE", "TOOL_EXECUTION"]),
+  type: z27.enum(["USER_PROMPT", "AI_RESPONSE", "TOOL_EXECUTION", "AI_THINKING"]),
   attachedFiles: z27.array(
     z27.object({
       relativePath: z27.string(),

package/dist/index.mjs

@@ -7354,6 +7354,7 @@ var GET_BLAME_DOCUMENT = `
               blame(path: $path) {
                 ranges {
                   commit {
+                    oid
                     author {
                       user {
                         name
@@ -7368,7 +7369,7 @@ var GET_BLAME_DOCUMENT = `
                 }
               }
             }
-            
+
           }
         }
       }
@@ -7776,6 +7777,7 @@ function getGithubSdk(params = {}) {
         (range) => ({
           startingLine: range.startingLine,
           endingLine: range.endingLine,
+          commitSha: range.commit.oid,
           email: range.commit.author.user?.email || "",
           name: range.commit.author.user?.name || "",
           login: range.commit.author.user?.login || ""
@@ -7925,6 +7927,14 @@ function getGithubSdk(params = {}) {
         direction: "desc",
         per_page: 100
       });
+    },
+    async listPRFiles(params2) {
+      return octokit.rest.pulls.listFiles({
+        owner: params2.owner,
+        repo: params2.repo,
+        pull_number: params2.pull_number,
+        per_page: 100
+      });
     }
   };
 }
@@ -8207,24 +8217,21 @@ var GithubSCMLib = class extends SCMLib {
     this._validateAccessTokenAndUrl();
     const { owner, repo } = parseGithubOwnerAndRepo(this.url);
     const prNumber = Number(submitRequestId);
-    const prRes = await this.githubSdk.getPr({
-      owner,
-      repo,
-      pull_number: prNumber
-    });
-    const prDiff = await this.getPrDiff({ pull_number: prNumber });
-    const commitsRes = await this.githubSdk.getPrCommits({
-      owner,
-      repo,
-      pull_number: prNumber
-    });
-    const commits = [];
-    for (const commit of commitsRes.data) {
-      const commitDiff = await this.getCommitDiff(commit.sha);
-      commits.push(commitDiff);
-    }
+    const [prRes, commitsRes, filesRes] = await Promise.all([
+      this.githubSdk.getPr({ owner, repo, pull_number: prNumber }),
+      this.githubSdk.getPrCommits({ owner, repo, pull_number: prNumber }),
+      this.githubSdk.listPRFiles({ owner, repo, pull_number: prNumber })
+    ]);
     const pr = prRes.data;
-    const diffLines = this._calculateDiffLineAttributions(prDiff, commits);
+    const prDiff = await this.getPrDiff({ pull_number: prNumber });
+    const commits = await Promise.all(
+      commitsRes.data.map((commit) => this.getCommitDiff(commit.sha))
+    );
+    const diffLines = await this._attributeLinesViaBlame(
+      pr.head.ref,
+      filesRes.data,
+      commits
+    );
     return {
       diff: prDiff,
       createdAt: new Date(pr.created_at),
@@ -8344,18 +8351,15 @@ var GithubSCMLib = class extends SCMLib {
       return { added: 0, removed: 0 };
     }
   }
-  _calculateDiffLineAttributions(prDiff, commits) {
-    const attributions = [];
-    const prDiffLines = prDiff.split("\n");
-    let currentFile = "";
+  /**
+   * Optimized helper to parse added line numbers from a unified diff patch
+   * Single-pass parsing for minimal CPU usage
+   */
+  _parseAddedLinesFromPatch(patch) {
+    const addedLines = [];
+    const lines = patch.split("\n");
     let currentLineNumber = 0;
-    for (const line of prDiffLines) {
-      if (line.startsWith("+++")) {
-        const match = line.match(/^\+\+\+ b\/(.+)$/);
-        currentFile = match?.[1] || "";
-        currentLineNumber = 0;
-        continue;
-      }
+    for (const line of lines) {
       if (line.startsWith("@@")) {
         const match = line.match(/^@@ -\d+(?:,\d+)? \+(\d+)/);
         if (match?.[1]) {
@@ -8364,122 +8368,57 @@ var GithubSCMLib = class extends SCMLib {
         continue;
       }
       if (line.startsWith("+") && !line.startsWith("+++")) {
-        const commitSha = this._findCommitForLine(
-          currentFile,
-          currentLineNumber,
-          line.substring(1),
-          // Remove the '+' prefix
-          commits
-        );
-        if (commitSha && currentFile) {
-          attributions.push({
-            file: currentFile,
-            line: currentLineNumber,
-            commitSha
-          });
-        }
+        addedLines.push(currentLineNumber);
         currentLineNumber++;
       } else if (!line.startsWith("-")) {
         currentLineNumber++;
       }
     }
-    return attributions;
+    return addedLines;
   }
-  _findCommitForLine(file, lineNumber, lineContent, commits) {
-    const normalizedContent = lineContent.trim();
-    for (let i = commits.length - 1; i >= 0; i--) {
-      const commit = commits[i];
-      if (!commit) {
-        continue;
-      }
-      const commitLines = commit.diff.split("\n");
-      let commitCurrentFile = "";
-      for (const commitLine of commitLines) {
-        if (commitLine.startsWith("+++")) {
-          const match = commitLine.match(/^\+\+\+ b\/(.+)$/);
-          commitCurrentFile = match?.[1] || "";
-          continue;
-        }
-        if (commitLine.startsWith("@@")) {
+  /**
+   * Attribute lines in a single file to their commits using blame
+   */
+  async _attributeFileLines(file, headRef, prCommitShas) {
+    try {
+      const blame = await this.getRepoBlameRanges(headRef, file.filename);
+      const addedLines = this._parseAddedLinesFromPatch(file.patch);
+      const addedLinesSet = new Set(addedLines);
+      const fileAttributions = [];
+      for (const blameRange of blame) {
+        if (!prCommitShas.has(blameRange.commitSha)) {
           continue;
         }
-        if (commitCurrentFile === file && commitLine.startsWith("+") && !commitLine.startsWith("+++")) {
-          const commitLineContent = commitLine.substring(1).trim();
-          if (commitLineContent === normalizedContent) {
-            return commit.commitSha;
+        for (let lineNum = blameRange.startingLine; lineNum <= blameRange.endingLine; lineNum++) {
+          if (addedLinesSet.has(lineNum)) {
+            fileAttributions.push({
+              file: file.filename,
+              line: lineNum,
+              commitSha: blameRange.commitSha
+            });
           }
         }
       }
+      return fileAttributions;
+    } catch (error) {
+      return [];
     }
-    for (let i = commits.length - 1; i >= 0; i--) {
-      const commit = commits[i];
-      if (!commit) {
-        continue;
-      }
-      const addedLinesInFile = this._getAddedLinesFromCommit(commit, file);
-      for (const { lineNum, content } of addedLinesInFile) {
-        if (Math.abs(lineNum - lineNumber) <= 10 && this._contentSimilarity(content, normalizedContent) > 0.9) {
-          return commit.commitSha;
-        }
-      }
-    }
-    const lastCommit = commits[commits.length - 1];
-    return lastCommit ? lastCommit.commitSha : null;
-  }
-  _getAddedLinesFromCommit(commit, targetFile) {
-    const addedLines = [];
-    const commitLines = commit.diff.split("\n");
-    let currentFile = "";
-    let currentLineNumber = 0;
-    for (const line of commitLines) {
-      if (line.startsWith("+++")) {
-        const match = line.match(/^\+\+\+ b\/(.+)$/);
-        currentFile = match?.[1] || "";
-        currentLineNumber = 0;
-        continue;
-      }
-      if (line.startsWith("@@")) {
-        const match = line.match(/^@@ -\d+(?:,\d+)? \+(\d+)/);
-        if (match?.[1]) {
-          currentLineNumber = parseInt(match[1], 10);
-        }
-        continue;
-      }
-      if (currentFile === targetFile && line.startsWith("+") && !line.startsWith("+++")) {
-        addedLines.push({
-          lineNum: currentLineNumber,
-          content: line.substring(1).trim()
-        });
-        currentLineNumber++;
-      } else if (!line.startsWith("-")) {
-        if (currentFile === targetFile) {
-          currentLineNumber++;
-        }
-      }
-    }
-    return addedLines;
   }
-  _contentSimilarity(content1, content2) {
-    if (content1 === content2) {
-      return 1;
-    }
-    const normalized1 = content1.replace(/\s+/g, " ");
-    const normalized2 = content2.replace(/\s+/g, " ");
-    if (normalized1 === normalized2) {
-      return 0.95;
-    }
-    const longer = normalized1.length > normalized2.length ? normalized1 : normalized2;
-    const shorter = normalized1.length > normalized2.length ? normalized2 : normalized1;
-    if (longer.length === 0) {
-      return 1;
-    }
-    if (longer.includes(shorter)) {
-      return shorter.length / longer.length;
-    }
-    const set1 = new Set(normalized1.split(""));
-    const set2 = new Set(normalized2.split(""));
-    const intersection = new Set([...set1].filter((x) => set2.has(x)));
-    return intersection.size / Math.max(set1.size, set2.size);
+  /**
+   * Optimized helper to attribute PR lines to commits using blame API
+   * Parallel blame queries for minimal API call time
+   */
+  async _attributeLinesViaBlame(headRef, changedFiles, prCommits) {
+    const prCommitShas = new Set(prCommits.map((c) => c.commitSha));
+    const filesWithAdditions = changedFiles.filter(
+      (file) => file.patch?.includes("\n+")
+    );
+    const attributions = await Promise.all(
+      filesWithAdditions.map(
+        (file) => this._attributeFileLines(file, headRef, prCommitShas)
+      )
+    );
+    return attributions.flat();
   }
 };
 
@@ -8828,6 +8767,7 @@ async function getGitlabBlameRanges({ ref, gitlabUrl, path: path17 }, options) {
     return {
       startingLine: oldLineNumber,
       endingLine: lineNumber - 1,
+      commitSha: range.commit.id,
       login: range.commit.author_email,
       email: range.commit.author_email,
       name: range.commit.author_name
@@ -19232,7 +19172,7 @@ import chalk10 from "chalk";
 import { withFile } from "tmp-promise";
 import z38 from "zod";
 var PromptItemZ = z38.object({
-  type: z38.enum(["USER_PROMPT", "AI_RESPONSE", "TOOL_EXECUTION"]),
+  type: z38.enum(["USER_PROMPT", "AI_RESPONSE", "TOOL_EXECUTION", "AI_THINKING"]),
   attachedFiles: z38.array(
     z38.object({
       relativePath: z38.string(),

package/package.json

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