@remogram/provider-gitea-api 0.1.0-beta.5 → 0.1.0-beta.8

package/index.js

@@ -10,7 +10,7 @@ import {
   gitAheadBehind,
   refsInventory,
   crInventory,
-  buildMergePlanBodyFromFacts,
+  buildMergePlanFromProviderFacts,
   buildChangeRequestOpenedBody,
   buildCommitStatusSetBody,
   parseStatusSetArgs,
@@ -27,6 +27,7 @@ import {
   parseSinceObservedAt,
   ERROR_CODES,
   forgeError,
+  assertExpectedSha,
   forgeIngestCapabilityFacts,
   checkPaginationCapabilityFacts,
   idempotencyScanCapabilityFacts,
@@ -56,6 +57,7 @@ import {
   buildOpenPullListMeta,
   giteaOpenPullSortQuery,
   appendSortQuery,
+  assertWriteCommandConfigured,
 } from '@remogram/core';
 const PUBLIC_GITEA_HOST = 'gitea.com';
 const PUBLIC_GITEA_API = 'https://gitea.com/api/v1';
@@ -84,6 +86,7 @@ const STRUCTURED_COMMANDS = apiProviderCommands({
   crFilesImplemented: true,
   crCommentsImplemented: true,
   forgeChangesImplemented: true,
+  mergeExecuteImplemented: true,
 });
 
 export function giteaToken() {
@@ -164,13 +167,36 @@ export function authHeaders(token) {
 }
 
 export function repoApiPath(config, ...segments) {
-  const owner = encodeURIComponent(config.owner);
-  const repo = encodeURIComponent(config.repo);
-  const base = `/repos/${owner}/${repo}`;
+  return repoApiPathFor(config.owner, config.repo, ...segments);
+}
+
+export function repoApiPathFor(owner, repo, ...segments) {
+  const encodedOwner = encodeURIComponent(owner);
+  const encodedRepo = encodeURIComponent(repo);
+  const base = `/repos/${encodedOwner}/${encodedRepo}`;
   if (!segments.length) return base;
   return `${base}/${segments.map((s) => encodeURIComponent(String(s))).join('/')}`;
 }
 
+export function forgeSourceRepoIdFromPull(config, pr) {
+  const headOwner = sanitizeField(pr.head?.repo?.owner?.login ?? pr.head?.repo?.owner?.name);
+  const headRepo = sanitizeField(pr.head?.repo?.name);
+  if (!headOwner || !headRepo) return null;
+  const configOwner = String(config.owner ?? '').toLowerCase();
+  const configRepo = String(config.repo ?? '').toLowerCase();
+  if (headOwner.toLowerCase() === configOwner && headRepo.toLowerCase() === configRepo) return null;
+  return `${headOwner}/${headRepo}`;
+}
+
+export function isGiteaHeadOutOfDate409(err) {
+  const status = err.status ?? err.forgeError?.status ?? null;
+  if (status !== 409) return false;
+  const message = err.forgeError?.message ?? err.message ?? '';
+  if (/head out of date/i.test(message)) return true;
+  if (/sha mismatch/i.test(message)) return true;
+  return false;
+}
+
 export async function giteaFetch(config, parsed, path, options = {}) {
   const token = requireToken();
   const url = `${apiBase(config, parsed)}${path}`;
@@ -301,6 +327,47 @@ export async function branchProtection(ctx, { branchRef }) {
   return buildBranchProtectionFromGiteaProtection(branchRef, protection);
 }
 
+export async function branchHeadSha(ctx, branchRef, { repoId } = {}) {
+  requireToken();
+  assertGitRef(branchRef, 'head_ref');
+  let owner = ctx.config.owner;
+  let repo = ctx.config.repo;
+  if (repoId) {
+    const parts = String(repoId).split('/');
+    if (parts.length !== 2 || !parts[0] || !parts[1]) {
+      throw Object.assign(new Error('Invalid repoId'), {
+        forgeError: forgeError(ERROR_CODES.INVALID_ARGS, 'repoId must be owner/repo'),
+      });
+    }
+    owner = parts[0];
+    repo = parts[1];
+  }
+  const branch = await giteaFetch(
+    ctx.config,
+    ctx.parsed,
+    repoApiPathFor(owner, repo, 'branches', branchRef),
+  );
+  const rawSha = sanitizeField(branch?.commit?.id);
+  if (!rawSha) {
+    throw Object.assign(new Error('Branch commit id missing'), {
+      forgeError: forgeError(
+        ERROR_CODES.UNPARSEABLE_PROVIDER_OUTPUT,
+        'Gitea branch response missing commit id',
+      ),
+    });
+  }
+  try {
+    return assertExpectedSha(rawSha, 'branch commit id');
+  } catch (err) {
+    throw Object.assign(new Error('Branch commit id invalid'), {
+      forgeError: forgeError(
+        ERROR_CODES.UNPARSEABLE_PROVIDER_OUTPUT,
+        sanitizeField(err.invalidArgs) || 'Gitea branch response commit id is not a valid SHA',
+      ),
+    });
+  }
+}
+
 export async function crFiles(ctx, { number }) {
   requireToken();
   if (number == null) {
@@ -484,7 +551,7 @@ export function providerCapabilities() {
     host_binding: 'verified_remote_host',
     pagination: 'supported',
     write_support: true,
-    write_commands: ['cr_open', 'status_set'],
+    write_commands: ['cr_open', 'status_set', 'merge'],
     ...forgeIngestCapabilityFacts(),
     ...checkPaginationCapabilityFacts({
       strategy: 'offset_limit',
@@ -519,10 +586,10 @@ export async function refsCompare(ctx, baseRef, headRef) {
   }
   const counts = gitAheadBehind(ctx.cwd, baseSha, headSha);
   return {
-    base_ref: sanitizeField(baseRef),
-    base_sha: baseSha,
-    head_ref: sanitizeField(headRef),
-    head_sha: headSha,
+    compare_base_ref: sanitizeField(baseRef),
+    compare_base_sha: baseSha,
+    compare_head_ref: sanitizeField(headRef),
+    compare_head_sha: headSha,
     ...counts,
   };
 }
@@ -648,6 +715,7 @@ export async function findCommitStatusByContext(ctx, sha, context) {
 }
 
 export async function statusSet(ctx, args) {
+  assertWriteCommandConfigured(ctx.config, 'status_set');
   const parsed = parseStatusSetArgs(args);
   const existing = await findCommitStatusByContext(ctx, parsed.sha, parsed.context);
   if (existing) {
@@ -676,6 +744,7 @@ export async function statusSet(ctx, args) {
 }
 
 export async function crOpen(ctx, { head, base, title, body: prBody }) {
+  assertWriteCommandConfigured(ctx.config, 'cr_open');
   assertGitRef(head, 'head');
   assertGitRef(base, 'base');
   if (!title || typeof title !== 'string' || !title.trim()) {
@@ -703,6 +772,58 @@ export async function crOpen(ctx, { head, base, title, body: prBody }) {
   return buildChangeRequestOpenedBody(pull, { head, base, title });
 }
 
+export async function mergeExecute(ctx, { number, method = 'merge', expectedHeadSha }) {
+  assertWriteCommandConfigured(ctx.config, 'merge');
+  if (method !== 'merge') {
+    throw Object.assign(new Error('Unsupported merge method'), {
+      forgeError: forgeError(
+        ERROR_CODES.INVALID_ARGS,
+        'Only --method merge is supported in v1',
+      ),
+    });
+  }
+  const pullIndex = Number(number);
+  if (!Number.isInteger(pullIndex) || pullIndex <= 0) {
+    throw Object.assign(new Error('Invalid PR number'), {
+      forgeError: forgeError(ERROR_CODES.INVALID_ARGS, 'PR number must be a positive integer'),
+    });
+  }
+  const headCommitId = assertExpectedSha(expectedHeadSha, 'expectedHeadSha');
+  let result;
+  try {
+    result = await giteaFetch(
+      ctx.config,
+      ctx.parsed,
+      repoApiPath(ctx.config, 'pulls', String(pullIndex), 'merge'),
+      {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ Do: 'merge', head_commit_id: headCommitId }),
+      },
+    );
+  } catch (err) {
+    const status = err.status ?? err.forgeError?.status ?? null;
+    const message = err.forgeError?.message ?? err.message ?? '';
+    if (isGiteaHeadOutOfDate409(err)) {
+      throw Object.assign(new Error(message), {
+        status,
+        mergeBlockedBlockers: ['head_ref_moved'],
+        forgeError: forgeError(
+          ERROR_CODES.MERGE_BLOCKED,
+          sanitizeField(message) || 'Head branch out of date at merge POST',
+          status,
+        ),
+      });
+    }
+    throw err;
+  }
+  return {
+    commit_sha: sanitizeField(result?.sha ?? result?.merge_commit_sha ?? null),
+    provider_status: 200,
+    base_sha: sanitizeField(result?.base_sha ?? null),
+  };
+}
+
 const GITEA_OPEN_PULL_COMPLIANT_MAX =
   DEFAULT_OPEN_PULL_LIST_PAGE_SIZE * MAX_CHECK_STATUS_PAGES;
 
@@ -913,17 +1034,20 @@ function mergeability(pr) {
 
 export async function prView(ctx, opts) {
   const pr = await getPull(ctx, opts);
-  return {
+  const body = {
     pr_number: pr.number,
     url: sanitizeUrl(pr.html_url ?? pr.url),
     title: sanitizeField(pr.title),
     state: normalizeGiteaPrState(pr.state),
-    base_ref: sanitizeField(pr.base?.ref),
-    base_sha: sanitizeField(pr.base?.sha),
-    head_ref: sanitizeField(pr.head?.ref),
-    head_sha: sanitizeField(pr.head?.sha),
+    forge_target_branch_ref: sanitizeField(pr.base?.ref),
+    forge_target_sha: sanitizeField(pr.base?.sha),
+    forge_source_branch_ref: sanitizeField(pr.head?.ref),
+    forge_source_sha: sanitizeField(pr.head?.sha),
     mergeability: mergeability(pr),
   };
+  const forgeSourceRepoId = forgeSourceRepoIdFromPull(ctx.config, pr);
+  if (forgeSourceRepoId) body.forge_source_repo_id = forgeSourceRepoId;
+  return body;
 }
 
 export async function prChecks(ctx, opts) {
@@ -954,7 +1078,7 @@ export async function prChecks(ctx, opts) {
   const mapped = mapGiteaCommitStatuses(statusRecords);
   const conclusion = summarizeChecks(mapped);
   return {
-    head_sha: sha,
+    forge_source_sha: sha,
     check_conclusion: conclusion,
     checks_truncated,
     statuses: mapped,
@@ -970,18 +1094,7 @@ export function summarizeChecks(statuses) {
 }
 
 export async function mergePlan(ctx, opts) {
-  const view = await prView(ctx, opts);
-  const checks = await prChecks(ctx, { number: view.pr_number });
-  let mergeOpts = opts;
-  if (opts.allowed_paths) {
-    try {
-      const crFilesBody = await crFiles(ctx, { number: view.pr_number });
-      mergeOpts = { ...opts, changed_paths: crFilesBody.changed_paths };
-    } catch {
-      // Fall back to local git diff in resolveMergePlanPathScope.
-    }
-  }
-  return buildMergePlanBodyFromFacts(ctx, view, checks, mergeOpts);
+  return buildMergePlanFromProviderFacts(ctx, opts, { prView, prChecks, crFiles });
 }
 
 export async function syncPlan(ctx, remoteName = 'origin') {
@@ -1024,9 +1137,11 @@ export const provider = {
   mergePlan,
   syncPlan,
   crOpen,
+  mergeExecute,
   statusSet,
   whoami,
   branchProtection,
+  branchHeadSha,
   crFiles,
   crComments,
   forgeChanges,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remogram/provider-gitea-api",
-  "version": "0.1.0-beta.5",
+  "version": "0.1.0-beta.8",
   "description": "Gitea REST API forge provider for remogram",
   "type": "module",
   "license": "MIT",
@@ -22,6 +22,6 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@remogram/core": "0.1.0-beta.5"
+    "@remogram/core": "0.1.0-beta.8"
   }
 }