refactor: migrates to a new simpler executor

Author: nxtcoder17

Runfile.yml

@@ -18,18 +18,13 @@ tasks:
     cmd: 
       - echo "hello world"
 
-  test:old:
-    cmd:
-      - go test -json ./pkg/runfile | gotestfmt
-
   test:
     env:
       pattern:
         default: ""
       only_failing:
         default: false
     watch:
-      enable: true
       dir:
         - ./parser
       onlySuffixes:
@@ -42,8 +37,11 @@ tasks:
         testfmt_args=""
         [ "$only_failing" = "true" ] && testfmt_args="--hide successful-tests"
 
-        go test -json ./pkg/runfile/... $pattern_args | gotestfmt $testfmt_args
+        go test -json ./pkg/runfile/resolver/... $pattern_args | gotestfmt $testfmt_args
+        go test -json ./pkg/executor/... $pattern_args | gotestfmt $testfmt_args
 
   test:only-failing:
     cmd:
-      - go test -json ./pkg/runfile | gotestfmt --hide successful-tests
+      - go test -json ./pkg/runfile/resolver/... | gotestfmt --hide successful-tests
+        go test -json ./pkg/executor/... $pattern_args | gotestfmt --hide successful-tests
+

examples/Runfile.yml

@@ -123,3 +123,8 @@ tasks:
       - run: first-and-second
       - echo "Hello World"
 
+  node:
+    interactive: true
+    cmd:
+      - node
+

go.mod

