claude-teammate 0.1.97 → 0.1.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-teammate",
-  "version": "0.1.97",
+  "version": "0.1.99",
   "description": "CLI bootstrapper for Claude Teammate.",
   "license": "MIT",
   "type": "module",

package/src/dashboard/ui.html

@@ -1162,7 +1162,7 @@ a:hover { text-decoration:underline; }
 .drawer-log-panel {
   display:flex;
   flex-direction:column;
-  overflow:hidden;
+  overflow-x:hidden;
   background:#111110;
 }
 

package/src/forge/gitlab.js

@@ -335,13 +335,64 @@ export function createGitLabClient(config) {
 
     async createPullRequestReview(repoUrl, prNumber, body, suggestions) {
       const repo = parseGitLabRepoUrl(repoUrl);
-      const reviewBody = buildGitLabReviewBody(body, suggestions);
-      return requestGitLabProject(config, repo, `/merge_requests/${prNumber}/notes`, {
-        method: "POST",
-        body: {
-          body: reviewBody
+      const normalizedSuggestions = Array.isArray(suggestions) ? suggestions.filter(Boolean) : [];
+      const fallbackSuggestions = [];
+      const discussionResults = [];
+
+      if (normalizedSuggestions.length > 0) {
+        const [mergeRequest, versions, changesPayload] = await Promise.all([
+          requestGitLabProject(config, repo, `/merge_requests/${prNumber}`),
+          requestGitLabProject(config, repo, `/merge_requests/${prNumber}/versions`),
+          requestGitLabProject(config, repo, `/merge_requests/${prNumber}/changes`)
+        ]);
+        const diffRefs = selectLatestGitLabDiffRefs(mergeRequest, versions);
+        const positionIndex = buildGitLabDiffPositionIndex(changesPayload?.changes || []);
+
+        for (const suggestion of normalizedSuggestions) {
+          const position = diffRefs
+            ? findGitLabSuggestionPosition(positionIndex, suggestion)
+            : null;
+
+          if (!position) {
+            fallbackSuggestions.push(suggestion);
+            continue;
+          }
+
+          try {
+            const payload = await requestGitLabProject(config, repo, `/merge_requests/${prNumber}/discussions`, {
+              method: "POST",
+              body: {
+                body: buildGitLabSuggestionDiscussionBody(suggestion),
+                position: {
+                  position_type: "text",
+                  base_sha: diffRefs.baseSha,
+                  start_sha: diffRefs.startSha,
+                  head_sha: diffRefs.headSha,
+                  ...position
+                }
+              }
+            });
+            discussionResults.push(payload);
+          } catch {
+            fallbackSuggestions.push(suggestion);
+          }
         }
-      });
+      }
+
+      const reviewBody = buildGitLabReviewBody(body, fallbackSuggestions);
+      const overviewNote = reviewBody
+        ? await requestGitLabProject(config, repo, `/merge_requests/${prNumber}/notes`, {
+            method: "POST",
+            body: {
+              body: reviewBody
+            }
+          })
+        : null;
+
+      return {
+        overviewNote,
+        discussions: discussionResults
+      };
     },
 
     async fetchPullRequestDiff(repoUrl, prNumber) {
@@ -401,17 +452,148 @@ function buildGitLabReviewBody(body, suggestions = []) {
   if (Array.isArray(suggestions) && suggestions.length > 0) {
     base.push("Suggestions:");
     for (const suggestion of suggestions) {
-      const location = [suggestion.file, suggestion.line].filter(Boolean).join(":");
-      const note = String(suggestion.body || "").trim();
-      const block = suggestion.committable && suggestion.suggestion
-        ? `\n\n\`\`\`suggestion\n${suggestion.suggestion}\n\`\`\``
-        : "";
-      base.push(`- ${location || "general"}: ${note}${block}`);
+      base.push(buildGitLabFallbackSuggestionEntry(suggestion));
     }
   }
   return base.filter(Boolean).join("\n\n").trim();
 }
 
+function buildGitLabFallbackSuggestionEntry(suggestion) {
+  const location = [suggestion?.file, suggestion?.line].filter(Boolean).join(":");
+  const note = String(suggestion?.body || "").trim();
+  const block = canCreateGitLabSuggestionBlock(suggestion)
+    ? `\n\n\`\`\`\`suggestion:-0+0\n${String(suggestion.suggestion || "").trim()}\n\`\`\`\``
+    : "";
+  return `- ${location || "general"}: ${note}${block}`;
+}
+
+function buildGitLabSuggestionDiscussionBody(suggestion) {
+  const note = String(suggestion?.body || "").trim();
+  const block = canCreateGitLabSuggestionBlock(suggestion)
+    ? `\n\n\`\`\`\`suggestion:-0+0\n${String(suggestion.suggestion || "").trim()}\n\`\`\`\``
+    : "";
+  return `${note}${block}`.trim();
+}
+
+function canCreateGitLabSuggestionBlock(suggestion) {
+  return Boolean(
+    suggestion?.committable &&
+    String(suggestion?.suggestion || "").trim() &&
+    String(suggestion?.side || "RIGHT").trim().toUpperCase() === "RIGHT"
+  );
+}
+
+function selectLatestGitLabDiffRefs(mergeRequest, versions) {
+  const candidates = Array.isArray(versions) ? versions : [];
+  const latestVersion = candidates
+    .filter((version) => version && (version.created_at || version.id != null))
+    .sort((left, right) => {
+      const leftDate = left.created_at ? Date.parse(left.created_at) : Number(left.id) || 0;
+      const rightDate = right.created_at ? Date.parse(right.created_at) : Number(right.id) || 0;
+      return rightDate - leftDate;
+    })[0];
+
+  const baseSha = latestVersion?.base_commit_sha || mergeRequest?.diff_refs?.base_sha;
+  const startSha = latestVersion?.start_commit_sha || mergeRequest?.diff_refs?.start_sha || baseSha;
+  const headSha = latestVersion?.head_commit_sha || mergeRequest?.diff_refs?.head_sha;
+
+  if (!baseSha || !startSha || !headSha) {
+    return null;
+  }
+
+  return { baseSha, startSha, headSha };
+}
+
+function buildGitLabDiffPositionIndex(changes) {
+  return (Array.isArray(changes) ? changes : []).map((change) => ({
+    oldPath: String(change?.old_path || change?.new_path || ""),
+    newPath: String(change?.new_path || change?.old_path || ""),
+    positions: parseGitLabDiffPositions(String(change?.diff || ""))
+  }));
+}
+
+function findGitLabSuggestionPosition(positionIndex, suggestion) {
+  const file = String(suggestion?.file || "").trim();
+  const line = Number(suggestion?.line) || 0;
+  const side = String(suggestion?.side || "RIGHT").trim().toUpperCase();
+  if (!file || !line) {
+    return null;
+  }
+
+  const preferredChange = positionIndex.find((change) =>
+    side === "LEFT" ? change.oldPath === file : change.newPath === file
+  ) || positionIndex.find((change) => change.oldPath === file || change.newPath === file);
+
+  if (!preferredChange) {
+    return null;
+  }
+
+  const match = preferredChange.positions.find((position) => (
+    side === "LEFT" ? position.oldLine === line : position.newLine === line
+  ));
+
+  if (!match) {
+    return null;
+  }
+
+  const payload = {
+    old_path: preferredChange.oldPath,
+    new_path: preferredChange.newPath
+  };
+
+  if (match.oldLine != null) {
+    payload.old_line = match.oldLine;
+  }
+  if (match.newLine != null) {
+    payload.new_line = match.newLine;
+  }
+
+  return payload;
+}
+
+function parseGitLabDiffPositions(diff) {
+  const positions = [];
+  let oldLine = 0;
+  let newLine = 0;
+
+  for (const rawLine of String(diff || "").split("\n")) {
+    const hunkMatch = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/u.exec(rawLine);
+    if (hunkMatch) {
+      oldLine = Number(hunkMatch[1]);
+      newLine = Number(hunkMatch[2]);
+      continue;
+    }
+
+    if (!rawLine || rawLine.startsWith("diff --git") || rawLine.startsWith("index ")) {
+      continue;
+    }
+    if (rawLine.startsWith("\")) {
+      continue;
+    }
+    if (rawLine.startsWith("--- ") || rawLine.startsWith("+++ ")) {
+      continue;
+    }
+
+    const prefix = rawLine[0];
+    if (prefix === "+") {
+      positions.push({ oldLine: null, newLine });
+      newLine += 1;
+      continue;
+    }
+    if (prefix === "-") {
+      positions.push({ oldLine, newLine: null });
+      oldLine += 1;
+      continue;
+    }
+
+    positions.push({ oldLine, newLine });
+    oldLine += 1;
+    newLine += 1;
+  }
+
+  return positions;
+}
+
 function buildGitLabDiff(changes) {
   return (Array.isArray(changes) ? changes : []).map((change) => {
     const oldPath = change.old_path || change.new_path || "unknown";