Fix #1044: Cron expressions respect schedule.TZ field using 3-level fallback

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
liugangjian 2026-03-09 09:27:56 +08:00
parent 028605cfd0
commit 6324427862
5 changed files with 53 additions and 17 deletions

View file

@ -221,8 +221,14 @@ func setupCronTool(
cronStorePath := filepath.Join(workspace, "cron", "jobs.json") cronStorePath := filepath.Join(workspace, "cron", "jobs.json")
// Create cron service // Create cron service
cronService := cron.NewCronService(cronStorePath, nil) cronService := cron.NewCronService(
cronStorePath,
nil,
cron.CronConfig{
ExecTimeoutMinutes: cfg.Tools.Cron.ExecTimeoutMinutes,
DefaultTimezone: cfg.Tools.Cron.DefaultTimezone,
},
)
// Create and register CronTool // Create and register CronTool
cronTool, err := tools.NewCronTool(cronService, agentLoop, msgBus, workspace, restrict, execTimeout, cfg) cronTool, err := tools.NewCronTool(cronService, agentLoop, msgBus, workspace, restrict, execTimeout, cfg)
if err != nil { if err != nil {

View file

@ -243,7 +243,8 @@
"proxy": "" "proxy": ""
}, },
"cron": { "cron": {
"exec_timeout_minutes": 5 "exec_timeout_minutes": 5,
"default_timezone": "Asia/Shanghai"
}, },
"mcp": { "mcp": {
"enabled": false, "enabled": false,

View file

@ -571,6 +571,7 @@ type WebToolsConfig struct {
type CronToolsConfig struct { type CronToolsConfig struct {
ExecTimeoutMinutes int `json:"exec_timeout_minutes" env:"PICOCLAW_TOOLS_CRON_EXEC_TIMEOUT_MINUTES"` // 0 means no timeout ExecTimeoutMinutes int `json:"exec_timeout_minutes" env:"PICOCLAW_TOOLS_CRON_EXEC_TIMEOUT_MINUTES"` // 0 means no timeout
DefaultTimezone string `json:"default_timezone" env:"PICOCLAW_TOOLS_CRON_DEFAULT_TIMEZONE"`
} }
type ExecConfig struct { type ExecConfig struct {

View file

@ -14,6 +14,10 @@ import (
"github.com/sipeed/picoclaw/pkg/fileutil" "github.com/sipeed/picoclaw/pkg/fileutil"
) )
type CronConfig struct {
ExecTimeoutMinutes int `json:"exec_timeout_minutes,omitempty"`
DefaultTimezone string `json:"default_timezone,omitempty"`
}
type CronSchedule struct { type CronSchedule struct {
Kind string `json:"kind"` Kind string `json:"kind"`
@ -59,20 +63,22 @@ type CronStore struct {
type JobHandler func(job *CronJob) (string, error) type JobHandler func(job *CronJob) (string, error)
type CronService struct { type CronService struct {
storePath string storePath string
store *CronStore store *CronStore
onJob JobHandler onJob JobHandler
mu sync.RWMutex mu sync.RWMutex
running bool running bool
stopChan chan struct{} stopChan chan struct{}
gronx *gronx.Gronx gronx *gronx.Gronx
config CronConfig
} }
func NewCronService(storePath string, onJob JobHandler) *CronService { func NewCronService(storePath string, onJob JobHandler, config CronConfig) *CronService {
cs := &CronService{ cs := &CronService{
storePath: storePath, storePath: storePath,
onJob: onJob, onJob: onJob,
gronx: gronx.New(), gronx: gronx.New(),
config: config,
} }
// Initialize and load store on creation // Initialize and load store on creation
cs.loadStore() cs.loadStore()
@ -264,15 +270,32 @@ func (cs *CronService) computeNextRun(schedule *CronSchedule, nowMS int64) *int6
return nil return nil
} }
// Use gronx to calculate next run time // 3-level fallback: schedule.TZ > config default_timezone > "Asia/Shanghai"
now := time.UnixMilli(nowMS) timezoneStr := schedule.TZ
if timezoneStr == "" {
timezoneStr = cs.config.DefaultTimezone
}
if timezoneStr == "" {
timezoneStr = "Asia/Shanghai" // Default fallback
}
// Load the target timezone
targetTZ, err := time.LoadLocation(timezoneStr)
if err != nil {
log.Printf("[cron] failed to load timezone '%s', falling back to UTC: %v", timezoneStr, err)
targetTZ = time.UTC // fallback to UTC on error
}
// Use gronx to calculate next run time based on target timezone
now := time.UnixMilli(nowMS).In(targetTZ)
nextTime, err := gronx.NextTickAfter(schedule.Expr, now, false) nextTime, err := gronx.NextTickAfter(schedule.Expr, now, false)
if err != nil { if err != nil {
log.Printf("[cron] failed to compute next run for expr '%s': %v", schedule.Expr, err) log.Printf("[cron] failed to compute next run for expr '%s' in timezone '%s': %v", schedule.Expr, timezoneStr, err)
return nil return nil
} }
nextMS := nextTime.UnixMilli() // Convert the calculated next time back to UTC Unix milli for storage
nextMS := nextTime.UTC().UnixMilli()
return &nextMS return &nextMS
} }

View file

@ -173,6 +173,11 @@ func (t *CronTool) addJob(args map[string]any) *ToolResult {
Kind: "cron", Kind: "cron",
Expr: cronExpr, Expr: cronExpr,
} }
// Get timezone if present in args
if tz, ok := args["timezone"].(string); ok && tz != "" {
schedule.TZ = tz // Set timezone on cron schedule
}
} else { } else {
return ErrorResult("one of at_seconds, every_seconds, or cron_expr is required") return ErrorResult("one of at_seconds, every_seconds, or cron_expr is required")
} }