From f446f1d279861148efc22b55c38e4cc10b93f7c2 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 26 Aug 2025 20:08:17 +0000
Subject: [PATCH] Fix remaining import alias issues and verify all builds pass

Co-authored-by: andreynering <7011819+andreynering@users.noreply.github.com>
---
 cmd/soft/main.go      | 2 +-
 pkg/log/log.go        | 2 +-
 pkg/ssh/middleware.go | 4 ++--
 pkg/ssh/ssh.go        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmd/soft/main.go b/cmd/soft/main.go
index 9b248fd37aa641d6d0707004413bf53ad959b4aa..fdb60d49bf827f9f8f0fc64a321290f0eb03d473 100644
--- a/cmd/soft/main.go
+++ b/cmd/soft/main.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 
 	"github.com/charmbracelet/colorprofile"
-	"github.com/charmbracelet/log/v2"
+	log "github.com/charmbracelet/log/v2"
 	"github.com/charmbracelet/soft-serve/cmd/soft/admin"
 	"github.com/charmbracelet/soft-serve/cmd/soft/browse"
 	"github.com/charmbracelet/soft-serve/cmd/soft/hook"
diff --git a/pkg/log/log.go b/pkg/log/log.go
index 0c1552589506a2cd82ae11aa77e300218e47d4d6..57bf25285e2b88a0ba75f0be41b83583081f5df5 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/charmbracelet/log/v2"
+	log "github.com/charmbracelet/log/v2"
 	"github.com/charmbracelet/soft-serve/pkg/config"
 )
 
diff --git a/pkg/ssh/middleware.go b/pkg/ssh/middleware.go
index 32c31af933a807bef2de20dd37e53778a7cb91aa..8b59a70d9bdb3de6a53ef095e31c6780fa05a405 100644
--- a/pkg/ssh/middleware.go
+++ b/pkg/ssh/middleware.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/charmbracelet/log/v2"
+	log "github.com/charmbracelet/log/v2"
 	"github.com/charmbracelet/soft-serve/pkg/backend"
 	"github.com/charmbracelet/soft-serve/pkg/config"
 	"github.com/charmbracelet/soft-serve/pkg/db"
@@ -13,7 +13,7 @@ import (
 	"github.com/charmbracelet/soft-serve/pkg/sshutils"
 	"github.com/charmbracelet/soft-serve/pkg/store"
 	"github.com/charmbracelet/ssh"
-	"github.com/charmbracelet/wish/v2"
+	wish "github.com/charmbracelet/wish/v2"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/spf13/cobra"
diff --git a/pkg/ssh/ssh.go b/pkg/ssh/ssh.go
index 10d5edee632048c98e83fdfb9609c0426e57f2a0..b9a23b59a2975e352be978157cb7eb011bc26117 100644
--- a/pkg/ssh/ssh.go
+++ b/pkg/ssh/ssh.go
@@ -9,14 +9,14 @@ import (
 	"time"
 
 	"github.com/charmbracelet/keygen"
-	"github.com/charmbracelet/log/v2"
+	log "github.com/charmbracelet/log/v2"
 	"github.com/charmbracelet/soft-serve/pkg/backend"
 	"github.com/charmbracelet/soft-serve/pkg/config"
 	"github.com/charmbracelet/soft-serve/pkg/db"
 	"github.com/charmbracelet/soft-serve/pkg/proto"
 	"github.com/charmbracelet/soft-serve/pkg/store"
 	"github.com/charmbracelet/ssh"
-	"github.com/charmbracelet/wish/v2"
+	wish "github.com/charmbracelet/wish/v2"
 	bm "github.com/charmbracelet/wish/v2/bubbletea"
 	rm "github.com/charmbracelet/wish/v2/recover"
 	"github.com/prometheus/client_golang/prometheus"