@brainervirus/workit-core 2.4.0 → 2.6.0

package/src/forge/github.ts

@@ -1,6 +1,6 @@
 // GitHub adapter: `gh api graphql` for PR state, checks and review threads,
 // `gh api` REST for required checks, job logs and reruns (design §2.0).
-import { apiJson, apiText, cliFailure, FORGE_TIMEOUTS, type ForgeRunner } from "./exec";
+import { apiJson, apiText, apiWrite, cliFailure, FORGE_TIMEOUTS, type ForgeRunner } from "./exec";
 import { logTail, redactText, shortBody } from "./redact";
 import {
   failure,
@@ -442,5 +442,88 @@ export function createGitHubForge(options: {
       );
       return run.ok ? success(undefined) : run;
     },
+
+    createPr(input) {
+      // Cross-repository PRs name the head as owner:branch.
+      const headOwner = input.headRepo.split("/")[0];
+      const head = input.headRepo === repo ? input.head : `${headOwner}:${input.head}`;
+      const created = apiWrite<{
+        number?: number;
+        html_url?: string;
+        state?: string;
+        merged?: boolean;
+        head?: { ref?: string; sha?: string };
+      }>(
+        runner,
+        "gh",
+        apiHost,
+        [
+          "api",
+          "-X",
+          "POST",
+          `repos/${repo}/pulls`,
+          "-f",
+          `title=${input.title}`,
+          "-f",
+          `head=${head}`,
+          "-f",
+          `base=${input.base}`,
+          "-f",
+          `body=${input.body}`,
+          "-F",
+          `draft=${input.draft ? "true" : "false"}`,
+        ],
+        `pull request for ${input.head}`,
+      );
+      if (!created.ok) return created;
+      const value = created.data;
+      if (typeof value.number !== "number" || typeof value.html_url !== "string")
+        return failure("failed", "gh api pulls returned no pull request number");
+      return success({
+        number: value.number,
+        url: value.html_url,
+        state: value.merged ? "merged" : value.state === "closed" ? "closed" : "open",
+        headBranch: value.head?.ref ?? input.head,
+        headSha: value.head?.sha ?? null,
+      });
+    },
+
+    merge(number, mergeOptions) {
+      // sha= is GitHub's atomic head guard: 409 when the head moved.
+      const merged = apiWrite<{ sha?: string; merged?: boolean; message?: string }>(
+        runner,
+        "gh",
+        apiHost,
+        [
+          "api",
+          "-X",
+          "PUT",
+          `repos/${repo}/pulls/${number}/merge`,
+          "-f",
+          `sha=${mergeOptions.sha}`,
+          "-f",
+          `merge_method=${mergeOptions.method}`,
+        ],
+        `merge of pull request #${number}`,
+      );
+      if (!merged.ok) return merged;
+      if (merged.data.merged === false)
+        return failure(
+          "blocked",
+          `merge of pull request #${number} refused: ${redactText(merged.data.message ?? "not merged").slice(0, 200)}`,
+        );
+      return success({ mergeSha: typeof merged.data.sha === "string" ? merged.data.sha : null });
+    },
+
+    updateBase(number, base) {
+      const updated = apiWrite<unknown>(
+        runner,
+        "gh",
+        apiHost,
+        ["api", "-X", "PATCH", `repos/${repo}/pulls/${number}`, "-f", `base=${base}`],
+        `retarget of pull request #${number}`,
+      );
+      return updated.ok ? success(undefined) : updated;
+    },
   };
 }

package/src/forge/gitlab.ts

@@ -1,7 +1,7 @@
 // GitLab adapter: `glab api` REST only (design §2.0 GitLab endpoints): the MR
 // (`detailed_merge_status`, `has_conflicts`, `head_pipeline`), pipeline jobs,
 // job traces, discussions, and pipeline/job retry.
