Merge pull request #443 from dgageot/fix-cagent-run

Fix cagent run

Author: dgageot

cmd/root/api.go

@@ -5,6 +5,7 @@ import (
 	"log/slog"
 	"net"
 	"os"
+	"path/filepath"
 
 	"github.com/spf13/cobra"
 
@@ -78,6 +79,8 @@ func runHttp(cmd *cobra.Command, args []string) error {
 	}
 	if stat.IsDir() {
 		opts = append(opts, server.WithAgentsDir(agentsPath))
+	} else {
+		opts = append(opts, server.WithAgentsDir(filepath.Dir(agentsPath)))
 	}
 
 	teams, err := teamloader.LoadTeams(ctx, agentsPath, runConfig)

pkg/server/server.go

@@ -1031,39 +1031,30 @@ func (s *Server) runAgent(c echo.Context) error {
 		slog.Debug("Runtime created for session", "session_id", sess.ID)
 	}
 
-	var messages []api.Message
-	if err := json.NewDecoder(c.Request().Body).Decode(&messages); err != nil {
-		return jsonErr(c, http.StatusBadRequest, "invalid request body")
-	}
-
-	// TODO(dga): for now, we only receive one message and it's always a user message.
-	for _, msg := range messages {
-		sess.AddMessage(session.UserMessage(agentFilename, msg.Content))
-		// Optional: run using a named command (?command=name)
-		if cmd := strings.TrimSpace(c.QueryParam("command")); cmd != "" {
-			cmds := agent.Commands()
-			if len(cmds) == 0 {
-				return c.JSON(http.StatusBadRequest, map[string]string{"error": fmt.Sprintf("agent '%s' has no commands", currentAgent)})
-			}
-			text, ok := cmds[cmd]
-			if !ok {
-				var names []string
-				for k := range cmds {
-					names = append(names, k)
-				}
-				sort.Strings(names)
-				return c.JSON(http.StatusBadRequest, map[string]string{"error": fmt.Sprintf("unknown command '%s'. Available: %s", cmd, strings.Join(names, ", "))})
-			}
-			sess.AddMessage(session.UserMessage(agentFilename, text))
-		} else {
-			var messages []api.Message
-			if err := json.NewDecoder(c.Request().Body).Decode(&messages); err != nil {
-				return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid request body"})
-			}
-			// TODO(dga): for now, we only receive one message and it's always a user message.
-			for _, msg := range messages {
-				sess.AddMessage(session.UserMessage(agentFilename, msg.Content))
+	if cmd := strings.TrimSpace(c.QueryParam("command")); cmd != "" {
+		cmds := agent.Commands()
+		if len(cmds) == 0 {
+			return c.JSON(http.StatusBadRequest, map[string]string{"error": fmt.Sprintf("agent '%s' has no commands", currentAgent)})
+		}
+		text, ok := cmds[cmd]
+		if !ok {
+			var names []string
+			for k := range cmds {
+				names = append(names, k)
 			}
+			sort.Strings(names)
+			return c.JSON(http.StatusBadRequest, map[string]string{"error": fmt.Sprintf("unknown command '%s'. Available: %s", cmd, strings.Join(names, ", "))})
+		}
+		sess.AddMessage(session.UserMessage(agentFilename, text))
+	} else {
+		// TODO(dga): for now, we only receive one message and it's always a user message.
+		var messages []api.Message
+		if err := json.NewDecoder(c.Request().Body).Decode(&messages); err != nil {
+			return jsonErr(c, http.StatusBadRequest, "invalid request body")
+		}
+
+		for _, msg := range messages {
+			sess.AddMessage(session.UserMessage(agentFilename, msg.Content))
 		}
 	}