agent-merge-broker 0.9.0 → 0.11.0

package/CHANGELOG.md

@@ -0,0 +1,417 @@
+# Changelog
+
+## 0.11.0 — 2026-09-03
+
+### Added
+
+- First-class Windows support: non-profile PowerShell validation, process-tree timeout cleanup,
+  per-user Task Scheduler services, a cross-platform Node acceptance demo, and release-gating CI.
+- A stdio MCP adapter with separate worker and operator tool profiles. Worker calls use locally held
+  lease tokens without returning them to the model, and merge-authorizing tools exist only in the
+  operator profile.
+- Actionable human status, sanitized `doctor --support-bundle` output, and archive-aware audit and
+  metrics reads.
+- Conservative Go, Rust, and Python bootstrap detection plus repository-relative validator working
+  directories for nested packages.
+
+### Changed
+
+- Hook installation composes with repository-local hook directories and preserves unrelated default
+  hooks. `install-hooks --print` supports explicit composition when another tool owns `pre-push`.
+- Background-service installation fails early when publication is disabled.
+- Documentation now publishes a platform matrix, Windows operating notes, MCP capability guidance,
+  safe support-bundle workflow, release-availability notice, and an explicit list of functionality
+  that is not included today.
+
+## 0.10.0 — 2026-09-02
+
+### Added
+
+- `init` now detects declared JavaScript and SwiftPM validation entry points, installs a managed
+  root `AGENTS.md` contract, reports unresolved project-specific configuration, and returns an
+  explicit operational-readiness result.
+- Validators can request native hardware execution on translated macOS processes and receive an
+  isolated `MERGE_BROKER_CACHE_DIR` shared across one integration transaction.
+
+### Changed
+
+- Initialization is idempotent for existing repositories: it preserves configured validation and
+  owner instructions while repairing missing managed files and legacy unsigned provenance.
+- `doctor` distinguishes component health from operational readiness and reports the process and
+  native host architectures, validation readiness, and whether the root agent contract is installed
+  and committed.
+
+## 0.9.0 — 2026-08-31
+
+### Added
+
+- Candidate revision intents make branch publication recoverable across an interrupted state
+  finalization, and integration now rejects a task receipt replaced after planning.
+- `ForgePublisher` is an injectable Node API boundary; the GitHub CLI publisher remains built in.
+- `doctor` reports toolchain, remote/base, forge authentication, committed policy, hooks, service,
+  locks, provenance, and unfinished transaction readiness.
+- A full getting-started guide, community support/conduct files, and structured issue templates.
+
+### Security
+
+- Validator output is memory-bounded while commands run, and timeouts terminate the POSIX process
+  group. Runtime directories/files now receive explicit 0700/0600 modes without changing a
+  caller-owned custom token directory.
+- Auto-merge defaults off, every auto-merge call carries an exact head SHA, and service installers
+  refuse to overwrite or remove unowned supervisor files.
+
+### Fixed
+
+- systemd user services now write stdout and stderr to the log path reported by the CLI.
+- The generated config is validated against the published JSON Schema during tests, packaged demos
+  are included in npm tarballs, numeric CLI options fail closed, and documentation edit links point
+  at their real source files.
+
+## 0.8.1 — 2026-08-30
+
+### Fixed
+
+- SHA-bound approval now works with GitHub CLI versions that do not expose `baseRefOid` through
+  `gh pr view --json`. The broker detects that specific capability gap, retrieves the exact head
+  and base refs through `gh api`, and fails closed if the pull request head changes between the two
+  snapshots.
+
+## 0.8.0 — 2026-08-28
+
+### Added
+
+- **Exact candidate approval.** Optional approval policy binds required GitHub checks, named manual
+  evidence, and explicit authorization to the integrated candidate SHA, base SHA, and policy
+  revision. Publishing no longer enables auto-merge before that gate when the policy is required.
+- `batch verify`, `batch approve`, and `batch request-changes` expose verification and authorization
+  as separate, auditable capabilities. Approvers can be restricted by configured actor identity.
+- `task candidate` replaces ambiguous completion language while `task submit` remains a compatible
+  alias. `task abandon` is the explicit cancellation alias.
+- `task reopen` and `task revise` keep corrective work on the same integration branch and pull
+  request. The guarded force update archives the former candidate as `superseded` and starts the new
+  revision with no inherited evidence or approval.
+- Candidate state and evidence have a published JSON schema, and human/JSON status surfaces show
+  verification progress, exact bindings, approval, and blocking reasons.
+
+### Security
+
+- Approval re-reads the live pull request, requires an exact head/base binding, rejects conflicts or
+  requested changes, verifies every task remains outside an editing lease, and passes the candidate
+  SHA to GitHub's merge head guard. External PR-head mutations block the candidate; an out-of-band
+  merge without matching approval is recorded as an invariant violation.
+- Base or candidate changes invalidate all prior verification and approval. Editing leases remain
+  enforceable during revision without being kept artificially alive through long CI and review.
+
+### Compatibility
+
+- Existing version-one configurations receive `approval.required: false` defaults and retain the
+  pre-0.8 publication behavior until they opt into the gate.
+
+## 0.7.1 — 2026-08-28
+
+### Fixed
+
+- Closing a pull request without merging now pauses every affected task as `failed` instead of
+  automatically re-queueing its unchanged receipt. This prevents eager services from repeatedly
+  publishing rejected work; corrected commits can be reclaimed and submitted normally, while
+  `task retry` remains the explicit escape hatch for a deliberate unchanged-receipt retry.
+
+## 0.7.0 — 2026-08-28
+
+### Added
+
+- **Explicit validation authority.** Repositories can select `validation.authority: required-ci` to
+  publish an immutable signed pull-request batch after changed-scope preflight, leaving the complete
+  suite to protected required CI checks instead of running it serially twice. The mode fails closed
+  unless publication uses pull requests, signed provenance is required, and the local authoritative
+  list is empty. Existing configurations default to `broker` and keep their current behavior.
+
+## 0.6.0 — 2026-08-25
+
+### Added
+
+- **Authenticated provenance.** New repositories receive an Ed25519 signing identity during `init`.
+  The public key is committed as protected-base policy; the mode-0600 private key stays under Git's
+  common runtime directory. Remote verification rejects forged, unsigned, or tampered manifests
+  when signature policy is required. Existing repositories can migrate with `merge-broker
+  provenance setup-signing`, and supervised hosts may supply the key through a file or environment
+  secret that validators never inherit.
+- **Abandoned integration recovery.** `serve` and `integrate` now recover a durable `running` batch
+  left by a killed process after safely acquiring the integration lock. Its tasks return to
+  `submitted` without spending their attempt budget, and broker-owned worktree and branch artifacts
+  are cleaned. `merge-broker recover` exposes the same operation explicitly, while `doctor` reports
+  incomplete transaction state and missing signing credentials.
+- `merge-broker install-service` runs the integration loop as a per-user background service — a
+  launchd agent on macOS, a systemd user unit on Linux. `serve` already did the work, but only
+  while somebody kept a terminal open, so a submitted task could sit in `submitted` for as long as
+  nobody happened to look. An agent cannot tell that state apart from having its work rejected, and
+  the repository this was written against had a verified batch waiting with nothing driving it. The
+  service is scoped per repository, because two checkouts of one project sharing a label would
+  leave one of them silently unserved. It is a user service on both platforms: a system daemon
+  would need root and would publish as a user who holds neither the SSH key nor the forge
+  credentials. On macOS the agent carries an explicit `PATH` — a launchd job inherits almost none,
+  and without it the loop starts, cannot see `git`, and does nothing, which looks exactly like
+  having nothing to do.
+- `serve` now reports what it is doing. It previously wrote only on a merge, a closure, an error, or
+  a *completed* integration — so a batch spending minutes in validators produced an empty log, and a
+  healthy busy service could not be told apart from a dead one. That was survivable while the loop
+  lived in a terminal and fatal once `install-service` moved it into the background, where the log
+  file is the only window on it. It now announces startup and its settings, announces a batch
+  *before* the work rather than after, reports idleness on a slower clock than the poll so a quiet
+  loop still proves it is alive without writing thousands of lines a day, and says it is stopping
+  instead of vanishing. Failures and batches returned to the queue go to stderr, progress to stdout,
+  and `--json` emits one object per line. `--once` keeps its original single-result output.
+
+### Security
+
+- **Post-assembly merge commits are rejected.** The former update-branch allowance compared changed
+  paths, which could not detect malicious conflict resolution inside a path the base also changed.
+  The provenance commit must now remain the branch head. A stale batch is closed, re-cut from the
+  current base, revalidated, and re-signed with `batch refresh`.
+- Remote provenance claims now distinguish cryptographically authenticated manifests from legacy
+  structural-only verification. Authenticated enforcement requires a protected-base public key and
+  private-key custody outside untrusted worker environments.
+
+### Fixed
+
+- The documented composite action now uses the real exact `v0.6.0` release tag, and the action runs
+  the matching package version instead of silently defaulting to `0.3.0`.
+- Architecture and protocol documentation now describe the local token vault and signing-key
+  custody accurately.
+- Service logs resolve through Git's common directory, so `install-service` works from linked
+  worktrees where `.git` is a file rather than a directory.
+- `batch refresh` now refuses to requeue or create a replacement when the superseded pull request
+  could not be closed. The previous best-effort close could leave two remotely mergeable copies of
+  the same tasks after a forge failure.
+- Runtime dependencies now honor the documented Node 20 minimum instead of installing a Commander
+  release whose engine declaration requires Node 22.
+
+## 0.5.0 — 2026-08-17
+
+Surviving a bad afternoon at the forge. A GitHub outage interrupted a publication midway, and the
+broker turned a transient 503 into a batch that could not be landed at all.
+
+### Added
+
+- `merge-broker batch refresh <id>` re-cuts a batch the base branch moved past, so it can merge
+  again. Previously there was no way back: the operator closed the pull request by hand, reconciled
+  state by hand, and integrated again. It re-cuts the same tasks from the current tip and
+  re-validates them, which is the point — a stale batch was only ever checked against a base nobody
+  merges into any more. Re-cutting rather than merging the base into the branch keeps every batch an
+  immutable artifact whose manifest describes exactly the base it was assembled on. The superseded
+  pull request is closed first, so nobody can still merge the batch being replaced. Attempts are not
+  incremented: nothing about the work failed, the world moved, and charging it against
+  `maxAttempts` would eventually retire a task for being unlucky about merge order. A batch that is
+  already current is a no-op.
+
+### Fixed
+
+- **Publication records the pull request before attempting auto-merge.** It used to create the pull
+  request and enable auto-merge as one step, so a failure at the second threw away the first: the
+  batch stayed `prepared` while its pull request existed on the forge. `batch sync` only reconciles
+  `published` batches, so the one command built to notice the merge could not see it. Auto-merge is
+  now its own step, and failing it leaves a published batch carrying `publishWarning` — something
+  that needs a hand, not a publication that did not happen.
+- **Publication is idempotent.** It looks for the branch's open pull request before opening one, so
+  retrying after a partial failure finishes the job instead of opening a duplicate. A lookup that
+  *fails* is not treated as "there is none" — publication stops with `PULL_REQUEST_LOOKUP_FAILED`,
+  because the response to none is to create one, and that is how retrying during an outage produces
+  duplicates. `batch publish` accepts an already-`published` batch so it can be used to retry.
+- **One batch in flight at a time.** `integrate` cut a new batch whenever tasks were queued, even
+  with an earlier batch still open. A batch is cut from the base tip so it is born mergeable;
+  cutting another while the first is unmerged makes that expire, and whichever merges first strands
+  the other behind a base that requires branches to be up to date. Integration now refuses with
+  `BATCH_OUTSTANDING` and names the batch to land first. `--force` overrides, and `--dry-run` is
+  unaffected — a rehearsal retains nothing, so it can strand nothing.
+
+## 0.4.1 — 2026-08-17
+
+Toolchain maintenance. No behaviour changes.
+
+### Fixed
+
+- Named the node types explicitly in `tsconfig.json`. TypeScript 7 stopped inferring ambient node
+  types from `NodeNext` module resolution alone, so every `node:` import failed to resolve and the
+  compiler read the specifiers as bare names. The build would have broken on the compiler upgrade
+  whether or not the dependency bump arrived with it.
+
+### Changed
+
+- Moved to TypeScript 7.0.2 and `@types/node` 26, the current stable line.
+- Updated `commander` to 15. This is the one runtime dependency, so consumers resolving it
+  transitively will see the major change.
+
+## 0.4.0 — 2026-08-15
+
+Recovery. Everything here came out of one repository's week of fighting the lifecycle rather than the
+merge: the broker was strict in places where strictness protected nothing, and the way out of an
+ordinary mistake was to rebuild the task.
+
+### Added
+
+- `merge-broker validate` runs the configured validators against a working tree, before anything is
+  submitted. Integration was previously the only thing that knew what "ready" meant, so adopters
+  wrote a cheaper approximation for workers to run first — and an approximation is exactly the thing
+  that passes locally and fails at integration. This runs the same validators from the same
+  configuration, covers uncommitted and untracked files, writes no state, requires no lease, and
+  exits non-zero on failure so a worker script can gate on it. Validators see
+  `MERGE_BROKER_BATCH_ID=local`.
+
+### Fixed
+
+- `integrate --dry-run` no longer marks tasks `failed` when validation fails. A rehearsal consumed
+  the queue: the next integrate found nothing to do and reported `EMPTY_BATCH`, with no indication
+  that the dry run had emptied it. The success path already restored `submitted` for this reason;
+  the failure path did not.
+- A task may be submitted again while `submitted`, replacing its receipt, until its batch is
+  assembled. Nothing downstream has read it yet, so the refusal protected only the worker's own
+  earlier list of commits — while making "I need one more commit" unrecoverable, since the sole
+  remaining lever was `cancel`, which is final and ends the lease.
+- `task extend` accepts a `failed` task, as `task claim` already did. Fixing what validation caught
+  routinely means touching a file the original scope did not cover, and refusing to widen scope at
+  exactly that moment left rebuilding the task as the only way forward.
+- Lifecycle refusals name the command that moves the task instead of only reporting its status. The
+  state machine is invisible from outside, so `cannot be submitted while batched` was a riddle.
+  Submission checks status before the lease for the same reason: batching ends the lease, so the
+  honest answer was "its batch is assembled", not "you hold no lease".
+
+## 0.3.0 — 2026-08-15
+
+First public release. The versions below are development history and were never published to npm.
+
+
+The adoption layer. Everything here already existed as bespoke glue around the broker in the
+repository that pilots it; this release moves the generic parts into the tool so a new adopter does
+not have to rebuild them.
+
+### Added
+
+- `merge-broker verify-provenance --branch <ref> --head <sha> --base <sha>` proves that a pull
+  request head is an unaltered broker batch: assembled on real base history, changing exactly the
+  paths its receipts account for, carrying every submitted commit, and validated. It reads only Git,
+  so it runs on any forge and before any dependency is installed. It accepts the "update branch"
+  merges a protected base produces, and rejects a merge that brings in anything the base does not
+  already contain. Verification policy is read from the configuration committed on the base branch,
+  never from the change under review.
+- A composite GitHub Action at `verify/action.yml`, so requiring the gate is two lines:
+  `uses: WeSpitfire/agent-merge-broker/verify@v1`.
+- `merge-broker task submit --since-base` submits the linear commits made after the base the broker
+  handed out. Commits whose change is already upstream are skipped by patch identity, so a rebased
+  branch does not resubmit landed work.
+- The broker now holds the lease token for the worker, mode 0600, beside the state it authorizes.
+  Lease-aware commands find it automatically; `--token`, `--token-file`, and `MERGE_BROKER_TOKEN`
+  still work, and `task claim --no-store-token` opts out. Previously the token was shown once and
+  every adopter had to build a credential store, with the obvious implementation putting a live
+  token in the working tree where `git add` and validator commands can reach it.
+- `merge-broker install-hooks` installs a pre-push guard that refuses direct pushes of
+  implementation branches, with `MERGE_BROKER_ALLOW_DIRECT_PUSH=1` as the deliberate bypass. It
+  refuses to run when the repository already has hooks that moving `core.hooksPath` would silently
+  disable, and `--uninstall` reverses it.
+- `examples/two-agents` is a runnable demonstration: two workers in parallel worktrees, one refused
+  overlapping claim, four commits, one validated branch. It runs in CI as an acceptance test.
+- Batch provenance manifests record the `history` mode used to assemble them, so a verifier knows
+  whether submitted commits are traceable in the integrated history. Manifests written before this
+  field are treated as `preserve`, which is what they were.
+
+## 0.2.0 — Unreleased
+
+Correctness pass ahead of the first public release. Everything below was found by reviewing the
+package as an outside adopter would receive it, rather than as it is used in its home repository.
+
+### Changed
+
+- **Validators no longer run under the operator's login shell.** They previously ran under
+  `$SHELL -lc`, which made every integration decision depend on whose machine assembled the batch:
+  a non-POSIX `$SHELL` such as fish or nushell broke validation outright, and personal login
+  profiles could silently reshape the result. Validators now run under `/bin/sh -c`
+  (`%ComSpec% /d /s /c` on Windows), configurable with `validation.shell`. The environment still
+  comes from the calling process, so PATH and toolchain managers keep working; a validator that
+  needs more should set its own `env`.
+- Auto-merge no longer decides by pattern-matching the GitHub CLI's prose. It queries
+  `mergeStateStatus` and merges directly only when GitHub reports `CLEAN`. The previous English
+  regular expression turned a clean pull request into a hard failure under a different `gh` version
+  or locale.
+
+### Added
+
+- `merge-broker prune [--older-than <days>] [--dry-run]` retires completed tasks and batches into
+  `<state>/archive/`. `state.json` is rewritten in full on every transaction, including heartbeats,
+  so an unbounded history made routine operations progressively slower. A completed task that a
+  retained task still depends on is never pruned: the scheduler cannot tell a pruned dependency from
+  one that has never merged, and the dependent would wait forever.
+- `merge-broker unlock [state|integration] [--force]` releases a lock left by a crashed process.
+  A holder on another machine cannot be probed, so integration could previously stall for the full
+  24-hour stale window with no recourse. Without `--force` the lock is released only when its owner
+  is provably gone.
+- `doctor` now reports lock state and warns when no validators are configured, which otherwise
+  assembles batches without checking anything and says nothing about it.
+- `validation.shell` configuration field and JSON-schema entry.
+
+### Fixed
+
+- One truncated line no longer makes the entire audit trail unreadable. `events` skips malformed
+  records and reads a bounded tail instead of loading the whole file, and the active audit file is
+  rotated into `<state>/archive/` once it grows large. Rotated segments are never deleted.
+- The lease token is no longer passed to validator commands. Repository configuration is trusted to
+  run commands, but no validator needs a worker credential that can submit or cancel on its behalf.
+- A task with more commits than `scheduling.maxCommits` now reports that it can never be scheduled
+  instead of repeating the same transient-looking deferral on every planning pass.
+
+### Platform support
+
+- CI now covers Ubuntu and macOS on Node 20 and 22. Windows runs as an informational job:
+  the shell selection and command quoting differ there and are not yet a supported platform.
+
+## 0.1.6 — Unreleased
+
+- Added `--force` to `task cancel` and `task release`, so an integration owner can reclaim a lease
+  whose one-time token was lost with its worker. Previously such a scope stayed locked until its TTL
+  expired. Forced revocation is recorded in the audit stream with the holder it was taken from.
+
+- Merged a published pull request directly when GitHub refuses to queue auto-merge because the pull
+  request is already mergeable. A "clean" status means the required checks have passed, so the batch
+  no longer stalls when checks finish before publication returns.
+- Fixed cross-machine lock recovery. Liveness was probed with a process ID, but the state directory
+  is shared across machines while process IDs are not, so one machine could reclaim a lock that
+  another machine was actively holding. Owner records now carry a hostname: a crashed holder on this
+  machine is reclaimed after a short grace period, and a holder elsewhere waits out the full stale
+  timeout. Records written without a hostname keep the previous behaviour.
+
+## 0.1.5 — Unreleased
+
+- Added `publish.autoMerge` and `publish.mergeMethod`. The broker now asks GitHub to merge a
+  published batch once required checks pass, so integration completes without a human step.
+- Rejected the `publish.autoMerge` + `publish.draft` combination during configuration validation.
+  GitHub can never merge a draft pull request, so the previous default silently stalled every batch.
+- Changed the generated default to `publish.draft: false` with `publish.autoMerge: true`.
+  Configurations written before this release keep auto-merge off until they opt in.
+- Added `integration.refreshBase`, which fetches the remote base branch before a batch is cut.
+  Batches were previously born behind the base branch and became unmergeable under
+  "require branches to be up to date" protection.
+- Reconciled pull requests that are closed without merging. The batch becomes `closed` and its tasks
+  return to the queue instead of remaining `published` forever, which silently discarded the work.
+- Limited failure blast radius: a cherry-pick or focused-validation failure now fails only the task
+  responsible and returns its batch-mates to the queue. Authoritative failures still fail the batch.
+- Added `integration.maxAttempts` to bound automatic re-queueing.
+- Added committed batch-provenance manifests that bind a published integration
+  branch to its base SHA, integrated parent, task receipts, and broker validators.
+- Made provenance opt-in compatible for existing version-one configurations and
+  enabled it by default for new installations.
+- Added token-authenticated active-lease scope extension for coordinator adapters.
+
+## 0.1.1 — Unreleased
+
+- Separated the integration `baseRef` from the forge target `baseBranch` so passive local main branches cannot produce stale batches.
+
+## 0.1.0 — Unreleased
+
+- Added versioned repository configuration and generated agent instructions.
+- Added atomic cross-worktree state, expiring leases, heartbeats, and audit events.
+- Added immutable commit receipts with expected/actual path enforcement.
+- Added dependency-aware, conflict-aware bounded batch scheduling.
+- Added transactional Git worktree integration with cherry-pick provenance.
+- Added focused and authoritative repository-defined validation.
+- Added local branch, remote branch, and GitHub pull-request publication.
+- Added explicit merge reconciliation and a polling broker service.
+- Added local throughput, batch, and validation metrics.
+- Added JSON CLI and exported Node API for adapters.

