Merge branch 'main' into feat-icon-tooltip

Author: 35C4n0r

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.11.0
+
+### Features
+- Support sending initial prompt via stdin
+
 ## v0.10.2
 
 ### Features

MAINTAINERS.md

@@ -2,7 +2,11 @@
 
 ## Release Process
 
-Before performing a release, perform a local "smoke-test".
+Before performing a release, perform a local "smoke-test":
+
+  - For most changes, simply running `go test ./e2e` may be sufficient.
+  - For agent-specific changes, manual testing may be required.
+
 If everything seems OK, you can proceed to do the following:
 
 1. Update the version string in `internal/version/version.go` and run `make gen`.

chat/bun.lock

@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "chat",

chat/package.json

@@ -48,5 +48,5 @@
     "start": "next start",
     "storybook": "storybook dev -p 6006"
   },
-  "version": "0.10.2"
+  "version": "0.11.0"
 }

cmd/server/server.go

@@ -4,12 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
 	"log/slog"
 	"net/http"
 	"os"
 	"sort"
 	"strings"
 
+	"github.com/mattn/go-isatty"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"golang.org/x/xerrors"
@@ -88,6 +90,19 @@ func runServer(ctx context.Context, logger *slog.Logger, argsToPass []string) er
 		return xerrors.Errorf("term height must be at least 10")
 	}
 
