fix(config): add missing merge logic for CodeTracking and LogCleanup

AnnatarHe · claude · AnnatarHe · commit 6cbbcb329173 · 2025-12-25T22:27:08.000+08:00
🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
diff --git a/model/config.go b/model/config.go
@@ -92,6 +92,12 @@ func mergeConfig(base, local *ShellTimeConfig) {
 	if local.SocketPath != "" {
 		base.SocketPath = local.SocketPath
 	}
+	if local.CodeTracking != nil {
+		base.CodeTracking = local.CodeTracking
+	}
+	if local.LogCleanup != nil {
+		base.LogCleanup = local.LogCleanup
+	}
 }
 
 func (cs *configService) ReadConfigFile(ctx context.Context, opts ...ReadConfigOption) (config ShellTimeConfig, err error) {

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,12 @@ func mergeConfig(base, local *ShellTimeConfig) {`
`92`	`92`	`if local.SocketPath != "" {`
`93`	`93`	`base.SocketPath = local.SocketPath`
`94`	`94`	`}`
	`95`	`+ if local.CodeTracking != nil {`
	`96`	`+ base.CodeTracking = local.CodeTracking`
	`97`	`+ }`
	`98`	`+ if local.LogCleanup != nil {`
	`99`	`+ base.LogCleanup = local.LogCleanup`
	`100`	`+ }`
`95`	`101`	`}`
`96`	`102`
`97`	`103`	`func (cs *configService) ReadConfigFile(ctx context.Context, opts ...ReadConfigOption) (config ShellTimeConfig, err error) {`