package/CODE_OF_CONDUCT.md

@@ -0,0 +1,28 @@
+# Code of conduct
+
+Agent Merge Broker is committed to a respectful, useful, and harassment-free project community.
+Participation includes issues, pull requests, reviews, discussions, release work, and other spaces
+the maintainers represent as part of this project.
+
+## Expected behavior
+
+- Be considerate, specific, and constructive.
+- Critique ideas and code without attacking people.
+- Respect differing experience levels, identities, backgrounds, and communication styles.
+- Assume good intent while remaining accountable for impact.
+- Keep private information, credentials, and vulnerability details out of public reports.
+- Accept a maintainer's request to pause, refocus, or leave a discussion.
+
+Harassment, discrimination, threats, sexualized attention, deliberate intimidation, repeated
+personal attacks, and publishing another person's private information are not acceptable.
+
+## Enforcement
+
+Maintainers may edit or remove contributions, limit participation, or ban a participant when needed
+to protect the community. Enforcement decisions should consider context, severity, repetition, and
+the safety of people affected.
+
+Report conduct concerns privately to the repository owner or maintainers. Include links and enough
+context to investigate; do not start a public thread about the people involved. Maintainers will
+limit disclosure to the people needed to respond and will avoid conflicts of interest where
+practical.

package/CONTRIBUTING.md

