mirror of
https://github.com/coder/coder.git
synced 2026-09-23 22:20:22 +08:00
Replaces the v2.10 `PushContextState` stub with a real coderd write path. Phase 1 of the chat-side persistence story; nothing reads these rows yet. Follows [#25983](https://github.com/coder/coder/pull/25983) and unblocks [CODAGT-569](https://linear.app/codercom/issue/CODAGT-569/enable-agent-api-v210-pushcontextstate-bump-currentminor-wire-coderd). ## What ships ### Schema (`000517_workspace_agent_context.{up,down}.sql`) Two new tables plus `api_key_scope` enum extensions: - `workspace_agent_context_snapshots` (PK `workspace_agent_id` to `workspace_agents(id) ON DELETE CASCADE`): one row per agent, overwritten per push. Holds `version`, `schema_version`, `aggregate_hash`, `snapshot_error`, `received_at`. - `workspace_agent_context_resources` (PK `(workspace_agent_id, source)`): per-resource state. `body_kind` and `status` are `TEXT` + `CHECK` so adding new wire kinds (the RFC's reserved PLUGIN/HOOK/SUBAGENT/COMMAND) is a one-line CHECK update plus a Go switch case. ### SQLC queries (`coderd/database/queries/workspaceagentcontext.sql`) - `UpsertWorkspaceAgentContextSnapshot` - `UpsertWorkspaceAgentContextResource` - `DeleteStaleWorkspaceAgentContextResources` (delete-where-source-not-in) - `GetLatestWorkspaceAgentContextSnapshot` - `ListWorkspaceAgentContextResources` ### Handler (`coderd/agentapi/context.go`) `ContextAPI` is a new sub-API. `PushContextState`: 1. Rejects `schema_version > 1` with a non-`Unimplemented` error so a forward-incompatible agent fails loudly during rollout instead of slipping into the permanent fallback path the `Unimplemented` translation reserves for old coderd deployments. 2. Validates resources: no empty/duplicate sources, every variant maps to a known body kind, every status maps to a known enum value, the `Body` oneof is set (even when status is non-OK, mirroring the wire guarantee so coderd can attribute failures to a known kind). 3. Inside `Database.InTx`, reads the existing snapshot. If the push is not `initial` and `version` is not strictly greater, returns `accepted = false` and leaves stored state untouched. Otherwise upserts the snapshot row, upserts each resource, then runs the stale-source prune so the snapshot and resource rows always agree. 4. Returns `accepted = true` on success. Resource bodies are stored as `protojson(body oneof variant)` in `body JSONB` with `body_kind` as the discriminator. Adding a new field to an existing variant is zero work since `protojson` tolerates new fields; adding a new variant is a CHECK + switch case. ### RBAC + dbauthz - New `ResourceWorkspaceAgentContext` (Create/Read/Update/Delete). - New `SubjectTypeAgentContext` plus `subjectAgentContext` system role and `dbauthz.AsAgentContext` helper. The push handler elevates to this subject; the agent's own role does not get direct write access to the table. - New `workspace_agent_context:*` API key scopes registered in the enum migration; internal-only (not added to `externalLowLevel`). ### Audit These rows are agent-pushed state, not user-authored. They are intentionally not added to `AuditActionMap` and not enumerated in `enterprise/audit/table.go`, matching `boundary_logs`, `workspace_agent_memory_resource_monitor`, etc. `enterprise/audit` tests pass unchanged. ## Tests - `coderd/agentapi/context_test.go`: 12 subtests covering accepts/rejects (schema version, empty/duplicate source, unknown status, missing body), version semantics (stale dropped, same-version replay dropped, `initial=true` overwrites lower version), variant coverage, non-OK status persistence, and the empty-active-set prune case. - `coderd/database/dbauthz/dbauthz_test.go`: 5 `MethodTestSuite` cases covering the new queries. - `coderd/rbac/roles_test.go`: `WorkspaceAgentContext` permission row asserting no human role currently has access. - `coderd/database/migrations/testdata/fixtures/000517_workspace_agent_context.up.sql`: one snapshot + one resource per known body kind plus a non-OK status, so the migration test suite never lands with these tables empty. ## Out of scope (later phases) - Chat hydration (`chats.context_aggregate_hash`, `last_injected_context`). - Dirty-bit fan-out and `PUT /chats/{id}/context`. - Agent-side `POST /api/v0/context/resync` barrier and the `coder exp chat context` CLI. - `codersdk` chat-context wire types and the dashboard Sources drawer. - Removal of the chatd per-turn pull fallback. ## Compat property This is a pure write path. If anything here returns errors the agent's `RunPush` loop backs off, no chat behavior changes, and the workspace keeps behaving exactly like it did before v2.10. <details> <summary>Implementation plan and decision log</summary> Key design calls: 1. **Concurrency**: Accept iff `req.Initial || req.Version > existing.Version`. The strict RFC reading ("version comparison is authoritative") locks restarted agents out because their per-process counter resets to 1; honoring `initial=true` reflects the real reboot reality while still rejecting steady-state replays/out-of-order pushes. 2. **Body encoding**: `protojson` over the oneof variant body proto, stored in JSONB with `body_kind` discriminator. Structured at the API/Go layer, schema-tolerant at the storage layer, and Phase 2 readers round-trip back via `protojson.Unmarshal`. 3. **Schema version rejection**: returns a normal error, not `Unimplemented`. The agent's `RunPush` loop only short-circuits on `Unimplemented`; that escape hatch is reserved for old coderd deployments. A forward-incompatible agent should retry-and-back-off, not flip the connection into permanent fallback. 4. **Validation strictness**: empty sources, duplicate sources, `STATUS_UNSPECIFIED`, and missing `Body` oneof variants are rejected before any write so a misbehaving agent cannot poison the snapshot table. Phase 2 readers can trust every row maps to a known proto variant. </details> _This PR was authored by Coder Agents on Kyle Carberry's behalf._
201 lines
5.6 KiB
Go
201 lines
5.6 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
|
|
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,
|
|
SnapshotError: s.SnapshotError,
|
|
}
|
|
}
|