mirror of
https://github.com/coder/coder.git
synced 2026-09-01 14:53:15 +08:00
b439b06ee6
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._
203 lines
5.9 KiB
Go
203 lines
5.9 KiB
Go
package agentcontext
|
|
|
|
import (
|
|
"context"
|
|
"encoding/hex"
|
|
"errors"
|
|
"net/http"
|
|
"net/url"
|
|
"strconv"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
|
|
"github.com/coder/coder/v2/coderd/httpapi"
|
|
"github.com/coder/coder/v2/codersdk"
|
|
)
|
|
|
|
// SourceResponse is the on-wire representation of a Source.
|
|
// Matches the path-only RFC schema; future additions (tags,
|
|
// labels) can land additively without breaking clients.
|
|
type SourceResponse struct {
|
|
Path string `json:"path"`
|
|
}
|
|
|
|
// SourceRequest is the request body for POST /sources.
|
|
type SourceRequest struct {
|
|
Path string `json:"path"`
|
|
}
|
|
|
|
// SnapshotResource is the on-wire representation of a Resource.
|
|
// Payloads are omitted; clients that need the bytes go through
|
|
// the drpc PushContextState path.
|
|
type SnapshotResource struct {
|
|
ID string `json:"id"`
|
|
Kind string `json:"kind"`
|
|
Source string `json:"source"`
|
|
SourcePath string `json:"source_path,omitempty"`
|
|
ContentHash string `json:"content_hash"`
|
|
SizeBytes uint64 `json:"size_bytes"`
|
|
Status string `json:"status"`
|
|
Error string `json:"error,omitempty"`
|
|
Description string `json:"description,omitempty"`
|
|
}
|
|
|
|
// SnapshotResponse is the on-wire representation of a Snapshot
|
|
// returned by the resync endpoint.
|
|
type SnapshotResponse struct {
|
|
Version uint64 `json:"version"`
|
|
AggregateHash string `json:"aggregate_hash"`
|
|
Resources []SnapshotResource `json:"resources"`
|
|
PayloadBytes uint64 `json:"payload_bytes"`
|
|
SnapshotError string `json:"snapshot_error,omitempty"`
|
|
}
|
|
|
|
// API exposes the Manager over HTTP. The routes match the RFC:
|
|
//
|
|
// GET /api/v0/context/sources
|
|
// POST /api/v0/context/sources { path }
|
|
// GET /api/v0/context/sources/{path}
|
|
// DELETE /api/v0/context/sources/{path}
|
|
// POST /api/v0/context/resync
|
|
//
|
|
// {path} is URL-encoded canonical path. Callers pass either the
|
|
// canonical or original path; the handler canonicalizes before
|
|
// matching.
|
|
type API struct {
|
|
manager *Manager
|
|
}
|
|
|
|
// NewAPI wraps the supplied Manager.
|
|
func NewAPI(m *Manager) *API {
|
|
return &API{manager: m}
|
|
}
|
|
|
|
// Routes returns the chi handler for /api/v0/context/*. Mount
|
|
// it at "/api/v0/context".
|
|
func (a *API) Routes() http.Handler {
|
|
r := chi.NewRouter()
|
|
r.Route("/sources", func(r chi.Router) {
|
|
r.Get("/", a.handleListSources)
|
|
r.Post("/", a.handleAddSource)
|
|
r.Get("/{path}", a.handleGetSource)
|
|
r.Delete("/{path}", a.handleRemoveSource)
|
|
})
|
|
r.Post("/resync", a.handleResync)
|
|
return r
|
|
}
|
|
|
|
func (a *API) handleListSources(rw http.ResponseWriter, r *http.Request) {
|
|
sources := a.manager.Sources()
|
|
out := make([]SourceResponse, 0, len(sources))
|
|
for _, s := range sources {
|
|
out = append(out, SourceResponse(s))
|
|
}
|
|
httpapi.Write(r.Context(), rw, http.StatusOK, out)
|
|
}
|
|
|
|
func (a *API) handleAddSource(rw http.ResponseWriter, r *http.Request) {
|
|
var req SourceRequest
|
|
if !httpapi.Read(r.Context(), rw, r, &req) {
|
|
return
|
|
}
|
|
s, err := a.manager.AddSource(Source(req))
|
|
if err != nil {
|
|
httpapi.Write(r.Context(), rw, http.StatusBadRequest, codersdk.Response{
|
|
Message: "Could not add context source.",
|
|
Detail: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
httpapi.Write(r.Context(), rw, http.StatusCreated, SourceResponse(s))
|
|
}
|
|
|
|
func (a *API) handleGetSource(rw http.ResponseWriter, r *http.Request) {
|
|
raw := chi.URLParam(r, "path")
|
|
decoded, err := url.PathUnescape(raw)
|
|
if err != nil {
|
|
httpapi.Write(r.Context(), rw, http.StatusBadRequest, codersdk.Response{
|
|
Message: "Invalid context source path.",
|
|
Detail: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
canonical, ok := a.manager.HasSource(decoded)
|
|
if !ok {
|
|
httpapi.Write(r.Context(), rw, http.StatusNotFound, codersdk.Response{
|
|
Message: "Context source not found.",
|
|
Detail: "No source registered for path " + strconv.Quote(decoded) + ".",
|
|
})
|
|
return
|
|
}
|
|
httpapi.Write(r.Context(), rw, http.StatusOK, SourceResponse{Path: canonical})
|
|
}
|
|
|
|
func (a *API) handleRemoveSource(rw http.ResponseWriter, r *http.Request) {
|
|
raw := chi.URLParam(r, "path")
|
|
decoded, err := url.PathUnescape(raw)
|
|
if err != nil {
|
|
httpapi.Write(r.Context(), rw, http.StatusBadRequest, codersdk.Response{
|
|
Message: "Invalid context source path.",
|
|
Detail: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
if err := a.manager.RemoveSource(decoded); err != nil {
|
|
if errors.Is(err, ErrSourceNotFound) {
|
|
httpapi.Write(r.Context(), rw, http.StatusNotFound, codersdk.Response{
|
|
Message: "Context source not found.",
|
|
Detail: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
httpapi.Write(r.Context(), rw, http.StatusBadRequest, codersdk.Response{
|
|
Message: "Could not remove context source.",
|
|
Detail: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
rw.WriteHeader(http.StatusNoContent)
|
|
}
|
|
|
|
func (a *API) handleResync(rw http.ResponseWriter, r *http.Request) {
|
|
snap, err := a.manager.Resync(r.Context())
|
|
if err != nil {
|
|
status := http.StatusInternalServerError
|
|
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
|
|
status = http.StatusGatewayTimeout
|
|
}
|
|
httpapi.Write(r.Context(), rw, status, codersdk.Response{
|
|
Message: "Resync failed.",
|
|
Detail: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
httpapi.Write(r.Context(), rw, http.StatusOK, snapshotResponse(snap))
|
|
}
|
|
|
|
// snapshotResponse converts a Snapshot to its on-wire form for
|
|
// the resync endpoint. Payloads are omitted; the per-resource
|
|
// payload bytes ship via the drpc PushContextState path.
|
|
func snapshotResponse(s Snapshot) SnapshotResponse {
|
|
out := SnapshotResponse{
|
|
Version: s.Version,
|
|
AggregateHash: hex.EncodeToString(s.AggregateHash[:]),
|
|
Resources: make([]SnapshotResource, 0, len(s.Resources)),
|
|
PayloadBytes: s.PayloadBytes,
|
|
SnapshotError: s.SnapshotError,
|
|
}
|
|
for _, r := range s.Resources {
|
|
out.Resources = append(out.Resources, SnapshotResource{
|
|
ID: r.ID,
|
|
Kind: r.Kind.String(),
|
|
Source: r.Source,
|
|
SourcePath: r.SourcePath,
|
|
ContentHash: hex.EncodeToString(r.ContentHash[:]),
|
|
SizeBytes: r.SizeBytes,
|
|
Status: r.Status.String(),
|
|
Error: r.Error,
|
|
Description: r.Description,
|
|
})
|
|
}
|
|
return out
|
|
}
|