checkpoint

Signed-off-by: Jeff Ortel <[email protected]>

command/cmd.go

@@ -41,7 +41,7 @@ func (r *Command) Run() (err error) {
 // The command and output are both reported in
 // task Report.Activity.
 func (r *Command) RunWith(ctx context.Context) (err error) {
-	r.Writer.reporter = r.Reporter
+	r.Writer.reporter = &r.Reporter
 	r.Reporter.Run(r.Path, r.Options)
 	defer func() {
 		r.Writer.End()

command/reporter.go

@@ -95,6 +95,9 @@ func (r *Reporter) Output(buffer []byte, delimited bool) {
 	case Error:
 	case Default:
 	case LiveOutput:
+		if r.index >= len(buffer) {
+			return
+		}
 		batch := string(buffer[r.index:])
 		if delimited {
 			end := strings.LastIndex(batch, "\n")
@@ -108,7 +111,7 @@ func (r *Reporter) Output(buffer []byte, delimited bool) {
 		} else {
 			output := r.Filter(batch)
 			addon.Activity("> %s", output)
-			r.index += len(batch)
+			r.index = len(buffer)
 		}
 	}
 }

command/writer.go

@@ -16,7 +16,7 @@ type ByteFilter func(in []byte) (out []byte)
 // Writer records command output.
 type Writer struct {
 	Filter   ByteFilter
-	reporter Reporter
+	reporter *Reporter
 	buffer   []byte
 	end      chan any
 	ended    chan any