mirror of
https://github.com/coder/coder.git
synced 2026-09-23 14:03:57 +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._
178 lines
5.3 KiB
Go
178 lines
5.3 KiB
Go
package agentcontext_test
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"io"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/coder/coder/v2/agent/agentcontext"
|
|
"github.com/coder/coder/v2/testutil"
|
|
)
|
|
|
|
func newAPITestServer(t *testing.T, opts agentcontext.ManagerOptions) (*httptest.Server, *agentcontext.Manager) {
|
|
t.Helper()
|
|
m := newTestManager(t, opts)
|
|
api := agentcontext.NewAPI(m)
|
|
srv := httptest.NewServer(api.Routes())
|
|
t.Cleanup(srv.Close)
|
|
return srv, m
|
|
}
|
|
|
|
// doRequest issues an HTTP request bounded by testutil.WaitShort
|
|
// and returns the status code and response body. The response
|
|
// body is closed before doRequest returns.
|
|
func doRequest(t *testing.T, method, requrl string, body io.Reader) (int, []byte) {
|
|
t.Helper()
|
|
ctx := testutil.Context(t, testutil.WaitShort)
|
|
req, err := http.NewRequestWithContext(ctx, method, requrl, body)
|
|
require.NoError(t, err)
|
|
if body != nil {
|
|
req.Header.Set("Content-Type", "application/json")
|
|
}
|
|
res, err := http.DefaultClient.Do(req) //nolint:bodyclose // closed below.
|
|
require.NoError(t, err)
|
|
defer res.Body.Close()
|
|
bodyBytes, err := io.ReadAll(res.Body)
|
|
require.NoError(t, err)
|
|
return res.StatusCode, bodyBytes
|
|
}
|
|
|
|
func TestAPI_ListSourcesEmpty(t *testing.T) {
|
|
t.Parallel()
|
|
srv, _ := newAPITestServer(t, agentcontext.ManagerOptions{
|
|
WorkingDir: func() string { return t.TempDir() },
|
|
})
|
|
|
|
status, body := doRequest(t, http.MethodGet, srv.URL+"/sources", nil)
|
|
require.Equal(t, http.StatusOK, status)
|
|
|
|
var got []agentcontext.SourceResponse
|
|
require.NoError(t, json.Unmarshal(body, &got))
|
|
require.Empty(t, got)
|
|
}
|
|
|
|
func TestAPI_AddAndListSource(t *testing.T) {
|
|
t.Parallel()
|
|
wd := t.TempDir()
|
|
src := t.TempDir()
|
|
|
|
srv, _ := newAPITestServer(t, agentcontext.ManagerOptions{
|
|
WorkingDir: func() string { return wd },
|
|
AllowedRoots: []string{wd, src},
|
|
})
|
|
|
|
body, _ := json.Marshal(agentcontext.SourceRequest{Path: src})
|
|
status, addBody := doRequest(t, http.MethodPost, srv.URL+"/sources", bytes.NewReader(body))
|
|
require.Equal(t, http.StatusCreated, status)
|
|
|
|
var created agentcontext.SourceResponse
|
|
require.NoError(t, json.Unmarshal(addBody, &created))
|
|
require.Equal(t, src, created.Path)
|
|
|
|
// List should show the new source.
|
|
listStatus, listBody := doRequest(t, http.MethodGet, srv.URL+"/sources", nil)
|
|
require.Equal(t, http.StatusOK, listStatus)
|
|
var list []agentcontext.SourceResponse
|
|
require.NoError(t, json.Unmarshal(listBody, &list))
|
|
require.Len(t, list, 1)
|
|
require.Equal(t, src, list[0].Path)
|
|
}
|
|
|
|
func TestAPI_AddSourceRejected(t *testing.T) {
|
|
t.Parallel()
|
|
wd := t.TempDir()
|
|
outside := t.TempDir()
|
|
|
|
srv, _ := newAPITestServer(t, agentcontext.ManagerOptions{
|
|
WorkingDir: func() string { return wd },
|
|
AllowedRoots: []string{wd},
|
|
})
|
|
|
|
body, _ := json.Marshal(agentcontext.SourceRequest{Path: outside})
|
|
status, _ := doRequest(t, http.MethodPost, srv.URL+"/sources", bytes.NewReader(body))
|
|
require.Equal(t, http.StatusBadRequest, status)
|
|
}
|
|
|
|
func TestAPI_GetAndDeleteSource(t *testing.T) {
|
|
t.Parallel()
|
|
wd := t.TempDir()
|
|
src := t.TempDir()
|
|
|
|
srv, m := newAPITestServer(t, agentcontext.ManagerOptions{
|
|
WorkingDir: func() string { return wd },
|
|
AllowedRoots: []string{wd, src},
|
|
})
|
|
|
|
_, err := m.AddSource(agentcontext.Source{Path: src})
|
|
require.NoError(t, err)
|
|
|
|
status, body := doRequest(t, http.MethodGet, srv.URL+"/sources/"+url.PathEscape(src), nil)
|
|
require.Equal(t, http.StatusOK, status)
|
|
|
|
var got agentcontext.SourceResponse
|
|
require.NoError(t, json.Unmarshal(body, &got))
|
|
require.Equal(t, src, got.Path)
|
|
|
|
delStatus, _ := doRequest(t, http.MethodDelete, srv.URL+"/sources/"+url.PathEscape(src), nil)
|
|
require.Equal(t, http.StatusNoContent, delStatus)
|
|
require.Empty(t, m.Sources())
|
|
}
|
|
|
|
func TestAPI_GetSourceNotFound(t *testing.T) {
|
|
t.Parallel()
|
|
srv, _ := newAPITestServer(t, agentcontext.ManagerOptions{
|
|
WorkingDir: func() string { return t.TempDir() },
|
|
})
|
|
|
|
status, _ := doRequest(t, http.MethodGet, srv.URL+"/sources/"+url.PathEscape("/never-added"), nil)
|
|
require.Equal(t, http.StatusNotFound, status)
|
|
}
|
|
|
|
func TestAPI_DeleteSourceNotFound(t *testing.T) {
|
|
t.Parallel()
|
|
srv, _ := newAPITestServer(t, agentcontext.ManagerOptions{
|
|
WorkingDir: func() string { return t.TempDir() },
|
|
})
|
|
|
|
status, _ := doRequest(t, http.MethodDelete, srv.URL+"/sources/"+url.PathEscape("/never-added"), nil)
|
|
require.Equal(t, http.StatusNotFound, status)
|
|
}
|
|
|
|
func TestAPI_Resync(t *testing.T) {
|
|
t.Parallel()
|
|
wd := t.TempDir()
|
|
mustWriteFile(t, filepath.Join(wd, "AGENTS.md"), "hello")
|
|
|
|
srv, _ := newAPITestServer(t, agentcontext.ManagerOptions{
|
|
WorkingDir: func() string { return wd },
|
|
})
|
|
|
|
status, body := doRequest(t, http.MethodPost, srv.URL+"/resync", nil)
|
|
require.Equal(t, http.StatusOK, status)
|
|
|
|
var snap agentcontext.SnapshotResponse
|
|
require.NoError(t, json.Unmarshal(body, &snap))
|
|
require.Equal(t, uint64(1), snap.SchemaVersion)
|
|
require.NotEmpty(t, snap.AggregateHash)
|
|
require.Len(t, snap.Resources, 1)
|
|
require.Equal(t, "instruction_file", snap.Resources[0].Kind)
|
|
require.Equal(t, "ok", snap.Resources[0].Status)
|
|
}
|
|
|
|
func TestAPI_AddSourceMalformedBody(t *testing.T) {
|
|
t.Parallel()
|
|
srv, _ := newAPITestServer(t, agentcontext.ManagerOptions{
|
|
WorkingDir: func() string { return t.TempDir() },
|
|
})
|
|
|
|
status, _ := doRequest(t, http.MethodPost, srv.URL+"/sources", bytes.NewReader([]byte("{not json")))
|
|
require.Equal(t, http.StatusBadRequest, status)
|
|
}
|