-import { apiJson, apiText, FORGE_TIMEOUTS, type ForgeRunner } from "./exec";
+import { apiJson, apiText, apiWrite, FORGE_TIMEOUTS, type ForgeRunner } from "./exec";
 import { logTail, redactText, shortBody } from "./redact";
 import {
   failure,
@@ -451,5 +451,106 @@ export function createGitLabForge(options: {
       );
       return run.ok ? success(undefined) : run;
     },
+
+    createPr(input) {
+      // An MR from a fork is created in the source project and targets ours.
+      const fromFork = input.headRepo !== repo;
+      let source = project;
+      const extra: string[] = [];
+      if (fromFork) {
+        const target = apiJson<{ id?: number }>(
+          runner,
+          "glab",
+          apiHost,
+          api(project),
+          `project ${repo}`,
+        );
+        if (!target.ok) return target;
+        if (input.headProjectId === null || typeof target.data.id !== "number")
+          return failure(
+            "failed",
+            `cannot resolve the project ids for an MR from ${input.headRepo}`,
+          );
+        source = `projects/${input.headProjectId}`;
+        extra.push("-F", `target_project_id=${target.data.id}`);
+      }
+      const title =
+        input.draft && !/^draft:/iu.test(input.title) ? `Draft: ${input.title}` : input.title;
+      const created = apiWrite<GlMr>(
+        runner,
+        "glab",
+        apiHost,
+        [
+          "api",
+          "-X",
+          "POST",
+          `${source}/merge_requests`,
+          "-f",
+          `source_branch=${input.head}`,
+          "-f",
+          `target_branch=${input.base}`,
+          "-f",
+          `title=${title}`,
+          "-f",
+          `description=${input.body}`,
+          ...extra,
+        ],
+        `merge request for ${input.head}`,
+      );
+      if (!created.ok) return created;
+      const value = created.data;
+      if (typeof value.iid !== "number" || typeof value.web_url !== "string")
+        return failure("failed", "glab api merge_requests returned no merge request iid");
+      return success({
+        number: value.iid,
+        url: value.web_url,
+        state: mrState(value.state),
+        headBranch: value.source_branch ?? input.head,
+        headSha: value.sha ?? null,
+      });
+    },
+
+    merge(iid, mergeOptions) {
+      // GitLab's merge method is a project setting; squash is per request.
+      if (mergeOptions.method === "rebase")
+        return failure(
+          "invalid_input",
+          "GitLab merges with the project's merge method; pass --method squash or merge",
+        );
+      const merged = apiWrite<
+        GlMr & { merge_commit_sha?: string | null; squash_commit_sha?: string | null }
+      >(
+        runner,
+        "glab",
+        apiHost,
+        [
+          "api",
+          "-X",
+          "PUT",
+          `${project}/merge_requests/${iid}/merge`,
+          "-f",
+          `sha=${mergeOptions.sha}`,
+          "-F",
+          `squash=${mergeOptions.method === "squash" ? "true" : "false"}`,
+        ],
+        `merge of merge request !${iid}`,
+      );
+      if (!merged.ok) return merged;
+      const value = merged.data;
+      return success({
+        mergeSha: value.merge_commit_sha ?? value.squash_commit_sha ?? null,
+      });
+    },
+
+    updateBase(iid, base) {
+      const updated = apiWrite<unknown>(
+        runner,
+        "glab",
+        apiHost,
+        ["api", "-X", "PUT", `${project}/merge_requests/${iid}`, "-f", `target_branch=${base}`],
+        `retarget of merge request !${iid}`,
+      );
+      return updated.ok ? success(undefined) : updated;
+    },
   };
 }

package/src/forge/pr-body.ts

