* feat(workflow): post line-anchored review comments with suggested fixes Bead archie-core-q9au (docs/prds/inline-review.md). A review's findings reached the operator only as a flat list in the PR body, so the author had to map every finding back to its line by hand and apply mechanical fixes by hand. Now the line-anchored findings are also posted as inline review comments, carrying a one-click suggestion when the reviewer could state the fix. Domain (internal/domain/workflow): - ReviewFinding gains Suggestion; Validate rejects one on anything but a confirmed finding, so the agent's record_finding call is refused with something it can act on. Validate splits into validateAnchor / validateClassification / validateDisposition, which also brings it back under the cyclop limit the gate enforces. - StagePostReviewComments runs after StageOpenPR in the implement workflow. It posts only line-anchored findings (Line > 0); a whole-file finding has no line to attach to and stays in the body list, which remains the complete record. It is best-effort: the PR is open and the body already lists every finding, so a failed comment is logged, never a park -- the same reasoning as OpenPR's existing best-effort LinkBranch call. - The suggestion fence is gated on Verdict == confirmed where the fence is written, because it is a one-click apply: a wrong suggestion breaks the code and the author has to notice. Forge (internal/forge): ReviewCommentWriter + GitHub/Gitea implementations, type-asserted like PullRequestReader so a forge that cannot is skipped rather than faked (NoopForge is pinned as not satisfying it). GitHub loops one CreateComment per comment and joins the failures, so one refused anchor cannot drop the rest; Gitea carries them on a single COMMENT-state review. Two deliberate departures from the PRD's sketch, both recorded in it: - The interface is batch (CreateReviewComments), not one call per comment: Gitea's only inline shape is one submitted review, and the set then crosses NATS once instead of once per finding. - The head SHA is resolved inside each forge implementation rather than by the caller. The stage runs in archie-agent, which holds no forge credentials and has no PullRequestReader; the daemon-side forgerpc handler is the only place that does. Transport (internal/forgerpc): workflow.Forger gains the method, so the agent reaches the daemon over the new create_review_comments subject; the server type-asserts the writer and answers an incapable forge with an error the stage logs. This is the one proxied method whose absence on an image skew does not park a task. The reviewer prompt and record_finding schema ask for a suggestion on a confirmed, mechanically fixable defect only. Regenerating the wfextract symbol table -- the documented way a new exported workflow symbol reaches interpreted stage plugins -- also picked up symbols that were missing from the committed table (the Status* and Source* constants, ReviewCheck, Store, Task, and the _Store wrapper). Nil-guards were re-applied to every wrapper afterwards, as that file's header requires. Evidence: task check exit 0 (incl. 229 UI tests). Three mutations of the new stage logic each fail a test that names the behaviour -- dropping the confirmed-only gate, dropping the Line > 0 filter, and letting a posting failure escape -- so the tests discriminate rather than passing vacuously. * fix(build): drop the Dockerfile pin assertion The guard fetched golangci-lint's go.mod at image build time to fail the build when GOLANGCI_LINT_VERSION and GOFUMPT_VERSION disagreed. It only ever tripped on self-inflicted pin drift, but it added a network fetch and a new failure mode to the release build, which is not where that belongs. The pins stay correct (golangci-lint 2.13.2, whose vendored gofumpt v0.11.0 equals GOFUMPT_VERSION) and the comment above them still states the invariant, so the reasoning survives without the build-time machinery. The pin change itself reaches the agent image through the normal release path: CI rebuilds and pushes archie-agent on an archie/vX.Y.Z release, and a gateway-only release deliberately does not. * feat(workflow): add the remediate workflow for PR review remediation Implements step 5 of docs/prds/pr-review-remediation.md: a remediate workflow that resumes the task's existing worktree onto its PR branch (worktree.Manager.Resume, not Prepare's refresh), runs a builder agent against the review's actionable comments, commits and pushes to the same branch, and replies via the forge's ReplyToReview. Task.RetryCount doubles as the remediation round counter, capped by the repo's max_retries; the round-cap stage parks the task and posts one comment when it's hit. Task gains a ReviewPayload field (JSON-encoded review unit) with full store/proto/staterpc plumbing. workflow.Forger gains Comment and ReplyToReview, proxied to archie-agent via a new forgerpc RPC. Resume and its Dir lookup are added as an unexported optional Trees capability rather than widening the exported interface, which is already at golangci-lint's interfacebloat cap and is projected into wfextract's Yaegi symbol table for repository-authored stage plugins. The daemon-side reaction consumer that dispatches into this workflow (subscribing ARCHIE_REACTIONS, grouping comments by review, enforcing per-task serialization) is tracked separately in archie-core-8li9.4. * feat(messaging): extract standalone messaging service binary and process composition * feat(messaging): adapt channel frontends to consume Gateway ChatContract * feat(messaging): remove in-process channels and Router from daemon bootstrap Telegram, email and webhook now run only in the Messaging Service, which reaches this process through the Gateway's ChatContract. The daemon builds no channel and no gateway.Router, so the wiring that existed only to serve them goes with it: setupGateways, setupEmailGateway, setupWebhookGateway, setupTelegramGateway, buildTelegramRouter, makeTelegramReload and the release-announcement path helper. The seams those paths owned move to where they can still be honoured: - Channel ValidateConfig runs in archiemessaging.compose, which now returns an error, so a configured-but-invalid front-end fails the service rather than being dropped silently. - The inbound rate limiter moves to the Gateway process, which owns the only Router and therefore the only place a per-sender budget applies to every channel's turns. - The daemon's gateway readiness probe becomes a ContractProbe against the Gateway. It cannot observe a channel lifecycle it no longer runs, and a channel-count probe would have reported every daemon degraded. - telegramSetup is now chatSetup (in chat_setup.go), trimmed to the fields a chat turn runner actually reads. Telegram operator features that were wired only in the daemon (/update, release announcements, version reporting, SIGHUP reload) are not yet wired in the Messaging Service: archie-core-8cda.6.6. Channel lifecycle reporting: archie-core-8cda.6.8. The Gateway process builds no worktree manager, so review_pr is unadvertised on every channel: archie-core-8cda.6.7. * feat(messaging): re-wire the Telegram operator surface in the Messaging Service setupTelegramGateway satisfied eight telegram.Gateway seams from the daemon's own process. Each is resolved by where the fact it needs is owned, not by where it used to be built; the decision table is in docs/architecture/migration-decisions.md. Wired here: /update (built from this service's own [chat.telegram] check and install commands), the update-report relay (same sha256(bot_user)[:8] path the daemon wrote, so a pending report is found rather than written afresh), show_tool_calls, and /restart's config reload, which re-resolves the token and allowlist from this service's own file and refuses a reload that resolves to an empty token. /version is sourced from the Gateway: ChatSnapshot gains a Version field carrying the Gateway's rendered build block, read per call and bounded by the dependency timeout. cmd/archie-messaging deliberately takes no version ldflags, so it cannot report a partial upgrade as a matched one. RunningVersions and ReleaseAnnouncements stay nil. Both need a component's real running version, and the only versions this process can obtain are a different binary's stamps -- reporting them would manufacture exactly the false success the update check exists to catch, and the announcer without parseable versions is a no-op that reads as configured. archie-core-8cda.6.9 carries the contract that unblocks them. Dangerous stays nil: no composition has ever supplied a command authority. Enrich is dropped from the update service: componentInstallTypeEnricher read [nats], which this service must not decode, so the check command's own reported install type stands. * fix(workflow): guard inline review comments against head drift Two findings from the review of q9au. A comment's line numbers describe exactly one revision of the branch, but the forge resolved the pull request's head at posting time -- after the review had already read the worktree. A push in that window (a collaborator, a retry) meant the findings were anchored to whatever now occupied those lines, mislabelling instead of failing. The revision the review measured now travels with the comment set: OpenPR records it from the same worktree read it already performs (TaskContext.ReviewedHeadSHA), StagePostReviewComments threads it through Forger to forgerpc, and the forge refuses the whole set once the head it reads has moved off it -- which the best-effort stage logs, the PR body remaining the record. An unmeasured revision posts unverified rather than dropping every finding, so a worktree that cannot report one degrades instead of regressing. Suggestion was documented single-line only, because GitHub applies a suggestion fence up to its first line and a multi-line replacement would silently corrupt the file. Only the verdict was validated, so a multi-line suggestion reached the renderer and posted as that truncated fence. Validate now rejects an embedded newline, which makes record_finding refuse it with feedback the model can act on instead of the reviewer discovering the corruption later.
222 lines
8.6 KiB
Go
222 lines
8.6 KiB
Go
// Package forge defines the interface archie uses to interact with a git
|
|
// host -- polling issues, managing labels, opening PRs, and reacting to
|
|
// comments. GitHub and Gitea are the supported implementations.
|
|
package forge
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"log/slog"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// New creates a Forge implementation for the given type.
|
|
func New(forgeType, token, host string, log *slog.Logger) (Forge, error) {
|
|
switch forgeType {
|
|
case "github":
|
|
return NewGitHub(token, host, log)
|
|
case "gitea":
|
|
return NewGitea(token, host, log)
|
|
case "none", "off", "disabled", "":
|
|
return NewNoop(log), nil
|
|
default:
|
|
return nil, fmt.Errorf("unsupported forge type %q (want github, gitea, or none)", forgeType)
|
|
}
|
|
}
|
|
|
|
// Issue is a forge-neutral representation of an issue (not a PR).
|
|
type Issue struct {
|
|
Number int
|
|
Title string
|
|
Body string
|
|
Labels []string
|
|
}
|
|
|
|
// Forge is the interface for interacting with a git host.
|
|
type Forge interface {
|
|
IssueForge
|
|
PullRequestForge
|
|
RepoForge
|
|
}
|
|
|
|
// IssueForge is issue-level operations.
|
|
type IssueForge interface {
|
|
// AssignedIssues returns open issues assigned to the given user,
|
|
// excluding PRs.
|
|
AssignedIssues(ctx context.Context, owner, repo, assignee string) ([]Issue, error)
|
|
|
|
// IssuesWithLabel returns open issues matching the given label,
|
|
// excluding PRs.
|
|
IssuesWithLabel(ctx context.Context, owner, repo, label string) ([]Issue, error)
|
|
|
|
// Comment posts an issue (or PR) comment and returns its id.
|
|
Comment(ctx context.Context, owner, repo string, number int, body string) (int64, error)
|
|
|
|
// CloseIssue closes an issue with an optional final comment.
|
|
CloseIssue(ctx context.Context, owner, repo string, number int, comment string) error
|
|
|
|
// React adds an emoji reaction to an issue.
|
|
React(ctx context.Context, owner, repo string, number int, reaction string) error
|
|
|
|
// SetStateLabel makes label the issue's only state label, removing any
|
|
// other label that appears in knownLabels first. An empty label clears
|
|
// all state labels (terminal states).
|
|
SetStateLabel(ctx context.Context, owner, repo string, number int, label string, knownLabels []string)
|
|
}
|
|
|
|
// PullRequestForge is pull-request-level operations.
|
|
type PullRequestForge interface {
|
|
// CreatePR opens a pull request and returns its number.
|
|
CreatePR(ctx context.Context, owner, repo, title, head, base, body string) (int, error)
|
|
|
|
// PRState returns "open", "merged", or "closed" for a PR.
|
|
PRState(ctx context.Context, owner, repo string, number int) (string, error)
|
|
}
|
|
|
|
// PullRequest is a forge-neutral summary of an existing pull request,
|
|
// carrying the inputs the operator-triggered reviewer needs: its identity,
|
|
// head/base refs and SHAs, and the title/body that serve as the review's
|
|
// issue text.
|
|
type PullRequest struct {
|
|
Number int
|
|
Title string
|
|
Body string
|
|
HeadRef string
|
|
BaseRef string
|
|
HeadSHA string
|
|
BaseSHA string
|
|
State string // "open", "merged", or "closed"
|
|
}
|
|
|
|
// PullRequestReader fetches an existing pull request's metadata. Forge
|
|
// implementations that cannot read PRs (the noop forge) do not implement it;
|
|
// callers type-assert and refuse review when the capability is absent.
|
|
type PullRequestReader interface {
|
|
GetPullRequest(ctx context.Context, owner, repo string, number int) (PullRequest, error)
|
|
}
|
|
|
|
// RepoForge is repository-level operations.
|
|
type RepoForge interface {
|
|
// AcceptInvitations auto-accepts pending repository invitations.
|
|
AcceptInvitations(ctx context.Context) error
|
|
|
|
// VerifyPush confirms the token can push to the repo.
|
|
VerifyPush(ctx context.Context, owner, repo string) error
|
|
|
|
// LinkBranch associates a branch with an issue so Gitea shows the
|
|
// development link in the issue sidebar.
|
|
LinkBranch(ctx context.Context, owner, repo string, issueNumber int, branch string) error
|
|
}
|
|
|
|
// ReviewState values for Review.State, normalised across forges.
|
|
const (
|
|
ReviewStateApproved = "approved"
|
|
ReviewStateRequestedChanges = "requested_changes"
|
|
ReviewStateCommented = "commented"
|
|
ReviewStateDismissed = "dismissed"
|
|
)
|
|
|
|
// Review is a forge-neutral review of an existing PR: an approval, a
|
|
// request-changes, a plain comment, or a dismissal.
|
|
type Review struct {
|
|
ID int64
|
|
Author string
|
|
State string // one of the ReviewState* constants
|
|
SubmittedAt time.Time
|
|
}
|
|
|
|
// ReviewComment is a forge-neutral review comment on an existing PR.
|
|
// Line is a location hint, not authoritative: the remediation agent reads
|
|
// the whole file. InReplyTo is the parent comment ID on GitHub; Gitea's
|
|
// inline comments are flat under a review, so it is 0 there.
|
|
type ReviewComment struct {
|
|
ID int64
|
|
Author string
|
|
Body string
|
|
Path string
|
|
Line int
|
|
InReplyTo int64
|
|
CreatedAt time.Time
|
|
}
|
|
|
|
// PullRequestReviewReader reads review activity on an existing PR. Forge
|
|
// implementations that cannot read reviews (the noop forge) do not implement
|
|
// it; callers type-assert and refuse when the capability is absent.
|
|
//
|
|
// sinceID is the dedup cursor: only entries with ID > sinceID are returned,
|
|
// so a poller and a webhook delivery of the same comment collapse on the same
|
|
// ID (the TaskEnvelope.IdempotencyKey pattern applied to reviews).
|
|
type PullRequestReviewReader interface {
|
|
ListReviews(ctx context.Context, owner, repo string, number int, sinceID int64) ([]Review, error)
|
|
ListReviewComments(ctx context.Context, owner, repo string, number int, sinceID int64) ([]ReviewComment, error)
|
|
// ReplyToReview posts a reply to an existing review comment (commentID).
|
|
// A summary for a whole review (e.g. "requested changes" addressed) is a
|
|
// plain PR comment via Forge.Comment, not this method.
|
|
ReplyToReview(ctx context.Context, owner, repo string, number int, commentID int64, body string) error
|
|
}
|
|
|
|
// InlineReviewComment is one line-anchored comment to post on a PR: the file,
|
|
// the line in the reviewed commit's version of it, and the body -- which may
|
|
// carry a fenced suggestion block the author can apply in one click.
|
|
type InlineReviewComment struct {
|
|
Path string
|
|
Line int
|
|
Body string
|
|
}
|
|
|
|
// ReviewCommentWriter posts line-anchored review comments on an open pull
|
|
// request. Forge implementations that cannot (the noop forge) do not implement
|
|
// it; callers type-assert and degrade to the PR-body list rather than faking it.
|
|
//
|
|
// The set travels in one call because that is Gitea's native shape (a single
|
|
// COMMENT-state review carrying many comments); GitHub loops internally. Each
|
|
// implementation reads the pull request's current head itself and anchors the
|
|
// comments to it, but only after checking it against reviewedHeadSHA -- the
|
|
// revision the caller's line numbers were measured on. A line number that
|
|
// outlives its revision does not fail loudly at the forge: it attaches to
|
|
// whatever is on that line now, so the set is refused once the head has moved.
|
|
// An empty reviewedHeadSHA means the caller could not measure one, and posts
|
|
// unanchored by revision rather than dropping every finding.
|
|
type ReviewCommentWriter interface {
|
|
CreateReviewComments(ctx context.Context, owner, repo string, number int, reviewedHeadSHA string, comments []InlineReviewComment) error
|
|
}
|
|
|
|
// reviewHeadDrift is the rule ReviewCommentWriter's implementations share: a
|
|
// line-anchored comment set may be posted only while the pull request's head is
|
|
// still the revision those line numbers were measured on. It returns nil when
|
|
// there is nothing to refuse, including when the caller could not measure a
|
|
// revision at all (reviewedHeadSHA == "") -- posting unverified is the
|
|
// pre-existing behaviour, and is strictly better than dropping every finding.
|
|
//
|
|
// The check lives here rather than in each implementation because the danger is
|
|
// identical on both: GitHub and Gitea accept a line number against the current
|
|
// head and anchor it to whatever now occupies that line, so a stale anchor does
|
|
// not fail loudly -- it misinforms.
|
|
func reviewHeadDrift(owner, repo string, number int, head, reviewedHeadSHA string) error {
|
|
if reviewedHeadSHA == "" || strings.EqualFold(head, reviewedHeadSHA) {
|
|
return nil
|
|
}
|
|
return fmt.Errorf(
|
|
"pull request %s/%s#%d has moved off the reviewed revision (%s): head is now %s, so the line-anchored comments would land on lines they were not measured against",
|
|
owner, repo, number, reviewedHeadSHA, head,
|
|
)
|
|
}
|
|
|
|
// normalizeReviewState maps a GitHub review state string onto the neutral
|
|
// ReviewState* constants. Unknown states pass through lowercased.
|
|
func normalizeReviewState(s string) string {
|
|
switch s {
|
|
case "APPROVED":
|
|
return ReviewStateApproved
|
|
case "CHANGES_REQUESTED":
|
|
return ReviewStateRequestedChanges
|
|
case "COMMENTED":
|
|
return ReviewStateCommented
|
|
case "DISMISSED":
|
|
return ReviewStateDismissed
|
|
default:
|
|
return strings.ToLower(s)
|
|
}
|
|
}
|