fix: interactive console commands that span multiple lines

fixes: #4809

Author: stuartwdouglas

internal/terminal/interactive.go

@@ -29,28 +29,28 @@ type KongContextBinder func(ctx context.Context, kctx *kong.Context) context.Con
 type exitPanic struct{}
 
 type interactiveConsole struct {
-	projectConfig projectconfig.Config
-	l             *readline.Instance
-	binder        KongContextBinder
-	k             *kong.Kong
-	closeWait     sync.WaitGroup
-	closed        bool
+	projectConfig       projectconfig.Config
+	l                   *readline.Instance
+	binder              KongContextBinder
+	k                   *kong.Kong
+	closeWait           sync.WaitGroup
+	closed              bool
+	currentLineCallback func(string)
 }
 
 func newInteractiveConsole(k *kong.Kong, binder KongContextBinder, projectConfig projectconfig.Config, eventSource *schemaeventsource.EventSource) (*interactiveConsole, error) {
+	it := &interactiveConsole{k: k, binder: binder, projectConfig: projectConfig}
 	l, err := readline.NewEx(&readline.Config{
 		Prompt:          interactivePrompt,
 		InterruptPrompt: "^C",
 		AutoComplete:    &FTLCompletion{app: k, view: eventSource.ViewOnly()},
-		Listener: &ExitListener{cancel: func() {
-			_ = syscall.Kill(-syscall.Getpid(), syscall.SIGINT) //nolint:forcetypeassert,errcheck // best effort
-		}},
+		Listener:        it,
 	})
+	it.l = l
 	if err != nil {
 		return nil, fmt.Errorf("init readline: %w", err)
 	}
 
-	it := &interactiveConsole{k: k, binder: binder, l: l, projectConfig: projectConfig}
 	it.closeWait.Add(1)
 	return it, nil
 }
@@ -98,7 +98,6 @@ func (r *interactiveConsole) run(ctx context.Context) error {
 	if tsm, ok = sm.(*terminalStatusManager); ok {
 		tsm.statusLock.Lock()
 		tsm.clearStatusMessages()
-		tsm.console = true
 		tsm.consoleRefresh = r.l.Refresh
 		tsm.recalculateLines()
 		tsm.statusLock.Unlock()
@@ -117,6 +116,7 @@ func (r *interactiveConsole) run(ctx context.Context) error {
 	}
 
 	for {
+		l.Operation.String()
 		line, err := l.Readline()
 		if errors.Is(err, readline.ErrInterrupt) {
 
@@ -193,15 +193,12 @@ func (r *interactiveConsole) run(ctx context.Context) error {
 	return nil
 }
 
-var _ readline.Listener = &ExitListener{}
-
-type ExitListener struct {
-	cancel func()
-}
-
-func (e ExitListener) OnChange(line []rune, pos int, key rune) (newLine []rune, newPos int, ok bool) {
+func (e *interactiveConsole) OnChange(line []rune, pos int, key rune) (newLine []rune, newPos int, ok bool) {
 	if key == readline.CharInterrupt {
-		e.cancel()
+		_ = syscall.Kill(-syscall.Getpid(), syscall.SIGINT) //nolint:forcetypeassert,errcheck // best effort
+	}
+	if e.currentLineCallback != nil {
+		e.currentLineCallback(string(line))
 	}
 	return line, pos, true
 }

internal/terminal/status.go

@@ -112,10 +112,10 @@ type terminalStatusManager struct {
 	height             int
 	width              int
 	exitWait           sync.WaitGroup
-	console            bool
 	consoleRefresh     func()
 	spinnerCount       int
 	interactiveConsole optional.Option[*interactiveConsole]
+	interactiveLines   int
 }
 
 type statusKey struct{}
@@ -283,11 +283,14 @@ func (r *terminalStatusManager) clearStatusMessages() {
 		return
 	}
 	count := r.totalStatusLines
-	if r.console {
-		count--
+	if r.interactiveConsole.Ok() {
+		// With the interactive console the cursor sits on the last line, so we just clear, we don't move up
+		r.underlyingWrite(ansiClearLine)
+	} else {
+		// Without the interactive console the cursor sits on an empty line by itself
+		r.underlyingWrite(ansiUpOneLine + ansiClearLine)
 	}
-	r.underlyingWrite(ansiClearLine)
-	for range count {
+	for range count - 1 {
 		r.underlyingWrite(ansiUpOneLine + ansiClearLine)
 	}
 }
@@ -421,6 +424,10 @@ func (r *terminalStatusManager) redrawStatus() {
 		}
 	}
 	if r.consoleRefresh != nil {
+		// If there is more than one line we need to actually make space for it to render
+		for range r.interactiveLines - 1 {
+			r.underlyingWrite("\n")
+		}
 		r.consoleRefresh()
 	}
 }
@@ -471,9 +478,7 @@ func (r *terminalStatusManager) recalculateLines() {
 			total += countLines(i.prefix+i.message+i.suffix, r.width)
 		}
 	}
-	if r.console {
-		total++
-	}
+	total += r.interactiveLines
 	r.totalStatusLines = total
 	r.redrawStatus()
 }
@@ -540,6 +545,21 @@ func LaunchEmbeddedConsole(ctx context.Context, k *kong.Kong, binder KongContext
 			fmt.Printf("\033[31mError: %s\033[0m\n", err)
 			return
 		}
+		it.currentLineCallback = func(s string) {
+			lines := countLines("> "+s, tsm.width) + 1
+			if lines != tsm.interactiveLines {
+				tsm.statusLock.Lock()
+				defer tsm.statusLock.Unlock()
+				if lines > tsm.interactiveLines {
+					// Enter has already been pressed, so we need to add the lines to the total
+					// This is so that it actually gets cleared
+					tsm.totalStatusLines += lines - tsm.interactiveLines
+				}
+				tsm.interactiveLines = lines
+				tsm.recalculateLines()
+			}
+		}
+		tsm.interactiveLines = 1
 		tsm.interactiveConsole = optional.Some(it)
 		go func() {
 			err := it.run(ctx)