@forge-glance/sdk 0.1.1 → 0.2.1

package/dist/providers.js

@@ -92,6 +92,10 @@ var MR_DASHBOARD_FRAGMENT = `
     approvalsLeft
     resolvableDiscussionsCount
     resolvedDiscussionsCount
+    autoMergeEnabled
+    autoMergeStrategy
+    mergeUser { id username name avatarUrl }
+    mergeAfter
     headPipeline {
       id iid status
       createdAt
@@ -212,7 +216,11 @@ function toMR(gql, role, baseURL) {
     approved: gql.approved ?? false,
     approvedBy: gql.approvedBy.nodes.map(toUserRef),
     diffStats,
-    detailedMergeStatus: gql.detailedMergeStatus ?? null
+    detailedMergeStatus: gql.detailedMergeStatus ?? null,
+    autoMergeEnabled: gql.autoMergeEnabled ?? false,
+    autoMergeStrategy: gql.autoMergeStrategy ?? null,
+    mergeUser: gql.mergeUser ? toUserRef(gql.mergeUser) : null,
+    mergeAfter: gql.mergeAfter ?? null
   };
 }
 var MR_DETAIL_QUERY = `
@@ -236,8 +244,20 @@ class GitLabProvider {
     this.baseURL = baseURL.replace(/\/$/, "");
     this.token = token;
     this.log = options.logger ?? noopLogger;
-    this.mrDetailFetcher = new MRDetailFetcher(this.baseURL, token, { logger: this.log });
+    this.mrDetailFetcher = new MRDetailFetcher(this.baseURL, token, {
+      logger: this.log
+    });
   }
+  capabilities = {
+    canMerge: true,
+    canApprove: true,
+    canUnapprove: true,
+    canRebase: true,
+    canAutoMerge: true,
+    canResolveDiscussions: true,
+    canRetryPipeline: true,
+    canRequestReReview: true
+  };
   async validateToken() {
     const url = `${this.baseURL}/api/v4/user`;
     const res = await fetch(url, {
@@ -343,7 +363,11 @@ class GitLabProvider {
       headers: { "PRIVATE-TOKEN": this.token }
     });
     if (!res.ok) {
-      this.log.warn("fetchPullRequestByBranch failed", { projectPath, sourceBranch, status: res.status });
+      this.log.warn("fetchPullRequestByBranch failed", {
+        projectPath,
+        sourceBranch,
+        status: res.status
+      });
       return null;
     }
     const mrs = await res.json();
@@ -381,10 +405,7 @@ class GitLabProvider {
       throw new Error(`createPullRequest failed: ${res.status} ${text}`);
     }
     const created = await res.json();
-    const pr = await this.fetchSingleMR(input.projectPath, created.iid, null);
-    if (!pr)
-      throw new Error("Created MR but failed to fetch it back");
-    return pr;
+    return this.fetchSingleMRWithRetry(input.projectPath, created.iid, "Created MR but failed to fetch it back");
   }
   async updatePullRequest(projectPath, mrIid, input) {
     const encoded = encodeURIComponent(projectPath);
@@ -417,10 +438,7 @@ class GitLabProvider {
       const text = await res.text();
       throw new Error(`updatePullRequest failed: ${res.status} ${text}`);
     }
-    const pr = await this.fetchSingleMR(projectPath, mrIid, null);
-    if (!pr)
-      throw new Error("Updated MR but failed to fetch it back");
-    return pr;
+    return this.fetchSingleMRWithRetry(projectPath, mrIid, "Updated MR but failed to fetch it back");
   }
   async restRequest(method, path, body) {
     const url = `${this.baseURL}${path}`;
@@ -436,6 +454,171 @@ class GitLabProvider {
       body: body !== undefined ? JSON.stringify(body) : undefined
     });
   }
