refactor(config): consolidate daemon config into model package

Move socket path configuration from daemon-specific config to the main
ShellTimeConfig. This simplifies the architecture by having a single
source of truth for configuration.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: AnnatarHe

cmd/daemon/main.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"log/slog"
 	"os"
 	"os/signal"
-	"path/filepath"
 	"syscall"
 
 	"github.com/ThreeDotsLabs/watermill"
@@ -25,36 +25,22 @@ var (
 	ppToken    = ""
 )
 
-func getConfigPath() string {
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		slog.Error("Failed to get user home directory", slog.Any("err", err))
-		return ""
-	}
-	return filepath.Join(homeDir, ".shelltime", "config.toml")
-}
-
 func main() {
 	l := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
 		AddSource: true,
 		Level:     slog.LevelDebug,
 	}))
 	slog.SetDefault(l)
 
-	daemonConfigService := daemon.NewConfigService(daemon.DefaultConfigPath)
-	daemonConfig, err := daemonConfigService.GetConfig()
+	ctx := context.Background()
+	configFile := os.ExpandEnv(fmt.Sprintf("%s/%s/%s", "$HOME", model.COMMAND_BASE_STORAGE_FOLDER, "config.toml"))
+	daemonConfigService := model.NewConfigService(configFile)
+	cfg, err := daemonConfigService.ReadConfigFile(ctx)
 	if err != nil {
 		slog.Error("Failed to get daemon config", slog.Any("err", err))
 		return
 	}
 
-	cs, err := daemonConfigService.GetUserConfig()
-	if err != nil {
-		slog.Error("Failed to get user config", slog.Any("err", err))
-		return
-	}
-
-	ctx := context.Background()
 	uptraceOptions := []uptrace.Option{
 		uptrace.WithDSN(uptraceDsn),
 		uptrace.WithServiceName("cli-daemon"),
@@ -66,7 +52,6 @@ func main() {
 		uptraceOptions = append(uptraceOptions, uptrace.WithResourceAttributes(attribute.String("hostname", hs)))
 	}
 
-	cfg, err := cs.ReadConfigFile(ctx)
 	if err != nil ||
 		cfg.EnableMetrics == nil ||
 		*cfg.EnableMetrics == false ||
@@ -82,7 +67,7 @@ func main() {
 	defer uptrace.Shutdown(ctx)
 	defer uptrace.ForceFlush(ctx)
 
-	daemon.Init(cs, version)
+	daemon.Init(daemonConfigService, version)
 	model.InjectVar(version)
 	cmdService := model.NewCommandService()
 
@@ -121,7 +106,7 @@ func main() {
 	}
 
 	// Create processor instance
-	processor := daemon.NewSocketHandler(daemonConfig, pubsub)
+	processor := daemon.NewSocketHandler(&cfg, pubsub)
 
 	// Start processor
 	if err := processor.Start(); err != nil {

commands/track.go

@@ -264,7 +264,7 @@ func DoSyncData(
 	trackingData []model.TrackingData,
 	meta model.TrackingMetaData,
 ) error {
-	socketPath := daemon.DefaultSocketPath
+	socketPath := config.SocketPath
 	isSocketReady := daemon.IsSocketReady(ctx, socketPath)
 
 	logrus.Traceln("is socket ready: ", isSocketReady)

daemon/config.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
+	"github.com/malamtime/cli/model"
 )
 
 type SocketMessageType string
@@ -23,14 +24,14 @@ type SocketMessage struct {
 }
 
 type SocketHandler struct {
-	config   *DaemonConfig
+	config   *model.ShellTimeConfig
 	listener net.Listener
 
 	channel  *GoChannel
 	stopChan chan struct{}
 }
 
-func NewSocketHandler(config *DaemonConfig, ch *GoChannel) *SocketHandler {
+func NewSocketHandler(config *model.ShellTimeConfig, ch *GoChannel) *SocketHandler {
 	return &SocketHandler{
 		config:   config,
 		channel:  ch,

daemon/socket.go

@@ -68,6 +68,9 @@ func mergeConfig(base, local *ShellTimeConfig) {
 	if local.CCOtel != nil {
 		base.CCOtel = local.CCOtel
 	}
+	if local.SocketPath != "" {
+		base.SocketPath = local.SocketPath
+	}
 }
 
 func (cs *configService) ReadConfigFile(ctx context.Context) (config ShellTimeConfig, err error) {
@@ -95,7 +98,6 @@ func (cs *configService) ReadConfigFile(ctx context.Context) (config ShellTimeCo
 		baseName := strings.TrimSuffix(configFile, ext)
 		// Construct local config filename: baseName + ".local" + ext
 		localConfigFile := baseName + ".local" + ext
-		
 		if localConfig, localErr := os.ReadFile(localConfigFile); localErr == nil {
 			// Parse local config and merge with base config
 			var localSettings ShellTimeConfig
@@ -126,15 +128,18 @@ func (cs *configService) ReadConfigFile(ctx context.Context) (config ShellTimeCo
 	if config.DataMasking == nil {
 		config.DataMasking = &truthy
 	}
-	
+
 	// Initialize AI config with defaults if not present
 	if config.AI == nil {
 		config.AI = DefaultAIConfig
 	}
 
 	// Initialize CCOtel config with default port if enabled but port not set
 	if config.CCOtel != nil && config.CCOtel.GRPCPort == 0 {
-		config.CCOtel.GRPCPort = 4317 // default OTEL gRPC port
+		config.CCOtel.GRPCPort = 54027 // default OTEL gRPC port
+	}
+	if config.SocketPath == "" {
+		config.SocketPath = DefaultSocketPath
 	}
 
 	UserShellTimeConfig = config

model/config.go

@@ -1,5 +1,9 @@
 package model
 
+const (
+	DefaultSocketPath = "/tmp/shelltime.sock"
+)
+
 type Endpoint struct {
 	APIEndpoint string `toml:"apiEndpoint"`
 	Token       string `token:"token"`
@@ -64,6 +68,10 @@ type ShellTimeConfig struct {
 
 	// CCOtel configuration for OTEL-based Claude Code tracking (v2 - gRPC passthrough)
 	CCOtel *CCOtel `toml:"ccotel"`
+
+	// SocketPath is the path to the Unix domain socket used for communication
+	// between the CLI and the daemon.
+	SocketPath string `toml:"socketPath"`
 }
 
 var DefaultAIConfig = &AIConfig{
@@ -90,4 +98,6 @@ var DefaultConfig = ShellTimeConfig{
 	Exclude:       []string{},
 	CCUsage:       nil,
 	CCOtel:        nil,
+
+	SocketPath: DefaultSocketPath,
 }