Merge main into opted-in PRs

Dispatch the index’s merge-main.yml: merge main into each opted-in PR branch when it moves, and comment where it cannot. Started with the standard GitHub CLI; the run is watched with gh run watch.

Skills it satisfies

A skill states the capability; this Tool is one way to exercise it. Each skill’s declared input and output contract follows, where it has one.

prepare-merge

Take a feature branch to a clean, conflict-free, green, pushed state so it can be merged with no surprises: base merged in, generated files regenerated, the folio’s content-type gates run, then pushed. It does NOT merge and does NOT push to the default branch. Use for “prepare-merge”, “make it mergeable”, “ship it”.

Source: cat-harness/sdlc/skills/sdlc-core/prepare-merge.md.

Also satisfied by: gates-merged, judge-tree, merge-train.

The skill declares no I/O contract (schemas/skills/prepare-merge/{input,output}.schema.json).

Inputs and outputs

Each port names a shared type by IRI, so two Tools for one skill can be checked for interchangeability.

porttyperequireddescriptionconstraint
inrepoRepoFullNameThe repository whose workflow is run. Default: the current one.string · pattern ^[A-Za-z0-9][A-Za-z0-9._-]*\\/[A-Za-z0-9][A-Za-z0-9._-]*$ · A forge repository’s full name, owner/name
inrefBranchThe branch to run it on. Default: the default branch.string · pattern ^[A-Za-z0-9][A-Za-z0-9._/-]*$ · A git branch name
outrunTextThe dispatched run; its outcome is read with gh run watch or gh run view.string · A short single-line human string. Not admissible as a command-line argument.

Processes and tasks

Steps this Tool can carry out, because each names a skill it satisfies:

processsteplanevia skill
Code change and reviewPrepare the merge, and watch it throughAuthoring agentprepare-merge
Merge the base branch inMerge the base in, without committingmerge:main commandprepare-merge
Merge the base branch inRegenerate, asking every CI gatemerge:main commandprepare-merge
Merge the base branch inResolve by hand, then regenerateAuthoring agentprepare-merge
A refused merge-train memberFix the PR, report on the PROwning sessionprepare-merge
A merge trainMerge each member onto the baseBuild pipelineprepare-merge
Adopting an upstream version bumpMove the pin and open the PRAgentprepare-merge
Merge and publish a content changeMerge, on explicit confirmationReview Committeeprepare-merge
Content Change and ReviewMerge and publishCI/CD Pipelineprepare-merge
Guideline UpdatesMerge the re-pin with its decided revisionsRe-pin steward and build pipelineprepare-merge

How it is deployed and reached

  • Command line. From the repository root: gh workflow run merge-main.yml.
  • GitHub Actions. No workflow in this checkout runs its command.

As an API: its operation in the OpenAPI document and the MCP tool list of its layer.

installcli: gh
runtimegh
networkyes

When a host it reaches is refused:

host / errorremedy
github.comnone: The workflow runs on GitHub; with no host there is nothing to dispatch. The scripts it runs can still be run locally by their own keys.
when to choose it
whenRunning the merge-main.yml workflow on demand instead of waiting for its trigger, or finding which workflow a CI step belongs to.
limitsNeeds a token that may dispatch workflows (actions: write) on the repository.
costA full CI run on GitHub’s runners.

What it is made of

Its definition names no file it is made of.

Linked data

The Tool is published as its own JSON-LD document at its IRI, https://litlfred.github.io/folio-assistant/cat-harness/tools/ci-merge-main.jsonld, partOf its layer’s document. The node below is the definition this page was drawn from, and is embedded in the page as application/ld+json.

{
  "@context": "https://litlfred.github.io/folio-assistant/cat-harness/cat-harness.context.jsonld",
  "@id": "https://litlfred.github.io/folio-assistant/cat-harness/tools/ci-merge-main.jsonld",
  "@type": "https://litlfred.github.io/cat-harness/v0/ns/Tool",
  "partOf": "https://litlfred.github.io/folio-assistant/cat-harness/cat-harness.jsonld",
  "name": "ci-merge-main",
  "title": "Merge main into opted-in PRs",
  "description": "Dispatch the index's `merge-main.yml`: merge `main` into each opted-in PR branch when it moves, and comment where it cannot. Started with the standard GitHub CLI; the run is watched with `gh run watch`.",
  "install": {
    "cli": "gh"
  },
  "invoke": {
    "shell": "gh workflow run merge-main.yml"
  },
  "io": {
    "inputs": [
      {
        "name": "repo",
        "schema": "https://litlfred.github.io/folio-assistant/cat-harness/tool-types.schema.json#/$defs/RepoFullName",
        "description": "The repository whose workflow is run. Default: the current one.",
        "required": false,
        "arg": {
          "flag": "--repo"
        }
      },
      {
        "name": "ref",
        "schema": "https://litlfred.github.io/folio-assistant/cat-harness/tool-types.schema.json#/$defs/Branch",
        "description": "The branch to run it on. Default: the default branch.",
        "required": false,
        "arg": {
          "flag": "--ref"
        }
      }
    ],
    "outputs": [
      {
        "name": "run",
        "schema": "https://litlfred.github.io/folio-assistant/cat-harness/tool-types.schema.json#/$defs/Text",
        "description": "The dispatched run; its outcome is read with `gh run watch` or `gh run view`."
      }
    ]
  },
  "satisfies": [
    "prepare-merge"
  ],
  "requirements": {
    "runtime": [
      "gh"
    ],
    "network": true
  },
  "remedies": [
    {
      "host": "github.com",
      "none": "The workflow runs on GitHub; with no host there is nothing to dispatch. The scripts it runs can still be run locally by their own keys."
    }
  ],
  "selection": {
    "when": "Running the `merge-main.yml` workflow on demand instead of waiting for its trigger, or finding which workflow a CI step belongs to.",
    "limits": "Needs a token that may dispatch workflows (actions: write) on the repository.",
    "cost": "A full CI run on GitHub's runners."
  }
}

folio-assistant — code under the Apache License 2.0, documentation under CC BY 3.0. Generated schema and API references are rebuilt from source on every push to main.

deployed dev