+  async mergePullRequest(projectPath, mrIid, input) {
+    const encoded = encodeURIComponent(projectPath);
+    const body = {};
+    if (input?.commitMessage != null)
+      body.merge_commit_message = input.commitMessage;
+    if (input?.squashCommitMessage != null)
+      body.squash_commit_message = input.squashCommitMessage;
+    if (input?.squash != null)
+      body.squash = input.squash;
+    if (input?.shouldRemoveSourceBranch != null)
+      body.should_remove_source_branch = input.shouldRemoveSourceBranch;
+    if (input?.sha != null)
+      body.sha = input.sha;
+    if (input?.mergeMethod === "squash" && input?.squash == null)
+      body.squash = true;
+    const res = await fetch(`${this.baseURL}/api/v4/projects/${encoded}/merge_requests/${mrIid}/merge`, {
+      method: "PUT",
+      headers: {
+        "PRIVATE-TOKEN": this.token,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(body)
+    });
+    if (!res.ok) {
+      const text = await res.text();
+      throw new Error(`mergePullRequest failed: ${res.status} ${text}`);
+    }
+    return this.fetchSingleMRWithRetry(projectPath, mrIid, "Merged MR but failed to fetch it back");
+  }
+  async approvePullRequest(projectPath, mrIid) {
+    const encoded = encodeURIComponent(projectPath);
+    const res = await fetch(`${this.baseURL}/api/v4/projects/${encoded}/merge_requests/${mrIid}/approve`, {
+      method: "POST",
+      headers: { "PRIVATE-TOKEN": this.token }
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`approvePullRequest failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
+  async unapprovePullRequest(projectPath, mrIid) {
+    const encoded = encodeURIComponent(projectPath);
+    const res = await fetch(`${this.baseURL}/api/v4/projects/${encoded}/merge_requests/${mrIid}/unapprove`, {
+      method: "POST",
+      headers: { "PRIVATE-TOKEN": this.token }
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`unapprovePullRequest failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
+  async rebasePullRequest(projectPath, mrIid) {
+    const encoded = encodeURIComponent(projectPath);
+    const res = await fetch(`${this.baseURL}/api/v4/projects/${encoded}/merge_requests/${mrIid}/rebase`, {
+      method: "PUT",
+      headers: { "PRIVATE-TOKEN": this.token }
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`rebasePullRequest failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
+  async setAutoMerge(projectPath, mrIid) {
+    const encoded = encodeURIComponent(projectPath);
+    const res = await fetch(`${this.baseURL}/api/v4/projects/${encoded}/merge_requests/${mrIid}/merge`, {
+      method: "PUT",
+      headers: {
+        "PRIVATE-TOKEN": this.token,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ merge_when_pipeline_succeeds: true })
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`setAutoMerge failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
+  async cancelAutoMerge(projectPath, mrIid) {
+    const encoded = encodeURIComponent(projectPath);
+    const res = await fetch(`${this.baseURL}/api/v4/projects/${encoded}/merge_requests/${mrIid}/cancel_merge_when_pipeline_succeeds`, {
+      method: "POST",
+      headers: { "PRIVATE-TOKEN": this.token }
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`cancelAutoMerge failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
+  async resolveDiscussion(projectPath, mrIid, discussionId) {
+    const encoded = encodeURIComponent(projectPath);
+    const res = await fetch(`${this.baseURL}/api/v4/projects/${encoded}/merge_requests/${mrIid}/discussions/${discussionId}`, {
+      method: "PUT",
+      headers: {
+        "PRIVATE-TOKEN": this.token,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ resolved: true })
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`resolveDiscussion failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
+  async unresolveDiscussion(projectPath, mrIid, discussionId) {
+    const encoded = encodeURIComponent(projectPath);
+    const res = await fetch(`${this.baseURL}/api/v4/projects/${encoded}/merge_requests/${mrIid}/discussions/${discussionId}`, {
+      method: "PUT",
+      headers: {
+        "PRIVATE-TOKEN": this.token,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ resolved: false })
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`unresolveDiscussion failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
+  async retryPipeline(projectPath, pipelineId) {
+    const encoded = encodeURIComponent(projectPath);
+    const res = await fetch(`${this.baseURL}/api/v4/projects/${encoded}/pipelines/${pipelineId}/retry`, {
+      method: "POST",
+      headers: { "PRIVATE-TOKEN": this.token }
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`retryPipeline failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
+  async requestReReview(projectPath, mrIid, _reviewerUsernames) {
+    const encoded = encodeURIComponent(projectPath);
+    const mrRes = await fetch(`${this.baseURL}/api/v4/projects/${encoded}/merge_requests/${mrIid}`, { headers: { "PRIVATE-TOKEN": this.token } });
+    if (!mrRes.ok) {
+      const text = await mrRes.text().catch(() => "");
+      throw new Error(`requestReReview: failed to fetch MR: ${mrRes.status}${text ? ` — ${text}` : ""}`);
+    }
+    const mr = await mrRes.json();
+    const reviewerIds = mr.reviewers?.map((r) => r.id) ?? [];
+    if (reviewerIds.length === 0) {
+      return;
+    }
+    const res = await fetch(`${this.baseURL}/api/v4/projects/${encoded}/merge_requests/${mrIid}`, {
+      method: "PUT",
+      headers: {
+        "PRIVATE-TOKEN": this.token,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ reviewer_ids: reviewerIds })
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`requestReReview failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
+  async fetchSingleMRWithRetry(projectPath, mrIid, errorMessage) {
+    for (let attempt = 0;attempt < 3; attempt++) {
+      if (attempt > 0) {
+        await new Promise((r) => setTimeout(r, attempt * 300));
+      }
+      const pr = await this.fetchSingleMR(projectPath, mrIid, null);
+      if (pr)
+        return pr;
+    }
+    throw new Error(errorMessage);
+  }
   async runQuery(query, variables) {
     const url = `${this.baseURL}/api/graphql`;
     const body = JSON.stringify({ query, variables: variables ?? {} });
@@ -551,6 +734,16 @@ class GitHubProvider {
       this.apiBase = `${this.baseURL}/api/v3`;
     }
   }
+  capabilities = {
+    canMerge: true,
+    canApprove: true,
+    canUnapprove: false,
+    canRebase: false,
+    canAutoMerge: false,
+    canResolveDiscussions: false,
+    canRetryPipeline: true,
+    canRequestReReview: true
+  };
   async validateToken() {
     const res = await this.api("GET", "/user");
     if (!res.ok) {
@@ -592,7 +785,9 @@ class GitHubProvider {
       ]);
       return this.toPullRequest(pr, prRoles, reviews, checkRuns);
     }));
-    this.log.debug("GitHubProvider.fetchPullRequests", { count: results.length });
+    this.log.debug("GitHubProvider.fetchPullRequests", {
+      count: results.length
+    });
     return results;
   }
   async fetchSingleMR(projectPath, mrIid, _currentUserNumericId) {
@@ -705,7 +900,11 @@ class GitHubProvider {
   async fetchPullRequestByBranch(projectPath, sourceBranch) {
     const res = await this.api("GET", `/repos/${projectPath}/pulls?head=${projectPath.split("/")[0]}:${encodeURIComponent(sourceBranch)}&state=open&per_page=1`);
     if (!res.ok) {
-      this.log.warn("fetchPullRequestByBranch failed", { projectPath, sourceBranch, status: res.status });
+      this.log.warn("fetchPullRequestByBranch failed", {
+        projectPath,
+        sourceBranch,
+        status: res.status
+      });
       return null;
     }
     const prs = await res.json();
@@ -789,6 +988,83 @@ class GitHubProvider {
   async restRequest(method, path, body) {
     return this.api(method, path, body);
   }
+  async mergePullRequest(projectPath, mrIid, input) {
+    const body = {};
+    if (input?.commitMessage != null)
+      body.commit_title = input.commitMessage;
+    if (input?.squashCommitMessage != null)
+      body.commit_title = input.squashCommitMessage;
+    if (input?.shouldRemoveSourceBranch != null)
+      body.delete_branch = input.shouldRemoveSourceBranch;
+    if (input?.sha != null)
+      body.sha = input.sha;
+    if (input?.mergeMethod) {
+      body.merge_method = input.mergeMethod;
+    } else if (input?.squash) {
+      body.merge_method = "squash";
+    }
+    const res = await this.api("PUT", `/repos/${projectPath}/pulls/${mrIid}/merge`, body);
+    if (!res.ok) {
+      const text = await res.text();
+      throw new Error(`mergePullRequest failed: ${res.status} ${text}`);
+    }
+    const pr = await this.fetchSingleMR(projectPath, mrIid, null);
+    if (!pr)
+      throw new Error("Merged PR but failed to fetch it back");
+    return pr;
+  }
+  async approvePullRequest(projectPath, mrIid) {
+    const res = await this.api("POST", `/repos/${projectPath}/pulls/${mrIid}/reviews`, {
+      event: "APPROVE"
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`approvePullRequest failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
+  async unapprovePullRequest(_projectPath, _mrIid) {
+    throw new Error("unapprovePullRequest is not supported by GitHub. " + "Check provider.capabilities.canUnapprove before calling.");
+  }
+  async rebasePullRequest(_projectPath, _mrIid) {
+    throw new Error("rebasePullRequest is not supported by GitHub. " + "Check provider.capabilities.canRebase before calling.");
+  }
+  async setAutoMerge(_projectPath, _mrIid) {
+    throw new Error("setAutoMerge is not supported by the GitHub REST API. " + "Check provider.capabilities.canAutoMerge before calling.");
+  }
+  async cancelAutoMerge(_projectPath, _mrIid) {
+    throw new Error("cancelAutoMerge is not supported by the GitHub REST API. " + "Check provider.capabilities.canAutoMerge before calling.");
+  }
+  async resolveDiscussion(_projectPath, _mrIid, _discussionId) {
+    throw new Error("resolveDiscussion is not supported by the GitHub REST API. " + "Check provider.capabilities.canResolveDiscussions before calling.");
+  }
+  async unresolveDiscussion(_projectPath, _mrIid, _discussionId) {
+    throw new Error("unresolveDiscussion is not supported by the GitHub REST API. " + "Check provider.capabilities.canResolveDiscussions before calling.");
+  }
+  async retryPipeline(projectPath, pipelineId) {
+    const res = await this.api("POST", `/repos/${projectPath}/actions/runs/${pipelineId}/rerun`);
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`retryPipeline failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
+  async requestReReview(projectPath, mrIid, reviewerUsernames) {
+    if (!reviewerUsernames?.length) {
+      const prRes = await this.api("GET", `/repos/${projectPath}/pulls/${mrIid}`);
+      if (!prRes.ok) {
+        throw new Error(`requestReReview: failed to fetch PR: ${prRes.status}`);
+      }
+      const pr = await prRes.json();
+      reviewerUsernames = pr.requested_reviewers.map((r) => r.login);
+      if (!reviewerUsernames.length) {
+        return;
+      }
+    }
+    const res = await this.api("POST", `/repos/${projectPath}/pulls/${mrIid}/requested_reviewers`, { reviewers: reviewerUsernames });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`requestReReview failed: ${res.status} ${res.statusText}${text ? ` — ${text}` : ""}`);
+    }
+  }
   async api(method, path, body) {
     const url = `${this.apiBase}${path}`;
     const headers = {
@@ -903,7 +1179,11 @@ class GitHubProvider {
       approved: approvedBy.length > 0 && changesRequested === 0,
       approvedBy,
       diffStats,
-      detailedMergeStatus: null
+      detailedMergeStatus: null,
+      autoMergeEnabled: pr.auto_merge != null,
+      autoMergeStrategy: pr.auto_merge?.merge_method ?? null,
+      mergeUser: pr.auto_merge ? toUserRef2(pr.auto_merge.enabled_by) : null,
+      mergeAfter: null
     };
   }
 }

package/dist/types.d.ts

@@ -75,6 +75,14 @@ export interface PullRequest {
      * "not_approved", "discussions_not_resolved". Null for non-GitLab providers.
      */
     detailedMergeStatus: string | null;
+    /** Whether auto-merge (merge when pipeline succeeds) is currently enabled. */
+    autoMergeEnabled: boolean;
+    /** The merge strategy that will be used when auto-merge fires, e.g. "merge", "squash", "rebase_merge". */
+    autoMergeStrategy: string | null;
+    /** The user who merged or enabled auto-merge. */
+    mergeUser: UserRef | null;
+    /** ISO timestamp after which the MR is eligible to merge (scheduled merge). */
+    mergeAfter: string | null;
 }
 /** Input for creating a new merge request / pull request. */
 export interface CreatePullRequestInput {
@@ -107,7 +115,62 @@ export interface UpdatePullRequestInput {
     /** Labels (replaces current set). */
     labels?: string[];
     /** Set MR state: "close" or "reopen". */
-    stateEvent?: "close" | "reopen";
+    stateEvent?: 'close' | 'reopen';
+}
+/**
+ * Merge strategy override.
+ * - "merge"  — Standard merge commit.
+ * - "squash" — Squash all commits into one before merging.
+ * - "rebase" — Rebase the source branch onto the target (fast-forward).
+ *
+ * When omitted, the provider uses the project's configured default merge method.
+ */
+export type MergeMethod = 'merge' | 'squash' | 'rebase';
+/**
+ * Input for merging (accepting) a pull request / merge request.
+ *
+ * All fields are **optional**. Omitting them defers to the project-level
+ * settings configured in the forge UI (merge method, squash policy,
+ * delete-source-branch, etc.). This matches how the web UI works.
+ */
+export interface MergePullRequestInput {
+    /** Merge commit message. Omit to use the provider/project default. */
+    commitMessage?: string;
+    /** Squash commit message (when merge method is "squash"). */
+    squashCommitMessage?: string;
+    /** Whether to squash commits. Omit to use the MR / project default. */
+    squash?: boolean;
+    /** Merge strategy override. Omit to use the project's default merge method. */
+    mergeMethod?: MergeMethod;
+    /** Delete source branch after merge. Omit to use project default. */
+    shouldRemoveSourceBranch?: boolean;
+    /** SHA that HEAD must match for the merge to proceed (optimistic locking). */
+    sha?: string;
+}
+/**
+ * Reports which mutation operations a provider supports.
+ *
+ * Callers should check these flags before invoking vendor-specific methods
+ * so they can conditionally show/hide UI affordances without
+ * knowing which provider they're talking to.
+ */
+export interface ProviderCapabilities {
+    /** Can merge / accept a pull request. */
+    canMerge: boolean;
+    /** Can approve a pull request. */
+    canApprove: boolean;
+    /** Can revoke an existing approval. */
+    canUnapprove: boolean;
+    /** Can rebase the source branch onto the target. */
+    canRebase: boolean;
+    /** Can enable automatic merge when pipeline succeeds. */
+    canAutoMerge: boolean;
+    /** Can resolve / unresolve discussion threads. */
+    canResolveDiscussions: boolean;
+    /** Can retry a pipeline. */
+    canRetryPipeline: boolean;
+    /** Can re-request review attention from reviewers. */
+    canRequestReReview: boolean;
 }
 /** Branch protection rule (provider-agnostic). */
 export interface BranchProtectionRule {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge-glance/sdk",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "GitHub & GitLab API client — REST, GraphQL, and real-time ActionCable subscriptions",
   "type": "module",
   "main": "dist/index.js",