Include initial prompt when interpolating {{input}} in prompt.yaml files

cmd/run/run.go

@@ -270,10 +270,12 @@ func NewRunCommand(cfg *command.Config) *cobra.Command {
 			if isPipe(os.Stdin) {
 				promptFromPipe, _ := io.ReadAll(os.Stdin)
 				if len(promptFromPipe) > 0 {
+					singleShot = true
 					pipedContent = strings.TrimSpace(string(promptFromPipe))
-					if pf == nil {
+					if initialPrompt != "" {
 						initialPrompt = initialPrompt + "\n" + pipedContent
-						singleShot = true
+					} else {
+						initialPrompt = pipedContent
 					}
 				}
 			}
@@ -291,8 +293,8 @@ func NewRunCommand(cfg *command.Config) *cobra.Command {
 			if pf != nil {
 				for _, m := range pf.Messages {
 					content := m.Content
-					if pipedContent != "" && strings.ToLower(m.Role) == "user" {
-						content = strings.ReplaceAll(content, "{{input}}", pipedContent)
+					if strings.ToLower(m.Role) == "user" {
+						content = strings.ReplaceAll(content, "{{input}}", initialPrompt)
 					}
 					switch strings.ToLower(m.Role) {
 					case "system":

cmd/run/run_test.go

@@ -149,7 +149,7 @@ messages:
 		require.Contains(t, out.String(), reply) // response streamed to output
 	})
 
-	t.Run("--file with {{input}} placeholder is substituted with stdin", func(t *testing.T) {
+	t.Run("--file with {{input}} placeholder is substituted with initial prompt and stdin", func(t *testing.T) {
 		const yamlBody = `
 name: Summarizer
 description: Summarizes input text
@@ -208,18 +208,21 @@ messages:
 
 		out := new(bytes.Buffer)
 		cfg := command.NewConfig(out, out, client, true, 100)
+
+		initialPrompt := "Please summarize the provided text."
 		runCmd := NewRunCommand(cfg)
 		runCmd.SetArgs([]string{
 			"--file", tmp.Name(),
 			azuremodels.FormatIdentifier("openai", "test-model"),
+			initialPrompt,
 		})
 
 		_, err = runCmd.ExecuteC()
 		require.NoError(t, err)
 
 		require.Len(t, capturedReq.Messages, 3)
 		require.Equal(t, "You are a text summarizer.", *capturedReq.Messages[0].Content)
-		require.Equal(t, piped, *capturedReq.Messages[1].Content) // {{input}} -> "Hello there!"
+		require.Equal(t, initialPrompt+"\n"+piped, *capturedReq.Messages[1].Content) // {{input}} -> "Please summarize the provided text.\nHello there!"
 
 		require.Contains(t, out.String(), reply)
 	})

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/text v0.23.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -49,5 +50,4 @@ require (
 	golang.org/x/net v0.38.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/term v0.30.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )