Files
paseo/packages/app/src/git/merge-capability.ts
T
nllptrxandMohamed Boudra 4a5716360b Feat/forge check semantics and followup fixes (#2337)
* feat(protocol): add forge check presentation metadata

Expose optional rawStatus, isManual, and requiresAction fields while keeping older check payloads backward-compatible.

* fix(gitea): model Actions jobs as tasks

Gitea's /actions/tasks endpoint returns individual jobs rather than workflow runs. Preserve sibling tasks from the latest execution, avoid collapsing same-name jobs, and enrich blocked tasks with run-level approval metadata.

* feat(app): distinguish forge check presentation states

* fix(gitlab): preserve pipeline job semantics

* refactor(app): centralize forge check presentation policy

Use one canonical category order, count shape, visual policy, and translated copy mapping across sidebar, hover-card, PR-pane, and GitLab pipeline surfaces.

* refactor: consolidate forge check handling

* feat(forge): auto-attach pasted forge references

* docs(compat): correct forge rollout metadata

* refactor(forge): model check nuances as traits

* fix(forge): harden checks from branch review

Structural Gitea Actions shadow dedup by run id (verified upstream),
rerun grouping without workflow_id, shared trait/status constants and
Gitea state mapping in the protocol package, all cloud host aliases in
pasted-link matching, logged glab job-detail failures, concurrent
approvals/pipeline fetch, checks aggregate from the same pipeline as
the job list, and removal of the unread check-level rawStatus. The
released pipeline-level rawStatus is staged for removal under
COMPAT(pipelineRawStatus).

* fix(gitea): detect fork-PR Actions approval hold as action_required

gitea.com represents a fork PR awaiting Actions approval as a run in
status "waiting" with no tasks and pending shadow commit statuses; it
does not expose need_approval. The previous mapping only set
action_required from a task with blocked+need_approval, so the gate
never surfaced (0 tasks -> early return; need_approval absent). Detect
the hold from /actions/runs: a waiting/blocked run whose PR is
cross-repo (head.repo.id != base.repo.id), or one that does expose
need_approval (self-hosted). Tag the run's pending shadow statuses
action_required. Runs are only fetched when a pending shadow has no
covering task, keeping the common path at two requests. Verified live
against gitea.com fork PR (run 715170, waiting, cross-repo).

* fix(gitea): resolve cross-fork PRs by head sha

The current-PR matcher gated candidates on the checkout owner
(giteaHeadOwner === expectedHeadOwner), which excludes every fork PR:
its head carries the fork owner while the checkout is the base repo, so
a fork PR - the only shape that can be approval-held on Gitea - never
resolved and its checks never showed in-app. GitLab has no such gate
(it resolves fork MRs from the target project by source branch). Accept
a recent PR whose head sha equals the workspace head sha regardless of
owner; the sha is an unambiguous identity, so the anti-collision owner
gate still applies when no sha match is available. Verified live against
gitea.com fork PR #6 (resolves + renders action_required).

* fix: resolve forge rebase drift

* fix: type forge auto-attach boundary

* fix(i18n): add Korean check status copy

---------

Co-authored-by: Mohamed Boudra <boudra.moha@gmail.com>
2026-08-25 23:37:50 +02:00

51 lines
1.8 KiB
TypeScript

import {
type ForgeSpecificEnvelope,
type LegacyGithubMergeFacts,
type MergeCapability,
} from "@/git/client-forge-module";
import { CLIENT_FORGE_LOGIC_MODULES } from "@/git/forges";
export type ForgeSpecificStatusFacts = ForgeSpecificEnvelope;
export type { LegacyGithubMergeFacts, MergeCapability };
/**
* Resolve the neutral merge capability from a registered forge's runtime facts.
* Returns null for an unregistered, unknown, or schema-mismatched facts family;
* callers then fall back to raw git state.
*/
function deriveForgeMergeCapability(facts: unknown): MergeCapability | null {
for (const module of CLIENT_FORGE_LOGIC_MODULES) {
const capability = module.facts?.deriveMergeCapability(facts);
if (capability) {
return capability;
}
}
return null;
}
/**
* Build the neutral merge capability from a forge's PR status facts. Returns
* null when the forge supplied no merge facts (e.g. a host that exposes none, or
* an unknown forge), in which case the caller falls back to raw git state.
* Per-forge derivation lives on client forge modules; this stays the single
* neutral entry point the action policy reads.
*
* COMPAT(forgeSpecific): forgeSpecific shipped in v0.2.0-beta.1. A daemon
* predating it emits only the legacy `status.github` field. When forgeSpecific
* is absent we synthesize the GitHub arm from those legacy facts. Remove after
* 2027-01-17 once the supported daemon floor is >= v0.2.0.
*/
export function deriveMergeCapability(
forgeSpecific: unknown,
legacyGithubFacts?: LegacyGithubMergeFacts | null,
): MergeCapability | null {
if (forgeSpecific === null || forgeSpecific === undefined) {
if (legacyGithubFacts) {
return deriveForgeMergeCapability({ forge: "github", ...legacyGithubFacts });
}
return null;
}
return deriveForgeMergeCapability(forgeSpecific);
}