+	// Read stdin if it's piped, to be used as initial prompt
+	initialPrompt := viper.GetString(FlagInitialPrompt)
+	if initialPrompt == "" {
+		if !isatty.IsTerminal(os.Stdin.Fd()) {
+			if stdinData, err := io.ReadAll(os.Stdin); err != nil {
+				return xerrors.Errorf("failed to read stdin: %w", err)
+			} else if len(stdinData) > 0 {
+				initialPrompt = string(stdinData)
+				logger.Info("Read initial prompt from stdin", "bytes", len(stdinData))
+			}
+		}
+	}
+
 	printOpenAPI := viper.GetBool(FlagPrintOpenAPI)
 	var process *termexec.Process
 	if printOpenAPI {
@@ -112,7 +127,7 @@ func runServer(ctx context.Context, logger *slog.Logger, argsToPass []string) er
 		ChatBasePath:   viper.GetString(FlagChatBasePath),
 		AllowedHosts:   viper.GetStringSlice(FlagAllowedHosts),
 		AllowedOrigins: viper.GetStringSlice(FlagAllowedOrigins),
-		InitialPrompt:  viper.GetString(FlagInitialPrompt),
+		InitialPrompt:  initialPrompt,
 	})
 	if err != nil {
 		return xerrors.Errorf("failed to create server: %w", err)
@@ -213,7 +228,7 @@ func CreateServerCmd() *cobra.Command {
 		{FlagAllowedHosts, "a", []string{"localhost", "127.0.0.1", "[::1]"}, "HTTP allowed hosts (hostnames only, no ports). Use '*' for all, comma-separated list via flag, space-separated list via AGENTAPI_ALLOWED_HOSTS env var", "stringSlice"},
 		// localhost:3284 is the default origin when you open the chat interface in your browser. localhost:3000 and 3001 are used during development.
 		{FlagAllowedOrigins, "o", []string{"http://localhost:3284", "http://localhost:3000", "http://localhost:3001"}, "HTTP allowed origins. Use '*' for all, comma-separated list via flag, space-separated list via AGENTAPI_ALLOWED_ORIGINS env var", "stringSlice"},
-		{FlagInitialPrompt, "I", "", "Initial prompt for the agent (recommended only if the agent doesn't support initial prompt in interaction mode)", "string"},
+		{FlagInitialPrompt, "I", "", "Initial prompt for the agent. Recommended only if the agent doesn't support initial prompt in interaction mode. Will be read from stdin if piped (e.g., echo 'prompt' | agentapi server -- my-agent)", "string"},
 	}
 
 	for _, spec := range flagSpecs {

e2e/echo_test.go

@@ -22,7 +22,7 @@ import (
 
 const (
 	testTimeout        = 30 * time.Second
-	operationTimeout   = 5 * time.Second
+	operationTimeout   = 10 * time.Second
 	healthCheckTimeout = 10 * time.Second
 )
 
@@ -40,15 +40,14 @@ func TestE2E(t *testing.T) {
 	t.Run("basic", func(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
 		defer cancel()
-		script, apiClient := setup(ctx, t)
-		require.NoError(t, waitAgentAPIStable(ctx, apiClient, operationTimeout))
+		script, apiClient := setup(ctx, t, nil)
 		messageReq := agentapisdk.PostMessageParams{
 			Content: "This is a test message.",
 			Type:    agentapisdk.MessageTypeUser,
 		}
 		_, err := apiClient.PostMessage(ctx, messageReq)
 		require.NoError(t, err, "Failed to send message via SDK")
-		require.NoError(t, waitAgentAPIStable(ctx, apiClient, operationTimeout))
+		require.NoError(t, waitAgentAPIStable(ctx, t, apiClient, operationTimeout, "post message"))
 		msgResp, err := apiClient.GetMessages(ctx)
 		require.NoError(t, err, "Failed to get messages via SDK")
 		require.Len(t, msgResp.Messages, 3)
@@ -61,7 +60,7 @@ func TestE2E(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
 		defer cancel()
 
-		script, apiClient := setup(ctx, t)
+		script, apiClient := setup(ctx, t, nil)
 		messageReq := agentapisdk.PostMessageParams{
 			Content: "What is the answer to life, the universe, and everything?",
 			Type:    agentapisdk.MessageTypeUser,
@@ -71,7 +70,7 @@ func TestE2E(t *testing.T) {
 		statusResp, err := apiClient.GetStatus(ctx)
 		require.NoError(t, err)
 		require.Equal(t, agentapisdk.StatusRunning, statusResp.Status)
-		require.NoError(t, waitAgentAPIStable(ctx, apiClient, 5*time.Second))
+		require.NoError(t, waitAgentAPIStable(ctx, t, apiClient, 5*time.Second, "post message"))
 		msgResp, err := apiClient.GetMessages(ctx)
 		require.NoError(t, err, "Failed to get messages via SDK")
 		require.Len(t, msgResp.Messages, 3)
@@ -82,11 +81,45 @@ func TestE2E(t *testing.T) {
 		require.Equal(t, script[1].ResponseMessage, strings.TrimSpace(parts[0]))
 		require.Equal(t, script[2].ResponseMessage, strings.TrimSpace(parts[1]))
 	})
+
+	t.Run("stdin", func(t *testing.T) {
+		ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
+		defer cancel()
+
+		script, apiClient := setup(ctx, t, &params{
+			cmdFn: func(ctx context.Context, t testing.TB, serverPort int, binaryPath, cwd, scriptFilePath string) (string, []string) {
+				defCmd, defArgs := defaultCmdFn(ctx, t, serverPort, binaryPath, cwd, scriptFilePath)
+				script := fmt.Sprintf(`echo "hello agent" | %s %s`, defCmd, strings.Join(defArgs, " "))
+				return "/bin/sh", []string{"-c", script}
+			},
+		})
+		require.NoError(t, waitAgentAPIStable(ctx, t, apiClient, 5*time.Second, "stdin"))
+		msgResp, err := apiClient.GetMessages(ctx)
+		require.NoError(t, err, "Failed to get messages via SDK")
+		require.Len(t, msgResp.Messages, 3)
+		require.Equal(t, script[0].ExpectMessage, strings.TrimSpace(msgResp.Messages[1].Content))
+		require.Equal(t, script[0].ResponseMessage, strings.TrimSpace(msgResp.Messages[2].Content))
+	})
+}
+
+type params struct {
+	cmdFn func(ctx context.Context, t testing.TB, serverPort int, binaryPath, cwd, scriptFilePath string) (string, []string)
 }
 
-func setup(ctx context.Context, t testing.TB) ([]ScriptEntry, *agentapisdk.Client) {
+func defaultCmdFn(ctx context.Context, t testing.TB, serverPort int, binaryPath, cwd, scriptFilePath string) (string, []string) {
+	return binaryPath, []string{"server", fmt.Sprintf("--port=%d", serverPort), "--", "go", "run", filepath.Join(cwd, "echo.go"), scriptFilePath}
+}
+
+func setup(ctx context.Context, t testing.TB, p *params) ([]ScriptEntry, *agentapisdk.Client) {
 	t.Helper()
 
+	if p == nil {
+		p = &params{}
+	}
+	if p.cmdFn == nil {
+		p.cmdFn = defaultCmdFn
+	}
+
 	scriptFilePath := filepath.Join("testdata", filepath.Base(t.Name())+".json")
 	data, err := os.ReadFile(scriptFilePath)
 	require.NoError(t, err, "Failed to read test script file: %s", scriptFilePath)
@@ -116,10 +149,9 @@ func setup(ctx context.Context, t testing.TB) ([]ScriptEntry, *agentapisdk.Clien
 	cwd, err := os.Getwd()
 	require.NoError(t, err, "Failed to get current working directory")
 
-	cmd := exec.CommandContext(ctx, binaryPath, "server",
-		fmt.Sprintf("--port=%d", serverPort),
-		"--",
-		"go", "run", filepath.Join(cwd, "echo.go"), scriptFilePath)
+	bin, args := p.cmdFn(ctx, t, serverPort, binaryPath, cwd, scriptFilePath)
+	t.Logf("Running command: %s %s", bin, strings.Join(args, " "))
+	cmd := exec.CommandContext(ctx, bin, args...)
 
 	// Capture output for debugging
 	stdout, err := cmd.StdoutPipe()
@@ -160,7 +192,7 @@ func setup(ctx context.Context, t testing.TB) ([]ScriptEntry, *agentapisdk.Clien
 	apiClient, err := agentapisdk.NewClient(serverURL)
 	require.NoError(t, err, "Failed to create agentapi SDK client")
 
-	require.NoError(t, waitAgentAPIStable(ctx, apiClient, operationTimeout))
+	require.NoError(t, waitAgentAPIStable(ctx, t, apiClient, operationTimeout, "setup"))
 	return script, apiClient
 }
 
@@ -198,24 +230,34 @@ func waitForServer(ctx context.Context, t testing.TB, url string, timeout time.D
 	}
 }
 
-func waitAgentAPIStable(ctx context.Context, apiClient *agentapisdk.Client, waitFor time.Duration) error {
+func waitAgentAPIStable(ctx context.Context, t testing.TB, apiClient *agentapisdk.Client, waitFor time.Duration, msg string) error {
+	t.Helper()
 	waitCtx, waitCancel := context.WithTimeout(ctx, waitFor)
 	defer waitCancel()
 
-	tick := time.NewTicker(100 * time.Millisecond)
-	defer tick.Stop()
+	start := time.Now()
+	var currStatus agentapisdk.AgentStatus
+	defer func() {
+		elapsed := time.Since(start)
+		t.Logf("%s: agent API status: %s (elapsed: %s)", msg, currStatus, elapsed.Round(100*time.Millisecond))
+	}()
+	evts, errs, err := apiClient.SubscribeEvents(ctx)
+	require.NoError(t, err, "failed to subscribe to events")
 	for {
 		select {
 		case <-waitCtx.Done():
 			return waitCtx.Err()
-		case <-tick.C:
-			sr, err := apiClient.GetStatus(ctx)
-			if err != nil {
-				continue
-			}
-			if sr.Status == agentapisdk.StatusStable {
-				return nil
+		case evt := <-evts:
+			if esc, ok := evt.(agentapisdk.EventStatusChange); ok {
+				currStatus = esc.Status
+				if currStatus == agentapisdk.StatusStable {
+					return nil
+				}
+			} else {
+				t.Logf("Got %T event", evt)
 			}
+		case err := <-errs:
+			return fmt.Errorf("read events: %w", err)
 		}
 	}
 }

e2e/testdata/stdin.json

@@ -0,0 +1,6 @@
+[
+  {
+    "expectMessage": "hello agent",
+    "responseMessage": "Hello! I'm ready to help you. Please send me a message to echo back."
+  }
+]

internal/version/version.go

@@ -2,4 +2,4 @@
 
 package version
 
-var Version = "0.10.2"
+var Version = "0.11.0"

lib/httpapi/server.go

@@ -326,6 +326,7 @@ func (s *Server) StartSnapshotLoop(ctx context.Context) {
 
 			// Send initial prompt when agent becomes stable for the first time
 			if !s.conversation.InitialPromptSent && convertStatus(currentStatus) == AgentStatusStable {
+
 				if err := s.conversation.SendMessage(FormatMessage(s.agentType, s.conversation.InitialPrompt)...); err != nil {
 					s.logger.Error("Failed to send initial prompt", "error", err)
 				} else {

lib/msgfmt/message_box.go

@@ -70,8 +70,8 @@ func removeOpencodeMessageBox(msg string) string {
 	//  ┃                                                                      ┃
 	// We only check for the first ┃ and then an empty line above it - as sometimes the full input block does not load within a snapshot,
 	// this leads to displaying a bunch of newlines.
-	for i := len(lines) - 1; i >= 1; i-- {
-		if strings.TrimSpace(lines[i-1]) == "" &&
+	for i := len(lines) - 1; i >= 2; i-- {
+		if strings.ReplaceAll(lines[i-2], " ", "") != "┃┃" &&
 			strings.ReplaceAll(lines[i], " ", "") == "┃┃" {
 			lines = lines[:i-1]
 			break