chore: refactor InteractionType and error

Author: 35C4n0r

cmd/server/server.go

@@ -70,7 +70,7 @@ func parseAgentType(firstArg string, agentTypeVar string) (AgentType, error) {
 }
 
 func parseInteractionType(interactionModeVar string) (types.InteractionType, error) {
-	return types.CLIInteractionType, nil
+	return types.InteractionTypeCLI, nil
 }
 
 func runServer(ctx context.Context, logger *slog.Logger, argsToPass []string) error {

lib/httpapi/server.go

@@ -195,12 +195,12 @@ func NewServer(ctx context.Context, config ServerConfig) (*Server, error) {
 	}
 
 	// Get the appropriate Interaction Handler
-	if config.InteractionType == types.CLIInteractionType {
+	if config.InteractionType == types.InteractionTypeCLI {
 		s.AgentHandler = cli.NewCLIHandler(ctx, logger, config.Process, config.AgentType)
-	} else if config.InteractionType == types.SDKInteractionType {
+	} else if config.InteractionType == types.InteractionTypeSDK {
 		// TODO add a SDKHandler for SDK
 	} else {
-		return nil, xerrors.Errorf("%s", config.InteractionType)
+		return nil, xerrors.Errorf("unknown interaction type %q", config.InteractionType)
 	}
 
 	// Register API routes

lib/httpapi/server_test.go

@@ -55,7 +55,7 @@ func TestOpenAPISchema(t *testing.T) {
 		ChatBasePath:    "/chat",
 		AllowedHosts:    []string{"*"},
 		AllowedOrigins:  []string{"*"},
-		InteractionType: types.CLIInteractionType,
+		InteractionType: types.InteractionTypeCLI,
 	})
 	require.NoError(t, err)
 	currentSchemaStr := srv.GetOpenAPI()
@@ -108,7 +108,7 @@ func TestServer_redirectToChat(t *testing.T) {
 				ChatBasePath:    tc.chatBasePath,
 				AllowedHosts:    []string{"*"},
 				AllowedOrigins:  []string{"*"},
-				InteractionType: types.CLIInteractionType,
+				InteractionType: types.InteractionTypeCLI,
 			})
 			require.NoError(t, err)
 			tsServer := httptest.NewServer(s.Handler())
@@ -273,7 +273,7 @@ func TestServer_AllowedHosts(t *testing.T) {
 				ChatBasePath:    "/chat",
 				AllowedHosts:    tc.allowedHosts,
 				AllowedOrigins:  []string{"https://example.com"}, // Set a default to isolate host testing
-				InteractionType: types.CLIInteractionType,
+				InteractionType: types.InteractionTypeCLI,
 			})
 			if tc.validationErrorMsg != "" {
 				require.Error(t, err)
@@ -357,7 +357,7 @@ func TestServer_CORSPreflightWithHosts(t *testing.T) {
 				ChatBasePath:    "/chat",
 				AllowedHosts:    tc.allowedHosts,
 				AllowedOrigins:  []string{"*"}, // Set wildcard origins to isolate host testing
-				InteractionType: types.CLIInteractionType,
+				InteractionType: types.InteractionTypeCLI,
 			})
 			require.NoError(t, err)
 			tsServer := httptest.NewServer(s.Handler())
@@ -517,7 +517,7 @@ func TestServer_CORSOrigins(t *testing.T) {
 				ChatBasePath:    "/chat",
 				AllowedHosts:    []string{"*"}, // Set wildcard to isolate CORS testing
 				AllowedOrigins:  tc.allowedOrigins,
-				InteractionType: types.CLIInteractionType,
+				InteractionType: types.InteractionTypeCLI,
 			})
 			if tc.validationErrorMsg != "" {
 				require.Error(t, err)
@@ -598,7 +598,7 @@ func TestServer_CORSPreflightOrigins(t *testing.T) {
 				ChatBasePath:    "/chat",
 				AllowedHosts:    []string{"*"}, // Set wildcard to isolate CORS testing
 				AllowedOrigins:  tc.allowedOrigins,
-				InteractionType: types.CLIInteractionType,
+				InteractionType: types.InteractionTypeCLI,
 			})
 			require.NoError(t, err)
 			tsServer := httptest.NewServer(s.Handler())
@@ -650,7 +650,7 @@ func TestServer_SSEMiddleware_Events(t *testing.T) {
 		ChatBasePath:    "/chat",
 		AllowedHosts:    []string{"*"},
 		AllowedOrigins:  []string{"*"},
-		InteractionType: types.CLIInteractionType,
+		InteractionType: types.InteractionTypeCLI,
 	})
 	require.NoError(t, err)
 	tsServer := httptest.NewServer(srv.Handler())

lib/types/conversation.go

@@ -33,8 +33,8 @@ func (c ConversationRole) Schema(r huma.Registry) *huma.Schema {
 type InteractionType string
 
 const (
-	SDKInteractionType InteractionType = "sdk"
-	CLIInteractionType InteractionType = "cli"
+	InteractionTypeSDK InteractionType = "sdk"
+	InteractionTypeCLI InteractionType = "cli"
 )
 
 type MessageType string