mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
Adds the agent half of the workspace context sources RFC. The agent now resolves instruction files, skills, and MCP configs into a typed `Snapshot`, watches the relevant paths recursively, exposes the source list over a workspace-agent HTTP API, and pushes each `Snapshot` to coderd over a new `PushContextState` RPC on Agent API v2.10. The coderd-side handler is a stub returning `Unimplemented` for now. Real persistence to `workspace_agent_context`, chatd hydration on dirty events, and the `KindMCPServer` MCP provider are tracked by [CODAGT-569](https://linear.app/codercom/issue/CODAGT-569/enable-agent-api-v210-pushcontextstate-bump-currentminor-wire-coderd). This matches the pattern used for v2.7 `ReportBoundaryLogs` in [#21293](https://github.com/coder/coder/pull/21293), which bumped the version and shipped a stub server so the wire and client could iterate before the persistence layer landed. ## What ships ### agent/agentcontext (new package) - `Source`, `Resource` (kinds `instruction_file`, `skill`, `mcp_config`, `mcp_server` plus reserved `plugin`/`hook`/`subagent`/`command`), `ResourceStatus`, `Snapshot`, `ComputeAggregateHash`. - `Manager` owns the in-memory source list, performs the initial resolve synchronously in `NewManager`, runs a re-resolve/watcher loop in `Run`, exposes `AddSource`/`RemoveSource`/`Sources`/`HasSource`/`Snapshot`/`SubscribeChanges`/`Resync`/`SeedSources`/`Close`. - `Resolver` walks scan roots, classifies recognized files, enforces 64 KiB per-resource, 2 MiB aggregate, and 500-resource caps with `StatusOversize`/`StatusExcluded`/`StatusUnreadable`/`StatusInvalid` outcomes, skips `node_modules`/`vendor`/etc., validates symlink targets stay inside the scan root, stamps `SourcePath` on user-derived resources, and optionally pulls MCP server tool lists via an `MCPProvider` interface. MCP config resources ship metadata only (size, hash) so secrets in env blocks never leave the agent. - `Watcher` is a recursive `fsnotify` wrapper with a 250 ms debounce, dynamic arming of newly created directories, and an ENOSPC-tolerant degraded mode that no-ops further syncs until the manager resyncs explicitly. - HTTP API for `GET/POST /sources`, `GET/DELETE /sources/{path}`, `POST /resync` mounted at `/api/v0/context`. - `Pusher` interface plus `RunPush` goroutine with exponential backoff capped at 30 s. `DRPCPusher` adapts the generated `DRPCAgentClient210` to `Pusher` and translates `drpcerr.Unimplemented` to `ErrPushUnimplemented` so the push loop exits cleanly when talking to coderd deployments that have not enabled the real handler. ### agent/proto (v2.10) - New messages `ContextResource`, `PushContextStateRequest`, `PushContextStateResponse` and the `PushContextState` RPC on `service Agent`. - Generated `DRPCAgentClient210` interface and `codersdk/agentsdk.Client.ConnectRPC210` / `ConnectRPC210WithRole`. - `tailnet/proto.CurrentMinor` bumped from `9` to `10`. ### Agent wiring - `agent.Options.Client` declares both v2.9 and v2.10 connectors; `run()` dials with `ConnectRPC210WithRole`. - `apiConnRoutineManager` holds a `DRPCAgentClient210`. Existing v2.8 routines keep their narrower `DRPCAgentClient28` signature thanks to interface embedding. - `startAgentAPI210` is the v2.10 counterpart to `startAgentAPI` for routines that need the new client. The push context state routine uses it. - A `contextManager` is constructed in `agent.init()`, seeded from the existing `CODER_AGENT_EXP_*_DIRS` env vars, started in its own goroutine under `gracefulCtx`, and closed in `agent.Close`. - `handleManifest` calls `Manager.SeedSources` for sources rooted at the manifest directory, then `Resync` after `manifest.Swap`, so the snapshot reflects the workspace working directory immediately instead of waiting for the next filesystem event. - HTTP routes mounted at `/api/v0/context` when the manager is up. ### Coderd stub `coderd/agentapi/context.go` returns `drpcerr.Unimplemented` for `PushContextState`. The real handler that persists `workspace_agent_context` rows, hydrates chats, and emits dirty events lives in CODAGT-569. ## Tests 24 tests across `agent/agentcontext` cover types, paths, resolver behavior with file caps, skill containers, MCP secret omission, symlink target validation, the recursive watcher firing on real fsnotify events, manager source CRUD / `Resync` / `SeedSources` / `Run` lifetime, the HTTP API, the DRPC adapter, and the push retry / initial-flag / unimplemented paths. Passes `go test -race -count=2`. `TestAgent_ContextStatePushed` boots a full agent against `agenttest.FakeAgentAPI` (which now records `PushContextState` traffic) and asserts the seeded `AGENTS.md` appears in a snapshot push with `schema_version = 1`. <details> <summary>Notes for reviewers</summary> - Source CRUD is workspace-agent-token only; coderd is not in the path for source mutation. - Per-resource cap 64 KiB, aggregate 2 MiB, count cap 500; resources past the cap ship with `StatusExcluded` and an empty payload so the aggregate hash still detects content edits. MCP-emitted resources enforce both a per-provider count cap and the aggregate byte cap. - Symlinks inside the scan root are followed; symlinks pointing outside (or broken) are rejected with `StatusExcluded` so credentials reachable via a stray symlink stay off the wire. - The initial push gates `lifecycle = ready` in the eventual full design. For this PR the `SeedSources` plus `handleManifest`-driven `Resync` keeps the snapshot fresh; the live push loop ships now and DRPCPusher translates the coderd `Unimplemented` stub into a clean exit. - The `PLUGIN`/`HOOK`/`SUBAGENT`/`COMMAND` kinds are reserved in proto and Go enums but unused; the Claude Code plugin resolver ships in a follow-up that does not need a schema migration. - Two follow-ups remain, both tracked by [CODAGT-569](https://linear.app/codercom/issue/CODAGT-569/enable-agent-api-v210-pushcontextstate-bump-currentminor-wire-coderd): (1) the chatd-side handler that persists snapshots and dirties chats; (2) the `coder exp chat context` CLI command set for `list`/`show`/`add`/`remove`/`refresh`. </details> _This PR was authored by Coder Agents on Kyle Carberry's behalf._
203 lines
5.7 KiB
Go
203 lines
5.7 KiB
Go
package agentcontext
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"time"
|
|
|
|
"golang.org/x/xerrors"
|
|
|
|
"cdr.dev/slog/v3"
|
|
"github.com/coder/quartz"
|
|
)
|
|
|
|
// PushRequest is the wire-format-independent payload the
|
|
// Manager hands to a Pusher. It mirrors the protobuf
|
|
// PushContextStateRequest message reserved in the RFC.
|
|
//
|
|
// Keeping the shape in plain Go lets this package compile
|
|
// without bumping the drpc proto version. The follow-up
|
|
// integration change can add a thin adapter that converts
|
|
// PushRequest to proto and back.
|
|
type PushRequest struct {
|
|
Version uint64
|
|
AggregateHash [32]byte
|
|
Resources []Resource
|
|
Initial bool
|
|
SchemaVersion uint64
|
|
SnapshotError string
|
|
}
|
|
|
|
// PushResponse is the wire-format-independent return value of
|
|
// a push.
|
|
type PushResponse struct {
|
|
Accepted bool
|
|
}
|
|
|
|
// Pusher delivers snapshots to coderd. Concrete implementations
|
|
// wrap a drpc client (Agent API v2.10 and later) or, in tests,
|
|
// a recording in-memory fake.
|
|
//
|
|
// PushContextState must respect ctx cancellation; the Manager
|
|
// retries on transient errors with backoff but stops on
|
|
// ErrPushUnimplemented.
|
|
type Pusher interface {
|
|
PushContextState(ctx context.Context, req *PushRequest) (*PushResponse, error)
|
|
}
|
|
|
|
// ErrPushUnimplemented signals that the coderd peer does not
|
|
// implement PushContextState. RunPush stops pushing for the
|
|
// remainder of the connection.
|
|
var ErrPushUnimplemented = xerrors.New("agentcontext: PushContextState unimplemented")
|
|
|
|
// Default backoff timings for pushWithRetry. Exposed as named
|
|
// constants (rather than inline literals) so godoc shows them
|
|
// and a second push loop, if it ever appears, can reuse them.
|
|
const (
|
|
DefaultPushInitialBackoff = 250 * time.Millisecond
|
|
DefaultPushMaxBackoff = 30 * time.Second
|
|
)
|
|
|
|
// PushOptions parameterizes RunPush.
|
|
type PushOptions struct {
|
|
// Logger receives push success/failure diagnostics.
|
|
Logger slog.Logger
|
|
// InitialBackoff is the wait before the first retry.
|
|
// Default 250ms.
|
|
InitialBackoff time.Duration
|
|
// MaxBackoff caps the retry wait. Default 30s.
|
|
MaxBackoff time.Duration
|
|
// Clock is the time source for retry backoffs. Optional;
|
|
// defaults to the Manager's clock so tests can trap waits
|
|
// with quartz instead of real sleeps.
|
|
Clock quartz.Clock
|
|
}
|
|
|
|
// RunPush ships the current snapshot to the Pusher, then ships
|
|
// every subsequent snapshot whenever the Manager broadcasts a
|
|
// change. RunPush returns when ctx is canceled, when the
|
|
// Manager is closed, or when the Pusher signals
|
|
// ErrPushUnimplemented.
|
|
//
|
|
// The first push is always sent with Initial=true so coderd can
|
|
// distinguish a fresh boot from a drift event.
|
|
func (m *Manager) RunPush(ctx context.Context, p Pusher, opts PushOptions) error {
|
|
if p == nil {
|
|
return xerrors.New("agentcontext: Pusher is required")
|
|
}
|
|
logger := opts.Logger
|
|
initialBackoff := opts.InitialBackoff
|
|
if initialBackoff <= 0 {
|
|
initialBackoff = DefaultPushInitialBackoff
|
|
}
|
|
maxBackoff := opts.MaxBackoff
|
|
if maxBackoff <= 0 {
|
|
maxBackoff = DefaultPushMaxBackoff
|
|
}
|
|
clock := opts.Clock
|
|
if clock == nil {
|
|
clock = m.clock
|
|
}
|
|
|
|
changes, unsub := m.SubscribeChanges()
|
|
defer unsub()
|
|
|
|
// First push uses the snapshot computed by NewManager.
|
|
initial := true
|
|
for {
|
|
snap := m.Snapshot()
|
|
req := snapshotToPushRequest(snap, initial)
|
|
|
|
err := pushWithRetry(ctx, p, req, initialBackoff, maxBackoff, clock, logger)
|
|
switch {
|
|
case err == nil:
|
|
initial = false
|
|
case errors.Is(err, ErrPushUnimplemented):
|
|
logger.Warn(ctx, "coderd peer does not implement PushContextState; stopping")
|
|
return nil
|
|
case errors.Is(err, context.Canceled), errors.Is(err, context.DeadlineExceeded):
|
|
return ctx.Err()
|
|
default:
|
|
// Should be unreachable: pushWithRetry only
|
|
// returns terminal errors. Log and continue.
|
|
logger.Warn(ctx, "push terminated with non-retried error", slog.Error(err))
|
|
}
|
|
|
|
select {
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
case <-m.closedCh:
|
|
return nil
|
|
case <-changes:
|
|
// Shutdown comes from closedCh or ctx; the
|
|
// subscriber channel is never closed by
|
|
// SubscribeChanges.
|
|
}
|
|
}
|
|
}
|
|
|
|
// pushWithRetry retries transient errors with exponential
|
|
// backoff capped at maxBackoff. The retry loop exits when:
|
|
//
|
|
// - ctx is canceled (returns ctx.Err()).
|
|
// - The Pusher returns nil (success).
|
|
// - The Pusher returns ErrPushUnimplemented (propagated).
|
|
func pushWithRetry(
|
|
ctx context.Context,
|
|
p Pusher,
|
|
req *PushRequest,
|
|
initialBackoff, maxBackoff time.Duration,
|
|
clock quartz.Clock,
|
|
logger slog.Logger,
|
|
) error {
|
|
backoff := initialBackoff
|
|
for {
|
|
resp, err := p.PushContextState(ctx, req)
|
|
if err == nil {
|
|
if resp != nil && !resp.Accepted {
|
|
// Out-of-order or replayed push. Do not
|
|
// retry; the next change will redeliver
|
|
// the snapshot with a higher version.
|
|
logger.Debug(ctx, "push rejected, awaiting next change",
|
|
slog.F("version", req.Version))
|
|
}
|
|
return nil
|
|
}
|
|
if errors.Is(err, ErrPushUnimplemented) {
|
|
return err
|
|
}
|
|
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
|
|
return err
|
|
}
|
|
logger.Warn(ctx, "push failed, retrying",
|
|
slog.F("version", req.Version),
|
|
slog.F("backoff", backoff),
|
|
slog.Error(err))
|
|
timer := clock.NewTimer(backoff)
|
|
select {
|
|
case <-ctx.Done():
|
|
timer.Stop()
|
|
return ctx.Err()
|
|
case <-timer.C:
|
|
}
|
|
backoff *= 2
|
|
if backoff > maxBackoff {
|
|
backoff = maxBackoff
|
|
}
|
|
}
|
|
}
|
|
|
|
// snapshotToPushRequest copies the Snapshot into the wire
|
|
// representation. The Resources slice is reused; callers must
|
|
// not mutate it.
|
|
func snapshotToPushRequest(s Snapshot, initial bool) *PushRequest {
|
|
return &PushRequest{
|
|
Version: s.Version,
|
|
AggregateHash: s.AggregateHash,
|
|
Resources: s.Resources,
|
|
Initial: initial,
|
|
SchemaVersion: s.SchemaVersion,
|
|
SnapshotError: s.SnapshotError,
|
|
}
|
|
}
|