feat: check for conflicting ACP and state persistence flags

Author: 35C4n0r

cmd/server/server.go

@@ -135,6 +135,12 @@ func runServer(ctx context.Context, logger *slog.Logger, argsToPass []string) er
 		}
 	}
 
+	experimentalACP := viper.GetBool(FlagExperimentalACP)
+
+	if experimentalACP && (saveState || loadState) {
+		return xerrors.Errorf("ACP mode doesn't support state persistence")
+	}
+
 	pidFile := viper.GetString(FlagPidFile)
 
 	// Write PID file if configured
@@ -146,7 +152,6 @@ func runServer(ctx context.Context, logger *slog.Logger, argsToPass []string) er
 	}
 
 	printOpenAPI := viper.GetBool(FlagPrintOpenAPI)
-	experimentalACP := viper.GetBool(FlagExperimentalACP)
 
 	if printOpenAPI && experimentalACP {
 		return xerrors.Errorf("flags --%s and --%s are mutually exclusive", FlagPrintOpenAPI, FlagExperimentalACP)
@@ -222,17 +227,17 @@ func runServer(ctx context.Context, logger *slog.Logger, argsToPass []string) er
 	// Monitor process exit
 	processExitCh := make(chan error, 1)
 	if process != nil {
-	go func() {
-		defer close(processExitCh)
-		defer gracefulCancel()
-		if err := process.Wait(); err != nil {
-			if errors.Is(err, termexec.ErrNonZeroExitCode) {
-				processExitCh <- xerrors.Errorf("========\n%s\n========\n: %w", strings.TrimSpace(process.ReadScreen()), err)
-			} else {
-				processExitCh <- xerrors.Errorf("failed to wait for process: %w", err)
+		go func() {
+			defer close(processExitCh)
+			defer gracefulCancel()
+			if err := process.Wait(); err != nil {
+				if errors.Is(err, termexec.ErrNonZeroExitCode) {
+					processExitCh <- xerrors.Errorf("========\n%s\n========\n: %w", strings.TrimSpace(process.ReadScreen()), err)
+				} else {
+					processExitCh <- xerrors.Errorf("failed to wait for process: %w", err)
+				}
 			}
-		}
-	}()
+		}()
 	}
 	if acpResult != nil {
 		go func() {
@@ -362,20 +367,20 @@ type flagSpec struct {
 }
 
 const (
-	FlagType           = "type"
-	FlagPort           = "port"
-	FlagPrintOpenAPI   = "print-openapi"
-	FlagChatBasePath   = "chat-base-path"
-	FlagTermWidth      = "term-width"
-	FlagTermHeight     = "term-height"
-	FlagAllowedHosts   = "allowed-hosts"
-	FlagAllowedOrigins = "allowed-origins"
-	FlagExit           = "exit"
-	FlagInitialPrompt  = "initial-prompt"
-	FlagStateFile      = "state-file"
-	FlagLoadState      = "load-state"
-	FlagSaveState      = "save-state"
-	FlagPidFile        = "pid-file"
+	FlagType            = "type"
+	FlagPort            = "port"
+	FlagPrintOpenAPI    = "print-openapi"
+	FlagChatBasePath    = "chat-base-path"
+	FlagTermWidth       = "term-width"
+	FlagTermHeight      = "term-height"
+	FlagAllowedHosts    = "allowed-hosts"
+	FlagAllowedOrigins  = "allowed-origins"
+	FlagExit            = "exit"
+	FlagInitialPrompt   = "initial-prompt"
+	FlagStateFile       = "state-file"
+	FlagLoadState       = "load-state"
+	FlagSaveState       = "save-state"
+	FlagPidFile         = "pid-file"
 	FlagExperimentalACP = "experimental-acp"
 )
 

x/acpio/acp_conversation.go

@@ -10,6 +10,7 @@ import (
 
 	st "github.com/coder/agentapi/lib/screentracker"
 	"github.com/coder/quartz"
+	"golang.org/x/xerrors"
 )
 
 // Compile-time assertion that ACPConversation implements st.Conversation
@@ -31,9 +32,9 @@ type ACPConversation struct {
 	cancel            context.CancelFunc
 	agentIO           ChunkableAgentIO
 	messages          []st.ConversationMessage
-	nextID            int  // monotonically increasing message ID
+	nextID            int           // monotonically increasing message ID
 	prompting         bool          // true while agent is processing
-	chunkReceived     chan struct{}  // signals that handleChunk has accumulated a chunk
+	chunkReceived     chan struct{} // signals that handleChunk has accumulated a chunk
 	streamingResponse strings.Builder
 	logger            *slog.Logger
 	emitter           st.Emitter
@@ -47,6 +48,7 @@ type noopEmitter struct{}
 func (noopEmitter) EmitMessages([]st.ConversationMessage) {}
 func (noopEmitter) EmitStatus(st.ConversationStatus)      {}
 func (noopEmitter) EmitScreen(string)                     {}
+func (noopEmitter) EmitError(_ string, _ st.ErrorLevel)   {}
 
 // NewACPConversation creates a new ACPConversation.
 // If emitter is provided, it will receive events when messages/status/screen change.
@@ -284,3 +286,7 @@ func (c *ACPConversation) executePrompt(messageParts []st.MessagePart) error {
 	c.logger.Debug("ACPConversation message complete", "responseLen", len(response))
 	return nil
 }
+
+func (c *ACPConversation) SaveState() error {
+	return xerrors.Errorf("ACP mode doesn't support state persistence")
+}