@@ -13,13 +13,14 @@ require (
 	github.com/nxtcoder17/fwatcher v1.2.2-0.20250804201159-543ad31be162
 	github.com/nxtcoder17/go.errors v0.0.0-20251116060059-d31bd582d4c8
 	github.com/urfave/cli/v3 v3.0.0-beta1
-	golang.org/x/term v0.32.0
+	golang.org/x/term v0.39.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/charmbracelet/x/ansi v0.4.2 // indirect
+	github.com/creack/pty v1.1.24 // indirect
 	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
@@ -32,6 +33,7 @@ require (
 	github.com/samber/lo v1.47.0 // indirect
 	github.com/samber/slog-common v0.18.1 // indirect
 	github.com/samber/slog-zerolog/v2 v2.7.3 // indirect
-	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/sys v0.40.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 )

go.sum

@@ -11,6 +11,8 @@ github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOY
 github.com/charmbracelet/x/ansi v0.4.2 h1:0JM6Aj/g/KC154/gOP4vfxun0ff6itogDYk41kof+qk=
 github.com/charmbracelet/x/ansi v0.4.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
+github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
@@ -38,12 +40,6 @@ github.com/nxtcoder17/fastlog v0.0.0-20251112144402-5324a708e570 h1:uiafpAq+4R/W
 github.com/nxtcoder17/fastlog v0.0.0-20251112144402-5324a708e570/go.mod h1:x6o+8WEHRGaWu9XEhSdTrjmDjKhVnKNXd/XZ56bNN/o=
 github.com/nxtcoder17/fwatcher v1.2.2-0.20250804201159-543ad31be162 h1:7EHTiBm6MVUMzT8pdeavpXcxwzzIbDC0QJwre6OvGAk=
 github.com/nxtcoder17/fwatcher v1.2.2-0.20250804201159-543ad31be162/go.mod h1:SMwIdCpyi5fBygrkCX8hIIUeILzgoxJFaDSlhFBOWWQ=
-github.com/nxtcoder17/go.errors v0.0.0-20251113120002-a0f554f5bc7e h1:CaipKbo8QLN+xmebk7JUy+HJE6v6KjCyVHRuNSBVV8Q=
-github.com/nxtcoder17/go.errors v0.0.0-20251113120002-a0f554f5bc7e/go.mod h1:9gp0I4JikKZGKflgPqqXCPZlIznVzlPWmnv+CWIrdxE=
-github.com/nxtcoder17/go.errors v0.0.0-20251116055045-656c03e9c6a6 h1:KzDMvpFNcEtd0Pbsun6qPkUg+lHKovDmUYsldlnCFWk=
-github.com/nxtcoder17/go.errors v0.0.0-20251116055045-656c03e9c6a6/go.mod h1:9gp0I4JikKZGKflgPqqXCPZlIznVzlPWmnv+CWIrdxE=
-github.com/nxtcoder17/go.errors v0.0.0-20251116055423-b54e4f346408 h1:uiAn9JS/vVvFtnEissR0sSIduvz+W2jQ9bdvwbvlBfo=
-github.com/nxtcoder17/go.errors v0.0.0-20251116055423-b54e4f346408/go.mod h1:9gp0I4JikKZGKflgPqqXCPZlIznVzlPWmnv+CWIrdxE=
 github.com/nxtcoder17/go.errors v0.0.0-20251116060059-d31bd582d4c8 h1:C1vUEvYbbpofqK4xnbEU1htxZl66myq6ZJfHpcdA/GQ=
 github.com/nxtcoder17/go.errors v0.0.0-20251116060059-d31bd582d4c8/go.mod h1:9gp0I4JikKZGKflgPqqXCPZlIznVzlPWmnv+CWIrdxE=
 github.com/nxtcoder17/go.pkgs v0.0.0-20250216034729-39e2d2cd48da h1:Y6GILHFlrihVfDqDPQ98y2kdUeI0SQc8tnoXh2NbEIA=
@@ -67,13 +63,19 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/urfave/cli/v3 v3.0.0-beta1 h1:6DTaaUarcM0wX7qj5Hcvs+5Dm3dyUTBbEwIWAjcw9Zg=
 github.com/urfave/cli/v3 v3.0.0-beta1/go.mod h1:FnIeEMYu+ko8zP1F9Ypr3xkZMIDqW3DR92yUtY39q1Y=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
+golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
 golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
+golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
+golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
 golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

nixy.yml

@@ -3,6 +3,9 @@ nixpkgs:
 
 packages:
   - go
-
   - pre-commit
   - gotestfmt
+
+onShellEnter: |+
+  export PATH="/workspace/bin:$PATH"
+  source $HOME/.profile

pkg/executor/command.go

@@ -0,0 +1,48 @@
+package executor
+
+import (
+	"context"
+)
+
+// Command is the unit of work in a pipeline
+type Command interface {
+	Run(ctx context.Context) error
+}
+
+type command struct {
+	run       func(ctx context.Context) error
+	preHooks  []func(ctx context.Context) error
+	postHooks []func(ctx context.Context) error
+}
+
+func (c *command) Run(ctx context.Context) error {
+	for _, h := range c.preHooks {
+		if err := h(ctx); err != nil {
+			return err
+		}
+	}
+	if err := c.run(ctx); err != nil {
+		return err
+	}
+	for _, h := range c.postHooks {
+		if err := h(ctx); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (c *command) AddPreHook(h func(ctx context.Context) error) *command {
+	c.preHooks = append(c.preHooks, h)
+	return c
+}
+
+func (c *command) AddPostHook(h func(ctx context.Context) error) *command {
+	c.postHooks = append(c.postHooks, h)
+	return c
+}
+
+// CommandFunc is now a factory
+func CommandFunc(fn func(context.Context) error) *command {
+	return &command{run: fn}
+}

pkg/executor/pipeline.go

@@ -0,0 +1,104 @@
+package executor
+
+import (
+	"context"
+	"log/slog"
+	"sync"
+
+	"golang.org/x/sync/errgroup"
+)
+
+// Step is a pipeline Step.
+// It could either have substeps or commands. Not both at the same time.
+type Step struct {
+	SubSteps []Step
+	Commands []Command
+
+	// Parallel means all the Commands/SubSteps will be executed in parallel
+	Parallel bool
+}
+
+// Pipeline executes a sequence of Steps
+type Pipeline struct {
+	logger *slog.Logger
+	mu     sync.Mutex
+	cancel func()
+	steps  []Step
+}
+
+func NewPipeline(logger *slog.Logger, steps []Step) *Pipeline {
+	if logger == nil {
+		logger = slog.Default()
+	}
+	return &Pipeline{logger: logger, steps: steps}
+}
+
+func (p *Pipeline) Start(parent context.Context) error {
+	p.mu.Lock()
+	ctx, cf := context.WithCancel(parent)
+	p.cancel = cf
+	defer p.mu.Unlock()
+
+	for i := range p.steps {
+		step := p.steps[i]
+		if err := p.execStep(ctx, &step); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (p *Pipeline) Stop() error {
+	if p.cancel != nil {
+		p.cancel()
+	}
+	return nil
+}
+
+func (p *Pipeline) execStep(ctx context.Context, step *Step) error {
+	if err := p.execSubSteps(ctx, step); err != nil {
+		return err
+	}
+	return p.execCommands(ctx, step)
+}
+
+func (p *Pipeline) execCommands(ctx context.Context, step *Step) error {
+	if step.Parallel {
+		g, gctx := errgroup.WithContext(ctx)
+		for i := range step.Commands {
+			cmd := step.Commands[i]
+			g.Go(func() error {
+				return cmd.Run(gctx)
+			})
+		}
+		return g.Wait()
+	}
+
+	for i := range step.Commands {
+		if err := step.Commands[i].Run(ctx); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (p *Pipeline) execSubSteps(ctx context.Context, step *Step) error {
+	if step.Parallel {
+		g, gctx := errgroup.WithContext(ctx)
+		for i := range step.SubSteps {
+			substep := &step.SubSteps[i]
+			g.Go(func() error {
+				return p.execStep(gctx, substep)
+			})
+		}
+		return g.Wait()
+	}
+
+	for i := range step.SubSteps {
+		if err := p.execStep(ctx, &step.SubSteps[i]); err != nil {
+			return err
+		}
+	}
+	return nil
+}

pkg/executor/shell-command.go

@@ -0,0 +1,90 @@
+package executor
+
+import (
+	"context"
+	"io"
+	"os"
+	"os/exec"
+	"os/signal"
+	"syscall"
+	"time"
+
+	"github.com/creack/pty"
+	"golang.org/x/term"
+)
+
+// NewInteractiveShellCommand creates a Command that runs an exec.Cmd with PTY for full terminal support
+func NewInteractiveShellCommand(handler func(context.Context) *exec.Cmd) *command {
+	return CommandFunc(func(ctx context.Context) error {
+		cmd := handler(ctx)
+
+		// Clear these - pty.Start sets them to TTY but won't override existing values
+		cmd.Stdout = nil
+		cmd.Stderr = nil
+		cmd.Stdin = nil
+
+		ptmx, err := pty.Start(cmd)
+		if err != nil {
+			return err
+		}
+		defer ptmx.Close()
+
+		// Handle terminal resize
+		sigCh := make(chan os.Signal, 1)
+		signal.Notify(sigCh, syscall.SIGWINCH)
+		go func() {
+			for range sigCh {
+				pty.InheritSize(os.Stdin, ptmx)
+			}
+		}()
+		sigCh <- syscall.SIGWINCH // Initial resize
+		defer signal.Stop(sigCh)
+
+		// Set stdin to raw mode
+		oldState, err := term.MakeRaw(int(os.Stdin.Fd()))
+		if err != nil {
+			return err
+		}
+		defer term.Restore(int(os.Stdin.Fd()), oldState)
+
+		// Copy I/O
+		go io.Copy(ptmx, os.Stdin)
+		io.Copy(os.Stdout, ptmx)
+
+		return cmd.Wait()
+	})
+}
+
+// NewShellCommand creates a Command that runs an exec.Cmd with lifecycle management
+func NewShellCommand(handler func(context.Context) *exec.Cmd) *command {
+	return CommandFunc(func(ctx context.Context) error {
+		cmd := handler(ctx)
+		cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
+
+		if err := cmd.Start(); err != nil {
+			return err
+		}
+
+		pid := cmd.Process.Pid
+		done := make(chan error, 1)
+
+		go func() {
+			done <- cmd.Wait()
+		}()
+
+		select {
+		case err := <-done:
+			return err
+		case <-ctx.Done():
+			syscall.Kill(-pid, syscall.SIGTERM)
+
+			select {
+			case <-done:
+			case <-time.After(2 * time.Second):
+				syscall.Kill(-pid, syscall.SIGKILL)
+				<-done
+			}
+			return ctx.Err()
+		}
+	})
+}