@@ -0,0 +1,100 @@
+// PR/MR body issue linking (port of scripts/pr-create.sh --build-body), shared
+// by the managed `hosting.pull_request` action (core/pr-create.ts re-exports
+// these until S16) and `workit pr create` (S11), which passes typed input
+// instead of environment variables.
+import { vcsConfig } from "../core/vcs-config";
+
+export function parseGhRepo(remote: string): string | null {
+  remote = (remote || "").trim().replace(/\/+$/, "");
+  if (!remote) return null;
+  if (remote.endsWith(".git")) remote = remote.slice(0, -4);
+  if (remote.includes(":")) remote = remote.split(":").pop() ?? ""; // drop git@host part (scp-style URL)
+  const parts = remote.split("/").filter(Boolean);
+  return parts.length >= 2 ? parts.slice(-2).join("/") : null;
+}
+
+export function parseGhIssue(value: string): string {
+  const m = /issues\/(\d+)/.exec(value);
+  return m ? m[1] : String(value).trim().replace(/^#/, "");
+}
+
+// RL-03/CA-25/AR-08: a branch-derived numeric issue id must be a bare number at
+// a segment or dash boundary — and never part of a date segment. Year-first
+// (feature/2024-01-15/x) and day-first (feature/15-01-2024/x) dates are both
+// skipped — a complete date anywhere in a segment (release-2024-01-15,
+// v2-2024-01-15-fix) — so no date digit ever closes an issue. Deliberate
+// numeric issue branches (feature/42-title, feature/2024-fix) keep linking.
+function deriveGhIssueFromBranch(branch: string): string {
+  for (const segment of branch.split("/")) {
+    if (/^\d{4}-\d/.test(segment)) continue; // year-first date-like segment (incl. year-month)
+    if (/\d{4}-\d{1,2}-\d{1,2}/.test(segment)) continue; // complete year-first date anywhere
+    if (/\d{1,2}-\d{1,2}-\d{4}/.test(segment)) continue; // complete day-first date anywhere
+    const m = /(?:^|-)(\d+)(?:-|$)/.exec(segment);
+    if (m) return m[1];
+  }
+  return "";
+}
+
+export function buildBody(
+  body: string,
+  branch: string,
+  linkIssues: boolean,
+  baseUrl: string,
+  ytIssue: string,
+  ghLinkOnPr: boolean,
+  ghIssue: string,
+  ghRelation: string,
+  ghRepo: string | null,
+): string {
+  let line: string | null = null;
+  if (linkIssues) {
+    let issue = ytIssue;
+    if (!issue && branch) {
+      // anchored prefix + \b boundary, 3+ digits so version-like tokens (POSTGRES-16, HTTP-3) never link
+      const m = /(?:^|\/|-)([A-Z]{2,}-\d{3,})\b/.exec(branch);
+      if (m) issue = m[1];
+    }
+    if (issue && baseUrl) line = `Related to: ${baseUrl.replace(/\/+$/, "")}/issue/${issue}`;
+  } else if (ghLinkOnPr) {
+    let issue = parseGhIssue(ghIssue);
+    if (!issue && branch) {
+      // pure-number issue id (feature/42-title -> 42); digits must be followed by a dash or end-of-string
+      // so version tokens (release/1.2.3, backport/8.0.1, lodash-4.17.21, 2024.1) never link
+      issue = deriveGhIssueFromBranch(branch);
+    }
+    if (issue) {
+      if (ghRelation === "related") {
+        line = `Related to #${issue}`;
+        if (ghRepo) line += ` — https://github.com/${ghRepo}/issues/${issue}`;
+      } else {
+        line = `Closes #${issue}`;
+      }
+    }
+  }
+  if (line === null) return body;
+  return body ? `${body}\n\n${line}` : line;
+}
+
+/**
+ * The body `workit pr create` sends: the agent's text plus the workspace's
+ * issue link (YouTrack `link_issues`, or GitHub `issues.link_on_pr` with the
+ * issue number derived from the branch). Reads config, never writes it.
+ */
+export function prBodyFor(
+  cwd: string,
+  input: { body: string; branch: string; repo: string | null },
+): string {
+  const resolved = vcsConfig("resolve", cwd);
+  if (resolved.ok === false) return input.body;
+  return buildBody(
+    input.body,
+    input.branch,
+    resolved.link_issues === true,
+    typeof resolved.youtrack_base_url === "string" ? resolved.youtrack_base_url : "",
+    "",
+    resolved.link_on_pr === true,
+    "",
+    "closes",
+    input.repo,
+  );
+}