Merge pull request #888 from dgageot/remove-duplication

Remove duplication

Author: dgageot

cmd/root/new.go

@@ -1,6 +1,7 @@
 package root
 
 import (
+	"context"
 	"strings"
 
 	tea "charm.land/bubbletea/v2"
@@ -54,7 +55,7 @@ func (f *newFlags) runNewCommand(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	var prompt *string
+	var firstMessage *string
 	opts := []session.Opt{
 		session.WithTitle("New agent"),
 		session.WithMaxIterations(f.maxIterationsParam),
@@ -63,12 +64,16 @@ func (f *newFlags) runNewCommand(cmd *cobra.Command, args []string) error {
 	if len(args) > 0 {
 		arg := strings.Join(args, " ")
 		opts = append(opts, session.WithUserMessage("", arg))
-		prompt = &arg
+		firstMessage = &arg
 	}
 
 	sess := session.New(opts...)
 
-	a := app.New(ctx, "", rt, sess, prompt)
+	return runTUI(ctx, "", rt, sess, firstMessage)
+}
+
+func runTUI(ctx context.Context, agentFilename string, rt runtime.Runtime, sess *session.Session, firstMessage *string) error {
+	a := app.New(ctx, agentFilename, rt, sess, firstMessage)
 	m := tui.New(a)
 
 	progOpts := []tea.ProgramOption{
@@ -79,6 +84,6 @@ func (f *newFlags) runNewCommand(cmd *cobra.Command, args []string) error {
 
 	go a.Subscribe(ctx, p)
 
-	_, err = p.Run()
+	_, err := p.Run()
 	return err
 }

cmd/root/run.go

@@ -8,20 +8,17 @@ import (
 	"log/slog"
 	"os"
 
-	tea "charm.land/bubbletea/v2"
 	"github.com/spf13/cobra"
 	"go.opentelemetry.io/otel"
 
 	"github.com/docker/cagent/pkg/agentfile"
-	"github.com/docker/cagent/pkg/app"
 	"github.com/docker/cagent/pkg/cli"
 	"github.com/docker/cagent/pkg/config"
 	"github.com/docker/cagent/pkg/runtime"
 	"github.com/docker/cagent/pkg/session"
 	"github.com/docker/cagent/pkg/team"
 	"github.com/docker/cagent/pkg/teamloader"
 	"github.com/docker/cagent/pkg/telemetry"
-	"github.com/docker/cagent/pkg/tui"
 )
 
 //go:embed default-agent.yaml
@@ -240,17 +237,5 @@ func handleRunMode(ctx context.Context, agentFilename string, rt runtime.Runtime
 		return err
 	}
 
-	a := app.New(ctx, agentFilename, rt, sess, firstMessage)
-	m := tui.New(a)
-
-	progOpts := []tea.ProgramOption{
-		tea.WithContext(ctx),
-	}
-
-	p := tea.NewProgram(m, progOpts...)
-
-	go a.Subscribe(ctx, p)
-
-	_, err = p.Run()
-	return err
+	return runTUI(ctx, agentFilename, rt, sess, firstMessage)
 }