feat: fix tests

Author: 35C4n0r

e2e/echo_test.go

@@ -274,7 +274,7 @@ func TestE2E(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
 		defer cancel()
 
-		script, apiClient := setup(ctx, t, &params{
+		script, apiClient, cleanup := setup(ctx, t, &params{
 			cmdFn: func(ctx context.Context, t testing.TB, serverPort int, binaryPath, cwd, scriptFilePath string) (string, []string) {
 				return binaryPath, []string{
 					"server",
@@ -283,7 +283,8 @@ func TestE2E(t *testing.T) {
 					"--", "go", "run", filepath.Join(cwd, "acp_echo.go"), scriptFilePath,
 				}
 			},
-		})
+		}, true)
+		defer cleanup()
 		messageReq := agentapisdk.PostMessageParams{
 			Content: "This is a test message.",
 			Type:    agentapisdk.MessageTypeUser,

lib/httpapi/server.go

@@ -104,8 +104,8 @@ const snapshotInterval = 25 * time.Millisecond
 
 type ServerConfig struct {
 	AgentType              mf.AgentType
-	AgentIO        st.AgentIO
-	Transport      Transport
+	AgentIO                st.AgentIO
+	Transport              Transport
 	Port                   int
 	ChatBasePath           string
 	AllowedHosts           []string
@@ -274,18 +274,19 @@ func NewServer(ctx context.Context, config ServerConfig) (*Server, error) {
 			return nil, fmt.Errorf("PTY transport requires termexec.Process")
 		}
 		conversation = st.NewPTY(ctx, st.PTYConversationConfig{
-		AgentType:              config.AgentType,
-		AgentIO:                proc,
-		Clock:                  config.Clock,
-		SnapshotInterval:       snapshotInterval,
-		ScreenStabilityLength:  2 * time.Second,
-		FormatMessage:          formatMessage,
-		ReadyForInitialPrompt:  isAgentReadyForInitialPrompt,
-		FormatToolCall:         formatToolCall,
-		InitialPrompt:          initialPrompt,
-		Logger:                 logger,
-		StatePersistenceConfig: config.StatePersistenceConfig,
-	}, emitter)}
+			AgentType:              config.AgentType,
+			AgentIO:                proc,
+			Clock:                  config.Clock,
+			SnapshotInterval:       snapshotInterval,
+			ScreenStabilityLength:  2 * time.Second,
+			FormatMessage:          formatMessage,
+			ReadyForInitialPrompt:  isAgentReadyForInitialPrompt,
+			FormatToolCall:         formatToolCall,
+			InitialPrompt:          initialPrompt,
+			Logger:                 logger,
+			StatePersistenceConfig: config.StatePersistenceConfig,
+		}, emitter)
+	}
 
 	// Create temporary directory for uploads
 	tempDir, err := os.MkdirTemp("", "agentapi-uploads-")

lib/httpapi/server_test.go

@@ -964,7 +964,7 @@ func TestServer_Stop_Idempotency(t *testing.T) {
 
 	srv, err := httpapi.NewServer(ctx, httpapi.ServerConfig{
 		AgentType:      msgfmt.AgentTypeClaude,
-		Process:        nil,
+		AgentIO:        nil,
 		Port:           0,
 		ChatBasePath:   "/chat",
 		AllowedHosts:   []string{"*"},

lib/httpapi/setup.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"os/signal"
 	"strings"
+	"syscall"
+	"time"
 
 	"github.com/coder/agentapi/lib/logctx"
 	mf "github.com/coder/agentapi/lib/msgfmt"

x/acpio/acp_conversation_test.go

@@ -45,6 +45,8 @@ type mockEmitter struct {
 	lastScreen    string
 }
 
+func (m *mockEmitter) EmitError(_ string, _ screentracker.ErrorLevel) {}
+
 func newMockEmitter() *mockEmitter {
 	m := &mockEmitter{}
 	m.cond = sync.NewCond(&m.mu)