From ab09534a842aefb3e83fdb1d88d8f1fea96a596e Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Fri, 31 Jul 2026 00:27:40 +0000
Subject: [PATCH] feat(portforward): log subcommands outputs with "up/down
 command:" prefix

---
 internal/portforward/service/helpers.go | 21 +++++++++++++++++++++
 internal/portforward/service/start.go   |  6 +++++-
 internal/portforward/service/stop.go    |  6 +++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/internal/portforward/service/helpers.go b/internal/portforward/service/helpers.go
index ad222434..c2788c98 100644
--- a/internal/portforward/service/helpers.go
+++ b/internal/portforward/service/helpers.go
@@ -49,3 +49,24 @@ func portPairToString(internal, external uint16) string {
 	}
 	return fmt.Sprintf("%d (internal port %d)", external, internal)
 }
+
+type loggerWithPrefix struct {
+	prefix string
+	logger Logger
+}
+
+func (l *loggerWithPrefix) Debug(msg string) {
+	l.logger.Debug(l.prefix + msg)
+}
+
+func (l *loggerWithPrefix) Info(msg string) {
+	l.logger.Info(l.prefix + msg)
+}
+
+func (l *loggerWithPrefix) Warn(msg string) {
+	l.logger.Warn(l.prefix + msg)
+}
+
+func (l *loggerWithPrefix) Error(msg string) {
+	l.logger.Error(l.prefix + msg)
+}
diff --git a/internal/portforward/service/start.go b/internal/portforward/service/start.go
index 7ee6875a..53be6c50 100644
--- a/internal/portforward/service/start.go
+++ b/internal/portforward/service/start.go
@@ -133,7 +133,11 @@ func (s *Service) onNewPorts(ctx context.Context, internalToExternalPorts map[ui
 	copy(s.ports, externalPorts)
 
 	if s.settings.UpCommand != "" {
-		err = runCommand(ctx, s.cmder, s.logger, s.settings.UpCommand, externalPorts, s.settings.Interface)
+		logger := &loggerWithPrefix{
+			prefix: "up command: ",
+			logger: s.logger,
+		}
+		err = runCommand(ctx, s.cmder, logger, s.settings.UpCommand, externalPorts, s.settings.Interface)
 		if err != nil {
 			err = fmt.Errorf("running up command: %w", err)
 			s.logger.Error(err.Error())
diff --git a/internal/portforward/service/stop.go b/internal/portforward/service/stop.go
index fecc03ef..6ad270af 100644
--- a/internal/portforward/service/stop.go
+++ b/internal/portforward/service/stop.go
@@ -32,7 +32,11 @@ func (s *Service) cleanup() (err error) {
 		const downTimeout = 60 * time.Second
 		ctx, cancel := context.WithTimeout(context.Background(), downTimeout)
 		defer cancel()
-		err = runCommand(ctx, s.cmder, s.logger, s.settings.DownCommand, s.ports, s.settings.Interface)
+		logger := &loggerWithPrefix{
+			prefix: "down command: ",
+			logger: s.logger,
+		}
+		err = runCommand(ctx, s.cmder, logger, s.settings.DownCommand, s.ports, s.settings.Interface)
 		if err != nil {
 			err = fmt.Errorf("running down command: %w", err)
 			s.logger.Error(err.Error())