@@ -0,0 +1,36 @@
+# Contributing
+
+Contributions are welcome. Small bug fixes, recovery fixtures, documentation improvements, and
+adapter work are all useful.
+
+Before starting a large protocol or persisted-state change, open a feature request so compatibility
+and migration expectations can be agreed before implementation. Use a security advisory rather
+than a public issue for exploitable findings.
+
+## Development
+
+```bash
+npm install
+npm run verify
+node dist/cli.js --help
+npm run example
+```
+
+Tests use temporary real Git repositories rather than mocks for transaction behavior. Add a regression fixture for changes to leases, receipts, cherry-picking, validation, batching, or lifecycle transitions.
+
+## Pull requests
+
+- Keep changes focused and explain any state or protocol compatibility impact.
+- Update JSON schemas and documentation with persisted-format changes.
+- Avoid agent-specific behavior in the core; expose it through an adapter boundary.
+- Preserve the invariant that no branch is retained after failed validation.
+- Include tests for both the successful transaction and its recovery path.
+
+Run `npm run verify` before submitting. CI also runs `npm pack --dry-run` to verify the distributable package.
+
+See [SUPPORT.md](SUPPORT.md) for usage questions and [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) for the
+project's participation expectations.
+
+## Compatibility
+
+Until version 1.0, breaking changes are allowed but must increment the relevant on-disk `version` field and include a migration or a clear reset procedure. Never silently reinterpret existing state.