Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 55 additions & 2 deletions agent/agent_acp_test.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
package agent_test

import (
"context"
"encoding/json"
"fmt"
"net/http"
"os"
"path/filepath"
"strings"
"testing"

"github.com/google/uuid"
"github.com/spf13/afero"
"github.com/stretchr/testify/require"

acp "github.com/coder/acp-go-sdk"
"github.com/coder/coder/v2/agent"
"github.com/coder/coder/v2/agent/agenttest"
"github.com/coder/coder/v2/agent/usershell"
Expand All @@ -29,17 +36,40 @@ func TestAgent_ACPInterface(t *testing.T) {
configDir := filepath.Join(home, ".coder", "acp")
require.NoError(t, os.MkdirAll(configDir, 0o700))
require.NoError(t, os.WriteFile(filepath.Join(configDir, "broken.json"), []byte(`{"command":"false"}`), 0o600))
binary, err := os.Executable()
require.NoError(t, err)
command := fmt.Sprintf("CODER_AGENT_ACP_TEST_HELPER=1 '%s' -test.run=^TestAgentACPHarness$", strings.ReplaceAll(binary, "'", "'\"'\"'"))
raw, err := json.Marshal(map[string]string{"command": command})
require.NoError(t, err)
require.NoError(t, os.WriteFile(filepath.Join(configDir, "fake.json"), raw, 0o600))
//nolint:dogsled // The integration fixture also returns unrelated transports.
conn, client, _, _, _ := setupAgent(t, agentsdk.Manifest{Directory: dir}, 0, func(_ *agenttest.Client, opts *agent.Options) {
opts.EnvInfo = acpEnvInfo{home: home}
opts.Filesystem = afero.NewOsFs()
})
ctx := testutil.Context(t, testutil.WaitLong)
_, err := conn.ListACPHarnesses(ctx)
_, err = conn.ListACPHarnesses(ctx)
require.NoError(t, err)
tool := uuid.New()
conn.SetExtraHeaders(http.Header{
workspacesdk.CoderChatIDHeader: {uuid.NewString()},
})
ctx = workspacesdk.WithToolCallID(ctx, tool)
var catalog []workspacesdk.ACPHarness
require.Eventually(t, func() bool { catalog, err = conn.ListACPHarnesses(ctx); return err == nil && len(catalog) == 1 }, testutil.WaitLong, testutil.IntervalFast)
require.Eventually(t, func() bool { catalog, err = conn.ListACPHarnesses(ctx); return err == nil && len(catalog) == 2 }, testutil.WaitLong, testutil.IntervalFast)
require.Equal(t, "broken", catalog[0].Slug)
info, err := conn.CreateACPSession(ctx, workspacesdk.ACPCreateSessionRequest{HarnessSlug: "fake", WorkingDirectory: dir})
require.NoError(t, err)
events, closer, err := conn.WatchACPSession(ctx, testutil.Logger(t), info.ID, workspacesdk.ACPReadOptions{})
require.NoError(t, err)
defer closer.Close()
for {
event := testutil.RequireReceive(ctx, t, events)
if event.Kind == workspacesdk.ACPEventKindSnapshot {
require.Equal(t, info.ID, event.Session.ID)
break
}
}
require.Eventually(t, func() bool {
for _, push := range client.ContextStatePushes() {
for _, resource := range push.Resources {
Expand All @@ -51,3 +81,26 @@ func TestAgent_ACPInterface(t *testing.T) {
return false
}, testutil.WaitLong, testutil.IntervalFast, "context pushes must include the harness catalog")
}

// TestAgentACPHarness provides a real ACP transport for the full agent router.
//
//nolint:paralleltest // The helper branch owns stdout and exits directly.
func TestAgentACPHarness(t *testing.T) {
if os.Getenv("CODER_AGENT_ACP_TEST_HELPER") != "1" {
t.Parallel()
return
}
conn := acp.NewAgentSideConnection(agentACPHarness{}, os.Stdout, os.Stdin)
<-conn.Done()
os.Exit(0) //nolint:revive // Keep Go test output out of the ACP stream.
}

type agentACPHarness struct{ acp.Agent }

func (agentACPHarness) Initialize(context.Context, acp.InitializeRequest) (acp.InitializeResponse, error) {
return acp.InitializeResponse{ProtocolVersion: acp.ProtocolVersionNumber}, nil
}

func (agentACPHarness) NewSession(context.Context, acp.NewSessionRequest) (acp.NewSessionResponse, error) {
return acp.NewSessionResponse{SessionId: acp.SessionId(uuid.NewString())}, nil
}
2 changes: 2 additions & 0 deletions agent/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ func (a *agent) apiHandler(upgradeListener *httpUpgrader) http.Handler {
tracing.Middleware(nil, []string{"/", "/api", "/api/**", "/debug/**"}, "agent"),
loggermw.Logger(a.logger, nil),
agentchat.Middleware,
// Install WriteDeadlineMiddleware before tool call deduplication so retries also get the deadline.
a.acpAPI.WriteDeadlineMiddleware,
a.toolCalls.Middleware,
)
r.Get("/", func(rw http.ResponseWriter, r *http.Request) {
Expand Down
Loading
Loading