refactor(pkg): merge pkg/utils into pkg/util

Consolidate pure helper packages under pkg/util and update imports.

AGENTS.md

@@ -135,7 +135,7 @@
 - `pkg/push/`：推送渠道客户端集成（Lark/Telegram/Email）。
 - `pkg/mail/`：邮件发送客户端。
 - `pkg/trace/`：OpenTelemetry 链路追踪配置。
-- `pkg/util/`：纯底层无副作用的系统工具（Crypto/Password/UUID）。
+- `pkg/util/`：纯底层无副作用的系统工具（Crypto/Password/UUID、格式化、网络、版本比较等）。
 
 前端目录：
 

internal/apps/agent/config/config.go

@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/edge/nodeip"
-	"github.com/Rain-kl/Wavelet/pkg/utils"
+	"github.com/Rain-kl/Wavelet/pkg/util"
 )
 
 const (
@@ -147,7 +147,7 @@ func Load(path string) (*Config, error) {
 func applyDefaults(cfg *Config, baseDir string) {
 	baseDir = filepath.Clean(baseDir)
 	cfg.Version = Version
-	cfg.OpenrestyResolvers = utils.UniqueAndCleanStringSlice(cfg.OpenrestyResolvers)
+	cfg.OpenrestyResolvers = util.UniqueAndCleanStringSlice(cfg.OpenrestyResolvers)
 	applyAgentIdentityDefaults(cfg)
 	applyAgentPathDefaults(cfg, baseDir)
 	applyAgentTimingDefaults(cfg)

internal/apps/agent/nginx/manager.go

@@ -25,7 +25,7 @@ import (
 
 	sharedprotocol "github.com/Rain-kl/Wavelet/pkg/protocol"
 	openrestyrender "github.com/Rain-kl/Wavelet/pkg/render/openresty"
-	"github.com/Rain-kl/Wavelet/pkg/utils"
+	"github.com/Rain-kl/Wavelet/pkg/util"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/agent/protocol"
 	"github.com/Rain-kl/Wavelet/internal/apps/agent/runtimeuser"
@@ -1506,7 +1506,7 @@ func ResolverDirective(explicitResolvers []string) string {
 }
 
 func resolverAddresses(explicitResolvers []string) []string {
-	if resolvers := utils.UniqueAndCleanStringSlice(explicitResolvers); len(resolvers) > 0 {
+	if resolvers := util.UniqueAndCleanStringSlice(explicitResolvers); len(resolvers) > 0 {
 		return resolvers
 	}
 	data, err := os.ReadFile("/etc/resolv.conf")

internal/apps/edge/updater/service.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/pkg/utils"
+	"github.com/Rain-kl/Wavelet/pkg/util"
 )
 
 const (
@@ -418,5 +418,5 @@ func buildReleaseCheckKey(options UpdateOptions, remoteVersion string) string {
 }
 
 func compareVersions(local string, remote string) int {
-	return utils.CompareVersions(local, remote)
+	return util.CompareVersions(local, remote)
 }

internal/apps/openflare/node/helpers.go

@@ -17,7 +17,7 @@ import (
 
 	ofws "github.com/Rain-kl/Wavelet/internal/apps/openflare/websocket"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/pkg/utils"
+	"github.com/Rain-kl/Wavelet/pkg/util"
 )
 
 const (
@@ -301,7 +301,7 @@ func isVersionNewer(current string, latest string) bool {
 }
 
 func compareVersions(local, remote string) int {
-	return utils.CompareVersions(local, remote)
+	return util.CompareVersions(local, remote)
 }
 
 func fetchLatestGitHubRelease(ctx context.Context, repo string, channel releaseChannel) (*githubReleaseResponse, error) {

pkg/util/format.go

@@ -1,5 +1,5 @@
-// Package utils provides shared formatting and string helper functions.
-package utils
+// Package util provides shared formatting and string helper functions.
+package util
 
 import (
 	"fmt"

pkg/util/format_test.go

@@ -1,4 +1,4 @@
-package utils
+package util
 
 import (
 	"testing"

pkg/util/network.go

@@ -1,4 +1,4 @@
-package utils
+package util
 
 import (
 	"log/slog"

pkg/util/network_test.go

@@ -1,4 +1,4 @@
-package utils
+package util
 
 import (
 	"testing"

pkg/util/slice.go

@@ -1,4 +1,4 @@
-package utils
+package util
 
 import (
 	"sort"

pkg/util/string.go

@@ -1,4 +1,4 @@
-package utils
+package util
 
 import "strings"
 

pkg/util/value.go

@@ -1,4 +1,4 @@
-package utils
+package util
 
 import "fmt"
 

pkg/util/version.go

@@ -1,4 +1,4 @@
-package utils
+package util
 
 import (
 	"strconv"

pkg/util/version_compare.go

@@ -1,4 +1,4 @@
-package utils
+package util
 
 import "strconv"