* 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.
253 lines
7.4 KiB
Go
253 lines
7.4 KiB
Go
package messaging
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
"runtime/debug"
|
|
"sync"
|
|
)
|
|
|
|
// Turns serialises chat turns per session and keeps the running turn
|
|
// cancellable.
|
|
//
|
|
// Channel event loops are typically single-threaded -- go-telegram/bot,
|
|
// for one, runs a single worker that calls handlers synchronously. Running
|
|
// a turn on that goroutine blocks delivery of every subsequent update,
|
|
// including the command meant to stop it: /stop would sit unread in the
|
|
// update channel until the turn it was meant to kill had already finished.
|
|
//
|
|
// Submitting to Turns hands the work to a per-session goroutine and returns
|
|
// immediately, so the event loop stays free and control commands are always
|
|
// serviceable. Ordering is preserved by the lane being serial, not by the
|
|
// event loop being blocked.
|
|
//
|
|
// Queues are unbounded and never shed. A dropped message is a silent
|
|
// failure that surfaces much later as an agent that ignored something,
|
|
// which costs far more to diagnose than the memory a backlog occupies.
|
|
// [Turns.Stop] is the way a backlog is cleared -- deliberately, by the
|
|
// person who created it.
|
|
type Turns struct {
|
|
log *slog.Logger
|
|
|
|
mu sync.Mutex
|
|
lanes map[string]*lane
|
|
}
|
|
|
|
// queued is one pending turn: the work, already bound to its own
|
|
// cancellable context, and the cancel that releases it.
|
|
//
|
|
// The context is derived when the turn is submitted rather than when it
|
|
// starts running, which means a turn has a live cancel handle for its whole
|
|
// time in the backlog. Stop can therefore cancel queued turns rather than
|
|
// merely dropping them, and each turn stays tied to the caller that asked
|
|
// for it -- it dies when that caller's context does.
|
|
type queued struct {
|
|
run func()
|
|
cancel context.CancelFunc
|
|
}
|
|
|
|
// lane is one session's serial worker.
|
|
//
|
|
// A single mutex guards the backlog, the running turn's cancel, and whether
|
|
// a worker is live, so that Stop observes them together. Splitting them
|
|
// would leave a window where a turn finishes between the backlog being
|
|
// cleared and the cancel being called, letting a queued turn start after a
|
|
// stop.
|
|
type lane struct {
|
|
mu sync.Mutex
|
|
pending []queued
|
|
// cancel stops the turn currently running in this lane. It is nil
|
|
// whenever the lane is idle.
|
|
cancel context.CancelFunc
|
|
// working reports whether a worker goroutine is draining this lane.
|
|
// The worker exits when the backlog empties, so this is what tells
|
|
// Submit whether to start a new one.
|
|
working bool
|
|
}
|
|
|
|
// NewTurns returns an idle dispatcher.
|
|
func NewTurns(log *slog.Logger) *Turns {
|
|
return &Turns{log: log, lanes: make(map[string]*lane)}
|
|
}
|
|
|
|
// Submit schedules run for the given session and returns without waiting
|
|
// for it. run receives a context derived from ctx that [Turns.Stop] can
|
|
// cancel.
|
|
//
|
|
// Submit never blocks and never rejects: messages queue.
|
|
func (t *Turns) Submit(ctx context.Context, session string, run func(context.Context)) {
|
|
turnCtx, cancel := context.WithCancel(ctx)
|
|
|
|
t.mu.Lock()
|
|
l, ok := t.lanes[session]
|
|
if !ok {
|
|
l = &lane{}
|
|
t.lanes[session] = l
|
|
}
|
|
l.mu.Lock()
|
|
l.pending = append(l.pending, queued{run: func() { run(turnCtx) }, cancel: cancel})
|
|
depth := len(l.pending)
|
|
start := !l.working
|
|
if start {
|
|
l.working = true
|
|
}
|
|
l.mu.Unlock()
|
|
t.mu.Unlock()
|
|
|
|
if start {
|
|
go t.serve(session, l)
|
|
}
|
|
if depth > 1 {
|
|
t.log.Info("chat turn queued", "session", session, "queue_depth", depth)
|
|
}
|
|
}
|
|
|
|
// Stop cancels the session's running turn and discards everything queued
|
|
// behind it. It reports whether a turn was actually cancelled and how many
|
|
// queued turns were dropped.
|
|
//
|
|
// Dropping the queue is intentional. "Stop" means stop, not "stop this one
|
|
// and immediately begin the next thing I said" -- starting the queued turn
|
|
// would look to the sender exactly like the stop had failed.
|
|
func (t *Turns) Stop(session string) (cancelled bool, dropped int) {
|
|
l := t.lane(session)
|
|
if l == nil {
|
|
return false, 0
|
|
}
|
|
|
|
l.mu.Lock()
|
|
defer l.mu.Unlock()
|
|
|
|
dropped = len(l.pending)
|
|
for i, q := range l.pending {
|
|
q.cancel()
|
|
l.pending[i] = queued{}
|
|
}
|
|
l.pending = nil
|
|
if l.cancel != nil {
|
|
l.cancel()
|
|
cancelled = true
|
|
}
|
|
return cancelled, dropped
|
|
}
|
|
|
|
// Running reports whether the session currently has a turn in flight.
|
|
func (t *Turns) Running(session string) bool {
|
|
l := t.lane(session)
|
|
if l == nil {
|
|
return false
|
|
}
|
|
l.mu.Lock()
|
|
defer l.mu.Unlock()
|
|
return l.cancel != nil
|
|
}
|
|
|
|
// Queued reports how many turns are waiting behind the running one.
|
|
func (t *Turns) Queued(session string) int {
|
|
l := t.lane(session)
|
|
if l == nil {
|
|
return 0
|
|
}
|
|
l.mu.Lock()
|
|
defer l.mu.Unlock()
|
|
return len(l.pending)
|
|
}
|
|
|
|
// lane returns the session's active lane, or nil if it has never been used or
|
|
// its completed lane has already retired.
|
|
func (t *Turns) lane(session string) *lane {
|
|
t.mu.Lock()
|
|
defer t.mu.Unlock()
|
|
return t.lanes[session]
|
|
}
|
|
|
|
// serve drains the lane's backlog one turn at a time and exits once it is
|
|
// empty. Submit starts a fresh worker when more arrives, so an idle session
|
|
// costs no goroutine.
|
|
func (t *Turns) serve(session string, l *lane) {
|
|
log := t.log.With("session", session)
|
|
for {
|
|
next, ok := l.begin()
|
|
if !ok {
|
|
if t.retire(session, l) {
|
|
return
|
|
}
|
|
continue
|
|
}
|
|
l.runOne(next, log)
|
|
}
|
|
}
|
|
|
|
// retire removes an idle lane while holding the same two locks Submit uses to
|
|
// find and append to it. Without that joint critical section, Submit could find
|
|
// the old lane immediately before cleanup deleted it and strand the new turn on
|
|
// a worker that had already exited.
|
|
func (t *Turns) retire(session string, l *lane) bool {
|
|
t.mu.Lock()
|
|
defer t.mu.Unlock()
|
|
|
|
current, ok := t.lanes[session]
|
|
if !ok || current != l {
|
|
return true
|
|
}
|
|
l.mu.Lock()
|
|
defer l.mu.Unlock()
|
|
if len(l.pending) != 0 {
|
|
return false
|
|
}
|
|
l.working = false
|
|
delete(t.lanes, session)
|
|
return true
|
|
}
|
|
|
|
// begin pops the oldest queued turn and publishes its cancel in the same
|
|
// critical section. It reports false when the backlog is empty; the owning
|
|
// Turns then retires the worker and map entry under both locks.
|
|
//
|
|
// The pop and the publish must happen together. Were the turn popped first
|
|
// and its cancel published after, a Stop landing in between would see an
|
|
// empty backlog and no running turn, report that nothing was happening, and
|
|
// let the turn it should have killed start regardless.
|
|
func (l *lane) begin() (queued, bool) {
|
|
l.mu.Lock()
|
|
defer l.mu.Unlock()
|
|
|
|
if len(l.pending) == 0 {
|
|
// The owning Turns retires the lane under both the map and lane
|
|
// locks. Changing working here would race a concurrent Submit.
|
|
return queued{}, false
|
|
}
|
|
|
|
next := l.pending[0]
|
|
// Clear the vacated slot so a completed turn's closure -- and whatever
|
|
// it captured -- does not stay reachable through the backing array.
|
|
l.pending[0] = queued{}
|
|
l.pending = l.pending[1:]
|
|
|
|
l.cancel = next.cancel
|
|
return next, true
|
|
}
|
|
|
|
// runOne executes one turn, always retracting its cancel afterwards so a
|
|
// later Stop cannot cancel an already-finished turn.
|
|
//
|
|
// Panics are contained here rather than by the channel's own recovery
|
|
// middleware: that middleware wraps the event-loop goroutine, and the turn
|
|
// no longer runs on it. Without this, one bad turn would take the lane's
|
|
// goroutine down and the session would silently stop answering forever.
|
|
func (l *lane) runOne(next queued, log *slog.Logger) {
|
|
defer next.cancel()
|
|
|
|
defer func() {
|
|
l.mu.Lock()
|
|
l.cancel = nil
|
|
l.mu.Unlock()
|
|
|
|
if r := recover(); r != nil {
|
|
log.Error("chat turn panicked", "panic", r, "stack", string(debug.Stack()))
|
|
}
|
|
}()
|
|
|
|
next.run()
|
|
}
|