mirror of
https://github.com/coder/coder.git
synced 2026-09-22 05:05:20 +08:00
## Overview Split from #26466, scoped to **agent-only** changes. This PR exposes the agent's context sources and snapshots over the existing agent socket. There are no changes outside `agent/`. ## What's included - **agentsocket**: context source CRUD (`ContextSources`, `GetContextSource`, `AddContextSource`, `RemoveContextSource`) plus `GetContextSnapshot` and `ResyncContext` RPCs, with matching client methods and proto. The server receives the context `Manager` via `WithContextManager` and returns a clean error when it is absent. - **agentcontext**: the resync JSON response now carries the per-resource `Name`, keeping the HTTP resync payload in sync with the drpc `PushContextState` path in `agentsocket`. - **agent**: passes the context `Manager` to the socket server via `WithContextManager`. ## What's intentionally NOT here - No MCP wiring. There are no MCP additions in `agent.go` or `agentcontext`. MCP ownership will land later in `agentcontext`; this PR does not build on `agent/x/agentmcp`. - No changes to `agent/x/agentmcp` or the `agentcontext` resolver. The socket serves whatever context resources the `Manager` already resolves. <details> <summary>Context for reviewers</summary> This is one of several PRs split out of #26466. Earlier revisions also wired live MCP servers through the socket; that scope was removed so this PR stays purely socket + context plumbing inside `agent/`. The agentcontext resolver, `agent/x/agentmcp`, and `agent.go` MCP startup behavior are unchanged from `main`. </details> --- _Created by Coder Agents on behalf of @kylecarbs._
207 lines
6.1 KiB
Go
207 lines
6.1 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"`
|
|
Name string `json:"name,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 the JSON form returned by
|
|
// the resync endpoint. Payloads are omitted; the per-resource
|
|
// payload bytes ship via the drpc PushContextState path. Keep the
|
|
// per-resource field mapping in sync with contextSnapshotToProto in
|
|
// agent/agentsocket/service.go.
|
|
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,
|
|
Name: r.Name,
|
|
Description: r.Description,
|
|
})
|
|
}
|
|
return out
|
|
}
|