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._
389 lines
15 KiB
Go
389 lines
15 KiB
Go
package agentapi
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"errors"
|
|
"math"
|
|
"sort"
|
|
|
|
"github.com/google/uuid"
|
|
"golang.org/x/xerrors"
|
|
"google.golang.org/protobuf/encoding/protojson"
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
"cdr.dev/slog/v3"
|
|
agentproto "github.com/coder/coder/v2/agent/proto"
|
|
"github.com/coder/coder/v2/coderd/database"
|
|
"github.com/coder/coder/v2/coderd/database/dbtime"
|
|
"github.com/coder/quartz"
|
|
)
|
|
|
|
// Server-side caps on a single PushContextState request. The agent
|
|
// enforces its own caps (64KiB per resource payload, 2MiB aggregate,
|
|
// 500 resources; see agent/agentcontext/resolve.go), but coderd
|
|
// cannot trust a workspace process, so pushes are re-validated here
|
|
// with headroom above the agent caps:
|
|
//
|
|
// - maxContextResourcesPerPush allows excluded stub entries past
|
|
// the agent's 500-resource cap.
|
|
// - maxContextResourceBodyBytes covers protojson and base64
|
|
// expansion of a 64KiB payload.
|
|
// - maxContextAggregateBodyBytes matches the 4MiB DRPC message
|
|
// cap so the invariant survives transport changes.
|
|
// - The string and hash caps bound the remaining row columns;
|
|
// source doubles as a btree primary key column, which PostgreSQL
|
|
// limits to roughly 2704 bytes per index entry.
|
|
const (
|
|
maxContextResourcesPerPush = 1000
|
|
maxContextResourceBodyBytes = 256 * 1024
|
|
maxContextAggregateBodyBytes = 4 * 1024 * 1024
|
|
maxContextSourceBytes = 1024
|
|
maxContextErrorBytes = 4096
|
|
maxContextHashBytes = 64
|
|
)
|
|
|
|
// ContextAPI implements the v2.10 PushContextState RPC. It persists
|
|
// the latest pushed snapshot per workspace agent across two tables
|
|
// (workspace_agent_context_snapshots and
|
|
// workspace_agent_context_resources) so later phases can hydrate
|
|
// chats and surface drift to the dashboard.
|
|
//
|
|
// The handler is a pure write path: nothing else in coderd reads
|
|
// these rows yet. If a bug here returns errors the agent's RunPush
|
|
// loop backs off and the workspace keeps behaving exactly like it
|
|
// did before v2.10.
|
|
type ContextAPI struct {
|
|
AgentID uuid.UUID
|
|
// Workspace caches workspace fields for the duration of the agent
|
|
// connection so dbauthz can authorize against the workspace RBAC
|
|
// object without re-fetching the workspace on every push.
|
|
Workspace *CachedWorkspaceFields
|
|
Log slog.Logger
|
|
Clock quartz.Clock
|
|
Database database.Store
|
|
}
|
|
|
|
// PushContextState persists a snapshot pushed by the workspace
|
|
// agent. The transaction upserts the snapshot row, upserts each
|
|
// resource, then deletes any resources whose source is not in the
|
|
// incoming set so the stored snapshot and resource table always
|
|
// agree. It runs at repeatable read isolation (with retries) so two
|
|
// concurrent pushes cannot interleave their writes; the loser of the
|
|
// conflict re-runs the version gate against the winner's committed
|
|
// state.
|
|
//
|
|
// Returns accepted = false (without writing) when the push is a
|
|
// replay or out-of-order resend: the agent's per-process version
|
|
// counter is monotonic, and only an initial = true push from a
|
|
// freshly-booted agent resets that baseline. Replays and stale
|
|
// retransmits leave the stored state untouched.
|
|
//
|
|
// Authorization happens in dbauthz: every query in the transaction
|
|
// authorizes the actor (the agent's token subject) against the
|
|
// workspace that owns the agent.
|
|
func (a *ContextAPI) PushContextState(ctx context.Context, req *agentproto.PushContextStateRequest) (*agentproto.PushContextStateResponse, error) {
|
|
if req == nil {
|
|
return nil, xerrors.New("agentapi: PushContextState request is nil")
|
|
}
|
|
if err := validateContextPushRequest(req); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
rows, err := validateAndConvertContextResources(req.Resources)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Attach the cached workspace RBAC object so dbauthz can take its
|
|
// fast path. On failure (or when unset, e.g. prebuilds) dbauthz
|
|
// falls back to fetching the workspace by agent ID.
|
|
if a.Workspace != nil {
|
|
injected, err := a.Workspace.ContextInject(ctx)
|
|
if err != nil {
|
|
a.Log.Debug(ctx, "failed to inject cached workspace RBAC object", slog.Error(err))
|
|
} else {
|
|
ctx = injected
|
|
}
|
|
}
|
|
|
|
clock := a.Clock
|
|
if clock == nil {
|
|
clock = quartz.NewReal()
|
|
}
|
|
now := dbtime.Time(clock.Now())
|
|
|
|
activeSources := make([]string, 0, len(rows))
|
|
for _, r := range rows {
|
|
activeSources = append(activeSources, r.Source)
|
|
}
|
|
sort.Strings(activeSources)
|
|
|
|
var accepted bool
|
|
err = database.ReadModifyUpdate(a.Database, func(tx database.Store) error {
|
|
// The closure re-runs on serialization conflicts; reset any
|
|
// state carried over from a rolled-back attempt.
|
|
accepted = false
|
|
|
|
existing, err := tx.GetLatestWorkspaceAgentContextSnapshot(ctx, a.AgentID)
|
|
switch {
|
|
case errors.Is(err, sql.ErrNoRows):
|
|
// No previous snapshot; first push always wins.
|
|
case err != nil:
|
|
return xerrors.Errorf("get latest snapshot: %w", err)
|
|
default:
|
|
// Accept either a fresh agent process (initial) or
|
|
// a strictly newer version. Out-of-order or replayed
|
|
// pushes leave the stored state untouched.
|
|
//
|
|
//nolint:gosec // existing.Version is a uint64 round-tripped via BIGINT; non-negative by construction.
|
|
if !req.Initial && req.Version <= uint64(existing.Version) {
|
|
return nil
|
|
}
|
|
}
|
|
|
|
_, err = tx.UpsertWorkspaceAgentContextSnapshot(ctx, database.UpsertWorkspaceAgentContextSnapshotParams{
|
|
WorkspaceAgentID: a.AgentID,
|
|
//nolint:gosec // Bounded by validateContextPushRequest.
|
|
Version: int64(req.Version),
|
|
AggregateHash: append([]byte(nil), req.AggregateHash...),
|
|
SnapshotError: req.SnapshotError,
|
|
ReceivedAt: now,
|
|
})
|
|
if err != nil {
|
|
return xerrors.Errorf("upsert snapshot: %w", err)
|
|
}
|
|
|
|
for _, r := range rows {
|
|
r.WorkspaceAgentID = a.AgentID
|
|
r.Now = now
|
|
_, err = tx.UpsertWorkspaceAgentContextResource(ctx, r)
|
|
if err != nil {
|
|
return xerrors.Errorf("upsert resource %q: %w", r.Source, err)
|
|
}
|
|
}
|
|
|
|
err = tx.DeleteStaleWorkspaceAgentContextResources(ctx, database.DeleteStaleWorkspaceAgentContextResourcesParams{
|
|
WorkspaceAgentID: a.AgentID,
|
|
ActiveSources: activeSources,
|
|
})
|
|
if err != nil {
|
|
return xerrors.Errorf("delete stale resources: %w", err)
|
|
}
|
|
|
|
accepted = true
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if !accepted {
|
|
a.Log.Debug(ctx, "PushContextState dropped: replay or out-of-order",
|
|
slog.F("agent_id", a.AgentID),
|
|
slog.F("version", req.Version),
|
|
slog.F("initial", req.Initial),
|
|
)
|
|
return &agentproto.PushContextStateResponse{Accepted: false}, nil
|
|
}
|
|
|
|
a.Log.Debug(ctx, "PushContextState accepted",
|
|
slog.F("agent_id", a.AgentID),
|
|
slog.F("version", req.Version),
|
|
slog.F("initial", req.Initial),
|
|
slog.F("resources", len(rows)),
|
|
)
|
|
return &agentproto.PushContextStateResponse{Accepted: true}, nil
|
|
}
|
|
|
|
// validateContextPushRequest enforces the request-level caps: counts
|
|
// and sizes a compromised workspace could otherwise inflate to DoS
|
|
// coderd or bloat the database.
|
|
func validateContextPushRequest(req *agentproto.PushContextStateRequest) error {
|
|
if req.Version > math.MaxInt64 {
|
|
return xerrors.Errorf("agentapi: PushContextState version %d exceeds int64 range", req.Version)
|
|
}
|
|
if len(req.AggregateHash) > maxContextHashBytes {
|
|
return xerrors.Errorf("agentapi: PushContextState aggregate hash is %d bytes, exceeds %d byte cap", len(req.AggregateHash), maxContextHashBytes)
|
|
}
|
|
if len(req.SnapshotError) > maxContextErrorBytes {
|
|
return xerrors.Errorf("agentapi: PushContextState snapshot error is %d bytes, exceeds %d byte cap", len(req.SnapshotError), maxContextErrorBytes)
|
|
}
|
|
if len(req.Resources) > maxContextResourcesPerPush {
|
|
return xerrors.Errorf("agentapi: PushContextState has %d resources, exceeds %d resource cap", len(req.Resources), maxContextResourcesPerPush)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// validateAndConvertContextResources translates wire resources into
|
|
// upsert parameters while rejecting structurally invalid input:
|
|
//
|
|
// - empty, oversized, or duplicate sources (the PK depends on
|
|
// uniqueness and indexes the source column),
|
|
// - unknown body variants (kept extensible by emitting the proto's
|
|
// reserved kinds via dedicated body messages),
|
|
// - unknown status enum values,
|
|
// - per-resource and aggregate body sizes past the server caps.
|
|
//
|
|
// Validation is deliberately strict here so a misbehaving agent
|
|
// cannot poison the snapshot table. Phase 2 readers can then trust
|
|
// that every row maps to a known proto variant.
|
|
//
|
|
// WorkspaceAgentID and Now are left unset; the caller fills them at
|
|
// upsert time.
|
|
func validateAndConvertContextResources(resources []*agentproto.ContextResource) ([]database.UpsertWorkspaceAgentContextResourceParams, error) {
|
|
rows := make([]database.UpsertWorkspaceAgentContextResourceParams, 0, len(resources))
|
|
seen := make(map[string]struct{}, len(resources))
|
|
aggregateBodyBytes := 0
|
|
for i, r := range resources {
|
|
if r == nil {
|
|
return nil, xerrors.Errorf("agentapi: PushContextState resource at index %d is nil", i)
|
|
}
|
|
if r.Source == "" {
|
|
return nil, xerrors.Errorf("agentapi: PushContextState resource at index %d has empty source", i)
|
|
}
|
|
if len(r.Source) > maxContextSourceBytes {
|
|
return nil, xerrors.Errorf("agentapi: PushContextState resource at index %d has %d byte source, exceeds %d byte cap", i, len(r.Source), maxContextSourceBytes)
|
|
}
|
|
if _, ok := seen[r.Source]; ok {
|
|
return nil, xerrors.Errorf("agentapi: PushContextState duplicate source %q", r.Source)
|
|
}
|
|
seen[r.Source] = struct{}{}
|
|
|
|
if len(r.GetSourcePath()) > maxContextSourceBytes {
|
|
return nil, xerrors.Errorf("resource %q: source path is %d bytes, exceeds %d byte cap", r.Source, len(r.GetSourcePath()), maxContextSourceBytes)
|
|
}
|
|
if len(r.Error) > maxContextErrorBytes {
|
|
return nil, xerrors.Errorf("resource %q: error is %d bytes, exceeds %d byte cap", r.Source, len(r.Error), maxContextErrorBytes)
|
|
}
|
|
if len(r.ContentHash) > maxContextHashBytes {
|
|
return nil, xerrors.Errorf("resource %q: content hash is %d bytes, exceeds %d byte cap", r.Source, len(r.ContentHash), maxContextHashBytes)
|
|
}
|
|
if r.SizeBytes > math.MaxInt64 {
|
|
return nil, xerrors.Errorf("resource %q: size %d exceeds int64 range", r.Source, r.SizeBytes)
|
|
}
|
|
|
|
kind, body, err := marshalContextResourceBody(r)
|
|
if err != nil {
|
|
return nil, xerrors.Errorf("resource %q: %w", r.Source, err)
|
|
}
|
|
if len(body) > maxContextResourceBodyBytes {
|
|
return nil, xerrors.Errorf("resource %q: body is %d bytes, exceeds %d byte cap", r.Source, len(body), maxContextResourceBodyBytes)
|
|
}
|
|
aggregateBodyBytes += len(body)
|
|
if aggregateBodyBytes > maxContextAggregateBodyBytes {
|
|
return nil, xerrors.Errorf("agentapi: PushContextState aggregate body size exceeds %d byte cap", maxContextAggregateBodyBytes)
|
|
}
|
|
status, err := contextResourceStatus(r.Status)
|
|
if err != nil {
|
|
return nil, xerrors.Errorf("resource %q: %w", r.Source, err)
|
|
}
|
|
|
|
//nolint:exhaustruct // WorkspaceAgentID and Now are filled by the caller at upsert time.
|
|
rows = append(rows, database.UpsertWorkspaceAgentContextResourceParams{
|
|
Source: r.Source,
|
|
SourcePath: r.GetSourcePath(),
|
|
BodyKind: kind,
|
|
Body: body,
|
|
ContentHash: append([]byte(nil), r.ContentHash...),
|
|
//nolint:gosec // Bounded above.
|
|
SizeBytes: int64(r.SizeBytes),
|
|
Status: status,
|
|
Error: r.Error,
|
|
})
|
|
}
|
|
return rows, nil
|
|
}
|
|
|
|
// marshalContextResourceBody picks the body variant set on the wire
|
|
// resource and returns the (body_kind, body_jsonb) pair stored in
|
|
// the resource row. The body is protojson encoded so the schema can
|
|
// be evolved by adding fields to the proto without coderd changes,
|
|
// and a future reader can round-trip back to the proto type by
|
|
// switching on body_kind.
|
|
//
|
|
// Body is always populated, even on non-OK statuses: the wire
|
|
// guarantees the oneof variant is set so coderd can still attribute
|
|
// the failure to a known kind. For variants with no content fields
|
|
// (mcp_config), an empty JSON object is stored.
|
|
func marshalContextResourceBody(r *agentproto.ContextResource) (kind database.WorkspaceAgentContextBodyKind, body []byte, err error) {
|
|
switch b := r.Body.(type) {
|
|
case *agentproto.ContextResource_InstructionFile:
|
|
payload := b.InstructionFile
|
|
if payload == nil {
|
|
payload = &agentproto.InstructionFileBody{}
|
|
}
|
|
body, err = marshalBody(payload)
|
|
return database.WorkspaceAgentContextBodyKindInstructionFile, body, err
|
|
case *agentproto.ContextResource_Skill:
|
|
payload := b.Skill
|
|
if payload == nil {
|
|
payload = &agentproto.SkillMetaBody{}
|
|
}
|
|
body, err = marshalBody(payload)
|
|
return database.WorkspaceAgentContextBodyKindSkill, body, err
|
|
case *agentproto.ContextResource_McpConfig:
|
|
payload := b.McpConfig
|
|
if payload == nil {
|
|
payload = &agentproto.MCPConfigBody{}
|
|
}
|
|
body, err = marshalBody(payload)
|
|
return database.WorkspaceAgentContextBodyKindMcpConfig, body, err
|
|
case *agentproto.ContextResource_McpServer:
|
|
payload := b.McpServer
|
|
if payload == nil {
|
|
payload = &agentproto.MCPServerBody{}
|
|
}
|
|
body, err = marshalBody(payload)
|
|
return database.WorkspaceAgentContextBodyKindMcpServer, body, err
|
|
case nil:
|
|
return "", nil, xerrors.Errorf("missing body variant; status %s requires a typed body", r.Status)
|
|
default:
|
|
return "", nil, xerrors.Errorf("unsupported body variant %T", r.Body)
|
|
}
|
|
}
|
|
|
|
// contextBodyMarshalOptions produces deterministic-ish JSON for the
|
|
// body so the stored value compares equal across pushes that yield
|
|
// equivalent protos. Strict canonicalization (RFC 8785) is not
|
|
// required here; the enum column plus the protojson round trip give
|
|
// us a stable enough store.
|
|
var contextBodyMarshalOptions = protojson.MarshalOptions{
|
|
UseProtoNames: true,
|
|
EmitUnpopulated: false,
|
|
}
|
|
|
|
// marshalBody is a small wrapper around protojson.Marshal that
|
|
// keeps the body encoding in one place; future phases that read
|
|
// these rows mirror the call with protojson.Unmarshal into the
|
|
// matching proto.Message.
|
|
func marshalBody(msg proto.Message) ([]byte, error) {
|
|
out, err := contextBodyMarshalOptions.Marshal(msg)
|
|
if err != nil {
|
|
return nil, xerrors.Errorf("marshal body: %w", err)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// contextResourceStatus translates the wire status enum to the
|
|
// database enum. STATUS_UNSPECIFIED is rejected: every well-formed
|
|
// snapshot row needs an explicit status so cache invalidation, dirty
|
|
// fan-out, and the Sources drawer can reason about partial pushes
|
|
// deterministically.
|
|
func contextResourceStatus(s agentproto.ContextResource_Status) (database.WorkspaceAgentContextResourceStatus, error) {
|
|
switch s {
|
|
case agentproto.ContextResource_OK:
|
|
return database.WorkspaceAgentContextResourceStatusOk, nil
|
|
case agentproto.ContextResource_OVERSIZE:
|
|
return database.WorkspaceAgentContextResourceStatusOversize, nil
|
|
case agentproto.ContextResource_UNREADABLE:
|
|
return database.WorkspaceAgentContextResourceStatusUnreadable, nil
|
|
case agentproto.ContextResource_INVALID:
|
|
return database.WorkspaceAgentContextResourceStatusInvalid, nil
|
|
case agentproto.ContextResource_EXCLUDED:
|
|
return database.WorkspaceAgentContextResourceStatusExcluded, nil
|
|
default:
|
|
return "", xerrors.Errorf("unknown status %d", s)
|
|
}
|
|
}
|